diff --git a/.generator/Dockerfile b/.generator/Dockerfile index 2831ccffa6ce..e07205aee4c2 100644 --- a/.generator/Dockerfile +++ b/.generator/Dockerfile @@ -92,6 +92,9 @@ ENV PYTHON_VERSION_DEFAULT=3.14 # These are the non "-dev" versions of the libraries used in the builder. RUN apt-get update && \ apt-get install -y --no-install-recommends \ + # Temporarily include git and ca-certificates to download gapic-generator from Github + ca-certificates \ + git \ # This is needed to avoid the following error: # `ImportError: libsqlite3.so.0: cannot open shared object file: No such file or directory`. # `libsqlite3-0` is used by the `coverage` PyPI package which is used when testing libraries @@ -133,4 +136,4 @@ RUN chmod a+rx ./cli.py COPY .generator/parse_googleapis_content.py . RUN chmod a+rx ./parse_googleapis_content.py -ENTRYPOINT ["python3.14", "./cli.py"] +ENTRYPOINT ["python3.14", "./cli.py"] \ No newline at end of file diff --git a/.generator/requirements.in b/.generator/requirements.in index 235aadd808cf..5d7fbe256050 100644 --- a/.generator/requirements.in +++ b/.generator/requirements.in @@ -1,7 +1,8 @@ click -gapic-generator==1.30.5 # Fix mypy issue https://github.com/googleapis/gapic-generator-python/pull/2536 +# Testing branch cache-api-context +gapic-generator @ git+https://github.com/googleapis/gapic-generator-python@95a512e4d2749de96940e440fe66c5d6742a4fc0 nox starlark-pyo3>=2025.1 build black==23.7.0 -isort==5.11.0 +isort==5.11.0 \ No newline at end of file diff --git a/.librarian/state.yaml b/.librarian/state.yaml index 927941f704f8..38f94d5de8fa 100644 --- a/.librarian/state.yaml +++ b/.librarian/state.yaml @@ -1,4 +1,4 @@ -image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:56f26eaebaf1b4a9f174a72e00d091a1364997e17201dbad1aea099ddbda3a3e +image: gapic-generator:local-benchmark-2 libraries: - id: google-ads-admanager version: 0.8.0 diff --git a/packages/google-ads-admanager/docs/conf.py b/packages/google-ads-admanager/docs/conf.py index 9250354cced4..c1971a8ad1d5 100644 --- a/packages/google-ads-admanager/docs/conf.py +++ b/packages/google-ads-admanager/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-ads-admanager documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/__init__.py index ffa700c219fd..f55750c3f29c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.ad_break_service import AdBreakServiceClient from .services.ad_review_center_ad_service import AdReviewCenterAdServiceClient from .services.ad_unit_service import AdUnitServiceClient diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/client.py index c020ebbebca3..742c1e15e9a2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.ad_break_service import pagers from google.ads.admanager_v1.types import ( @@ -85,9 +85,7 @@ class AdBreakServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AdBreakServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AdBreakServiceTransport]] _transport_registry["rest"] = AdBreakServiceRestTransport def get_transport_class( @@ -645,11 +643,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AdBreakServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AdBreakServiceClient._read_environment_variables() + ) self._client_cert_source = AdBreakServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -684,8 +680,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AdBreakServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/pagers.py index 6bf54a2fe8d6..708a6e295e99 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/base.py index 8754c42e22bf..f62045ec90dc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ad_break_messages, ad_break_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest.py index a75c182b2cc5..520f27684cd0 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -659,7 +659,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest_base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest_base.py index 298a08badb3b..1668e30ba69e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest_base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_break_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.ads.admanager_v1.types import ad_break_messages, ad_break_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/client.py index 3a27ef8206fe..a05ef2f6d1b7 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.ads.admanager_v1.services.ad_review_center_ad_service import pagers @@ -83,9 +83,7 @@ class AdReviewCenterAdServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AdReviewCenterAdServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AdReviewCenterAdServiceTransport]] _transport_registry["rest"] = AdReviewCenterAdServiceRestTransport def get_transport_class( @@ -649,11 +647,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AdReviewCenterAdServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AdReviewCenterAdServiceClient._read_environment_variables() + ) self._client_cert_source = ( AdReviewCenterAdServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -690,8 +686,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AdReviewCenterAdServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/pagers.py index 5b7d3e65cde6..5e3e15dd0825 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/__init__.py index 91d81f66f8c2..7bc63d24d4c7 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AdReviewCenterAdServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AdReviewCenterAdServiceTransport]] _transport_registry["rest"] = AdReviewCenterAdServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/base.py index 2b391fba5a35..fdc7dc2d9d84 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ad_review_center_ad_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/rest.py index 6acb0b61629d..41dd10bbe278 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_review_center_ad_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -464,9 +464,7 @@ def __call__( """ - http_options = ( - _BaseAdReviewCenterAdServiceRestTransport._BaseBatchAllowAdReviewCenterAds._get_http_options() - ) + http_options = _BaseAdReviewCenterAdServiceRestTransport._BaseBatchAllowAdReviewCenterAds._get_http_options() request, metadata = self._interceptor.pre_batch_allow_ad_review_center_ads( request, metadata @@ -492,7 +490,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -533,11 +531,10 @@ def __call__( resp = self._interceptor.post_batch_allow_ad_review_center_ads(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_allow_ad_review_center_ads_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_allow_ad_review_center_ads_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -625,9 +622,7 @@ def __call__( """ - http_options = ( - _BaseAdReviewCenterAdServiceRestTransport._BaseBatchBlockAdReviewCenterAds._get_http_options() - ) + http_options = _BaseAdReviewCenterAdServiceRestTransport._BaseBatchBlockAdReviewCenterAds._get_http_options() request, metadata = self._interceptor.pre_batch_block_ad_review_center_ads( request, metadata @@ -653,7 +648,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -694,11 +689,10 @@ def __call__( resp = self._interceptor.post_batch_block_ad_review_center_ads(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_block_ad_review_center_ads_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_block_ad_review_center_ads_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -779,9 +773,7 @@ def __call__( Response object for ``SearchAdReviewCenterAds`` method. """ - http_options = ( - _BaseAdReviewCenterAdServiceRestTransport._BaseSearchAdReviewCenterAds._get_http_options() - ) + http_options = _BaseAdReviewCenterAdServiceRestTransport._BaseSearchAdReviewCenterAds._get_http_options() request, metadata = self._interceptor.pre_search_ad_review_center_ads( request, metadata @@ -884,7 +876,9 @@ def batch_allow_ad_review_center_ads( ]: # 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._BatchAllowAdReviewCenterAds(self._session, self._host, self._interceptor) # type: ignore + return self._BatchAllowAdReviewCenterAds( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_block_ad_review_center_ads( @@ -895,7 +889,9 @@ def batch_block_ad_review_center_ads( ]: # 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._BatchBlockAdReviewCenterAds(self._session, self._host, self._interceptor) # type: ignore + return self._BatchBlockAdReviewCenterAds( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_ad_review_center_ads( @@ -906,7 +902,9 @@ def search_ad_review_center_ads( ]: # 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._SearchAdReviewCenterAds(self._session, self._host, self._interceptor) # type: ignore + return self._SearchAdReviewCenterAds( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -966,9 +964,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAdReviewCenterAdServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAdReviewCenterAdServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAdReviewCenterAdServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/client.py index 54fdb434e2e9..d5e9814c0dfe 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.ad_unit_service import pagers from google.ads.admanager_v1.types import ( @@ -668,11 +668,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AdUnitServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AdUnitServiceClient._read_environment_variables() + ) self._client_cert_source = AdUnitServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -707,8 +705,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AdUnitServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/pagers.py index 35a60482fdc9..995c71e1f584 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/base.py index 1092e1b34c4d..08ed693dab8c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ad_unit_messages, ad_unit_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/rest.py index 4a3d2d1b9794..1850a8318b32 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/ad_unit_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -831,9 +831,7 @@ def __call__( Response object for ``BatchActivateAdUnits`` method. """ - http_options = ( - _BaseAdUnitServiceRestTransport._BaseBatchActivateAdUnits._get_http_options() - ) + http_options = _BaseAdUnitServiceRestTransport._BaseBatchActivateAdUnits._get_http_options() request, metadata = self._interceptor.pre_batch_activate_ad_units( request, metadata @@ -985,9 +983,7 @@ def __call__( Response object for ``BatchArchiveAdUnits`` method. """ - http_options = ( - _BaseAdUnitServiceRestTransport._BaseBatchArchiveAdUnits._get_http_options() - ) + http_options = _BaseAdUnitServiceRestTransport._BaseBatchArchiveAdUnits._get_http_options() request, metadata = self._interceptor.pre_batch_archive_ad_units( request, metadata @@ -1139,9 +1135,7 @@ def __call__( Response object for ``BatchCreateAdUnits`` method. """ - http_options = ( - _BaseAdUnitServiceRestTransport._BaseBatchCreateAdUnits._get_http_options() - ) + http_options = _BaseAdUnitServiceRestTransport._BaseBatchCreateAdUnits._get_http_options() request, metadata = self._interceptor.pre_batch_create_ad_units( request, metadata @@ -1294,9 +1288,7 @@ def __call__( Response object for ``BatchDeactivateAdUnits`` method. """ - http_options = ( - _BaseAdUnitServiceRestTransport._BaseBatchDeactivateAdUnits._get_http_options() - ) + http_options = _BaseAdUnitServiceRestTransport._BaseBatchDeactivateAdUnits._get_http_options() request, metadata = self._interceptor.pre_batch_deactivate_ad_units( request, metadata @@ -1448,9 +1440,7 @@ def __call__( Response object for ``BatchUpdateAdUnits`` method. """ - http_options = ( - _BaseAdUnitServiceRestTransport._BaseBatchUpdateAdUnits._get_http_options() - ) + http_options = _BaseAdUnitServiceRestTransport._BaseBatchUpdateAdUnits._get_http_options() request, metadata = self._interceptor.pre_batch_update_ad_units( request, metadata @@ -2341,7 +2331,9 @@ def batch_deactivate_ad_units( ]: # 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._BatchDeactivateAdUnits(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeactivateAdUnits( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_ad_units( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/client.py index 3da4620956e6..0e7a626845b9 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class ApplicationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ApplicationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ApplicationServiceTransport]] _transport_registry["rest"] = ApplicationServiceRestTransport def get_transport_class( @@ -634,11 +632,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApplicationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApplicationServiceClient._read_environment_variables() + ) self._client_cert_source = ApplicationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -673,8 +669,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApplicationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/pagers.py index 7b6fd3d8cb5b..3350400d8dbf 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/__init__.py index 96088f830d7c..df94997a00b6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ApplicationServiceRestInterceptor, ApplicationServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ApplicationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ApplicationServiceTransport]] _transport_registry["rest"] = ApplicationServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/base.py index a160509b80b4..9125ca11c6b5 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import application_messages, application_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/rest.py index 61b9c5d62503..738d8c1dbbb3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/application_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -370,9 +370,7 @@ def __call__( """ - http_options = ( - _BaseApplicationServiceRestTransport._BaseGetApplication._get_http_options() - ) + http_options = _BaseApplicationServiceRestTransport._BaseGetApplication._get_http_options() request, metadata = self._interceptor.pre_get_application(request, metadata) transcoded_request = _BaseApplicationServiceRestTransport._BaseGetApplication._get_transcoded_request( @@ -519,9 +517,7 @@ def __call__( """ - http_options = ( - _BaseApplicationServiceRestTransport._BaseListApplications._get_http_options() - ) + http_options = _BaseApplicationServiceRestTransport._BaseListApplications._get_http_options() request, metadata = self._interceptor.pre_list_applications( request, metadata @@ -692,9 +688,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseApplicationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseApplicationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseApplicationServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/client.py index 15717f6010ce..8bd2e0a3ce73 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class AudienceSegmentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AudienceSegmentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AudienceSegmentServiceTransport]] _transport_registry["rest"] = AudienceSegmentServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AudienceSegmentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AudienceSegmentServiceClient._read_environment_variables() + ) self._client_cert_source = AudienceSegmentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -679,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AudienceSegmentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/pagers.py index 8940bd966b66..bc92516907cb 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/__init__.py index caf4d2aa56d1..e21bd63eaeb4 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AudienceSegmentServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AudienceSegmentServiceTransport]] _transport_registry["rest"] = AudienceSegmentServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/base.py index 8d43d6e6aa5b..aabe0d0279c8 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/rest.py index f41c5533858a..188597bfcef6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/audience_segment_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -370,9 +370,7 @@ def __call__( The ``AudienceSegment`` resource. """ - http_options = ( - _BaseAudienceSegmentServiceRestTransport._BaseGetAudienceSegment._get_http_options() - ) + http_options = _BaseAudienceSegmentServiceRestTransport._BaseGetAudienceSegment._get_http_options() request, metadata = self._interceptor.pre_get_audience_segment( request, metadata @@ -523,9 +521,7 @@ def __call__( """ - http_options = ( - _BaseAudienceSegmentServiceRestTransport._BaseListAudienceSegments._get_http_options() - ) + http_options = _BaseAudienceSegmentServiceRestTransport._BaseListAudienceSegments._get_http_options() request, metadata = self._interceptor.pre_list_audience_segments( request, metadata @@ -701,9 +697,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAudienceSegmentServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAudienceSegmentServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAudienceSegmentServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/client.py index 1905f0615ff8..97f4267bad05 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class BandwidthGroupServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BandwidthGroupServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BandwidthGroupServiceTransport]] _transport_registry["rest"] = BandwidthGroupServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BandwidthGroupServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BandwidthGroupServiceClient._read_environment_variables() + ) self._client_cert_source = BandwidthGroupServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -679,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BandwidthGroupServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/pagers.py index e015c21f381b..fd99bac400c3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/__init__.py index 96b9cbe70396..7779891532a2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[BandwidthGroupServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[BandwidthGroupServiceTransport]] _transport_registry["rest"] = BandwidthGroupServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/base.py index 33cb98b4e16a..8337018ac15f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/rest.py index 29c3165baa02..9d6b21cc5399 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/bandwidth_group_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -373,9 +373,7 @@ def __call__( """ - http_options = ( - _BaseBandwidthGroupServiceRestTransport._BaseGetBandwidthGroup._get_http_options() - ) + http_options = _BaseBandwidthGroupServiceRestTransport._BaseGetBandwidthGroup._get_http_options() request, metadata = self._interceptor.pre_get_bandwidth_group( request, metadata @@ -526,9 +524,7 @@ def __call__( """ - http_options = ( - _BaseBandwidthGroupServiceRestTransport._BaseListBandwidthGroups._get_http_options() - ) + http_options = _BaseBandwidthGroupServiceRestTransport._BaseListBandwidthGroups._get_http_options() request, metadata = self._interceptor.pre_list_bandwidth_groups( request, metadata @@ -704,9 +700,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseBandwidthGroupServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseBandwidthGroupServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseBandwidthGroupServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/client.py index 3d6f162ebfc3..74307fada64e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class BrowserLanguageServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BrowserLanguageServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BrowserLanguageServiceTransport]] _transport_registry["rest"] = BrowserLanguageServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BrowserLanguageServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BrowserLanguageServiceClient._read_environment_variables() + ) self._client_cert_source = BrowserLanguageServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -679,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BrowserLanguageServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/pagers.py index 29c5432dec77..78ad1aa38472 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/__init__.py index b3d0a4067c54..bebfbd81b315 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[BrowserLanguageServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[BrowserLanguageServiceTransport]] _transport_registry["rest"] = BrowserLanguageServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/base.py index 12f2e19b7fdd..4b85e2f2d72f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/rest.py index a8b8fcbad57c..523d03a2b385 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_language_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -370,9 +370,7 @@ def __call__( Represents the language of a browser. """ - http_options = ( - _BaseBrowserLanguageServiceRestTransport._BaseGetBrowserLanguage._get_http_options() - ) + http_options = _BaseBrowserLanguageServiceRestTransport._BaseGetBrowserLanguage._get_http_options() request, metadata = self._interceptor.pre_get_browser_language( request, metadata @@ -523,9 +521,7 @@ def __call__( """ - http_options = ( - _BaseBrowserLanguageServiceRestTransport._BaseListBrowserLanguages._get_http_options() - ) + http_options = _BaseBrowserLanguageServiceRestTransport._BaseListBrowserLanguages._get_http_options() request, metadata = self._interceptor.pre_list_browser_languages( request, metadata @@ -701,9 +697,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseBrowserLanguageServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseBrowserLanguageServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseBrowserLanguageServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/client.py index c74e94e381c3..3b54412cc6dc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class BrowserServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BrowserServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BrowserServiceTransport]] _transport_registry["rest"] = BrowserServiceRestTransport def get_transport_class( @@ -630,11 +628,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BrowserServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BrowserServiceClient._read_environment_variables() + ) self._client_cert_source = BrowserServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -669,8 +665,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BrowserServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/pagers.py index 95173cb5fbe0..580770e2cb04 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/base.py index 214406dd960b..4786de410282 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import browser_messages, browser_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/rest.py index b503188825a7..242bc55dcb22 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/browser_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/client.py index ea1f2c031e28..e5296369d232 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class CmsMetadataKeyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CmsMetadataKeyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CmsMetadataKeyServiceTransport]] _transport_registry["rest"] = CmsMetadataKeyServiceRestTransport def get_transport_class( @@ -641,11 +639,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CmsMetadataKeyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CmsMetadataKeyServiceClient._read_environment_variables() + ) self._client_cert_source = CmsMetadataKeyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -680,8 +676,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CmsMetadataKeyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/pagers.py index ef1178a06532..bdf1fc7d7bb2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/__init__.py index 8df01714ef69..0813dc61268a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CmsMetadataKeyServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CmsMetadataKeyServiceTransport]] _transport_registry["rest"] = CmsMetadataKeyServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/base.py index 8fdc1627f8b1..b6d059cee96f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/rest.py index ba7cc92b7378..44ff0a90719e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_key_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -372,9 +372,7 @@ def __call__( """ - http_options = ( - _BaseCmsMetadataKeyServiceRestTransport._BaseGetCmsMetadataKey._get_http_options() - ) + http_options = _BaseCmsMetadataKeyServiceRestTransport._BaseGetCmsMetadataKey._get_http_options() request, metadata = self._interceptor.pre_get_cms_metadata_key( request, metadata @@ -525,9 +523,7 @@ def __call__( """ - http_options = ( - _BaseCmsMetadataKeyServiceRestTransport._BaseListCmsMetadataKeys._get_http_options() - ) + http_options = _BaseCmsMetadataKeyServiceRestTransport._BaseListCmsMetadataKeys._get_http_options() request, metadata = self._interceptor.pre_list_cms_metadata_keys( request, metadata @@ -703,9 +699,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCmsMetadataKeyServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCmsMetadataKeyServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCmsMetadataKeyServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/client.py index 16ad97e28fe1..55d30c3d083e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class CmsMetadataValueServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CmsMetadataValueServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CmsMetadataValueServiceTransport]] _transport_registry["rest"] = CmsMetadataValueServiceRestTransport def get_transport_class( @@ -661,11 +659,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CmsMetadataValueServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CmsMetadataValueServiceClient._read_environment_variables() + ) self._client_cert_source = ( CmsMetadataValueServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -702,8 +698,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CmsMetadataValueServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/pagers.py index bc68d27c7c58..fda969e49c09 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/__init__.py index 03c87919081d..e708c6678877 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CmsMetadataValueServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CmsMetadataValueServiceTransport]] _transport_registry["rest"] = CmsMetadataValueServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/base.py index 64f7c508e112..2c11cd33402d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/rest.py index e17ef914e113..ff26c2594d4f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/cms_metadata_value_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -372,9 +372,7 @@ def __call__( """ - http_options = ( - _BaseCmsMetadataValueServiceRestTransport._BaseGetCmsMetadataValue._get_http_options() - ) + http_options = _BaseCmsMetadataValueServiceRestTransport._BaseGetCmsMetadataValue._get_http_options() request, metadata = self._interceptor.pre_get_cms_metadata_value( request, metadata @@ -525,9 +523,7 @@ def __call__( """ - http_options = ( - _BaseCmsMetadataValueServiceRestTransport._BaseListCmsMetadataValues._get_http_options() - ) + http_options = _BaseCmsMetadataValueServiceRestTransport._BaseListCmsMetadataValues._get_http_options() request, metadata = self._interceptor.pre_list_cms_metadata_values( request, metadata @@ -699,9 +695,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCmsMetadataValueServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCmsMetadataValueServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCmsMetadataValueServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/client.py index 6fa30ec5989c..779d7304a55f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.company_service import pagers from google.ads.admanager_v1.types import ( @@ -84,9 +84,7 @@ class CompanyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CompanyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CompanyServiceTransport]] _transport_registry["rest"] = CompanyServiceRestTransport def get_transport_class( @@ -689,11 +687,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CompanyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CompanyServiceClient._read_environment_variables() + ) self._client_cert_source = CompanyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -728,8 +724,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CompanyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/pagers.py index 91ba86c1c532..b926a659fd41 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/base.py index bd8405b8a7b5..6c52bec87938 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import company_messages, company_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/rest.py index 7938aa979aa4..2541be08436d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/company_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/client.py index 34d02e9056c3..47fa8c2bf3ec 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.contact_service import pagers from google.ads.admanager_v1.types import ( @@ -83,9 +83,7 @@ class ContactServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContactServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContactServiceTransport]] _transport_registry["rest"] = ContactServiceRestTransport def get_transport_class( @@ -654,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContactServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContactServiceClient._read_environment_variables() + ) self._client_cert_source = ContactServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -693,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContactServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/pagers.py index 900bdb93c0b5..832124a8b028 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/base.py index 610c710d3c34..b12f5ec0224e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import contact_messages, contact_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/rest.py index 8ea86924104b..411f40a746ed 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/contact_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -594,9 +594,7 @@ def __call__( Response object for ``BatchCreateContacts`` method. """ - http_options = ( - _BaseContactServiceRestTransport._BaseBatchCreateContacts._get_http_options() - ) + http_options = _BaseContactServiceRestTransport._BaseBatchCreateContacts._get_http_options() request, metadata = self._interceptor.pre_batch_create_contacts( request, metadata @@ -749,9 +747,7 @@ def __call__( Response object for ``BatchUpdateContacts`` method. """ - http_options = ( - _BaseContactServiceRestTransport._BaseBatchUpdateContacts._get_http_options() - ) + http_options = _BaseContactServiceRestTransport._BaseBatchUpdateContacts._get_http_options() request, metadata = self._interceptor.pre_batch_update_contacts( request, metadata diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/client.py index 0002dd41b0a8..baf43d2ab53d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class ContentBundleServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContentBundleServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContentBundleServiceTransport]] _transport_registry["rest"] = ContentBundleServiceRestTransport def get_transport_class( @@ -638,11 +636,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContentBundleServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContentBundleServiceClient._read_environment_variables() + ) self._client_cert_source = ContentBundleServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +673,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContentBundleServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/pagers.py index c010507bcda3..2adf8af36566 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/__init__.py index 435b5c1001f5..1533486b6998 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ContentBundleServiceRestInterceptor, ContentBundleServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ContentBundleServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ContentBundleServiceTransport]] _transport_registry["rest"] = ContentBundleServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/base.py index ebee2c64eb30..65333bb2a392 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/rest.py index 05cfaf157cbe..aad63c04ffbc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_bundle_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -377,9 +377,7 @@ def __call__( """ - http_options = ( - _BaseContentBundleServiceRestTransport._BaseGetContentBundle._get_http_options() - ) + http_options = _BaseContentBundleServiceRestTransport._BaseGetContentBundle._get_http_options() request, metadata = self._interceptor.pre_get_content_bundle( request, metadata @@ -530,9 +528,7 @@ def __call__( """ - http_options = ( - _BaseContentBundleServiceRestTransport._BaseListContentBundles._get_http_options() - ) + http_options = _BaseContentBundleServiceRestTransport._BaseListContentBundles._get_http_options() request, metadata = self._interceptor.pre_list_content_bundles( request, metadata @@ -708,9 +704,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseContentBundleServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseContentBundleServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseContentBundleServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/client.py index 93654e9ed830..6e1af6c11bb3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class ContentLabelServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContentLabelServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContentLabelServiceTransport]] _transport_registry["rest"] = ContentLabelServiceRestTransport def get_transport_class( @@ -635,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContentLabelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContentLabelServiceClient._read_environment_variables() + ) self._client_cert_source = ContentLabelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContentLabelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/pagers.py index 31f5522bc145..5b74fed627e4 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/__init__.py index b14b83ab13da..f8e096c74fa4 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ContentLabelServiceRestInterceptor, ContentLabelServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ContentLabelServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ContentLabelServiceTransport]] _transport_registry["rest"] = ContentLabelServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/base.py index 954287f12698..001c8d304e88 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import content_label_messages, content_label_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/rest.py index 09ed6137106b..e04874b0b718 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_label_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -366,9 +366,7 @@ def __call__( A content label. """ - http_options = ( - _BaseContentLabelServiceRestTransport._BaseGetContentLabel._get_http_options() - ) + http_options = _BaseContentLabelServiceRestTransport._BaseGetContentLabel._get_http_options() request, metadata = self._interceptor.pre_get_content_label( request, metadata @@ -517,9 +515,7 @@ def __call__( """ - http_options = ( - _BaseContentLabelServiceRestTransport._BaseListContentLabels._get_http_options() - ) + http_options = _BaseContentLabelServiceRestTransport._BaseListContentLabels._get_http_options() request, metadata = self._interceptor.pre_list_content_labels( request, metadata @@ -695,9 +691,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseContentLabelServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseContentLabelServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseContentLabelServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/client.py index a74694a64c32..9c4686798997 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class ContentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContentServiceTransport]] _transport_registry["rest"] = ContentServiceRestTransport def get_transport_class( @@ -628,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContentServiceClient._read_environment_variables() + ) self._client_cert_source = ContentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/pagers.py index cc1feb6bb787..bf4cf1359012 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/base.py index 66b40f930556..5ece053dc174 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import content_messages, content_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/rest.py index 8cb123fa350f..ae6fcbd7c6f2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/content_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/client.py index cb145f88b0af..13c2c5d09e9c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class CreativeTemplateServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CreativeTemplateServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CreativeTemplateServiceTransport]] _transport_registry["rest"] = CreativeTemplateServiceRestTransport def get_transport_class( @@ -641,11 +639,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CreativeTemplateServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CreativeTemplateServiceClient._read_environment_variables() + ) self._client_cert_source = ( CreativeTemplateServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -682,8 +678,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CreativeTemplateServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/pagers.py index 4ec78308875f..3e66404e2b0a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/__init__.py index 760dd54dd935..0390751e27db 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CreativeTemplateServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CreativeTemplateServiceTransport]] _transport_registry["rest"] = CreativeTemplateServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/base.py index abd950b74d8c..056e0c6caa23 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/rest.py index 22b568cbabf4..d168804fde63 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/creative_template_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -372,9 +372,7 @@ def __call__( """ - http_options = ( - _BaseCreativeTemplateServiceRestTransport._BaseGetCreativeTemplate._get_http_options() - ) + http_options = _BaseCreativeTemplateServiceRestTransport._BaseGetCreativeTemplate._get_http_options() request, metadata = self._interceptor.pre_get_creative_template( request, metadata @@ -525,9 +523,7 @@ def __call__( """ - http_options = ( - _BaseCreativeTemplateServiceRestTransport._BaseListCreativeTemplates._get_http_options() - ) + http_options = _BaseCreativeTemplateServiceRestTransport._BaseListCreativeTemplates._get_http_options() request, metadata = self._interceptor.pre_list_creative_templates( request, metadata @@ -701,9 +697,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCreativeTemplateServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCreativeTemplateServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCreativeTemplateServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/client.py index 58359bef085b..23aab254162b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.custom_field_service import pagers from google.ads.admanager_v1.types import ( @@ -83,9 +83,7 @@ class CustomFieldServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CustomFieldServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CustomFieldServiceTransport]] _transport_registry["rest"] = CustomFieldServiceRestTransport def get_transport_class( @@ -639,11 +637,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CustomFieldServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CustomFieldServiceClient._read_environment_variables() + ) self._client_cert_source = CustomFieldServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -678,8 +674,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CustomFieldServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/pagers.py index 3052d8dadcb9..6054e24f17d0 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/__init__.py index c4ee1d8975f5..1cb5c79ffe64 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import CustomFieldServiceRestInterceptor, CustomFieldServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CustomFieldServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CustomFieldServiceTransport]] _transport_registry["rest"] = CustomFieldServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/base.py index 61f90b2d3e25..cd7d6a072413 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import custom_field_messages, custom_field_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/rest.py index 4b567d05e8e3..2a4e4ccf071a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_field_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -729,9 +729,7 @@ def __call__( """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseBatchActivateCustomFields._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseBatchActivateCustomFields._get_http_options() request, metadata = self._interceptor.pre_batch_activate_custom_fields( request, metadata @@ -887,9 +885,7 @@ def __call__( Response object for ``BatchCreateCustomFields`` method. """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseBatchCreateCustomFields._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseBatchCreateCustomFields._get_http_options() request, metadata = self._interceptor.pre_batch_create_custom_fields( request, metadata @@ -1050,9 +1046,7 @@ def __call__( """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseBatchDeactivateCustomFields._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseBatchDeactivateCustomFields._get_http_options() request, metadata = self._interceptor.pre_batch_deactivate_custom_fields( request, metadata @@ -1121,11 +1115,10 @@ def __call__( resp = self._interceptor.post_batch_deactivate_custom_fields(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_deactivate_custom_fields_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_deactivate_custom_fields_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1209,9 +1202,7 @@ def __call__( Response object for ``BatchUpdateCustomFields`` method. """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseBatchUpdateCustomFields._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseBatchUpdateCustomFields._get_http_options() request, metadata = self._interceptor.pre_batch_update_custom_fields( request, metadata @@ -1370,9 +1361,7 @@ def __call__( """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseCreateCustomField._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseCreateCustomField._get_http_options() request, metadata = self._interceptor.pre_create_custom_field( request, metadata @@ -1526,9 +1515,7 @@ def __call__( """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseGetCustomField._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseGetCustomField._get_http_options() request, metadata = self._interceptor.pre_get_custom_field( request, metadata @@ -1677,9 +1664,7 @@ def __call__( """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseListCustomFields._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseListCustomFields._get_http_options() request, metadata = self._interceptor.pre_list_custom_fields( request, metadata @@ -1829,9 +1814,7 @@ def __call__( """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseUpdateCustomField._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseUpdateCustomField._get_http_options() request, metadata = self._interceptor.pre_update_custom_field( request, metadata @@ -1937,7 +1920,9 @@ def batch_activate_custom_fields( ]: # 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._BatchActivateCustomFields(self._session, self._host, self._interceptor) # type: ignore + return self._BatchActivateCustomFields( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_create_custom_fields( @@ -1948,7 +1933,9 @@ def batch_create_custom_fields( ]: # 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._BatchCreateCustomFields(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateCustomFields( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_deactivate_custom_fields( @@ -1959,7 +1946,9 @@ def batch_deactivate_custom_fields( ]: # 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._BatchDeactivateCustomFields(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeactivateCustomFields( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_custom_fields( @@ -1970,7 +1959,9 @@ def batch_update_custom_fields( ]: # 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._BatchUpdateCustomFields(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateCustomFields( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_custom_field( @@ -2073,9 +2064,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCustomFieldServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCustomFieldServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCustomFieldServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/client.py index 86ca935b9cc7..8bef80064aba 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.custom_targeting_key_service import pagers from google.ads.admanager_v1.types import ( @@ -83,9 +83,7 @@ class CustomTargetingKeyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CustomTargetingKeyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CustomTargetingKeyServiceTransport]] _transport_registry["rest"] = CustomTargetingKeyServiceRestTransport def get_transport_class( @@ -644,11 +642,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CustomTargetingKeyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CustomTargetingKeyServiceClient._read_environment_variables() + ) self._client_cert_source = ( CustomTargetingKeyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -685,8 +681,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CustomTargetingKeyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/pagers.py index 898de4765849..7b15fa0c6868 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/__init__.py index 7433408cca85..fbc0d2eac12a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CustomTargetingKeyServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CustomTargetingKeyServiceTransport]] _transport_registry["rest"] = CustomTargetingKeyServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/base.py index 6a226b68b199..4761253f6b5e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/rest.py index 7e2630b80eb3..a2a1800122dd 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_key_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -743,15 +743,12 @@ def __call__( """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseBatchActivateCustomTargetingKeys._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchActivateCustomTargetingKeys._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_batch_activate_custom_targeting_keys( - request, metadata + request, metadata = ( + self._interceptor.pre_batch_activate_custom_targeting_keys( + request, metadata + ) ) transcoded_request = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchActivateCustomTargetingKeys._get_transcoded_request( http_options, request @@ -821,11 +818,10 @@ def __call__( resp = self._interceptor.post_batch_activate_custom_targeting_keys(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_activate_custom_targeting_keys_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_activate_custom_targeting_keys_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -914,15 +910,12 @@ def __call__( """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseBatchCreateCustomTargetingKeys._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchCreateCustomTargetingKeys._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_batch_create_custom_targeting_keys( - request, metadata + request, metadata = ( + self._interceptor.pre_batch_create_custom_targeting_keys( + request, metadata + ) ) transcoded_request = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchCreateCustomTargetingKeys._get_transcoded_request( http_options, request @@ -992,11 +985,10 @@ def __call__( resp = self._interceptor.post_batch_create_custom_targeting_keys(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_create_custom_targeting_keys_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_create_custom_targeting_keys_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1085,15 +1077,12 @@ def __call__( """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseBatchDeactivateCustomTargetingKeys._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchDeactivateCustomTargetingKeys._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_batch_deactivate_custom_targeting_keys( - request, metadata + request, metadata = ( + self._interceptor.pre_batch_deactivate_custom_targeting_keys( + request, metadata + ) ) transcoded_request = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchDeactivateCustomTargetingKeys._get_transcoded_request( http_options, request @@ -1152,9 +1141,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - custom_targeting_key_service.BatchDeactivateCustomTargetingKeysResponse() - ) + resp = custom_targeting_key_service.BatchDeactivateCustomTargetingKeysResponse() pb_resp = custom_targeting_key_service.BatchDeactivateCustomTargetingKeysResponse.pb( resp ) @@ -1163,11 +1150,10 @@ def __call__( resp = self._interceptor.post_batch_deactivate_custom_targeting_keys(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_deactivate_custom_targeting_keys_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_deactivate_custom_targeting_keys_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1256,15 +1242,12 @@ def __call__( """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseBatchUpdateCustomTargetingKeys._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchUpdateCustomTargetingKeys._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_batch_update_custom_targeting_keys( - request, metadata + request, metadata = ( + self._interceptor.pre_batch_update_custom_targeting_keys( + request, metadata + ) ) transcoded_request = _BaseCustomTargetingKeyServiceRestTransport._BaseBatchUpdateCustomTargetingKeys._get_transcoded_request( http_options, request @@ -1334,11 +1317,10 @@ def __call__( resp = self._interceptor.post_batch_update_custom_targeting_keys(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_update_custom_targeting_keys_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_update_custom_targeting_keys_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1424,9 +1406,7 @@ def __call__( The ``CustomTargetingKey`` resource. """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseCreateCustomTargetingKey._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseCreateCustomTargetingKey._get_http_options() request, metadata = self._interceptor.pre_create_custom_targeting_key( request, metadata @@ -1580,9 +1560,7 @@ def __call__( The ``CustomTargetingKey`` resource. """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseGetCustomTargetingKey._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseGetCustomTargetingKey._get_http_options() request, metadata = self._interceptor.pre_get_custom_targeting_key( request, metadata @@ -1736,9 +1714,7 @@ def __call__( """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseListCustomTargetingKeys._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseListCustomTargetingKeys._get_http_options() request, metadata = self._interceptor.pre_list_custom_targeting_keys( request, metadata @@ -1891,9 +1867,7 @@ def __call__( The ``CustomTargetingKey`` resource. """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseUpdateCustomTargetingKey._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseUpdateCustomTargetingKey._get_http_options() request, metadata = self._interceptor.pre_update_custom_targeting_key( request, metadata @@ -2001,7 +1975,9 @@ def batch_activate_custom_targeting_keys( ]: # 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._BatchActivateCustomTargetingKeys(self._session, self._host, self._interceptor) # type: ignore + return self._BatchActivateCustomTargetingKeys( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_create_custom_targeting_keys( @@ -2012,7 +1988,9 @@ def batch_create_custom_targeting_keys( ]: # 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._BatchCreateCustomTargetingKeys(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateCustomTargetingKeys( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_deactivate_custom_targeting_keys( @@ -2023,7 +2001,9 @@ def batch_deactivate_custom_targeting_keys( ]: # 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._BatchDeactivateCustomTargetingKeys(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeactivateCustomTargetingKeys( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_custom_targeting_keys( @@ -2034,7 +2014,9 @@ def batch_update_custom_targeting_keys( ]: # 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._BatchUpdateCustomTargetingKeys(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateCustomTargetingKeys( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_custom_targeting_key( @@ -2045,7 +2027,9 @@ def create_custom_targeting_key( ]: # 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._CreateCustomTargetingKey(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCustomTargetingKey( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_custom_targeting_key( @@ -2067,7 +2051,9 @@ def list_custom_targeting_keys( ]: # 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._ListCustomTargetingKeys(self._session, self._host, self._interceptor) # type: ignore + return self._ListCustomTargetingKeys( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_custom_targeting_key( @@ -2078,7 +2064,9 @@ def update_custom_targeting_key( ]: # 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._UpdateCustomTargetingKey(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCustomTargetingKey( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -2138,9 +2126,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCustomTargetingKeyServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCustomTargetingKeyServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCustomTargetingKeyServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/client.py index 752e5311b0b7..eec17123836d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class CustomTargetingValueServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CustomTargetingValueServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CustomTargetingValueServiceTransport]] _transport_registry["rest"] = CustomTargetingValueServiceRestTransport def get_transport_class( @@ -665,11 +663,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CustomTargetingValueServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CustomTargetingValueServiceClient._read_environment_variables() + ) self._client_cert_source = ( CustomTargetingValueServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -706,8 +702,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CustomTargetingValueServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/pagers.py index 3ccae9afc101..565eb2bee6fd 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/__init__.py index d329984aab4b..50d73c506308 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CustomTargetingValueServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CustomTargetingValueServiceTransport]] _transport_registry["rest"] = CustomTargetingValueServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/base.py index 0cce7512aeed..1171c65cb703 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/rest.py index 32b7a4256f2e..bf5cae07c938 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/custom_targeting_value_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -375,9 +375,7 @@ def __call__( The ``CustomTargetingValue`` resource. """ - http_options = ( - _BaseCustomTargetingValueServiceRestTransport._BaseGetCustomTargetingValue._get_http_options() - ) + http_options = _BaseCustomTargetingValueServiceRestTransport._BaseGetCustomTargetingValue._get_http_options() request, metadata = self._interceptor.pre_get_custom_targeting_value( request, metadata @@ -531,9 +529,7 @@ def __call__( """ - http_options = ( - _BaseCustomTargetingValueServiceRestTransport._BaseListCustomTargetingValues._get_http_options() - ) + http_options = _BaseCustomTargetingValueServiceRestTransport._BaseListCustomTargetingValues._get_http_options() request, metadata = self._interceptor.pre_list_custom_targeting_values( request, metadata @@ -638,7 +634,9 @@ def get_custom_targeting_value( ]: # 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._GetCustomTargetingValue(self._session, self._host, self._interceptor) # type: ignore + return self._GetCustomTargetingValue( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_custom_targeting_values( @@ -649,7 +647,9 @@ def list_custom_targeting_values( ]: # 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._ListCustomTargetingValues(self._session, self._host, self._interceptor) # type: ignore + return self._ListCustomTargetingValues( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -709,9 +709,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCustomTargetingValueServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCustomTargetingValueServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCustomTargetingValueServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/client.py index 841dc47261dc..5dac58d5681f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class DeviceCapabilityServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DeviceCapabilityServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DeviceCapabilityServiceTransport]] _transport_registry["rest"] = DeviceCapabilityServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeviceCapabilityServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeviceCapabilityServiceClient._read_environment_variables() + ) self._client_cert_source = ( DeviceCapabilityServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -681,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeviceCapabilityServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/pagers.py index a69e874671aa..3494841b25f6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/__init__.py index 96cc6d3d9875..02d105a5935c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DeviceCapabilityServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DeviceCapabilityServiceTransport]] _transport_registry["rest"] = DeviceCapabilityServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/base.py index e9cc18fb6b4d..6173a69e7ed6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/rest.py index f5cd40b6d5f2..88dd94e252b1 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_capability_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -370,9 +370,7 @@ def __call__( Represents a device capability. """ - http_options = ( - _BaseDeviceCapabilityServiceRestTransport._BaseGetDeviceCapability._get_http_options() - ) + http_options = _BaseDeviceCapabilityServiceRestTransport._BaseGetDeviceCapability._get_http_options() request, metadata = self._interceptor.pre_get_device_capability( request, metadata @@ -523,9 +521,7 @@ def __call__( """ - http_options = ( - _BaseDeviceCapabilityServiceRestTransport._BaseListDeviceCapabilities._get_http_options() - ) + http_options = _BaseDeviceCapabilityServiceRestTransport._BaseListDeviceCapabilities._get_http_options() request, metadata = self._interceptor.pre_list_device_capabilities( request, metadata @@ -637,7 +633,9 @@ def list_device_capabilities( ]: # 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._ListDeviceCapabilities(self._session, self._host, self._interceptor) # type: ignore + return self._ListDeviceCapabilities( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -697,9 +695,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDeviceCapabilityServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDeviceCapabilityServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDeviceCapabilityServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/client.py index bed4de1a390e..920de19ba80c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class DeviceCategoryServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DeviceCategoryServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DeviceCategoryServiceTransport]] _transport_registry["rest"] = DeviceCategoryServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeviceCategoryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeviceCategoryServiceClient._read_environment_variables() + ) self._client_cert_source = DeviceCategoryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -679,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeviceCategoryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/pagers.py index 37c59e30b51c..04dc4c36b0a2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/__init__.py index d4566e32176f..d16dc5696da3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DeviceCategoryServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DeviceCategoryServiceTransport]] _transport_registry["rest"] = DeviceCategoryServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/base.py index e1325e0ca54b..7809286c3508 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/rest.py index 64d39fcc3fe7..a2e95d691c85 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_category_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -371,9 +371,7 @@ def __call__( """ - http_options = ( - _BaseDeviceCategoryServiceRestTransport._BaseGetDeviceCategory._get_http_options() - ) + http_options = _BaseDeviceCategoryServiceRestTransport._BaseGetDeviceCategory._get_http_options() request, metadata = self._interceptor.pre_get_device_category( request, metadata @@ -524,9 +522,7 @@ def __call__( """ - http_options = ( - _BaseDeviceCategoryServiceRestTransport._BaseListDeviceCategories._get_http_options() - ) + http_options = _BaseDeviceCategoryServiceRestTransport._BaseListDeviceCategories._get_http_options() request, metadata = self._interceptor.pre_list_device_categories( request, metadata @@ -702,9 +698,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDeviceCategoryServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDeviceCategoryServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDeviceCategoryServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/client.py index cdaa052132bf..be47ef9cb7f5 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class DeviceManufacturerServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DeviceManufacturerServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DeviceManufacturerServiceTransport]] _transport_registry["rest"] = DeviceManufacturerServiceRestTransport def get_transport_class( @@ -642,11 +640,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeviceManufacturerServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeviceManufacturerServiceClient._read_environment_variables() + ) self._client_cert_source = ( DeviceManufacturerServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -683,8 +679,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeviceManufacturerServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/pagers.py index 8350962d8ec0..a9ff7cc7ee46 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/__init__.py index de35fae566fd..90b0f8bdf00f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DeviceManufacturerServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DeviceManufacturerServiceTransport]] _transport_registry["rest"] = DeviceManufacturerServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/base.py index a5c3f5eaf527..de6aa6c097ce 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/rest.py index 825c4cd4522d..0eeb3a5bd708 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/device_manufacturer_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -372,9 +372,7 @@ def __call__( Represents a device manufacturer. """ - http_options = ( - _BaseDeviceManufacturerServiceRestTransport._BaseGetDeviceManufacturer._get_http_options() - ) + http_options = _BaseDeviceManufacturerServiceRestTransport._BaseGetDeviceManufacturer._get_http_options() request, metadata = self._interceptor.pre_get_device_manufacturer( request, metadata @@ -527,9 +525,7 @@ def __call__( """ - http_options = ( - _BaseDeviceManufacturerServiceRestTransport._BaseListDeviceManufacturers._get_http_options() - ) + http_options = _BaseDeviceManufacturerServiceRestTransport._BaseListDeviceManufacturers._get_http_options() request, metadata = self._interceptor.pre_list_device_manufacturers( request, metadata @@ -643,7 +639,9 @@ def list_device_manufacturers( ]: # 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._ListDeviceManufacturers(self._session, self._host, self._interceptor) # type: ignore + return self._ListDeviceManufacturers( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -703,9 +701,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDeviceManufacturerServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDeviceManufacturerServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDeviceManufacturerServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/client.py index 9ecea2acb74a..dd8a92913398 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.entity_signals_mapping_service import pagers from google.ads.admanager_v1.types import ( @@ -82,9 +82,7 @@ class EntitySignalsMappingServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EntitySignalsMappingServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EntitySignalsMappingServiceTransport]] _transport_registry["rest"] = EntitySignalsMappingServiceRestTransport def get_transport_class( @@ -643,11 +641,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EntitySignalsMappingServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EntitySignalsMappingServiceClient._read_environment_variables() + ) self._client_cert_source = ( EntitySignalsMappingServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -684,8 +680,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EntitySignalsMappingServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/pagers.py index 171272468ad3..e6057e7b7b2a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/__init__.py index a2ce2dea2ae8..6505476453ec 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EntitySignalsMappingServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EntitySignalsMappingServiceTransport]] _transport_registry["rest"] = EntitySignalsMappingServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/base.py index 9a8e51b5096e..06581914586f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/rest.py index 42f16c63eb96..cdf41abad502 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/entity_signals_mapping_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -621,15 +621,12 @@ def __call__( """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseBatchCreateEntitySignalsMappings._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseBatchCreateEntitySignalsMappings._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_batch_create_entity_signals_mappings( - request, metadata + request, metadata = ( + self._interceptor.pre_batch_create_entity_signals_mappings( + request, metadata + ) ) transcoded_request = _BaseEntitySignalsMappingServiceRestTransport._BaseBatchCreateEntitySignalsMappings._get_transcoded_request( http_options, request @@ -688,9 +685,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - entity_signals_mapping_service.BatchCreateEntitySignalsMappingsResponse() - ) + resp = entity_signals_mapping_service.BatchCreateEntitySignalsMappingsResponse() pb_resp = entity_signals_mapping_service.BatchCreateEntitySignalsMappingsResponse.pb( resp ) @@ -699,11 +694,10 @@ def __call__( resp = self._interceptor.post_batch_create_entity_signals_mappings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_create_entity_signals_mappings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_create_entity_signals_mappings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -792,15 +786,12 @@ def __call__( """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseBatchUpdateEntitySignalsMappings._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseBatchUpdateEntitySignalsMappings._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_batch_update_entity_signals_mappings( - request, metadata + request, metadata = ( + self._interceptor.pre_batch_update_entity_signals_mappings( + request, metadata + ) ) transcoded_request = _BaseEntitySignalsMappingServiceRestTransport._BaseBatchUpdateEntitySignalsMappings._get_transcoded_request( http_options, request @@ -859,9 +850,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - entity_signals_mapping_service.BatchUpdateEntitySignalsMappingsResponse() - ) + resp = entity_signals_mapping_service.BatchUpdateEntitySignalsMappingsResponse() pb_resp = entity_signals_mapping_service.BatchUpdateEntitySignalsMappingsResponse.pb( resp ) @@ -870,11 +859,10 @@ def __call__( resp = self._interceptor.post_batch_update_entity_signals_mappings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_update_entity_signals_mappings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_update_entity_signals_mappings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -961,9 +949,7 @@ def __call__( The ``EntitySignalsMapping`` resource. """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseCreateEntitySignalsMapping._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseCreateEntitySignalsMapping._get_http_options() request, metadata = self._interceptor.pre_create_entity_signals_mapping( request, metadata @@ -1032,11 +1018,10 @@ def __call__( resp = self._interceptor.post_create_entity_signals_mapping(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_entity_signals_mapping_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_entity_signals_mapping_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1123,9 +1108,7 @@ def __call__( The ``EntitySignalsMapping`` resource. """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseGetEntitySignalsMapping._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseGetEntitySignalsMapping._get_http_options() request, metadata = self._interceptor.pre_get_entity_signals_mapping( request, metadata @@ -1279,9 +1262,7 @@ def __call__( """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseListEntitySignalsMappings._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseListEntitySignalsMappings._get_http_options() request, metadata = self._interceptor.pre_list_entity_signals_mappings( request, metadata @@ -1437,9 +1418,7 @@ def __call__( The ``EntitySignalsMapping`` resource. """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseUpdateEntitySignalsMapping._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseUpdateEntitySignalsMapping._get_http_options() request, metadata = self._interceptor.pre_update_entity_signals_mapping( request, metadata @@ -1508,11 +1487,10 @@ def __call__( resp = self._interceptor.post_update_entity_signals_mapping(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_entity_signals_mapping_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_entity_signals_mapping_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1550,7 +1528,9 @@ def batch_create_entity_signals_mappings( ]: # 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._BatchCreateEntitySignalsMappings(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateEntitySignalsMappings( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_entity_signals_mappings( @@ -1561,7 +1541,9 @@ def batch_update_entity_signals_mappings( ]: # 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._BatchUpdateEntitySignalsMappings(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateEntitySignalsMappings( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_entity_signals_mapping( @@ -1572,7 +1554,9 @@ def create_entity_signals_mapping( ]: # 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._CreateEntitySignalsMapping(self._session, self._host, self._interceptor) # type: ignore + return self._CreateEntitySignalsMapping( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_entity_signals_mapping( @@ -1583,7 +1567,9 @@ def get_entity_signals_mapping( ]: # 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._GetEntitySignalsMapping(self._session, self._host, self._interceptor) # type: ignore + return self._GetEntitySignalsMapping( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_entity_signals_mappings( @@ -1594,7 +1580,9 @@ def list_entity_signals_mappings( ]: # 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._ListEntitySignalsMappings(self._session, self._host, self._interceptor) # type: ignore + return self._ListEntitySignalsMappings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_entity_signals_mapping( @@ -1605,7 +1593,9 @@ def update_entity_signals_mapping( ]: # 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._UpdateEntitySignalsMapping(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateEntitySignalsMapping( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -1665,9 +1655,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEntitySignalsMappingServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEntitySignalsMappingServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEntitySignalsMappingServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/client.py index 8b241c8f7dc8..0c1165777d5b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class GeoTargetServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GeoTargetServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GeoTargetServiceTransport]] _transport_registry["rest"] = GeoTargetServiceRestTransport def get_transport_class( @@ -632,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeoTargetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeoTargetServiceClient._read_environment_variables() + ) self._client_cert_source = GeoTargetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -671,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeoTargetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/pagers.py index 5a337140ee62..250c1f7434e9 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/base.py index 3094a520dc48..9c97fefd085a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import geo_target_messages, geo_target_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/rest.py index defcd3fb3e92..9e05825b9f05 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/geo_target_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -510,9 +510,7 @@ def __call__( """ - http_options = ( - _BaseGeoTargetServiceRestTransport._BaseListGeoTargets._get_http_options() - ) + http_options = _BaseGeoTargetServiceRestTransport._BaseListGeoTargets._get_http_options() request, metadata = self._interceptor.pre_list_geo_targets( request, metadata diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/client.py index 6fc7e6e2e9a0..bcc7a3bd7201 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore from google.ads.admanager_v1.services.line_item_service import pagers from google.ads.admanager_v1.types import ( @@ -86,9 +86,7 @@ class LineItemServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LineItemServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LineItemServiceTransport]] _transport_registry["rest"] = LineItemServiceRestTransport def get_transport_class( @@ -676,11 +674,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LineItemServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LineItemServiceClient._read_environment_variables() + ) self._client_cert_source = LineItemServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -715,8 +711,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LineItemServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/pagers.py index 2974bf2d4fab..09167d3cabc5 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/base.py index 2f7336f0d603..09418cbc310b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import line_item_messages, line_item_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/rest.py index 0418b69597d1..770d5a716b22 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/line_item_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/client.py index fead9735f6aa..8b531473dc60 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class MobileCarrierServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MobileCarrierServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MobileCarrierServiceTransport]] _transport_registry["rest"] = MobileCarrierServiceRestTransport def get_transport_class( @@ -638,11 +636,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MobileCarrierServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MobileCarrierServiceClient._read_environment_variables() + ) self._client_cert_source = MobileCarrierServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +673,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MobileCarrierServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/pagers.py index 1e2c65ccb757..93c62d9db96c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/__init__.py index 544e6e3e623d..d609344d00c7 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import MobileCarrierServiceRestInterceptor, MobileCarrierServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[MobileCarrierServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[MobileCarrierServiceTransport]] _transport_registry["rest"] = MobileCarrierServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/base.py index 916c3fcc14d4..64593884db9f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/rest.py index 47e7bd49560f..0d2f8727ea5a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_carrier_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -369,9 +369,7 @@ def __call__( Represents a mobile carrier. """ - http_options = ( - _BaseMobileCarrierServiceRestTransport._BaseGetMobileCarrier._get_http_options() - ) + http_options = _BaseMobileCarrierServiceRestTransport._BaseGetMobileCarrier._get_http_options() request, metadata = self._interceptor.pre_get_mobile_carrier( request, metadata @@ -522,9 +520,7 @@ def __call__( """ - http_options = ( - _BaseMobileCarrierServiceRestTransport._BaseListMobileCarriers._get_http_options() - ) + http_options = _BaseMobileCarrierServiceRestTransport._BaseListMobileCarriers._get_http_options() request, metadata = self._interceptor.pre_list_mobile_carriers( request, metadata @@ -700,9 +696,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseMobileCarrierServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseMobileCarrierServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseMobileCarrierServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/client.py index e9326937dd41..a15f15a6bf30 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class MobileDeviceServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MobileDeviceServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MobileDeviceServiceTransport]] _transport_registry["rest"] = MobileDeviceServiceRestTransport def get_transport_class( @@ -657,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MobileDeviceServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MobileDeviceServiceClient._read_environment_variables() + ) self._client_cert_source = MobileDeviceServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MobileDeviceServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/pagers.py index ab6a4cfa93ab..50278d57efd0 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/__init__.py index b01a56ca24a4..823a5bb989cc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import MobileDeviceServiceRestInterceptor, MobileDeviceServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[MobileDeviceServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[MobileDeviceServiceTransport]] _transport_registry["rest"] = MobileDeviceServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/base.py index a2f2316aa1bd..05d7769190cc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import mobile_device_messages, mobile_device_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/rest.py index 04da8951ea26..64d13eefecf1 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -366,9 +366,7 @@ def __call__( Represents a mobile device. """ - http_options = ( - _BaseMobileDeviceServiceRestTransport._BaseGetMobileDevice._get_http_options() - ) + http_options = _BaseMobileDeviceServiceRestTransport._BaseGetMobileDevice._get_http_options() request, metadata = self._interceptor.pre_get_mobile_device( request, metadata @@ -517,9 +515,7 @@ def __call__( """ - http_options = ( - _BaseMobileDeviceServiceRestTransport._BaseListMobileDevices._get_http_options() - ) + http_options = _BaseMobileDeviceServiceRestTransport._BaseListMobileDevices._get_http_options() request, metadata = self._interceptor.pre_list_mobile_devices( request, metadata @@ -695,9 +691,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseMobileDeviceServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseMobileDeviceServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseMobileDeviceServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/client.py index 508646652609..7bba8bf9620e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class MobileDeviceSubmodelServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MobileDeviceSubmodelServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MobileDeviceSubmodelServiceTransport]] _transport_registry["rest"] = MobileDeviceSubmodelServiceRestTransport def get_transport_class( @@ -662,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MobileDeviceSubmodelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MobileDeviceSubmodelServiceClient._read_environment_variables() + ) self._client_cert_source = ( MobileDeviceSubmodelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -703,8 +699,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MobileDeviceSubmodelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/pagers.py index 5f3b655437c1..66b2635e32aa 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/__init__.py index 14eed448f6dd..d7d2b93cff5d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[MobileDeviceSubmodelServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[MobileDeviceSubmodelServiceTransport]] _transport_registry["rest"] = MobileDeviceSubmodelServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/base.py index eb74a85fe720..127b7ed67ab7 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/rest.py index a5e16dbe9bce..309d2b5038c2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/mobile_device_submodel_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -375,9 +375,7 @@ def __call__( Represents a mobile device submodel. """ - http_options = ( - _BaseMobileDeviceSubmodelServiceRestTransport._BaseGetMobileDeviceSubmodel._get_http_options() - ) + http_options = _BaseMobileDeviceSubmodelServiceRestTransport._BaseGetMobileDeviceSubmodel._get_http_options() request, metadata = self._interceptor.pre_get_mobile_device_submodel( request, metadata @@ -531,9 +529,7 @@ def __call__( """ - http_options = ( - _BaseMobileDeviceSubmodelServiceRestTransport._BaseListMobileDeviceSubmodels._get_http_options() - ) + http_options = _BaseMobileDeviceSubmodelServiceRestTransport._BaseListMobileDeviceSubmodels._get_http_options() request, metadata = self._interceptor.pre_list_mobile_device_submodels( request, metadata @@ -638,7 +634,9 @@ def get_mobile_device_submodel( ]: # 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._GetMobileDeviceSubmodel(self._session, self._host, self._interceptor) # type: ignore + return self._GetMobileDeviceSubmodel( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_mobile_device_submodels( @@ -649,7 +647,9 @@ def list_mobile_device_submodels( ]: # 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._ListMobileDeviceSubmodels(self._session, self._host, self._interceptor) # type: ignore + return self._ListMobileDeviceSubmodels( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -709,9 +709,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseMobileDeviceSubmodelServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseMobileDeviceSubmodelServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseMobileDeviceSubmodelServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/client.py index 5a202e187fe6..f9cfc6a97834 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class NetworkServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkServiceTransport]] _transport_registry["rest"] = NetworkServiceRestTransport def get_transport_class( @@ -628,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkServiceClient._read_environment_variables() + ) self._client_cert_source = NetworkServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/pagers.py index d2f6f9ac2c81..bfc626b6837d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/base.py index 37a533bcb399..769ddd77fb18 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import network_messages, network_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/rest.py index 738cf7c4cf2c..2e3fe5b080e5 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/network_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/client.py index ff5a417ed399..e4d4d148520e 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class OperatingSystemServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OperatingSystemServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OperatingSystemServiceTransport]] _transport_registry["rest"] = OperatingSystemServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OperatingSystemServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OperatingSystemServiceClient._read_environment_variables() + ) self._client_cert_source = OperatingSystemServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -679,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OperatingSystemServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/pagers.py index 952dbf48f68c..dc27f6d1f1de 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/__init__.py index 320902eb5eaa..761697f492ec 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OperatingSystemServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OperatingSystemServiceTransport]] _transport_registry["rest"] = OperatingSystemServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/base.py index 540beae9d436..85b2c3deaa50 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/rest.py index c06b27340a3b..486ec21b3272 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -372,9 +372,7 @@ def __call__( """ - http_options = ( - _BaseOperatingSystemServiceRestTransport._BaseGetOperatingSystem._get_http_options() - ) + http_options = _BaseOperatingSystemServiceRestTransport._BaseGetOperatingSystem._get_http_options() request, metadata = self._interceptor.pre_get_operating_system( request, metadata @@ -525,9 +523,7 @@ def __call__( """ - http_options = ( - _BaseOperatingSystemServiceRestTransport._BaseListOperatingSystems._get_http_options() - ) + http_options = _BaseOperatingSystemServiceRestTransport._BaseListOperatingSystems._get_http_options() request, metadata = self._interceptor.pre_list_operating_systems( request, metadata @@ -703,9 +699,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseOperatingSystemServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseOperatingSystemServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseOperatingSystemServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/client.py index f7e8cc6beb56..68e5626177c6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class OperatingSystemVersionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OperatingSystemVersionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OperatingSystemVersionServiceTransport]] _transport_registry["rest"] = OperatingSystemVersionServiceRestTransport def get_transport_class( @@ -646,11 +644,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OperatingSystemVersionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OperatingSystemVersionServiceClient._read_environment_variables() + ) self._client_cert_source = ( OperatingSystemVersionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -691,8 +687,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OperatingSystemVersionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/pagers.py index 88e371f5d87f..e283158de02c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/__init__.py index e86e270fa10d..ab371b34e078 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OperatingSystemVersionServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OperatingSystemVersionServiceTransport]] _transport_registry["rest"] = OperatingSystemVersionServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/base.py index 418158eb9b8c..1692e88fbf9f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/rest.py index 23edfc6975ed..c7dbd5f9c529 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/operating_system_version_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -380,9 +380,7 @@ def __call__( """ - http_options = ( - _BaseOperatingSystemVersionServiceRestTransport._BaseGetOperatingSystemVersion._get_http_options() - ) + http_options = _BaseOperatingSystemVersionServiceRestTransport._BaseGetOperatingSystemVersion._get_http_options() request, metadata = self._interceptor.pre_get_operating_system_version( request, metadata @@ -536,9 +534,7 @@ def __call__( """ - http_options = ( - _BaseOperatingSystemVersionServiceRestTransport._BaseListOperatingSystemVersions._get_http_options() - ) + http_options = _BaseOperatingSystemVersionServiceRestTransport._BaseListOperatingSystemVersions._get_http_options() request, metadata = self._interceptor.pre_list_operating_system_versions( request, metadata @@ -608,11 +604,10 @@ def __call__( resp = self._interceptor.post_list_operating_system_versions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_operating_system_versions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_operating_system_versions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -648,7 +643,9 @@ def get_operating_system_version( ]: # 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._GetOperatingSystemVersion(self._session, self._host, self._interceptor) # type: ignore + return self._GetOperatingSystemVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_operating_system_versions( @@ -659,7 +656,9 @@ def list_operating_system_versions( ]: # 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._ListOperatingSystemVersions(self._session, self._host, self._interceptor) # type: ignore + return self._ListOperatingSystemVersions( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -719,9 +718,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseOperatingSystemVersionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseOperatingSystemVersionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseOperatingSystemVersionServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/client.py index a904acf32f1c..62a0142aab7c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.order_service import pagers from google.ads.admanager_v1.types import ( @@ -741,11 +741,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OrderServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OrderServiceClient._read_environment_variables() + ) self._client_cert_source = OrderServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -780,8 +778,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OrderServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/pagers.py index 60a8d182a397..e39347ca767a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/base.py index d860c4065617..8fe8014579d2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import order_messages, order_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/rest.py index 5e735d8d71f8..db92845e7713 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/order_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/client.py index 7d1bea65523b..94720a2e9545 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.placement_service import pagers from google.ads.admanager_v1.types import ( @@ -84,9 +84,7 @@ class PlacementServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PlacementServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PlacementServiceTransport]] _transport_registry["rest"] = PlacementServiceRestTransport def get_transport_class( @@ -655,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PlacementServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PlacementServiceClient._read_environment_variables() + ) self._client_cert_source = PlacementServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PlacementServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/pagers.py index 1a62376a2c77..00b15804855f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/base.py index bc8be2e7b0fd..7b43eb46372c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import placement_messages, placement_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/rest.py index 66f812e66d80..117a885ccc99 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/placement_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -777,9 +777,7 @@ def __call__( Response object for ``BatchActivatePlacements`` method. """ - http_options = ( - _BasePlacementServiceRestTransport._BaseBatchActivatePlacements._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseBatchActivatePlacements._get_http_options() request, metadata = self._interceptor.pre_batch_activate_placements( request, metadata @@ -936,9 +934,7 @@ def __call__( Response object for ``BatchArchivePlacements`` method. """ - http_options = ( - _BasePlacementServiceRestTransport._BaseBatchArchivePlacements._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseBatchArchivePlacements._get_http_options() request, metadata = self._interceptor.pre_batch_archive_placements( request, metadata @@ -1095,9 +1091,7 @@ def __call__( Response object for ``BatchCreatePlacements`` method. """ - http_options = ( - _BasePlacementServiceRestTransport._BaseBatchCreatePlacements._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseBatchCreatePlacements._get_http_options() request, metadata = self._interceptor.pre_batch_create_placements( request, metadata @@ -1258,9 +1252,7 @@ def __call__( """ - http_options = ( - _BasePlacementServiceRestTransport._BaseBatchDeactivatePlacements._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseBatchDeactivatePlacements._get_http_options() request, metadata = self._interceptor.pre_batch_deactivate_placements( request, metadata @@ -1417,9 +1409,7 @@ def __call__( Response object for ``BatchUpdatePlacements`` method. """ - http_options = ( - _BasePlacementServiceRestTransport._BaseBatchUpdatePlacements._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseBatchUpdatePlacements._get_http_options() request, metadata = self._interceptor.pre_batch_update_placements( request, metadata @@ -1576,9 +1566,7 @@ def __call__( The ``Placement`` resource. """ - http_options = ( - _BasePlacementServiceRestTransport._BaseCreatePlacement._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseCreatePlacement._get_http_options() request, metadata = self._interceptor.pre_create_placement( request, metadata @@ -1873,9 +1861,7 @@ def __call__( """ - http_options = ( - _BasePlacementServiceRestTransport._BaseListPlacements._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseListPlacements._get_http_options() request, metadata = self._interceptor.pre_list_placements(request, metadata) transcoded_request = _BasePlacementServiceRestTransport._BaseListPlacements._get_transcoded_request( @@ -2021,9 +2007,7 @@ def __call__( The ``Placement`` resource. """ - http_options = ( - _BasePlacementServiceRestTransport._BaseUpdatePlacement._get_http_options() - ) + http_options = _BasePlacementServiceRestTransport._BaseUpdatePlacement._get_http_options() request, metadata = self._interceptor.pre_update_placement( request, metadata @@ -2127,7 +2111,9 @@ def batch_activate_placements( ]: # 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._BatchActivatePlacements(self._session, self._host, self._interceptor) # type: ignore + return self._BatchActivatePlacements( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_archive_placements( @@ -2138,7 +2124,9 @@ def batch_archive_placements( ]: # 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._BatchArchivePlacements(self._session, self._host, self._interceptor) # type: ignore + return self._BatchArchivePlacements( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_create_placements( @@ -2160,7 +2148,9 @@ def batch_deactivate_placements( ]: # 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._BatchDeactivatePlacements(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeactivatePlacements( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_placements( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/client.py index 70b02ce8654f..9e117fd86d2b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore from google.ads.admanager_v1.services.private_auction_deal_service import pagers from google.ads.admanager_v1.types import ( @@ -88,9 +88,7 @@ class PrivateAuctionDealServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PrivateAuctionDealServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PrivateAuctionDealServiceTransport]] _transport_registry["rest"] = PrivateAuctionDealServiceRestTransport def get_transport_class( @@ -1063,11 +1061,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PrivateAuctionDealServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PrivateAuctionDealServiceClient._read_environment_variables() + ) self._client_cert_source = ( PrivateAuctionDealServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -1104,8 +1100,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PrivateAuctionDealServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/pagers.py index 542239dc9eae..d27ac1773697 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/__init__.py index c02ba6caa52d..2d6c70d00393 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PrivateAuctionDealServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PrivateAuctionDealServiceTransport]] _transport_registry["rest"] = PrivateAuctionDealServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/base.py index ba6d70aee264..03e871c09c3d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/rest.py index 3f855c0dae98..64c41a68cb79 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_deal_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -496,9 +496,7 @@ def __call__( The ``PrivateAuctionDeal`` resource. """ - http_options = ( - _BasePrivateAuctionDealServiceRestTransport._BaseCreatePrivateAuctionDeal._get_http_options() - ) + http_options = _BasePrivateAuctionDealServiceRestTransport._BaseCreatePrivateAuctionDeal._get_http_options() request, metadata = self._interceptor.pre_create_private_auction_deal( request, metadata @@ -652,9 +650,7 @@ def __call__( The ``PrivateAuctionDeal`` resource. """ - http_options = ( - _BasePrivateAuctionDealServiceRestTransport._BaseGetPrivateAuctionDeal._get_http_options() - ) + http_options = _BasePrivateAuctionDealServiceRestTransport._BaseGetPrivateAuctionDeal._get_http_options() request, metadata = self._interceptor.pre_get_private_auction_deal( request, metadata @@ -808,9 +804,7 @@ def __call__( """ - http_options = ( - _BasePrivateAuctionDealServiceRestTransport._BaseListPrivateAuctionDeals._get_http_options() - ) + http_options = _BasePrivateAuctionDealServiceRestTransport._BaseListPrivateAuctionDeals._get_http_options() request, metadata = self._interceptor.pre_list_private_auction_deals( request, metadata @@ -963,9 +957,7 @@ def __call__( The ``PrivateAuctionDeal`` resource. """ - http_options = ( - _BasePrivateAuctionDealServiceRestTransport._BaseUpdatePrivateAuctionDeal._get_http_options() - ) + http_options = _BasePrivateAuctionDealServiceRestTransport._BaseUpdatePrivateAuctionDeal._get_http_options() request, metadata = self._interceptor.pre_update_private_auction_deal( request, metadata @@ -1073,7 +1065,9 @@ def create_private_auction_deal( ]: # 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._CreatePrivateAuctionDeal(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePrivateAuctionDeal( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_private_auction_deal( @@ -1095,7 +1089,9 @@ def list_private_auction_deals( ]: # 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._ListPrivateAuctionDeals(self._session, self._host, self._interceptor) # type: ignore + return self._ListPrivateAuctionDeals( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_private_auction_deal( @@ -1106,7 +1102,9 @@ def update_private_auction_deal( ]: # 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._UpdatePrivateAuctionDeal(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePrivateAuctionDeal( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -1166,9 +1164,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePrivateAuctionDealServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePrivateAuctionDealServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePrivateAuctionDealServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/client.py index e578dc366ce4..89216c65ae55 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.private_auction_service import pagers from google.ads.admanager_v1.types import ( @@ -83,9 +83,7 @@ class PrivateAuctionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PrivateAuctionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PrivateAuctionServiceTransport]] _transport_registry["rest"] = PrivateAuctionServiceRestTransport def get_transport_class( @@ -659,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PrivateAuctionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PrivateAuctionServiceClient._read_environment_variables() + ) self._client_cert_source = PrivateAuctionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -698,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PrivateAuctionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/pagers.py index f363c3017f6b..0e91098181ee 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/__init__.py index 84f5afae6bbc..9ea1bd1380a2 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PrivateAuctionServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PrivateAuctionServiceTransport]] _transport_registry["rest"] = PrivateAuctionServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/base.py index f20c4f75c638..e90d84efa450 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/rest.py index 03d1be5b00cc..9db728615a4c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/private_auction_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -488,9 +488,7 @@ def __call__( The ``PrivateAuction`` resource. """ - http_options = ( - _BasePrivateAuctionServiceRestTransport._BaseCreatePrivateAuction._get_http_options() - ) + http_options = _BasePrivateAuctionServiceRestTransport._BaseCreatePrivateAuction._get_http_options() request, metadata = self._interceptor.pre_create_private_auction( request, metadata @@ -644,9 +642,7 @@ def __call__( The ``PrivateAuction`` resource. """ - http_options = ( - _BasePrivateAuctionServiceRestTransport._BaseGetPrivateAuction._get_http_options() - ) + http_options = _BasePrivateAuctionServiceRestTransport._BaseGetPrivateAuction._get_http_options() request, metadata = self._interceptor.pre_get_private_auction( request, metadata @@ -797,9 +793,7 @@ def __call__( """ - http_options = ( - _BasePrivateAuctionServiceRestTransport._BaseListPrivateAuctions._get_http_options() - ) + http_options = _BasePrivateAuctionServiceRestTransport._BaseListPrivateAuctions._get_http_options() request, metadata = self._interceptor.pre_list_private_auctions( request, metadata @@ -951,9 +945,7 @@ def __call__( The ``PrivateAuction`` resource. """ - http_options = ( - _BasePrivateAuctionServiceRestTransport._BaseUpdatePrivateAuction._get_http_options() - ) + http_options = _BasePrivateAuctionServiceRestTransport._BaseUpdatePrivateAuction._get_http_options() request, metadata = self._interceptor.pre_update_private_auction( request, metadata @@ -1154,9 +1146,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePrivateAuctionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePrivateAuctionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePrivateAuctionServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/client.py index 153f15d1cc82..b8012b83bcff 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class ProgrammaticBuyerServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ProgrammaticBuyerServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ProgrammaticBuyerServiceTransport]] _transport_registry["rest"] = ProgrammaticBuyerServiceRestTransport def get_transport_class( @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProgrammaticBuyerServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProgrammaticBuyerServiceClient._read_environment_variables() + ) self._client_cert_source = ( ProgrammaticBuyerServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -681,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProgrammaticBuyerServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/pagers.py index 40844d5ebe50..c33e9e83f4bc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/__init__.py index c21930623d4e..d091304cbac5 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ProgrammaticBuyerServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ProgrammaticBuyerServiceTransport]] _transport_registry["rest"] = ProgrammaticBuyerServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/base.py index 0a997490eb0f..7a741064fec7 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/rest.py index 76055ab6e4ae..a1fdd5bf449a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/programmatic_buyer_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -370,9 +370,7 @@ def __call__( Represents a programmatic buyer. """ - http_options = ( - _BaseProgrammaticBuyerServiceRestTransport._BaseGetProgrammaticBuyer._get_http_options() - ) + http_options = _BaseProgrammaticBuyerServiceRestTransport._BaseGetProgrammaticBuyer._get_http_options() request, metadata = self._interceptor.pre_get_programmatic_buyer( request, metadata @@ -521,9 +519,7 @@ def __call__( """ - http_options = ( - _BaseProgrammaticBuyerServiceRestTransport._BaseListProgrammaticBuyers._get_http_options() - ) + http_options = _BaseProgrammaticBuyerServiceRestTransport._BaseListProgrammaticBuyers._get_http_options() request, metadata = self._interceptor.pre_list_programmatic_buyers( request, metadata @@ -635,7 +631,9 @@ def list_programmatic_buyers( ]: # 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._ListProgrammaticBuyers(self._session, self._host, self._interceptor) # type: ignore + return self._ListProgrammaticBuyers( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -695,9 +693,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseProgrammaticBuyerServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseProgrammaticBuyerServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseProgrammaticBuyerServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/client.py index db27bff26478..6751cfb4f4ba 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.report_service import pagers from google.ads.admanager_v1.types import ( @@ -634,11 +634,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReportServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReportServiceClient._read_environment_variables() + ) self._client_cert_source = ReportServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -673,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReportServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/pagers.py index b37c4e04b280..d61a5cef9232 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/base.py index 1ea30ce61825..a3329f3ba979 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import report_messages, report_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/rest.py index 76bd269a0ce7..8ece1ffd362a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/report_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -777,9 +777,7 @@ def __call__( """ - http_options = ( - _BaseReportServiceRestTransport._BaseFetchReportResultRows._get_http_options() - ) + http_options = _BaseReportServiceRestTransport._BaseFetchReportResultRows._get_http_options() request, metadata = self._interceptor.pre_fetch_report_result_rows( request, metadata @@ -1260,7 +1258,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/client.py index 8bd563ac2103..dadab8476135 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RoleServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RoleServiceClient._read_environment_variables() + ) self._client_cert_source = RoleServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RoleServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/pagers.py index 1c15b06368ee..9c87a549f2d3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/base.py index 0777067a15b6..9e51d0906149 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import role_messages, role_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/rest.py index 652d35156dd1..bc5782b31c95 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/role_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/client.py index 9356d6253118..8ae27a598bcf 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.site_service import pagers from google.ads.admanager_v1.types import site_enums, site_messages, site_service @@ -628,11 +628,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SiteServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SiteServiceClient._read_environment_variables() + ) self._client_cert_source = SiteServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +665,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SiteServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/pagers.py index dea236c7bd2d..9bd8759e7dd4 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/base.py index 2aaf6a93f0a6..7689fb1da24f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import site_messages, site_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/rest.py index 845aa0aae342..84af71b87da6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/site_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -847,9 +847,7 @@ def __call__( Response object for ``BatchDeactivateSites`` method. """ - http_options = ( - _BaseSiteServiceRestTransport._BaseBatchDeactivateSites._get_http_options() - ) + http_options = _BaseSiteServiceRestTransport._BaseBatchDeactivateSites._get_http_options() request, metadata = self._interceptor.pre_batch_deactivate_sites( request, metadata @@ -1006,9 +1004,7 @@ def __call__( """ - http_options = ( - _BaseSiteServiceRestTransport._BaseBatchSubmitSitesForApproval._get_http_options() - ) + http_options = _BaseSiteServiceRestTransport._BaseBatchSubmitSitesForApproval._get_http_options() request, metadata = self._interceptor.pre_batch_submit_sites_for_approval( request, metadata @@ -1079,11 +1075,10 @@ def __call__( resp = self._interceptor.post_batch_submit_sites_for_approval(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_submit_sites_for_approval_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_submit_sites_for_approval_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1916,7 +1911,9 @@ def batch_submit_sites_for_approval( ]: # 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._BatchSubmitSitesForApproval(self._session, self._host, self._interceptor) # type: ignore + return self._BatchSubmitSitesForApproval( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_sites( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/client.py index 54b1ee4d8c43..865a53b31575 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class TaxonomyCategoryServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TaxonomyCategoryServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TaxonomyCategoryServiceTransport]] _transport_registry["rest"] = TaxonomyCategoryServiceRestTransport def get_transport_class( @@ -641,11 +639,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TaxonomyCategoryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TaxonomyCategoryServiceClient._read_environment_variables() + ) self._client_cert_source = ( TaxonomyCategoryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -682,8 +678,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TaxonomyCategoryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/pagers.py index d8926e0ccd58..5eab44a3eb2a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/__init__.py index ffbde4bb2418..b98cebe59c73 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[TaxonomyCategoryServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[TaxonomyCategoryServiceTransport]] _transport_registry["rest"] = TaxonomyCategoryServiceRestTransport __all__ = ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/base.py index b019dcdeb321..39b6e8284770 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/rest.py index fa45cce7a9b9..87bd41299405 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/taxonomy_category_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -370,9 +370,7 @@ def __call__( The ``TaxonomyCategory`` resource. """ - http_options = ( - _BaseTaxonomyCategoryServiceRestTransport._BaseGetTaxonomyCategory._get_http_options() - ) + http_options = _BaseTaxonomyCategoryServiceRestTransport._BaseGetTaxonomyCategory._get_http_options() request, metadata = self._interceptor.pre_get_taxonomy_category( request, metadata @@ -523,9 +521,7 @@ def __call__( """ - http_options = ( - _BaseTaxonomyCategoryServiceRestTransport._BaseListTaxonomyCategories._get_http_options() - ) + http_options = _BaseTaxonomyCategoryServiceRestTransport._BaseListTaxonomyCategories._get_http_options() request, metadata = self._interceptor.pre_list_taxonomy_categories( request, metadata @@ -637,7 +633,9 @@ def list_taxonomy_categories( ]: # 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._ListTaxonomyCategories(self._session, self._host, self._interceptor) # type: ignore + return self._ListTaxonomyCategories( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -697,9 +695,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseTaxonomyCategoryServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseTaxonomyCategoryServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseTaxonomyCategoryServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/client.py index c1a4b8efdd51..f779f2f11ddd 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.team_service import pagers from google.ads.admanager_v1.types import team_enums, team_messages, team_service @@ -627,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TeamServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TeamServiceClient._read_environment_variables() + ) self._client_cert_source = TeamServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -666,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TeamServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/pagers.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/pagers.py index 406ed033d41e..e0a352c06757 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/pagers.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/base.py index 606d50c61ab1..951f10b63ec8 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import team_messages, team_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/rest.py index 8b23bd9d774c..26bfc31fd33f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/team_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -691,9 +691,7 @@ def __call__( Response object for ``BatchActivateTeams`` method. """ - http_options = ( - _BaseTeamServiceRestTransport._BaseBatchActivateTeams._get_http_options() - ) + http_options = _BaseTeamServiceRestTransport._BaseBatchActivateTeams._get_http_options() request, metadata = self._interceptor.pre_batch_activate_teams( request, metadata @@ -999,9 +997,7 @@ def __call__( Response object for ``BatchDeactivateTeams`` method. """ - http_options = ( - _BaseTeamServiceRestTransport._BaseBatchDeactivateTeams._get_http_options() - ) + http_options = _BaseTeamServiceRestTransport._BaseBatchDeactivateTeams._get_http_options() request, metadata = self._interceptor.pre_batch_deactivate_teams( request, metadata diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/client.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/client.py index d0609b04fbbc..7876307940bb 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/client.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version @@ -627,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserServiceClient._read_environment_variables() + ) self._client_cert_source = UserServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -666,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/base.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/base.py index 68c14f256d50..09a4cfde8dfc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/base.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.admanager_v1 import gapic_version as package_version from google.ads.admanager_v1.types import user_messages, user_service diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/rest.py b/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/rest.py index c08c08c38d9a..1da40b44dcb6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/rest.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/services/user_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/__init__.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/__init__.py index 3946c32d71d0..9d23e8c82bc3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/__init__.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .ad_break_messages import AdBreak +from .ad_break_messages import ( + AdBreak, +) from .ad_break_service import ( CreateAdBreakRequest, DeleteAdBreakRequest, @@ -22,8 +24,12 @@ ListAdBreaksResponse, UpdateAdBreakRequest, ) -from .ad_review_center_ad_enums import AdReviewCenterAdStatusEnum -from .ad_review_center_ad_messages import AdReviewCenterAd +from .ad_review_center_ad_enums import ( + AdReviewCenterAdStatusEnum, +) +from .ad_review_center_ad_messages import ( + AdReviewCenterAd, +) from .ad_review_center_ad_service import ( BatchAdReviewCenterAdsOperationMetadata, BatchAllowAdReviewCenterAdsRequest, @@ -33,8 +39,17 @@ SearchAdReviewCenterAdsRequest, SearchAdReviewCenterAdsResponse, ) -from .ad_unit_enums import AdUnitStatusEnum, SmartSizeModeEnum, TargetWindowEnum -from .ad_unit_messages import AdUnit, AdUnitParent, AdUnitSize, LabelFrequencyCap +from .ad_unit_enums import ( + AdUnitStatusEnum, + SmartSizeModeEnum, + TargetWindowEnum, +) +from .ad_unit_messages import ( + AdUnit, + AdUnitParent, + AdUnitSize, + LabelFrequencyCap, +) from .ad_unit_service import ( BatchActivateAdUnitsRequest, BatchActivateAdUnitsResponse, @@ -54,61 +69,92 @@ ListAdUnitsResponse, UpdateAdUnitRequest, ) -from .admanager_error import AdManagerError -from .application_messages import Application +from .admanager_error import ( + AdManagerError, +) +from .application_messages import ( + Application, +) from .application_service import ( GetApplicationRequest, ListApplicationsRequest, ListApplicationsResponse, ) -from .applied_label import AppliedLabel -from .audience_segment_messages import AudienceSegment +from .applied_label import ( + AppliedLabel, +) +from .audience_segment_messages import ( + AudienceSegment, +) from .audience_segment_service import ( GetAudienceSegmentRequest, ListAudienceSegmentsRequest, ListAudienceSegmentsResponse, ) -from .bandwidth_group_messages import BandwidthGroup +from .bandwidth_group_messages import ( + BandwidthGroup, +) from .bandwidth_group_service import ( GetBandwidthGroupRequest, ListBandwidthGroupsRequest, ListBandwidthGroupsResponse, ) -from .browser_language_messages import BrowserLanguage +from .browser_language_messages import ( + BrowserLanguage, +) from .browser_language_service import ( GetBrowserLanguageRequest, ListBrowserLanguagesRequest, ListBrowserLanguagesResponse, ) -from .browser_messages import Browser +from .browser_messages import ( + Browser, +) from .browser_service import ( GetBrowserRequest, ListBrowsersRequest, ListBrowsersResponse, ) -from .cms_metadata_key_enums import CmsMetadataKeyStatusEnum -from .cms_metadata_key_messages import CmsMetadataKey +from .cms_metadata_key_enums import ( + CmsMetadataKeyStatusEnum, +) +from .cms_metadata_key_messages import ( + CmsMetadataKey, +) from .cms_metadata_key_service import ( GetCmsMetadataKeyRequest, ListCmsMetadataKeysRequest, ListCmsMetadataKeysResponse, ) -from .cms_metadata_value_enums import CmsMetadataValueStatusEnum -from .cms_metadata_value_messages import CmsMetadataValue +from .cms_metadata_value_enums import ( + CmsMetadataValueStatusEnum, +) +from .cms_metadata_value_messages import ( + CmsMetadataValue, +) from .cms_metadata_value_service import ( GetCmsMetadataValueRequest, ListCmsMetadataValuesRequest, ListCmsMetadataValuesResponse, ) -from .company_enums import CompanyCreditStatusEnum, CompanyTypeEnum -from .company_messages import Company +from .company_enums import ( + CompanyCreditStatusEnum, + CompanyTypeEnum, +) +from .company_messages import ( + Company, +) from .company_service import ( GetCompanyRequest, ListCompaniesRequest, ListCompaniesResponse, ) -from .contact_enums import ContactStatusEnum -from .contact_messages import Contact +from .contact_enums import ( + ContactStatusEnum, +) +from .contact_messages import ( + Contact, +) from .contact_service import ( BatchCreateContactsRequest, BatchCreateContactsResponse, @@ -120,25 +166,38 @@ ListContactsResponse, UpdateContactRequest, ) -from .content_bundle_messages import ContentBundle +from .content_bundle_messages import ( + ContentBundle, +) from .content_bundle_service import ( GetContentBundleRequest, ListContentBundlesRequest, ListContentBundlesResponse, ) -from .content_label_messages import ContentLabel +from .content_label_messages import ( + ContentLabel, +) from .content_label_service import ( GetContentLabelRequest, ListContentLabelsRequest, ListContentLabelsResponse, ) -from .content_messages import Content -from .content_service import GetContentRequest, ListContentRequest, ListContentResponse +from .content_messages import ( + Content, +) +from .content_service import ( + GetContentRequest, + ListContentRequest, + ListContentResponse, +) from .creative_template_enums import ( CreativeTemplateStatusEnum, CreativeTemplateTypeEnum, ) -from .creative_template_messages import CreativeTemplate, CreativeTemplateVariable +from .creative_template_messages import ( + CreativeTemplate, + CreativeTemplateVariable, +) from .creative_template_service import ( GetCreativeTemplateRequest, ListCreativeTemplatesRequest, @@ -153,7 +212,10 @@ CustomFieldStatusEnum, CustomFieldVisibilityEnum, ) -from .custom_field_messages import CustomField, CustomFieldOption +from .custom_field_messages import ( + CustomField, + CustomFieldOption, +) from .custom_field_service import ( BatchActivateCustomFieldsRequest, BatchActivateCustomFieldsResponse, @@ -169,13 +231,17 @@ ListCustomFieldsResponse, UpdateCustomFieldRequest, ) -from .custom_field_value import CustomFieldValue +from .custom_field_value import ( + CustomFieldValue, +) from .custom_targeting_key_enums import ( CustomTargetingKeyReportableTypeEnum, CustomTargetingKeyStatusEnum, CustomTargetingKeyTypeEnum, ) -from .custom_targeting_key_messages import CustomTargetingKey +from .custom_targeting_key_messages import ( + CustomTargetingKey, +) from .custom_targeting_key_service import ( BatchActivateCustomTargetingKeysRequest, BatchActivateCustomTargetingKeysResponse, @@ -195,33 +261,47 @@ CustomTargetingValueMatchTypeEnum, CustomTargetingValueStatusEnum, ) -from .custom_targeting_value_messages import CustomTargetingValue +from .custom_targeting_value_messages import ( + CustomTargetingValue, +) from .custom_targeting_value_service import ( GetCustomTargetingValueRequest, ListCustomTargetingValuesRequest, ListCustomTargetingValuesResponse, ) -from .deal_buyer_permission_type_enum import DealBuyerPermissionTypeEnum -from .device_capability_messages import DeviceCapability +from .deal_buyer_permission_type_enum import ( + DealBuyerPermissionTypeEnum, +) +from .device_capability_messages import ( + DeviceCapability, +) from .device_capability_service import ( GetDeviceCapabilityRequest, ListDeviceCapabilitiesRequest, ListDeviceCapabilitiesResponse, ) -from .device_category_messages import DeviceCategory +from .device_category_messages import ( + DeviceCategory, +) from .device_category_service import ( GetDeviceCategoryRequest, ListDeviceCategoriesRequest, ListDeviceCategoriesResponse, ) -from .device_manufacturer_messages import DeviceManufacturer +from .device_manufacturer_messages import ( + DeviceManufacturer, +) from .device_manufacturer_service import ( GetDeviceManufacturerRequest, ListDeviceManufacturersRequest, ListDeviceManufacturersResponse, ) -from .early_ad_break_notification_enums import AdBreakStateEnum -from .entity_signals_mapping_messages import EntitySignalsMapping +from .early_ad_break_notification_enums import ( + AdBreakStateEnum, +) +from .entity_signals_mapping_messages import ( + EntitySignalsMapping, +) from .entity_signals_mapping_service import ( BatchCreateEntitySignalsMappingsRequest, BatchCreateEntitySignalsMappingsResponse, @@ -233,67 +313,112 @@ ListEntitySignalsMappingsResponse, UpdateEntitySignalsMappingRequest, ) -from .environment_type_enum import EnvironmentTypeEnum -from .exchange_syndication_product_enum import ExchangeSyndicationProductEnum -from .frequency_cap import FrequencyCap -from .geo_target_messages import GeoTarget +from .environment_type_enum import ( + EnvironmentTypeEnum, +) +from .exchange_syndication_product_enum import ( + ExchangeSyndicationProductEnum, +) +from .frequency_cap import ( + FrequencyCap, +) +from .geo_target_messages import ( + GeoTarget, +) from .geo_target_service import ( GetGeoTargetRequest, ListGeoTargetsRequest, ListGeoTargetsResponse, ) -from .goal import Goal -from .goal_enums import GoalTypeEnum, UnitTypeEnum -from .label_messages import Label -from .line_item_enums import LineItemTypeEnum -from .line_item_messages import LineItem +from .goal import ( + Goal, +) +from .goal_enums import ( + GoalTypeEnum, + UnitTypeEnum, +) +from .label_messages import ( + Label, +) +from .line_item_enums import ( + LineItemTypeEnum, +) +from .line_item_messages import ( + LineItem, +) from .line_item_service import ( GetLineItemRequest, ListLineItemsRequest, ListLineItemsResponse, ) -from .live_stream_event_messages import LiveStreamEvent -from .mobile_carrier_messages import MobileCarrier +from .live_stream_event_messages import ( + LiveStreamEvent, +) +from .mobile_carrier_messages import ( + MobileCarrier, +) from .mobile_carrier_service import ( GetMobileCarrierRequest, ListMobileCarriersRequest, ListMobileCarriersResponse, ) -from .mobile_device_messages import MobileDevice +from .mobile_device_messages import ( + MobileDevice, +) from .mobile_device_service import ( GetMobileDeviceRequest, ListMobileDevicesRequest, ListMobileDevicesResponse, ) -from .mobile_device_submodel_messages import MobileDeviceSubmodel +from .mobile_device_submodel_messages import ( + MobileDeviceSubmodel, +) from .mobile_device_submodel_service import ( GetMobileDeviceSubmodelRequest, ListMobileDeviceSubmodelsRequest, ListMobileDeviceSubmodelsResponse, ) -from .network_messages import Network +from .network_messages import ( + Network, +) from .network_service import ( GetNetworkRequest, ListNetworksRequest, ListNetworksResponse, ) -from .operating_system_messages import OperatingSystem +from .operating_system_messages import ( + OperatingSystem, +) from .operating_system_service import ( GetOperatingSystemRequest, ListOperatingSystemsRequest, ListOperatingSystemsResponse, ) -from .operating_system_version_messages import OperatingSystemVersion +from .operating_system_version_messages import ( + OperatingSystemVersion, +) from .operating_system_version_service import ( GetOperatingSystemVersionRequest, ListOperatingSystemVersionsRequest, ListOperatingSystemVersionsResponse, ) -from .order_enums import OrderStatusEnum -from .order_messages import Order -from .order_service import GetOrderRequest, ListOrdersRequest, ListOrdersResponse -from .placement_enums import PlacementStatusEnum -from .placement_messages import Placement +from .order_enums import ( + OrderStatusEnum, +) +from .order_messages import ( + Order, +) +from .order_service import ( + GetOrderRequest, + ListOrdersRequest, + ListOrdersResponse, +) +from .placement_enums import ( + PlacementStatusEnum, +) +from .placement_messages import ( + Placement, +) from .placement_service import ( BatchActivatePlacementsRequest, BatchActivatePlacementsResponse, @@ -311,7 +436,9 @@ ListPlacementsResponse, UpdatePlacementRequest, ) -from .private_auction_deal_messages import PrivateAuctionDeal +from .private_auction_deal_messages import ( + PrivateAuctionDeal, +) from .private_auction_deal_service import ( CreatePrivateAuctionDealRequest, GetPrivateAuctionDealRequest, @@ -319,7 +446,9 @@ ListPrivateAuctionDealsResponse, UpdatePrivateAuctionDealRequest, ) -from .private_auction_messages import PrivateAuction +from .private_auction_messages import ( + PrivateAuction, +) from .private_auction_service import ( CreatePrivateAuctionRequest, GetPrivateAuctionRequest, @@ -327,15 +456,25 @@ ListPrivateAuctionsResponse, UpdatePrivateAuctionRequest, ) -from .private_marketplace_enums import PrivateMarketplaceDealStatusEnum -from .programmatic_buyer_messages import ProgrammaticBuyer +from .private_marketplace_enums import ( + PrivateMarketplaceDealStatusEnum, +) +from .programmatic_buyer_messages import ( + ProgrammaticBuyer, +) from .programmatic_buyer_service import ( GetProgrammaticBuyerRequest, ListProgrammaticBuyersRequest, ListProgrammaticBuyersResponse, ) -from .report_definition import ReportDefinition -from .report_messages import Report, ReportDataTable, ScheduleOptions +from .report_definition import ( + ReportDefinition, +) +from .report_messages import ( + Report, + ReportDataTable, + ScheduleOptions, +) from .report_service import ( CreateReportRequest, FetchReportResultRowsRequest, @@ -348,13 +487,31 @@ RunReportResponse, UpdateReportRequest, ) -from .report_value import ReportValue -from .request_platform_enum import RequestPlatformEnum -from .role_enums import RoleStatusEnum -from .role_messages import Role -from .role_service import GetRoleRequest, ListRolesRequest, ListRolesResponse -from .site_enums import SiteApprovalStatusEnum, SiteDisapprovalReasonEnum -from .site_messages import DisapprovalReason, Site +from .report_value import ( + ReportValue, +) +from .request_platform_enum import ( + RequestPlatformEnum, +) +from .role_enums import ( + RoleStatusEnum, +) +from .role_messages import ( + Role, +) +from .role_service import ( + GetRoleRequest, + ListRolesRequest, + ListRolesResponse, +) +from .site_enums import ( + SiteApprovalStatusEnum, + SiteDisapprovalReasonEnum, +) +from .site_messages import ( + DisapprovalReason, + Site, +) from .site_service import ( BatchCreateSitesRequest, BatchCreateSitesResponse, @@ -370,9 +527,15 @@ ListSitesResponse, UpdateSiteRequest, ) -from .size import Size -from .size_type_enum import SizeTypeEnum -from .targeted_video_bumper_type_enum import TargetedVideoBumperTypeEnum +from .size import ( + Size, +) +from .size_type_enum import ( + SizeTypeEnum, +) +from .targeted_video_bumper_type_enum import ( + TargetedVideoBumperTypeEnum, +) from .targeting import ( AdUnitTargeting, AudienceSegmentTargeting, @@ -401,15 +564,24 @@ VideoPosition, VideoPositionTargeting, ) -from .taxonomy_category_messages import TaxonomyCategory +from .taxonomy_category_messages import ( + TaxonomyCategory, +) from .taxonomy_category_service import ( GetTaxonomyCategoryRequest, ListTaxonomyCategoriesRequest, ListTaxonomyCategoriesResponse, ) -from .taxonomy_type_enum import TaxonomyTypeEnum -from .team_enums import TeamAccessTypeEnum, TeamStatusEnum -from .team_messages import Team +from .taxonomy_type_enum import ( + TaxonomyTypeEnum, +) +from .team_enums import ( + TeamAccessTypeEnum, + TeamStatusEnum, +) +from .team_messages import ( + Team, +) from .team_service import ( BatchActivateTeamsRequest, BatchActivateTeamsResponse, @@ -425,11 +597,21 @@ ListTeamsResponse, UpdateTeamRequest, ) -from .time_unit_enum import TimeUnitEnum -from .user_messages import User -from .user_service import GetUserRequest -from .video_position_enum import VideoPositionEnum -from .web_property import WebProperty +from .time_unit_enum import ( + TimeUnitEnum, +) +from .user_messages import ( + User, +) +from .user_service import ( + GetUserRequest, +) +from .video_position_enum import ( + VideoPositionEnum, +) +from .web_property import ( + WebProperty, +) __all__ = ( "AdBreak", diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_break_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_break_messages.py index 56c16436dcd9..80fab06610b1 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_break_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_break_messages.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import early_ad_break_notification_enums diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_break_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_break_service.py index 605ac5b8160c..2b5ce40b27ac 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_break_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_break_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import ad_break_messages diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_review_center_ad_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_review_center_ad_enums.py index 6c39673c5e7d..efc8adebe853 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_review_center_ad_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_review_center_ad_enums.py @@ -48,6 +48,7 @@ class AdReviewCenterAdStatus(proto.Enum): This ad is allowed to serve by default and has not been reviewed. """ + AD_REVIEW_CENTER_AD_STATUS_UNSPECIFIED = 0 ALLOWED = 1 BLOCKED = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_review_center_ad_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_review_center_ad_service.py index 987b7e677b38..55efd50af61b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_review_center_ad_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_review_center_ad_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.rpc import status_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_enums.py index 06685fd9cb8b..2fa61c8ba661 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_enums.py @@ -51,6 +51,7 @@ class AdUnitStatus(proto.Enum): The ad unit will be hidden in the UI and ignored by serving. """ + AD_UNIT_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 @@ -78,6 +79,7 @@ class SmartSizeMode(proto.Enum): DYNAMIC_SIZE (3): Height and width are ranges. """ + SMART_SIZE_MODE_UNSPECIFIED = 0 NONE = 1 SMART_BANNER = 2 @@ -104,6 +106,7 @@ class TargetWindow(proto.Enum): Specifies that the link should open in a new window. """ + TARGET_WINDOW_UNSPECIFIED = 0 TOP = 1 BLANK = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_messages.py index e18306797e07..e5e54a9fb9bb 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_messages.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import ( @@ -282,26 +282,26 @@ class AdUnit(proto.Message): number=21, message=applied_label.AppliedLabel, ) - effective_applied_labels: MutableSequence[ - applied_label.AppliedLabel - ] = proto.RepeatedField( - proto.MESSAGE, - number=22, - message=applied_label.AppliedLabel, + effective_applied_labels: MutableSequence[applied_label.AppliedLabel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=22, + message=applied_label.AppliedLabel, + ) ) - applied_label_frequency_caps: MutableSequence[ - "LabelFrequencyCap" - ] = proto.RepeatedField( - proto.MESSAGE, - number=23, - message="LabelFrequencyCap", + applied_label_frequency_caps: MutableSequence["LabelFrequencyCap"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=23, + message="LabelFrequencyCap", + ) ) - effective_label_frequency_caps: MutableSequence[ - "LabelFrequencyCap" - ] = proto.RepeatedField( - proto.MESSAGE, - number=24, - message="LabelFrequencyCap", + effective_label_frequency_caps: MutableSequence["LabelFrequencyCap"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=24, + message="LabelFrequencyCap", + ) ) smart_size_mode: ad_unit_enums.SmartSizeModeEnum.SmartSizeMode = proto.Field( proto.ENUM, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_service.py index 0548087d7840..843d7fe206fb 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/ad_unit_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import ad_unit_messages diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/admanager_error.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/admanager_error.py index 701a37c9c744..db8238005079 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/admanager_error.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/admanager_error.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/application_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/application_service.py index 66466c2392f6..ff84e778783a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/application_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/application_service.py @@ -136,12 +136,12 @@ class ListApplicationsResponse(proto.Message): def raw_page(self): return self - applications: MutableSequence[ - application_messages.Application - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=application_messages.Application, + applications: MutableSequence[application_messages.Application] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=application_messages.Application, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/audience_segment_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/audience_segment_service.py index 8a3818c7d45a..36bd48920444 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/audience_segment_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/audience_segment_service.py @@ -136,12 +136,12 @@ class ListAudienceSegmentsResponse(proto.Message): def raw_page(self): return self - audience_segments: MutableSequence[ - audience_segment_messages.AudienceSegment - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=audience_segment_messages.AudienceSegment, + audience_segments: MutableSequence[audience_segment_messages.AudienceSegment] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=audience_segment_messages.AudienceSegment, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/bandwidth_group_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/bandwidth_group_service.py index da2bcff452fa..a9ce1dfb813b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/bandwidth_group_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/bandwidth_group_service.py @@ -136,12 +136,12 @@ class ListBandwidthGroupsResponse(proto.Message): def raw_page(self): return self - bandwidth_groups: MutableSequence[ - bandwidth_group_messages.BandwidthGroup - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=bandwidth_group_messages.BandwidthGroup, + bandwidth_groups: MutableSequence[bandwidth_group_messages.BandwidthGroup] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=bandwidth_group_messages.BandwidthGroup, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/browser_language_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/browser_language_service.py index 9dcc58ecfa08..888dc092edd8 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/browser_language_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/browser_language_service.py @@ -136,12 +136,12 @@ class ListBrowserLanguagesResponse(proto.Message): def raw_page(self): return self - browser_languages: MutableSequence[ - browser_language_messages.BrowserLanguage - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=browser_language_messages.BrowserLanguage, + browser_languages: MutableSequence[browser_language_messages.BrowserLanguage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=browser_language_messages.BrowserLanguage, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_enums.py index 7dbc67bb2349..256ae4190e10 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_enums.py @@ -44,6 +44,7 @@ class CmsMetadataKeyStatus(proto.Enum): INACTIVE (2): The key is not active. """ + CMS_METADATA_KEY_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_service.py index cbaaa15d50a3..b4c3ed88902b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_key_service.py @@ -136,12 +136,12 @@ class ListCmsMetadataKeysResponse(proto.Message): def raw_page(self): return self - cms_metadata_keys: MutableSequence[ - cms_metadata_key_messages.CmsMetadataKey - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=cms_metadata_key_messages.CmsMetadataKey, + cms_metadata_keys: MutableSequence[cms_metadata_key_messages.CmsMetadataKey] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=cms_metadata_key_messages.CmsMetadataKey, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_value_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_value_enums.py index c8e57667f854..9feb62b80a04 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_value_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/cms_metadata_value_enums.py @@ -46,6 +46,7 @@ class CmsMetadataValueStatus(proto.Enum): INACTIVE (3): The value is not active. """ + CMS_METADATA_VALUE_STATUS_UNSPECIFIED = 0 ACTIVE = 1 ARCHIVED = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/company_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/company_enums.py index 5beadbc05e2c..010be14a19d5 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/company_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/company_enums.py @@ -57,6 +57,7 @@ class CompanyType(proto.Enum): A company representing multiple advertisers and agencies. """ + COMPANY_TYPE_UNSPECIFIED = 0 ADVERTISER = 1 HOUSE_ADVERTISER = 2 @@ -144,6 +145,7 @@ class CompanyCreditStatus(proto.Enum): This credit status is only available in advance settings. """ + COMPANY_CREDIT_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/company_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/company_messages.py index 5667fa5bf131..6cff5873afef 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/company_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/company_messages.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import applied_label, company_enums diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/contact_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/contact_enums.py index baca3c7df8d8..303fb7273d51 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/contact_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/contact_enums.py @@ -59,6 +59,7 @@ class ContactStatus(proto.Enum): their orders, but their access was later revoked. """ + CONTACT_STATUS_UNSPECIFIED = 0 INVITE_CANCELED = 1 INVITE_EXPIRED = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/contact_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/contact_service.py index 11a3f8f0de77..3287685a1568 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/contact_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/contact_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import contact_messages diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/content_bundle_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/content_bundle_service.py index f97a13a50a3a..33526003265b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/content_bundle_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/content_bundle_service.py @@ -136,12 +136,12 @@ class ListContentBundlesResponse(proto.Message): def raw_page(self): return self - content_bundles: MutableSequence[ - content_bundle_messages.ContentBundle - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=content_bundle_messages.ContentBundle, + content_bundles: MutableSequence[content_bundle_messages.ContentBundle] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=content_bundle_messages.ContentBundle, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/content_label_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/content_label_service.py index c70c118f105e..e3d4908579ce 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/content_label_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/content_label_service.py @@ -136,12 +136,12 @@ class ListContentLabelsResponse(proto.Message): def raw_page(self): return self - content_labels: MutableSequence[ - content_label_messages.ContentLabel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=content_label_messages.ContentLabel, + content_labels: MutableSequence[content_label_messages.ContentLabel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=content_label_messages.ContentLabel, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_enums.py index 11eec0934cb7..2e0ede8e6193 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_enums.py @@ -47,6 +47,7 @@ class CreativeTemplateType(proto.Enum): Creative templates created by an administrator or other user in the network. """ + CREATIVE_TEMPLATE_TYPE_UNSPECIFIED = 0 STANDARD = 1 CUSTOM = 2 @@ -76,6 +77,7 @@ class CreativeTemplateStatus(proto.Enum): but existing ones can be edited and continue to serve """ + CREATIVE_TEMPLATE_STATUS_UNSPECIFIED = 0 ACTIVE = 1 DELETED = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_messages.py index e0fa7533f5a3..e2a7aef58d94 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_messages.py @@ -245,6 +245,7 @@ class MimeType(proto.Enum): GIF (3): The ``image/gif`` MIME type. """ + MIME_TYPE_UNSPECIFIED = 0 JPG = 1 PNG = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_service.py index 7247e40fc9c0..623b5e8057e3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_service.py @@ -136,12 +136,12 @@ class ListCreativeTemplatesResponse(proto.Message): def raw_page(self): return self - creative_templates: MutableSequence[ - creative_template_messages.CreativeTemplate - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=creative_template_messages.CreativeTemplate, + creative_templates: MutableSequence[creative_template_messages.CreativeTemplate] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=creative_template_messages.CreativeTemplate, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_variable_url_type_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_variable_url_type_enum.py index 5f4e2f19313a..35842c2a9cdc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_variable_url_type_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/creative_template_variable_url_type_enum.py @@ -49,6 +49,7 @@ class CreativeTemplateVariableUrlType(proto.Enum): STANDARD_HTTP (4): Standard HTTP URL. """ + CREATIVE_TEMPLATE_VARIABLE_URL_TYPE_UNSPECIFIED = 0 CLICK_TRACKER = 1 DEEPLINK = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_enums.py index 83aaa4c45593..6f17d7aafcfc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_enums.py @@ -53,6 +53,7 @@ class CustomFieldDataType(proto.Enum): DROP_DOWN (4): A drop-down field. """ + CUSTOM_FIELD_DATA_TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -84,6 +85,7 @@ class CustomFieldEntityType(proto.Enum): The CustomField is applied to ProposalLineItems. """ + CUSTOM_FIELD_ENTITY_TYPE_UNSPECIFIED = 0 LINE_ITEM = 1 ORDER = 2 @@ -109,6 +111,7 @@ class CustomFieldStatus(proto.Enum): INACTIVE (2): The CustomField is inactive. """ + CUSTOM_FIELD_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 @@ -136,6 +139,7 @@ class CustomFieldVisibility(proto.Enum): The CustomField is visible and editable in both the API and UI. """ + CUSTOM_FIELD_VISIBILITY_UNSPECIFIED = 0 HIDDEN = 1 READ_ONLY = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_service.py index 1dfeeced9652..d4a71d7307bd 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_field_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import custom_field_messages @@ -147,12 +147,12 @@ class ListCustomFieldsResponse(proto.Message): def raw_page(self): return self - custom_fields: MutableSequence[ - custom_field_messages.CustomField - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_field_messages.CustomField, + custom_fields: MutableSequence[custom_field_messages.CustomField] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_field_messages.CustomField, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -218,12 +218,12 @@ class BatchCreateCustomFieldsResponse(proto.Message): The ``CustomField`` objects created. """ - custom_fields: MutableSequence[ - custom_field_messages.CustomField - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_field_messages.CustomField, + custom_fields: MutableSequence[custom_field_messages.CustomField] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_field_messages.CustomField, + ) ) @@ -284,12 +284,12 @@ class BatchUpdateCustomFieldsResponse(proto.Message): The ``CustomField`` objects updated. """ - custom_fields: MutableSequence[ - custom_field_messages.CustomField - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_field_messages.CustomField, + custom_fields: MutableSequence[custom_field_messages.CustomField] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_field_messages.CustomField, + ) ) diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_key_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_key_enums.py index 1057a40e9694..1cdd8745abce 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_key_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_key_enums.py @@ -46,6 +46,7 @@ class CustomTargetingKeyStatus(proto.Enum): INACTIVE (2): Custom targeting key is inactive. """ + CUSTOM_TARGETING_KEY_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 @@ -68,6 +69,7 @@ class CustomTargetingKeyType(proto.Enum): FREEFORM (2): Key without a fixed set of values """ + CUSTOM_TARGETING_KEY_TYPE_UNSPECIFIED = 0 PREDEFINED = 1 FREEFORM = 2 @@ -95,6 +97,7 @@ class CustomTargetingKeyReportableType(proto.Enum): Custom dimension available for reporting in the AdManager query tool. """ + CUSTOM_TARGETING_KEY_REPORTABLE_TYPE_UNSPECIFIED = 0 OFF = 1 ON = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_key_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_key_service.py index 865ef8655968..3c5885eab32f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_key_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_key_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import custom_targeting_key_messages diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_value_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_value_enums.py index 0ff4475d6e7a..86a290d60d8a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_value_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/custom_targeting_value_enums.py @@ -45,6 +45,7 @@ class CustomTargetingValueStatus(proto.Enum): INACTIVE (2): Custom targeting value is inactive. """ + CUSTOM_TARGETING_VALUE_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 @@ -111,6 +112,7 @@ class CustomTargetingValueMatchType(proto.Enum): but not with car=misspelled hond a. This match type can not be used within line item targeting. """ + CUSTOM_TARGETING_VALUE_MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BROAD = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/deal_buyer_permission_type_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/deal_buyer_permission_type_enum.py index 727b9a450384..135822f21b05 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/deal_buyer_permission_type_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/deal_buyer_permission_type_enum.py @@ -47,6 +47,7 @@ class DealBuyerPermissionType(proto.Enum): The deal transacts with all buyers under the same bidder. """ + DEAL_BUYER_PERMISSION_TYPE_UNSPECIFIED = 0 NEGOTIATOR_ONLY = 1 BIDDER = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/device_category_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/device_category_service.py index 205639be4dc1..9b36ba4de585 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/device_category_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/device_category_service.py @@ -136,12 +136,12 @@ class ListDeviceCategoriesResponse(proto.Message): def raw_page(self): return self - device_categories: MutableSequence[ - device_category_messages.DeviceCategory - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=device_category_messages.DeviceCategory, + device_categories: MutableSequence[device_category_messages.DeviceCategory] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=device_category_messages.DeviceCategory, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/early_ad_break_notification_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/early_ad_break_notification_enums.py index 3fef72589f90..685828cf0054 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/early_ad_break_notification_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/early_ad_break_notification_enums.py @@ -50,6 +50,7 @@ class AdBreakState(proto.Enum): will start later. You can delete or update the ad break. """ + AD_BREAK_STATE_UNSPECIFIED = 0 DECISIONED = 1 COMPLETE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/entity_signals_mapping_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/entity_signals_mapping_service.py index c0018fd28171..a6d1bb312195 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/entity_signals_mapping_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/entity_signals_mapping_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import entity_signals_mapping_messages @@ -233,12 +233,12 @@ class BatchCreateEntitySignalsMappingsRequest(proto.Message): proto.STRING, number=1, ) - requests: MutableSequence[ - "CreateEntitySignalsMappingRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="CreateEntitySignalsMappingRequest", + requests: MutableSequence["CreateEntitySignalsMappingRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="CreateEntitySignalsMappingRequest", + ) ) @@ -277,12 +277,12 @@ class BatchUpdateEntitySignalsMappingsRequest(proto.Message): proto.STRING, number=1, ) - requests: MutableSequence[ - "UpdateEntitySignalsMappingRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="UpdateEntitySignalsMappingRequest", + requests: MutableSequence["UpdateEntitySignalsMappingRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="UpdateEntitySignalsMappingRequest", + ) ) diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/environment_type_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/environment_type_enum.py index a07d11b28b4b..124ec1b3667a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/environment_type_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/environment_type_enum.py @@ -44,6 +44,7 @@ class EnvironmentType(proto.Enum): VIDEO_PLAYER (2): Video players. """ + ENVIRONMENT_TYPE_UNSPECIFIED = 0 BROWSER = 1 VIDEO_PLAYER = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/exchange_syndication_product_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/exchange_syndication_product_enum.py index 88e5f971c29b..7a7f32053456 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/exchange_syndication_product_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/exchange_syndication_product_enum.py @@ -49,6 +49,7 @@ class ExchangeSyndicationProduct(proto.Enum): GAMES (4): Property serves for games. """ + EXCHANGE_SYNDICATION_PRODUCT_UNSPECIFIED = 0 DISPLAY = 1 MOBILE_APP = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/goal_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/goal_enums.py index cfeadae75c69..d1f1cd6e8403 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/goal_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/goal_enums.py @@ -77,6 +77,7 @@ class GoalType(proto.Enum): - [LineItemTypeEnum.LineItemType.ADMOB][] - [LineItemTypeEnum.LineItemType.BUMPER][google.ads.admanager.v1.LineItemTypeEnum.LineItemType.BUMPER] """ + GOAL_TYPE_UNSPECIFIED = 0 NONE = 1 LIFETIME = 2 @@ -139,6 +140,7 @@ class UnitType(proto.Enum): must be [LineItemTypeEnum.LineItemType.STANDARD][google.ads.admanager.v1.LineItemTypeEnum.LineItemType.STANDARD]. """ + UNIT_TYPE_UNSPECIFIED = 0 IMPRESSIONS = 1 CLICKS = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_enums.py index b4affa0d98a8..5dcf959a2877 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_enums.py @@ -91,6 +91,7 @@ class LineItemType(proto.Enum): The type of LineItem used for configuring audience extension campaigns. """ + LINE_ITEM_TYPE_UNSPECIFIED = 0 SPONSORSHIP = 12 STANDARD = 13 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_messages.py index 24dac2c1470f..8a11bc894e72 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/line_item_messages.py @@ -17,13 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore import proto # type: ignore -from google.ads.admanager_v1.types import custom_field_value +from google.ads.admanager_v1.types import custom_field_value, line_item_enums from google.ads.admanager_v1.types import goal as gaa_goal -from google.ads.admanager_v1.types import line_item_enums __protobuf__ = proto.module( package="google.ads.admanager.v1", @@ -144,12 +143,12 @@ class LineItem(proto.Message): optional=True, message=money_pb2.Money, ) - custom_field_values: MutableSequence[ - custom_field_value.CustomFieldValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=59, - message=custom_field_value.CustomFieldValue, + custom_field_values: MutableSequence[custom_field_value.CustomFieldValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=59, + message=custom_field_value.CustomFieldValue, + ) ) goal: gaa_goal.Goal = proto.Field( proto.MESSAGE, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_carrier_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_carrier_service.py index e1b13c95553e..ac6518f3eeee 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_carrier_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_carrier_service.py @@ -136,12 +136,12 @@ class ListMobileCarriersResponse(proto.Message): def raw_page(self): return self - mobile_carriers: MutableSequence[ - mobile_carrier_messages.MobileCarrier - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=mobile_carrier_messages.MobileCarrier, + mobile_carriers: MutableSequence[mobile_carrier_messages.MobileCarrier] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=mobile_carrier_messages.MobileCarrier, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_device_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_device_service.py index c9c15594fccd..d671945074d8 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_device_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/mobile_device_service.py @@ -136,12 +136,12 @@ class ListMobileDevicesResponse(proto.Message): def raw_page(self): return self - mobile_devices: MutableSequence[ - mobile_device_messages.MobileDevice - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=mobile_device_messages.MobileDevice, + mobile_devices: MutableSequence[mobile_device_messages.MobileDevice] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=mobile_device_messages.MobileDevice, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/operating_system_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/operating_system_service.py index 596e2872af86..9eff2ad9b6e6 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/operating_system_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/operating_system_service.py @@ -136,12 +136,12 @@ class ListOperatingSystemsResponse(proto.Message): def raw_page(self): return self - operating_systems: MutableSequence[ - operating_system_messages.OperatingSystem - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=operating_system_messages.OperatingSystem, + operating_systems: MutableSequence[operating_system_messages.OperatingSystem] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=operating_system_messages.OperatingSystem, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/order_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/order_enums.py index 98643a627af8..8d5734044365 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/order_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/order_enums.py @@ -60,6 +60,7 @@ class OrderStatus(proto.Enum): DELETED (8): Indicates that the Order has been deleted. """ + ORDER_STATUS_UNSPECIFIED = 0 DRAFT = 2 PENDING_APPROVAL = 3 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/order_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/order_messages.py index b7e4bad837c3..936a9bd5b335 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/order_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/order_messages.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import applied_label, custom_field_value, order_enums @@ -318,19 +318,19 @@ class Order(proto.Message): number=25, message=applied_label.AppliedLabel, ) - effective_applied_labels: MutableSequence[ - applied_label.AppliedLabel - ] = proto.RepeatedField( - proto.MESSAGE, - number=26, - message=applied_label.AppliedLabel, + effective_applied_labels: MutableSequence[applied_label.AppliedLabel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=26, + message=applied_label.AppliedLabel, + ) ) - custom_field_values: MutableSequence[ - custom_field_value.CustomFieldValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=38, - message=custom_field_value.CustomFieldValue, + custom_field_values: MutableSequence[custom_field_value.CustomFieldValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=38, + message=custom_field_value.CustomFieldValue, + ) ) diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_enums.py index 93e71bd716e0..a90e90f7b47c 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_enums.py @@ -46,6 +46,7 @@ class PlacementStatus(proto.Enum): ARCHIVED (3): No stats collected, user-visible. """ + PLACEMENT_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_messages.py index 1fd11f4ddb3a..9b07a5713819 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_messages.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import placement_enums diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_service.py index 2b5a377e8c15..fc1c6c020919 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/placement_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import placement_messages diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_deal_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_deal_messages.py index 3ab543583ebb..8b0a7072f4db 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_deal_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_deal_messages.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import ( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_deal_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_deal_service.py index 5640ff44e418..a603783f7761 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_deal_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_deal_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import private_auction_deal_messages diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_messages.py index 60908aaf2b02..3bf6c5183861 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_messages.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_service.py index aa687e105e0f..9ad5abb98b5d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_auction_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import private_auction_messages @@ -139,12 +139,12 @@ class ListPrivateAuctionsResponse(proto.Message): def raw_page(self): return self - private_auctions: MutableSequence[ - private_auction_messages.PrivateAuction - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=private_auction_messages.PrivateAuction, + private_auctions: MutableSequence[private_auction_messages.PrivateAuction] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=private_auction_messages.PrivateAuction, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_marketplace_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_marketplace_enums.py index b057ea735f1c..73da560ed6b3 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/private_marketplace_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/private_marketplace_enums.py @@ -50,6 +50,7 @@ class PrivateMarketplaceDealStatus(proto.Enum): BUYER_PAUSED (5): The deal is paused by the buyer. """ + PRIVATE_MARKETPLACE_DEAL_STATUS_UNSPECIFIED = 0 PENDING = 1 ACTIVE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/report_definition.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/report_definition.py index 68e83350426c..5aa22bc2687d 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/report_definition.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/report_definition.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.type import date_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import report_value @@ -133,6 +133,7 @@ class ReportType(proto.Enum): AD_SPEED (13): Ad speed. """ + REPORT_TYPE_UNSPECIFIED = 0 HISTORICAL = 1 REACH = 5 @@ -5859,6 +5860,7 @@ class Dimension(proto.Enum): equal to the ID in index 9 of ``ReportDefinition.custom_dimension_key_ids``. """ + _pb_options = {"allow_alias": True} DIMENSION_UNSPECIFIED = 0 ACTIVE_VIEW_MEASUREMENT_SOURCE = 575 @@ -11319,6 +11321,7 @@ class Metric(proto.Enum): Data format: ``INTEGER`` """ + _pb_options = {"allow_alias": True} METRIC_UNSPECIFIED = 0 ACTIVE_USERS = 223 @@ -11835,6 +11838,7 @@ class TimePeriodColumn(proto.Enum): TIME_PERIOD_COLUMN_QUARTER (4): A column for each quarter in the report. """ + TIME_PERIOD_COLUMN_UNSPECIFIED = 0 TIME_PERIOD_COLUMN_DATE = 1 TIME_PERIOD_COLUMN_WEEK = 2 @@ -11862,6 +11866,7 @@ class MetricValueType(proto.Enum): The relative change between the primary and comparison date ranges. """ + PRIMARY = 0 PRIMARY_PERCENT_OF_TOTAL = 1 COMPARISON = 2 @@ -11892,6 +11897,7 @@ class TimeZoneSource(proto.Enum): compared with PUBLISHER, and reports may take longer to run since the dates are dynamically calculated at request time. """ + TIME_ZONE_SOURCE_UNSPECIFIED = 0 PUBLISHER = 1 AD_EXCHANGE = 2 @@ -12109,6 +12115,7 @@ class RelativeDateRange(proto.Enum): Wednesday, but SAME_PERIOD_PREVIOUS_YEAR will be Monday - Sunday. """ + RELATIVE_DATE_RANGE_UNSPECIFIED = 0 TODAY = 1 YESTERDAY = 2 @@ -12269,6 +12276,7 @@ class Operation(proto.Enum): expression or set of regular expressions (none must match). """ + IN = 0 NOT_IN = 1 CONTAINS = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/report_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/report_messages.py index 9848f69a15f8..dbe3c11ceedc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/report_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/report_messages.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import report_definition as gaa_report_definition @@ -87,6 +87,7 @@ class Visibility(proto.Enum): Reports with this visibility will appear in the Ad Manager UI. """ + _pb_options = {"allow_alias": True} HIDDEN = 0 DRAFT = 1 @@ -161,19 +162,19 @@ class Row(proto.Message): metric_value_groups represents the metrics for date y. """ - dimension_values: MutableSequence[ - report_value.ReportValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=report_value.ReportValue, + dimension_values: MutableSequence[report_value.ReportValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=report_value.ReportValue, + ) ) - metric_value_groups: MutableSequence[ - "ReportDataTable.MetricValueGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ReportDataTable.MetricValueGroup", + metric_value_groups: MutableSequence["ReportDataTable.MetricValueGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ReportDataTable.MetricValueGroup", + ) ) class MetricValueGroup(proto.Message): @@ -208,19 +209,19 @@ class MetricValueGroup(proto.Message): number=1, message=report_value.ReportValue, ) - primary_percent_of_total_values: MutableSequence[ - report_value.ReportValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=report_value.ReportValue, + primary_percent_of_total_values: MutableSequence[report_value.ReportValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=report_value.ReportValue, + ) ) - comparison_values: MutableSequence[ - report_value.ReportValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=report_value.ReportValue, + comparison_values: MutableSequence[report_value.ReportValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=report_value.ReportValue, + ) ) comparison_percent_of_total_values: MutableSequence[ report_value.ReportValue @@ -229,19 +230,19 @@ class MetricValueGroup(proto.Message): number=4, message=report_value.ReportValue, ) - absolute_change_values: MutableSequence[ - report_value.ReportValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=report_value.ReportValue, + absolute_change_values: MutableSequence[report_value.ReportValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=report_value.ReportValue, + ) ) - relative_change_values: MutableSequence[ - report_value.ReportValue - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=report_value.ReportValue, + relative_change_values: MutableSequence[report_value.ReportValue] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=report_value.ReportValue, + ) ) flag_values: MutableSequence[bool] = proto.RepeatedField( proto.BOOL, @@ -275,6 +276,7 @@ class DeliveryCondition(proto.Enum): Deliver report when flag's conditions are met. """ + NEVER = 0 ALWAYS = 1 WHEN_FLAG_CONDITIONS_MET = 2 @@ -342,6 +344,7 @@ class Frequency(proto.Enum): MONTHLY (7): Schedule report to run on a monthly basis. """ + FREQUENCY_UNSPECIFIED = 0 HOURLY = 1 TWO_TIMES_DAILY = 2 @@ -360,12 +363,12 @@ class WeeklySchedule(proto.Message): report. """ - weekly_scheduled_days: MutableSequence[ - dayofweek_pb2.DayOfWeek - ] = proto.RepeatedField( - proto.ENUM, - number=1, - enum=dayofweek_pb2.DayOfWeek, + weekly_scheduled_days: MutableSequence[dayofweek_pb2.DayOfWeek] = ( + proto.RepeatedField( + proto.ENUM, + number=1, + enum=dayofweek_pb2.DayOfWeek, + ) ) class MonthlySchedule(proto.Message): @@ -426,12 +429,12 @@ class MonthlySchedule(proto.Message): number=2, enum=DeliveryCondition, ) - flags: MutableSequence[ - gaa_report_definition.ReportDefinition.Flag - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=gaa_report_definition.ReportDefinition.Flag, + flags: MutableSequence[gaa_report_definition.ReportDefinition.Flag] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=gaa_report_definition.ReportDefinition.Flag, + ) ) diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/report_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/report_service.py index 61767f61bf4f..69ad34380b11 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/report_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/report_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import report_definition, report_messages diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/request_platform_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/request_platform_enum.py index 1db06154bbf5..1eb07c9ddf07 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/request_platform_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/request_platform_enum.py @@ -55,6 +55,7 @@ class RequestPlatform(proto.Enum): Represents a request made from a video player. """ + REQUEST_PLATFORM_UNSPECIFIED = 0 BROWSER = 1 MOBILE_APP = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/role_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/role_enums.py index b89b43559271..12a248dcdb2a 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/role_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/role_enums.py @@ -44,6 +44,7 @@ class RoleStatus(proto.Enum): INACTIVE (2): Role is inactive. """ + ROLE_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/site_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/site_enums.py index 46e54da4e27c..efac6f21f6a8 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/site_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/site_enums.py @@ -48,6 +48,7 @@ class SiteDisapprovalReason(proto.Enum): The parent must be an authorized seller of the child network's inventory. """ + SITE_DISAPPROVAL_REASON_UNSPECIFIED = 0 CONTENT = 1 OTHER = 2 @@ -84,6 +85,7 @@ class SiteApprovalStatus(proto.Enum): be reviwed with an estimated turn-around time of 24h. Such a site cannot serve ads. """ + SITE_APPROVAL_STATUS_UNSPECIFIED = 0 APPROVED = 1 DISAPPROVED = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/site_messages.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/site_messages.py index a7ceb9fe8624..aa672234b5de 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/site_messages.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/site_messages.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import site_enums diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/site_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/site_service.py index c646b1f70a1e..bacda48c6eea 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/site_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/site_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import site_messages diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/size_type_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/size_type_enum.py index 7fefa507635c..0f58b8ddfd1b 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/size_type_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/size_type_enum.py @@ -65,6 +65,7 @@ class SizeType(proto.Enum): Audio size. Used with audio ads. This must be used with 1x1 size. """ + SIZE_TYPE_UNSPECIFIED = 0 PIXEL = 1 ASPECT_RATIO = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/targeted_video_bumper_type_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/targeted_video_bumper_type_enum.py index 87c5ef66a0c5..05ea7760e22f 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/targeted_video_bumper_type_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/targeted_video_bumper_type_enum.py @@ -49,6 +49,7 @@ class TargetedVideoBumperType(proto.Enum): Represents the bumper position before the ad pod. """ + TARGETED_VIDEO_BUMPER_TYPE_UNSPECIFIED = 0 AFTER = 1 BEFORE = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/targeting.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/targeting.py index 1fa0ecd646a5..2d5659b834ee 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/targeting.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/targeting.py @@ -577,12 +577,12 @@ class CustomTargeting(proto.Message): together. """ - custom_targeting_clauses: MutableSequence[ - "CustomTargetingClause" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CustomTargetingClause", + custom_targeting_clauses: MutableSequence["CustomTargetingClause"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CustomTargetingClause", + ) ) @@ -602,26 +602,26 @@ class CustomTargetingClause(proto.Message): metadata. """ - custom_targeting_literals: MutableSequence[ - "CustomTargetingLiteral" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CustomTargetingLiteral", - ) - audience_segment_targetings: MutableSequence[ - "AudienceSegmentTargeting" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="AudienceSegmentTargeting", - ) - cms_metadata_targetings: MutableSequence[ - "CmsMetadataTargeting" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="CmsMetadataTargeting", + custom_targeting_literals: MutableSequence["CustomTargetingLiteral"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CustomTargetingLiteral", + ) + ) + audience_segment_targetings: MutableSequence["AudienceSegmentTargeting"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="AudienceSegmentTargeting", + ) + ) + cms_metadata_targetings: MutableSequence["CmsMetadataTargeting"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="CmsMetadataTargeting", + ) ) diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/taxonomy_type_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/taxonomy_type_enum.py index e03d32877e47..c86791b73f37 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/taxonomy_type_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/taxonomy_type_enum.py @@ -53,6 +53,7 @@ class TaxonomyType(proto.Enum): TAXONOMY_GOOGLE_STRUCTURED_VIDEO_1_0 (7): The PPS structured video signals taxonomy. """ + TAXONOMY_TYPE_UNSPECIFIED = 0 TAXONOMY_IAB_AUDIENCE_1_1 = 3 TAXONOMY_IAB_CONTENT_1_0 = 8 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/team_enums.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/team_enums.py index 30932486144d..0380ac67becc 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/team_enums.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/team_enums.py @@ -46,6 +46,7 @@ class TeamStatus(proto.Enum): INACTIVE (2): The status of an inactive team. """ + TEAM_STATUS_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 @@ -73,6 +74,7 @@ class TeamAccessType(proto.Enum): The level of access in which team members can view and edit a team's orders. """ + TEAM_ACCESS_TYPE_UNSPECIFIED = 0 NONE = 1 READ_ONLY = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/team_service.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/team_service.py index ad7ca1e8e61e..857b21056c46 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/team_service.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/team_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ads.admanager_v1.types import team_messages diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/time_unit_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/time_unit_enum.py index 5742c7489ceb..5c1ffd025045 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/time_unit_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/time_unit_enum.py @@ -55,6 +55,7 @@ class TimeUnit(proto.Enum): Per video stream. Only valid for entities in a VIDEO_PLAYER environment. """ + TIME_UNIT_UNSPECIFIED = 0 MINUTE = 1 HOUR = 2 diff --git a/packages/google-ads-admanager/google/ads/admanager_v1/types/video_position_enum.py b/packages/google-ads-admanager/google/ads/admanager_v1/types/video_position_enum.py index 3fca184ec0fb..87f4f1cf2202 100644 --- a/packages/google-ads-admanager/google/ads/admanager_v1/types/video_position_enum.py +++ b/packages/google-ads-admanager/google/ads/admanager_v1/types/video_position_enum.py @@ -49,6 +49,7 @@ class VideoPosition(proto.Enum): PREROLL (4): Target ad placement before the video starts. """ + VIDEO_POSITION_UNSPECIFIED = 0 ALL = 1 MIDROLL = 2 diff --git a/packages/google-ads-admanager/noxfile.py b/packages/google-ads-admanager/noxfile.py index f5011758666f..43f4ad2b96ad 100644 --- a/packages/google-ads-admanager/noxfile.py +++ b/packages/google-ads-admanager/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_break_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_break_service.py index d38bc685ee56..e36571da016b 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_break_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_break_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.ad_break_service import ( AdBreakServiceClient, @@ -907,10 +912,9 @@ def test_ad_break_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +959,9 @@ def test_ad_break_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +997,9 @@ def test_ad_break_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2248,8 +2250,9 @@ def test_get_ad_break_rest_bad_request(request_type=ad_break_service.GetAdBreakR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2333,17 +2336,19 @@ def test_get_ad_break_rest_interceptors(null_interceptor): ) client = AdBreakServiceClient(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.AdBreakServiceRestInterceptor, "post_get_ad_break" - ) as post, mock.patch.object( - transports.AdBreakServiceRestInterceptor, "post_get_ad_break_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AdBreakServiceRestInterceptor, "pre_get_ad_break" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, "post_get_ad_break" + ) as post, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, "post_get_ad_break_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, "pre_get_ad_break" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2396,8 +2401,9 @@ def test_list_ad_breaks_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2462,17 +2468,20 @@ def test_list_ad_breaks_rest_interceptors(null_interceptor): ) client = AdBreakServiceClient(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.AdBreakServiceRestInterceptor, "post_list_ad_breaks" - ) as post, mock.patch.object( - transports.AdBreakServiceRestInterceptor, "post_list_ad_breaks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AdBreakServiceRestInterceptor, "pre_list_ad_breaks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, "post_list_ad_breaks" + ) as post, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, + "post_list_ad_breaks_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, "pre_list_ad_breaks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2530,8 +2539,9 @@ def test_create_ad_break_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2693,17 +2703,20 @@ def test_create_ad_break_rest_interceptors(null_interceptor): ) client = AdBreakServiceClient(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.AdBreakServiceRestInterceptor, "post_create_ad_break" - ) as post, mock.patch.object( - transports.AdBreakServiceRestInterceptor, "post_create_ad_break_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AdBreakServiceRestInterceptor, "pre_create_ad_break" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, "post_create_ad_break" + ) as post, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, + "post_create_ad_break_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, "pre_create_ad_break" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2760,8 +2773,9 @@ def test_update_ad_break_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2927,17 +2941,20 @@ def test_update_ad_break_rest_interceptors(null_interceptor): ) client = AdBreakServiceClient(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.AdBreakServiceRestInterceptor, "post_update_ad_break" - ) as post, mock.patch.object( - transports.AdBreakServiceRestInterceptor, "post_update_ad_break_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AdBreakServiceRestInterceptor, "pre_update_ad_break" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, "post_update_ad_break" + ) as post, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, + "post_update_ad_break_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, "pre_update_ad_break" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2992,8 +3009,9 @@ def test_delete_ad_break_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3052,13 +3070,13 @@ def test_delete_ad_break_rest_interceptors(null_interceptor): ) client = AdBreakServiceClient(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.AdBreakServiceRestInterceptor, "pre_delete_ad_break" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdBreakServiceRestInterceptor, "pre_delete_ad_break" + ) as pre, + ): pre.assert_not_called() pb_message = ad_break_service.DeleteAdBreakRequest.pb( ad_break_service.DeleteAdBreakRequest() @@ -3105,8 +3123,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3308,11 +3327,14 @@ def test_ad_break_service_base_transport(): def test_ad_break_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.ad_break_service.transports.AdBreakServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.ad_break_service.transports.AdBreakServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AdBreakServiceTransport( @@ -3329,9 +3351,12 @@ def test_ad_break_service_base_transport_with_credentials_file(): def test_ad_break_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.ad_break_service.transports.AdBreakServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.ad_break_service.transports.AdBreakServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AdBreakServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_review_center_ad_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_review_center_ad_service.py index f5dc50b02789..00c0cf7e6511 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_review_center_ad_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_review_center_ad_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.ads.admanager_v1.services.ad_review_center_ad_service import ( AdReviewCenterAdServiceClient, @@ -950,10 +950,9 @@ def test_ad_review_center_ad_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +997,9 @@ def test_ad_review_center_ad_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1035,9 @@ def test_ad_review_center_ad_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1973,8 +1970,9 @@ def test_search_ad_review_center_ads_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2039,20 +2037,22 @@ def test_search_ad_review_center_ads_rest_interceptors(null_interceptor): ) client = AdReviewCenterAdServiceClient(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.AdReviewCenterAdServiceRestInterceptor, - "post_search_ad_review_center_ads", - ) as post, mock.patch.object( - transports.AdReviewCenterAdServiceRestInterceptor, - "post_search_ad_review_center_ads_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AdReviewCenterAdServiceRestInterceptor, - "pre_search_ad_review_center_ads", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdReviewCenterAdServiceRestInterceptor, + "post_search_ad_review_center_ads", + ) as post, + mock.patch.object( + transports.AdReviewCenterAdServiceRestInterceptor, + "post_search_ad_review_center_ads_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdReviewCenterAdServiceRestInterceptor, + "pre_search_ad_review_center_ads", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2114,8 +2114,9 @@ def test_batch_allow_ad_review_center_ads_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2172,22 +2173,23 @@ def test_batch_allow_ad_review_center_ads_rest_interceptors(null_interceptor): ) client = AdReviewCenterAdServiceClient(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.AdReviewCenterAdServiceRestInterceptor, - "post_batch_allow_ad_review_center_ads", - ) as post, mock.patch.object( - transports.AdReviewCenterAdServiceRestInterceptor, - "post_batch_allow_ad_review_center_ads_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AdReviewCenterAdServiceRestInterceptor, - "pre_batch_allow_ad_review_center_ads", - ) as pre: + 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.AdReviewCenterAdServiceRestInterceptor, + "post_batch_allow_ad_review_center_ads", + ) as post, + mock.patch.object( + transports.AdReviewCenterAdServiceRestInterceptor, + "post_batch_allow_ad_review_center_ads_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdReviewCenterAdServiceRestInterceptor, + "pre_batch_allow_ad_review_center_ads", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2240,8 +2242,9 @@ def test_batch_block_ad_review_center_ads_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2298,22 +2301,23 @@ def test_batch_block_ad_review_center_ads_rest_interceptors(null_interceptor): ) client = AdReviewCenterAdServiceClient(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.AdReviewCenterAdServiceRestInterceptor, - "post_batch_block_ad_review_center_ads", - ) as post, mock.patch.object( - transports.AdReviewCenterAdServiceRestInterceptor, - "post_batch_block_ad_review_center_ads_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AdReviewCenterAdServiceRestInterceptor, - "pre_batch_block_ad_review_center_ads", - ) as pre: + 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.AdReviewCenterAdServiceRestInterceptor, + "post_batch_block_ad_review_center_ads", + ) as post, + mock.patch.object( + transports.AdReviewCenterAdServiceRestInterceptor, + "post_batch_block_ad_review_center_ads_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdReviewCenterAdServiceRestInterceptor, + "pre_batch_block_ad_review_center_ads", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2368,8 +2372,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2557,11 +2562,14 @@ def test_ad_review_center_ad_service_base_transport(): def test_ad_review_center_ad_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.ad_review_center_ad_service.transports.AdReviewCenterAdServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.ad_review_center_ad_service.transports.AdReviewCenterAdServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AdReviewCenterAdServiceTransport( @@ -2578,9 +2586,12 @@ def test_ad_review_center_ad_service_base_transport_with_credentials_file(): def test_ad_review_center_ad_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.ad_review_center_ad_service.transports.AdReviewCenterAdServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.ad_review_center_ad_service.transports.AdReviewCenterAdServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AdReviewCenterAdServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_unit_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_unit_service.py index 62670ac85104..6d6ada214963 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_unit_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_ad_unit_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.ad_unit_service import ( AdUnitServiceClient, @@ -905,10 +910,9 @@ def test_ad_unit_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -953,10 +957,9 @@ def test_ad_unit_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -992,10 +995,9 @@ def test_ad_unit_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1610,9 +1612,9 @@ def test_list_ad_unit_sizes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ad_unit_sizes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ad_unit_sizes] = ( + mock_rpc + ) request = {} client.list_ad_unit_sizes(request) @@ -2247,9 +2249,9 @@ def test_batch_create_ad_units_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_ad_units - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_ad_units] = ( + mock_rpc + ) request = {} client.batch_create_ad_units(request) @@ -2440,9 +2442,9 @@ def test_batch_update_ad_units_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_ad_units - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_ad_units] = ( + mock_rpc + ) request = {} client.batch_update_ad_units(request) @@ -3038,9 +3040,9 @@ def test_batch_archive_ad_units_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_archive_ad_units - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_archive_ad_units] = ( + mock_rpc + ) request = {} client.batch_archive_ad_units(request) @@ -3302,8 +3304,9 @@ def test_get_ad_unit_rest_bad_request(request_type=ad_unit_service.GetAdUnitRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3409,17 +3412,19 @@ def test_get_ad_unit_rest_interceptors(null_interceptor): ) client = AdUnitServiceClient(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.AdUnitServiceRestInterceptor, "post_get_ad_unit" - ) as post, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "post_get_ad_unit_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "pre_get_ad_unit" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_get_ad_unit" + ) as post, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_get_ad_unit_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "pre_get_ad_unit" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3472,8 +3477,9 @@ def test_list_ad_units_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3538,17 +3544,19 @@ def test_list_ad_units_rest_interceptors(null_interceptor): ) client = AdUnitServiceClient(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.AdUnitServiceRestInterceptor, "post_list_ad_units" - ) as post, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "post_list_ad_units_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "pre_list_ad_units" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_list_ad_units" + ) as post, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_list_ad_units_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "pre_list_ad_units" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3606,8 +3614,9 @@ def test_list_ad_unit_sizes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3672,17 +3681,20 @@ def test_list_ad_unit_sizes_rest_interceptors(null_interceptor): ) client = AdUnitServiceClient(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.AdUnitServiceRestInterceptor, "post_list_ad_unit_sizes" - ) as post, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "post_list_ad_unit_sizes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "pre_list_ad_unit_sizes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_list_ad_unit_sizes" + ) as post, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, + "post_list_ad_unit_sizes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "pre_list_ad_unit_sizes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3740,8 +3752,9 @@ def test_create_ad_unit_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3962,17 +3975,19 @@ def test_create_ad_unit_rest_interceptors(null_interceptor): ) client = AdUnitServiceClient(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.AdUnitServiceRestInterceptor, "post_create_ad_unit" - ) as post, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "post_create_ad_unit_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "pre_create_ad_unit" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_create_ad_unit" + ) as post, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_create_ad_unit_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "pre_create_ad_unit" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4025,8 +4040,9 @@ def test_update_ad_unit_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4247,17 +4263,19 @@ def test_update_ad_unit_rest_interceptors(null_interceptor): ) client = AdUnitServiceClient(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.AdUnitServiceRestInterceptor, "post_update_ad_unit" - ) as post, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "post_update_ad_unit_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "pre_update_ad_unit" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_update_ad_unit" + ) as post, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_update_ad_unit_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "pre_update_ad_unit" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4310,8 +4328,9 @@ def test_batch_create_ad_units_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4371,18 +4390,20 @@ def test_batch_create_ad_units_rest_interceptors(null_interceptor): ) client = AdUnitServiceClient(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.AdUnitServiceRestInterceptor, "post_batch_create_ad_units" - ) as post, mock.patch.object( - transports.AdUnitServiceRestInterceptor, - "post_batch_create_ad_units_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "pre_batch_create_ad_units" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_batch_create_ad_units" + ) as post, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, + "post_batch_create_ad_units_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "pre_batch_create_ad_units" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4440,8 +4461,9 @@ def test_batch_update_ad_units_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4501,18 +4523,20 @@ def test_batch_update_ad_units_rest_interceptors(null_interceptor): ) client = AdUnitServiceClient(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.AdUnitServiceRestInterceptor, "post_batch_update_ad_units" - ) as post, mock.patch.object( - transports.AdUnitServiceRestInterceptor, - "post_batch_update_ad_units_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "pre_batch_update_ad_units" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_batch_update_ad_units" + ) as post, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, + "post_batch_update_ad_units_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "pre_batch_update_ad_units" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4570,8 +4594,9 @@ def test_batch_activate_ad_units_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4631,18 +4656,20 @@ def test_batch_activate_ad_units_rest_interceptors(null_interceptor): ) client = AdUnitServiceClient(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.AdUnitServiceRestInterceptor, "post_batch_activate_ad_units" - ) as post, mock.patch.object( - transports.AdUnitServiceRestInterceptor, - "post_batch_activate_ad_units_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "pre_batch_activate_ad_units" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_batch_activate_ad_units" + ) as post, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, + "post_batch_activate_ad_units_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "pre_batch_activate_ad_units" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4700,8 +4727,9 @@ def test_batch_deactivate_ad_units_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4761,18 +4789,20 @@ def test_batch_deactivate_ad_units_rest_interceptors(null_interceptor): ) client = AdUnitServiceClient(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.AdUnitServiceRestInterceptor, "post_batch_deactivate_ad_units" - ) as post, mock.patch.object( - transports.AdUnitServiceRestInterceptor, - "post_batch_deactivate_ad_units_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "pre_batch_deactivate_ad_units" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_batch_deactivate_ad_units" + ) as post, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, + "post_batch_deactivate_ad_units_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "pre_batch_deactivate_ad_units" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4830,8 +4860,9 @@ def test_batch_archive_ad_units_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4891,18 +4922,20 @@ def test_batch_archive_ad_units_rest_interceptors(null_interceptor): ) client = AdUnitServiceClient(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.AdUnitServiceRestInterceptor, "post_batch_archive_ad_units" - ) as post, mock.patch.object( - transports.AdUnitServiceRestInterceptor, - "post_batch_archive_ad_units_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AdUnitServiceRestInterceptor, "pre_batch_archive_ad_units" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "post_batch_archive_ad_units" + ) as post, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, + "post_batch_archive_ad_units_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdUnitServiceRestInterceptor, "pre_batch_archive_ad_units" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4962,8 +4995,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5282,11 +5316,14 @@ def test_ad_unit_service_base_transport(): def test_ad_unit_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.ad_unit_service.transports.AdUnitServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.ad_unit_service.transports.AdUnitServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AdUnitServiceTransport( @@ -5303,9 +5340,12 @@ def test_ad_unit_service_base_transport_with_credentials_file(): def test_ad_unit_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.ad_unit_service.transports.AdUnitServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.ad_unit_service.transports.AdUnitServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AdUnitServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_application_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_application_service.py index 5f022949099d..63d5b96457d7 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_application_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_application_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -923,10 +928,9 @@ def test_application_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +975,9 @@ def test_application_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1013,9 @@ def test_application_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1371,9 +1373,9 @@ def test_list_applications_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_applications - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_applications] = ( + mock_rpc + ) request = {} client.list_applications(request) @@ -1705,8 +1707,9 @@ def test_get_application_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1771,18 +1774,20 @@ def test_get_application_rest_interceptors(null_interceptor): ) client = ApplicationServiceClient(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.ApplicationServiceRestInterceptor, "post_get_application" - ) as post, mock.patch.object( - transports.ApplicationServiceRestInterceptor, - "post_get_application_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApplicationServiceRestInterceptor, "pre_get_application" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApplicationServiceRestInterceptor, "post_get_application" + ) as post, + mock.patch.object( + transports.ApplicationServiceRestInterceptor, + "post_get_application_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApplicationServiceRestInterceptor, "pre_get_application" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1837,8 +1842,9 @@ def test_list_applications_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1903,18 +1909,20 @@ def test_list_applications_rest_interceptors(null_interceptor): ) client = ApplicationServiceClient(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.ApplicationServiceRestInterceptor, "post_list_applications" - ) as post, mock.patch.object( - transports.ApplicationServiceRestInterceptor, - "post_list_applications_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApplicationServiceRestInterceptor, "pre_list_applications" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApplicationServiceRestInterceptor, "post_list_applications" + ) as post, + mock.patch.object( + transports.ApplicationServiceRestInterceptor, + "post_list_applications_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApplicationServiceRestInterceptor, "pre_list_applications" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1974,8 +1982,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2116,11 +2125,14 @@ def test_application_service_base_transport(): def test_application_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.application_service.transports.ApplicationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.application_service.transports.ApplicationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApplicationServiceTransport( @@ -2137,9 +2149,12 @@ def test_application_service_base_transport_with_credentials_file(): def test_application_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.application_service.transports.ApplicationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.application_service.transports.ApplicationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApplicationServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_audience_segment_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_audience_segment_service.py index b1a67cc50279..a8b348a5980e 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_audience_segment_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_audience_segment_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -938,10 +943,9 @@ def test_audience_segment_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +990,9 @@ def test_audience_segment_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1028,9 @@ def test_audience_segment_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1216,9 +1218,9 @@ def test_get_audience_segment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_audience_segment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_audience_segment] = ( + mock_rpc + ) request = {} client.get_audience_segment(request) @@ -1398,9 +1400,9 @@ def test_list_audience_segments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_audience_segments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_audience_segments] = ( + mock_rpc + ) request = {} client.list_audience_segments(request) @@ -1740,8 +1742,9 @@ def test_get_audience_segment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1806,18 +1809,21 @@ def test_get_audience_segment_rest_interceptors(null_interceptor): ) client = AudienceSegmentServiceClient(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.AudienceSegmentServiceRestInterceptor, "post_get_audience_segment" - ) as post, mock.patch.object( - transports.AudienceSegmentServiceRestInterceptor, - "post_get_audience_segment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AudienceSegmentServiceRestInterceptor, "pre_get_audience_segment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AudienceSegmentServiceRestInterceptor, + "post_get_audience_segment", + ) as post, + mock.patch.object( + transports.AudienceSegmentServiceRestInterceptor, + "post_get_audience_segment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AudienceSegmentServiceRestInterceptor, "pre_get_audience_segment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1875,8 +1881,9 @@ def test_list_audience_segments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1943,18 +1950,22 @@ def test_list_audience_segments_rest_interceptors(null_interceptor): ) client = AudienceSegmentServiceClient(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.AudienceSegmentServiceRestInterceptor, "post_list_audience_segments" - ) as post, mock.patch.object( - transports.AudienceSegmentServiceRestInterceptor, - "post_list_audience_segments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AudienceSegmentServiceRestInterceptor, "pre_list_audience_segments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AudienceSegmentServiceRestInterceptor, + "post_list_audience_segments", + ) as post, + mock.patch.object( + transports.AudienceSegmentServiceRestInterceptor, + "post_list_audience_segments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AudienceSegmentServiceRestInterceptor, + "pre_list_audience_segments", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2014,8 +2025,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2158,11 +2170,14 @@ def test_audience_segment_service_base_transport(): def test_audience_segment_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.audience_segment_service.transports.AudienceSegmentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.audience_segment_service.transports.AudienceSegmentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AudienceSegmentServiceTransport( @@ -2179,9 +2194,12 @@ def test_audience_segment_service_base_transport_with_credentials_file(): def test_audience_segment_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.audience_segment_service.transports.AudienceSegmentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.audience_segment_service.transports.AudienceSegmentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AudienceSegmentServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_bandwidth_group_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_bandwidth_group_service.py index a485e8c6c06e..21e91c0b44a9 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_bandwidth_group_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_bandwidth_group_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -934,10 +939,9 @@ def test_bandwidth_group_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +986,9 @@ def test_bandwidth_group_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1024,9 @@ def test_bandwidth_group_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1212,9 +1214,9 @@ def test_get_bandwidth_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_bandwidth_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_bandwidth_group] = ( + mock_rpc + ) request = {} client.get_bandwidth_group(request) @@ -1394,9 +1396,9 @@ def test_list_bandwidth_groups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_bandwidth_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_bandwidth_groups] = ( + mock_rpc + ) request = {} client.list_bandwidth_groups(request) @@ -1736,8 +1738,9 @@ def test_get_bandwidth_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1802,18 +1805,20 @@ def test_get_bandwidth_group_rest_interceptors(null_interceptor): ) client = BandwidthGroupServiceClient(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.BandwidthGroupServiceRestInterceptor, "post_get_bandwidth_group" - ) as post, mock.patch.object( - transports.BandwidthGroupServiceRestInterceptor, - "post_get_bandwidth_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BandwidthGroupServiceRestInterceptor, "pre_get_bandwidth_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BandwidthGroupServiceRestInterceptor, "post_get_bandwidth_group" + ) as post, + mock.patch.object( + transports.BandwidthGroupServiceRestInterceptor, + "post_get_bandwidth_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BandwidthGroupServiceRestInterceptor, "pre_get_bandwidth_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1871,8 +1876,9 @@ def test_list_bandwidth_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1939,18 +1945,21 @@ def test_list_bandwidth_groups_rest_interceptors(null_interceptor): ) client = BandwidthGroupServiceClient(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.BandwidthGroupServiceRestInterceptor, "post_list_bandwidth_groups" - ) as post, mock.patch.object( - transports.BandwidthGroupServiceRestInterceptor, - "post_list_bandwidth_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BandwidthGroupServiceRestInterceptor, "pre_list_bandwidth_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BandwidthGroupServiceRestInterceptor, + "post_list_bandwidth_groups", + ) as post, + mock.patch.object( + transports.BandwidthGroupServiceRestInterceptor, + "post_list_bandwidth_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BandwidthGroupServiceRestInterceptor, "pre_list_bandwidth_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2010,8 +2019,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2154,11 +2164,14 @@ def test_bandwidth_group_service_base_transport(): def test_bandwidth_group_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.bandwidth_group_service.transports.BandwidthGroupServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.bandwidth_group_service.transports.BandwidthGroupServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BandwidthGroupServiceTransport( @@ -2175,9 +2188,12 @@ def test_bandwidth_group_service_base_transport_with_credentials_file(): def test_bandwidth_group_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.bandwidth_group_service.transports.BandwidthGroupServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.bandwidth_group_service.transports.BandwidthGroupServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BandwidthGroupServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_language_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_language_service.py index 8e61d01e4720..35b36a5f0451 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_language_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_language_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -938,10 +943,9 @@ def test_browser_language_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +990,9 @@ def test_browser_language_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1028,9 @@ def test_browser_language_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1216,9 +1218,9 @@ def test_get_browser_language_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_browser_language - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_browser_language] = ( + mock_rpc + ) request = {} client.get_browser_language(request) @@ -1398,9 +1400,9 @@ def test_list_browser_languages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_browser_languages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_browser_languages] = ( + mock_rpc + ) request = {} client.list_browser_languages(request) @@ -1740,8 +1742,9 @@ def test_get_browser_language_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1806,18 +1809,21 @@ def test_get_browser_language_rest_interceptors(null_interceptor): ) client = BrowserLanguageServiceClient(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.BrowserLanguageServiceRestInterceptor, "post_get_browser_language" - ) as post, mock.patch.object( - transports.BrowserLanguageServiceRestInterceptor, - "post_get_browser_language_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BrowserLanguageServiceRestInterceptor, "pre_get_browser_language" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BrowserLanguageServiceRestInterceptor, + "post_get_browser_language", + ) as post, + mock.patch.object( + transports.BrowserLanguageServiceRestInterceptor, + "post_get_browser_language_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BrowserLanguageServiceRestInterceptor, "pre_get_browser_language" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1875,8 +1881,9 @@ def test_list_browser_languages_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1943,18 +1950,22 @@ def test_list_browser_languages_rest_interceptors(null_interceptor): ) client = BrowserLanguageServiceClient(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.BrowserLanguageServiceRestInterceptor, "post_list_browser_languages" - ) as post, mock.patch.object( - transports.BrowserLanguageServiceRestInterceptor, - "post_list_browser_languages_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BrowserLanguageServiceRestInterceptor, "pre_list_browser_languages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BrowserLanguageServiceRestInterceptor, + "post_list_browser_languages", + ) as post, + mock.patch.object( + transports.BrowserLanguageServiceRestInterceptor, + "post_list_browser_languages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BrowserLanguageServiceRestInterceptor, + "pre_list_browser_languages", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2014,8 +2025,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2158,11 +2170,14 @@ def test_browser_language_service_base_transport(): def test_browser_language_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.browser_language_service.transports.BrowserLanguageServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.browser_language_service.transports.BrowserLanguageServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BrowserLanguageServiceTransport( @@ -2179,9 +2194,12 @@ def test_browser_language_service_base_transport_with_credentials_file(): def test_browser_language_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.browser_language_service.transports.BrowserLanguageServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.browser_language_service.transports.BrowserLanguageServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BrowserLanguageServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_service.py index fe491e7e8ad6..1da37a3aea35 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_browser_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -896,10 +901,9 @@ def test_browser_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -944,10 +948,9 @@ def test_browser_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +986,9 @@ def test_browser_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1669,8 +1671,9 @@ def test_get_browser_rest_bad_request(request_type=browser_service.GetBrowserReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1739,17 +1742,19 @@ def test_get_browser_rest_interceptors(null_interceptor): ) client = BrowserServiceClient(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.BrowserServiceRestInterceptor, "post_get_browser" - ) as post, mock.patch.object( - transports.BrowserServiceRestInterceptor, "post_get_browser_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BrowserServiceRestInterceptor, "pre_get_browser" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BrowserServiceRestInterceptor, "post_get_browser" + ) as post, + mock.patch.object( + transports.BrowserServiceRestInterceptor, "post_get_browser_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BrowserServiceRestInterceptor, "pre_get_browser" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1802,8 +1807,9 @@ def test_list_browsers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1868,17 +1874,19 @@ def test_list_browsers_rest_interceptors(null_interceptor): ) client = BrowserServiceClient(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.BrowserServiceRestInterceptor, "post_list_browsers" - ) as post, mock.patch.object( - transports.BrowserServiceRestInterceptor, "post_list_browsers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BrowserServiceRestInterceptor, "pre_list_browsers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BrowserServiceRestInterceptor, "post_list_browsers" + ) as post, + mock.patch.object( + transports.BrowserServiceRestInterceptor, "post_list_browsers_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BrowserServiceRestInterceptor, "pre_list_browsers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1938,8 +1946,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2078,11 +2087,14 @@ def test_browser_service_base_transport(): def test_browser_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.browser_service.transports.BrowserServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.browser_service.transports.BrowserServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BrowserServiceTransport( @@ -2099,9 +2111,12 @@ def test_browser_service_base_transport_with_credentials_file(): def test_browser_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.browser_service.transports.BrowserServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.browser_service.transports.BrowserServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BrowserServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_key_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_key_service.py index 936e2d4fb511..d5ea4f491743 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_key_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_key_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -937,10 +942,9 @@ def test_cms_metadata_key_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +989,9 @@ def test_cms_metadata_key_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1027,9 @@ def test_cms_metadata_key_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1215,9 +1217,9 @@ def test_get_cms_metadata_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cms_metadata_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cms_metadata_key] = ( + mock_rpc + ) request = {} client.get_cms_metadata_key(request) @@ -1397,9 +1399,9 @@ def test_list_cms_metadata_keys_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cms_metadata_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cms_metadata_keys] = ( + mock_rpc + ) request = {} client.list_cms_metadata_keys(request) @@ -1739,8 +1741,9 @@ def test_get_cms_metadata_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1810,18 +1813,20 @@ def test_get_cms_metadata_key_rest_interceptors(null_interceptor): ) client = CmsMetadataKeyServiceClient(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.CmsMetadataKeyServiceRestInterceptor, "post_get_cms_metadata_key" - ) as post, mock.patch.object( - transports.CmsMetadataKeyServiceRestInterceptor, - "post_get_cms_metadata_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmsMetadataKeyServiceRestInterceptor, "pre_get_cms_metadata_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CmsMetadataKeyServiceRestInterceptor, "post_get_cms_metadata_key" + ) as post, + mock.patch.object( + transports.CmsMetadataKeyServiceRestInterceptor, + "post_get_cms_metadata_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmsMetadataKeyServiceRestInterceptor, "pre_get_cms_metadata_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1879,8 +1884,9 @@ def test_list_cms_metadata_keys_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1947,18 +1953,22 @@ def test_list_cms_metadata_keys_rest_interceptors(null_interceptor): ) client = CmsMetadataKeyServiceClient(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.CmsMetadataKeyServiceRestInterceptor, "post_list_cms_metadata_keys" - ) as post, mock.patch.object( - transports.CmsMetadataKeyServiceRestInterceptor, - "post_list_cms_metadata_keys_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmsMetadataKeyServiceRestInterceptor, "pre_list_cms_metadata_keys" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CmsMetadataKeyServiceRestInterceptor, + "post_list_cms_metadata_keys", + ) as post, + mock.patch.object( + transports.CmsMetadataKeyServiceRestInterceptor, + "post_list_cms_metadata_keys_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmsMetadataKeyServiceRestInterceptor, + "pre_list_cms_metadata_keys", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2018,8 +2028,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2162,11 +2173,14 @@ def test_cms_metadata_key_service_base_transport(): def test_cms_metadata_key_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.cms_metadata_key_service.transports.CmsMetadataKeyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.cms_metadata_key_service.transports.CmsMetadataKeyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CmsMetadataKeyServiceTransport( @@ -2183,9 +2197,12 @@ def test_cms_metadata_key_service_base_transport_with_credentials_file(): def test_cms_metadata_key_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.cms_metadata_key_service.transports.CmsMetadataKeyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.cms_metadata_key_service.transports.CmsMetadataKeyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CmsMetadataKeyServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_value_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_value_service.py index db69139275fa..d17d8e238857 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_value_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_cms_metadata_value_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -939,10 +944,9 @@ def test_cms_metadata_value_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +991,9 @@ def test_cms_metadata_value_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1029,9 @@ def test_cms_metadata_value_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1218,9 +1220,9 @@ def test_get_cms_metadata_value_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cms_metadata_value - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cms_metadata_value] = ( + mock_rpc + ) request = {} client.get_cms_metadata_value(request) @@ -1742,8 +1744,9 @@ def test_get_cms_metadata_value_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1815,18 +1818,22 @@ def test_get_cms_metadata_value_rest_interceptors(null_interceptor): ) client = CmsMetadataValueServiceClient(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.CmsMetadataValueServiceRestInterceptor, "post_get_cms_metadata_value" - ) as post, mock.patch.object( - transports.CmsMetadataValueServiceRestInterceptor, - "post_get_cms_metadata_value_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmsMetadataValueServiceRestInterceptor, "pre_get_cms_metadata_value" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CmsMetadataValueServiceRestInterceptor, + "post_get_cms_metadata_value", + ) as post, + mock.patch.object( + transports.CmsMetadataValueServiceRestInterceptor, + "post_get_cms_metadata_value_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmsMetadataValueServiceRestInterceptor, + "pre_get_cms_metadata_value", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1884,8 +1891,9 @@ def test_list_cms_metadata_values_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1952,20 +1960,22 @@ def test_list_cms_metadata_values_rest_interceptors(null_interceptor): ) client = CmsMetadataValueServiceClient(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.CmsMetadataValueServiceRestInterceptor, - "post_list_cms_metadata_values", - ) as post, mock.patch.object( - transports.CmsMetadataValueServiceRestInterceptor, - "post_list_cms_metadata_values_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmsMetadataValueServiceRestInterceptor, - "pre_list_cms_metadata_values", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CmsMetadataValueServiceRestInterceptor, + "post_list_cms_metadata_values", + ) as post, + mock.patch.object( + transports.CmsMetadataValueServiceRestInterceptor, + "post_list_cms_metadata_values_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmsMetadataValueServiceRestInterceptor, + "pre_list_cms_metadata_values", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2025,8 +2035,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2169,11 +2180,14 @@ def test_cms_metadata_value_service_base_transport(): def test_cms_metadata_value_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.cms_metadata_value_service.transports.CmsMetadataValueServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.cms_metadata_value_service.transports.CmsMetadataValueServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CmsMetadataValueServiceTransport( @@ -2190,9 +2204,12 @@ def test_cms_metadata_value_service_base_transport_with_credentials_file(): def test_cms_metadata_value_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.cms_metadata_value_service.transports.CmsMetadataValueServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.cms_metadata_value_service.transports.CmsMetadataValueServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CmsMetadataValueServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_company_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_company_service.py index 9640841ff494..fc52e2d95a2a 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_company_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_company_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.company_service import ( CompanyServiceClient, @@ -902,10 +907,9 @@ def test_company_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +954,9 @@ def test_company_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +992,9 @@ def test_company_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1675,8 +1677,9 @@ def test_get_company_rest_bad_request(request_type=company_service.GetCompanyReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1768,17 +1771,19 @@ def test_get_company_rest_interceptors(null_interceptor): ) client = CompanyServiceClient(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.CompanyServiceRestInterceptor, "post_get_company" - ) as post, mock.patch.object( - transports.CompanyServiceRestInterceptor, "post_get_company_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CompanyServiceRestInterceptor, "pre_get_company" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CompanyServiceRestInterceptor, "post_get_company" + ) as post, + mock.patch.object( + transports.CompanyServiceRestInterceptor, "post_get_company_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CompanyServiceRestInterceptor, "pre_get_company" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1831,8 +1836,9 @@ def test_list_companies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1897,17 +1903,20 @@ def test_list_companies_rest_interceptors(null_interceptor): ) client = CompanyServiceClient(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.CompanyServiceRestInterceptor, "post_list_companies" - ) as post, mock.patch.object( - transports.CompanyServiceRestInterceptor, "post_list_companies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CompanyServiceRestInterceptor, "pre_list_companies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CompanyServiceRestInterceptor, "post_list_companies" + ) as post, + mock.patch.object( + transports.CompanyServiceRestInterceptor, + "post_list_companies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompanyServiceRestInterceptor, "pre_list_companies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1967,8 +1976,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2107,11 +2117,14 @@ def test_company_service_base_transport(): def test_company_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.company_service.transports.CompanyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.company_service.transports.CompanyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompanyServiceTransport( @@ -2128,9 +2141,12 @@ def test_company_service_base_transport_with_credentials_file(): def test_company_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.company_service.transports.CompanyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.company_service.transports.CompanyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompanyServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_contact_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_contact_service.py index 37a249a9ef5b..3c2547043a8d 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_contact_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_contact_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.contact_service import ( ContactServiceClient, @@ -901,10 +906,9 @@ def test_contact_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -949,10 +953,9 @@ def test_contact_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +991,9 @@ def test_contact_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1794,9 +1796,9 @@ def test_batch_create_contacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_contacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_contacts] = ( + mock_rpc + ) request = {} client.batch_create_contacts(request) @@ -2172,9 +2174,9 @@ def test_batch_update_contacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_contacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_contacts] = ( + mock_rpc + ) request = {} client.batch_update_contacts(request) @@ -2440,8 +2442,9 @@ def test_get_contact_rest_bad_request(request_type=contact_service.GetContactReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2526,17 +2529,19 @@ def test_get_contact_rest_interceptors(null_interceptor): ) client = ContactServiceClient(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.ContactServiceRestInterceptor, "post_get_contact" - ) as post, mock.patch.object( - transports.ContactServiceRestInterceptor, "post_get_contact_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContactServiceRestInterceptor, "pre_get_contact" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactServiceRestInterceptor, "post_get_contact" + ) as post, + mock.patch.object( + transports.ContactServiceRestInterceptor, "post_get_contact_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ContactServiceRestInterceptor, "pre_get_contact" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2589,8 +2594,9 @@ def test_list_contacts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2655,17 +2661,19 @@ def test_list_contacts_rest_interceptors(null_interceptor): ) client = ContactServiceClient(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.ContactServiceRestInterceptor, "post_list_contacts" - ) as post, mock.patch.object( - transports.ContactServiceRestInterceptor, "post_list_contacts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContactServiceRestInterceptor, "pre_list_contacts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactServiceRestInterceptor, "post_list_contacts" + ) as post, + mock.patch.object( + transports.ContactServiceRestInterceptor, "post_list_contacts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ContactServiceRestInterceptor, "pre_list_contacts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2723,8 +2731,9 @@ def test_create_contact_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2889,17 +2898,20 @@ def test_create_contact_rest_interceptors(null_interceptor): ) client = ContactServiceClient(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.ContactServiceRestInterceptor, "post_create_contact" - ) as post, mock.patch.object( - transports.ContactServiceRestInterceptor, "post_create_contact_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContactServiceRestInterceptor, "pre_create_contact" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactServiceRestInterceptor, "post_create_contact" + ) as post, + mock.patch.object( + transports.ContactServiceRestInterceptor, + "post_create_contact_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactServiceRestInterceptor, "pre_create_contact" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2952,8 +2964,9 @@ def test_batch_create_contacts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3013,18 +3026,20 @@ def test_batch_create_contacts_rest_interceptors(null_interceptor): ) client = ContactServiceClient(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.ContactServiceRestInterceptor, "post_batch_create_contacts" - ) as post, mock.patch.object( - transports.ContactServiceRestInterceptor, - "post_batch_create_contacts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactServiceRestInterceptor, "pre_batch_create_contacts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactServiceRestInterceptor, "post_batch_create_contacts" + ) as post, + mock.patch.object( + transports.ContactServiceRestInterceptor, + "post_batch_create_contacts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactServiceRestInterceptor, "pre_batch_create_contacts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3082,8 +3097,9 @@ def test_update_contact_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3248,17 +3264,20 @@ def test_update_contact_rest_interceptors(null_interceptor): ) client = ContactServiceClient(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.ContactServiceRestInterceptor, "post_update_contact" - ) as post, mock.patch.object( - transports.ContactServiceRestInterceptor, "post_update_contact_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContactServiceRestInterceptor, "pre_update_contact" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactServiceRestInterceptor, "post_update_contact" + ) as post, + mock.patch.object( + transports.ContactServiceRestInterceptor, + "post_update_contact_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactServiceRestInterceptor, "pre_update_contact" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3311,8 +3330,9 @@ def test_batch_update_contacts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3372,18 +3392,20 @@ def test_batch_update_contacts_rest_interceptors(null_interceptor): ) client = ContactServiceClient(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.ContactServiceRestInterceptor, "post_batch_update_contacts" - ) as post, mock.patch.object( - transports.ContactServiceRestInterceptor, - "post_batch_update_contacts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactServiceRestInterceptor, "pre_batch_update_contacts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactServiceRestInterceptor, "post_batch_update_contacts" + ) as post, + mock.patch.object( + transports.ContactServiceRestInterceptor, + "post_batch_update_contacts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactServiceRestInterceptor, "pre_batch_update_contacts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3443,8 +3465,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3671,11 +3694,14 @@ def test_contact_service_base_transport(): def test_contact_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.contact_service.transports.ContactServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.contact_service.transports.ContactServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContactServiceTransport( @@ -3692,9 +3718,12 @@ def test_contact_service_base_transport_with_credentials_file(): def test_contact_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.contact_service.transports.ContactServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.contact_service.transports.ContactServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContactServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_bundle_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_bundle_service.py index ce93e89b6156..c7a5c0f39385 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_bundle_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_bundle_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -932,10 +937,9 @@ def test_content_bundle_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +984,9 @@ def test_content_bundle_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1022,9 @@ def test_content_bundle_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1210,9 +1212,9 @@ def test_get_content_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_content_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_content_bundle] = ( + mock_rpc + ) request = {} client.get_content_bundle(request) @@ -1390,9 +1392,9 @@ def test_list_content_bundles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_content_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_content_bundles] = ( + mock_rpc + ) request = {} client.list_content_bundles(request) @@ -1731,8 +1733,9 @@ def test_get_content_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1797,18 +1800,20 @@ def test_get_content_bundle_rest_interceptors(null_interceptor): ) client = ContentBundleServiceClient(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.ContentBundleServiceRestInterceptor, "post_get_content_bundle" - ) as post, mock.patch.object( - transports.ContentBundleServiceRestInterceptor, - "post_get_content_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContentBundleServiceRestInterceptor, "pre_get_content_bundle" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentBundleServiceRestInterceptor, "post_get_content_bundle" + ) as post, + mock.patch.object( + transports.ContentBundleServiceRestInterceptor, + "post_get_content_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContentBundleServiceRestInterceptor, "pre_get_content_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1866,8 +1871,9 @@ def test_list_content_bundles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1934,18 +1940,20 @@ def test_list_content_bundles_rest_interceptors(null_interceptor): ) client = ContentBundleServiceClient(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.ContentBundleServiceRestInterceptor, "post_list_content_bundles" - ) as post, mock.patch.object( - transports.ContentBundleServiceRestInterceptor, - "post_list_content_bundles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContentBundleServiceRestInterceptor, "pre_list_content_bundles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentBundleServiceRestInterceptor, "post_list_content_bundles" + ) as post, + mock.patch.object( + transports.ContentBundleServiceRestInterceptor, + "post_list_content_bundles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContentBundleServiceRestInterceptor, "pre_list_content_bundles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2005,8 +2013,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2149,11 +2158,14 @@ def test_content_bundle_service_base_transport(): def test_content_bundle_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.content_bundle_service.transports.ContentBundleServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.content_bundle_service.transports.ContentBundleServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContentBundleServiceTransport( @@ -2170,9 +2182,12 @@ def test_content_bundle_service_base_transport_with_credentials_file(): def test_content_bundle_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.content_bundle_service.transports.ContentBundleServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.content_bundle_service.transports.ContentBundleServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContentBundleServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_label_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_label_service.py index 16f4176eba96..8e32bb1fa66a 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_label_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_label_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -929,10 +934,9 @@ def test_content_label_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +981,9 @@ def test_content_label_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1019,9 @@ def test_content_label_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1205,9 +1207,9 @@ def test_get_content_label_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_content_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_content_label] = ( + mock_rpc + ) request = {} client.get_content_label(request) @@ -1385,9 +1387,9 @@ def test_list_content_labels_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_content_labels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_content_labels] = ( + mock_rpc + ) request = {} client.list_content_labels(request) @@ -1721,8 +1723,9 @@ def test_get_content_label_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1787,18 +1790,20 @@ def test_get_content_label_rest_interceptors(null_interceptor): ) client = ContentLabelServiceClient(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.ContentLabelServiceRestInterceptor, "post_get_content_label" - ) as post, mock.patch.object( - transports.ContentLabelServiceRestInterceptor, - "post_get_content_label_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContentLabelServiceRestInterceptor, "pre_get_content_label" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentLabelServiceRestInterceptor, "post_get_content_label" + ) as post, + mock.patch.object( + transports.ContentLabelServiceRestInterceptor, + "post_get_content_label_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContentLabelServiceRestInterceptor, "pre_get_content_label" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1856,8 +1861,9 @@ def test_list_content_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1922,18 +1928,20 @@ def test_list_content_labels_rest_interceptors(null_interceptor): ) client = ContentLabelServiceClient(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.ContentLabelServiceRestInterceptor, "post_list_content_labels" - ) as post, mock.patch.object( - transports.ContentLabelServiceRestInterceptor, - "post_list_content_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContentLabelServiceRestInterceptor, "pre_list_content_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentLabelServiceRestInterceptor, "post_list_content_labels" + ) as post, + mock.patch.object( + transports.ContentLabelServiceRestInterceptor, + "post_list_content_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContentLabelServiceRestInterceptor, "pre_list_content_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1993,8 +2001,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2137,11 +2146,14 @@ def test_content_label_service_base_transport(): def test_content_label_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.content_label_service.transports.ContentLabelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.content_label_service.transports.ContentLabelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContentLabelServiceTransport( @@ -2158,9 +2170,12 @@ def test_content_label_service_base_transport_with_credentials_file(): def test_content_label_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.content_label_service.transports.ContentLabelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.content_label_service.transports.ContentLabelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContentLabelServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_service.py index ddb5b47f2022..e1560d3a0232 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_content_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -896,10 +901,9 @@ def test_content_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -944,10 +948,9 @@ def test_content_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +986,9 @@ def test_content_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1669,8 +1671,9 @@ def test_get_content_rest_bad_request(request_type=content_service.GetContentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1735,17 +1738,19 @@ def test_get_content_rest_interceptors(null_interceptor): ) client = ContentServiceClient(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.ContentServiceRestInterceptor, "post_get_content" - ) as post, mock.patch.object( - transports.ContentServiceRestInterceptor, "post_get_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContentServiceRestInterceptor, "pre_get_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_get_content" + ) as post, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_get_content_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ContentServiceRestInterceptor, "pre_get_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1796,8 +1801,9 @@ def test_list_content_rest_bad_request(request_type=content_service.ListContentR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1862,17 +1868,19 @@ def test_list_content_rest_interceptors(null_interceptor): ) client = ContentServiceClient(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.ContentServiceRestInterceptor, "post_list_content" - ) as post, mock.patch.object( - transports.ContentServiceRestInterceptor, "post_list_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContentServiceRestInterceptor, "pre_list_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_list_content" + ) as post, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_list_content_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ContentServiceRestInterceptor, "pre_list_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1932,8 +1940,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2072,11 +2081,14 @@ def test_content_service_base_transport(): def test_content_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.content_service.transports.ContentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.content_service.transports.ContentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContentServiceTransport( @@ -2093,9 +2105,12 @@ def test_content_service_base_transport_with_credentials_file(): def test_content_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.content_service.transports.ContentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.content_service.transports.ContentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContentServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_creative_template_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_creative_template_service.py index 80c3a669d23a..ed51c0ee1f3a 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_creative_template_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_creative_template_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -939,10 +944,9 @@ def test_creative_template_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +991,9 @@ def test_creative_template_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1029,9 @@ def test_creative_template_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1218,9 +1220,9 @@ def test_get_creative_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_creative_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_creative_template] = ( + mock_rpc + ) request = {} client.get_creative_template(request) @@ -1742,8 +1744,9 @@ def test_get_creative_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1830,18 +1833,22 @@ def test_get_creative_template_rest_interceptors(null_interceptor): ) client = CreativeTemplateServiceClient(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.CreativeTemplateServiceRestInterceptor, "post_get_creative_template" - ) as post, mock.patch.object( - transports.CreativeTemplateServiceRestInterceptor, - "post_get_creative_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CreativeTemplateServiceRestInterceptor, "pre_get_creative_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CreativeTemplateServiceRestInterceptor, + "post_get_creative_template", + ) as post, + mock.patch.object( + transports.CreativeTemplateServiceRestInterceptor, + "post_get_creative_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CreativeTemplateServiceRestInterceptor, + "pre_get_creative_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1899,8 +1906,9 @@ def test_list_creative_templates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1967,19 +1975,22 @@ def test_list_creative_templates_rest_interceptors(null_interceptor): ) client = CreativeTemplateServiceClient(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.CreativeTemplateServiceRestInterceptor, - "post_list_creative_templates", - ) as post, mock.patch.object( - transports.CreativeTemplateServiceRestInterceptor, - "post_list_creative_templates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CreativeTemplateServiceRestInterceptor, "pre_list_creative_templates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CreativeTemplateServiceRestInterceptor, + "post_list_creative_templates", + ) as post, + mock.patch.object( + transports.CreativeTemplateServiceRestInterceptor, + "post_list_creative_templates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CreativeTemplateServiceRestInterceptor, + "pre_list_creative_templates", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2039,8 +2050,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2183,11 +2195,14 @@ def test_creative_template_service_base_transport(): def test_creative_template_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.creative_template_service.transports.CreativeTemplateServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.creative_template_service.transports.CreativeTemplateServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CreativeTemplateServiceTransport( @@ -2204,9 +2219,12 @@ def test_creative_template_service_base_transport_with_credentials_file(): def test_creative_template_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.creative_template_service.transports.CreativeTemplateServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.creative_template_service.transports.CreativeTemplateServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CreativeTemplateServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_field_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_field_service.py index 224d48866483..b83523fa9e55 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_field_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_field_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.custom_field_service import ( CustomFieldServiceClient, @@ -928,10 +933,9 @@ def test_custom_field_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +980,9 @@ def test_custom_field_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1018,9 @@ def test_custom_field_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1200,9 +1202,9 @@ def test_get_custom_field_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_field - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_field] = ( + mock_rpc + ) request = {} client.get_custom_field(request) @@ -1380,9 +1382,9 @@ def test_list_custom_fields_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_fields - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_fields] = ( + mock_rpc + ) request = {} client.list_custom_fields(request) @@ -1646,9 +1648,9 @@ def test_create_custom_field_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_field - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_field] = ( + mock_rpc + ) request = {} client.create_custom_field(request) @@ -2039,9 +2041,9 @@ def test_update_custom_field_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_custom_field - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_custom_field] = ( + mock_rpc + ) request = {} client.update_custom_field(request) @@ -2913,8 +2915,9 @@ def test_get_custom_field_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3003,18 +3006,20 @@ def test_get_custom_field_rest_interceptors(null_interceptor): ) client = CustomFieldServiceClient(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.CustomFieldServiceRestInterceptor, "post_get_custom_field" - ) as post, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, - "post_get_custom_field_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, "pre_get_custom_field" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, "post_get_custom_field" + ) as post, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "post_get_custom_field_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, "pre_get_custom_field" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3069,8 +3074,9 @@ def test_list_custom_fields_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3135,18 +3141,20 @@ def test_list_custom_fields_rest_interceptors(null_interceptor): ) client = CustomFieldServiceClient(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.CustomFieldServiceRestInterceptor, "post_list_custom_fields" - ) as post, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, - "post_list_custom_fields_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, "pre_list_custom_fields" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, "post_list_custom_fields" + ) as post, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "post_list_custom_fields_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, "pre_list_custom_fields" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3204,8 +3212,9 @@ def test_create_custom_field_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3376,18 +3385,20 @@ def test_create_custom_field_rest_interceptors(null_interceptor): ) client = CustomFieldServiceClient(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.CustomFieldServiceRestInterceptor, "post_create_custom_field" - ) as post, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, - "post_create_custom_field_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, "pre_create_custom_field" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, "post_create_custom_field" + ) as post, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "post_create_custom_field_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, "pre_create_custom_field" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3442,8 +3453,9 @@ def test_batch_create_custom_fields_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3505,18 +3517,22 @@ def test_batch_create_custom_fields_rest_interceptors(null_interceptor): ) client = CustomFieldServiceClient(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.CustomFieldServiceRestInterceptor, "post_batch_create_custom_fields" - ) as post, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, - "post_batch_create_custom_fields_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, "pre_batch_create_custom_fields" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "post_batch_create_custom_fields", + ) as post, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "post_batch_create_custom_fields_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "pre_batch_create_custom_fields", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3574,8 +3590,9 @@ def test_update_custom_field_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3746,18 +3763,20 @@ def test_update_custom_field_rest_interceptors(null_interceptor): ) client = CustomFieldServiceClient(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.CustomFieldServiceRestInterceptor, "post_update_custom_field" - ) as post, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, - "post_update_custom_field_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, "pre_update_custom_field" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, "post_update_custom_field" + ) as post, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "post_update_custom_field_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, "pre_update_custom_field" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3812,8 +3831,9 @@ def test_batch_update_custom_fields_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3875,18 +3895,22 @@ def test_batch_update_custom_fields_rest_interceptors(null_interceptor): ) client = CustomFieldServiceClient(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.CustomFieldServiceRestInterceptor, "post_batch_update_custom_fields" - ) as post, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, - "post_batch_update_custom_fields_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, "pre_batch_update_custom_fields" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "post_batch_update_custom_fields", + ) as post, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "post_batch_update_custom_fields_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "pre_batch_update_custom_fields", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3944,8 +3968,9 @@ def test_batch_activate_custom_fields_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4007,19 +4032,22 @@ def test_batch_activate_custom_fields_rest_interceptors(null_interceptor): ) client = CustomFieldServiceClient(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.CustomFieldServiceRestInterceptor, - "post_batch_activate_custom_fields", - ) as post, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, - "post_batch_activate_custom_fields_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, "pre_batch_activate_custom_fields" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "post_batch_activate_custom_fields", + ) as post, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "post_batch_activate_custom_fields_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "pre_batch_activate_custom_fields", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4077,8 +4105,9 @@ def test_batch_deactivate_custom_fields_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4142,20 +4171,22 @@ def test_batch_deactivate_custom_fields_rest_interceptors(null_interceptor): ) client = CustomFieldServiceClient(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.CustomFieldServiceRestInterceptor, - "post_batch_deactivate_custom_fields", - ) as post, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, - "post_batch_deactivate_custom_fields_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomFieldServiceRestInterceptor, - "pre_batch_deactivate_custom_fields", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "post_batch_deactivate_custom_fields", + ) as post, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "post_batch_deactivate_custom_fields_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomFieldServiceRestInterceptor, + "pre_batch_deactivate_custom_fields", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4215,8 +4246,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4495,11 +4527,14 @@ def test_custom_field_service_base_transport(): def test_custom_field_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.custom_field_service.transports.CustomFieldServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.custom_field_service.transports.CustomFieldServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CustomFieldServiceTransport( @@ -4516,9 +4551,12 @@ def test_custom_field_service_base_transport_with_credentials_file(): def test_custom_field_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.custom_field_service.transports.CustomFieldServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.custom_field_service.transports.CustomFieldServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CustomFieldServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_key_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_key_service.py index ec50834ad229..f0252fdd16b8 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_key_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_key_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.custom_targeting_key_service import ( CustomTargetingKeyServiceClient, @@ -949,10 +954,9 @@ def test_custom_targeting_key_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1001,9 @@ def test_custom_targeting_key_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1039,9 @@ def test_custom_targeting_key_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3023,8 +3025,9 @@ def test_get_custom_targeting_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3108,20 +3111,22 @@ def test_get_custom_targeting_key_rest_interceptors(null_interceptor): ) client = CustomTargetingKeyServiceClient(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.CustomTargetingKeyServiceRestInterceptor, - "post_get_custom_targeting_key", - ) as post, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "post_get_custom_targeting_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "pre_get_custom_targeting_key", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_get_custom_targeting_key", + ) as post, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_get_custom_targeting_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "pre_get_custom_targeting_key", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3179,8 +3184,9 @@ def test_list_custom_targeting_keys_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3247,20 +3253,22 @@ def test_list_custom_targeting_keys_rest_interceptors(null_interceptor): ) client = CustomTargetingKeyServiceClient(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.CustomTargetingKeyServiceRestInterceptor, - "post_list_custom_targeting_keys", - ) as post, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "post_list_custom_targeting_keys_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "pre_list_custom_targeting_keys", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_list_custom_targeting_keys", + ) as post, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_list_custom_targeting_keys_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "pre_list_custom_targeting_keys", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3322,8 +3330,9 @@ def test_create_custom_targeting_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3489,20 +3498,22 @@ def test_create_custom_targeting_key_rest_interceptors(null_interceptor): ) client = CustomTargetingKeyServiceClient(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.CustomTargetingKeyServiceRestInterceptor, - "post_create_custom_targeting_key", - ) as post, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "post_create_custom_targeting_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "pre_create_custom_targeting_key", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_create_custom_targeting_key", + ) as post, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_create_custom_targeting_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "pre_create_custom_targeting_key", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3560,8 +3571,9 @@ def test_batch_create_custom_targeting_keys_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3629,20 +3641,22 @@ def test_batch_create_custom_targeting_keys_rest_interceptors(null_interceptor): ) client = CustomTargetingKeyServiceClient(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.CustomTargetingKeyServiceRestInterceptor, - "post_batch_create_custom_targeting_keys", - ) as post, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "post_batch_create_custom_targeting_keys_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "pre_batch_create_custom_targeting_keys", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_batch_create_custom_targeting_keys", + ) as post, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_batch_create_custom_targeting_keys_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "pre_batch_create_custom_targeting_keys", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3708,8 +3722,9 @@ def test_update_custom_targeting_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3877,20 +3892,22 @@ def test_update_custom_targeting_key_rest_interceptors(null_interceptor): ) client = CustomTargetingKeyServiceClient(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.CustomTargetingKeyServiceRestInterceptor, - "post_update_custom_targeting_key", - ) as post, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "post_update_custom_targeting_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "pre_update_custom_targeting_key", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_update_custom_targeting_key", + ) as post, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_update_custom_targeting_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "pre_update_custom_targeting_key", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3948,8 +3965,9 @@ def test_batch_update_custom_targeting_keys_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4017,20 +4035,22 @@ def test_batch_update_custom_targeting_keys_rest_interceptors(null_interceptor): ) client = CustomTargetingKeyServiceClient(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.CustomTargetingKeyServiceRestInterceptor, - "post_batch_update_custom_targeting_keys", - ) as post, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "post_batch_update_custom_targeting_keys_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "pre_batch_update_custom_targeting_keys", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_batch_update_custom_targeting_keys", + ) as post, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_batch_update_custom_targeting_keys_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "pre_batch_update_custom_targeting_keys", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4094,8 +4114,9 @@ def test_batch_activate_custom_targeting_keys_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4163,20 +4184,22 @@ def test_batch_activate_custom_targeting_keys_rest_interceptors(null_interceptor ) client = CustomTargetingKeyServiceClient(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.CustomTargetingKeyServiceRestInterceptor, - "post_batch_activate_custom_targeting_keys", - ) as post, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "post_batch_activate_custom_targeting_keys_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "pre_batch_activate_custom_targeting_keys", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_batch_activate_custom_targeting_keys", + ) as post, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_batch_activate_custom_targeting_keys_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "pre_batch_activate_custom_targeting_keys", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4238,8 +4261,9 @@ def test_batch_deactivate_custom_targeting_keys_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4308,20 +4332,22 @@ def test_batch_deactivate_custom_targeting_keys_rest_interceptors(null_intercept ) client = CustomTargetingKeyServiceClient(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.CustomTargetingKeyServiceRestInterceptor, - "post_batch_deactivate_custom_targeting_keys", - ) as post, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "post_batch_deactivate_custom_targeting_keys_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomTargetingKeyServiceRestInterceptor, - "pre_batch_deactivate_custom_targeting_keys", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_batch_deactivate_custom_targeting_keys", + ) as post, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "post_batch_deactivate_custom_targeting_keys_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomTargetingKeyServiceRestInterceptor, + "pre_batch_deactivate_custom_targeting_keys", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4387,8 +4413,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4677,11 +4704,14 @@ def test_custom_targeting_key_service_base_transport(): def test_custom_targeting_key_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.custom_targeting_key_service.transports.CustomTargetingKeyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.custom_targeting_key_service.transports.CustomTargetingKeyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CustomTargetingKeyServiceTransport( @@ -4698,9 +4728,12 @@ def test_custom_targeting_key_service_base_transport_with_credentials_file(): def test_custom_targeting_key_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.custom_targeting_key_service.transports.CustomTargetingKeyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.custom_targeting_key_service.transports.CustomTargetingKeyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CustomTargetingKeyServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_value_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_value_service.py index 2ef027954f9e..1b3046132f15 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_value_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_custom_targeting_value_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -972,10 +977,9 @@ def test_custom_targeting_value_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1020,10 +1024,9 @@ def test_custom_targeting_value_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1062,9 @@ def test_custom_targeting_value_service_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1788,8 +1790,9 @@ def test_get_custom_targeting_value_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1870,20 +1873,22 @@ def test_get_custom_targeting_value_rest_interceptors(null_interceptor): ) client = CustomTargetingValueServiceClient(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.CustomTargetingValueServiceRestInterceptor, - "post_get_custom_targeting_value", - ) as post, mock.patch.object( - transports.CustomTargetingValueServiceRestInterceptor, - "post_get_custom_targeting_value_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomTargetingValueServiceRestInterceptor, - "pre_get_custom_targeting_value", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomTargetingValueServiceRestInterceptor, + "post_get_custom_targeting_value", + ) as post, + mock.patch.object( + transports.CustomTargetingValueServiceRestInterceptor, + "post_get_custom_targeting_value_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomTargetingValueServiceRestInterceptor, + "pre_get_custom_targeting_value", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1941,8 +1946,9 @@ def test_list_custom_targeting_values_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2011,20 +2017,22 @@ def test_list_custom_targeting_values_rest_interceptors(null_interceptor): ) client = CustomTargetingValueServiceClient(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.CustomTargetingValueServiceRestInterceptor, - "post_list_custom_targeting_values", - ) as post, mock.patch.object( - transports.CustomTargetingValueServiceRestInterceptor, - "post_list_custom_targeting_values_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CustomTargetingValueServiceRestInterceptor, - "pre_list_custom_targeting_values", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CustomTargetingValueServiceRestInterceptor, + "post_list_custom_targeting_values", + ) as post, + mock.patch.object( + transports.CustomTargetingValueServiceRestInterceptor, + "post_list_custom_targeting_values_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CustomTargetingValueServiceRestInterceptor, + "pre_list_custom_targeting_values", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2088,8 +2096,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2232,11 +2241,14 @@ def test_custom_targeting_value_service_base_transport(): def test_custom_targeting_value_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.custom_targeting_value_service.transports.CustomTargetingValueServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.custom_targeting_value_service.transports.CustomTargetingValueServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CustomTargetingValueServiceTransport( @@ -2253,9 +2265,12 @@ def test_custom_targeting_value_service_base_transport_with_credentials_file(): def test_custom_targeting_value_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.custom_targeting_value_service.transports.CustomTargetingValueServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.custom_targeting_value_service.transports.CustomTargetingValueServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CustomTargetingValueServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_capability_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_capability_service.py index f48ee75597a5..575be4e84213 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_capability_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_capability_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -938,10 +943,9 @@ def test_device_capability_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +990,9 @@ def test_device_capability_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1028,9 @@ def test_device_capability_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1217,9 +1219,9 @@ def test_get_device_capability_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_device_capability - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_device_capability] = ( + mock_rpc + ) request = {} client.get_device_capability(request) @@ -1741,8 +1743,9 @@ def test_get_device_capability_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1807,18 +1810,22 @@ def test_get_device_capability_rest_interceptors(null_interceptor): ) client = DeviceCapabilityServiceClient(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.DeviceCapabilityServiceRestInterceptor, "post_get_device_capability" - ) as post, mock.patch.object( - transports.DeviceCapabilityServiceRestInterceptor, - "post_get_device_capability_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeviceCapabilityServiceRestInterceptor, "pre_get_device_capability" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeviceCapabilityServiceRestInterceptor, + "post_get_device_capability", + ) as post, + mock.patch.object( + transports.DeviceCapabilityServiceRestInterceptor, + "post_get_device_capability_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeviceCapabilityServiceRestInterceptor, + "pre_get_device_capability", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1876,8 +1883,9 @@ def test_list_device_capabilities_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1944,20 +1952,22 @@ def test_list_device_capabilities_rest_interceptors(null_interceptor): ) client = DeviceCapabilityServiceClient(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.DeviceCapabilityServiceRestInterceptor, - "post_list_device_capabilities", - ) as post, mock.patch.object( - transports.DeviceCapabilityServiceRestInterceptor, - "post_list_device_capabilities_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeviceCapabilityServiceRestInterceptor, - "pre_list_device_capabilities", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeviceCapabilityServiceRestInterceptor, + "post_list_device_capabilities", + ) as post, + mock.patch.object( + transports.DeviceCapabilityServiceRestInterceptor, + "post_list_device_capabilities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeviceCapabilityServiceRestInterceptor, + "pre_list_device_capabilities", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2017,8 +2027,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2161,11 +2172,14 @@ def test_device_capability_service_base_transport(): def test_device_capability_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.device_capability_service.transports.DeviceCapabilityServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.device_capability_service.transports.DeviceCapabilityServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeviceCapabilityServiceTransport( @@ -2182,9 +2196,12 @@ def test_device_capability_service_base_transport_with_credentials_file(): def test_device_capability_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.device_capability_service.transports.DeviceCapabilityServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.device_capability_service.transports.DeviceCapabilityServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeviceCapabilityServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_category_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_category_service.py index 6729bafb0869..3704215b9e6c 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_category_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_category_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -934,10 +939,9 @@ def test_device_category_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +986,9 @@ def test_device_category_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1024,9 @@ def test_device_category_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1212,9 +1214,9 @@ def test_get_device_category_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_device_category - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_device_category] = ( + mock_rpc + ) request = {} client.get_device_category(request) @@ -1394,9 +1396,9 @@ def test_list_device_categories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_device_categories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_device_categories] = ( + mock_rpc + ) request = {} client.list_device_categories(request) @@ -1736,8 +1738,9 @@ def test_get_device_category_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1802,18 +1805,20 @@ def test_get_device_category_rest_interceptors(null_interceptor): ) client = DeviceCategoryServiceClient(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.DeviceCategoryServiceRestInterceptor, "post_get_device_category" - ) as post, mock.patch.object( - transports.DeviceCategoryServiceRestInterceptor, - "post_get_device_category_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeviceCategoryServiceRestInterceptor, "pre_get_device_category" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeviceCategoryServiceRestInterceptor, "post_get_device_category" + ) as post, + mock.patch.object( + transports.DeviceCategoryServiceRestInterceptor, + "post_get_device_category_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeviceCategoryServiceRestInterceptor, "pre_get_device_category" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1871,8 +1876,9 @@ def test_list_device_categories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1939,18 +1945,22 @@ def test_list_device_categories_rest_interceptors(null_interceptor): ) client = DeviceCategoryServiceClient(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.DeviceCategoryServiceRestInterceptor, "post_list_device_categories" - ) as post, mock.patch.object( - transports.DeviceCategoryServiceRestInterceptor, - "post_list_device_categories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeviceCategoryServiceRestInterceptor, "pre_list_device_categories" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeviceCategoryServiceRestInterceptor, + "post_list_device_categories", + ) as post, + mock.patch.object( + transports.DeviceCategoryServiceRestInterceptor, + "post_list_device_categories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeviceCategoryServiceRestInterceptor, + "pre_list_device_categories", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2010,8 +2020,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2154,11 +2165,14 @@ def test_device_category_service_base_transport(): def test_device_category_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.device_category_service.transports.DeviceCategoryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.device_category_service.transports.DeviceCategoryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeviceCategoryServiceTransport( @@ -2175,9 +2189,12 @@ def test_device_category_service_base_transport_with_credentials_file(): def test_device_category_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.device_category_service.transports.DeviceCategoryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.device_category_service.transports.DeviceCategoryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeviceCategoryServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_manufacturer_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_manufacturer_service.py index 4ba56cf1392e..2b92534871d3 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_manufacturer_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_device_manufacturer_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -947,10 +952,9 @@ def test_device_manufacturer_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -995,10 +999,9 @@ def test_device_manufacturer_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1037,9 @@ def test_device_manufacturer_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1757,8 +1759,9 @@ def test_get_device_manufacturer_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1823,20 +1826,22 @@ def test_get_device_manufacturer_rest_interceptors(null_interceptor): ) client = DeviceManufacturerServiceClient(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.DeviceManufacturerServiceRestInterceptor, - "post_get_device_manufacturer", - ) as post, mock.patch.object( - transports.DeviceManufacturerServiceRestInterceptor, - "post_get_device_manufacturer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeviceManufacturerServiceRestInterceptor, - "pre_get_device_manufacturer", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeviceManufacturerServiceRestInterceptor, + "post_get_device_manufacturer", + ) as post, + mock.patch.object( + transports.DeviceManufacturerServiceRestInterceptor, + "post_get_device_manufacturer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeviceManufacturerServiceRestInterceptor, + "pre_get_device_manufacturer", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1894,8 +1899,9 @@ def test_list_device_manufacturers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1962,20 +1968,22 @@ def test_list_device_manufacturers_rest_interceptors(null_interceptor): ) client = DeviceManufacturerServiceClient(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.DeviceManufacturerServiceRestInterceptor, - "post_list_device_manufacturers", - ) as post, mock.patch.object( - transports.DeviceManufacturerServiceRestInterceptor, - "post_list_device_manufacturers_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeviceManufacturerServiceRestInterceptor, - "pre_list_device_manufacturers", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeviceManufacturerServiceRestInterceptor, + "post_list_device_manufacturers", + ) as post, + mock.patch.object( + transports.DeviceManufacturerServiceRestInterceptor, + "post_list_device_manufacturers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeviceManufacturerServiceRestInterceptor, + "pre_list_device_manufacturers", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2039,8 +2047,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2183,11 +2192,14 @@ def test_device_manufacturer_service_base_transport(): def test_device_manufacturer_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.device_manufacturer_service.transports.DeviceManufacturerServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.device_manufacturer_service.transports.DeviceManufacturerServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeviceManufacturerServiceTransport( @@ -2204,9 +2216,12 @@ def test_device_manufacturer_service_base_transport_with_credentials_file(): def test_device_manufacturer_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.device_manufacturer_service.transports.DeviceManufacturerServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.device_manufacturer_service.transports.DeviceManufacturerServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeviceManufacturerServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_entity_signals_mapping_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_entity_signals_mapping_service.py index 068c5c47c520..2c5c9d8317bc 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_entity_signals_mapping_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_entity_signals_mapping_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.entity_signals_mapping_service import ( EntitySignalsMappingServiceClient, @@ -972,10 +977,9 @@ def test_entity_signals_mapping_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1020,10 +1024,9 @@ def test_entity_signals_mapping_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1062,9 @@ def test_entity_signals_mapping_service_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2632,8 +2634,9 @@ def test_get_entity_signals_mapping_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2703,20 +2706,22 @@ def test_get_entity_signals_mapping_rest_interceptors(null_interceptor): ) client = EntitySignalsMappingServiceClient(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.EntitySignalsMappingServiceRestInterceptor, - "post_get_entity_signals_mapping", - ) as post, mock.patch.object( - transports.EntitySignalsMappingServiceRestInterceptor, - "post_get_entity_signals_mapping_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntitySignalsMappingServiceRestInterceptor, - "pre_get_entity_signals_mapping", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "post_get_entity_signals_mapping", + ) as post, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "post_get_entity_signals_mapping_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "pre_get_entity_signals_mapping", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2774,8 +2779,9 @@ def test_list_entity_signals_mappings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2844,20 +2850,22 @@ def test_list_entity_signals_mappings_rest_interceptors(null_interceptor): ) client = EntitySignalsMappingServiceClient(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.EntitySignalsMappingServiceRestInterceptor, - "post_list_entity_signals_mappings", - ) as post, mock.patch.object( - transports.EntitySignalsMappingServiceRestInterceptor, - "post_list_entity_signals_mappings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntitySignalsMappingServiceRestInterceptor, - "pre_list_entity_signals_mappings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "post_list_entity_signals_mappings", + ) as post, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "post_list_entity_signals_mappings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "pre_list_entity_signals_mappings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2919,8 +2927,9 @@ def test_create_entity_signals_mapping_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3071,20 +3080,22 @@ def test_create_entity_signals_mapping_rest_interceptors(null_interceptor): ) client = EntitySignalsMappingServiceClient(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.EntitySignalsMappingServiceRestInterceptor, - "post_create_entity_signals_mapping", - ) as post, mock.patch.object( - transports.EntitySignalsMappingServiceRestInterceptor, - "post_create_entity_signals_mapping_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntitySignalsMappingServiceRestInterceptor, - "pre_create_entity_signals_mapping", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "post_create_entity_signals_mapping", + ) as post, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "post_create_entity_signals_mapping_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "pre_create_entity_signals_mapping", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3148,8 +3159,9 @@ def test_update_entity_signals_mapping_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3304,20 +3316,22 @@ def test_update_entity_signals_mapping_rest_interceptors(null_interceptor): ) client = EntitySignalsMappingServiceClient(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.EntitySignalsMappingServiceRestInterceptor, - "post_update_entity_signals_mapping", - ) as post, mock.patch.object( - transports.EntitySignalsMappingServiceRestInterceptor, - "post_update_entity_signals_mapping_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntitySignalsMappingServiceRestInterceptor, - "pre_update_entity_signals_mapping", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "post_update_entity_signals_mapping", + ) as post, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "post_update_entity_signals_mapping_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "pre_update_entity_signals_mapping", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3377,8 +3391,9 @@ def test_batch_create_entity_signals_mappings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3447,20 +3462,22 @@ def test_batch_create_entity_signals_mappings_rest_interceptors(null_interceptor ) client = EntitySignalsMappingServiceClient(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.EntitySignalsMappingServiceRestInterceptor, - "post_batch_create_entity_signals_mappings", - ) as post, mock.patch.object( - transports.EntitySignalsMappingServiceRestInterceptor, - "post_batch_create_entity_signals_mappings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntitySignalsMappingServiceRestInterceptor, - "pre_batch_create_entity_signals_mappings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "post_batch_create_entity_signals_mappings", + ) as post, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "post_batch_create_entity_signals_mappings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "pre_batch_create_entity_signals_mappings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3524,8 +3541,9 @@ def test_batch_update_entity_signals_mappings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3594,20 +3612,22 @@ def test_batch_update_entity_signals_mappings_rest_interceptors(null_interceptor ) client = EntitySignalsMappingServiceClient(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.EntitySignalsMappingServiceRestInterceptor, - "post_batch_update_entity_signals_mappings", - ) as post, mock.patch.object( - transports.EntitySignalsMappingServiceRestInterceptor, - "post_batch_update_entity_signals_mappings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntitySignalsMappingServiceRestInterceptor, - "pre_batch_update_entity_signals_mappings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "post_batch_update_entity_signals_mappings", + ) as post, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "post_batch_update_entity_signals_mappings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntitySignalsMappingServiceRestInterceptor, + "pre_batch_update_entity_signals_mappings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3673,8 +3693,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3913,11 +3934,14 @@ def test_entity_signals_mapping_service_base_transport(): def test_entity_signals_mapping_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.entity_signals_mapping_service.transports.EntitySignalsMappingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.entity_signals_mapping_service.transports.EntitySignalsMappingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EntitySignalsMappingServiceTransport( @@ -3934,9 +3958,12 @@ def test_entity_signals_mapping_service_base_transport_with_credentials_file(): def test_entity_signals_mapping_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.entity_signals_mapping_service.transports.EntitySignalsMappingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.entity_signals_mapping_service.transports.EntitySignalsMappingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EntitySignalsMappingServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_geo_target_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_geo_target_service.py index 5e8cdbf62306..9edbeaf53aa0 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_geo_target_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_geo_target_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -911,10 +916,9 @@ def test_geo_target_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +963,9 @@ def test_geo_target_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +1001,9 @@ def test_geo_target_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,9 +1361,9 @@ def test_list_geo_targets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_geo_targets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_geo_targets] = ( + mock_rpc + ) request = {} client.list_geo_targets(request) @@ -1693,8 +1695,9 @@ def test_get_geo_target_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1769,17 +1772,20 @@ def test_get_geo_target_rest_interceptors(null_interceptor): ) client = GeoTargetServiceClient(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.GeoTargetServiceRestInterceptor, "post_get_geo_target" - ) as post, mock.patch.object( - transports.GeoTargetServiceRestInterceptor, "post_get_geo_target_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeoTargetServiceRestInterceptor, "pre_get_geo_target" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeoTargetServiceRestInterceptor, "post_get_geo_target" + ) as post, + mock.patch.object( + transports.GeoTargetServiceRestInterceptor, + "post_get_geo_target_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GeoTargetServiceRestInterceptor, "pre_get_geo_target" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1834,8 +1840,9 @@ def test_list_geo_targets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1900,18 +1907,20 @@ def test_list_geo_targets_rest_interceptors(null_interceptor): ) client = GeoTargetServiceClient(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.GeoTargetServiceRestInterceptor, "post_list_geo_targets" - ) as post, mock.patch.object( - transports.GeoTargetServiceRestInterceptor, - "post_list_geo_targets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GeoTargetServiceRestInterceptor, "pre_list_geo_targets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeoTargetServiceRestInterceptor, "post_list_geo_targets" + ) as post, + mock.patch.object( + transports.GeoTargetServiceRestInterceptor, + "post_list_geo_targets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GeoTargetServiceRestInterceptor, "pre_list_geo_targets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1971,8 +1980,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2111,11 +2121,14 @@ def test_geo_target_service_base_transport(): def test_geo_target_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.geo_target_service.transports.GeoTargetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.geo_target_service.transports.GeoTargetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeoTargetServiceTransport( @@ -2132,9 +2145,12 @@ def test_geo_target_service_base_transport_with_credentials_file(): def test_geo_target_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.geo_target_service.transports.GeoTargetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.geo_target_service.transports.GeoTargetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeoTargetServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_line_item_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_line_item_service.py index 04e04ffc8bbd..96faeb0d8ca0 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_line_item_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_line_item_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore from google.ads.admanager_v1.services.line_item_service import ( LineItemServiceClient, @@ -918,10 +923,9 @@ def test_line_item_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -966,10 +970,9 @@ def test_line_item_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1005,10 +1008,9 @@ def test_line_item_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1693,8 +1695,9 @@ def test_get_line_item_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1766,17 +1769,20 @@ def test_get_line_item_rest_interceptors(null_interceptor): ) client = LineItemServiceClient(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.LineItemServiceRestInterceptor, "post_get_line_item" - ) as post, mock.patch.object( - transports.LineItemServiceRestInterceptor, "post_get_line_item_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineItemServiceRestInterceptor, "pre_get_line_item" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineItemServiceRestInterceptor, "post_get_line_item" + ) as post, + mock.patch.object( + transports.LineItemServiceRestInterceptor, + "post_get_line_item_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LineItemServiceRestInterceptor, "pre_get_line_item" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1831,8 +1837,9 @@ def test_list_line_items_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1897,17 +1904,20 @@ def test_list_line_items_rest_interceptors(null_interceptor): ) client = LineItemServiceClient(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.LineItemServiceRestInterceptor, "post_list_line_items" - ) as post, mock.patch.object( - transports.LineItemServiceRestInterceptor, "post_list_line_items_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineItemServiceRestInterceptor, "pre_list_line_items" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineItemServiceRestInterceptor, "post_list_line_items" + ) as post, + mock.patch.object( + transports.LineItemServiceRestInterceptor, + "post_list_line_items_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LineItemServiceRestInterceptor, "pre_list_line_items" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1967,8 +1977,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2107,11 +2118,14 @@ def test_line_item_service_base_transport(): def test_line_item_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.line_item_service.transports.LineItemServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.line_item_service.transports.LineItemServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LineItemServiceTransport( @@ -2128,9 +2142,12 @@ def test_line_item_service_base_transport_with_credentials_file(): def test_line_item_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.line_item_service.transports.LineItemServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.line_item_service.transports.LineItemServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LineItemServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_carrier_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_carrier_service.py index c8e81d11099e..6f381441a0de 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_carrier_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_carrier_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -932,10 +937,9 @@ def test_mobile_carrier_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +984,9 @@ def test_mobile_carrier_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1022,9 @@ def test_mobile_carrier_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1210,9 +1212,9 @@ def test_get_mobile_carrier_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_mobile_carrier - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_mobile_carrier] = ( + mock_rpc + ) request = {} client.get_mobile_carrier(request) @@ -1390,9 +1392,9 @@ def test_list_mobile_carriers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_mobile_carriers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_mobile_carriers] = ( + mock_rpc + ) request = {} client.list_mobile_carriers(request) @@ -1731,8 +1733,9 @@ def test_get_mobile_carrier_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1799,18 +1802,20 @@ def test_get_mobile_carrier_rest_interceptors(null_interceptor): ) client = MobileCarrierServiceClient(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.MobileCarrierServiceRestInterceptor, "post_get_mobile_carrier" - ) as post, mock.patch.object( - transports.MobileCarrierServiceRestInterceptor, - "post_get_mobile_carrier_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MobileCarrierServiceRestInterceptor, "pre_get_mobile_carrier" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MobileCarrierServiceRestInterceptor, "post_get_mobile_carrier" + ) as post, + mock.patch.object( + transports.MobileCarrierServiceRestInterceptor, + "post_get_mobile_carrier_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MobileCarrierServiceRestInterceptor, "pre_get_mobile_carrier" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1868,8 +1873,9 @@ def test_list_mobile_carriers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1936,18 +1942,20 @@ def test_list_mobile_carriers_rest_interceptors(null_interceptor): ) client = MobileCarrierServiceClient(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.MobileCarrierServiceRestInterceptor, "post_list_mobile_carriers" - ) as post, mock.patch.object( - transports.MobileCarrierServiceRestInterceptor, - "post_list_mobile_carriers_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MobileCarrierServiceRestInterceptor, "pre_list_mobile_carriers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MobileCarrierServiceRestInterceptor, "post_list_mobile_carriers" + ) as post, + mock.patch.object( + transports.MobileCarrierServiceRestInterceptor, + "post_list_mobile_carriers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MobileCarrierServiceRestInterceptor, "pre_list_mobile_carriers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2007,8 +2015,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2151,11 +2160,14 @@ def test_mobile_carrier_service_base_transport(): def test_mobile_carrier_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.mobile_carrier_service.transports.MobileCarrierServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.mobile_carrier_service.transports.MobileCarrierServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MobileCarrierServiceTransport( @@ -2172,9 +2184,12 @@ def test_mobile_carrier_service_base_transport_with_credentials_file(): def test_mobile_carrier_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.mobile_carrier_service.transports.MobileCarrierServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.mobile_carrier_service.transports.MobileCarrierServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MobileCarrierServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_service.py index aa51a2bd5f91..d3881609e117 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -929,10 +934,9 @@ def test_mobile_device_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +981,9 @@ def test_mobile_device_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1019,9 @@ def test_mobile_device_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1205,9 +1207,9 @@ def test_get_mobile_device_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_mobile_device - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_mobile_device] = ( + mock_rpc + ) request = {} client.get_mobile_device(request) @@ -1385,9 +1387,9 @@ def test_list_mobile_devices_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_mobile_devices - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_mobile_devices] = ( + mock_rpc + ) request = {} client.list_mobile_devices(request) @@ -1721,8 +1723,9 @@ def test_get_mobile_device_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1789,18 +1792,20 @@ def test_get_mobile_device_rest_interceptors(null_interceptor): ) client = MobileDeviceServiceClient(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.MobileDeviceServiceRestInterceptor, "post_get_mobile_device" - ) as post, mock.patch.object( - transports.MobileDeviceServiceRestInterceptor, - "post_get_mobile_device_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MobileDeviceServiceRestInterceptor, "pre_get_mobile_device" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MobileDeviceServiceRestInterceptor, "post_get_mobile_device" + ) as post, + mock.patch.object( + transports.MobileDeviceServiceRestInterceptor, + "post_get_mobile_device_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MobileDeviceServiceRestInterceptor, "pre_get_mobile_device" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1858,8 +1863,9 @@ def test_list_mobile_devices_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1924,18 +1930,20 @@ def test_list_mobile_devices_rest_interceptors(null_interceptor): ) client = MobileDeviceServiceClient(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.MobileDeviceServiceRestInterceptor, "post_list_mobile_devices" - ) as post, mock.patch.object( - transports.MobileDeviceServiceRestInterceptor, - "post_list_mobile_devices_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MobileDeviceServiceRestInterceptor, "pre_list_mobile_devices" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MobileDeviceServiceRestInterceptor, "post_list_mobile_devices" + ) as post, + mock.patch.object( + transports.MobileDeviceServiceRestInterceptor, + "post_list_mobile_devices_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MobileDeviceServiceRestInterceptor, "pre_list_mobile_devices" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1995,8 +2003,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2139,11 +2148,14 @@ def test_mobile_device_service_base_transport(): def test_mobile_device_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.mobile_device_service.transports.MobileDeviceServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.mobile_device_service.transports.MobileDeviceServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MobileDeviceServiceTransport( @@ -2160,9 +2172,12 @@ def test_mobile_device_service_base_transport_with_credentials_file(): def test_mobile_device_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.mobile_device_service.transports.MobileDeviceServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.mobile_device_service.transports.MobileDeviceServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MobileDeviceServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_submodel_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_submodel_service.py index beb734e467c0..e272335ce5fc 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_submodel_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_mobile_device_submodel_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -971,10 +976,9 @@ def test_mobile_device_submodel_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1023,9 @@ def test_mobile_device_submodel_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1061,9 @@ def test_mobile_device_submodel_service_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1787,8 +1789,9 @@ def test_get_mobile_device_submodel_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1857,20 +1860,22 @@ def test_get_mobile_device_submodel_rest_interceptors(null_interceptor): ) client = MobileDeviceSubmodelServiceClient(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.MobileDeviceSubmodelServiceRestInterceptor, - "post_get_mobile_device_submodel", - ) as post, mock.patch.object( - transports.MobileDeviceSubmodelServiceRestInterceptor, - "post_get_mobile_device_submodel_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MobileDeviceSubmodelServiceRestInterceptor, - "pre_get_mobile_device_submodel", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MobileDeviceSubmodelServiceRestInterceptor, + "post_get_mobile_device_submodel", + ) as post, + mock.patch.object( + transports.MobileDeviceSubmodelServiceRestInterceptor, + "post_get_mobile_device_submodel_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MobileDeviceSubmodelServiceRestInterceptor, + "pre_get_mobile_device_submodel", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1928,8 +1933,9 @@ def test_list_mobile_device_submodels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1998,20 +2004,22 @@ def test_list_mobile_device_submodels_rest_interceptors(null_interceptor): ) client = MobileDeviceSubmodelServiceClient(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.MobileDeviceSubmodelServiceRestInterceptor, - "post_list_mobile_device_submodels", - ) as post, mock.patch.object( - transports.MobileDeviceSubmodelServiceRestInterceptor, - "post_list_mobile_device_submodels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MobileDeviceSubmodelServiceRestInterceptor, - "pre_list_mobile_device_submodels", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MobileDeviceSubmodelServiceRestInterceptor, + "post_list_mobile_device_submodels", + ) as post, + mock.patch.object( + transports.MobileDeviceSubmodelServiceRestInterceptor, + "post_list_mobile_device_submodels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MobileDeviceSubmodelServiceRestInterceptor, + "pre_list_mobile_device_submodels", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2075,8 +2083,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2219,11 +2228,14 @@ def test_mobile_device_submodel_service_base_transport(): def test_mobile_device_submodel_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.mobile_device_submodel_service.transports.MobileDeviceSubmodelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.mobile_device_submodel_service.transports.MobileDeviceSubmodelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MobileDeviceSubmodelServiceTransport( @@ -2240,9 +2252,12 @@ def test_mobile_device_submodel_service_base_transport_with_credentials_file(): def test_mobile_device_submodel_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.mobile_device_submodel_service.transports.MobileDeviceSubmodelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.mobile_device_submodel_service.transports.MobileDeviceSubmodelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MobileDeviceSubmodelServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_network_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_network_service.py index 8752a70feb83..ea6ae5d2c6a5 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_network_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_network_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -896,10 +901,9 @@ def test_network_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -944,10 +948,9 @@ def test_network_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +986,9 @@ def test_network_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1508,8 +1510,9 @@ def test_get_network_rest_bad_request(request_type=network_service.GetNetworkReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1590,17 +1593,19 @@ def test_get_network_rest_interceptors(null_interceptor): ) client = NetworkServiceClient(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.NetworkServiceRestInterceptor, "post_get_network" - ) as post, mock.patch.object( - transports.NetworkServiceRestInterceptor, "post_get_network_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServiceRestInterceptor, "pre_get_network" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServiceRestInterceptor, "post_get_network" + ) as post, + mock.patch.object( + transports.NetworkServiceRestInterceptor, "post_get_network_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServiceRestInterceptor, "pre_get_network" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1653,8 +1658,9 @@ def test_list_networks_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1719,17 +1725,19 @@ def test_list_networks_rest_interceptors(null_interceptor): ) client = NetworkServiceClient(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.NetworkServiceRestInterceptor, "post_list_networks" - ) as post, mock.patch.object( - transports.NetworkServiceRestInterceptor, "post_list_networks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServiceRestInterceptor, "pre_list_networks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServiceRestInterceptor, "post_list_networks" + ) as post, + mock.patch.object( + transports.NetworkServiceRestInterceptor, "post_list_networks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServiceRestInterceptor, "pre_list_networks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1789,8 +1797,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1929,11 +1938,14 @@ def test_network_service_base_transport(): def test_network_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.network_service.transports.NetworkServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.network_service.transports.NetworkServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkServiceTransport( @@ -1950,9 +1962,12 @@ def test_network_service_base_transport_with_credentials_file(): def test_network_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.network_service.transports.NetworkServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.network_service.transports.NetworkServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_service.py index 1014e2e31523..8cb1711927da 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -938,10 +943,9 @@ def test_operating_system_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +990,9 @@ def test_operating_system_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1028,9 @@ def test_operating_system_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1216,9 +1218,9 @@ def test_get_operating_system_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_operating_system - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_operating_system] = ( + mock_rpc + ) request = {} client.get_operating_system(request) @@ -1398,9 +1400,9 @@ def test_list_operating_systems_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_operating_systems - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_operating_systems] = ( + mock_rpc + ) request = {} client.list_operating_systems(request) @@ -1740,8 +1742,9 @@ def test_get_operating_system_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1806,18 +1809,21 @@ def test_get_operating_system_rest_interceptors(null_interceptor): ) client = OperatingSystemServiceClient(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.OperatingSystemServiceRestInterceptor, "post_get_operating_system" - ) as post, mock.patch.object( - transports.OperatingSystemServiceRestInterceptor, - "post_get_operating_system_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OperatingSystemServiceRestInterceptor, "pre_get_operating_system" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OperatingSystemServiceRestInterceptor, + "post_get_operating_system", + ) as post, + mock.patch.object( + transports.OperatingSystemServiceRestInterceptor, + "post_get_operating_system_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OperatingSystemServiceRestInterceptor, "pre_get_operating_system" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1875,8 +1881,9 @@ def test_list_operating_systems_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1943,18 +1950,22 @@ def test_list_operating_systems_rest_interceptors(null_interceptor): ) client = OperatingSystemServiceClient(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.OperatingSystemServiceRestInterceptor, "post_list_operating_systems" - ) as post, mock.patch.object( - transports.OperatingSystemServiceRestInterceptor, - "post_list_operating_systems_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OperatingSystemServiceRestInterceptor, "pre_list_operating_systems" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OperatingSystemServiceRestInterceptor, + "post_list_operating_systems", + ) as post, + mock.patch.object( + transports.OperatingSystemServiceRestInterceptor, + "post_list_operating_systems_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OperatingSystemServiceRestInterceptor, + "pre_list_operating_systems", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2014,8 +2025,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2158,11 +2170,14 @@ def test_operating_system_service_base_transport(): def test_operating_system_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.operating_system_service.transports.OperatingSystemServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.operating_system_service.transports.OperatingSystemServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OperatingSystemServiceTransport( @@ -2179,9 +2194,12 @@ def test_operating_system_service_base_transport_with_credentials_file(): def test_operating_system_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.operating_system_service.transports.OperatingSystemServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.operating_system_service.transports.OperatingSystemServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OperatingSystemServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_version_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_version_service.py index 8b37cafe2363..b1efe3ac28e6 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_version_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_operating_system_version_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -984,10 +989,9 @@ def test_operating_system_version_service_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1036,9 @@ def test_operating_system_version_service_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1071,10 +1074,9 @@ def test_operating_system_version_service_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1812,8 +1814,9 @@ def test_get_operating_system_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1886,20 +1889,22 @@ def test_get_operating_system_version_rest_interceptors(null_interceptor): ) client = OperatingSystemVersionServiceClient(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.OperatingSystemVersionServiceRestInterceptor, - "post_get_operating_system_version", - ) as post, mock.patch.object( - transports.OperatingSystemVersionServiceRestInterceptor, - "post_get_operating_system_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OperatingSystemVersionServiceRestInterceptor, - "pre_get_operating_system_version", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OperatingSystemVersionServiceRestInterceptor, + "post_get_operating_system_version", + ) as post, + mock.patch.object( + transports.OperatingSystemVersionServiceRestInterceptor, + "post_get_operating_system_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OperatingSystemVersionServiceRestInterceptor, + "pre_get_operating_system_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1959,8 +1964,9 @@ def test_list_operating_system_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2031,20 +2037,22 @@ def test_list_operating_system_versions_rest_interceptors(null_interceptor): ) client = OperatingSystemVersionServiceClient(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.OperatingSystemVersionServiceRestInterceptor, - "post_list_operating_system_versions", - ) as post, mock.patch.object( - transports.OperatingSystemVersionServiceRestInterceptor, - "post_list_operating_system_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OperatingSystemVersionServiceRestInterceptor, - "pre_list_operating_system_versions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OperatingSystemVersionServiceRestInterceptor, + "post_list_operating_system_versions", + ) as post, + mock.patch.object( + transports.OperatingSystemVersionServiceRestInterceptor, + "post_list_operating_system_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OperatingSystemVersionServiceRestInterceptor, + "pre_list_operating_system_versions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2108,8 +2116,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2256,11 +2265,14 @@ def test_operating_system_version_service_base_transport(): def test_operating_system_version_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.operating_system_version_service.transports.OperatingSystemVersionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.operating_system_version_service.transports.OperatingSystemVersionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OperatingSystemVersionServiceTransport( @@ -2277,9 +2289,12 @@ def test_operating_system_version_service_base_transport_with_credentials_file() def test_operating_system_version_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.operating_system_version_service.transports.OperatingSystemVersionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.operating_system_version_service.transports.OperatingSystemVersionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OperatingSystemVersionServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_order_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_order_service.py index 28395db72736..6fbf53836453 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_order_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_order_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.order_service import ( OrderServiceClient, @@ -886,10 +891,9 @@ def test_order_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -934,10 +938,9 @@ def test_order_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +976,9 @@ def test_order_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1653,8 +1655,9 @@ def test_get_order_rest_bad_request(request_type=order_service.GetOrderRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1761,17 +1764,19 @@ def test_get_order_rest_interceptors(null_interceptor): ) client = OrderServiceClient(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.OrderServiceRestInterceptor, "post_get_order" - ) as post, mock.patch.object( - transports.OrderServiceRestInterceptor, "post_get_order_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OrderServiceRestInterceptor, "pre_get_order" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrderServiceRestInterceptor, "post_get_order" + ) as post, + mock.patch.object( + transports.OrderServiceRestInterceptor, "post_get_order_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.OrderServiceRestInterceptor, "pre_get_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1820,8 +1825,9 @@ def test_list_orders_rest_bad_request(request_type=order_service.ListOrdersReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1886,17 +1892,19 @@ def test_list_orders_rest_interceptors(null_interceptor): ) client = OrderServiceClient(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.OrderServiceRestInterceptor, "post_list_orders" - ) as post, mock.patch.object( - transports.OrderServiceRestInterceptor, "post_list_orders_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OrderServiceRestInterceptor, "pre_list_orders" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrderServiceRestInterceptor, "post_list_orders" + ) as post, + mock.patch.object( + transports.OrderServiceRestInterceptor, "post_list_orders_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.OrderServiceRestInterceptor, "pre_list_orders" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1953,8 +1961,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2093,11 +2102,14 @@ def test_order_service_base_transport(): def test_order_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.order_service.transports.OrderServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.order_service.transports.OrderServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrderServiceTransport( @@ -2114,9 +2126,12 @@ def test_order_service_base_transport_with_credentials_file(): def test_order_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.order_service.transports.OrderServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.order_service.transports.OrderServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrderServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_placement_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_placement_service.py index 312c3a95745f..6cccaf4bb10a 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_placement_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_placement_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.placement_service import ( PlacementServiceClient, @@ -917,10 +922,9 @@ def test_placement_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +969,9 @@ def test_placement_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1007,9 @@ def test_placement_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1625,9 +1627,9 @@ def test_create_placement_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_placement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_placement] = ( + mock_rpc + ) request = {} client.create_placement(request) @@ -1814,9 +1816,9 @@ def test_update_placement_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_placement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_placement] = ( + mock_rpc + ) request = {} client.update_placement(request) @@ -3075,8 +3077,9 @@ def test_get_placement_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3151,17 +3154,20 @@ def test_get_placement_rest_interceptors(null_interceptor): ) client = PlacementServiceClient(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.PlacementServiceRestInterceptor, "post_get_placement" - ) as post, mock.patch.object( - transports.PlacementServiceRestInterceptor, "post_get_placement_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlacementServiceRestInterceptor, "pre_get_placement" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "post_get_placement" + ) as post, + mock.patch.object( + transports.PlacementServiceRestInterceptor, + "post_get_placement_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "pre_get_placement" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3216,8 +3222,9 @@ def test_list_placements_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3282,17 +3289,20 @@ def test_list_placements_rest_interceptors(null_interceptor): ) client = PlacementServiceClient(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.PlacementServiceRestInterceptor, "post_list_placements" - ) as post, mock.patch.object( - transports.PlacementServiceRestInterceptor, "post_list_placements_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlacementServiceRestInterceptor, "pre_list_placements" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "post_list_placements" + ) as post, + mock.patch.object( + transports.PlacementServiceRestInterceptor, + "post_list_placements_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "pre_list_placements" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3350,8 +3360,9 @@ def test_create_placement_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3503,18 +3514,20 @@ def test_create_placement_rest_interceptors(null_interceptor): ) client = PlacementServiceClient(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.PlacementServiceRestInterceptor, "post_create_placement" - ) as post, mock.patch.object( - transports.PlacementServiceRestInterceptor, - "post_create_placement_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PlacementServiceRestInterceptor, "pre_create_placement" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "post_create_placement" + ) as post, + mock.patch.object( + transports.PlacementServiceRestInterceptor, + "post_create_placement_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "pre_create_placement" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3569,8 +3582,9 @@ def test_update_placement_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3722,18 +3736,20 @@ def test_update_placement_rest_interceptors(null_interceptor): ) client = PlacementServiceClient(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.PlacementServiceRestInterceptor, "post_update_placement" - ) as post, mock.patch.object( - transports.PlacementServiceRestInterceptor, - "post_update_placement_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PlacementServiceRestInterceptor, "pre_update_placement" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "post_update_placement" + ) as post, + mock.patch.object( + transports.PlacementServiceRestInterceptor, + "post_update_placement_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "pre_update_placement" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3788,8 +3804,9 @@ def test_batch_create_placements_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3849,18 +3866,20 @@ def test_batch_create_placements_rest_interceptors(null_interceptor): ) client = PlacementServiceClient(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.PlacementServiceRestInterceptor, "post_batch_create_placements" - ) as post, mock.patch.object( - transports.PlacementServiceRestInterceptor, - "post_batch_create_placements_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PlacementServiceRestInterceptor, "pre_batch_create_placements" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "post_batch_create_placements" + ) as post, + mock.patch.object( + transports.PlacementServiceRestInterceptor, + "post_batch_create_placements_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "pre_batch_create_placements" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3918,8 +3937,9 @@ def test_batch_update_placements_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3979,18 +3999,20 @@ def test_batch_update_placements_rest_interceptors(null_interceptor): ) client = PlacementServiceClient(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.PlacementServiceRestInterceptor, "post_batch_update_placements" - ) as post, mock.patch.object( - transports.PlacementServiceRestInterceptor, - "post_batch_update_placements_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PlacementServiceRestInterceptor, "pre_batch_update_placements" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "post_batch_update_placements" + ) as post, + mock.patch.object( + transports.PlacementServiceRestInterceptor, + "post_batch_update_placements_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "pre_batch_update_placements" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4048,8 +4070,9 @@ def test_batch_activate_placements_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4111,18 +4134,20 @@ def test_batch_activate_placements_rest_interceptors(null_interceptor): ) client = PlacementServiceClient(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.PlacementServiceRestInterceptor, "post_batch_activate_placements" - ) as post, mock.patch.object( - transports.PlacementServiceRestInterceptor, - "post_batch_activate_placements_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PlacementServiceRestInterceptor, "pre_batch_activate_placements" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "post_batch_activate_placements" + ) as post, + mock.patch.object( + transports.PlacementServiceRestInterceptor, + "post_batch_activate_placements_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "pre_batch_activate_placements" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4180,8 +4205,9 @@ def test_batch_deactivate_placements_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4243,18 +4269,22 @@ def test_batch_deactivate_placements_rest_interceptors(null_interceptor): ) client = PlacementServiceClient(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.PlacementServiceRestInterceptor, "post_batch_deactivate_placements" - ) as post, mock.patch.object( - transports.PlacementServiceRestInterceptor, - "post_batch_deactivate_placements_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PlacementServiceRestInterceptor, "pre_batch_deactivate_placements" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlacementServiceRestInterceptor, + "post_batch_deactivate_placements", + ) as post, + mock.patch.object( + transports.PlacementServiceRestInterceptor, + "post_batch_deactivate_placements_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlacementServiceRestInterceptor, + "pre_batch_deactivate_placements", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4312,8 +4342,9 @@ def test_batch_archive_placements_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4373,18 +4404,20 @@ def test_batch_archive_placements_rest_interceptors(null_interceptor): ) client = PlacementServiceClient(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.PlacementServiceRestInterceptor, "post_batch_archive_placements" - ) as post, mock.patch.object( - transports.PlacementServiceRestInterceptor, - "post_batch_archive_placements_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PlacementServiceRestInterceptor, "pre_batch_archive_placements" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "post_batch_archive_placements" + ) as post, + mock.patch.object( + transports.PlacementServiceRestInterceptor, + "post_batch_archive_placements_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlacementServiceRestInterceptor, "pre_batch_archive_placements" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4444,8 +4477,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4741,11 +4775,14 @@ def test_placement_service_base_transport(): def test_placement_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.placement_service.transports.PlacementServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.placement_service.transports.PlacementServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PlacementServiceTransport( @@ -4762,9 +4799,12 @@ def test_placement_service_base_transport_with_credentials_file(): def test_placement_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.placement_service.transports.PlacementServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.placement_service.transports.PlacementServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PlacementServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_deal_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_deal_service.py index eb9826683bf2..994264771fb2 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_deal_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_deal_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore from google.ads.admanager_v1.services.private_auction_deal_service import ( PrivateAuctionDealServiceClient, @@ -958,10 +963,9 @@ def test_private_auction_deal_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1010,9 @@ def test_private_auction_deal_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1048,9 @@ def test_private_auction_deal_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2168,8 +2170,9 @@ def test_get_private_auction_deal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2256,20 +2259,22 @@ def test_get_private_auction_deal_rest_interceptors(null_interceptor): ) client = PrivateAuctionDealServiceClient(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.PrivateAuctionDealServiceRestInterceptor, - "post_get_private_auction_deal", - ) as post, mock.patch.object( - transports.PrivateAuctionDealServiceRestInterceptor, - "post_get_private_auction_deal_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivateAuctionDealServiceRestInterceptor, - "pre_get_private_auction_deal", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivateAuctionDealServiceRestInterceptor, + "post_get_private_auction_deal", + ) as post, + mock.patch.object( + transports.PrivateAuctionDealServiceRestInterceptor, + "post_get_private_auction_deal_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivateAuctionDealServiceRestInterceptor, + "pre_get_private_auction_deal", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2327,8 +2332,9 @@ def test_list_private_auction_deals_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2395,20 +2401,22 @@ def test_list_private_auction_deals_rest_interceptors(null_interceptor): ) client = PrivateAuctionDealServiceClient(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.PrivateAuctionDealServiceRestInterceptor, - "post_list_private_auction_deals", - ) as post, mock.patch.object( - transports.PrivateAuctionDealServiceRestInterceptor, - "post_list_private_auction_deals_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivateAuctionDealServiceRestInterceptor, - "pre_list_private_auction_deals", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivateAuctionDealServiceRestInterceptor, + "post_list_private_auction_deals", + ) as post, + mock.patch.object( + transports.PrivateAuctionDealServiceRestInterceptor, + "post_list_private_auction_deals_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivateAuctionDealServiceRestInterceptor, + "pre_list_private_auction_deals", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2470,8 +2478,9 @@ def test_create_private_auction_deal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2862,20 +2871,22 @@ def test_create_private_auction_deal_rest_interceptors(null_interceptor): ) client = PrivateAuctionDealServiceClient(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.PrivateAuctionDealServiceRestInterceptor, - "post_create_private_auction_deal", - ) as post, mock.patch.object( - transports.PrivateAuctionDealServiceRestInterceptor, - "post_create_private_auction_deal_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivateAuctionDealServiceRestInterceptor, - "pre_create_private_auction_deal", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivateAuctionDealServiceRestInterceptor, + "post_create_private_auction_deal", + ) as post, + mock.patch.object( + transports.PrivateAuctionDealServiceRestInterceptor, + "post_create_private_auction_deal_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivateAuctionDealServiceRestInterceptor, + "pre_create_private_auction_deal", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2935,8 +2946,9 @@ def test_update_private_auction_deal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3329,20 +3341,22 @@ def test_update_private_auction_deal_rest_interceptors(null_interceptor): ) client = PrivateAuctionDealServiceClient(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.PrivateAuctionDealServiceRestInterceptor, - "post_update_private_auction_deal", - ) as post, mock.patch.object( - transports.PrivateAuctionDealServiceRestInterceptor, - "post_update_private_auction_deal_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivateAuctionDealServiceRestInterceptor, - "pre_update_private_auction_deal", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivateAuctionDealServiceRestInterceptor, + "post_update_private_auction_deal", + ) as post, + mock.patch.object( + transports.PrivateAuctionDealServiceRestInterceptor, + "post_update_private_auction_deal_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivateAuctionDealServiceRestInterceptor, + "pre_update_private_auction_deal", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3402,8 +3416,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3592,11 +3607,14 @@ def test_private_auction_deal_service_base_transport(): def test_private_auction_deal_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.private_auction_deal_service.transports.PrivateAuctionDealServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.private_auction_deal_service.transports.PrivateAuctionDealServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PrivateAuctionDealServiceTransport( @@ -3613,9 +3631,12 @@ def test_private_auction_deal_service_base_transport_with_credentials_file(): def test_private_auction_deal_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.private_auction_deal_service.transports.PrivateAuctionDealServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.private_auction_deal_service.transports.PrivateAuctionDealServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PrivateAuctionDealServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_service.py index c6dbb8df9c4b..44929d4ce3a5 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_private_auction_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.private_auction_service import ( PrivateAuctionServiceClient, @@ -936,10 +941,9 @@ def test_private_auction_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +988,9 @@ def test_private_auction_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1026,9 @@ def test_private_auction_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1214,9 +1216,9 @@ def test_get_private_auction_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_private_auction - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_private_auction] = ( + mock_rpc + ) request = {} client.get_private_auction(request) @@ -1396,9 +1398,9 @@ def test_list_private_auctions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_private_auctions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_private_auctions] = ( + mock_rpc + ) request = {} client.list_private_auctions(request) @@ -1669,9 +1671,9 @@ def test_create_private_auction_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_private_auction - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_private_auction] = ( + mock_rpc + ) request = {} client.create_private_auction(request) @@ -1862,9 +1864,9 @@ def test_update_private_auction_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_private_auction - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_private_auction] = ( + mock_rpc + ) request = {} client.update_private_auction(request) @@ -2124,8 +2126,9 @@ def test_get_private_auction_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2198,18 +2201,20 @@ def test_get_private_auction_rest_interceptors(null_interceptor): ) client = PrivateAuctionServiceClient(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.PrivateAuctionServiceRestInterceptor, "post_get_private_auction" - ) as post, mock.patch.object( - transports.PrivateAuctionServiceRestInterceptor, - "post_get_private_auction_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivateAuctionServiceRestInterceptor, "pre_get_private_auction" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivateAuctionServiceRestInterceptor, "post_get_private_auction" + ) as post, + mock.patch.object( + transports.PrivateAuctionServiceRestInterceptor, + "post_get_private_auction_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivateAuctionServiceRestInterceptor, "pre_get_private_auction" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2267,8 +2272,9 @@ def test_list_private_auctions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2335,18 +2341,21 @@ def test_list_private_auctions_rest_interceptors(null_interceptor): ) client = PrivateAuctionServiceClient(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.PrivateAuctionServiceRestInterceptor, "post_list_private_auctions" - ) as post, mock.patch.object( - transports.PrivateAuctionServiceRestInterceptor, - "post_list_private_auctions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivateAuctionServiceRestInterceptor, "pre_list_private_auctions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivateAuctionServiceRestInterceptor, + "post_list_private_auctions", + ) as post, + mock.patch.object( + transports.PrivateAuctionServiceRestInterceptor, + "post_list_private_auctions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivateAuctionServiceRestInterceptor, "pre_list_private_auctions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2404,8 +2413,9 @@ def test_create_private_auction_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2560,18 +2570,22 @@ def test_create_private_auction_rest_interceptors(null_interceptor): ) client = PrivateAuctionServiceClient(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.PrivateAuctionServiceRestInterceptor, "post_create_private_auction" - ) as post, mock.patch.object( - transports.PrivateAuctionServiceRestInterceptor, - "post_create_private_auction_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivateAuctionServiceRestInterceptor, "pre_create_private_auction" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivateAuctionServiceRestInterceptor, + "post_create_private_auction", + ) as post, + mock.patch.object( + transports.PrivateAuctionServiceRestInterceptor, + "post_create_private_auction_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivateAuctionServiceRestInterceptor, + "pre_create_private_auction", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2631,8 +2645,9 @@ def test_update_private_auction_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2789,18 +2804,22 @@ def test_update_private_auction_rest_interceptors(null_interceptor): ) client = PrivateAuctionServiceClient(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.PrivateAuctionServiceRestInterceptor, "post_update_private_auction" - ) as post, mock.patch.object( - transports.PrivateAuctionServiceRestInterceptor, - "post_update_private_auction_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivateAuctionServiceRestInterceptor, "pre_update_private_auction" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivateAuctionServiceRestInterceptor, + "post_update_private_auction", + ) as post, + mock.patch.object( + transports.PrivateAuctionServiceRestInterceptor, + "post_update_private_auction_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivateAuctionServiceRestInterceptor, + "pre_update_private_auction", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2860,8 +2879,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3050,11 +3070,14 @@ def test_private_auction_service_base_transport(): def test_private_auction_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.private_auction_service.transports.PrivateAuctionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.private_auction_service.transports.PrivateAuctionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PrivateAuctionServiceTransport( @@ -3071,9 +3094,12 @@ def test_private_auction_service_base_transport_with_credentials_file(): def test_private_auction_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.private_auction_service.transports.PrivateAuctionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.private_auction_service.transports.PrivateAuctionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PrivateAuctionServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_programmatic_buyer_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_programmatic_buyer_service.py index c691053ae41c..3ceee4f12f7a 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_programmatic_buyer_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_programmatic_buyer_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -942,10 +947,9 @@ def test_programmatic_buyer_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +994,9 @@ def test_programmatic_buyer_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1029,10 +1032,9 @@ def test_programmatic_buyer_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1221,9 +1223,9 @@ def test_get_programmatic_buyer_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_programmatic_buyer - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_programmatic_buyer] = ( + mock_rpc + ) request = {} client.get_programmatic_buyer(request) @@ -1748,8 +1750,9 @@ def test_get_programmatic_buyer_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1826,19 +1829,22 @@ def test_get_programmatic_buyer_rest_interceptors(null_interceptor): ) client = ProgrammaticBuyerServiceClient(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.ProgrammaticBuyerServiceRestInterceptor, - "post_get_programmatic_buyer", - ) as post, mock.patch.object( - transports.ProgrammaticBuyerServiceRestInterceptor, - "post_get_programmatic_buyer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProgrammaticBuyerServiceRestInterceptor, "pre_get_programmatic_buyer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProgrammaticBuyerServiceRestInterceptor, + "post_get_programmatic_buyer", + ) as post, + mock.patch.object( + transports.ProgrammaticBuyerServiceRestInterceptor, + "post_get_programmatic_buyer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProgrammaticBuyerServiceRestInterceptor, + "pre_get_programmatic_buyer", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1896,8 +1902,9 @@ def test_list_programmatic_buyers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1964,20 +1971,22 @@ def test_list_programmatic_buyers_rest_interceptors(null_interceptor): ) client = ProgrammaticBuyerServiceClient(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.ProgrammaticBuyerServiceRestInterceptor, - "post_list_programmatic_buyers", - ) as post, mock.patch.object( - transports.ProgrammaticBuyerServiceRestInterceptor, - "post_list_programmatic_buyers_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProgrammaticBuyerServiceRestInterceptor, - "pre_list_programmatic_buyers", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProgrammaticBuyerServiceRestInterceptor, + "post_list_programmatic_buyers", + ) as post, + mock.patch.object( + transports.ProgrammaticBuyerServiceRestInterceptor, + "post_list_programmatic_buyers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProgrammaticBuyerServiceRestInterceptor, + "pre_list_programmatic_buyers", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2039,8 +2048,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2183,11 +2193,14 @@ def test_programmatic_buyer_service_base_transport(): def test_programmatic_buyer_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.programmatic_buyer_service.transports.ProgrammaticBuyerServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.programmatic_buyer_service.transports.ProgrammaticBuyerServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProgrammaticBuyerServiceTransport( @@ -2204,9 +2217,12 @@ def test_programmatic_buyer_service_base_transport_with_credentials_file(): def test_programmatic_buyer_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.programmatic_buyer_service.transports.ProgrammaticBuyerServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.programmatic_buyer_service.transports.ProgrammaticBuyerServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProgrammaticBuyerServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_report_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_report_service.py index 5ccc96bee5bb..0c8772cecd74 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_report_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_report_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +60,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.ads.admanager_v1.services.report_service import ( ReportServiceClient, @@ -911,10 +911,9 @@ def test_report_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +958,9 @@ def test_report_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +996,9 @@ def test_report_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2389,8 +2386,9 @@ def test_get_report_rest_bad_request(request_type=report_service.GetReportReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2461,17 +2459,19 @@ def test_get_report_rest_interceptors(null_interceptor): ) client = ReportServiceClient(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.ReportServiceRestInterceptor, "post_get_report" - ) as post, mock.patch.object( - transports.ReportServiceRestInterceptor, "post_get_report_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReportServiceRestInterceptor, "pre_get_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReportServiceRestInterceptor, "post_get_report" + ) as post, + mock.patch.object( + transports.ReportServiceRestInterceptor, "post_get_report_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReportServiceRestInterceptor, "pre_get_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2522,8 +2522,9 @@ def test_list_reports_rest_bad_request(request_type=report_service.ListReportsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2588,17 +2589,19 @@ def test_list_reports_rest_interceptors(null_interceptor): ) client = ReportServiceClient(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.ReportServiceRestInterceptor, "post_list_reports" - ) as post, mock.patch.object( - transports.ReportServiceRestInterceptor, "post_list_reports_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReportServiceRestInterceptor, "pre_list_reports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReportServiceRestInterceptor, "post_list_reports" + ) as post, + mock.patch.object( + transports.ReportServiceRestInterceptor, "post_list_reports_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReportServiceRestInterceptor, "pre_list_reports" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2653,8 +2656,9 @@ def test_create_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2877,17 +2881,19 @@ def test_create_report_rest_interceptors(null_interceptor): ) client = ReportServiceClient(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.ReportServiceRestInterceptor, "post_create_report" - ) as post, mock.patch.object( - transports.ReportServiceRestInterceptor, "post_create_report_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReportServiceRestInterceptor, "pre_create_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReportServiceRestInterceptor, "post_create_report" + ) as post, + mock.patch.object( + transports.ReportServiceRestInterceptor, "post_create_report_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReportServiceRestInterceptor, "pre_create_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2940,8 +2946,9 @@ def test_update_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3164,17 +3171,19 @@ def test_update_report_rest_interceptors(null_interceptor): ) client = ReportServiceClient(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.ReportServiceRestInterceptor, "post_update_report" - ) as post, mock.patch.object( - transports.ReportServiceRestInterceptor, "post_update_report_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReportServiceRestInterceptor, "pre_update_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReportServiceRestInterceptor, "post_update_report" + ) as post, + mock.patch.object( + transports.ReportServiceRestInterceptor, "post_update_report_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReportServiceRestInterceptor, "pre_update_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3225,8 +3234,9 @@ def test_run_report_rest_bad_request(request_type=report_service.RunReportReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3283,19 +3293,20 @@ def test_run_report_rest_interceptors(null_interceptor): ) client = ReportServiceClient(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.ReportServiceRestInterceptor, "post_run_report" - ) as post, mock.patch.object( - transports.ReportServiceRestInterceptor, "post_run_report_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReportServiceRestInterceptor, "pre_run_report" - ) as pre: + 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.ReportServiceRestInterceptor, "post_run_report" + ) as post, + mock.patch.object( + transports.ReportServiceRestInterceptor, "post_run_report_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReportServiceRestInterceptor, "pre_run_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3348,8 +3359,9 @@ def test_fetch_report_result_rows_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3414,18 +3426,20 @@ def test_fetch_report_result_rows_rest_interceptors(null_interceptor): ) client = ReportServiceClient(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.ReportServiceRestInterceptor, "post_fetch_report_result_rows" - ) as post, mock.patch.object( - transports.ReportServiceRestInterceptor, - "post_fetch_report_result_rows_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReportServiceRestInterceptor, "pre_fetch_report_result_rows" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReportServiceRestInterceptor, "post_fetch_report_result_rows" + ) as post, + mock.patch.object( + transports.ReportServiceRestInterceptor, + "post_fetch_report_result_rows_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReportServiceRestInterceptor, "pre_fetch_report_result_rows" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3485,8 +3499,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3733,11 +3748,14 @@ def test_report_service_base_transport(): def test_report_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.report_service.transports.ReportServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.report_service.transports.ReportServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReportServiceTransport( @@ -3754,9 +3772,12 @@ def test_report_service_base_transport_with_credentials_file(): def test_report_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.report_service.transports.ReportServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.report_service.transports.ReportServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReportServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_role_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_role_service.py index 33b85c82231d..0d93cfec609a 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_role_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_role_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -875,10 +880,9 @@ def test_role_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -923,10 +927,9 @@ def test_role_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -962,10 +965,9 @@ def test_role_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1642,8 +1644,9 @@ def test_get_role_rest_bad_request(request_type=role_service.GetRoleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1716,17 +1719,17 @@ def test_get_role_rest_interceptors(null_interceptor): ) client = RoleServiceClient(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.RoleServiceRestInterceptor, "post_get_role" - ) as post, mock.patch.object( - transports.RoleServiceRestInterceptor, "post_get_role_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoleServiceRestInterceptor, "pre_get_role" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoleServiceRestInterceptor, "post_get_role" + ) as post, + mock.patch.object( + transports.RoleServiceRestInterceptor, "post_get_role_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoleServiceRestInterceptor, "pre_get_role") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1775,8 +1778,9 @@ def test_list_roles_rest_bad_request(request_type=role_service.ListRolesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1841,17 +1845,19 @@ def test_list_roles_rest_interceptors(null_interceptor): ) client = RoleServiceClient(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.RoleServiceRestInterceptor, "post_list_roles" - ) as post, mock.patch.object( - transports.RoleServiceRestInterceptor, "post_list_roles_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoleServiceRestInterceptor, "pre_list_roles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoleServiceRestInterceptor, "post_list_roles" + ) as post, + mock.patch.object( + transports.RoleServiceRestInterceptor, "post_list_roles_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoleServiceRestInterceptor, "pre_list_roles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1906,8 +1912,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2046,11 +2053,14 @@ def test_role_service_base_transport(): def test_role_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.role_service.transports.RoleServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.role_service.transports.RoleServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RoleServiceTransport( @@ -2067,9 +2077,12 @@ def test_role_service_base_transport_with_credentials_file(): def test_role_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.role_service.transports.RoleServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.role_service.transports.RoleServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RoleServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_site_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_site_service.py index 8187a97edc76..9ab17548f8f7 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_site_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_site_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.admanager_v1.services.site_service import ( SiteServiceClient, @@ -877,10 +882,9 @@ def test_site_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +929,9 @@ def test_site_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +967,9 @@ def test_site_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1761,9 +1763,9 @@ def test_batch_create_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_sites] = ( + mock_rpc + ) request = {} client.batch_create_sites(request) @@ -2135,9 +2137,9 @@ def test_batch_update_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_sites] = ( + mock_rpc + ) request = {} client.batch_update_sites(request) @@ -2336,9 +2338,9 @@ def test_batch_deactivate_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_deactivate_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_deactivate_sites] = ( + mock_rpc + ) request = {} client.batch_deactivate_sites(request) @@ -2802,8 +2804,9 @@ def test_get_site_rest_bad_request(request_type=site_service.GetSiteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2875,17 +2878,17 @@ def test_get_site_rest_interceptors(null_interceptor): ) client = SiteServiceClient(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.SiteServiceRestInterceptor, "post_get_site" - ) as post, mock.patch.object( - transports.SiteServiceRestInterceptor, "post_get_site_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SiteServiceRestInterceptor, "pre_get_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteServiceRestInterceptor, "post_get_site" + ) as post, + mock.patch.object( + transports.SiteServiceRestInterceptor, "post_get_site_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SiteServiceRestInterceptor, "pre_get_site") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2934,8 +2937,9 @@ def test_list_sites_rest_bad_request(request_type=site_service.ListSitesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3000,17 +3004,19 @@ def test_list_sites_rest_interceptors(null_interceptor): ) client = SiteServiceClient(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.SiteServiceRestInterceptor, "post_list_sites" - ) as post, mock.patch.object( - transports.SiteServiceRestInterceptor, "post_list_sites_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SiteServiceRestInterceptor, "pre_list_sites" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteServiceRestInterceptor, "post_list_sites" + ) as post, + mock.patch.object( + transports.SiteServiceRestInterceptor, "post_list_sites_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SiteServiceRestInterceptor, "pre_list_sites" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3061,8 +3067,9 @@ def test_create_site_rest_bad_request(request_type=site_service.CreateSiteReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3209,17 +3216,19 @@ def test_create_site_rest_interceptors(null_interceptor): ) client = SiteServiceClient(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.SiteServiceRestInterceptor, "post_create_site" - ) as post, mock.patch.object( - transports.SiteServiceRestInterceptor, "post_create_site_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SiteServiceRestInterceptor, "pre_create_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteServiceRestInterceptor, "post_create_site" + ) as post, + mock.patch.object( + transports.SiteServiceRestInterceptor, "post_create_site_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SiteServiceRestInterceptor, "pre_create_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3270,8 +3279,9 @@ def test_batch_create_sites_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3331,17 +3341,20 @@ def test_batch_create_sites_rest_interceptors(null_interceptor): ) client = SiteServiceClient(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.SiteServiceRestInterceptor, "post_batch_create_sites" - ) as post, mock.patch.object( - transports.SiteServiceRestInterceptor, "post_batch_create_sites_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SiteServiceRestInterceptor, "pre_batch_create_sites" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteServiceRestInterceptor, "post_batch_create_sites" + ) as post, + mock.patch.object( + transports.SiteServiceRestInterceptor, + "post_batch_create_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteServiceRestInterceptor, "pre_batch_create_sites" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3397,8 +3410,9 @@ def test_update_site_rest_bad_request(request_type=site_service.UpdateSiteReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3545,17 +3559,19 @@ def test_update_site_rest_interceptors(null_interceptor): ) client = SiteServiceClient(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.SiteServiceRestInterceptor, "post_update_site" - ) as post, mock.patch.object( - transports.SiteServiceRestInterceptor, "post_update_site_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SiteServiceRestInterceptor, "pre_update_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteServiceRestInterceptor, "post_update_site" + ) as post, + mock.patch.object( + transports.SiteServiceRestInterceptor, "post_update_site_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SiteServiceRestInterceptor, "pre_update_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3606,8 +3622,9 @@ def test_batch_update_sites_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3667,17 +3684,20 @@ def test_batch_update_sites_rest_interceptors(null_interceptor): ) client = SiteServiceClient(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.SiteServiceRestInterceptor, "post_batch_update_sites" - ) as post, mock.patch.object( - transports.SiteServiceRestInterceptor, "post_batch_update_sites_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SiteServiceRestInterceptor, "pre_batch_update_sites" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteServiceRestInterceptor, "post_batch_update_sites" + ) as post, + mock.patch.object( + transports.SiteServiceRestInterceptor, + "post_batch_update_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteServiceRestInterceptor, "pre_batch_update_sites" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3735,8 +3755,9 @@ def test_batch_deactivate_sites_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3796,18 +3817,20 @@ def test_batch_deactivate_sites_rest_interceptors(null_interceptor): ) client = SiteServiceClient(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.SiteServiceRestInterceptor, "post_batch_deactivate_sites" - ) as post, mock.patch.object( - transports.SiteServiceRestInterceptor, - "post_batch_deactivate_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteServiceRestInterceptor, "pre_batch_deactivate_sites" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteServiceRestInterceptor, "post_batch_deactivate_sites" + ) as post, + mock.patch.object( + transports.SiteServiceRestInterceptor, + "post_batch_deactivate_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteServiceRestInterceptor, "pre_batch_deactivate_sites" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3865,8 +3888,9 @@ def test_batch_submit_sites_for_approval_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3926,18 +3950,21 @@ def test_batch_submit_sites_for_approval_rest_interceptors(null_interceptor): ) client = SiteServiceClient(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.SiteServiceRestInterceptor, "post_batch_submit_sites_for_approval" - ) as post, mock.patch.object( - transports.SiteServiceRestInterceptor, - "post_batch_submit_sites_for_approval_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteServiceRestInterceptor, "pre_batch_submit_sites_for_approval" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteServiceRestInterceptor, + "post_batch_submit_sites_for_approval", + ) as post, + mock.patch.object( + transports.SiteServiceRestInterceptor, + "post_batch_submit_sites_for_approval_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteServiceRestInterceptor, "pre_batch_submit_sites_for_approval" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3997,8 +4024,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4271,11 +4299,14 @@ def test_site_service_base_transport(): def test_site_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.site_service.transports.SiteServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.site_service.transports.SiteServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteServiceTransport( @@ -4292,9 +4323,12 @@ def test_site_service_base_transport_with_credentials_file(): def test_site_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.site_service.transports.SiteServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.site_service.transports.SiteServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_taxonomy_category_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_taxonomy_category_service.py index b0da830a2c49..10cc14520190 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_taxonomy_category_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_taxonomy_category_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -939,10 +944,9 @@ def test_taxonomy_category_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +991,9 @@ def test_taxonomy_category_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1029,9 @@ def test_taxonomy_category_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1218,9 +1220,9 @@ def test_get_taxonomy_category_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_taxonomy_category - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_taxonomy_category] = ( + mock_rpc + ) request = {} client.get_taxonomy_category(request) @@ -1742,8 +1744,9 @@ def test_get_taxonomy_category_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1823,18 +1826,22 @@ def test_get_taxonomy_category_rest_interceptors(null_interceptor): ) client = TaxonomyCategoryServiceClient(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.TaxonomyCategoryServiceRestInterceptor, "post_get_taxonomy_category" - ) as post, mock.patch.object( - transports.TaxonomyCategoryServiceRestInterceptor, - "post_get_taxonomy_category_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TaxonomyCategoryServiceRestInterceptor, "pre_get_taxonomy_category" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TaxonomyCategoryServiceRestInterceptor, + "post_get_taxonomy_category", + ) as post, + mock.patch.object( + transports.TaxonomyCategoryServiceRestInterceptor, + "post_get_taxonomy_category_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TaxonomyCategoryServiceRestInterceptor, + "pre_get_taxonomy_category", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1892,8 +1899,9 @@ def test_list_taxonomy_categories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1960,20 +1968,22 @@ def test_list_taxonomy_categories_rest_interceptors(null_interceptor): ) client = TaxonomyCategoryServiceClient(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.TaxonomyCategoryServiceRestInterceptor, - "post_list_taxonomy_categories", - ) as post, mock.patch.object( - transports.TaxonomyCategoryServiceRestInterceptor, - "post_list_taxonomy_categories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TaxonomyCategoryServiceRestInterceptor, - "pre_list_taxonomy_categories", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TaxonomyCategoryServiceRestInterceptor, + "post_list_taxonomy_categories", + ) as post, + mock.patch.object( + transports.TaxonomyCategoryServiceRestInterceptor, + "post_list_taxonomy_categories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TaxonomyCategoryServiceRestInterceptor, + "pre_list_taxonomy_categories", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2033,8 +2043,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2177,11 +2188,14 @@ def test_taxonomy_category_service_base_transport(): def test_taxonomy_category_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.taxonomy_category_service.transports.TaxonomyCategoryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.taxonomy_category_service.transports.TaxonomyCategoryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TaxonomyCategoryServiceTransport( @@ -2198,9 +2212,12 @@ def test_taxonomy_category_service_base_transport_with_credentials_file(): def test_taxonomy_category_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.taxonomy_category_service.transports.TaxonomyCategoryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.taxonomy_category_service.transports.TaxonomyCategoryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TaxonomyCategoryServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_team_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_team_service.py index d06ee9335d63..89d4f06638c3 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_team_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_team_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.ads.admanager_v1.services.team_service import ( TeamServiceClient, @@ -876,10 +881,9 @@ def test_team_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -924,10 +928,9 @@ def test_team_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -963,10 +966,9 @@ def test_team_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1760,9 +1762,9 @@ def test_batch_create_teams_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_teams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_teams] = ( + mock_rpc + ) request = {} client.batch_create_teams(request) @@ -2134,9 +2136,9 @@ def test_batch_update_teams_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_teams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_teams] = ( + mock_rpc + ) request = {} client.batch_update_teams(request) @@ -2334,9 +2336,9 @@ def test_batch_activate_teams_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_activate_teams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_activate_teams] = ( + mock_rpc + ) request = {} client.batch_activate_teams(request) @@ -2531,9 +2533,9 @@ def test_batch_deactivate_teams_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_deactivate_teams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_deactivate_teams] = ( + mock_rpc + ) request = {} client.batch_deactivate_teams(request) @@ -2795,8 +2797,9 @@ def test_get_team_rest_bad_request(request_type=team_service.GetTeamRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2871,17 +2874,17 @@ def test_get_team_rest_interceptors(null_interceptor): ) client = TeamServiceClient(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.TeamServiceRestInterceptor, "post_get_team" - ) as post, mock.patch.object( - transports.TeamServiceRestInterceptor, "post_get_team_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TeamServiceRestInterceptor, "pre_get_team" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TeamServiceRestInterceptor, "post_get_team" + ) as post, + mock.patch.object( + transports.TeamServiceRestInterceptor, "post_get_team_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TeamServiceRestInterceptor, "pre_get_team") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2930,8 +2933,9 @@ def test_list_teams_rest_bad_request(request_type=team_service.ListTeamsRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2996,17 +3000,19 @@ def test_list_teams_rest_interceptors(null_interceptor): ) client = TeamServiceClient(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.TeamServiceRestInterceptor, "post_list_teams" - ) as post, mock.patch.object( - transports.TeamServiceRestInterceptor, "post_list_teams_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TeamServiceRestInterceptor, "pre_list_teams" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TeamServiceRestInterceptor, "post_list_teams" + ) as post, + mock.patch.object( + transports.TeamServiceRestInterceptor, "post_list_teams_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TeamServiceRestInterceptor, "pre_list_teams" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3057,8 +3063,9 @@ def test_create_team_rest_bad_request(request_type=team_service.CreateTeamReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3209,17 +3216,19 @@ def test_create_team_rest_interceptors(null_interceptor): ) client = TeamServiceClient(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.TeamServiceRestInterceptor, "post_create_team" - ) as post, mock.patch.object( - transports.TeamServiceRestInterceptor, "post_create_team_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TeamServiceRestInterceptor, "pre_create_team" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TeamServiceRestInterceptor, "post_create_team" + ) as post, + mock.patch.object( + transports.TeamServiceRestInterceptor, "post_create_team_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TeamServiceRestInterceptor, "pre_create_team" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3270,8 +3279,9 @@ def test_batch_create_teams_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3331,17 +3341,20 @@ def test_batch_create_teams_rest_interceptors(null_interceptor): ) client = TeamServiceClient(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.TeamServiceRestInterceptor, "post_batch_create_teams" - ) as post, mock.patch.object( - transports.TeamServiceRestInterceptor, "post_batch_create_teams_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TeamServiceRestInterceptor, "pre_batch_create_teams" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TeamServiceRestInterceptor, "post_batch_create_teams" + ) as post, + mock.patch.object( + transports.TeamServiceRestInterceptor, + "post_batch_create_teams_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TeamServiceRestInterceptor, "pre_batch_create_teams" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3397,8 +3410,9 @@ def test_update_team_rest_bad_request(request_type=team_service.UpdateTeamReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3549,17 +3563,19 @@ def test_update_team_rest_interceptors(null_interceptor): ) client = TeamServiceClient(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.TeamServiceRestInterceptor, "post_update_team" - ) as post, mock.patch.object( - transports.TeamServiceRestInterceptor, "post_update_team_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TeamServiceRestInterceptor, "pre_update_team" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TeamServiceRestInterceptor, "post_update_team" + ) as post, + mock.patch.object( + transports.TeamServiceRestInterceptor, "post_update_team_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TeamServiceRestInterceptor, "pre_update_team" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3610,8 +3626,9 @@ def test_batch_update_teams_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3671,17 +3688,20 @@ def test_batch_update_teams_rest_interceptors(null_interceptor): ) client = TeamServiceClient(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.TeamServiceRestInterceptor, "post_batch_update_teams" - ) as post, mock.patch.object( - transports.TeamServiceRestInterceptor, "post_batch_update_teams_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TeamServiceRestInterceptor, "pre_batch_update_teams" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TeamServiceRestInterceptor, "post_batch_update_teams" + ) as post, + mock.patch.object( + transports.TeamServiceRestInterceptor, + "post_batch_update_teams_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TeamServiceRestInterceptor, "pre_batch_update_teams" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3739,8 +3759,9 @@ def test_batch_activate_teams_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3800,17 +3821,20 @@ def test_batch_activate_teams_rest_interceptors(null_interceptor): ) client = TeamServiceClient(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.TeamServiceRestInterceptor, "post_batch_activate_teams" - ) as post, mock.patch.object( - transports.TeamServiceRestInterceptor, "post_batch_activate_teams_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TeamServiceRestInterceptor, "pre_batch_activate_teams" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TeamServiceRestInterceptor, "post_batch_activate_teams" + ) as post, + mock.patch.object( + transports.TeamServiceRestInterceptor, + "post_batch_activate_teams_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TeamServiceRestInterceptor, "pre_batch_activate_teams" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3868,8 +3892,9 @@ def test_batch_deactivate_teams_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3929,18 +3954,20 @@ def test_batch_deactivate_teams_rest_interceptors(null_interceptor): ) client = TeamServiceClient(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.TeamServiceRestInterceptor, "post_batch_deactivate_teams" - ) as post, mock.patch.object( - transports.TeamServiceRestInterceptor, - "post_batch_deactivate_teams_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TeamServiceRestInterceptor, "pre_batch_deactivate_teams" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TeamServiceRestInterceptor, "post_batch_deactivate_teams" + ) as post, + mock.patch.object( + transports.TeamServiceRestInterceptor, + "post_batch_deactivate_teams_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TeamServiceRestInterceptor, "pre_batch_deactivate_teams" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4000,8 +4027,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4274,11 +4302,14 @@ def test_team_service_base_transport(): def test_team_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.team_service.transports.TeamServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.team_service.transports.TeamServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TeamServiceTransport( @@ -4295,9 +4326,12 @@ def test_team_service_base_transport_with_credentials_file(): def test_team_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.team_service.transports.TeamServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.team_service.transports.TeamServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TeamServiceTransport() diff --git a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_user_service.py b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_user_service.py index 4ca4648880fa..64d02c3a13e1 100644 --- a/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_user_service.py +++ b/packages/google-ads-admanager/tests/unit/gapic/admanager_v1/test_user_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -871,10 +876,9 @@ def test_user_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -919,10 +923,9 @@ def test_user_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +961,9 @@ def test_user_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1382,8 +1384,9 @@ def test_get_user_rest_bad_request(request_type=user_service.GetUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1462,17 +1465,17 @@ def test_get_user_rest_interceptors(null_interceptor): ) client = UserServiceClient(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.UserServiceRestInterceptor, "post_get_user" - ) as post, mock.patch.object( - transports.UserServiceRestInterceptor, "post_get_user_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UserServiceRestInterceptor, "pre_get_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserServiceRestInterceptor, "post_get_user" + ) as post, + mock.patch.object( + transports.UserServiceRestInterceptor, "post_get_user_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UserServiceRestInterceptor, "pre_get_user") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1525,8 +1528,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1644,11 +1648,14 @@ def test_user_service_base_transport(): def test_user_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.admanager_v1.services.user_service.transports.UserServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.admanager_v1.services.user_service.transports.UserServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserServiceTransport( @@ -1665,9 +1672,12 @@ def test_user_service_base_transport_with_credentials_file(): def test_user_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.admanager_v1.services.user_service.transports.UserServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.admanager_v1.services.user_service.transports.UserServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserServiceTransport() diff --git a/packages/google-ads-datamanager/docs/conf.py b/packages/google-ads-datamanager/docs/conf.py index 46f73cb30516..7e6e9333122a 100644 --- a/packages/google-ads-datamanager/docs/conf.py +++ b/packages/google-ads-datamanager/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-ads-datamanager documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/__init__.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/__init__.py index 94085fe79bae..27d459bc22cf 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/__init__.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.ingestion_service import ( IngestionServiceAsyncClient, IngestionServiceClient, diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/async_client.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/async_client.py index f716e5a30ea4..a36513b84e56 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/async_client.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.datamanager_v1 import gapic_version as package_version @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IngestionServiceAsyncClient: The constructed client. """ - return IngestionServiceClient.from_service_account_info.__func__(IngestionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = IngestionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(IngestionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IngestionServiceAsyncClient: The constructed client. """ - return IngestionServiceClient.from_service_account_file.__func__(IngestionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = IngestionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(IngestionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/client.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/client.py index b0c173fe6db8..4fa517fa7a63 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/client.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.datamanager_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class IngestionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IngestionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IngestionServiceTransport]] _transport_registry["grpc"] = IngestionServiceGrpcTransport _transport_registry["grpc_asyncio"] = IngestionServiceGrpcAsyncIOTransport _transport_registry["rest"] = IngestionServiceRestTransport @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IngestionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IngestionServiceClient._read_environment_variables() + ) self._client_cert_source = IngestionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IngestionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/base.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/base.py index c35f4d76210b..f9643c305549 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/base.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.datamanager_v1 import gapic_version as package_version from google.ads.datamanager_v1.types import ingestion_service diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc.py index f474cbfa3a9d..00603b147821 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.ads.datamanager_v1.types import ingestion_service diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc_asyncio.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc_asyncio.py index 244dd0e87126..1712ec86a94b 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc_asyncio.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ads.datamanager_v1.types import ingestion_service diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/rest.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/rest.py index 0aa91d1efa3c..16456968ba8f 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/rest.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/services/ingestion_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -464,9 +464,7 @@ def __call__( """ - http_options = ( - _BaseIngestionServiceRestTransport._BaseIngestAudienceMembers._get_http_options() - ) + http_options = _BaseIngestionServiceRestTransport._BaseIngestAudienceMembers._get_http_options() request, metadata = self._interceptor.pre_ingest_audience_members( request, metadata @@ -783,9 +781,7 @@ def __call__( """ - http_options = ( - _BaseIngestionServiceRestTransport._BaseRemoveAudienceMembers._get_http_options() - ) + http_options = _BaseIngestionServiceRestTransport._BaseRemoveAudienceMembers._get_http_options() request, metadata = self._interceptor.pre_remove_audience_members( request, metadata @@ -945,9 +941,7 @@ def __call__( """ - http_options = ( - _BaseIngestionServiceRestTransport._BaseRetrieveRequestStatus._get_http_options() - ) + http_options = _BaseIngestionServiceRestTransport._BaseRetrieveRequestStatus._get_http_options() request, metadata = self._interceptor.pre_retrieve_request_status( request, metadata diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/__init__.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/__init__.py index 88a8ff301d39..6786c28fbb18 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/__init__.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/__init__.py @@ -13,15 +13,45 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .audience import AudienceMember, MobileData, PairData -from .cart_data import CartData, Item -from .consent import Consent, ConsentStatus -from .destination import Destination, Product, ProductAccount -from .device_info import DeviceInfo -from .encryption_info import AwsWrappedKeyInfo, EncryptionInfo, GcpWrappedKeyInfo -from .error import ErrorReason -from .event import AdIdentifiers, CustomVariable, Event, EventParameter, EventSource -from .experimental_field import ExperimentalField +from .audience import ( + AudienceMember, + MobileData, + PairData, +) +from .cart_data import ( + CartData, + Item, +) +from .consent import ( + Consent, + ConsentStatus, +) +from .destination import ( + Destination, + Product, + ProductAccount, +) +from .device_info import ( + DeviceInfo, +) +from .encryption_info import ( + AwsWrappedKeyInfo, + EncryptionInfo, + GcpWrappedKeyInfo, +) +from .error import ( + ErrorReason, +) +from .event import ( + AdIdentifiers, + CustomVariable, + Event, + EventParameter, + EventSource, +) +from .experimental_field import ( + ExperimentalField, +) from .ingestion_service import ( Encoding, IngestAudienceMembersRequest, @@ -33,8 +63,12 @@ RetrieveRequestStatusRequest, RetrieveRequestStatusResponse, ) -from .item_parameter import ItemParameter -from .match_rate import MatchRateRange +from .item_parameter import ( + ItemParameter, +) +from .match_rate import ( + MatchRateRange, +) from .processing_errors import ( ErrorCount, ErrorInfo, @@ -43,9 +77,18 @@ WarningCount, WarningInfo, ) -from .request_status_per_destination import RequestStatusPerDestination -from .terms_of_service import TermsOfService, TermsOfServiceStatus -from .user_data import AddressInfo, UserData, UserIdentifier +from .request_status_per_destination import ( + RequestStatusPerDestination, +) +from .terms_of_service import ( + TermsOfService, + TermsOfServiceStatus, +) +from .user_data import ( + AddressInfo, + UserData, + UserIdentifier, +) from .user_properties import ( CustomerType, CustomerValueBucket, diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/cart_data.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/cart_data.py index 95b1b3b502cc..600b7e6d08f9 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/cart_data.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/cart_data.py @@ -114,12 +114,12 @@ class Item(proto.Message): proto.STRING, number=4, ) - additional_item_parameters: MutableSequence[ - item_parameter.ItemParameter - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=item_parameter.ItemParameter, + additional_item_parameters: MutableSequence[item_parameter.ItemParameter] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=item_parameter.ItemParameter, + ) ) diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/consent.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/consent.py index 0a418036393c..483aa35ff542 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/consent.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/consent.py @@ -40,6 +40,7 @@ class ConsentStatus(proto.Enum): CONSENT_DENIED (2): Denied. """ + CONSENT_STATUS_UNSPECIFIED = 0 CONSENT_GRANTED = 1 CONSENT_DENIED = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/destination.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/destination.py index aaa0c8e07660..e6a1e424cf9b 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/destination.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/destination.py @@ -46,6 +46,7 @@ class Product(proto.Enum): DATA_PARTNER (4): Data Partner. """ + _pb_options = {"deprecated": True} PRODUCT_UNSPECIFIED = 0 GOOGLE_ADS = 1 @@ -154,6 +155,7 @@ class AccountType(proto.Enum): GOOGLE_ANALYTICS_PROPERTY (5): Google Analytics. """ + ACCOUNT_TYPE_UNSPECIFIED = 0 GOOGLE_ADS = 1 DISPLAY_VIDEO_PARTNER = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/encryption_info.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/encryption_info.py index 33512f38ea1d..0958c6c86dee 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/encryption_info.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/encryption_info.py @@ -97,6 +97,7 @@ class KeyType(proto.Enum): XCHACHA20_POLY1305 (1): Algorithm XChaCha20-Poly1305 """ + KEY_TYPE_UNSPECIFIED = 0 XCHACHA20_POLY1305 = 1 @@ -148,6 +149,7 @@ class KeyType(proto.Enum): XCHACHA20_POLY1305 (1): Algorithm XChaCha20-Poly1305 """ + KEY_TYPE_UNSPECIFIED = 0 XCHACHA20_POLY1305 = 1 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/error.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/error.py index 3f04e40b7317..ab5b7d2e1bcf 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/error.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/error.py @@ -163,6 +163,7 @@ class ErrorReason(proto.Enum): TOO_MANY_ELEMENTS (51): Too many elements in a list in the request. """ + ERROR_REASON_UNSPECIFIED = 0 INTERNAL_ERROR = 1 DEADLINE_EXCEEDED = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/event.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/event.py index bcbd42adc8a2..ec95d47d8bfe 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/event.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/event.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore -from google.ads.datamanager_v1.types import user_properties as gad_user_properties from google.ads.datamanager_v1.types import cart_data as gad_cart_data from google.ads.datamanager_v1.types import consent as gad_consent from google.ads.datamanager_v1.types import device_info, experimental_field from google.ads.datamanager_v1.types import user_data as gad_user_data +from google.ads.datamanager_v1.types import user_properties as gad_user_properties __protobuf__ = proto.module( package="google.ads.datamanager.v1", @@ -57,6 +57,7 @@ class EventSource(proto.Enum): OTHER (5): The event was generated from other sources. """ + EVENT_SOURCE_UNSPECIFIED = 0 WEB = 1 APP = 2 @@ -202,12 +203,12 @@ class Event(proto.Message): number=13, message="CustomVariable", ) - experimental_fields: MutableSequence[ - experimental_field.ExperimentalField - ] = proto.RepeatedField( - proto.MESSAGE, - number=14, - message=experimental_field.ExperimentalField, + experimental_fields: MutableSequence[experimental_field.ExperimentalField] = ( + proto.RepeatedField( + proto.MESSAGE, + number=14, + message=experimental_field.ExperimentalField, + ) ) user_properties: gad_user_properties.UserProperties = proto.Field( proto.MESSAGE, @@ -226,12 +227,12 @@ class Event(proto.Message): proto.STRING, number=18, ) - additional_event_parameters: MutableSequence[ - "EventParameter" - ] = proto.RepeatedField( - proto.MESSAGE, - number=19, - message="EventParameter", + additional_event_parameters: MutableSequence["EventParameter"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=19, + message="EventParameter", + ) ) diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/ingestion_service.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/ingestion_service.py index 59bc54572d12..b040f3bf3702 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/ingestion_service.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/ingestion_service.py @@ -19,15 +19,13 @@ import proto # type: ignore +from google.ads.datamanager_v1.types import audience, destination, event +from google.ads.datamanager_v1.types import consent as gad_consent from google.ads.datamanager_v1.types import encryption_info as gad_encryption_info from google.ads.datamanager_v1.types import ( request_status_per_destination as gad_request_status_per_destination, ) from google.ads.datamanager_v1.types import terms_of_service as gad_terms_of_service -from google.ads.datamanager_v1.types import audience -from google.ads.datamanager_v1.types import consent as gad_consent -from google.ads.datamanager_v1.types import destination -from google.ads.datamanager_v1.types import event __protobuf__ = proto.module( package="google.ads.datamanager.v1", @@ -57,6 +55,7 @@ class Encoding(proto.Enum): BASE64 (2): Base 64 encoding. """ + ENCODING_UNSPECIFIED = 0 HEX = 1 BASE64 = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/match_rate.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/match_rate.py index 8afe7729a3aa..d26e7028541d 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/match_rate.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/match_rate.py @@ -63,6 +63,7 @@ class MatchRateRange(proto.Enum): The match rate range is between 91% and 100% (in the interval ``[91, 100]``). """ + MATCH_RATE_RANGE_UNKNOWN = 0 MATCH_RATE_RANGE_NOT_ELIGIBLE = 1 MATCH_RATE_RANGE_LESS_THAN_20 = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/processing_errors.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/processing_errors.py index 771a3ba68b4a..220c32318965 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/processing_errors.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/processing_errors.py @@ -114,6 +114,7 @@ class ProcessingErrorReason(proto.Enum): ad identifier that isn't from the operating account's ads. """ + PROCESSING_ERROR_REASON_UNSPECIFIED = 0 PROCESSING_ERROR_REASON_INVALID_CUSTOM_VARIABLE = 1 PROCESSING_ERROR_REASON_CUSTOM_VARIABLE_NOT_ENABLED = 2 @@ -128,9 +129,7 @@ class ProcessingErrorReason(proto.Enum): PROCESSING_ERROR_REASON_INVALID_MERCHANT_ID = 11 PROCESSING_ERROR_REASON_INVALID_WBRAID = 12 PROCESSING_ERROR_REASON_INTERNAL_ERROR = 13 - PROCESSING_ERROR_REASON_DESTINATION_ACCOUNT_ENHANCED_CONVERSIONS_TERMS_NOT_SIGNED = ( - 14 - ) + PROCESSING_ERROR_REASON_DESTINATION_ACCOUNT_ENHANCED_CONVERSIONS_TERMS_NOT_SIGNED = 14 PROCESSING_ERROR_REASON_INVALID_EVENT = 15 PROCESSING_ERROR_REASON_INSUFFICIENT_MATCHED_TRANSACTIONS = 16 PROCESSING_ERROR_REASON_INSUFFICIENT_TRANSACTIONS = 17 @@ -177,6 +176,7 @@ class ProcessingWarningReason(proto.Enum): PROCESSING_WARNING_REASON_AWS_AUTH_FAILED (9): The system failed to authenticate with AWS. """ + PROCESSING_WARNING_REASON_UNSPECIFIED = 0 PROCESSING_WARNING_REASON_KEK_PERMISSION_DENIED = 1 PROCESSING_WARNING_REASON_DEK_DECRYPTION_ERROR = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/request_status_per_destination.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/request_status_per_destination.py index 2ca22c1bfd5c..ac72fd032b34 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/request_status_per_destination.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/request_status_per_destination.py @@ -82,6 +82,7 @@ class RequestStatus(proto.Enum): PARTIAL_SUCCESS (4): The request partially succeeded. """ + REQUEST_STATUS_UNKNOWN = 0 SUCCESS = 1 PROCESSING = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/terms_of_service.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/terms_of_service.py index 5f2867a13d09..8aee6397f942 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/terms_of_service.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/terms_of_service.py @@ -42,6 +42,7 @@ class TermsOfServiceStatus(proto.Enum): Status indicating the caller has chosen to reject the terms of service. """ + TERMS_OF_SERVICE_STATUS_UNSPECIFIED = 0 ACCEPTED = 1 REJECTED = 2 diff --git a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/user_properties.py b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/user_properties.py index 97fc71b0f1bb..f0b7a5227bc5 100644 --- a/packages/google-ads-datamanager/google/ads/datamanager_v1/types/user_properties.py +++ b/packages/google-ads-datamanager/google/ads/datamanager_v1/types/user_properties.py @@ -45,6 +45,7 @@ class CustomerType(proto.Enum): The customer has re-engaged with the advertiser. """ + CUSTOMER_TYPE_UNSPECIFIED = 0 NEW = 1 RETURNING = 2 @@ -65,6 +66,7 @@ class CustomerValueBucket(proto.Enum): HIGH (3): The customer is high value. """ + CUSTOMER_VALUE_BUCKET_UNSPECIFIED = 0 LOW = 1 MEDIUM = 2 diff --git a/packages/google-ads-datamanager/noxfile.py b/packages/google-ads-datamanager/noxfile.py index fdfc161e3f0d..aeda04ccc5c6 100644 --- a/packages/google-ads-datamanager/noxfile.py +++ b/packages/google-ads-datamanager/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-ads-datamanager/tests/unit/gapic/datamanager_v1/test_ingestion_service.py b/packages/google-ads-datamanager/tests/unit/gapic/datamanager_v1/test_ingestion_service.py index 76a690d1fc60..cd3805b9f895 100644 --- a/packages/google-ads-datamanager/tests/unit/gapic/datamanager_v1/test_ingestion_service.py +++ b/packages/google-ads-datamanager/tests/unit/gapic/datamanager_v1/test_ingestion_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.ads.datamanager_v1.services.ingestion_service import ( IngestionServiceAsyncClient, @@ -985,10 +990,9 @@ def test_ingestion_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1037,9 @@ def test_ingestion_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1072,10 +1075,9 @@ def test_ingestion_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1323,13 +1325,13 @@ def test_ingestion_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2953,8 +2955,9 @@ def test_ingest_audience_members_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3017,18 +3020,20 @@ def test_ingest_audience_members_rest_interceptors(null_interceptor): ) client = IngestionServiceClient(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.IngestionServiceRestInterceptor, "post_ingest_audience_members" - ) as post, mock.patch.object( - transports.IngestionServiceRestInterceptor, - "post_ingest_audience_members_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IngestionServiceRestInterceptor, "pre_ingest_audience_members" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IngestionServiceRestInterceptor, "post_ingest_audience_members" + ) as post, + mock.patch.object( + transports.IngestionServiceRestInterceptor, + "post_ingest_audience_members_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IngestionServiceRestInterceptor, "pre_ingest_audience_members" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3086,8 +3091,9 @@ def test_remove_audience_members_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3150,18 +3156,20 @@ def test_remove_audience_members_rest_interceptors(null_interceptor): ) client = IngestionServiceClient(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.IngestionServiceRestInterceptor, "post_remove_audience_members" - ) as post, mock.patch.object( - transports.IngestionServiceRestInterceptor, - "post_remove_audience_members_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IngestionServiceRestInterceptor, "pre_remove_audience_members" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IngestionServiceRestInterceptor, "post_remove_audience_members" + ) as post, + mock.patch.object( + transports.IngestionServiceRestInterceptor, + "post_remove_audience_members_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IngestionServiceRestInterceptor, "pre_remove_audience_members" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3219,8 +3227,9 @@ def test_ingest_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3283,17 +3292,20 @@ def test_ingest_events_rest_interceptors(null_interceptor): ) client = IngestionServiceClient(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.IngestionServiceRestInterceptor, "post_ingest_events" - ) as post, mock.patch.object( - transports.IngestionServiceRestInterceptor, "post_ingest_events_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IngestionServiceRestInterceptor, "pre_ingest_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IngestionServiceRestInterceptor, "post_ingest_events" + ) as post, + mock.patch.object( + transports.IngestionServiceRestInterceptor, + "post_ingest_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IngestionServiceRestInterceptor, "pre_ingest_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3351,8 +3363,9 @@ def test_retrieve_request_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3412,18 +3425,20 @@ def test_retrieve_request_status_rest_interceptors(null_interceptor): ) client = IngestionServiceClient(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.IngestionServiceRestInterceptor, "post_retrieve_request_status" - ) as post, mock.patch.object( - transports.IngestionServiceRestInterceptor, - "post_retrieve_request_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IngestionServiceRestInterceptor, "pre_retrieve_request_status" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IngestionServiceRestInterceptor, "post_retrieve_request_status" + ) as post, + mock.patch.object( + transports.IngestionServiceRestInterceptor, + "post_retrieve_request_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IngestionServiceRestInterceptor, "pre_retrieve_request_status" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3619,11 +3634,14 @@ def test_ingestion_service_base_transport(): def test_ingestion_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.datamanager_v1.services.ingestion_service.transports.IngestionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.datamanager_v1.services.ingestion_service.transports.IngestionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IngestionServiceTransport( @@ -3640,9 +3658,12 @@ def test_ingestion_service_base_transport_with_credentials_file(): def test_ingestion_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.datamanager_v1.services.ingestion_service.transports.IngestionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.datamanager_v1.services.ingestion_service.transports.IngestionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IngestionServiceTransport() @@ -3714,11 +3735,12 @@ def test_ingestion_service_transport_auth_gdch_credentials(transport_class): def test_ingestion_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ads-marketingplatform-admin/docs/conf.py b/packages/google-ads-marketingplatform-admin/docs/conf.py index f673662b04bc..c19c5aa6f5a2 100644 --- a/packages/google-ads-marketingplatform-admin/docs/conf.py +++ b/packages/google-ads-marketingplatform-admin/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-ads-marketingplatform-admin documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/__init__.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/__init__.py index b41c7babdbed..44dd8836caf9 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/__init__.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.marketingplatform_admin_service import ( MarketingplatformAdminServiceAsyncClient, MarketingplatformAdminServiceClient, diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/async_client.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/async_client.py index 1416ba2380b8..78e8061c37bb 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/async_client.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.marketingplatform_admin_v1alpha import gapic_version as package_version @@ -146,7 +146,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MarketingplatformAdminServiceAsyncClient: The constructed client. """ - return MarketingplatformAdminServiceClient.from_service_account_info.__func__(MarketingplatformAdminServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MarketingplatformAdminServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + MarketingplatformAdminServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -162,7 +167,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MarketingplatformAdminServiceAsyncClient: The constructed client. """ - return MarketingplatformAdminServiceClient.from_service_account_file.__func__(MarketingplatformAdminServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MarketingplatformAdminServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + MarketingplatformAdminServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -200,7 +210,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return MarketingplatformAdminServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return MarketingplatformAdminServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> MarketingplatformAdminServiceTransport: diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/client.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/client.py index a9d1fc9dca1d..41f284f10fab 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/client.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ads.marketingplatform_admin_v1alpha import gapic_version as package_version @@ -83,13 +83,11 @@ class MarketingplatformAdminServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MarketingplatformAdminServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MarketingplatformAdminServiceTransport]] _transport_registry["grpc"] = MarketingplatformAdminServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = MarketingplatformAdminServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + MarketingplatformAdminServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = MarketingplatformAdminServiceRestTransport def get_transport_class( @@ -684,11 +682,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MarketingplatformAdminServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MarketingplatformAdminServiceClient._read_environment_variables() + ) self._client_cert_source = ( MarketingplatformAdminServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -729,8 +725,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MarketingplatformAdminServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/pagers.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/pagers.py index f31c78893a3a..4bff178620ce 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/pagers.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -314,7 +314,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/__init__.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/__init__.py index fbabd2c13a8d..b9501e450264 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/__init__.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[MarketingplatformAdminServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[MarketingplatformAdminServiceTransport]] _transport_registry["grpc"] = MarketingplatformAdminServiceGrpcTransport _transport_registry["grpc_asyncio"] = MarketingplatformAdminServiceGrpcAsyncIOTransport _transport_registry["rest"] = MarketingplatformAdminServiceRestTransport diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/base.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/base.py index 44afa9cc5cd7..4295be260e8c 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/base.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ads.marketingplatform_admin_v1alpha import gapic_version as package_version from google.ads.marketingplatform_admin_v1alpha.types import ( diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc.py index 571481963ff7..84563e709161 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.ads.marketingplatform_admin_v1alpha.types import ( marketingplatform_admin, @@ -412,12 +412,12 @@ def find_sales_partner_managed_clients( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "find_sales_partner_managed_clients" not in self._stubs: - self._stubs[ - "find_sales_partner_managed_clients" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/FindSalesPartnerManagedClients", - request_serializer=marketingplatform_admin.FindSalesPartnerManagedClientsRequest.serialize, - response_deserializer=marketingplatform_admin.FindSalesPartnerManagedClientsResponse.deserialize, + self._stubs["find_sales_partner_managed_clients"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/FindSalesPartnerManagedClients", + request_serializer=marketingplatform_admin.FindSalesPartnerManagedClientsRequest.serialize, + response_deserializer=marketingplatform_admin.FindSalesPartnerManagedClientsResponse.deserialize, + ) ) return self._stubs["find_sales_partner_managed_clients"] @@ -444,12 +444,12 @@ def list_analytics_account_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_analytics_account_links" not in self._stubs: - self._stubs[ - "list_analytics_account_links" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/ListAnalyticsAccountLinks", - request_serializer=marketingplatform_admin.ListAnalyticsAccountLinksRequest.serialize, - response_deserializer=marketingplatform_admin.ListAnalyticsAccountLinksResponse.deserialize, + self._stubs["list_analytics_account_links"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/ListAnalyticsAccountLinks", + request_serializer=marketingplatform_admin.ListAnalyticsAccountLinksRequest.serialize, + response_deserializer=marketingplatform_admin.ListAnalyticsAccountLinksResponse.deserialize, + ) ) return self._stubs["list_analytics_account_links"] @@ -482,12 +482,12 @@ def create_analytics_account_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_analytics_account_link" not in self._stubs: - self._stubs[ - "create_analytics_account_link" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/CreateAnalyticsAccountLink", - request_serializer=marketingplatform_admin.CreateAnalyticsAccountLinkRequest.serialize, - response_deserializer=resources.AnalyticsAccountLink.deserialize, + self._stubs["create_analytics_account_link"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/CreateAnalyticsAccountLink", + request_serializer=marketingplatform_admin.CreateAnalyticsAccountLinkRequest.serialize, + response_deserializer=resources.AnalyticsAccountLink.deserialize, + ) ) return self._stubs["create_analytics_account_link"] @@ -517,12 +517,12 @@ def delete_analytics_account_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_analytics_account_link" not in self._stubs: - self._stubs[ - "delete_analytics_account_link" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/DeleteAnalyticsAccountLink", - request_serializer=marketingplatform_admin.DeleteAnalyticsAccountLinkRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_analytics_account_link"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/DeleteAnalyticsAccountLink", + request_serializer=marketingplatform_admin.DeleteAnalyticsAccountLinkRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_analytics_account_link"] @@ -548,12 +548,12 @@ def set_property_service_level( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_property_service_level" not in self._stubs: - self._stubs[ - "set_property_service_level" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/SetPropertyServiceLevel", - request_serializer=marketingplatform_admin.SetPropertyServiceLevelRequest.serialize, - response_deserializer=marketingplatform_admin.SetPropertyServiceLevelResponse.deserialize, + self._stubs["set_property_service_level"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/SetPropertyServiceLevel", + request_serializer=marketingplatform_admin.SetPropertyServiceLevelRequest.serialize, + response_deserializer=marketingplatform_admin.SetPropertyServiceLevelResponse.deserialize, + ) ) return self._stubs["set_property_service_level"] diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc_asyncio.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc_asyncio.py index 1a99d9895164..f498f35f75e3 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc_asyncio.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ads.marketingplatform_admin_v1alpha.types import ( marketingplatform_admin, @@ -421,12 +421,12 @@ def find_sales_partner_managed_clients( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "find_sales_partner_managed_clients" not in self._stubs: - self._stubs[ - "find_sales_partner_managed_clients" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/FindSalesPartnerManagedClients", - request_serializer=marketingplatform_admin.FindSalesPartnerManagedClientsRequest.serialize, - response_deserializer=marketingplatform_admin.FindSalesPartnerManagedClientsResponse.deserialize, + self._stubs["find_sales_partner_managed_clients"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/FindSalesPartnerManagedClients", + request_serializer=marketingplatform_admin.FindSalesPartnerManagedClientsRequest.serialize, + response_deserializer=marketingplatform_admin.FindSalesPartnerManagedClientsResponse.deserialize, + ) ) return self._stubs["find_sales_partner_managed_clients"] @@ -453,12 +453,12 @@ def list_analytics_account_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_analytics_account_links" not in self._stubs: - self._stubs[ - "list_analytics_account_links" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/ListAnalyticsAccountLinks", - request_serializer=marketingplatform_admin.ListAnalyticsAccountLinksRequest.serialize, - response_deserializer=marketingplatform_admin.ListAnalyticsAccountLinksResponse.deserialize, + self._stubs["list_analytics_account_links"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/ListAnalyticsAccountLinks", + request_serializer=marketingplatform_admin.ListAnalyticsAccountLinksRequest.serialize, + response_deserializer=marketingplatform_admin.ListAnalyticsAccountLinksResponse.deserialize, + ) ) return self._stubs["list_analytics_account_links"] @@ -491,12 +491,12 @@ def create_analytics_account_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_analytics_account_link" not in self._stubs: - self._stubs[ - "create_analytics_account_link" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/CreateAnalyticsAccountLink", - request_serializer=marketingplatform_admin.CreateAnalyticsAccountLinkRequest.serialize, - response_deserializer=resources.AnalyticsAccountLink.deserialize, + self._stubs["create_analytics_account_link"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/CreateAnalyticsAccountLink", + request_serializer=marketingplatform_admin.CreateAnalyticsAccountLinkRequest.serialize, + response_deserializer=resources.AnalyticsAccountLink.deserialize, + ) ) return self._stubs["create_analytics_account_link"] @@ -527,12 +527,12 @@ def delete_analytics_account_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_analytics_account_link" not in self._stubs: - self._stubs[ - "delete_analytics_account_link" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/DeleteAnalyticsAccountLink", - request_serializer=marketingplatform_admin.DeleteAnalyticsAccountLinkRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_analytics_account_link"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/DeleteAnalyticsAccountLink", + request_serializer=marketingplatform_admin.DeleteAnalyticsAccountLinkRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_analytics_account_link"] @@ -558,12 +558,12 @@ def set_property_service_level( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_property_service_level" not in self._stubs: - self._stubs[ - "set_property_service_level" - ] = self._logged_channel.unary_unary( - "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/SetPropertyServiceLevel", - request_serializer=marketingplatform_admin.SetPropertyServiceLevelRequest.serialize, - response_deserializer=marketingplatform_admin.SetPropertyServiceLevelResponse.deserialize, + self._stubs["set_property_service_level"] = ( + self._logged_channel.unary_unary( + "/google.marketingplatform.admin.v1alpha.MarketingplatformAdminService/SetPropertyServiceLevel", + request_serializer=marketingplatform_admin.SetPropertyServiceLevelRequest.serialize, + response_deserializer=marketingplatform_admin.SetPropertyServiceLevelResponse.deserialize, + ) ) return self._stubs["set_property_service_level"] diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest.py index 81e0d3d51106..804df0facb5e 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -672,9 +672,7 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseCreateAnalyticsAccountLink._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseCreateAnalyticsAccountLink._get_http_options() request, metadata = self._interceptor.pre_create_analytics_account_link( request, metadata @@ -743,11 +741,10 @@ def __call__( resp = self._interceptor.post_create_analytics_account_link(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_analytics_account_link_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_analytics_account_link_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -827,9 +824,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseDeleteAnalyticsAccountLink._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseDeleteAnalyticsAccountLink._get_http_options() request, metadata = self._interceptor.pre_delete_analytics_account_link( request, metadata @@ -851,7 +846,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -947,15 +942,12 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseFindSalesPartnerManagedClients._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseFindSalesPartnerManagedClients._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_find_sales_partner_managed_clients( - request, metadata + request, metadata = ( + self._interceptor.pre_find_sales_partner_managed_clients( + request, metadata + ) ) transcoded_request = _BaseMarketingplatformAdminServiceRestTransport._BaseFindSalesPartnerManagedClients._get_transcoded_request( http_options, request @@ -1023,11 +1015,10 @@ def __call__( resp = self._interceptor.post_find_sales_partner_managed_clients(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_find_sales_partner_managed_clients_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_find_sales_partner_managed_clients_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1112,9 +1103,7 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseGetOrganization._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseGetOrganization._get_http_options() request, metadata = self._interceptor.pre_get_organization( request, metadata @@ -1265,9 +1254,7 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseListAnalyticsAccountLinks._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseListAnalyticsAccountLinks._get_http_options() request, metadata = self._interceptor.pre_list_analytics_account_links( request, metadata @@ -1417,9 +1404,7 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseListOrganizations._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseListOrganizations._get_http_options() request, metadata = self._interceptor.pre_list_organizations( request, metadata @@ -1574,9 +1559,7 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseReportPropertyUsage._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseReportPropertyUsage._get_http_options() request, metadata = self._interceptor.pre_report_property_usage( request, metadata @@ -1737,9 +1720,7 @@ def __call__( """ - http_options = ( - _BaseMarketingplatformAdminServiceRestTransport._BaseSetPropertyServiceLevel._get_http_options() - ) + http_options = _BaseMarketingplatformAdminServiceRestTransport._BaseSetPropertyServiceLevel._get_http_options() request, metadata = self._interceptor.pre_set_property_service_level( request, metadata @@ -1847,7 +1828,9 @@ def create_analytics_account_link( ]: # 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._CreateAnalyticsAccountLink(self._session, self._host, self._interceptor) # type: ignore + return self._CreateAnalyticsAccountLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_analytics_account_link( @@ -1857,7 +1840,9 @@ def delete_analytics_account_link( ]: # 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._DeleteAnalyticsAccountLink(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAnalyticsAccountLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def find_sales_partner_managed_clients( @@ -1868,7 +1853,9 @@ def find_sales_partner_managed_clients( ]: # 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._FindSalesPartnerManagedClients(self._session, self._host, self._interceptor) # type: ignore + return self._FindSalesPartnerManagedClients( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_organization( @@ -1889,7 +1876,9 @@ def list_analytics_account_links( ]: # 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._ListAnalyticsAccountLinks(self._session, self._host, self._interceptor) # type: ignore + return self._ListAnalyticsAccountLinks( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_organizations( @@ -1922,7 +1911,9 @@ def set_property_service_level( ]: # 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._SetPropertyServiceLevel(self._session, self._host, self._interceptor) # type: ignore + return self._SetPropertyServiceLevel( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest_base.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest_base.py index 07c7078500af..7204336d70c9 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest_base.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/services/marketingplatform_admin_service/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.ads.marketingplatform_admin_v1alpha.types import ( diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/marketingplatform_admin.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/marketingplatform_admin.py index ed54d076b297..b0d708f94975 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/marketingplatform_admin.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/marketingplatform_admin.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.type import date_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore import proto # type: ignore from google.ads.marketingplatform_admin_v1alpha.types import resources @@ -243,12 +243,12 @@ class ListAnalyticsAccountLinksResponse(proto.Message): def raw_page(self): return self - analytics_account_links: MutableSequence[ - resources.AnalyticsAccountLink - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.AnalyticsAccountLink, + analytics_account_links: MutableSequence[resources.AnalyticsAccountLink] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.AnalyticsAccountLink, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/resources.py b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/resources.py index 4dab191fa07d..f173b8732e31 100644 --- a/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/resources.py +++ b/packages/google-ads-marketingplatform-admin/google/ads/marketingplatform_admin_v1alpha/types/resources.py @@ -44,6 +44,7 @@ class LinkVerificationState(proto.Enum): The link is requested, but hasn't been approved by the product account admin. """ + LINK_VERIFICATION_STATE_UNSPECIFIED = 0 LINK_VERIFICATION_STATE_VERIFIED = 1 LINK_VERIFICATION_STATE_NOT_VERIFIED = 2 @@ -60,6 +61,7 @@ class AnalyticsServiceLevel(proto.Enum): ANALYTICS_SERVICE_LEVEL_360 (2): The premium version of Google Analytics. """ + ANALYTICS_SERVICE_LEVEL_UNSPECIFIED = 0 ANALYTICS_SERVICE_LEVEL_STANDARD = 1 ANALYTICS_SERVICE_LEVEL_360 = 2 @@ -78,6 +80,7 @@ class AnalyticsPropertyType(proto.Enum): ANALYTICS_PROPERTY_TYPE_ROLLUP (3): Google Analytics rollup property """ + ANALYTICS_PROPERTY_TYPE_UNSPECIFIED = 0 ANALYTICS_PROPERTY_TYPE_ORDINARY = 1 ANALYTICS_PROPERTY_TYPE_SUBPROPERTY = 2 diff --git a/packages/google-ads-marketingplatform-admin/noxfile.py b/packages/google-ads-marketingplatform-admin/noxfile.py index 0a8f35d7b244..fe5ae4e2edf0 100644 --- a/packages/google-ads-marketingplatform-admin/noxfile.py +++ b/packages/google-ads-marketingplatform-admin/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-ads-marketingplatform-admin/tests/unit/gapic/marketingplatform_admin_v1alpha/test_marketingplatform_admin_service.py b/packages/google-ads-marketingplatform-admin/tests/unit/gapic/marketingplatform_admin_v1alpha/test_marketingplatform_admin_service.py index 519c29c1b380..84d100a01bbc 100644 --- a/packages/google-ads-marketingplatform-admin/tests/unit/gapic/marketingplatform_admin_v1alpha/test_marketingplatform_admin_service.py +++ b/packages/google-ads-marketingplatform-admin/tests/unit/gapic/marketingplatform_admin_v1alpha/test_marketingplatform_admin_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -1048,10 +1053,9 @@ def test_marketingplatform_admin_service_client_get_mtls_endpoint_and_cert_sourc client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1100,9 @@ def test_marketingplatform_admin_service_client_get_mtls_endpoint_and_cert_sourc client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1135,10 +1138,9 @@ def test_marketingplatform_admin_service_client_get_mtls_endpoint_and_cert_sourc "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1399,13 +1401,13 @@ def test_marketingplatform_admin_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1517,9 +1519,9 @@ def test_get_organization_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_organization - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_organization] = ( + mock_rpc + ) request = {} client.get_organization(request) @@ -1851,9 +1853,9 @@ def test_list_organizations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_organizations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_organizations] = ( + mock_rpc + ) request = {} client.list_organizations(request) @@ -4090,9 +4092,9 @@ def test_report_property_usage_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_property_usage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_property_usage] = ( + mock_rpc + ) request = {} client.report_property_usage(request) @@ -4359,9 +4361,9 @@ def test_get_organization_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_organization - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_organization] = ( + mock_rpc + ) request = {} client.get_organization(request) @@ -4539,9 +4541,9 @@ def test_list_organizations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_organizations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_organizations] = ( + mock_rpc + ) request = {} client.list_organizations(request) @@ -5621,9 +5623,9 @@ def test_report_property_usage_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_property_usage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_property_usage] = ( + mock_rpc + ) request = {} client.report_property_usage(request) @@ -6343,8 +6345,9 @@ def test_get_organization_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6409,18 +6412,22 @@ def test_get_organization_rest_interceptors(null_interceptor): ) client = MarketingplatformAdminServiceClient(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.MarketingplatformAdminServiceRestInterceptor, "post_get_organization" - ) as post, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "post_get_organization_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, "pre_get_organization" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_get_organization", + ) as post, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_get_organization_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "pre_get_organization", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6473,8 +6480,9 @@ def test_list_organizations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6539,20 +6547,22 @@ def test_list_organizations_rest_interceptors(null_interceptor): ) client = MarketingplatformAdminServiceClient(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.MarketingplatformAdminServiceRestInterceptor, - "post_list_organizations", - ) as post, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "post_list_organizations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "pre_list_organizations", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_list_organizations", + ) as post, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_list_organizations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "pre_list_organizations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6610,8 +6620,9 @@ def test_find_sales_partner_managed_clients_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6677,20 +6688,22 @@ def test_find_sales_partner_managed_clients_rest_interceptors(null_interceptor): ) client = MarketingplatformAdminServiceClient(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.MarketingplatformAdminServiceRestInterceptor, - "post_find_sales_partner_managed_clients", - ) as post, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "post_find_sales_partner_managed_clients_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "pre_find_sales_partner_managed_clients", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_find_sales_partner_managed_clients", + ) as post, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_find_sales_partner_managed_clients_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "pre_find_sales_partner_managed_clients", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6752,8 +6765,9 @@ def test_list_analytics_account_links_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6818,20 +6832,22 @@ def test_list_analytics_account_links_rest_interceptors(null_interceptor): ) client = MarketingplatformAdminServiceClient(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.MarketingplatformAdminServiceRestInterceptor, - "post_list_analytics_account_links", - ) as post, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "post_list_analytics_account_links_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "pre_list_analytics_account_links", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_list_analytics_account_links", + ) as post, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_list_analytics_account_links_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "pre_list_analytics_account_links", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6891,8 +6907,9 @@ def test_create_analytics_account_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7041,20 +7058,22 @@ def test_create_analytics_account_link_rest_interceptors(null_interceptor): ) client = MarketingplatformAdminServiceClient(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.MarketingplatformAdminServiceRestInterceptor, - "post_create_analytics_account_link", - ) as post, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "post_create_analytics_account_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "pre_create_analytics_account_link", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_create_analytics_account_link", + ) as post, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_create_analytics_account_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "pre_create_analytics_account_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7109,8 +7128,9 @@ def test_delete_analytics_account_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7167,14 +7187,14 @@ def test_delete_analytics_account_link_rest_interceptors(null_interceptor): ) client = MarketingplatformAdminServiceClient(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.MarketingplatformAdminServiceRestInterceptor, - "pre_delete_analytics_account_link", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "pre_delete_analytics_account_link", + ) as pre, + ): pre.assert_not_called() pb_message = marketingplatform_admin.DeleteAnalyticsAccountLinkRequest.pb( marketingplatform_admin.DeleteAnalyticsAccountLinkRequest() @@ -7221,8 +7241,9 @@ def test_set_property_service_level_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7286,20 +7307,22 @@ def test_set_property_service_level_rest_interceptors(null_interceptor): ) client = MarketingplatformAdminServiceClient(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.MarketingplatformAdminServiceRestInterceptor, - "post_set_property_service_level", - ) as post, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "post_set_property_service_level_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "pre_set_property_service_level", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_set_property_service_level", + ) as post, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_set_property_service_level_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "pre_set_property_service_level", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7357,8 +7380,9 @@ def test_report_property_usage_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7420,20 +7444,22 @@ def test_report_property_usage_rest_interceptors(null_interceptor): ) client = MarketingplatformAdminServiceClient(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.MarketingplatformAdminServiceRestInterceptor, - "post_report_property_usage", - ) as post, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "post_report_property_usage_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MarketingplatformAdminServiceRestInterceptor, - "pre_report_property_usage", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_report_property_usage", + ) as post, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "post_report_property_usage_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MarketingplatformAdminServiceRestInterceptor, + "pre_report_property_usage", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7721,11 +7747,14 @@ def test_marketingplatform_admin_service_base_transport(): def test_marketingplatform_admin_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ads.marketingplatform_admin_v1alpha.services.marketingplatform_admin_service.transports.MarketingplatformAdminServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ads.marketingplatform_admin_v1alpha.services.marketingplatform_admin_service.transports.MarketingplatformAdminServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MarketingplatformAdminServiceTransport( @@ -7745,9 +7774,12 @@ def test_marketingplatform_admin_service_base_transport_with_credentials_file(): def test_marketingplatform_admin_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ads.marketingplatform_admin_v1alpha.services.marketingplatform_admin_service.transports.MarketingplatformAdminServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ads.marketingplatform_admin_v1alpha.services.marketingplatform_admin_service.transports.MarketingplatformAdminServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MarketingplatformAdminServiceTransport() @@ -7832,11 +7864,12 @@ def test_marketingplatform_admin_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/docs/conf.py b/packages/google-ai-generativelanguage/docs/conf.py index 954d1e5c618d..10bbaabf4445 100644 --- a/packages/google-ai-generativelanguage/docs/conf.py +++ b/packages/google-ai-generativelanguage/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-ai-generativelanguage documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/__init__.py index 9688340148bc..554b46bdd983 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.generative_service import ( GenerativeServiceAsyncClient, GenerativeServiceClient, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/async_client.py index 3e45acb1ff5f..09638bcf8ab8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1 import gapic_version as package_version @@ -48,9 +48,8 @@ from google.longrunning import operations_pb2 # type: ignore -from google.ai.generativelanguage_v1.types import content +from google.ai.generativelanguage_v1.types import content, generative_service from google.ai.generativelanguage_v1.types import content as gag_content -from google.ai.generativelanguage_v1.types import generative_service from .client import GenerativeServiceClient from .transports.base import DEFAULT_CLIENT_INFO, GenerativeServiceTransport @@ -120,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GenerativeServiceAsyncClient: The constructed client. """ - return GenerativeServiceClient.from_service_account_info.__func__(GenerativeServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GenerativeServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GenerativeServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GenerativeServiceAsyncClient: The constructed client. """ - return GenerativeServiceClient.from_service_account_file.__func__(GenerativeServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GenerativeServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(GenerativeServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/client.py index 5bc3dcac7b2a..f8ee1d5f4a0d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1 import gapic_version as package_version @@ -64,9 +64,8 @@ from google.longrunning import operations_pb2 # type: ignore -from google.ai.generativelanguage_v1.types import content +from google.ai.generativelanguage_v1.types import content, generative_service from google.ai.generativelanguage_v1.types import content as gag_content -from google.ai.generativelanguage_v1.types import generative_service from .transports.base import DEFAULT_CLIENT_INFO, GenerativeServiceTransport from .transports.grpc import GenerativeServiceGrpcTransport @@ -82,9 +81,7 @@ class GenerativeServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GenerativeServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GenerativeServiceTransport]] _transport_registry["grpc"] = GenerativeServiceGrpcTransport _transport_registry["grpc_asyncio"] = GenerativeServiceGrpcAsyncIOTransport _transport_registry["rest"] = GenerativeServiceRestTransport @@ -623,11 +620,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GenerativeServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GenerativeServiceClient._read_environment_variables() + ) self._client_cert_source = GenerativeServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -662,8 +657,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GenerativeServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/base.py index 62eb0ccd7d6f..610570f9e334 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1 import gapic_version as package_version from google.ai.generativelanguage_v1.types import generative_service @@ -322,13 +322,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc.py index bccb8dd9c309..867236a201ae 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc_asyncio.py index 73be0a1d1aaa..bbfc0cda4ffb 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/rest.py index b2c3671e4d67..b69bd7d87dce 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -616,9 +616,7 @@ def __call__( The response to a ``BatchEmbedContentsRequest``. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseBatchEmbedContents._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseBatchEmbedContents._get_http_options() request, metadata = self._interceptor.pre_batch_embed_contents( request, metadata @@ -931,9 +929,7 @@ def __call__( The response to an ``EmbedContentRequest``. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_http_options() request, metadata = self._interceptor.pre_embed_content(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_transcoded_request( @@ -1101,9 +1097,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGenerateContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGenerateContent._get_http_options() request, metadata = self._interceptor.pre_generate_content( request, metadata @@ -1274,9 +1268,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseStreamGenerateContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseStreamGenerateContent._get_http_options() request, metadata = self._interceptor.pre_stream_generate_content( request, metadata @@ -1477,9 +1469,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1597,9 +1587,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1714,9 +1702,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1855,9 +1841,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/async_client.py index a76d8be7ba3c..2b44140f3fa4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1 import gapic_version as package_version @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_info.__func__(ModelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ModelServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ModelServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_file.__func__(ModelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ModelServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ModelServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/client.py index 411978fb7ad8..b165582fcad2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1 import gapic_version as package_version @@ -615,11 +615,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ModelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ModelServiceClient._read_environment_variables() + ) self._client_cert_source = ModelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -654,8 +652,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ModelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/pagers.py index 6c8c1af02a95..402b5b8cbf49 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/base.py index de8ca8fc7a90..70e99fb853b7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1 import gapic_version as package_version from google.ai.generativelanguage_v1.types import model, model_service @@ -222,13 +222,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc.py index 3fb9c479294e..28389c947afa 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1.types import model, model_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc_asyncio.py index 14d772f49f1d..55e393855f47 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1.types import model, model_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/rest.py index 9dd9959c1b3b..c7084942d166 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/__init__.py index ab08a24b6999..3aa277b3252a 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/__init__.py @@ -13,8 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .citation import CitationMetadata, CitationSource -from .content import Blob, Content, Modality, ModalityTokenCount, Part, VideoMetadata +from .citation import ( + CitationMetadata, + CitationSource, +) +from .content import ( + Blob, + Content, + Modality, + ModalityTokenCount, + Part, + VideoMetadata, +) from .generative_service import ( BatchEmbedContentsRequest, BatchEmbedContentsResponse, @@ -38,9 +48,19 @@ UrlContextMetadata, UrlMetadata, ) -from .model import Model -from .model_service import GetModelRequest, ListModelsRequest, ListModelsResponse -from .safety import HarmCategory, SafetyRating, SafetySetting +from .model import ( + Model, +) +from .model_service import ( + GetModelRequest, + ListModelsRequest, + ListModelsResponse, +) +from .safety import ( + HarmCategory, + SafetyRating, + SafetySetting, +) __all__ = ( "CitationMetadata", diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/content.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/content.py index eac583585f1d..78aced31aff1 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/content.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/content.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -50,6 +50,7 @@ class Modality(proto.Enum): DOCUMENT (5): Document, e.g. PDF. """ + MODALITY_UNSPECIFIED = 0 TEXT = 1 IMAGE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/generative_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/generative_service.py index c46146a1f0de..aee65cfad595 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/generative_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/generative_service.py @@ -17,12 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.ai.generativelanguage_v1.types import citation +from google.ai.generativelanguage_v1.types import citation, safety from google.ai.generativelanguage_v1.types import content as gag_content -from google.ai.generativelanguage_v1.types import safety __protobuf__ = proto.module( package="google.ai.generativelanguage.v1", @@ -84,6 +83,7 @@ class TaskType(proto.Enum): Specifies that the given text will be used for code retrieval. """ + TASK_TYPE_UNSPECIFIED = 0 RETRIEVAL_QUERY = 1 RETRIEVAL_DOCUMENT = 2 @@ -439,6 +439,7 @@ class BlockReason(proto.Enum): Candidates blocked due to unsafe image generation content. """ + BLOCK_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -513,26 +514,26 @@ class UsageMetadata(proto.Message): proto.INT32, number=3, ) - prompt_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gag_content.ModalityTokenCount, + prompt_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gag_content.ModalityTokenCount, + ) ) - cache_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=gag_content.ModalityTokenCount, + cache_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=gag_content.ModalityTokenCount, + ) ) - candidates_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gag_content.ModalityTokenCount, + candidates_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gag_content.ModalityTokenCount, + ) ) tool_use_prompt_tokens_details: MutableSequence[ gag_content.ModalityTokenCount @@ -678,6 +679,7 @@ class FinishReason(proto.Enum): Model called too many tools consecutively, thus the system exited execution. """ + FINISH_REASON_UNSPECIFIED = 0 STOP = 1 MAX_TOKENS = 2 @@ -794,6 +796,7 @@ class UrlRetrievalStatus(proto.Enum): Url retrieval is failed because the content is unsafe. """ + URL_RETRIEVAL_STATUS_UNSPECIFIED = 0 URL_RETRIEVAL_STATUS_SUCCESS = 1 URL_RETRIEVAL_STATUS_ERROR = 2 @@ -1342,19 +1345,19 @@ class CountTokensResponse(proto.Message): proto.INT32, number=1, ) - prompt_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=gag_content.ModalityTokenCount, + prompt_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=gag_content.ModalityTokenCount, + ) ) - cache_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gag_content.ModalityTokenCount, + cache_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gag_content.ModalityTokenCount, + ) ) diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/safety.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/safety.py index 3ee9897b889f..8c35cca3db8e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/safety.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/types/safety.py @@ -67,6 +67,7 @@ class HarmCategory(proto.Enum): integrity. DEPRECATED: use enable_enhanced_civic_answers instead. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_DEROGATORY = 1 HARM_CATEGORY_TOXICITY = 2 @@ -121,6 +122,7 @@ class HarmProbability(proto.Enum): HIGH (4): Content has a high chance of being unsafe. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -176,6 +178,7 @@ class HarmBlockThreshold(proto.Enum): OFF (5): Turn off the safety filter. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/__init__.py index f32046b1e50a..2c6521348b44 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cache_service import CacheServiceAsyncClient, CacheServiceClient from .services.discuss_service import DiscussServiceAsyncClient, DiscussServiceClient from .services.file_service import FileServiceAsyncClient, FileServiceClient diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/async_client.py index f54b06648bf5..c8f6b7bdb439 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -44,18 +44,20 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.cache_service import pagers +from google.ai.generativelanguage_v1alpha.types import ( + cache_service, + cached_content, + content, +) from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content -from google.ai.generativelanguage_v1alpha.types import content from .client import CacheServiceClient from .transports.base import DEFAULT_CLIENT_INFO, CacheServiceTransport @@ -128,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CacheServiceAsyncClient: The constructed client. """ - return CacheServiceClient.from_service_account_info.__func__(CacheServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CacheServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CacheServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CacheServiceAsyncClient: The constructed client. """ - return CacheServiceClient.from_service_account_file.__func__(CacheServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CacheServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CacheServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/client.py index 580d3c445d34..1e5037dbb092 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -61,18 +61,20 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.cache_service import pagers +from google.ai.generativelanguage_v1alpha.types import ( + cache_service, + cached_content, + content, +) from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content -from google.ai.generativelanguage_v1alpha.types import content from .transports.base import DEFAULT_CLIENT_INFO, CacheServiceTransport from .transports.grpc import CacheServiceGrpcTransport @@ -641,11 +643,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CacheServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CacheServiceClient._read_environment_variables() + ) self._client_cert_source = CacheServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -680,8 +680,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CacheServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/pagers.py index 3e071c9be7cb..71239b8fdcd8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/base.py index 1ef177d03879..f1cba36ad441 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/base.py @@ -17,22 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ai.generativelanguage_v1alpha import gapic_version as package_version +from google.ai.generativelanguage_v1alpha.types import cache_service, cached_content from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc.py index c4d67b967a88..be19b0b09c22 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc.py @@ -16,25 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1alpha.types import cache_service, cached_content from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content from .base import DEFAULT_CLIENT_INFO, CacheServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc_asyncio.py index a7aa3dd83293..4c44c9406267 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/grpc_asyncio.py @@ -17,27 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1alpha.types import cache_service, cached_content from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content from .base import DEFAULT_CLIENT_INFO, CacheServiceTransport from .grpc import CacheServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest.py index 6edd33409fd5..7b78e7cee041 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest.py @@ -16,25 +16,24 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.ai.generativelanguage_v1alpha.types import cache_service, cached_content from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseCacheServiceRestTransport @@ -539,9 +538,7 @@ def __call__( """ - http_options = ( - _BaseCacheServiceRestTransport._BaseCreateCachedContent._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseCreateCachedContent._get_http_options() request, metadata = self._interceptor.pre_create_cached_content( request, metadata @@ -688,9 +685,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCacheServiceRestTransport._BaseDeleteCachedContent._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseDeleteCachedContent._get_http_options() request, metadata = self._interceptor.pre_delete_cached_content( request, metadata @@ -712,7 +707,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -952,9 +947,7 @@ def __call__( Response with CachedContents list. """ - http_options = ( - _BaseCacheServiceRestTransport._BaseListCachedContents._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseListCachedContents._get_http_options() request, metadata = self._interceptor.pre_list_cached_contents( request, metadata @@ -1107,9 +1100,7 @@ def __call__( """ - http_options = ( - _BaseCacheServiceRestTransport._BaseUpdateCachedContent._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseUpdateCachedContent._get_http_options() request, metadata = self._interceptor.pre_update_cached_content( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest_base.py index fe4810a432e3..54dfecf52a12 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/cache_service/transports/rest_base.py @@ -17,16 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.ai.generativelanguage_v1alpha.types import cache_service, cached_content from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content from .base import DEFAULT_CLIENT_INFO, CacheServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/async_client.py index 37b51ed4ca2d..f60791236794 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -118,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_info.__func__(DiscussServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DiscussServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DiscussServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +135,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_file.__func__(DiscussServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DiscussServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DiscussServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/client.py index ab67d3357f23..80ba135a273b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -79,9 +79,7 @@ class DiscussServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DiscussServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DiscussServiceTransport]] _transport_registry["grpc"] = DiscussServiceGrpcTransport _transport_registry["grpc_asyncio"] = DiscussServiceGrpcAsyncIOTransport _transport_registry["rest"] = DiscussServiceRestTransport @@ -618,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiscussServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiscussServiceClient._read_environment_variables() + ) self._client_cert_source = DiscussServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiscussServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/base.py index f64aab9c5d67..bcfbe14b8aef 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version from google.ai.generativelanguage_v1alpha.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc.py index 6089a7344940..4e9f8671a9e7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc_asyncio.py index 0ada5c47f361..2ca51546d8c2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/rest.py index ebbdc5714bc5..8bc496d6e83d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/discuss_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -401,9 +401,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() request, metadata = self._interceptor.pre_count_message_tokens( request, metadata @@ -561,9 +559,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() request, metadata = self._interceptor.pre_generate_message( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/async_client.py index 4b9194ee2b70..d1a092ff4c81 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.file_service import pagers from google.ai.generativelanguage_v1alpha.types import file, file_service @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FileServiceAsyncClient: The constructed client. """ - return FileServiceClient.from_service_account_info.__func__(FileServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = FileServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(FileServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FileServiceAsyncClient: The constructed client. """ - return FileServiceClient.from_service_account_file.__func__(FileServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = FileServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(FileServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/client.py index bd4473bb887f..69248864b065 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.file_service import pagers from google.ai.generativelanguage_v1alpha.types import file, file_service @@ -615,11 +615,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FileServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FileServiceClient._read_environment_variables() + ) self._client_cert_source = FileServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -654,8 +652,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FileServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/pagers.py index 7d371a7ec005..0f6b270fbeb9 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/base.py index 50785ca4b061..fdcb2e36359b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ai.generativelanguage_v1alpha import gapic_version as package_version from google.ai.generativelanguage_v1alpha.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc.py index 9110648325ab..51aaaac0d30d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc_asyncio.py index b9601a4368c5..b960b757abe4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest.py index b65353ed506e..ad180c33d302 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -624,7 +624,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest_base.py index 3aa80e67e7c9..5db41dd04f9e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/file_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.ai.generativelanguage_v1alpha.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/async_client.py index c27a4f42f77d..d4e42428b0d1 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -49,8 +49,11 @@ from google.longrunning import operations_pb2 # type: ignore -from google.ai.generativelanguage_v1alpha.types import generative_service, safety -from google.ai.generativelanguage_v1alpha.types import content +from google.ai.generativelanguage_v1alpha.types import ( + content, + generative_service, + safety, +) from google.ai.generativelanguage_v1alpha.types import content as gag_content from .client import GenerativeServiceClient @@ -125,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GenerativeServiceAsyncClient: The constructed client. """ - return GenerativeServiceClient.from_service_account_info.__func__(GenerativeServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GenerativeServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GenerativeServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GenerativeServiceAsyncClient: The constructed client. """ - return GenerativeServiceClient.from_service_account_file.__func__(GenerativeServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GenerativeServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(GenerativeServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/client.py index 7bcdd61b6860..540ff8acbc8e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -65,8 +65,11 @@ from google.longrunning import operations_pb2 # type: ignore -from google.ai.generativelanguage_v1alpha.types import generative_service, safety -from google.ai.generativelanguage_v1alpha.types import content +from google.ai.generativelanguage_v1alpha.types import ( + content, + generative_service, + safety, +) from google.ai.generativelanguage_v1alpha.types import content as gag_content from .transports.base import DEFAULT_CLIENT_INFO, GenerativeServiceTransport @@ -83,9 +86,7 @@ class GenerativeServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GenerativeServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GenerativeServiceTransport]] _transport_registry["grpc"] = GenerativeServiceGrpcTransport _transport_registry["grpc_asyncio"] = GenerativeServiceGrpcAsyncIOTransport _transport_registry["rest"] = GenerativeServiceRestTransport @@ -639,11 +640,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GenerativeServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GenerativeServiceClient._read_environment_variables() + ) self._client_cert_source = GenerativeServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -678,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GenerativeServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/base.py index ba835750e8a4..37178747ac27 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version from google.ai.generativelanguage_v1alpha.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc.py index 58e2722e712f..01844baf2a90 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc_asyncio.py index 11b7486809ec..4913a0d8e331 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/rest.py index 72bc3a9407e2..aca07307507b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/generative_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -630,9 +630,7 @@ def __call__( The response to a ``BatchEmbedContentsRequest``. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseBatchEmbedContents._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseBatchEmbedContents._get_http_options() request, metadata = self._interceptor.pre_batch_embed_contents( request, metadata @@ -964,9 +962,7 @@ def __call__( The response to an ``EmbedContentRequest``. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_http_options() request, metadata = self._interceptor.pre_embed_content(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_transcoded_request( @@ -1120,9 +1116,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGenerateAnswer._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGenerateAnswer._get_http_options() request, metadata = self._interceptor.pre_generate_answer(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseGenerateAnswer._get_transcoded_request( @@ -1290,9 +1284,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGenerateContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGenerateContent._get_http_options() request, metadata = self._interceptor.pre_generate_content( request, metadata @@ -1463,9 +1455,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseStreamGenerateContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseStreamGenerateContent._get_http_options() request, metadata = self._interceptor.pre_stream_generate_content( request, metadata @@ -1689,9 +1679,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1830,9 +1818,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/async_client.py index c7db42c641f8..cd9663b5fe1e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.model_service import pagers +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model from .client import ModelServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ModelServiceTransport @@ -121,7 +120,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_info.__func__(ModelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ModelServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ModelServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +137,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_file.__func__(ModelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ModelServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ModelServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/client.py index e926afddbe15..3ac1b4aaf62e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.model_service import pagers +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model from .transports.base import DEFAULT_CLIENT_INFO, ModelServiceTransport from .transports.grpc import ModelServiceGrpcTransport @@ -636,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ModelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ModelServiceClient._read_environment_variables() + ) self._client_cert_source = ModelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -675,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ModelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/pagers.py index 93f31ab417eb..eb988212bbf6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/base.py index ffcb6956530a..4dd5cd28d329 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ai.generativelanguage_v1alpha import gapic_version as package_version +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc.py index 76577e35b9e3..0e7ae105d85a 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc_asyncio.py index 995cd27f37f1..200c5378ef64 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport from .grpc import ModelServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest.py index b08f5dbe2a37..211c0db60e06 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseModelServiceRestTransport @@ -712,7 +711,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -853,7 +852,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest_base.py index a7a276b6a493..557100fb6191 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/model_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/async_client.py index ff3883186428..19886a6561f6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.permission_service import pagers +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service from .client import PermissionServiceClient from .transports.base import DEFAULT_CLIENT_INFO, PermissionServiceTransport @@ -120,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PermissionServiceAsyncClient: The constructed client. """ - return PermissionServiceClient.from_service_account_info.__func__(PermissionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PermissionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PermissionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PermissionServiceAsyncClient: The constructed client. """ - return PermissionServiceClient.from_service_account_file.__func__(PermissionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PermissionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PermissionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/client.py index 886874d9e830..8599fa46e1b9 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.permission_service import pagers +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service from .transports.base import DEFAULT_CLIENT_INFO, PermissionServiceTransport from .transports.grpc import PermissionServiceGrpcTransport @@ -83,9 +82,7 @@ class PermissionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PermissionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PermissionServiceTransport]] _transport_registry["grpc"] = PermissionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PermissionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PermissionServiceRestTransport @@ -628,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PermissionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PermissionServiceClient._read_environment_variables() + ) self._client_cert_source = PermissionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PermissionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/pagers.py index 353548184a06..e5cf1b12b870 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/base.py index f1913db5e6d1..e32a04cbf2dc 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ai.generativelanguage_v1alpha import gapic_version as package_version +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc.py index ac91289d2ec9..433187a53863 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc_asyncio.py index 44f015eaa973..63f6784464f5 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport from .grpc import PermissionServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest.py index 3013aa877644..567bf9b08c5c 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BasePermissionServiceRestTransport @@ -609,9 +608,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseCreatePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseCreatePermission._get_http_options() request, metadata = self._interceptor.pre_create_permission( request, metadata @@ -757,9 +754,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseDeletePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseDeletePermission._get_http_options() request, metadata = self._interceptor.pre_delete_permission( request, metadata @@ -781,7 +776,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -894,9 +889,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseGetPermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseGetPermission._get_http_options() request, metadata = self._interceptor.pre_get_permission(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseGetPermission._get_transcoded_request( @@ -1041,9 +1034,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseListPermissions._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseListPermissions._get_http_options() request, metadata = self._interceptor.pre_list_permissions( request, metadata @@ -1192,9 +1183,7 @@ def __call__( Response from ``TransferOwnership``. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseTransferOwnership._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseTransferOwnership._get_http_options() request, metadata = self._interceptor.pre_transfer_ownership( request, metadata @@ -1370,9 +1359,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseUpdatePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseUpdatePermission._get_http_options() request, metadata = self._interceptor.pre_update_permission( request, metadata @@ -1582,9 +1569,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1723,9 +1708,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest_base.py index b5dbba91798f..3c36f153f810 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/permission_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/async_client.py index c5553ac320b5..0845de4fa9b7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.types import prediction_service @@ -115,7 +115,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_info.__func__(PredictionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PredictionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PredictionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +132,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_file.__func__(PredictionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PredictionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PredictionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/client.py index 00d80c61d43c..93e177122c25 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.types import prediction_service @@ -80,9 +80,7 @@ class PredictionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PredictionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PredictionServiceTransport]] _transport_registry["grpc"] = PredictionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PredictionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PredictionServiceRestTransport @@ -619,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PredictionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PredictionServiceClient._read_environment_variables() + ) self._client_cert_source = PredictionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -658,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PredictionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/base.py index 62dad853153b..84f4719fa1f8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version from google.ai.generativelanguage_v1alpha.types import prediction_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc.py index 34281a3cbfd3..4f92c9e383b5 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import prediction_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc_asyncio.py index fbf6a4a446fb..6cf47c7823e0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import prediction_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/rest.py index ebd400a229d5..e5b9b9b22e07 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/prediction_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -499,9 +499,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePredictionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePredictionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -640,9 +638,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BasePredictionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BasePredictionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/async_client.py index 9aa9e6892f58..c18ca02e17e8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.retriever_service import pagers from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service @@ -123,7 +123,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RetrieverServiceAsyncClient: The constructed client. """ - return RetrieverServiceClient.from_service_account_info.__func__(RetrieverServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = RetrieverServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(RetrieverServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +140,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RetrieverServiceAsyncClient: The constructed client. """ - return RetrieverServiceClient.from_service_account_file.__func__(RetrieverServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = RetrieverServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(RetrieverServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/client.py index e8912a3bafaa..b3d91ffaa4ee 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.retriever_service import pagers from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service @@ -82,9 +82,7 @@ class RetrieverServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RetrieverServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RetrieverServiceTransport]] _transport_registry["grpc"] = RetrieverServiceGrpcTransport _transport_registry["grpc_asyncio"] = RetrieverServiceGrpcAsyncIOTransport _transport_registry["rest"] = RetrieverServiceRestTransport @@ -660,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RetrieverServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RetrieverServiceClient._read_environment_variables() + ) self._client_cert_source = RetrieverServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -699,8 +695,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RetrieverServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/pagers.py index 04cde8d0c694..4012702a6c76 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/base.py index 11d840677a3a..7089cd715a22 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ai.generativelanguage_v1alpha import gapic_version as package_version from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc.py index a7a353912192..1aad5afee930 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc_asyncio.py index 53b11a70b28d..222a1c624fc6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest.py index c61752564690..00260c0ebcd4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1246,9 +1246,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseBatchCreateChunks._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseBatchCreateChunks._get_http_options() request, metadata = self._interceptor.pre_batch_create_chunks( request, metadata @@ -1397,9 +1395,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseBatchDeleteChunks._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseBatchDeleteChunks._get_http_options() request, metadata = self._interceptor.pre_batch_delete_chunks( request, metadata @@ -1425,7 +1421,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1518,9 +1514,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseBatchUpdateChunks._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseBatchUpdateChunks._get_http_options() request, metadata = self._interceptor.pre_batch_update_chunks( request, metadata @@ -1980,9 +1974,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -2147,7 +2139,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2253,7 +2245,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2337,9 +2329,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -2359,7 +2349,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3193,9 +3183,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseListDocuments._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseListDocuments._get_http_options() request, metadata = self._interceptor.pre_list_documents(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseListDocuments._get_transcoded_request( @@ -3496,9 +3484,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseQueryDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseQueryDocument._get_http_options() request, metadata = self._interceptor.pre_query_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseQueryDocument._get_transcoded_request( @@ -3956,9 +3942,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -4426,9 +4410,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest_base.py index 3e9095eb8bab..6328b067535a 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/retriever_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.ai.generativelanguage_v1alpha.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/async_client.py index d894955d43c7..a8e1e70f180f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -114,7 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_info.__func__(TextServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = TextServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(TextServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_file.__func__(TextServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = TextServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(TextServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/client.py index 8cadd3871ba9..ccd9784700e8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version @@ -616,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TextServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TextServiceClient._read_environment_variables() + ) self._client_cert_source = TextServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -655,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TextServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/base.py index cc2793bb396c..95697a1b96c0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1alpha import gapic_version as package_version from google.ai.generativelanguage_v1alpha.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc.py index c7df4e3818a2..ae8225915ed7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc_asyncio.py index dd70ea47c597..ba59257daf06 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/rest.py index 3ef2152e1798..b4a9f2e561e0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/services/text_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/__init__.py index cdc32c4c9227..8e659c0a6717 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/__init__.py @@ -21,8 +21,13 @@ ListCachedContentsResponse, UpdateCachedContentRequest, ) -from .cached_content import CachedContent -from .citation import CitationMetadata, CitationSource +from .cached_content import ( + CachedContent, +) +from .citation import ( + CitationMetadata, + CitationSource, +) from .content import ( Blob, CodeExecution, @@ -53,7 +58,10 @@ Message, MessagePrompt, ) -from .file import File, VideoMetadata +from .file import ( + File, + VideoMetadata, +) from .file_service import ( CreateFileRequest, CreateFileResponse, @@ -101,7 +109,9 @@ TaskType, VoiceConfig, ) -from .model import Model +from .model import ( + Model, +) from .model_service import ( CreateTunedModelMetadata, CreateTunedModelRequest, @@ -114,7 +124,9 @@ ListTunedModelsResponse, UpdateTunedModelRequest, ) -from .permission import Permission +from .permission import ( + Permission, +) from .permission_service import ( CreatePermissionRequest, DeletePermissionRequest, @@ -125,7 +137,10 @@ TransferOwnershipResponse, UpdatePermissionRequest, ) -from .prediction_service import PredictRequest, PredictResponse +from .prediction_service import ( + PredictRequest, + PredictResponse, +) from .retriever import ( Chunk, ChunkData, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/cache_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/cache_service.py index 01fc3d4634f0..00cea4440594 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/cache_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/cache_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import ( @@ -84,12 +84,12 @@ class ListCachedContentsResponse(proto.Message): def raw_page(self): return self - cached_contents: MutableSequence[ - gag_cached_content.CachedContent - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gag_cached_content.CachedContent, + cached_contents: MutableSequence[gag_cached_content.CachedContent] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gag_cached_content.CachedContent, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/cached_content.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/cached_content.py index 0c68a86abd42..094f7c7b1d75 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/cached_content.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/cached_content.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import content diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/content.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/content.py index a6b412796f2e..5965414b115f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/content.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/content.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -66,6 +66,7 @@ class Type(proto.Enum): OBJECT (6): Object type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -280,6 +281,7 @@ class Language(proto.Enum): Python >= 3.10, with numpy and simpy available. """ + LANGUAGE_UNSPECIFIED = 0 PYTHON = 1 @@ -326,6 +328,7 @@ class Outcome(proto.Enum): cancelled. There may or may not be a partial output present. """ + OUTCOME_UNSPECIFIED = 0 OUTCOME_OK = 1 OUTCOME_FAILED = 2 @@ -449,6 +452,7 @@ class Mode(proto.Enum): Run retrieval only when system decides it is necessary. """ + MODE_UNSPECIFIED = 0 MODE_DYNAMIC = 1 @@ -531,6 +535,7 @@ class Mode(proto.Enum): Model behavior is same as when not passing any function declarations. """ + MODE_UNSPECIFIED = 0 AUTO = 1 ANY = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/file.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/file.py index 9d5f89faac95..2aadedb27a2e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/file.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/file.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -94,6 +94,7 @@ class State(proto.Enum): FAILED (10): File failed processing. """ + STATE_UNSPECIFIED = 0 PROCESSING = 1 ACTIVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/generative_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/generative_service.py index e27d44c9d460..a1dadec6ed33 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/generative_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/generative_service.py @@ -19,9 +19,8 @@ import proto # type: ignore -from google.ai.generativelanguage_v1alpha.types import citation +from google.ai.generativelanguage_v1alpha.types import citation, retriever, safety from google.ai.generativelanguage_v1alpha.types import content as gag_content -from google.ai.generativelanguage_v1alpha.types import retriever, safety __protobuf__ = proto.module( package="google.ai.generativelanguage.v1alpha", @@ -96,6 +95,7 @@ class TaskType(proto.Enum): Specifies that the given text will be used for fact verification. """ + TASK_TYPE_UNSPECIFIED = 0 RETRIEVAL_QUERY = 1 RETRIEVAL_DOCUMENT = 2 @@ -469,6 +469,7 @@ class Modality(proto.Enum): AUDIO (3): Indicates the model should return audio. """ + MODALITY_UNSPECIFIED = 0 TEXT = 1 IMAGE = 2 @@ -666,6 +667,7 @@ class BlockReason(proto.Enum): Candidates blocked due to unsafe image generation content. """ + BLOCK_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -833,6 +835,7 @@ class FinishReason(proto.Enum): Token generation stopped because generated images contain safety violations. """ + FINISH_REASON_UNSPECIFIED = 0 STOP = 1 MAX_TOKENS = 2 @@ -875,12 +878,12 @@ class FinishReason(proto.Enum): proto.INT32, number=7, ) - grounding_attributions: MutableSequence[ - "GroundingAttribution" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="GroundingAttribution", + grounding_attributions: MutableSequence["GroundingAttribution"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="GroundingAttribution", + ) ) grounding_metadata: "GroundingMetadata" = proto.Field( proto.MESSAGE, @@ -1385,6 +1388,7 @@ class AnswerStyle(proto.Enum): paragraph, multiple paragraphs, or bullet points, etc. """ + ANSWER_STYLE_UNSPECIFIED = 0 ABSTRACTIVE = 1 EXTRACTIVE = 2 @@ -1509,6 +1513,7 @@ class BlockReason(proto.Enum): OTHER (2): Input was blocked due to other reasons. """ + BLOCK_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -1906,12 +1911,12 @@ class BidiGenerateContentToolResponse(proto.Message): Optional. The response to the function calls. """ - function_responses: MutableSequence[ - gag_content.FunctionResponse - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gag_content.FunctionResponse, + function_responses: MutableSequence[gag_content.FunctionResponse] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gag_content.FunctionResponse, + ) ) diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/model_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/model_service.py index a96cd85a7959..b73a2cdab277 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/model_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/model_service.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model from google.ai.generativelanguage_v1alpha.types import model +from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model __protobuf__ = proto.module( package="google.ai.generativelanguage.v1alpha", diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/permission.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/permission.py index e337fce9fbd0..6251850fc925 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/permission.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/permission.py @@ -90,6 +90,7 @@ class GranteeType(proto.Enum): Represents access to everyone. No extra information is required. """ + GRANTEE_TYPE_UNSPECIFIED = 0 USER = 1 GROUP = 2 @@ -110,6 +111,7 @@ class Role(proto.Enum): READER (3): Reader can use the resource. """ + ROLE_UNSPECIFIED = 0 OWNER = 1 WRITER = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/permission_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/permission_service.py index 557804974748..af98ba8e0dec 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/permission_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/permission_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import permission as gag_permission diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/prediction_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/prediction_service.py index 50fba348edc1..989bc573b493 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/prediction_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/prediction_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/retriever.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/retriever.py index 0b7bac0382f4..a889910b88b0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/retriever.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/retriever.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -280,6 +280,7 @@ class Operator(proto.Enum): Supported by string only when ``CustomMetadata`` value type for the given key has a ``string_list_value``. """ + OPERATOR_UNSPECIFIED = 0 LESS = 1 LESS_EQUAL = 2 @@ -352,6 +353,7 @@ class State(proto.Enum): STATE_FAILED (10): ``Chunk`` failed processing. """ + STATE_UNSPECIFIED = 0 STATE_PENDING_PROCESSING = 1 STATE_ACTIVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/retriever_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/retriever_service.py index 8df4807400a1..3e11daab4926 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/retriever_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/retriever_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ai.generativelanguage_v1alpha.types import retriever diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/safety.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/safety.py index 09122f754c61..a893524b7b81 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/safety.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/safety.py @@ -68,6 +68,7 @@ class HarmCategory(proto.Enum): **Gemini** - Content that may be used to harm civic integrity. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_DEROGATORY = 1 HARM_CATEGORY_TOXICITY = 2 @@ -114,6 +115,7 @@ class BlockedReason(proto.Enum): Content was blocked, but the reason is uncategorized. """ + BLOCKED_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -199,6 +201,7 @@ class HarmProbability(proto.Enum): HIGH (4): Content has a high chance of being unsafe. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -254,6 +257,7 @@ class HarmBlockThreshold(proto.Enum): OFF (5): Turn off the safety filter. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/tuned_model.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/tuned_model.py index ab8ca643e6a7..e31fe8197fb3 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/tuned_model.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1alpha/types/tuned_model.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -139,6 +139,7 @@ class State(proto.Enum): FAILED (3): The model failed to be created. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/__init__.py index 832e33cf40c4..9d5d480bd819 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cache_service import CacheServiceAsyncClient, CacheServiceClient from .services.discuss_service import DiscussServiceAsyncClient, DiscussServiceClient from .services.file_service import FileServiceAsyncClient, FileServiceClient diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/async_client.py index 9cd4a9a67b29..f5fb50693f93 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -44,18 +44,20 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.cache_service import pagers +from google.ai.generativelanguage_v1beta.types import ( + cache_service, + cached_content, + content, +) from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content -from google.ai.generativelanguage_v1beta.types import content from .client import CacheServiceClient from .transports.base import DEFAULT_CLIENT_INFO, CacheServiceTransport @@ -128,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CacheServiceAsyncClient: The constructed client. """ - return CacheServiceClient.from_service_account_info.__func__(CacheServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CacheServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CacheServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CacheServiceAsyncClient: The constructed client. """ - return CacheServiceClient.from_service_account_file.__func__(CacheServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CacheServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CacheServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/client.py index c2c7317817de..67ec765d0526 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -61,18 +61,20 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.cache_service import pagers +from google.ai.generativelanguage_v1beta.types import ( + cache_service, + cached_content, + content, +) from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content -from google.ai.generativelanguage_v1beta.types import content from .transports.base import DEFAULT_CLIENT_INFO, CacheServiceTransport from .transports.grpc import CacheServiceGrpcTransport @@ -641,11 +643,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CacheServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CacheServiceClient._read_environment_variables() + ) self._client_cert_source = CacheServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -680,8 +680,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CacheServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/pagers.py index 96ccf7334f22..4683a61ff65c 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/base.py index 5c7eb31dbaaf..716efa9f0b59 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/base.py @@ -17,22 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta import gapic_version as package_version +from google.ai.generativelanguage_v1beta.types import cache_service, cached_content from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -276,13 +275,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc.py index 562bc36b9f07..e57fdab3357f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc.py @@ -16,25 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta.types import cache_service, cached_content from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content from .base import DEFAULT_CLIENT_INFO, CacheServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc_asyncio.py index a353a13f410d..fc504ee02930 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/grpc_asyncio.py @@ -17,27 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta.types import cache_service, cached_content from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content from .base import DEFAULT_CLIENT_INFO, CacheServiceTransport from .grpc import CacheServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest.py index 0ed3445e30f2..bc9bf95f02e6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest.py @@ -16,25 +16,24 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.ai.generativelanguage_v1beta.types import cache_service, cached_content from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseCacheServiceRestTransport @@ -585,9 +584,7 @@ def __call__( """ - http_options = ( - _BaseCacheServiceRestTransport._BaseCreateCachedContent._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseCreateCachedContent._get_http_options() request, metadata = self._interceptor.pre_create_cached_content( request, metadata @@ -734,9 +731,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCacheServiceRestTransport._BaseDeleteCachedContent._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseDeleteCachedContent._get_http_options() request, metadata = self._interceptor.pre_delete_cached_content( request, metadata @@ -758,7 +753,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -998,9 +993,7 @@ def __call__( Response with CachedContents list. """ - http_options = ( - _BaseCacheServiceRestTransport._BaseListCachedContents._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseListCachedContents._get_http_options() request, metadata = self._interceptor.pre_list_cached_contents( request, metadata @@ -1153,9 +1146,7 @@ def __call__( """ - http_options = ( - _BaseCacheServiceRestTransport._BaseUpdateCachedContent._get_http_options() - ) + http_options = _BaseCacheServiceRestTransport._BaseUpdateCachedContent._get_http_options() request, metadata = self._interceptor.pre_update_cached_content( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest_base.py index cb30d7e0976f..28933fdca796 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/cache_service/transports/rest_base.py @@ -17,16 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.ai.generativelanguage_v1beta.types import cache_service, cached_content from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content from .base import DEFAULT_CLIENT_INFO, CacheServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/async_client.py index fb69a8f75736..9011e75c59ba 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -118,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_info.__func__(DiscussServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DiscussServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DiscussServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +135,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_file.__func__(DiscussServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DiscussServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DiscussServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/client.py index 25c3cef5e580..0b68cb56cdec 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -79,9 +79,7 @@ class DiscussServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DiscussServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DiscussServiceTransport]] _transport_registry["grpc"] = DiscussServiceGrpcTransport _transport_registry["grpc_asyncio"] = DiscussServiceGrpcAsyncIOTransport _transport_registry["rest"] = DiscussServiceRestTransport @@ -618,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiscussServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiscussServiceClient._read_environment_variables() + ) self._client_cert_source = DiscussServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiscussServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/base.py index c13b8f3131a1..1bb7a5000105 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version from google.ai.generativelanguage_v1beta.types import discuss_service @@ -244,13 +244,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc.py index c67b3071f851..8596345cd1d1 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc_asyncio.py index 45a93b84e891..b695c5238cb0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/rest.py index d25b5061f1ad..bf6d5458d97d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -447,9 +447,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() request, metadata = self._interceptor.pre_count_message_tokens( request, metadata @@ -607,9 +605,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() request, metadata = self._interceptor.pre_generate_message( request, metadata @@ -782,9 +778,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -896,9 +890,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/async_client.py index e91b4cebe221..088b0e737c79 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.file_service import pagers from google.ai.generativelanguage_v1beta.types import file, file_service @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FileServiceAsyncClient: The constructed client. """ - return FileServiceClient.from_service_account_info.__func__(FileServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = FileServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(FileServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FileServiceAsyncClient: The constructed client. """ - return FileServiceClient.from_service_account_file.__func__(FileServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = FileServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(FileServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/client.py index 0242788bbba8..b60d8b89cacf 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.file_service import pagers from google.ai.generativelanguage_v1beta.types import file, file_service @@ -615,11 +615,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FileServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FileServiceClient._read_environment_variables() + ) self._client_cert_source = FileServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -654,8 +652,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FileServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/pagers.py index 936db03f4e3b..dcf08ed4e59e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/base.py index cdd723f311b1..5a640f4263d6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta import gapic_version as package_version from google.ai.generativelanguage_v1beta.types import file, file_service @@ -269,13 +269,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc.py index f4a107e1cfc6..466314c53dd2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc_asyncio.py index e9f623439626..ebb43446a383 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest.py index 40cdf4a7e8a9..eb834e9e42c2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -728,7 +728,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest_base.py index 6e1b8da34dd3..9716c19e68de 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/file_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.ai.generativelanguage_v1beta.types import file, file_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/async_client.py index 32e26bf6bbbf..792eb2d8ce17 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -49,8 +49,11 @@ from google.longrunning import operations_pb2 # type: ignore -from google.ai.generativelanguage_v1beta.types import generative_service, safety -from google.ai.generativelanguage_v1beta.types import content +from google.ai.generativelanguage_v1beta.types import ( + content, + generative_service, + safety, +) from google.ai.generativelanguage_v1beta.types import content as gag_content from .client import GenerativeServiceClient @@ -125,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GenerativeServiceAsyncClient: The constructed client. """ - return GenerativeServiceClient.from_service_account_info.__func__(GenerativeServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GenerativeServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GenerativeServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GenerativeServiceAsyncClient: The constructed client. """ - return GenerativeServiceClient.from_service_account_file.__func__(GenerativeServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GenerativeServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(GenerativeServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/client.py index d63d617683b9..42e70b35a2e3 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -65,8 +65,11 @@ from google.longrunning import operations_pb2 # type: ignore -from google.ai.generativelanguage_v1beta.types import generative_service, safety -from google.ai.generativelanguage_v1beta.types import content +from google.ai.generativelanguage_v1beta.types import ( + content, + generative_service, + safety, +) from google.ai.generativelanguage_v1beta.types import content as gag_content from .transports.base import DEFAULT_CLIENT_INFO, GenerativeServiceTransport @@ -83,9 +86,7 @@ class GenerativeServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GenerativeServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GenerativeServiceTransport]] _transport_registry["grpc"] = GenerativeServiceGrpcTransport _transport_registry["grpc_asyncio"] = GenerativeServiceGrpcAsyncIOTransport _transport_registry["rest"] = GenerativeServiceRestTransport @@ -639,11 +640,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GenerativeServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GenerativeServiceClient._read_environment_variables() + ) self._client_cert_source = GenerativeServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -678,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GenerativeServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/base.py index a68b9cc5c925..fe97259b4ea1 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version from google.ai.generativelanguage_v1beta.types import generative_service @@ -365,13 +365,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc.py index 572e133e617e..b2f27e3e6867 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc_asyncio.py index ee8921cee45c..296cbd7a25b7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import generative_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/rest.py index ae4804cac76f..495d090e0bd1 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -676,9 +676,7 @@ def __call__( The response to a ``BatchEmbedContentsRequest``. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseBatchEmbedContents._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseBatchEmbedContents._get_http_options() request, metadata = self._interceptor.pre_batch_embed_contents( request, metadata @@ -1010,9 +1008,7 @@ def __call__( The response to an ``EmbedContentRequest``. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_http_options() request, metadata = self._interceptor.pre_embed_content(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseEmbedContent._get_transcoded_request( @@ -1166,9 +1162,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGenerateAnswer._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGenerateAnswer._get_http_options() request, metadata = self._interceptor.pre_generate_answer(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseGenerateAnswer._get_transcoded_request( @@ -1336,9 +1330,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGenerateContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGenerateContent._get_http_options() request, metadata = self._interceptor.pre_generate_content( request, metadata @@ -1509,9 +1501,7 @@ def __call__( """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseStreamGenerateContent._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseStreamGenerateContent._get_http_options() request, metadata = self._interceptor.pre_stream_generate_content( request, metadata @@ -1733,9 +1723,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1848,9 +1836,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1965,9 +1951,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2106,9 +2090,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGenerativeServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGenerativeServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGenerativeServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/async_client.py index 522fa45bfb0e..d968b9f0a7f2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.model_service import pagers +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model from .client import ModelServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ModelServiceTransport @@ -121,7 +120,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_info.__func__(ModelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ModelServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ModelServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +137,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_file.__func__(ModelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ModelServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ModelServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/client.py index 11abdfbe3509..0214f443f01f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.model_service import pagers +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model from .transports.base import DEFAULT_CLIENT_INFO, ModelServiceTransport from .transports.grpc import ModelServiceGrpcTransport @@ -636,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ModelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ModelServiceClient._read_environment_variables() + ) self._client_cert_source = ModelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -675,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ModelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/pagers.py index f688265b42e6..1ab764385e69 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/base.py index e1cf138a2bd9..bd3a40263803 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta import gapic_version as package_version +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -366,13 +365,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc.py index 2c4a480c7e64..4ec8f4e8d2a2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc_asyncio.py index c97872329ffa..3eba6c7a5a27 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport from .grpc import ModelServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest.py index af86ebab0d92..7b6a568a88e3 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseModelServiceRestTransport @@ -782,7 +781,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -923,7 +922,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest_base.py index 3c785acad44f..72703a369cae 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/async_client.py index 425c09b4ae68..f5dd2e6505c3 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.permission_service import pagers +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service from .client import PermissionServiceClient from .transports.base import DEFAULT_CLIENT_INFO, PermissionServiceTransport @@ -120,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PermissionServiceAsyncClient: The constructed client. """ - return PermissionServiceClient.from_service_account_info.__func__(PermissionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PermissionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PermissionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PermissionServiceAsyncClient: The constructed client. """ - return PermissionServiceClient.from_service_account_file.__func__(PermissionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PermissionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PermissionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/client.py index c786c23c66c3..02c98a0fa3f4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.permission_service import pagers +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service from .transports.base import DEFAULT_CLIENT_INFO, PermissionServiceTransport from .transports.grpc import PermissionServiceGrpcTransport @@ -83,9 +82,7 @@ class PermissionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PermissionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PermissionServiceTransport]] _transport_registry["grpc"] = PermissionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PermissionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PermissionServiceRestTransport @@ -628,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PermissionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PermissionServiceClient._read_environment_variables() + ) self._client_cert_source = PermissionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PermissionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/pagers.py index 3fd5c4d66bce..84a2a5823902 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/base.py index 6df407e77d74..e61c1f04da79 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta import gapic_version as package_version +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -330,13 +329,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc.py index cd05dbe7e0ac..2b1eab39784d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc_asyncio.py index 052c78051f3b..e0704ff31d27 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport from .grpc import PermissionServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest.py index 3f25c19f31c7..f3613b84d1e0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BasePermissionServiceRestTransport @@ -655,9 +654,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseCreatePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseCreatePermission._get_http_options() request, metadata = self._interceptor.pre_create_permission( request, metadata @@ -803,9 +800,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseDeletePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseDeletePermission._get_http_options() request, metadata = self._interceptor.pre_delete_permission( request, metadata @@ -827,7 +822,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -940,9 +935,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseGetPermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseGetPermission._get_http_options() request, metadata = self._interceptor.pre_get_permission(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseGetPermission._get_transcoded_request( @@ -1087,9 +1080,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseListPermissions._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseListPermissions._get_http_options() request, metadata = self._interceptor.pre_list_permissions( request, metadata @@ -1238,9 +1229,7 @@ def __call__( Response from ``TransferOwnership``. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseTransferOwnership._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseTransferOwnership._get_http_options() request, metadata = self._interceptor.pre_transfer_ownership( request, metadata @@ -1416,9 +1405,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseUpdatePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseUpdatePermission._get_http_options() request, metadata = self._interceptor.pre_update_permission( request, metadata @@ -1626,9 +1613,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1741,9 +1726,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1858,9 +1841,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1999,9 +1980,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest_base.py index c40358b1c41a..0cf4622f984f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/async_client.py index 49438a28cad3..9c541578c7b5 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.ai.generativelanguage_v1beta.types import prediction_service @@ -117,7 +117,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_info.__func__(PredictionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PredictionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PredictionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +134,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_file.__func__(PredictionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PredictionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PredictionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/client.py index 5e0068302f22..6a82f24d5410 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.ai.generativelanguage_v1beta.types import prediction_service @@ -82,9 +82,7 @@ class PredictionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PredictionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PredictionServiceTransport]] _transport_registry["grpc"] = PredictionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PredictionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PredictionServiceRestTransport @@ -621,11 +619,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PredictionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PredictionServiceClient._read_environment_variables() + ) self._client_cert_source = PredictionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -660,8 +656,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PredictionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/base.py index f1bb8f5a14c7..c32c8839253c 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version from google.ai.generativelanguage_v1beta.types import prediction_service @@ -228,13 +228,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc.py index 814af605894a..8cd823435934 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import prediction_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc_asyncio.py index 18a459b67a5f..9e5ec35ee622 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import prediction_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/rest.py index da7a3216caf1..194380b6a3ee 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/prediction_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -672,9 +672,7 @@ def __call__( """ - http_options = ( - _BasePredictionServiceRestTransport._BasePredictLongRunning._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BasePredictLongRunning._get_http_options() request, metadata = self._interceptor.pre_predict_long_running( request, metadata @@ -700,7 +698,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -842,9 +840,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePredictionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -957,9 +953,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePredictionServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1074,9 +1068,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePredictionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePredictionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1215,9 +1207,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BasePredictionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BasePredictionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/async_client.py index e4ee2ab258cb..de76ccfd7c78 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.retriever_service import pagers from google.ai.generativelanguage_v1beta.types import retriever, retriever_service @@ -123,7 +123,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RetrieverServiceAsyncClient: The constructed client. """ - return RetrieverServiceClient.from_service_account_info.__func__(RetrieverServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = RetrieverServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(RetrieverServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +140,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RetrieverServiceAsyncClient: The constructed client. """ - return RetrieverServiceClient.from_service_account_file.__func__(RetrieverServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = RetrieverServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(RetrieverServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/client.py index f0f7162aa4a5..75997e6b6d77 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.retriever_service import pagers from google.ai.generativelanguage_v1beta.types import retriever, retriever_service @@ -82,9 +82,7 @@ class RetrieverServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RetrieverServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RetrieverServiceTransport]] _transport_registry["grpc"] = RetrieverServiceGrpcTransport _transport_registry["grpc_asyncio"] = RetrieverServiceGrpcAsyncIOTransport _transport_registry["rest"] = RetrieverServiceRestTransport @@ -660,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RetrieverServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RetrieverServiceClient._read_environment_variables() + ) self._client_cert_source = RetrieverServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -699,8 +695,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RetrieverServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/pagers.py index 01502f265827..105be9d07d77 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/base.py index b5801e9810e5..efdc1b5af711 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta import gapic_version as package_version from google.ai.generativelanguage_v1beta.types import retriever, retriever_service @@ -638,13 +638,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc.py index a30f8c134f0c..5cd2b62688c6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc_asyncio.py index d92fc65de28a..b415fc3b10c8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest.py index 55f4d169e685..6ce456b39f06 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1292,9 +1292,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseBatchCreateChunks._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseBatchCreateChunks._get_http_options() request, metadata = self._interceptor.pre_batch_create_chunks( request, metadata @@ -1443,9 +1441,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseBatchDeleteChunks._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseBatchDeleteChunks._get_http_options() request, metadata = self._interceptor.pre_batch_delete_chunks( request, metadata @@ -1471,7 +1467,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1564,9 +1560,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseBatchUpdateChunks._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseBatchUpdateChunks._get_http_options() request, metadata = self._interceptor.pre_batch_update_chunks( request, metadata @@ -2026,9 +2020,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -2193,7 +2185,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2299,7 +2291,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2383,9 +2375,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -2405,7 +2395,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3239,9 +3229,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseListDocuments._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseListDocuments._get_http_options() request, metadata = self._interceptor.pre_list_documents(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseListDocuments._get_transcoded_request( @@ -3542,9 +3530,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseQueryDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseQueryDocument._get_http_options() request, metadata = self._interceptor.pre_query_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseQueryDocument._get_transcoded_request( @@ -4002,9 +3988,7 @@ def __call__( """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -4330,9 +4314,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -4445,9 +4427,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -4702,9 +4682,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRetrieverServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRetrieverServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRetrieverServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest_base.py index 3c8d11d31f99..b1c6bd0f3e2b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.ai.generativelanguage_v1beta.types import retriever, retriever_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/async_client.py index 1e4362c86c78..c4ac92e34763 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -114,7 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_info.__func__(TextServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = TextServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(TextServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_file.__func__(TextServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = TextServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(TextServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/client.py index b6829c906687..b48f642e2bbc 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version @@ -616,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TextServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TextServiceClient._read_environment_variables() + ) self._client_cert_source = TextServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -655,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TextServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/base.py index 7c4bd96748ac..d08863e417d5 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta import gapic_version as package_version from google.ai.generativelanguage_v1beta.types import text_service @@ -295,13 +295,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc.py index 741421b1e6d0..8245b1aeb150 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc_asyncio.py index 046f02e4d0fd..38c85cd02c91 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/rest.py index 78f7ff669496..9a81ebabd11e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/text_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/__init__.py index 1e999f2f54b0..d0a03d5b83b0 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/__init__.py @@ -21,8 +21,13 @@ ListCachedContentsResponse, UpdateCachedContentRequest, ) -from .cached_content import CachedContent -from .citation import CitationMetadata, CitationSource +from .cached_content import ( + CachedContent, +) +from .citation import ( + CitationMetadata, + CitationSource, +) from .content import ( Blob, CodeExecution, @@ -62,7 +67,10 @@ Message, MessagePrompt, ) -from .file import File, VideoFileMetadata +from .file import ( + File, + VideoFileMetadata, +) from .file_service import ( CreateFileRequest, CreateFileResponse, @@ -126,7 +134,9 @@ UsageMetadata, VoiceConfig, ) -from .model import Model +from .model import ( + Model, +) from .model_service import ( CreateTunedModelMetadata, CreateTunedModelRequest, @@ -139,7 +149,9 @@ ListTunedModelsResponse, UpdateTunedModelRequest, ) -from .permission import Permission +from .permission import ( + Permission, +) from .permission_service import ( CreatePermissionRequest, DeletePermissionRequest, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/cache_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/cache_service.py index f0933295e04b..65fdee002acc 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/cache_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/cache_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ai.generativelanguage_v1beta.types import ( @@ -84,12 +84,12 @@ class ListCachedContentsResponse(proto.Message): def raw_page(self): return self - cached_contents: MutableSequence[ - gag_cached_content.CachedContent - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gag_cached_content.CachedContent, + cached_contents: MutableSequence[gag_cached_content.CachedContent] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gag_cached_content.CachedContent, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/cached_content.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/cached_content.py index 514bd8e46181..1324de41c8e8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/cached_content.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/cached_content.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.ai.generativelanguage_v1beta.types import content diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/content.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/content.py index 935c2eafde02..07cec4a0bec6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/content.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/content.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -80,6 +80,7 @@ class Type(proto.Enum): NULL (7): Null type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -107,6 +108,7 @@ class Modality(proto.Enum): DOCUMENT (5): Document, e.g. PDF. """ + MODALITY_UNSPECIFIED = 0 TEXT = 1 IMAGE = 2 @@ -448,6 +450,7 @@ class Language(proto.Enum): Python >= 3.10, with numpy and simpy available. """ + LANGUAGE_UNSPECIFIED = 0 PYTHON = 1 @@ -494,6 +497,7 @@ class Outcome(proto.Enum): cancelled. There may or may not be a partial output present. """ + OUTCOME_UNSPECIFIED = 0 OUTCOME_OK = 1 OUTCOME_FAILED = 2 @@ -609,6 +613,7 @@ class Environment(proto.Enum): ENVIRONMENT_BROWSER (1): Operates in a web browser. """ + ENVIRONMENT_UNSPECIFIED = 0 ENVIRONMENT_BROWSER = 1 @@ -800,6 +805,7 @@ class Mode(proto.Enum): Run retrieval only when system decides it is necessary. """ + MODE_UNSPECIFIED = 0 MODE_DYNAMIC = 1 @@ -919,6 +925,7 @@ class Mode(proto.Enum): "allowed_function_names", else the predicted function call will be any one of the provided "function_declarations". """ + MODE_UNSPECIFIED = 0 AUTO = 1 ANY = 2 @@ -1025,6 +1032,7 @@ class Behavior(proto.Enum): available while maintaining the conversation between the user and the model. """ + UNSPECIFIED = 0 BLOCKING = 1 NON_BLOCKING = 2 @@ -1176,6 +1184,7 @@ class Scheduling(proto.Enum): interrupt ongoing generation and prompt to generate output. """ + SCHEDULING_UNSPECIFIED = 0 SILENT = 1 WHEN_IDLE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/file.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/file.py index f54e60868897..e01aba255fa4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/file.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/file.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -98,6 +98,7 @@ class State(proto.Enum): FAILED (10): File failed processing. """ + STATE_UNSPECIFIED = 0 PROCESSING = 1 ACTIVE = 2 @@ -117,6 +118,7 @@ class Source(proto.Enum): Indicates the file is a registered, i.e. a Google Cloud Storage file. """ + SOURCE_UNSPECIFIED = 0 UPLOADED = 1 GENERATED = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/generative_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/generative_service.py index dd0599d93edd..d0baf328f248 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/generative_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/generative_service.py @@ -17,13 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.ai.generativelanguage_v1beta.types import citation +from google.ai.generativelanguage_v1beta.types import citation, retriever, safety from google.ai.generativelanguage_v1beta.types import content as gag_content -from google.ai.generativelanguage_v1beta.types import retriever, safety __protobuf__ = proto.module( package="google.ai.generativelanguage.v1beta", @@ -115,6 +114,7 @@ class TaskType(proto.Enum): Specifies that the given text will be used for code retrieval. """ + TASK_TYPE_UNSPECIFIED = 0 RETRIEVAL_QUERY = 1 RETRIEVAL_DOCUMENT = 2 @@ -674,6 +674,7 @@ class Modality(proto.Enum): AUDIO (3): Indicates the model should return audio. """ + MODALITY_UNSPECIFIED = 0 TEXT = 1 IMAGE = 2 @@ -693,6 +694,7 @@ class MediaResolution(proto.Enum): Media resolution set to high (zoomed reframing with 256 tokens). """ + MEDIA_RESOLUTION_UNSPECIFIED = 0 MEDIA_RESOLUTION_LOW = 1 MEDIA_RESOLUTION_MEDIUM = 2 @@ -925,6 +927,7 @@ class BlockReason(proto.Enum): Candidates blocked due to unsafe image generation content. """ + BLOCK_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -1006,26 +1009,26 @@ class UsageMetadata(proto.Message): proto.INT32, number=3, ) - prompt_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gag_content.ModalityTokenCount, + prompt_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gag_content.ModalityTokenCount, + ) ) - cache_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=gag_content.ModalityTokenCount, + cache_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=gag_content.ModalityTokenCount, + ) ) - candidates_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gag_content.ModalityTokenCount, + candidates_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gag_content.ModalityTokenCount, + ) ) tool_use_prompt_tokens_details: MutableSequence[ gag_content.ModalityTokenCount @@ -1176,6 +1179,7 @@ class FinishReason(proto.Enum): Model called too many tools consecutively, thus the system exited execution. """ + FINISH_REASON_UNSPECIFIED = 0 STOP = 1 MAX_TOKENS = 2 @@ -1229,12 +1233,12 @@ class FinishReason(proto.Enum): proto.INT32, number=7, ) - grounding_attributions: MutableSequence[ - "GroundingAttribution" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="GroundingAttribution", + grounding_attributions: MutableSequence["GroundingAttribution"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="GroundingAttribution", + ) ) grounding_metadata: "GroundingMetadata" = proto.Field( proto.MESSAGE, @@ -1299,6 +1303,7 @@ class UrlRetrievalStatus(proto.Enum): Url retrieval is failed because the content is unsafe. """ + URL_RETRIEVAL_STATUS_UNSPECIFIED = 0 URL_RETRIEVAL_STATUS_SUCCESS = 1 URL_RETRIEVAL_STATUS_ERROR = 2 @@ -2012,6 +2017,7 @@ class AnswerStyle(proto.Enum): paragraph, multiple paragraphs, or bullet points, etc. """ + ANSWER_STYLE_UNSPECIFIED = 0 ABSTRACTIVE = 1 EXTRACTIVE = 2 @@ -2136,6 +2142,7 @@ class BlockReason(proto.Enum): OTHER (2): Input was blocked due to other reasons. """ + BLOCK_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -2390,19 +2397,19 @@ class CountTokensResponse(proto.Message): proto.INT32, number=5, ) - prompt_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=gag_content.ModalityTokenCount, + prompt_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=gag_content.ModalityTokenCount, + ) ) - cache_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gag_content.ModalityTokenCount, + cache_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gag_content.ModalityTokenCount, + ) ) @@ -2444,6 +2451,7 @@ class ActivityHandling(proto.Enum): NO_INTERRUPTION (2): The model's response will not be interrupted. """ + ACTIVITY_HANDLING_UNSPECIFIED = 0 START_OF_ACTIVITY_INTERRUPTS = 1 NO_INTERRUPTION = 2 @@ -2465,6 +2473,7 @@ class TurnCoverage(proto.Enum): since the last turn, including inactivity (e.g. silence on the audio stream). """ + TURN_COVERAGE_UNSPECIFIED = 0 TURN_INCLUDES_ONLY_ACTIVITY = 1 TURN_INCLUDES_ALL_INPUT = 2 @@ -2524,6 +2533,7 @@ class StartSensitivity(proto.Enum): Automatic detection will detect the start of speech less often. """ + START_SENSITIVITY_UNSPECIFIED = 0 START_SENSITIVITY_HIGH = 1 START_SENSITIVITY_LOW = 2 @@ -2539,6 +2549,7 @@ class EndSensitivity(proto.Enum): END_SENSITIVITY_LOW (2): Automatic detection ends speech less often. """ + END_SENSITIVITY_UNSPECIFIED = 0 END_SENSITIVITY_HIGH = 1 END_SENSITIVITY_LOW = 2 @@ -2966,12 +2977,12 @@ class BidiGenerateContentToolResponse(proto.Message): Optional. The response to the function calls. """ - function_responses: MutableSequence[ - gag_content.FunctionResponse - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gag_content.FunctionResponse, + function_responses: MutableSequence[gag_content.FunctionResponse] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gag_content.FunctionResponse, + ) ) @@ -3406,33 +3417,33 @@ class UsageMetadata(proto.Message): proto.INT32, number=3, ) - prompt_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gag_content.ModalityTokenCount, + prompt_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gag_content.ModalityTokenCount, + ) ) - cache_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=gag_content.ModalityTokenCount, + cache_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=gag_content.ModalityTokenCount, + ) ) - response_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gag_content.ModalityTokenCount, + response_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gag_content.ModalityTokenCount, + ) ) - tool_use_prompt_tokens_details: MutableSequence[ - gag_content.ModalityTokenCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message=gag_content.ModalityTokenCount, + tool_use_prompt_tokens_details: MutableSequence[gag_content.ModalityTokenCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message=gag_content.ModalityTokenCount, + ) ) diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/model_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/model_service.py index 371eb015b67d..962f47cb9c55 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/model_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/model_service.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model from google.ai.generativelanguage_v1beta.types import model +from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model __protobuf__ = proto.module( package="google.ai.generativelanguage.v1beta", diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/permission.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/permission.py index a6141133edcc..2f8c0e2a4533 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/permission.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/permission.py @@ -90,6 +90,7 @@ class GranteeType(proto.Enum): Represents access to everyone. No extra information is required. """ + GRANTEE_TYPE_UNSPECIFIED = 0 USER = 1 GROUP = 2 @@ -110,6 +111,7 @@ class Role(proto.Enum): READER (3): Reader can use the resource. """ + ROLE_UNSPECIFIED = 0 OWNER = 1 WRITER = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/permission_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/permission_service.py index 598397332edf..4a1b42a0051d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/permission_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/permission_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ai.generativelanguage_v1beta.types import permission as gag_permission diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/prediction_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/prediction_service.py index e4ec2aef8bf2..f366c4f8a1d2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/prediction_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/prediction_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever.py index 5308e418971a..0ce523dde9d3 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -280,6 +280,7 @@ class Operator(proto.Enum): Supported by string only when ``CustomMetadata`` value type for the given key has a ``string_list_value``. """ + OPERATOR_UNSPECIFIED = 0 LESS = 1 LESS_EQUAL = 2 @@ -352,6 +353,7 @@ class State(proto.Enum): STATE_FAILED (10): ``Chunk`` failed processing. """ + STATE_UNSPECIFIED = 0 STATE_PENDING_PROCESSING = 1 STATE_ACTIVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever_service.py index 8f94c99012d4..d10d6a5dbd63 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/retriever_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ai.generativelanguage_v1beta.types import retriever diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/safety.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/safety.py index 19e1130e4089..028d0e0a3b11 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/safety.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/safety.py @@ -69,6 +69,7 @@ class HarmCategory(proto.Enum): integrity. DEPRECATED: use enable_enhanced_civic_answers instead. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_DEROGATORY = 1 HARM_CATEGORY_TOXICITY = 2 @@ -115,6 +116,7 @@ class BlockedReason(proto.Enum): Content was blocked, but the reason is uncategorized. """ + BLOCKED_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -200,6 +202,7 @@ class HarmProbability(proto.Enum): HIGH (4): Content has a high chance of being unsafe. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -255,6 +258,7 @@ class HarmBlockThreshold(proto.Enum): OFF (5): Turn off the safety filter. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/tuned_model.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/tuned_model.py index ac25081635af..c62a4e9f516a 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/tuned_model.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/types/tuned_model.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -136,6 +136,7 @@ class State(proto.Enum): FAILED (3): The model failed to be created. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/__init__.py index 472daf067e6c..974e5bda080f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.discuss_service import DiscussServiceAsyncClient, DiscussServiceClient from .services.model_service import ModelServiceAsyncClient, ModelServiceClient from .services.text_service import TextServiceAsyncClient, TextServiceClient diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/async_client.py index 6f7f3fcb49ac..589b53f8674b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version @@ -116,7 +116,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_info.__func__(DiscussServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DiscussServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DiscussServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +133,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_file.__func__(DiscussServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DiscussServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DiscussServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/client.py index 8b8032c0728c..ab791843580d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version @@ -77,9 +77,7 @@ class DiscussServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DiscussServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DiscussServiceTransport]] _transport_registry["grpc"] = DiscussServiceGrpcTransport _transport_registry["grpc_asyncio"] = DiscussServiceGrpcAsyncIOTransport _transport_registry["rest"] = DiscussServiceRestTransport @@ -616,11 +614,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiscussServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiscussServiceClient._read_environment_variables() + ) self._client_cert_source = DiscussServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -655,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiscussServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/base.py index 27e48661c7df..530febbe252b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version from google.ai.generativelanguage_v1beta2.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc.py index c69c83485947..93cff3a6d79b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.ai.generativelanguage_v1beta2.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc_asyncio.py index 24ddec559b3f..41ab9fbdda60 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta2.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/rest.py index 2d2ff799ef69..e18f5054faac 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -350,9 +350,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() request, metadata = self._interceptor.pre_count_message_tokens( request, metadata @@ -510,9 +508,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() request, metadata = self._interceptor.pre_generate_message( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/async_client.py index 717411ebf158..cae4d9816f66 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version @@ -111,7 +111,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_info.__func__(ModelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ModelServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ModelServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +128,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_file.__func__(ModelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ModelServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ModelServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/client.py index 71f47835dbd1..4332aefa9df4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version @@ -613,11 +613,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ModelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ModelServiceClient._read_environment_variables() + ) self._client_cert_source = ModelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -652,8 +650,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ModelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/pagers.py index 78e1890431dc..f6f8fce4ee07 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/base.py index 8b485e2a2205..06344c5dcd6d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version from google.ai.generativelanguage_v1beta2.types import model, model_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc.py index 74d4ab64ba01..325a39d32e3f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.ai.generativelanguage_v1beta2.types import model, model_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc_asyncio.py index d4462838aca1..ac226a68b386 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta2.types import model, model_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/rest.py index b764cfa6e792..a0f437080112 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/model_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/async_client.py index 7814259f544e..97f174570b7f 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version @@ -112,7 +112,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_info.__func__(TextServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = TextServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(TextServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +129,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_file.__func__(TextServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = TextServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(TextServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/client.py index 02a6f448489b..23a4ff286dd6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version @@ -614,11 +614,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TextServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TextServiceClient._read_environment_variables() + ) self._client_cert_source = TextServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -653,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TextServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/base.py index 90ed393d6ca3..16df0db788f7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta2 import gapic_version as package_version from google.ai.generativelanguage_v1beta2.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc.py index 9f9c528913a8..611f5c9c60fd 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.ai.generativelanguage_v1beta2.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc_asyncio.py index 63d961bae14c..435c8ac5704e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta2.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/rest.py index e0cb4aa36655..9d70acf94493 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/__init__.py index 2f3df470c104..fa12b9dfdf87 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .citation import CitationMetadata, CitationSource +from .citation import ( + CitationMetadata, + CitationSource, +) from .discuss_service import ( CountMessageTokensRequest, CountMessageTokensResponse, @@ -23,8 +26,14 @@ Message, MessagePrompt, ) -from .model import Model -from .model_service import GetModelRequest, ListModelsRequest, ListModelsResponse +from .model import ( + Model, +) +from .model_service import ( + GetModelRequest, + ListModelsRequest, + ListModelsResponse, +) from .safety import ( ContentFilter, HarmCategory, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/safety.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/safety.py index 466a7828a9f4..9212213d2e0c 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/safety.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/safety.py @@ -59,6 +59,7 @@ class HarmCategory(proto.Enum): Dangerous content that promotes, facilitates, or encourages harmful acts. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_DEROGATORY = 1 HARM_CATEGORY_TOXICITY = 2 @@ -100,6 +101,7 @@ class BlockedReason(proto.Enum): Content was blocked, but the reason is uncategorized. """ + BLOCKED_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -182,6 +184,7 @@ class HarmProbability(proto.Enum): HIGH (4): Content has a high chance of being unsafe. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -229,6 +232,7 @@ class HarmBlockThreshold(proto.Enum): Content with NEGLIGIBLE, LOW, and MEDIUM will be allowed. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/__init__.py index 87e768c5339e..783210c85484 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.discuss_service import DiscussServiceAsyncClient, DiscussServiceClient from .services.model_service import ModelServiceAsyncClient, ModelServiceClient from .services.permission_service import ( diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/async_client.py index 23ba7959c19f..5048fd23ee2e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -118,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_info.__func__(DiscussServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DiscussServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DiscussServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +135,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DiscussServiceAsyncClient: The constructed client. """ - return DiscussServiceClient.from_service_account_file.__func__(DiscussServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DiscussServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DiscussServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/client.py index e33322d77cd9..aa509b517a37 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -79,9 +79,7 @@ class DiscussServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DiscussServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DiscussServiceTransport]] _transport_registry["grpc"] = DiscussServiceGrpcTransport _transport_registry["grpc_asyncio"] = DiscussServiceGrpcAsyncIOTransport _transport_registry["rest"] = DiscussServiceRestTransport @@ -618,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiscussServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiscussServiceClient._read_environment_variables() + ) self._client_cert_source = DiscussServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiscussServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/base.py index afc6c9fd2286..f14b332a99b9 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version from google.ai.generativelanguage_v1beta3.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc.py index 0cf12fead37e..a8bdd4769596 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta3.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc_asyncio.py index 3269b169eb48..c76a94ddd24d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta3.types import discuss_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/rest.py index e3375c56afc5..9504bcdebc69 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/discuss_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -351,9 +351,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseCountMessageTokens._get_http_options() request, metadata = self._interceptor.pre_count_message_tokens( request, metadata @@ -511,9 +509,7 @@ def __call__( """ - http_options = ( - _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() - ) + http_options = _BaseDiscussServiceRestTransport._BaseGenerateMessage._get_http_options() request, metadata = self._interceptor.pre_generate_message( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/async_client.py index 2fdcda7664d5..e475356296c8 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta3.services.model_service import pagers +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model from .client import ModelServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ModelServiceTransport @@ -121,7 +120,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_info.__func__(ModelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ModelServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ModelServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +137,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ModelServiceAsyncClient: The constructed client. """ - return ModelServiceClient.from_service_account_file.__func__(ModelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ModelServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ModelServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/client.py index f2964d9c842f..ed773fce5ac1 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta3.services.model_service import pagers +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model from .transports.base import DEFAULT_CLIENT_INFO, ModelServiceTransport from .transports.grpc import ModelServiceGrpcTransport @@ -636,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ModelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ModelServiceClient._read_environment_variables() + ) self._client_cert_source = ModelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -675,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ModelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/pagers.py index 3e0a81f1e2e0..64705e4257ed 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/base.py index a128421f274c..6ef356a34621 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta3 import gapic_version as package_version +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc.py index b7dfb8bfdab2..e49af013eaf4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc_asyncio.py index a5dae3ef51e2..11a32d9be3ea 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport from .grpc import ModelServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest.py index 288d6ee52e34..8b027efd2d79 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseModelServiceRestTransport @@ -637,7 +636,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -778,7 +777,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest_base.py index 9f933b3974c5..a606497672ec 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/model_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model from .base import DEFAULT_CLIENT_INFO, ModelServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py index bb2c6b98dff4..5bcd4fa4c517 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.ai.generativelanguage_v1beta3.services.permission_service import pagers +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service from .client import PermissionServiceClient from .transports.base import DEFAULT_CLIENT_INFO, PermissionServiceTransport @@ -124,7 +123,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PermissionServiceAsyncClient: The constructed client. """ - return PermissionServiceClient.from_service_account_info.__func__(PermissionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PermissionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PermissionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +140,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PermissionServiceAsyncClient: The constructed client. """ - return PermissionServiceClient.from_service_account_file.__func__(PermissionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PermissionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PermissionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py index 49c417484bd4..6846669fd6a6 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.ai.generativelanguage_v1beta3.services.permission_service import pagers +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service from .transports.base import DEFAULT_CLIENT_INFO, PermissionServiceTransport from .transports.grpc import PermissionServiceGrpcTransport @@ -83,9 +82,7 @@ class PermissionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PermissionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PermissionServiceTransport]] _transport_registry["grpc"] = PermissionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PermissionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PermissionServiceRestTransport @@ -643,11 +640,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PermissionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PermissionServiceClient._read_environment_variables() + ) self._client_cert_source = PermissionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -682,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PermissionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/pagers.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/pagers.py index 6ca04a54f8a5..41cd819439cb 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/pagers.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/base.py index 07ae8e18d53f..c8228fadc62d 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.ai.generativelanguage_v1beta3 import gapic_version as package_version +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc.py index b269c2fa2aa9..f70285a5d771 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc_asyncio.py index 85264ef7d892..7ff85d5b5d9e 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport from .grpc import PermissionServiceGrpcTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py index bf8ab75b3ab1..fd99536d04c5 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BasePermissionServiceRestTransport @@ -559,9 +558,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseCreatePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseCreatePermission._get_http_options() request, metadata = self._interceptor.pre_create_permission( request, metadata @@ -707,9 +704,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseDeletePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseDeletePermission._get_http_options() request, metadata = self._interceptor.pre_delete_permission( request, metadata @@ -731,7 +726,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -844,9 +839,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseGetPermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseGetPermission._get_http_options() request, metadata = self._interceptor.pre_get_permission(request, metadata) transcoded_request = _BasePermissionServiceRestTransport._BaseGetPermission._get_transcoded_request( @@ -991,9 +984,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseListPermissions._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseListPermissions._get_http_options() request, metadata = self._interceptor.pre_list_permissions( request, metadata @@ -1142,9 +1133,7 @@ def __call__( Response from ``TransferOwnership``. """ - http_options = ( - _BasePermissionServiceRestTransport._BaseTransferOwnership._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseTransferOwnership._get_http_options() request, metadata = self._interceptor.pre_transfer_ownership( request, metadata @@ -1320,9 +1309,7 @@ def __call__( """ - http_options = ( - _BasePermissionServiceRestTransport._BaseUpdatePermission._get_http_options() - ) + http_options = _BasePermissionServiceRestTransport._BaseUpdatePermission._get_http_options() request, metadata = self._interceptor.pre_update_permission( request, metadata diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest_base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest_base.py index 7b5465ad6529..618b8026ccca 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest_base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service from .base import DEFAULT_CLIENT_INFO, PermissionServiceTransport diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/async_client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/async_client.py index c17366c12314..70f61925eacf 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/async_client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -114,7 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_info.__func__(TextServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = TextServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(TextServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TextServiceAsyncClient: The constructed client. """ - return TextServiceClient.from_service_account_file.__func__(TextServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = TextServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(TextServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/client.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/client.py index 7d05a713fbc8..d7e4ca371739 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/client.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version @@ -616,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TextServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TextServiceClient._read_environment_variables() + ) self._client_cert_source = TextServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -655,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TextServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/base.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/base.py index e88dbeea30f5..497818e64f18 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/base.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.ai.generativelanguage_v1beta3 import gapic_version as package_version from google.ai.generativelanguage_v1beta3.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc.py index bc0d8881b5d8..0fa951da40d7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta3.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc_asyncio.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc_asyncio.py index c7ce62f9ff37..0498a7d920c9 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc_asyncio.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.ai.generativelanguage_v1beta3.types import text_service diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/rest.py index 2b831794bd21..1e27fefbb8e7 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/text_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/__init__.py index aa90e5d93eba..94d7de94b6f2 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .citation import CitationMetadata, CitationSource +from .citation import ( + CitationMetadata, + CitationSource, +) from .discuss_service import ( CountMessageTokensRequest, CountMessageTokensResponse, @@ -23,7 +26,9 @@ Message, MessagePrompt, ) -from .model import Model +from .model import ( + Model, +) from .model_service import ( CreateTunedModelMetadata, CreateTunedModelRequest, @@ -36,7 +41,9 @@ ListTunedModelsResponse, UpdateTunedModelRequest, ) -from .permission import Permission +from .permission import ( + Permission, +) from .permission_service import ( CreatePermissionRequest, DeletePermissionRequest, diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/model_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/model_service.py index 83aa7c8fbd73..3b3c6cb604ee 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/model_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/model_service.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model from google.ai.generativelanguage_v1beta3.types import model +from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model __protobuf__ = proto.module( package="google.ai.generativelanguage.v1beta3", diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py index 68c7b3926daf..27d9268eb549 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission.py @@ -89,6 +89,7 @@ class GranteeType(proto.Enum): Represents access to everyone. No extra information is required. """ + GRANTEE_TYPE_UNSPECIFIED = 0 USER = 1 GROUP = 2 @@ -109,6 +110,7 @@ class Role(proto.Enum): READER (3): Reader can use the resource. """ + ROLE_UNSPECIFIED = 0 OWNER = 1 WRITER = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission_service.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission_service.py index 96ef0e4e49f9..69af622deb76 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission_service.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/permission_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.ai.generativelanguage_v1beta3.types import permission as gag_permission diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/safety.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/safety.py index d440bd18a707..72cfd8d79253 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/safety.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/safety.py @@ -59,6 +59,7 @@ class HarmCategory(proto.Enum): Dangerous content that promotes, facilitates, or encourages harmful acts. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_DEROGATORY = 1 HARM_CATEGORY_TOXICITY = 2 @@ -100,6 +101,7 @@ class BlockedReason(proto.Enum): Content was blocked, but the reason is uncategorized. """ + BLOCKED_REASON_UNSPECIFIED = 0 SAFETY = 1 OTHER = 2 @@ -182,6 +184,7 @@ class HarmProbability(proto.Enum): HIGH (4): Content has a high chance of being unsafe. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -231,6 +234,7 @@ class HarmBlockThreshold(proto.Enum): BLOCK_NONE (4): All content will be allowed. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/tuned_model.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/tuned_model.py index f8dfa76fde1c..c97f2a57206b 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/tuned_model.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/types/tuned_model.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -130,6 +130,7 @@ class State(proto.Enum): FAILED (3): The model failed to be created. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-ai-generativelanguage/noxfile.py b/packages/google-ai-generativelanguage/noxfile.py index 468fa21a3dcb..0755f77a0a03 100644 --- a/packages/google-ai-generativelanguage/noxfile.py +++ b/packages/google-ai-generativelanguage/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_generative_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_generative_service.py index ef58071d97c7..6f28014213be 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_generative_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_generative_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,26 +43,30 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.ai.generativelanguage_v1.services.generative_service import ( GenerativeServiceAsyncClient, GenerativeServiceClient, transports, ) -from google.ai.generativelanguage_v1.types import content +from google.ai.generativelanguage_v1.types import content, generative_service, safety from google.ai.generativelanguage_v1.types import content as gag_content -from google.ai.generativelanguage_v1.types import generative_service, safety CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -982,10 +986,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1033,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1071,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1320,13 +1321,13 @@ def test_generative_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1435,9 +1436,9 @@ def test_generate_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_content] = ( + mock_rpc + ) request = {} client.generate_content(request) @@ -2454,9 +2455,9 @@ def test_batch_embed_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_contents] = ( + mock_rpc + ) request = {} client.batch_embed_contents(request) @@ -3066,9 +3067,9 @@ def test_generate_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_content] = ( + mock_rpc + ) request = {} client.generate_content(request) @@ -3643,9 +3644,9 @@ def test_batch_embed_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_contents] = ( + mock_rpc + ) request = {} client.batch_embed_contents(request) @@ -4375,8 +4376,9 @@ def test_generate_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4441,18 +4443,20 @@ def test_generate_content_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_generate_content" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, - "post_generate_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_generate_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_generate_content" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_generate_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_generate_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4510,8 +4514,9 @@ def test_stream_generate_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4580,18 +4585,20 @@ def test_stream_generate_content_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_stream_generate_content" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, - "post_stream_generate_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_stream_generate_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_stream_generate_content" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_stream_generate_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_stream_generate_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4649,8 +4656,9 @@ def test_embed_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4710,17 +4718,20 @@ def test_embed_content_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_embed_content" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "post_embed_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_embed_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_embed_content" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_embed_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_embed_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4778,8 +4789,9 @@ def test_batch_embed_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4839,18 +4851,20 @@ def test_batch_embed_contents_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_batch_embed_contents" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, - "post_batch_embed_contents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_batch_embed_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_batch_embed_contents" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_batch_embed_contents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_batch_embed_contents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4908,8 +4922,9 @@ def test_count_tokens_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4972,17 +4987,20 @@ def test_count_tokens_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_count_tokens" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "post_count_tokens_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_count_tokens" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_count_tokens" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_count_tokens_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_count_tokens" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5042,8 +5060,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5102,8 +5121,9 @@ def test_delete_operation_rest_bad_request( request = json_format.ParseDict({"name": "operations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5164,8 +5184,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5224,8 +5245,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "operations"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5445,11 +5467,14 @@ def test_generative_service_base_transport(): def test_generative_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1.services.generative_service.transports.GenerativeServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1.services.generative_service.transports.GenerativeServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GenerativeServiceTransport( @@ -5466,9 +5491,12 @@ def test_generative_service_base_transport_with_credentials_file(): def test_generative_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1.services.generative_service.transports.GenerativeServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1.services.generative_service.transports.GenerativeServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GenerativeServiceTransport() @@ -5540,11 +5568,12 @@ def test_generative_service_transport_auth_gdch_credentials(transport_class): def test_generative_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_model_service.py index 420d866bd405..56eb8ce8a044 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1/test_model_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -927,10 +932,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1256,13 +1258,13 @@ def test_model_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2687,8 +2689,9 @@ def test_get_model_rest_bad_request(request_type=model_service.GetModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2777,17 +2780,19 @@ def test_get_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_get_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_get_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_get_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_model_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_get_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2836,8 +2841,9 @@ def test_list_models_rest_bad_request(request_type=model_service.ListModelsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2900,17 +2906,19 @@ def test_list_models_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_list_models" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_list_models_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_list_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_models" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_models_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_list_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2967,8 +2975,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3027,8 +3036,9 @@ def test_delete_operation_rest_bad_request( request = json_format.ParseDict({"name": "operations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3089,8 +3099,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3149,8 +3160,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "operations"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3303,11 +3315,14 @@ def test_model_service_base_transport(): def test_model_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelServiceTransport( @@ -3324,9 +3339,12 @@ def test_model_service_base_transport_with_credentials_file(): def test_model_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelServiceTransport() @@ -3398,11 +3416,12 @@ def test_model_service_transport_auth_gdch_credentials(transport_class): def test_model_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_cache_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_cache_service.py index fe35e28b290a..ec3e453a311d 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_cache_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_cache_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.cache_service import ( CacheServiceAsyncClient, @@ -63,12 +68,14 @@ pagers, transports, ) +from google.ai.generativelanguage_v1alpha.types import ( + cache_service, + cached_content, + content, +) from google.ai.generativelanguage_v1alpha.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1alpha.types import cache_service -from google.ai.generativelanguage_v1alpha.types import cached_content -from google.ai.generativelanguage_v1alpha.types import content CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -936,10 +943,9 @@ def test_cache_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +990,9 @@ def test_cache_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1028,9 @@ def test_cache_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1265,13 +1269,13 @@ def test_cache_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1384,9 +1388,9 @@ def test_list_cached_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cached_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cached_contents] = ( + mock_rpc + ) request = {} client.list_cached_contents(request) @@ -1775,9 +1779,9 @@ def test_create_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_cached_content] = ( + mock_rpc + ) request = {} client.create_cached_content(request) @@ -2072,9 +2076,9 @@ def test_get_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cached_content] = ( + mock_rpc + ) request = {} client.get_cached_content(request) @@ -2418,9 +2422,9 @@ def test_update_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cached_content] = ( + mock_rpc + ) request = {} client.update_cached_content(request) @@ -2784,9 +2788,9 @@ def test_delete_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cached_content] = ( + mock_rpc + ) request = {} client.delete_cached_content(request) @@ -3049,9 +3053,9 @@ def test_list_cached_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cached_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cached_contents] = ( + mock_rpc + ) request = {} client.list_cached_contents(request) @@ -3153,9 +3157,9 @@ def test_create_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_cached_content] = ( + mock_rpc + ) request = {} client.create_cached_content(request) @@ -3333,9 +3337,9 @@ def test_get_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cached_content] = ( + mock_rpc + ) request = {} client.get_cached_content(request) @@ -3514,9 +3518,9 @@ def test_update_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cached_content] = ( + mock_rpc + ) request = {} client.update_cached_content(request) @@ -3701,9 +3705,9 @@ def test_delete_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cached_content] = ( + mock_rpc + ) request = {} client.delete_cached_content(request) @@ -4253,8 +4257,9 @@ def test_list_cached_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4317,18 +4322,20 @@ def test_list_cached_contents_rest_interceptors(null_interceptor): ) client = CacheServiceClient(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.CacheServiceRestInterceptor, "post_list_cached_contents" - ) as post, mock.patch.object( - transports.CacheServiceRestInterceptor, - "post_list_cached_contents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CacheServiceRestInterceptor, "pre_list_cached_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CacheServiceRestInterceptor, "post_list_cached_contents" + ) as post, + mock.patch.object( + transports.CacheServiceRestInterceptor, + "post_list_cached_contents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CacheServiceRestInterceptor, "pre_list_cached_contents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4386,8 +4393,9 @@ def test_create_cached_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4597,18 +4605,20 @@ def test_create_cached_content_rest_interceptors(null_interceptor): ) client = CacheServiceClient(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.CacheServiceRestInterceptor, "post_create_cached_content" - ) as post, mock.patch.object( - transports.CacheServiceRestInterceptor, - "post_create_cached_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CacheServiceRestInterceptor, "pre_create_cached_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CacheServiceRestInterceptor, "post_create_cached_content" + ) as post, + mock.patch.object( + transports.CacheServiceRestInterceptor, + "post_create_cached_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CacheServiceRestInterceptor, "pre_create_cached_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4663,8 +4673,9 @@ def test_get_cached_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4731,17 +4742,20 @@ def test_get_cached_content_rest_interceptors(null_interceptor): ) client = CacheServiceClient(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.CacheServiceRestInterceptor, "post_get_cached_content" - ) as post, mock.patch.object( - transports.CacheServiceRestInterceptor, "post_get_cached_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CacheServiceRestInterceptor, "pre_get_cached_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CacheServiceRestInterceptor, "post_get_cached_content" + ) as post, + mock.patch.object( + transports.CacheServiceRestInterceptor, + "post_get_cached_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CacheServiceRestInterceptor, "pre_get_cached_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4796,8 +4810,9 @@ def test_update_cached_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5007,18 +5022,20 @@ def test_update_cached_content_rest_interceptors(null_interceptor): ) client = CacheServiceClient(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.CacheServiceRestInterceptor, "post_update_cached_content" - ) as post, mock.patch.object( - transports.CacheServiceRestInterceptor, - "post_update_cached_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CacheServiceRestInterceptor, "pre_update_cached_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CacheServiceRestInterceptor, "post_update_cached_content" + ) as post, + mock.patch.object( + transports.CacheServiceRestInterceptor, + "post_update_cached_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CacheServiceRestInterceptor, "pre_update_cached_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5073,8 +5090,9 @@ def test_delete_cached_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5131,13 +5149,13 @@ def test_delete_cached_content_rest_interceptors(null_interceptor): ) client = CacheServiceClient(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.CacheServiceRestInterceptor, "pre_delete_cached_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CacheServiceRestInterceptor, "pre_delete_cached_content" + ) as pre, + ): pre.assert_not_called() pb_message = cache_service.DeleteCachedContentRequest.pb( cache_service.DeleteCachedContentRequest() @@ -5184,8 +5202,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5244,8 +5263,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5469,11 +5489,14 @@ def test_cache_service_base_transport(): def test_cache_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1alpha.services.cache_service.transports.CacheServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.cache_service.transports.CacheServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CacheServiceTransport( @@ -5490,9 +5513,12 @@ def test_cache_service_base_transport_with_credentials_file(): def test_cache_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1alpha.services.cache_service.transports.CacheServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.cache_service.transports.CacheServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CacheServiceTransport() @@ -5564,11 +5590,12 @@ def test_cache_service_transport_auth_gdch_credentials(transport_class): def test_cache_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_discuss_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_discuss_service.py index d442c3277b84..4762f2073d09 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_discuss_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_discuss_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -945,10 +950,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +997,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1035,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1278,13 +1280,13 @@ def test_discuss_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1388,9 +1390,9 @@ def test_generate_message_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -1758,9 +1760,9 @@ def test_count_message_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) @@ -2040,9 +2042,9 @@ def test_generate_message_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -2240,9 +2242,9 @@ def test_count_message_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) @@ -2645,8 +2647,9 @@ def test_generate_message_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2706,17 +2709,20 @@ def test_generate_message_rest_interceptors(null_interceptor): ) client = DiscussServiceClient(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.DiscussServiceRestInterceptor, "post_generate_message" - ) as post, mock.patch.object( - transports.DiscussServiceRestInterceptor, "post_generate_message_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DiscussServiceRestInterceptor, "pre_generate_message" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "post_generate_message" + ) as post, + mock.patch.object( + transports.DiscussServiceRestInterceptor, + "post_generate_message_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "pre_generate_message" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2774,8 +2780,9 @@ def test_count_message_tokens_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2838,18 +2845,20 @@ def test_count_message_tokens_rest_interceptors(null_interceptor): ) client = DiscussServiceClient(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.DiscussServiceRestInterceptor, "post_count_message_tokens" - ) as post, mock.patch.object( - transports.DiscussServiceRestInterceptor, - "post_count_message_tokens_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DiscussServiceRestInterceptor, "pre_count_message_tokens" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "post_count_message_tokens" + ) as post, + mock.patch.object( + transports.DiscussServiceRestInterceptor, + "post_count_message_tokens_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "pre_count_message_tokens" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2909,8 +2918,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2969,8 +2979,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3123,11 +3134,14 @@ def test_discuss_service_base_transport(): def test_discuss_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1alpha.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiscussServiceTransport( @@ -3144,9 +3158,12 @@ def test_discuss_service_base_transport_with_credentials_file(): def test_discuss_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1alpha.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiscussServiceTransport() @@ -3218,11 +3235,12 @@ def test_discuss_service_transport_auth_gdch_credentials(transport_class): def test_discuss_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_file_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_file_service.py index d9c1324591fe..e989f15e7fec 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_file_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_file_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.file_service import ( FileServiceAsyncClient, @@ -927,10 +932,9 @@ def test_file_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_file_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_file_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1246,13 +1248,13 @@ def test_file_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3269,8 +3271,9 @@ def test_create_file_rest_bad_request(request_type=file_service.CreateFileReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3330,17 +3333,19 @@ def test_create_file_rest_interceptors(null_interceptor): ) client = FileServiceClient(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.FileServiceRestInterceptor, "post_create_file" - ) as post, mock.patch.object( - transports.FileServiceRestInterceptor, "post_create_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FileServiceRestInterceptor, "pre_create_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_create_file" + ) as post, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_create_file_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FileServiceRestInterceptor, "pre_create_file" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3391,8 +3396,9 @@ def test_list_files_rest_bad_request(request_type=file_service.ListFilesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3455,17 +3461,19 @@ def test_list_files_rest_interceptors(null_interceptor): ) client = FileServiceClient(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.FileServiceRestInterceptor, "post_list_files" - ) as post, mock.patch.object( - transports.FileServiceRestInterceptor, "post_list_files_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FileServiceRestInterceptor, "pre_list_files" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_list_files" + ) as post, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_list_files_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FileServiceRestInterceptor, "pre_list_files" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3516,8 +3524,9 @@ def test_get_file_rest_bad_request(request_type=file_service.GetFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3592,17 +3601,17 @@ def test_get_file_rest_interceptors(null_interceptor): ) client = FileServiceClient(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.FileServiceRestInterceptor, "post_get_file" - ) as post, mock.patch.object( - transports.FileServiceRestInterceptor, "post_get_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FileServiceRestInterceptor, "pre_get_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_get_file" + ) as post, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_get_file_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FileServiceRestInterceptor, "pre_get_file") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3651,8 +3660,9 @@ def test_delete_file_rest_bad_request(request_type=file_service.DeleteFileReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3709,13 +3719,13 @@ def test_delete_file_rest_interceptors(null_interceptor): ) client = FileServiceClient(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.FileServiceRestInterceptor, "pre_delete_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FileServiceRestInterceptor, "pre_delete_file" + ) as pre, + ): pre.assert_not_called() pb_message = file_service.DeleteFileRequest.pb(file_service.DeleteFileRequest()) transcode.return_value = { @@ -3760,8 +3770,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3820,8 +3831,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4014,11 +4026,14 @@ def test_file_service_base_transport(): def test_file_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1alpha.services.file_service.transports.FileServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.file_service.transports.FileServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FileServiceTransport( @@ -4035,9 +4050,12 @@ def test_file_service_base_transport_with_credentials_file(): def test_file_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1alpha.services.file_service.transports.FileServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.file_service.transports.FileServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FileServiceTransport() @@ -4109,11 +4127,12 @@ def test_file_service_transport_auth_gdch_credentials(transport_class): def test_file_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_generative_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_generative_service.py index e945fded9390..950e02c00983 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_generative_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_generative_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.generative_service import ( GenerativeServiceAsyncClient, @@ -60,11 +65,11 @@ transports, ) from google.ai.generativelanguage_v1alpha.types import ( + content, generative_service, retriever, safety, ) -from google.ai.generativelanguage_v1alpha.types import content from google.ai.generativelanguage_v1alpha.types import content as gag_content CRED_INFO_JSON = { @@ -985,10 +990,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1037,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1072,10 +1075,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1323,13 +1325,13 @@ def test_generative_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1438,9 +1440,9 @@ def test_generate_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_content] = ( + mock_rpc + ) request = {} client.generate_content(request) @@ -2831,9 +2833,9 @@ def test_batch_embed_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_contents] = ( + mock_rpc + ) request = {} client.batch_embed_contents(request) @@ -3488,9 +3490,9 @@ def test_bidi_generate_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.bidi_generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.bidi_generate_content] = ( + mock_rpc + ) request = [{}] client.bidi_generate_content(request) @@ -3608,9 +3610,9 @@ def test_generate_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_content] = ( + mock_rpc + ) request = {} client.generate_content(request) @@ -4388,9 +4390,9 @@ def test_batch_embed_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_contents] = ( + mock_rpc + ) request = {} client.batch_embed_contents(request) @@ -5192,8 +5194,9 @@ def test_generate_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5256,18 +5259,20 @@ def test_generate_content_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_generate_content" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, - "post_generate_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_generate_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_generate_content" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_generate_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_generate_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5325,8 +5330,9 @@ def test_generate_answer_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5389,18 +5395,20 @@ def test_generate_answer_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_generate_answer" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, - "post_generate_answer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_generate_answer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_generate_answer" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_generate_answer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_generate_answer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5458,8 +5466,9 @@ def test_stream_generate_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5526,18 +5535,20 @@ def test_stream_generate_content_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_stream_generate_content" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, - "post_stream_generate_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_stream_generate_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_stream_generate_content" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_stream_generate_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_stream_generate_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5595,8 +5606,9 @@ def test_embed_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5656,17 +5668,20 @@ def test_embed_content_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_embed_content" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "post_embed_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_embed_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_embed_content" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_embed_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_embed_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5724,8 +5739,9 @@ def test_batch_embed_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5785,18 +5801,20 @@ def test_batch_embed_contents_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_batch_embed_contents" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, - "post_batch_embed_contents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_batch_embed_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_batch_embed_contents" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_batch_embed_contents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_batch_embed_contents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5854,8 +5872,9 @@ def test_count_tokens_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5920,17 +5939,20 @@ def test_count_tokens_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_count_tokens" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "post_count_tokens_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_count_tokens" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_count_tokens" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_count_tokens_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_count_tokens" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6002,8 +6024,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6062,8 +6085,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6303,11 +6327,14 @@ def test_generative_service_base_transport(): def test_generative_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1alpha.services.generative_service.transports.GenerativeServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.generative_service.transports.GenerativeServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GenerativeServiceTransport( @@ -6324,9 +6351,12 @@ def test_generative_service_base_transport_with_credentials_file(): def test_generative_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1alpha.services.generative_service.transports.GenerativeServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.generative_service.transports.GenerativeServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GenerativeServiceTransport() @@ -6398,11 +6428,12 @@ def test_generative_service_transport_auth_gdch_credentials(transport_class): def test_generative_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_model_service.py index 82e644ae4b88..1813b2e0b807 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_model_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.model_service import ( ModelServiceAsyncClient, @@ -70,9 +70,8 @@ pagers, transports, ) +from google.ai.generativelanguage_v1alpha.types import model, model_service, tuned_model from google.ai.generativelanguage_v1alpha.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1alpha.types import model, model_service -from google.ai.generativelanguage_v1alpha.types import tuned_model CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -940,10 +939,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +986,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1024,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1269,13 +1265,13 @@ def test_model_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2568,9 +2564,9 @@ def test_list_tuned_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tuned_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tuned_models] = ( + mock_rpc + ) request = {} client.list_tuned_models(request) @@ -3050,9 +3046,9 @@ def test_create_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tuned_model] = ( + mock_rpc + ) request = {} client.create_tuned_model(request) @@ -3378,9 +3374,9 @@ def test_update_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tuned_model] = ( + mock_rpc + ) request = {} client.update_tuned_model(request) @@ -3764,9 +3760,9 @@ def test_delete_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tuned_model] = ( + mock_rpc + ) request = {} client.delete_tuned_model(request) @@ -4531,9 +4527,9 @@ def test_list_tuned_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tuned_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tuned_models] = ( + mock_rpc + ) request = {} client.list_tuned_models(request) @@ -4692,9 +4688,9 @@ def test_create_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tuned_model] = ( + mock_rpc + ) request = {} client.create_tuned_model(request) @@ -4879,9 +4875,9 @@ def test_update_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tuned_model] = ( + mock_rpc + ) request = {} client.update_tuned_model(request) @@ -5068,9 +5064,9 @@ def test_delete_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tuned_model] = ( + mock_rpc + ) request = {} client.delete_tuned_model(request) @@ -5727,8 +5723,9 @@ def test_get_model_rest_bad_request(request_type=model_service.GetModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5815,17 +5812,19 @@ def test_get_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_get_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_get_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_get_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_model_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_get_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5874,8 +5873,9 @@ def test_list_models_rest_bad_request(request_type=model_service.ListModelsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5938,17 +5938,19 @@ def test_list_models_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_list_models" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_list_models_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_list_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_models" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_models_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_list_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6003,8 +6005,9 @@ def test_get_tuned_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6082,17 +6085,19 @@ def test_get_tuned_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_get_tuned_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_get_tuned_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_get_tuned_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_tuned_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_tuned_model_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_get_tuned_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6145,8 +6150,9 @@ def test_list_tuned_models_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6209,17 +6215,20 @@ def test_list_tuned_models_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_list_tuned_models" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_list_tuned_models_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_list_tuned_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_tuned_models" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, + "post_list_tuned_models_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_list_tuned_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6277,8 +6286,9 @@ def test_create_tuned_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6448,19 +6458,21 @@ def test_create_tuned_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_create_tuned_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_create_tuned_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_create_tuned_model" - ) as pre: + 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.ModelServiceRestInterceptor, "post_create_tuned_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, + "post_create_tuned_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_create_tuned_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6513,8 +6525,9 @@ def test_update_tuned_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6705,17 +6718,20 @@ def test_update_tuned_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_update_tuned_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_update_tuned_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_update_tuned_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_update_tuned_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, + "post_update_tuned_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_update_tuned_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6768,8 +6784,9 @@ def test_delete_tuned_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6826,13 +6843,13 @@ def test_delete_tuned_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "pre_delete_tuned_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_delete_tuned_model" + ) as pre, + ): pre.assert_not_called() pb_message = model_service.DeleteTunedModelRequest.pb( model_service.DeleteTunedModelRequest() @@ -6879,8 +6896,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6939,8 +6957,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7226,11 +7245,14 @@ def test_model_service_base_transport(): def test_model_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1alpha.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelServiceTransport( @@ -7247,9 +7269,12 @@ def test_model_service_base_transport_with_credentials_file(): def test_model_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1alpha.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelServiceTransport() @@ -7321,11 +7346,12 @@ def test_model_service_transport_auth_gdch_credentials(transport_class): def test_model_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_permission_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_permission_service.py index e343a7fb467c..ba5ba3cee793 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_permission_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_permission_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.permission_service import ( PermissionServiceAsyncClient, @@ -60,9 +65,8 @@ pagers, transports, ) +from google.ai.generativelanguage_v1alpha.types import permission, permission_service from google.ai.generativelanguage_v1alpha.types import permission as gag_permission -from google.ai.generativelanguage_v1alpha.types import permission -from google.ai.generativelanguage_v1alpha.types import permission_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -982,10 +986,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1033,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1071,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1320,13 +1321,13 @@ def test_permission_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1443,9 +1444,9 @@ def test_create_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_permission] = ( + mock_rpc + ) request = {} client.create_permission(request) @@ -2133,9 +2134,9 @@ def test_list_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permissions] = ( + mock_rpc + ) request = {} client.list_permissions(request) @@ -2659,9 +2660,9 @@ def test_update_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_permission] = ( + mock_rpc + ) request = {} client.update_permission(request) @@ -3012,9 +3013,9 @@ def test_delete_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_permission] = ( + mock_rpc + ) request = {} client.delete_permission(request) @@ -3344,9 +3345,9 @@ def test_transfer_ownership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_ownership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_ownership] = ( + mock_rpc + ) request = {} client.transfer_ownership(request) @@ -3527,9 +3528,9 @@ def test_create_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_permission] = ( + mock_rpc + ) request = {} client.create_permission(request) @@ -3894,9 +3895,9 @@ def test_list_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permissions] = ( + mock_rpc + ) request = {} client.list_permissions(request) @@ -4151,9 +4152,9 @@ def test_update_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_permission] = ( + mock_rpc + ) request = {} client.update_permission(request) @@ -4341,9 +4342,9 @@ def test_delete_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_permission] = ( + mock_rpc + ) request = {} client.delete_permission(request) @@ -4517,9 +4518,9 @@ def test_transfer_ownership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_ownership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_ownership] = ( + mock_rpc + ) request = {} client.transfer_ownership(request) @@ -5076,8 +5077,9 @@ def test_create_permission_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5219,18 +5221,20 @@ def test_create_permission_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_create_permission" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, - "post_create_permission_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_create_permission" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_create_permission" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_create_permission_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_create_permission" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5283,8 +5287,9 @@ def test_get_permission_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5353,17 +5358,20 @@ def test_get_permission_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_get_permission" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, "post_get_permission_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_get_permission" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_get_permission" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_get_permission_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_get_permission" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5416,8 +5424,9 @@ def test_list_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5480,18 +5489,20 @@ def test_list_permissions_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_list_permissions" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, - "post_list_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_list_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_list_permissions" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_list_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_list_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5549,8 +5560,9 @@ def test_update_permission_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5692,18 +5704,20 @@ def test_update_permission_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_update_permission" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, - "post_update_permission_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_update_permission" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_update_permission" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_update_permission_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_update_permission" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5756,8 +5770,9 @@ def test_delete_permission_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5814,13 +5829,13 @@ def test_delete_permission_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "pre_delete_permission" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_delete_permission" + ) as pre, + ): pre.assert_not_called() pb_message = permission_service.DeletePermissionRequest.pb( permission_service.DeletePermissionRequest() @@ -5865,8 +5880,9 @@ def test_transfer_ownership_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5926,18 +5942,20 @@ def test_transfer_ownership_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_transfer_ownership" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, - "post_transfer_ownership_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_transfer_ownership" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_transfer_ownership" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_transfer_ownership_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_transfer_ownership" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5997,8 +6015,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6057,8 +6076,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6301,11 +6321,14 @@ def test_permission_service_base_transport(): def test_permission_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1alpha.services.permission_service.transports.PermissionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.permission_service.transports.PermissionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PermissionServiceTransport( @@ -6322,9 +6345,12 @@ def test_permission_service_base_transport_with_credentials_file(): def test_permission_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1alpha.services.permission_service.transports.PermissionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.permission_service.transports.PermissionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PermissionServiceTransport() @@ -6396,11 +6422,12 @@ def test_permission_service_transport_auth_gdch_credentials(transport_class): def test_permission_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_prediction_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_prediction_service.py index 8d08dc86fae4..93ff4af959c3 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_prediction_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_prediction_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.prediction_service import ( PredictionServiceAsyncClient, @@ -979,10 +984,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1031,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1066,10 +1069,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1317,13 +1319,13 @@ def test_prediction_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2037,8 +2039,9 @@ def test_predict_rest_bad_request(request_type=prediction_service.PredictRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2098,17 +2101,19 @@ def test_predict_rest_interceptors(null_interceptor): ) client = PredictionServiceClient(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.PredictionServiceRestInterceptor, "post_predict" - ) as post, mock.patch.object( - transports.PredictionServiceRestInterceptor, "post_predict_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PredictionServiceRestInterceptor, "pre_predict" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "post_predict" + ) as post, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "post_predict_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "pre_predict" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2165,8 +2170,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2225,8 +2231,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2356,11 +2363,14 @@ def test_prediction_service_base_transport(): def test_prediction_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1alpha.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PredictionServiceTransport( @@ -2377,9 +2387,12 @@ def test_prediction_service_base_transport_with_credentials_file(): def test_prediction_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1alpha.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PredictionServiceTransport() @@ -2451,11 +2464,12 @@ def test_prediction_service_transport_auth_gdch_credentials(transport_class): def test_prediction_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_retriever_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_retriever_service.py index e4ea18966156..71b1627ce82b 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_retriever_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_retriever_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1alpha.services.retriever_service import ( RetrieverServiceAsyncClient, @@ -973,10 +978,9 @@ def test_retriever_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1025,9 @@ def test_retriever_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1063,9 @@ def test_retriever_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1311,13 +1313,13 @@ def test_retriever_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5644,9 +5646,9 @@ def test_batch_create_chunks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_chunks] = ( + mock_rpc + ) request = {} client.batch_create_chunks(request) @@ -6544,9 +6546,9 @@ def test_batch_update_chunks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_chunks] = ( + mock_rpc + ) request = {} client.batch_update_chunks(request) @@ -7105,9 +7107,9 @@ def test_batch_delete_chunks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_chunks] = ( + mock_rpc + ) request = {} client.batch_delete_chunks(request) @@ -10038,9 +10040,9 @@ def test_batch_create_chunks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_chunks] = ( + mock_rpc + ) request = {} client.batch_create_chunks(request) @@ -10521,9 +10523,9 @@ def test_batch_update_chunks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_chunks] = ( + mock_rpc + ) request = {} client.batch_update_chunks(request) @@ -10813,9 +10815,9 @@ def test_batch_delete_chunks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_chunks] = ( + mock_rpc + ) request = {} client.batch_delete_chunks(request) @@ -12257,8 +12259,9 @@ def test_create_corpus_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12396,17 +12399,20 @@ def test_create_corpus_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_create_corpus" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_create_corpus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_create_corpus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_create_corpus" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_create_corpus_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_create_corpus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12457,8 +12463,9 @@ def test_get_corpus_rest_bad_request(request_type=retriever_service.GetCorpusReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12523,17 +12530,19 @@ def test_get_corpus_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_get_corpus" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_get_corpus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_get_corpus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_get_corpus" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_get_corpus_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_get_corpus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12586,8 +12595,9 @@ def test_update_corpus_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12725,17 +12735,20 @@ def test_update_corpus_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_update_corpus" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_update_corpus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_update_corpus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_update_corpus" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_update_corpus_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_update_corpus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12788,8 +12801,9 @@ def test_delete_corpus_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12846,13 +12860,13 @@ def test_delete_corpus_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "pre_delete_corpus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_delete_corpus" + ) as pre, + ): pre.assert_not_called() pb_message = retriever_service.DeleteCorpusRequest.pb( retriever_service.DeleteCorpusRequest() @@ -12897,8 +12911,9 @@ def test_list_corpora_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12961,17 +12976,20 @@ def test_list_corpora_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_list_corpora" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_list_corpora_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_list_corpora" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_list_corpora" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_list_corpora_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_list_corpora" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13029,8 +13047,9 @@ def test_query_corpus_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13090,17 +13109,20 @@ def test_query_corpus_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_query_corpus" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_query_corpus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_query_corpus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_query_corpus" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_query_corpus_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_query_corpus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13158,8 +13180,9 @@ def test_create_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13305,17 +13328,20 @@ def test_create_document_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_create_document" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_create_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_create_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_create_document" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_create_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_create_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13368,8 +13394,9 @@ def test_get_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13434,17 +13461,20 @@ def test_get_document_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_get_document" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_get_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_get_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_get_document" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_get_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_get_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13497,8 +13527,9 @@ def test_update_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13644,17 +13675,20 @@ def test_update_document_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_update_document" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_update_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_update_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_update_document" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_update_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_update_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13707,8 +13741,9 @@ def test_delete_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13765,13 +13800,13 @@ def test_delete_document_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "pre_delete_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_delete_document" + ) as pre, + ): pre.assert_not_called() pb_message = retriever_service.DeleteDocumentRequest.pb( retriever_service.DeleteDocumentRequest() @@ -13816,8 +13851,9 @@ def test_list_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13880,17 +13916,20 @@ def test_list_documents_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_list_documents" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_list_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_list_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_list_documents" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_list_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_list_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13948,8 +13987,9 @@ def test_query_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14009,17 +14049,20 @@ def test_query_document_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_query_document" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_query_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_query_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_query_document" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_query_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_query_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14077,8 +14120,9 @@ def test_create_chunk_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14225,17 +14269,20 @@ def test_create_chunk_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_create_chunk" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_create_chunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_create_chunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_create_chunk" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_create_chunk_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_create_chunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14288,8 +14335,9 @@ def test_batch_create_chunks_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14349,18 +14397,20 @@ def test_batch_create_chunks_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_batch_create_chunks" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, - "post_batch_create_chunks_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_batch_create_chunks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_batch_create_chunks" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_batch_create_chunks_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_batch_create_chunks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14416,8 +14466,9 @@ def test_get_chunk_rest_bad_request(request_type=retriever_service.GetChunkReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14482,17 +14533,19 @@ def test_get_chunk_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_get_chunk" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_get_chunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_get_chunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_get_chunk" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_get_chunk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_get_chunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14547,8 +14600,9 @@ def test_update_chunk_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14697,17 +14751,20 @@ def test_update_chunk_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_update_chunk" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_update_chunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_update_chunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_update_chunk" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_update_chunk_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_update_chunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14760,8 +14817,9 @@ def test_batch_update_chunks_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14821,18 +14879,20 @@ def test_batch_update_chunks_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_batch_update_chunks" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, - "post_batch_update_chunks_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_batch_update_chunks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_batch_update_chunks" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_batch_update_chunks_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_batch_update_chunks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14890,8 +14950,9 @@ def test_delete_chunk_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14948,13 +15009,13 @@ def test_delete_chunk_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "pre_delete_chunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_delete_chunk" + ) as pre, + ): pre.assert_not_called() pb_message = retriever_service.DeleteChunkRequest.pb( retriever_service.DeleteChunkRequest() @@ -14999,8 +15060,9 @@ def test_batch_delete_chunks_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15057,13 +15119,13 @@ def test_batch_delete_chunks_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "pre_batch_delete_chunks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_batch_delete_chunks" + ) as pre, + ): pre.assert_not_called() pb_message = retriever_service.BatchDeleteChunksRequest.pb( retriever_service.BatchDeleteChunksRequest() @@ -15106,8 +15168,9 @@ def test_list_chunks_rest_bad_request(request_type=retriever_service.ListChunksR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15170,17 +15233,19 @@ def test_list_chunks_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_list_chunks" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_list_chunks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_list_chunks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_list_chunks" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_list_chunks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_list_chunks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15240,8 +15305,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15300,8 +15366,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15836,11 +15903,14 @@ def test_retriever_service_base_transport(): def test_retriever_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1alpha.services.retriever_service.transports.RetrieverServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.retriever_service.transports.RetrieverServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RetrieverServiceTransport( @@ -15857,9 +15927,12 @@ def test_retriever_service_base_transport_with_credentials_file(): def test_retriever_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1alpha.services.retriever_service.transports.RetrieverServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.retriever_service.transports.RetrieverServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RetrieverServiceTransport() @@ -15931,11 +16004,12 @@ def test_retriever_service_transport_auth_gdch_credentials(transport_class): def test_retriever_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_text_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_text_service.py index e81d012be3d7..0edb1aefb1aa 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_text_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1alpha/test_text_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -922,10 +927,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -970,10 +974,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1009,10 +1012,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1241,13 +1243,13 @@ def test_text_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2047,9 +2049,9 @@ def test_batch_embed_text_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_text - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_text] = ( + mock_rpc + ) request = {} client.batch_embed_text(request) @@ -2383,9 +2385,9 @@ def test_count_text_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_text_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_text_tokens] = ( + mock_rpc + ) request = {} client.count_text_tokens(request) @@ -3038,9 +3040,9 @@ def test_batch_embed_text_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_text - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_text] = ( + mock_rpc + ) request = {} client.batch_embed_text(request) @@ -3220,9 +3222,9 @@ def test_count_text_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_text_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_text_tokens] = ( + mock_rpc + ) request = {} client.count_text_tokens(request) @@ -3715,8 +3717,9 @@ def test_generate_text_rest_bad_request(request_type=text_service.GenerateTextRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3776,17 +3779,19 @@ def test_generate_text_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_generate_text" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_generate_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_generate_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_generate_text" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_generate_text_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_generate_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3839,8 +3844,9 @@ def test_embed_text_rest_bad_request(request_type=text_service.EmbedTextRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3900,17 +3906,19 @@ def test_embed_text_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_embed_text" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_embed_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_embed_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_embed_text" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_embed_text_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_embed_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3963,8 +3971,9 @@ def test_batch_embed_text_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4024,17 +4033,19 @@ def test_batch_embed_text_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_batch_embed_text" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_batch_embed_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_batch_embed_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_batch_embed_text" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_batch_embed_text_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_batch_embed_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4092,8 +4103,9 @@ def test_count_text_tokens_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4156,17 +4168,20 @@ def test_count_text_tokens_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_count_text_tokens" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_count_text_tokens_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_count_text_tokens" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_count_text_tokens" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, + "post_count_text_tokens_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_count_text_tokens" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4226,8 +4241,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4286,8 +4302,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4482,11 +4499,14 @@ def test_text_service_base_transport(): def test_text_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1alpha.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TextServiceTransport( @@ -4503,9 +4523,12 @@ def test_text_service_base_transport_with_credentials_file(): def test_text_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1alpha.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1alpha.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TextServiceTransport() @@ -4577,11 +4600,12 @@ def test_text_service_transport_auth_gdch_credentials(transport_class): def test_text_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_cache_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_cache_service.py index 9b9cc7d0fdae..a12df9233087 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_cache_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_cache_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,21 +43,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.cache_service import ( CacheServiceAsyncClient, @@ -65,12 +70,14 @@ pagers, transports, ) +from google.ai.generativelanguage_v1beta.types import ( + cache_service, + cached_content, + content, +) from google.ai.generativelanguage_v1beta.types import ( cached_content as gag_cached_content, ) -from google.ai.generativelanguage_v1beta.types import cache_service -from google.ai.generativelanguage_v1beta.types import cached_content -from google.ai.generativelanguage_v1beta.types import content CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -938,10 +945,9 @@ def test_cache_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +992,9 @@ def test_cache_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1030,9 @@ def test_cache_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1267,13 +1271,13 @@ def test_cache_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1386,9 +1390,9 @@ def test_list_cached_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cached_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cached_contents] = ( + mock_rpc + ) request = {} client.list_cached_contents(request) @@ -1777,9 +1781,9 @@ def test_create_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_cached_content] = ( + mock_rpc + ) request = {} client.create_cached_content(request) @@ -2074,9 +2078,9 @@ def test_get_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cached_content] = ( + mock_rpc + ) request = {} client.get_cached_content(request) @@ -2420,9 +2424,9 @@ def test_update_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cached_content] = ( + mock_rpc + ) request = {} client.update_cached_content(request) @@ -2786,9 +2790,9 @@ def test_delete_cached_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cached_content] = ( + mock_rpc + ) request = {} client.delete_cached_content(request) @@ -3051,9 +3055,9 @@ def test_list_cached_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cached_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cached_contents] = ( + mock_rpc + ) request = {} client.list_cached_contents(request) @@ -3155,9 +3159,9 @@ def test_create_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_cached_content] = ( + mock_rpc + ) request = {} client.create_cached_content(request) @@ -3335,9 +3339,9 @@ def test_get_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cached_content] = ( + mock_rpc + ) request = {} client.get_cached_content(request) @@ -3516,9 +3520,9 @@ def test_update_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cached_content] = ( + mock_rpc + ) request = {} client.update_cached_content(request) @@ -3702,9 +3706,9 @@ def test_delete_cached_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cached_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cached_content] = ( + mock_rpc + ) request = {} client.delete_cached_content(request) @@ -4254,8 +4258,9 @@ def test_list_cached_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4318,18 +4323,20 @@ def test_list_cached_contents_rest_interceptors(null_interceptor): ) client = CacheServiceClient(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.CacheServiceRestInterceptor, "post_list_cached_contents" - ) as post, mock.patch.object( - transports.CacheServiceRestInterceptor, - "post_list_cached_contents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CacheServiceRestInterceptor, "pre_list_cached_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CacheServiceRestInterceptor, "post_list_cached_contents" + ) as post, + mock.patch.object( + transports.CacheServiceRestInterceptor, + "post_list_cached_contents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CacheServiceRestInterceptor, "pre_list_cached_contents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4387,8 +4394,9 @@ def test_create_cached_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4663,18 +4671,20 @@ def test_create_cached_content_rest_interceptors(null_interceptor): ) client = CacheServiceClient(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.CacheServiceRestInterceptor, "post_create_cached_content" - ) as post, mock.patch.object( - transports.CacheServiceRestInterceptor, - "post_create_cached_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CacheServiceRestInterceptor, "pre_create_cached_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CacheServiceRestInterceptor, "post_create_cached_content" + ) as post, + mock.patch.object( + transports.CacheServiceRestInterceptor, + "post_create_cached_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CacheServiceRestInterceptor, "pre_create_cached_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4729,8 +4739,9 @@ def test_get_cached_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4797,17 +4808,20 @@ def test_get_cached_content_rest_interceptors(null_interceptor): ) client = CacheServiceClient(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.CacheServiceRestInterceptor, "post_get_cached_content" - ) as post, mock.patch.object( - transports.CacheServiceRestInterceptor, "post_get_cached_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CacheServiceRestInterceptor, "pre_get_cached_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CacheServiceRestInterceptor, "post_get_cached_content" + ) as post, + mock.patch.object( + transports.CacheServiceRestInterceptor, + "post_get_cached_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CacheServiceRestInterceptor, "pre_get_cached_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4862,8 +4876,9 @@ def test_update_cached_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5138,18 +5153,20 @@ def test_update_cached_content_rest_interceptors(null_interceptor): ) client = CacheServiceClient(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.CacheServiceRestInterceptor, "post_update_cached_content" - ) as post, mock.patch.object( - transports.CacheServiceRestInterceptor, - "post_update_cached_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CacheServiceRestInterceptor, "pre_update_cached_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CacheServiceRestInterceptor, "post_update_cached_content" + ) as post, + mock.patch.object( + transports.CacheServiceRestInterceptor, + "post_update_cached_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CacheServiceRestInterceptor, "pre_update_cached_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5204,8 +5221,9 @@ def test_delete_cached_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5262,13 +5280,13 @@ def test_delete_cached_content_rest_interceptors(null_interceptor): ) client = CacheServiceClient(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.CacheServiceRestInterceptor, "pre_delete_cached_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CacheServiceRestInterceptor, "pre_delete_cached_content" + ) as pre, + ): pre.assert_not_called() pb_message = cache_service.DeleteCachedContentRequest.pb( cache_service.DeleteCachedContentRequest() @@ -5313,8 +5331,9 @@ def test_cancel_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5373,8 +5392,9 @@ def test_delete_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5435,8 +5455,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5495,8 +5516,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5722,11 +5744,14 @@ def test_cache_service_base_transport(): def test_cache_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta.services.cache_service.transports.CacheServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta.services.cache_service.transports.CacheServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CacheServiceTransport( @@ -5743,9 +5768,12 @@ def test_cache_service_base_transport_with_credentials_file(): def test_cache_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta.services.cache_service.transports.CacheServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta.services.cache_service.transports.CacheServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CacheServiceTransport() @@ -5817,11 +5845,12 @@ def test_cache_service_transport_auth_gdch_credentials(transport_class): def test_cache_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_discuss_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_discuss_service.py index 66c1560a06ea..e2c0d9ab9099 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_discuss_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_discuss_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -945,10 +950,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +997,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1035,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1278,13 +1280,13 @@ def test_discuss_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1388,9 +1390,9 @@ def test_generate_message_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -1758,9 +1760,9 @@ def test_count_message_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) @@ -2040,9 +2042,9 @@ def test_generate_message_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -2240,9 +2242,9 @@ def test_count_message_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) @@ -2645,8 +2647,9 @@ def test_generate_message_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2706,17 +2709,20 @@ def test_generate_message_rest_interceptors(null_interceptor): ) client = DiscussServiceClient(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.DiscussServiceRestInterceptor, "post_generate_message" - ) as post, mock.patch.object( - transports.DiscussServiceRestInterceptor, "post_generate_message_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DiscussServiceRestInterceptor, "pre_generate_message" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "post_generate_message" + ) as post, + mock.patch.object( + transports.DiscussServiceRestInterceptor, + "post_generate_message_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "pre_generate_message" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2774,8 +2780,9 @@ def test_count_message_tokens_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2838,18 +2845,20 @@ def test_count_message_tokens_rest_interceptors(null_interceptor): ) client = DiscussServiceClient(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.DiscussServiceRestInterceptor, "post_count_message_tokens" - ) as post, mock.patch.object( - transports.DiscussServiceRestInterceptor, - "post_count_message_tokens_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DiscussServiceRestInterceptor, "pre_count_message_tokens" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "post_count_message_tokens" + ) as post, + mock.patch.object( + transports.DiscussServiceRestInterceptor, + "post_count_message_tokens_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "pre_count_message_tokens" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2907,8 +2916,9 @@ def test_cancel_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2967,8 +2977,9 @@ def test_delete_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3029,8 +3040,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3089,8 +3101,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3245,11 +3258,14 @@ def test_discuss_service_base_transport(): def test_discuss_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiscussServiceTransport( @@ -3266,9 +3282,12 @@ def test_discuss_service_base_transport_with_credentials_file(): def test_discuss_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiscussServiceTransport() @@ -3340,11 +3359,12 @@ def test_discuss_service_transport_auth_gdch_credentials(transport_class): def test_discuss_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_file_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_file_service.py index 604d0e367a65..5cc1c7594d6f 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_file_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_file_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.file_service import ( FileServiceAsyncClient, @@ -927,10 +932,9 @@ def test_file_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_file_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_file_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1246,13 +1248,13 @@ def test_file_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3818,8 +3820,9 @@ def test_create_file_rest_bad_request(request_type=file_service.CreateFileReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3879,17 +3882,19 @@ def test_create_file_rest_interceptors(null_interceptor): ) client = FileServiceClient(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.FileServiceRestInterceptor, "post_create_file" - ) as post, mock.patch.object( - transports.FileServiceRestInterceptor, "post_create_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FileServiceRestInterceptor, "pre_create_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_create_file" + ) as post, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_create_file_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FileServiceRestInterceptor, "pre_create_file" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3940,8 +3945,9 @@ def test_list_files_rest_bad_request(request_type=file_service.ListFilesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4004,17 +4010,19 @@ def test_list_files_rest_interceptors(null_interceptor): ) client = FileServiceClient(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.FileServiceRestInterceptor, "post_list_files" - ) as post, mock.patch.object( - transports.FileServiceRestInterceptor, "post_list_files_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FileServiceRestInterceptor, "pre_list_files" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_list_files" + ) as post, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_list_files_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FileServiceRestInterceptor, "pre_list_files" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4065,8 +4073,9 @@ def test_get_file_rest_bad_request(request_type=file_service.GetFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4145,17 +4154,17 @@ def test_get_file_rest_interceptors(null_interceptor): ) client = FileServiceClient(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.FileServiceRestInterceptor, "post_get_file" - ) as post, mock.patch.object( - transports.FileServiceRestInterceptor, "post_get_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FileServiceRestInterceptor, "pre_get_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_get_file" + ) as post, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_get_file_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FileServiceRestInterceptor, "pre_get_file") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4204,8 +4213,9 @@ def test_delete_file_rest_bad_request(request_type=file_service.DeleteFileReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4262,13 +4272,13 @@ def test_delete_file_rest_interceptors(null_interceptor): ) client = FileServiceClient(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.FileServiceRestInterceptor, "pre_delete_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FileServiceRestInterceptor, "pre_delete_file" + ) as pre, + ): pre.assert_not_called() pb_message = file_service.DeleteFileRequest.pb(file_service.DeleteFileRequest()) transcode.return_value = { @@ -4309,8 +4319,9 @@ def test_download_file_rest_bad_request(request_type=file_service.DownloadFileRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4370,17 +4381,19 @@ def test_download_file_rest_interceptors(null_interceptor): ) client = FileServiceClient(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.FileServiceRestInterceptor, "post_download_file" - ) as post, mock.patch.object( - transports.FileServiceRestInterceptor, "post_download_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FileServiceRestInterceptor, "pre_download_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_download_file" + ) as post, + mock.patch.object( + transports.FileServiceRestInterceptor, "post_download_file_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FileServiceRestInterceptor, "pre_download_file" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4435,8 +4448,9 @@ def test_cancel_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4495,8 +4509,9 @@ def test_delete_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4557,8 +4572,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4617,8 +4633,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4834,11 +4851,14 @@ def test_file_service_base_transport(): def test_file_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta.services.file_service.transports.FileServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta.services.file_service.transports.FileServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FileServiceTransport( @@ -4855,9 +4875,12 @@ def test_file_service_base_transport_with_credentials_file(): def test_file_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta.services.file_service.transports.FileServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta.services.file_service.transports.FileServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FileServiceTransport() @@ -4929,11 +4952,12 @@ def test_file_service_transport_auth_gdch_credentials(transport_class): def test_file_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_generative_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_generative_service.py index 4f7850c9d30f..ccd04219048e 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_generative_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_generative_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.generative_service import ( GenerativeServiceAsyncClient, @@ -64,11 +69,11 @@ transports, ) from google.ai.generativelanguage_v1beta.types import ( + content, generative_service, retriever, safety, ) -from google.ai.generativelanguage_v1beta.types import content from google.ai.generativelanguage_v1beta.types import content as gag_content CRED_INFO_JSON = { @@ -989,10 +994,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1041,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1079,9 @@ def test_generative_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1327,13 +1329,13 @@ def test_generative_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1444,9 +1446,9 @@ def test_generate_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_content] = ( + mock_rpc + ) request = {} client.generate_content(request) @@ -2839,9 +2841,9 @@ def test_batch_embed_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_contents] = ( + mock_rpc + ) request = {} client.batch_embed_contents(request) @@ -3496,9 +3498,9 @@ def test_bidi_generate_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.bidi_generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.bidi_generate_content] = ( + mock_rpc + ) request = [{}] client.bidi_generate_content(request) @@ -3616,9 +3618,9 @@ def test_generate_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_content] = ( + mock_rpc + ) request = {} client.generate_content(request) @@ -4395,9 +4397,9 @@ def test_batch_embed_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_contents] = ( + mock_rpc + ) request = {} client.batch_embed_contents(request) @@ -5200,8 +5202,9 @@ def test_generate_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5266,18 +5269,20 @@ def test_generate_content_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_generate_content" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, - "post_generate_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_generate_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_generate_content" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_generate_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_generate_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5335,8 +5340,9 @@ def test_generate_answer_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5399,18 +5405,20 @@ def test_generate_answer_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_generate_answer" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, - "post_generate_answer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_generate_answer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_generate_answer" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_generate_answer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_generate_answer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5468,8 +5476,9 @@ def test_stream_generate_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5538,18 +5547,20 @@ def test_stream_generate_content_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_stream_generate_content" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, - "post_stream_generate_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_stream_generate_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_stream_generate_content" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_stream_generate_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_stream_generate_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5607,8 +5618,9 @@ def test_embed_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5668,17 +5680,20 @@ def test_embed_content_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_embed_content" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "post_embed_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_embed_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_embed_content" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_embed_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_embed_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5736,8 +5751,9 @@ def test_batch_embed_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5797,18 +5813,20 @@ def test_batch_embed_contents_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_batch_embed_contents" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, - "post_batch_embed_contents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_batch_embed_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_batch_embed_contents" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_batch_embed_contents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_batch_embed_contents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5866,8 +5884,9 @@ def test_count_tokens_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5932,17 +5951,20 @@ def test_count_tokens_rest_interceptors(null_interceptor): ) client = GenerativeServiceClient(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.GenerativeServiceRestInterceptor, "post_count_tokens" - ) as post, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "post_count_tokens_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GenerativeServiceRestInterceptor, "pre_count_tokens" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "post_count_tokens" + ) as post, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, + "post_count_tokens_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GenerativeServiceRestInterceptor, "pre_count_tokens" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6012,8 +6034,9 @@ def test_cancel_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6072,8 +6095,9 @@ def test_delete_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6134,8 +6158,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6194,8 +6219,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6437,11 +6463,14 @@ def test_generative_service_base_transport(): def test_generative_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta.services.generative_service.transports.GenerativeServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta.services.generative_service.transports.GenerativeServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GenerativeServiceTransport( @@ -6458,9 +6487,12 @@ def test_generative_service_base_transport_with_credentials_file(): def test_generative_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta.services.generative_service.transports.GenerativeServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta.services.generative_service.transports.GenerativeServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GenerativeServiceTransport() @@ -6532,11 +6564,12 @@ def test_generative_service_transport_auth_gdch_credentials(transport_class): def test_generative_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_model_service.py index 296bfd337f4a..d9ff66f49f00 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_model_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.model_service import ( ModelServiceAsyncClient, @@ -70,9 +70,8 @@ pagers, transports, ) +from google.ai.generativelanguage_v1beta.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta.types import model, model_service -from google.ai.generativelanguage_v1beta.types import tuned_model CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -940,10 +939,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +986,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1024,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1269,13 +1265,13 @@ def test_model_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2572,9 +2568,9 @@ def test_list_tuned_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tuned_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tuned_models] = ( + mock_rpc + ) request = {} client.list_tuned_models(request) @@ -3054,9 +3050,9 @@ def test_create_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tuned_model] = ( + mock_rpc + ) request = {} client.create_tuned_model(request) @@ -3382,9 +3378,9 @@ def test_update_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tuned_model] = ( + mock_rpc + ) request = {} client.update_tuned_model(request) @@ -3768,9 +3764,9 @@ def test_delete_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tuned_model] = ( + mock_rpc + ) request = {} client.delete_tuned_model(request) @@ -4535,9 +4531,9 @@ def test_list_tuned_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tuned_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tuned_models] = ( + mock_rpc + ) request = {} client.list_tuned_models(request) @@ -4696,9 +4692,9 @@ def test_create_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tuned_model] = ( + mock_rpc + ) request = {} client.create_tuned_model(request) @@ -4883,9 +4879,9 @@ def test_update_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tuned_model] = ( + mock_rpc + ) request = {} client.update_tuned_model(request) @@ -5072,9 +5068,9 @@ def test_delete_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tuned_model] = ( + mock_rpc + ) request = {} client.delete_tuned_model(request) @@ -5732,8 +5728,9 @@ def test_get_model_rest_bad_request(request_type=model_service.GetModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5822,17 +5819,19 @@ def test_get_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_get_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_get_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_get_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_model_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_get_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5881,8 +5880,9 @@ def test_list_models_rest_bad_request(request_type=model_service.ListModelsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5945,17 +5945,19 @@ def test_list_models_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_list_models" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_list_models_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_list_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_models" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_models_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_list_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6010,8 +6012,9 @@ def test_get_tuned_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6089,17 +6092,19 @@ def test_get_tuned_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_get_tuned_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_get_tuned_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_get_tuned_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_tuned_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_tuned_model_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_get_tuned_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6152,8 +6157,9 @@ def test_list_tuned_models_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6216,17 +6222,20 @@ def test_list_tuned_models_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_list_tuned_models" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_list_tuned_models_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_list_tuned_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_tuned_models" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, + "post_list_tuned_models_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_list_tuned_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6284,8 +6293,9 @@ def test_create_tuned_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6446,19 +6456,21 @@ def test_create_tuned_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_create_tuned_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_create_tuned_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_create_tuned_model" - ) as pre: + 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.ModelServiceRestInterceptor, "post_create_tuned_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, + "post_create_tuned_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_create_tuned_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6511,8 +6523,9 @@ def test_update_tuned_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6694,17 +6707,20 @@ def test_update_tuned_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_update_tuned_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_update_tuned_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_update_tuned_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_update_tuned_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, + "post_update_tuned_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_update_tuned_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6757,8 +6773,9 @@ def test_delete_tuned_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6815,13 +6832,13 @@ def test_delete_tuned_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "pre_delete_tuned_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_delete_tuned_model" + ) as pre, + ): pre.assert_not_called() pb_message = model_service.DeleteTunedModelRequest.pb( model_service.DeleteTunedModelRequest() @@ -6866,8 +6883,9 @@ def test_cancel_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6926,8 +6944,9 @@ def test_delete_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6988,8 +7007,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7048,8 +7068,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7337,11 +7358,14 @@ def test_model_service_base_transport(): def test_model_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelServiceTransport( @@ -7358,9 +7382,12 @@ def test_model_service_base_transport_with_credentials_file(): def test_model_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelServiceTransport() @@ -7432,11 +7459,12 @@ def test_model_service_transport_auth_gdch_credentials(transport_class): def test_model_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_permission_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_permission_service.py index 1059c4602d78..6eaaa94e2494 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_permission_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_permission_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.permission_service import ( PermissionServiceAsyncClient, @@ -60,9 +65,8 @@ pagers, transports, ) +from google.ai.generativelanguage_v1beta.types import permission, permission_service from google.ai.generativelanguage_v1beta.types import permission as gag_permission -from google.ai.generativelanguage_v1beta.types import permission -from google.ai.generativelanguage_v1beta.types import permission_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -982,10 +986,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1033,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1071,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1320,13 +1321,13 @@ def test_permission_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1443,9 +1444,9 @@ def test_create_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_permission] = ( + mock_rpc + ) request = {} client.create_permission(request) @@ -2133,9 +2134,9 @@ def test_list_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permissions] = ( + mock_rpc + ) request = {} client.list_permissions(request) @@ -2659,9 +2660,9 @@ def test_update_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_permission] = ( + mock_rpc + ) request = {} client.update_permission(request) @@ -3012,9 +3013,9 @@ def test_delete_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_permission] = ( + mock_rpc + ) request = {} client.delete_permission(request) @@ -3344,9 +3345,9 @@ def test_transfer_ownership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_ownership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_ownership] = ( + mock_rpc + ) request = {} client.transfer_ownership(request) @@ -3527,9 +3528,9 @@ def test_create_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_permission] = ( + mock_rpc + ) request = {} client.create_permission(request) @@ -3894,9 +3895,9 @@ def test_list_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permissions] = ( + mock_rpc + ) request = {} client.list_permissions(request) @@ -4151,9 +4152,9 @@ def test_update_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_permission] = ( + mock_rpc + ) request = {} client.update_permission(request) @@ -4341,9 +4342,9 @@ def test_delete_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_permission] = ( + mock_rpc + ) request = {} client.delete_permission(request) @@ -4517,9 +4518,9 @@ def test_transfer_ownership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_ownership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_ownership] = ( + mock_rpc + ) request = {} client.transfer_ownership(request) @@ -5076,8 +5077,9 @@ def test_create_permission_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5219,18 +5221,20 @@ def test_create_permission_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_create_permission" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, - "post_create_permission_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_create_permission" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_create_permission" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_create_permission_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_create_permission" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5283,8 +5287,9 @@ def test_get_permission_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5353,17 +5358,20 @@ def test_get_permission_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_get_permission" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, "post_get_permission_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_get_permission" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_get_permission" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_get_permission_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_get_permission" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5416,8 +5424,9 @@ def test_list_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5480,18 +5489,20 @@ def test_list_permissions_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_list_permissions" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, - "post_list_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_list_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_list_permissions" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_list_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_list_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5549,8 +5560,9 @@ def test_update_permission_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5692,18 +5704,20 @@ def test_update_permission_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_update_permission" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, - "post_update_permission_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_update_permission" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_update_permission" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_update_permission_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_update_permission" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5756,8 +5770,9 @@ def test_delete_permission_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5814,13 +5829,13 @@ def test_delete_permission_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "pre_delete_permission" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_delete_permission" + ) as pre, + ): pre.assert_not_called() pb_message = permission_service.DeletePermissionRequest.pb( permission_service.DeletePermissionRequest() @@ -5865,8 +5880,9 @@ def test_transfer_ownership_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5926,18 +5942,20 @@ def test_transfer_ownership_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_transfer_ownership" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, - "post_transfer_ownership_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_transfer_ownership" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_transfer_ownership" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_transfer_ownership_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_transfer_ownership" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5995,8 +6013,9 @@ def test_cancel_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6055,8 +6074,9 @@ def test_delete_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6117,8 +6137,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6177,8 +6198,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6423,11 +6445,14 @@ def test_permission_service_base_transport(): def test_permission_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta.services.permission_service.transports.PermissionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta.services.permission_service.transports.PermissionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PermissionServiceTransport( @@ -6444,9 +6469,12 @@ def test_permission_service_base_transport_with_credentials_file(): def test_permission_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta.services.permission_service.transports.PermissionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta.services.permission_service.transports.PermissionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PermissionServiceTransport() @@ -6518,11 +6546,12 @@ def test_permission_service_transport_auth_gdch_credentials(transport_class): def test_permission_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_prediction_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_prediction_service.py index 87dfad1cad8c..c9efe4fb267c 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_prediction_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_prediction_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,16 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.prediction_service import ( PredictionServiceAsyncClient, @@ -988,10 +988,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1035,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1075,10 +1073,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1326,13 +1323,13 @@ def test_prediction_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1767,9 +1764,9 @@ def test_predict_long_running_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.predict_long_running - ] = mock_rpc + client._transport._wrapped_methods[client._transport.predict_long_running] = ( + mock_rpc + ) request = {} client.predict_long_running(request) @@ -2243,9 +2240,9 @@ def test_predict_long_running_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.predict_long_running - ] = mock_rpc + client._transport._wrapped_methods[client._transport.predict_long_running] = ( + mock_rpc + ) request = {} client.predict_long_running(request) @@ -2643,8 +2640,9 @@ def test_predict_rest_bad_request(request_type=prediction_service.PredictRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2704,17 +2702,19 @@ def test_predict_rest_interceptors(null_interceptor): ) client = PredictionServiceClient(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.PredictionServiceRestInterceptor, "post_predict" - ) as post, mock.patch.object( - transports.PredictionServiceRestInterceptor, "post_predict_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PredictionServiceRestInterceptor, "pre_predict" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "post_predict" + ) as post, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "post_predict_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "pre_predict" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2769,8 +2769,9 @@ def test_predict_long_running_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2827,20 +2828,21 @@ def test_predict_long_running_rest_interceptors(null_interceptor): ) client = PredictionServiceClient(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.PredictionServiceRestInterceptor, "post_predict_long_running" - ) as post, mock.patch.object( - transports.PredictionServiceRestInterceptor, - "post_predict_long_running_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PredictionServiceRestInterceptor, "pre_predict_long_running" - ) as pre: + 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.PredictionServiceRestInterceptor, "post_predict_long_running" + ) as post, + mock.patch.object( + transports.PredictionServiceRestInterceptor, + "post_predict_long_running_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "pre_predict_long_running" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2893,8 +2895,9 @@ def test_cancel_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2953,8 +2956,9 @@ def test_delete_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3015,8 +3019,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3075,8 +3080,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3253,11 +3259,14 @@ def test_prediction_service_base_transport(): def test_prediction_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PredictionServiceTransport( @@ -3274,9 +3283,12 @@ def test_prediction_service_base_transport_with_credentials_file(): def test_prediction_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PredictionServiceTransport() @@ -3348,11 +3360,12 @@ def test_prediction_service_transport_auth_gdch_credentials(transport_class): def test_prediction_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_retriever_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_retriever_service.py index 21a8eb0be139..b2fd699b3d92 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_retriever_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_retriever_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta.services.retriever_service import ( RetrieverServiceAsyncClient, @@ -973,10 +978,9 @@ def test_retriever_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1025,9 @@ def test_retriever_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1063,9 @@ def test_retriever_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1311,13 +1313,13 @@ def test_retriever_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5644,9 +5646,9 @@ def test_batch_create_chunks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_chunks] = ( + mock_rpc + ) request = {} client.batch_create_chunks(request) @@ -6544,9 +6546,9 @@ def test_batch_update_chunks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_chunks] = ( + mock_rpc + ) request = {} client.batch_update_chunks(request) @@ -7105,9 +7107,9 @@ def test_batch_delete_chunks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_chunks] = ( + mock_rpc + ) request = {} client.batch_delete_chunks(request) @@ -10038,9 +10040,9 @@ def test_batch_create_chunks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_chunks] = ( + mock_rpc + ) request = {} client.batch_create_chunks(request) @@ -10521,9 +10523,9 @@ def test_batch_update_chunks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_chunks] = ( + mock_rpc + ) request = {} client.batch_update_chunks(request) @@ -10813,9 +10815,9 @@ def test_batch_delete_chunks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_chunks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_chunks] = ( + mock_rpc + ) request = {} client.batch_delete_chunks(request) @@ -12257,8 +12259,9 @@ def test_create_corpus_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12396,17 +12399,20 @@ def test_create_corpus_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_create_corpus" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_create_corpus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_create_corpus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_create_corpus" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_create_corpus_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_create_corpus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12457,8 +12463,9 @@ def test_get_corpus_rest_bad_request(request_type=retriever_service.GetCorpusReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12523,17 +12530,19 @@ def test_get_corpus_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_get_corpus" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_get_corpus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_get_corpus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_get_corpus" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_get_corpus_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_get_corpus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12586,8 +12595,9 @@ def test_update_corpus_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12725,17 +12735,20 @@ def test_update_corpus_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_update_corpus" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_update_corpus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_update_corpus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_update_corpus" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_update_corpus_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_update_corpus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12788,8 +12801,9 @@ def test_delete_corpus_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12846,13 +12860,13 @@ def test_delete_corpus_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "pre_delete_corpus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_delete_corpus" + ) as pre, + ): pre.assert_not_called() pb_message = retriever_service.DeleteCorpusRequest.pb( retriever_service.DeleteCorpusRequest() @@ -12897,8 +12911,9 @@ def test_list_corpora_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12961,17 +12976,20 @@ def test_list_corpora_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_list_corpora" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_list_corpora_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_list_corpora" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_list_corpora" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_list_corpora_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_list_corpora" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13029,8 +13047,9 @@ def test_query_corpus_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13090,17 +13109,20 @@ def test_query_corpus_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_query_corpus" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_query_corpus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_query_corpus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_query_corpus" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_query_corpus_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_query_corpus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13158,8 +13180,9 @@ def test_create_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13305,17 +13328,20 @@ def test_create_document_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_create_document" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_create_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_create_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_create_document" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_create_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_create_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13368,8 +13394,9 @@ def test_get_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13434,17 +13461,20 @@ def test_get_document_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_get_document" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_get_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_get_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_get_document" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_get_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_get_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13497,8 +13527,9 @@ def test_update_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13644,17 +13675,20 @@ def test_update_document_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_update_document" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_update_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_update_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_update_document" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_update_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_update_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13707,8 +13741,9 @@ def test_delete_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13765,13 +13800,13 @@ def test_delete_document_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "pre_delete_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_delete_document" + ) as pre, + ): pre.assert_not_called() pb_message = retriever_service.DeleteDocumentRequest.pb( retriever_service.DeleteDocumentRequest() @@ -13816,8 +13851,9 @@ def test_list_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13880,17 +13916,20 @@ def test_list_documents_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_list_documents" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_list_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_list_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_list_documents" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_list_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_list_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13948,8 +13987,9 @@ def test_query_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14009,17 +14049,20 @@ def test_query_document_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_query_document" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_query_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_query_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_query_document" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_query_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_query_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14077,8 +14120,9 @@ def test_create_chunk_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14225,17 +14269,20 @@ def test_create_chunk_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_create_chunk" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_create_chunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_create_chunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_create_chunk" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_create_chunk_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_create_chunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14288,8 +14335,9 @@ def test_batch_create_chunks_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14349,18 +14397,20 @@ def test_batch_create_chunks_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_batch_create_chunks" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, - "post_batch_create_chunks_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_batch_create_chunks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_batch_create_chunks" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_batch_create_chunks_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_batch_create_chunks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14416,8 +14466,9 @@ def test_get_chunk_rest_bad_request(request_type=retriever_service.GetChunkReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14482,17 +14533,19 @@ def test_get_chunk_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_get_chunk" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_get_chunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_get_chunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_get_chunk" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_get_chunk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_get_chunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14547,8 +14600,9 @@ def test_update_chunk_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14697,17 +14751,20 @@ def test_update_chunk_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_update_chunk" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_update_chunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_update_chunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_update_chunk" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_update_chunk_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_update_chunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14760,8 +14817,9 @@ def test_batch_update_chunks_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14821,18 +14879,20 @@ def test_batch_update_chunks_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_batch_update_chunks" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, - "post_batch_update_chunks_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_batch_update_chunks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_batch_update_chunks" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, + "post_batch_update_chunks_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_batch_update_chunks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14890,8 +14950,9 @@ def test_delete_chunk_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14948,13 +15009,13 @@ def test_delete_chunk_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "pre_delete_chunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_delete_chunk" + ) as pre, + ): pre.assert_not_called() pb_message = retriever_service.DeleteChunkRequest.pb( retriever_service.DeleteChunkRequest() @@ -14999,8 +15060,9 @@ def test_batch_delete_chunks_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15057,13 +15119,13 @@ def test_batch_delete_chunks_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "pre_batch_delete_chunks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_batch_delete_chunks" + ) as pre, + ): pre.assert_not_called() pb_message = retriever_service.BatchDeleteChunksRequest.pb( retriever_service.BatchDeleteChunksRequest() @@ -15106,8 +15168,9 @@ def test_list_chunks_rest_bad_request(request_type=retriever_service.ListChunksR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15170,17 +15233,19 @@ def test_list_chunks_rest_interceptors(null_interceptor): ) client = RetrieverServiceClient(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.RetrieverServiceRestInterceptor, "post_list_chunks" - ) as post, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "post_list_chunks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RetrieverServiceRestInterceptor, "pre_list_chunks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_list_chunks" + ) as post, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "post_list_chunks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RetrieverServiceRestInterceptor, "pre_list_chunks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15238,8 +15303,9 @@ def test_cancel_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15298,8 +15364,9 @@ def test_delete_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15360,8 +15427,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15420,8 +15488,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15958,11 +16027,14 @@ def test_retriever_service_base_transport(): def test_retriever_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta.services.retriever_service.transports.RetrieverServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta.services.retriever_service.transports.RetrieverServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RetrieverServiceTransport( @@ -15979,9 +16051,12 @@ def test_retriever_service_base_transport_with_credentials_file(): def test_retriever_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta.services.retriever_service.transports.RetrieverServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta.services.retriever_service.transports.RetrieverServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RetrieverServiceTransport() @@ -16053,11 +16128,12 @@ def test_retriever_service_transport_auth_gdch_credentials(transport_class): def test_retriever_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_text_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_text_service.py index ec6d6293b0b2..6f71b4810a55 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_text_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta/test_text_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -922,10 +927,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -970,10 +974,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1009,10 +1012,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1241,13 +1243,13 @@ def test_text_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2047,9 +2049,9 @@ def test_batch_embed_text_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_text - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_text] = ( + mock_rpc + ) request = {} client.batch_embed_text(request) @@ -2383,9 +2385,9 @@ def test_count_text_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_text_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_text_tokens] = ( + mock_rpc + ) request = {} client.count_text_tokens(request) @@ -3038,9 +3040,9 @@ def test_batch_embed_text_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_text - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_text] = ( + mock_rpc + ) request = {} client.batch_embed_text(request) @@ -3220,9 +3222,9 @@ def test_count_text_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_text_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_text_tokens] = ( + mock_rpc + ) request = {} client.count_text_tokens(request) @@ -3715,8 +3717,9 @@ def test_generate_text_rest_bad_request(request_type=text_service.GenerateTextRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3776,17 +3779,19 @@ def test_generate_text_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_generate_text" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_generate_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_generate_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_generate_text" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_generate_text_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_generate_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3839,8 +3844,9 @@ def test_embed_text_rest_bad_request(request_type=text_service.EmbedTextRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3900,17 +3906,19 @@ def test_embed_text_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_embed_text" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_embed_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_embed_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_embed_text" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_embed_text_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_embed_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3963,8 +3971,9 @@ def test_batch_embed_text_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4024,17 +4033,19 @@ def test_batch_embed_text_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_batch_embed_text" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_batch_embed_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_batch_embed_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_batch_embed_text" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_batch_embed_text_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_batch_embed_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4092,8 +4103,9 @@ def test_count_text_tokens_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4156,17 +4168,20 @@ def test_count_text_tokens_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_count_text_tokens" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_count_text_tokens_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_count_text_tokens" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_count_text_tokens" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, + "post_count_text_tokens_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_count_text_tokens" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4224,8 +4239,9 @@ def test_cancel_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4284,8 +4300,9 @@ def test_delete_operation_rest_bad_request( request = json_format.ParseDict({"name": "batches/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4346,8 +4363,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4406,8 +4424,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "tunedModels/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4604,11 +4623,14 @@ def test_text_service_base_transport(): def test_text_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TextServiceTransport( @@ -4625,9 +4647,12 @@ def test_text_service_base_transport_with_credentials_file(): def test_text_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TextServiceTransport() @@ -4699,11 +4724,12 @@ def test_text_service_transport_auth_gdch_credentials(transport_class): def test_text_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_discuss_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_discuss_service.py index eb7277fb24cf..b49e0ace8240 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_discuss_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_discuss_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -944,10 +949,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -992,10 +996,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1034,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1277,13 +1279,13 @@ def test_discuss_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1387,9 +1389,9 @@ def test_generate_message_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -1757,9 +1759,9 @@ def test_count_message_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) @@ -2039,9 +2041,9 @@ def test_generate_message_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -2239,9 +2241,9 @@ def test_count_message_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) @@ -2644,8 +2646,9 @@ def test_generate_message_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2705,17 +2708,20 @@ def test_generate_message_rest_interceptors(null_interceptor): ) client = DiscussServiceClient(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.DiscussServiceRestInterceptor, "post_generate_message" - ) as post, mock.patch.object( - transports.DiscussServiceRestInterceptor, "post_generate_message_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DiscussServiceRestInterceptor, "pre_generate_message" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "post_generate_message" + ) as post, + mock.patch.object( + transports.DiscussServiceRestInterceptor, + "post_generate_message_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "pre_generate_message" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2773,8 +2779,9 @@ def test_count_message_tokens_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2837,18 +2844,20 @@ def test_count_message_tokens_rest_interceptors(null_interceptor): ) client = DiscussServiceClient(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.DiscussServiceRestInterceptor, "post_count_message_tokens" - ) as post, mock.patch.object( - transports.DiscussServiceRestInterceptor, - "post_count_message_tokens_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DiscussServiceRestInterceptor, "pre_count_message_tokens" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "post_count_message_tokens" + ) as post, + mock.patch.object( + transports.DiscussServiceRestInterceptor, + "post_count_message_tokens_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "pre_count_message_tokens" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2998,11 +3007,14 @@ def test_discuss_service_base_transport(): def test_discuss_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta2.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta2.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiscussServiceTransport( @@ -3019,9 +3031,12 @@ def test_discuss_service_base_transport_with_credentials_file(): def test_discuss_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta2.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta2.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiscussServiceTransport() @@ -3093,11 +3108,12 @@ def test_discuss_service_transport_auth_gdch_credentials(transport_class): def test_discuss_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_model_service.py index a383fe0e232c..6ef1987d5123 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_model_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -926,10 +931,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -974,10 +978,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1013,10 +1016,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1255,13 +1257,13 @@ def test_model_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2678,8 +2680,9 @@ def test_get_model_rest_bad_request(request_type=model_service.GetModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2764,17 +2767,19 @@ def test_get_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_get_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_get_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_get_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_model_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_get_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2823,8 +2828,9 @@ def test_list_models_rest_bad_request(request_type=model_service.ListModelsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2887,17 +2893,19 @@ def test_list_models_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_list_models" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_list_models_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_list_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_models" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_models_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_list_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3042,11 +3050,14 @@ def test_model_service_base_transport(): def test_model_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta2.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta2.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelServiceTransport( @@ -3063,9 +3074,12 @@ def test_model_service_base_transport_with_credentials_file(): def test_model_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta2.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta2.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelServiceTransport() @@ -3137,11 +3151,12 @@ def test_model_service_transport_auth_gdch_credentials(transport_class): def test_model_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_text_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_text_service.py index 6068c1eeea3c..60eb38548d62 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_text_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta2/test_text_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -921,10 +926,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,13 +1242,13 @@ def test_text_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2578,8 +2580,9 @@ def test_generate_text_rest_bad_request(request_type=text_service.GenerateTextRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2639,17 +2642,19 @@ def test_generate_text_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_generate_text" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_generate_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_generate_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_generate_text" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_generate_text_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_generate_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2702,8 +2707,9 @@ def test_embed_text_rest_bad_request(request_type=text_service.EmbedTextRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2763,17 +2769,19 @@ def test_embed_text_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_embed_text" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_embed_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_embed_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_embed_text" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_embed_text_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_embed_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2916,11 +2924,14 @@ def test_text_service_base_transport(): def test_text_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta2.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta2.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TextServiceTransport( @@ -2937,9 +2948,12 @@ def test_text_service_base_transport_with_credentials_file(): def test_text_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta2.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta2.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TextServiceTransport() @@ -3011,11 +3025,12 @@ def test_text_service_transport_auth_gdch_credentials(transport_class): def test_text_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_discuss_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_discuss_service.py index f48aaa042386..abfd0def780c 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_discuss_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_discuss_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -945,10 +950,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +997,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1035,9 @@ def test_discuss_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1278,13 +1280,13 @@ def test_discuss_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1388,9 +1390,9 @@ def test_generate_message_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -1758,9 +1760,9 @@ def test_count_message_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) @@ -2040,9 +2042,9 @@ def test_generate_message_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_message] = ( + mock_rpc + ) request = {} client.generate_message(request) @@ -2240,9 +2242,9 @@ def test_count_message_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_message_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_message_tokens] = ( + mock_rpc + ) request = {} client.count_message_tokens(request) @@ -2645,8 +2647,9 @@ def test_generate_message_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2706,17 +2709,20 @@ def test_generate_message_rest_interceptors(null_interceptor): ) client = DiscussServiceClient(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.DiscussServiceRestInterceptor, "post_generate_message" - ) as post, mock.patch.object( - transports.DiscussServiceRestInterceptor, "post_generate_message_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DiscussServiceRestInterceptor, "pre_generate_message" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "post_generate_message" + ) as post, + mock.patch.object( + transports.DiscussServiceRestInterceptor, + "post_generate_message_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "pre_generate_message" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2774,8 +2780,9 @@ def test_count_message_tokens_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2838,18 +2845,20 @@ def test_count_message_tokens_rest_interceptors(null_interceptor): ) client = DiscussServiceClient(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.DiscussServiceRestInterceptor, "post_count_message_tokens" - ) as post, mock.patch.object( - transports.DiscussServiceRestInterceptor, - "post_count_message_tokens_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DiscussServiceRestInterceptor, "pre_count_message_tokens" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "post_count_message_tokens" + ) as post, + mock.patch.object( + transports.DiscussServiceRestInterceptor, + "post_count_message_tokens_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DiscussServiceRestInterceptor, "pre_count_message_tokens" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2999,11 +3008,14 @@ def test_discuss_service_base_transport(): def test_discuss_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta3.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta3.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiscussServiceTransport( @@ -3020,9 +3032,12 @@ def test_discuss_service_base_transport_with_credentials_file(): def test_discuss_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta3.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta3.services.discuss_service.transports.DiscussServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiscussServiceTransport() @@ -3094,11 +3109,12 @@ def test_discuss_service_transport_auth_gdch_credentials(transport_class): def test_discuss_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_model_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_model_service.py index 5b55a4badee1..31d8dc8e106e 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_model_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_model_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.ai.generativelanguage_v1beta3.services.model_service import ( ModelServiceAsyncClient, @@ -70,9 +70,8 @@ pagers, transports, ) +from google.ai.generativelanguage_v1beta3.types import model, model_service, tuned_model from google.ai.generativelanguage_v1beta3.types import tuned_model as gag_tuned_model -from google.ai.generativelanguage_v1beta3.types import model, model_service -from google.ai.generativelanguage_v1beta3.types import tuned_model CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -940,10 +939,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +986,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1024,9 @@ def test_model_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1269,13 +1265,13 @@ def test_model_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2558,9 +2554,9 @@ def test_list_tuned_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tuned_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tuned_models] = ( + mock_rpc + ) request = {} client.list_tuned_models(request) @@ -3040,9 +3036,9 @@ def test_create_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tuned_model] = ( + mock_rpc + ) request = {} client.create_tuned_model(request) @@ -3366,9 +3362,9 @@ def test_update_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tuned_model] = ( + mock_rpc + ) request = {} client.update_tuned_model(request) @@ -3750,9 +3746,9 @@ def test_delete_tuned_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tuned_model] = ( + mock_rpc + ) request = {} client.delete_tuned_model(request) @@ -4517,9 +4513,9 @@ def test_list_tuned_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tuned_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tuned_models] = ( + mock_rpc + ) request = {} client.list_tuned_models(request) @@ -4678,9 +4674,9 @@ def test_create_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tuned_model] = ( + mock_rpc + ) request = {} client.create_tuned_model(request) @@ -4865,9 +4861,9 @@ def test_update_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tuned_model] = ( + mock_rpc + ) request = {} client.update_tuned_model(request) @@ -5062,9 +5058,9 @@ def test_delete_tuned_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tuned_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tuned_model] = ( + mock_rpc + ) request = {} client.delete_tuned_model(request) @@ -5718,8 +5714,9 @@ def test_get_model_rest_bad_request(request_type=model_service.GetModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5804,17 +5801,19 @@ def test_get_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_get_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_get_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_get_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_model_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_get_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5863,8 +5862,9 @@ def test_list_models_rest_bad_request(request_type=model_service.ListModelsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5927,17 +5927,19 @@ def test_list_models_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_list_models" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_list_models_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_list_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_models" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_models_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_list_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5992,8 +5994,9 @@ def test_get_tuned_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6069,17 +6072,19 @@ def test_get_tuned_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_get_tuned_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_get_tuned_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_get_tuned_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_tuned_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_get_tuned_model_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_get_tuned_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6132,8 +6137,9 @@ def test_list_tuned_models_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6196,17 +6202,20 @@ def test_list_tuned_models_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_list_tuned_models" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_list_tuned_models_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_list_tuned_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_list_tuned_models" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, + "post_list_tuned_models_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_list_tuned_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6264,8 +6273,9 @@ def test_create_tuned_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6424,19 +6434,21 @@ def test_create_tuned_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_create_tuned_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_create_tuned_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_create_tuned_model" - ) as pre: + 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.ModelServiceRestInterceptor, "post_create_tuned_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, + "post_create_tuned_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_create_tuned_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6489,8 +6501,9 @@ def test_update_tuned_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6668,17 +6681,20 @@ def test_update_tuned_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "post_update_tuned_model" - ) as post, mock.patch.object( - transports.ModelServiceRestInterceptor, "post_update_tuned_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelServiceRestInterceptor, "pre_update_tuned_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "post_update_tuned_model" + ) as post, + mock.patch.object( + transports.ModelServiceRestInterceptor, + "post_update_tuned_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_update_tuned_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6731,8 +6747,9 @@ def test_delete_tuned_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6789,13 +6806,13 @@ def test_delete_tuned_model_rest_interceptors(null_interceptor): ) client = ModelServiceClient(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.ModelServiceRestInterceptor, "pre_delete_tuned_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelServiceRestInterceptor, "pre_delete_tuned_model" + ) as pre, + ): pre.assert_not_called() pb_message = model_service.DeleteTunedModelRequest.pb( model_service.DeleteTunedModelRequest() @@ -7065,11 +7082,14 @@ def test_model_service_base_transport(): def test_model_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta3.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta3.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelServiceTransport( @@ -7086,9 +7106,12 @@ def test_model_service_base_transport_with_credentials_file(): def test_model_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta3.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta3.services.model_service.transports.ModelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelServiceTransport() @@ -7160,11 +7183,12 @@ def test_model_service_transport_auth_gdch_credentials(transport_class): def test_model_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_permission_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_permission_service.py index d57108d001ec..9d1d0524797f 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_permission_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_permission_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.ai.generativelanguage_v1beta3.services.permission_service import ( PermissionServiceAsyncClient, @@ -60,9 +65,8 @@ pagers, transports, ) +from google.ai.generativelanguage_v1beta3.types import permission, permission_service from google.ai.generativelanguage_v1beta3.types import permission as gag_permission -from google.ai.generativelanguage_v1beta3.types import permission -from google.ai.generativelanguage_v1beta3.types import permission_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -982,10 +986,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1033,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1071,9 @@ def test_permission_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1320,13 +1321,13 @@ def test_permission_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1443,9 +1444,9 @@ def test_create_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_permission] = ( + mock_rpc + ) request = {} client.create_permission(request) @@ -2133,9 +2134,9 @@ def test_list_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permissions] = ( + mock_rpc + ) request = {} client.list_permissions(request) @@ -2659,9 +2660,9 @@ def test_update_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_permission] = ( + mock_rpc + ) request = {} client.update_permission(request) @@ -3012,9 +3013,9 @@ def test_delete_permission_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_permission] = ( + mock_rpc + ) request = {} client.delete_permission(request) @@ -3344,9 +3345,9 @@ def test_transfer_ownership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_ownership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_ownership] = ( + mock_rpc + ) request = {} client.transfer_ownership(request) @@ -3527,9 +3528,9 @@ def test_create_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_permission] = ( + mock_rpc + ) request = {} client.create_permission(request) @@ -3894,9 +3895,9 @@ def test_list_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_permissions] = ( + mock_rpc + ) request = {} client.list_permissions(request) @@ -4151,9 +4152,9 @@ def test_update_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_permission] = ( + mock_rpc + ) request = {} client.update_permission(request) @@ -4341,9 +4342,9 @@ def test_delete_permission_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_permission - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_permission] = ( + mock_rpc + ) request = {} client.delete_permission(request) @@ -4517,9 +4518,9 @@ def test_transfer_ownership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_ownership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_ownership] = ( + mock_rpc + ) request = {} client.transfer_ownership(request) @@ -5076,8 +5077,9 @@ def test_create_permission_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5219,18 +5221,20 @@ def test_create_permission_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_create_permission" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, - "post_create_permission_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_create_permission" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_create_permission" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_create_permission_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_create_permission" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5283,8 +5287,9 @@ def test_get_permission_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5353,17 +5358,20 @@ def test_get_permission_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_get_permission" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, "post_get_permission_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_get_permission" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_get_permission" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_get_permission_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_get_permission" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5416,8 +5424,9 @@ def test_list_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5480,18 +5489,20 @@ def test_list_permissions_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_list_permissions" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, - "post_list_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_list_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_list_permissions" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_list_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_list_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5549,8 +5560,9 @@ def test_update_permission_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5692,18 +5704,20 @@ def test_update_permission_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_update_permission" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, - "post_update_permission_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_update_permission" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_update_permission" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_update_permission_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_update_permission" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5756,8 +5770,9 @@ def test_delete_permission_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5814,13 +5829,13 @@ def test_delete_permission_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "pre_delete_permission" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_delete_permission" + ) as pre, + ): pre.assert_not_called() pb_message = permission_service.DeletePermissionRequest.pb( permission_service.DeletePermissionRequest() @@ -5865,8 +5880,9 @@ def test_transfer_ownership_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5926,18 +5942,20 @@ def test_transfer_ownership_rest_interceptors(null_interceptor): ) client = PermissionServiceClient(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.PermissionServiceRestInterceptor, "post_transfer_ownership" - ) as post, mock.patch.object( - transports.PermissionServiceRestInterceptor, - "post_transfer_ownership_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PermissionServiceRestInterceptor, "pre_transfer_ownership" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "post_transfer_ownership" + ) as post, + mock.patch.object( + transports.PermissionServiceRestInterceptor, + "post_transfer_ownership_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PermissionServiceRestInterceptor, "pre_transfer_ownership" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6177,11 +6195,14 @@ def test_permission_service_base_transport(): def test_permission_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta3.services.permission_service.transports.PermissionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta3.services.permission_service.transports.PermissionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PermissionServiceTransport( @@ -6198,9 +6219,12 @@ def test_permission_service_base_transport_with_credentials_file(): def test_permission_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta3.services.permission_service.transports.PermissionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta3.services.permission_service.transports.PermissionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PermissionServiceTransport() @@ -6272,11 +6296,12 @@ def test_permission_service_transport_auth_gdch_credentials(transport_class): def test_permission_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_text_service.py b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_text_service.py index e552f0fa44e4..4ad9639e5bdf 100644 --- a/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_text_service.py +++ b/packages/google-ai-generativelanguage/tests/unit/gapic/generativelanguage_v1beta3/test_text_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -922,10 +927,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -970,10 +974,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1009,10 +1012,9 @@ def test_text_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1241,13 +1243,13 @@ def test_text_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2047,9 +2049,9 @@ def test_batch_embed_text_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_text - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_text] = ( + mock_rpc + ) request = {} client.batch_embed_text(request) @@ -2383,9 +2385,9 @@ def test_count_text_tokens_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_text_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_text_tokens] = ( + mock_rpc + ) request = {} client.count_text_tokens(request) @@ -3050,9 +3052,9 @@ def test_batch_embed_text_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_embed_text - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_embed_text] = ( + mock_rpc + ) request = {} client.batch_embed_text(request) @@ -3244,9 +3246,9 @@ def test_count_text_tokens_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.count_text_tokens - ] = mock_rpc + client._transport._wrapped_methods[client._transport.count_text_tokens] = ( + mock_rpc + ) request = {} client.count_text_tokens(request) @@ -3739,8 +3741,9 @@ def test_generate_text_rest_bad_request(request_type=text_service.GenerateTextRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3800,17 +3803,19 @@ def test_generate_text_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_generate_text" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_generate_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_generate_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_generate_text" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_generate_text_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_generate_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3863,8 +3868,9 @@ def test_embed_text_rest_bad_request(request_type=text_service.EmbedTextRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3924,17 +3930,19 @@ def test_embed_text_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_embed_text" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_embed_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_embed_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_embed_text" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_embed_text_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_embed_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3987,8 +3995,9 @@ def test_batch_embed_text_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4048,17 +4057,19 @@ def test_batch_embed_text_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_batch_embed_text" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_batch_embed_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_batch_embed_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_batch_embed_text" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_batch_embed_text_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_batch_embed_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4116,8 +4127,9 @@ def test_count_text_tokens_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4180,17 +4192,20 @@ def test_count_text_tokens_rest_interceptors(null_interceptor): ) client = TextServiceClient(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.TextServiceRestInterceptor, "post_count_text_tokens" - ) as post, mock.patch.object( - transports.TextServiceRestInterceptor, "post_count_text_tokens_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TextServiceRestInterceptor, "pre_count_text_tokens" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TextServiceRestInterceptor, "post_count_text_tokens" + ) as post, + mock.patch.object( + transports.TextServiceRestInterceptor, + "post_count_text_tokens_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TextServiceRestInterceptor, "pre_count_text_tokens" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4382,11 +4397,14 @@ def test_text_service_base_transport(): def test_text_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.ai.generativelanguage_v1beta3.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.ai.generativelanguage_v1beta3.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TextServiceTransport( @@ -4403,9 +4421,12 @@ def test_text_service_base_transport_with_credentials_file(): def test_text_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.ai.generativelanguage_v1beta3.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.ai.generativelanguage_v1beta3.services.text_service.transports.TextServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TextServiceTransport() @@ -4477,11 +4498,12 @@ def test_text_service_transport_auth_gdch_credentials(transport_class): def test_text_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-analytics-admin/docs/conf.py b/packages/google-analytics-admin/docs/conf.py index 2ed0309e3992..0d388d5a2017 100644 --- a/packages/google-analytics-admin/docs/conf.py +++ b/packages/google-analytics-admin/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-analytics-admin documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/__init__.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/__init__.py index fd5c93b15746..52535fd10219 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/__init__.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.analytics_admin_service import ( AnalyticsAdminServiceAsyncClient, AnalyticsAdminServiceClient, diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py index 4d367b9bebff..ad6ad39ace87 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.admin_v1alpha import gapic_version as package_version @@ -45,12 +45,23 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.analytics.admin_v1alpha.services.analytics_admin_service import pagers +from google.analytics.admin_v1alpha.types import ( + access_report, + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -58,14 +69,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import access_report, analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter from .client import AnalyticsAdminServiceClient from .transports.base import DEFAULT_CLIENT_INFO, AnalyticsAdminServiceTransport @@ -325,7 +328,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AnalyticsAdminServiceAsyncClient: The constructed client. """ - return AnalyticsAdminServiceClient.from_service_account_info.__func__(AnalyticsAdminServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AnalyticsAdminServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AnalyticsAdminServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -341,7 +345,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AnalyticsAdminServiceAsyncClient: The constructed client. """ - return AnalyticsAdminServiceClient.from_service_account_file.__func__(AnalyticsAdminServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AnalyticsAdminServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AnalyticsAdminServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -379,7 +384,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AnalyticsAdminServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AnalyticsAdminServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AnalyticsAdminServiceTransport: diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py index eb96ddc48852..64b553827f1b 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.admin_v1alpha import gapic_version as package_version @@ -61,12 +61,23 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.analytics.admin_v1alpha.services.analytics_admin_service import pagers +from google.analytics.admin_v1alpha.types import ( + access_report, + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -74,14 +85,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import access_report, analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter from .transports.base import DEFAULT_CLIENT_INFO, AnalyticsAdminServiceTransport from .transports.grpc import AnalyticsAdminServiceGrpcTransport @@ -97,9 +100,7 @@ class AnalyticsAdminServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AnalyticsAdminServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsAdminServiceTransport]] _transport_registry["grpc"] = AnalyticsAdminServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsAdminServiceGrpcAsyncIOTransport _transport_registry["rest"] = AnalyticsAdminServiceRestTransport @@ -1319,11 +1320,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AnalyticsAdminServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AnalyticsAdminServiceClient._read_environment_variables() + ) self._client_cert_source = AnalyticsAdminServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1358,8 +1357,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AnalyticsAdminServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/pagers.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/pagers.py index da5a1b136d58..20d832e29532 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/pagers.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/pagers.py @@ -75,7 +75,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -231,7 +231,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -307,7 +307,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -389,7 +389,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -465,7 +465,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -545,7 +545,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -621,7 +621,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -701,7 +701,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -777,7 +777,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -857,7 +857,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -935,7 +935,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1019,7 +1019,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1102,7 +1102,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1186,7 +1186,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1264,7 +1264,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1346,7 +1346,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1422,7 +1422,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1504,7 +1504,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1580,7 +1580,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1662,7 +1662,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1744,7 +1744,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1830,7 +1830,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1915,7 +1915,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2003,7 +2003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2079,7 +2079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2161,7 +2161,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2237,7 +2237,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2317,7 +2317,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2393,7 +2393,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2473,7 +2473,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2549,7 +2549,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2629,7 +2629,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2705,7 +2705,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2787,7 +2787,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2863,7 +2863,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2943,7 +2943,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3019,7 +3019,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3101,7 +3101,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3177,7 +3177,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3257,7 +3257,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3333,7 +3333,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3413,7 +3413,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3489,7 +3489,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3569,7 +3569,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3645,7 +3645,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3727,7 +3727,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3803,7 +3803,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3883,7 +3883,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3959,7 +3959,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -4041,7 +4041,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -4119,7 +4119,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -4201,7 +4201,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -4279,7 +4279,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -4363,7 +4363,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -4441,7 +4441,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -4523,7 +4523,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -4601,7 +4601,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/__init__.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/__init__.py index 36fdaad681d1..13b4fb2c6f02 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/__init__.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AnalyticsAdminServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsAdminServiceTransport]] _transport_registry["grpc"] = AnalyticsAdminServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsAdminServiceGrpcAsyncIOTransport _transport_registry["rest"] = AnalyticsAdminServiceRestTransport diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/base.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/base.py index 88a9cba9ed12..db8dc6f9f2b3 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/base.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/base.py @@ -17,16 +17,26 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.analytics.admin_v1alpha import gapic_version as package_version +from google.analytics.admin_v1alpha.types import ( + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -34,14 +44,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc.py index 39a5a58a683c..dd98c207c75a 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc.py @@ -16,19 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson +from google.analytics.admin_v1alpha.types import ( + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -36,14 +46,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter from .base import DEFAULT_CLIENT_INFO, AnalyticsAdminServiceTransport @@ -942,12 +944,12 @@ def get_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "get_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetMeasurementProtocolSecret", - request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["get_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetMeasurementProtocolSecret", + request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["get_measurement_protocol_secret"] @@ -975,12 +977,12 @@ def list_measurement_protocol_secrets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_measurement_protocol_secrets" not in self._stubs: - self._stubs[ - "list_measurement_protocol_secrets" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListMeasurementProtocolSecrets", - request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, - response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + self._stubs["list_measurement_protocol_secrets"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListMeasurementProtocolSecrets", + request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, + response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + ) ) return self._stubs["list_measurement_protocol_secrets"] @@ -1007,12 +1009,12 @@ def create_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "create_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateMeasurementProtocolSecret", - request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["create_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateMeasurementProtocolSecret", + request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["create_measurement_protocol_secret"] @@ -1038,12 +1040,12 @@ def delete_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "delete_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteMeasurementProtocolSecret", - request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteMeasurementProtocolSecret", + request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_measurement_protocol_secret"] @@ -1070,12 +1072,12 @@ def update_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "update_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateMeasurementProtocolSecret", - request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["update_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateMeasurementProtocolSecret", + request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["update_measurement_protocol_secret"] @@ -1106,12 +1108,12 @@ def acknowledge_user_data_collection( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "acknowledge_user_data_collection" not in self._stubs: - self._stubs[ - "acknowledge_user_data_collection" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/AcknowledgeUserDataCollection", - request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, - response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + self._stubs["acknowledge_user_data_collection"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/AcknowledgeUserDataCollection", + request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, + response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + ) ) return self._stubs["acknowledge_user_data_collection"] @@ -1138,12 +1140,12 @@ def get_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "get_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.GetSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + self._stubs["get_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.GetSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + ) ) return self._stubs["get_sk_ad_network_conversion_value_schema"] @@ -1170,12 +1172,12 @@ def create_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "create_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.CreateSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + self._stubs["create_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.CreateSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + ) ) return self._stubs["create_sk_ad_network_conversion_value_schema"] @@ -1201,12 +1203,12 @@ def delete_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "delete_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.DeleteSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.DeleteSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_sk_ad_network_conversion_value_schema"] @@ -1233,12 +1235,12 @@ def update_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "update_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.UpdateSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + self._stubs["update_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.UpdateSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + ) ) return self._stubs["update_sk_ad_network_conversion_value_schema"] @@ -1267,12 +1269,12 @@ def list_sk_ad_network_conversion_value_schemas( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_sk_ad_network_conversion_value_schemas" not in self._stubs: - self._stubs[ - "list_sk_ad_network_conversion_value_schemas" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSKAdNetworkConversionValueSchemas", - request_serializer=analytics_admin.ListSKAdNetworkConversionValueSchemasRequest.serialize, - response_deserializer=analytics_admin.ListSKAdNetworkConversionValueSchemasResponse.deserialize, + self._stubs["list_sk_ad_network_conversion_value_schemas"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSKAdNetworkConversionValueSchemas", + request_serializer=analytics_admin.ListSKAdNetworkConversionValueSchemasRequest.serialize, + response_deserializer=analytics_admin.ListSKAdNetworkConversionValueSchemasResponse.deserialize, + ) ) return self._stubs["list_sk_ad_network_conversion_value_schemas"] @@ -1302,12 +1304,12 @@ def search_change_history_events( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_change_history_events" not in self._stubs: - self._stubs[ - "search_change_history_events" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/SearchChangeHistoryEvents", - request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, - response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + self._stubs["search_change_history_events"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/SearchChangeHistoryEvents", + request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, + response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + ) ) return self._stubs["search_change_history_events"] @@ -1333,12 +1335,12 @@ def get_google_signals_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_google_signals_settings" not in self._stubs: - self._stubs[ - "get_google_signals_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetGoogleSignalsSettings", - request_serializer=analytics_admin.GetGoogleSignalsSettingsRequest.serialize, - response_deserializer=resources.GoogleSignalsSettings.deserialize, + self._stubs["get_google_signals_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetGoogleSignalsSettings", + request_serializer=analytics_admin.GetGoogleSignalsSettingsRequest.serialize, + response_deserializer=resources.GoogleSignalsSettings.deserialize, + ) ) return self._stubs["get_google_signals_settings"] @@ -1364,12 +1366,12 @@ def update_google_signals_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_google_signals_settings" not in self._stubs: - self._stubs[ - "update_google_signals_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateGoogleSignalsSettings", - request_serializer=analytics_admin.UpdateGoogleSignalsSettingsRequest.serialize, - response_deserializer=resources.GoogleSignalsSettings.deserialize, + self._stubs["update_google_signals_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateGoogleSignalsSettings", + request_serializer=analytics_admin.UpdateGoogleSignalsSettingsRequest.serialize, + response_deserializer=resources.GoogleSignalsSettings.deserialize, + ) ) return self._stubs["update_google_signals_settings"] @@ -1676,12 +1678,12 @@ def get_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "get_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + self._stubs["get_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + ) ) return self._stubs["get_display_video360_advertiser_link"] @@ -1709,12 +1711,12 @@ def list_display_video360_advertiser_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_display_video360_advertiser_links" not in self._stubs: - self._stubs[ - "list_display_video360_advertiser_links" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinks", - request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinksRequest.serialize, - response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinksResponse.deserialize, + self._stubs["list_display_video360_advertiser_links"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinks", + request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinksRequest.serialize, + response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinksResponse.deserialize, + ) ) return self._stubs["list_display_video360_advertiser_links"] @@ -1746,12 +1748,12 @@ def create_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "create_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + self._stubs["create_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + ) ) return self._stubs["create_display_video360_advertiser_link"] @@ -1778,12 +1780,12 @@ def delete_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "delete_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_display_video360_advertiser_link"] @@ -1811,12 +1813,12 @@ def update_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "update_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.UpdateDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + self._stubs["update_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.UpdateDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + ) ) return self._stubs["update_display_video360_advertiser_link"] @@ -1844,12 +1846,12 @@ def get_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "get_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + self._stubs["get_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + ) ) return self._stubs["get_display_video360_advertiser_link_proposal"] @@ -1877,12 +1879,12 @@ def list_display_video360_advertiser_link_proposals( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_display_video360_advertiser_link_proposals" not in self._stubs: - self._stubs[ - "list_display_video360_advertiser_link_proposals" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinkProposals", - request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsRequest.serialize, - response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsResponse.deserialize, + self._stubs["list_display_video360_advertiser_link_proposals"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinkProposals", + request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsRequest.serialize, + response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsResponse.deserialize, + ) ) return self._stubs["list_display_video360_advertiser_link_proposals"] @@ -1909,12 +1911,12 @@ def create_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "create_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + self._stubs["create_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + ) ) return self._stubs["create_display_video360_advertiser_link_proposal"] @@ -1942,12 +1944,12 @@ def delete_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "delete_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_display_video360_advertiser_link_proposal"] @@ -1977,12 +1979,12 @@ def approve_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "approve_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "approve_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ApproveDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalResponse.deserialize, + self._stubs["approve_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ApproveDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalResponse.deserialize, + ) ) return self._stubs["approve_display_video360_advertiser_link_proposal"] @@ -2016,12 +2018,12 @@ def cancel_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "cancel_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CancelDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.CancelDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + self._stubs["cancel_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CancelDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.CancelDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + ) ) return self._stubs["cancel_display_video360_advertiser_link_proposal"] @@ -2320,12 +2322,12 @@ def get_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_retention_settings" not in self._stubs: - self._stubs[ - "get_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRetentionSettings", - request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["get_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRetentionSettings", + request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["get_data_retention_settings"] @@ -2352,12 +2354,12 @@ def update_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_retention_settings" not in self._stubs: - self._stubs[ - "update_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRetentionSettings", - request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["update_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRetentionSettings", + request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["update_data_retention_settings"] @@ -2819,12 +2821,12 @@ def update_attribution_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_attribution_settings" not in self._stubs: - self._stubs[ - "update_attribution_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateAttributionSettings", - request_serializer=analytics_admin.UpdateAttributionSettingsRequest.serialize, - response_deserializer=resources.AttributionSettings.deserialize, + self._stubs["update_attribution_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateAttributionSettings", + request_serializer=analytics_admin.UpdateAttributionSettingsRequest.serialize, + response_deserializer=resources.AttributionSettings.deserialize, + ) ) return self._stubs["update_attribution_settings"] @@ -3041,12 +3043,12 @@ def batch_create_access_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_create_access_bindings" not in self._stubs: - self._stubs[ - "batch_create_access_bindings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchCreateAccessBindings", - request_serializer=analytics_admin.BatchCreateAccessBindingsRequest.serialize, - response_deserializer=analytics_admin.BatchCreateAccessBindingsResponse.deserialize, + self._stubs["batch_create_access_bindings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchCreateAccessBindings", + request_serializer=analytics_admin.BatchCreateAccessBindingsRequest.serialize, + response_deserializer=analytics_admin.BatchCreateAccessBindingsResponse.deserialize, + ) ) return self._stubs["batch_create_access_bindings"] @@ -3103,12 +3105,12 @@ def batch_update_access_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_access_bindings" not in self._stubs: - self._stubs[ - "batch_update_access_bindings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchUpdateAccessBindings", - request_serializer=analytics_admin.BatchUpdateAccessBindingsRequest.serialize, - response_deserializer=analytics_admin.BatchUpdateAccessBindingsResponse.deserialize, + self._stubs["batch_update_access_bindings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchUpdateAccessBindings", + request_serializer=analytics_admin.BatchUpdateAccessBindingsRequest.serialize, + response_deserializer=analytics_admin.BatchUpdateAccessBindingsResponse.deserialize, + ) ) return self._stubs["batch_update_access_bindings"] @@ -3132,12 +3134,12 @@ def batch_delete_access_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_delete_access_bindings" not in self._stubs: - self._stubs[ - "batch_delete_access_bindings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchDeleteAccessBindings", - request_serializer=analytics_admin.BatchDeleteAccessBindingsRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["batch_delete_access_bindings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchDeleteAccessBindings", + request_serializer=analytics_admin.BatchDeleteAccessBindingsRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["batch_delete_access_bindings"] @@ -3577,12 +3579,12 @@ def get_enhanced_measurement_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_enhanced_measurement_settings" not in self._stubs: - self._stubs[ - "get_enhanced_measurement_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetEnhancedMeasurementSettings", - request_serializer=analytics_admin.GetEnhancedMeasurementSettingsRequest.serialize, - response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + self._stubs["get_enhanced_measurement_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetEnhancedMeasurementSettings", + request_serializer=analytics_admin.GetEnhancedMeasurementSettingsRequest.serialize, + response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + ) ) return self._stubs["get_enhanced_measurement_settings"] @@ -3611,12 +3613,12 @@ def update_enhanced_measurement_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_enhanced_measurement_settings" not in self._stubs: - self._stubs[ - "update_enhanced_measurement_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateEnhancedMeasurementSettings", - request_serializer=analytics_admin.UpdateEnhancedMeasurementSettingsRequest.serialize, - response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + self._stubs["update_enhanced_measurement_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateEnhancedMeasurementSettings", + request_serializer=analytics_admin.UpdateEnhancedMeasurementSettingsRequest.serialize, + response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + ) ) return self._stubs["update_enhanced_measurement_settings"] @@ -4059,12 +4061,12 @@ def update_data_redaction_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_redaction_settings" not in self._stubs: - self._stubs[ - "update_data_redaction_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRedactionSettings", - request_serializer=analytics_admin.UpdateDataRedactionSettingsRequest.serialize, - response_deserializer=resources.DataRedactionSettings.deserialize, + self._stubs["update_data_redaction_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRedactionSettings", + request_serializer=analytics_admin.UpdateDataRedactionSettingsRequest.serialize, + response_deserializer=resources.DataRedactionSettings.deserialize, + ) ) return self._stubs["update_data_redaction_settings"] @@ -4090,12 +4092,12 @@ def get_data_redaction_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_redaction_settings" not in self._stubs: - self._stubs[ - "get_data_redaction_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRedactionSettings", - request_serializer=analytics_admin.GetDataRedactionSettingsRequest.serialize, - response_deserializer=resources.DataRedactionSettings.deserialize, + self._stubs["get_data_redaction_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRedactionSettings", + request_serializer=analytics_admin.GetDataRedactionSettingsRequest.serialize, + response_deserializer=resources.DataRedactionSettings.deserialize, + ) ) return self._stubs["get_data_redaction_settings"] @@ -4294,12 +4296,12 @@ def get_rollup_property_source_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_rollup_property_source_link" not in self._stubs: - self._stubs[ - "get_rollup_property_source_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetRollupPropertySourceLink", - request_serializer=analytics_admin.GetRollupPropertySourceLinkRequest.serialize, - response_deserializer=resources.RollupPropertySourceLink.deserialize, + self._stubs["get_rollup_property_source_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetRollupPropertySourceLink", + request_serializer=analytics_admin.GetRollupPropertySourceLinkRequest.serialize, + response_deserializer=resources.RollupPropertySourceLink.deserialize, + ) ) return self._stubs["get_rollup_property_source_link"] @@ -4329,12 +4331,12 @@ def list_rollup_property_source_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_rollup_property_source_links" not in self._stubs: - self._stubs[ - "list_rollup_property_source_links" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListRollupPropertySourceLinks", - request_serializer=analytics_admin.ListRollupPropertySourceLinksRequest.serialize, - response_deserializer=analytics_admin.ListRollupPropertySourceLinksResponse.deserialize, + self._stubs["list_rollup_property_source_links"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListRollupPropertySourceLinks", + request_serializer=analytics_admin.ListRollupPropertySourceLinksRequest.serialize, + response_deserializer=analytics_admin.ListRollupPropertySourceLinksResponse.deserialize, + ) ) return self._stubs["list_rollup_property_source_links"] @@ -4364,12 +4366,12 @@ def create_rollup_property_source_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_rollup_property_source_link" not in self._stubs: - self._stubs[ - "create_rollup_property_source_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateRollupPropertySourceLink", - request_serializer=analytics_admin.CreateRollupPropertySourceLinkRequest.serialize, - response_deserializer=resources.RollupPropertySourceLink.deserialize, + self._stubs["create_rollup_property_source_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateRollupPropertySourceLink", + request_serializer=analytics_admin.CreateRollupPropertySourceLinkRequest.serialize, + response_deserializer=resources.RollupPropertySourceLink.deserialize, + ) ) return self._stubs["create_rollup_property_source_link"] @@ -4398,12 +4400,12 @@ def delete_rollup_property_source_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_rollup_property_source_link" not in self._stubs: - self._stubs[ - "delete_rollup_property_source_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteRollupPropertySourceLink", - request_serializer=analytics_admin.DeleteRollupPropertySourceLinkRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_rollup_property_source_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteRollupPropertySourceLink", + request_serializer=analytics_admin.DeleteRollupPropertySourceLinkRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_rollup_property_source_link"] @@ -4460,12 +4462,12 @@ def create_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_subproperty_event_filter" not in self._stubs: - self._stubs[ - "create_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSubpropertyEventFilter", - request_serializer=analytics_admin.CreateSubpropertyEventFilterRequest.serialize, - response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + self._stubs["create_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSubpropertyEventFilter", + request_serializer=analytics_admin.CreateSubpropertyEventFilterRequest.serialize, + response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + ) ) return self._stubs["create_subproperty_event_filter"] @@ -4491,12 +4493,12 @@ def get_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_subproperty_event_filter" not in self._stubs: - self._stubs[ - "get_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertyEventFilter", - request_serializer=analytics_admin.GetSubpropertyEventFilterRequest.serialize, - response_deserializer=subproperty_event_filter.SubpropertyEventFilter.deserialize, + self._stubs["get_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertyEventFilter", + request_serializer=analytics_admin.GetSubpropertyEventFilterRequest.serialize, + response_deserializer=subproperty_event_filter.SubpropertyEventFilter.deserialize, + ) ) return self._stubs["get_subproperty_event_filter"] @@ -4522,12 +4524,12 @@ def list_subproperty_event_filters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_subproperty_event_filters" not in self._stubs: - self._stubs[ - "list_subproperty_event_filters" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertyEventFilters", - request_serializer=analytics_admin.ListSubpropertyEventFiltersRequest.serialize, - response_deserializer=analytics_admin.ListSubpropertyEventFiltersResponse.deserialize, + self._stubs["list_subproperty_event_filters"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertyEventFilters", + request_serializer=analytics_admin.ListSubpropertyEventFiltersRequest.serialize, + response_deserializer=analytics_admin.ListSubpropertyEventFiltersResponse.deserialize, + ) ) return self._stubs["list_subproperty_event_filters"] @@ -4554,12 +4556,12 @@ def update_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_subproperty_event_filter" not in self._stubs: - self._stubs[ - "update_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertyEventFilter", - request_serializer=analytics_admin.UpdateSubpropertyEventFilterRequest.serialize, - response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + self._stubs["update_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertyEventFilter", + request_serializer=analytics_admin.UpdateSubpropertyEventFilterRequest.serialize, + response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + ) ) return self._stubs["update_subproperty_event_filter"] @@ -4585,12 +4587,12 @@ def delete_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_subproperty_event_filter" not in self._stubs: - self._stubs[ - "delete_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSubpropertyEventFilter", - request_serializer=analytics_admin.DeleteSubpropertyEventFilterRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSubpropertyEventFilter", + request_serializer=analytics_admin.DeleteSubpropertyEventFilterRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_subproperty_event_filter"] @@ -4617,12 +4619,12 @@ def create_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_reporting_data_annotation" not in self._stubs: - self._stubs[ - "create_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateReportingDataAnnotation", - request_serializer=analytics_admin.CreateReportingDataAnnotationRequest.serialize, - response_deserializer=resources.ReportingDataAnnotation.deserialize, + self._stubs["create_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateReportingDataAnnotation", + request_serializer=analytics_admin.CreateReportingDataAnnotationRequest.serialize, + response_deserializer=resources.ReportingDataAnnotation.deserialize, + ) ) return self._stubs["create_reporting_data_annotation"] @@ -4648,12 +4650,12 @@ def get_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_reporting_data_annotation" not in self._stubs: - self._stubs[ - "get_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingDataAnnotation", - request_serializer=analytics_admin.GetReportingDataAnnotationRequest.serialize, - response_deserializer=resources.ReportingDataAnnotation.deserialize, + self._stubs["get_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingDataAnnotation", + request_serializer=analytics_admin.GetReportingDataAnnotationRequest.serialize, + response_deserializer=resources.ReportingDataAnnotation.deserialize, + ) ) return self._stubs["get_reporting_data_annotation"] @@ -4680,12 +4682,12 @@ def list_reporting_data_annotations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_reporting_data_annotations" not in self._stubs: - self._stubs[ - "list_reporting_data_annotations" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListReportingDataAnnotations", - request_serializer=analytics_admin.ListReportingDataAnnotationsRequest.serialize, - response_deserializer=analytics_admin.ListReportingDataAnnotationsResponse.deserialize, + self._stubs["list_reporting_data_annotations"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListReportingDataAnnotations", + request_serializer=analytics_admin.ListReportingDataAnnotationsRequest.serialize, + response_deserializer=analytics_admin.ListReportingDataAnnotationsResponse.deserialize, + ) ) return self._stubs["list_reporting_data_annotations"] @@ -4712,12 +4714,12 @@ def update_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_reporting_data_annotation" not in self._stubs: - self._stubs[ - "update_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateReportingDataAnnotation", - request_serializer=analytics_admin.UpdateReportingDataAnnotationRequest.serialize, - response_deserializer=resources.ReportingDataAnnotation.deserialize, + self._stubs["update_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateReportingDataAnnotation", + request_serializer=analytics_admin.UpdateReportingDataAnnotationRequest.serialize, + response_deserializer=resources.ReportingDataAnnotation.deserialize, + ) ) return self._stubs["update_reporting_data_annotation"] @@ -4743,12 +4745,12 @@ def delete_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_reporting_data_annotation" not in self._stubs: - self._stubs[ - "delete_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteReportingDataAnnotation", - request_serializer=analytics_admin.DeleteReportingDataAnnotationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteReportingDataAnnotation", + request_serializer=analytics_admin.DeleteReportingDataAnnotationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_reporting_data_annotation"] @@ -4803,12 +4805,12 @@ def list_subproperty_sync_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_subproperty_sync_configs" not in self._stubs: - self._stubs[ - "list_subproperty_sync_configs" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertySyncConfigs", - request_serializer=analytics_admin.ListSubpropertySyncConfigsRequest.serialize, - response_deserializer=analytics_admin.ListSubpropertySyncConfigsResponse.deserialize, + self._stubs["list_subproperty_sync_configs"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertySyncConfigs", + request_serializer=analytics_admin.ListSubpropertySyncConfigsRequest.serialize, + response_deserializer=analytics_admin.ListSubpropertySyncConfigsResponse.deserialize, + ) ) return self._stubs["list_subproperty_sync_configs"] @@ -4834,12 +4836,12 @@ def update_subproperty_sync_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_subproperty_sync_config" not in self._stubs: - self._stubs[ - "update_subproperty_sync_config" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertySyncConfig", - request_serializer=analytics_admin.UpdateSubpropertySyncConfigRequest.serialize, - response_deserializer=resources.SubpropertySyncConfig.deserialize, + self._stubs["update_subproperty_sync_config"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertySyncConfig", + request_serializer=analytics_admin.UpdateSubpropertySyncConfigRequest.serialize, + response_deserializer=resources.SubpropertySyncConfig.deserialize, + ) ) return self._stubs["update_subproperty_sync_config"] @@ -4865,12 +4867,12 @@ def get_subproperty_sync_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_subproperty_sync_config" not in self._stubs: - self._stubs[ - "get_subproperty_sync_config" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertySyncConfig", - request_serializer=analytics_admin.GetSubpropertySyncConfigRequest.serialize, - response_deserializer=resources.SubpropertySyncConfig.deserialize, + self._stubs["get_subproperty_sync_config"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertySyncConfig", + request_serializer=analytics_admin.GetSubpropertySyncConfigRequest.serialize, + response_deserializer=resources.SubpropertySyncConfig.deserialize, + ) ) return self._stubs["get_subproperty_sync_config"] @@ -4898,12 +4900,12 @@ def get_reporting_identity_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_reporting_identity_settings" not in self._stubs: - self._stubs[ - "get_reporting_identity_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingIdentitySettings", - request_serializer=analytics_admin.GetReportingIdentitySettingsRequest.serialize, - response_deserializer=resources.ReportingIdentitySettings.deserialize, + self._stubs["get_reporting_identity_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingIdentitySettings", + request_serializer=analytics_admin.GetReportingIdentitySettingsRequest.serialize, + response_deserializer=resources.ReportingIdentitySettings.deserialize, + ) ) return self._stubs["get_reporting_identity_settings"] diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc_asyncio.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc_asyncio.py index 850283528193..67f2a37f6030 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc_asyncio.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc_asyncio.py @@ -17,21 +17,31 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.analytics.admin_v1alpha.types import ( + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -39,14 +49,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter from .base import DEFAULT_CLIENT_INFO, AnalyticsAdminServiceTransport from .grpc import AnalyticsAdminServiceGrpcTransport @@ -967,12 +969,12 @@ def get_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "get_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetMeasurementProtocolSecret", - request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["get_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetMeasurementProtocolSecret", + request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["get_measurement_protocol_secret"] @@ -1000,12 +1002,12 @@ def list_measurement_protocol_secrets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_measurement_protocol_secrets" not in self._stubs: - self._stubs[ - "list_measurement_protocol_secrets" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListMeasurementProtocolSecrets", - request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, - response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + self._stubs["list_measurement_protocol_secrets"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListMeasurementProtocolSecrets", + request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, + response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + ) ) return self._stubs["list_measurement_protocol_secrets"] @@ -1032,12 +1034,12 @@ def create_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "create_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateMeasurementProtocolSecret", - request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["create_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateMeasurementProtocolSecret", + request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["create_measurement_protocol_secret"] @@ -1064,12 +1066,12 @@ def delete_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "delete_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteMeasurementProtocolSecret", - request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteMeasurementProtocolSecret", + request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_measurement_protocol_secret"] @@ -1096,12 +1098,12 @@ def update_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "update_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateMeasurementProtocolSecret", - request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["update_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateMeasurementProtocolSecret", + request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["update_measurement_protocol_secret"] @@ -1132,12 +1134,12 @@ def acknowledge_user_data_collection( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "acknowledge_user_data_collection" not in self._stubs: - self._stubs[ - "acknowledge_user_data_collection" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/AcknowledgeUserDataCollection", - request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, - response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + self._stubs["acknowledge_user_data_collection"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/AcknowledgeUserDataCollection", + request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, + response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + ) ) return self._stubs["acknowledge_user_data_collection"] @@ -1164,12 +1166,12 @@ def get_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "get_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.GetSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + self._stubs["get_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.GetSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + ) ) return self._stubs["get_sk_ad_network_conversion_value_schema"] @@ -1196,12 +1198,12 @@ def create_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "create_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.CreateSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + self._stubs["create_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.CreateSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + ) ) return self._stubs["create_sk_ad_network_conversion_value_schema"] @@ -1228,12 +1230,12 @@ def delete_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "delete_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.DeleteSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.DeleteSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_sk_ad_network_conversion_value_schema"] @@ -1260,12 +1262,12 @@ def update_sk_ad_network_conversion_value_schema( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_sk_ad_network_conversion_value_schema" not in self._stubs: - self._stubs[ - "update_sk_ad_network_conversion_value_schema" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSKAdNetworkConversionValueSchema", - request_serializer=analytics_admin.UpdateSKAdNetworkConversionValueSchemaRequest.serialize, - response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + self._stubs["update_sk_ad_network_conversion_value_schema"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSKAdNetworkConversionValueSchema", + request_serializer=analytics_admin.UpdateSKAdNetworkConversionValueSchemaRequest.serialize, + response_deserializer=resources.SKAdNetworkConversionValueSchema.deserialize, + ) ) return self._stubs["update_sk_ad_network_conversion_value_schema"] @@ -1294,12 +1296,12 @@ def list_sk_ad_network_conversion_value_schemas( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_sk_ad_network_conversion_value_schemas" not in self._stubs: - self._stubs[ - "list_sk_ad_network_conversion_value_schemas" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSKAdNetworkConversionValueSchemas", - request_serializer=analytics_admin.ListSKAdNetworkConversionValueSchemasRequest.serialize, - response_deserializer=analytics_admin.ListSKAdNetworkConversionValueSchemasResponse.deserialize, + self._stubs["list_sk_ad_network_conversion_value_schemas"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSKAdNetworkConversionValueSchemas", + request_serializer=analytics_admin.ListSKAdNetworkConversionValueSchemasRequest.serialize, + response_deserializer=analytics_admin.ListSKAdNetworkConversionValueSchemasResponse.deserialize, + ) ) return self._stubs["list_sk_ad_network_conversion_value_schemas"] @@ -1329,12 +1331,12 @@ def search_change_history_events( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_change_history_events" not in self._stubs: - self._stubs[ - "search_change_history_events" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/SearchChangeHistoryEvents", - request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, - response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + self._stubs["search_change_history_events"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/SearchChangeHistoryEvents", + request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, + response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + ) ) return self._stubs["search_change_history_events"] @@ -1360,12 +1362,12 @@ def get_google_signals_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_google_signals_settings" not in self._stubs: - self._stubs[ - "get_google_signals_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetGoogleSignalsSettings", - request_serializer=analytics_admin.GetGoogleSignalsSettingsRequest.serialize, - response_deserializer=resources.GoogleSignalsSettings.deserialize, + self._stubs["get_google_signals_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetGoogleSignalsSettings", + request_serializer=analytics_admin.GetGoogleSignalsSettingsRequest.serialize, + response_deserializer=resources.GoogleSignalsSettings.deserialize, + ) ) return self._stubs["get_google_signals_settings"] @@ -1391,12 +1393,12 @@ def update_google_signals_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_google_signals_settings" not in self._stubs: - self._stubs[ - "update_google_signals_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateGoogleSignalsSettings", - request_serializer=analytics_admin.UpdateGoogleSignalsSettingsRequest.serialize, - response_deserializer=resources.GoogleSignalsSettings.deserialize, + self._stubs["update_google_signals_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateGoogleSignalsSettings", + request_serializer=analytics_admin.UpdateGoogleSignalsSettingsRequest.serialize, + response_deserializer=resources.GoogleSignalsSettings.deserialize, + ) ) return self._stubs["update_google_signals_settings"] @@ -1713,12 +1715,12 @@ def get_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "get_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + self._stubs["get_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + ) ) return self._stubs["get_display_video360_advertiser_link"] @@ -1746,12 +1748,12 @@ def list_display_video360_advertiser_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_display_video360_advertiser_links" not in self._stubs: - self._stubs[ - "list_display_video360_advertiser_links" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinks", - request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinksRequest.serialize, - response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinksResponse.deserialize, + self._stubs["list_display_video360_advertiser_links"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinks", + request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinksRequest.serialize, + response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinksResponse.deserialize, + ) ) return self._stubs["list_display_video360_advertiser_links"] @@ -1783,12 +1785,12 @@ def create_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "create_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + self._stubs["create_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + ) ) return self._stubs["create_display_video360_advertiser_link"] @@ -1816,12 +1818,12 @@ def delete_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "delete_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_display_video360_advertiser_link"] @@ -1849,12 +1851,12 @@ def update_display_video360_advertiser_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_display_video360_advertiser_link" not in self._stubs: - self._stubs[ - "update_display_video360_advertiser_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDisplayVideo360AdvertiserLink", - request_serializer=analytics_admin.UpdateDisplayVideo360AdvertiserLinkRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + self._stubs["update_display_video360_advertiser_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDisplayVideo360AdvertiserLink", + request_serializer=analytics_admin.UpdateDisplayVideo360AdvertiserLinkRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLink.deserialize, + ) ) return self._stubs["update_display_video360_advertiser_link"] @@ -1882,12 +1884,12 @@ def get_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "get_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + self._stubs["get_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.GetDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + ) ) return self._stubs["get_display_video360_advertiser_link_proposal"] @@ -1915,12 +1917,12 @@ def list_display_video360_advertiser_link_proposals( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_display_video360_advertiser_link_proposals" not in self._stubs: - self._stubs[ - "list_display_video360_advertiser_link_proposals" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinkProposals", - request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsRequest.serialize, - response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsResponse.deserialize, + self._stubs["list_display_video360_advertiser_link_proposals"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListDisplayVideo360AdvertiserLinkProposals", + request_serializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsRequest.serialize, + response_deserializer=analytics_admin.ListDisplayVideo360AdvertiserLinkProposalsResponse.deserialize, + ) ) return self._stubs["list_display_video360_advertiser_link_proposals"] @@ -1947,12 +1949,12 @@ def create_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "create_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + self._stubs["create_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.CreateDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + ) ) return self._stubs["create_display_video360_advertiser_link_proposal"] @@ -1980,12 +1982,12 @@ def delete_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "delete_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.DeleteDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_display_video360_advertiser_link_proposal"] @@ -2015,12 +2017,12 @@ def approve_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "approve_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "approve_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ApproveDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalResponse.deserialize, + self._stubs["approve_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ApproveDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=analytics_admin.ApproveDisplayVideo360AdvertiserLinkProposalResponse.deserialize, + ) ) return self._stubs["approve_display_video360_advertiser_link_proposal"] @@ -2054,12 +2056,12 @@ def cancel_display_video360_advertiser_link_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_display_video360_advertiser_link_proposal" not in self._stubs: - self._stubs[ - "cancel_display_video360_advertiser_link_proposal" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CancelDisplayVideo360AdvertiserLinkProposal", - request_serializer=analytics_admin.CancelDisplayVideo360AdvertiserLinkProposalRequest.serialize, - response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + self._stubs["cancel_display_video360_advertiser_link_proposal"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CancelDisplayVideo360AdvertiserLinkProposal", + request_serializer=analytics_admin.CancelDisplayVideo360AdvertiserLinkProposalRequest.serialize, + response_deserializer=resources.DisplayVideo360AdvertiserLinkProposal.deserialize, + ) ) return self._stubs["cancel_display_video360_advertiser_link_proposal"] @@ -2371,12 +2373,12 @@ def get_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_retention_settings" not in self._stubs: - self._stubs[ - "get_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRetentionSettings", - request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["get_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRetentionSettings", + request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["get_data_retention_settings"] @@ -2403,12 +2405,12 @@ def update_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_retention_settings" not in self._stubs: - self._stubs[ - "update_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRetentionSettings", - request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["update_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRetentionSettings", + request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["update_data_retention_settings"] @@ -2889,12 +2891,12 @@ def update_attribution_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_attribution_settings" not in self._stubs: - self._stubs[ - "update_attribution_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateAttributionSettings", - request_serializer=analytics_admin.UpdateAttributionSettingsRequest.serialize, - response_deserializer=resources.AttributionSettings.deserialize, + self._stubs["update_attribution_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateAttributionSettings", + request_serializer=analytics_admin.UpdateAttributionSettingsRequest.serialize, + response_deserializer=resources.AttributionSettings.deserialize, + ) ) return self._stubs["update_attribution_settings"] @@ -3115,12 +3117,12 @@ def batch_create_access_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_create_access_bindings" not in self._stubs: - self._stubs[ - "batch_create_access_bindings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchCreateAccessBindings", - request_serializer=analytics_admin.BatchCreateAccessBindingsRequest.serialize, - response_deserializer=analytics_admin.BatchCreateAccessBindingsResponse.deserialize, + self._stubs["batch_create_access_bindings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchCreateAccessBindings", + request_serializer=analytics_admin.BatchCreateAccessBindingsRequest.serialize, + response_deserializer=analytics_admin.BatchCreateAccessBindingsResponse.deserialize, + ) ) return self._stubs["batch_create_access_bindings"] @@ -3177,12 +3179,12 @@ def batch_update_access_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_access_bindings" not in self._stubs: - self._stubs[ - "batch_update_access_bindings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchUpdateAccessBindings", - request_serializer=analytics_admin.BatchUpdateAccessBindingsRequest.serialize, - response_deserializer=analytics_admin.BatchUpdateAccessBindingsResponse.deserialize, + self._stubs["batch_update_access_bindings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchUpdateAccessBindings", + request_serializer=analytics_admin.BatchUpdateAccessBindingsRequest.serialize, + response_deserializer=analytics_admin.BatchUpdateAccessBindingsResponse.deserialize, + ) ) return self._stubs["batch_update_access_bindings"] @@ -3208,12 +3210,12 @@ def batch_delete_access_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_delete_access_bindings" not in self._stubs: - self._stubs[ - "batch_delete_access_bindings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchDeleteAccessBindings", - request_serializer=analytics_admin.BatchDeleteAccessBindingsRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["batch_delete_access_bindings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/BatchDeleteAccessBindings", + request_serializer=analytics_admin.BatchDeleteAccessBindingsRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["batch_delete_access_bindings"] @@ -3670,12 +3672,12 @@ def get_enhanced_measurement_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_enhanced_measurement_settings" not in self._stubs: - self._stubs[ - "get_enhanced_measurement_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetEnhancedMeasurementSettings", - request_serializer=analytics_admin.GetEnhancedMeasurementSettingsRequest.serialize, - response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + self._stubs["get_enhanced_measurement_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetEnhancedMeasurementSettings", + request_serializer=analytics_admin.GetEnhancedMeasurementSettingsRequest.serialize, + response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + ) ) return self._stubs["get_enhanced_measurement_settings"] @@ -3704,12 +3706,12 @@ def update_enhanced_measurement_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_enhanced_measurement_settings" not in self._stubs: - self._stubs[ - "update_enhanced_measurement_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateEnhancedMeasurementSettings", - request_serializer=analytics_admin.UpdateEnhancedMeasurementSettingsRequest.serialize, - response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + self._stubs["update_enhanced_measurement_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateEnhancedMeasurementSettings", + request_serializer=analytics_admin.UpdateEnhancedMeasurementSettingsRequest.serialize, + response_deserializer=resources.EnhancedMeasurementSettings.deserialize, + ) ) return self._stubs["update_enhanced_measurement_settings"] @@ -4165,12 +4167,12 @@ def update_data_redaction_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_redaction_settings" not in self._stubs: - self._stubs[ - "update_data_redaction_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRedactionSettings", - request_serializer=analytics_admin.UpdateDataRedactionSettingsRequest.serialize, - response_deserializer=resources.DataRedactionSettings.deserialize, + self._stubs["update_data_redaction_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateDataRedactionSettings", + request_serializer=analytics_admin.UpdateDataRedactionSettingsRequest.serialize, + response_deserializer=resources.DataRedactionSettings.deserialize, + ) ) return self._stubs["update_data_redaction_settings"] @@ -4196,12 +4198,12 @@ def get_data_redaction_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_redaction_settings" not in self._stubs: - self._stubs[ - "get_data_redaction_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRedactionSettings", - request_serializer=analytics_admin.GetDataRedactionSettingsRequest.serialize, - response_deserializer=resources.DataRedactionSettings.deserialize, + self._stubs["get_data_redaction_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetDataRedactionSettings", + request_serializer=analytics_admin.GetDataRedactionSettingsRequest.serialize, + response_deserializer=resources.DataRedactionSettings.deserialize, + ) ) return self._stubs["get_data_redaction_settings"] @@ -4405,12 +4407,12 @@ def get_rollup_property_source_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_rollup_property_source_link" not in self._stubs: - self._stubs[ - "get_rollup_property_source_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetRollupPropertySourceLink", - request_serializer=analytics_admin.GetRollupPropertySourceLinkRequest.serialize, - response_deserializer=resources.RollupPropertySourceLink.deserialize, + self._stubs["get_rollup_property_source_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetRollupPropertySourceLink", + request_serializer=analytics_admin.GetRollupPropertySourceLinkRequest.serialize, + response_deserializer=resources.RollupPropertySourceLink.deserialize, + ) ) return self._stubs["get_rollup_property_source_link"] @@ -4440,12 +4442,12 @@ def list_rollup_property_source_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_rollup_property_source_links" not in self._stubs: - self._stubs[ - "list_rollup_property_source_links" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListRollupPropertySourceLinks", - request_serializer=analytics_admin.ListRollupPropertySourceLinksRequest.serialize, - response_deserializer=analytics_admin.ListRollupPropertySourceLinksResponse.deserialize, + self._stubs["list_rollup_property_source_links"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListRollupPropertySourceLinks", + request_serializer=analytics_admin.ListRollupPropertySourceLinksRequest.serialize, + response_deserializer=analytics_admin.ListRollupPropertySourceLinksResponse.deserialize, + ) ) return self._stubs["list_rollup_property_source_links"] @@ -4475,12 +4477,12 @@ def create_rollup_property_source_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_rollup_property_source_link" not in self._stubs: - self._stubs[ - "create_rollup_property_source_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateRollupPropertySourceLink", - request_serializer=analytics_admin.CreateRollupPropertySourceLinkRequest.serialize, - response_deserializer=resources.RollupPropertySourceLink.deserialize, + self._stubs["create_rollup_property_source_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateRollupPropertySourceLink", + request_serializer=analytics_admin.CreateRollupPropertySourceLinkRequest.serialize, + response_deserializer=resources.RollupPropertySourceLink.deserialize, + ) ) return self._stubs["create_rollup_property_source_link"] @@ -4510,12 +4512,12 @@ def delete_rollup_property_source_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_rollup_property_source_link" not in self._stubs: - self._stubs[ - "delete_rollup_property_source_link" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteRollupPropertySourceLink", - request_serializer=analytics_admin.DeleteRollupPropertySourceLinkRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_rollup_property_source_link"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteRollupPropertySourceLink", + request_serializer=analytics_admin.DeleteRollupPropertySourceLinkRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_rollup_property_source_link"] @@ -4572,12 +4574,12 @@ def create_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_subproperty_event_filter" not in self._stubs: - self._stubs[ - "create_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSubpropertyEventFilter", - request_serializer=analytics_admin.CreateSubpropertyEventFilterRequest.serialize, - response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + self._stubs["create_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateSubpropertyEventFilter", + request_serializer=analytics_admin.CreateSubpropertyEventFilterRequest.serialize, + response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + ) ) return self._stubs["create_subproperty_event_filter"] @@ -4603,12 +4605,12 @@ def get_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_subproperty_event_filter" not in self._stubs: - self._stubs[ - "get_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertyEventFilter", - request_serializer=analytics_admin.GetSubpropertyEventFilterRequest.serialize, - response_deserializer=subproperty_event_filter.SubpropertyEventFilter.deserialize, + self._stubs["get_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertyEventFilter", + request_serializer=analytics_admin.GetSubpropertyEventFilterRequest.serialize, + response_deserializer=subproperty_event_filter.SubpropertyEventFilter.deserialize, + ) ) return self._stubs["get_subproperty_event_filter"] @@ -4634,12 +4636,12 @@ def list_subproperty_event_filters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_subproperty_event_filters" not in self._stubs: - self._stubs[ - "list_subproperty_event_filters" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertyEventFilters", - request_serializer=analytics_admin.ListSubpropertyEventFiltersRequest.serialize, - response_deserializer=analytics_admin.ListSubpropertyEventFiltersResponse.deserialize, + self._stubs["list_subproperty_event_filters"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertyEventFilters", + request_serializer=analytics_admin.ListSubpropertyEventFiltersRequest.serialize, + response_deserializer=analytics_admin.ListSubpropertyEventFiltersResponse.deserialize, + ) ) return self._stubs["list_subproperty_event_filters"] @@ -4666,12 +4668,12 @@ def update_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_subproperty_event_filter" not in self._stubs: - self._stubs[ - "update_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertyEventFilter", - request_serializer=analytics_admin.UpdateSubpropertyEventFilterRequest.serialize, - response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + self._stubs["update_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertyEventFilter", + request_serializer=analytics_admin.UpdateSubpropertyEventFilterRequest.serialize, + response_deserializer=gaa_subproperty_event_filter.SubpropertyEventFilter.deserialize, + ) ) return self._stubs["update_subproperty_event_filter"] @@ -4698,12 +4700,12 @@ def delete_subproperty_event_filter( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_subproperty_event_filter" not in self._stubs: - self._stubs[ - "delete_subproperty_event_filter" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSubpropertyEventFilter", - request_serializer=analytics_admin.DeleteSubpropertyEventFilterRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_subproperty_event_filter"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteSubpropertyEventFilter", + request_serializer=analytics_admin.DeleteSubpropertyEventFilterRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_subproperty_event_filter"] @@ -4730,12 +4732,12 @@ def create_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_reporting_data_annotation" not in self._stubs: - self._stubs[ - "create_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateReportingDataAnnotation", - request_serializer=analytics_admin.CreateReportingDataAnnotationRequest.serialize, - response_deserializer=resources.ReportingDataAnnotation.deserialize, + self._stubs["create_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/CreateReportingDataAnnotation", + request_serializer=analytics_admin.CreateReportingDataAnnotationRequest.serialize, + response_deserializer=resources.ReportingDataAnnotation.deserialize, + ) ) return self._stubs["create_reporting_data_annotation"] @@ -4761,12 +4763,12 @@ def get_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_reporting_data_annotation" not in self._stubs: - self._stubs[ - "get_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingDataAnnotation", - request_serializer=analytics_admin.GetReportingDataAnnotationRequest.serialize, - response_deserializer=resources.ReportingDataAnnotation.deserialize, + self._stubs["get_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingDataAnnotation", + request_serializer=analytics_admin.GetReportingDataAnnotationRequest.serialize, + response_deserializer=resources.ReportingDataAnnotation.deserialize, + ) ) return self._stubs["get_reporting_data_annotation"] @@ -4793,12 +4795,12 @@ def list_reporting_data_annotations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_reporting_data_annotations" not in self._stubs: - self._stubs[ - "list_reporting_data_annotations" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListReportingDataAnnotations", - request_serializer=analytics_admin.ListReportingDataAnnotationsRequest.serialize, - response_deserializer=analytics_admin.ListReportingDataAnnotationsResponse.deserialize, + self._stubs["list_reporting_data_annotations"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListReportingDataAnnotations", + request_serializer=analytics_admin.ListReportingDataAnnotationsRequest.serialize, + response_deserializer=analytics_admin.ListReportingDataAnnotationsResponse.deserialize, + ) ) return self._stubs["list_reporting_data_annotations"] @@ -4825,12 +4827,12 @@ def update_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_reporting_data_annotation" not in self._stubs: - self._stubs[ - "update_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateReportingDataAnnotation", - request_serializer=analytics_admin.UpdateReportingDataAnnotationRequest.serialize, - response_deserializer=resources.ReportingDataAnnotation.deserialize, + self._stubs["update_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateReportingDataAnnotation", + request_serializer=analytics_admin.UpdateReportingDataAnnotationRequest.serialize, + response_deserializer=resources.ReportingDataAnnotation.deserialize, + ) ) return self._stubs["update_reporting_data_annotation"] @@ -4857,12 +4859,12 @@ def delete_reporting_data_annotation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_reporting_data_annotation" not in self._stubs: - self._stubs[ - "delete_reporting_data_annotation" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteReportingDataAnnotation", - request_serializer=analytics_admin.DeleteReportingDataAnnotationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_reporting_data_annotation"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/DeleteReportingDataAnnotation", + request_serializer=analytics_admin.DeleteReportingDataAnnotationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_reporting_data_annotation"] @@ -4917,12 +4919,12 @@ def list_subproperty_sync_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_subproperty_sync_configs" not in self._stubs: - self._stubs[ - "list_subproperty_sync_configs" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertySyncConfigs", - request_serializer=analytics_admin.ListSubpropertySyncConfigsRequest.serialize, - response_deserializer=analytics_admin.ListSubpropertySyncConfigsResponse.deserialize, + self._stubs["list_subproperty_sync_configs"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/ListSubpropertySyncConfigs", + request_serializer=analytics_admin.ListSubpropertySyncConfigsRequest.serialize, + response_deserializer=analytics_admin.ListSubpropertySyncConfigsResponse.deserialize, + ) ) return self._stubs["list_subproperty_sync_configs"] @@ -4948,12 +4950,12 @@ def update_subproperty_sync_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_subproperty_sync_config" not in self._stubs: - self._stubs[ - "update_subproperty_sync_config" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertySyncConfig", - request_serializer=analytics_admin.UpdateSubpropertySyncConfigRequest.serialize, - response_deserializer=resources.SubpropertySyncConfig.deserialize, + self._stubs["update_subproperty_sync_config"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/UpdateSubpropertySyncConfig", + request_serializer=analytics_admin.UpdateSubpropertySyncConfigRequest.serialize, + response_deserializer=resources.SubpropertySyncConfig.deserialize, + ) ) return self._stubs["update_subproperty_sync_config"] @@ -4979,12 +4981,12 @@ def get_subproperty_sync_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_subproperty_sync_config" not in self._stubs: - self._stubs[ - "get_subproperty_sync_config" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertySyncConfig", - request_serializer=analytics_admin.GetSubpropertySyncConfigRequest.serialize, - response_deserializer=resources.SubpropertySyncConfig.deserialize, + self._stubs["get_subproperty_sync_config"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetSubpropertySyncConfig", + request_serializer=analytics_admin.GetSubpropertySyncConfigRequest.serialize, + response_deserializer=resources.SubpropertySyncConfig.deserialize, + ) ) return self._stubs["get_subproperty_sync_config"] @@ -5012,12 +5014,12 @@ def get_reporting_identity_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_reporting_identity_settings" not in self._stubs: - self._stubs[ - "get_reporting_identity_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingIdentitySettings", - request_serializer=analytics_admin.GetReportingIdentitySettingsRequest.serialize, - response_deserializer=resources.ReportingIdentitySettings.deserialize, + self._stubs["get_reporting_identity_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1alpha.AnalyticsAdminService/GetReportingIdentitySettings", + request_serializer=analytics_admin.GetReportingIdentitySettingsRequest.serialize, + response_deserializer=resources.ReportingIdentitySettings.deserialize, + ) ) return self._stubs["get_reporting_identity_settings"] diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest.py index 0f8cef255828..5a6d939205be 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest.py @@ -16,19 +16,29 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.analytics.admin_v1alpha.types import ( + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -36,14 +46,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAnalyticsAdminServiceRestTransport @@ -8144,9 +8146,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseAcknowledgeUserDataCollection._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseAcknowledgeUserDataCollection._get_http_options() request, metadata = self._interceptor.pre_acknowledge_user_data_collection( request, metadata @@ -8215,11 +8215,10 @@ def __call__( resp = self._interceptor.post_acknowledge_user_data_collection(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_acknowledge_user_data_collection_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_acknowledge_user_data_collection_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8312,15 +8311,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseApproveDisplayVideo360AdvertiserLinkProposal._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseApproveDisplayVideo360AdvertiserLinkProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_approve_display_video360_advertiser_link_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_approve_display_video360_advertiser_link_proposal( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseApproveDisplayVideo360AdvertiserLinkProposal._get_transcoded_request( http_options, request @@ -8394,11 +8390,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_approve_display_video360_advertiser_link_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_approve_display_video360_advertiser_link_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8478,9 +8473,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseArchiveAudience._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseArchiveAudience._get_http_options() request, metadata = self._interceptor.pre_archive_audience( request, metadata @@ -8506,7 +8499,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8596,9 +8589,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomDimension._get_http_options() request, metadata = self._interceptor.pre_archive_custom_dimension( request, metadata @@ -8624,7 +8615,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8712,9 +8703,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomMetric._get_http_options() request, metadata = self._interceptor.pre_archive_custom_metric( request, metadata @@ -8740,7 +8729,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8837,9 +8826,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseBatchCreateAccessBindings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseBatchCreateAccessBindings._get_http_options() request, metadata = self._interceptor.pre_batch_create_access_bindings( request, metadata @@ -8992,9 +8979,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseBatchDeleteAccessBindings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseBatchDeleteAccessBindings._get_http_options() request, metadata = self._interceptor.pre_batch_delete_access_bindings( request, metadata @@ -9020,7 +9005,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9113,9 +9098,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseBatchGetAccessBindings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseBatchGetAccessBindings._get_http_options() request, metadata = self._interceptor.pre_batch_get_access_bindings( request, metadata @@ -9267,9 +9250,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseBatchUpdateAccessBindings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseBatchUpdateAccessBindings._get_http_options() request, metadata = self._interceptor.pre_batch_update_access_bindings( request, metadata @@ -9439,15 +9420,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCancelDisplayVideo360AdvertiserLinkProposal._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCancelDisplayVideo360AdvertiserLinkProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_cancel_display_video360_advertiser_link_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_cancel_display_video360_advertiser_link_proposal( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCancelDisplayVideo360AdvertiserLinkProposal._get_transcoded_request( http_options, request @@ -9517,11 +9495,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_cancel_display_video360_advertiser_link_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_cancel_display_video360_advertiser_link_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9609,9 +9586,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateAccessBinding._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateAccessBinding._get_http_options() request, metadata = self._interceptor.pre_create_access_binding( request, metadata @@ -9768,9 +9743,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateAdSenseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateAdSenseLink._get_http_options() request, metadata = self._interceptor.pre_create_ad_sense_link( request, metadata @@ -9926,9 +9899,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateAudience._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateAudience._get_http_options() request, metadata = self._interceptor.pre_create_audience(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateAudience._get_transcoded_request( @@ -10080,9 +10051,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateBigQueryLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateBigQueryLink._get_http_options() request, metadata = self._interceptor.pre_create_big_query_link( request, metadata @@ -10236,9 +10205,7 @@ def __call__( A definition for a calculated metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateCalculatedMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateCalculatedMetric._get_http_options() request, metadata = self._interceptor.pre_create_calculated_metric( request, metadata @@ -10392,9 +10359,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateChannelGroup._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateChannelGroup._get_http_options() request, metadata = self._interceptor.pre_create_channel_group( request, metadata @@ -10550,9 +10515,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateConversionEvent._get_http_options() request, metadata = self._interceptor.pre_create_conversion_event( request, metadata @@ -10706,9 +10669,7 @@ def __call__( A definition for a CustomDimension. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomDimension._get_http_options() request, metadata = self._interceptor.pre_create_custom_dimension( request, metadata @@ -10862,9 +10823,7 @@ def __call__( A definition for a custom metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomMetric._get_http_options() request, metadata = self._interceptor.pre_create_custom_metric( request, metadata @@ -11020,9 +10979,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateDataStream._get_http_options() request, metadata = self._interceptor.pre_create_data_stream( request, metadata @@ -11182,15 +11139,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateDisplayVideo360AdvertiserLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateDisplayVideo360AdvertiserLink._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_display_video360_advertiser_link( - request, metadata + request, metadata = ( + self._interceptor.pre_create_display_video360_advertiser_link( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateDisplayVideo360AdvertiserLink._get_transcoded_request( http_options, request @@ -11256,11 +11210,10 @@ def __call__( resp = self._interceptor.post_create_display_video360_advertiser_link(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_display_video360_advertiser_link_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_display_video360_advertiser_link_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -11358,15 +11311,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateDisplayVideo360AdvertiserLinkProposal._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateDisplayVideo360AdvertiserLinkProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_display_video360_advertiser_link_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_create_display_video360_advertiser_link_proposal( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateDisplayVideo360AdvertiserLinkProposal._get_transcoded_request( http_options, request @@ -11436,11 +11386,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_display_video360_advertiser_link_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_display_video360_advertiser_link_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -11540,9 +11489,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateEventCreateRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateEventCreateRule._get_http_options() request, metadata = self._interceptor.pre_create_event_create_rule( request, metadata @@ -11712,9 +11659,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateEventEditRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateEventEditRule._get_http_options() request, metadata = self._interceptor.pre_create_event_edit_rule( request, metadata @@ -11870,9 +11815,7 @@ def __call__( A resource message representing an ``ExpandedDataSet``. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateExpandedDataSet._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateExpandedDataSet._get_http_options() request, metadata = self._interceptor.pre_create_expanded_data_set( request, metadata @@ -12030,9 +11973,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateFirebaseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateFirebaseLink._get_http_options() request, metadata = self._interceptor.pre_create_firebase_link( request, metadata @@ -12188,9 +12129,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateGoogleAdsLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateGoogleAdsLink._get_http_options() request, metadata = self._interceptor.pre_create_google_ads_link( request, metadata @@ -12346,9 +12285,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateKeyEvent._get_http_options() request, metadata = self._interceptor.pre_create_key_event( request, metadata @@ -12505,15 +12442,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateMeasurementProtocolSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_measurement_protocol_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_create_measurement_protocol_secret( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateMeasurementProtocolSecret._get_transcoded_request( http_options, request @@ -12579,11 +12513,10 @@ def __call__( resp = self._interceptor.post_create_measurement_protocol_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_measurement_protocol_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_measurement_protocol_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -12669,9 +12602,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateProperty._get_http_options() request, metadata = self._interceptor.pre_create_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateProperty._get_transcoded_request( @@ -12827,9 +12758,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateReportingDataAnnotation._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateReportingDataAnnotation._get_http_options() request, metadata = self._interceptor.pre_create_reporting_data_annotation( request, metadata @@ -12898,11 +12827,10 @@ def __call__( resp = self._interceptor.post_create_reporting_data_annotation(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_reporting_data_annotation_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_reporting_data_annotation_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -12988,9 +12916,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateRollupProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateRollupProperty._get_http_options() request, metadata = self._interceptor.pre_create_rollup_property( request, metadata @@ -13152,15 +13078,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateRollupPropertySourceLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateRollupPropertySourceLink._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_rollup_property_source_link( - request, metadata + request, metadata = ( + self._interceptor.pre_create_rollup_property_source_link( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateRollupPropertySourceLink._get_transcoded_request( http_options, request @@ -13226,11 +13149,10 @@ def __call__( resp = self._interceptor.post_create_rollup_property_source_link(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_rollup_property_source_link_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_rollup_property_source_link_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -13316,9 +13238,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateSearchAds360Link._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateSearchAds360Link._get_http_options() request, metadata = self._interceptor.pre_create_search_ads360_link( request, metadata @@ -13476,15 +13396,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateSKAdNetworkConversionValueSchema._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateSKAdNetworkConversionValueSchema._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_sk_ad_network_conversion_value_schema( - request, metadata + request, metadata = ( + self._interceptor.pre_create_sk_ad_network_conversion_value_schema( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateSKAdNetworkConversionValueSchema._get_transcoded_request( http_options, request @@ -13552,11 +13469,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_sk_ad_network_conversion_value_schema_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_sk_ad_network_conversion_value_schema_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -13646,9 +13562,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateSubpropertyEventFilter._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateSubpropertyEventFilter._get_http_options() request, metadata = self._interceptor.pre_create_subproperty_event_filter( request, metadata @@ -13717,11 +13631,10 @@ def __call__( resp = self._interceptor.post_create_subproperty_event_filter(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_subproperty_event_filter_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_subproperty_event_filter_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -13802,9 +13715,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccessBinding._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccessBinding._get_http_options() request, metadata = self._interceptor.pre_delete_access_binding( request, metadata @@ -13826,7 +13737,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -13914,9 +13825,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccount._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccount._get_http_options() request, metadata = self._interceptor.pre_delete_account(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccount._get_transcoded_request( @@ -13936,7 +13845,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -14022,9 +13931,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAdSenseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAdSenseLink._get_http_options() request, metadata = self._interceptor.pre_delete_ad_sense_link( request, metadata @@ -14046,7 +13953,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -14134,9 +14041,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteBigQueryLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteBigQueryLink._get_http_options() request, metadata = self._interceptor.pre_delete_big_query_link( request, metadata @@ -14158,7 +14063,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -14246,9 +14151,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteCalculatedMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteCalculatedMetric._get_http_options() request, metadata = self._interceptor.pre_delete_calculated_metric( request, metadata @@ -14270,7 +14173,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -14356,9 +14259,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteChannelGroup._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteChannelGroup._get_http_options() request, metadata = self._interceptor.pre_delete_channel_group( request, metadata @@ -14380,7 +14281,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -14468,9 +14369,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteConversionEvent._get_http_options() request, metadata = self._interceptor.pre_delete_conversion_event( request, metadata @@ -14492,7 +14391,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -14580,9 +14479,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDataStream._get_http_options() request, metadata = self._interceptor.pre_delete_data_stream( request, metadata @@ -14604,7 +14501,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -14695,15 +14592,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDisplayVideo360AdvertiserLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDisplayVideo360AdvertiserLink._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_display_video360_advertiser_link( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_display_video360_advertiser_link( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDisplayVideo360AdvertiserLink._get_transcoded_request( http_options, request @@ -14722,7 +14616,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -14812,15 +14706,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDisplayVideo360AdvertiserLinkProposal._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDisplayVideo360AdvertiserLinkProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_display_video360_advertiser_link_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_display_video360_advertiser_link_proposal( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDisplayVideo360AdvertiserLinkProposal._get_transcoded_request( http_options, request @@ -14839,7 +14730,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -14925,9 +14816,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteEventCreateRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteEventCreateRule._get_http_options() request, metadata = self._interceptor.pre_delete_event_create_rule( request, metadata @@ -14949,7 +14838,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -15037,9 +14926,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteEventEditRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteEventEditRule._get_http_options() request, metadata = self._interceptor.pre_delete_event_edit_rule( request, metadata @@ -15061,7 +14948,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -15149,9 +15036,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteExpandedDataSet._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteExpandedDataSet._get_http_options() request, metadata = self._interceptor.pre_delete_expanded_data_set( request, metadata @@ -15173,7 +15058,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -15261,9 +15146,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteFirebaseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteFirebaseLink._get_http_options() request, metadata = self._interceptor.pre_delete_firebase_link( request, metadata @@ -15285,7 +15168,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -15373,9 +15256,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteGoogleAdsLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteGoogleAdsLink._get_http_options() request, metadata = self._interceptor.pre_delete_google_ads_link( request, metadata @@ -15397,7 +15278,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -15485,9 +15366,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteKeyEvent._get_http_options() request, metadata = self._interceptor.pre_delete_key_event( request, metadata @@ -15509,7 +15388,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -15598,15 +15477,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteMeasurementProtocolSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_measurement_protocol_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_measurement_protocol_secret( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteMeasurementProtocolSecret._get_transcoded_request( http_options, request @@ -15625,7 +15501,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -15717,9 +15593,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteProperty._get_http_options() request, metadata = self._interceptor.pre_delete_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteProperty._get_transcoded_request( @@ -15862,9 +15736,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteReportingDataAnnotation._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteReportingDataAnnotation._get_http_options() request, metadata = self._interceptor.pre_delete_reporting_data_annotation( request, metadata @@ -15886,7 +15758,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -15975,15 +15847,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteRollupPropertySourceLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteRollupPropertySourceLink._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_rollup_property_source_link( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_rollup_property_source_link( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteRollupPropertySourceLink._get_transcoded_request( http_options, request @@ -16002,7 +15871,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -16088,9 +15957,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSearchAds360Link._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSearchAds360Link._get_http_options() request, metadata = self._interceptor.pre_delete_search_ads360_link( request, metadata @@ -16112,7 +15979,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -16202,15 +16069,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSKAdNetworkConversionValueSchema._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSKAdNetworkConversionValueSchema._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_sk_ad_network_conversion_value_schema( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_sk_ad_network_conversion_value_schema( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSKAdNetworkConversionValueSchema._get_transcoded_request( http_options, request @@ -16229,7 +16093,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -16318,9 +16182,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSubpropertyEventFilter._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteSubpropertyEventFilter._get_http_options() request, metadata = self._interceptor.pre_delete_subproperty_event_filter( request, metadata @@ -16342,7 +16204,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -16434,9 +16296,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetAccessBinding._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetAccessBinding._get_http_options() request, metadata = self._interceptor.pre_get_access_binding( request, metadata @@ -16585,9 +16445,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetAccount._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetAccount._get_http_options() request, metadata = self._interceptor.pre_get_account(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetAccount._get_transcoded_request( @@ -16734,9 +16592,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetAdSenseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetAdSenseLink._get_http_options() request, metadata = self._interceptor.pre_get_ad_sense_link( request, metadata @@ -16885,9 +16741,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetAttributionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetAttributionSettings._get_http_options() request, metadata = self._interceptor.pre_get_attribution_settings( request, metadata @@ -17034,9 +16888,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetAudience._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetAudience._get_http_options() request, metadata = self._interceptor.pre_get_audience(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetAudience._get_transcoded_request( @@ -17182,9 +17034,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetBigQueryLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetBigQueryLink._get_http_options() request, metadata = self._interceptor.pre_get_big_query_link( request, metadata @@ -17332,9 +17182,7 @@ def __call__( A definition for a calculated metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetCalculatedMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetCalculatedMetric._get_http_options() request, metadata = self._interceptor.pre_get_calculated_metric( request, metadata @@ -17484,9 +17332,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetChannelGroup._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetChannelGroup._get_http_options() request, metadata = self._interceptor.pre_get_channel_group( request, metadata @@ -17636,9 +17482,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetConversionEvent._get_http_options() request, metadata = self._interceptor.pre_get_conversion_event( request, metadata @@ -17786,9 +17630,7 @@ def __call__( A definition for a CustomDimension. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomDimension._get_http_options() request, metadata = self._interceptor.pre_get_custom_dimension( request, metadata @@ -17936,9 +17778,7 @@ def __call__( A definition for a custom metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomMetric._get_http_options() request, metadata = self._interceptor.pre_get_custom_metric( request, metadata @@ -18090,9 +17930,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataRedactionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataRedactionSettings._get_http_options() request, metadata = self._interceptor.pre_get_data_redaction_settings( request, metadata @@ -18241,9 +18079,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataRetentionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataRetentionSettings._get_http_options() request, metadata = self._interceptor.pre_get_data_retention_settings( request, metadata @@ -18392,9 +18228,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataSharingSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataSharingSettings._get_http_options() request, metadata = self._interceptor.pre_get_data_sharing_settings( request, metadata @@ -18542,9 +18376,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataStream._get_http_options() request, metadata = self._interceptor.pre_get_data_stream(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataStream._get_transcoded_request( @@ -18694,15 +18526,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDisplayVideo360AdvertiserLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDisplayVideo360AdvertiserLink._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_display_video360_advertiser_link( - request, metadata + request, metadata = ( + self._interceptor.pre_get_display_video360_advertiser_link( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetDisplayVideo360AdvertiserLink._get_transcoded_request( http_options, request @@ -18763,11 +18592,10 @@ def __call__( resp = self._interceptor.post_get_display_video360_advertiser_link(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_display_video360_advertiser_link_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_display_video360_advertiser_link_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -18864,15 +18692,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDisplayVideo360AdvertiserLinkProposal._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDisplayVideo360AdvertiserLinkProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_display_video360_advertiser_link_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_get_display_video360_advertiser_link_proposal( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetDisplayVideo360AdvertiserLinkProposal._get_transcoded_request( http_options, request @@ -18935,11 +18760,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_display_video360_advertiser_link_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_display_video360_advertiser_link_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -19031,9 +18855,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetEnhancedMeasurementSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetEnhancedMeasurementSettings._get_http_options() request, metadata = self._interceptor.pre_get_enhanced_measurement_settings( request, metadata @@ -19097,11 +18919,10 @@ def __call__( resp = self._interceptor.post_get_enhanced_measurement_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_enhanced_measurement_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_enhanced_measurement_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -19198,9 +19019,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetEventCreateRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetEventCreateRule._get_http_options() request, metadata = self._interceptor.pre_get_event_create_rule( request, metadata @@ -19364,9 +19183,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetEventEditRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetEventEditRule._get_http_options() request, metadata = self._interceptor.pre_get_event_edit_rule( request, metadata @@ -19516,9 +19333,7 @@ def __call__( A resource message representing an ``ExpandedDataSet``. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetExpandedDataSet._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetExpandedDataSet._get_http_options() request, metadata = self._interceptor.pre_get_expanded_data_set( request, metadata @@ -19672,9 +19487,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetGlobalSiteTag._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetGlobalSiteTag._get_http_options() request, metadata = self._interceptor.pre_get_global_site_tag( request, metadata @@ -19825,9 +19638,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetGoogleSignalsSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetGoogleSignalsSettings._get_http_options() request, metadata = self._interceptor.pre_get_google_signals_settings( request, metadata @@ -19974,9 +19785,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetKeyEvent._get_http_options() request, metadata = self._interceptor.pre_get_key_event(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetKeyEvent._get_transcoded_request( @@ -20125,9 +19934,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetMeasurementProtocolSecret._get_http_options() request, metadata = self._interceptor.pre_get_measurement_protocol_secret( request, metadata @@ -20191,11 +19998,10 @@ def __call__( resp = self._interceptor.post_get_measurement_protocol_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_measurement_protocol_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_measurement_protocol_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -20279,9 +20085,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetProperty._get_http_options() request, metadata = self._interceptor.pre_get_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetProperty._get_transcoded_request( @@ -20429,9 +20233,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetReportingDataAnnotation._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetReportingDataAnnotation._get_http_options() request, metadata = self._interceptor.pre_get_reporting_data_annotation( request, metadata @@ -20495,11 +20297,10 @@ def __call__( resp = self._interceptor.post_get_reporting_data_annotation(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_reporting_data_annotation_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_reporting_data_annotation_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -20587,9 +20388,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetReportingIdentitySettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetReportingIdentitySettings._get_http_options() request, metadata = self._interceptor.pre_get_reporting_identity_settings( request, metadata @@ -20653,11 +20452,10 @@ def __call__( resp = self._interceptor.post_get_reporting_identity_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_reporting_identity_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_reporting_identity_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -20746,9 +20544,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetRollupPropertySourceLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetRollupPropertySourceLink._get_http_options() request, metadata = self._interceptor.pre_get_rollup_property_source_link( request, metadata @@ -20812,11 +20608,10 @@ def __call__( resp = self._interceptor.post_get_rollup_property_source_link(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_rollup_property_source_link_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_rollup_property_source_link_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -20901,9 +20696,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetSearchAds360Link._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetSearchAds360Link._get_http_options() request, metadata = self._interceptor.pre_get_search_ads360_link( request, metadata @@ -21056,15 +20849,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetSKAdNetworkConversionValueSchema._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetSKAdNetworkConversionValueSchema._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_sk_ad_network_conversion_value_schema( - request, metadata + request, metadata = ( + self._interceptor.pre_get_sk_ad_network_conversion_value_schema( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetSKAdNetworkConversionValueSchema._get_transcoded_request( http_options, request @@ -21127,11 +20917,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_sk_ad_network_conversion_value_schema_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_sk_ad_network_conversion_value_schema_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -21218,9 +21007,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetSubpropertyEventFilter._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetSubpropertyEventFilter._get_http_options() request, metadata = self._interceptor.pre_get_subproperty_event_filter( request, metadata @@ -21377,9 +21164,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetSubpropertySyncConfig._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetSubpropertySyncConfig._get_http_options() request, metadata = self._interceptor.pre_get_subproperty_sync_config( request, metadata @@ -21527,9 +21312,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAccessBindings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAccessBindings._get_http_options() request, metadata = self._interceptor.pre_list_access_bindings( request, metadata @@ -21678,9 +21461,7 @@ def __call__( Request message for ListAccounts RPC. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAccounts._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAccounts._get_http_options() request, metadata = self._interceptor.pre_list_accounts(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListAccounts._get_transcoded_request( @@ -21828,9 +21609,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAccountSummaries._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAccountSummaries._get_http_options() request, metadata = self._interceptor.pre_list_account_summaries( request, metadata @@ -21982,9 +21761,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAdSenseLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAdSenseLinks._get_http_options() request, metadata = self._interceptor.pre_list_ad_sense_links( request, metadata @@ -22136,9 +21913,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAudiences._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAudiences._get_http_options() request, metadata = self._interceptor.pre_list_audiences(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListAudiences._get_transcoded_request( @@ -22286,9 +22061,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListBigQueryLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListBigQueryLinks._get_http_options() request, metadata = self._interceptor.pre_list_big_query_links( request, metadata @@ -22440,9 +22213,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListCalculatedMetrics._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListCalculatedMetrics._get_http_options() request, metadata = self._interceptor.pre_list_calculated_metrics( request, metadata @@ -22594,9 +22365,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListChannelGroups._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListChannelGroups._get_http_options() request, metadata = self._interceptor.pre_list_channel_groups( request, metadata @@ -22748,9 +22517,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListConversionEvents._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListConversionEvents._get_http_options() request, metadata = self._interceptor.pre_list_conversion_events( request, metadata @@ -22902,9 +22669,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListCustomDimensions._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListCustomDimensions._get_http_options() request, metadata = self._interceptor.pre_list_custom_dimensions( request, metadata @@ -23056,9 +22821,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListCustomMetrics._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListCustomMetrics._get_http_options() request, metadata = self._interceptor.pre_list_custom_metrics( request, metadata @@ -23210,9 +22973,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListDataStreams._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListDataStreams._get_http_options() request, metadata = self._interceptor.pre_list_data_streams( request, metadata @@ -23369,15 +23130,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListDisplayVideo360AdvertiserLinkProposals._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListDisplayVideo360AdvertiserLinkProposals._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_display_video360_advertiser_link_proposals( - request, metadata + request, metadata = ( + self._interceptor.pre_list_display_video360_advertiser_link_proposals( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListDisplayVideo360AdvertiserLinkProposals._get_transcoded_request( http_options, request @@ -23446,11 +23204,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_display_video360_advertiser_link_proposals_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_display_video360_advertiser_link_proposals_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -23538,15 +23295,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListDisplayVideo360AdvertiserLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListDisplayVideo360AdvertiserLinks._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_display_video360_advertiser_links( - request, metadata + request, metadata = ( + self._interceptor.pre_list_display_video360_advertiser_links( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListDisplayVideo360AdvertiserLinks._get_transcoded_request( http_options, request @@ -23609,11 +23363,10 @@ def __call__( resp = self._interceptor.post_list_display_video360_advertiser_links(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_display_video360_advertiser_links_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_display_video360_advertiser_links_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -23698,9 +23451,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListEventCreateRules._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListEventCreateRules._get_http_options() request, metadata = self._interceptor.pre_list_event_create_rules( request, metadata @@ -23852,9 +23603,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListEventEditRules._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListEventEditRules._get_http_options() request, metadata = self._interceptor.pre_list_event_edit_rules( request, metadata @@ -24006,9 +23755,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListExpandedDataSets._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListExpandedDataSets._get_http_options() request, metadata = self._interceptor.pre_list_expanded_data_sets( request, metadata @@ -24160,9 +23907,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListFirebaseLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListFirebaseLinks._get_http_options() request, metadata = self._interceptor.pre_list_firebase_links( request, metadata @@ -24314,9 +24059,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListGoogleAdsLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListGoogleAdsLinks._get_http_options() request, metadata = self._interceptor.pre_list_google_ads_links( request, metadata @@ -24467,9 +24210,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListKeyEvents._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListKeyEvents._get_http_options() request, metadata = self._interceptor.pre_list_key_events(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListKeyEvents._get_transcoded_request( @@ -24620,9 +24361,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListMeasurementProtocolSecrets._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListMeasurementProtocolSecrets._get_http_options() request, metadata = self._interceptor.pre_list_measurement_protocol_secrets( request, metadata @@ -24686,11 +24425,10 @@ def __call__( resp = self._interceptor.post_list_measurement_protocol_secrets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_measurement_protocol_secrets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_measurement_protocol_secrets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -24777,9 +24515,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListProperties._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListProperties._get_http_options() request, metadata = self._interceptor.pre_list_properties(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListProperties._get_transcoded_request( @@ -24930,9 +24666,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListReportingDataAnnotations._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListReportingDataAnnotations._get_http_options() request, metadata = self._interceptor.pre_list_reporting_data_annotations( request, metadata @@ -24996,11 +24730,10 @@ def __call__( resp = self._interceptor.post_list_reporting_data_annotations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_reporting_data_annotations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_reporting_data_annotations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -25090,9 +24823,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListRollupPropertySourceLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListRollupPropertySourceLinks._get_http_options() request, metadata = self._interceptor.pre_list_rollup_property_source_links( request, metadata @@ -25156,11 +24887,10 @@ def __call__( resp = self._interceptor.post_list_rollup_property_source_links(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_rollup_property_source_links_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_rollup_property_source_links_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -25247,9 +24977,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListSearchAds360Links._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListSearchAds360Links._get_http_options() request, metadata = self._interceptor.pre_list_search_ads360_links( request, metadata @@ -25406,15 +25134,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListSKAdNetworkConversionValueSchemas._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListSKAdNetworkConversionValueSchemas._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_sk_ad_network_conversion_value_schemas( - request, metadata + request, metadata = ( + self._interceptor.pre_list_sk_ad_network_conversion_value_schemas( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListSKAdNetworkConversionValueSchemas._get_transcoded_request( http_options, request @@ -25479,11 +25204,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_sk_ad_network_conversion_value_schemas_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_sk_ad_network_conversion_value_schemas_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -25571,9 +25295,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListSubpropertyEventFilters._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListSubpropertyEventFilters._get_http_options() request, metadata = self._interceptor.pre_list_subproperty_event_filters( request, metadata @@ -25637,11 +25359,10 @@ def __call__( resp = self._interceptor.post_list_subproperty_event_filters(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_subproperty_event_filters_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_subproperty_event_filters_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -25729,9 +25450,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListSubpropertySyncConfigs._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListSubpropertySyncConfigs._get_http_options() request, metadata = self._interceptor.pre_list_subproperty_sync_configs( request, metadata @@ -25795,11 +25514,10 @@ def __call__( resp = self._interceptor.post_list_subproperty_sync_configs(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_subproperty_sync_configs_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_subproperty_sync_configs_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -25887,9 +25605,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseProvisionAccountTicket._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseProvisionAccountTicket._get_http_options() request, metadata = self._interceptor.pre_provision_account_ticket( request, metadata @@ -26045,9 +25761,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseProvisionSubproperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseProvisionSubproperty._get_http_options() request, metadata = self._interceptor.pre_provision_subproperty( request, metadata @@ -26199,9 +25913,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseReorderEventEditRules._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseReorderEventEditRules._get_http_options() request, metadata = self._interceptor.pre_reorder_event_edit_rules( request, metadata @@ -26227,7 +25939,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -26323,9 +26035,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseRunAccessReport._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseRunAccessReport._get_http_options() request, metadata = self._interceptor.pre_run_access_report( request, metadata @@ -26484,9 +26194,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseSearchChangeHistoryEvents._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseSearchChangeHistoryEvents._get_http_options() request, metadata = self._interceptor.pre_search_change_history_events( request, metadata @@ -26644,9 +26352,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseSubmitUserDeletion._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseSubmitUserDeletion._get_http_options() request, metadata = self._interceptor.pre_submit_user_deletion( request, metadata @@ -26804,9 +26510,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccessBinding._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccessBinding._get_http_options() request, metadata = self._interceptor.pre_update_access_binding( request, metadata @@ -26962,9 +26666,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccount._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccount._get_http_options() request, metadata = self._interceptor.pre_update_account(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccount._get_transcoded_request( @@ -27118,9 +26820,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAttributionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAttributionSettings._get_http_options() request, metadata = self._interceptor.pre_update_attribution_settings( request, metadata @@ -27274,9 +26974,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAudience._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAudience._get_http_options() request, metadata = self._interceptor.pre_update_audience(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAudience._get_transcoded_request( @@ -27428,9 +27126,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateBigQueryLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateBigQueryLink._get_http_options() request, metadata = self._interceptor.pre_update_big_query_link( request, metadata @@ -27584,9 +27280,7 @@ def __call__( A definition for a calculated metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCalculatedMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCalculatedMetric._get_http_options() request, metadata = self._interceptor.pre_update_calculated_metric( request, metadata @@ -27740,9 +27434,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateChannelGroup._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateChannelGroup._get_http_options() request, metadata = self._interceptor.pre_update_channel_group( request, metadata @@ -27898,9 +27590,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateConversionEvent._get_http_options() request, metadata = self._interceptor.pre_update_conversion_event( request, metadata @@ -28054,9 +27744,7 @@ def __call__( A definition for a CustomDimension. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomDimension._get_http_options() request, metadata = self._interceptor.pre_update_custom_dimension( request, metadata @@ -28210,9 +27898,7 @@ def __call__( A definition for a custom metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomMetric._get_http_options() request, metadata = self._interceptor.pre_update_custom_metric( request, metadata @@ -28372,9 +28058,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataRedactionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataRedactionSettings._get_http_options() request, metadata = self._interceptor.pre_update_data_redaction_settings( request, metadata @@ -28443,11 +28127,10 @@ def __call__( resp = self._interceptor.post_update_data_redaction_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_data_redaction_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_data_redaction_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -28534,9 +28217,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataRetentionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataRetentionSettings._get_http_options() request, metadata = self._interceptor.pre_update_data_retention_settings( request, metadata @@ -28605,11 +28286,10 @@ def __call__( resp = self._interceptor.post_update_data_retention_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_data_retention_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_data_retention_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -28693,9 +28373,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataStream._get_http_options() request, metadata = self._interceptor.pre_update_data_stream( request, metadata @@ -28855,15 +28533,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDisplayVideo360AdvertiserLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDisplayVideo360AdvertiserLink._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_display_video360_advertiser_link( - request, metadata + request, metadata = ( + self._interceptor.pre_update_display_video360_advertiser_link( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDisplayVideo360AdvertiserLink._get_transcoded_request( http_options, request @@ -28929,11 +28604,10 @@ def __call__( resp = self._interceptor.post_update_display_video360_advertiser_link(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_display_video360_advertiser_link_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_display_video360_advertiser_link_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -29024,15 +28698,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEnhancedMeasurementSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEnhancedMeasurementSettings._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_enhanced_measurement_settings( - request, metadata + request, metadata = ( + self._interceptor.pre_update_enhanced_measurement_settings( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEnhancedMeasurementSettings._get_transcoded_request( http_options, request @@ -29098,11 +28769,10 @@ def __call__( resp = self._interceptor.post_update_enhanced_measurement_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_enhanced_measurement_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_enhanced_measurement_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -29200,9 +28870,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEventCreateRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEventCreateRule._get_http_options() request, metadata = self._interceptor.pre_update_event_create_rule( request, metadata @@ -29372,9 +29040,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEventEditRule._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateEventEditRule._get_http_options() request, metadata = self._interceptor.pre_update_event_edit_rule( request, metadata @@ -29530,9 +29196,7 @@ def __call__( A resource message representing an ``ExpandedDataSet``. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateExpandedDataSet._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateExpandedDataSet._get_http_options() request, metadata = self._interceptor.pre_update_expanded_data_set( request, metadata @@ -29690,9 +29354,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateGoogleAdsLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateGoogleAdsLink._get_http_options() request, metadata = self._interceptor.pre_update_google_ads_link( request, metadata @@ -29851,9 +29513,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateGoogleSignalsSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateGoogleSignalsSettings._get_http_options() request, metadata = self._interceptor.pre_update_google_signals_settings( request, metadata @@ -29922,11 +29582,10 @@ def __call__( resp = self._interceptor.post_update_google_signals_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_google_signals_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_google_signals_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -30010,9 +29669,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateKeyEvent._get_http_options() request, metadata = self._interceptor.pre_update_key_event( request, metadata @@ -30169,15 +29826,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateMeasurementProtocolSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_measurement_protocol_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_update_measurement_protocol_secret( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateMeasurementProtocolSecret._get_transcoded_request( http_options, request @@ -30243,11 +29897,10 @@ def __call__( resp = self._interceptor.post_update_measurement_protocol_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_measurement_protocol_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_measurement_protocol_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -30333,9 +29986,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateProperty._get_http_options() request, metadata = self._interceptor.pre_update_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateProperty._get_transcoded_request( @@ -30491,9 +30142,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateReportingDataAnnotation._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateReportingDataAnnotation._get_http_options() request, metadata = self._interceptor.pre_update_reporting_data_annotation( request, metadata @@ -30562,11 +30211,10 @@ def __call__( resp = self._interceptor.post_update_reporting_data_annotation(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_reporting_data_annotation_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_reporting_data_annotation_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -30652,9 +30300,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSearchAds360Link._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSearchAds360Link._get_http_options() request, metadata = self._interceptor.pre_update_search_ads360_link( request, metadata @@ -30812,15 +30458,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSKAdNetworkConversionValueSchema._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSKAdNetworkConversionValueSchema._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_sk_ad_network_conversion_value_schema( - request, metadata + request, metadata = ( + self._interceptor.pre_update_sk_ad_network_conversion_value_schema( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSKAdNetworkConversionValueSchema._get_transcoded_request( http_options, request @@ -30888,11 +30531,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_sk_ad_network_conversion_value_schema_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_sk_ad_network_conversion_value_schema_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -30982,9 +30624,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSubpropertyEventFilter._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSubpropertyEventFilter._get_http_options() request, metadata = self._interceptor.pre_update_subproperty_event_filter( request, metadata @@ -31053,11 +30693,10 @@ def __call__( resp = self._interceptor.post_update_subproperty_event_filter(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_subproperty_event_filter_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_subproperty_event_filter_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -31152,9 +30791,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSubpropertySyncConfig._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateSubpropertySyncConfig._get_http_options() request, metadata = self._interceptor.pre_update_subproperty_sync_config( request, metadata @@ -31223,11 +30860,10 @@ def __call__( resp = self._interceptor.post_update_subproperty_sync_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_subproperty_sync_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_subproperty_sync_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -31261,7 +30897,9 @@ def acknowledge_user_data_collection( ]: # 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._AcknowledgeUserDataCollection(self._session, self._host, self._interceptor) # type: ignore + return self._AcknowledgeUserDataCollection( + self._session, self._host, self._interceptor + ) # type: ignore @property def approve_display_video360_advertiser_link_proposal( @@ -31272,7 +30910,9 @@ def approve_display_video360_advertiser_link_proposal( ]: # 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._ApproveDisplayVideo360AdvertiserLinkProposal(self._session, self._host, self._interceptor) # type: ignore + return self._ApproveDisplayVideo360AdvertiserLinkProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def archive_audience( @@ -31288,7 +30928,9 @@ def archive_custom_dimension( ) -> Callable[[analytics_admin.ArchiveCustomDimensionRequest], empty_pb2.Empty]: # 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._ArchiveCustomDimension(self._session, self._host, self._interceptor) # type: ignore + return self._ArchiveCustomDimension( + self._session, self._host, self._interceptor + ) # type: ignore @property def archive_custom_metric( @@ -31307,7 +30949,9 @@ def batch_create_access_bindings( ]: # 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._BatchCreateAccessBindings(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateAccessBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_delete_access_bindings( @@ -31315,7 +30959,9 @@ def batch_delete_access_bindings( ) -> Callable[[analytics_admin.BatchDeleteAccessBindingsRequest], empty_pb2.Empty]: # 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._BatchDeleteAccessBindings(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeleteAccessBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_get_access_bindings( @@ -31326,7 +30972,9 @@ def batch_get_access_bindings( ]: # 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._BatchGetAccessBindings(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetAccessBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_access_bindings( @@ -31337,7 +30985,9 @@ def batch_update_access_bindings( ]: # 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._BatchUpdateAccessBindings(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateAccessBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_display_video360_advertiser_link_proposal( @@ -31348,7 +30998,9 @@ def cancel_display_video360_advertiser_link_proposal( ]: # 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._CancelDisplayVideo360AdvertiserLinkProposal(self._session, self._host, self._interceptor) # type: ignore + return self._CancelDisplayVideo360AdvertiserLinkProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_access_binding( @@ -31392,7 +31044,9 @@ def create_calculated_metric( ]: # 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._CreateCalculatedMetric(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCalculatedMetric( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_channel_group( @@ -31449,7 +31103,9 @@ def create_display_video360_advertiser_link( ]: # 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._CreateDisplayVideo360AdvertiserLink(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDisplayVideo360AdvertiserLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_display_video360_advertiser_link_proposal( @@ -31460,7 +31116,9 @@ def create_display_video360_advertiser_link_proposal( ]: # 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._CreateDisplayVideo360AdvertiserLinkProposal(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDisplayVideo360AdvertiserLinkProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_event_create_rule( @@ -31530,7 +31188,9 @@ def create_measurement_protocol_secret( ]: # 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._CreateMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._CreateMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_property( @@ -31549,7 +31209,9 @@ def create_reporting_data_annotation( ]: # 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._CreateReportingDataAnnotation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateReportingDataAnnotation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_rollup_property( @@ -31571,7 +31233,9 @@ def create_rollup_property_source_link( ]: # 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._CreateRollupPropertySourceLink(self._session, self._host, self._interceptor) # type: ignore + return self._CreateRollupPropertySourceLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_search_ads360_link( @@ -31581,7 +31245,9 @@ def create_search_ads360_link( ]: # 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._CreateSearchAds360Link(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSearchAds360Link( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_sk_ad_network_conversion_value_schema( @@ -31592,7 +31258,9 @@ def create_sk_ad_network_conversion_value_schema( ]: # 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._CreateSKAdNetworkConversionValueSchema(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSKAdNetworkConversionValueSchema( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_subproperty_event_filter( @@ -31603,7 +31271,9 @@ def create_subproperty_event_filter( ]: # 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._CreateSubpropertyEventFilter(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSubpropertyEventFilter( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_access_binding( @@ -31643,7 +31313,9 @@ def delete_calculated_metric( ) -> Callable[[analytics_admin.DeleteCalculatedMetricRequest], empty_pb2.Empty]: # 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._DeleteCalculatedMetric(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCalculatedMetric( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_channel_group( @@ -31677,7 +31349,9 @@ def delete_display_video360_advertiser_link( ]: # 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._DeleteDisplayVideo360AdvertiserLink(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDisplayVideo360AdvertiserLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_display_video360_advertiser_link_proposal( @@ -31688,7 +31362,9 @@ def delete_display_video360_advertiser_link_proposal( ]: # 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._DeleteDisplayVideo360AdvertiserLinkProposal(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDisplayVideo360AdvertiserLinkProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_event_create_rule( @@ -31746,7 +31422,9 @@ def delete_measurement_protocol_secret( ]: # 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._DeleteMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_property( @@ -31764,7 +31442,9 @@ def delete_reporting_data_annotation( ]: # 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._DeleteReportingDataAnnotation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteReportingDataAnnotation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_rollup_property_source_link( @@ -31774,7 +31454,9 @@ def delete_rollup_property_source_link( ]: # 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._DeleteRollupPropertySourceLink(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteRollupPropertySourceLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_search_ads360_link( @@ -31782,7 +31464,9 @@ def delete_search_ads360_link( ) -> Callable[[analytics_admin.DeleteSearchAds360LinkRequest], empty_pb2.Empty]: # 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._DeleteSearchAds360Link(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSearchAds360Link( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_sk_ad_network_conversion_value_schema( @@ -31792,7 +31476,9 @@ def delete_sk_ad_network_conversion_value_schema( ]: # 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._DeleteSKAdNetworkConversionValueSchema(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSKAdNetworkConversionValueSchema( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_subproperty_event_filter( @@ -31802,7 +31488,9 @@ def delete_subproperty_event_filter( ]: # 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._DeleteSubpropertyEventFilter(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSubpropertyEventFilter( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_access_binding( @@ -31836,7 +31524,9 @@ def get_attribution_settings( ]: # 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._GetAttributionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetAttributionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_audience( @@ -31909,7 +31599,9 @@ def get_data_redaction_settings( ]: # 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._GetDataRedactionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataRedactionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_retention_settings( @@ -31920,7 +31612,9 @@ def get_data_retention_settings( ]: # 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._GetDataRetentionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataRetentionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_sharing_settings( @@ -31930,7 +31624,9 @@ def get_data_sharing_settings( ]: # 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._GetDataSharingSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataSharingSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_stream( @@ -31949,7 +31645,9 @@ def get_display_video360_advertiser_link( ]: # 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._GetDisplayVideo360AdvertiserLink(self._session, self._host, self._interceptor) # type: ignore + return self._GetDisplayVideo360AdvertiserLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_display_video360_advertiser_link_proposal( @@ -31960,7 +31658,9 @@ def get_display_video360_advertiser_link_proposal( ]: # 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._GetDisplayVideo360AdvertiserLinkProposal(self._session, self._host, self._interceptor) # type: ignore + return self._GetDisplayVideo360AdvertiserLinkProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_enhanced_measurement_settings( @@ -31971,7 +31671,9 @@ def get_enhanced_measurement_settings( ]: # 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._GetEnhancedMeasurementSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetEnhancedMeasurementSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_event_create_rule( @@ -32021,7 +31723,9 @@ def get_google_signals_settings( ]: # 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._GetGoogleSignalsSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetGoogleSignalsSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_key_event( @@ -32040,7 +31744,9 @@ def get_measurement_protocol_secret( ]: # 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._GetMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._GetMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_property( @@ -32059,7 +31765,9 @@ def get_reporting_data_annotation( ]: # 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._GetReportingDataAnnotation(self._session, self._host, self._interceptor) # type: ignore + return self._GetReportingDataAnnotation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_reporting_identity_settings( @@ -32070,7 +31778,9 @@ def get_reporting_identity_settings( ]: # 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._GetReportingIdentitySettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetReportingIdentitySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_rollup_property_source_link( @@ -32081,7 +31791,9 @@ def get_rollup_property_source_link( ]: # 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._GetRollupPropertySourceLink(self._session, self._host, self._interceptor) # type: ignore + return self._GetRollupPropertySourceLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_search_ads360_link( @@ -32102,7 +31814,9 @@ def get_sk_ad_network_conversion_value_schema( ]: # 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._GetSKAdNetworkConversionValueSchema(self._session, self._host, self._interceptor) # type: ignore + return self._GetSKAdNetworkConversionValueSchema( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_subproperty_event_filter( @@ -32113,7 +31827,9 @@ def get_subproperty_event_filter( ]: # 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._GetSubpropertyEventFilter(self._session, self._host, self._interceptor) # type: ignore + return self._GetSubpropertyEventFilter( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_subproperty_sync_config( @@ -32124,7 +31840,9 @@ def get_subproperty_sync_config( ]: # 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._GetSubpropertySyncConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetSubpropertySyncConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_access_bindings( @@ -32265,7 +31983,9 @@ def list_display_video360_advertiser_link_proposals( ]: # 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._ListDisplayVideo360AdvertiserLinkProposals(self._session, self._host, self._interceptor) # type: ignore + return self._ListDisplayVideo360AdvertiserLinkProposals( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_display_video360_advertiser_links( @@ -32276,7 +31996,9 @@ def list_display_video360_advertiser_links( ]: # 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._ListDisplayVideo360AdvertiserLinks(self._session, self._host, self._interceptor) # type: ignore + return self._ListDisplayVideo360AdvertiserLinks( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_event_create_rules( @@ -32352,7 +32074,9 @@ def list_measurement_protocol_secrets( ]: # 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._ListMeasurementProtocolSecrets(self._session, self._host, self._interceptor) # type: ignore + return self._ListMeasurementProtocolSecrets( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_properties( @@ -32373,7 +32097,9 @@ def list_reporting_data_annotations( ]: # 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._ListReportingDataAnnotations(self._session, self._host, self._interceptor) # type: ignore + return self._ListReportingDataAnnotations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_rollup_property_source_links( @@ -32384,7 +32110,9 @@ def list_rollup_property_source_links( ]: # 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._ListRollupPropertySourceLinks(self._session, self._host, self._interceptor) # type: ignore + return self._ListRollupPropertySourceLinks( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_search_ads360_links( @@ -32406,7 +32134,9 @@ def list_sk_ad_network_conversion_value_schemas( ]: # 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._ListSKAdNetworkConversionValueSchemas(self._session, self._host, self._interceptor) # type: ignore + return self._ListSKAdNetworkConversionValueSchemas( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_subproperty_event_filters( @@ -32417,7 +32147,9 @@ def list_subproperty_event_filters( ]: # 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._ListSubpropertyEventFilters(self._session, self._host, self._interceptor) # type: ignore + return self._ListSubpropertyEventFilters( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_subproperty_sync_configs( @@ -32428,7 +32160,9 @@ def list_subproperty_sync_configs( ]: # 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._ListSubpropertySyncConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListSubpropertySyncConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def provision_account_ticket( @@ -32439,7 +32173,9 @@ def provision_account_ticket( ]: # 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._ProvisionAccountTicket(self._session, self._host, self._interceptor) # type: ignore + return self._ProvisionAccountTicket( + self._session, self._host, self._interceptor + ) # type: ignore @property def provision_subproperty( @@ -32480,7 +32216,9 @@ def search_change_history_events( ]: # 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._SearchChangeHistoryEvents(self._session, self._host, self._interceptor) # type: ignore + return self._SearchChangeHistoryEvents( + self._session, self._host, self._interceptor + ) # type: ignore @property def submit_user_deletion( @@ -32520,7 +32258,9 @@ def update_attribution_settings( ]: # 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._UpdateAttributionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAttributionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_audience( @@ -32546,7 +32286,9 @@ def update_calculated_metric( ]: # 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._UpdateCalculatedMetric(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCalculatedMetric( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_channel_group( @@ -32595,7 +32337,9 @@ def update_data_redaction_settings( ]: # 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._UpdateDataRedactionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDataRedactionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_data_retention_settings( @@ -32606,7 +32350,9 @@ def update_data_retention_settings( ]: # 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._UpdateDataRetentionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDataRetentionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_data_stream( @@ -32625,7 +32371,9 @@ def update_display_video360_advertiser_link( ]: # 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._UpdateDisplayVideo360AdvertiserLink(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDisplayVideo360AdvertiserLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_enhanced_measurement_settings( @@ -32636,7 +32384,9 @@ def update_enhanced_measurement_settings( ]: # 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._UpdateEnhancedMeasurementSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateEnhancedMeasurementSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_event_create_rule( @@ -32690,7 +32440,9 @@ def update_google_signals_settings( ]: # 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._UpdateGoogleSignalsSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateGoogleSignalsSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_key_event( @@ -32709,7 +32461,9 @@ def update_measurement_protocol_secret( ]: # 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._UpdateMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_property( @@ -32728,7 +32482,9 @@ def update_reporting_data_annotation( ]: # 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._UpdateReportingDataAnnotation(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateReportingDataAnnotation( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_search_ads360_link( @@ -32738,7 +32494,9 @@ def update_search_ads360_link( ]: # 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._UpdateSearchAds360Link(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSearchAds360Link( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_sk_ad_network_conversion_value_schema( @@ -32749,7 +32507,9 @@ def update_sk_ad_network_conversion_value_schema( ]: # 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._UpdateSKAdNetworkConversionValueSchema(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSKAdNetworkConversionValueSchema( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_subproperty_event_filter( @@ -32760,7 +32520,9 @@ def update_subproperty_event_filter( ]: # 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._UpdateSubpropertyEventFilter(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSubpropertyEventFilter( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_subproperty_sync_config( @@ -32771,7 +32533,9 @@ def update_subproperty_sync_config( ]: # 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._UpdateSubpropertySyncConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSubpropertySyncConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest_base.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest_base.py index 6752c22a9022..737034dadcec 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest_base.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/rest_base.py @@ -17,10 +17,20 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.analytics.admin_v1alpha.types import ( + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -28,14 +38,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter from .base import DEFAULT_CLIENT_INFO, AnalyticsAdminServiceTransport diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/access_report.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/access_report.py index 04e2be2a8ead..53902be53158 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/access_report.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/access_report.py @@ -285,6 +285,7 @@ class MatchType(proto.Enum): Partial match for the regular expression with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -355,6 +356,7 @@ class Operation(proto.Enum): GREATER_THAN_OR_EQUAL (5): Greater than or equal """ + OPERATION_UNSPECIFIED = 0 EQUAL = 1 LESS_THAN = 2 @@ -501,6 +503,7 @@ class OrderType(proto.Enum): values all have equal ordering value below all numeric values. """ + ORDER_TYPE_UNSPECIFIED = 0 ALPHANUMERIC = 1 CASE_INSENSITIVE_ALPHANUMERIC = 2 diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py index 4e332c481647..a56b944eae24 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py @@ -17,10 +17,16 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.analytics.admin_v1alpha.types import ( + access_report, + event_create_and_edit, + resources, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -28,10 +34,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import access_report -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import resources __protobuf__ = proto.module( package="google.analytics.admin.v1alpha", @@ -430,19 +432,19 @@ class RunAccessReportResponse(proto.Message): with account-level requests. """ - dimension_headers: MutableSequence[ - access_report.AccessDimensionHeader - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=access_report.AccessDimensionHeader, + dimension_headers: MutableSequence[access_report.AccessDimensionHeader] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=access_report.AccessDimensionHeader, + ) ) - metric_headers: MutableSequence[ - access_report.AccessMetricHeader - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=access_report.AccessMetricHeader, + metric_headers: MutableSequence[access_report.AccessMetricHeader] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=access_report.AccessMetricHeader, + ) ) rows: MutableSequence[access_report.AccessRow] = proto.RepeatedField( proto.MESSAGE, @@ -1198,12 +1200,12 @@ class SearchChangeHistoryEventsRequest(proto.Message): proto.STRING, number=2, ) - resource_type: MutableSequence[ - resources.ChangeHistoryResourceType - ] = proto.RepeatedField( - proto.ENUM, - number=3, - enum=resources.ChangeHistoryResourceType, + resource_type: MutableSequence[resources.ChangeHistoryResourceType] = ( + proto.RepeatedField( + proto.ENUM, + number=3, + enum=resources.ChangeHistoryResourceType, + ) ) action: MutableSequence[resources.ActionType] = proto.RepeatedField( proto.ENUM, @@ -1250,12 +1252,12 @@ class SearchChangeHistoryEventsResponse(proto.Message): def raw_page(self): return self - change_history_events: MutableSequence[ - resources.ChangeHistoryEvent - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.ChangeHistoryEvent, + change_history_events: MutableSequence[resources.ChangeHistoryEvent] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.ChangeHistoryEvent, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -2293,12 +2295,12 @@ class ListSearchAds360LinksResponse(proto.Message): def raw_page(self): return self - search_ads_360_links: MutableSequence[ - resources.SearchAds360Link - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.SearchAds360Link, + search_ads_360_links: MutableSequence[resources.SearchAds360Link] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.SearchAds360Link, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -2773,12 +2775,12 @@ class ListCalculatedMetricsResponse(proto.Message): def raw_page(self): return self - calculated_metrics: MutableSequence[ - resources.CalculatedMetric - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.CalculatedMetric, + calculated_metrics: MutableSequence[resources.CalculatedMetric] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.CalculatedMetric, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -3604,12 +3606,12 @@ class ListExpandedDataSetsResponse(proto.Message): def raw_page(self): return self - expanded_data_sets: MutableSequence[ - gaa_expanded_data_set.ExpandedDataSet - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gaa_expanded_data_set.ExpandedDataSet, + expanded_data_sets: MutableSequence[gaa_expanded_data_set.ExpandedDataSet] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gaa_expanded_data_set.ExpandedDataSet, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -3750,12 +3752,12 @@ class ListChannelGroupsResponse(proto.Message): def raw_page(self): return self - channel_groups: MutableSequence[ - gaa_channel_group.ChannelGroup - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gaa_channel_group.ChannelGroup, + channel_groups: MutableSequence[gaa_channel_group.ChannelGroup] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gaa_channel_group.ChannelGroup, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -4246,12 +4248,12 @@ class ListEventCreateRulesResponse(proto.Message): def raw_page(self): return self - event_create_rules: MutableSequence[ - event_create_and_edit.EventCreateRule - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=event_create_and_edit.EventCreateRule, + event_create_rules: MutableSequence[event_create_and_edit.EventCreateRule] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=event_create_and_edit.EventCreateRule, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -4392,12 +4394,12 @@ class ListEventEditRulesResponse(proto.Message): def raw_page(self): return self - event_edit_rules: MutableSequence[ - event_create_and_edit.EventEditRule - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=event_create_and_edit.EventEditRule, + event_edit_rules: MutableSequence[event_create_and_edit.EventEditRule] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=event_create_and_edit.EventEditRule, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -4957,12 +4959,12 @@ class ListReportingDataAnnotationsResponse(proto.Message): def raw_page(self): return self - reporting_data_annotations: MutableSequence[ - resources.ReportingDataAnnotation - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.ReportingDataAnnotation, + reporting_data_annotations: MutableSequence[resources.ReportingDataAnnotation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.ReportingDataAnnotation, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -5175,12 +5177,12 @@ class ListSubpropertySyncConfigsResponse(proto.Message): def raw_page(self): return self - subproperty_sync_configs: MutableSequence[ - resources.SubpropertySyncConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.SubpropertySyncConfig, + subproperty_sync_configs: MutableSequence[resources.SubpropertySyncConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.SubpropertySyncConfig, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/audience.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/audience.py index 37a0926e75c0..58b7d8facf53 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/audience.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/audience.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -55,6 +55,7 @@ class AudienceFilterScope(proto.Enum): condition is met by any event across any session. """ + AUDIENCE_FILTER_SCOPE_UNSPECIFIED = 0 AUDIENCE_FILTER_SCOPE_WITHIN_SAME_EVENT = 1 AUDIENCE_FILTER_SCOPE_WITHIN_SAME_SESSION = 2 @@ -159,6 +160,7 @@ class MatchType(proto.Enum): Full regular expression matches with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -262,6 +264,7 @@ class Operation(proto.Enum): GREATER_THAN (4): Greater than. """ + OPERATION_UNSPECIFIED = 0 EQUAL = 1 LESS_THAN = 2 @@ -457,12 +460,12 @@ class AudienceFilterExpressionList(proto.Message): A list of Audience filter expressions. """ - filter_expressions: MutableSequence[ - "AudienceFilterExpression" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AudienceFilterExpression", + filter_expressions: MutableSequence["AudienceFilterExpression"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AudienceFilterExpression", + ) ) @@ -617,6 +620,7 @@ class AudienceClauseType(proto.Enum): Users will be excluded from the Audience if the filter clause is met. """ + AUDIENCE_CLAUSE_TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -664,6 +668,7 @@ class LogCondition(proto.Enum): Audience condition is met, even if the user is already a member of the Audience. """ + LOG_CONDITION_UNSPECIFIED = 0 AUDIENCE_JOINED = 1 AUDIENCE_MEMBERSHIP_RENEWED = 2 @@ -732,6 +737,7 @@ class AudienceExclusionDurationMode(proto.Enum): Exclude users from the Audience if they've ever met the filter clause. """ + AUDIENCE_EXCLUSION_DURATION_MODE_UNSPECIFIED = 0 EXCLUDE_TEMPORARILY = 1 EXCLUDE_PERMANENTLY = 2 diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/channel_group.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/channel_group.py index f31adc8950f9..2b1288ec3b0a 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/channel_group.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/channel_group.py @@ -91,6 +91,7 @@ class MatchType(proto.Enum): Partial regular expression match with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -213,12 +214,12 @@ class ChannelGroupFilterExpressionList(proto.Message): A list of Channel Group filter expressions. """ - filter_expressions: MutableSequence[ - "ChannelGroupFilterExpression" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ChannelGroupFilterExpression", + filter_expressions: MutableSequence["ChannelGroupFilterExpression"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ChannelGroupFilterExpression", + ) ) diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/event_create_and_edit.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/event_create_and_edit.py index 6b488354e27b..47923a7debb5 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/event_create_and_edit.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/event_create_and_edit.py @@ -260,6 +260,7 @@ class ComparisonType(proto.Enum): regular expression, case insensitive. Only supported for web streams. """ + COMPARISON_TYPE_UNSPECIFIED = 0 EQUALS = 1 EQUALS_CASE_INSENSITIVE = 2 diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/expanded_data_set.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/expanded_data_set.py index 594986314071..4fe0bcc31bf1 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/expanded_data_set.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/expanded_data_set.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -84,6 +84,7 @@ class MatchType(proto.Enum): CONTAINS (2): Contains the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 CONTAINS = 2 @@ -204,12 +205,12 @@ class ExpandedDataSetFilterExpressionList(proto.Message): A list of ExpandedDataSet filter expressions. """ - filter_expressions: MutableSequence[ - "ExpandedDataSetFilterExpression" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ExpandedDataSetFilterExpression", + filter_expressions: MutableSequence["ExpandedDataSetFilterExpression"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ExpandedDataSetFilterExpression", + ) ) diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/resources.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/resources.py index 47b078ddc522..9d50d4498249 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/resources.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/resources.py @@ -17,17 +17,17 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group +from google.analytics.admin_v1alpha.types import event_create_and_edit from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, ) -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import event_create_and_edit __protobuf__ = proto.module( package="google.analytics.admin.v1alpha", @@ -144,6 +144,7 @@ class IndustryCategory(proto.Enum): SHOPPING (26): Shopping """ + INDUSTRY_CATEGORY_UNSPECIFIED = 0 AUTOMOTIVE = 1 BUSINESS_AND_INDUSTRIAL_MARKETS = 2 @@ -185,6 +186,7 @@ class ServiceLevel(proto.Enum): The paid, premium version of Google Analytics. """ + SERVICE_LEVEL_UNSPECIFIED = 0 GOOGLE_ANALYTICS_STANDARD = 1 GOOGLE_ANALYTICS_360 = 2 @@ -205,6 +207,7 @@ class ActorType(proto.Enum): Changes made by Google Analytics support team staff. """ + ACTOR_TYPE_UNSPECIFIED = 0 USER = 1 SYSTEM = 2 @@ -224,6 +227,7 @@ class ActionType(proto.Enum): DELETED (3): Resource was deleted in this change. """ + ACTION_TYPE_UNSPECIFIED = 0 CREATED = 1 UPDATED = 2 @@ -297,6 +301,7 @@ class ChangeHistoryResourceType(proto.Enum): REPORTING_IDENTITY_SETTINGS (34): ReportingIdentitySettings resource """ + CHANGE_HISTORY_RESOURCE_TYPE_UNSPECIFIED = 0 ACCOUNT = 1 PROPERTY = 2 @@ -342,6 +347,7 @@ class GoogleSignalsState(proto.Enum): GOOGLE_SIGNALS_DISABLED (2): Google Signals is disabled. """ + GOOGLE_SIGNALS_STATE_UNSPECIFIED = 0 GOOGLE_SIGNALS_ENABLED = 1 GOOGLE_SIGNALS_DISABLED = 2 @@ -360,6 +366,7 @@ class GoogleSignalsConsent(proto.Enum): GOOGLE_SIGNALS_CONSENT_NOT_CONSENTED (1): Terms of service have not been accepted """ + GOOGLE_SIGNALS_CONSENT_UNSPECIFIED = 0 GOOGLE_SIGNALS_CONSENT_CONSENTED = 2 GOOGLE_SIGNALS_CONSENT_NOT_CONSENTED = 1 @@ -379,6 +386,7 @@ class LinkProposalInitiatingProduct(proto.Enum): This proposal was created by a user from a linked product (not Google Analytics). """ + LINK_PROPOSAL_INITIATING_PRODUCT_UNSPECIFIED = 0 GOOGLE_ANALYTICS = 1 LINKED_PRODUCT = 2 @@ -418,6 +426,7 @@ class LinkProposalState(proto.Enum): This proposal will be automatically deleted after some time. """ + LINK_PROPOSAL_STATE_UNSPECIFIED = 0 AWAITING_REVIEW_FROM_GOOGLE_ANALYTICS = 1 AWAITING_REVIEW_FROM_LINKED_PRODUCT = 2 @@ -440,6 +449,7 @@ class PropertyType(proto.Enum): PROPERTY_TYPE_ROLLUP (3): Google Analytics rollup property """ + PROPERTY_TYPE_UNSPECIFIED = 0 PROPERTY_TYPE_ORDINARY = 1 PROPERTY_TYPE_SUBPROPERTY = 2 @@ -462,6 +472,7 @@ class CoarseValue(proto.Enum): COARSE_VALUE_HIGH (3): Coarse value of high. """ + COARSE_VALUE_UNSPECIFIED = 0 COARSE_VALUE_LOW = 1 COARSE_VALUE_MEDIUM = 2 @@ -720,6 +731,7 @@ class DataStreamType(proto.Enum): IOS_APP_DATA_STREAM (3): iOS app data stream. """ + DATA_STREAM_TYPE_UNSPECIFIED = 0 WEB_DATA_STREAM = 1 ANDROID_APP_DATA_STREAM = 2 @@ -2175,6 +2187,7 @@ class ConversionCountingMethod(proto.Enum): An Event instance is considered a Conversion at most once per session per user. """ + CONVERSION_COUNTING_METHOD_UNSPECIFIED = 0 ONCE_PER_EVENT = 1 ONCE_PER_SESSION = 2 @@ -2296,6 +2309,7 @@ class CountingMethod(proto.Enum): An Event instance is considered a Key Event at most once per session per user. """ + COUNTING_METHOD_UNSPECIFIED = 0 ONCE_PER_EVENT = 1 ONCE_PER_SESSION = 2 @@ -2450,6 +2464,7 @@ class DimensionScope(proto.Enum): ITEM (3): Dimension scoped to eCommerce items """ + DIMENSION_SCOPE_UNSPECIFIED = 0 EVENT = 1 USER = 2 @@ -2553,6 +2568,7 @@ class MeasurementUnit(proto.Enum): HOURS (10): This metric measures hours. """ + MEASUREMENT_UNIT_UNSPECIFIED = 0 STANDARD = 1 CURRENCY = 2 @@ -2574,6 +2590,7 @@ class MetricScope(proto.Enum): EVENT (1): Metric scoped to an event. """ + METRIC_SCOPE_UNSPECIFIED = 0 EVENT = 1 @@ -2589,6 +2606,7 @@ class RestrictedMetricType(proto.Enum): REVENUE_DATA (2): Metric reports revenue data. """ + RESTRICTED_METRIC_TYPE_UNSPECIFIED = 0 COST_DATA = 1 REVENUE_DATA = 2 @@ -2699,6 +2717,7 @@ class MetricUnit(proto.Enum): HOURS (10): This metric measures hours. """ + METRIC_UNIT_UNSPECIFIED = 0 STANDARD = 1 CURRENCY = 2 @@ -2724,6 +2743,7 @@ class RestrictedMetricType(proto.Enum): REVENUE_DATA (2): Metric reports revenue data. """ + RESTRICTED_METRIC_TYPE_UNSPECIFIED = 0 COST_DATA = 1 REVENUE_DATA = 2 @@ -2809,6 +2829,7 @@ class RetentionDuration(proto.Enum): months. Available to 360 properties only. Available for event data only. """ + RETENTION_DURATION_UNSPECIFIED = 0 TWO_MONTHS = 1 FOURTEEN_MONTHS = 3 @@ -2882,6 +2903,7 @@ class AcquisitionConversionEventLookbackWindow(proto.Enum): ACQUISITION_CONVERSION_EVENT_LOOKBACK_WINDOW_30_DAYS (2): 30-day lookback window. """ + ACQUISITION_CONVERSION_EVENT_LOOKBACK_WINDOW_UNSPECIFIED = 0 ACQUISITION_CONVERSION_EVENT_LOOKBACK_WINDOW_7_DAYS = 1 ACQUISITION_CONVERSION_EVENT_LOOKBACK_WINDOW_30_DAYS = 2 @@ -2901,6 +2923,7 @@ class OtherConversionEventLookbackWindow(proto.Enum): OTHER_CONVERSION_EVENT_LOOKBACK_WINDOW_90_DAYS (3): 90-day lookback window. """ + OTHER_CONVERSION_EVENT_LOOKBACK_WINDOW_UNSPECIFIED = 0 OTHER_CONVERSION_EVENT_LOOKBACK_WINDOW_30_DAYS = 1 OTHER_CONVERSION_EVENT_LOOKBACK_WINDOW_60_DAYS = 2 @@ -2928,6 +2951,7 @@ class ReportingAttributionModel(proto.Enum): Paid channel that the customer clicked through before converting. Previously ADS_PREFERRED_LAST_CLICK """ + REPORTING_ATTRIBUTION_MODEL_UNSPECIFIED = 0 PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN = 1 PAID_AND_ORGANIC_CHANNELS_LAST_CLICK = 2 @@ -2955,6 +2979,7 @@ class AdsWebConversionDataExportScope(proto.Enum): conversion credit. To learn more, see `Google Paid channels `__. """ + ADS_WEB_CONVERSION_DATA_EXPORT_SCOPE_UNSPECIFIED = 0 NOT_SELECTED_YET = 1 PAID_AND_ORGANIC_CHANNELS = 2 @@ -3400,6 +3425,7 @@ class Color(proto.Enum): Orange color. (Only used for system-generated annotations) """ + COLOR_UNSPECIFIED = 0 PURPLE = 1 BROWN = 2 @@ -3518,6 +3544,7 @@ class SynchronizationMode(proto.Enum): property. Local mutations are not allowed on the subproperty (Create / Update / Delete) """ + SYNCHRONIZATION_MODE_UNSPECIFIED = 0 NONE = 1 ALL = 2 @@ -3565,6 +3592,7 @@ class ReportingIdentity(proto.Enum): DEVICE_BASED (3): Device-based reporting identity strategy. """ + IDENTITY_BLENDING_STRATEGY_UNSPECIFIED = 0 BLENDED = 1 OBSERVED = 2 diff --git a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/subproperty_event_filter.py b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/subproperty_event_filter.py index 9c2f204bfeed..15731b5bf7a8 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/subproperty_event_filter.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1alpha/types/subproperty_event_filter.py @@ -93,6 +93,7 @@ class MatchType(proto.Enum): Partial regular expression matches with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -194,12 +195,12 @@ class SubpropertyEventFilterExpressionList(proto.Message): Subproperty event filter expressions """ - filter_expressions: MutableSequence[ - "SubpropertyEventFilterExpression" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SubpropertyEventFilterExpression", + filter_expressions: MutableSequence["SubpropertyEventFilterExpression"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SubpropertyEventFilterExpression", + ) ) @@ -231,6 +232,7 @@ class FilterClauseType(proto.Enum): Events will be excluded from the Sub property if the filter clause is met. """ + FILTER_CLAUSE_TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -280,12 +282,12 @@ class SubpropertyEventFilter(proto.Message): number=2, optional=True, ) - filter_clauses: MutableSequence[ - "SubpropertyEventFilterClause" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SubpropertyEventFilterClause", + filter_clauses: MutableSequence["SubpropertyEventFilterClause"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SubpropertyEventFilterClause", + ) ) diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/__init__.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/__init__.py index fbae194a5849..01dda1535b13 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/__init__.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.analytics_admin_service import ( AnalyticsAdminServiceAsyncClient, AnalyticsAdminServiceClient, diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/async_client.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/async_client.py index 044a3ab3a08b..f4716c52885b 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/async_client.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.admin_v1beta import gapic_version as package_version @@ -45,9 +45,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.analytics.admin_v1beta.services.analytics_admin_service import pagers from google.analytics.admin_v1beta.types import ( @@ -188,7 +188,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AnalyticsAdminServiceAsyncClient: The constructed client. """ - return AnalyticsAdminServiceClient.from_service_account_info.__func__(AnalyticsAdminServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AnalyticsAdminServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AnalyticsAdminServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -204,7 +205,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AnalyticsAdminServiceAsyncClient: The constructed client. """ - return AnalyticsAdminServiceClient.from_service_account_file.__func__(AnalyticsAdminServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AnalyticsAdminServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AnalyticsAdminServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -242,7 +244,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AnalyticsAdminServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AnalyticsAdminServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AnalyticsAdminServiceTransport: diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/client.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/client.py index 6aa6cd2a8798..0c88d2660100 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/client.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.admin_v1beta import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.analytics.admin_v1beta.services.analytics_admin_service import pagers from google.analytics.admin_v1beta.types import ( @@ -86,9 +86,7 @@ class AnalyticsAdminServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AnalyticsAdminServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsAdminServiceTransport]] _transport_registry["grpc"] = AnalyticsAdminServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsAdminServiceGrpcAsyncIOTransport _transport_registry["rest"] = AnalyticsAdminServiceRestTransport @@ -860,11 +858,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AnalyticsAdminServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AnalyticsAdminServiceClient._read_environment_variables() + ) self._client_cert_source = AnalyticsAdminServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -899,8 +895,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AnalyticsAdminServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/pagers.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/pagers.py index eda6d347944a..03cdf55db47f 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/pagers.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -381,7 +381,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -537,7 +537,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -613,7 +613,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -693,7 +693,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -769,7 +769,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -849,7 +849,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -927,7 +927,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1009,7 +1009,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1087,7 +1087,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1169,7 +1169,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1245,7 +1245,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1327,7 +1327,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1403,7 +1403,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1483,7 +1483,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1559,7 +1559,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1641,7 +1641,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1717,7 +1717,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1797,7 +1797,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1873,7 +1873,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/__init__.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/__init__.py index 36fdaad681d1..13b4fb2c6f02 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/__init__.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AnalyticsAdminServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsAdminServiceTransport]] _transport_registry["grpc"] = AnalyticsAdminServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsAdminServiceGrpcAsyncIOTransport _transport_registry["rest"] = AnalyticsAdminServiceRestTransport diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/base.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/base.py index 2ce496934131..f3d290afbc0c 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/base.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.analytics.admin_v1beta import gapic_version as package_version from google.analytics.admin_v1beta.types import analytics_admin, resources diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc.py index 145ee73db6f7..9565903d80a9 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.analytics.admin_v1beta.types import analytics_admin, resources @@ -901,12 +901,12 @@ def get_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "get_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/GetMeasurementProtocolSecret", - request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["get_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/GetMeasurementProtocolSecret", + request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["get_measurement_protocol_secret"] @@ -934,12 +934,12 @@ def list_measurement_protocol_secrets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_measurement_protocol_secrets" not in self._stubs: - self._stubs[ - "list_measurement_protocol_secrets" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/ListMeasurementProtocolSecrets", - request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, - response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + self._stubs["list_measurement_protocol_secrets"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/ListMeasurementProtocolSecrets", + request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, + response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + ) ) return self._stubs["list_measurement_protocol_secrets"] @@ -966,12 +966,12 @@ def create_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "create_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/CreateMeasurementProtocolSecret", - request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["create_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/CreateMeasurementProtocolSecret", + request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["create_measurement_protocol_secret"] @@ -997,12 +997,12 @@ def delete_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "delete_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/DeleteMeasurementProtocolSecret", - request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/DeleteMeasurementProtocolSecret", + request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_measurement_protocol_secret"] @@ -1029,12 +1029,12 @@ def update_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "update_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateMeasurementProtocolSecret", - request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["update_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateMeasurementProtocolSecret", + request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["update_measurement_protocol_secret"] @@ -1065,12 +1065,12 @@ def acknowledge_user_data_collection( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "acknowledge_user_data_collection" not in self._stubs: - self._stubs[ - "acknowledge_user_data_collection" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/AcknowledgeUserDataCollection", - request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, - response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + self._stubs["acknowledge_user_data_collection"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/AcknowledgeUserDataCollection", + request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, + response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + ) ) return self._stubs["acknowledge_user_data_collection"] @@ -1100,12 +1100,12 @@ def search_change_history_events( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_change_history_events" not in self._stubs: - self._stubs[ - "search_change_history_events" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/SearchChangeHistoryEvents", - request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, - response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + self._stubs["search_change_history_events"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/SearchChangeHistoryEvents", + request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, + response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + ) ) return self._stubs["search_change_history_events"] @@ -1684,12 +1684,12 @@ def get_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_retention_settings" not in self._stubs: - self._stubs[ - "get_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/GetDataRetentionSettings", - request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["get_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/GetDataRetentionSettings", + request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["get_data_retention_settings"] @@ -1716,12 +1716,12 @@ def update_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_retention_settings" not in self._stubs: - self._stubs[ - "update_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateDataRetentionSettings", - request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["update_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateDataRetentionSettings", + request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["update_data_retention_settings"] diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc_asyncio.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc_asyncio.py index b2986da8655e..f1492a1e5292 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc_asyncio.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.analytics.admin_v1beta.types import analytics_admin, resources @@ -924,12 +924,12 @@ def get_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "get_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/GetMeasurementProtocolSecret", - request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["get_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/GetMeasurementProtocolSecret", + request_serializer=analytics_admin.GetMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["get_measurement_protocol_secret"] @@ -957,12 +957,12 @@ def list_measurement_protocol_secrets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_measurement_protocol_secrets" not in self._stubs: - self._stubs[ - "list_measurement_protocol_secrets" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/ListMeasurementProtocolSecrets", - request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, - response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + self._stubs["list_measurement_protocol_secrets"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/ListMeasurementProtocolSecrets", + request_serializer=analytics_admin.ListMeasurementProtocolSecretsRequest.serialize, + response_deserializer=analytics_admin.ListMeasurementProtocolSecretsResponse.deserialize, + ) ) return self._stubs["list_measurement_protocol_secrets"] @@ -989,12 +989,12 @@ def create_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "create_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/CreateMeasurementProtocolSecret", - request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["create_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/CreateMeasurementProtocolSecret", + request_serializer=analytics_admin.CreateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["create_measurement_protocol_secret"] @@ -1021,12 +1021,12 @@ def delete_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "delete_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/DeleteMeasurementProtocolSecret", - request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/DeleteMeasurementProtocolSecret", + request_serializer=analytics_admin.DeleteMeasurementProtocolSecretRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_measurement_protocol_secret"] @@ -1053,12 +1053,12 @@ def update_measurement_protocol_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_measurement_protocol_secret" not in self._stubs: - self._stubs[ - "update_measurement_protocol_secret" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateMeasurementProtocolSecret", - request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, - response_deserializer=resources.MeasurementProtocolSecret.deserialize, + self._stubs["update_measurement_protocol_secret"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateMeasurementProtocolSecret", + request_serializer=analytics_admin.UpdateMeasurementProtocolSecretRequest.serialize, + response_deserializer=resources.MeasurementProtocolSecret.deserialize, + ) ) return self._stubs["update_measurement_protocol_secret"] @@ -1089,12 +1089,12 @@ def acknowledge_user_data_collection( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "acknowledge_user_data_collection" not in self._stubs: - self._stubs[ - "acknowledge_user_data_collection" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/AcknowledgeUserDataCollection", - request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, - response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + self._stubs["acknowledge_user_data_collection"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/AcknowledgeUserDataCollection", + request_serializer=analytics_admin.AcknowledgeUserDataCollectionRequest.serialize, + response_deserializer=analytics_admin.AcknowledgeUserDataCollectionResponse.deserialize, + ) ) return self._stubs["acknowledge_user_data_collection"] @@ -1124,12 +1124,12 @@ def search_change_history_events( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_change_history_events" not in self._stubs: - self._stubs[ - "search_change_history_events" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/SearchChangeHistoryEvents", - request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, - response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + self._stubs["search_change_history_events"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/SearchChangeHistoryEvents", + request_serializer=analytics_admin.SearchChangeHistoryEventsRequest.serialize, + response_deserializer=analytics_admin.SearchChangeHistoryEventsResponse.deserialize, + ) ) return self._stubs["search_change_history_events"] @@ -1731,12 +1731,12 @@ def get_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_retention_settings" not in self._stubs: - self._stubs[ - "get_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/GetDataRetentionSettings", - request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["get_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/GetDataRetentionSettings", + request_serializer=analytics_admin.GetDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["get_data_retention_settings"] @@ -1763,12 +1763,12 @@ def update_data_retention_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_retention_settings" not in self._stubs: - self._stubs[ - "update_data_retention_settings" - ] = self._logged_channel.unary_unary( - "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateDataRetentionSettings", - request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, - response_deserializer=resources.DataRetentionSettings.deserialize, + self._stubs["update_data_retention_settings"] = ( + self._logged_channel.unary_unary( + "/google.analytics.admin.v1beta.AnalyticsAdminService/UpdateDataRetentionSettings", + request_serializer=analytics_admin.UpdateDataRetentionSettingsRequest.serialize, + response_deserializer=resources.DataRetentionSettings.deserialize, + ) ) return self._stubs["update_data_retention_settings"] diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest.py index 9e77f0983433..c38632009b51 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -2976,9 +2976,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseAcknowledgeUserDataCollection._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseAcknowledgeUserDataCollection._get_http_options() request, metadata = self._interceptor.pre_acknowledge_user_data_collection( request, metadata @@ -3047,11 +3045,10 @@ def __call__( resp = self._interceptor.post_acknowledge_user_data_collection(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_acknowledge_user_data_collection_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_acknowledge_user_data_collection_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3133,9 +3130,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomDimension._get_http_options() request, metadata = self._interceptor.pre_archive_custom_dimension( request, metadata @@ -3161,7 +3156,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3249,9 +3244,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseArchiveCustomMetric._get_http_options() request, metadata = self._interceptor.pre_archive_custom_metric( request, metadata @@ -3277,7 +3270,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3373,9 +3366,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateConversionEvent._get_http_options() request, metadata = self._interceptor.pre_create_conversion_event( request, metadata @@ -3529,9 +3520,7 @@ def __call__( A definition for a CustomDimension. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomDimension._get_http_options() request, metadata = self._interceptor.pre_create_custom_dimension( request, metadata @@ -3685,9 +3674,7 @@ def __call__( A definition for a custom metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateCustomMetric._get_http_options() request, metadata = self._interceptor.pre_create_custom_metric( request, metadata @@ -3843,9 +3830,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateDataStream._get_http_options() request, metadata = self._interceptor.pre_create_data_stream( request, metadata @@ -4001,9 +3986,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateFirebaseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateFirebaseLink._get_http_options() request, metadata = self._interceptor.pre_create_firebase_link( request, metadata @@ -4159,9 +4142,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateGoogleAdsLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateGoogleAdsLink._get_http_options() request, metadata = self._interceptor.pre_create_google_ads_link( request, metadata @@ -4317,9 +4298,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateKeyEvent._get_http_options() request, metadata = self._interceptor.pre_create_key_event( request, metadata @@ -4476,15 +4455,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateMeasurementProtocolSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_measurement_protocol_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_create_measurement_protocol_secret( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateMeasurementProtocolSecret._get_transcoded_request( http_options, request @@ -4550,11 +4526,10 @@ def __call__( resp = self._interceptor.post_create_measurement_protocol_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_measurement_protocol_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_measurement_protocol_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4640,9 +4615,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseCreateProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseCreateProperty._get_http_options() request, metadata = self._interceptor.pre_create_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseCreateProperty._get_transcoded_request( @@ -4787,9 +4760,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccount._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccount._get_http_options() request, metadata = self._interceptor.pre_delete_account(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteAccount._get_transcoded_request( @@ -4809,7 +4780,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4895,9 +4866,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteConversionEvent._get_http_options() request, metadata = self._interceptor.pre_delete_conversion_event( request, metadata @@ -4919,7 +4888,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5007,9 +4976,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteDataStream._get_http_options() request, metadata = self._interceptor.pre_delete_data_stream( request, metadata @@ -5031,7 +4998,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5119,9 +5086,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteFirebaseLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteFirebaseLink._get_http_options() request, metadata = self._interceptor.pre_delete_firebase_link( request, metadata @@ -5143,7 +5108,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5231,9 +5196,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteGoogleAdsLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteGoogleAdsLink._get_http_options() request, metadata = self._interceptor.pre_delete_google_ads_link( request, metadata @@ -5255,7 +5218,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5343,9 +5306,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteKeyEvent._get_http_options() request, metadata = self._interceptor.pre_delete_key_event( request, metadata @@ -5367,7 +5328,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5456,15 +5417,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteMeasurementProtocolSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_measurement_protocol_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_measurement_protocol_secret( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteMeasurementProtocolSecret._get_transcoded_request( http_options, request @@ -5483,7 +5441,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5575,9 +5533,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseDeleteProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteProperty._get_http_options() request, metadata = self._interceptor.pre_delete_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseDeleteProperty._get_transcoded_request( @@ -5722,9 +5678,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetAccount._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetAccount._get_http_options() request, metadata = self._interceptor.pre_get_account(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetAccount._get_transcoded_request( @@ -5870,9 +5824,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetConversionEvent._get_http_options() request, metadata = self._interceptor.pre_get_conversion_event( request, metadata @@ -6020,9 +5972,7 @@ def __call__( A definition for a CustomDimension. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomDimension._get_http_options() request, metadata = self._interceptor.pre_get_custom_dimension( request, metadata @@ -6170,9 +6120,7 @@ def __call__( A definition for a custom metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetCustomMetric._get_http_options() request, metadata = self._interceptor.pre_get_custom_metric( request, metadata @@ -6323,9 +6271,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataRetentionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataRetentionSettings._get_http_options() request, metadata = self._interceptor.pre_get_data_retention_settings( request, metadata @@ -6474,9 +6420,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataSharingSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataSharingSettings._get_http_options() request, metadata = self._interceptor.pre_get_data_sharing_settings( request, metadata @@ -6624,9 +6568,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataStream._get_http_options() request, metadata = self._interceptor.pre_get_data_stream(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetDataStream._get_transcoded_request( @@ -6771,9 +6713,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetKeyEvent._get_http_options() request, metadata = self._interceptor.pre_get_key_event(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetKeyEvent._get_transcoded_request( @@ -6922,9 +6862,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetMeasurementProtocolSecret._get_http_options() request, metadata = self._interceptor.pre_get_measurement_protocol_secret( request, metadata @@ -6988,11 +6926,10 @@ def __call__( resp = self._interceptor.post_get_measurement_protocol_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_measurement_protocol_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_measurement_protocol_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -7076,9 +7013,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseGetProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseGetProperty._get_http_options() request, metadata = self._interceptor.pre_get_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseGetProperty._get_transcoded_request( @@ -7221,9 +7156,7 @@ def __call__( Request message for ListAccounts RPC. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAccounts._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAccounts._get_http_options() request, metadata = self._interceptor.pre_list_accounts(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListAccounts._get_transcoded_request( @@ -7371,9 +7304,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListAccountSummaries._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListAccountSummaries._get_http_options() request, metadata = self._interceptor.pre_list_account_summaries( request, metadata @@ -7525,9 +7456,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListConversionEvents._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListConversionEvents._get_http_options() request, metadata = self._interceptor.pre_list_conversion_events( request, metadata @@ -7679,9 +7608,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListCustomDimensions._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListCustomDimensions._get_http_options() request, metadata = self._interceptor.pre_list_custom_dimensions( request, metadata @@ -7833,9 +7760,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListCustomMetrics._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListCustomMetrics._get_http_options() request, metadata = self._interceptor.pre_list_custom_metrics( request, metadata @@ -7987,9 +7912,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListDataStreams._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListDataStreams._get_http_options() request, metadata = self._interceptor.pre_list_data_streams( request, metadata @@ -8141,9 +8064,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListFirebaseLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListFirebaseLinks._get_http_options() request, metadata = self._interceptor.pre_list_firebase_links( request, metadata @@ -8295,9 +8216,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListGoogleAdsLinks._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListGoogleAdsLinks._get_http_options() request, metadata = self._interceptor.pre_list_google_ads_links( request, metadata @@ -8448,9 +8367,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListKeyEvents._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListKeyEvents._get_http_options() request, metadata = self._interceptor.pre_list_key_events(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListKeyEvents._get_transcoded_request( @@ -8601,9 +8518,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListMeasurementProtocolSecrets._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListMeasurementProtocolSecrets._get_http_options() request, metadata = self._interceptor.pre_list_measurement_protocol_secrets( request, metadata @@ -8667,11 +8582,10 @@ def __call__( resp = self._interceptor.post_list_measurement_protocol_secrets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_measurement_protocol_secrets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_measurement_protocol_secrets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8758,9 +8672,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseListProperties._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseListProperties._get_http_options() request, metadata = self._interceptor.pre_list_properties(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseListProperties._get_transcoded_request( @@ -8909,9 +8821,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseProvisionAccountTicket._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseProvisionAccountTicket._get_http_options() request, metadata = self._interceptor.pre_provision_account_ticket( request, metadata @@ -9067,9 +8977,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseRunAccessReport._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseRunAccessReport._get_http_options() request, metadata = self._interceptor.pre_run_access_report( request, metadata @@ -9228,9 +9136,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseSearchChangeHistoryEvents._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseSearchChangeHistoryEvents._get_http_options() request, metadata = self._interceptor.pre_search_change_history_events( request, metadata @@ -9388,9 +9294,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccount._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccount._get_http_options() request, metadata = self._interceptor.pre_update_account(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateAccount._get_transcoded_request( @@ -9542,9 +9446,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateConversionEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateConversionEvent._get_http_options() request, metadata = self._interceptor.pre_update_conversion_event( request, metadata @@ -9698,9 +9600,7 @@ def __call__( A definition for a CustomDimension. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomDimension._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomDimension._get_http_options() request, metadata = self._interceptor.pre_update_custom_dimension( request, metadata @@ -9854,9 +9754,7 @@ def __call__( A definition for a custom metric. """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomMetric._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateCustomMetric._get_http_options() request, metadata = self._interceptor.pre_update_custom_metric( request, metadata @@ -10015,9 +9913,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataRetentionSettings._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataRetentionSettings._get_http_options() request, metadata = self._interceptor.pre_update_data_retention_settings( request, metadata @@ -10086,11 +9982,10 @@ def __call__( resp = self._interceptor.post_update_data_retention_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_data_retention_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_data_retention_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -10174,9 +10069,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataStream._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateDataStream._get_http_options() request, metadata = self._interceptor.pre_update_data_stream( request, metadata @@ -10332,9 +10225,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateGoogleAdsLink._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateGoogleAdsLink._get_http_options() request, metadata = self._interceptor.pre_update_google_ads_link( request, metadata @@ -10490,9 +10381,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateKeyEvent._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateKeyEvent._get_http_options() request, metadata = self._interceptor.pre_update_key_event( request, metadata @@ -10649,15 +10538,12 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateMeasurementProtocolSecret._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateMeasurementProtocolSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_measurement_protocol_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_update_measurement_protocol_secret( + request, metadata + ) ) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateMeasurementProtocolSecret._get_transcoded_request( http_options, request @@ -10723,11 +10609,10 @@ def __call__( resp = self._interceptor.post_update_measurement_protocol_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_measurement_protocol_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_measurement_protocol_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -10813,9 +10698,7 @@ def __call__( """ - http_options = ( - _BaseAnalyticsAdminServiceRestTransport._BaseUpdateProperty._get_http_options() - ) + http_options = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateProperty._get_http_options() request, metadata = self._interceptor.pre_update_property(request, metadata) transcoded_request = _BaseAnalyticsAdminServiceRestTransport._BaseUpdateProperty._get_transcoded_request( @@ -10917,7 +10800,9 @@ def acknowledge_user_data_collection( ]: # 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._AcknowledgeUserDataCollection(self._session, self._host, self._interceptor) # type: ignore + return self._AcknowledgeUserDataCollection( + self._session, self._host, self._interceptor + ) # type: ignore @property def archive_custom_dimension( @@ -10925,7 +10810,9 @@ def archive_custom_dimension( ) -> Callable[[analytics_admin.ArchiveCustomDimensionRequest], empty_pb2.Empty]: # 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._ArchiveCustomDimension(self._session, self._host, self._interceptor) # type: ignore + return self._ArchiveCustomDimension( + self._session, self._host, self._interceptor + ) # type: ignore @property def archive_custom_metric( @@ -11006,7 +10893,9 @@ def create_measurement_protocol_secret( ]: # 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._CreateMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._CreateMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_property( @@ -11072,7 +10961,9 @@ def delete_measurement_protocol_secret( ]: # 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._DeleteMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_property( @@ -11127,7 +11018,9 @@ def get_data_retention_settings( ]: # 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._GetDataRetentionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataRetentionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_sharing_settings( @@ -11137,7 +11030,9 @@ def get_data_sharing_settings( ]: # 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._GetDataSharingSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataSharingSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_stream( @@ -11164,7 +11059,9 @@ def get_measurement_protocol_secret( ]: # 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._GetMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._GetMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_property( @@ -11280,7 +11177,9 @@ def list_measurement_protocol_secrets( ]: # 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._ListMeasurementProtocolSecrets(self._session, self._host, self._interceptor) # type: ignore + return self._ListMeasurementProtocolSecrets( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_properties( @@ -11301,7 +11200,9 @@ def provision_account_ticket( ]: # 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._ProvisionAccountTicket(self._session, self._host, self._interceptor) # type: ignore + return self._ProvisionAccountTicket( + self._session, self._host, self._interceptor + ) # type: ignore @property def run_access_report( @@ -11323,7 +11224,9 @@ def search_change_history_events( ]: # 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._SearchChangeHistoryEvents(self._session, self._host, self._interceptor) # type: ignore + return self._SearchChangeHistoryEvents( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_account( @@ -11370,7 +11273,9 @@ def update_data_retention_settings( ]: # 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._UpdateDataRetentionSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDataRetentionSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_data_stream( @@ -11407,7 +11312,9 @@ def update_measurement_protocol_secret( ]: # 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._UpdateMeasurementProtocolSecret(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateMeasurementProtocolSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_property( diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest_base.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest_base.py index e2ee26f02570..ca7ee388754c 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest_base.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/services/analytics_admin_service/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.analytics.admin_v1beta.types import analytics_admin, resources diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/types/access_report.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/types/access_report.py index a885224d7d1d..d4eff10a8db6 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/types/access_report.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/types/access_report.py @@ -285,6 +285,7 @@ class MatchType(proto.Enum): Partial match for the regular expression with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -355,6 +356,7 @@ class Operation(proto.Enum): GREATER_THAN_OR_EQUAL (5): Greater than or equal """ + OPERATION_UNSPECIFIED = 0 EQUAL = 1 LESS_THAN = 2 @@ -501,6 +503,7 @@ class OrderType(proto.Enum): values all have equal ordering value below all numeric values. """ + ORDER_TYPE_UNSPECIFIED = 0 ALPHANUMERIC = 1 CASE_INSENSITIVE_ALPHANUMERIC = 2 diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/types/analytics_admin.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/types/analytics_admin.py index 985be8e93072..3f8c5b9339e3 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/types/analytics_admin.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/types/analytics_admin.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.analytics.admin_v1beta.types import access_report, resources @@ -296,19 +296,19 @@ class RunAccessReportResponse(proto.Message): with account-level requests. """ - dimension_headers: MutableSequence[ - access_report.AccessDimensionHeader - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=access_report.AccessDimensionHeader, + dimension_headers: MutableSequence[access_report.AccessDimensionHeader] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=access_report.AccessDimensionHeader, + ) ) - metric_headers: MutableSequence[ - access_report.AccessMetricHeader - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=access_report.AccessMetricHeader, + metric_headers: MutableSequence[access_report.AccessMetricHeader] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=access_report.AccessMetricHeader, + ) ) rows: MutableSequence[access_report.AccessRow] = proto.RepeatedField( proto.MESSAGE, @@ -1046,12 +1046,12 @@ class SearchChangeHistoryEventsRequest(proto.Message): proto.STRING, number=2, ) - resource_type: MutableSequence[ - resources.ChangeHistoryResourceType - ] = proto.RepeatedField( - proto.ENUM, - number=3, - enum=resources.ChangeHistoryResourceType, + resource_type: MutableSequence[resources.ChangeHistoryResourceType] = ( + proto.RepeatedField( + proto.ENUM, + number=3, + enum=resources.ChangeHistoryResourceType, + ) ) action: MutableSequence[resources.ActionType] = proto.RepeatedField( proto.ENUM, @@ -1098,12 +1098,12 @@ class SearchChangeHistoryEventsResponse(proto.Message): def raw_page(self): return self - change_history_events: MutableSequence[ - resources.ChangeHistoryEvent - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.ChangeHistoryEvent, + change_history_events: MutableSequence[resources.ChangeHistoryEvent] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.ChangeHistoryEvent, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-analytics-admin/google/analytics/admin_v1beta/types/resources.py b/packages/google-analytics-admin/google/analytics/admin_v1beta/types/resources.py index c98b2f801228..8a8ac13e25e2 100644 --- a/packages/google-analytics-admin/google/analytics/admin_v1beta/types/resources.py +++ b/packages/google-analytics-admin/google/analytics/admin_v1beta/types/resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -110,6 +110,7 @@ class IndustryCategory(proto.Enum): SHOPPING (26): Shopping """ + INDUSTRY_CATEGORY_UNSPECIFIED = 0 AUTOMOTIVE = 1 BUSINESS_AND_INDUSTRIAL_MARKETS = 2 @@ -151,6 +152,7 @@ class ServiceLevel(proto.Enum): The paid, premium version of Google Analytics. """ + SERVICE_LEVEL_UNSPECIFIED = 0 GOOGLE_ANALYTICS_STANDARD = 1 GOOGLE_ANALYTICS_360 = 2 @@ -171,6 +173,7 @@ class ActorType(proto.Enum): Changes made by Google Analytics support team staff. """ + ACTOR_TYPE_UNSPECIFIED = 0 USER = 1 SYSTEM = 2 @@ -190,6 +193,7 @@ class ActionType(proto.Enum): DELETED (3): Resource was deleted in this change. """ + ACTION_TYPE_UNSPECIFIED = 0 CREATED = 1 UPDATED = 2 @@ -233,6 +237,7 @@ class ChangeHistoryResourceType(proto.Enum): ATTRIBUTION_SETTINGS (20): AttributionSettings resource """ + CHANGE_HISTORY_RESOURCE_TYPE_UNSPECIFIED = 0 ACCOUNT = 1 PROPERTY = 2 @@ -263,6 +268,7 @@ class PropertyType(proto.Enum): PROPERTY_TYPE_ROLLUP (3): Google Analytics rollup property """ + PROPERTY_TYPE_UNSPECIFIED = 0 PROPERTY_TYPE_ORDINARY = 1 PROPERTY_TYPE_SUBPROPERTY = 2 @@ -521,6 +527,7 @@ class DataStreamType(proto.Enum): IOS_APP_DATA_STREAM (3): iOS app data stream. """ + DATA_STREAM_TYPE_UNSPECIFIED = 0 WEB_DATA_STREAM = 1 ANDROID_APP_DATA_STREAM = 2 @@ -1182,6 +1189,7 @@ class ConversionCountingMethod(proto.Enum): An Event instance is considered a Conversion at most once per session per user. """ + CONVERSION_COUNTING_METHOD_UNSPECIFIED = 0 ONCE_PER_EVENT = 1 ONCE_PER_SESSION = 2 @@ -1303,6 +1311,7 @@ class CountingMethod(proto.Enum): An Event instance is considered a Key Event at most once per session per user. """ + COUNTING_METHOD_UNSPECIFIED = 0 ONCE_PER_EVENT = 1 ONCE_PER_SESSION = 2 @@ -1426,6 +1435,7 @@ class DimensionScope(proto.Enum): ITEM (3): Dimension scoped to eCommerce items """ + DIMENSION_SCOPE_UNSPECIFIED = 0 EVENT = 1 USER = 2 @@ -1529,6 +1539,7 @@ class MeasurementUnit(proto.Enum): HOURS (10): This metric measures hours. """ + MEASUREMENT_UNIT_UNSPECIFIED = 0 STANDARD = 1 CURRENCY = 2 @@ -1550,6 +1561,7 @@ class MetricScope(proto.Enum): EVENT (1): Metric scoped to an event. """ + METRIC_SCOPE_UNSPECIFIED = 0 EVENT = 1 @@ -1565,6 +1577,7 @@ class RestrictedMetricType(proto.Enum): REVENUE_DATA (2): Metric reports revenue data. """ + RESTRICTED_METRIC_TYPE_UNSPECIFIED = 0 COST_DATA = 1 REVENUE_DATA = 2 @@ -1647,6 +1660,7 @@ class RetentionDuration(proto.Enum): months. Available to 360 properties only. Available for event data only. """ + RETENTION_DURATION_UNSPECIFIED = 0 TWO_MONTHS = 1 FOURTEEN_MONTHS = 3 diff --git a/packages/google-analytics-admin/noxfile.py b/packages/google-analytics-admin/noxfile.py index 68a3b308f553..94d9faa347ea 100644 --- a/packages/google-analytics-admin/noxfile.py +++ b/packages/google-analytics-admin/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-analytics-admin/tests/unit/gapic/admin_v1alpha/test_analytics_admin_service.py b/packages/google-analytics-admin/tests/unit/gapic/admin_v1alpha/test_analytics_admin_service.py index 5ce56c2e7f12..9a2548a852fb 100644 --- a/packages/google-analytics-admin/tests/unit/gapic/admin_v1alpha/test_analytics_admin_service.py +++ b/packages/google-analytics-admin/tests/unit/gapic/admin_v1alpha/test_analytics_admin_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import date_pb2 # type: ignore from google.analytics.admin_v1alpha.services.analytics_admin_service import ( AnalyticsAdminServiceAsyncClient, @@ -63,6 +68,17 @@ pagers, transports, ) +from google.analytics.admin_v1alpha.types import ( + access_report, + analytics_admin, + audience, + channel_group, + event_create_and_edit, + expanded_data_set, + resources, + subproperty_event_filter, +) +from google.analytics.admin_v1alpha.types import audience as gaa_audience from google.analytics.admin_v1alpha.types import channel_group as gaa_channel_group from google.analytics.admin_v1alpha.types import ( expanded_data_set as gaa_expanded_data_set, @@ -70,14 +86,6 @@ from google.analytics.admin_v1alpha.types import ( subproperty_event_filter as gaa_subproperty_event_filter, ) -from google.analytics.admin_v1alpha.types import access_report, analytics_admin -from google.analytics.admin_v1alpha.types import audience -from google.analytics.admin_v1alpha.types import audience as gaa_audience -from google.analytics.admin_v1alpha.types import channel_group -from google.analytics.admin_v1alpha.types import event_create_and_edit -from google.analytics.admin_v1alpha.types import expanded_data_set -from google.analytics.admin_v1alpha.types import resources -from google.analytics.admin_v1alpha.types import subproperty_event_filter CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1013,10 +1021,9 @@ def test_analytics_admin_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1068,9 @@ def test_analytics_admin_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1106,9 @@ def test_analytics_admin_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,13 +1364,13 @@ def test_analytics_admin_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3034,9 +3039,9 @@ def test_list_account_summaries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_account_summaries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_account_summaries] = ( + mock_rpc + ) request = {} client.list_account_summaries(request) @@ -5146,9 +5151,9 @@ def test_create_firebase_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_firebase_link] = ( + mock_rpc + ) request = {} client.create_firebase_link(request) @@ -5497,9 +5502,9 @@ def test_delete_firebase_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_firebase_link] = ( + mock_rpc + ) request = {} client.delete_firebase_link(request) @@ -5832,9 +5837,9 @@ def test_list_firebase_links_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_firebase_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_firebase_links] = ( + mock_rpc + ) request = {} client.list_firebase_links(request) @@ -6378,9 +6383,9 @@ def test_get_global_site_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_global_site_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_global_site_tag] = ( + mock_rpc + ) request = {} client.get_global_site_tag(request) @@ -6729,9 +6734,9 @@ def test_create_google_ads_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_google_ads_link] = ( + mock_rpc + ) request = {} client.create_google_ads_link(request) @@ -7090,9 +7095,9 @@ def test_update_google_ads_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_google_ads_link] = ( + mock_rpc + ) request = {} client.update_google_ads_link(request) @@ -7446,9 +7451,9 @@ def test_delete_google_ads_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_google_ads_link] = ( + mock_rpc + ) request = {} client.delete_google_ads_link(request) @@ -7782,9 +7787,9 @@ def test_list_google_ads_links_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_google_ads_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_google_ads_links] = ( + mock_rpc + ) request = {} client.list_google_ads_links(request) @@ -14834,9 +14839,9 @@ def test_get_conversion_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversion_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversion_event] = ( + mock_rpc + ) request = {} client.get_conversion_event(request) @@ -15521,9 +15526,9 @@ def test_list_conversion_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversion_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversion_events] = ( + mock_rpc + ) request = {} client.list_conversion_events(request) @@ -16067,9 +16072,9 @@ def test_create_key_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_key_event] = ( + mock_rpc + ) request = {} client.create_key_event(request) @@ -16410,9 +16415,9 @@ def test_update_key_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_key_event] = ( + mock_rpc + ) request = {} client.update_key_event(request) @@ -17081,9 +17086,9 @@ def test_delete_key_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_key_event] = ( + mock_rpc + ) request = {} client.delete_key_event(request) @@ -22861,9 +22866,9 @@ def test_list_custom_dimensions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_dimensions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_dimensions] = ( + mock_rpc + ) request = {} client.list_custom_dimensions(request) @@ -23746,9 +23751,9 @@ def test_get_custom_dimension_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_dimension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_dimension] = ( + mock_rpc + ) request = {} client.get_custom_dimension(request) @@ -24114,9 +24119,9 @@ def test_create_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_metric] = ( + mock_rpc + ) request = {} client.create_custom_metric(request) @@ -24494,9 +24499,9 @@ def test_update_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_custom_metric] = ( + mock_rpc + ) request = {} client.update_custom_metric(request) @@ -24864,9 +24869,9 @@ def test_list_custom_metrics_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_metrics - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_metrics] = ( + mock_rpc + ) request = {} client.list_custom_metrics(request) @@ -25406,9 +25411,9 @@ def test_archive_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.archive_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.archive_custom_metric] = ( + mock_rpc + ) request = {} client.archive_custom_metric(request) @@ -25753,9 +25758,9 @@ def test_get_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_metric] = ( + mock_rpc + ) request = {} client.get_custom_metric(request) @@ -26854,9 +26859,9 @@ def test_create_data_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_stream] = ( + mock_rpc + ) request = {} client.create_data_stream(request) @@ -27231,9 +27236,9 @@ def test_delete_data_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_stream] = ( + mock_rpc + ) request = {} client.delete_data_stream(request) @@ -27564,9 +27569,9 @@ def test_update_data_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_stream] = ( + mock_rpc + ) request = {} client.update_data_stream(request) @@ -27944,9 +27949,9 @@ def test_list_data_streams_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_streams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_streams] = ( + mock_rpc + ) request = {} client.list_data_streams(request) @@ -30387,9 +30392,9 @@ def test_archive_audience_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.archive_audience - ] = mock_rpc + client._transport._wrapped_methods[client._transport.archive_audience] = ( + mock_rpc + ) request = {} client.archive_audience(request) @@ -30634,9 +30639,9 @@ def test_get_search_ads360_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_search_ads360_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_search_ads360_link] = ( + mock_rpc + ) request = {} client.get_search_ads360_link(request) @@ -33350,9 +33355,9 @@ def test_run_access_report_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_access_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_access_report] = ( + mock_rpc + ) request = {} client.run_access_report(request) @@ -33609,9 +33614,9 @@ def test_create_access_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_access_binding] = ( + mock_rpc + ) request = {} client.create_access_binding(request) @@ -33966,9 +33971,9 @@ def test_get_access_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_access_binding] = ( + mock_rpc + ) request = {} client.get_access_binding(request) @@ -34310,9 +34315,9 @@ def test_update_access_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_access_binding] = ( + mock_rpc + ) request = {} client.update_access_binding(request) @@ -34652,9 +34657,9 @@ def test_delete_access_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_access_binding] = ( + mock_rpc + ) request = {} client.delete_access_binding(request) @@ -34987,9 +34992,9 @@ def test_list_access_bindings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_access_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_access_bindings] = ( + mock_rpc + ) request = {} client.list_access_bindings(request) @@ -36540,9 +36545,9 @@ def test_get_expanded_data_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_expanded_data_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_expanded_data_set] = ( + mock_rpc + ) request = {} client.get_expanded_data_set(request) @@ -38508,9 +38513,9 @@ def test_get_channel_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_channel_group] = ( + mock_rpc + ) request = {} client.get_channel_group(request) @@ -38859,9 +38864,9 @@ def test_list_channel_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_channel_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_channel_groups] = ( + mock_rpc + ) request = {} client.list_channel_groups(request) @@ -39411,9 +39416,9 @@ def test_create_channel_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_channel_group] = ( + mock_rpc + ) request = {} client.create_channel_group(request) @@ -39775,9 +39780,9 @@ def test_update_channel_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_channel_group] = ( + mock_rpc + ) request = {} client.update_channel_group(request) @@ -40132,9 +40137,9 @@ def test_delete_channel_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_channel_group] = ( + mock_rpc + ) request = {} client.delete_channel_group(request) @@ -40482,9 +40487,9 @@ def test_create_big_query_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_big_query_link] = ( + mock_rpc + ) request = {} client.create_big_query_link(request) @@ -40866,9 +40871,9 @@ def test_get_big_query_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_big_query_link] = ( + mock_rpc + ) request = {} client.get_big_query_link(request) @@ -41225,9 +41230,9 @@ def test_list_big_query_links_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_big_query_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_big_query_links] = ( + mock_rpc + ) request = {} client.list_big_query_links(request) @@ -41767,9 +41772,9 @@ def test_delete_big_query_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_big_query_link] = ( + mock_rpc + ) request = {} client.delete_big_query_link(request) @@ -42113,9 +42118,9 @@ def test_update_big_query_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_big_query_link] = ( + mock_rpc + ) request = {} client.update_big_query_link(request) @@ -43261,9 +43266,9 @@ def test_get_ad_sense_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ad_sense_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ad_sense_link] = ( + mock_rpc + ) request = {} client.get_ad_sense_link(request) @@ -43606,9 +43611,9 @@ def test_create_ad_sense_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ad_sense_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ad_sense_link] = ( + mock_rpc + ) request = {} client.create_ad_sense_link(request) @@ -43957,9 +43962,9 @@ def test_delete_ad_sense_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_ad_sense_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_ad_sense_link] = ( + mock_rpc + ) request = {} client.delete_ad_sense_link(request) @@ -44292,9 +44297,9 @@ def test_list_ad_sense_links_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ad_sense_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ad_sense_links] = ( + mock_rpc + ) request = {} client.list_ad_sense_links(request) @@ -44841,9 +44846,9 @@ def test_get_event_create_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_event_create_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_event_create_rule] = ( + mock_rpc + ) request = {} client.get_event_create_rule(request) @@ -46791,9 +46796,9 @@ def test_get_event_edit_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_event_edit_rule] = ( + mock_rpc + ) request = {} client.get_event_edit_rule(request) @@ -47140,9 +47145,9 @@ def test_list_event_edit_rules_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_event_edit_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_event_edit_rules] = ( + mock_rpc + ) request = {} client.list_event_edit_rules(request) @@ -47691,9 +47696,9 @@ def test_create_event_edit_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_event_edit_rule] = ( + mock_rpc + ) request = {} client.create_event_edit_rule(request) @@ -48048,9 +48053,9 @@ def test_update_event_edit_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_event_edit_rule] = ( + mock_rpc + ) request = {} client.update_event_edit_rule(request) @@ -48402,9 +48407,9 @@ def test_delete_event_edit_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_event_edit_rule] = ( + mock_rpc + ) request = {} client.delete_event_edit_rule(request) @@ -49717,9 +49722,9 @@ def test_get_calculated_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_calculated_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_calculated_metric] = ( + mock_rpc + ) request = {} client.get_calculated_metric(request) @@ -51735,9 +51740,9 @@ def test_create_rollup_property_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_rollup_property - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_rollup_property] = ( + mock_rpc + ) request = {} client.create_rollup_property(request) @@ -53509,9 +53514,9 @@ def test_provision_subproperty_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_subproperty - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_subproperty] = ( + mock_rpc + ) request = {} client.provision_subproperty(request) @@ -57668,9 +57673,9 @@ def test_submit_user_deletion_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_user_deletion - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_user_deletion] = ( + mock_rpc + ) request = {} client.submit_user_deletion(request) @@ -60233,9 +60238,9 @@ def test_list_account_summaries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_account_summaries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_account_summaries] = ( + mock_rpc + ) request = {} client.list_account_summaries(request) @@ -61255,9 +61260,9 @@ def test_create_firebase_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_firebase_link] = ( + mock_rpc + ) request = {} client.create_firebase_link(request) @@ -61447,9 +61452,9 @@ def test_delete_firebase_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_firebase_link] = ( + mock_rpc + ) request = {} client.delete_firebase_link(request) @@ -61623,9 +61628,9 @@ def test_list_firebase_links_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_firebase_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_firebase_links] = ( + mock_rpc + ) request = {} client.list_firebase_links(request) @@ -61882,9 +61887,9 @@ def test_get_global_site_tag_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_global_site_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_global_site_tag] = ( + mock_rpc + ) request = {} client.get_global_site_tag(request) @@ -62067,9 +62072,9 @@ def test_create_google_ads_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_google_ads_link] = ( + mock_rpc + ) request = {} client.create_google_ads_link(request) @@ -62260,9 +62265,9 @@ def test_update_google_ads_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_google_ads_link] = ( + mock_rpc + ) request = {} client.update_google_ads_link(request) @@ -62445,9 +62450,9 @@ def test_delete_google_ads_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_google_ads_link] = ( + mock_rpc + ) request = {} client.delete_google_ads_link(request) @@ -62622,9 +62627,9 @@ def test_list_google_ads_links_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_google_ads_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_google_ads_links] = ( + mock_rpc + ) request = {} client.list_google_ads_links(request) @@ -66294,9 +66299,9 @@ def test_get_conversion_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversion_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversion_event] = ( + mock_rpc + ) request = {} client.get_conversion_event(request) @@ -66655,9 +66660,9 @@ def test_list_conversion_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversion_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversion_events] = ( + mock_rpc + ) request = {} client.list_conversion_events(request) @@ -66913,9 +66918,9 @@ def test_create_key_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_key_event] = ( + mock_rpc + ) request = {} client.create_key_event(request) @@ -67103,9 +67108,9 @@ def test_update_key_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_key_event] = ( + mock_rpc + ) request = {} client.update_key_event(request) @@ -67468,9 +67473,9 @@ def test_delete_key_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_key_event] = ( + mock_rpc + ) request = {} client.delete_key_event(request) @@ -70497,9 +70502,9 @@ def test_list_custom_dimensions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_dimensions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_dimensions] = ( + mock_rpc + ) request = {} client.list_custom_dimensions(request) @@ -70936,9 +70941,9 @@ def test_get_custom_dimension_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_dimension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_dimension] = ( + mock_rpc + ) request = {} client.get_custom_dimension(request) @@ -71118,9 +71123,9 @@ def test_create_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_metric] = ( + mock_rpc + ) request = {} client.create_custom_metric(request) @@ -71310,9 +71315,9 @@ def test_update_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_custom_metric] = ( + mock_rpc + ) request = {} client.update_custom_metric(request) @@ -71494,9 +71499,9 @@ def test_list_custom_metrics_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_metrics - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_metrics] = ( + mock_rpc + ) request = {} client.list_custom_metrics(request) @@ -71754,9 +71759,9 @@ def test_archive_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.archive_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.archive_custom_metric] = ( + mock_rpc + ) request = {} client.archive_custom_metric(request) @@ -71930,9 +71935,9 @@ def test_get_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_metric] = ( + mock_rpc + ) request = {} client.get_custom_metric(request) @@ -72491,9 +72496,9 @@ def test_create_data_stream_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_stream] = ( + mock_rpc + ) request = {} client.create_data_stream(request) @@ -72691,9 +72696,9 @@ def test_delete_data_stream_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_stream] = ( + mock_rpc + ) request = {} client.delete_data_stream(request) @@ -72867,9 +72872,9 @@ def test_update_data_stream_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_stream] = ( + mock_rpc + ) request = {} client.update_data_stream(request) @@ -73057,9 +73062,9 @@ def test_list_data_streams_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_streams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_streams] = ( + mock_rpc + ) request = {} client.list_data_streams(request) @@ -74297,9 +74302,9 @@ def test_archive_audience_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.archive_audience - ] = mock_rpc + client._transport._wrapped_methods[client._transport.archive_audience] = ( + mock_rpc + ) request = {} client.archive_audience(request) @@ -74420,9 +74425,9 @@ def test_get_search_ads360_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_search_ads360_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_search_ads360_link] = ( + mock_rpc + ) request = {} client.get_search_ads360_link(request) @@ -75798,9 +75803,9 @@ def test_run_access_report_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_access_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_access_report] = ( + mock_rpc + ) request = {} client.run_access_report(request) @@ -75839,9 +75844,9 @@ def test_create_access_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_access_binding] = ( + mock_rpc + ) request = {} client.create_access_binding(request) @@ -76031,9 +76036,9 @@ def test_get_access_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_access_binding] = ( + mock_rpc + ) request = {} client.get_access_binding(request) @@ -76213,9 +76218,9 @@ def test_update_access_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_access_binding] = ( + mock_rpc + ) request = {} client.update_access_binding(request) @@ -76394,9 +76399,9 @@ def test_delete_access_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_access_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_access_binding] = ( + mock_rpc + ) request = {} client.delete_access_binding(request) @@ -76570,9 +76575,9 @@ def test_list_access_bindings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_access_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_access_bindings] = ( + mock_rpc + ) request = {} client.list_access_bindings(request) @@ -77383,9 +77388,9 @@ def test_get_expanded_data_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_expanded_data_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_expanded_data_set] = ( + mock_rpc + ) request = {} client.get_expanded_data_set(request) @@ -78389,9 +78394,9 @@ def test_get_channel_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_channel_group] = ( + mock_rpc + ) request = {} client.get_channel_group(request) @@ -78570,9 +78575,9 @@ def test_list_channel_groups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_channel_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_channel_groups] = ( + mock_rpc + ) request = {} client.list_channel_groups(request) @@ -78829,9 +78834,9 @@ def test_create_channel_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_channel_group] = ( + mock_rpc + ) request = {} client.create_channel_group(request) @@ -79021,9 +79026,9 @@ def test_update_channel_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_channel_group] = ( + mock_rpc + ) request = {} client.update_channel_group(request) @@ -79213,9 +79218,9 @@ def test_delete_channel_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_channel_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_channel_group] = ( + mock_rpc + ) request = {} client.delete_channel_group(request) @@ -79390,9 +79395,9 @@ def test_create_big_query_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_big_query_link] = ( + mock_rpc + ) request = {} client.create_big_query_link(request) @@ -79582,9 +79587,9 @@ def test_get_big_query_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_big_query_link] = ( + mock_rpc + ) request = {} client.get_big_query_link(request) @@ -79763,9 +79768,9 @@ def test_list_big_query_links_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_big_query_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_big_query_links] = ( + mock_rpc + ) request = {} client.list_big_query_links(request) @@ -80023,9 +80028,9 @@ def test_delete_big_query_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_big_query_link] = ( + mock_rpc + ) request = {} client.delete_big_query_link(request) @@ -80200,9 +80205,9 @@ def test_update_big_query_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_big_query_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_big_query_link] = ( + mock_rpc + ) request = {} client.update_big_query_link(request) @@ -80782,9 +80787,9 @@ def test_get_ad_sense_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ad_sense_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ad_sense_link] = ( + mock_rpc + ) request = {} client.get_ad_sense_link(request) @@ -80963,9 +80968,9 @@ def test_create_ad_sense_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ad_sense_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ad_sense_link] = ( + mock_rpc + ) request = {} client.create_ad_sense_link(request) @@ -81155,9 +81160,9 @@ def test_delete_ad_sense_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_ad_sense_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_ad_sense_link] = ( + mock_rpc + ) request = {} client.delete_ad_sense_link(request) @@ -81331,9 +81336,9 @@ def test_list_ad_sense_links_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ad_sense_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ad_sense_links] = ( + mock_rpc + ) request = {} client.list_ad_sense_links(request) @@ -81591,9 +81596,9 @@ def test_get_event_create_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_event_create_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_event_create_rule] = ( + mock_rpc + ) request = {} client.get_event_create_rule(request) @@ -82607,9 +82612,9 @@ def test_get_event_edit_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_event_edit_rule] = ( + mock_rpc + ) request = {} client.get_event_edit_rule(request) @@ -82792,9 +82797,9 @@ def test_list_event_edit_rules_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_event_edit_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_event_edit_rules] = ( + mock_rpc + ) request = {} client.list_event_edit_rules(request) @@ -83053,9 +83058,9 @@ def test_create_event_edit_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_event_edit_rule] = ( + mock_rpc + ) request = {} client.create_event_edit_rule(request) @@ -83247,9 +83252,9 @@ def test_update_event_edit_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_event_edit_rule] = ( + mock_rpc + ) request = {} client.update_event_edit_rule(request) @@ -83442,9 +83447,9 @@ def test_delete_event_edit_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_event_edit_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_event_edit_rule] = ( + mock_rpc + ) request = {} client.delete_event_edit_rule(request) @@ -84139,9 +84144,9 @@ def test_get_calculated_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_calculated_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_calculated_metric] = ( + mock_rpc + ) request = {} client.get_calculated_metric(request) @@ -85172,9 +85177,9 @@ def test_create_rollup_property_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_rollup_property - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_rollup_property] = ( + mock_rpc + ) request = {} client.create_rollup_property(request) @@ -86138,9 +86143,9 @@ def test_provision_subproperty_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_subproperty - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_subproperty] = ( + mock_rpc + ) request = {} client.provision_subproperty(request) @@ -88337,9 +88342,9 @@ def test_submit_user_deletion_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_user_deletion - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_user_deletion] = ( + mock_rpc + ) request = {} client.submit_user_deletion(request) @@ -97623,8 +97628,9 @@ def test_get_account_rest_bad_request(request_type=analytics_admin.GetAccountReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -97695,18 +97701,20 @@ def test_get_account_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_account" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_account_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_account" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_account_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_account" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -97759,8 +97767,9 @@ def test_list_accounts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -97823,18 +97832,20 @@ def test_list_accounts_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_accounts" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_accounts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_accounts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_accounts" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_accounts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_accounts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -97892,8 +97903,9 @@ def test_delete_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -97950,13 +97962,13 @@ def test_delete_account_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_account" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteAccountRequest.pb( analytics_admin.DeleteAccountRequest() @@ -98001,8 +98013,9 @@ def test_update_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -98149,18 +98162,20 @@ def test_update_account_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_account" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_account_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_update_account" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_account_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_account" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -98213,8 +98228,9 @@ def test_provision_account_ticket_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -98277,18 +98293,22 @@ def test_provision_account_ticket_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_provision_account_ticket" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_provision_account_ticket_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_provision_account_ticket" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_provision_account_ticket", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_provision_account_ticket_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_provision_account_ticket", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -98346,8 +98366,9 @@ def test_list_account_summaries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -98410,18 +98431,22 @@ def test_list_account_summaries_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_account_summaries" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_account_summaries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_account_summaries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_account_summaries", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_account_summaries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_account_summaries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -98477,8 +98502,9 @@ def test_get_property_rest_bad_request(request_type=analytics_admin.GetPropertyR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -98557,18 +98583,20 @@ def test_get_property_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_property" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_property_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_property" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_property" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_property_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_property" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -98621,8 +98649,9 @@ def test_list_properties_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -98685,18 +98714,20 @@ def test_list_properties_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_properties" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_properties_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_properties" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_properties" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_properties_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_properties" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -98754,8 +98785,9 @@ def test_create_property_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -98916,18 +98948,20 @@ def test_create_property_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_property" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_property_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_property" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_property" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_property_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_property" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -98980,8 +99014,9 @@ def test_delete_property_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -99060,18 +99095,20 @@ def test_delete_property_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_delete_property" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_delete_property_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_property" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_delete_property" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_delete_property_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_property" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -99124,8 +99161,9 @@ def test_update_property_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -99286,18 +99324,20 @@ def test_update_property_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_property" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_property_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_property" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_update_property" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_property_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_property" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -99350,8 +99390,9 @@ def test_create_firebase_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -99488,18 +99529,20 @@ def test_create_firebase_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_firebase_link" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_firebase_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_firebase_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_firebase_link" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_firebase_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_firebase_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -99552,8 +99595,9 @@ def test_delete_firebase_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -99610,13 +99654,13 @@ def test_delete_firebase_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_firebase_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_firebase_link" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteFirebaseLinkRequest.pb( analytics_admin.DeleteFirebaseLinkRequest() @@ -99661,8 +99705,9 @@ def test_list_firebase_links_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -99725,18 +99770,20 @@ def test_list_firebase_links_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_firebase_links" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_firebase_links_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_firebase_links" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_firebase_links" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_firebase_links_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_firebase_links" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -99794,8 +99841,9 @@ def test_get_global_site_tag_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -99860,18 +99908,20 @@ def test_get_global_site_tag_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_global_site_tag" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_global_site_tag_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_global_site_tag" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_global_site_tag" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_global_site_tag_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_global_site_tag" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -99924,8 +99974,9 @@ def test_create_google_ads_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -100072,18 +100123,22 @@ def test_create_google_ads_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_google_ads_link" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_google_ads_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_google_ads_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_google_ads_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_google_ads_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_google_ads_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -100138,8 +100193,9 @@ def test_update_google_ads_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -100288,18 +100344,22 @@ def test_update_google_ads_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_google_ads_link" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_google_ads_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_google_ads_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_google_ads_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_google_ads_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_google_ads_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -100352,8 +100412,9 @@ def test_delete_google_ads_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -100410,13 +100471,14 @@ def test_delete_google_ads_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_google_ads_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_google_ads_link", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteGoogleAdsLinkRequest.pb( analytics_admin.DeleteGoogleAdsLinkRequest() @@ -100461,8 +100523,9 @@ def test_list_google_ads_links_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -100525,18 +100588,21 @@ def test_list_google_ads_links_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_google_ads_links" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_google_ads_links_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_google_ads_links" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_google_ads_links", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_google_ads_links_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_google_ads_links" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -100594,8 +100660,9 @@ def test_get_data_sharing_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -100668,19 +100735,22 @@ def test_get_data_sharing_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_data_sharing_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_data_sharing_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_data_sharing_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_data_sharing_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_data_sharing_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_data_sharing_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -100737,8 +100807,9 @@ def test_get_measurement_protocol_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -100807,20 +100878,22 @@ def test_get_measurement_protocol_secret_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_measurement_protocol_secret", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_measurement_protocol_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_measurement_protocol_secret", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_measurement_protocol_secret", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_measurement_protocol_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_measurement_protocol_secret", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -100878,8 +100951,9 @@ def test_list_measurement_protocol_secrets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -100944,20 +101018,22 @@ def test_list_measurement_protocol_secrets_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_list_measurement_protocol_secrets", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_measurement_protocol_secrets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_list_measurement_protocol_secrets", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_measurement_protocol_secrets", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_measurement_protocol_secrets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_measurement_protocol_secrets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -101015,8 +101091,9 @@ def test_create_measurement_protocol_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -101161,20 +101238,22 @@ def test_create_measurement_protocol_secret_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_create_measurement_protocol_secret", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_measurement_protocol_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_create_measurement_protocol_secret", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_measurement_protocol_secret", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_measurement_protocol_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_measurement_protocol_secret", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -101234,8 +101313,9 @@ def test_delete_measurement_protocol_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -101294,14 +101374,14 @@ def test_delete_measurement_protocol_secret_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "pre_delete_measurement_protocol_secret", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_measurement_protocol_secret", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteMeasurementProtocolSecretRequest.pb( analytics_admin.DeleteMeasurementProtocolSecretRequest() @@ -101350,8 +101430,9 @@ def test_update_measurement_protocol_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -101500,20 +101581,22 @@ def test_update_measurement_protocol_secret_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_measurement_protocol_secret", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_measurement_protocol_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_measurement_protocol_secret", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_measurement_protocol_secret", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_measurement_protocol_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_measurement_protocol_secret", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -101571,8 +101654,9 @@ def test_acknowledge_user_data_collection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -101634,20 +101718,22 @@ def test_acknowledge_user_data_collection_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_acknowledge_user_data_collection", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_acknowledge_user_data_collection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_acknowledge_user_data_collection", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_acknowledge_user_data_collection", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_acknowledge_user_data_collection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_acknowledge_user_data_collection", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -101707,8 +101793,9 @@ def test_get_sk_ad_network_conversion_value_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -101775,20 +101862,22 @@ def test_get_sk_ad_network_conversion_value_schema_rest_interceptors(null_interc ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_sk_ad_network_conversion_value_schema", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_sk_ad_network_conversion_value_schema_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_sk_ad_network_conversion_value_schema", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_sk_ad_network_conversion_value_schema", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_sk_ad_network_conversion_value_schema_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_sk_ad_network_conversion_value_schema", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -101846,8 +101935,9 @@ def test_create_sk_ad_network_conversion_value_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -102017,20 +102107,22 @@ def test_create_sk_ad_network_conversion_value_schema_rest_interceptors( ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_create_sk_ad_network_conversion_value_schema", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_sk_ad_network_conversion_value_schema_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_create_sk_ad_network_conversion_value_schema", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_sk_ad_network_conversion_value_schema", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_sk_ad_network_conversion_value_schema_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_sk_ad_network_conversion_value_schema", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -102090,8 +102182,9 @@ def test_delete_sk_ad_network_conversion_value_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -102152,14 +102245,14 @@ def test_delete_sk_ad_network_conversion_value_schema_rest_interceptors( ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "pre_delete_sk_ad_network_conversion_value_schema", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_sk_ad_network_conversion_value_schema", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteSKAdNetworkConversionValueSchemaRequest.pb( analytics_admin.DeleteSKAdNetworkConversionValueSchemaRequest() @@ -102208,8 +102301,9 @@ def test_update_sk_ad_network_conversion_value_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -102383,20 +102477,22 @@ def test_update_sk_ad_network_conversion_value_schema_rest_interceptors( ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_sk_ad_network_conversion_value_schema", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_sk_ad_network_conversion_value_schema_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_sk_ad_network_conversion_value_schema", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_sk_ad_network_conversion_value_schema", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_sk_ad_network_conversion_value_schema_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_sk_ad_network_conversion_value_schema", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -102454,8 +102550,9 @@ def test_list_sk_ad_network_conversion_value_schemas_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -102522,20 +102619,22 @@ def test_list_sk_ad_network_conversion_value_schemas_rest_interceptors( ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_list_sk_ad_network_conversion_value_schemas", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_sk_ad_network_conversion_value_schemas_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_list_sk_ad_network_conversion_value_schemas", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_sk_ad_network_conversion_value_schemas", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_sk_ad_network_conversion_value_schemas_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_sk_ad_network_conversion_value_schemas", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -102597,8 +102696,9 @@ def test_search_change_history_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -102663,20 +102763,22 @@ def test_search_change_history_events_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_search_change_history_events", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_search_change_history_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_search_change_history_events", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_search_change_history_events", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_search_change_history_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_search_change_history_events", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -102734,8 +102836,9 @@ def test_get_google_signals_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -102805,20 +102908,22 @@ def test_get_google_signals_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_google_signals_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_google_signals_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_google_signals_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_google_signals_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_google_signals_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_google_signals_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -102875,8 +102980,9 @@ def test_update_google_signals_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -103024,20 +103130,22 @@ def test_update_google_signals_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_google_signals_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_google_signals_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_google_signals_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_google_signals_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_google_signals_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_google_signals_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -103092,8 +103200,9 @@ def test_create_conversion_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -103248,18 +103357,22 @@ def test_create_conversion_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_conversion_event" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_conversion_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_conversion_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_conversion_event", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_conversion_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_conversion_event", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -103314,8 +103427,9 @@ def test_update_conversion_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -103472,18 +103586,22 @@ def test_update_conversion_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_conversion_event" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_conversion_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_conversion_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_conversion_event", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_conversion_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_conversion_event", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -103536,8 +103654,9 @@ def test_get_conversion_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -103611,18 +103730,20 @@ def test_get_conversion_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_conversion_event" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_conversion_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_conversion_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_conversion_event" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_conversion_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_conversion_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -103675,8 +103796,9 @@ def test_delete_conversion_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -103733,13 +103855,14 @@ def test_delete_conversion_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_conversion_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_conversion_event", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteConversionEventRequest.pb( analytics_admin.DeleteConversionEventRequest() @@ -103784,8 +103907,9 @@ def test_list_conversion_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -103848,18 +103972,22 @@ def test_list_conversion_events_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_conversion_events" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_conversion_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_conversion_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_conversion_events", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_conversion_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_conversion_events", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -103917,8 +104045,9 @@ def test_create_key_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -104068,18 +104197,20 @@ def test_create_key_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_key_event" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_key_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_key_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_key_event" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_key_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_key_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -104132,8 +104263,9 @@ def test_update_key_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -104283,18 +104415,20 @@ def test_update_key_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_key_event" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_key_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_key_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_update_key_event" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_key_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_key_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -104347,8 +104481,9 @@ def test_get_key_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -104419,18 +104554,20 @@ def test_get_key_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_key_event" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_key_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_key_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_key_event" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_key_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_key_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -104483,8 +104620,9 @@ def test_delete_key_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -104541,13 +104679,13 @@ def test_delete_key_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_key_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_key_event" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteKeyEventRequest.pb( analytics_admin.DeleteKeyEventRequest() @@ -104592,8 +104730,9 @@ def test_list_key_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -104656,18 +104795,20 @@ def test_list_key_events_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_key_events" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_key_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_key_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_key_events" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_key_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_key_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -104725,8 +104866,9 @@ def test_get_display_video360_advertiser_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -104793,20 +104935,22 @@ def test_get_display_video360_advertiser_link_rest_interceptors(null_interceptor ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_display_video360_advertiser_link", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_display_video360_advertiser_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_display_video360_advertiser_link", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_display_video360_advertiser_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_display_video360_advertiser_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_display_video360_advertiser_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -104864,8 +105008,9 @@ def test_list_display_video360_advertiser_links_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -104930,20 +105075,22 @@ def test_list_display_video360_advertiser_links_rest_interceptors(null_intercept ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_list_display_video360_advertiser_links", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_display_video360_advertiser_links_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_list_display_video360_advertiser_links", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_display_video360_advertiser_links", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_display_video360_advertiser_links_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_display_video360_advertiser_links", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -105003,8 +105150,9 @@ def test_create_display_video360_advertiser_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -105154,20 +105302,22 @@ def test_create_display_video360_advertiser_link_rest_interceptors(null_intercep ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_create_display_video360_advertiser_link", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_display_video360_advertiser_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_create_display_video360_advertiser_link", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_display_video360_advertiser_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_display_video360_advertiser_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_display_video360_advertiser_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -105225,8 +105375,9 @@ def test_delete_display_video360_advertiser_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -105283,14 +105434,14 @@ def test_delete_display_video360_advertiser_link_rest_interceptors(null_intercep ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "pre_delete_display_video360_advertiser_link", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_display_video360_advertiser_link", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteDisplayVideo360AdvertiserLinkRequest.pb( analytics_admin.DeleteDisplayVideo360AdvertiserLinkRequest() @@ -105339,8 +105490,9 @@ def test_update_display_video360_advertiser_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -105494,20 +105646,22 @@ def test_update_display_video360_advertiser_link_rest_interceptors(null_intercep ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_display_video360_advertiser_link", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_display_video360_advertiser_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_display_video360_advertiser_link", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_display_video360_advertiser_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_display_video360_advertiser_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_display_video360_advertiser_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -105567,8 +105721,9 @@ def test_get_display_video360_advertiser_link_proposal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -105641,20 +105796,22 @@ def test_get_display_video360_advertiser_link_proposal_rest_interceptors( ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_display_video360_advertiser_link_proposal", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_display_video360_advertiser_link_proposal_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_display_video360_advertiser_link_proposal", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_display_video360_advertiser_link_proposal", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_display_video360_advertiser_link_proposal_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_display_video360_advertiser_link_proposal", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -105712,8 +105869,9 @@ def test_list_display_video360_advertiser_link_proposals_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -105786,20 +105944,22 @@ def test_list_display_video360_advertiser_link_proposals_rest_interceptors( ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_list_display_video360_advertiser_link_proposals", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_display_video360_advertiser_link_proposals_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_list_display_video360_advertiser_link_proposals", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_display_video360_advertiser_link_proposals", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_display_video360_advertiser_link_proposals_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_display_video360_advertiser_link_proposals", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -105863,8 +106023,9 @@ def test_create_display_video360_advertiser_link_proposal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -106035,20 +106196,22 @@ def test_create_display_video360_advertiser_link_proposal_rest_interceptors( ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_create_display_video360_advertiser_link_proposal", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_display_video360_advertiser_link_proposal_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_create_display_video360_advertiser_link_proposal", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_display_video360_advertiser_link_proposal", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_display_video360_advertiser_link_proposal_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_display_video360_advertiser_link_proposal", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -106110,8 +106273,9 @@ def test_delete_display_video360_advertiser_link_proposal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -106174,14 +106338,14 @@ def test_delete_display_video360_advertiser_link_proposal_rest_interceptors( ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "pre_delete_display_video360_advertiser_link_proposal", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_display_video360_advertiser_link_proposal", + ) as pre, + ): pre.assert_not_called() pb_message = ( analytics_admin.DeleteDisplayVideo360AdvertiserLinkProposalRequest.pb( @@ -106230,8 +106394,9 @@ def test_approve_display_video360_advertiser_link_proposal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -106305,20 +106470,22 @@ def test_approve_display_video360_advertiser_link_proposal_rest_interceptors( ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_approve_display_video360_advertiser_link_proposal", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_approve_display_video360_advertiser_link_proposal_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_approve_display_video360_advertiser_link_proposal", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_approve_display_video360_advertiser_link_proposal", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_approve_display_video360_advertiser_link_proposal_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_approve_display_video360_advertiser_link_proposal", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -106382,8 +106549,9 @@ def test_cancel_display_video360_advertiser_link_proposal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -106458,20 +106626,22 @@ def test_cancel_display_video360_advertiser_link_proposal_rest_interceptors( ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_cancel_display_video360_advertiser_link_proposal", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_cancel_display_video360_advertiser_link_proposal_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_cancel_display_video360_advertiser_link_proposal", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_cancel_display_video360_advertiser_link_proposal", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_cancel_display_video360_advertiser_link_proposal_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_cancel_display_video360_advertiser_link_proposal", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -106531,8 +106701,9 @@ def test_create_custom_dimension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -106682,18 +106853,22 @@ def test_create_custom_dimension_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_custom_dimension" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_custom_dimension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_custom_dimension" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_custom_dimension", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_custom_dimension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_custom_dimension", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -106748,8 +106923,9 @@ def test_update_custom_dimension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -106901,18 +107077,22 @@ def test_update_custom_dimension_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_custom_dimension" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_custom_dimension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_custom_dimension" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_custom_dimension", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_custom_dimension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_custom_dimension", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -106965,8 +107145,9 @@ def test_list_custom_dimensions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -107029,18 +107210,22 @@ def test_list_custom_dimensions_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_custom_dimensions" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_custom_dimensions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_custom_dimensions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_custom_dimensions", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_custom_dimensions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_custom_dimensions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -107098,8 +107283,9 @@ def test_archive_custom_dimension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -107156,13 +107342,14 @@ def test_archive_custom_dimension_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_archive_custom_dimension" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_archive_custom_dimension", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.ArchiveCustomDimensionRequest.pb( analytics_admin.ArchiveCustomDimensionRequest() @@ -107207,8 +107394,9 @@ def test_get_custom_dimension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -107281,18 +107469,20 @@ def test_get_custom_dimension_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_custom_dimension" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_custom_dimension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_custom_dimension" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_custom_dimension" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_custom_dimension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_custom_dimension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -107345,8 +107535,9 @@ def test_create_custom_metric_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -107501,18 +107692,20 @@ def test_create_custom_metric_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_custom_metric" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_custom_metric_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_custom_metric" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_custom_metric" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_custom_metric_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_custom_metric" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -107567,8 +107760,9 @@ def test_update_custom_metric_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -107725,18 +107919,20 @@ def test_update_custom_metric_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_custom_metric" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_custom_metric_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_custom_metric" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_update_custom_metric" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_custom_metric_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_custom_metric" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -107789,8 +107985,9 @@ def test_list_custom_metrics_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -107853,18 +108050,20 @@ def test_list_custom_metrics_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_custom_metrics" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_custom_metrics_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_custom_metrics" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_custom_metrics" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_custom_metrics_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_custom_metrics" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -107922,8 +108121,9 @@ def test_archive_custom_metric_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -107980,13 +108180,13 @@ def test_archive_custom_metric_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_archive_custom_metric" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_archive_custom_metric" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.ArchiveCustomMetricRequest.pb( analytics_admin.ArchiveCustomMetricRequest() @@ -108031,8 +108231,9 @@ def test_get_custom_metric_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -108111,18 +108312,20 @@ def test_get_custom_metric_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_custom_metric" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_custom_metric_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_custom_metric" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_custom_metric" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_custom_metric_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_custom_metric" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -108175,8 +108378,9 @@ def test_get_data_retention_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -108251,20 +108455,22 @@ def test_get_data_retention_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_data_retention_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_data_retention_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_data_retention_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_data_retention_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_data_retention_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_data_retention_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -108321,8 +108527,9 @@ def test_update_data_retention_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -108476,20 +108683,22 @@ def test_update_data_retention_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_data_retention_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_data_retention_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_data_retention_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_data_retention_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_data_retention_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_data_retention_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -108544,8 +108753,9 @@ def test_create_data_stream_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -108699,18 +108909,20 @@ def test_create_data_stream_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_data_stream" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_data_stream_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_data_stream" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_data_stream" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_data_stream_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_data_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -108763,8 +108975,9 @@ def test_delete_data_stream_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -108821,13 +109034,13 @@ def test_delete_data_stream_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_data_stream" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_data_stream" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteDataStreamRequest.pb( analytics_admin.DeleteDataStreamRequest() @@ -108872,8 +109085,9 @@ def test_update_data_stream_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -109027,18 +109241,20 @@ def test_update_data_stream_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_data_stream" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_data_stream_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_data_stream" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_update_data_stream" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_data_stream_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_data_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -109091,8 +109307,9 @@ def test_list_data_streams_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -109155,18 +109372,20 @@ def test_list_data_streams_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_data_streams" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_data_streams_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_data_streams" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_data_streams" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_data_streams_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_data_streams" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -109224,8 +109443,9 @@ def test_get_data_stream_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -109292,18 +109512,20 @@ def test_get_data_stream_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_data_stream" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_data_stream_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_data_stream" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_data_stream" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_data_stream_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_data_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -109354,8 +109576,9 @@ def test_get_audience_rest_bad_request(request_type=analytics_admin.GetAudienceR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -109431,18 +109654,20 @@ def test_get_audience_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_audience" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_audience_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_audience" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_audience" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_audience_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_audience" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -109495,8 +109720,9 @@ def test_list_audiences_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -109559,18 +109785,20 @@ def test_list_audiences_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_audiences" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_audiences_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_audiences" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_audiences" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_audiences_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_audiences" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -109628,8 +109856,9 @@ def test_create_audience_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -109833,18 +110062,20 @@ def test_create_audience_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_audience" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_audience_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_audience" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_audience" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_audience_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_audience" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -109897,8 +110128,9 @@ def test_update_audience_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -110102,18 +110334,20 @@ def test_update_audience_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_audience" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_audience_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_audience" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_update_audience" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_audience_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_audience" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -110166,8 +110400,9 @@ def test_archive_audience_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -110224,13 +110459,13 @@ def test_archive_audience_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_archive_audience" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_archive_audience" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.ArchiveAudienceRequest.pb( analytics_admin.ArchiveAudienceRequest() @@ -110275,8 +110510,9 @@ def test_get_search_ads360_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -110343,18 +110579,22 @@ def test_get_search_ads360_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_search_ads360_link" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_search_ads360_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_search_ads360_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_search_ads360_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_search_ads360_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_search_ads360_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -110407,8 +110647,9 @@ def test_list_search_ads360_links_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -110471,18 +110712,22 @@ def test_list_search_ads360_links_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_search_ads360_links" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_search_ads360_links_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_search_ads360_links" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_search_ads360_links", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_search_ads360_links_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_search_ads360_links", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -110540,8 +110785,9 @@ def test_create_search_ads360_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -110686,19 +110932,22 @@ def test_create_search_ads360_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_create_search_ads360_link", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_search_ads360_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_search_ads360_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_search_ads360_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_search_ads360_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_search_ads360_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -110751,8 +111000,9 @@ def test_delete_search_ads360_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -110809,13 +111059,14 @@ def test_delete_search_ads360_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_search_ads360_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_search_ads360_link", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteSearchAds360LinkRequest.pb( analytics_admin.DeleteSearchAds360LinkRequest() @@ -110862,8 +111113,9 @@ def test_update_search_ads360_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -111010,19 +111262,22 @@ def test_update_search_ads360_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_search_ads360_link", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_search_ads360_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_search_ads360_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_search_ads360_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_search_ads360_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_search_ads360_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -111075,8 +111330,9 @@ def test_get_attribution_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -111159,18 +111415,22 @@ def test_get_attribution_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_attribution_settings" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_attribution_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_attribution_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_attribution_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_attribution_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_attribution_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -111227,8 +111487,9 @@ def test_update_attribution_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -111391,20 +111652,22 @@ def test_update_attribution_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_attribution_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_attribution_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_attribution_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_attribution_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_attribution_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_attribution_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -111459,8 +111722,9 @@ def test_run_access_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -111523,18 +111787,20 @@ def test_run_access_report_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_run_access_report" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_run_access_report_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_run_access_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_run_access_report" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_run_access_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_run_access_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -111592,8 +111858,9 @@ def test_create_access_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -111733,18 +112000,21 @@ def test_create_access_binding_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_access_binding" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_access_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_access_binding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_access_binding", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_access_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_access_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -111797,8 +112067,9 @@ def test_get_access_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -111864,18 +112135,20 @@ def test_get_access_binding_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_access_binding" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_access_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_access_binding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_access_binding" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_access_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_access_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -111930,8 +112203,9 @@ def test_update_access_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -112073,18 +112347,21 @@ def test_update_access_binding_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_access_binding" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_access_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_access_binding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_access_binding", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_access_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_access_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -112137,8 +112414,9 @@ def test_delete_access_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -112195,13 +112473,13 @@ def test_delete_access_binding_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_access_binding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_access_binding" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteAccessBindingRequest.pb( analytics_admin.DeleteAccessBindingRequest() @@ -112246,8 +112524,9 @@ def test_list_access_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -112310,18 +112589,20 @@ def test_list_access_bindings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_access_bindings" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_access_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_access_bindings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_access_bindings" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_access_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_access_bindings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -112379,8 +112660,9 @@ def test_batch_create_access_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -112442,20 +112724,22 @@ def test_batch_create_access_bindings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_batch_create_access_bindings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_batch_create_access_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_batch_create_access_bindings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_batch_create_access_bindings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_batch_create_access_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_batch_create_access_bindings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -112513,8 +112797,9 @@ def test_batch_get_access_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -112574,19 +112859,22 @@ def test_batch_get_access_bindings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_batch_get_access_bindings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_batch_get_access_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_batch_get_access_bindings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_batch_get_access_bindings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_batch_get_access_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_batch_get_access_bindings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -112644,8 +112932,9 @@ def test_batch_update_access_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -112707,20 +112996,22 @@ def test_batch_update_access_bindings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_batch_update_access_bindings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_batch_update_access_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_batch_update_access_bindings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_batch_update_access_bindings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_batch_update_access_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_batch_update_access_bindings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -112778,8 +113069,9 @@ def test_batch_delete_access_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -112836,14 +113128,14 @@ def test_batch_delete_access_bindings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "pre_batch_delete_access_bindings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_batch_delete_access_bindings", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.BatchDeleteAccessBindingsRequest.pb( analytics_admin.BatchDeleteAccessBindingsRequest() @@ -112888,8 +113180,9 @@ def test_get_expanded_data_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -112960,18 +113253,21 @@ def test_get_expanded_data_set_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_expanded_data_set" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_expanded_data_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_expanded_data_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_expanded_data_set", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_expanded_data_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_expanded_data_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -113026,8 +113322,9 @@ def test_list_expanded_data_sets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -113090,18 +113387,22 @@ def test_list_expanded_data_sets_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_expanded_data_sets" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_expanded_data_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_expanded_data_sets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_expanded_data_sets", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_expanded_data_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_expanded_data_sets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -113159,8 +113460,9 @@ def test_create_expanded_data_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -113324,18 +113626,22 @@ def test_create_expanded_data_set_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_expanded_data_set" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_expanded_data_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_expanded_data_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_expanded_data_set", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_expanded_data_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_expanded_data_set", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -113395,8 +113701,9 @@ def test_update_expanded_data_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -113562,18 +113869,22 @@ def test_update_expanded_data_set_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_expanded_data_set" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_expanded_data_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_expanded_data_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_expanded_data_set", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_expanded_data_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_expanded_data_set", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -113631,8 +113942,9 @@ def test_delete_expanded_data_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -113689,13 +114001,14 @@ def test_delete_expanded_data_set_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_expanded_data_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_expanded_data_set", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteExpandedDataSetRequest.pb( analytics_admin.DeleteExpandedDataSetRequest() @@ -113740,8 +114053,9 @@ def test_get_channel_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -113812,18 +114126,20 @@ def test_get_channel_group_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_channel_group" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_channel_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_channel_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_channel_group" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_channel_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_channel_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -113876,8 +114192,9 @@ def test_list_channel_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -113940,18 +114257,20 @@ def test_list_channel_groups_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_channel_groups" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_channel_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_channel_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_channel_groups" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_channel_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_channel_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -114009,8 +114328,9 @@ def test_create_channel_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -114172,18 +114492,20 @@ def test_create_channel_group_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_channel_group" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_channel_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_channel_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_channel_group" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_channel_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_channel_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -114240,8 +114562,9 @@ def test_update_channel_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -114405,18 +114728,20 @@ def test_update_channel_group_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_channel_group" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_channel_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_channel_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_update_channel_group" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_channel_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_channel_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -114471,8 +114796,9 @@ def test_delete_channel_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -114529,13 +114855,13 @@ def test_delete_channel_group_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_channel_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_channel_group" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteChannelGroupRequest.pb( analytics_admin.DeleteChannelGroupRequest() @@ -114580,8 +114906,9 @@ def test_create_big_query_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -114739,18 +115066,21 @@ def test_create_big_query_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_big_query_link" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_big_query_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_big_query_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_big_query_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_big_query_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_big_query_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -114803,8 +115133,9 @@ def test_get_big_query_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -114883,18 +115214,20 @@ def test_get_big_query_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_big_query_link" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_big_query_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_big_query_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_big_query_link" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_big_query_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_big_query_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -114947,8 +115280,9 @@ def test_list_big_query_links_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -115011,18 +115345,20 @@ def test_list_big_query_links_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_big_query_links" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_big_query_links_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_big_query_links" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_big_query_links" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_big_query_links_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_big_query_links" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -115080,8 +115416,9 @@ def test_delete_big_query_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -115138,13 +115475,13 @@ def test_delete_big_query_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_big_query_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_big_query_link" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteBigQueryLinkRequest.pb( analytics_admin.DeleteBigQueryLinkRequest() @@ -115191,8 +115528,9 @@ def test_update_big_query_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -115352,18 +115690,21 @@ def test_update_big_query_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_big_query_link" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_big_query_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_big_query_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_big_query_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_big_query_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_big_query_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -115418,8 +115759,9 @@ def test_get_enhanced_measurement_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -115504,20 +115846,22 @@ def test_get_enhanced_measurement_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_enhanced_measurement_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_enhanced_measurement_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_enhanced_measurement_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_enhanced_measurement_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_enhanced_measurement_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_enhanced_measurement_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -115579,8 +115923,9 @@ def test_update_enhanced_measurement_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -115755,20 +116100,22 @@ def test_update_enhanced_measurement_settings_rest_interceptors(null_interceptor ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_enhanced_measurement_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_enhanced_measurement_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_enhanced_measurement_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_enhanced_measurement_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_enhanced_measurement_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_enhanced_measurement_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -115826,8 +116173,9 @@ def test_get_ad_sense_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -115892,18 +116240,20 @@ def test_get_ad_sense_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_ad_sense_link" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_ad_sense_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_ad_sense_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_ad_sense_link" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_ad_sense_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_ad_sense_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -115956,8 +116306,9 @@ def test_create_ad_sense_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -116093,18 +116444,20 @@ def test_create_ad_sense_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_ad_sense_link" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_ad_sense_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_ad_sense_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_ad_sense_link" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_ad_sense_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_ad_sense_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -116157,8 +116510,9 @@ def test_delete_ad_sense_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -116215,13 +116569,13 @@ def test_delete_ad_sense_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_ad_sense_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_ad_sense_link" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteAdSenseLinkRequest.pb( analytics_admin.DeleteAdSenseLinkRequest() @@ -116266,8 +116620,9 @@ def test_list_ad_sense_links_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -116330,18 +116685,20 @@ def test_list_ad_sense_links_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_ad_sense_links" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_ad_sense_links_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_ad_sense_links" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_ad_sense_links" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_ad_sense_links_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_ad_sense_links" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -116401,8 +116758,9 @@ def test_get_event_create_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -116471,18 +116829,21 @@ def test_get_event_create_rule_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_event_create_rule" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_event_create_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_event_create_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_event_create_rule", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_event_create_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_event_create_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -116540,8 +116901,9 @@ def test_list_event_create_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -116604,18 +116966,22 @@ def test_list_event_create_rules_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_event_create_rules" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_event_create_rules_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_event_create_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_event_create_rules", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_event_create_rules_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_event_create_rules", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -116673,8 +117039,9 @@ def test_create_event_create_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -116826,18 +117193,22 @@ def test_create_event_create_rule_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_event_create_rule" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_event_create_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_event_create_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_event_create_rule", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_event_create_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_event_create_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -116899,8 +117270,9 @@ def test_update_event_create_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -117056,18 +117428,22 @@ def test_update_event_create_rule_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_event_create_rule" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_event_create_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_event_create_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_event_create_rule", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_event_create_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_event_create_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -117127,8 +117503,9 @@ def test_delete_event_create_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -117187,13 +117564,14 @@ def test_delete_event_create_rule_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_event_create_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_event_create_rule", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteEventCreateRuleRequest.pb( analytics_admin.DeleteEventCreateRuleRequest() @@ -117240,8 +117618,9 @@ def test_get_event_edit_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -117310,18 +117689,20 @@ def test_get_event_edit_rule_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_event_edit_rule" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_event_edit_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_event_edit_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_event_edit_rule" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_event_edit_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_event_edit_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -117379,8 +117760,9 @@ def test_list_event_edit_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -117443,18 +117825,21 @@ def test_list_event_edit_rules_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_event_edit_rules" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_event_edit_rules_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_event_edit_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_event_edit_rules", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_event_edit_rules_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_event_edit_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -117512,8 +117897,9 @@ def test_create_event_edit_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -117665,18 +118051,22 @@ def test_create_event_edit_rule_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_event_edit_rule" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_event_edit_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_event_edit_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_event_edit_rule", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_event_edit_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_event_edit_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -117738,8 +118128,9 @@ def test_update_event_edit_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -117895,18 +118286,22 @@ def test_update_event_edit_rule_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_event_edit_rule" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_event_edit_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_event_edit_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_event_edit_rule", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_event_edit_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_event_edit_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -117966,8 +118361,9 @@ def test_delete_event_edit_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -118026,13 +118422,14 @@ def test_delete_event_edit_rule_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_event_edit_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_event_edit_rule", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteEventEditRuleRequest.pb( analytics_admin.DeleteEventEditRuleRequest() @@ -118077,8 +118474,9 @@ def test_reorder_event_edit_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -118135,13 +118533,14 @@ def test_reorder_event_edit_rules_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_reorder_event_edit_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_reorder_event_edit_rules", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.ReorderEventEditRulesRequest.pb( analytics_admin.ReorderEventEditRulesRequest() @@ -118190,8 +118589,9 @@ def test_update_data_redaction_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -118344,20 +118744,22 @@ def test_update_data_redaction_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_data_redaction_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_data_redaction_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_data_redaction_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_data_redaction_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_data_redaction_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_data_redaction_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -118414,8 +118816,9 @@ def test_get_data_redaction_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -118486,20 +118889,22 @@ def test_get_data_redaction_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_data_redaction_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_data_redaction_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_data_redaction_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_data_redaction_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_data_redaction_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_data_redaction_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -118554,8 +118959,9 @@ def test_get_calculated_metric_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -118636,18 +119042,21 @@ def test_get_calculated_metric_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_calculated_metric" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_calculated_metric_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_calculated_metric" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_calculated_metric", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_calculated_metric_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_calculated_metric" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -118700,8 +119109,9 @@ def test_create_calculated_metric_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -118861,18 +119271,22 @@ def test_create_calculated_metric_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_calculated_metric" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_calculated_metric_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_calculated_metric" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_calculated_metric", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_calculated_metric_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_calculated_metric", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -118925,8 +119339,9 @@ def test_list_calculated_metrics_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -118989,18 +119404,22 @@ def test_list_calculated_metrics_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_calculated_metrics" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_calculated_metrics_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_calculated_metrics" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_calculated_metrics", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_calculated_metrics_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_calculated_metrics", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -119060,8 +119479,9 @@ def test_update_calculated_metric_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -119223,18 +119643,22 @@ def test_update_calculated_metric_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_calculated_metric" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_calculated_metric_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_calculated_metric" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_calculated_metric", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_calculated_metric_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_calculated_metric", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -119287,8 +119711,9 @@ def test_delete_calculated_metric_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -119345,13 +119770,14 @@ def test_delete_calculated_metric_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_calculated_metric" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_calculated_metric", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteCalculatedMetricRequest.pb( analytics_admin.DeleteCalculatedMetricRequest() @@ -119396,8 +119822,9 @@ def test_create_rollup_property_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -119457,18 +119884,22 @@ def test_create_rollup_property_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_rollup_property" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_rollup_property_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_rollup_property" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_rollup_property", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_rollup_property_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_rollup_property", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -119526,8 +119957,9 @@ def test_get_rollup_property_source_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -119592,20 +120024,22 @@ def test_get_rollup_property_source_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_rollup_property_source_link", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_rollup_property_source_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_rollup_property_source_link", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_rollup_property_source_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_rollup_property_source_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_rollup_property_source_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -119660,8 +120094,9 @@ def test_list_rollup_property_source_links_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -119726,20 +120161,22 @@ def test_list_rollup_property_source_links_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_list_rollup_property_source_links", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_rollup_property_source_links_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_list_rollup_property_source_links", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_rollup_property_source_links", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_rollup_property_source_links_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_rollup_property_source_links", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -119797,8 +120234,9 @@ def test_create_rollup_property_source_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -119940,20 +120378,22 @@ def test_create_rollup_property_source_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_create_rollup_property_source_link", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_rollup_property_source_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_create_rollup_property_source_link", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_rollup_property_source_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_rollup_property_source_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_rollup_property_source_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -120008,8 +120448,9 @@ def test_delete_rollup_property_source_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -120066,14 +120507,14 @@ def test_delete_rollup_property_source_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "pre_delete_rollup_property_source_link", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_rollup_property_source_link", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteRollupPropertySourceLinkRequest.pb( analytics_admin.DeleteRollupPropertySourceLinkRequest() @@ -120118,8 +120559,9 @@ def test_provision_subproperty_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -120179,18 +120621,21 @@ def test_provision_subproperty_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_provision_subproperty" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_provision_subproperty_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_provision_subproperty" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_provision_subproperty", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_provision_subproperty_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_provision_subproperty" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -120248,8 +120693,9 @@ def test_create_subproperty_event_filter_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -120409,20 +120855,22 @@ def test_create_subproperty_event_filter_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_create_subproperty_event_filter", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_subproperty_event_filter_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_create_subproperty_event_filter", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_subproperty_event_filter", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_subproperty_event_filter_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_subproperty_event_filter", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -120480,8 +120928,9 @@ def test_get_subproperty_event_filter_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -120546,20 +120995,22 @@ def test_get_subproperty_event_filter_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_subproperty_event_filter", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_subproperty_event_filter_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_subproperty_event_filter", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_subproperty_event_filter", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_subproperty_event_filter_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_subproperty_event_filter", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -120617,8 +121068,9 @@ def test_list_subproperty_event_filters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -120683,20 +121135,22 @@ def test_list_subproperty_event_filters_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_list_subproperty_event_filters", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_subproperty_event_filters_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_list_subproperty_event_filters", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_subproperty_event_filters", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_subproperty_event_filters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_subproperty_event_filters", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -120758,8 +121212,9 @@ def test_update_subproperty_event_filter_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -120923,20 +121378,22 @@ def test_update_subproperty_event_filter_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_subproperty_event_filter", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_subproperty_event_filter_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_subproperty_event_filter", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_subproperty_event_filter", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_subproperty_event_filter_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_subproperty_event_filter", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -120994,8 +121451,9 @@ def test_delete_subproperty_event_filter_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -121052,14 +121510,14 @@ def test_delete_subproperty_event_filter_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "pre_delete_subproperty_event_filter", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_subproperty_event_filter", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteSubpropertyEventFilterRequest.pb( analytics_admin.DeleteSubpropertyEventFilterRequest() @@ -121104,8 +121562,9 @@ def test_create_reporting_data_annotation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -121258,20 +121717,22 @@ def test_create_reporting_data_annotation_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_create_reporting_data_annotation", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_reporting_data_annotation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_create_reporting_data_annotation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_reporting_data_annotation", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_reporting_data_annotation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_reporting_data_annotation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -121326,8 +121787,9 @@ def test_get_reporting_data_annotation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -121398,20 +121860,22 @@ def test_get_reporting_data_annotation_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_reporting_data_annotation", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_reporting_data_annotation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_reporting_data_annotation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_reporting_data_annotation", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_reporting_data_annotation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_reporting_data_annotation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -121466,8 +121930,9 @@ def test_list_reporting_data_annotations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -121532,20 +121997,22 @@ def test_list_reporting_data_annotations_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_list_reporting_data_annotations", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_reporting_data_annotations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_list_reporting_data_annotations", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_reporting_data_annotations", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_reporting_data_annotations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_reporting_data_annotations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -121607,8 +122074,9 @@ def test_update_reporting_data_annotation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -121765,20 +122233,22 @@ def test_update_reporting_data_annotation_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_reporting_data_annotation", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_reporting_data_annotation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_reporting_data_annotation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_reporting_data_annotation", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_reporting_data_annotation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_reporting_data_annotation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -121833,8 +122303,9 @@ def test_delete_reporting_data_annotation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -121891,14 +122362,14 @@ def test_delete_reporting_data_annotation_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "pre_delete_reporting_data_annotation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_reporting_data_annotation", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteReportingDataAnnotationRequest.pb( analytics_admin.DeleteReportingDataAnnotationRequest() @@ -121943,8 +122414,9 @@ def test_submit_user_deletion_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -122004,18 +122476,20 @@ def test_submit_user_deletion_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_submit_user_deletion" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_submit_user_deletion_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_submit_user_deletion" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_submit_user_deletion" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_submit_user_deletion_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_submit_user_deletion" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -122073,8 +122547,9 @@ def test_list_subproperty_sync_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -122139,20 +122614,22 @@ def test_list_subproperty_sync_configs_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_list_subproperty_sync_configs", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_subproperty_sync_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_list_subproperty_sync_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_subproperty_sync_configs", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_subproperty_sync_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_subproperty_sync_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -122214,8 +122691,9 @@ def test_update_subproperty_sync_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -122365,20 +122843,22 @@ def test_update_subproperty_sync_config_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_subproperty_sync_config", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_subproperty_sync_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_subproperty_sync_config", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_subproperty_sync_config", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_subproperty_sync_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_subproperty_sync_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -122433,8 +122913,9 @@ def test_get_subproperty_sync_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -122504,20 +122985,22 @@ def test_get_subproperty_sync_config_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_subproperty_sync_config", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_subproperty_sync_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_subproperty_sync_config", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_subproperty_sync_config", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_subproperty_sync_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_subproperty_sync_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -122572,8 +123055,9 @@ def test_get_reporting_identity_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -122641,20 +123125,22 @@ def test_get_reporting_identity_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_reporting_identity_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_reporting_identity_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_reporting_identity_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_reporting_identity_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_reporting_identity_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_reporting_identity_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -126277,11 +126763,14 @@ def test_analytics_admin_service_base_transport(): def test_analytics_admin_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.analytics.admin_v1alpha.services.analytics_admin_service.transports.AnalyticsAdminServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.analytics.admin_v1alpha.services.analytics_admin_service.transports.AnalyticsAdminServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AnalyticsAdminServiceTransport( @@ -126303,9 +126792,12 @@ def test_analytics_admin_service_base_transport_with_credentials_file(): def test_analytics_admin_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.analytics.admin_v1alpha.services.analytics_admin_service.transports.AnalyticsAdminServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.analytics.admin_v1alpha.services.analytics_admin_service.transports.AnalyticsAdminServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AnalyticsAdminServiceTransport() @@ -126389,11 +126881,12 @@ def test_analytics_admin_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-analytics-admin/tests/unit/gapic/admin_v1beta/test_analytics_admin_service.py b/packages/google-analytics-admin/tests/unit/gapic/admin_v1beta/test_analytics_admin_service.py index 6223818b6454..d95ffb70b942 100644 --- a/packages/google-analytics-admin/tests/unit/gapic/admin_v1beta/test_analytics_admin_service.py +++ b/packages/google-analytics-admin/tests/unit/gapic/admin_v1beta/test_analytics_admin_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.analytics.admin_v1beta.services.analytics_admin_service import ( AnalyticsAdminServiceAsyncClient, @@ -1001,10 +1006,9 @@ def test_analytics_admin_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1049,10 +1053,9 @@ def test_analytics_admin_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1088,10 +1091,9 @@ def test_analytics_admin_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1347,13 +1349,13 @@ def test_analytics_admin_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3020,9 +3022,9 @@ def test_list_account_summaries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_account_summaries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_account_summaries] = ( + mock_rpc + ) request = {} client.list_account_summaries(request) @@ -5132,9 +5134,9 @@ def test_create_firebase_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_firebase_link] = ( + mock_rpc + ) request = {} client.create_firebase_link(request) @@ -5483,9 +5485,9 @@ def test_delete_firebase_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_firebase_link] = ( + mock_rpc + ) request = {} client.delete_firebase_link(request) @@ -5818,9 +5820,9 @@ def test_list_firebase_links_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_firebase_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_firebase_links] = ( + mock_rpc + ) request = {} client.list_firebase_links(request) @@ -6369,9 +6371,9 @@ def test_create_google_ads_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_google_ads_link] = ( + mock_rpc + ) request = {} client.create_google_ads_link(request) @@ -6730,9 +6732,9 @@ def test_update_google_ads_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_google_ads_link] = ( + mock_rpc + ) request = {} client.update_google_ads_link(request) @@ -7086,9 +7088,9 @@ def test_delete_google_ads_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_google_ads_link] = ( + mock_rpc + ) request = {} client.delete_google_ads_link(request) @@ -7422,9 +7424,9 @@ def test_list_google_ads_links_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_google_ads_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_google_ads_links] = ( + mock_rpc + ) request = {} client.list_google_ads_links(request) @@ -11771,9 +11773,9 @@ def test_get_conversion_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversion_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversion_event] = ( + mock_rpc + ) request = {} client.get_conversion_event(request) @@ -12458,9 +12460,9 @@ def test_list_conversion_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversion_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversion_events] = ( + mock_rpc + ) request = {} client.list_conversion_events(request) @@ -13004,9 +13006,9 @@ def test_create_key_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_key_event] = ( + mock_rpc + ) request = {} client.create_key_event(request) @@ -13347,9 +13349,9 @@ def test_update_key_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_key_event] = ( + mock_rpc + ) request = {} client.update_key_event(request) @@ -14018,9 +14020,9 @@ def test_delete_key_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_key_event] = ( + mock_rpc + ) request = {} client.delete_key_event(request) @@ -15604,9 +15606,9 @@ def test_list_custom_dimensions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_dimensions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_dimensions] = ( + mock_rpc + ) request = {} client.list_custom_dimensions(request) @@ -16489,9 +16491,9 @@ def test_get_custom_dimension_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_dimension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_dimension] = ( + mock_rpc + ) request = {} client.get_custom_dimension(request) @@ -16857,9 +16859,9 @@ def test_create_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_metric] = ( + mock_rpc + ) request = {} client.create_custom_metric(request) @@ -17237,9 +17239,9 @@ def test_update_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_custom_metric] = ( + mock_rpc + ) request = {} client.update_custom_metric(request) @@ -17607,9 +17609,9 @@ def test_list_custom_metrics_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_metrics - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_metrics] = ( + mock_rpc + ) request = {} client.list_custom_metrics(request) @@ -18149,9 +18151,9 @@ def test_archive_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.archive_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.archive_custom_metric] = ( + mock_rpc + ) request = {} client.archive_custom_metric(request) @@ -18496,9 +18498,9 @@ def test_get_custom_metric_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_metric] = ( + mock_rpc + ) request = {} client.get_custom_metric(request) @@ -19597,9 +19599,9 @@ def test_create_data_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_stream] = ( + mock_rpc + ) request = {} client.create_data_stream(request) @@ -19974,9 +19976,9 @@ def test_delete_data_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_stream] = ( + mock_rpc + ) request = {} client.delete_data_stream(request) @@ -20307,9 +20309,9 @@ def test_update_data_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_stream] = ( + mock_rpc + ) request = {} client.update_data_stream(request) @@ -20687,9 +20689,9 @@ def test_list_data_streams_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_streams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_streams] = ( + mock_rpc + ) request = {} client.list_data_streams(request) @@ -21561,9 +21563,9 @@ def test_run_access_report_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_access_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_access_report] = ( + mock_rpc + ) request = {} client.run_access_report(request) @@ -22420,9 +22422,9 @@ def test_list_account_summaries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_account_summaries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_account_summaries] = ( + mock_rpc + ) request = {} client.list_account_summaries(request) @@ -23442,9 +23444,9 @@ def test_create_firebase_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_firebase_link] = ( + mock_rpc + ) request = {} client.create_firebase_link(request) @@ -23634,9 +23636,9 @@ def test_delete_firebase_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_firebase_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_firebase_link] = ( + mock_rpc + ) request = {} client.delete_firebase_link(request) @@ -23810,9 +23812,9 @@ def test_list_firebase_links_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_firebase_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_firebase_links] = ( + mock_rpc + ) request = {} client.list_firebase_links(request) @@ -24070,9 +24072,9 @@ def test_create_google_ads_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_google_ads_link] = ( + mock_rpc + ) request = {} client.create_google_ads_link(request) @@ -24263,9 +24265,9 @@ def test_update_google_ads_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_google_ads_link] = ( + mock_rpc + ) request = {} client.update_google_ads_link(request) @@ -24448,9 +24450,9 @@ def test_delete_google_ads_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_google_ads_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_google_ads_link] = ( + mock_rpc + ) request = {} client.delete_google_ads_link(request) @@ -24625,9 +24627,9 @@ def test_list_google_ads_links_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_google_ads_links - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_google_ads_links] = ( + mock_rpc + ) request = {} client.list_google_ads_links(request) @@ -26834,9 +26836,9 @@ def test_get_conversion_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversion_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversion_event] = ( + mock_rpc + ) request = {} client.get_conversion_event(request) @@ -27193,9 +27195,9 @@ def test_list_conversion_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversion_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversion_events] = ( + mock_rpc + ) request = {} client.list_conversion_events(request) @@ -27450,9 +27452,9 @@ def test_create_key_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_key_event] = ( + mock_rpc + ) request = {} client.create_key_event(request) @@ -27640,9 +27642,9 @@ def test_update_key_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_key_event] = ( + mock_rpc + ) request = {} client.update_key_event(request) @@ -28005,9 +28007,9 @@ def test_delete_key_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_key_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_key_event] = ( + mock_rpc + ) request = {} client.delete_key_event(request) @@ -28815,9 +28817,9 @@ def test_list_custom_dimensions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_dimensions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_dimensions] = ( + mock_rpc + ) request = {} client.list_custom_dimensions(request) @@ -29253,9 +29255,9 @@ def test_get_custom_dimension_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_dimension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_dimension] = ( + mock_rpc + ) request = {} client.get_custom_dimension(request) @@ -29434,9 +29436,9 @@ def test_create_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_metric] = ( + mock_rpc + ) request = {} client.create_custom_metric(request) @@ -29626,9 +29628,9 @@ def test_update_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_custom_metric] = ( + mock_rpc + ) request = {} client.update_custom_metric(request) @@ -29810,9 +29812,9 @@ def test_list_custom_metrics_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_metrics - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_metrics] = ( + mock_rpc + ) request = {} client.list_custom_metrics(request) @@ -30070,9 +30072,9 @@ def test_archive_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.archive_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.archive_custom_metric] = ( + mock_rpc + ) request = {} client.archive_custom_metric(request) @@ -30246,9 +30248,9 @@ def test_get_custom_metric_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_metric - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_metric] = ( + mock_rpc + ) request = {} client.get_custom_metric(request) @@ -30807,9 +30809,9 @@ def test_create_data_stream_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_stream] = ( + mock_rpc + ) request = {} client.create_data_stream(request) @@ -31007,9 +31009,9 @@ def test_delete_data_stream_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_stream] = ( + mock_rpc + ) request = {} client.delete_data_stream(request) @@ -31183,9 +31185,9 @@ def test_update_data_stream_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_stream] = ( + mock_rpc + ) request = {} client.update_data_stream(request) @@ -31373,9 +31375,9 @@ def test_list_data_streams_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_streams - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_streams] = ( + mock_rpc + ) request = {} client.list_data_streams(request) @@ -31807,9 +31809,9 @@ def test_run_access_report_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_access_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_access_report] = ( + mock_rpc + ) request = {} client.run_access_report(request) @@ -34803,8 +34805,9 @@ def test_get_account_rest_bad_request(request_type=analytics_admin.GetAccountReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34875,18 +34878,20 @@ def test_get_account_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_account" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_account_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_account" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_account_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_account" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34939,8 +34944,9 @@ def test_list_accounts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35003,18 +35009,20 @@ def test_list_accounts_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_accounts" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_accounts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_accounts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_accounts" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_accounts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_accounts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35072,8 +35080,9 @@ def test_delete_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35130,13 +35139,13 @@ def test_delete_account_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_account" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteAccountRequest.pb( analytics_admin.DeleteAccountRequest() @@ -35181,8 +35190,9 @@ def test_update_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35329,18 +35339,20 @@ def test_update_account_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_account" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_account_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_update_account" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_account_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_account" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35393,8 +35405,9 @@ def test_provision_account_ticket_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35457,18 +35470,22 @@ def test_provision_account_ticket_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_provision_account_ticket" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_provision_account_ticket_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_provision_account_ticket" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_provision_account_ticket", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_provision_account_ticket_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_provision_account_ticket", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35526,8 +35543,9 @@ def test_list_account_summaries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35590,18 +35608,22 @@ def test_list_account_summaries_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_account_summaries" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_account_summaries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_account_summaries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_account_summaries", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_account_summaries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_account_summaries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35657,8 +35679,9 @@ def test_get_property_rest_bad_request(request_type=analytics_admin.GetPropertyR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35737,18 +35760,20 @@ def test_get_property_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_property" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_property_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_property" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_property" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_property_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_property" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35801,8 +35826,9 @@ def test_list_properties_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35865,18 +35891,20 @@ def test_list_properties_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_properties" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_properties_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_properties" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_properties" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_properties_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_properties" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35934,8 +35962,9 @@ def test_create_property_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36096,18 +36125,20 @@ def test_create_property_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_property" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_property_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_property" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_property" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_property_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_property" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36160,8 +36191,9 @@ def test_delete_property_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36240,18 +36272,20 @@ def test_delete_property_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_delete_property" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_delete_property_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_property" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_delete_property" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_delete_property_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_property" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36304,8 +36338,9 @@ def test_update_property_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36466,18 +36501,20 @@ def test_update_property_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_property" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_property_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_property" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_update_property" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_property_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_property" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36530,8 +36567,9 @@ def test_create_firebase_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36668,18 +36706,20 @@ def test_create_firebase_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_firebase_link" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_firebase_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_firebase_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_firebase_link" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_firebase_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_firebase_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36732,8 +36772,9 @@ def test_delete_firebase_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36790,13 +36831,13 @@ def test_delete_firebase_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_firebase_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_firebase_link" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteFirebaseLinkRequest.pb( analytics_admin.DeleteFirebaseLinkRequest() @@ -36841,8 +36882,9 @@ def test_list_firebase_links_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36905,18 +36947,20 @@ def test_list_firebase_links_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_firebase_links" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_firebase_links_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_firebase_links" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_firebase_links" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_firebase_links_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_firebase_links" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36974,8 +37018,9 @@ def test_create_google_ads_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37122,18 +37167,22 @@ def test_create_google_ads_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_google_ads_link" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_google_ads_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_google_ads_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_google_ads_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_google_ads_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_google_ads_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37188,8 +37237,9 @@ def test_update_google_ads_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37338,18 +37388,22 @@ def test_update_google_ads_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_google_ads_link" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_google_ads_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_google_ads_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_google_ads_link", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_google_ads_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_google_ads_link", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37402,8 +37456,9 @@ def test_delete_google_ads_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37460,13 +37515,14 @@ def test_delete_google_ads_link_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_google_ads_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_google_ads_link", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteGoogleAdsLinkRequest.pb( analytics_admin.DeleteGoogleAdsLinkRequest() @@ -37511,8 +37567,9 @@ def test_list_google_ads_links_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37575,18 +37632,21 @@ def test_list_google_ads_links_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_google_ads_links" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_google_ads_links_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_google_ads_links" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_google_ads_links", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_google_ads_links_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_google_ads_links" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37644,8 +37704,9 @@ def test_get_data_sharing_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37718,19 +37779,22 @@ def test_get_data_sharing_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_data_sharing_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_data_sharing_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_data_sharing_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_data_sharing_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_data_sharing_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_data_sharing_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37787,8 +37851,9 @@ def test_get_measurement_protocol_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37857,20 +37922,22 @@ def test_get_measurement_protocol_secret_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_measurement_protocol_secret", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_measurement_protocol_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_measurement_protocol_secret", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_measurement_protocol_secret", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_measurement_protocol_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_measurement_protocol_secret", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37928,8 +37995,9 @@ def test_list_measurement_protocol_secrets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37994,20 +38062,22 @@ def test_list_measurement_protocol_secrets_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_list_measurement_protocol_secrets", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_measurement_protocol_secrets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_list_measurement_protocol_secrets", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_measurement_protocol_secrets", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_measurement_protocol_secrets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_measurement_protocol_secrets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38065,8 +38135,9 @@ def test_create_measurement_protocol_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38211,20 +38282,22 @@ def test_create_measurement_protocol_secret_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_create_measurement_protocol_secret", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_measurement_protocol_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_create_measurement_protocol_secret", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_measurement_protocol_secret", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_measurement_protocol_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_measurement_protocol_secret", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38284,8 +38357,9 @@ def test_delete_measurement_protocol_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38344,14 +38418,14 @@ def test_delete_measurement_protocol_secret_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "pre_delete_measurement_protocol_secret", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_measurement_protocol_secret", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteMeasurementProtocolSecretRequest.pb( analytics_admin.DeleteMeasurementProtocolSecretRequest() @@ -38400,8 +38474,9 @@ def test_update_measurement_protocol_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38550,20 +38625,22 @@ def test_update_measurement_protocol_secret_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_measurement_protocol_secret", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_measurement_protocol_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_measurement_protocol_secret", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_measurement_protocol_secret", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_measurement_protocol_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_measurement_protocol_secret", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38621,8 +38698,9 @@ def test_acknowledge_user_data_collection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38684,20 +38762,22 @@ def test_acknowledge_user_data_collection_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_acknowledge_user_data_collection", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_acknowledge_user_data_collection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_acknowledge_user_data_collection", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_acknowledge_user_data_collection", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_acknowledge_user_data_collection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_acknowledge_user_data_collection", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38755,8 +38835,9 @@ def test_search_change_history_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38821,20 +38902,22 @@ def test_search_change_history_events_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_search_change_history_events", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_search_change_history_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_search_change_history_events", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_search_change_history_events", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_search_change_history_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_search_change_history_events", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38892,8 +38975,9 @@ def test_create_conversion_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39048,18 +39132,22 @@ def test_create_conversion_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_conversion_event" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_conversion_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_conversion_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_conversion_event", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_conversion_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_conversion_event", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39114,8 +39202,9 @@ def test_update_conversion_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39272,18 +39361,22 @@ def test_update_conversion_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_conversion_event" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_conversion_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_conversion_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_conversion_event", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_conversion_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_conversion_event", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39336,8 +39429,9 @@ def test_get_conversion_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39411,18 +39505,20 @@ def test_get_conversion_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_conversion_event" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_conversion_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_conversion_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_conversion_event" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_conversion_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_conversion_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39475,8 +39571,9 @@ def test_delete_conversion_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39533,13 +39630,14 @@ def test_delete_conversion_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_conversion_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_delete_conversion_event", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteConversionEventRequest.pb( analytics_admin.DeleteConversionEventRequest() @@ -39584,8 +39682,9 @@ def test_list_conversion_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39648,18 +39747,22 @@ def test_list_conversion_events_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_conversion_events" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_conversion_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_conversion_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_conversion_events", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_conversion_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_conversion_events", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39717,8 +39820,9 @@ def test_create_key_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39868,18 +39972,20 @@ def test_create_key_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_key_event" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_key_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_key_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_key_event" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_key_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_key_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39932,8 +40038,9 @@ def test_update_key_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40083,18 +40190,20 @@ def test_update_key_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_key_event" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_key_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_key_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_update_key_event" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_key_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_key_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40147,8 +40256,9 @@ def test_get_key_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40219,18 +40329,20 @@ def test_get_key_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_key_event" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_key_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_key_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_key_event" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_key_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_key_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40283,8 +40395,9 @@ def test_delete_key_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40341,13 +40454,13 @@ def test_delete_key_event_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_key_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_key_event" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteKeyEventRequest.pb( analytics_admin.DeleteKeyEventRequest() @@ -40392,8 +40505,9 @@ def test_list_key_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40456,18 +40570,20 @@ def test_list_key_events_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_key_events" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_key_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_key_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_key_events" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_key_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_key_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40525,8 +40641,9 @@ def test_create_custom_dimension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40676,18 +40793,22 @@ def test_create_custom_dimension_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_custom_dimension" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_custom_dimension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_custom_dimension" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_custom_dimension", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_custom_dimension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_create_custom_dimension", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40742,8 +40863,9 @@ def test_update_custom_dimension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40895,18 +41017,22 @@ def test_update_custom_dimension_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_custom_dimension" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_custom_dimension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_custom_dimension" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_custom_dimension", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_custom_dimension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_custom_dimension", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40959,8 +41085,9 @@ def test_list_custom_dimensions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41023,18 +41150,22 @@ def test_list_custom_dimensions_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_custom_dimensions" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_custom_dimensions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_custom_dimensions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_custom_dimensions", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_custom_dimensions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_list_custom_dimensions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41092,8 +41223,9 @@ def test_archive_custom_dimension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41150,13 +41282,14 @@ def test_archive_custom_dimension_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_archive_custom_dimension" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_archive_custom_dimension", + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.ArchiveCustomDimensionRequest.pb( analytics_admin.ArchiveCustomDimensionRequest() @@ -41201,8 +41334,9 @@ def test_get_custom_dimension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41275,18 +41409,20 @@ def test_get_custom_dimension_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_custom_dimension" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_custom_dimension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_custom_dimension" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_custom_dimension" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_custom_dimension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_custom_dimension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41339,8 +41475,9 @@ def test_create_custom_metric_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41495,18 +41632,20 @@ def test_create_custom_metric_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_custom_metric" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_custom_metric_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_custom_metric" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_custom_metric" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_custom_metric_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_custom_metric" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41561,8 +41700,9 @@ def test_update_custom_metric_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41719,18 +41859,20 @@ def test_update_custom_metric_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_custom_metric" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_custom_metric_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_custom_metric" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_update_custom_metric" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_custom_metric_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_custom_metric" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41783,8 +41925,9 @@ def test_list_custom_metrics_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41847,18 +41990,20 @@ def test_list_custom_metrics_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_custom_metrics" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_custom_metrics_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_custom_metrics" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_custom_metrics" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_custom_metrics_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_custom_metrics" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41916,8 +42061,9 @@ def test_archive_custom_metric_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41974,13 +42120,13 @@ def test_archive_custom_metric_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_archive_custom_metric" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_archive_custom_metric" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.ArchiveCustomMetricRequest.pb( analytics_admin.ArchiveCustomMetricRequest() @@ -42025,8 +42171,9 @@ def test_get_custom_metric_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42105,18 +42252,20 @@ def test_get_custom_metric_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_custom_metric" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_custom_metric_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_custom_metric" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_custom_metric" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_custom_metric_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_custom_metric" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42169,8 +42318,9 @@ def test_get_data_retention_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42245,20 +42395,22 @@ def test_get_data_retention_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_get_data_retention_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_data_retention_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_get_data_retention_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_data_retention_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_data_retention_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_get_data_retention_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42315,8 +42467,9 @@ def test_update_data_retention_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42470,20 +42623,22 @@ def test_update_data_retention_settings_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, - "post_update_data_retention_settings", - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_data_retention_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "pre_update_data_retention_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_data_retention_settings", + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_data_retention_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "pre_update_data_retention_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42538,8 +42693,9 @@ def test_create_data_stream_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42693,18 +42849,20 @@ def test_create_data_stream_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_create_data_stream" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_create_data_stream_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_create_data_stream" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_create_data_stream" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_create_data_stream_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_create_data_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42757,8 +42915,9 @@ def test_delete_data_stream_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42815,13 +42974,13 @@ def test_delete_data_stream_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "pre_delete_data_stream" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_delete_data_stream" + ) as pre, + ): pre.assert_not_called() pb_message = analytics_admin.DeleteDataStreamRequest.pb( analytics_admin.DeleteDataStreamRequest() @@ -42866,8 +43025,9 @@ def test_update_data_stream_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43021,18 +43181,20 @@ def test_update_data_stream_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_update_data_stream" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_update_data_stream_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_update_data_stream" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_update_data_stream" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_update_data_stream_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_update_data_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43085,8 +43247,9 @@ def test_list_data_streams_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43149,18 +43312,20 @@ def test_list_data_streams_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_list_data_streams" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_list_data_streams_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_list_data_streams" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_list_data_streams" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_list_data_streams_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_list_data_streams" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43218,8 +43383,9 @@ def test_get_data_stream_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43286,18 +43452,20 @@ def test_get_data_stream_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_get_data_stream" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_get_data_stream_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_get_data_stream" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_get_data_stream" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_get_data_stream_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_get_data_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43350,8 +43518,9 @@ def test_run_access_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43414,18 +43583,20 @@ def test_run_access_report_rest_interceptors(null_interceptor): ) client = AnalyticsAdminServiceClient(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.AnalyticsAdminServiceRestInterceptor, "post_run_access_report" - ) as post, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, - "post_run_access_report_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnalyticsAdminServiceRestInterceptor, "pre_run_access_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "post_run_access_report" + ) as post, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, + "post_run_access_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnalyticsAdminServiceRestInterceptor, "pre_run_access_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44743,11 +44914,14 @@ def test_analytics_admin_service_base_transport(): def test_analytics_admin_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.analytics.admin_v1beta.services.analytics_admin_service.transports.AnalyticsAdminServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.analytics.admin_v1beta.services.analytics_admin_service.transports.AnalyticsAdminServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AnalyticsAdminServiceTransport( @@ -44767,9 +44941,12 @@ def test_analytics_admin_service_base_transport_with_credentials_file(): def test_analytics_admin_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.analytics.admin_v1beta.services.analytics_admin_service.transports.AnalyticsAdminServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.analytics.admin_v1beta.services.analytics_admin_service.transports.AnalyticsAdminServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AnalyticsAdminServiceTransport() @@ -44849,11 +45026,12 @@ def test_analytics_admin_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-analytics-data/docs/conf.py b/packages/google-analytics-data/docs/conf.py index 2bbc7a268fd0..a1b3cffc3f3b 100644 --- a/packages/google-analytics-data/docs/conf.py +++ b/packages/google-analytics-data/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-analytics-data documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/__init__.py b/packages/google-analytics-data/google/analytics/data_v1alpha/__init__.py index 89a66cbd6eb9..bf9e916a7bb6 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/__init__.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.alpha_analytics_data import ( AlphaAnalyticsDataAsyncClient, AlphaAnalyticsDataClient, diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/async_client.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/async_client.py index 624388b4eb8b..208a85447bc4 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/async_client.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.data_v1alpha import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.analytics.data_v1alpha.services.alpha_analytics_data import pagers from google.analytics.data_v1alpha.types import analytics_data_api, data @@ -136,7 +136,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlphaAnalyticsDataAsyncClient: The constructed client. """ - return AlphaAnalyticsDataClient.from_service_account_info.__func__(AlphaAnalyticsDataAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AlphaAnalyticsDataClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AlphaAnalyticsDataAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -152,7 +153,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlphaAnalyticsDataAsyncClient: The constructed client. """ - return AlphaAnalyticsDataClient.from_service_account_file.__func__(AlphaAnalyticsDataAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AlphaAnalyticsDataClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AlphaAnalyticsDataAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -190,7 +192,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AlphaAnalyticsDataClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AlphaAnalyticsDataClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AlphaAnalyticsDataTransport: diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/client.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/client.py index 1be907c18644..fc1547067e34 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/client.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.data_v1alpha import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.analytics.data_v1alpha.services.alpha_analytics_data import pagers from google.analytics.data_v1alpha.types import analytics_data_api, data @@ -83,9 +83,7 @@ class AlphaAnalyticsDataClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AlphaAnalyticsDataTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AlphaAnalyticsDataTransport]] _transport_registry["grpc"] = AlphaAnalyticsDataGrpcTransport _transport_registry["grpc_asyncio"] = AlphaAnalyticsDataGrpcAsyncIOTransport _transport_registry["rest"] = AlphaAnalyticsDataRestTransport @@ -680,11 +678,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlphaAnalyticsDataClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlphaAnalyticsDataClient._read_environment_variables() + ) self._client_cert_source = AlphaAnalyticsDataClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -719,8 +715,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlphaAnalyticsDataTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/pagers.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/pagers.py index ce1d034a1f45..a9395ee465c5 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/pagers.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -225,7 +225,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -385,7 +385,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -461,7 +461,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/__init__.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/__init__.py index 02551ceb158c..9b9373222496 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/__init__.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import AlphaAnalyticsDataRestInterceptor, AlphaAnalyticsDataRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AlphaAnalyticsDataTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AlphaAnalyticsDataTransport]] _transport_registry["grpc"] = AlphaAnalyticsDataGrpcTransport _transport_registry["grpc_asyncio"] = AlphaAnalyticsDataGrpcAsyncIOTransport _transport_registry["rest"] = AlphaAnalyticsDataRestTransport diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/base.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/base.py index 6248ba4d7cbf..626fe9259e3b 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/base.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.data_v1alpha import gapic_version as package_version from google.analytics.data_v1alpha.types import analytics_data_api diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc.py index 336286c50ed7..a963d1392308 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.analytics.data_v1alpha.types import analytics_data_api @@ -526,12 +526,12 @@ def sheet_export_audience_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "sheet_export_audience_list" not in self._stubs: - self._stubs[ - "sheet_export_audience_list" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/SheetExportAudienceList", - request_serializer=analytics_data_api.SheetExportAudienceListRequest.serialize, - response_deserializer=analytics_data_api.SheetExportAudienceListResponse.deserialize, + self._stubs["sheet_export_audience_list"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/SheetExportAudienceList", + request_serializer=analytics_data_api.SheetExportAudienceListRequest.serialize, + response_deserializer=analytics_data_api.SheetExportAudienceListResponse.deserialize, + ) ) return self._stubs["sheet_export_audience_list"] @@ -658,12 +658,12 @@ def create_recurring_audience_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_recurring_audience_list" not in self._stubs: - self._stubs[ - "create_recurring_audience_list" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/CreateRecurringAudienceList", - request_serializer=analytics_data_api.CreateRecurringAudienceListRequest.serialize, - response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + self._stubs["create_recurring_audience_list"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/CreateRecurringAudienceList", + request_serializer=analytics_data_api.CreateRecurringAudienceListRequest.serialize, + response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + ) ) return self._stubs["create_recurring_audience_list"] @@ -700,12 +700,12 @@ def get_recurring_audience_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_recurring_audience_list" not in self._stubs: - self._stubs[ - "get_recurring_audience_list" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetRecurringAudienceList", - request_serializer=analytics_data_api.GetRecurringAudienceListRequest.serialize, - response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + self._stubs["get_recurring_audience_list"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetRecurringAudienceList", + request_serializer=analytics_data_api.GetRecurringAudienceListRequest.serialize, + response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + ) ) return self._stubs["get_recurring_audience_list"] @@ -743,12 +743,12 @@ def list_recurring_audience_lists( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_recurring_audience_lists" not in self._stubs: - self._stubs[ - "list_recurring_audience_lists" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/ListRecurringAudienceLists", - request_serializer=analytics_data_api.ListRecurringAudienceListsRequest.serialize, - response_deserializer=analytics_data_api.ListRecurringAudienceListsResponse.deserialize, + self._stubs["list_recurring_audience_lists"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/ListRecurringAudienceLists", + request_serializer=analytics_data_api.ListRecurringAudienceListsRequest.serialize, + response_deserializer=analytics_data_api.ListRecurringAudienceListsResponse.deserialize, + ) ) return self._stubs["list_recurring_audience_lists"] @@ -776,12 +776,12 @@ def get_property_quotas_snapshot( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_property_quotas_snapshot" not in self._stubs: - self._stubs[ - "get_property_quotas_snapshot" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetPropertyQuotasSnapshot", - request_serializer=analytics_data_api.GetPropertyQuotasSnapshotRequest.serialize, - response_deserializer=analytics_data_api.PropertyQuotasSnapshot.deserialize, + self._stubs["get_property_quotas_snapshot"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetPropertyQuotasSnapshot", + request_serializer=analytics_data_api.GetPropertyQuotasSnapshotRequest.serialize, + response_deserializer=analytics_data_api.PropertyQuotasSnapshot.deserialize, + ) ) return self._stubs["get_property_quotas_snapshot"] diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc_asyncio.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc_asyncio.py index eaa4dca9ef32..7fbb069e2861 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc_asyncio.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.analytics.data_v1alpha.types import analytics_data_api @@ -535,12 +535,12 @@ def sheet_export_audience_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "sheet_export_audience_list" not in self._stubs: - self._stubs[ - "sheet_export_audience_list" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/SheetExportAudienceList", - request_serializer=analytics_data_api.SheetExportAudienceListRequest.serialize, - response_deserializer=analytics_data_api.SheetExportAudienceListResponse.deserialize, + self._stubs["sheet_export_audience_list"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/SheetExportAudienceList", + request_serializer=analytics_data_api.SheetExportAudienceListRequest.serialize, + response_deserializer=analytics_data_api.SheetExportAudienceListResponse.deserialize, + ) ) return self._stubs["sheet_export_audience_list"] @@ -668,12 +668,12 @@ def create_recurring_audience_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_recurring_audience_list" not in self._stubs: - self._stubs[ - "create_recurring_audience_list" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/CreateRecurringAudienceList", - request_serializer=analytics_data_api.CreateRecurringAudienceListRequest.serialize, - response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + self._stubs["create_recurring_audience_list"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/CreateRecurringAudienceList", + request_serializer=analytics_data_api.CreateRecurringAudienceListRequest.serialize, + response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + ) ) return self._stubs["create_recurring_audience_list"] @@ -710,12 +710,12 @@ def get_recurring_audience_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_recurring_audience_list" not in self._stubs: - self._stubs[ - "get_recurring_audience_list" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetRecurringAudienceList", - request_serializer=analytics_data_api.GetRecurringAudienceListRequest.serialize, - response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + self._stubs["get_recurring_audience_list"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetRecurringAudienceList", + request_serializer=analytics_data_api.GetRecurringAudienceListRequest.serialize, + response_deserializer=analytics_data_api.RecurringAudienceList.deserialize, + ) ) return self._stubs["get_recurring_audience_list"] @@ -753,12 +753,12 @@ def list_recurring_audience_lists( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_recurring_audience_lists" not in self._stubs: - self._stubs[ - "list_recurring_audience_lists" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/ListRecurringAudienceLists", - request_serializer=analytics_data_api.ListRecurringAudienceListsRequest.serialize, - response_deserializer=analytics_data_api.ListRecurringAudienceListsResponse.deserialize, + self._stubs["list_recurring_audience_lists"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/ListRecurringAudienceLists", + request_serializer=analytics_data_api.ListRecurringAudienceListsRequest.serialize, + response_deserializer=analytics_data_api.ListRecurringAudienceListsResponse.deserialize, + ) ) return self._stubs["list_recurring_audience_lists"] @@ -786,12 +786,12 @@ def get_property_quotas_snapshot( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_property_quotas_snapshot" not in self._stubs: - self._stubs[ - "get_property_quotas_snapshot" - ] = self._logged_channel.unary_unary( - "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetPropertyQuotasSnapshot", - request_serializer=analytics_data_api.GetPropertyQuotasSnapshotRequest.serialize, - response_deserializer=analytics_data_api.PropertyQuotasSnapshot.deserialize, + self._stubs["get_property_quotas_snapshot"] = ( + self._logged_channel.unary_unary( + "/google.analytics.data.v1alpha.AlphaAnalyticsData/GetPropertyQuotasSnapshot", + request_serializer=analytics_data_api.GetPropertyQuotasSnapshotRequest.serialize, + response_deserializer=analytics_data_api.PropertyQuotasSnapshot.deserialize, + ) ) return self._stubs["get_property_quotas_snapshot"] diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/rest.py b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/rest.py index 5c4e24536e6b..7fde7d0fc110 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/rest.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/services/alpha_analytics_data/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1084,9 +1084,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseCreateAudienceList._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseCreateAudienceList._get_http_options() request, metadata = self._interceptor.pre_create_audience_list( request, metadata @@ -1112,7 +1110,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1246,9 +1244,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseCreateRecurringAudienceList._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseCreateRecurringAudienceList._get_http_options() request, metadata = self._interceptor.pre_create_recurring_audience_list( request, metadata @@ -1317,11 +1313,10 @@ def __call__( resp = self._interceptor.post_create_recurring_audience_list(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_recurring_audience_list_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_recurring_audience_list_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1407,9 +1402,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseCreateReportTask._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseCreateReportTask._get_http_options() request, metadata = self._interceptor.pre_create_report_task( request, metadata @@ -1435,7 +1428,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1563,9 +1556,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseGetAudienceList._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseGetAudienceList._get_http_options() request, metadata = self._interceptor.pre_get_audience_list( request, metadata @@ -1715,9 +1706,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseGetPropertyQuotasSnapshot._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseGetPropertyQuotasSnapshot._get_http_options() request, metadata = self._interceptor.pre_get_property_quotas_snapshot( request, metadata @@ -1874,9 +1863,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseGetRecurringAudienceList._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseGetRecurringAudienceList._get_http_options() request, metadata = self._interceptor.pre_get_recurring_audience_list( request, metadata @@ -2026,9 +2013,7 @@ def __call__( A specific report task configuration. """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseGetReportTask._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseGetReportTask._get_http_options() request, metadata = self._interceptor.pre_get_report_task(request, metadata) transcoded_request = _BaseAlphaAnalyticsDataRestTransport._BaseGetReportTask._get_transcoded_request( @@ -2174,9 +2159,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseListAudienceLists._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseListAudienceLists._get_http_options() request, metadata = self._interceptor.pre_list_audience_lists( request, metadata @@ -2327,9 +2310,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseListRecurringAudienceLists._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseListRecurringAudienceLists._get_http_options() request, metadata = self._interceptor.pre_list_recurring_audience_lists( request, metadata @@ -2393,11 +2374,10 @@ def __call__( resp = self._interceptor.post_list_recurring_audience_lists(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_recurring_audience_lists_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_recurring_audience_lists_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2484,9 +2464,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseListReportTasks._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseListReportTasks._get_http_options() request, metadata = self._interceptor.pre_list_report_tasks( request, metadata @@ -2635,9 +2613,7 @@ def __call__( A list of users in an audience list. """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseQueryAudienceList._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseQueryAudienceList._get_http_options() request, metadata = self._interceptor.pre_query_audience_list( request, metadata @@ -2793,9 +2769,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseQueryReportTask._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseQueryReportTask._get_http_options() request, metadata = self._interceptor.pre_query_report_task( request, metadata @@ -2952,9 +2926,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseRunFunnelReport._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseRunFunnelReport._get_http_options() request, metadata = self._interceptor.pre_run_funnel_report( request, metadata @@ -3111,9 +3083,7 @@ def __call__( """ - http_options = ( - _BaseAlphaAnalyticsDataRestTransport._BaseSheetExportAudienceList._get_http_options() - ) + http_options = _BaseAlphaAnalyticsDataRestTransport._BaseSheetExportAudienceList._get_http_options() request, metadata = self._interceptor.pre_sheet_export_audience_list( request, metadata @@ -3233,7 +3203,9 @@ def create_recurring_audience_list( ]: # 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._CreateRecurringAudienceList(self._session, self._host, self._interceptor) # type: ignore + return self._CreateRecurringAudienceList( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_report_task( @@ -3264,7 +3236,9 @@ def get_property_quotas_snapshot( ]: # 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._GetPropertyQuotasSnapshot(self._session, self._host, self._interceptor) # type: ignore + return self._GetPropertyQuotasSnapshot( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_recurring_audience_list( @@ -3275,7 +3249,9 @@ def get_recurring_audience_list( ]: # 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._GetRecurringAudienceList(self._session, self._host, self._interceptor) # type: ignore + return self._GetRecurringAudienceList( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_report_task( @@ -3307,7 +3283,9 @@ def list_recurring_audience_lists( ]: # 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._ListRecurringAudienceLists(self._session, self._host, self._interceptor) # type: ignore + return self._ListRecurringAudienceLists( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_report_tasks( @@ -3362,7 +3340,9 @@ def sheet_export_audience_list( ]: # 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._SheetExportAudienceList(self._session, self._host, self._interceptor) # type: ignore + return self._SheetExportAudienceList( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/types/analytics_data_api.py b/packages/google-analytics-data/google/analytics/data_v1alpha/types/analytics_data_api.py index a4a5ff4e238d..8835dc589a2c 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/types/analytics_data_api.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/types/analytics_data_api.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.analytics.data_v1alpha.types import data @@ -356,12 +356,12 @@ class ListRecurringAudienceListsResponse(proto.Message): def raw_page(self): return self - recurring_audience_lists: MutableSequence[ - "RecurringAudienceList" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="RecurringAudienceList", + recurring_audience_lists: MutableSequence["RecurringAudienceList"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="RecurringAudienceList", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -652,6 +652,7 @@ class State(proto.Enum): possible that re-requesting this audience list will succeed. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -1086,6 +1087,7 @@ class FunnelVisualizationType(proto.Enum): visualization sub report in the response will contain the date dimension. """ + FUNNEL_VISUALIZATION_TYPE_UNSPECIFIED = 0 STANDARD_FUNNEL = 1 TRENDED_FUNNEL = 2 @@ -1340,12 +1342,12 @@ class ReportDefinition(proto.Message): proto.INT64, number=8, ) - metric_aggregations: MutableSequence[ - data.MetricAggregation - ] = proto.RepeatedField( - proto.ENUM, - number=9, - enum=data.MetricAggregation, + metric_aggregations: MutableSequence[data.MetricAggregation] = ( + proto.RepeatedField( + proto.ENUM, + number=9, + enum=data.MetricAggregation, + ) ) order_bys: MutableSequence[data.OrderBy] = proto.RepeatedField( proto.MESSAGE, @@ -1445,6 +1447,7 @@ class State(proto.Enum): FAILED (3): The report failed to be created. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-analytics-data/google/analytics/data_v1alpha/types/data.py b/packages/google-analytics-data/google/analytics/data_v1alpha/types/data.py index 642723a7b7c7..d7d184615eae 100644 --- a/packages/google-analytics-data/google/analytics/data_v1alpha/types/data.py +++ b/packages/google-analytics-data/google/analytics/data_v1alpha/types/data.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -118,6 +118,7 @@ class UserCriteriaScoping(proto.Enum): If the criteria is satisfied by any events for the user, the user matches the criteria. """ + USER_CRITERIA_SCOPING_UNSPECIFIED = 0 USER_CRITERIA_WITHIN_SAME_EVENT = 1 USER_CRITERIA_WITHIN_SAME_SESSION = 2 @@ -139,6 +140,7 @@ class UserExclusionDuration(proto.Enum): Permanently exclude users from the segment if the user ever meets the ``userExclusionCriteria`` condition. """ + USER_EXCLUSION_DURATION_UNSPECIFIED = 0 USER_EXCLUSION_TEMPORARY = 1 USER_EXCLUSION_PERMANENT = 2 @@ -158,6 +160,7 @@ class SessionCriteriaScoping(proto.Enum): If the criteria is satisfied within one session, the session matches the criteria. """ + SESSION_CRITERIA_SCOPING_UNSPECIFIED = 0 SESSION_CRITERIA_WITHIN_SAME_EVENT = 1 SESSION_CRITERIA_WITHIN_SAME_SESSION = 2 @@ -179,6 +182,7 @@ class SessionExclusionDuration(proto.Enum): Permanently exclude sessions from the segment if the session ever meets the ``sessionExclusionCriteria`` condition. """ + SESSION_EXCLUSION_DURATION_UNSPECIFIED = 0 SESSION_EXCLUSION_TEMPORARY = 1 SESSION_EXCLUSION_PERMANENT = 2 @@ -195,6 +199,7 @@ class EventCriteriaScoping(proto.Enum): If the criteria is satisfied within one event, the event matches the criteria. """ + EVENT_CRITERIA_SCOPING_UNSPECIFIED = 0 EVENT_CRITERIA_WITHIN_SAME_EVENT = 1 @@ -211,6 +216,7 @@ class EventExclusionDuration(proto.Enum): Permanently exclude events from the segment if the event ever meets the ``eventExclusionCriteria`` condition. """ + EVENT_EXCLUSION_DURATION_UNSPECIFIED = 0 EVENT_EXCLUSION_PERMANENT = 1 @@ -230,6 +236,7 @@ class MetricAggregation(proto.Enum): COUNT (4): Count operator. """ + METRIC_AGGREGATION_UNSPECIFIED = 0 TOTAL = 1 MINIMUM = 5 @@ -278,6 +285,7 @@ class MetricType(proto.Enum): A length in kilometers; a special floating point type. """ + METRIC_TYPE_UNSPECIFIED = 0 TYPE_INTEGER = 1 TYPE_FLOAT = 2 @@ -305,6 +313,7 @@ class RestrictedMetricType(proto.Enum): REVENUE_DATA (2): Revenue metrics such as ``purchaseRevenue``. """ + RESTRICTED_METRIC_TYPE_UNSPECIFIED = 0 COST_DATA = 1 REVENUE_DATA = 2 @@ -330,6 +339,7 @@ class SamplingLevel(proto.Enum): explorations. To learn more, see https://support.google.com/analytics/answer/10896953. """ + SAMPLING_LEVEL_UNSPECIFIED = 0 LOW = 1 MEDIUM = 2 @@ -752,6 +762,7 @@ class MatchType(proto.Enum): Partial match for the regular expression with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -823,6 +834,7 @@ class Operation(proto.Enum): GREATER_THAN_OR_EQUAL (5): Greater than or equal """ + OPERATION_UNSPECIFIED = 0 EQUAL = 1 LESS_THAN = 2 @@ -912,6 +924,7 @@ class OrderType(proto.Enum): values all have equal ordering value below all numeric values. """ + ORDER_TYPE_UNSPECIFIED = 0 ALPHANUMERIC = 1 CASE_INSENSITIVE_ALPHANUMERIC = 2 @@ -1180,6 +1193,7 @@ class Granularity(proto.Enum): ``dateRange`` is a month in duration and the request contains ``cohortNthMonth``. """ + GRANULARITY_UNSPECIFIED = 0 DAILY = 1 WEEKLY = 2 @@ -1333,12 +1347,12 @@ class ActiveMetricRestriction(proto.Message): number=1, optional=True, ) - restricted_metric_types: MutableSequence[ - "RestrictedMetricType" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="RestrictedMetricType", + restricted_metric_types: MutableSequence["RestrictedMetricType"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="RestrictedMetricType", + ) ) active_metric_restrictions: MutableSequence[ @@ -1886,19 +1900,19 @@ class UserSegmentCriteria(proto.Message): if ``andConditionGroups`` are specified. """ - and_condition_groups: MutableSequence[ - "UserSegmentConditionGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="UserSegmentConditionGroup", + and_condition_groups: MutableSequence["UserSegmentConditionGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="UserSegmentConditionGroup", + ) ) - and_sequence_groups: MutableSequence[ - "UserSegmentSequenceGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="UserSegmentSequenceGroup", + and_sequence_groups: MutableSequence["UserSegmentSequenceGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="UserSegmentSequenceGroup", + ) ) @@ -2100,12 +2114,12 @@ class SessionSegmentCriteria(proto.Message): of these ``andConditionGroups``. """ - and_condition_groups: MutableSequence[ - "SessionSegmentConditionGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SessionSegmentConditionGroup", + and_condition_groups: MutableSequence["SessionSegmentConditionGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SessionSegmentConditionGroup", + ) ) @@ -2215,12 +2229,12 @@ class EventSegmentCriteria(proto.Message): these ``andConditionGroups``. """ - and_condition_groups: MutableSequence[ - "EventSegmentConditionGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="EventSegmentConditionGroup", + and_condition_groups: MutableSequence["EventSegmentConditionGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="EventSegmentConditionGroup", + ) ) @@ -2646,12 +2660,12 @@ class SegmentParameterFilterExpressionList(proto.Message): expressions. """ - expressions: MutableSequence[ - "SegmentParameterFilterExpression" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SegmentParameterFilterExpression", + expressions: MutableSequence["SegmentParameterFilterExpression"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SegmentParameterFilterExpression", + ) ) @@ -3061,12 +3075,12 @@ class FunnelParameterFilterExpressionList(proto.Message): expressions. """ - expressions: MutableSequence[ - "FunnelParameterFilterExpression" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="FunnelParameterFilterExpression", + expressions: MutableSequence["FunnelParameterFilterExpression"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="FunnelParameterFilterExpression", + ) ) diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/__init__.py b/packages/google-analytics-data/google/analytics/data_v1beta/__init__.py index 4b96ba617004..51c6f64785e4 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/__init__.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.beta_analytics_data import ( BetaAnalyticsDataAsyncClient, BetaAnalyticsDataClient, diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/async_client.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/async_client.py index 4fe6d7ff0ae0..9b5e079ae881 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/async_client.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.data_v1beta import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.analytics.data_v1beta.services.beta_analytics_data import pagers from google.analytics.data_v1beta.types import analytics_data_api, data @@ -122,7 +122,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BetaAnalyticsDataAsyncClient: The constructed client. """ - return BetaAnalyticsDataClient.from_service_account_info.__func__(BetaAnalyticsDataAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BetaAnalyticsDataClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BetaAnalyticsDataAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +139,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BetaAnalyticsDataAsyncClient: The constructed client. """ - return BetaAnalyticsDataClient.from_service_account_file.__func__(BetaAnalyticsDataAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BetaAnalyticsDataClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BetaAnalyticsDataAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/client.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/client.py index 6f1e46564a48..dd34cf31bc7a 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/client.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.data_v1beta import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.analytics.data_v1beta.services.beta_analytics_data import pagers from google.analytics.data_v1beta.types import analytics_data_api, data @@ -83,9 +83,7 @@ class BetaAnalyticsDataClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BetaAnalyticsDataTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BetaAnalyticsDataTransport]] _transport_registry["grpc"] = BetaAnalyticsDataGrpcTransport _transport_registry["grpc_asyncio"] = BetaAnalyticsDataGrpcAsyncIOTransport _transport_registry["rest"] = BetaAnalyticsDataRestTransport @@ -642,11 +640,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BetaAnalyticsDataClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BetaAnalyticsDataClient._read_environment_variables() + ) self._client_cert_source = BetaAnalyticsDataClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -681,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BetaAnalyticsDataTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/pagers.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/pagers.py index 8bdc52fcc23e..4f8380e1c421 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/pagers.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py index 7c2efa9ff5ed..3b2504df2013 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.analytics.data_v1beta import gapic_version as package_version from google.analytics.data_v1beta.types import analytics_data_api diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc.py index fac0f1e2e138..27570e9887c9 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.analytics.data_v1beta.types import analytics_data_api diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py index 85258c7302e4..24a81044e26f 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.analytics.data_v1beta.types import analytics_data_api diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/rest.py b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/rest.py index 24398efa6a6c..73ff4adcb76c 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/rest.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/services/beta_analytics_data/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -904,9 +904,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseBatchRunPivotReports._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseBatchRunPivotReports._get_http_options() request, metadata = self._interceptor.pre_batch_run_pivot_reports( request, metadata @@ -1066,9 +1064,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseBatchRunReports._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseBatchRunReports._get_http_options() request, metadata = self._interceptor.pre_batch_run_reports( request, metadata @@ -1228,9 +1224,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseCheckCompatibility._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseCheckCompatibility._get_http_options() request, metadata = self._interceptor.pre_check_compatibility( request, metadata @@ -1387,9 +1381,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseCreateAudienceExport._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseCreateAudienceExport._get_http_options() request, metadata = self._interceptor.pre_create_audience_export( request, metadata @@ -1415,7 +1407,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1546,9 +1538,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseGetAudienceExport._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseGetAudienceExport._get_http_options() request, metadata = self._interceptor.pre_get_audience_export( request, metadata @@ -1846,9 +1836,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseListAudienceExports._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseListAudienceExports._get_http_options() request, metadata = self._interceptor.pre_list_audience_exports( request, metadata @@ -2001,9 +1989,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseQueryAudienceExport._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseQueryAudienceExport._get_http_options() request, metadata = self._interceptor.pre_query_audience_export( request, metadata @@ -2161,9 +2147,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseRunPivotReport._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseRunPivotReport._get_http_options() request, metadata = self._interceptor.pre_run_pivot_report( request, metadata @@ -2319,9 +2303,7 @@ def __call__( """ - http_options = ( - _BaseBetaAnalyticsDataRestTransport._BaseRunRealtimeReport._get_http_options() - ) + http_options = _BaseBetaAnalyticsDataRestTransport._BaseRunRealtimeReport._get_http_options() request, metadata = self._interceptor.pre_run_realtime_report( request, metadata diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/types/analytics_data_api.py b/packages/google-analytics-data/google/analytics/data_v1beta/types/analytics_data_api.py index 77191f826246..c35761558d39 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/types/analytics_data_api.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/types/analytics_data_api.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.analytics.data_v1beta.types import data @@ -130,19 +130,19 @@ class CheckCompatibilityResponse(proto.Message): The compatibility of each metric. """ - dimension_compatibilities: MutableSequence[ - data.DimensionCompatibility - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=data.DimensionCompatibility, + dimension_compatibilities: MutableSequence[data.DimensionCompatibility] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=data.DimensionCompatibility, + ) ) - metric_compatibilities: MutableSequence[ - data.MetricCompatibility - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=data.MetricCompatibility, + metric_compatibilities: MutableSequence[data.MetricCompatibility] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=data.MetricCompatibility, + ) ) @@ -1226,6 +1226,7 @@ class State(proto.Enum): is possible that re-requesting this audience export will succeed. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-analytics-data/google/analytics/data_v1beta/types/data.py b/packages/google-analytics-data/google/analytics/data_v1beta/types/data.py index 781bf84f8c65..279eab7d10eb 100644 --- a/packages/google-analytics-data/google/analytics/data_v1beta/types/data.py +++ b/packages/google-analytics-data/google/analytics/data_v1beta/types/data.py @@ -77,6 +77,7 @@ class MetricAggregation(proto.Enum): COUNT (4): Count operator. """ + METRIC_AGGREGATION_UNSPECIFIED = 0 TOTAL = 1 MINIMUM = 5 @@ -125,6 +126,7 @@ class MetricType(proto.Enum): A length in kilometers; a special floating point type. """ + METRIC_TYPE_UNSPECIFIED = 0 TYPE_INTEGER = 1 TYPE_FLOAT = 2 @@ -152,6 +154,7 @@ class RestrictedMetricType(proto.Enum): REVENUE_DATA (2): Revenue metrics such as ``purchaseRevenue``. """ + RESTRICTED_METRIC_TYPE_UNSPECIFIED = 0 COST_DATA = 1 REVENUE_DATA = 2 @@ -172,6 +175,7 @@ class Compatibility(proto.Enum): dimension or metric cannot be successfully added to a report. """ + COMPATIBILITY_UNSPECIFIED = 0 COMPATIBLE = 1 INCOMPATIBLE = 2 @@ -673,6 +677,7 @@ class MatchType(proto.Enum): Partial match for the regular expression with the string value. """ + MATCH_TYPE_UNSPECIFIED = 0 EXACT = 1 BEGINS_WITH = 2 @@ -742,6 +747,7 @@ class Operation(proto.Enum): GREATER_THAN_OR_EQUAL (5): Greater than or equal """ + OPERATION_UNSPECIFIED = 0 EQUAL = 1 LESS_THAN = 2 @@ -896,6 +902,7 @@ class OrderType(proto.Enum): values all have equal ordering value below all numeric values. """ + ORDER_TYPE_UNSPECIFIED = 0 ALPHANUMERIC = 1 CASE_INSENSITIVE_ALPHANUMERIC = 2 @@ -968,12 +975,12 @@ class PivotSelection(proto.Message): proto.STRING, number=1, ) - pivot_selections: MutableSequence[ - "OrderBy.PivotOrderBy.PivotSelection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="OrderBy.PivotOrderBy.PivotSelection", + pivot_selections: MutableSequence["OrderBy.PivotOrderBy.PivotSelection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="OrderBy.PivotOrderBy.PivotSelection", + ) ) metric: MetricOrderBy = proto.Field( @@ -1235,6 +1242,7 @@ class Granularity(proto.Enum): ``dateRange`` is a month in duration and the request contains ``cohortNthMonth``. """ + GRANULARITY_UNSPECIFIED = 0 DAILY = 1 WEEKLY = 2 @@ -1386,12 +1394,12 @@ class ActiveMetricRestriction(proto.Message): number=1, optional=True, ) - restricted_metric_types: MutableSequence[ - "RestrictedMetricType" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="RestrictedMetricType", + restricted_metric_types: MutableSequence["RestrictedMetricType"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="RestrictedMetricType", + ) ) active_metric_restrictions: MutableSequence[ @@ -1530,12 +1538,12 @@ class PivotHeader(proto.Message): ``offset`` and ``limit`` are specified in the request. """ - pivot_dimension_headers: MutableSequence[ - "PivotDimensionHeader" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="PivotDimensionHeader", + pivot_dimension_headers: MutableSequence["PivotDimensionHeader"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="PivotDimensionHeader", + ) ) row_count: int = proto.Field( proto.INT32, @@ -1917,6 +1925,7 @@ class BlockedReason(proto.Enum): related metrics for this property, and this metric is cost related. """ + BLOCKED_REASON_UNSPECIFIED = 0 NO_REVENUE_METRICS = 1 NO_COST_METRICS = 2 diff --git a/packages/google-analytics-data/noxfile.py b/packages/google-analytics-data/noxfile.py index 43fd9fb9b55c..7c7d3550e35d 100644 --- a/packages/google-analytics-data/noxfile.py +++ b/packages/google-analytics-data/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-analytics-data/tests/unit/gapic/data_v1alpha/test_alpha_analytics_data.py b/packages/google-analytics-data/tests/unit/gapic/data_v1alpha/test_alpha_analytics_data.py index 614d6b552a42..ae3db54e1423 100644 --- a/packages/google-analytics-data/tests/unit/gapic/data_v1alpha/test_alpha_analytics_data.py +++ b/packages/google-analytics-data/tests/unit/gapic/data_v1alpha/test_alpha_analytics_data.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.analytics.data_v1alpha.services.alpha_analytics_data import ( AlphaAnalyticsDataAsyncClient, @@ -994,10 +994,9 @@ def test_alpha_analytics_data_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1041,9 @@ def test_alpha_analytics_data_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1079,9 @@ def test_alpha_analytics_data_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1332,13 +1329,13 @@ def test_alpha_analytics_data_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1455,9 +1452,9 @@ def test_run_funnel_report_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_funnel_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_funnel_report] = ( + mock_rpc + ) request = {} client.run_funnel_report(request) @@ -1708,9 +1705,9 @@ def test_create_audience_list_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_audience_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_audience_list] = ( + mock_rpc + ) request = {} client.create_audience_list(request) @@ -2067,9 +2064,9 @@ def test_query_audience_list_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_audience_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_audience_list] = ( + mock_rpc + ) request = {} client.query_audience_list(request) @@ -2774,9 +2771,9 @@ def test_get_audience_list_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_audience_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_audience_list] = ( + mock_rpc + ) request = {} client.get_audience_list(request) @@ -3134,9 +3131,9 @@ def test_list_audience_lists_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_audience_lists - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_audience_lists] = ( + mock_rpc + ) request = {} client.list_audience_lists(request) @@ -5307,9 +5304,9 @@ def test_create_report_task_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_report_task - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_report_task] = ( + mock_rpc + ) request = {} client.create_report_task(request) @@ -5664,9 +5661,9 @@ def test_query_report_task_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_report_task - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_report_task] = ( + mock_rpc + ) request = {} client.query_report_task(request) @@ -6330,9 +6327,9 @@ def test_list_report_tasks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_report_tasks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_report_tasks] = ( + mock_rpc + ) request = {} client.list_report_tasks(request) @@ -6804,9 +6801,9 @@ def test_run_funnel_report_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_funnel_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_funnel_report] = ( + mock_rpc + ) request = {} client.run_funnel_report(request) @@ -6844,9 +6841,9 @@ def test_create_audience_list_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_audience_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_audience_list] = ( + mock_rpc + ) request = {} client.create_audience_list(request) @@ -7035,9 +7032,9 @@ def test_query_audience_list_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_audience_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_audience_list] = ( + mock_rpc + ) request = {} client.query_audience_list(request) @@ -7404,9 +7401,9 @@ def test_get_audience_list_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_audience_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_audience_list] = ( + mock_rpc + ) request = {} client.get_audience_list(request) @@ -7585,9 +7582,9 @@ def test_list_audience_lists_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_audience_lists - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_audience_lists] = ( + mock_rpc + ) request = {} client.list_audience_lists(request) @@ -8680,9 +8677,9 @@ def test_create_report_task_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_report_task - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_report_task] = ( + mock_rpc + ) request = {} client.create_report_task(request) @@ -8869,9 +8866,9 @@ def test_query_report_task_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_report_task - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_report_task] = ( + mock_rpc + ) request = {} client.query_report_task(request) @@ -9227,9 +9224,9 @@ def test_list_report_tasks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_report_tasks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_report_tasks] = ( + mock_rpc + ) request = {} client.list_report_tasks(request) @@ -10339,8 +10336,9 @@ def test_run_funnel_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10403,18 +10401,20 @@ def test_run_funnel_report_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, "post_run_funnel_report" - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_run_funnel_report_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, "pre_run_funnel_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "post_run_funnel_report" + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_run_funnel_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "pre_run_funnel_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10472,8 +10472,9 @@ def test_create_audience_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10616,20 +10617,21 @@ def test_create_audience_list_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, "post_create_audience_list" - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_create_audience_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, "pre_create_audience_list" - ) as pre: + 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.AlphaAnalyticsDataRestInterceptor, "post_create_audience_list" + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_create_audience_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "pre_create_audience_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10682,8 +10684,9 @@ def test_query_audience_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10746,18 +10749,20 @@ def test_query_audience_list_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, "post_query_audience_list" - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_query_audience_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, "pre_query_audience_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "post_query_audience_list" + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_query_audience_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "pre_query_audience_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10815,8 +10820,9 @@ def test_sheet_export_audience_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10885,18 +10891,22 @@ def test_sheet_export_audience_list_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, "post_sheet_export_audience_list" - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_sheet_export_audience_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, "pre_sheet_export_audience_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_sheet_export_audience_list", + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_sheet_export_audience_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "pre_sheet_export_audience_list", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10954,8 +10964,9 @@ def test_get_audience_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11034,18 +11045,20 @@ def test_get_audience_list_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, "post_get_audience_list" - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_get_audience_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, "pre_get_audience_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "post_get_audience_list" + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_get_audience_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "pre_get_audience_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11100,8 +11113,9 @@ def test_list_audience_lists_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11164,18 +11178,20 @@ def test_list_audience_lists_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, "post_list_audience_lists" - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_list_audience_lists_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, "pre_list_audience_lists" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "post_list_audience_lists" + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_list_audience_lists_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "pre_list_audience_lists" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11233,8 +11249,9 @@ def test_create_recurring_audience_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11388,20 +11405,22 @@ def test_create_recurring_audience_list_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, - "post_create_recurring_audience_list", - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_create_recurring_audience_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "pre_create_recurring_audience_list", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_create_recurring_audience_list", + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_create_recurring_audience_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "pre_create_recurring_audience_list", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11459,8 +11478,9 @@ def test_get_recurring_audience_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11531,18 +11551,22 @@ def test_get_recurring_audience_list_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, "post_get_recurring_audience_list" - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_get_recurring_audience_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, "pre_get_recurring_audience_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_get_recurring_audience_list", + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_get_recurring_audience_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "pre_get_recurring_audience_list", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11600,8 +11624,9 @@ def test_list_recurring_audience_lists_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11666,20 +11691,22 @@ def test_list_recurring_audience_lists_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, - "post_list_recurring_audience_lists", - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_list_recurring_audience_lists_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "pre_list_recurring_audience_lists", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_list_recurring_audience_lists", + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_list_recurring_audience_lists_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "pre_list_recurring_audience_lists", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11737,8 +11764,9 @@ def test_get_property_quotas_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11801,19 +11829,22 @@ def test_get_property_quotas_snapshot_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, - "post_get_property_quotas_snapshot", - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_get_property_quotas_snapshot_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, "pre_get_property_quotas_snapshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_get_property_quotas_snapshot", + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_get_property_quotas_snapshot_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "pre_get_property_quotas_snapshot", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11871,8 +11902,9 @@ def test_create_report_task_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12097,20 +12129,21 @@ def test_create_report_task_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, "post_create_report_task" - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_create_report_task_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, "pre_create_report_task" - ) as pre: + 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.AlphaAnalyticsDataRestInterceptor, "post_create_report_task" + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_create_report_task_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "pre_create_report_task" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12163,8 +12196,9 @@ def test_query_report_task_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12227,18 +12261,20 @@ def test_query_report_task_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, "post_query_report_task" - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_query_report_task_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, "pre_query_report_task" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "post_query_report_task" + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_query_report_task_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "pre_query_report_task" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12296,8 +12332,9 @@ def test_get_report_task_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12360,18 +12397,20 @@ def test_get_report_task_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, "post_get_report_task" - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_get_report_task_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, "pre_get_report_task" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "post_get_report_task" + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_get_report_task_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "pre_get_report_task" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12426,8 +12465,9 @@ def test_list_report_tasks_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12490,18 +12530,20 @@ def test_list_report_tasks_rest_interceptors(null_interceptor): ) client = AlphaAnalyticsDataClient(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.AlphaAnalyticsDataRestInterceptor, "post_list_report_tasks" - ) as post, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, - "post_list_report_tasks_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlphaAnalyticsDataRestInterceptor, "pre_list_report_tasks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "post_list_report_tasks" + ) as post, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, + "post_list_report_tasks_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlphaAnalyticsDataRestInterceptor, "pre_list_report_tasks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12949,11 +12991,14 @@ def test_alpha_analytics_data_base_transport(): def test_alpha_analytics_data_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.analytics.data_v1alpha.services.alpha_analytics_data.transports.AlphaAnalyticsDataTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.analytics.data_v1alpha.services.alpha_analytics_data.transports.AlphaAnalyticsDataTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlphaAnalyticsDataTransport( @@ -12976,9 +13021,12 @@ def test_alpha_analytics_data_base_transport_with_credentials_file(): def test_alpha_analytics_data_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.analytics.data_v1alpha.services.alpha_analytics_data.transports.AlphaAnalyticsDataTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.analytics.data_v1alpha.services.alpha_analytics_data.transports.AlphaAnalyticsDataTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlphaAnalyticsDataTransport() @@ -13062,11 +13110,12 @@ def test_alpha_analytics_data_transport_auth_gdch_credentials(transport_class): def test_alpha_analytics_data_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-analytics-data/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py b/packages/google-analytics-data/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py index 4701e29668b6..f74afbb2f26f 100644 --- a/packages/google-analytics-data/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py +++ b/packages/google-analytics-data/tests/unit/gapic/data_v1beta/test_beta_analytics_data.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,16 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.analytics.data_v1beta.services.beta_analytics_data import ( BetaAnalyticsDataAsyncClient, @@ -989,10 +989,9 @@ def test_beta_analytics_data_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1036,9 @@ def test_beta_analytics_data_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1074,9 @@ def test_beta_analytics_data_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1327,13 +1324,13 @@ def test_beta_analytics_data_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1690,9 +1687,9 @@ def test_run_pivot_report_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_pivot_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_pivot_report] = ( + mock_rpc + ) request = {} client.run_pivot_report(request) @@ -1938,9 +1935,9 @@ def test_batch_run_reports_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_run_reports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_run_reports] = ( + mock_rpc + ) request = {} client.batch_run_reports(request) @@ -2776,9 +2773,9 @@ def test_run_realtime_report_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_realtime_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_realtime_report] = ( + mock_rpc + ) request = {} client.run_realtime_report(request) @@ -3031,9 +3028,9 @@ def test_check_compatibility_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.check_compatibility - ] = mock_rpc + client._transport._wrapped_methods[client._transport.check_compatibility] = ( + mock_rpc + ) request = {} client.check_compatibility(request) @@ -3282,9 +3279,9 @@ def test_create_audience_export_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_audience_export - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_audience_export] = ( + mock_rpc + ) request = {} client.create_audience_export(request) @@ -3642,9 +3639,9 @@ def test_query_audience_export_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_audience_export - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_audience_export] = ( + mock_rpc + ) request = {} client.query_audience_export(request) @@ -3998,9 +3995,9 @@ def test_get_audience_export_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_audience_export - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_audience_export] = ( + mock_rpc + ) request = {} client.get_audience_export(request) @@ -4357,9 +4354,9 @@ def test_list_audience_exports_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_audience_exports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_audience_exports] = ( + mock_rpc + ) request = {} client.list_audience_exports(request) @@ -4867,9 +4864,9 @@ def test_run_pivot_report_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_pivot_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_pivot_report] = ( + mock_rpc + ) request = {} client.run_pivot_report(request) @@ -4905,9 +4902,9 @@ def test_batch_run_reports_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_run_reports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_run_reports] = ( + mock_rpc + ) request = {} client.batch_run_reports(request) @@ -5162,9 +5159,9 @@ def test_run_realtime_report_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_realtime_report - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_realtime_report] = ( + mock_rpc + ) request = {} client.run_realtime_report(request) @@ -5202,9 +5199,9 @@ def test_check_compatibility_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.check_compatibility - ] = mock_rpc + client._transport._wrapped_methods[client._transport.check_compatibility] = ( + mock_rpc + ) request = {} client.check_compatibility(request) @@ -5243,9 +5240,9 @@ def test_create_audience_export_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_audience_export - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_audience_export] = ( + mock_rpc + ) request = {} client.create_audience_export(request) @@ -5435,9 +5432,9 @@ def test_query_audience_export_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_audience_export - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_audience_export] = ( + mock_rpc + ) request = {} client.query_audience_export(request) @@ -5620,9 +5617,9 @@ def test_get_audience_export_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_audience_export - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_audience_export] = ( + mock_rpc + ) request = {} client.get_audience_export(request) @@ -5802,9 +5799,9 @@ def test_list_audience_exports_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_audience_exports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_audience_exports] = ( + mock_rpc + ) request = {} client.list_audience_exports(request) @@ -6741,8 +6738,9 @@ def test_run_report_rest_bad_request(request_type=analytics_data_api.RunReportRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6807,17 +6805,19 @@ def test_run_report_rest_interceptors(null_interceptor): ) client = BetaAnalyticsDataClient(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.BetaAnalyticsDataRestInterceptor, "post_run_report" - ) as post, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "post_run_report_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "pre_run_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "post_run_report" + ) as post, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "post_run_report_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "pre_run_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6875,8 +6875,9 @@ def test_run_pivot_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6939,18 +6940,20 @@ def test_run_pivot_report_rest_interceptors(null_interceptor): ) client = BetaAnalyticsDataClient(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.BetaAnalyticsDataRestInterceptor, "post_run_pivot_report" - ) as post, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, - "post_run_pivot_report_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "pre_run_pivot_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "post_run_pivot_report" + ) as post, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, + "post_run_pivot_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "pre_run_pivot_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7008,8 +7011,9 @@ def test_batch_run_reports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7072,18 +7076,20 @@ def test_batch_run_reports_rest_interceptors(null_interceptor): ) client = BetaAnalyticsDataClient(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.BetaAnalyticsDataRestInterceptor, "post_batch_run_reports" - ) as post, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, - "post_batch_run_reports_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "pre_batch_run_reports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "post_batch_run_reports" + ) as post, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, + "post_batch_run_reports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "pre_batch_run_reports" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7141,8 +7147,9 @@ def test_batch_run_pivot_reports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7205,18 +7212,20 @@ def test_batch_run_pivot_reports_rest_interceptors(null_interceptor): ) client = BetaAnalyticsDataClient(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.BetaAnalyticsDataRestInterceptor, "post_batch_run_pivot_reports" - ) as post, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, - "post_batch_run_pivot_reports_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "pre_batch_run_pivot_reports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "post_batch_run_pivot_reports" + ) as post, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, + "post_batch_run_pivot_reports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "pre_batch_run_pivot_reports" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7274,8 +7283,9 @@ def test_get_metadata_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7338,17 +7348,20 @@ def test_get_metadata_rest_interceptors(null_interceptor): ) client = BetaAnalyticsDataClient(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.BetaAnalyticsDataRestInterceptor, "post_get_metadata" - ) as post, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "post_get_metadata_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "pre_get_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "post_get_metadata" + ) as post, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, + "post_get_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "pre_get_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7403,8 +7416,9 @@ def test_run_realtime_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7469,18 +7483,20 @@ def test_run_realtime_report_rest_interceptors(null_interceptor): ) client = BetaAnalyticsDataClient(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.BetaAnalyticsDataRestInterceptor, "post_run_realtime_report" - ) as post, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, - "post_run_realtime_report_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "pre_run_realtime_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "post_run_realtime_report" + ) as post, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, + "post_run_realtime_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "pre_run_realtime_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7538,8 +7554,9 @@ def test_check_compatibility_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7599,18 +7616,20 @@ def test_check_compatibility_rest_interceptors(null_interceptor): ) client = BetaAnalyticsDataClient(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.BetaAnalyticsDataRestInterceptor, "post_check_compatibility" - ) as post, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, - "post_check_compatibility_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "pre_check_compatibility" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "post_check_compatibility" + ) as post, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, + "post_check_compatibility_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "pre_check_compatibility" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7668,8 +7687,9 @@ def test_create_audience_export_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7807,20 +7827,21 @@ def test_create_audience_export_rest_interceptors(null_interceptor): ) client = BetaAnalyticsDataClient(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.BetaAnalyticsDataRestInterceptor, "post_create_audience_export" - ) as post, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, - "post_create_audience_export_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "pre_create_audience_export" - ) as pre: + 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.BetaAnalyticsDataRestInterceptor, "post_create_audience_export" + ) as post, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, + "post_create_audience_export_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "pre_create_audience_export" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7873,8 +7894,9 @@ def test_query_audience_export_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7937,18 +7959,20 @@ def test_query_audience_export_rest_interceptors(null_interceptor): ) client = BetaAnalyticsDataClient(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.BetaAnalyticsDataRestInterceptor, "post_query_audience_export" - ) as post, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, - "post_query_audience_export_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "pre_query_audience_export" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "post_query_audience_export" + ) as post, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, + "post_query_audience_export_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "pre_query_audience_export" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8006,8 +8030,9 @@ def test_get_audience_export_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8084,18 +8109,20 @@ def test_get_audience_export_rest_interceptors(null_interceptor): ) client = BetaAnalyticsDataClient(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.BetaAnalyticsDataRestInterceptor, "post_get_audience_export" - ) as post, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, - "post_get_audience_export_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "pre_get_audience_export" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "post_get_audience_export" + ) as post, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, + "post_get_audience_export_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "pre_get_audience_export" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8150,8 +8177,9 @@ def test_list_audience_exports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8214,18 +8242,20 @@ def test_list_audience_exports_rest_interceptors(null_interceptor): ) client = BetaAnalyticsDataClient(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.BetaAnalyticsDataRestInterceptor, "post_list_audience_exports" - ) as post, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, - "post_list_audience_exports_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BetaAnalyticsDataRestInterceptor, "pre_list_audience_exports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "post_list_audience_exports" + ) as post, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, + "post_list_audience_exports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BetaAnalyticsDataRestInterceptor, "pre_list_audience_exports" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8600,11 +8630,14 @@ def test_beta_analytics_data_base_transport(): def test_beta_analytics_data_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.analytics.data_v1beta.services.beta_analytics_data.transports.BetaAnalyticsDataTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.analytics.data_v1beta.services.beta_analytics_data.transports.BetaAnalyticsDataTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BetaAnalyticsDataTransport( @@ -8624,9 +8657,12 @@ def test_beta_analytics_data_base_transport_with_credentials_file(): def test_beta_analytics_data_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.analytics.data_v1beta.services.beta_analytics_data.transports.BetaAnalyticsDataTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.analytics.data_v1beta.services.beta_analytics_data.transports.BetaAnalyticsDataTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BetaAnalyticsDataTransport() @@ -8704,11 +8740,12 @@ def test_beta_analytics_data_transport_auth_gdch_credentials(transport_class): def test_beta_analytics_data_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-apps-card/docs/conf.py b/packages/google-apps-card/docs/conf.py index fbc4d832e6b4..aaab67fbf4a9 100644 --- a/packages/google-apps-card/docs/conf.py +++ b/packages/google-apps-card/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-apps-card documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-apps-card/google/apps/card_v1/__init__.py b/packages/google-apps-card/google/apps/card_v1/__init__.py index d59ff54a4f08..08a54a5bace0 100644 --- a/packages/google-apps-card/google/apps/card_v1/__init__.py +++ b/packages/google-apps-card/google/apps/card_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.card import ( Action, BorderStyle, diff --git a/packages/google-apps-card/google/apps/card_v1/types/card.py b/packages/google-apps-card/google/apps/card_v1/types/card.py index 359b564f39e5..20c351b20452 100644 --- a/packages/google-apps-card/google/apps/card_v1/types/card.py +++ b/packages/google-apps-card/google/apps/card_v1/types/card.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.type import color_pb2 # type: ignore +import google.type.color_pb2 as color_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -270,6 +270,7 @@ class DividerStyle(proto.Enum): The result is equivalent to not adding a divider at all. """ + DIVIDER_STYLE_UNSPECIFIED = 0 SOLID_DIVIDER = 1 NO_DIVIDER = 2 @@ -293,6 +294,7 @@ class DisplayStyle(proto.Enum): Default value. The card is shown by replacing the view of the top card in the card stack. """ + DISPLAY_STYLE_UNSPECIFIED = 0 PEEK = 1 REPLACE = 2 @@ -942,6 +944,7 @@ class ImageType(proto.Enum): example, a 4x3 image becomes a circle with a diameter of 3. """ + SQUARE = 0 CIRCLE = 1 @@ -967,6 +970,7 @@ class HorizontalAlignment(proto.Enum): widgets to the right. For right-to-left layouts, aligns widgets to the left. """ + HORIZONTAL_ALIGNMENT_UNSPECIFIED = 0 START = 1 CENTER = 2 @@ -985,6 +989,7 @@ class VerticalAlignment(proto.Enum): BOTTOM (3): Alignment to the bottom position. """ + VERTICAL_ALIGNMENT_UNSPECIFIED = 0 TOP = 1 MIDDLE = 2 @@ -1117,6 +1122,7 @@ class TextSyntax(proto.Enum): MARKDOWN (2): The text is rendered as Markdown. """ + TEXT_SYNTAX_UNSPECIFIED = 0 HTML = 1 MARKDOWN = 2 @@ -1335,6 +1341,7 @@ class ControlType(proto.Enum): CHECK_BOX (2): A checkbox. """ + SWITCH = 0 CHECKBOX = 1 CHECK_BOX = 2 @@ -1564,6 +1571,7 @@ class Type(proto.Enum): The text input field has a fixed height of multiple lines. """ + SINGLE_LINE = 0 MULTIPLE_LINE = 1 @@ -1838,6 +1846,7 @@ class SelectionType(proto.Enum): `Google Workspace add-ons and Chat apps `__: """ + CHECK_BOX = 0 RADIO_BUTTON = 1 SWITCH = 2 @@ -1933,6 +1942,7 @@ class CommonDataSource(proto.Enum): view and select users from their Google Workspace organization. """ + UNKNOWN = 0 USER = 1 @@ -2070,6 +2080,7 @@ class DateTimePickerType(proto.Enum): TIME_ONLY (2): Users input a time. """ + DATE_AND_TIME = 0 DATE_ONLY = 1 TIME_ONLY = 2 @@ -2267,6 +2278,7 @@ class Type(proto.Enum): lowest priority actions, especially when presenting multiple options. """ + TYPE_UNSPECIFIED = 0 OUTLINED = 1 FILLED = 2 @@ -2538,6 +2550,7 @@ class ImageCropType(proto.Enum): Applies a rectangular crop with a 4:3 aspect ratio. """ + IMAGE_CROP_TYPE_UNSPECIFIED = 0 SQUARE = 1 CIRCLE = 2 @@ -2605,6 +2618,7 @@ class BorderType(proto.Enum): STROKE (2): Default value. Outline. """ + BORDER_TYPE_UNSPECIFIED = 0 NO_BORDER = 1 STROKE = 2 @@ -2769,6 +2783,7 @@ class GridItemLayout(proto.Enum): The title and subtitle are shown above the grid item's image. """ + GRID_ITEM_LAYOUT_UNSPECIFIED = 0 TEXT_BELOW = 1 TEXT_ABOVE = 2 @@ -2906,6 +2921,7 @@ class HorizontalSizeStyle(proto.Enum): possible and no more than 30% of the card's width. """ + HORIZONTAL_SIZE_STYLE_UNSPECIFIED = 0 FILL_AVAILABLE_SPACE = 1 FILL_MINIMUM_SPACE = 2 @@ -2928,6 +2944,7 @@ class VerticalAlignment(proto.Enum): BOTTOM (3): Aligns widgets to the bottom of a column. """ + VERTICAL_ALIGNMENT_UNSPECIFIED = 0 CENTER = 1 TOP = 2 @@ -3300,6 +3317,7 @@ class OpenAs(proto.Enum): The link opens as an overlay, such as a pop-up. """ + FULL_SIZE = 0 OVERLAY = 1 @@ -3329,6 +3347,7 @@ class OnClose(proto.Enum): the child window acts as a modal dialog and the parent card is blocked until the child window closes. """ + NOTHING = 0 RELOAD = 1 @@ -3443,6 +3462,7 @@ class LoadIndicator(proto.Enum): NONE (1): Nothing is displayed. """ + SPINNER = 0 NONE = 1 @@ -3483,6 +3503,7 @@ class Interaction(proto.Enum): `Google Chat apps `__: """ + INTERACTION_UNSPECIFIED = 0 OPEN_DIALOG = 1 @@ -3589,6 +3610,7 @@ class InputType(proto.Enum): A emoji selected from system-provided emoji picker. """ + INPUT_TYPE_UNSPECIFIED = 0 TEXT = 1 INTEGER = 2 @@ -3635,6 +3657,7 @@ class Layout(proto.Enum): The chips scroll horizontally if they don't fit in the available space. """ + LAYOUT_UNSPECIFIED = 0 WRAPPED = 1 HORIZONTAL_SCROLLABLE = 2 diff --git a/packages/google-apps-card/noxfile.py b/packages/google-apps-card/noxfile.py index ef27bd4d0bc7..8deca516313e 100644 --- a/packages/google-apps-card/noxfile.py +++ b/packages/google-apps-card/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-apps-chat/docs/conf.py b/packages/google-apps-chat/docs/conf.py index 3d2e3c98ce90..4aec248376dc 100644 --- a/packages/google-apps-chat/docs/conf.py +++ b/packages/google-apps-chat/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-apps-chat documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-apps-chat/google/apps/chat_v1/__init__.py b/packages/google-apps-chat/google/apps/chat_v1/__init__.py index db2d4e18cb0c..eff0264c755f 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/__init__.py +++ b/packages/google-apps-chat/google/apps/chat_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.chat_service import ChatServiceAsyncClient, ChatServiceClient from .types.action_status import ActionStatus from .types.annotation import ( diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/async_client.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/async_client.py index bafd1540159c..0ddefd08a77d 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/async_client.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.chat_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.apps.chat_v1.services.chat_service import pagers from google.apps.chat_v1.types import ( @@ -57,24 +57,26 @@ group, history_state, matched_url, + membership, + message, + reaction, + slash_command, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, + user, ) -from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, -) -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import slash_command -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state, user from .client import ChatServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ChatServiceTransport @@ -174,7 +176,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ChatServiceAsyncClient: The constructed client. """ - return ChatServiceClient.from_service_account_info.__func__(ChatServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ChatServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ChatServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -190,7 +193,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ChatServiceAsyncClient: The constructed client. """ - return ChatServiceClient.from_service_account_file.__func__(ChatServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ChatServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ChatServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/client.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/client.py index 3294c399ad55..1bfbd8ea6255 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/client.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.chat_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.apps.chat_v1.services.chat_service import pagers from google.apps.chat_v1.types import ( @@ -74,24 +74,26 @@ group, history_state, matched_url, + membership, + message, + reaction, + slash_command, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, + user, ) -from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, -) -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import slash_command -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state, user from .transports.base import DEFAULT_CLIENT_INFO, ChatServiceTransport from .transports.grpc import ChatServiceGrpcTransport @@ -852,11 +854,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ChatServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ChatServiceClient._read_environment_variables() + ) self._client_cert_source = ChatServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -891,8 +891,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ChatServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/pagers.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/pagers.py index ab5e6af2e829..2fa61873496a 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/pagers.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/base.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/base.py index facd1b3a935e..8cfaa0e3b91e 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/base.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/base.py @@ -17,33 +17,36 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.apps.chat_v1 import gapic_version as package_version from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, + attachment, + membership, + message, + reaction, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, ) -from google.apps.chat_v1.types import attachment -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc.py index 616ba4406cd0..5b74e5c5050b 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc.py @@ -16,36 +16,39 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, + attachment, + membership, + message, + reaction, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, ) -from google.apps.chat_v1.types import attachment -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state from .base import DEFAULT_CLIENT_INFO, ChatServiceTransport @@ -2117,12 +2120,12 @@ def get_space_notification_setting( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_space_notification_setting" not in self._stubs: - self._stubs[ - "get_space_notification_setting" - ] = self._logged_channel.unary_unary( - "/google.chat.v1.ChatService/GetSpaceNotificationSetting", - request_serializer=space_notification_setting.GetSpaceNotificationSettingRequest.serialize, - response_deserializer=space_notification_setting.SpaceNotificationSetting.deserialize, + self._stubs["get_space_notification_setting"] = ( + self._logged_channel.unary_unary( + "/google.chat.v1.ChatService/GetSpaceNotificationSetting", + request_serializer=space_notification_setting.GetSpaceNotificationSettingRequest.serialize, + response_deserializer=space_notification_setting.SpaceNotificationSetting.deserialize, + ) ) return self._stubs["get_space_notification_setting"] @@ -2158,12 +2161,12 @@ def update_space_notification_setting( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_space_notification_setting" not in self._stubs: - self._stubs[ - "update_space_notification_setting" - ] = self._logged_channel.unary_unary( - "/google.chat.v1.ChatService/UpdateSpaceNotificationSetting", - request_serializer=gc_space_notification_setting.UpdateSpaceNotificationSettingRequest.serialize, - response_deserializer=gc_space_notification_setting.SpaceNotificationSetting.deserialize, + self._stubs["update_space_notification_setting"] = ( + self._logged_channel.unary_unary( + "/google.chat.v1.ChatService/UpdateSpaceNotificationSetting", + request_serializer=gc_space_notification_setting.UpdateSpaceNotificationSettingRequest.serialize, + response_deserializer=gc_space_notification_setting.SpaceNotificationSetting.deserialize, + ) ) return self._stubs["update_space_notification_setting"] diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc_asyncio.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc_asyncio.py index 8141a8d66656..920864338584 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc_asyncio.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/grpc_asyncio.py @@ -17,38 +17,41 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, + attachment, + membership, + message, + reaction, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, ) -from google.apps.chat_v1.types import attachment -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state from .base import DEFAULT_CLIENT_INFO, ChatServiceTransport from .grpc import ChatServiceGrpcTransport @@ -2152,12 +2155,12 @@ def get_space_notification_setting( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_space_notification_setting" not in self._stubs: - self._stubs[ - "get_space_notification_setting" - ] = self._logged_channel.unary_unary( - "/google.chat.v1.ChatService/GetSpaceNotificationSetting", - request_serializer=space_notification_setting.GetSpaceNotificationSettingRequest.serialize, - response_deserializer=space_notification_setting.SpaceNotificationSetting.deserialize, + self._stubs["get_space_notification_setting"] = ( + self._logged_channel.unary_unary( + "/google.chat.v1.ChatService/GetSpaceNotificationSetting", + request_serializer=space_notification_setting.GetSpaceNotificationSettingRequest.serialize, + response_deserializer=space_notification_setting.SpaceNotificationSetting.deserialize, + ) ) return self._stubs["get_space_notification_setting"] @@ -2193,12 +2196,12 @@ def update_space_notification_setting( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_space_notification_setting" not in self._stubs: - self._stubs[ - "update_space_notification_setting" - ] = self._logged_channel.unary_unary( - "/google.chat.v1.ChatService/UpdateSpaceNotificationSetting", - request_serializer=gc_space_notification_setting.UpdateSpaceNotificationSettingRequest.serialize, - response_deserializer=gc_space_notification_setting.SpaceNotificationSetting.deserialize, + self._stubs["update_space_notification_setting"] = ( + self._logged_channel.unary_unary( + "/google.chat.v1.ChatService/UpdateSpaceNotificationSetting", + request_serializer=gc_space_notification_setting.UpdateSpaceNotificationSettingRequest.serialize, + response_deserializer=gc_space_notification_setting.SpaceNotificationSetting.deserialize, + ) ) return self._stubs["update_space_notification_setting"] diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest.py index 22c4cab66b5f..12860478aa6d 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest.py @@ -16,36 +16,39 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, + attachment, + membership, + message, + reaction, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, ) -from google.apps.chat_v1.types import attachment -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseChatServiceRestTransport @@ -2027,9 +2030,7 @@ def __call__( """ - http_options = ( - _BaseChatServiceRestTransport._BaseCompleteImportSpace._get_http_options() - ) + http_options = _BaseChatServiceRestTransport._BaseCompleteImportSpace._get_http_options() request, metadata = self._interceptor.pre_complete_import_space( request, metadata @@ -2976,7 +2977,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3235,7 +3236,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3341,7 +3342,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3451,7 +3452,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4592,9 +4593,7 @@ def __call__( """ - http_options = ( - _BaseChatServiceRestTransport._BaseGetSpaceNotificationSetting._get_http_options() - ) + http_options = _BaseChatServiceRestTransport._BaseGetSpaceNotificationSetting._get_http_options() request, metadata = self._interceptor.pre_get_space_notification_setting( request, metadata @@ -4660,11 +4659,10 @@ def __call__( resp = self._interceptor.post_get_space_notification_setting(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_space_notification_setting_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_space_notification_setting_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4901,9 +4899,7 @@ def __call__( """ - http_options = ( - _BaseChatServiceRestTransport._BaseGetThreadReadState._get_http_options() - ) + http_options = _BaseChatServiceRestTransport._BaseGetThreadReadState._get_http_options() request, metadata = self._interceptor.pre_get_thread_read_state( request, metadata @@ -6738,9 +6734,7 @@ def __call__( """ - http_options = ( - _BaseChatServiceRestTransport._BaseUpdateSpaceNotificationSetting._get_http_options() - ) + http_options = _BaseChatServiceRestTransport._BaseUpdateSpaceNotificationSetting._get_http_options() request, metadata = self._interceptor.pre_update_space_notification_setting( request, metadata @@ -6811,11 +6805,10 @@ def __call__( resp = self._interceptor.post_update_space_notification_setting(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_space_notification_setting_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_space_notification_setting_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6903,9 +6896,7 @@ def __call__( """ - http_options = ( - _BaseChatServiceRestTransport._BaseUpdateSpaceReadState._get_http_options() - ) + http_options = _BaseChatServiceRestTransport._BaseUpdateSpaceReadState._get_http_options() request, metadata = self._interceptor.pre_update_space_read_state( request, metadata @@ -7303,7 +7294,9 @@ def get_space_notification_setting( ]: # 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._GetSpaceNotificationSetting(self._session, self._host, self._interceptor) # type: ignore + return self._GetSpaceNotificationSetting( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_space_read_state( @@ -7424,7 +7417,9 @@ def update_space_notification_setting( ]: # 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._UpdateSpaceNotificationSetting(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSpaceNotificationSetting( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_space_read_state( diff --git a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest_base.py b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest_base.py index eaf15e2431b2..096dc810d09c 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest_base.py +++ b/packages/google-apps-chat/google/apps/chat_v1/services/chat_service/transports/rest_base.py @@ -17,27 +17,30 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, + attachment, + membership, + message, + reaction, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, ) -from google.apps.chat_v1.types import attachment -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state -from google.apps.chat_v1.types import space_setup, thread_read_state from .base import DEFAULT_CLIENT_INFO, ChatServiceTransport diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/__init__.py b/packages/google-apps-chat/google/apps/chat_v1/types/__init__.py index 68048bc1193c..112ccf0257ce 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/__init__.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .action_status import ActionStatus +from .action_status import ( + ActionStatus, +) from .annotation import ( Annotation, AnnotationType, @@ -34,8 +36,12 @@ UploadAttachmentRequest, UploadAttachmentResponse, ) -from .contextual_addon import ContextualAddOnMarkup -from .deletion_metadata import DeletionMetadata +from .contextual_addon import ( + ContextualAddOnMarkup, +) +from .deletion_metadata import ( + DeletionMetadata, +) from .event_payload import ( MembershipBatchCreatedEventData, MembershipBatchDeletedEventData, @@ -56,9 +62,15 @@ SpaceBatchUpdatedEventData, SpaceUpdatedEventData, ) -from .group import Group -from .history_state import HistoryState -from .matched_url import MatchedUrl +from .group import ( + Group, +) +from .history_state import ( + HistoryState, +) +from .matched_url import ( + MatchedUrl, +) from .membership import ( CreateMembershipRequest, DeleteMembershipRequest, @@ -100,7 +112,9 @@ ListReactionsResponse, Reaction, ) -from .slash_command import SlashCommand +from .slash_command import ( + SlashCommand, +) from .space import ( CompleteImportSpaceRequest, CompleteImportSpaceResponse, @@ -131,10 +145,19 @@ SpaceReadState, UpdateSpaceReadStateRequest, ) -from .space_setup import SetUpSpaceRequest -from .thread_read_state import GetThreadReadStateRequest, ThreadReadState -from .user import User -from .widgets import WidgetMarkup +from .space_setup import ( + SetUpSpaceRequest, +) +from .thread_read_state import ( + GetThreadReadStateRequest, + ThreadReadState, +) +from .user import ( + User, +) +from .widgets import ( + WidgetMarkup, +) __all__ = ( "ActionStatus", diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/action_status.py b/packages/google-apps-chat/google/apps/chat_v1/types/action_status.py index a9ea195c15af..9ddd288d98fd 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/action_status.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/action_status.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.rpc import code_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/annotation.py b/packages/google-apps-chat/google/apps/chat_v1/types/annotation.py index bdbe3ea2d6f9..43122b2cbd03 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/annotation.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/annotation.py @@ -54,6 +54,7 @@ class AnnotationType(proto.Enum): CUSTOM_EMOJI (4): A custom emoji annotation. """ + ANNOTATION_TYPE_UNSPECIFIED = 0 USER_MENTION = 1 SLASH_COMMAND = 2 @@ -192,6 +193,7 @@ class Type(proto.Enum): MENTION (2): Mention user in space. """ + TYPE_UNSPECIFIED = 0 ADD = 1 MENTION = 2 @@ -236,6 +238,7 @@ class Type(proto.Enum): INVOKE (2): Invoke slash command in space. """ + TYPE_UNSPECIFIED = 0 ADD = 1 INVOKE = 2 @@ -324,6 +327,7 @@ class RichLinkType(proto.Enum): A Calendar message rich link type. For example, a Calendar chip. """ + RICH_LINK_TYPE_UNSPECIFIED = 0 DRIVE_FILE = 1 CHAT_SPACE = 2 @@ -462,6 +466,7 @@ class Type(proto.Enum): HUDDLE (2): The Meet space is a huddle. """ + TYPE_UNSPECIFIED = 0 MEETING = 1 HUDDLE = 2 @@ -483,6 +488,7 @@ class HuddleStatus(proto.Enum): Meet space URI and identifiers will no longer be valid. """ + HUDDLE_STATUS_UNSPECIFIED = 0 STARTED = 1 ENDED = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/attachment.py b/packages/google-apps-chat/google/apps/chat_v1/types/attachment.py index e412a68b54ad..8bc734843cfe 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/attachment.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/attachment.py @@ -92,6 +92,7 @@ class Source(proto.Enum): UPLOADED_CONTENT (2): The file is uploaded to Chat. """ + SOURCE_UNSPECIFIED = 0 DRIVE_FILE = 1 UPLOADED_CONTENT = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/contextual_addon.py b/packages/google-apps-chat/google/apps/chat_v1/types/contextual_addon.py index f5a89b77f5bc..559cfc028137 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/contextual_addon.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/contextual_addon.py @@ -80,6 +80,7 @@ class ImageStyle(proto.Enum): AVATAR (2): Circular border. """ + IMAGE_STYLE_UNSPECIFIED = 0 IMAGE = 1 AVATAR = 2 @@ -164,19 +165,19 @@ class CardAction(proto.Message): number=1, message="ContextualAddOnMarkup.Card.CardHeader", ) - sections: MutableSequence[ - "ContextualAddOnMarkup.Card.Section" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ContextualAddOnMarkup.Card.Section", + sections: MutableSequence["ContextualAddOnMarkup.Card.Section"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ContextualAddOnMarkup.Card.Section", + ) ) - card_actions: MutableSequence[ - "ContextualAddOnMarkup.Card.CardAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="ContextualAddOnMarkup.Card.CardAction", + card_actions: MutableSequence["ContextualAddOnMarkup.Card.CardAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="ContextualAddOnMarkup.Card.CardAction", + ) ) name: str = proto.Field( proto.STRING, diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/deletion_metadata.py b/packages/google-apps-chat/google/apps/chat_v1/types/deletion_metadata.py index 6603304076c4..f64ee5c0288d 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/deletion_metadata.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/deletion_metadata.py @@ -67,6 +67,7 @@ class DeletionType(proto.Enum): A member of the space deleted the message. Users can delete messages sent by apps. """ + DELETION_TYPE_UNSPECIFIED = 0 CREATOR = 1 SPACE_OWNER = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/history_state.py b/packages/google-apps-chat/google/apps/chat_v1/types/history_state.py index bf707dfef069..27c6e067cad7 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/history_state.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/history_state.py @@ -42,6 +42,7 @@ class HistoryState(proto.Enum): rules `__ specify for how long messages and threads are kept. """ + HISTORY_STATE_UNSPECIFIED = 0 HISTORY_OFF = 1 HISTORY_ON = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/membership.py b/packages/google-apps-chat/google/apps/chat_v1/types/membership.py index 6888a1eddaeb..2803d5c5e32d 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/membership.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/membership.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.apps.chat_v1.types import group, user @@ -112,6 +112,7 @@ class MembershipState(proto.Enum): doesn't have a pending invitation to join the space. """ + MEMBERSHIP_STATE_UNSPECIFIED = 0 JOINED = 1 INVITED = 2 @@ -193,6 +194,7 @@ class MembershipRole(proto.Enum): To learn more, see `Manage space settings `__. """ + MEMBERSHIP_ROLE_UNSPECIFIED = 0 ROLE_MEMBER = 1 ROLE_MANAGER = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/message.py b/packages/google-apps-chat/google/apps/chat_v1/types/message.py index 5ef8ae03f642..943599189fd2 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/message.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/message.py @@ -17,21 +17,18 @@ from typing import MutableMapping, MutableSequence -from google.apps.card_v1.types import card as gac_card -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.apps.card_v1.types import card as gac_card from google.apps.chat_v1.types import action_status as gc_action_status -from google.apps.chat_v1.types import annotation +from google.apps.chat_v1.types import annotation, contextual_addon, reaction, user from google.apps.chat_v1.types import attachment as gc_attachment -from google.apps.chat_v1.types import contextual_addon from google.apps.chat_v1.types import deletion_metadata as gc_deletion_metadata from google.apps.chat_v1.types import matched_url as gc_matched_url -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import slash_command as gc_slash_command from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import user __protobuf__ = proto.module( package="google.chat.v1", @@ -294,12 +291,12 @@ class Message(proto.Message): proto.STRING, number=43, ) - cards: MutableSequence[ - contextual_addon.ContextualAddOnMarkup.Card - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=contextual_addon.ContextualAddOnMarkup.Card, + cards: MutableSequence[contextual_addon.ContextualAddOnMarkup.Card] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=contextual_addon.ContextualAddOnMarkup.Card, + ) ) cards_v2: MutableSequence["CardWithId"] = proto.RepeatedField( proto.MESSAGE, @@ -357,12 +354,12 @@ class Message(proto.Message): proto.STRING, number=32, ) - emoji_reaction_summaries: MutableSequence[ - reaction.EmojiReactionSummary - ] = proto.RepeatedField( - proto.MESSAGE, - number=33, - message=reaction.EmojiReactionSummary, + emoji_reaction_summaries: MutableSequence[reaction.EmojiReactionSummary] = ( + proto.RepeatedField( + proto.MESSAGE, + number=33, + message=reaction.EmojiReactionSummary, + ) ) private_message_viewer: user.User = proto.Field( proto.MESSAGE, @@ -528,6 +525,7 @@ class ResponseType(proto.Enum): UPDATE_WIDGET (7): Widget text autocomplete options query. """ + TYPE_UNSPECIFIED = 0 NEW_MESSAGE = 1 UPDATE_MESSAGE = 2 @@ -544,12 +542,12 @@ class SelectionItems(proto.Message): An array of the SelectionItem objects. """ - items: MutableSequence[ - gac_card.SelectionInput.SelectionItem - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gac_card.SelectionInput.SelectionItem, + items: MutableSequence[gac_card.SelectionInput.SelectionItem] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gac_card.SelectionInput.SelectionItem, + ) ) class UpdatedWidget(proto.Message): @@ -810,6 +808,7 @@ class MessageReplyOption(proto.Enum): message creation fails, a ``NOT_FOUND`` error is returned instead. """ + MESSAGE_REPLY_OPTION_UNSPECIFIED = 0 REPLY_MESSAGE_FALLBACK_TO_NEW_THREAD = 1 REPLY_MESSAGE_OR_FAIL = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/space.py b/packages/google-apps-chat/google/apps/chat_v1/types/space.py index aeb88d94473d..97b540196a84 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/space.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/space.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.apps.chat_v1.types import history_state @@ -236,6 +236,7 @@ class Type(proto.Enum): doesn't include direct messages between two humans. """ + TYPE_UNSPECIFIED = 0 ROOM = 1 DM = 2 @@ -257,6 +258,7 @@ class SpaceType(proto.Enum): 1:1 messages between two humans or a human and a Chat app. """ + SPACE_TYPE_UNSPECIFIED = 0 SPACE = 1 GROUP_CHAT = 2 @@ -281,6 +283,7 @@ class SpaceThreadingState(proto.Enum): Direct messages (DMs) between two people and group conversations between 3 or more people. """ + SPACE_THREADING_STATE_UNSPECIFIED = 0 THREADED_MESSAGES = 2 GROUPED_MESSAGES = 3 @@ -303,6 +306,7 @@ class PredefinedPermissionSettings(proto.Enum): space where only space managers can post messages. """ + PREDEFINED_PERMISSION_SETTINGS_UNSPECIFIED = 0 COLLABORATION_SPACE = 1 ANNOUNCEMENT_SPACE = 2 @@ -421,6 +425,7 @@ class AccessState(proto.Enum): Creating discoverable spaces requires `user authentication `__. """ + ACCESS_STATE_UNSPECIFIED = 0 PRIVATE = 1 DISCOVERABLE = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/space_event.py b/packages/google-apps-chat/google/apps/chat_v1/types/space_event.py index 9158002464c4..8e8c6f2c15ef 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/space_event.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/space_event.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.apps.chat_v1.types import event_payload diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/space_notification_setting.py b/packages/google-apps-chat/google/apps/chat_v1/types/space_notification_setting.py index 764bbbd50932..be5027ddfb54 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/space_notification_setting.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/space_notification_setting.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -73,6 +73,7 @@ class NotificationSetting(proto.Enum): OFF (4): Notification is off. """ + NOTIFICATION_SETTING_UNSPECIFIED = 0 ALL = 1 MAIN_CONVERSATIONS = 2 @@ -93,6 +94,7 @@ class MuteSetting(proto.Enum): for the space, regardless of the notification setting. """ + MUTE_SETTING_UNSPECIFIED = 0 UNMUTED = 1 MUTED = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/space_read_state.py b/packages/google-apps-chat/google/apps/chat_v1/types/space_read_state.py index 2329fca2d8a5..046a90823c27 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/space_read_state.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/space_read_state.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/thread_read_state.py b/packages/google-apps-chat/google/apps/chat_v1/types/thread_read_state.py index 18208cfcc3f9..038a6fd81b33 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/thread_read_state.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/thread_read_state.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/user.py b/packages/google-apps-chat/google/apps/chat_v1/types/user.py index 5cc0a8e5bb96..eb0d8a3e3b56 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/user.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/user.py @@ -85,6 +85,7 @@ class Type(proto.Enum): BOT (2): Chat app user. """ + TYPE_UNSPECIFIED = 0 HUMAN = 1 BOT = 2 diff --git a/packages/google-apps-chat/google/apps/chat_v1/types/widgets.py b/packages/google-apps-chat/google/apps/chat_v1/types/widgets.py index f73fa43efc6e..8460571e6c96 100644 --- a/packages/google-apps-chat/google/apps/chat_v1/types/widgets.py +++ b/packages/google-apps-chat/google/apps/chat_v1/types/widgets.py @@ -122,6 +122,7 @@ class Icon(proto.Enum): VIDEO_PLAY (29): No description available. """ + ICON_UNSPECIFIED = 0 AIRPLANE = 1 BOOKMARK = 26 @@ -493,12 +494,12 @@ class ActionParameter(proto.Message): proto.STRING, number=1, ) - parameters: MutableSequence[ - "WidgetMarkup.FormAction.ActionParameter" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="WidgetMarkup.FormAction.ActionParameter", + parameters: MutableSequence["WidgetMarkup.FormAction.ActionParameter"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="WidgetMarkup.FormAction.ActionParameter", + ) ) text_paragraph: TextParagraph = proto.Field( diff --git a/packages/google-apps-chat/noxfile.py b/packages/google-apps-chat/noxfile.py index a237afad67d3..0e2272e83ec4 100644 --- a/packages/google-apps-chat/noxfile.py +++ b/packages/google-apps-chat/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-apps-chat/tests/unit/gapic/chat_v1/test_chat_service.py b/packages/google-apps-chat/tests/unit/gapic/chat_v1/test_chat_service.py index a0f77452c3ba..0921f2abdae5 100644 --- a/packages/google-apps-chat/tests/unit/gapic/chat_v1/test_chat_service.py +++ b/packages/google-apps-chat/tests/unit/gapic/chat_v1/test_chat_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore +import google.type.color_pb2 as color_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries from google.apps.card_v1.types import card -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import code_pb2 # type: ignore -from google.type import color_pb2 # type: ignore from google.apps.chat_v1.services.chat_service import ( ChatServiceAsyncClient, @@ -74,23 +79,26 @@ group, history_state, matched_url, + membership, + message, + reaction, + slash_command, + space, + space_event, + space_notification_setting, + space_read_state, + space_setup, + thread_read_state, + user, + widgets, ) -from google.apps.chat_v1.types import space_setup, thread_read_state, user, widgets -from google.apps.chat_v1.types import ( - space_notification_setting as gc_space_notification_setting, -) -from google.apps.chat_v1.types import membership from google.apps.chat_v1.types import membership as gc_membership -from google.apps.chat_v1.types import message from google.apps.chat_v1.types import message as gc_message -from google.apps.chat_v1.types import reaction from google.apps.chat_v1.types import reaction as gc_reaction -from google.apps.chat_v1.types import slash_command -from google.apps.chat_v1.types import space from google.apps.chat_v1.types import space as gc_space -from google.apps.chat_v1.types import space_event -from google.apps.chat_v1.types import space_notification_setting -from google.apps.chat_v1.types import space_read_state +from google.apps.chat_v1.types import ( + space_notification_setting as gc_space_notification_setting, +) from google.apps.chat_v1.types import space_read_state as gc_space_read_state CRED_INFO_JSON = { @@ -955,10 +963,9 @@ def test_chat_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1010,9 @@ def test_chat_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1048,9 @@ def test_chat_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1274,13 +1279,13 @@ def test_chat_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2314,9 +2319,9 @@ def test_list_memberships_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_memberships - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_memberships] = ( + mock_rpc + ) request = {} client.list_memberships(request) @@ -4513,9 +4518,9 @@ def test_upload_attachment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upload_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upload_attachment] = ( + mock_rpc + ) request = {} client.upload_attachment(request) @@ -7128,9 +7133,9 @@ def test_complete_import_space_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_import_space - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_import_space] = ( + mock_rpc + ) request = {} client.complete_import_space(request) @@ -7408,9 +7413,9 @@ def test_find_direct_message_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.find_direct_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.find_direct_message] = ( + mock_rpc + ) request = {} client.find_direct_message(request) @@ -7627,9 +7632,9 @@ def test_create_membership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_membership] = ( + mock_rpc + ) request = {} client.create_membership(request) @@ -7980,9 +7985,9 @@ def test_update_membership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_membership] = ( + mock_rpc + ) request = {} client.update_membership(request) @@ -8337,9 +8342,9 @@ def test_delete_membership_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_membership] = ( + mock_rpc + ) request = {} client.delete_membership(request) @@ -9849,9 +9854,9 @@ def test_create_custom_emoji_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_emoji - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_emoji] = ( + mock_rpc + ) request = {} client.create_custom_emoji(request) @@ -10131,9 +10136,9 @@ def test_get_custom_emoji_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_emoji - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_emoji] = ( + mock_rpc + ) request = {} client.get_custom_emoji(request) @@ -10470,9 +10475,9 @@ def test_list_custom_emojis_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_emojis - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_emojis] = ( + mock_rpc + ) request = {} client.list_custom_emojis(request) @@ -10856,9 +10861,9 @@ def test_delete_custom_emoji_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_custom_emoji - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_custom_emoji] = ( + mock_rpc + ) request = {} client.delete_custom_emoji(request) @@ -11188,9 +11193,9 @@ def test_get_space_read_state_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_space_read_state - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_space_read_state] = ( + mock_rpc + ) request = {} client.get_space_read_state(request) @@ -11880,9 +11885,9 @@ def test_get_thread_read_state_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_thread_read_state - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_thread_read_state] = ( + mock_rpc + ) request = {} client.get_thread_read_state(request) @@ -12551,9 +12556,9 @@ def test_list_space_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_space_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_space_events] = ( + mock_rpc + ) request = {} client.list_space_events(request) @@ -14242,9 +14247,9 @@ def test_list_memberships_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_memberships - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_memberships] = ( + mock_rpc + ) request = {} client.list_memberships(request) @@ -15400,9 +15405,9 @@ def test_upload_attachment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upload_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upload_attachment] = ( + mock_rpc + ) request = {} client.upload_attachment(request) @@ -16667,9 +16672,9 @@ def test_complete_import_space_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_import_space - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_import_space] = ( + mock_rpc + ) request = {} client.complete_import_space(request) @@ -16792,9 +16797,9 @@ def test_find_direct_message_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.find_direct_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.find_direct_message] = ( + mock_rpc + ) request = {} client.find_direct_message(request) @@ -16925,9 +16930,9 @@ def test_create_membership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_membership] = ( + mock_rpc + ) request = {} client.create_membership(request) @@ -17116,9 +17121,9 @@ def test_update_membership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_membership] = ( + mock_rpc + ) request = {} client.update_membership(request) @@ -17313,9 +17318,9 @@ def test_delete_membership_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_membership - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_membership] = ( + mock_rpc + ) request = {} client.delete_membership(request) @@ -18110,9 +18115,9 @@ def test_create_custom_emoji_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_custom_emoji - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_custom_emoji] = ( + mock_rpc + ) request = {} client.create_custom_emoji(request) @@ -18284,9 +18289,9 @@ def test_get_custom_emoji_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_emoji - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_emoji] = ( + mock_rpc + ) request = {} client.get_custom_emoji(request) @@ -18464,9 +18469,9 @@ def test_list_custom_emojis_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_emojis - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_emojis] = ( + mock_rpc + ) request = {} client.list_custom_emojis(request) @@ -18565,9 +18570,9 @@ def test_delete_custom_emoji_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_custom_emoji - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_custom_emoji] = ( + mock_rpc + ) request = {} client.delete_custom_emoji(request) @@ -18740,9 +18745,9 @@ def test_get_space_read_state_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_space_read_state - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_space_read_state] = ( + mock_rpc + ) request = {} client.get_space_read_state(request) @@ -19115,9 +19120,9 @@ def test_get_thread_read_state_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_thread_read_state - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_thread_read_state] = ( + mock_rpc + ) request = {} client.get_thread_read_state(request) @@ -19473,9 +19478,9 @@ def test_list_space_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_space_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_space_events] = ( + mock_rpc + ) request = {} client.list_space_events(request) @@ -22091,8 +22096,9 @@ def test_create_message_rest_bad_request(request_type=gc_message.CreateMessageRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22700,17 +22706,19 @@ def test_create_message_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_create_message" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_create_message_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_create_message" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_create_message" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_create_message_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_create_message" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22761,8 +22769,9 @@ def test_list_messages_rest_bad_request(request_type=message.ListMessagesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22825,17 +22834,19 @@ def test_list_messages_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_list_messages" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_list_messages_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_list_messages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_list_messages" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_list_messages_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_list_messages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22888,8 +22899,9 @@ def test_list_memberships_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22952,17 +22964,19 @@ def test_list_memberships_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_list_memberships" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_list_memberships_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_list_memberships" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_list_memberships" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_list_memberships_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_list_memberships" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23015,8 +23029,9 @@ def test_get_membership_rest_bad_request(request_type=membership.GetMembershipRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23083,17 +23098,19 @@ def test_get_membership_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_get_membership" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_get_membership_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_get_membership" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_membership" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_membership_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_get_membership" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23144,8 +23161,9 @@ def test_get_message_rest_bad_request(request_type=message.GetMessageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23220,17 +23238,19 @@ def test_get_message_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_get_message" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_get_message_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_get_message" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_message" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_message_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_get_message" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23279,8 +23299,9 @@ def test_update_message_rest_bad_request(request_type=gc_message.UpdateMessageRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23888,17 +23909,19 @@ def test_update_message_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_update_message" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_update_message_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_update_message" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_update_message" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_update_message_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_update_message" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23949,8 +23972,9 @@ def test_delete_message_rest_bad_request(request_type=message.DeleteMessageReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24007,13 +24031,13 @@ def test_delete_message_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "pre_delete_message" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_delete_message" + ) as pre, + ): pre.assert_not_called() pb_message = message.DeleteMessageRequest.pb(message.DeleteMessageRequest()) transcode.return_value = { @@ -24054,8 +24078,9 @@ def test_get_attachment_rest_bad_request(request_type=attachment.GetAttachmentRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24128,17 +24153,19 @@ def test_get_attachment_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_get_attachment" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_get_attachment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_get_attachment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_attachment" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_attachment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_get_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24191,8 +24218,9 @@ def test_upload_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24252,17 +24280,20 @@ def test_upload_attachment_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_upload_attachment" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_upload_attachment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_upload_attachment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_upload_attachment" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_upload_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_upload_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24318,8 +24349,9 @@ def test_list_spaces_rest_bad_request(request_type=space.ListSpacesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24382,17 +24414,19 @@ def test_list_spaces_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_list_spaces" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_list_spaces_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_list_spaces" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_list_spaces" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_list_spaces_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_list_spaces" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24441,8 +24475,9 @@ def test_search_spaces_rest_bad_request(request_type=space.SearchSpacesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24507,17 +24542,19 @@ def test_search_spaces_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_search_spaces" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_search_spaces_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_search_spaces" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_search_spaces" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_search_spaces_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_search_spaces" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24566,8 +24603,9 @@ def test_get_space_rest_bad_request(request_type=space.GetSpaceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24658,17 +24696,19 @@ def test_get_space_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_get_space" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_get_space_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_get_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_space" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_space_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_get_space" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24717,8 +24757,9 @@ def test_create_space_rest_bad_request(request_type=gc_space.CreateSpaceRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24918,17 +24959,19 @@ def test_create_space_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_create_space" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_create_space_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_create_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_create_space" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_create_space_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_create_space" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24977,8 +25020,9 @@ def test_set_up_space_rest_bad_request(request_type=space_setup.SetUpSpaceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25069,17 +25113,19 @@ def test_set_up_space_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_set_up_space" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_set_up_space_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_set_up_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_set_up_space" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_set_up_space_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_set_up_space" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25128,8 +25174,9 @@ def test_update_space_rest_bad_request(request_type=gc_space.UpdateSpaceRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25329,17 +25376,19 @@ def test_update_space_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_update_space" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_update_space_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_update_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_update_space" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_update_space_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_update_space" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25388,8 +25437,9 @@ def test_delete_space_rest_bad_request(request_type=space.DeleteSpaceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25446,13 +25496,13 @@ def test_delete_space_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "pre_delete_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_delete_space" + ) as pre, + ): pre.assert_not_called() pb_message = space.DeleteSpaceRequest.pb(space.DeleteSpaceRequest()) transcode.return_value = { @@ -25495,8 +25545,9 @@ def test_complete_import_space_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25556,18 +25607,20 @@ def test_complete_import_space_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_complete_import_space" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, - "post_complete_import_space_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_complete_import_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_complete_import_space" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_complete_import_space_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_complete_import_space" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25622,8 +25675,9 @@ def test_find_direct_message_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25714,17 +25768,20 @@ def test_find_direct_message_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_find_direct_message" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_find_direct_message_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_find_direct_message" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_find_direct_message" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_find_direct_message_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_find_direct_message" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25775,8 +25832,9 @@ def test_create_membership_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25925,17 +25983,20 @@ def test_create_membership_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_create_membership" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_create_membership_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_create_membership" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_create_membership" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_create_membership_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_create_membership" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25988,8 +26049,9 @@ def test_update_membership_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26138,17 +26200,20 @@ def test_update_membership_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_update_membership" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_update_membership_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_update_membership" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_update_membership" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_update_membership_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_update_membership" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26201,8 +26266,9 @@ def test_delete_membership_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26269,17 +26335,20 @@ def test_delete_membership_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_delete_membership" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_delete_membership_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_delete_membership" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_delete_membership" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_delete_membership_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_delete_membership" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26332,8 +26401,9 @@ def test_create_reaction_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26486,17 +26556,19 @@ def test_create_reaction_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_create_reaction" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_create_reaction_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_create_reaction" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_create_reaction" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_create_reaction_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_create_reaction" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26547,8 +26619,9 @@ def test_list_reactions_rest_bad_request(request_type=reaction.ListReactionsRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26611,17 +26684,19 @@ def test_list_reactions_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_list_reactions" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_list_reactions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_list_reactions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_list_reactions" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_list_reactions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_list_reactions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26672,8 +26747,9 @@ def test_delete_reaction_rest_bad_request(request_type=reaction.DeleteReactionRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26730,13 +26806,13 @@ def test_delete_reaction_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "pre_delete_reaction" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_delete_reaction" + ) as pre, + ): pre.assert_not_called() pb_message = reaction.DeleteReactionRequest.pb(reaction.DeleteReactionRequest()) transcode.return_value = { @@ -26779,8 +26855,9 @@ def test_create_custom_emoji_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26923,17 +27000,20 @@ def test_create_custom_emoji_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_create_custom_emoji" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_create_custom_emoji_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_create_custom_emoji" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_create_custom_emoji" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_create_custom_emoji_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_create_custom_emoji" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26984,8 +27064,9 @@ def test_get_custom_emoji_rest_bad_request(request_type=reaction.GetCustomEmojiR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27054,17 +27135,19 @@ def test_get_custom_emoji_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_get_custom_emoji" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_get_custom_emoji_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_get_custom_emoji" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_custom_emoji" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_custom_emoji_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_get_custom_emoji" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27115,8 +27198,9 @@ def test_list_custom_emojis_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27179,17 +27263,20 @@ def test_list_custom_emojis_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_list_custom_emojis" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_list_custom_emojis_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_list_custom_emojis" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_list_custom_emojis" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_list_custom_emojis_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_list_custom_emojis" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27244,8 +27331,9 @@ def test_delete_custom_emoji_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27302,13 +27390,13 @@ def test_delete_custom_emoji_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "pre_delete_custom_emoji" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_delete_custom_emoji" + ) as pre, + ): pre.assert_not_called() pb_message = reaction.DeleteCustomEmojiRequest.pb( reaction.DeleteCustomEmojiRequest() @@ -27353,8 +27441,9 @@ def test_get_space_read_state_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27417,17 +27506,20 @@ def test_get_space_read_state_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_get_space_read_state" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_get_space_read_state_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_get_space_read_state" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_space_read_state" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_get_space_read_state_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_get_space_read_state" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27484,8 +27576,9 @@ def test_update_space_read_state_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27623,18 +27716,20 @@ def test_update_space_read_state_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_update_space_read_state" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, - "post_update_space_read_state_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_update_space_read_state" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_update_space_read_state" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_update_space_read_state_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_update_space_read_state" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27691,8 +27786,9 @@ def test_get_thread_read_state_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27757,18 +27853,20 @@ def test_get_thread_read_state_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_get_thread_read_state" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, - "post_get_thread_read_state_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_get_thread_read_state" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_thread_read_state" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_get_thread_read_state_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_get_thread_read_state" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27823,8 +27921,9 @@ def test_get_space_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27889,17 +27988,19 @@ def test_get_space_event_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_get_space_event" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_get_space_event_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_get_space_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_space_event" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_space_event_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_get_space_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27952,8 +28053,9 @@ def test_list_space_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28016,17 +28118,20 @@ def test_list_space_events_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_list_space_events" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, "post_list_space_events_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_list_space_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_list_space_events" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_list_space_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_list_space_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28084,8 +28189,9 @@ def test_get_space_notification_setting_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28160,18 +28266,20 @@ def test_get_space_notification_setting_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_get_space_notification_setting" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, - "post_get_space_notification_setting_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_get_space_notification_setting" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, "post_get_space_notification_setting" + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_get_space_notification_setting_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, "pre_get_space_notification_setting" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28233,8 +28341,9 @@ def test_update_space_notification_setting_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28393,18 +28502,22 @@ def test_update_space_notification_setting_rest_interceptors(null_interceptor): ) client = ChatServiceClient(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.ChatServiceRestInterceptor, "post_update_space_notification_setting" - ) as post, mock.patch.object( - transports.ChatServiceRestInterceptor, - "post_update_space_notification_setting_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ChatServiceRestInterceptor, "pre_update_space_notification_setting" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_update_space_notification_setting", + ) as post, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "post_update_space_notification_setting_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ChatServiceRestInterceptor, + "pre_update_space_notification_setting", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29279,11 +29392,14 @@ def test_chat_service_base_transport(): def test_chat_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.apps.chat_v1.services.chat_service.transports.ChatServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.apps.chat_v1.services.chat_service.transports.ChatServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ChatServiceTransport( @@ -29331,9 +29447,12 @@ def test_chat_service_base_transport_with_credentials_file(): def test_chat_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.apps.chat_v1.services.chat_service.transports.ChatServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.apps.chat_v1.services.chat_service.transports.ChatServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ChatServiceTransport() @@ -29467,11 +29586,12 @@ def test_chat_service_transport_auth_gdch_credentials(transport_class): def test_chat_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-apps-events-subscriptions/docs/conf.py b/packages/google-apps-events-subscriptions/docs/conf.py index 32c0661d33f5..bba5b0888f09 100644 --- a/packages/google-apps-events-subscriptions/docs/conf.py +++ b/packages/google-apps-events-subscriptions/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-apps-events-subscriptions documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/__init__.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/__init__.py index e01c4b385ea4..a4efa0e0ad9f 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/__init__.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.subscriptions_service import ( SubscriptionsServiceAsyncClient, SubscriptionsServiceClient, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/async_client.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/async_client.py index 17222d357274..536ca08005c8 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/async_client.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.events_subscriptions_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.apps.events_subscriptions_v1.services.subscriptions_service import pagers from google.apps.events_subscriptions_v1.types import ( @@ -132,7 +132,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SubscriptionsServiceAsyncClient: The constructed client. """ - return SubscriptionsServiceClient.from_service_account_info.__func__(SubscriptionsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SubscriptionsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SubscriptionsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +149,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SubscriptionsServiceAsyncClient: The constructed client. """ - return SubscriptionsServiceClient.from_service_account_file.__func__(SubscriptionsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SubscriptionsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SubscriptionsServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -186,7 +188,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SubscriptionsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SubscriptionsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SubscriptionsServiceTransport: diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/client.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/client.py index df79b0ad656e..e275254e3ec8 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/client.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.events_subscriptions_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.apps.events_subscriptions_v1.services.subscriptions_service import pagers from google.apps.events_subscriptions_v1.types import ( @@ -89,9 +89,7 @@ class SubscriptionsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SubscriptionsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SubscriptionsServiceTransport]] _transport_registry["grpc"] = SubscriptionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SubscriptionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SubscriptionsServiceRestTransport @@ -662,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SubscriptionsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SubscriptionsServiceClient._read_environment_variables() + ) self._client_cert_source = SubscriptionsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -701,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SubscriptionsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/pagers.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/pagers.py index 313749a191f1..44e003b7f689 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/pagers.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/__init__.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/__init__.py index 9bb0413d8e7a..9e94d24ae563 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/__init__.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SubscriptionsServiceRestInterceptor, SubscriptionsServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SubscriptionsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SubscriptionsServiceTransport]] _transport_registry["grpc"] = SubscriptionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SubscriptionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SubscriptionsServiceRestTransport diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/base.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/base.py index cea83063948e..87e36dd552ba 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/base.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.events_subscriptions_v1 import gapic_version as package_version from google.apps.events_subscriptions_v1.types import ( diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc.py index a37a3730cc32..39fd42071c2d 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.apps.events_subscriptions_v1.types import ( subscription_resource, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc_asyncio.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc_asyncio.py index bef661160025..0ce652006f7b 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc_asyncio.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.events_subscriptions_v1.types import ( subscription_resource, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/rest.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/rest.py index c05d1ca9fd1f..65032f193995 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/rest.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/services/subscriptions_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -638,9 +638,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseCreateSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseCreateSubscription._get_http_options() request, metadata = self._interceptor.pre_create_subscription( request, metadata @@ -666,7 +664,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -794,9 +792,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseDeleteSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseDeleteSubscription._get_http_options() request, metadata = self._interceptor.pre_delete_subscription( request, metadata @@ -818,7 +814,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -946,9 +942,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseGetSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseGetSubscription._get_http_options() request, metadata = self._interceptor.pre_get_subscription( request, metadata @@ -1098,9 +1092,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseListSubscriptions._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseListSubscriptions._get_http_options() request, metadata = self._interceptor.pre_list_subscriptions( request, metadata @@ -1256,9 +1248,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseReactivateSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseReactivateSubscription._get_http_options() request, metadata = self._interceptor.pre_reactivate_subscription( request, metadata @@ -1284,7 +1274,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1413,9 +1403,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseUpdateSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseUpdateSubscription._get_http_options() request, metadata = self._interceptor.pre_update_subscription( request, metadata @@ -1441,7 +1429,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1560,7 +1548,9 @@ def reactivate_subscription( ]: # 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._ReactivateSubscription(self._session, self._host, self._interceptor) # type: ignore + return self._ReactivateSubscription( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_subscription( @@ -1630,9 +1620,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSubscriptionsServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/__init__.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/__init__.py index 44deb4175f8c..632c208c1268 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/__init__.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/__init__.py @@ -13,7 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .subscription_resource import NotificationEndpoint, PayloadOptions, Subscription +from .subscription_resource import ( + NotificationEndpoint, + PayloadOptions, + Subscription, +) from .subscriptions_service import ( CreateSubscriptionMetadata, CreateSubscriptionRequest, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscription_resource.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscription_resource.py index 287766a90bae..e2566a75df04 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscription_resource.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscription_resource.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -160,6 +160,7 @@ class State(proto.Enum): DELETED (3): The subscription is deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -199,6 +200,7 @@ class ErrorType(proto.Enum): OTHER (5): An unidentified error has occurred. """ + ERROR_TYPE_UNSPECIFIED = 0 USER_SCOPE_REVOKED = 1 RESOURCE_DELETED = 2 diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscriptions_service.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscriptions_service.py index c12938eac1b2..1e0a01ddf969 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscriptions_service.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1/types/subscriptions_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.apps.events_subscriptions_v1.types import subscription_resource @@ -265,12 +265,12 @@ class ListSubscriptionsResponse(proto.Message): def raw_page(self): return self - subscriptions: MutableSequence[ - subscription_resource.Subscription - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=subscription_resource.Subscription, + subscriptions: MutableSequence[subscription_resource.Subscription] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=subscription_resource.Subscription, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/__init__.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/__init__.py index 6c5a8fa412d4..6eddc19d87a0 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/__init__.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.subscriptions_service import ( SubscriptionsServiceAsyncClient, SubscriptionsServiceClient, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/async_client.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/async_client.py index 1917388b4c8e..f1d028d0d861 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/async_client.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.events_subscriptions_v1beta import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.apps.events_subscriptions_v1beta.services.subscriptions_service import ( pagers, @@ -134,7 +134,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SubscriptionsServiceAsyncClient: The constructed client. """ - return SubscriptionsServiceClient.from_service_account_info.__func__(SubscriptionsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SubscriptionsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SubscriptionsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -150,7 +151,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SubscriptionsServiceAsyncClient: The constructed client. """ - return SubscriptionsServiceClient.from_service_account_file.__func__(SubscriptionsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SubscriptionsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SubscriptionsServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -188,7 +190,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SubscriptionsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SubscriptionsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SubscriptionsServiceTransport: diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/client.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/client.py index a46407faac78..371973e741a8 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/client.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.events_subscriptions_v1beta import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.apps.events_subscriptions_v1beta.services.subscriptions_service import ( pagers, @@ -91,9 +91,7 @@ class SubscriptionsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SubscriptionsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SubscriptionsServiceTransport]] _transport_registry["grpc"] = SubscriptionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SubscriptionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SubscriptionsServiceRestTransport @@ -664,11 +662,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SubscriptionsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SubscriptionsServiceClient._read_environment_variables() + ) self._client_cert_source = SubscriptionsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -703,8 +699,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SubscriptionsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/pagers.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/pagers.py index b961b6a6b358..a40bee07ddc2 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/pagers.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/__init__.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/__init__.py index 9bb0413d8e7a..9e94d24ae563 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/__init__.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SubscriptionsServiceRestInterceptor, SubscriptionsServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SubscriptionsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SubscriptionsServiceTransport]] _transport_registry["grpc"] = SubscriptionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SubscriptionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SubscriptionsServiceRestTransport diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/base.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/base.py index f65b7a4246c4..c3c9e1156820 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/base.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.events_subscriptions_v1beta import gapic_version as package_version from google.apps.events_subscriptions_v1beta.types import ( diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc.py index 7f3f96e5f648..d2f551a2601d 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.apps.events_subscriptions_v1beta.types import ( subscription_resource, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc_asyncio.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc_asyncio.py index daf393c60460..3d76f5a03e84 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc_asyncio.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.events_subscriptions_v1beta.types import ( subscription_resource, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/rest.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/rest.py index c4d636df3ded..00d3d950633a 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/rest.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/services/subscriptions_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -638,9 +638,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseCreateSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseCreateSubscription._get_http_options() request, metadata = self._interceptor.pre_create_subscription( request, metadata @@ -666,7 +664,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -794,9 +792,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseDeleteSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseDeleteSubscription._get_http_options() request, metadata = self._interceptor.pre_delete_subscription( request, metadata @@ -818,7 +814,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -946,9 +942,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseGetSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseGetSubscription._get_http_options() request, metadata = self._interceptor.pre_get_subscription( request, metadata @@ -1098,9 +1092,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseListSubscriptions._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseListSubscriptions._get_http_options() request, metadata = self._interceptor.pre_list_subscriptions( request, metadata @@ -1256,9 +1248,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseReactivateSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseReactivateSubscription._get_http_options() request, metadata = self._interceptor.pre_reactivate_subscription( request, metadata @@ -1284,7 +1274,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1413,9 +1403,7 @@ def __call__( """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseUpdateSubscription._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseUpdateSubscription._get_http_options() request, metadata = self._interceptor.pre_update_subscription( request, metadata @@ -1441,7 +1429,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1560,7 +1548,9 @@ def reactivate_subscription( ]: # 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._ReactivateSubscription(self._session, self._host, self._interceptor) # type: ignore + return self._ReactivateSubscription( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_subscription( @@ -1630,9 +1620,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSubscriptionsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSubscriptionsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSubscriptionsServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/__init__.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/__init__.py index 44deb4175f8c..632c208c1268 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/__init__.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/__init__.py @@ -13,7 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .subscription_resource import NotificationEndpoint, PayloadOptions, Subscription +from .subscription_resource import ( + NotificationEndpoint, + PayloadOptions, + Subscription, +) from .subscriptions_service import ( CreateSubscriptionMetadata, CreateSubscriptionRequest, diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscription_resource.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscription_resource.py index 037ed14da03d..d2b2d0845b32 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscription_resource.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscription_resource.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -164,6 +164,7 @@ class State(proto.Enum): DELETED (3): The subscription is deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -203,6 +204,7 @@ class ErrorType(proto.Enum): OTHER (5): An unidentified error has occurred. """ + ERROR_TYPE_UNSPECIFIED = 0 USER_SCOPE_REVOKED = 1 RESOURCE_DELETED = 2 diff --git a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscriptions_service.py b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscriptions_service.py index ed3a6208ebb7..a4164d19f9d8 100644 --- a/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscriptions_service.py +++ b/packages/google-apps-events-subscriptions/google/apps/events_subscriptions_v1beta/types/subscriptions_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.apps.events_subscriptions_v1beta.types import subscription_resource @@ -273,12 +273,12 @@ class ListSubscriptionsResponse(proto.Message): def raw_page(self): return self - subscriptions: MutableSequence[ - subscription_resource.Subscription - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=subscription_resource.Subscription, + subscriptions: MutableSequence[subscription_resource.Subscription] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=subscription_resource.Subscription, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-apps-events-subscriptions/noxfile.py b/packages/google-apps-events-subscriptions/noxfile.py index 2c6b5fa3dede..d35de28e6967 100644 --- a/packages/google-apps-events-subscriptions/noxfile.py +++ b/packages/google-apps-events-subscriptions/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1/test_subscriptions_service.py b/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1/test_subscriptions_service.py index 82f4edd670e0..039d240091b7 100644 --- a/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1/test_subscriptions_service.py +++ b/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1/test_subscriptions_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.apps.events_subscriptions_v1.services.subscriptions_service import ( SubscriptionsServiceAsyncClient, @@ -1009,10 +1009,9 @@ def test_subscriptions_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1056,9 @@ def test_subscriptions_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1094,9 @@ def test_subscriptions_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1355,13 +1352,13 @@ def test_subscriptions_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1478,9 +1475,9 @@ def test_create_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_subscription] = ( + mock_rpc + ) request = {} client.create_subscription(request) @@ -1773,9 +1770,9 @@ def test_delete_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_subscription] = ( + mock_rpc + ) request = {} client.delete_subscription(request) @@ -2135,9 +2132,9 @@ def test_get_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_subscription] = ( + mock_rpc + ) request = {} client.get_subscription(request) @@ -2488,9 +2485,9 @@ def test_list_subscriptions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_subscriptions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_subscriptions] = ( + mock_rpc + ) request = {} client.list_subscriptions(request) @@ -2957,9 +2954,9 @@ def test_update_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_subscription] = ( + mock_rpc + ) request = {} client.update_subscription(request) @@ -3607,9 +3604,9 @@ def test_create_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_subscription] = ( + mock_rpc + ) request = {} client.create_subscription(request) @@ -3788,9 +3785,9 @@ def test_delete_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_subscription] = ( + mock_rpc + ) request = {} client.delete_subscription(request) @@ -3982,9 +3979,9 @@ def test_get_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_subscription] = ( + mock_rpc + ) request = {} client.get_subscription(request) @@ -4162,9 +4159,9 @@ def test_list_subscriptions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_subscriptions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_subscriptions] = ( + mock_rpc + ) request = {} client.list_subscriptions(request) @@ -4433,9 +4430,9 @@ def test_update_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_subscription] = ( + mock_rpc + ) request = {} client.update_subscription(request) @@ -5234,8 +5231,9 @@ def test_create_subscription_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5381,20 +5379,21 @@ def test_create_subscription_rest_interceptors(null_interceptor): ) client = SubscriptionsServiceClient(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.SubscriptionsServiceRestInterceptor, "post_create_subscription" - ) as post, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, - "post_create_subscription_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, "pre_create_subscription" - ) as pre: + 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.SubscriptionsServiceRestInterceptor, "post_create_subscription" + ) as post, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "post_create_subscription_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "pre_create_subscription" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5447,8 +5446,9 @@ def test_delete_subscription_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5505,20 +5505,21 @@ def test_delete_subscription_rest_interceptors(null_interceptor): ) client = SubscriptionsServiceClient(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.SubscriptionsServiceRestInterceptor, "post_delete_subscription" - ) as post, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, - "post_delete_subscription_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, "pre_delete_subscription" - ) as pre: + 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.SubscriptionsServiceRestInterceptor, "post_delete_subscription" + ) as post, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "post_delete_subscription_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "pre_delete_subscription" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5571,8 +5572,9 @@ def test_get_subscription_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5654,18 +5656,20 @@ def test_get_subscription_rest_interceptors(null_interceptor): ) client = SubscriptionsServiceClient(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.SubscriptionsServiceRestInterceptor, "post_get_subscription" - ) as post, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, - "post_get_subscription_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, "pre_get_subscription" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "post_get_subscription" + ) as post, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "post_get_subscription_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "pre_get_subscription" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5720,8 +5724,9 @@ def test_list_subscriptions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5784,18 +5789,20 @@ def test_list_subscriptions_rest_interceptors(null_interceptor): ) client = SubscriptionsServiceClient(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.SubscriptionsServiceRestInterceptor, "post_list_subscriptions" - ) as post, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, - "post_list_subscriptions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, "pre_list_subscriptions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "post_list_subscriptions" + ) as post, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "post_list_subscriptions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "pre_list_subscriptions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5853,8 +5860,9 @@ def test_update_subscription_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6000,20 +6008,21 @@ def test_update_subscription_rest_interceptors(null_interceptor): ) client = SubscriptionsServiceClient(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.SubscriptionsServiceRestInterceptor, "post_update_subscription" - ) as post, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, - "post_update_subscription_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, "pre_update_subscription" - ) as pre: + 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.SubscriptionsServiceRestInterceptor, "post_update_subscription" + ) as post, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "post_update_subscription_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "pre_update_subscription" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6066,8 +6075,9 @@ def test_reactivate_subscription_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6124,20 +6134,23 @@ def test_reactivate_subscription_rest_interceptors(null_interceptor): ) client = SubscriptionsServiceClient(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.SubscriptionsServiceRestInterceptor, "post_reactivate_subscription" - ) as post, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, - "post_reactivate_subscription_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, "pre_reactivate_subscription" - ) as pre: + 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.SubscriptionsServiceRestInterceptor, + "post_reactivate_subscription", + ) as post, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "post_reactivate_subscription_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "pre_reactivate_subscription", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6190,8 +6203,9 @@ def test_get_operation_rest_bad_request( request = json_format.ParseDict({"name": "operations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6457,11 +6471,14 @@ def test_subscriptions_service_base_transport(): def test_subscriptions_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.apps.events_subscriptions_v1.services.subscriptions_service.transports.SubscriptionsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.apps.events_subscriptions_v1.services.subscriptions_service.transports.SubscriptionsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SubscriptionsServiceTransport( @@ -6489,9 +6506,12 @@ def test_subscriptions_service_base_transport_with_credentials_file(): def test_subscriptions_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.apps.events_subscriptions_v1.services.subscriptions_service.transports.SubscriptionsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.apps.events_subscriptions_v1.services.subscriptions_service.transports.SubscriptionsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SubscriptionsServiceTransport() @@ -6585,11 +6605,12 @@ def test_subscriptions_service_transport_auth_gdch_credentials(transport_class): def test_subscriptions_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1beta/test_subscriptions_service.py b/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1beta/test_subscriptions_service.py index d8205a07e5fb..8be38baff3fa 100644 --- a/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1beta/test_subscriptions_service.py +++ b/packages/google-apps-events-subscriptions/tests/unit/gapic/events_subscriptions_v1beta/test_subscriptions_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.apps.events_subscriptions_v1beta.services.subscriptions_service import ( SubscriptionsServiceAsyncClient, @@ -1009,10 +1009,9 @@ def test_subscriptions_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1056,9 @@ def test_subscriptions_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1094,9 @@ def test_subscriptions_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1355,13 +1352,13 @@ def test_subscriptions_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1483,9 +1480,9 @@ def test_create_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_subscription] = ( + mock_rpc + ) request = {} client.create_subscription(request) @@ -1790,9 +1787,9 @@ def test_delete_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_subscription] = ( + mock_rpc + ) request = {} client.delete_subscription(request) @@ -2152,9 +2149,9 @@ def test_get_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_subscription] = ( + mock_rpc + ) request = {} client.get_subscription(request) @@ -2505,9 +2502,9 @@ def test_list_subscriptions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_subscriptions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_subscriptions] = ( + mock_rpc + ) request = {} client.list_subscriptions(request) @@ -2974,9 +2971,9 @@ def test_update_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_subscription] = ( + mock_rpc + ) request = {} client.update_subscription(request) @@ -3636,9 +3633,9 @@ def test_create_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_subscription] = ( + mock_rpc + ) request = {} client.create_subscription(request) @@ -3821,9 +3818,9 @@ def test_delete_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_subscription] = ( + mock_rpc + ) request = {} client.delete_subscription(request) @@ -4015,9 +4012,9 @@ def test_get_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_subscription] = ( + mock_rpc + ) request = {} client.get_subscription(request) @@ -4195,9 +4192,9 @@ def test_list_subscriptions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_subscriptions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_subscriptions] = ( + mock_rpc + ) request = {} client.list_subscriptions(request) @@ -4466,9 +4463,9 @@ def test_update_subscription_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_subscription] = ( + mock_rpc + ) request = {} client.update_subscription(request) @@ -5272,8 +5269,9 @@ def test_create_subscription_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5420,20 +5418,21 @@ def test_create_subscription_rest_interceptors(null_interceptor): ) client = SubscriptionsServiceClient(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.SubscriptionsServiceRestInterceptor, "post_create_subscription" - ) as post, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, - "post_create_subscription_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, "pre_create_subscription" - ) as pre: + 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.SubscriptionsServiceRestInterceptor, "post_create_subscription" + ) as post, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "post_create_subscription_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "pre_create_subscription" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5486,8 +5485,9 @@ def test_delete_subscription_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5544,20 +5544,21 @@ def test_delete_subscription_rest_interceptors(null_interceptor): ) client = SubscriptionsServiceClient(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.SubscriptionsServiceRestInterceptor, "post_delete_subscription" - ) as post, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, - "post_delete_subscription_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, "pre_delete_subscription" - ) as pre: + 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.SubscriptionsServiceRestInterceptor, "post_delete_subscription" + ) as post, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "post_delete_subscription_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "pre_delete_subscription" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5610,8 +5611,9 @@ def test_get_subscription_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5693,18 +5695,20 @@ def test_get_subscription_rest_interceptors(null_interceptor): ) client = SubscriptionsServiceClient(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.SubscriptionsServiceRestInterceptor, "post_get_subscription" - ) as post, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, - "post_get_subscription_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, "pre_get_subscription" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "post_get_subscription" + ) as post, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "post_get_subscription_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "pre_get_subscription" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5759,8 +5763,9 @@ def test_list_subscriptions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5823,18 +5828,20 @@ def test_list_subscriptions_rest_interceptors(null_interceptor): ) client = SubscriptionsServiceClient(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.SubscriptionsServiceRestInterceptor, "post_list_subscriptions" - ) as post, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, - "post_list_subscriptions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, "pre_list_subscriptions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "post_list_subscriptions" + ) as post, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "post_list_subscriptions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "pre_list_subscriptions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5892,8 +5899,9 @@ def test_update_subscription_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6040,20 +6048,21 @@ def test_update_subscription_rest_interceptors(null_interceptor): ) client = SubscriptionsServiceClient(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.SubscriptionsServiceRestInterceptor, "post_update_subscription" - ) as post, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, - "post_update_subscription_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, "pre_update_subscription" - ) as pre: + 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.SubscriptionsServiceRestInterceptor, "post_update_subscription" + ) as post, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "post_update_subscription_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, "pre_update_subscription" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6106,8 +6115,9 @@ def test_reactivate_subscription_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6164,20 +6174,23 @@ def test_reactivate_subscription_rest_interceptors(null_interceptor): ) client = SubscriptionsServiceClient(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.SubscriptionsServiceRestInterceptor, "post_reactivate_subscription" - ) as post, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, - "post_reactivate_subscription_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubscriptionsServiceRestInterceptor, "pre_reactivate_subscription" - ) as pre: + 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.SubscriptionsServiceRestInterceptor, + "post_reactivate_subscription", + ) as post, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "post_reactivate_subscription_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubscriptionsServiceRestInterceptor, + "pre_reactivate_subscription", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6230,8 +6243,9 @@ def test_get_operation_rest_bad_request( request = json_format.ParseDict({"name": "operations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6497,11 +6511,14 @@ def test_subscriptions_service_base_transport(): def test_subscriptions_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.apps.events_subscriptions_v1beta.services.subscriptions_service.transports.SubscriptionsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.apps.events_subscriptions_v1beta.services.subscriptions_service.transports.SubscriptionsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SubscriptionsServiceTransport( @@ -6534,9 +6551,12 @@ def test_subscriptions_service_base_transport_with_credentials_file(): def test_subscriptions_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.apps.events_subscriptions_v1beta.services.subscriptions_service.transports.SubscriptionsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.apps.events_subscriptions_v1beta.services.subscriptions_service.transports.SubscriptionsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SubscriptionsServiceTransport() @@ -6640,11 +6660,12 @@ def test_subscriptions_service_transport_auth_gdch_credentials(transport_class): def test_subscriptions_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-apps-meet/docs/conf.py b/packages/google-apps-meet/docs/conf.py index bafdf956518c..30ef20ab421d 100644 --- a/packages/google-apps-meet/docs/conf.py +++ b/packages/google-apps-meet/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-apps-meet documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-apps-meet/google/apps/meet_v2/__init__.py b/packages/google-apps-meet/google/apps/meet_v2/__init__.py index 91cb681c80ee..caa399bf9ecc 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/__init__.py +++ b/packages/google-apps-meet/google/apps/meet_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.conference_records_service import ( ConferenceRecordsServiceAsyncClient, ConferenceRecordsServiceClient, diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/async_client.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/async_client.py index 53b7ab32db78..b99e2e059b45 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/async_client.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2 import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.apps.meet_v2.services.conference_records_service import pagers from google.apps.meet_v2.types import resource, service @@ -151,7 +151,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConferenceRecordsServiceAsyncClient: The constructed client. """ - return ConferenceRecordsServiceClient.from_service_account_info.__func__(ConferenceRecordsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConferenceRecordsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConferenceRecordsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -167,7 +168,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConferenceRecordsServiceAsyncClient: The constructed client. """ - return ConferenceRecordsServiceClient.from_service_account_file.__func__(ConferenceRecordsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConferenceRecordsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + ConferenceRecordsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -205,7 +209,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConferenceRecordsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConferenceRecordsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConferenceRecordsServiceTransport: diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/client.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/client.py index 3f264a400eeb..b19c9c54cc1e 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/client.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.apps.meet_v2.services.conference_records_service import pagers from google.apps.meet_v2.types import resource, service @@ -80,9 +80,7 @@ class ConferenceRecordsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConferenceRecordsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConferenceRecordsServiceTransport]] _transport_registry["grpc"] = ConferenceRecordsServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConferenceRecordsServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConferenceRecordsServiceRestTransport @@ -742,11 +740,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConferenceRecordsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConferenceRecordsServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConferenceRecordsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -783,8 +779,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConferenceRecordsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/pagers.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/pagers.py index c94defa50854..bf69c806c497 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/pagers.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/__init__.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/__init__.py index 6c3d88f8cf95..332bd007118b 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/__init__.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConferenceRecordsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConferenceRecordsServiceTransport]] _transport_registry["grpc"] = ConferenceRecordsServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConferenceRecordsServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConferenceRecordsServiceRestTransport diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/base.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/base.py index 7bf39dcc76cb..aa002a3134d0 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/base.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2 import gapic_version as package_version from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc.py index 4c6aa8625f22..231ad3e69673 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc_asyncio.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc_asyncio.py index f50d12da7315..d6e2980fa0b5 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc_asyncio.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/rest.py b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/rest.py index 814c378e728f..57908da6b142 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/rest.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/conference_records_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -891,9 +891,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetConferenceRecord._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetConferenceRecord._get_http_options() request, metadata = self._interceptor.pre_get_conference_record( request, metadata @@ -1040,9 +1038,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetParticipant._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetParticipant._get_http_options() request, metadata = self._interceptor.pre_get_participant(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseGetParticipant._get_transcoded_request( @@ -1196,9 +1192,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetParticipantSession._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetParticipantSession._get_http_options() request, metadata = self._interceptor.pre_get_participant_session( request, metadata @@ -1346,9 +1340,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetRecording._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetRecording._get_http_options() request, metadata = self._interceptor.pre_get_recording(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseGetRecording._get_transcoded_request( @@ -1497,9 +1489,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetTranscript._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetTranscript._get_http_options() request, metadata = self._interceptor.pre_get_transcript(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseGetTranscript._get_transcoded_request( @@ -1647,9 +1637,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetTranscriptEntry._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetTranscriptEntry._get_http_options() request, metadata = self._interceptor.pre_get_transcript_entry( request, metadata @@ -1799,9 +1787,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListConferenceRecords._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListConferenceRecords._get_http_options() request, metadata = self._interceptor.pre_list_conference_records( request, metadata @@ -1949,9 +1935,7 @@ def __call__( Response of ListParticipants method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListParticipants._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListParticipants._get_http_options() request, metadata = self._interceptor.pre_list_participants( request, metadata @@ -2102,9 +2086,7 @@ def __call__( Response of ListParticipants method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListParticipantSessions._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListParticipantSessions._get_http_options() request, metadata = self._interceptor.pre_list_participant_sessions( request, metadata @@ -2251,9 +2233,7 @@ def __call__( Response for ListRecordings method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListRecordings._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListRecordings._get_http_options() request, metadata = self._interceptor.pre_list_recordings(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseListRecordings._get_transcoded_request( @@ -2401,9 +2381,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListTranscriptEntries._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListTranscriptEntries._get_http_options() request, metadata = self._interceptor.pre_list_transcript_entries( request, metadata @@ -2550,9 +2528,7 @@ def __call__( Response for ListTranscripts method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListTranscripts._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListTranscripts._get_http_options() request, metadata = self._interceptor.pre_list_transcripts( request, metadata @@ -2719,7 +2695,9 @@ def list_participant_sessions( ]: # 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._ListParticipantSessions(self._session, self._host, self._interceptor) # type: ignore + return self._ListParticipantSessions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_recordings( diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/async_client.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/async_client.py index 705019811079..80587358785e 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/async_client.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2 import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.apps.meet_v2.types import resource, service @@ -118,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SpacesServiceAsyncClient: The constructed client. """ - return SpacesServiceClient.from_service_account_info.__func__(SpacesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SpacesServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SpacesServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +135,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SpacesServiceAsyncClient: The constructed client. """ - return SpacesServiceClient.from_service_account_file.__func__(SpacesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SpacesServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SpacesServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/client.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/client.py index 5c056d672687..7cb4c64002f1 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/client.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.apps.meet_v2.types import resource, service @@ -627,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SpacesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SpacesServiceClient._read_environment_variables() + ) self._client_cert_source = SpacesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -666,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SpacesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/base.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/base.py index dafcc5be8762..d29771d937b0 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/base.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.apps.meet_v2 import gapic_version as package_version from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc.py index e6fe7b8f70a2..5cc533c7b0a9 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc_asyncio.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc_asyncio.py index d702e068d30e..80eecf91769e 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc_asyncio.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest.py index 297ad4b263d1..d72035b2e2f4 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -550,9 +550,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSpacesServiceRestTransport._BaseEndActiveConference._get_http_options() - ) + http_options = _BaseSpacesServiceRestTransport._BaseEndActiveConference._get_http_options() request, metadata = self._interceptor.pre_end_active_conference( request, metadata @@ -578,7 +576,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest_base.py b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest_base.py index 18feaae6e3eb..4b7b6ecc7323 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest_base.py +++ b/packages/google-apps-meet/google/apps/meet_v2/services/spaces_service/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.apps.meet_v2.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2/types/resource.py b/packages/google-apps-meet/google/apps/meet_v2/types/resource.py index c8367aac28be..8ddb31ac6c2d 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/types/resource.py +++ b/packages/google-apps-meet/google/apps/meet_v2/types/resource.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -157,6 +157,7 @@ class AccessType(proto.Enum): Only invitees can join without knocking. Everyone else must knock. """ + ACCESS_TYPE_UNSPECIFIED = 0 OPEN = 1 TRUSTED = 2 @@ -179,6 +180,7 @@ class EntryPointAccess(proto.Enum): Meet Embed SDK Web or mobile Meet SDKs to create owned entry points. """ + ENTRY_POINT_ACCESS_UNSPECIFIED = 0 ALL = 1 CREATOR_APP_ONLY = 2 @@ -453,6 +455,7 @@ class State(proto.Enum): Recording file is generated and ready to download. """ + STATE_UNSPECIFIED = 0 STARTED = 1 ENDED = 2 @@ -556,6 +559,7 @@ class State(proto.Enum): Transcript file is generated and ready to download. """ + STATE_UNSPECIFIED = 0 STARTED = 1 ENDED = 2 diff --git a/packages/google-apps-meet/google/apps/meet_v2/types/service.py b/packages/google-apps-meet/google/apps/meet_v2/types/service.py index d5448d183bcc..3d40f163f79f 100644 --- a/packages/google-apps-meet/google/apps/meet_v2/types/service.py +++ b/packages/google-apps-meet/google/apps/meet_v2/types/service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.apps.meet_v2.types import resource @@ -231,12 +231,12 @@ class ListConferenceRecordsResponse(proto.Message): def raw_page(self): return self - conference_records: MutableSequence[ - resource.ConferenceRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resource.ConferenceRecord, + conference_records: MutableSequence[resource.ConferenceRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resource.ConferenceRecord, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -419,12 +419,12 @@ class ListParticipantSessionsResponse(proto.Message): def raw_page(self): return self - participant_sessions: MutableSequence[ - resource.ParticipantSession - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resource.ParticipantSession, + participant_sessions: MutableSequence[resource.ParticipantSession] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resource.ParticipantSession, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/__init__.py b/packages/google-apps-meet/google/apps/meet_v2beta/__init__.py index 0ec4f3e13903..3dee22129df4 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/__init__.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.conference_records_service import ( ConferenceRecordsServiceAsyncClient, ConferenceRecordsServiceClient, diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/async_client.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/async_client.py index d61f4319ca66..21a48eb6e8e5 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/async_client.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2beta import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.apps.meet_v2beta.services.conference_records_service import pagers from google.apps.meet_v2beta.types import resource, service @@ -151,7 +151,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConferenceRecordsServiceAsyncClient: The constructed client. """ - return ConferenceRecordsServiceClient.from_service_account_info.__func__(ConferenceRecordsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConferenceRecordsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConferenceRecordsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -167,7 +168,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConferenceRecordsServiceAsyncClient: The constructed client. """ - return ConferenceRecordsServiceClient.from_service_account_file.__func__(ConferenceRecordsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConferenceRecordsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + ConferenceRecordsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -205,7 +209,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConferenceRecordsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConferenceRecordsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConferenceRecordsServiceTransport: diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/client.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/client.py index 305e5aeb15ef..69e5f4cd3fc2 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/client.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2beta import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.apps.meet_v2beta.services.conference_records_service import pagers from google.apps.meet_v2beta.types import resource, service @@ -80,9 +80,7 @@ class ConferenceRecordsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConferenceRecordsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConferenceRecordsServiceTransport]] _transport_registry["grpc"] = ConferenceRecordsServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConferenceRecordsServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConferenceRecordsServiceRestTransport @@ -742,11 +740,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConferenceRecordsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConferenceRecordsServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConferenceRecordsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -783,8 +779,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConferenceRecordsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/pagers.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/pagers.py index e6a70b25671e..a1ad96be7301 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/pagers.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/__init__.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/__init__.py index 6c3d88f8cf95..332bd007118b 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/__init__.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConferenceRecordsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConferenceRecordsServiceTransport]] _transport_registry["grpc"] = ConferenceRecordsServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConferenceRecordsServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConferenceRecordsServiceRestTransport diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/base.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/base.py index 2fdb7d4a8fa6..d76b6664ec76 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/base.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2beta import gapic_version as package_version from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc.py index 288385b56ff4..382eb7bbc2a7 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc_asyncio.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc_asyncio.py index 99420c42470f..0ad1fa40bcb0 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc_asyncio.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/rest.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/rest.py index afa7b4292777..d153e4fa6a0f 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/rest.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/conference_records_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -891,9 +891,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetConferenceRecord._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetConferenceRecord._get_http_options() request, metadata = self._interceptor.pre_get_conference_record( request, metadata @@ -1040,9 +1038,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetParticipant._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetParticipant._get_http_options() request, metadata = self._interceptor.pre_get_participant(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseGetParticipant._get_transcoded_request( @@ -1196,9 +1192,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetParticipantSession._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetParticipantSession._get_http_options() request, metadata = self._interceptor.pre_get_participant_session( request, metadata @@ -1346,9 +1340,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetRecording._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetRecording._get_http_options() request, metadata = self._interceptor.pre_get_recording(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseGetRecording._get_transcoded_request( @@ -1497,9 +1489,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetTranscript._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetTranscript._get_http_options() request, metadata = self._interceptor.pre_get_transcript(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseGetTranscript._get_transcoded_request( @@ -1647,9 +1637,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseGetTranscriptEntry._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseGetTranscriptEntry._get_http_options() request, metadata = self._interceptor.pre_get_transcript_entry( request, metadata @@ -1799,9 +1787,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListConferenceRecords._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListConferenceRecords._get_http_options() request, metadata = self._interceptor.pre_list_conference_records( request, metadata @@ -1949,9 +1935,7 @@ def __call__( Response of ListParticipants method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListParticipants._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListParticipants._get_http_options() request, metadata = self._interceptor.pre_list_participants( request, metadata @@ -2102,9 +2086,7 @@ def __call__( Response of ListParticipants method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListParticipantSessions._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListParticipantSessions._get_http_options() request, metadata = self._interceptor.pre_list_participant_sessions( request, metadata @@ -2251,9 +2233,7 @@ def __call__( Response for ListRecordings method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListRecordings._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListRecordings._get_http_options() request, metadata = self._interceptor.pre_list_recordings(request, metadata) transcoded_request = _BaseConferenceRecordsServiceRestTransport._BaseListRecordings._get_transcoded_request( @@ -2401,9 +2381,7 @@ def __call__( """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListTranscriptEntries._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListTranscriptEntries._get_http_options() request, metadata = self._interceptor.pre_list_transcript_entries( request, metadata @@ -2550,9 +2528,7 @@ def __call__( Response for ListTranscripts method. """ - http_options = ( - _BaseConferenceRecordsServiceRestTransport._BaseListTranscripts._get_http_options() - ) + http_options = _BaseConferenceRecordsServiceRestTransport._BaseListTranscripts._get_http_options() request, metadata = self._interceptor.pre_list_transcripts( request, metadata @@ -2719,7 +2695,9 @@ def list_participant_sessions( ]: # 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._ListParticipantSessions(self._session, self._host, self._interceptor) # type: ignore + return self._ListParticipantSessions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_recordings( diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/async_client.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/async_client.py index 1e89dce41e1e..eb003eff59b2 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/async_client.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2beta import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.apps.meet_v2beta.services.spaces_service import pagers from google.apps.meet_v2beta.types import resource, service @@ -121,7 +121,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SpacesServiceAsyncClient: The constructed client. """ - return SpacesServiceClient.from_service_account_info.__func__(SpacesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SpacesServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SpacesServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +138,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SpacesServiceAsyncClient: The constructed client. """ - return SpacesServiceClient.from_service_account_file.__func__(SpacesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SpacesServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SpacesServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/client.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/client.py index 7dd03bffa7b1..8cd34b022a28 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/client.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.apps.meet_v2beta import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.apps.meet_v2beta.services.spaces_service import pagers from google.apps.meet_v2beta.types import resource, service @@ -645,11 +645,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SpacesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SpacesServiceClient._read_environment_variables() + ) self._client_cert_source = SpacesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -684,8 +682,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SpacesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/pagers.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/pagers.py index fe74ccc78d5a..e38e2b492387 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/pagers.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/base.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/base.py index fbf0b297cf25..24661d9788cc 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/base.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.apps.meet_v2beta import gapic_version as package_version from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc.py index 1e53f9183f77..ed8ca49b27cd 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc_asyncio.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc_asyncio.py index ea51fcfdcae7..70f96e397218 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc_asyncio.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest.py index 4bd37bc3dc6d..c67cd089ad1f 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -640,9 +640,7 @@ def __call__( """ - http_options = ( - _BaseSpacesServiceRestTransport._BaseConnectActiveConference._get_http_options() - ) + http_options = _BaseSpacesServiceRestTransport._BaseConnectActiveConference._get_http_options() request, metadata = self._interceptor.pre_connect_active_conference( request, metadata @@ -1125,7 +1123,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1211,9 +1209,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSpacesServiceRestTransport._BaseEndActiveConference._get_http_options() - ) + http_options = _BaseSpacesServiceRestTransport._BaseEndActiveConference._get_http_options() request, metadata = self._interceptor.pre_end_active_conference( request, metadata @@ -1239,7 +1235,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1889,7 +1885,9 @@ def connect_active_conference( ]: # 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._ConnectActiveConference(self._session, self._host, self._interceptor) # type: ignore + return self._ConnectActiveConference( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_member(self) -> Callable[[service.CreateMemberRequest], resource.Member]: diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest_base.py b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest_base.py index 2a35e66e6881..8a19aef0c997 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest_base.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/services/spaces_service/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.apps.meet_v2beta.types import resource, service diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/types/resource.py b/packages/google-apps-meet/google/apps/meet_v2beta/types/resource.py index 82a7962b8f0e..1c7ac157b1e9 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/types/resource.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/types/resource.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -178,6 +178,7 @@ class AccessType(proto.Enum): Only invitees can join without knocking. Everyone else must knock. """ + ACCESS_TYPE_UNSPECIFIED = 0 OPEN = 1 TRUSTED = 2 @@ -200,6 +201,7 @@ class EntryPointAccess(proto.Enum): Meet Embed SDK Web or mobile Meet SDKs to create owned entry points. """ + ENTRY_POINT_ACCESS_UNSPECIFIED = 0 ALL = 1 CREATOR_APP_ONLY = 2 @@ -222,6 +224,7 @@ class Moderation(proto.Enum): ON (2): Moderation is on. """ + MODERATION_UNSPECIFIED = 0 OFF = 1 ON = 2 @@ -240,6 +243,7 @@ class AttendanceReportGenerationType(proto.Enum): DO_NOT_GENERATE (2): Attendance report will not be generated. """ + ATTENDANCE_REPORT_GENERATION_TYPE_UNSPECIFIED = 0 GENERATE_REPORT = 1 DO_NOT_GENERATE = 2 @@ -276,6 +280,7 @@ class RestrictionType(proto.Enum): NO_RESTRICTION (2): All Participants have permissions. """ + RESTRICTION_TYPE_UNSPECIFIED = 0 HOSTS_ONLY = 1 NO_RESTRICTION = 2 @@ -295,6 +300,7 @@ class DefaultJoinAsViewerType(proto.Enum): OFF (2): Users will by default join as contributors. """ + DEFAULT_JOIN_AS_VIEWER_TYPE_UNSPECIFIED = 0 ON = 1 OFF = 2 @@ -352,6 +358,7 @@ class AutoGenerationType(proto.Enum): OFF (2): The artifact is not generated automatically. """ + AUTO_GENERATION_TYPE_UNSPECIFIED = 0 ON = 1 OFF = 2 @@ -495,6 +502,7 @@ class Role(proto.Enum): COHOST (1): Co-host role. """ + ROLE_UNSPECIFIED = 0 COHOST = 1 @@ -775,6 +783,7 @@ class State(proto.Enum): Recording file is generated and ready to download. """ + STATE_UNSPECIFIED = 0 STARTED = 1 ENDED = 2 @@ -878,6 +887,7 @@ class State(proto.Enum): Transcript file is generated and ready to download. """ + STATE_UNSPECIFIED = 0 STARTED = 1 ENDED = 2 diff --git a/packages/google-apps-meet/google/apps/meet_v2beta/types/service.py b/packages/google-apps-meet/google/apps/meet_v2beta/types/service.py index 512076d54316..92a4a45980f2 100644 --- a/packages/google-apps-meet/google/apps/meet_v2beta/types/service.py +++ b/packages/google-apps-meet/google/apps/meet_v2beta/types/service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.apps.meet_v2beta.types import resource @@ -406,12 +406,12 @@ class ListConferenceRecordsResponse(proto.Message): def raw_page(self): return self - conference_records: MutableSequence[ - resource.ConferenceRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resource.ConferenceRecord, + conference_records: MutableSequence[resource.ConferenceRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resource.ConferenceRecord, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -594,12 +594,12 @@ class ListParticipantSessionsResponse(proto.Message): def raw_page(self): return self - participant_sessions: MutableSequence[ - resource.ParticipantSession - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resource.ParticipantSession, + participant_sessions: MutableSequence[resource.ParticipantSession] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resource.ParticipantSession, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-apps-meet/noxfile.py b/packages/google-apps-meet/noxfile.py index 2cb5aff4f295..c542324e0a87 100644 --- a/packages/google-apps-meet/noxfile.py +++ b/packages/google-apps-meet/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_conference_records_service.py b/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_conference_records_service.py index b49854a3abda..032e7f949349 100644 --- a/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_conference_records_service.py +++ b/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_conference_records_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.apps.meet_v2.services.conference_records_service import ( ConferenceRecordsServiceAsyncClient, @@ -1004,10 +1009,9 @@ def test_conference_records_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1056,9 @@ def test_conference_records_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1094,9 @@ def test_conference_records_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1351,13 +1353,13 @@ def test_conference_records_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1476,9 +1478,9 @@ def test_get_conference_record_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conference_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conference_record] = ( + mock_rpc + ) request = {} client.get_conference_record(request) @@ -2538,9 +2540,9 @@ def test_list_participants_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -5136,9 +5138,9 @@ def test_list_transcripts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transcripts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transcripts] = ( + mock_rpc + ) request = {} client.list_transcripts(request) @@ -5667,9 +5669,9 @@ def test_get_transcript_entry_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transcript_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transcript_entry] = ( + mock_rpc + ) request = {} client.get_transcript_entry(request) @@ -6493,9 +6495,9 @@ def test_get_conference_record_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conference_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conference_record] = ( + mock_rpc + ) request = {} client.get_conference_record(request) @@ -6952,9 +6954,9 @@ def test_list_participants_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -8260,9 +8262,9 @@ def test_list_transcripts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transcripts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transcripts] = ( + mock_rpc + ) request = {} client.list_transcripts(request) @@ -8517,9 +8519,9 @@ def test_get_transcript_entry_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transcript_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transcript_entry] = ( + mock_rpc + ) request = {} client.get_transcript_entry(request) @@ -9688,8 +9690,9 @@ def test_get_conference_record_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9754,18 +9757,22 @@ def test_get_conference_record_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_get_conference_record" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_get_conference_record_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_get_conference_record" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_conference_record", + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_conference_record_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "pre_get_conference_record", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9818,8 +9825,9 @@ def test_list_conference_records_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9882,20 +9890,22 @@ def test_list_conference_records_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, - "post_list_conference_records", - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_list_conference_records_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "pre_list_conference_records", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_conference_records", + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_conference_records_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "pre_list_conference_records", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9951,8 +9961,9 @@ def test_get_participant_rest_bad_request(request_type=service.GetParticipantReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10015,18 +10026,20 @@ def test_get_participant_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_get_participant" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_get_participant_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_get_participant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "post_get_participant" + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_participant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "pre_get_participant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10077,8 +10090,9 @@ def test_list_participants_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10143,18 +10157,20 @@ def test_list_participants_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_list_participants" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_list_participants_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_list_participants" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "post_list_participants" + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_participants_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "pre_list_participants" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10211,8 +10227,9 @@ def test_get_participant_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10277,20 +10294,22 @@ def test_get_participant_session_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, - "post_get_participant_session", - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_get_participant_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "pre_get_participant_session", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_participant_session", + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_participant_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "pre_get_participant_session", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10345,8 +10364,9 @@ def test_list_participant_sessions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10409,20 +10429,22 @@ def test_list_participant_sessions_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, - "post_list_participant_sessions", - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_list_participant_sessions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "pre_list_participant_sessions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_participant_sessions", + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_participant_sessions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "pre_list_participant_sessions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10478,8 +10500,9 @@ def test_get_recording_rest_bad_request(request_type=service.GetRecordingRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10544,18 +10567,20 @@ def test_get_recording_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_get_recording" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_get_recording_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_get_recording" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "post_get_recording" + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_recording_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "pre_get_recording" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10604,8 +10629,9 @@ def test_list_recordings_rest_bad_request(request_type=service.ListRecordingsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10668,18 +10694,20 @@ def test_list_recordings_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_list_recordings" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_list_recordings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_list_recordings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "post_list_recordings" + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_recordings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "pre_list_recordings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10730,8 +10758,9 @@ def test_get_transcript_rest_bad_request(request_type=service.GetTranscriptReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10796,18 +10825,20 @@ def test_get_transcript_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_get_transcript" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_get_transcript_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_get_transcript" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "post_get_transcript" + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_transcript_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "pre_get_transcript" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10856,8 +10887,9 @@ def test_list_transcripts_rest_bad_request(request_type=service.ListTranscriptsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10920,18 +10952,20 @@ def test_list_transcripts_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_list_transcripts" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_list_transcripts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_list_transcripts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "post_list_transcripts" + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_transcripts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "pre_list_transcripts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10986,8 +11020,9 @@ def test_get_transcript_entry_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11058,18 +11093,22 @@ def test_get_transcript_entry_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_get_transcript_entry" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_get_transcript_entry_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_get_transcript_entry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_transcript_entry", + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_transcript_entry_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "pre_get_transcript_entry", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11122,8 +11161,9 @@ def test_list_transcript_entries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11186,20 +11226,22 @@ def test_list_transcript_entries_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, - "post_list_transcript_entries", - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_list_transcript_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "pre_list_transcript_entries", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_transcript_entries", + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_transcript_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "pre_list_transcript_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11571,11 +11613,14 @@ def test_conference_records_service_base_transport(): def test_conference_records_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.apps.meet_v2.services.conference_records_service.transports.ConferenceRecordsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.apps.meet_v2.services.conference_records_service.transports.ConferenceRecordsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConferenceRecordsServiceTransport( @@ -11595,9 +11640,12 @@ def test_conference_records_service_base_transport_with_credentials_file(): def test_conference_records_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.apps.meet_v2.services.conference_records_service.transports.ConferenceRecordsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.apps.meet_v2.services.conference_records_service.transports.ConferenceRecordsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConferenceRecordsServiceTransport() @@ -11677,11 +11725,12 @@ def test_conference_records_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_spaces_service.py b/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_spaces_service.py index 2aa358b36d36..7a18cac67f65 100644 --- a/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_spaces_service.py +++ b/packages/google-apps-meet/tests/unit/gapic/meet_v2/test_spaces_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.apps.meet_v2.services.spaces_service import ( SpacesServiceAsyncClient, @@ -941,10 +946,9 @@ def test_spaces_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +993,9 @@ def test_spaces_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1031,9 @@ def test_spaces_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1274,13 +1276,13 @@ def test_spaces_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2317,9 +2319,9 @@ def test_end_active_conference_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.end_active_conference - ] = mock_rpc + client._transport._wrapped_methods[client._transport.end_active_conference] = ( + mock_rpc + ) request = {} client.end_active_conference(request) @@ -3020,9 +3022,9 @@ def test_end_active_conference_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.end_active_conference - ] = mock_rpc + client._transport._wrapped_methods[client._transport.end_active_conference] = ( + mock_rpc + ) request = {} client.end_active_conference(request) @@ -3508,8 +3510,9 @@ def test_create_space_rest_bad_request(request_type=service.CreateSpaceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3650,17 +3653,19 @@ def test_create_space_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "post_create_space" - ) as post, mock.patch.object( - transports.SpacesServiceRestInterceptor, "post_create_space_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SpacesServiceRestInterceptor, "pre_create_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_create_space" + ) as post, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_create_space_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_create_space" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3709,8 +3714,9 @@ def test_get_space_rest_bad_request(request_type=service.GetSpaceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3777,17 +3783,19 @@ def test_get_space_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "post_get_space" - ) as post, mock.patch.object( - transports.SpacesServiceRestInterceptor, "post_get_space_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SpacesServiceRestInterceptor, "pre_get_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_get_space" + ) as post, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_get_space_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_get_space" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3836,8 +3844,9 @@ def test_update_space_rest_bad_request(request_type=service.UpdateSpaceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3978,17 +3987,19 @@ def test_update_space_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "post_update_space" - ) as post, mock.patch.object( - transports.SpacesServiceRestInterceptor, "post_update_space_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SpacesServiceRestInterceptor, "pre_update_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_update_space" + ) as post, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_update_space_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_update_space" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4039,8 +4050,9 @@ def test_end_active_conference_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4097,13 +4109,13 @@ def test_end_active_conference_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "pre_end_active_conference" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_end_active_conference" + ) as pre, + ): pre.assert_not_called() pb_message = service.EndActiveConferenceRequest.pb( service.EndActiveConferenceRequest() @@ -4282,11 +4294,14 @@ def test_spaces_service_base_transport(): def test_spaces_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.apps.meet_v2.services.spaces_service.transports.SpacesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.apps.meet_v2.services.spaces_service.transports.SpacesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SpacesServiceTransport( @@ -4307,9 +4322,12 @@ def test_spaces_service_base_transport_with_credentials_file(): def test_spaces_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.apps.meet_v2.services.spaces_service.transports.SpacesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.apps.meet_v2.services.spaces_service.transports.SpacesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SpacesServiceTransport() @@ -4389,11 +4407,12 @@ def test_spaces_service_transport_auth_gdch_credentials(transport_class): def test_spaces_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_conference_records_service.py b/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_conference_records_service.py index d4ba94f59f7f..cd1f7dc25cfc 100644 --- a/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_conference_records_service.py +++ b/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_conference_records_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.apps.meet_v2beta.services.conference_records_service import ( ConferenceRecordsServiceAsyncClient, @@ -1004,10 +1009,9 @@ def test_conference_records_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1056,9 @@ def test_conference_records_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1094,9 @@ def test_conference_records_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1351,13 +1353,13 @@ def test_conference_records_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1476,9 +1478,9 @@ def test_get_conference_record_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conference_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conference_record] = ( + mock_rpc + ) request = {} client.get_conference_record(request) @@ -2538,9 +2540,9 @@ def test_list_participants_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -5136,9 +5138,9 @@ def test_list_transcripts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transcripts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transcripts] = ( + mock_rpc + ) request = {} client.list_transcripts(request) @@ -5667,9 +5669,9 @@ def test_get_transcript_entry_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transcript_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transcript_entry] = ( + mock_rpc + ) request = {} client.get_transcript_entry(request) @@ -6493,9 +6495,9 @@ def test_get_conference_record_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conference_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conference_record] = ( + mock_rpc + ) request = {} client.get_conference_record(request) @@ -6953,9 +6955,9 @@ def test_list_participants_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -8265,9 +8267,9 @@ def test_list_transcripts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transcripts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transcripts] = ( + mock_rpc + ) request = {} client.list_transcripts(request) @@ -8523,9 +8525,9 @@ def test_get_transcript_entry_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transcript_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transcript_entry] = ( + mock_rpc + ) request = {} client.get_transcript_entry(request) @@ -9694,8 +9696,9 @@ def test_get_conference_record_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9760,18 +9763,22 @@ def test_get_conference_record_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_get_conference_record" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_get_conference_record_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_get_conference_record" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_conference_record", + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_conference_record_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "pre_get_conference_record", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9824,8 +9831,9 @@ def test_list_conference_records_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9888,20 +9896,22 @@ def test_list_conference_records_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, - "post_list_conference_records", - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_list_conference_records_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "pre_list_conference_records", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_conference_records", + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_conference_records_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "pre_list_conference_records", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9957,8 +9967,9 @@ def test_get_participant_rest_bad_request(request_type=service.GetParticipantReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10021,18 +10032,20 @@ def test_get_participant_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_get_participant" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_get_participant_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_get_participant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "post_get_participant" + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_participant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "pre_get_participant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10083,8 +10096,9 @@ def test_list_participants_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10149,18 +10163,20 @@ def test_list_participants_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_list_participants" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_list_participants_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_list_participants" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "post_list_participants" + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_participants_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "pre_list_participants" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10217,8 +10233,9 @@ def test_get_participant_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10283,20 +10300,22 @@ def test_get_participant_session_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, - "post_get_participant_session", - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_get_participant_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "pre_get_participant_session", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_participant_session", + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_participant_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "pre_get_participant_session", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10351,8 +10370,9 @@ def test_list_participant_sessions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10415,20 +10435,22 @@ def test_list_participant_sessions_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, - "post_list_participant_sessions", - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_list_participant_sessions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "pre_list_participant_sessions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_participant_sessions", + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_participant_sessions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "pre_list_participant_sessions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10484,8 +10506,9 @@ def test_get_recording_rest_bad_request(request_type=service.GetRecordingRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10550,18 +10573,20 @@ def test_get_recording_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_get_recording" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_get_recording_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_get_recording" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "post_get_recording" + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_recording_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "pre_get_recording" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10610,8 +10635,9 @@ def test_list_recordings_rest_bad_request(request_type=service.ListRecordingsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10674,18 +10700,20 @@ def test_list_recordings_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_list_recordings" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_list_recordings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_list_recordings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "post_list_recordings" + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_recordings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "pre_list_recordings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10736,8 +10764,9 @@ def test_get_transcript_rest_bad_request(request_type=service.GetTranscriptReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10802,18 +10831,20 @@ def test_get_transcript_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_get_transcript" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_get_transcript_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_get_transcript" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "post_get_transcript" + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_transcript_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "pre_get_transcript" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10862,8 +10893,9 @@ def test_list_transcripts_rest_bad_request(request_type=service.ListTranscriptsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10926,18 +10958,20 @@ def test_list_transcripts_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_list_transcripts" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_list_transcripts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_list_transcripts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "post_list_transcripts" + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_transcripts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, "pre_list_transcripts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10992,8 +11026,9 @@ def test_get_transcript_entry_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11064,18 +11099,22 @@ def test_get_transcript_entry_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, "post_get_transcript_entry" - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_get_transcript_entry_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, "pre_get_transcript_entry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_transcript_entry", + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_get_transcript_entry_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "pre_get_transcript_entry", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11128,8 +11167,9 @@ def test_list_transcript_entries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11192,20 +11232,22 @@ def test_list_transcript_entries_rest_interceptors(null_interceptor): ) client = ConferenceRecordsServiceClient(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.ConferenceRecordsServiceRestInterceptor, - "post_list_transcript_entries", - ) as post, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "post_list_transcript_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConferenceRecordsServiceRestInterceptor, - "pre_list_transcript_entries", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_transcript_entries", + ) as post, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "post_list_transcript_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConferenceRecordsServiceRestInterceptor, + "pre_list_transcript_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11577,11 +11619,14 @@ def test_conference_records_service_base_transport(): def test_conference_records_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.apps.meet_v2beta.services.conference_records_service.transports.ConferenceRecordsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.apps.meet_v2beta.services.conference_records_service.transports.ConferenceRecordsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConferenceRecordsServiceTransport( @@ -11601,9 +11646,12 @@ def test_conference_records_service_base_transport_with_credentials_file(): def test_conference_records_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.apps.meet_v2beta.services.conference_records_service.transports.ConferenceRecordsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.apps.meet_v2beta.services.conference_records_service.transports.ConferenceRecordsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConferenceRecordsServiceTransport() @@ -11683,11 +11731,12 @@ def test_conference_records_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_spaces_service.py b/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_spaces_service.py index 6be40422a2e3..62ed7e83f47a 100644 --- a/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_spaces_service.py +++ b/packages/google-apps-meet/tests/unit/gapic/meet_v2beta/test_spaces_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.apps.meet_v2beta.services.spaces_service import ( SpacesServiceAsyncClient, @@ -942,10 +947,9 @@ def test_spaces_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +994,9 @@ def test_spaces_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1029,10 +1032,9 @@ def test_spaces_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1275,13 +1277,13 @@ def test_spaces_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2669,9 +2671,9 @@ def test_end_active_conference_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.end_active_conference - ] = mock_rpc + client._transport._wrapped_methods[client._transport.end_active_conference] = ( + mock_rpc + ) request = {} client.end_active_conference(request) @@ -5070,9 +5072,9 @@ def test_end_active_conference_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.end_active_conference - ] = mock_rpc + client._transport._wrapped_methods[client._transport.end_active_conference] = ( + mock_rpc + ) request = {} client.end_active_conference(request) @@ -6583,8 +6585,9 @@ def test_create_space_rest_bad_request(request_type=service.CreateSpaceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6741,17 +6744,19 @@ def test_create_space_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "post_create_space" - ) as post, mock.patch.object( - transports.SpacesServiceRestInterceptor, "post_create_space_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SpacesServiceRestInterceptor, "pre_create_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_create_space" + ) as post, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_create_space_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_create_space" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6800,8 +6805,9 @@ def test_get_space_rest_bad_request(request_type=service.GetSpaceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6868,17 +6874,19 @@ def test_get_space_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "post_get_space" - ) as post, mock.patch.object( - transports.SpacesServiceRestInterceptor, "post_get_space_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SpacesServiceRestInterceptor, "pre_get_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_get_space" + ) as post, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_get_space_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_get_space" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6927,8 +6935,9 @@ def test_update_space_rest_bad_request(request_type=service.UpdateSpaceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7085,17 +7094,19 @@ def test_update_space_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "post_update_space" - ) as post, mock.patch.object( - transports.SpacesServiceRestInterceptor, "post_update_space_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SpacesServiceRestInterceptor, "pre_update_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_update_space" + ) as post, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_update_space_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_update_space" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7146,8 +7157,9 @@ def test_connect_active_conference_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7212,18 +7224,20 @@ def test_connect_active_conference_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "post_connect_active_conference" - ) as post, mock.patch.object( - transports.SpacesServiceRestInterceptor, - "post_connect_active_conference_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SpacesServiceRestInterceptor, "pre_connect_active_conference" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_connect_active_conference" + ) as post, + mock.patch.object( + transports.SpacesServiceRestInterceptor, + "post_connect_active_conference_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_connect_active_conference" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7281,8 +7295,9 @@ def test_end_active_conference_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7339,13 +7354,13 @@ def test_end_active_conference_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "pre_end_active_conference" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_end_active_conference" + ) as pre, + ): pre.assert_not_called() pb_message = service.EndActiveConferenceRequest.pb( service.EndActiveConferenceRequest() @@ -7388,8 +7403,9 @@ def test_create_member_rest_bad_request(request_type=service.CreateMemberRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7531,17 +7547,19 @@ def test_create_member_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "post_create_member" - ) as post, mock.patch.object( - transports.SpacesServiceRestInterceptor, "post_create_member_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SpacesServiceRestInterceptor, "pre_create_member" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_create_member" + ) as post, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_create_member_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_create_member" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7590,8 +7608,9 @@ def test_get_member_rest_bad_request(request_type=service.GetMemberRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7660,17 +7679,19 @@ def test_get_member_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "post_get_member" - ) as post, mock.patch.object( - transports.SpacesServiceRestInterceptor, "post_get_member_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SpacesServiceRestInterceptor, "pre_get_member" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_get_member" + ) as post, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_get_member_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_get_member" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7719,8 +7740,9 @@ def test_list_members_rest_bad_request(request_type=service.ListMembersRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7783,17 +7805,19 @@ def test_list_members_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "post_list_members" - ) as post, mock.patch.object( - transports.SpacesServiceRestInterceptor, "post_list_members_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SpacesServiceRestInterceptor, "pre_list_members" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_list_members" + ) as post, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "post_list_members_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_list_members" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7844,8 +7868,9 @@ def test_delete_member_rest_bad_request(request_type=service.DeleteMemberRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7902,13 +7927,13 @@ def test_delete_member_rest_interceptors(null_interceptor): ) client = SpacesServiceClient(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.SpacesServiceRestInterceptor, "pre_delete_member" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SpacesServiceRestInterceptor, "pre_delete_member" + ) as pre, + ): pre.assert_not_called() pb_message = service.DeleteMemberRequest.pb(service.DeleteMemberRequest()) transcode.return_value = { @@ -8192,11 +8217,14 @@ def test_spaces_service_base_transport(): def test_spaces_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.apps.meet_v2beta.services.spaces_service.transports.SpacesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.apps.meet_v2beta.services.spaces_service.transports.SpacesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SpacesServiceTransport( @@ -8220,9 +8248,12 @@ def test_spaces_service_base_transport_with_credentials_file(): def test_spaces_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.apps.meet_v2beta.services.spaces_service.transports.SpacesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.apps.meet_v2beta.services.spaces_service.transports.SpacesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SpacesServiceTransport() @@ -8308,11 +8339,12 @@ def test_spaces_service_transport_auth_gdch_credentials(transport_class): def test_spaces_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-apps-script-type/docs/conf.py b/packages/google-apps-script-type/docs/conf.py index fd022ddeae76..0379c93ee383 100644 --- a/packages/google-apps-script-type/docs/conf.py +++ b/packages/google-apps-script-type/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-apps-script-type documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-apps-script-type/google/apps/script/type/__init__.py b/packages/google-apps-script-type/google/apps/script/type/__init__.py index 1549239a5319..097954ea1698 100644 --- a/packages/google-apps-script-type/google/apps/script/type/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.addon_widget_set import AddOnWidgetSet from .types.extension_point import ( HomepageExtensionPoint, diff --git a/packages/google-apps-script-type/google/apps/script/type/calendar/__init__.py b/packages/google-apps-script-type/google/apps/script/type/calendar/__init__.py index fd11d871fa35..4cbfb5f0bcc4 100644 --- a/packages/google-apps-script-type/google/apps/script/type/calendar/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/calendar/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.calendar_addon_manifest import ( CalendarAddOnManifest, CalendarExtensionPoint, diff --git a/packages/google-apps-script-type/google/apps/script/type/calendar/types/calendar_addon_manifest.py b/packages/google-apps-script-type/google/apps/script/type/calendar/types/calendar_addon_manifest.py index 69c708bd37b2..566d4461cce8 100644 --- a/packages/google-apps-script-type/google/apps/script/type/calendar/types/calendar_addon_manifest.py +++ b/packages/google-apps-script-type/google/apps/script/type/calendar/types/calendar_addon_manifest.py @@ -87,6 +87,7 @@ class EventAccess(proto.Enum): fields including the metadata, attendees, and conference data and the ability to perform all actions. """ + UNSPECIFIED = 0 METADATA = 1 READ = 3 diff --git a/packages/google-apps-script-type/google/apps/script/type/docs/__init__.py b/packages/google-apps-script-type/google/apps/script/type/docs/__init__.py index 8628680e3fd8..cc67ccfa9f1a 100644 --- a/packages/google-apps-script-type/google/apps/script/type/docs/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/docs/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.docs_addon_manifest import DocsAddOnManifest, DocsExtensionPoint if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-apps-script-type/google/apps/script/type/docs/types/__init__.py b/packages/google-apps-script-type/google/apps/script/type/docs/types/__init__.py index 4d5f1812db24..077a3bcd90e4 100644 --- a/packages/google-apps-script-type/google/apps/script/type/docs/types/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/docs/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .docs_addon_manifest import DocsAddOnManifest, DocsExtensionPoint +from .docs_addon_manifest import ( + DocsAddOnManifest, + DocsExtensionPoint, +) __all__ = ( "DocsAddOnManifest", diff --git a/packages/google-apps-script-type/google/apps/script/type/drive/__init__.py b/packages/google-apps-script-type/google/apps/script/type/drive/__init__.py index 9064f77464ea..55f7ff0e58e7 100644 --- a/packages/google-apps-script-type/google/apps/script/type/drive/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/drive/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.drive_addon_manifest import DriveAddOnManifest, DriveExtensionPoint if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-apps-script-type/google/apps/script/type/drive/types/__init__.py b/packages/google-apps-script-type/google/apps/script/type/drive/types/__init__.py index dec9df4f1820..cd6a41ce1224 100644 --- a/packages/google-apps-script-type/google/apps/script/type/drive/types/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/drive/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .drive_addon_manifest import DriveAddOnManifest, DriveExtensionPoint +from .drive_addon_manifest import ( + DriveAddOnManifest, + DriveExtensionPoint, +) __all__ = ( "DriveAddOnManifest", diff --git a/packages/google-apps-script-type/google/apps/script/type/gmail/__init__.py b/packages/google-apps-script-type/google/apps/script/type/gmail/__init__.py index 5de1e21c7db2..8a0180942fc0 100644 --- a/packages/google-apps-script-type/google/apps/script/type/gmail/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/gmail/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.gmail_addon_manifest import ( ComposeTrigger, ContextualTrigger, diff --git a/packages/google-apps-script-type/google/apps/script/type/gmail/types/gmail_addon_manifest.py b/packages/google-apps-script-type/google/apps/script/type/gmail/types/gmail_addon_manifest.py index 2f67a4aabe94..040aa2175f24 100644 --- a/packages/google-apps-script-type/google/apps/script/type/gmail/types/gmail_addon_manifest.py +++ b/packages/google-apps-script-type/google/apps/script/type/gmail/types/gmail_addon_manifest.py @@ -176,16 +176,17 @@ class DraftAccess(proto.Enum): compose addon is triggered. This includes the audience list (To/cc list) of a draft message. """ + UNSPECIFIED = 0 NONE = 1 METADATA = 2 - actions: MutableSequence[ - extension_point.MenuItemExtensionPoint - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=extension_point.MenuItemExtensionPoint, + actions: MutableSequence[extension_point.MenuItemExtensionPoint] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=extension_point.MenuItemExtensionPoint, + ) ) draft_access: DraftAccess = proto.Field( proto.ENUM, diff --git a/packages/google-apps-script-type/google/apps/script/type/sheets/__init__.py b/packages/google-apps-script-type/google/apps/script/type/sheets/__init__.py index 564cf7c0c1f5..0cd2b0f690e5 100644 --- a/packages/google-apps-script-type/google/apps/script/type/sheets/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/sheets/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.sheets_addon_manifest import SheetsAddOnManifest, SheetsExtensionPoint if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-apps-script-type/google/apps/script/type/sheets/types/__init__.py b/packages/google-apps-script-type/google/apps/script/type/sheets/types/__init__.py index df8312895eed..17e611f23640 100644 --- a/packages/google-apps-script-type/google/apps/script/type/sheets/types/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/sheets/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .sheets_addon_manifest import SheetsAddOnManifest, SheetsExtensionPoint +from .sheets_addon_manifest import ( + SheetsAddOnManifest, + SheetsExtensionPoint, +) __all__ = ( "SheetsAddOnManifest", diff --git a/packages/google-apps-script-type/google/apps/script/type/slides/__init__.py b/packages/google-apps-script-type/google/apps/script/type/slides/__init__.py index f21cae748a52..9f4c23022394 100644 --- a/packages/google-apps-script-type/google/apps/script/type/slides/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/slides/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.slides_addon_manifest import SlidesAddOnManifest, SlidesExtensionPoint if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-apps-script-type/google/apps/script/type/slides/types/__init__.py b/packages/google-apps-script-type/google/apps/script/type/slides/types/__init__.py index a7f0840f9dad..d7b3f750cd35 100644 --- a/packages/google-apps-script-type/google/apps/script/type/slides/types/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/slides/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .slides_addon_manifest import SlidesAddOnManifest, SlidesExtensionPoint +from .slides_addon_manifest import ( + SlidesAddOnManifest, + SlidesExtensionPoint, +) __all__ = ( "SlidesAddOnManifest", diff --git a/packages/google-apps-script-type/google/apps/script/type/types/__init__.py b/packages/google-apps-script-type/google/apps/script/type/types/__init__.py index 098c1dc74989..29a1062c7599 100644 --- a/packages/google-apps-script-type/google/apps/script/type/types/__init__.py +++ b/packages/google-apps-script-type/google/apps/script/type/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .addon_widget_set import AddOnWidgetSet +from .addon_widget_set import ( + AddOnWidgetSet, +) from .extension_point import ( HomepageExtensionPoint, MenuItemExtensionPoint, diff --git a/packages/google-apps-script-type/google/apps/script/type/types/addon_widget_set.py b/packages/google-apps-script-type/google/apps/script/type/types/addon_widget_set.py index 7619e681c2a5..4006b1c5fd4d 100644 --- a/packages/google-apps-script-type/google/apps/script/type/types/addon_widget_set.py +++ b/packages/google-apps-script-type/google/apps/script/type/types/addon_widget_set.py @@ -59,6 +59,7 @@ class WidgetType(proto.Enum): A Gmail add-on action that applies to the addon compose UI. """ + WIDGET_TYPE_UNSPECIFIED = 0 DATE_PICKER = 1 STYLED_BUTTONS = 2 diff --git a/packages/google-apps-script-type/google/apps/script/type/types/extension_point.py b/packages/google-apps-script-type/google/apps/script/type/types/extension_point.py index aaf0344c9911..112163e4d912 100644 --- a/packages/google-apps-script-type/google/apps/script/type/types/extension_point.py +++ b/packages/google-apps-script-type/google/apps/script/type/types/extension_point.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-apps-script-type/google/apps/script/type/types/script_manifest.py b/packages/google-apps-script-type/google/apps/script/type/types/script_manifest.py index 74e2cb3addf6..cec4f6a655db 100644 --- a/packages/google-apps-script-type/google/apps/script/type/types/script_manifest.py +++ b/packages/google-apps-script-type/google/apps/script/type/types/script_manifest.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.apps.script.type.types import addon_widget_set, extension_point @@ -48,6 +48,7 @@ class HttpAuthorizationHeader(proto.Enum): NONE (3): Do not send an Authentication header """ + HTTP_AUTHORIZATION_HEADER_UNSPECIFIED = 0 SYSTEM_ID_TOKEN = 1 USER_ID_TOKEN = 2 diff --git a/packages/google-apps-script-type/noxfile.py b/packages/google-apps-script-type/noxfile.py index 2f26ca0c1a9e..1ff841128efa 100644 --- a/packages/google-apps-script-type/noxfile.py +++ b/packages/google-apps-script-type/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-area120-tables/docs/conf.py b/packages/google-area120-tables/docs/conf.py index 3c2ec766871e..ee60fbed9dc5 100644 --- a/packages/google-area120-tables/docs/conf.py +++ b/packages/google-area120-tables/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-area120-tables documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/__init__.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/__init__.py index f27dec6ff7a9..650f0bbe2a0e 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/__init__.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.tables_service import TablesServiceAsyncClient, TablesServiceClient from .types.tables import ( BatchCreateRowsRequest, diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/async_client.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/async_client.py index b917331e4691..bb1fa0a02bac 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/async_client.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.area120.tables_v1alpha1 import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.area120.tables_v1alpha1.services.tables_service import pagers from google.area120.tables_v1alpha1.types import tables @@ -133,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TablesServiceAsyncClient: The constructed client. """ - return TablesServiceClient.from_service_account_info.__func__(TablesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = TablesServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(TablesServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TablesServiceAsyncClient: The constructed client. """ - return TablesServiceClient.from_service_account_file.__func__(TablesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = TablesServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(TablesServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/client.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/client.py index a16f5500afd1..1b5a03ac3865 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/client.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.area120.tables_v1alpha1 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.area120.tables_v1alpha1.services.tables_service import pagers from google.area120.tables_v1alpha1.types import tables @@ -659,11 +659,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TablesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TablesServiceClient._read_environment_variables() + ) self._client_cert_source = TablesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -698,8 +696,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TablesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/pagers.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/pagers.py index 5bdb8bf16787..9166d2d32105 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/pagers.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/base.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/base.py index 6d11321f2468..d648b39f918b 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/base.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.area120.tables_v1alpha1 import gapic_version as package_version from google.area120.tables_v1alpha1.types import tables diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc.py index 76a28da04b2c..1395c30512c4 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.area120.tables_v1alpha1.types import tables diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc_asyncio.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc_asyncio.py index cab6b1b92929..4c4055ac251d 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc_asyncio.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.area120.tables_v1alpha1.types import tables diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest.py index 756980dd347b..8a95d8c06fce 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -969,7 +969,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1393,7 +1393,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest_base.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest_base.py index 8aec8900b2f5..3e44560b01e2 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest_base.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.area120.tables_v1alpha1.types import tables diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/types/tables.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/types/tables.py index d54c21f0aa40..ec05eb53b2a3 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/types/tables.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/types/tables.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -63,6 +63,7 @@ class View(proto.Enum): Uses internally generated column id to identify values. """ + VIEW_UNSPECIFIED = 0 COLUMN_ID_VIEW = 1 diff --git a/packages/google-area120-tables/noxfile.py b/packages/google-area120-tables/noxfile.py index 327e59149d7d..343b1de40ffb 100644 --- a/packages/google-area120-tables/noxfile.py +++ b/packages/google-area120-tables/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py b/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py index 0242e76fdde7..917ed70a668f 100644 --- a/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py +++ b/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.area120.tables_v1alpha1.services.tables_service import ( TablesServiceAsyncClient, @@ -943,10 +948,9 @@ def test_tables_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +995,9 @@ def test_tables_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1033,9 @@ def test_tables_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1276,13 +1278,13 @@ def test_tables_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3946,9 +3948,9 @@ def test_batch_create_rows_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_rows - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_rows] = ( + mock_rpc + ) request = {} client.batch_create_rows(request) @@ -4516,9 +4518,9 @@ def test_batch_update_rows_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_rows - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_rows] = ( + mock_rpc + ) request = {} client.batch_update_rows(request) @@ -5072,9 +5074,9 @@ def test_batch_delete_rows_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_rows - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_rows] = ( + mock_rpc + ) request = {} client.batch_delete_rows(request) @@ -6409,9 +6411,9 @@ def test_batch_create_rows_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_rows - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_rows] = ( + mock_rpc + ) request = {} client.batch_create_rows(request) @@ -6727,9 +6729,9 @@ def test_batch_update_rows_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_rows - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_rows] = ( + mock_rpc + ) request = {} client.batch_update_rows(request) @@ -7027,9 +7029,9 @@ def test_batch_delete_rows_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_rows - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_rows] = ( + mock_rpc + ) request = {} client.batch_delete_rows(request) @@ -7852,8 +7854,9 @@ def test_get_table_rest_bad_request(request_type=tables.GetTableRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7918,17 +7921,19 @@ def test_get_table_rest_interceptors(null_interceptor): ) client = TablesServiceClient(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.TablesServiceRestInterceptor, "post_get_table" - ) as post, mock.patch.object( - transports.TablesServiceRestInterceptor, "post_get_table_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TablesServiceRestInterceptor, "pre_get_table" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_get_table" + ) as post, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_get_table_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TablesServiceRestInterceptor, "pre_get_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7977,8 +7982,9 @@ def test_list_tables_rest_bad_request(request_type=tables.ListTablesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8041,17 +8047,19 @@ def test_list_tables_rest_interceptors(null_interceptor): ) client = TablesServiceClient(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.TablesServiceRestInterceptor, "post_list_tables" - ) as post, mock.patch.object( - transports.TablesServiceRestInterceptor, "post_list_tables_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TablesServiceRestInterceptor, "pre_list_tables" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_list_tables" + ) as post, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_list_tables_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TablesServiceRestInterceptor, "pre_list_tables" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8100,8 +8108,9 @@ def test_get_workspace_rest_bad_request(request_type=tables.GetWorkspaceRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8166,17 +8175,19 @@ def test_get_workspace_rest_interceptors(null_interceptor): ) client = TablesServiceClient(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.TablesServiceRestInterceptor, "post_get_workspace" - ) as post, mock.patch.object( - transports.TablesServiceRestInterceptor, "post_get_workspace_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TablesServiceRestInterceptor, "pre_get_workspace" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_get_workspace" + ) as post, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_get_workspace_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TablesServiceRestInterceptor, "pre_get_workspace" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8225,8 +8236,9 @@ def test_list_workspaces_rest_bad_request(request_type=tables.ListWorkspacesRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8289,17 +8301,20 @@ def test_list_workspaces_rest_interceptors(null_interceptor): ) client = TablesServiceClient(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.TablesServiceRestInterceptor, "post_list_workspaces" - ) as post, mock.patch.object( - transports.TablesServiceRestInterceptor, "post_list_workspaces_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TablesServiceRestInterceptor, "pre_list_workspaces" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_list_workspaces" + ) as post, + mock.patch.object( + transports.TablesServiceRestInterceptor, + "post_list_workspaces_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TablesServiceRestInterceptor, "pre_list_workspaces" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8350,8 +8365,9 @@ def test_get_row_rest_bad_request(request_type=tables.GetRowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8414,17 +8430,19 @@ def test_get_row_rest_interceptors(null_interceptor): ) client = TablesServiceClient(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.TablesServiceRestInterceptor, "post_get_row" - ) as post, mock.patch.object( - transports.TablesServiceRestInterceptor, "post_get_row_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TablesServiceRestInterceptor, "pre_get_row" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_get_row" + ) as post, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_get_row_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TablesServiceRestInterceptor, "pre_get_row" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8473,8 +8491,9 @@ def test_list_rows_rest_bad_request(request_type=tables.ListRowsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8537,17 +8556,19 @@ def test_list_rows_rest_interceptors(null_interceptor): ) client = TablesServiceClient(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.TablesServiceRestInterceptor, "post_list_rows" - ) as post, mock.patch.object( - transports.TablesServiceRestInterceptor, "post_list_rows_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TablesServiceRestInterceptor, "pre_list_rows" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_list_rows" + ) as post, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_list_rows_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TablesServiceRestInterceptor, "pre_list_rows" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8596,8 +8617,9 @@ def test_create_row_rest_bad_request(request_type=tables.CreateRowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8728,17 +8750,19 @@ def test_create_row_rest_interceptors(null_interceptor): ) client = TablesServiceClient(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.TablesServiceRestInterceptor, "post_create_row" - ) as post, mock.patch.object( - transports.TablesServiceRestInterceptor, "post_create_row_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TablesServiceRestInterceptor, "pre_create_row" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_create_row" + ) as post, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_create_row_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TablesServiceRestInterceptor, "pre_create_row" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8787,8 +8811,9 @@ def test_batch_create_rows_rest_bad_request(request_type=tables.BatchCreateRowsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8848,17 +8873,20 @@ def test_batch_create_rows_rest_interceptors(null_interceptor): ) client = TablesServiceClient(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.TablesServiceRestInterceptor, "post_batch_create_rows" - ) as post, mock.patch.object( - transports.TablesServiceRestInterceptor, "post_batch_create_rows_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TablesServiceRestInterceptor, "pre_batch_create_rows" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_batch_create_rows" + ) as post, + mock.patch.object( + transports.TablesServiceRestInterceptor, + "post_batch_create_rows_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TablesServiceRestInterceptor, "pre_batch_create_rows" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8909,8 +8937,9 @@ def test_update_row_rest_bad_request(request_type=tables.UpdateRowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9041,17 +9070,19 @@ def test_update_row_rest_interceptors(null_interceptor): ) client = TablesServiceClient(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.TablesServiceRestInterceptor, "post_update_row" - ) as post, mock.patch.object( - transports.TablesServiceRestInterceptor, "post_update_row_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TablesServiceRestInterceptor, "pre_update_row" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_update_row" + ) as post, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_update_row_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TablesServiceRestInterceptor, "pre_update_row" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9100,8 +9131,9 @@ def test_batch_update_rows_rest_bad_request(request_type=tables.BatchUpdateRowsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9161,17 +9193,20 @@ def test_batch_update_rows_rest_interceptors(null_interceptor): ) client = TablesServiceClient(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.TablesServiceRestInterceptor, "post_batch_update_rows" - ) as post, mock.patch.object( - transports.TablesServiceRestInterceptor, "post_batch_update_rows_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TablesServiceRestInterceptor, "pre_batch_update_rows" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TablesServiceRestInterceptor, "post_batch_update_rows" + ) as post, + mock.patch.object( + transports.TablesServiceRestInterceptor, + "post_batch_update_rows_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TablesServiceRestInterceptor, "pre_batch_update_rows" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9222,8 +9257,9 @@ def test_delete_row_rest_bad_request(request_type=tables.DeleteRowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9280,13 +9316,13 @@ def test_delete_row_rest_interceptors(null_interceptor): ) client = TablesServiceClient(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.TablesServiceRestInterceptor, "pre_delete_row" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TablesServiceRestInterceptor, "pre_delete_row" + ) as pre, + ): pre.assert_not_called() pb_message = tables.DeleteRowRequest.pb(tables.DeleteRowRequest()) transcode.return_value = { @@ -9327,8 +9363,9 @@ def test_batch_delete_rows_rest_bad_request(request_type=tables.BatchDeleteRowsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9385,13 +9422,13 @@ def test_batch_delete_rows_rest_interceptors(null_interceptor): ) client = TablesServiceClient(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.TablesServiceRestInterceptor, "pre_batch_delete_rows" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TablesServiceRestInterceptor, "pre_batch_delete_rows" + ) as pre, + ): pre.assert_not_called() pb_message = tables.BatchDeleteRowsRequest.pb(tables.BatchDeleteRowsRequest()) transcode.return_value = { @@ -9740,11 +9777,14 @@ def test_tables_service_base_transport(): def test_tables_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.area120.tables_v1alpha1.services.tables_service.transports.TablesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.area120.tables_v1alpha1.services.tables_service.transports.TablesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TablesServiceTransport( @@ -9768,9 +9808,12 @@ def test_tables_service_base_transport_with_credentials_file(): def test_tables_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.area120.tables_v1alpha1.services.tables_service.transports.TablesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.area120.tables_v1alpha1.services.tables_service.transports.TablesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TablesServiceTransport() @@ -9856,11 +9899,12 @@ def test_tables_service_transport_auth_gdch_credentials(transport_class): def test_tables_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-access-approval/docs/conf.py b/packages/google-cloud-access-approval/docs/conf.py index cc902066e8c7..24aafc288986 100644 --- a/packages/google-cloud-access-approval/docs/conf.py +++ b/packages/google-cloud-access-approval/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-access-approval documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/__init__.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/__init__.py index 148c477931b7..c5ec929a2123 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/__init__.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.access_approval import AccessApprovalAsyncClient, AccessApprovalClient from .types.accessapproval import ( AccessApprovalServiceAccount, diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/async_client.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/async_client.py index e8715ce45664..1fe26f1cacfb 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/async_client.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.accessapproval_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.accessapproval_v1.services.access_approval import pagers from google.cloud.accessapproval_v1.types import accessapproval @@ -165,7 +165,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AccessApprovalAsyncClient: The constructed client. """ - return AccessApprovalClient.from_service_account_info.__func__(AccessApprovalAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AccessApprovalClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AccessApprovalAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -181,7 +182,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AccessApprovalAsyncClient: The constructed client. """ - return AccessApprovalClient.from_service_account_file.__func__(AccessApprovalAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AccessApprovalClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AccessApprovalAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/client.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/client.py index 3b7481a342ac..fba24683e9f7 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/client.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.accessapproval_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.accessapproval_v1.services.access_approval import pagers from google.cloud.accessapproval_v1.types import accessapproval @@ -81,9 +81,7 @@ class AccessApprovalClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AccessApprovalTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AccessApprovalTransport]] _transport_registry["grpc"] = AccessApprovalGrpcTransport _transport_registry["grpc_asyncio"] = AccessApprovalGrpcAsyncIOTransport _transport_registry["rest"] = AccessApprovalRestTransport @@ -686,11 +684,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AccessApprovalClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AccessApprovalClient._read_environment_variables() + ) self._client_cert_source = AccessApprovalClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -725,8 +721,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AccessApprovalTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/pagers.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/pagers.py index b4e44e675f37..a6a730711737 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/pagers.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/base.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/base.py index a5c281b57242..d38492a7f73c 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/base.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.accessapproval_v1 import gapic_version as package_version from google.cloud.accessapproval_v1.types import accessapproval diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc.py index bc6845404bf0..28d227fe9043 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.accessapproval_v1.types import accessapproval @@ -516,12 +516,12 @@ def invalidate_approval_request( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "invalidate_approval_request" not in self._stubs: - self._stubs[ - "invalidate_approval_request" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/InvalidateApprovalRequest", - request_serializer=accessapproval.InvalidateApprovalRequestMessage.serialize, - response_deserializer=accessapproval.ApprovalRequest.deserialize, + self._stubs["invalidate_approval_request"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/InvalidateApprovalRequest", + request_serializer=accessapproval.InvalidateApprovalRequestMessage.serialize, + response_deserializer=accessapproval.ApprovalRequest.deserialize, + ) ) return self._stubs["invalidate_approval_request"] @@ -548,12 +548,12 @@ def get_access_approval_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_access_approval_settings" not in self._stubs: - self._stubs[ - "get_access_approval_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalSettings", - request_serializer=accessapproval.GetAccessApprovalSettingsMessage.serialize, - response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + self._stubs["get_access_approval_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalSettings", + request_serializer=accessapproval.GetAccessApprovalSettingsMessage.serialize, + response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + ) ) return self._stubs["get_access_approval_settings"] @@ -582,12 +582,12 @@ def update_access_approval_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_access_approval_settings" not in self._stubs: - self._stubs[ - "update_access_approval_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/UpdateAccessApprovalSettings", - request_serializer=accessapproval.UpdateAccessApprovalSettingsMessage.serialize, - response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + self._stubs["update_access_approval_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/UpdateAccessApprovalSettings", + request_serializer=accessapproval.UpdateAccessApprovalSettingsMessage.serialize, + response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + ) ) return self._stubs["update_access_approval_settings"] @@ -620,12 +620,12 @@ def delete_access_approval_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_access_approval_settings" not in self._stubs: - self._stubs[ - "delete_access_approval_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/DeleteAccessApprovalSettings", - request_serializer=accessapproval.DeleteAccessApprovalSettingsMessage.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_access_approval_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/DeleteAccessApprovalSettings", + request_serializer=accessapproval.DeleteAccessApprovalSettingsMessage.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_access_approval_settings"] @@ -654,12 +654,12 @@ def get_access_approval_service_account( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_access_approval_service_account" not in self._stubs: - self._stubs[ - "get_access_approval_service_account" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalServiceAccount", - request_serializer=accessapproval.GetAccessApprovalServiceAccountMessage.serialize, - response_deserializer=accessapproval.AccessApprovalServiceAccount.deserialize, + self._stubs["get_access_approval_service_account"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalServiceAccount", + request_serializer=accessapproval.GetAccessApprovalServiceAccountMessage.serialize, + response_deserializer=accessapproval.AccessApprovalServiceAccount.deserialize, + ) ) return self._stubs["get_access_approval_service_account"] diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc_asyncio.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc_asyncio.py index 1f338edfb91c..74454dd68364 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc_asyncio.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.accessapproval_v1.types import accessapproval @@ -527,12 +527,12 @@ def invalidate_approval_request( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "invalidate_approval_request" not in self._stubs: - self._stubs[ - "invalidate_approval_request" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/InvalidateApprovalRequest", - request_serializer=accessapproval.InvalidateApprovalRequestMessage.serialize, - response_deserializer=accessapproval.ApprovalRequest.deserialize, + self._stubs["invalidate_approval_request"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/InvalidateApprovalRequest", + request_serializer=accessapproval.InvalidateApprovalRequestMessage.serialize, + response_deserializer=accessapproval.ApprovalRequest.deserialize, + ) ) return self._stubs["invalidate_approval_request"] @@ -559,12 +559,12 @@ def get_access_approval_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_access_approval_settings" not in self._stubs: - self._stubs[ - "get_access_approval_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalSettings", - request_serializer=accessapproval.GetAccessApprovalSettingsMessage.serialize, - response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + self._stubs["get_access_approval_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalSettings", + request_serializer=accessapproval.GetAccessApprovalSettingsMessage.serialize, + response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + ) ) return self._stubs["get_access_approval_settings"] @@ -593,12 +593,12 @@ def update_access_approval_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_access_approval_settings" not in self._stubs: - self._stubs[ - "update_access_approval_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/UpdateAccessApprovalSettings", - request_serializer=accessapproval.UpdateAccessApprovalSettingsMessage.serialize, - response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + self._stubs["update_access_approval_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/UpdateAccessApprovalSettings", + request_serializer=accessapproval.UpdateAccessApprovalSettingsMessage.serialize, + response_deserializer=accessapproval.AccessApprovalSettings.deserialize, + ) ) return self._stubs["update_access_approval_settings"] @@ -631,12 +631,12 @@ def delete_access_approval_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_access_approval_settings" not in self._stubs: - self._stubs[ - "delete_access_approval_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/DeleteAccessApprovalSettings", - request_serializer=accessapproval.DeleteAccessApprovalSettingsMessage.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_access_approval_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/DeleteAccessApprovalSettings", + request_serializer=accessapproval.DeleteAccessApprovalSettingsMessage.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_access_approval_settings"] @@ -665,12 +665,12 @@ def get_access_approval_service_account( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_access_approval_service_account" not in self._stubs: - self._stubs[ - "get_access_approval_service_account" - ] = self._logged_channel.unary_unary( - "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalServiceAccount", - request_serializer=accessapproval.GetAccessApprovalServiceAccountMessage.serialize, - response_deserializer=accessapproval.AccessApprovalServiceAccount.deserialize, + self._stubs["get_access_approval_service_account"] = ( + self._logged_channel.unary_unary( + "/google.cloud.accessapproval.v1.AccessApproval/GetAccessApprovalServiceAccount", + request_serializer=accessapproval.GetAccessApprovalServiceAccountMessage.serialize, + response_deserializer=accessapproval.AccessApprovalServiceAccount.deserialize, + ) ) return self._stubs["get_access_approval_service_account"] diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest.py index 7b3298d807f1..6119ab7b910c 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -745,9 +745,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseApproveApprovalRequest._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseApproveApprovalRequest._get_http_options() request, metadata = self._interceptor.pre_approve_approval_request( request, metadata @@ -897,9 +895,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseDeleteAccessApprovalSettings._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseDeleteAccessApprovalSettings._get_http_options() request, metadata = self._interceptor.pre_delete_access_approval_settings( request, metadata @@ -921,7 +917,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1016,9 +1012,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseDismissApprovalRequest._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseDismissApprovalRequest._get_http_options() request, metadata = self._interceptor.pre_dismiss_approval_request( request, metadata @@ -1175,15 +1169,12 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseGetAccessApprovalServiceAccount._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseGetAccessApprovalServiceAccount._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_access_approval_service_account( - request, metadata + request, metadata = ( + self._interceptor.pre_get_access_approval_service_account( + request, metadata + ) ) transcoded_request = _BaseAccessApprovalRestTransport._BaseGetAccessApprovalServiceAccount._get_transcoded_request( http_options, request @@ -1244,11 +1235,10 @@ def __call__( resp = self._interceptor.post_get_access_approval_service_account(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_access_approval_service_account_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_access_approval_service_account_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1335,9 +1325,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseGetAccessApprovalSettings._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseGetAccessApprovalSettings._get_http_options() request, metadata = self._interceptor.pre_get_access_approval_settings( request, metadata @@ -1487,9 +1475,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseGetApprovalRequest._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseGetApprovalRequest._get_http_options() request, metadata = self._interceptor.pre_get_approval_request( request, metadata @@ -1639,9 +1625,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseInvalidateApprovalRequest._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseInvalidateApprovalRequest._get_http_options() request, metadata = self._interceptor.pre_invalidate_approval_request( request, metadata @@ -1795,9 +1779,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseListApprovalRequests._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseListApprovalRequests._get_http_options() request, metadata = self._interceptor.pre_list_approval_requests( request, metadata @@ -1950,9 +1932,7 @@ def __call__( """ - http_options = ( - _BaseAccessApprovalRestTransport._BaseUpdateAccessApprovalSettings._get_http_options() - ) + http_options = _BaseAccessApprovalRestTransport._BaseUpdateAccessApprovalSettings._get_http_options() request, metadata = self._interceptor.pre_update_access_approval_settings( request, metadata @@ -2023,11 +2003,10 @@ def __call__( resp = self._interceptor.post_update_access_approval_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_access_approval_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_access_approval_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2062,7 +2041,9 @@ def approve_approval_request( ]: # 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._ApproveApprovalRequest(self._session, self._host, self._interceptor) # type: ignore + return self._ApproveApprovalRequest( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_access_approval_settings( @@ -2072,7 +2053,9 @@ def delete_access_approval_settings( ]: # 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._DeleteAccessApprovalSettings(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAccessApprovalSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def dismiss_approval_request( @@ -2082,7 +2065,9 @@ def dismiss_approval_request( ]: # 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._DismissApprovalRequest(self._session, self._host, self._interceptor) # type: ignore + return self._DismissApprovalRequest( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_access_approval_service_account( @@ -2093,7 +2078,9 @@ def get_access_approval_service_account( ]: # 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._GetAccessApprovalServiceAccount(self._session, self._host, self._interceptor) # type: ignore + return self._GetAccessApprovalServiceAccount( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_access_approval_settings( @@ -2104,7 +2091,9 @@ def get_access_approval_settings( ]: # 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._GetAccessApprovalSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetAccessApprovalSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_approval_request( @@ -2125,7 +2114,9 @@ def invalidate_approval_request( ]: # 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._InvalidateApprovalRequest(self._session, self._host, self._interceptor) # type: ignore + return self._InvalidateApprovalRequest( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_approval_requests( @@ -2147,7 +2138,9 @@ def update_access_approval_settings( ]: # 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._UpdateAccessApprovalSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAccessApprovalSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest_base.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest_base.py index c711b128abd3..2cec35eac893 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest_base.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/services/access_approval/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.accessapproval_v1.types import accessapproval diff --git a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/types/accessapproval.py b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/types/accessapproval.py index 4e729159a713..9983545a8d80 100644 --- a/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/types/accessapproval.py +++ b/packages/google-cloud-access-approval/google/cloud/accessapproval_v1/types/accessapproval.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -60,6 +60,7 @@ class EnrollmentLevel(proto.Enum): Service is enrolled in Access Approval for all requests """ + ENROLLMENT_LEVEL_UNSPECIFIED = 0 BLOCK_ALL = 1 @@ -158,6 +159,7 @@ class Type(proto.Enum): to diagnose or resolve a suspected issue in services or a known outage. """ + TYPE_UNSPECIFIED = 0 CUSTOMER_INITIATED_SUPPORT = 1 GOOGLE_INITIATED_SERVICE = 2 diff --git a/packages/google-cloud-access-approval/noxfile.py b/packages/google-cloud-access-approval/noxfile.py index 21fd26f8a906..a5b8d9343289 100644 --- a/packages/google-cloud-access-approval/noxfile.py +++ b/packages/google-cloud-access-approval/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py b/packages/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py index 9d7d78889377..0421e739726b 100644 --- a/packages/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py +++ b/packages/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.accessapproval_v1.services.access_approval import ( AccessApprovalAsyncClient, @@ -947,10 +952,9 @@ def test_access_approval_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -995,10 +999,9 @@ def test_access_approval_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1037,9 @@ def test_access_approval_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1280,13 +1282,13 @@ def test_access_approval_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1404,9 +1406,9 @@ def test_list_approval_requests_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_approval_requests - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_approval_requests] = ( + mock_rpc + ) request = {} client.list_approval_requests(request) @@ -1950,9 +1952,9 @@ def test_get_approval_request_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_approval_request - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_approval_request] = ( + mock_rpc + ) request = {} client.get_approval_request(request) @@ -4420,9 +4422,9 @@ def test_list_approval_requests_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_approval_requests - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_approval_requests] = ( + mock_rpc + ) request = {} client.list_approval_requests(request) @@ -4580,9 +4582,9 @@ def test_get_approval_request_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_approval_request - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_approval_request] = ( + mock_rpc + ) request = {} client.get_approval_request(request) @@ -5790,8 +5792,9 @@ def test_list_approval_requests_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5854,18 +5857,20 @@ def test_list_approval_requests_rest_interceptors(null_interceptor): ) client = AccessApprovalClient(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.AccessApprovalRestInterceptor, "post_list_approval_requests" - ) as post, mock.patch.object( - transports.AccessApprovalRestInterceptor, - "post_list_approval_requests_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AccessApprovalRestInterceptor, "pre_list_approval_requests" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AccessApprovalRestInterceptor, "post_list_approval_requests" + ) as post, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "post_list_approval_requests_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AccessApprovalRestInterceptor, "pre_list_approval_requests" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5923,8 +5928,9 @@ def test_get_approval_request_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5989,18 +5995,20 @@ def test_get_approval_request_rest_interceptors(null_interceptor): ) client = AccessApprovalClient(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.AccessApprovalRestInterceptor, "post_get_approval_request" - ) as post, mock.patch.object( - transports.AccessApprovalRestInterceptor, - "post_get_approval_request_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AccessApprovalRestInterceptor, "pre_get_approval_request" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AccessApprovalRestInterceptor, "post_get_approval_request" + ) as post, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "post_get_approval_request_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AccessApprovalRestInterceptor, "pre_get_approval_request" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6055,8 +6063,9 @@ def test_approve_approval_request_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6121,18 +6130,20 @@ def test_approve_approval_request_rest_interceptors(null_interceptor): ) client = AccessApprovalClient(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.AccessApprovalRestInterceptor, "post_approve_approval_request" - ) as post, mock.patch.object( - transports.AccessApprovalRestInterceptor, - "post_approve_approval_request_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AccessApprovalRestInterceptor, "pre_approve_approval_request" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AccessApprovalRestInterceptor, "post_approve_approval_request" + ) as post, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "post_approve_approval_request_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AccessApprovalRestInterceptor, "pre_approve_approval_request" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6187,8 +6198,9 @@ def test_dismiss_approval_request_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6253,18 +6265,20 @@ def test_dismiss_approval_request_rest_interceptors(null_interceptor): ) client = AccessApprovalClient(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.AccessApprovalRestInterceptor, "post_dismiss_approval_request" - ) as post, mock.patch.object( - transports.AccessApprovalRestInterceptor, - "post_dismiss_approval_request_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AccessApprovalRestInterceptor, "pre_dismiss_approval_request" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AccessApprovalRestInterceptor, "post_dismiss_approval_request" + ) as post, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "post_dismiss_approval_request_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AccessApprovalRestInterceptor, "pre_dismiss_approval_request" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6319,8 +6333,9 @@ def test_invalidate_approval_request_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6385,18 +6400,20 @@ def test_invalidate_approval_request_rest_interceptors(null_interceptor): ) client = AccessApprovalClient(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.AccessApprovalRestInterceptor, "post_invalidate_approval_request" - ) as post, mock.patch.object( - transports.AccessApprovalRestInterceptor, - "post_invalidate_approval_request_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AccessApprovalRestInterceptor, "pre_invalidate_approval_request" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AccessApprovalRestInterceptor, "post_invalidate_approval_request" + ) as post, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "post_invalidate_approval_request_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AccessApprovalRestInterceptor, "pre_invalidate_approval_request" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6451,8 +6468,9 @@ def test_get_access_approval_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6525,18 +6543,21 @@ def test_get_access_approval_settings_rest_interceptors(null_interceptor): ) client = AccessApprovalClient(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.AccessApprovalRestInterceptor, "post_get_access_approval_settings" - ) as post, mock.patch.object( - transports.AccessApprovalRestInterceptor, - "post_get_access_approval_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AccessApprovalRestInterceptor, "pre_get_access_approval_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "post_get_access_approval_settings", + ) as post, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "post_get_access_approval_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AccessApprovalRestInterceptor, "pre_get_access_approval_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6594,8 +6615,9 @@ def test_update_access_approval_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6751,18 +6773,22 @@ def test_update_access_approval_settings_rest_interceptors(null_interceptor): ) client = AccessApprovalClient(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.AccessApprovalRestInterceptor, "post_update_access_approval_settings" - ) as post, mock.patch.object( - transports.AccessApprovalRestInterceptor, - "post_update_access_approval_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AccessApprovalRestInterceptor, "pre_update_access_approval_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "post_update_access_approval_settings", + ) as post, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "post_update_access_approval_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "pre_update_access_approval_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6820,8 +6846,9 @@ def test_delete_access_approval_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6878,13 +6905,14 @@ def test_delete_access_approval_settings_rest_interceptors(null_interceptor): ) client = AccessApprovalClient(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.AccessApprovalRestInterceptor, "pre_delete_access_approval_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "pre_delete_access_approval_settings", + ) as pre, + ): pre.assert_not_called() pb_message = accessapproval.DeleteAccessApprovalSettingsMessage.pb( accessapproval.DeleteAccessApprovalSettingsMessage() @@ -6929,8 +6957,9 @@ def test_get_access_approval_service_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6995,20 +7024,22 @@ def test_get_access_approval_service_account_rest_interceptors(null_interceptor) ) client = AccessApprovalClient(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.AccessApprovalRestInterceptor, - "post_get_access_approval_service_account", - ) as post, mock.patch.object( - transports.AccessApprovalRestInterceptor, - "post_get_access_approval_service_account_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AccessApprovalRestInterceptor, - "pre_get_access_approval_service_account", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "post_get_access_approval_service_account", + ) as post, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "post_get_access_approval_service_account_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AccessApprovalRestInterceptor, + "pre_get_access_approval_service_account", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7321,11 +7352,14 @@ def test_access_approval_base_transport(): def test_access_approval_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.accessapproval_v1.services.access_approval.transports.AccessApprovalTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.accessapproval_v1.services.access_approval.transports.AccessApprovalTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AccessApprovalTransport( @@ -7342,9 +7376,12 @@ def test_access_approval_base_transport_with_credentials_file(): def test_access_approval_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.accessapproval_v1.services.access_approval.transports.AccessApprovalTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.accessapproval_v1.services.access_approval.transports.AccessApprovalTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AccessApprovalTransport() @@ -7416,11 +7453,12 @@ def test_access_approval_transport_auth_gdch_credentials(transport_class): def test_access_approval_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-advisorynotifications/docs/conf.py b/packages/google-cloud-advisorynotifications/docs/conf.py index 20648b6b43b8..83378ae9db86 100644 --- a/packages/google-cloud-advisorynotifications/docs/conf.py +++ b/packages/google-cloud-advisorynotifications/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-advisorynotifications documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/__init__.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/__init__.py index cab7a20a8b3a..02fafaef59e7 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/__init__.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.advisory_notifications_service import ( AdvisoryNotificationsServiceAsyncClient, AdvisoryNotificationsServiceClient, diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/async_client.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/async_client.py index 1ce15d6728ec..4f0470142eb7 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/async_client.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.advisorynotifications_v1 import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.advisorynotifications_v1.services.advisory_notifications_service import ( pagers, @@ -133,7 +133,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AdvisoryNotificationsServiceAsyncClient: The constructed client. """ - return AdvisoryNotificationsServiceClient.from_service_account_info.__func__(AdvisoryNotificationsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + AdvisoryNotificationsServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + AdvisoryNotificationsServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +154,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AdvisoryNotificationsServiceAsyncClient: The constructed client. """ - return AdvisoryNotificationsServiceClient.from_service_account_file.__func__(AdvisoryNotificationsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + AdvisoryNotificationsServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + AdvisoryNotificationsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -187,7 +197,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AdvisoryNotificationsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AdvisoryNotificationsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AdvisoryNotificationsServiceTransport: diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/client.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/client.py index 04ee7b77f2f7..47cec9048972 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/client.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.advisorynotifications_v1 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.advisorynotifications_v1.services.advisory_notifications_service import ( pagers, @@ -82,13 +82,11 @@ class AdvisoryNotificationsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AdvisoryNotificationsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AdvisoryNotificationsServiceTransport]] _transport_registry["grpc"] = AdvisoryNotificationsServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = AdvisoryNotificationsServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + AdvisoryNotificationsServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = AdvisoryNotificationsServiceRestTransport def get_transport_class( @@ -658,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AdvisoryNotificationsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AdvisoryNotificationsServiceClient._read_environment_variables() + ) self._client_cert_source = ( AdvisoryNotificationsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -701,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AdvisoryNotificationsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/pagers.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/pagers.py index fd4146045561..a916fc5e4858 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/pagers.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/__init__.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/__init__.py index 375a4715f5ac..8281a9413abe 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/__init__.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AdvisoryNotificationsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AdvisoryNotificationsServiceTransport]] _transport_registry["grpc"] = AdvisoryNotificationsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AdvisoryNotificationsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AdvisoryNotificationsServiceRestTransport diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/base.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/base.py index 49aca7758441..1528dbcbeafe 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/base.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.advisorynotifications_v1 import gapic_version as package_version from google.cloud.advisorynotifications_v1.types import service diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc.py index 8008e2472964..e8d913c28d4e 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.advisorynotifications_v1.types import service diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc_asyncio.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc_asyncio.py index d698e618ff63..91ff73349717 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.advisorynotifications_v1.types import service diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/rest.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/rest.py index e5d3ebd5122d..91ddddfc9f8a 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/rest.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/services/advisory_notifications_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -442,9 +442,7 @@ def __call__( """ - http_options = ( - _BaseAdvisoryNotificationsServiceRestTransport._BaseGetNotification._get_http_options() - ) + http_options = _BaseAdvisoryNotificationsServiceRestTransport._BaseGetNotification._get_http_options() request, metadata = self._interceptor.pre_get_notification( request, metadata @@ -589,9 +587,7 @@ def __call__( Settings for Advisory Notifications. """ - http_options = ( - _BaseAdvisoryNotificationsServiceRestTransport._BaseGetSettings._get_http_options() - ) + http_options = _BaseAdvisoryNotificationsServiceRestTransport._BaseGetSettings._get_http_options() request, metadata = self._interceptor.pre_get_settings(request, metadata) transcoded_request = _BaseAdvisoryNotificationsServiceRestTransport._BaseGetSettings._get_transcoded_request( @@ -739,9 +735,7 @@ def __call__( """ - http_options = ( - _BaseAdvisoryNotificationsServiceRestTransport._BaseListNotifications._get_http_options() - ) + http_options = _BaseAdvisoryNotificationsServiceRestTransport._BaseListNotifications._get_http_options() request, metadata = self._interceptor.pre_list_notifications( request, metadata @@ -889,9 +883,7 @@ def __call__( Settings for Advisory Notifications. """ - http_options = ( - _BaseAdvisoryNotificationsServiceRestTransport._BaseUpdateSettings._get_http_options() - ) + http_options = _BaseAdvisoryNotificationsServiceRestTransport._BaseUpdateSettings._get_http_options() request, metadata = self._interceptor.pre_update_settings(request, metadata) transcoded_request = _BaseAdvisoryNotificationsServiceRestTransport._BaseUpdateSettings._get_transcoded_request( diff --git a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/types/service.py b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/types/service.py index 8166e182bc8f..8e0fea7a0bc4 100644 --- a/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/types/service.py +++ b/packages/google-cloud-advisorynotifications/google/cloud/advisorynotifications_v1/types/service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -58,6 +58,7 @@ class NotificationView(proto.Enum): FULL (2): Include everything. """ + NOTIFICATION_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -86,6 +87,7 @@ class LocalizationState(proto.Enum): Localization for requested language is completed. """ + LOCALIZATION_STATE_UNSPECIFIED = 0 LOCALIZATION_STATE_NOT_APPLICABLE = 1 LOCALIZATION_STATE_PENDING = 2 @@ -107,6 +109,7 @@ class NotificationType(proto.Enum): NOTIFICATION_TYPE_THREAT_HORIZONS (4): Threat horizons MSA """ + NOTIFICATION_TYPE_UNSPECIFIED = 0 NOTIFICATION_TYPE_SECURITY_PRIVACY_ADVISORY = 1 NOTIFICATION_TYPE_SENSITIVE_ACTIONS = 2 diff --git a/packages/google-cloud-advisorynotifications/noxfile.py b/packages/google-cloud-advisorynotifications/noxfile.py index a6c29ad86e31..bb70cd20e98b 100644 --- a/packages/google-cloud-advisorynotifications/noxfile.py +++ b/packages/google-cloud-advisorynotifications/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-advisorynotifications/tests/unit/gapic/advisorynotifications_v1/test_advisory_notifications_service.py b/packages/google-cloud-advisorynotifications/tests/unit/gapic/advisorynotifications_v1/test_advisory_notifications_service.py index 846293a5452c..d0c93d213b93 100644 --- a/packages/google-cloud-advisorynotifications/tests/unit/gapic/advisorynotifications_v1/test_advisory_notifications_service.py +++ b/packages/google-cloud-advisorynotifications/tests/unit/gapic/advisorynotifications_v1/test_advisory_notifications_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.advisorynotifications_v1.services.advisory_notifications_service import ( AdvisoryNotificationsServiceAsyncClient, @@ -1035,10 +1040,9 @@ def test_advisory_notifications_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1087,9 @@ def test_advisory_notifications_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1122,10 +1125,9 @@ def test_advisory_notifications_service_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1386,13 +1388,13 @@ def test_advisory_notifications_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1511,9 +1513,9 @@ def test_list_notifications_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_notifications - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_notifications] = ( + mock_rpc + ) request = {} client.list_notifications(request) @@ -2057,9 +2059,9 @@ def test_get_notification_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_notification - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_notification] = ( + mock_rpc + ) request = {} client.get_notification(request) @@ -2967,9 +2969,9 @@ def test_list_notifications_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_notifications - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_notifications] = ( + mock_rpc + ) request = {} client.list_notifications(request) @@ -3227,9 +3229,9 @@ def test_get_notification_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_notification - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_notification] = ( + mock_rpc + ) request = {} client.get_notification(request) @@ -4080,8 +4082,9 @@ def test_list_notifications_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4146,19 +4149,22 @@ def test_list_notifications_rest_interceptors(null_interceptor): ) client = AdvisoryNotificationsServiceClient(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.AdvisoryNotificationsServiceRestInterceptor, - "post_list_notifications", - ) as post, mock.patch.object( - transports.AdvisoryNotificationsServiceRestInterceptor, - "post_list_notifications_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AdvisoryNotificationsServiceRestInterceptor, "pre_list_notifications" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdvisoryNotificationsServiceRestInterceptor, + "post_list_notifications", + ) as post, + mock.patch.object( + transports.AdvisoryNotificationsServiceRestInterceptor, + "post_list_notifications_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdvisoryNotificationsServiceRestInterceptor, + "pre_list_notifications", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4213,8 +4219,9 @@ def test_get_notification_rest_bad_request(request_type=service.GetNotificationR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4284,18 +4291,22 @@ def test_get_notification_rest_interceptors(null_interceptor): ) client = AdvisoryNotificationsServiceClient(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.AdvisoryNotificationsServiceRestInterceptor, "post_get_notification" - ) as post, mock.patch.object( - transports.AdvisoryNotificationsServiceRestInterceptor, - "post_get_notification_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AdvisoryNotificationsServiceRestInterceptor, "pre_get_notification" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdvisoryNotificationsServiceRestInterceptor, + "post_get_notification", + ) as post, + mock.patch.object( + transports.AdvisoryNotificationsServiceRestInterceptor, + "post_get_notification_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdvisoryNotificationsServiceRestInterceptor, + "pre_get_notification", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4344,8 +4355,9 @@ def test_get_settings_rest_bad_request(request_type=service.GetSettingsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4410,18 +4422,20 @@ def test_get_settings_rest_interceptors(null_interceptor): ) client = AdvisoryNotificationsServiceClient(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.AdvisoryNotificationsServiceRestInterceptor, "post_get_settings" - ) as post, mock.patch.object( - transports.AdvisoryNotificationsServiceRestInterceptor, - "post_get_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AdvisoryNotificationsServiceRestInterceptor, "pre_get_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdvisoryNotificationsServiceRestInterceptor, "post_get_settings" + ) as post, + mock.patch.object( + transports.AdvisoryNotificationsServiceRestInterceptor, + "post_get_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdvisoryNotificationsServiceRestInterceptor, "pre_get_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4472,8 +4486,9 @@ def test_update_settings_rest_bad_request(request_type=service.UpdateSettingsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4612,18 +4627,22 @@ def test_update_settings_rest_interceptors(null_interceptor): ) client = AdvisoryNotificationsServiceClient(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.AdvisoryNotificationsServiceRestInterceptor, "post_update_settings" - ) as post, mock.patch.object( - transports.AdvisoryNotificationsServiceRestInterceptor, - "post_update_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AdvisoryNotificationsServiceRestInterceptor, "pre_update_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdvisoryNotificationsServiceRestInterceptor, + "post_update_settings", + ) as post, + mock.patch.object( + transports.AdvisoryNotificationsServiceRestInterceptor, + "post_update_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AdvisoryNotificationsServiceRestInterceptor, + "pre_update_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4808,11 +4827,14 @@ def test_advisory_notifications_service_base_transport(): def test_advisory_notifications_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.advisorynotifications_v1.services.advisory_notifications_service.transports.AdvisoryNotificationsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.advisorynotifications_v1.services.advisory_notifications_service.transports.AdvisoryNotificationsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AdvisoryNotificationsServiceTransport( @@ -4829,9 +4851,12 @@ def test_advisory_notifications_service_base_transport_with_credentials_file(): def test_advisory_notifications_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.advisorynotifications_v1.services.advisory_notifications_service.transports.AdvisoryNotificationsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.advisorynotifications_v1.services.advisory_notifications_service.transports.AdvisoryNotificationsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AdvisoryNotificationsServiceTransport() @@ -4910,11 +4935,12 @@ def test_advisory_notifications_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-alloydb-connectors/docs/conf.py b/packages/google-cloud-alloydb-connectors/docs/conf.py index b675348a535b..1509769410e9 100644 --- a/packages/google-cloud-alloydb-connectors/docs/conf.py +++ b/packages/google-cloud-alloydb-connectors/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-alloydb-connectors documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/__init__.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/__init__.py index 00f62310d636..0e9e13b85f1e 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/__init__.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.resources import MetadataExchangeRequest, MetadataExchangeResponse if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/__init__.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/__init__.py index d4c190d538f6..104cb8c050d7 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/__init__.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .resources import MetadataExchangeRequest, MetadataExchangeResponse +from .resources import ( + MetadataExchangeRequest, + MetadataExchangeResponse, +) __all__ = ( "MetadataExchangeRequest", diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/resources.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/resources.py index d02f6884ae54..709771ca5cf4 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/resources.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1/types/resources.py @@ -60,6 +60,7 @@ class AuthType(proto.Enum): AUTO_IAM (2): Automatic IAM authentication """ + AUTH_TYPE_UNSPECIFIED = 0 DB_NATIVE = 1 AUTO_IAM = 2 @@ -103,6 +104,7 @@ class ResponseCode(proto.Enum): ERROR (2): Failure """ + RESPONSE_CODE_UNSPECIFIED = 0 OK = 1 ERROR = 2 diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/__init__.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/__init__.py index 9e28f46b2d13..9fa9c91250f0 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/__init__.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.resources import MetadataExchangeRequest, MetadataExchangeResponse if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/__init__.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/__init__.py index d4c190d538f6..104cb8c050d7 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/__init__.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .resources import MetadataExchangeRequest, MetadataExchangeResponse +from .resources import ( + MetadataExchangeRequest, + MetadataExchangeResponse, +) __all__ = ( "MetadataExchangeRequest", diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/resources.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/resources.py index 95ac129fbd0e..3b573256f02e 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/resources.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1alpha/types/resources.py @@ -60,6 +60,7 @@ class AuthType(proto.Enum): AUTO_IAM (2): Automatic IAM authentication """ + AUTH_TYPE_UNSPECIFIED = 0 DB_NATIVE = 1 AUTO_IAM = 2 @@ -103,6 +104,7 @@ class ResponseCode(proto.Enum): ERROR (2): Failure """ + RESPONSE_CODE_UNSPECIFIED = 0 OK = 1 ERROR = 2 diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/__init__.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/__init__.py index c998f9173468..0e05c0b64696 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/__init__.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.resources import MetadataExchangeRequest, MetadataExchangeResponse if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/__init__.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/__init__.py index d4c190d538f6..104cb8c050d7 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/__init__.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .resources import MetadataExchangeRequest, MetadataExchangeResponse +from .resources import ( + MetadataExchangeRequest, + MetadataExchangeResponse, +) __all__ = ( "MetadataExchangeRequest", diff --git a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/resources.py b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/resources.py index 0d991f382b62..7e6d57ed7e5b 100644 --- a/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/resources.py +++ b/packages/google-cloud-alloydb-connectors/google/cloud/alloydb/connectors_v1beta/types/resources.py @@ -60,6 +60,7 @@ class AuthType(proto.Enum): AUTO_IAM (2): Automatic IAM authentication """ + AUTH_TYPE_UNSPECIFIED = 0 DB_NATIVE = 1 AUTO_IAM = 2 @@ -103,6 +104,7 @@ class ResponseCode(proto.Enum): ERROR (2): Failure """ + RESPONSE_CODE_UNSPECIFIED = 0 OK = 1 ERROR = 2 diff --git a/packages/google-cloud-alloydb-connectors/noxfile.py b/packages/google-cloud-alloydb-connectors/noxfile.py index efa4b186b653..ec6630dc1d6f 100644 --- a/packages/google-cloud-alloydb-connectors/noxfile.py +++ b/packages/google-cloud-alloydb-connectors/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-alloydb/docs/conf.py b/packages/google-cloud-alloydb/docs/conf.py index b19cf2a94d7d..05846a91dd19 100644 --- a/packages/google-cloud-alloydb/docs/conf.py +++ b/packages/google-cloud-alloydb/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-alloydb documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/__init__.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/__init__.py index 88023f4d1454..6849b3ac2d54 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/__init__.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.alloy_db_admin import AlloyDBAdminAsyncClient, AlloyDBAdminClient from .services.alloy_dbcsql_admin import ( AlloyDBCSQLAdminAsyncClient, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/async_client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/async_client.py index dddd8e9b95d1..abdbbe11b0a9 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/async_client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.alloydb_v1.services.alloy_db_admin import pagers from google.cloud.alloydb_v1.types import csql_resources, data_model, resources, service @@ -149,7 +151,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlloyDBAdminAsyncClient: The constructed client. """ - return AlloyDBAdminClient.from_service_account_info.__func__(AlloyDBAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AlloyDBAdminClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AlloyDBAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +168,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlloyDBAdminAsyncClient: The constructed client. """ - return AlloyDBAdminClient.from_service_account_file.__func__(AlloyDBAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AlloyDBAdminClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AlloyDBAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/client.py index 92b4b6415a4e..0ac012522395 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.alloydb_v1.services.alloy_db_admin import pagers from google.cloud.alloydb_v1.types import csql_resources, data_model, resources, service @@ -859,11 +861,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlloyDBAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlloyDBAdminClient._read_environment_variables() + ) self._client_cert_source = AlloyDBAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -898,8 +898,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlloyDBAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/pagers.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/pagers.py index 81a21cc4b1cb..a9504d1a369d 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/pagers.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/base.py index 18c2d539a836..b3813310d6dc 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.alloydb_v1 import gapic_version as package_version from google.cloud.alloydb_v1.types import resources, service @@ -811,13 +813,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc.py index ce1d9f5f01d6..6b1ca683c616 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1.types import resources, service @@ -1123,12 +1125,12 @@ def list_supported_database_flags( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_supported_database_flags" not in self._stubs: - self._stubs[ - "list_supported_database_flags" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1.AlloyDBAdmin/ListSupportedDatabaseFlags", - request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, - response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + self._stubs["list_supported_database_flags"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1.AlloyDBAdmin/ListSupportedDatabaseFlags", + request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, + response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + ) ) return self._stubs["list_supported_database_flags"] @@ -1160,12 +1162,12 @@ def generate_client_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_client_certificate" not in self._stubs: - self._stubs[ - "generate_client_certificate" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1.AlloyDBAdmin/GenerateClientCertificate", - request_serializer=service.GenerateClientCertificateRequest.serialize, - response_deserializer=service.GenerateClientCertificateResponse.deserialize, + self._stubs["generate_client_certificate"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1.AlloyDBAdmin/GenerateClientCertificate", + request_serializer=service.GenerateClientCertificateRequest.serialize, + response_deserializer=service.GenerateClientCertificateResponse.deserialize, + ) ) return self._stubs["generate_client_certificate"] diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc_asyncio.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc_asyncio.py index e9fcdcb8b432..6c118b0b9003 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1.types import resources, service @@ -1151,12 +1153,12 @@ def list_supported_database_flags( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_supported_database_flags" not in self._stubs: - self._stubs[ - "list_supported_database_flags" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1.AlloyDBAdmin/ListSupportedDatabaseFlags", - request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, - response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + self._stubs["list_supported_database_flags"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1.AlloyDBAdmin/ListSupportedDatabaseFlags", + request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, + response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + ) ) return self._stubs["list_supported_database_flags"] @@ -1188,12 +1190,12 @@ def generate_client_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_client_certificate" not in self._stubs: - self._stubs[ - "generate_client_certificate" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1.AlloyDBAdmin/GenerateClientCertificate", - request_serializer=service.GenerateClientCertificateRequest.serialize, - response_deserializer=service.GenerateClientCertificateResponse.deserialize, + self._stubs["generate_client_certificate"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1.AlloyDBAdmin/GenerateClientCertificate", + request_serializer=service.GenerateClientCertificateRequest.serialize, + response_deserializer=service.GenerateClientCertificateResponse.deserialize, + ) ) return self._stubs["generate_client_certificate"] diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest.py index 969e9f2ec0d1..6e3683c3cfb9 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -2402,9 +2404,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseBatchCreateInstances._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseBatchCreateInstances._get_http_options() request, metadata = self._interceptor.pre_batch_create_instances( request, metadata @@ -2430,7 +2430,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2585,7 +2585,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2736,7 +2736,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2887,7 +2887,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3012,9 +3012,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryCluster._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryCluster._get_http_options() request, metadata = self._interceptor.pre_create_secondary_cluster( request, metadata @@ -3040,7 +3038,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3167,9 +3165,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryInstance._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryInstance._get_http_options() request, metadata = self._interceptor.pre_create_secondary_instance( request, metadata @@ -3195,7 +3191,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3499,7 +3495,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3644,7 +3640,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3789,7 +3785,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3931,7 +3927,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4205,7 +4201,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4359,7 +4355,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4487,9 +4483,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseGenerateClientCertificate._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseGenerateClientCertificate._get_http_options() request, metadata = self._interceptor.pre_generate_client_certificate( request, metadata @@ -4947,9 +4941,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseGetConnectionInfo._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseGetConnectionInfo._get_http_options() request, metadata = self._interceptor.pre_get_connection_info( request, metadata @@ -5421,7 +5413,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5579,7 +5571,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6296,9 +6288,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseListSupportedDatabaseFlags._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseListSupportedDatabaseFlags._get_http_options() request, metadata = self._interceptor.pre_list_supported_database_flags( request, metadata @@ -6364,11 +6354,10 @@ def __call__( resp = self._interceptor.post_list_supported_database_flags(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_supported_database_flags_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_supported_database_flags_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6627,7 +6616,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6780,7 +6769,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6932,7 +6921,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7058,9 +7047,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseSwitchoverCluster._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseSwitchoverCluster._get_http_options() request, metadata = self._interceptor.pre_switchover_cluster( request, metadata @@ -7086,7 +7073,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7241,7 +7228,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7392,7 +7379,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7543,7 +7530,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7850,7 +7837,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7955,7 +7942,9 @@ def create_secondary_cluster( ) -> Callable[[service.CreateSecondaryClusterRequest], 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._CreateSecondaryCluster(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecondaryCluster( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_secondary_instance( @@ -7963,7 +7952,9 @@ def create_secondary_instance( ) -> Callable[[service.CreateSecondaryInstanceRequest], 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._CreateSecondaryInstance(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecondaryInstance( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_user(self) -> Callable[[service.CreateUserRequest], resources.User]: @@ -8034,7 +8025,9 @@ def generate_client_certificate( ]: # 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._GenerateClientCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateClientCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backup(self) -> Callable[[service.GetBackupRequest], resources.Backup]: @@ -8127,7 +8120,9 @@ def list_supported_database_flags( ]: # 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._ListSupportedDatabaseFlags(self._session, self._host, self._interceptor) # type: ignore + return self._ListSupportedDatabaseFlags( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_users( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest_base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest_base.py index 83fac675ec16..1413aec44838 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest_base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_db_admin/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.alloydb_v1.types import resources, service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/async_client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/async_client.py index 6ba3260e8da6..81ccc3a3c3ba 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/async_client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1 import gapic_version as package_version @@ -44,11 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1.types import csql_service, resources, service @@ -131,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlloyDBCSQLAdminAsyncClient: The constructed client. """ - return AlloyDBCSQLAdminClient.from_service_account_info.__func__(AlloyDBCSQLAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AlloyDBCSQLAdminClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AlloyDBCSQLAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlloyDBCSQLAdminAsyncClient: The constructed client. """ - return AlloyDBCSQLAdminClient.from_service_account_file.__func__(AlloyDBCSQLAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AlloyDBCSQLAdminClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AlloyDBCSQLAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/client.py index e77ec067b923..b2ee864de728 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1 import gapic_version as package_version @@ -61,11 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1.types import csql_service, resources, service @@ -84,9 +86,7 @@ class AlloyDBCSQLAdminClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AlloyDBCSQLAdminTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AlloyDBCSQLAdminTransport]] _transport_registry["grpc"] = AlloyDBCSQLAdminGrpcTransport _transport_registry["grpc_asyncio"] = AlloyDBCSQLAdminGrpcAsyncIOTransport _transport_registry["rest"] = AlloyDBCSQLAdminRestTransport @@ -719,11 +719,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlloyDBCSQLAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlloyDBCSQLAdminClient._read_environment_variables() + ) self._client_cert_source = AlloyDBCSQLAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -758,8 +756,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlloyDBCSQLAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/base.py index 84b6a9b098cc..ea345918b998 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1 import gapic_version as package_version from google.cloud.alloydb_v1.types import csql_service @@ -224,13 +226,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc.py index 43322426f874..b38cd72fa72d 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1.types import csql_service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc_asyncio.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc_asyncio.py index 818b421353db..c485adf330f8 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1.types import csql_service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest.py index 6bce3eeeb17d..6e85f65244af 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -486,9 +488,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseRestoreFromCloudSQL._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseRestoreFromCloudSQL._get_http_options() request, metadata = self._interceptor.pre_restore_from_cloud_sql( request, metadata @@ -514,7 +514,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -786,9 +786,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_transcoded_request( @@ -925,9 +923,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1045,9 +1041,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1302,9 +1296,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest_base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest_base.py index 033a0378cbae..d9ac51d39d28 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest_base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/services/alloy_dbcsql_admin/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/__init__.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/__init__.py index 88290a268e7f..eff92db5866a 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/__init__.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/__init__.py @@ -13,9 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .csql_resources import CloudSQLBackupRunSource -from .csql_service import RestoreFromCloudSQLRequest -from .data_model import SqlResult, SqlResultColumn, SqlResultRow, SqlResultValue +from .csql_resources import ( + CloudSQLBackupRunSource, +) +from .csql_service import ( + RestoreFromCloudSQLRequest, +) +from .data_model import ( + SqlResult, + SqlResultColumn, + SqlResultRow, + SqlResultValue, +) from .resources import ( AutomatedBackupPolicy, Backup, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py index d0e2ca60e4c1..779a451097a4 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/resources.py @@ -17,12 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore from google.cloud.alloydb_v1.types import csql_resources @@ -76,6 +76,7 @@ class InstanceView(proto.Enum): instance, this includes details of each node in the pool. """ + INSTANCE_VIEW_UNSPECIFIED = 0 INSTANCE_VIEW_BASIC = 1 INSTANCE_VIEW_FULL = 2 @@ -99,6 +100,7 @@ class ClusterView(proto.Enum): plus the earliest restorable time if continuous backups are enabled. May increase latency. """ + CLUSTER_VIEW_UNSPECIFIED = 0 CLUSTER_VIEW_BASIC = 1 CLUSTER_VIEW_CONTINUOUS_BACKUP = 2 @@ -122,6 +124,7 @@ class DatabaseVersion(proto.Enum): POSTGRES_17 (5): The database version is Postgres 17. """ + DATABASE_VERSION_UNSPECIFIED = 0 POSTGRES_13 = 1 POSTGRES_14 = 2 @@ -144,6 +147,7 @@ class SubscriptionType(proto.Enum): TRIAL (2): Trial subscription. """ + SUBSCRIPTION_TYPE_UNSPECIFIED = 0 STANDARD = 1 TRIAL = 2 @@ -197,6 +201,7 @@ class MigrationSourceType(proto.Enum): DMS source means the cluster was created via DMS migration job. """ + MIGRATION_SOURCE_TYPE_UNSPECIFIED = 0 DMS = 1 @@ -262,6 +267,7 @@ class Type(proto.Enum): is managed by the customer. KMS key versions will be populated. """ + TYPE_UNSPECIFIED = 0 GOOGLE_DEFAULT_ENCRYPTION = 1 CUSTOMER_MANAGED_ENCRYPTION = 2 @@ -316,6 +322,7 @@ class SslMode(proto.Enum): SSL connections are required. CA verification not enforced. """ + SSL_MODE_UNSPECIFIED = 0 SSL_MODE_ALLOW = 1 SSL_MODE_REQUIRE = 2 @@ -334,6 +341,7 @@ class CaSource(proto.Enum): Certificate Authority (CA) managed by the AlloyDB Cluster. """ + CA_SOURCE_UNSPECIFIED = 0 CA_SOURCE_MANAGED = 1 @@ -744,12 +752,12 @@ class DenyMaintenancePeriod(proto.Message): number=1, message=MaintenanceWindow, ) - deny_maintenance_periods: MutableSequence[ - DenyMaintenancePeriod - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=DenyMaintenancePeriod, + deny_maintenance_periods: MutableSequence[DenyMaintenancePeriod] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=DenyMaintenancePeriod, + ) ) @@ -967,6 +975,7 @@ class State(proto.Enum): PROMOTING (9): The cluster is being promoted. """ + STATE_UNSPECIFIED = 0 READY = 1 STOPPED = 2 @@ -991,6 +1000,7 @@ class ClusterType(proto.Enum): Secondary cluster that is replicating from another region. This only supports read. """ + CLUSTER_TYPE_UNSPECIFIED = 0 PRIMARY = 1 SECONDARY = 2 @@ -1462,6 +1472,7 @@ class State(proto.Enum): PROMOTING (9): The instance is being promoted. """ + STATE_UNSPECIFIED = 0 READY = 1 STOPPED = 2 @@ -1494,6 +1505,7 @@ class InstanceType(proto.Enum): only. SECONDARY instance is a cross-region read replica """ + INSTANCE_TYPE_UNSPECIFIED = 0 PRIMARY = 1 READ_POOL = 2 @@ -1515,6 +1527,7 @@ class AvailabilityType(proto.Enum): REGIONAL (2): Regional (or Highly) available instance. """ + AVAILABILITY_TYPE_UNSPECIFIED = 0 ZONAL = 1 REGIONAL = 2 @@ -1530,6 +1543,7 @@ class ActivationPolicy(proto.Enum): NEVER (2): The instance is not running. """ + ACTIVATION_POLICY_UNSPECIFIED = 0 ALWAYS = 1 NEVER = 2 @@ -1908,19 +1922,19 @@ class PscInstanceConfig(proto.Message): proto.STRING, number=7, ) - psc_interface_configs: MutableSequence[ - "Instance.PscInterfaceConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="Instance.PscInterfaceConfig", + psc_interface_configs: MutableSequence["Instance.PscInterfaceConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="Instance.PscInterfaceConfig", + ) ) - psc_auto_connections: MutableSequence[ - "Instance.PscAutoConnectionConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message="Instance.PscAutoConnectionConfig", + psc_auto_connections: MutableSequence["Instance.PscAutoConnectionConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message="Instance.PscAutoConnectionConfig", + ) ) class InstanceNetworkConfig(proto.Message): @@ -2329,6 +2343,7 @@ class State(proto.Enum): DELETING (4): The backup is being deleted. """ + STATE_UNSPECIFIED = 0 READY = 1 CREATING = 2 @@ -2353,6 +2368,7 @@ class Type(proto.Enum): backups scheduler due to a continuous backup policy. """ + TYPE_UNSPECIFIED = 0 ON_DEMAND = 1 AUTOMATED = 2 @@ -2584,6 +2600,7 @@ class ValueType(proto.Enum): Denotes that the flag does not accept any values. """ + VALUE_TYPE_UNSPECIFIED = 0 STRING = 1 INTEGER = 2 @@ -2602,6 +2619,7 @@ class Scope(proto.Enum): CONNECTION_POOL (2): The flag is a connection pool flag. """ + SCOPE_UNSPECIFIED = 0 DATABASE = 1 CONNECTION_POOL = 2 @@ -2734,6 +2752,7 @@ class UserType(proto.Enum): Database user that can authenticate via IAM-Based authentication. """ + USER_TYPE_UNSPECIFIED = 0 ALLOYDB_BUILT_IN = 1 ALLOYDB_IAM_USER = 2 diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/service.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/service.py index 47abef01327c..146cb5f44d71 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/service.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1/types/service.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.alloydb_v1.types import data_model, resources @@ -813,6 +813,7 @@ class Status(proto.Enum): CANCELLED (7): Cancellation complete. """ + STATUS_UNSPECIFIED = 0 NOT_STARTED = 4 IN_PROGRESS = 5 @@ -843,6 +844,7 @@ class Stage(proto.Enum): CLEANUP (7): Cleanup. """ + STAGE_UNSPECIFIED = 0 ALLOYDB_PRECHECK = 1 PG_UPGRADE_CHECK = 2 @@ -956,12 +958,12 @@ class ClusterUpgradeDetails(proto.Message): number=4, enum=resources.DatabaseVersion, ) - stage_info: MutableSequence[ - "UpgradeClusterResponse.StageInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="UpgradeClusterResponse.StageInfo", + stage_info: MutableSequence["UpgradeClusterResponse.StageInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="UpgradeClusterResponse.StageInfo", + ) ) instance_upgrade_details: MutableSequence[ "UpgradeClusterResponse.InstanceUpgradeDetails" @@ -980,12 +982,12 @@ class ClusterUpgradeDetails(proto.Message): proto.STRING, number=2, ) - cluster_upgrade_details: MutableSequence[ - ClusterUpgradeDetails - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ClusterUpgradeDetails, + cluster_upgrade_details: MutableSequence[ClusterUpgradeDetails] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ClusterUpgradeDetails, + ) ) @@ -1489,12 +1491,12 @@ class CreateInstanceRequests(proto.Message): to be created. This list should not be empty. """ - create_instance_requests: MutableSequence[ - "CreateInstanceRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CreateInstanceRequest", + create_instance_requests: MutableSequence["CreateInstanceRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CreateInstanceRequest", + ) ) @@ -1584,13 +1586,13 @@ class BatchCreateInstancesMetadata(proto.Message): proto.STRING, number=1, ) - instance_statuses: MutableMapping[ - str, "BatchCreateInstanceStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=2, - message="BatchCreateInstanceStatus", + instance_statuses: MutableMapping[str, "BatchCreateInstanceStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=2, + message="BatchCreateInstanceStatus", + ) ) @@ -1664,6 +1666,7 @@ class State(proto.Enum): was rolled back and deleted due to some other failure during BatchCreateInstances operation. """ + STATE_UNSPECIFIED = 0 PENDING_CREATE = 1 READY = 2 @@ -1916,6 +1919,7 @@ class FaultType(proto.Enum): STOP_VM (1): Stop the VM """ + FAULT_TYPE_UNSPECIFIED = 0 STOP_VM = 1 @@ -2130,6 +2134,7 @@ class Status(proto.Enum): https://google.aip.dev/193 but will be returned as part of this message. """ + STATUS_UNSPECIFIED = 0 OK = 1 PARTIAL = 2 @@ -2484,12 +2489,12 @@ class ListSupportedDatabaseFlagsResponse(proto.Message): def raw_page(self): return self - supported_database_flags: MutableSequence[ - resources.SupportedDatabaseFlag - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.SupportedDatabaseFlag, + supported_database_flags: MutableSequence[resources.SupportedDatabaseFlag] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.SupportedDatabaseFlag, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/__init__.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/__init__.py index 88417f7dd994..241105bf128b 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/__init__.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.alloy_db_admin import AlloyDBAdminAsyncClient, AlloyDBAdminClient from .services.alloy_dbcsql_admin import ( AlloyDBCSQLAdminAsyncClient, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/async_client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/async_client.py index 00e27e31b64f..cf8b902e5003 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/async_client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1alpha import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.alloydb_v1alpha.services.alloy_db_admin import pagers from google.cloud.alloydb_v1alpha.types import ( @@ -155,7 +157,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlloyDBAdminAsyncClient: The constructed client. """ - return AlloyDBAdminClient.from_service_account_info.__func__(AlloyDBAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AlloyDBAdminClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AlloyDBAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +174,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlloyDBAdminAsyncClient: The constructed client. """ - return AlloyDBAdminClient.from_service_account_file.__func__(AlloyDBAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AlloyDBAdminClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AlloyDBAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/client.py index 1ddb5febb020..468894db98a4 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1alpha import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.alloydb_v1alpha.services.alloy_db_admin import pagers from google.cloud.alloydb_v1alpha.types import ( @@ -865,11 +867,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlloyDBAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlloyDBAdminClient._read_environment_variables() + ) self._client_cert_source = AlloyDBAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -904,8 +904,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlloyDBAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/pagers.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/pagers.py index 2bbd5afcef7e..181f3225be49 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/pagers.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/base.py index 0edc9c24d679..6f00282f2e2a 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.alloydb_v1alpha import gapic_version as package_version from google.cloud.alloydb_v1alpha.types import resources, service @@ -852,13 +854,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc.py index 905123d0951e..f64c0aa3c67c 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1alpha.types import resources, service @@ -1123,12 +1125,12 @@ def list_supported_database_flags( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_supported_database_flags" not in self._stubs: - self._stubs[ - "list_supported_database_flags" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/ListSupportedDatabaseFlags", - request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, - response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + self._stubs["list_supported_database_flags"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/ListSupportedDatabaseFlags", + request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, + response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + ) ) return self._stubs["list_supported_database_flags"] @@ -1160,12 +1162,12 @@ def generate_client_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_client_certificate" not in self._stubs: - self._stubs[ - "generate_client_certificate" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/GenerateClientCertificate", - request_serializer=service.GenerateClientCertificateRequest.serialize, - response_deserializer=service.GenerateClientCertificateResponse.deserialize, + self._stubs["generate_client_certificate"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/GenerateClientCertificate", + request_serializer=service.GenerateClientCertificateRequest.serialize, + response_deserializer=service.GenerateClientCertificateResponse.deserialize, + ) ) return self._stubs["generate_client_certificate"] diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc_asyncio.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc_asyncio.py index 220aa51246cb..f01a3ce516ba 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1alpha.types import resources, service @@ -1151,12 +1153,12 @@ def list_supported_database_flags( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_supported_database_flags" not in self._stubs: - self._stubs[ - "list_supported_database_flags" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/ListSupportedDatabaseFlags", - request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, - response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + self._stubs["list_supported_database_flags"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/ListSupportedDatabaseFlags", + request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, + response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + ) ) return self._stubs["list_supported_database_flags"] @@ -1188,12 +1190,12 @@ def generate_client_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_client_certificate" not in self._stubs: - self._stubs[ - "generate_client_certificate" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/GenerateClientCertificate", - request_serializer=service.GenerateClientCertificateRequest.serialize, - response_deserializer=service.GenerateClientCertificateResponse.deserialize, + self._stubs["generate_client_certificate"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1alpha.AlloyDBAdmin/GenerateClientCertificate", + request_serializer=service.GenerateClientCertificateRequest.serialize, + response_deserializer=service.GenerateClientCertificateResponse.deserialize, + ) ) return self._stubs["generate_client_certificate"] diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest.py index 4de9213e2432..eca3c90c1956 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -2454,9 +2456,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseBatchCreateInstances._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseBatchCreateInstances._get_http_options() request, metadata = self._interceptor.pre_batch_create_instances( request, metadata @@ -2482,7 +2482,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2637,7 +2637,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2788,7 +2788,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3089,7 +3089,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3214,9 +3214,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryCluster._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryCluster._get_http_options() request, metadata = self._interceptor.pre_create_secondary_cluster( request, metadata @@ -3242,7 +3240,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3369,9 +3367,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryInstance._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryInstance._get_http_options() request, metadata = self._interceptor.pre_create_secondary_instance( request, metadata @@ -3397,7 +3393,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3701,7 +3697,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3846,7 +3842,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3991,7 +3987,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4133,7 +4129,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4407,7 +4403,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4561,7 +4557,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4689,9 +4685,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseGenerateClientCertificate._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseGenerateClientCertificate._get_http_options() request, metadata = self._interceptor.pre_generate_client_certificate( request, metadata @@ -5149,9 +5143,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseGetConnectionInfo._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseGetConnectionInfo._get_http_options() request, metadata = self._interceptor.pre_get_connection_info( request, metadata @@ -5623,7 +5615,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5781,7 +5773,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6498,9 +6490,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseListSupportedDatabaseFlags._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseListSupportedDatabaseFlags._get_http_options() request, metadata = self._interceptor.pre_list_supported_database_flags( request, metadata @@ -6566,11 +6556,10 @@ def __call__( resp = self._interceptor.post_list_supported_database_flags(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_supported_database_flags_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_supported_database_flags_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6829,7 +6818,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6982,7 +6971,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7134,7 +7123,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7260,9 +7249,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseSwitchoverCluster._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseSwitchoverCluster._get_http_options() request, metadata = self._interceptor.pre_switchover_cluster( request, metadata @@ -7288,7 +7275,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7443,7 +7430,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7594,7 +7581,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7745,7 +7732,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8052,7 +8039,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8165,7 +8152,9 @@ def create_secondary_cluster( ) -> Callable[[service.CreateSecondaryClusterRequest], 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._CreateSecondaryCluster(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecondaryCluster( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_secondary_instance( @@ -8173,7 +8162,9 @@ def create_secondary_instance( ) -> Callable[[service.CreateSecondaryInstanceRequest], 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._CreateSecondaryInstance(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecondaryInstance( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_user(self) -> Callable[[service.CreateUserRequest], resources.User]: @@ -8244,7 +8235,9 @@ def generate_client_certificate( ]: # 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._GenerateClientCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateClientCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backup(self) -> Callable[[service.GetBackupRequest], resources.Backup]: @@ -8337,7 +8330,9 @@ def list_supported_database_flags( ]: # 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._ListSupportedDatabaseFlags(self._session, self._host, self._interceptor) # type: ignore + return self._ListSupportedDatabaseFlags( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_users( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest_base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest_base.py index bcac90f9df8e..1fdd68116605 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest_base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_db_admin/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.alloydb_v1alpha.types import resources, service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/async_client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/async_client.py index fb1f49ffb1bc..3b0e7332f8ac 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/async_client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1alpha import gapic_version as package_version @@ -44,11 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1alpha.types import csql_service, resources, service @@ -131,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlloyDBCSQLAdminAsyncClient: The constructed client. """ - return AlloyDBCSQLAdminClient.from_service_account_info.__func__(AlloyDBCSQLAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AlloyDBCSQLAdminClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AlloyDBCSQLAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlloyDBCSQLAdminAsyncClient: The constructed client. """ - return AlloyDBCSQLAdminClient.from_service_account_file.__func__(AlloyDBCSQLAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AlloyDBCSQLAdminClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AlloyDBCSQLAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/client.py index 71f60269b358..dbe86d771cb7 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1alpha import gapic_version as package_version @@ -61,11 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1alpha.types import csql_service, resources, service @@ -84,9 +86,7 @@ class AlloyDBCSQLAdminClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AlloyDBCSQLAdminTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AlloyDBCSQLAdminTransport]] _transport_registry["grpc"] = AlloyDBCSQLAdminGrpcTransport _transport_registry["grpc_asyncio"] = AlloyDBCSQLAdminGrpcAsyncIOTransport _transport_registry["rest"] = AlloyDBCSQLAdminRestTransport @@ -719,11 +719,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlloyDBCSQLAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlloyDBCSQLAdminClient._read_environment_variables() + ) self._client_cert_source = AlloyDBCSQLAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -758,8 +756,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlloyDBCSQLAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/base.py index 662f881cbd70..62f62b593678 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1alpha import gapic_version as package_version from google.cloud.alloydb_v1alpha.types import csql_service @@ -224,13 +226,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc.py index 665de62a2c89..90f57676e2df 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1alpha.types import csql_service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc_asyncio.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc_asyncio.py index 7954e38cdbfd..566a453f1729 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1alpha.types import csql_service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest.py index 15e167764907..ecedad1d48a4 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -486,9 +488,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseRestoreFromCloudSQL._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseRestoreFromCloudSQL._get_http_options() request, metadata = self._interceptor.pre_restore_from_cloud_sql( request, metadata @@ -514,7 +514,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -786,9 +786,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_transcoded_request( @@ -925,9 +923,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1045,9 +1041,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1302,9 +1296,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest_base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest_base.py index dda6be0203b4..8e4f9b0d8e84 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest_base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/services/alloy_dbcsql_admin/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/__init__.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/__init__.py index 2b5e40149a56..41050b818d59 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/__init__.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/__init__.py @@ -13,9 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .csql_resources import CloudSQLBackupRunSource -from .csql_service import RestoreFromCloudSQLRequest -from .data_model import SqlResult, SqlResultColumn, SqlResultRow, SqlResultValue +from .csql_resources import ( + CloudSQLBackupRunSource, +) +from .csql_service import ( + RestoreFromCloudSQLRequest, +) +from .data_model import ( + SqlResult, + SqlResultColumn, + SqlResultRow, + SqlResultValue, +) from .gemini import ( GCAEntitlementType, GCAInstanceConfig, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/gemini.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/gemini.py index a2d90b0e60a0..a95907b8f546 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/gemini.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/gemini.py @@ -41,6 +41,7 @@ class GCAEntitlementType(proto.Enum): The resource is entitled to the GCA Standard Tier. """ + GCA_ENTITLEMENT_TYPE_UNSPECIFIED = 0 GCA_STANDARD = 1 diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py index 4a4c2605bd31..7c02c6636765 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/resources.py @@ -17,12 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore from google.cloud.alloydb_v1alpha.types import csql_resources, gemini @@ -76,6 +76,7 @@ class InstanceView(proto.Enum): instance, this includes details of each node in the pool. """ + INSTANCE_VIEW_UNSPECIFIED = 0 INSTANCE_VIEW_BASIC = 1 INSTANCE_VIEW_FULL = 2 @@ -99,6 +100,7 @@ class ClusterView(proto.Enum): plus the earliest restorable time if continuous backups are enabled. May increase latency. """ + CLUSTER_VIEW_UNSPECIFIED = 0 CLUSTER_VIEW_BASIC = 1 CLUSTER_VIEW_CONTINUOUS_BACKUP = 2 @@ -124,6 +126,7 @@ class DatabaseVersion(proto.Enum): POSTGRES_18 (6): The database version is Postgres 18. """ + DATABASE_VERSION_UNSPECIFIED = 0 POSTGRES_13 = 1 POSTGRES_14 = 2 @@ -147,6 +150,7 @@ class SubscriptionType(proto.Enum): TRIAL (2): Trial subscription. """ + SUBSCRIPTION_TYPE_UNSPECIFIED = 0 STANDARD = 1 TRIAL = 2 @@ -200,6 +204,7 @@ class MigrationSourceType(proto.Enum): DMS source means the cluster was created via DMS migration job. """ + MIGRATION_SOURCE_TYPE_UNSPECIFIED = 0 DMS = 1 @@ -265,6 +270,7 @@ class Type(proto.Enum): is managed by the customer. KMS key versions will be populated. """ + TYPE_UNSPECIFIED = 0 GOOGLE_DEFAULT_ENCRYPTION = 1 CUSTOMER_MANAGED_ENCRYPTION = 2 @@ -319,6 +325,7 @@ class SslMode(proto.Enum): SSL connections are required. CA verification not enforced. """ + SSL_MODE_UNSPECIFIED = 0 SSL_MODE_ALLOW = 1 SSL_MODE_REQUIRE = 2 @@ -337,6 +344,7 @@ class CaSource(proto.Enum): Certificate Authority (CA) managed by the AlloyDB Cluster. """ + CA_SOURCE_UNSPECIFIED = 0 CA_SOURCE_MANAGED = 1 @@ -747,12 +755,12 @@ class DenyMaintenancePeriod(proto.Message): number=1, message=MaintenanceWindow, ) - deny_maintenance_periods: MutableSequence[ - DenyMaintenancePeriod - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=DenyMaintenancePeriod, + deny_maintenance_periods: MutableSequence[DenyMaintenancePeriod] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=DenyMaintenancePeriod, + ) ) @@ -982,6 +990,7 @@ class State(proto.Enum): PROMOTING (9): The cluster is being promoted. """ + STATE_UNSPECIFIED = 0 READY = 1 STOPPED = 2 @@ -1006,6 +1015,7 @@ class ClusterType(proto.Enum): Secondary cluster that is replicating from another region. This only supports read. """ + CLUSTER_TYPE_UNSPECIFIED = 0 PRIMARY = 1 SECONDARY = 2 @@ -1505,6 +1515,7 @@ class State(proto.Enum): PROMOTING (9): The instance is being promoted. """ + STATE_UNSPECIFIED = 0 READY = 1 STOPPED = 2 @@ -1537,6 +1548,7 @@ class InstanceType(proto.Enum): only. SECONDARY instance is a cross-region read replica """ + INSTANCE_TYPE_UNSPECIFIED = 0 PRIMARY = 1 READ_POOL = 2 @@ -1558,6 +1570,7 @@ class AvailabilityType(proto.Enum): REGIONAL (2): Regional (or Highly) available instance. """ + AVAILABILITY_TYPE_UNSPECIFIED = 0 ZONAL = 1 REGIONAL = 2 @@ -1573,6 +1586,7 @@ class ActivationPolicy(proto.Enum): NEVER (2): The instance is not running. """ + ACTIVATION_POLICY_UNSPECIFIED = 0 ALWAYS = 1 NEVER = 2 @@ -1841,6 +1855,7 @@ class Mode(proto.Enum): Performs a forced update when applicable. This will be fast but may incur a downtime. """ + MODE_UNSPECIFIED = 0 DEFAULT = 1 FORCE_APPLY = 2 @@ -2001,19 +2016,19 @@ class PscInstanceConfig(proto.Message): proto.STRING, number=7, ) - psc_interface_configs: MutableSequence[ - "Instance.PscInterfaceConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="Instance.PscInterfaceConfig", + psc_interface_configs: MutableSequence["Instance.PscInterfaceConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="Instance.PscInterfaceConfig", + ) ) - psc_auto_connections: MutableSequence[ - "Instance.PscAutoConnectionConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message="Instance.PscAutoConnectionConfig", + psc_auto_connections: MutableSequence["Instance.PscAutoConnectionConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message="Instance.PscAutoConnectionConfig", + ) ) class InstanceNetworkConfig(proto.Message): @@ -2459,6 +2474,7 @@ class State(proto.Enum): DELETING (4): The backup is being deleted. """ + STATE_UNSPECIFIED = 0 READY = 1 CREATING = 2 @@ -2483,6 +2499,7 @@ class Type(proto.Enum): backups scheduler due to a continuous backup policy. """ + TYPE_UNSPECIFIED = 0 ON_DEMAND = 1 AUTOMATED = 2 @@ -2718,6 +2735,7 @@ class ValueType(proto.Enum): Denotes that the flag does not accept any values. """ + VALUE_TYPE_UNSPECIFIED = 0 STRING = 1 INTEGER = 2 @@ -2736,6 +2754,7 @@ class Scope(proto.Enum): CONNECTION_POOL (2): The flag is a connection pool flag. """ + SCOPE_UNSPECIFIED = 0 DATABASE = 1 CONNECTION_POOL = 2 @@ -2868,6 +2887,7 @@ class UserType(proto.Enum): Database user that can authenticate via IAM-Based authentication. """ + USER_TYPE_UNSPECIFIED = 0 ALLOYDB_BUILT_IN = 1 ALLOYDB_IAM_USER = 2 diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/service.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/service.py index 73bd04b2f542..c526f10b031b 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/service.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1alpha/types/service.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.alloydb_v1alpha.types import data_model, resources @@ -815,6 +815,7 @@ class Status(proto.Enum): CANCELLED (7): Cancellation complete. """ + STATUS_UNSPECIFIED = 0 NOT_STARTED = 4 IN_PROGRESS = 5 @@ -845,6 +846,7 @@ class Stage(proto.Enum): CLEANUP (7): Cleanup. """ + STAGE_UNSPECIFIED = 0 ALLOYDB_PRECHECK = 1 PG_UPGRADE_CHECK = 2 @@ -958,12 +960,12 @@ class ClusterUpgradeDetails(proto.Message): number=4, enum=resources.DatabaseVersion, ) - stage_info: MutableSequence[ - "UpgradeClusterResponse.StageInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="UpgradeClusterResponse.StageInfo", + stage_info: MutableSequence["UpgradeClusterResponse.StageInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="UpgradeClusterResponse.StageInfo", + ) ) instance_upgrade_details: MutableSequence[ "UpgradeClusterResponse.InstanceUpgradeDetails" @@ -982,12 +984,12 @@ class ClusterUpgradeDetails(proto.Message): proto.STRING, number=2, ) - cluster_upgrade_details: MutableSequence[ - ClusterUpgradeDetails - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ClusterUpgradeDetails, + cluster_upgrade_details: MutableSequence[ClusterUpgradeDetails] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ClusterUpgradeDetails, + ) ) @@ -1491,12 +1493,12 @@ class CreateInstanceRequests(proto.Message): to be created. This list should not be empty. """ - create_instance_requests: MutableSequence[ - "CreateInstanceRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CreateInstanceRequest", + create_instance_requests: MutableSequence["CreateInstanceRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CreateInstanceRequest", + ) ) @@ -1586,13 +1588,13 @@ class BatchCreateInstancesMetadata(proto.Message): proto.STRING, number=1, ) - instance_statuses: MutableMapping[ - str, "BatchCreateInstanceStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=2, - message="BatchCreateInstanceStatus", + instance_statuses: MutableMapping[str, "BatchCreateInstanceStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=2, + message="BatchCreateInstanceStatus", + ) ) @@ -1666,6 +1668,7 @@ class State(proto.Enum): was rolled back and deleted due to some other failure during BatchCreateInstances operation. """ + STATE_UNSPECIFIED = 0 PENDING_CREATE = 1 READY = 2 @@ -1918,6 +1921,7 @@ class FaultType(proto.Enum): STOP_VM (1): Stop the VM """ + FAULT_TYPE_UNSPECIFIED = 0 STOP_VM = 1 @@ -2132,6 +2136,7 @@ class Status(proto.Enum): https://google.aip.dev/193 but will be returned as part of this message. """ + STATUS_UNSPECIFIED = 0 OK = 1 PARTIAL = 2 @@ -2486,12 +2491,12 @@ class ListSupportedDatabaseFlagsResponse(proto.Message): def raw_page(self): return self - supported_database_flags: MutableSequence[ - resources.SupportedDatabaseFlag - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.SupportedDatabaseFlag, + supported_database_flags: MutableSequence[resources.SupportedDatabaseFlag] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.SupportedDatabaseFlag, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -2786,6 +2791,7 @@ class State(proto.Enum): The promote operation is completed and the database is available for write. """ + STATE_UNSPECIFIED = 0 PROMOTE_CLUSTER_AVAILABLE_FOR_READ = 1 PROMOTE_CLUSTER_AVAILABLE_FOR_WRITE = 2 diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/__init__.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/__init__.py index 95cf3f76da5f..e17512954ffa 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/__init__.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.alloy_db_admin import AlloyDBAdminAsyncClient, AlloyDBAdminClient from .services.alloy_dbcsql_admin import ( AlloyDBCSQLAdminAsyncClient, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/async_client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/async_client.py index bacd85a6a946..80f4b80c2f5e 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/async_client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1beta import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.alloydb_v1beta.services.alloy_db_admin import pagers from google.cloud.alloydb_v1beta.types import ( @@ -155,7 +157,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlloyDBAdminAsyncClient: The constructed client. """ - return AlloyDBAdminClient.from_service_account_info.__func__(AlloyDBAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AlloyDBAdminClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AlloyDBAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +174,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlloyDBAdminAsyncClient: The constructed client. """ - return AlloyDBAdminClient.from_service_account_file.__func__(AlloyDBAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AlloyDBAdminClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AlloyDBAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/client.py index 0c804327b1b8..477d6f002f3e 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1beta import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.alloydb_v1beta.services.alloy_db_admin import pagers from google.cloud.alloydb_v1beta.types import ( @@ -865,11 +867,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlloyDBAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlloyDBAdminClient._read_environment_variables() + ) self._client_cert_source = AlloyDBAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -904,8 +904,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlloyDBAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/pagers.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/pagers.py index e2a7b75fb5ac..afb3a4c27b8c 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/pagers.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/base.py index f0b1480872aa..cf4e4bc918fd 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.alloydb_v1beta import gapic_version as package_version from google.cloud.alloydb_v1beta.types import resources, service @@ -861,13 +863,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc.py index 17cbc46bac99..58ac88b797c1 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1beta.types import resources, service @@ -1123,12 +1125,12 @@ def list_supported_database_flags( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_supported_database_flags" not in self._stubs: - self._stubs[ - "list_supported_database_flags" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1beta.AlloyDBAdmin/ListSupportedDatabaseFlags", - request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, - response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + self._stubs["list_supported_database_flags"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1beta.AlloyDBAdmin/ListSupportedDatabaseFlags", + request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, + response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + ) ) return self._stubs["list_supported_database_flags"] @@ -1160,12 +1162,12 @@ def generate_client_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_client_certificate" not in self._stubs: - self._stubs[ - "generate_client_certificate" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1beta.AlloyDBAdmin/GenerateClientCertificate", - request_serializer=service.GenerateClientCertificateRequest.serialize, - response_deserializer=service.GenerateClientCertificateResponse.deserialize, + self._stubs["generate_client_certificate"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1beta.AlloyDBAdmin/GenerateClientCertificate", + request_serializer=service.GenerateClientCertificateRequest.serialize, + response_deserializer=service.GenerateClientCertificateResponse.deserialize, + ) ) return self._stubs["generate_client_certificate"] diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc_asyncio.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc_asyncio.py index 5745a199c01a..a98a6290f2ca 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1beta.types import resources, service @@ -1151,12 +1153,12 @@ def list_supported_database_flags( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_supported_database_flags" not in self._stubs: - self._stubs[ - "list_supported_database_flags" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1beta.AlloyDBAdmin/ListSupportedDatabaseFlags", - request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, - response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + self._stubs["list_supported_database_flags"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1beta.AlloyDBAdmin/ListSupportedDatabaseFlags", + request_serializer=service.ListSupportedDatabaseFlagsRequest.serialize, + response_deserializer=service.ListSupportedDatabaseFlagsResponse.deserialize, + ) ) return self._stubs["list_supported_database_flags"] @@ -1188,12 +1190,12 @@ def generate_client_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_client_certificate" not in self._stubs: - self._stubs[ - "generate_client_certificate" - ] = self._logged_channel.unary_unary( - "/google.cloud.alloydb.v1beta.AlloyDBAdmin/GenerateClientCertificate", - request_serializer=service.GenerateClientCertificateRequest.serialize, - response_deserializer=service.GenerateClientCertificateResponse.deserialize, + self._stubs["generate_client_certificate"] = ( + self._logged_channel.unary_unary( + "/google.cloud.alloydb.v1beta.AlloyDBAdmin/GenerateClientCertificate", + request_serializer=service.GenerateClientCertificateRequest.serialize, + response_deserializer=service.GenerateClientCertificateResponse.deserialize, + ) ) return self._stubs["generate_client_certificate"] diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest.py index c2eb478722a0..bead9dbdf12a 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -2453,9 +2455,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseBatchCreateInstances._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseBatchCreateInstances._get_http_options() request, metadata = self._interceptor.pre_batch_create_instances( request, metadata @@ -2481,7 +2481,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2636,7 +2636,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2787,7 +2787,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3088,7 +3088,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3213,9 +3213,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryCluster._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryCluster._get_http_options() request, metadata = self._interceptor.pre_create_secondary_cluster( request, metadata @@ -3241,7 +3239,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3368,9 +3366,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryInstance._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseCreateSecondaryInstance._get_http_options() request, metadata = self._interceptor.pre_create_secondary_instance( request, metadata @@ -3396,7 +3392,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3700,7 +3696,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3845,7 +3841,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3990,7 +3986,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4132,7 +4128,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4406,7 +4402,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4560,7 +4556,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4688,9 +4684,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseGenerateClientCertificate._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseGenerateClientCertificate._get_http_options() request, metadata = self._interceptor.pre_generate_client_certificate( request, metadata @@ -5148,9 +5142,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseGetConnectionInfo._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseGetConnectionInfo._get_http_options() request, metadata = self._interceptor.pre_get_connection_info( request, metadata @@ -5622,7 +5614,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5780,7 +5772,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6497,9 +6489,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseListSupportedDatabaseFlags._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseListSupportedDatabaseFlags._get_http_options() request, metadata = self._interceptor.pre_list_supported_database_flags( request, metadata @@ -6565,11 +6555,10 @@ def __call__( resp = self._interceptor.post_list_supported_database_flags(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_supported_database_flags_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_supported_database_flags_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6828,7 +6817,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6981,7 +6970,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7133,7 +7122,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7259,9 +7248,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBAdminRestTransport._BaseSwitchoverCluster._get_http_options() - ) + http_options = _BaseAlloyDBAdminRestTransport._BaseSwitchoverCluster._get_http_options() request, metadata = self._interceptor.pre_switchover_cluster( request, metadata @@ -7287,7 +7274,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7442,7 +7429,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7593,7 +7580,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7744,7 +7731,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8051,7 +8038,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8164,7 +8151,9 @@ def create_secondary_cluster( ) -> Callable[[service.CreateSecondaryClusterRequest], 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._CreateSecondaryCluster(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecondaryCluster( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_secondary_instance( @@ -8172,7 +8161,9 @@ def create_secondary_instance( ) -> Callable[[service.CreateSecondaryInstanceRequest], 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._CreateSecondaryInstance(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecondaryInstance( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_user(self) -> Callable[[service.CreateUserRequest], resources.User]: @@ -8243,7 +8234,9 @@ def generate_client_certificate( ]: # 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._GenerateClientCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateClientCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backup(self) -> Callable[[service.GetBackupRequest], resources.Backup]: @@ -8336,7 +8329,9 @@ def list_supported_database_flags( ]: # 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._ListSupportedDatabaseFlags(self._session, self._host, self._interceptor) # type: ignore + return self._ListSupportedDatabaseFlags( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_users( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest_base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest_base.py index b1b21fb06944..bafbea80ba20 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest_base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_db_admin/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.alloydb_v1beta.types import resources, service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/async_client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/async_client.py index 924dc8b77cce..57ed9ba9938c 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/async_client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1beta import gapic_version as package_version @@ -44,11 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1beta.types import csql_service, resources, service @@ -131,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlloyDBCSQLAdminAsyncClient: The constructed client. """ - return AlloyDBCSQLAdminClient.from_service_account_info.__func__(AlloyDBCSQLAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AlloyDBCSQLAdminClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AlloyDBCSQLAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlloyDBCSQLAdminAsyncClient: The constructed client. """ - return AlloyDBCSQLAdminClient.from_service_account_file.__func__(AlloyDBCSQLAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AlloyDBCSQLAdminClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AlloyDBCSQLAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/client.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/client.py index 8f87c075575c..bbe4a9e2094b 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/client.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1beta import gapic_version as package_version @@ -61,11 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.alloydb_v1beta.types import csql_service, resources, service @@ -84,9 +86,7 @@ class AlloyDBCSQLAdminClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AlloyDBCSQLAdminTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AlloyDBCSQLAdminTransport]] _transport_registry["grpc"] = AlloyDBCSQLAdminGrpcTransport _transport_registry["grpc_asyncio"] = AlloyDBCSQLAdminGrpcAsyncIOTransport _transport_registry["rest"] = AlloyDBCSQLAdminRestTransport @@ -719,11 +719,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlloyDBCSQLAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlloyDBCSQLAdminClient._read_environment_variables() + ) self._client_cert_source = AlloyDBCSQLAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -758,8 +756,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlloyDBCSQLAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/base.py index 18c87ceef091..d734eb1eaf37 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.alloydb_v1beta import gapic_version as package_version from google.cloud.alloydb_v1beta.types import csql_service @@ -224,13 +226,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc.py index 699ce009e5d7..ed5d0c25af5b 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1beta.types import csql_service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc_asyncio.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc_asyncio.py index 5ab22889b08f..c1080166df9c 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.alloydb_v1beta.types import csql_service diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest.py index 29813ed5cfe1..75def1049b10 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -485,9 +487,7 @@ def __call__( """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseRestoreFromCloudSQL._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseRestoreFromCloudSQL._get_http_options() request, metadata = self._interceptor.pre_restore_from_cloud_sql( request, metadata @@ -513,7 +513,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -785,9 +785,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAlloyDBCSQLAdminRestTransport._BaseListLocations._get_transcoded_request( @@ -923,9 +921,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1038,9 +1034,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1295,9 +1289,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAlloyDBCSQLAdminRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest_base.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest_base.py index 7f8b5122cdd8..9ffebd030b32 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest_base.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/services/alloy_dbcsql_admin/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/__init__.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/__init__.py index 2b5e40149a56..41050b818d59 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/__init__.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/__init__.py @@ -13,9 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .csql_resources import CloudSQLBackupRunSource -from .csql_service import RestoreFromCloudSQLRequest -from .data_model import SqlResult, SqlResultColumn, SqlResultRow, SqlResultValue +from .csql_resources import ( + CloudSQLBackupRunSource, +) +from .csql_service import ( + RestoreFromCloudSQLRequest, +) +from .data_model import ( + SqlResult, + SqlResultColumn, + SqlResultRow, + SqlResultValue, +) from .gemini import ( GCAEntitlementType, GCAInstanceConfig, diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/gemini.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/gemini.py index c0fd9c9754e6..87b6f873a894 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/gemini.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/gemini.py @@ -41,6 +41,7 @@ class GCAEntitlementType(proto.Enum): The resource is entitled to the GCA Standard Tier. """ + GCA_ENTITLEMENT_TYPE_UNSPECIFIED = 0 GCA_STANDARD = 1 diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py index 5b4689f7832e..3899d17bf3c4 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/resources.py @@ -17,12 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore from google.cloud.alloydb_v1beta.types import csql_resources, gemini @@ -76,6 +76,7 @@ class InstanceView(proto.Enum): instance, this includes details of each node in the pool. """ + INSTANCE_VIEW_UNSPECIFIED = 0 INSTANCE_VIEW_BASIC = 1 INSTANCE_VIEW_FULL = 2 @@ -99,6 +100,7 @@ class ClusterView(proto.Enum): plus the earliest restorable time if continuous backups are enabled. May increase latency. """ + CLUSTER_VIEW_UNSPECIFIED = 0 CLUSTER_VIEW_BASIC = 1 CLUSTER_VIEW_CONTINUOUS_BACKUP = 2 @@ -124,6 +126,7 @@ class DatabaseVersion(proto.Enum): POSTGRES_18 (6): The database version is Postgres 18. """ + DATABASE_VERSION_UNSPECIFIED = 0 POSTGRES_13 = 1 POSTGRES_14 = 2 @@ -147,6 +150,7 @@ class SubscriptionType(proto.Enum): TRIAL (2): Trial subscription. """ + SUBSCRIPTION_TYPE_UNSPECIFIED = 0 STANDARD = 1 TRIAL = 2 @@ -200,6 +204,7 @@ class MigrationSourceType(proto.Enum): DMS source means the cluster was created via DMS migration job. """ + MIGRATION_SOURCE_TYPE_UNSPECIFIED = 0 DMS = 1 @@ -265,6 +270,7 @@ class Type(proto.Enum): is managed by the customer. KMS key versions will be populated. """ + TYPE_UNSPECIFIED = 0 GOOGLE_DEFAULT_ENCRYPTION = 1 CUSTOMER_MANAGED_ENCRYPTION = 2 @@ -319,6 +325,7 @@ class SslMode(proto.Enum): SSL connections are required. CA verification not enforced. """ + SSL_MODE_UNSPECIFIED = 0 SSL_MODE_ALLOW = 1 SSL_MODE_REQUIRE = 2 @@ -337,6 +344,7 @@ class CaSource(proto.Enum): Certificate Authority (CA) managed by the AlloyDB Cluster. """ + CA_SOURCE_UNSPECIFIED = 0 CA_SOURCE_MANAGED = 1 @@ -747,12 +755,12 @@ class DenyMaintenancePeriod(proto.Message): number=1, message=MaintenanceWindow, ) - deny_maintenance_periods: MutableSequence[ - DenyMaintenancePeriod - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=DenyMaintenancePeriod, + deny_maintenance_periods: MutableSequence[DenyMaintenancePeriod] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=DenyMaintenancePeriod, + ) ) @@ -980,6 +988,7 @@ class State(proto.Enum): PROMOTING (9): The cluster is being promoted. """ + STATE_UNSPECIFIED = 0 READY = 1 STOPPED = 2 @@ -1004,6 +1013,7 @@ class ClusterType(proto.Enum): Secondary cluster that is replicating from another region. This only supports read. """ + CLUSTER_TYPE_UNSPECIFIED = 0 PRIMARY = 1 SECONDARY = 2 @@ -1497,6 +1507,7 @@ class State(proto.Enum): PROMOTING (9): The instance is being promoted. """ + STATE_UNSPECIFIED = 0 READY = 1 STOPPED = 2 @@ -1529,6 +1540,7 @@ class InstanceType(proto.Enum): only. SECONDARY instance is a cross-region read replica """ + INSTANCE_TYPE_UNSPECIFIED = 0 PRIMARY = 1 READ_POOL = 2 @@ -1550,6 +1562,7 @@ class AvailabilityType(proto.Enum): REGIONAL (2): Regional (or Highly) available instance. """ + AVAILABILITY_TYPE_UNSPECIFIED = 0 ZONAL = 1 REGIONAL = 2 @@ -1565,6 +1578,7 @@ class ActivationPolicy(proto.Enum): NEVER (2): The instance is not running. """ + ACTIVATION_POLICY_UNSPECIFIED = 0 ALWAYS = 1 NEVER = 2 @@ -1833,6 +1847,7 @@ class Mode(proto.Enum): Performs a forced update when applicable. This will be fast but may incur a downtime. """ + MODE_UNSPECIFIED = 0 DEFAULT = 1 FORCE_APPLY = 2 @@ -1993,19 +2008,19 @@ class PscInstanceConfig(proto.Message): proto.STRING, number=7, ) - psc_interface_configs: MutableSequence[ - "Instance.PscInterfaceConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="Instance.PscInterfaceConfig", + psc_interface_configs: MutableSequence["Instance.PscInterfaceConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="Instance.PscInterfaceConfig", + ) ) - psc_auto_connections: MutableSequence[ - "Instance.PscAutoConnectionConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message="Instance.PscAutoConnectionConfig", + psc_auto_connections: MutableSequence["Instance.PscAutoConnectionConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message="Instance.PscAutoConnectionConfig", + ) ) class InstanceNetworkConfig(proto.Message): @@ -2445,6 +2460,7 @@ class State(proto.Enum): DELETING (4): The backup is being deleted. """ + STATE_UNSPECIFIED = 0 READY = 1 CREATING = 2 @@ -2469,6 +2485,7 @@ class Type(proto.Enum): backups scheduler due to a continuous backup policy. """ + TYPE_UNSPECIFIED = 0 ON_DEMAND = 1 AUTOMATED = 2 @@ -2700,6 +2717,7 @@ class ValueType(proto.Enum): Denotes that the flag does not accept any values. """ + VALUE_TYPE_UNSPECIFIED = 0 STRING = 1 INTEGER = 2 @@ -2718,6 +2736,7 @@ class Scope(proto.Enum): CONNECTION_POOL (2): The flag is a connection pool flag. """ + SCOPE_UNSPECIFIED = 0 DATABASE = 1 CONNECTION_POOL = 2 @@ -2850,6 +2869,7 @@ class UserType(proto.Enum): Database user that can authenticate via IAM-Based authentication. """ + USER_TYPE_UNSPECIFIED = 0 ALLOYDB_BUILT_IN = 1 ALLOYDB_IAM_USER = 2 diff --git a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/service.py b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/service.py index 753af81c3709..9f433882a57c 100644 --- a/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/service.py +++ b/packages/google-cloud-alloydb/google/cloud/alloydb_v1beta/types/service.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.alloydb_v1beta.types import data_model, resources @@ -815,6 +815,7 @@ class Status(proto.Enum): CANCELLED (7): Cancellation complete. """ + STATUS_UNSPECIFIED = 0 NOT_STARTED = 4 IN_PROGRESS = 5 @@ -845,6 +846,7 @@ class Stage(proto.Enum): CLEANUP (7): Cleanup. """ + STAGE_UNSPECIFIED = 0 ALLOYDB_PRECHECK = 1 PG_UPGRADE_CHECK = 2 @@ -958,12 +960,12 @@ class ClusterUpgradeDetails(proto.Message): number=4, enum=resources.DatabaseVersion, ) - stage_info: MutableSequence[ - "UpgradeClusterResponse.StageInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="UpgradeClusterResponse.StageInfo", + stage_info: MutableSequence["UpgradeClusterResponse.StageInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="UpgradeClusterResponse.StageInfo", + ) ) instance_upgrade_details: MutableSequence[ "UpgradeClusterResponse.InstanceUpgradeDetails" @@ -982,12 +984,12 @@ class ClusterUpgradeDetails(proto.Message): proto.STRING, number=2, ) - cluster_upgrade_details: MutableSequence[ - ClusterUpgradeDetails - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ClusterUpgradeDetails, + cluster_upgrade_details: MutableSequence[ClusterUpgradeDetails] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ClusterUpgradeDetails, + ) ) @@ -1491,12 +1493,12 @@ class CreateInstanceRequests(proto.Message): to be created. This list should not be empty. """ - create_instance_requests: MutableSequence[ - "CreateInstanceRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CreateInstanceRequest", + create_instance_requests: MutableSequence["CreateInstanceRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CreateInstanceRequest", + ) ) @@ -1586,13 +1588,13 @@ class BatchCreateInstancesMetadata(proto.Message): proto.STRING, number=1, ) - instance_statuses: MutableMapping[ - str, "BatchCreateInstanceStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=2, - message="BatchCreateInstanceStatus", + instance_statuses: MutableMapping[str, "BatchCreateInstanceStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=2, + message="BatchCreateInstanceStatus", + ) ) @@ -1666,6 +1668,7 @@ class State(proto.Enum): was rolled back and deleted due to some other failure during BatchCreateInstances operation. """ + STATE_UNSPECIFIED = 0 PENDING_CREATE = 1 READY = 2 @@ -1918,6 +1921,7 @@ class FaultType(proto.Enum): STOP_VM (1): Stop the VM """ + FAULT_TYPE_UNSPECIFIED = 0 STOP_VM = 1 @@ -2132,6 +2136,7 @@ class Status(proto.Enum): https://google.aip.dev/193 but will be returned as part of this message. """ + STATUS_UNSPECIFIED = 0 OK = 1 PARTIAL = 2 @@ -2486,12 +2491,12 @@ class ListSupportedDatabaseFlagsResponse(proto.Message): def raw_page(self): return self - supported_database_flags: MutableSequence[ - resources.SupportedDatabaseFlag - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.SupportedDatabaseFlag, + supported_database_flags: MutableSequence[resources.SupportedDatabaseFlag] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.SupportedDatabaseFlag, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -2786,6 +2791,7 @@ class State(proto.Enum): The promote operation is completed and the database is available for write. """ + STATE_UNSPECIFIED = 0 PROMOTE_CLUSTER_AVAILABLE_FOR_READ = 1 PROMOTE_CLUSTER_AVAILABLE_FOR_WRITE = 2 diff --git a/packages/google-cloud-alloydb/noxfile.py b/packages/google-cloud-alloydb/noxfile.py index d7e47c1d5e3d..6f9875d224ce 100644 --- a/packages/google-cloud-alloydb/noxfile.py +++ b/packages/google-cloud-alloydb/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py index 9f4286df5201..3a4a5fd67e11 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_db_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,17 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,26 +62,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.alloydb_v1.services.alloy_db_admin import ( AlloyDBAdminAsyncClient, @@ -947,10 +949,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -995,10 +996,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1034,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1276,13 +1275,13 @@ def test_alloy_db_admin_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4735,9 +4734,9 @@ def test_switchover_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switchover_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switchover_cluster] = ( + mock_rpc + ) request = {} client.switchover_cluster(request) @@ -7337,9 +7336,9 @@ def test_batch_create_instances_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_instances] = ( + mock_rpc + ) request = {} client.batch_create_instances(request) @@ -8264,9 +8263,9 @@ def test_failover_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_instance] = ( + mock_rpc + ) request = {} client.failover_instance(request) @@ -8944,9 +8943,9 @@ def test_restart_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -12462,9 +12461,9 @@ def test_get_connection_info_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_info] = ( + mock_rpc + ) request = {} client.get_connection_info(request) @@ -16937,9 +16936,9 @@ def test_switchover_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switchover_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switchover_cluster] = ( + mock_rpc + ) request = {} client.switchover_cluster(request) @@ -18367,9 +18366,9 @@ def test_batch_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_instances] = ( + mock_rpc + ) request = {} client.batch_create_instances(request) @@ -18895,9 +18894,9 @@ def test_failover_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_instance] = ( + mock_rpc + ) request = {} client.failover_instance(request) @@ -19265,9 +19264,9 @@ def test_restart_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -21133,9 +21132,9 @@ def test_get_connection_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_info] = ( + mock_rpc + ) request = {} client.get_connection_info(request) @@ -24547,8 +24546,9 @@ def test_list_clusters_rest_bad_request(request_type=service.ListClustersRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24613,17 +24613,19 @@ def test_list_clusters_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_clusters" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_clusters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_clusters" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_clusters_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24674,8 +24676,9 @@ def test_get_cluster_rest_bad_request(request_type=service.GetClusterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24758,17 +24761,19 @@ def test_get_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24817,8 +24822,9 @@ def test_create_cluster_rest_bad_request(request_type=service.CreateClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25039,19 +25045,20 @@ def test_create_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25102,8 +25109,9 @@ def test_update_cluster_rest_bad_request(request_type=service.UpdateClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25326,19 +25334,20 @@ def test_update_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_update_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_update_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_update_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_update_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_update_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25387,8 +25396,9 @@ def test_export_cluster_rest_bad_request(request_type=service.ExportClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25445,19 +25455,20 @@ def test_export_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_export_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_export_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_export_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_export_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_export_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_export_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25506,8 +25517,9 @@ def test_import_cluster_rest_bad_request(request_type=service.ImportClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25564,19 +25576,20 @@ def test_import_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_import_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_import_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_import_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_import_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_import_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_import_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25625,8 +25638,9 @@ def test_upgrade_cluster_rest_bad_request(request_type=service.UpgradeClusterReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25683,19 +25697,20 @@ def test_upgrade_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_upgrade_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_upgrade_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_upgrade_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_upgrade_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_upgrade_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_upgrade_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25744,8 +25759,9 @@ def test_delete_cluster_rest_bad_request(request_type=service.DeleteClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25802,19 +25818,20 @@ def test_delete_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_delete_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_delete_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_delete_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_delete_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_delete_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_delete_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25863,8 +25880,9 @@ def test_promote_cluster_rest_bad_request(request_type=service.PromoteClusterReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25921,19 +25939,20 @@ def test_promote_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_promote_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_promote_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_promote_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_promote_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_promote_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_promote_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25984,8 +26003,9 @@ def test_switchover_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26042,19 +26062,21 @@ def test_switchover_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_switchover_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_switchover_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_switchover_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_switchover_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_switchover_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_switchover_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26105,8 +26127,9 @@ def test_restore_cluster_rest_bad_request(request_type=service.RestoreClusterReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26163,19 +26186,20 @@ def test_restore_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_restore_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_restore_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_restore_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_restore_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_restore_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_restore_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26226,8 +26250,9 @@ def test_create_secondary_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26448,20 +26473,21 @@ def test_create_secondary_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_secondary_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_create_secondary_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_secondary_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_secondary_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_create_secondary_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_secondary_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26512,8 +26538,9 @@ def test_list_instances_rest_bad_request(request_type=service.ListInstancesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26578,17 +26605,19 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26641,8 +26670,9 @@ def test_get_instance_rest_bad_request(request_type=service.GetInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26735,17 +26765,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26794,8 +26826,9 @@ def test_create_instance_rest_bad_request(request_type=service.CreateInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27001,19 +27034,20 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27064,8 +27098,9 @@ def test_create_secondary_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27271,20 +27306,21 @@ def test_create_secondary_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_secondary_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_create_secondary_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_secondary_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_secondary_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_create_secondary_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_secondary_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27337,8 +27373,9 @@ def test_batch_create_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27565,20 +27602,21 @@ def test_batch_create_instances_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_batch_create_instances" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_batch_create_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_batch_create_instances" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_batch_create_instances" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_batch_create_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_batch_create_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27633,8 +27671,9 @@ def test_update_instance_rest_bad_request(request_type=service.UpdateInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27844,19 +27883,20 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_update_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27907,8 +27947,9 @@ def test_delete_instance_rest_bad_request(request_type=service.DeleteInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27967,19 +28008,20 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_delete_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_delete_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28032,8 +28074,9 @@ def test_failover_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28092,19 +28135,21 @@ def test_failover_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_failover_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_failover_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_failover_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_failover_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_failover_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_failover_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28157,8 +28202,9 @@ def test_inject_fault_rest_bad_request(request_type=service.InjectFaultRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28217,19 +28263,20 @@ def test_inject_fault_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_inject_fault" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_inject_fault_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_inject_fault" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_inject_fault" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_inject_fault_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_inject_fault" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28280,8 +28327,9 @@ def test_restart_instance_rest_bad_request(request_type=service.RestartInstanceR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28340,19 +28388,21 @@ def test_restart_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_restart_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_restart_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_restart_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_restart_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_restart_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_restart_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28403,8 +28453,9 @@ def test_execute_sql_rest_bad_request(request_type=service.ExecuteSqlRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28466,17 +28517,19 @@ def test_execute_sql_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_execute_sql" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_execute_sql_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_execute_sql" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_execute_sql" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_execute_sql_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_execute_sql" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28525,8 +28578,9 @@ def test_list_backups_rest_bad_request(request_type=service.ListBackupsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28591,17 +28645,19 @@ def test_list_backups_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_backups" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_backups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_backups" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_backups_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_backups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28652,8 +28708,9 @@ def test_get_backup_rest_bad_request(request_type=service.GetBackupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28740,17 +28797,19 @@ def test_get_backup_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_backup" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_backup" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28799,8 +28858,9 @@ def test_create_backup_rest_bad_request(request_type=service.CreateBackupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28953,19 +29013,20 @@ def test_create_backup_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_backup" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_backup" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_backup" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29016,8 +29077,9 @@ def test_update_backup_rest_bad_request(request_type=service.UpdateBackupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29172,19 +29234,20 @@ def test_update_backup_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_update_backup" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_update_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_update_backup" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_update_backup" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_update_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29233,8 +29296,9 @@ def test_delete_backup_rest_bad_request(request_type=service.DeleteBackupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29291,19 +29355,20 @@ def test_delete_backup_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_delete_backup" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_delete_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_delete_backup" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_delete_backup" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_delete_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_delete_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29354,8 +29419,9 @@ def test_list_supported_database_flags_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29418,18 +29484,20 @@ def test_list_supported_database_flags_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_supported_database_flags" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_list_supported_database_flags_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_supported_database_flags" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_supported_database_flags" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_list_supported_database_flags_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_supported_database_flags" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29487,8 +29555,9 @@ def test_generate_client_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29553,18 +29622,20 @@ def test_generate_client_certificate_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_generate_client_certificate" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_generate_client_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_generate_client_certificate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_generate_client_certificate" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_generate_client_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_generate_client_certificate" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29624,8 +29695,9 @@ def test_get_connection_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29696,17 +29768,20 @@ def test_get_connection_info_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_connection_info" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_connection_info_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_connection_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_connection_info" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_get_connection_info_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_connection_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29757,8 +29832,9 @@ def test_list_users_rest_bad_request(request_type=service.ListUsersRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29823,17 +29899,19 @@ def test_list_users_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_users" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_users_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_users" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_users" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_users_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_users" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29884,8 +29962,9 @@ def test_get_user_rest_bad_request(request_type=service.GetUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29958,17 +30037,19 @@ def test_get_user_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_user" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_user_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_user" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_user_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_user" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30017,8 +30098,9 @@ def test_create_user_rest_bad_request(request_type=service.CreateUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30163,17 +30245,19 @@ def test_create_user_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_user" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_user_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_user" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_user_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_user" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30226,8 +30310,9 @@ def test_update_user_rest_bad_request(request_type=service.UpdateUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30376,17 +30461,19 @@ def test_update_user_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_update_user" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_update_user_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_update_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_user" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_user_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_update_user" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30437,8 +30524,9 @@ def test_delete_user_rest_bad_request(request_type=service.DeleteUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30497,13 +30585,13 @@ def test_delete_user_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "pre_delete_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_delete_user" + ) as pre, + ): pre.assert_not_called() pb_message = service.DeleteUserRequest.pb(service.DeleteUserRequest()) transcode.return_value = { @@ -30544,8 +30632,9 @@ def test_list_databases_rest_bad_request(request_type=service.ListDatabasesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30608,17 +30697,19 @@ def test_list_databases_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_databases" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_databases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_databases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_databases" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_databases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_databases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30671,8 +30762,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -30731,8 +30823,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -30793,8 +30886,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -30855,8 +30949,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -30917,8 +31012,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -30979,8 +31075,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31908,11 +32005,14 @@ def test_alloy_db_admin_base_transport(): def test_alloy_db_admin_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.alloydb_v1.services.alloy_db_admin.transports.AlloyDBAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.alloydb_v1.services.alloy_db_admin.transports.AlloyDBAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlloyDBAdminTransport( @@ -31929,9 +32029,12 @@ def test_alloy_db_admin_base_transport_with_credentials_file(): def test_alloy_db_admin_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.alloydb_v1.services.alloy_db_admin.transports.AlloyDBAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.alloydb_v1.services.alloy_db_admin.transports.AlloyDBAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlloyDBAdminTransport() @@ -32003,11 +32106,12 @@ def test_alloy_db_admin_transport_auth_gdch_credentials(transport_class): def test_alloy_db_admin_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_dbcsql_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_dbcsql_admin.py index c221b6181eb6..542ce16b042f 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_dbcsql_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1/test_alloy_dbcsql_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +60,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.alloydb_v1.services.alloy_dbcsql_admin import ( AlloyDBCSQLAdminAsyncClient, @@ -993,10 +995,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1042,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1080,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1331,13 +1330,13 @@ def test_alloy_dbcsql_admin_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1450,9 +1449,9 @@ def test_restore_from_cloud_sql_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_from_cloud_sql - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_from_cloud_sql] = ( + mock_rpc + ) request = {} client.restore_from_cloud_sql(request) @@ -1742,9 +1741,9 @@ def test_restore_from_cloud_sql_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_from_cloud_sql - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_from_cloud_sql] = ( + mock_rpc + ) request = {} client.restore_from_cloud_sql(request) @@ -2104,8 +2103,9 @@ def test_restore_from_cloud_sql_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2162,20 +2162,21 @@ def test_restore_from_cloud_sql_rest_interceptors(null_interceptor): ) client = AlloyDBCSQLAdminClient(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.AlloyDBCSQLAdminRestInterceptor, "post_restore_from_cloud_sql" - ) as post, mock.patch.object( - transports.AlloyDBCSQLAdminRestInterceptor, - "post_restore_from_cloud_sql_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBCSQLAdminRestInterceptor, "pre_restore_from_cloud_sql" - ) as pre: + 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.AlloyDBCSQLAdminRestInterceptor, "post_restore_from_cloud_sql" + ) as post, + mock.patch.object( + transports.AlloyDBCSQLAdminRestInterceptor, + "post_restore_from_cloud_sql_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBCSQLAdminRestInterceptor, "pre_restore_from_cloud_sql" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2228,8 +2229,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2288,8 +2290,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2350,8 +2353,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2412,8 +2416,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2474,8 +2479,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2536,8 +2542,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2695,11 +2702,14 @@ def test_alloy_dbcsql_admin_base_transport(): def test_alloy_dbcsql_admin_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.alloydb_v1.services.alloy_dbcsql_admin.transports.AlloyDBCSQLAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.alloydb_v1.services.alloy_dbcsql_admin.transports.AlloyDBCSQLAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlloyDBCSQLAdminTransport( @@ -2716,9 +2726,12 @@ def test_alloy_dbcsql_admin_base_transport_with_credentials_file(): def test_alloy_dbcsql_admin_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.alloydb_v1.services.alloy_dbcsql_admin.transports.AlloyDBCSQLAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.alloydb_v1.services.alloy_dbcsql_admin.transports.AlloyDBCSQLAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlloyDBCSQLAdminTransport() @@ -2790,11 +2803,12 @@ def test_alloy_dbcsql_admin_transport_auth_gdch_credentials(transport_class): def test_alloy_dbcsql_admin_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py index 202ab9366a81..c6c85265cdb9 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_db_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,17 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,26 +62,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.alloydb_v1alpha.services.alloy_db_admin import ( AlloyDBAdminAsyncClient, @@ -953,10 +955,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1001,10 +1002,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1040,10 +1040,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1282,13 +1281,13 @@ def test_alloy_db_admin_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4749,9 +4748,9 @@ def test_switchover_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switchover_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switchover_cluster] = ( + mock_rpc + ) request = {} client.switchover_cluster(request) @@ -7355,9 +7354,9 @@ def test_batch_create_instances_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_instances] = ( + mock_rpc + ) request = {} client.batch_create_instances(request) @@ -8282,9 +8281,9 @@ def test_failover_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_instance] = ( + mock_rpc + ) request = {} client.failover_instance(request) @@ -8962,9 +8961,9 @@ def test_restart_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -12494,9 +12493,9 @@ def test_get_connection_info_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_info] = ( + mock_rpc + ) request = {} client.get_connection_info(request) @@ -17342,9 +17341,9 @@ def test_switchover_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switchover_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switchover_cluster] = ( + mock_rpc + ) request = {} client.switchover_cluster(request) @@ -18772,9 +18771,9 @@ def test_batch_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_instances] = ( + mock_rpc + ) request = {} client.batch_create_instances(request) @@ -19300,9 +19299,9 @@ def test_failover_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_instance] = ( + mock_rpc + ) request = {} client.failover_instance(request) @@ -19670,9 +19669,9 @@ def test_restart_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -21547,9 +21546,9 @@ def test_get_connection_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_info] = ( + mock_rpc + ) request = {} client.get_connection_info(request) @@ -25231,8 +25230,9 @@ def test_list_clusters_rest_bad_request(request_type=service.ListClustersRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25297,17 +25297,19 @@ def test_list_clusters_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_clusters" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_clusters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_clusters" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_clusters_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25358,8 +25360,9 @@ def test_get_cluster_rest_bad_request(request_type=service.GetClusterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25446,17 +25449,19 @@ def test_get_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25505,8 +25510,9 @@ def test_create_cluster_rest_bad_request(request_type=service.CreateClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25730,19 +25736,20 @@ def test_create_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25793,8 +25800,9 @@ def test_update_cluster_rest_bad_request(request_type=service.UpdateClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26020,19 +26028,20 @@ def test_update_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_update_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_update_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_update_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_update_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_update_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26081,8 +26090,9 @@ def test_export_cluster_rest_bad_request(request_type=service.ExportClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26139,19 +26149,20 @@ def test_export_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_export_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_export_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_export_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_export_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_export_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_export_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26200,8 +26211,9 @@ def test_import_cluster_rest_bad_request(request_type=service.ImportClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26258,19 +26270,20 @@ def test_import_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_import_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_import_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_import_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_import_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_import_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_import_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26319,8 +26332,9 @@ def test_upgrade_cluster_rest_bad_request(request_type=service.UpgradeClusterReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26377,19 +26391,20 @@ def test_upgrade_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_upgrade_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_upgrade_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_upgrade_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_upgrade_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_upgrade_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_upgrade_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26438,8 +26453,9 @@ def test_delete_cluster_rest_bad_request(request_type=service.DeleteClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26496,19 +26512,20 @@ def test_delete_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_delete_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_delete_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_delete_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_delete_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_delete_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_delete_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26557,8 +26574,9 @@ def test_promote_cluster_rest_bad_request(request_type=service.PromoteClusterReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26615,19 +26633,20 @@ def test_promote_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_promote_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_promote_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_promote_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_promote_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_promote_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_promote_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26678,8 +26697,9 @@ def test_switchover_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26736,19 +26756,21 @@ def test_switchover_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_switchover_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_switchover_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_switchover_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_switchover_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_switchover_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_switchover_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26799,8 +26821,9 @@ def test_restore_cluster_rest_bad_request(request_type=service.RestoreClusterReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26857,19 +26880,20 @@ def test_restore_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_restore_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_restore_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_restore_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_restore_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_restore_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_restore_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26920,8 +26944,9 @@ def test_create_secondary_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27145,20 +27170,21 @@ def test_create_secondary_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_secondary_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_create_secondary_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_secondary_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_secondary_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_create_secondary_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_secondary_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27209,8 +27235,9 @@ def test_list_instances_rest_bad_request(request_type=service.ListInstancesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27275,17 +27302,19 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27338,8 +27367,9 @@ def test_get_instance_rest_bad_request(request_type=service.GetInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27434,17 +27464,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27493,8 +27525,9 @@ def test_create_instance_rest_bad_request(request_type=service.CreateInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27706,19 +27739,20 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27769,8 +27803,9 @@ def test_create_secondary_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27982,20 +28017,21 @@ def test_create_secondary_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_secondary_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_create_secondary_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_secondary_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_secondary_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_create_secondary_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_secondary_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28048,8 +28084,9 @@ def test_batch_create_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28282,20 +28319,21 @@ def test_batch_create_instances_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_batch_create_instances" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_batch_create_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_batch_create_instances" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_batch_create_instances" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_batch_create_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_batch_create_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28350,8 +28388,9 @@ def test_update_instance_rest_bad_request(request_type=service.UpdateInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28567,19 +28606,20 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_update_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28630,8 +28670,9 @@ def test_delete_instance_rest_bad_request(request_type=service.DeleteInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28690,19 +28731,20 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_delete_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_delete_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28755,8 +28797,9 @@ def test_failover_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28815,19 +28858,21 @@ def test_failover_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_failover_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_failover_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_failover_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_failover_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_failover_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_failover_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28880,8 +28925,9 @@ def test_inject_fault_rest_bad_request(request_type=service.InjectFaultRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28940,19 +28986,20 @@ def test_inject_fault_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_inject_fault" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_inject_fault_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_inject_fault" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_inject_fault" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_inject_fault_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_inject_fault" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29003,8 +29050,9 @@ def test_restart_instance_rest_bad_request(request_type=service.RestartInstanceR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29063,19 +29111,21 @@ def test_restart_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_restart_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_restart_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_restart_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_restart_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_restart_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_restart_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29126,8 +29176,9 @@ def test_execute_sql_rest_bad_request(request_type=service.ExecuteSqlRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29189,17 +29240,19 @@ def test_execute_sql_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_execute_sql" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_execute_sql_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_execute_sql" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_execute_sql" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_execute_sql_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_execute_sql" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29248,8 +29301,9 @@ def test_list_backups_rest_bad_request(request_type=service.ListBackupsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29314,17 +29368,19 @@ def test_list_backups_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_backups" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_backups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_backups" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_backups_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_backups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29375,8 +29431,9 @@ def test_get_backup_rest_bad_request(request_type=service.GetBackupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29465,17 +29522,19 @@ def test_get_backup_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_backup" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_backup" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29524,8 +29583,9 @@ def test_create_backup_rest_bad_request(request_type=service.CreateBackupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29679,19 +29739,20 @@ def test_create_backup_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_backup" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_backup" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_backup" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29742,8 +29803,9 @@ def test_update_backup_rest_bad_request(request_type=service.UpdateBackupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29899,19 +29961,20 @@ def test_update_backup_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_update_backup" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_update_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_update_backup" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_update_backup" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_update_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29960,8 +30023,9 @@ def test_delete_backup_rest_bad_request(request_type=service.DeleteBackupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30018,19 +30082,20 @@ def test_delete_backup_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_delete_backup" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_delete_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_delete_backup" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_delete_backup" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_delete_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_delete_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30081,8 +30146,9 @@ def test_list_supported_database_flags_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30145,18 +30211,20 @@ def test_list_supported_database_flags_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_supported_database_flags" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_list_supported_database_flags_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_supported_database_flags" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_supported_database_flags" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_list_supported_database_flags_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_supported_database_flags" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30214,8 +30282,9 @@ def test_generate_client_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30282,18 +30351,20 @@ def test_generate_client_certificate_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_generate_client_certificate" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_generate_client_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_generate_client_certificate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_generate_client_certificate" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_generate_client_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_generate_client_certificate" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30353,8 +30424,9 @@ def test_get_connection_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30429,17 +30501,20 @@ def test_get_connection_info_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_connection_info" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_connection_info_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_connection_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_connection_info" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_get_connection_info_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_connection_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30490,8 +30565,9 @@ def test_list_users_rest_bad_request(request_type=service.ListUsersRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30556,17 +30632,19 @@ def test_list_users_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_users" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_users_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_users" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_users" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_users_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_users" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30617,8 +30695,9 @@ def test_get_user_rest_bad_request(request_type=service.GetUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30691,17 +30770,19 @@ def test_get_user_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_user" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_user_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_user" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_user_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_user" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30750,8 +30831,9 @@ def test_create_user_rest_bad_request(request_type=service.CreateUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30896,17 +30978,19 @@ def test_create_user_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_user" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_user_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_user" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_user_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_user" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30959,8 +31043,9 @@ def test_update_user_rest_bad_request(request_type=service.UpdateUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31109,17 +31194,19 @@ def test_update_user_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_update_user" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_update_user_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_update_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_user" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_user_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_update_user" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31170,8 +31257,9 @@ def test_delete_user_rest_bad_request(request_type=service.DeleteUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31230,13 +31318,13 @@ def test_delete_user_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "pre_delete_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_delete_user" + ) as pre, + ): pre.assert_not_called() pb_message = service.DeleteUserRequest.pb(service.DeleteUserRequest()) transcode.return_value = { @@ -31277,8 +31365,9 @@ def test_list_databases_rest_bad_request(request_type=service.ListDatabasesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31341,17 +31430,19 @@ def test_list_databases_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_databases" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_databases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_databases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_databases" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_databases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_databases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31402,8 +31493,9 @@ def test_create_database_rest_bad_request(request_type=service.CreateDatabaseReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31554,17 +31646,19 @@ def test_create_database_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_database" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_database_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_database" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_database_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31615,8 +31709,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31675,8 +31770,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31737,8 +31833,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31799,8 +31896,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31861,8 +31959,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31923,8 +32022,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -32873,11 +32973,14 @@ def test_alloy_db_admin_base_transport(): def test_alloy_db_admin_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.alloydb_v1alpha.services.alloy_db_admin.transports.AlloyDBAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.alloydb_v1alpha.services.alloy_db_admin.transports.AlloyDBAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlloyDBAdminTransport( @@ -32894,9 +32997,12 @@ def test_alloy_db_admin_base_transport_with_credentials_file(): def test_alloy_db_admin_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.alloydb_v1alpha.services.alloy_db_admin.transports.AlloyDBAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.alloydb_v1alpha.services.alloy_db_admin.transports.AlloyDBAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlloyDBAdminTransport() @@ -32968,11 +33074,12 @@ def test_alloy_db_admin_transport_auth_gdch_credentials(transport_class): def test_alloy_db_admin_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_dbcsql_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_dbcsql_admin.py index 1e7a7917d61e..43fc4e199701 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_dbcsql_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1alpha/test_alloy_dbcsql_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +60,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.alloydb_v1alpha.services.alloy_dbcsql_admin import ( AlloyDBCSQLAdminAsyncClient, @@ -994,10 +996,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1043,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1081,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1332,13 +1331,13 @@ def test_alloy_dbcsql_admin_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1451,9 +1450,9 @@ def test_restore_from_cloud_sql_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_from_cloud_sql - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_from_cloud_sql] = ( + mock_rpc + ) request = {} client.restore_from_cloud_sql(request) @@ -1743,9 +1742,9 @@ def test_restore_from_cloud_sql_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_from_cloud_sql - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_from_cloud_sql] = ( + mock_rpc + ) request = {} client.restore_from_cloud_sql(request) @@ -2105,8 +2104,9 @@ def test_restore_from_cloud_sql_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2163,20 +2163,21 @@ def test_restore_from_cloud_sql_rest_interceptors(null_interceptor): ) client = AlloyDBCSQLAdminClient(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.AlloyDBCSQLAdminRestInterceptor, "post_restore_from_cloud_sql" - ) as post, mock.patch.object( - transports.AlloyDBCSQLAdminRestInterceptor, - "post_restore_from_cloud_sql_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBCSQLAdminRestInterceptor, "pre_restore_from_cloud_sql" - ) as pre: + 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.AlloyDBCSQLAdminRestInterceptor, "post_restore_from_cloud_sql" + ) as post, + mock.patch.object( + transports.AlloyDBCSQLAdminRestInterceptor, + "post_restore_from_cloud_sql_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBCSQLAdminRestInterceptor, "pre_restore_from_cloud_sql" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2229,8 +2230,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2289,8 +2291,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2351,8 +2354,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2413,8 +2417,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2475,8 +2480,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2537,8 +2543,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2696,11 +2703,14 @@ def test_alloy_dbcsql_admin_base_transport(): def test_alloy_dbcsql_admin_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.alloydb_v1alpha.services.alloy_dbcsql_admin.transports.AlloyDBCSQLAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.alloydb_v1alpha.services.alloy_dbcsql_admin.transports.AlloyDBCSQLAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlloyDBCSQLAdminTransport( @@ -2717,9 +2727,12 @@ def test_alloy_dbcsql_admin_base_transport_with_credentials_file(): def test_alloy_dbcsql_admin_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.alloydb_v1alpha.services.alloy_dbcsql_admin.transports.AlloyDBCSQLAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.alloydb_v1alpha.services.alloy_dbcsql_admin.transports.AlloyDBCSQLAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlloyDBCSQLAdminTransport() @@ -2791,11 +2804,12 @@ def test_alloy_dbcsql_admin_transport_auth_gdch_credentials(transport_class): def test_alloy_dbcsql_admin_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py index c47fc6b92006..df7df59b4e37 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_db_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,17 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,26 +62,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.alloydb_v1beta.services.alloy_db_admin import ( AlloyDBAdminAsyncClient, @@ -953,10 +955,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1001,10 +1002,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1040,10 +1040,9 @@ def test_alloy_db_admin_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1282,13 +1281,13 @@ def test_alloy_db_admin_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4745,9 +4744,9 @@ def test_switchover_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switchover_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switchover_cluster] = ( + mock_rpc + ) request = {} client.switchover_cluster(request) @@ -7347,9 +7346,9 @@ def test_batch_create_instances_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_instances] = ( + mock_rpc + ) request = {} client.batch_create_instances(request) @@ -8274,9 +8273,9 @@ def test_failover_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_instance] = ( + mock_rpc + ) request = {} client.failover_instance(request) @@ -8954,9 +8953,9 @@ def test_restart_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -12482,9 +12481,9 @@ def test_get_connection_info_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_info] = ( + mock_rpc + ) request = {} client.get_connection_info(request) @@ -17330,9 +17329,9 @@ def test_switchover_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switchover_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switchover_cluster] = ( + mock_rpc + ) request = {} client.switchover_cluster(request) @@ -18760,9 +18759,9 @@ def test_batch_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_instances] = ( + mock_rpc + ) request = {} client.batch_create_instances(request) @@ -19288,9 +19287,9 @@ def test_failover_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_instance] = ( + mock_rpc + ) request = {} client.failover_instance(request) @@ -19658,9 +19657,9 @@ def test_restart_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -21535,9 +21534,9 @@ def test_get_connection_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_info] = ( + mock_rpc + ) request = {} client.get_connection_info(request) @@ -25216,8 +25215,9 @@ def test_list_clusters_rest_bad_request(request_type=service.ListClustersRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25282,17 +25282,19 @@ def test_list_clusters_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_clusters" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_clusters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_clusters" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_clusters_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25343,8 +25345,9 @@ def test_get_cluster_rest_bad_request(request_type=service.GetClusterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25429,17 +25432,19 @@ def test_get_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25488,8 +25493,9 @@ def test_create_cluster_rest_bad_request(request_type=service.CreateClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25712,19 +25718,20 @@ def test_create_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25775,8 +25782,9 @@ def test_update_cluster_rest_bad_request(request_type=service.UpdateClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26001,19 +26009,20 @@ def test_update_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_update_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_update_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_update_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_update_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_update_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26062,8 +26071,9 @@ def test_export_cluster_rest_bad_request(request_type=service.ExportClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26120,19 +26130,20 @@ def test_export_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_export_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_export_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_export_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_export_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_export_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_export_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26181,8 +26192,9 @@ def test_import_cluster_rest_bad_request(request_type=service.ImportClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26239,19 +26251,20 @@ def test_import_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_import_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_import_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_import_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_import_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_import_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_import_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26300,8 +26313,9 @@ def test_upgrade_cluster_rest_bad_request(request_type=service.UpgradeClusterReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26358,19 +26372,20 @@ def test_upgrade_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_upgrade_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_upgrade_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_upgrade_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_upgrade_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_upgrade_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_upgrade_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26419,8 +26434,9 @@ def test_delete_cluster_rest_bad_request(request_type=service.DeleteClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26477,19 +26493,20 @@ def test_delete_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_delete_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_delete_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_delete_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_delete_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_delete_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_delete_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26538,8 +26555,9 @@ def test_promote_cluster_rest_bad_request(request_type=service.PromoteClusterReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26596,19 +26614,20 @@ def test_promote_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_promote_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_promote_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_promote_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_promote_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_promote_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_promote_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26659,8 +26678,9 @@ def test_switchover_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26717,19 +26737,21 @@ def test_switchover_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_switchover_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_switchover_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_switchover_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_switchover_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_switchover_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_switchover_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26780,8 +26802,9 @@ def test_restore_cluster_rest_bad_request(request_type=service.RestoreClusterReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26838,19 +26861,20 @@ def test_restore_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_restore_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_restore_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_restore_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_restore_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_restore_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_restore_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26901,8 +26925,9 @@ def test_create_secondary_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27125,20 +27150,21 @@ def test_create_secondary_cluster_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_secondary_cluster" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_create_secondary_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_secondary_cluster" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_secondary_cluster" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_create_secondary_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_secondary_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27189,8 +27215,9 @@ def test_list_instances_rest_bad_request(request_type=service.ListInstancesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27255,17 +27282,19 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27318,8 +27347,9 @@ def test_get_instance_rest_bad_request(request_type=service.GetInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27412,17 +27442,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27471,8 +27503,9 @@ def test_create_instance_rest_bad_request(request_type=service.CreateInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27683,19 +27716,20 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27746,8 +27780,9 @@ def test_create_secondary_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27958,20 +27993,21 @@ def test_create_secondary_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_secondary_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_create_secondary_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_secondary_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_secondary_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_create_secondary_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_secondary_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28024,8 +28060,9 @@ def test_batch_create_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28257,20 +28294,21 @@ def test_batch_create_instances_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_batch_create_instances" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_batch_create_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_batch_create_instances" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_batch_create_instances" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_batch_create_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_batch_create_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28325,8 +28363,9 @@ def test_update_instance_rest_bad_request(request_type=service.UpdateInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28541,19 +28580,20 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_update_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28604,8 +28644,9 @@ def test_delete_instance_rest_bad_request(request_type=service.DeleteInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28664,19 +28705,20 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_delete_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_delete_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28729,8 +28771,9 @@ def test_failover_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28789,19 +28832,21 @@ def test_failover_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_failover_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_failover_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_failover_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_failover_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_failover_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_failover_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28854,8 +28899,9 @@ def test_inject_fault_rest_bad_request(request_type=service.InjectFaultRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28914,19 +28960,20 @@ def test_inject_fault_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_inject_fault" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_inject_fault_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_inject_fault" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_inject_fault" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_inject_fault_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_inject_fault" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28977,8 +29024,9 @@ def test_restart_instance_rest_bad_request(request_type=service.RestartInstanceR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29037,19 +29085,21 @@ def test_restart_instance_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_restart_instance" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_restart_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_restart_instance" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_restart_instance" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_restart_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_restart_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29100,8 +29150,9 @@ def test_execute_sql_rest_bad_request(request_type=service.ExecuteSqlRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29163,17 +29214,19 @@ def test_execute_sql_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_execute_sql" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_execute_sql_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_execute_sql" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_execute_sql" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_execute_sql_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_execute_sql" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29222,8 +29275,9 @@ def test_list_backups_rest_bad_request(request_type=service.ListBackupsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29288,17 +29342,19 @@ def test_list_backups_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_backups" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_backups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_backups" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_backups_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_backups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29349,8 +29405,9 @@ def test_get_backup_rest_bad_request(request_type=service.GetBackupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29437,17 +29494,19 @@ def test_get_backup_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_backup" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_backup" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29496,8 +29555,9 @@ def test_create_backup_rest_bad_request(request_type=service.CreateBackupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29650,19 +29710,20 @@ def test_create_backup_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_backup" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_backup" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_create_backup" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29713,8 +29774,9 @@ def test_update_backup_rest_bad_request(request_type=service.UpdateBackupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29869,19 +29931,20 @@ def test_update_backup_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_update_backup" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_update_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_update_backup" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_update_backup" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_update_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29930,8 +29993,9 @@ def test_delete_backup_rest_bad_request(request_type=service.DeleteBackupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29988,19 +30052,20 @@ def test_delete_backup_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_delete_backup" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_delete_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_delete_backup" - ) as pre: + 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.AlloyDBAdminRestInterceptor, "post_delete_backup" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_delete_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_delete_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30051,8 +30116,9 @@ def test_list_supported_database_flags_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30115,18 +30181,20 @@ def test_list_supported_database_flags_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_supported_database_flags" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_list_supported_database_flags_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_supported_database_flags" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_supported_database_flags" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_list_supported_database_flags_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_supported_database_flags" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30184,8 +30252,9 @@ def test_generate_client_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30252,18 +30321,20 @@ def test_generate_client_certificate_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_generate_client_certificate" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, - "post_generate_client_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_generate_client_certificate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_generate_client_certificate" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_generate_client_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_generate_client_certificate" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30323,8 +30394,9 @@ def test_get_connection_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30399,17 +30471,20 @@ def test_get_connection_info_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_connection_info" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_connection_info_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_connection_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_connection_info" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, + "post_get_connection_info_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_connection_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30460,8 +30535,9 @@ def test_list_users_rest_bad_request(request_type=service.ListUsersRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30526,17 +30602,19 @@ def test_list_users_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_users" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_users_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_users" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_users" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_users_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_users" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30587,8 +30665,9 @@ def test_get_user_rest_bad_request(request_type=service.GetUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30661,17 +30740,19 @@ def test_get_user_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_get_user" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_get_user_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_get_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_user" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_get_user_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_get_user" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30720,8 +30801,9 @@ def test_create_user_rest_bad_request(request_type=service.CreateUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30866,17 +30948,19 @@ def test_create_user_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_user" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_user_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_user" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_user_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_user" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30929,8 +31013,9 @@ def test_update_user_rest_bad_request(request_type=service.UpdateUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31079,17 +31164,19 @@ def test_update_user_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_update_user" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_update_user_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_update_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_user" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_update_user_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_update_user" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31140,8 +31227,9 @@ def test_delete_user_rest_bad_request(request_type=service.DeleteUserRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31200,13 +31288,13 @@ def test_delete_user_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "pre_delete_user" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_delete_user" + ) as pre, + ): pre.assert_not_called() pb_message = service.DeleteUserRequest.pb(service.DeleteUserRequest()) transcode.return_value = { @@ -31247,8 +31335,9 @@ def test_list_databases_rest_bad_request(request_type=service.ListDatabasesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31311,17 +31400,19 @@ def test_list_databases_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_list_databases" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_list_databases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_list_databases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_databases" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_list_databases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_list_databases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31372,8 +31463,9 @@ def test_create_database_rest_bad_request(request_type=service.CreateDatabaseReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31524,17 +31616,19 @@ def test_create_database_rest_interceptors(null_interceptor): ) client = AlloyDBAdminClient(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.AlloyDBAdminRestInterceptor, "post_create_database" - ) as post, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "post_create_database_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBAdminRestInterceptor, "pre_create_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_database" + ) as post, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "post_create_database_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBAdminRestInterceptor, "pre_create_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31585,8 +31679,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31645,8 +31740,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31707,8 +31803,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31769,8 +31866,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31831,8 +31929,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31893,8 +31992,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -32843,11 +32943,14 @@ def test_alloy_db_admin_base_transport(): def test_alloy_db_admin_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.alloydb_v1beta.services.alloy_db_admin.transports.AlloyDBAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.alloydb_v1beta.services.alloy_db_admin.transports.AlloyDBAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlloyDBAdminTransport( @@ -32864,9 +32967,12 @@ def test_alloy_db_admin_base_transport_with_credentials_file(): def test_alloy_db_admin_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.alloydb_v1beta.services.alloy_db_admin.transports.AlloyDBAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.alloydb_v1beta.services.alloy_db_admin.transports.AlloyDBAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlloyDBAdminTransport() @@ -32938,11 +33044,12 @@ def test_alloy_db_admin_transport_auth_gdch_credentials(transport_class): def test_alloy_db_admin_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_dbcsql_admin.py b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_dbcsql_admin.py index 3f254b9bc4db..d68bd0c19a4f 100644 --- a/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_dbcsql_admin.py +++ b/packages/google-cloud-alloydb/tests/unit/gapic/alloydb_v1beta/test_alloy_dbcsql_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +60,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.alloydb_v1beta.services.alloy_dbcsql_admin import ( AlloyDBCSQLAdminAsyncClient, @@ -994,10 +996,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1043,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1081,9 @@ def test_alloy_dbcsql_admin_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1332,13 +1331,13 @@ def test_alloy_dbcsql_admin_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1451,9 +1450,9 @@ def test_restore_from_cloud_sql_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_from_cloud_sql - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_from_cloud_sql] = ( + mock_rpc + ) request = {} client.restore_from_cloud_sql(request) @@ -1743,9 +1742,9 @@ def test_restore_from_cloud_sql_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_from_cloud_sql - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_from_cloud_sql] = ( + mock_rpc + ) request = {} client.restore_from_cloud_sql(request) @@ -2105,8 +2104,9 @@ def test_restore_from_cloud_sql_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2163,20 +2163,21 @@ def test_restore_from_cloud_sql_rest_interceptors(null_interceptor): ) client = AlloyDBCSQLAdminClient(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.AlloyDBCSQLAdminRestInterceptor, "post_restore_from_cloud_sql" - ) as post, mock.patch.object( - transports.AlloyDBCSQLAdminRestInterceptor, - "post_restore_from_cloud_sql_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AlloyDBCSQLAdminRestInterceptor, "pre_restore_from_cloud_sql" - ) as pre: + 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.AlloyDBCSQLAdminRestInterceptor, "post_restore_from_cloud_sql" + ) as post, + mock.patch.object( + transports.AlloyDBCSQLAdminRestInterceptor, + "post_restore_from_cloud_sql_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AlloyDBCSQLAdminRestInterceptor, "pre_restore_from_cloud_sql" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2229,8 +2230,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2289,8 +2291,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2351,8 +2354,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2413,8 +2417,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2475,8 +2480,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2537,8 +2543,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2696,11 +2703,14 @@ def test_alloy_dbcsql_admin_base_transport(): def test_alloy_dbcsql_admin_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.alloydb_v1beta.services.alloy_dbcsql_admin.transports.AlloyDBCSQLAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.alloydb_v1beta.services.alloy_dbcsql_admin.transports.AlloyDBCSQLAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlloyDBCSQLAdminTransport( @@ -2717,9 +2727,12 @@ def test_alloy_dbcsql_admin_base_transport_with_credentials_file(): def test_alloy_dbcsql_admin_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.alloydb_v1beta.services.alloy_dbcsql_admin.transports.AlloyDBCSQLAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.alloydb_v1beta.services.alloy_dbcsql_admin.transports.AlloyDBCSQLAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlloyDBCSQLAdminTransport() @@ -2791,11 +2804,12 @@ def test_alloy_dbcsql_admin_transport_auth_gdch_credentials(transport_class): def test_alloy_dbcsql_admin_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-api-gateway/docs/conf.py b/packages/google-cloud-api-gateway/docs/conf.py index 4b4be672540b..ebe8e5a76ad0 100644 --- a/packages/google-cloud-api-gateway/docs/conf.py +++ b/packages/google-cloud-api-gateway/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-api-gateway documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/__init__.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/__init__.py index e81f78f549a1..acfe1c26ab5c 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/__init__.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.api_gateway_service import ( ApiGatewayServiceAsyncClient, ApiGatewayServiceClient, diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py index 22551b721078..b40f0babe1e7 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigateway_v1 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apigateway_v1.services.api_gateway_service import pagers from google.cloud.apigateway_v1.types import apigateway @@ -135,7 +135,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiGatewayServiceAsyncClient: The constructed client. """ - return ApiGatewayServiceClient.from_service_account_info.__func__(ApiGatewayServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ApiGatewayServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ApiGatewayServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -151,7 +152,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiGatewayServiceAsyncClient: The constructed client. """ - return ApiGatewayServiceClient.from_service_account_file.__func__(ApiGatewayServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ApiGatewayServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ApiGatewayServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/client.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/client.py index fb02cef83c62..b3f61b0a34ef 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/client.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigateway_v1 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.apigateway_v1.services.api_gateway_service import pagers from google.cloud.apigateway_v1.types import apigateway @@ -84,9 +84,7 @@ class ApiGatewayServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ApiGatewayServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ApiGatewayServiceTransport]] _transport_registry["grpc"] = ApiGatewayServiceGrpcTransport _transport_registry["grpc_asyncio"] = ApiGatewayServiceGrpcAsyncIOTransport _transport_registry["rest"] = ApiGatewayServiceRestTransport @@ -725,11 +723,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiGatewayServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiGatewayServiceClient._read_environment_variables() + ) self._client_cert_source = ApiGatewayServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -764,8 +760,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiGatewayServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/pagers.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/pagers.py index e662872b3d54..1507450167c7 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/pagers.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py index 33207eca2a63..353f5e054aac 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigateway_v1 import gapic_version as package_version from google.cloud.apigateway_v1.types import apigateway diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py index 3d1d90889ef9..a5bb254672a7 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apigateway_v1.types import apigateway diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py index cac8a22ca764..cc1e02bac4e9 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apigateway_v1.types import apigateway diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/rest.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/rest.py index 8667956b1bd3..209869e97e9a 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/rest.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/services/api_gateway_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1131,7 +1131,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1258,9 +1258,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseCreateApiConfig._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseCreateApiConfig._get_http_options() request, metadata = self._interceptor.pre_create_api_config( request, metadata @@ -1286,7 +1284,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1413,9 +1411,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseCreateGateway._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseCreateGateway._get_http_options() request, metadata = self._interceptor.pre_create_gateway(request, metadata) transcoded_request = _BaseApiGatewayServiceRestTransport._BaseCreateGateway._get_transcoded_request( @@ -1439,7 +1435,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1586,7 +1582,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1711,9 +1707,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseDeleteApiConfig._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseDeleteApiConfig._get_http_options() request, metadata = self._interceptor.pre_delete_api_config( request, metadata @@ -1735,7 +1729,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1860,9 +1854,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseDeleteGateway._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseDeleteGateway._get_http_options() request, metadata = self._interceptor.pre_delete_gateway(request, metadata) transcoded_request = _BaseApiGatewayServiceRestTransport._BaseDeleteGateway._get_transcoded_request( @@ -1882,7 +1874,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2157,9 +2149,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseGetApiConfig._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseGetApiConfig._get_http_options() request, metadata = self._interceptor.pre_get_api_config(request, metadata) transcoded_request = _BaseApiGatewayServiceRestTransport._BaseGetApiConfig._get_transcoded_request( @@ -2456,9 +2446,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseListApiConfigs._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseListApiConfigs._get_http_options() request, metadata = self._interceptor.pre_list_api_configs( request, metadata @@ -2754,9 +2742,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseListGateways._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseListGateways._get_http_options() request, metadata = self._interceptor.pre_list_gateways(request, metadata) transcoded_request = _BaseApiGatewayServiceRestTransport._BaseListGateways._get_transcoded_request( @@ -2929,7 +2915,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3056,9 +3042,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseUpdateApiConfig._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseUpdateApiConfig._get_http_options() request, metadata = self._interceptor.pre_update_api_config( request, metadata @@ -3084,7 +3068,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3211,9 +3195,7 @@ def __call__( """ - http_options = ( - _BaseApiGatewayServiceRestTransport._BaseUpdateGateway._get_http_options() - ) + http_options = _BaseApiGatewayServiceRestTransport._BaseUpdateGateway._get_http_options() request, metadata = self._interceptor.pre_update_gateway(request, metadata) transcoded_request = _BaseApiGatewayServiceRestTransport._BaseUpdateGateway._get_transcoded_request( @@ -3237,7 +3219,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/types/apigateway.py b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/types/apigateway.py index 6be19fc24cf1..469dd2fe6bfc 100644 --- a/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/types/apigateway.py +++ b/packages/google-cloud-api-gateway/google/cloud/apigateway_v1/types/apigateway.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -97,6 +97,7 @@ class State(proto.Enum): UPDATING (5): API is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -217,6 +218,7 @@ class State(proto.Enum): downstream systems. API Configs in this state cannot be used by Gateways. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -394,6 +396,7 @@ class State(proto.Enum): UPDATING (5): Gateway is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -847,6 +850,7 @@ class ConfigView(proto.Enum): FULL (2): Include configuration source files. """ + CONFIG_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 diff --git a/packages/google-cloud-api-gateway/noxfile.py b/packages/google-cloud-api-gateway/noxfile.py index 377d5a2e2d64..defa21977621 100644 --- a/packages/google-cloud-api-gateway/noxfile.py +++ b/packages/google-cloud-api-gateway/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-api-gateway/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py b/packages/google-cloud-api-gateway/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py index bc146cee7ef3..e7069a945527 100644 --- a/packages/google-cloud-api-gateway/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py +++ b/packages/google-cloud-api-gateway/tests/unit/gapic/apigateway_v1/test_api_gateway_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apigateway_v1.services.api_gateway_service import ( ApiGatewayServiceAsyncClient, @@ -991,10 +991,9 @@ def test_api_gateway_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1038,9 @@ def test_api_gateway_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1076,9 @@ def test_api_gateway_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1329,13 +1326,13 @@ def test_api_gateway_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5178,9 +5175,9 @@ def test_list_api_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_configs] = ( + mock_rpc + ) request = {} client.list_api_configs(request) @@ -6041,9 +6038,9 @@ def test_create_api_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_config] = ( + mock_rpc + ) request = {} client.create_api_config(request) @@ -6400,9 +6397,9 @@ def test_update_api_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_config] = ( + mock_rpc + ) request = {} client.update_api_config(request) @@ -6753,9 +6750,9 @@ def test_delete_api_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_config] = ( + mock_rpc + ) request = {} client.delete_api_config(request) @@ -9006,9 +9003,9 @@ def test_list_api_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_configs] = ( + mock_rpc + ) request = {} client.list_api_configs(request) @@ -9448,9 +9445,9 @@ def test_create_api_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_config] = ( + mock_rpc + ) request = {} client.create_api_config(request) @@ -9656,9 +9653,9 @@ def test_update_api_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_config] = ( + mock_rpc + ) request = {} client.update_api_config(request) @@ -9839,9 +9836,9 @@ def test_delete_api_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_config] = ( + mock_rpc + ) request = {} client.delete_api_config(request) @@ -10863,8 +10860,9 @@ def test_list_gateways_rest_bad_request(request_type=apigateway.ListGatewaysRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10929,17 +10927,20 @@ def test_list_gateways_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_list_gateways" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "post_list_gateways_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_list_gateways" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "post_list_gateways" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, + "post_list_gateways_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_list_gateways" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10990,8 +10991,9 @@ def test_get_gateway_rest_bad_request(request_type=apigateway.GetGatewayRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11062,17 +11064,20 @@ def test_get_gateway_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_get_gateway" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "post_get_gateway_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_get_gateway" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "post_get_gateway" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, + "post_get_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_get_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11121,8 +11126,9 @@ def test_create_gateway_rest_bad_request(request_type=apigateway.CreateGatewayRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11256,19 +11262,21 @@ def test_create_gateway_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_create_gateway" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "post_create_gateway_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_create_gateway" - ) as pre: + 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.ApiGatewayServiceRestInterceptor, "post_create_gateway" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, + "post_create_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_create_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11321,8 +11329,9 @@ def test_update_gateway_rest_bad_request(request_type=apigateway.UpdateGatewayRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11458,19 +11467,21 @@ def test_update_gateway_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_update_gateway" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "post_update_gateway_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_update_gateway" - ) as pre: + 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.ApiGatewayServiceRestInterceptor, "post_update_gateway" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, + "post_update_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_update_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11521,8 +11532,9 @@ def test_delete_gateway_rest_bad_request(request_type=apigateway.DeleteGatewayRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11579,19 +11591,21 @@ def test_delete_gateway_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_delete_gateway" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "post_delete_gateway_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_delete_gateway" - ) as pre: + 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.ApiGatewayServiceRestInterceptor, "post_delete_gateway" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, + "post_delete_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_delete_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11642,8 +11656,9 @@ def test_list_apis_rest_bad_request(request_type=apigateway.ListApisRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11708,17 +11723,19 @@ def test_list_apis_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_list_apis" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "post_list_apis_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_list_apis" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "post_list_apis" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "post_list_apis_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_list_apis" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11769,8 +11786,9 @@ def test_get_api_rest_bad_request(request_type=apigateway.GetApiRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11839,17 +11857,19 @@ def test_get_api_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_get_api" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "post_get_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_get_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "post_get_api" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "post_get_api_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_get_api" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11898,8 +11918,9 @@ def test_create_api_rest_bad_request(request_type=apigateway.CreateApiRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12032,19 +12053,20 @@ def test_create_api_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_create_api" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "post_create_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_create_api" - ) as pre: + 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.ApiGatewayServiceRestInterceptor, "post_create_api" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "post_create_api_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_create_api" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12093,8 +12115,9 @@ def test_update_api_rest_bad_request(request_type=apigateway.UpdateApiRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12227,19 +12250,20 @@ def test_update_api_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_update_api" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "post_update_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_update_api" - ) as pre: + 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.ApiGatewayServiceRestInterceptor, "post_update_api" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "post_update_api_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_update_api" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12288,8 +12312,9 @@ def test_delete_api_rest_bad_request(request_type=apigateway.DeleteApiRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12346,19 +12371,20 @@ def test_delete_api_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_delete_api" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "post_delete_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_delete_api" - ) as pre: + 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.ApiGatewayServiceRestInterceptor, "post_delete_api" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "post_delete_api_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_delete_api" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12409,8 +12435,9 @@ def test_list_api_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12475,18 +12502,20 @@ def test_list_api_configs_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_list_api_configs" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, - "post_list_api_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_list_api_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "post_list_api_configs" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, + "post_list_api_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_list_api_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12541,8 +12570,9 @@ def test_get_api_config_rest_bad_request(request_type=apigateway.GetApiConfigReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12615,17 +12645,20 @@ def test_get_api_config_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_get_api_config" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "post_get_api_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_get_api_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "post_get_api_config" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, + "post_get_api_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_get_api_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12676,8 +12709,9 @@ def test_create_api_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12816,20 +12850,21 @@ def test_create_api_config_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_create_api_config" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, - "post_create_api_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_create_api_config" - ) as pre: + 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.ApiGatewayServiceRestInterceptor, "post_create_api_config" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, + "post_create_api_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_create_api_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12886,8 +12921,9 @@ def test_update_api_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13030,20 +13066,21 @@ def test_update_api_config_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_update_api_config" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, - "post_update_api_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_update_api_config" - ) as pre: + 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.ApiGatewayServiceRestInterceptor, "post_update_api_config" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, + "post_update_api_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_update_api_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13098,8 +13135,9 @@ def test_delete_api_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13158,20 +13196,21 @@ def test_delete_api_config_rest_interceptors(null_interceptor): ) client = ApiGatewayServiceClient(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.ApiGatewayServiceRestInterceptor, "post_delete_api_config" - ) as post, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, - "post_delete_api_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiGatewayServiceRestInterceptor, "pre_delete_api_config" - ) as pre: + 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.ApiGatewayServiceRestInterceptor, "post_delete_api_config" + ) as post, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, + "post_delete_api_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiGatewayServiceRestInterceptor, "pre_delete_api_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13615,11 +13654,14 @@ def test_api_gateway_service_base_transport(): def test_api_gateway_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apigateway_v1.services.api_gateway_service.transports.ApiGatewayServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apigateway_v1.services.api_gateway_service.transports.ApiGatewayServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiGatewayServiceTransport( @@ -13636,9 +13678,12 @@ def test_api_gateway_service_base_transport_with_credentials_file(): def test_api_gateway_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apigateway_v1.services.api_gateway_service.transports.ApiGatewayServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apigateway_v1.services.api_gateway_service.transports.ApiGatewayServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiGatewayServiceTransport() @@ -13710,11 +13755,12 @@ def test_api_gateway_service_transport_auth_gdch_credentials(transport_class): def test_api_gateway_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-api-keys/docs/conf.py b/packages/google-cloud-api-keys/docs/conf.py index 2e8d745533ae..0411ee0fdb13 100644 --- a/packages/google-cloud-api-keys/docs/conf.py +++ b/packages/google-cloud-api-keys/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-api-keys documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/__init__.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/__init__.py index 6f44b492ed7d..25510b1ffc99 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/__init__.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.api_keys import ApiKeysAsyncClient, ApiKeysClient from .types.apikeys import ( CreateKeyRequest, diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/async_client.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/async_client.py index 01818ba3857a..04963b0f1441 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/async_client.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.api_keys_v2 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.api_keys_v2.services.api_keys import pagers from google.cloud.api_keys_v2.types import apikeys, resources @@ -112,7 +112,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiKeysAsyncClient: The constructed client. """ - return ApiKeysClient.from_service_account_info.__func__(ApiKeysAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ApiKeysClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ApiKeysAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +129,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiKeysAsyncClient: The constructed client. """ - return ApiKeysClient.from_service_account_file.__func__(ApiKeysAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ApiKeysClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ApiKeysAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/client.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/client.py index 9b8fb0d46a9a..2a7713d2680d 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/client.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.api_keys_v2 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.api_keys_v2.services.api_keys import pagers from google.cloud.api_keys_v2.types import apikeys, resources @@ -625,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiKeysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiKeysClient._read_environment_variables() + ) self._client_cert_source = ApiKeysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiKeysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/pagers.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/pagers.py index 96ed583cb381..c9e500261b5a 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/pagers.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/base.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/base.py index 8b8d9a46a08b..4e6f9956c636 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/base.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.api_keys_v2 import gapic_version as package_version from google.cloud.api_keys_v2.types import apikeys, resources diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc.py index 7a3c328b5b9c..b1b35bd63d45 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.api_keys_v2.types import apikeys, resources diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc_asyncio.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc_asyncio.py index 4a708509067e..c9301035706b 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc_asyncio.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.api_keys_v2.types import apikeys, resources diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/rest.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/rest.py index 9258a7f3ff46..f444b75f9312 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/rest.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/services/api_keys/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -739,7 +739,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -885,7 +885,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1615,7 +1615,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1766,7 +1766,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/types/apikeys.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/types/apikeys.py index ae8033b35d89..ae903235fc13 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/types/apikeys.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/types/apikeys.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.api_keys_v2.types import resources diff --git a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/types/resources.py b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/types/resources.py index 7a2adf569777..e2880e041ae8 100644 --- a/packages/google-cloud-api-keys/google/cloud/api_keys_v2/types/resources.py +++ b/packages/google-cloud-api-keys/google/cloud/api_keys_v2/types/resources.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-api-keys/noxfile.py b/packages/google-cloud-api-keys/noxfile.py index abc9118a54fe..bfa845a43555 100644 --- a/packages/google-cloud-api-keys/noxfile.py +++ b/packages/google-cloud-api-keys/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-api-keys/tests/unit/gapic/api_keys_v2/test_api_keys.py b/packages/google-cloud-api-keys/tests/unit/gapic/api_keys_v2/test_api_keys.py index 773d07c8284d..70d7b8d51590 100644 --- a/packages/google-cloud-api-keys/tests/unit/gapic/api_keys_v2/test_api_keys.py +++ b/packages/google-cloud-api-keys/tests/unit/gapic/api_keys_v2/test_api_keys.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.api_keys_v2.services.api_keys import ( ApiKeysAsyncClient, @@ -911,10 +911,9 @@ def test_api_keys_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +958,9 @@ def test_api_keys_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +996,9 @@ def test_api_keys_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1226,13 +1223,13 @@ def test_api_keys_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5773,8 +5770,9 @@ def test_create_key_rest_bad_request(request_type=apikeys.CreateKeyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5938,19 +5936,16 @@ def test_create_key_rest_interceptors(null_interceptor): ) client = ApiKeysClient(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.ApiKeysRestInterceptor, "post_create_key" - ) as post, mock.patch.object( - transports.ApiKeysRestInterceptor, "post_create_key_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiKeysRestInterceptor, "pre_create_key" - ) as pre: + 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.ApiKeysRestInterceptor, "post_create_key") as post, + mock.patch.object( + transports.ApiKeysRestInterceptor, "post_create_key_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiKeysRestInterceptor, "pre_create_key") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5999,8 +5994,9 @@ def test_list_keys_rest_bad_request(request_type=apikeys.ListKeysRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6061,17 +6057,15 @@ def test_list_keys_rest_interceptors(null_interceptor): ) client = ApiKeysClient(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.ApiKeysRestInterceptor, "post_list_keys" - ) as post, mock.patch.object( - transports.ApiKeysRestInterceptor, "post_list_keys_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiKeysRestInterceptor, "pre_list_keys" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiKeysRestInterceptor, "post_list_keys") as post, + mock.patch.object( + transports.ApiKeysRestInterceptor, "post_list_keys_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiKeysRestInterceptor, "pre_list_keys") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6120,8 +6114,9 @@ def test_get_key_rest_bad_request(request_type=apikeys.GetKeyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6190,17 +6185,15 @@ def test_get_key_rest_interceptors(null_interceptor): ) client = ApiKeysClient(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.ApiKeysRestInterceptor, "post_get_key" - ) as post, mock.patch.object( - transports.ApiKeysRestInterceptor, "post_get_key_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiKeysRestInterceptor, "pre_get_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiKeysRestInterceptor, "post_get_key") as post, + mock.patch.object( + transports.ApiKeysRestInterceptor, "post_get_key_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiKeysRestInterceptor, "pre_get_key") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6249,8 +6242,9 @@ def test_get_key_string_rest_bad_request(request_type=apikeys.GetKeyStringReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6311,17 +6305,19 @@ def test_get_key_string_rest_interceptors(null_interceptor): ) client = ApiKeysClient(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.ApiKeysRestInterceptor, "post_get_key_string" - ) as post, mock.patch.object( - transports.ApiKeysRestInterceptor, "post_get_key_string_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiKeysRestInterceptor, "pre_get_key_string" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiKeysRestInterceptor, "post_get_key_string" + ) as post, + mock.patch.object( + transports.ApiKeysRestInterceptor, "post_get_key_string_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiKeysRestInterceptor, "pre_get_key_string" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6372,8 +6368,9 @@ def test_update_key_rest_bad_request(request_type=apikeys.UpdateKeyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6537,19 +6534,16 @@ def test_update_key_rest_interceptors(null_interceptor): ) client = ApiKeysClient(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.ApiKeysRestInterceptor, "post_update_key" - ) as post, mock.patch.object( - transports.ApiKeysRestInterceptor, "post_update_key_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiKeysRestInterceptor, "pre_update_key" - ) as pre: + 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.ApiKeysRestInterceptor, "post_update_key") as post, + mock.patch.object( + transports.ApiKeysRestInterceptor, "post_update_key_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiKeysRestInterceptor, "pre_update_key") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6598,8 +6592,9 @@ def test_delete_key_rest_bad_request(request_type=apikeys.DeleteKeyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6654,19 +6649,16 @@ def test_delete_key_rest_interceptors(null_interceptor): ) client = ApiKeysClient(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.ApiKeysRestInterceptor, "post_delete_key" - ) as post, mock.patch.object( - transports.ApiKeysRestInterceptor, "post_delete_key_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiKeysRestInterceptor, "pre_delete_key" - ) as pre: + 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.ApiKeysRestInterceptor, "post_delete_key") as post, + mock.patch.object( + transports.ApiKeysRestInterceptor, "post_delete_key_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiKeysRestInterceptor, "pre_delete_key") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6715,8 +6707,9 @@ def test_undelete_key_rest_bad_request(request_type=apikeys.UndeleteKeyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6771,19 +6764,18 @@ def test_undelete_key_rest_interceptors(null_interceptor): ) client = ApiKeysClient(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.ApiKeysRestInterceptor, "post_undelete_key" - ) as post, mock.patch.object( - transports.ApiKeysRestInterceptor, "post_undelete_key_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiKeysRestInterceptor, "pre_undelete_key" - ) as pre: + 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.ApiKeysRestInterceptor, "post_undelete_key" + ) as post, + mock.patch.object( + transports.ApiKeysRestInterceptor, "post_undelete_key_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiKeysRestInterceptor, "pre_undelete_key") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6832,8 +6824,9 @@ def test_lookup_key_rest_bad_request(request_type=apikeys.LookupKeyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6896,17 +6889,15 @@ def test_lookup_key_rest_interceptors(null_interceptor): ) client = ApiKeysClient(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.ApiKeysRestInterceptor, "post_lookup_key" - ) as post, mock.patch.object( - transports.ApiKeysRestInterceptor, "post_lookup_key_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiKeysRestInterceptor, "pre_lookup_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiKeysRestInterceptor, "post_lookup_key") as post, + mock.patch.object( + transports.ApiKeysRestInterceptor, "post_lookup_key_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiKeysRestInterceptor, "pre_lookup_key") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6957,8 +6948,9 @@ def test_get_operation_rest_bad_request( request = json_format.ParseDict({"name": "operations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7256,11 +7248,14 @@ def test_api_keys_base_transport(): def test_api_keys_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.api_keys_v2.services.api_keys.transports.ApiKeysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.api_keys_v2.services.api_keys.transports.ApiKeysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiKeysTransport( @@ -7280,9 +7275,12 @@ def test_api_keys_base_transport_with_credentials_file(): def test_api_keys_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.api_keys_v2.services.api_keys.transports.ApiKeysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.api_keys_v2.services.api_keys.transports.ApiKeysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiKeysTransport() @@ -7360,11 +7358,12 @@ def test_api_keys_transport_auth_gdch_credentials(transport_class): def test_api_keys_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apigee-connect/docs/conf.py b/packages/google-cloud-apigee-connect/docs/conf.py index 4599a43aa53a..2a1e63fcb997 100644 --- a/packages/google-cloud-apigee-connect/docs/conf.py +++ b/packages/google-cloud-apigee-connect/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-apigee-connect documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/__init__.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/__init__.py index 3a16090e36a2..215bbef488d0 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/__init__.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.connection_service import ( ConnectionServiceAsyncClient, ConnectionServiceClient, diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/async_client.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/async_client.py index 20d5e0deda42..c592d78a38f2 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/async_client.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigeeconnect_v1 import gapic_version as package_version @@ -115,7 +115,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConnectionServiceAsyncClient: The constructed client. """ - return ConnectionServiceClient.from_service_account_info.__func__(ConnectionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConnectionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConnectionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +132,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConnectionServiceAsyncClient: The constructed client. """ - return ConnectionServiceClient.from_service_account_file.__func__(ConnectionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConnectionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConnectionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/client.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/client.py index cf88899a49a3..96d087252698 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/client.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigeeconnect_v1 import gapic_version as package_version @@ -77,9 +77,7 @@ class ConnectionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConnectionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConnectionServiceTransport]] _transport_registry["grpc"] = ConnectionServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConnectionServiceGrpcAsyncIOTransport @@ -619,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConnectionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConnectionServiceClient._read_environment_variables() + ) self._client_cert_source = ConnectionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -658,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConnectionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/pagers.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/pagers.py index 43bda5f6f142..affb49f82a67 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/pagers.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/base.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/base.py index 65951042774e..42e01ef5ed1d 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/base.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigeeconnect_v1 import gapic_version as package_version from google.cloud.apigeeconnect_v1.types import connection diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc.py index 3e4e1c8ce834..87c7323bd970 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.apigeeconnect_v1.types import connection diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc_asyncio.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc_asyncio.py index e4ec8ffb333d..aa3440968d31 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/connection_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apigeeconnect_v1.types import connection diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/async_client.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/async_client.py index 6a90a6c9160e..f6959b8b94f5 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/async_client.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigeeconnect_v1 import gapic_version as package_version @@ -47,7 +47,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore from google.cloud.apigeeconnect_v1.types import tether @@ -109,7 +109,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TetherAsyncClient: The constructed client. """ - return TetherClient.from_service_account_info.__func__(TetherAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = TetherClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(TetherAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -125,7 +126,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TetherAsyncClient: The constructed client. """ - return TetherClient.from_service_account_file.__func__(TetherAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = TetherClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(TetherAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/client.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/client.py index 7a00a2926fa7..5357fb9e2418 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/client.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigeeconnect_v1 import gapic_version as package_version @@ -63,7 +63,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore from google.cloud.apigeeconnect_v1.types import tether @@ -601,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TetherClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TetherClient._read_environment_variables() + ) self._client_cert_source = TetherClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TetherTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/base.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/base.py index 7eec0c72bce9..1fb20efdb197 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/base.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigeeconnect_v1 import gapic_version as package_version from google.cloud.apigeeconnect_v1.types import tether diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc.py index d7fd02efa1d6..8a489a19df2e 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.apigeeconnect_v1.types import tether diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc_asyncio.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc_asyncio.py index 49defc8fea59..5b102ef520e7 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc_asyncio.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/services/tether/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apigeeconnect_v1.types import tether diff --git a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/types/tether.py b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/types/tether.py index 0898fea44bd4..3d1e40ce28a6 100644 --- a/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/types/tether.py +++ b/packages/google-cloud-apigee-connect/google/cloud/apigeeconnect_v1/types/tether.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -49,6 +49,7 @@ class Action(proto.Enum): Indicates that agent should open a new stream. """ + ACTION_UNSPECIFIED = 0 OPEN_NEW_STREAM = 1 @@ -66,6 +67,7 @@ class TetherEndpoint(proto.Enum): APIGEE_MINT_RATING (3): Apigee Mint Rating endpoint. """ + TETHER_ENDPOINT_UNSPECIFIED = 0 APIGEE_MART = 1 APIGEE_RUNTIME = 2 @@ -81,6 +83,7 @@ class Scheme(proto.Enum): HTTPS (1): HTTPS protocol. """ + SCHEME_UNSPECIFIED = 0 HTTPS = 1 diff --git a/packages/google-cloud-apigee-connect/noxfile.py b/packages/google-cloud-apigee-connect/noxfile.py index 683b961dd114..815fb3301264 100644 --- a/packages/google-cloud-apigee-connect/noxfile.py +++ b/packages/google-cloud-apigee-connect/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_connection_service.py b/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_connection_service.py index 6f939f051966..5fd331d8c86d 100644 --- a/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_connection_service.py +++ b/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_connection_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,11 +39,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -949,10 +954,9 @@ def test_connection_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1001,9 @@ def test_connection_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1039,9 @@ def test_connection_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1280,13 +1282,13 @@ def test_connection_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1395,9 +1397,9 @@ def test_list_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -2047,11 +2049,14 @@ def test_connection_service_base_transport(): def test_connection_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apigeeconnect_v1.services.connection_service.transports.ConnectionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apigeeconnect_v1.services.connection_service.transports.ConnectionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConnectionServiceTransport( @@ -2068,9 +2073,12 @@ def test_connection_service_base_transport_with_credentials_file(): def test_connection_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apigeeconnect_v1.services.connection_service.transports.ConnectionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apigeeconnect_v1.services.connection_service.transports.ConnectionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConnectionServiceTransport() @@ -2141,11 +2149,12 @@ def test_connection_service_transport_auth_gdch_credentials(transport_class): def test_connection_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_tether.py b/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_tether.py index f5e6208c4bf3..b5cc45090261 100644 --- a/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_tether.py +++ b/packages/google-cloud-apigee-connect/tests/unit/gapic/apigeeconnect_v1/test_tether.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,17 +39,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.apigeeconnect_v1.services.tether import ( TetherAsyncClient, @@ -878,10 +883,9 @@ def test_tether_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -926,10 +930,9 @@ def test_tether_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +968,9 @@ def test_tether_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1191,13 +1193,13 @@ def test_tether_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1311,9 +1313,9 @@ async def test_egress_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.egress - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.egress] = ( + mock_rpc + ) request = [{}] await client.egress(request) @@ -1534,11 +1536,14 @@ def test_tether_base_transport(): def test_tether_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apigeeconnect_v1.services.tether.transports.TetherTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apigeeconnect_v1.services.tether.transports.TetherTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TetherTransport( @@ -1555,9 +1560,12 @@ def test_tether_base_transport_with_credentials_file(): def test_tether_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apigeeconnect_v1.services.tether.transports.TetherTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apigeeconnect_v1.services.tether.transports.TetherTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TetherTransport() @@ -1628,11 +1636,12 @@ def test_tether_transport_auth_gdch_credentials(transport_class): def test_tether_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apigee-registry/docs/conf.py b/packages/google-cloud-apigee-registry/docs/conf.py index c5194a0432c9..fbef1432f62b 100644 --- a/packages/google-cloud-apigee-registry/docs/conf.py +++ b/packages/google-cloud-apigee-registry/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-apigee-registry documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/__init__.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/__init__.py index f37e9f9984a0..8ee0c62fa77e 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/__init__.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.provisioning import ProvisioningAsyncClient, ProvisioningClient from .services.registry import RegistryAsyncClient, RegistryClient from .types.provisioning_service import ( diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/async_client.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/async_client.py index 06aa7763ded0..24ecd4ffca09 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/async_client.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigee_registry_v1 import gapic_version as package_version @@ -44,14 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apigee_registry_v1.types import provisioning_service @@ -119,7 +121,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProvisioningAsyncClient: The constructed client. """ - return ProvisioningClient.from_service_account_info.__func__(ProvisioningAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ProvisioningClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ProvisioningAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +138,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProvisioningAsyncClient: The constructed client. """ - return ProvisioningClient.from_service_account_file.__func__(ProvisioningAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ProvisioningClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ProvisioningAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/client.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/client.py index a689770115cc..4d20995d7df0 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/client.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigee_registry_v1 import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apigee_registry_v1.types import provisioning_service @@ -628,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProvisioningClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProvisioningClient._read_environment_variables() + ) self._client_cert_source = ProvisioningClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProvisioningTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/base.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/base.py index ac9ad9826be6..21908bec15b7 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/base.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigee_registry_v1 import gapic_version as package_version from google.cloud.apigee_registry_v1.types import provisioning_service @@ -267,13 +269,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc.py index fc9bf9c2109c..e4ca9064ca24 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apigee_registry_v1.types import provisioning_service diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc_asyncio.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc_asyncio.py index 9ebf2904b1ac..d34e586db240 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc_asyncio.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apigee_registry_v1.types import provisioning_service diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest.py index 7a8092db82f5..8bb0b7779add 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -697,7 +699,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -843,7 +845,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1725,9 +1727,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseProvisioningRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseProvisioningRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest_base.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest_base.py index bcd461cd5c1d..540c970c05c6 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest_base.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/provisioning/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/async_client.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/async_client.py index 1250fd808591..62411803f158 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/async_client.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigee_registry_v1 import gapic_version as package_version @@ -44,14 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apigee_registry_v1.services.registry import pagers from google.cloud.apigee_registry_v1.types import registry_models, registry_service @@ -124,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RegistryAsyncClient: The constructed client. """ - return RegistryClient.from_service_account_info.__func__(RegistryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = RegistryClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(RegistryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RegistryAsyncClient: The constructed client. """ - return RegistryClient.from_service_account_file.__func__(RegistryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = RegistryClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(RegistryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/client.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/client.py index a49d6ee1d0df..70d0fe4c5c94 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/client.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apigee_registry_v1 import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apigee_registry_v1.services.registry import pagers from google.cloud.apigee_registry_v1.types import registry_models, registry_service @@ -725,11 +727,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegistryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegistryClient._read_environment_variables() + ) self._client_cert_source = RegistryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -764,8 +764,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegistryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/pagers.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/pagers.py index b49005e19001..35fa5da74055 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/pagers.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -693,7 +693,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -769,7 +769,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -849,7 +849,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -927,7 +927,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1009,7 +1009,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1085,7 +1085,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/base.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/base.py index 949af55b5aac..2d2f111b2d1c 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/base.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/base.py @@ -16,20 +16,22 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.apigee_registry_v1 import gapic_version as package_version from google.cloud.apigee_registry_v1.types import registry_models, registry_service @@ -1129,13 +1131,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc.py index 2b0c260972c2..49030f6dd07a 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apigee_registry_v1.types import registry_models, registry_service @@ -1039,12 +1041,12 @@ def tag_api_deployment_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "tag_api_deployment_revision" not in self._stubs: - self._stubs[ - "tag_api_deployment_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.apigeeregistry.v1.Registry/TagApiDeploymentRevision", - request_serializer=registry_service.TagApiDeploymentRevisionRequest.serialize, - response_deserializer=registry_models.ApiDeployment.deserialize, + self._stubs["tag_api_deployment_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apigeeregistry.v1.Registry/TagApiDeploymentRevision", + request_serializer=registry_service.TagApiDeploymentRevisionRequest.serialize, + response_deserializer=registry_models.ApiDeployment.deserialize, + ) ) return self._stubs["tag_api_deployment_revision"] @@ -1072,12 +1074,12 @@ def list_api_deployment_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_api_deployment_revisions" not in self._stubs: - self._stubs[ - "list_api_deployment_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.apigeeregistry.v1.Registry/ListApiDeploymentRevisions", - request_serializer=registry_service.ListApiDeploymentRevisionsRequest.serialize, - response_deserializer=registry_service.ListApiDeploymentRevisionsResponse.deserialize, + self._stubs["list_api_deployment_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apigeeregistry.v1.Registry/ListApiDeploymentRevisions", + request_serializer=registry_service.ListApiDeploymentRevisionsRequest.serialize, + response_deserializer=registry_service.ListApiDeploymentRevisionsResponse.deserialize, + ) ) return self._stubs["list_api_deployment_revisions"] @@ -1133,12 +1135,12 @@ def delete_api_deployment_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_api_deployment_revision" not in self._stubs: - self._stubs[ - "delete_api_deployment_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.apigeeregistry.v1.Registry/DeleteApiDeploymentRevision", - request_serializer=registry_service.DeleteApiDeploymentRevisionRequest.serialize, - response_deserializer=registry_models.ApiDeployment.deserialize, + self._stubs["delete_api_deployment_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apigeeregistry.v1.Registry/DeleteApiDeploymentRevision", + request_serializer=registry_service.DeleteApiDeploymentRevisionRequest.serialize, + response_deserializer=registry_models.ApiDeployment.deserialize, + ) ) return self._stubs["delete_api_deployment_revision"] diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc_asyncio.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc_asyncio.py index 5c15ff577112..434ee227aee4 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc_asyncio.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/grpc_asyncio.py @@ -17,25 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apigee_registry_v1.types import registry_models, registry_service @@ -1070,12 +1072,12 @@ def tag_api_deployment_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "tag_api_deployment_revision" not in self._stubs: - self._stubs[ - "tag_api_deployment_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.apigeeregistry.v1.Registry/TagApiDeploymentRevision", - request_serializer=registry_service.TagApiDeploymentRevisionRequest.serialize, - response_deserializer=registry_models.ApiDeployment.deserialize, + self._stubs["tag_api_deployment_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apigeeregistry.v1.Registry/TagApiDeploymentRevision", + request_serializer=registry_service.TagApiDeploymentRevisionRequest.serialize, + response_deserializer=registry_models.ApiDeployment.deserialize, + ) ) return self._stubs["tag_api_deployment_revision"] @@ -1103,12 +1105,12 @@ def list_api_deployment_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_api_deployment_revisions" not in self._stubs: - self._stubs[ - "list_api_deployment_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.apigeeregistry.v1.Registry/ListApiDeploymentRevisions", - request_serializer=registry_service.ListApiDeploymentRevisionsRequest.serialize, - response_deserializer=registry_service.ListApiDeploymentRevisionsResponse.deserialize, + self._stubs["list_api_deployment_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apigeeregistry.v1.Registry/ListApiDeploymentRevisions", + request_serializer=registry_service.ListApiDeploymentRevisionsRequest.serialize, + response_deserializer=registry_service.ListApiDeploymentRevisionsResponse.deserialize, + ) ) return self._stubs["list_api_deployment_revisions"] @@ -1165,12 +1167,12 @@ def delete_api_deployment_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_api_deployment_revision" not in self._stubs: - self._stubs[ - "delete_api_deployment_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.apigeeregistry.v1.Registry/DeleteApiDeploymentRevision", - request_serializer=registry_service.DeleteApiDeploymentRevisionRequest.serialize, - response_deserializer=registry_models.ApiDeployment.deserialize, + self._stubs["delete_api_deployment_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apigeeregistry.v1.Registry/DeleteApiDeploymentRevision", + request_serializer=registry_service.DeleteApiDeploymentRevisionRequest.serialize, + response_deserializer=registry_models.ApiDeployment.deserialize, + ) ) return self._stubs["delete_api_deployment_revision"] diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest.py index 8749966c7e62..5bb18ffc0993 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest.py @@ -16,21 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -3069,7 +3071,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3178,7 +3180,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3277,9 +3279,7 @@ def __call__( """ - http_options = ( - _BaseRegistryRestTransport._BaseDeleteApiDeploymentRevision._get_http_options() - ) + http_options = _BaseRegistryRestTransport._BaseDeleteApiDeploymentRevision._get_http_options() request, metadata = self._interceptor.pre_delete_api_deployment_revision( request, metadata @@ -3343,11 +3343,10 @@ def __call__( resp = self._interceptor.post_delete_api_deployment_revision(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_api_deployment_revision_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_api_deployment_revision_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3448,7 +3447,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3551,9 +3550,7 @@ def __call__( """ - http_options = ( - _BaseRegistryRestTransport._BaseDeleteApiSpecRevision._get_http_options() - ) + http_options = _BaseRegistryRestTransport._BaseDeleteApiSpecRevision._get_http_options() request, metadata = self._interceptor.pre_delete_api_spec_revision( request, metadata @@ -3719,7 +3716,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3829,7 +3826,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4455,7 +4452,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4959,7 +4956,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5085,9 +5082,7 @@ def __call__( """ - http_options = ( - _BaseRegistryRestTransport._BaseListApiDeploymentRevisions._get_http_options() - ) + http_options = _BaseRegistryRestTransport._BaseListApiDeploymentRevisions._get_http_options() request, metadata = self._interceptor.pre_list_api_deployment_revisions( request, metadata @@ -5151,11 +5146,10 @@ def __call__( resp = self._interceptor.post_list_api_deployment_revisions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_api_deployment_revisions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_api_deployment_revisions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6316,9 +6310,7 @@ def __call__( """ - http_options = ( - _BaseRegistryRestTransport._BaseRollbackApiDeployment._get_http_options() - ) + http_options = _BaseRegistryRestTransport._BaseRollbackApiDeployment._get_http_options() request, metadata = self._interceptor.pre_rollback_api_deployment( request, metadata @@ -6651,9 +6643,7 @@ def __call__( """ - http_options = ( - _BaseRegistryRestTransport._BaseTagApiDeploymentRevision._get_http_options() - ) + http_options = _BaseRegistryRestTransport._BaseTagApiDeploymentRevision._get_http_options() request, metadata = self._interceptor.pre_tag_api_deployment_revision( request, metadata @@ -7626,7 +7616,9 @@ def delete_api_deployment_revision( ]: # 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._DeleteApiDeploymentRevision(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteApiDeploymentRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_api_spec( @@ -7729,7 +7721,9 @@ def list_api_deployment_revisions( ]: # 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._ListApiDeploymentRevisions(self._session, self._host, self._interceptor) # type: ignore + return self._ListApiDeploymentRevisions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_api_deployments( @@ -7829,7 +7823,9 @@ def tag_api_deployment_revision( ]: # 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._TagApiDeploymentRevision(self._session, self._host, self._interceptor) # type: ignore + return self._TagApiDeploymentRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def tag_api_spec_revision( diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest_base.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest_base.py index 00171ce65163..20a351dac2dd 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest_base.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/services/registry/transports/rest_base.py @@ -17,13 +17,15 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.apigee_registry_v1.types import registry_models, registry_service diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/__init__.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/__init__.py index fad5524246d9..c895ae5fadad 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/__init__.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/__init__.py @@ -20,7 +20,13 @@ Instance, OperationMetadata, ) -from .registry_models import Api, ApiDeployment, ApiSpec, ApiVersion, Artifact +from .registry_models import ( + Api, + ApiDeployment, + ApiSpec, + ApiVersion, + Artifact, +) from .registry_service import ( CreateApiDeploymentRequest, CreateApiRequest, diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/provisioning_service.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/provisioning_service.py index 5018cad32d94..c69d7a3d4264 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/provisioning_service.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/provisioning_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -196,6 +196,7 @@ class State(proto.Enum): The Instance encountered an error during a state change. """ + STATE_UNSPECIFIED = 0 INACTIVE = 1 CREATING = 2 diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/registry_models.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/registry_models.py index bb2349b643a5..c9aba5cce9ac 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/registry_models.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/registry_models.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/registry_service.py b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/registry_service.py index 09020e77f50c..891ca2196c1a 100644 --- a/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/registry_service.py +++ b/packages/google-cloud-apigee-registry/google/cloud/apigee_registry_v1/types/registry_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.apigee_registry_v1.types import registry_models @@ -807,12 +807,12 @@ class ListApiDeploymentsResponse(proto.Message): def raw_page(self): return self - api_deployments: MutableSequence[ - registry_models.ApiDeployment - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=registry_models.ApiDeployment, + api_deployments: MutableSequence[registry_models.ApiDeployment] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=registry_models.ApiDeployment, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -999,12 +999,12 @@ class ListApiDeploymentRevisionsResponse(proto.Message): def raw_page(self): return self - api_deployments: MutableSequence[ - registry_models.ApiDeployment - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=registry_models.ApiDeployment, + api_deployments: MutableSequence[registry_models.ApiDeployment] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=registry_models.ApiDeployment, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-apigee-registry/noxfile.py b/packages/google-cloud-apigee-registry/noxfile.py index 54d19c51eca7..6b1b9f89be80 100644 --- a/packages/google-cloud-apigee-registry/noxfile.py +++ b/packages/google-cloud-apigee-registry/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_provisioning.py b/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_provisioning.py index 825afb7e8848..7e37523116f1 100644 --- a/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_provisioning.py +++ b/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_provisioning.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +57,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apigee_registry_v1.services.provisioning import ( ProvisioningAsyncClient, @@ -941,10 +943,9 @@ def test_provisioning_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +990,9 @@ def test_provisioning_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1028,9 @@ def test_provisioning_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1270,13 +1269,13 @@ def test_provisioning_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3150,8 +3149,9 @@ def test_create_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3286,19 +3286,20 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = ProvisioningClient(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.ProvisioningRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.ProvisioningRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProvisioningRestInterceptor, "pre_create_instance" - ) as pre: + 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.ProvisioningRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.ProvisioningRestInterceptor, "post_create_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProvisioningRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3351,8 +3352,9 @@ def test_delete_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3409,19 +3411,20 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = ProvisioningClient(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.ProvisioningRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.ProvisioningRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProvisioningRestInterceptor, "pre_delete_instance" - ) as pre: + 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.ProvisioningRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.ProvisioningRestInterceptor, "post_delete_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProvisioningRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3474,8 +3477,9 @@ def test_get_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3542,17 +3546,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = ProvisioningClient(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.ProvisioningRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.ProvisioningRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProvisioningRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProvisioningRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.ProvisioningRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProvisioningRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3607,8 +3613,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3667,8 +3674,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3729,8 +3737,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3791,8 +3800,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3853,8 +3863,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3915,8 +3926,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3977,8 +3989,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4039,8 +4052,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4101,8 +4115,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4303,11 +4318,14 @@ def test_provisioning_base_transport(): def test_provisioning_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apigee_registry_v1.services.provisioning.transports.ProvisioningTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apigee_registry_v1.services.provisioning.transports.ProvisioningTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProvisioningTransport( @@ -4324,9 +4342,12 @@ def test_provisioning_base_transport_with_credentials_file(): def test_provisioning_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apigee_registry_v1.services.provisioning.transports.ProvisioningTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apigee_registry_v1.services.provisioning.transports.ProvisioningTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProvisioningTransport() @@ -4398,11 +4419,12 @@ def test_provisioning_transport_auth_gdch_credentials(transport_class): def test_provisioning_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_registry.py b/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_registry.py index a00e94159c07..c223d33890a8 100644 --- a/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_registry.py +++ b/packages/google-cloud-apigee-registry/tests/unit/gapic/apigee_registry_v1/test_registry.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,23 +43,30 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apigee_registry_v1.services.registry import ( RegistryAsyncClient, @@ -916,10 +923,9 @@ def test_registry_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +970,9 @@ def test_registry_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1008,9 @@ def test_registry_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1231,13 +1235,13 @@ def test_registry_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3219,9 +3223,9 @@ def test_list_api_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_versions] = ( + mock_rpc + ) request = {} client.list_api_versions(request) @@ -4106,9 +4110,9 @@ def test_create_api_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_version] = ( + mock_rpc + ) request = {} client.create_api_version(request) @@ -4476,9 +4480,9 @@ def test_update_api_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_version] = ( + mock_rpc + ) request = {} client.update_api_version(request) @@ -4831,9 +4835,9 @@ def test_delete_api_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_version] = ( + mock_rpc + ) request = {} client.delete_api_version(request) @@ -6043,9 +6047,9 @@ def test_get_api_spec_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_spec_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_spec_contents] = ( + mock_rpc + ) request = {} client.get_api_spec_contents(request) @@ -7455,9 +7459,9 @@ def test_tag_api_spec_revision_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.tag_api_spec_revision - ] = mock_rpc + client._transport._wrapped_methods[client._transport.tag_api_spec_revision] = ( + mock_rpc + ) request = {} client.tag_api_spec_revision(request) @@ -8204,9 +8208,9 @@ def test_rollback_api_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rollback_api_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rollback_api_spec] = ( + mock_rpc + ) request = {} client.rollback_api_spec(request) @@ -8855,9 +8859,9 @@ def test_list_api_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_deployments] = ( + mock_rpc + ) request = {} client.list_api_deployments(request) @@ -9415,9 +9419,9 @@ def test_get_api_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_deployment] = ( + mock_rpc + ) request = {} client.get_api_deployment(request) @@ -9792,9 +9796,9 @@ def test_create_api_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_deployment] = ( + mock_rpc + ) request = {} client.create_api_deployment(request) @@ -10183,9 +10187,9 @@ def test_update_api_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_deployment] = ( + mock_rpc + ) request = {} client.update_api_deployment(request) @@ -10549,9 +10553,9 @@ def test_delete_api_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_deployment] = ( + mock_rpc + ) request = {} client.delete_api_deployment(request) @@ -13165,9 +13169,9 @@ def test_get_artifact_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_artifact_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_artifact_contents] = ( + mock_rpc + ) request = {} client.get_artifact_contents(request) @@ -13868,9 +13872,9 @@ def test_replace_artifact_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.replace_artifact - ] = mock_rpc + client._transport._wrapped_methods[client._transport.replace_artifact] = ( + mock_rpc + ) request = {} client.replace_artifact(request) @@ -15449,9 +15453,9 @@ def test_list_api_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_versions] = ( + mock_rpc + ) request = {} client.list_api_versions(request) @@ -15891,9 +15895,9 @@ def test_create_api_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_version] = ( + mock_rpc + ) request = {} client.create_api_version(request) @@ -16102,9 +16106,9 @@ def test_update_api_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_version] = ( + mock_rpc + ) request = {} client.update_api_version(request) @@ -16301,9 +16305,9 @@ def test_delete_api_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_version] = ( + mock_rpc + ) request = {} client.delete_api_version(request) @@ -16925,9 +16929,9 @@ def test_get_api_spec_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_spec_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_spec_contents] = ( + mock_rpc + ) request = {} client.get_api_spec_contents(request) @@ -17687,9 +17691,9 @@ def test_tag_api_spec_revision_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.tag_api_spec_revision - ] = mock_rpc + client._transport._wrapped_methods[client._transport.tag_api_spec_revision] = ( + mock_rpc + ) request = {} client.tag_api_spec_revision(request) @@ -18029,9 +18033,9 @@ def test_rollback_api_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rollback_api_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rollback_api_spec] = ( + mock_rpc + ) request = {} client.rollback_api_spec(request) @@ -18351,9 +18355,9 @@ def test_list_api_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_deployments] = ( + mock_rpc + ) request = {} client.list_api_deployments(request) @@ -18613,9 +18617,9 @@ def test_get_api_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_deployment] = ( + mock_rpc + ) request = {} client.get_api_deployment(request) @@ -18798,9 +18802,9 @@ def test_create_api_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_deployment] = ( + mock_rpc + ) request = {} client.create_api_deployment(request) @@ -19010,9 +19014,9 @@ def test_update_api_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_deployment] = ( + mock_rpc + ) request = {} client.update_api_deployment(request) @@ -19210,9 +19214,9 @@ def test_delete_api_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_deployment] = ( + mock_rpc + ) request = {} client.delete_api_deployment(request) @@ -20501,9 +20505,9 @@ def test_get_artifact_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_artifact_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_artifact_contents] = ( + mock_rpc + ) request = {} client.get_artifact_contents(request) @@ -20885,9 +20889,9 @@ def test_replace_artifact_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.replace_artifact - ] = mock_rpc + client._transport._wrapped_methods[client._transport.replace_artifact] = ( + mock_rpc + ) request = {} client.replace_artifact(request) @@ -23222,8 +23226,9 @@ def test_list_apis_rest_bad_request(request_type=registry_service.ListApisReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23284,17 +23289,15 @@ def test_list_apis_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_list_apis" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_list_apis_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_list_apis" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegistryRestInterceptor, "post_list_apis") as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_list_apis_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegistryRestInterceptor, "pre_list_apis") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23347,8 +23350,9 @@ def test_get_api_rest_bad_request(request_type=registry_service.GetApiRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23419,17 +23423,15 @@ def test_get_api_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_get_api" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_get_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_get_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegistryRestInterceptor, "post_get_api") as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_get_api_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegistryRestInterceptor, "pre_get_api") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23478,8 +23480,9 @@ def test_create_api_rest_bad_request(request_type=registry_service.CreateApiRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23629,17 +23632,17 @@ def test_create_api_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_create_api" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_create_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_create_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_create_api" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_create_api_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegistryRestInterceptor, "pre_create_api") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23690,8 +23693,9 @@ def test_update_api_rest_bad_request(request_type=registry_service.UpdateApiRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23841,17 +23845,17 @@ def test_update_api_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_update_api" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_update_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_update_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_update_api" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_update_api_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegistryRestInterceptor, "pre_update_api") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23902,8 +23906,9 @@ def test_delete_api_rest_bad_request(request_type=registry_service.DeleteApiRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23958,13 +23963,11 @@ def test_delete_api_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "pre_delete_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegistryRestInterceptor, "pre_delete_api") as pre, + ): pre.assert_not_called() pb_message = registry_service.DeleteApiRequest.pb( registry_service.DeleteApiRequest() @@ -24009,8 +24012,9 @@ def test_list_api_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24071,17 +24075,19 @@ def test_list_api_versions_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_list_api_versions" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_list_api_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_list_api_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_list_api_versions" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_list_api_versions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_list_api_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24141,8 +24147,9 @@ def test_get_api_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24211,17 +24218,19 @@ def test_get_api_version_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_get_api_version" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_get_api_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_get_api_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_get_api_version" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_get_api_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_get_api_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24274,8 +24283,9 @@ def test_create_api_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24419,17 +24429,19 @@ def test_create_api_version_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_create_api_version" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_create_api_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_create_api_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_create_api_version" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_create_api_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_create_api_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24486,8 +24498,9 @@ def test_update_api_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24635,17 +24648,19 @@ def test_update_api_version_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_update_api_version" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_update_api_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_update_api_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_update_api_version" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_update_api_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_update_api_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24700,8 +24715,9 @@ def test_delete_api_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24758,13 +24774,13 @@ def test_delete_api_version_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "pre_delete_api_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_delete_api_version" + ) as pre, + ): pre.assert_not_called() pb_message = registry_service.DeleteApiVersionRequest.pb( registry_service.DeleteApiVersionRequest() @@ -24811,8 +24827,9 @@ def test_list_api_specs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24875,17 +24892,19 @@ def test_list_api_specs_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_list_api_specs" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_list_api_specs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_list_api_specs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_list_api_specs" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_list_api_specs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_list_api_specs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24943,8 +24962,9 @@ def test_get_api_spec_rest_bad_request(request_type=registry_service.GetApiSpecR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25023,17 +25043,19 @@ def test_get_api_spec_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_get_api_spec" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_get_api_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_get_api_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_get_api_spec" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_get_api_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_get_api_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25088,8 +25110,9 @@ def test_get_api_spec_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25151,17 +25174,20 @@ def test_get_api_spec_contents_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_get_api_spec_contents" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_get_api_spec_contents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_get_api_spec_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_get_api_spec_contents" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, + "post_get_api_spec_contents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_get_api_spec_contents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25216,8 +25242,9 @@ def test_create_api_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25379,17 +25406,19 @@ def test_create_api_spec_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_create_api_spec" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_create_api_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_create_api_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_create_api_spec" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_create_api_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_create_api_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25446,8 +25475,9 @@ def test_update_api_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25611,17 +25641,19 @@ def test_update_api_spec_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_update_api_spec" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_update_api_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_update_api_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_update_api_spec" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_update_api_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_update_api_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25676,8 +25708,9 @@ def test_delete_api_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25734,13 +25767,13 @@ def test_delete_api_spec_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "pre_delete_api_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_delete_api_spec" + ) as pre, + ): pre.assert_not_called() pb_message = registry_service.DeleteApiSpecRequest.pb( registry_service.DeleteApiSpecRequest() @@ -25787,8 +25820,9 @@ def test_tag_api_spec_revision_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25867,17 +25901,20 @@ def test_tag_api_spec_revision_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_tag_api_spec_revision" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_tag_api_spec_revision_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_tag_api_spec_revision" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_tag_api_spec_revision" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, + "post_tag_api_spec_revision_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_tag_api_spec_revision" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25932,8 +25969,9 @@ def test_list_api_spec_revisions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25996,17 +26034,20 @@ def test_list_api_spec_revisions_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_list_api_spec_revisions" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_list_api_spec_revisions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_list_api_spec_revisions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_list_api_spec_revisions" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, + "post_list_api_spec_revisions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_list_api_spec_revisions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26066,8 +26107,9 @@ def test_rollback_api_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26146,17 +26188,19 @@ def test_rollback_api_spec_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_rollback_api_spec" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_rollback_api_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_rollback_api_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_rollback_api_spec" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_rollback_api_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_rollback_api_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26211,8 +26255,9 @@ def test_delete_api_spec_revision_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26291,18 +26336,20 @@ def test_delete_api_spec_revision_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_delete_api_spec_revision" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, - "post_delete_api_spec_revision_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_delete_api_spec_revision" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_delete_api_spec_revision" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, + "post_delete_api_spec_revision_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_delete_api_spec_revision" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26355,8 +26402,9 @@ def test_list_api_deployments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26417,17 +26465,20 @@ def test_list_api_deployments_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_list_api_deployments" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_list_api_deployments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_list_api_deployments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_list_api_deployments" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, + "post_list_api_deployments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_list_api_deployments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26487,8 +26538,9 @@ def test_get_api_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26567,17 +26619,19 @@ def test_get_api_deployment_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_get_api_deployment" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_get_api_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_get_api_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_get_api_deployment" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_get_api_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_get_api_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26632,8 +26686,9 @@ def test_create_api_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26795,17 +26850,20 @@ def test_create_api_deployment_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_create_api_deployment" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_create_api_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_create_api_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_create_api_deployment" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, + "post_create_api_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_create_api_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26864,8 +26922,9 @@ def test_update_api_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27031,17 +27090,20 @@ def test_update_api_deployment_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_update_api_deployment" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_update_api_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_update_api_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_update_api_deployment" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, + "post_update_api_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_update_api_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27098,8 +27160,9 @@ def test_delete_api_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27156,13 +27219,13 @@ def test_delete_api_deployment_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "pre_delete_api_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_delete_api_deployment" + ) as pre, + ): pre.assert_not_called() pb_message = registry_service.DeleteApiDeploymentRequest.pb( registry_service.DeleteApiDeploymentRequest() @@ -27209,8 +27272,9 @@ def test_tag_api_deployment_revision_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27289,18 +27353,20 @@ def test_tag_api_deployment_revision_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_tag_api_deployment_revision" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, - "post_tag_api_deployment_revision_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_tag_api_deployment_revision" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_tag_api_deployment_revision" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, + "post_tag_api_deployment_revision_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_tag_api_deployment_revision" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27357,8 +27423,9 @@ def test_list_api_deployment_revisions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27423,18 +27490,20 @@ def test_list_api_deployment_revisions_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_list_api_deployment_revisions" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, - "post_list_api_deployment_revisions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_list_api_deployment_revisions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_list_api_deployment_revisions" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, + "post_list_api_deployment_revisions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_list_api_deployment_revisions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27494,8 +27563,9 @@ def test_rollback_api_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27574,17 +27644,20 @@ def test_rollback_api_deployment_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_rollback_api_deployment" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_rollback_api_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_rollback_api_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_rollback_api_deployment" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, + "post_rollback_api_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_rollback_api_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27641,8 +27714,9 @@ def test_delete_api_deployment_revision_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27721,18 +27795,20 @@ def test_delete_api_deployment_revision_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_delete_api_deployment_revision" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, - "post_delete_api_deployment_revision_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_delete_api_deployment_revision" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_delete_api_deployment_revision" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, + "post_delete_api_deployment_revision_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_delete_api_deployment_revision" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27787,8 +27863,9 @@ def test_list_artifacts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27849,17 +27926,19 @@ def test_list_artifacts_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_list_artifacts" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_list_artifacts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_list_artifacts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_list_artifacts" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_list_artifacts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_list_artifacts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27917,8 +27996,9 @@ def test_get_artifact_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27987,17 +28067,19 @@ def test_get_artifact_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_get_artifact" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_get_artifact_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_get_artifact" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_get_artifact" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_get_artifact_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_get_artifact" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28050,8 +28132,9 @@ def test_get_artifact_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28111,17 +28194,20 @@ def test_get_artifact_contents_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_get_artifact_contents" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_get_artifact_contents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_get_artifact_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_get_artifact_contents" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, + "post_get_artifact_contents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_get_artifact_contents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28174,8 +28260,9 @@ def test_create_artifact_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28320,17 +28407,19 @@ def test_create_artifact_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_create_artifact" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_create_artifact_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_create_artifact" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_create_artifact" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_create_artifact_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_create_artifact" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28385,8 +28474,9 @@ def test_replace_artifact_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28533,17 +28623,19 @@ def test_replace_artifact_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "post_replace_artifact" - ) as post, mock.patch.object( - transports.RegistryRestInterceptor, "post_replace_artifact_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegistryRestInterceptor, "pre_replace_artifact" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "post_replace_artifact" + ) as post, + mock.patch.object( + transports.RegistryRestInterceptor, "post_replace_artifact_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_replace_artifact" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28596,8 +28688,9 @@ def test_delete_artifact_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28652,13 +28745,13 @@ def test_delete_artifact_rest_interceptors(null_interceptor): ) client = RegistryClient(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.RegistryRestInterceptor, "pre_delete_artifact" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegistryRestInterceptor, "pre_delete_artifact" + ) as pre, + ): pre.assert_not_called() pb_message = registry_service.DeleteArtifactRequest.pb( registry_service.DeleteArtifactRequest() @@ -28703,8 +28796,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -28763,8 +28857,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -28825,8 +28920,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -28887,8 +28983,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -28949,8 +29046,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -29011,8 +29109,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -29073,8 +29172,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -29135,8 +29235,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -29197,8 +29298,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -30087,11 +30189,14 @@ def test_registry_base_transport(): def test_registry_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apigee_registry_v1.services.registry.transports.RegistryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apigee_registry_v1.services.registry.transports.RegistryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegistryTransport( @@ -30108,9 +30213,12 @@ def test_registry_base_transport_with_credentials_file(): def test_registry_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apigee_registry_v1.services.registry.transports.RegistryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apigee_registry_v1.services.registry.transports.RegistryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegistryTransport() @@ -30182,11 +30290,12 @@ def test_registry_transport_auth_gdch_credentials(transport_class): def test_registry_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apihub/docs/conf.py b/packages/google-cloud-apihub/docs/conf.py index 3455650048d7..0378bad2e67c 100644 --- a/packages/google-cloud-apihub/docs/conf.py +++ b/packages/google-cloud-apihub/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-apihub documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/__init__.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/__init__.py index 0f7f978213f0..b7454ea3d969 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/__init__.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.api_hub import ApiHubAsyncClient, ApiHubClient from .services.api_hub_collect import ApiHubCollectAsyncClient, ApiHubCollectClient from .services.api_hub_curate import ApiHubCurateAsyncClient, ApiHubCurateClient diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/async_client.py index 2cdf8b393f9c..ac483f7b9737 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub import pagers from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -124,7 +124,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiHubAsyncClient: The constructed client. """ - return ApiHubClient.from_service_account_info.__func__(ApiHubAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ApiHubClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ApiHubAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +141,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiHubAsyncClient: The constructed client. """ - return ApiHubClient.from_service_account_file.__func__(ApiHubAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ApiHubClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ApiHubAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/client.py index f3a1c58add4f..1d9e3fa72ffb 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub import pagers from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -817,11 +817,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiHubClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiHubClient._read_environment_variables() + ) self._client_cert_source = ApiHubClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -856,8 +854,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiHubTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/pagers.py index 9b6140febab2..5d6ecc46025f 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1159,7 +1159,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1235,7 +1235,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/base.py index cf1fa7213b9d..e551dd5ecb33 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -912,13 +912,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc.py index ab24c0d1931b..af7536543a18 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc_asyncio.py index 85a6d9b0b274..7e4654a60bdd 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest.py index 32ec97189b28..a2763e950bd1 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -3387,7 +3387,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3499,7 +3499,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3613,7 +3613,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3727,7 +3727,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3841,7 +3841,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3949,7 +3949,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4059,7 +4059,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest_base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest_base.py index fe45190e434f..4612fd03f9b3 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest_base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/async_client.py index 8d87ae3be421..a03bf86ca528 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -138,7 +138,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiHubCollectAsyncClient: The constructed client. """ - return ApiHubCollectClient.from_service_account_info.__func__(ApiHubCollectAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ApiHubCollectClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ApiHubCollectAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +155,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiHubCollectAsyncClient: The constructed client. """ - return ApiHubCollectClient.from_service_account_file.__func__(ApiHubCollectAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ApiHubCollectClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ApiHubCollectAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/client.py index 053a7d94b5b1..49ee40f1471f 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -797,11 +797,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiHubCollectClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiHubCollectClient._read_environment_variables() + ) self._client_cert_source = ApiHubCollectClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -836,8 +834,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiHubCollectTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/base.py index 0cb3a6bc851a..7cae984c266b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import collect_service @@ -222,13 +222,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc.py index b9fb96133b93..26f51ba38869 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import collect_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc_asyncio.py index 5fc7f7333d73..f52c619571ad 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import collect_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/rest.py index 53674ebd74a0..2b89134bcb2b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_collect/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -512,7 +512,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/async_client.py index 8b7a73079607..89ff5debd841 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_curate import pagers from google.cloud.apihub_v1.types import curate_service @@ -120,7 +120,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiHubCurateAsyncClient: The constructed client. """ - return ApiHubCurateClient.from_service_account_info.__func__(ApiHubCurateAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ApiHubCurateClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ApiHubCurateAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +137,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiHubCurateAsyncClient: The constructed client. """ - return ApiHubCurateClient.from_service_account_file.__func__(ApiHubCurateAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ApiHubCurateClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ApiHubCurateAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/client.py index 386c5fe1e940..b9fd7ade1ebb 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_curate import pagers from google.cloud.apihub_v1.types import curate_service @@ -649,11 +649,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiHubCurateClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiHubCurateClient._read_environment_variables() + ) self._client_cert_source = ApiHubCurateClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -688,8 +686,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiHubCurateTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/pagers.py index f290d270c004..fc97a986a28b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/base.py index eb9805a9fecb..5e1f8427118a 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import curate_service @@ -277,13 +277,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc.py index 645bde79f3b5..281de696e65f 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import curate_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc_asyncio.py index e0d0fd34dec6..840f26e28229 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import curate_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest.py index a3f1fc5c5d2b..ab474c981ff3 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -784,7 +784,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest_base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest_base.py index f4479d0e1512..3c73828a39e2 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest_base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_curate/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.apihub_v1.types import curate_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/async_client.py index cd2ab0ee2790..c71bc5def009 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_dependencies import pagers from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -122,7 +122,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiHubDependenciesAsyncClient: The constructed client. """ - return ApiHubDependenciesClient.from_service_account_info.__func__(ApiHubDependenciesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ApiHubDependenciesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ApiHubDependenciesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +139,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiHubDependenciesAsyncClient: The constructed client. """ - return ApiHubDependenciesClient.from_service_account_file.__func__(ApiHubDependenciesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ApiHubDependenciesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ApiHubDependenciesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -176,7 +178,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ApiHubDependenciesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ApiHubDependenciesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ApiHubDependenciesTransport: diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/client.py index 1172b097b3c7..507e83f935b1 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_dependencies import pagers from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -83,9 +83,7 @@ class ApiHubDependenciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ApiHubDependenciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ApiHubDependenciesTransport]] _transport_registry["grpc"] = ApiHubDependenciesGrpcTransport _transport_registry["grpc_asyncio"] = ApiHubDependenciesGrpcAsyncIOTransport _transport_registry["rest"] = ApiHubDependenciesRestTransport @@ -655,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiHubDependenciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiHubDependenciesClient._read_environment_variables() + ) self._client_cert_source = ApiHubDependenciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiHubDependenciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/pagers.py index 63d33f7ec4be..0b6cafe65f8c 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/__init__.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/__init__.py index e94033b587e8..23d6083f6b35 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/__init__.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ApiHubDependenciesRestInterceptor, ApiHubDependenciesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ApiHubDependenciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ApiHubDependenciesTransport]] _transport_registry["grpc"] = ApiHubDependenciesGrpcTransport _transport_registry["grpc_asyncio"] = ApiHubDependenciesGrpcAsyncIOTransport _transport_registry["rest"] = ApiHubDependenciesRestTransport diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/base.py index 70019db11b24..4628f0b1284c 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import apihub_service, common_fields @@ -295,13 +295,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc.py index 5217b0fc6d25..df8d4d549002 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc_asyncio.py index 69931d71e02b..5f626f0ba80c 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest.py index 8336679af1e4..1fb08d0bbc1e 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -625,9 +625,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseCreateDependency._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseCreateDependency._get_http_options() request, metadata = self._interceptor.pre_create_dependency( request, metadata @@ -775,9 +773,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseDeleteDependency._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseDeleteDependency._get_http_options() request, metadata = self._interceptor.pre_delete_dependency( request, metadata @@ -799,7 +795,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -896,9 +892,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseGetDependency._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseGetDependency._get_http_options() request, metadata = self._interceptor.pre_get_dependency(request, metadata) transcoded_request = _BaseApiHubDependenciesRestTransport._BaseGetDependency._get_transcoded_request( @@ -1046,9 +1040,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseListDependencies._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseListDependencies._get_http_options() request, metadata = self._interceptor.pre_list_dependencies( request, metadata @@ -1205,9 +1197,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseUpdateDependency._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseUpdateDependency._get_http_options() request, metadata = self._interceptor.pre_update_dependency( request, metadata @@ -1403,9 +1393,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseApiHubDependenciesRestTransport._BaseGetLocation._get_transcoded_request( @@ -1544,9 +1532,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseApiHubDependenciesRestTransport._BaseListLocations._get_transcoded_request( @@ -1683,9 +1669,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1803,9 +1787,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1921,9 +1903,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseApiHubDependenciesRestTransport._BaseGetOperation._get_transcoded_request( @@ -2062,9 +2042,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseApiHubDependenciesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseApiHubDependenciesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseApiHubDependenciesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest_base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest_base.py index 19fbb0fabfc6..f315d88a2bf1 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest_base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_dependencies/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.apihub_v1.types import apihub_service, common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/async_client.py index cd8daddeb2e5..f47a0513af2c 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_discovery import pagers from google.cloud.apihub_v1.types import common_fields, discovery_service @@ -133,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiHubDiscoveryAsyncClient: The constructed client. """ - return ApiHubDiscoveryClient.from_service_account_info.__func__(ApiHubDiscoveryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ApiHubDiscoveryClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ApiHubDiscoveryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiHubDiscoveryAsyncClient: The constructed client. """ - return ApiHubDiscoveryClient.from_service_account_file.__func__(ApiHubDiscoveryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ApiHubDiscoveryClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ApiHubDiscoveryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/client.py index cc33699691ec..bd89c36804d7 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_discovery import pagers from google.cloud.apihub_v1.types import common_fields, discovery_service @@ -82,9 +82,7 @@ class ApiHubDiscoveryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ApiHubDiscoveryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ApiHubDiscoveryTransport]] _transport_registry["grpc"] = ApiHubDiscoveryGrpcTransport _transport_registry["grpc_asyncio"] = ApiHubDiscoveryGrpcAsyncIOTransport _transport_registry["rest"] = ApiHubDiscoveryRestTransport @@ -676,11 +674,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiHubDiscoveryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiHubDiscoveryClient._read_environment_variables() + ) self._client_cert_source = ApiHubDiscoveryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -715,8 +711,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiHubDiscoveryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/pagers.py index 2c798ca38cfa..8e95cff5829e 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -307,7 +307,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/base.py index 0203b82d1f68..e439f43ad29e 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import common_fields, discovery_service @@ -271,13 +271,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc.py index 3e2fe0fd46ed..609c550b1961 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import common_fields, discovery_service @@ -348,12 +348,12 @@ def list_discovered_api_observations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_discovered_api_observations" not in self._stubs: - self._stubs[ - "list_discovered_api_observations" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiObservations", - request_serializer=discovery_service.ListDiscoveredApiObservationsRequest.serialize, - response_deserializer=discovery_service.ListDiscoveredApiObservationsResponse.deserialize, + self._stubs["list_discovered_api_observations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiObservations", + request_serializer=discovery_service.ListDiscoveredApiObservationsRequest.serialize, + response_deserializer=discovery_service.ListDiscoveredApiObservationsResponse.deserialize, + ) ) return self._stubs["list_discovered_api_observations"] @@ -380,12 +380,12 @@ def get_discovered_api_observation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_discovered_api_observation" not in self._stubs: - self._stubs[ - "get_discovered_api_observation" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiObservation", - request_serializer=discovery_service.GetDiscoveredApiObservationRequest.serialize, - response_deserializer=common_fields.DiscoveredApiObservation.deserialize, + self._stubs["get_discovered_api_observation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiObservation", + request_serializer=discovery_service.GetDiscoveredApiObservationRequest.serialize, + response_deserializer=common_fields.DiscoveredApiObservation.deserialize, + ) ) return self._stubs["get_discovered_api_observation"] @@ -412,12 +412,12 @@ def list_discovered_api_operations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_discovered_api_operations" not in self._stubs: - self._stubs[ - "list_discovered_api_operations" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiOperations", - request_serializer=discovery_service.ListDiscoveredApiOperationsRequest.serialize, - response_deserializer=discovery_service.ListDiscoveredApiOperationsResponse.deserialize, + self._stubs["list_discovered_api_operations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiOperations", + request_serializer=discovery_service.ListDiscoveredApiOperationsRequest.serialize, + response_deserializer=discovery_service.ListDiscoveredApiOperationsResponse.deserialize, + ) ) return self._stubs["list_discovered_api_operations"] @@ -444,12 +444,12 @@ def get_discovered_api_operation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_discovered_api_operation" not in self._stubs: - self._stubs[ - "get_discovered_api_operation" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiOperation", - request_serializer=discovery_service.GetDiscoveredApiOperationRequest.serialize, - response_deserializer=common_fields.DiscoveredApiOperation.deserialize, + self._stubs["get_discovered_api_operation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiOperation", + request_serializer=discovery_service.GetDiscoveredApiOperationRequest.serialize, + response_deserializer=common_fields.DiscoveredApiOperation.deserialize, + ) ) return self._stubs["get_discovered_api_operation"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc_asyncio.py index 1ded1ec9bee1..7691a5ef724b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import common_fields, discovery_service @@ -356,12 +356,12 @@ def list_discovered_api_observations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_discovered_api_observations" not in self._stubs: - self._stubs[ - "list_discovered_api_observations" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiObservations", - request_serializer=discovery_service.ListDiscoveredApiObservationsRequest.serialize, - response_deserializer=discovery_service.ListDiscoveredApiObservationsResponse.deserialize, + self._stubs["list_discovered_api_observations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiObservations", + request_serializer=discovery_service.ListDiscoveredApiObservationsRequest.serialize, + response_deserializer=discovery_service.ListDiscoveredApiObservationsResponse.deserialize, + ) ) return self._stubs["list_discovered_api_observations"] @@ -388,12 +388,12 @@ def get_discovered_api_observation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_discovered_api_observation" not in self._stubs: - self._stubs[ - "get_discovered_api_observation" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiObservation", - request_serializer=discovery_service.GetDiscoveredApiObservationRequest.serialize, - response_deserializer=common_fields.DiscoveredApiObservation.deserialize, + self._stubs["get_discovered_api_observation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiObservation", + request_serializer=discovery_service.GetDiscoveredApiObservationRequest.serialize, + response_deserializer=common_fields.DiscoveredApiObservation.deserialize, + ) ) return self._stubs["get_discovered_api_observation"] @@ -420,12 +420,12 @@ def list_discovered_api_operations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_discovered_api_operations" not in self._stubs: - self._stubs[ - "list_discovered_api_operations" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiOperations", - request_serializer=discovery_service.ListDiscoveredApiOperationsRequest.serialize, - response_deserializer=discovery_service.ListDiscoveredApiOperationsResponse.deserialize, + self._stubs["list_discovered_api_operations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/ListDiscoveredApiOperations", + request_serializer=discovery_service.ListDiscoveredApiOperationsRequest.serialize, + response_deserializer=discovery_service.ListDiscoveredApiOperationsResponse.deserialize, + ) ) return self._stubs["list_discovered_api_operations"] @@ -452,12 +452,12 @@ def get_discovered_api_operation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_discovered_api_operation" not in self._stubs: - self._stubs[ - "get_discovered_api_operation" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiOperation", - request_serializer=discovery_service.GetDiscoveredApiOperationRequest.serialize, - response_deserializer=common_fields.DiscoveredApiOperation.deserialize, + self._stubs["get_discovered_api_operation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubDiscovery/GetDiscoveredApiOperation", + request_serializer=discovery_service.GetDiscoveredApiOperationRequest.serialize, + response_deserializer=common_fields.DiscoveredApiOperation.deserialize, + ) ) return self._stubs["get_discovered_api_operation"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/rest.py index e2c7b9cc3353..25d41c20c583 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_discovery/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -612,9 +612,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseGetDiscoveredApiObservation._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseGetDiscoveredApiObservation._get_http_options() request, metadata = self._interceptor.pre_get_discovered_api_observation( request, metadata @@ -680,11 +678,10 @@ def __call__( resp = self._interceptor.post_get_discovered_api_observation(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_discovered_api_observation_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_discovered_api_observation_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -771,9 +768,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseGetDiscoveredApiOperation._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseGetDiscoveredApiOperation._get_http_options() request, metadata = self._interceptor.pre_get_discovered_api_operation( request, metadata @@ -926,9 +921,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseListDiscoveredApiObservations._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseListDiscoveredApiObservations._get_http_options() request, metadata = self._interceptor.pre_list_discovered_api_observations( request, metadata @@ -992,11 +985,10 @@ def __call__( resp = self._interceptor.post_list_discovered_api_observations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_discovered_api_observations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_discovered_api_observations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1084,9 +1076,7 @@ def __call__( """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseListDiscoveredApiOperations._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseListDiscoveredApiOperations._get_http_options() request, metadata = self._interceptor.pre_list_discovered_api_operations( request, metadata @@ -1152,11 +1142,10 @@ def __call__( resp = self._interceptor.post_list_discovered_api_operations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_discovered_api_operations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_discovered_api_operations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1194,7 +1183,9 @@ def get_discovered_api_observation( ]: # 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._GetDiscoveredApiObservation(self._session, self._host, self._interceptor) # type: ignore + return self._GetDiscoveredApiObservation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_discovered_api_operation( @@ -1205,7 +1196,9 @@ def get_discovered_api_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._GetDiscoveredApiOperation(self._session, self._host, self._interceptor) # type: ignore + return self._GetDiscoveredApiOperation( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_discovered_api_observations( @@ -1216,7 +1209,9 @@ def list_discovered_api_observations( ]: # 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._ListDiscoveredApiObservations(self._session, self._host, self._interceptor) # type: ignore + return self._ListDiscoveredApiObservations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_discovered_api_operations( @@ -1227,7 +1222,9 @@ def list_discovered_api_operations( ]: # 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._ListDiscoveredApiOperations(self._session, self._host, self._interceptor) # type: ignore + return self._ListDiscoveredApiOperations( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1564,9 +1561,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1683,9 +1678,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1940,9 +1933,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseApiHubDiscoveryRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseApiHubDiscoveryRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseApiHubDiscoveryRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/async_client.py index aced5f7275a9..ef471278ea39 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_plugin import pagers from google.cloud.apihub_v1.types import common_fields, plugin_service @@ -127,7 +127,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApiHubPluginAsyncClient: The constructed client. """ - return ApiHubPluginClient.from_service_account_info.__func__(ApiHubPluginAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ApiHubPluginClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ApiHubPluginAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApiHubPluginAsyncClient: The constructed client. """ - return ApiHubPluginClient.from_service_account_file.__func__(ApiHubPluginAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ApiHubPluginClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ApiHubPluginAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/client.py index b9258806a9d1..76a137f83560 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_plugin import pagers from google.cloud.apihub_v1.types import common_fields, plugin_service @@ -692,11 +692,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApiHubPluginClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApiHubPluginClient._read_environment_variables() + ) self._client_cert_source = ApiHubPluginClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -731,8 +729,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApiHubPluginTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/pagers.py index 92aa37d721d2..cfef1bbb3431 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/base.py index 9a8fed1ae05b..b3420469a9ce 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import plugin_service @@ -419,13 +419,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc.py index 7c4c3ec5e082..98e58024f918 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import plugin_service @@ -553,12 +553,12 @@ def execute_plugin_instance_action( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "execute_plugin_instance_action" not in self._stubs: - self._stubs[ - "execute_plugin_instance_action" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubPlugin/ExecutePluginInstanceAction", - request_serializer=plugin_service.ExecutePluginInstanceActionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["execute_plugin_instance_action"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubPlugin/ExecutePluginInstanceAction", + request_serializer=plugin_service.ExecutePluginInstanceActionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["execute_plugin_instance_action"] @@ -641,12 +641,12 @@ def enable_plugin_instance_action( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_plugin_instance_action" not in self._stubs: - self._stubs[ - "enable_plugin_instance_action" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubPlugin/EnablePluginInstanceAction", - request_serializer=plugin_service.EnablePluginInstanceActionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_plugin_instance_action"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubPlugin/EnablePluginInstanceAction", + request_serializer=plugin_service.EnablePluginInstanceActionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_plugin_instance_action"] @@ -671,12 +671,12 @@ def disable_plugin_instance_action( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_plugin_instance_action" not in self._stubs: - self._stubs[ - "disable_plugin_instance_action" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubPlugin/DisablePluginInstanceAction", - request_serializer=plugin_service.DisablePluginInstanceActionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_plugin_instance_action"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubPlugin/DisablePluginInstanceAction", + request_serializer=plugin_service.DisablePluginInstanceActionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_plugin_instance_action"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc_asyncio.py index e6c8de4ad5a9..edc29f977dbd 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import plugin_service @@ -572,12 +572,12 @@ def execute_plugin_instance_action( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "execute_plugin_instance_action" not in self._stubs: - self._stubs[ - "execute_plugin_instance_action" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubPlugin/ExecutePluginInstanceAction", - request_serializer=plugin_service.ExecutePluginInstanceActionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["execute_plugin_instance_action"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubPlugin/ExecutePluginInstanceAction", + request_serializer=plugin_service.ExecutePluginInstanceActionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["execute_plugin_instance_action"] @@ -662,12 +662,12 @@ def enable_plugin_instance_action( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_plugin_instance_action" not in self._stubs: - self._stubs[ - "enable_plugin_instance_action" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubPlugin/EnablePluginInstanceAction", - request_serializer=plugin_service.EnablePluginInstanceActionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_plugin_instance_action"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubPlugin/EnablePluginInstanceAction", + request_serializer=plugin_service.EnablePluginInstanceActionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_plugin_instance_action"] @@ -693,12 +693,12 @@ def disable_plugin_instance_action( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_plugin_instance_action" not in self._stubs: - self._stubs[ - "disable_plugin_instance_action" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.ApiHubPlugin/DisablePluginInstanceAction", - request_serializer=plugin_service.DisablePluginInstanceActionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_plugin_instance_action"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.ApiHubPlugin/DisablePluginInstanceAction", + request_serializer=plugin_service.DisablePluginInstanceActionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_plugin_instance_action"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/rest.py index fce4fd4d475b..748d05b117b1 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/api_hub_plugin/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1378,9 +1378,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseCreatePluginInstance._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseCreatePluginInstance._get_http_options() request, metadata = self._interceptor.pre_create_plugin_instance( request, metadata @@ -1406,7 +1404,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1555,7 +1553,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1680,9 +1678,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseDeletePluginInstance._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseDeletePluginInstance._get_http_options() request, metadata = self._interceptor.pre_delete_plugin_instance( request, metadata @@ -1704,7 +1700,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1984,9 +1980,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseDisablePluginInstanceAction._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseDisablePluginInstanceAction._get_http_options() request, metadata = self._interceptor.pre_disable_plugin_instance_action( request, metadata @@ -2012,7 +2006,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2055,11 +2049,10 @@ def __call__( resp = self._interceptor.post_disable_plugin_instance_action(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_disable_plugin_instance_action_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_disable_plugin_instance_action_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2302,9 +2295,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseEnablePluginInstanceAction._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseEnablePluginInstanceAction._get_http_options() request, metadata = self._interceptor.pre_enable_plugin_instance_action( request, metadata @@ -2330,7 +2321,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2373,11 +2364,10 @@ def __call__( resp = self._interceptor.post_enable_plugin_instance_action(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_enable_plugin_instance_action_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_enable_plugin_instance_action_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2464,9 +2454,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseExecutePluginInstanceAction._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseExecutePluginInstanceAction._get_http_options() request, metadata = self._interceptor.pre_execute_plugin_instance_action( request, metadata @@ -2492,7 +2480,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2535,11 +2523,10 @@ def __call__( resp = self._interceptor.post_execute_plugin_instance_action(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_execute_plugin_instance_action_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_execute_plugin_instance_action_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2775,9 +2762,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseGetPluginInstance._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseGetPluginInstance._get_http_options() request, metadata = self._interceptor.pre_get_plugin_instance( request, metadata @@ -2926,9 +2911,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseListPluginInstances._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseListPluginInstances._get_http_options() request, metadata = self._interceptor.pre_list_plugin_instances( request, metadata @@ -3237,9 +3220,7 @@ def __call__( """ - http_options = ( - _BaseApiHubPluginRestTransport._BaseUpdatePluginInstance._get_http_options() - ) + http_options = _BaseApiHubPluginRestTransport._BaseUpdatePluginInstance._get_http_options() request, metadata = self._interceptor.pre_update_plugin_instance( request, metadata @@ -3386,7 +3367,9 @@ def disable_plugin_instance_action( ]: # 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._DisablePluginInstanceAction(self._session, self._host, self._interceptor) # type: ignore + return self._DisablePluginInstanceAction( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_plugin( @@ -3404,7 +3387,9 @@ def enable_plugin_instance_action( ]: # 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._EnablePluginInstanceAction(self._session, self._host, self._interceptor) # type: ignore + return self._EnablePluginInstanceAction( + self._session, self._host, self._interceptor + ) # type: ignore @property def execute_plugin_instance_action( @@ -3414,7 +3399,9 @@ def execute_plugin_instance_action( ]: # 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._ExecutePluginInstanceAction(self._session, self._host, self._interceptor) # type: ignore + return self._ExecutePluginInstanceAction( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_plugin( diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/async_client.py index a0ed565e4d54..b9ed0e26b24f 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.host_project_registration_service import pagers from google.cloud.apihub_v1.types import host_project_registration_service @@ -134,7 +134,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: HostProjectRegistrationServiceAsyncClient: The constructed client. """ - return HostProjectRegistrationServiceClient.from_service_account_info.__func__(HostProjectRegistrationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + HostProjectRegistrationServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + HostProjectRegistrationServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -150,7 +155,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: HostProjectRegistrationServiceAsyncClient: The constructed client. """ - return HostProjectRegistrationServiceClient.from_service_account_file.__func__(HostProjectRegistrationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + HostProjectRegistrationServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + HostProjectRegistrationServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -188,7 +198,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return HostProjectRegistrationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return HostProjectRegistrationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> HostProjectRegistrationServiceTransport: diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/client.py index ef129b1348fe..9f1252421df0 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.host_project_registration_service import pagers from google.cloud.apihub_v1.types import host_project_registration_service @@ -85,13 +85,11 @@ class HostProjectRegistrationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[HostProjectRegistrationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[HostProjectRegistrationServiceTransport]] _transport_registry["grpc"] = HostProjectRegistrationServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = HostProjectRegistrationServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + HostProjectRegistrationServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = HostProjectRegistrationServiceRestTransport def get_transport_class( @@ -643,11 +641,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = HostProjectRegistrationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + HostProjectRegistrationServiceClient._read_environment_variables() + ) self._client_cert_source = ( HostProjectRegistrationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -688,8 +684,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(HostProjectRegistrationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/pagers.py index 42a7a42b645f..3ba61c400c6b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/pagers.py @@ -69,7 +69,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -160,7 +160,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/__init__.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/__init__.py index 312bae57ee53..20d38af82b8a 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/__init__.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[HostProjectRegistrationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[HostProjectRegistrationServiceTransport]] _transport_registry["grpc"] = HostProjectRegistrationServiceGrpcTransport _transport_registry["grpc_asyncio"] = HostProjectRegistrationServiceGrpcAsyncIOTransport _transport_registry["rest"] = HostProjectRegistrationServiceRestTransport diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/base.py index d9412ed3f912..19f8ea517b06 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import host_project_registration_service @@ -274,13 +274,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc.py index 698024d104ec..8306204a9534 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import host_project_registration_service @@ -354,12 +354,12 @@ def create_host_project_registration( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_host_project_registration" not in self._stubs: - self._stubs[ - "create_host_project_registration" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.HostProjectRegistrationService/CreateHostProjectRegistration", - request_serializer=host_project_registration_service.CreateHostProjectRegistrationRequest.serialize, - response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + self._stubs["create_host_project_registration"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.HostProjectRegistrationService/CreateHostProjectRegistration", + request_serializer=host_project_registration_service.CreateHostProjectRegistrationRequest.serialize, + response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + ) ) return self._stubs["create_host_project_registration"] @@ -385,12 +385,12 @@ def get_host_project_registration( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_host_project_registration" not in self._stubs: - self._stubs[ - "get_host_project_registration" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.HostProjectRegistrationService/GetHostProjectRegistration", - request_serializer=host_project_registration_service.GetHostProjectRegistrationRequest.serialize, - response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + self._stubs["get_host_project_registration"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.HostProjectRegistrationService/GetHostProjectRegistration", + request_serializer=host_project_registration_service.GetHostProjectRegistrationRequest.serialize, + response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + ) ) return self._stubs["get_host_project_registration"] @@ -417,12 +417,12 @@ def list_host_project_registrations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_host_project_registrations" not in self._stubs: - self._stubs[ - "list_host_project_registrations" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.HostProjectRegistrationService/ListHostProjectRegistrations", - request_serializer=host_project_registration_service.ListHostProjectRegistrationsRequest.serialize, - response_deserializer=host_project_registration_service.ListHostProjectRegistrationsResponse.deserialize, + self._stubs["list_host_project_registrations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.HostProjectRegistrationService/ListHostProjectRegistrations", + request_serializer=host_project_registration_service.ListHostProjectRegistrationsRequest.serialize, + response_deserializer=host_project_registration_service.ListHostProjectRegistrationsResponse.deserialize, + ) ) return self._stubs["list_host_project_registrations"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc_asyncio.py index 1fad630d9194..938a8bffd5d3 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import host_project_registration_service @@ -362,12 +362,12 @@ def create_host_project_registration( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_host_project_registration" not in self._stubs: - self._stubs[ - "create_host_project_registration" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.HostProjectRegistrationService/CreateHostProjectRegistration", - request_serializer=host_project_registration_service.CreateHostProjectRegistrationRequest.serialize, - response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + self._stubs["create_host_project_registration"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.HostProjectRegistrationService/CreateHostProjectRegistration", + request_serializer=host_project_registration_service.CreateHostProjectRegistrationRequest.serialize, + response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + ) ) return self._stubs["create_host_project_registration"] @@ -393,12 +393,12 @@ def get_host_project_registration( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_host_project_registration" not in self._stubs: - self._stubs[ - "get_host_project_registration" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.HostProjectRegistrationService/GetHostProjectRegistration", - request_serializer=host_project_registration_service.GetHostProjectRegistrationRequest.serialize, - response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + self._stubs["get_host_project_registration"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.HostProjectRegistrationService/GetHostProjectRegistration", + request_serializer=host_project_registration_service.GetHostProjectRegistrationRequest.serialize, + response_deserializer=host_project_registration_service.HostProjectRegistration.deserialize, + ) ) return self._stubs["get_host_project_registration"] @@ -427,12 +427,12 @@ def list_host_project_registrations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_host_project_registrations" not in self._stubs: - self._stubs[ - "list_host_project_registrations" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.HostProjectRegistrationService/ListHostProjectRegistrations", - request_serializer=host_project_registration_service.ListHostProjectRegistrationsRequest.serialize, - response_deserializer=host_project_registration_service.ListHostProjectRegistrationsResponse.deserialize, + self._stubs["list_host_project_registrations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.HostProjectRegistrationService/ListHostProjectRegistrations", + request_serializer=host_project_registration_service.ListHostProjectRegistrationsRequest.serialize, + response_deserializer=host_project_registration_service.ListHostProjectRegistrationsResponse.deserialize, + ) ) return self._stubs["list_host_project_registrations"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/rest.py index dbd002e8dafb..0acc20c219af 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/host_project_registration_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -571,9 +571,7 @@ def __call__( """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseCreateHostProjectRegistration._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseCreateHostProjectRegistration._get_http_options() request, metadata = self._interceptor.pre_create_host_project_registration( request, metadata @@ -642,11 +640,10 @@ def __call__( resp = self._interceptor.post_create_host_project_registration(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_host_project_registration_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_host_project_registration_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -743,9 +740,7 @@ def __call__( """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseGetHostProjectRegistration._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseGetHostProjectRegistration._get_http_options() request, metadata = self._interceptor.pre_get_host_project_registration( request, metadata @@ -809,11 +804,10 @@ def __call__( resp = self._interceptor.post_get_host_project_registration(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_host_project_registration_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_host_project_registration_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -903,9 +897,7 @@ def __call__( """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseListHostProjectRegistrations._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseListHostProjectRegistrations._get_http_options() request, metadata = self._interceptor.pre_list_host_project_registrations( request, metadata @@ -973,11 +965,10 @@ def __call__( resp = self._interceptor.post_list_host_project_registrations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_host_project_registrations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_host_project_registrations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1013,7 +1004,9 @@ def create_host_project_registration( ]: # 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._CreateHostProjectRegistration(self._session, self._host, self._interceptor) # type: ignore + return self._CreateHostProjectRegistration( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_host_project_registration( @@ -1024,7 +1017,9 @@ def get_host_project_registration( ]: # 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._GetHostProjectRegistration(self._session, self._host, self._interceptor) # type: ignore + return self._GetHostProjectRegistration( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_host_project_registrations( @@ -1035,7 +1030,9 @@ def list_host_project_registrations( ]: # 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._ListHostProjectRegistrations(self._session, self._host, self._interceptor) # type: ignore + return self._ListHostProjectRegistrations( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1095,9 +1092,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseHostProjectRegistrationServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1238,9 +1233,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseHostProjectRegistrationServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1377,9 +1370,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1497,9 +1488,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1615,9 +1604,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseHostProjectRegistrationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1758,9 +1745,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseHostProjectRegistrationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseHostProjectRegistrationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseHostProjectRegistrationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/async_client.py index c5c17bc23f5d..65fc77f78d1a 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.apihub_v1.types import common_fields, linting_service @@ -118,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LintingServiceAsyncClient: The constructed client. """ - return LintingServiceClient.from_service_account_info.__func__(LintingServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = LintingServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(LintingServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +135,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LintingServiceAsyncClient: The constructed client. """ - return LintingServiceClient.from_service_account_file.__func__(LintingServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = LintingServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(LintingServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/client.py index f36b979cc90c..49d4056f2e27 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.apihub_v1.types import common_fields, linting_service @@ -81,9 +81,7 @@ class LintingServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LintingServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LintingServiceTransport]] _transport_registry["grpc"] = LintingServiceGrpcTransport _transport_registry["grpc_asyncio"] = LintingServiceGrpcAsyncIOTransport _transport_registry["rest"] = LintingServiceRestTransport @@ -649,11 +647,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LintingServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LintingServiceClient._read_environment_variables() + ) self._client_cert_source = LintingServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -688,8 +684,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LintingServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/base.py index 6ab2a1dcf945..da4bbabd313c 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import linting_service @@ -281,13 +281,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc.py index f3a4464516e5..d8f562d8730e 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import linting_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc_asyncio.py index 103d99188cd5..38b341faffdb 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import linting_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest.py index d69611ee6f5e..6f6be942e354 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -710,9 +710,7 @@ def __call__( The style guide contents. """ - http_options = ( - _BaseLintingServiceRestTransport._BaseGetStyleGuideContents._get_http_options() - ) + http_options = _BaseLintingServiceRestTransport._BaseGetStyleGuideContents._get_http_options() request, metadata = self._interceptor.pre_get_style_guide_contents( request, metadata @@ -889,7 +887,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -984,9 +982,7 @@ def __call__( """ - http_options = ( - _BaseLintingServiceRestTransport._BaseUpdateStyleGuide._get_http_options() - ) + http_options = _BaseLintingServiceRestTransport._BaseUpdateStyleGuide._get_http_options() request, metadata = self._interceptor.pre_update_style_guide( request, metadata @@ -1451,9 +1447,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseLintingServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseLintingServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1570,9 +1564,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseLintingServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseLintingServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest_base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest_base.py index 9b1896ea9a08..941b2352c6b5 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest_base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/linting_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.apihub_v1.types import linting_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/async_client.py index 8e9a9c7fe8c3..57a36a692558 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.types import common_fields, provisioning_service @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProvisioningAsyncClient: The constructed client. """ - return ProvisioningClient.from_service_account_info.__func__(ProvisioningAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ProvisioningClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ProvisioningAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProvisioningAsyncClient: The constructed client. """ - return ProvisioningClient.from_service_account_file.__func__(ProvisioningAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ProvisioningClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ProvisioningAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/client.py index 7228be2747aa..7d815c935815 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.types import common_fields, provisioning_service @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProvisioningClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProvisioningClient._read_environment_variables() + ) self._client_cert_source = ProvisioningClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProvisioningTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/base.py index 203486cfd9e8..f139acaf443b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import common_fields, provisioning_service @@ -285,13 +285,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc.py index 09a8ab8ae090..758baea7239d 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import common_fields, provisioning_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc_asyncio.py index 6b93be7b2058..550f40f0f7f2 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import common_fields, provisioning_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/rest.py index 3758e9dfd27b..96715b819814 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/provisioning/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -660,9 +660,7 @@ def __call__( """ - http_options = ( - _BaseProvisioningRestTransport._BaseCreateApiHubInstance._get_http_options() - ) + http_options = _BaseProvisioningRestTransport._BaseCreateApiHubInstance._get_http_options() request, metadata = self._interceptor.pre_create_api_hub_instance( request, metadata @@ -688,7 +686,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -814,9 +812,7 @@ def __call__( """ - http_options = ( - _BaseProvisioningRestTransport._BaseDeleteApiHubInstance._get_http_options() - ) + http_options = _BaseProvisioningRestTransport._BaseDeleteApiHubInstance._get_http_options() request, metadata = self._interceptor.pre_delete_api_hub_instance( request, metadata @@ -838,7 +834,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -964,9 +960,7 @@ def __call__( """ - http_options = ( - _BaseProvisioningRestTransport._BaseGetApiHubInstance._get_http_options() - ) + http_options = _BaseProvisioningRestTransport._BaseGetApiHubInstance._get_http_options() request, metadata = self._interceptor.pre_get_api_hub_instance( request, metadata @@ -1115,9 +1109,7 @@ def __call__( """ - http_options = ( - _BaseProvisioningRestTransport._BaseLookupApiHubInstance._get_http_options() - ) + http_options = _BaseProvisioningRestTransport._BaseLookupApiHubInstance._get_http_options() request, metadata = self._interceptor.pre_lookup_api_hub_instance( request, metadata diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/async_client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/async_client.py index 6d74c71060d1..d70a377b26b4 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/async_client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.runtime_project_attachment_service import pagers from google.cloud.apihub_v1.types import runtime_project_attachment_service @@ -134,7 +134,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RuntimeProjectAttachmentServiceAsyncClient: The constructed client. """ - return RuntimeProjectAttachmentServiceClient.from_service_account_info.__func__(RuntimeProjectAttachmentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + RuntimeProjectAttachmentServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + RuntimeProjectAttachmentServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -150,7 +155,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RuntimeProjectAttachmentServiceAsyncClient: The constructed client. """ - return RuntimeProjectAttachmentServiceClient.from_service_account_file.__func__(RuntimeProjectAttachmentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + RuntimeProjectAttachmentServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + RuntimeProjectAttachmentServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -188,7 +198,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return RuntimeProjectAttachmentServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return RuntimeProjectAttachmentServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> RuntimeProjectAttachmentServiceTransport: diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/client.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/client.py index 4c2fe1abf2f4..f74a6bf09167 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/client.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apihub_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.runtime_project_attachment_service import pagers from google.cloud.apihub_v1.types import runtime_project_attachment_service @@ -85,13 +85,11 @@ class RuntimeProjectAttachmentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RuntimeProjectAttachmentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RuntimeProjectAttachmentServiceTransport]] _transport_registry["grpc"] = RuntimeProjectAttachmentServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = RuntimeProjectAttachmentServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + RuntimeProjectAttachmentServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = RuntimeProjectAttachmentServiceRestTransport def get_transport_class( @@ -643,11 +641,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RuntimeProjectAttachmentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RuntimeProjectAttachmentServiceClient._read_environment_variables() + ) self._client_cert_source = ( RuntimeProjectAttachmentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -688,8 +684,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RuntimeProjectAttachmentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/pagers.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/pagers.py index 7ec9855408df..d4d73083dc5b 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/pagers.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -161,7 +161,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/__init__.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/__init__.py index fef6954cdf31..7cfa1723ff51 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/__init__.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RuntimeProjectAttachmentServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RuntimeProjectAttachmentServiceTransport]] _transport_registry["grpc"] = RuntimeProjectAttachmentServiceGrpcTransport -_transport_registry[ - "grpc_asyncio" -] = RuntimeProjectAttachmentServiceGrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + RuntimeProjectAttachmentServiceGrpcAsyncIOTransport +) _transport_registry["rest"] = RuntimeProjectAttachmentServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/base.py index e8a8505a2ee4..487855c3d176 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.apihub_v1 import gapic_version as package_version from google.cloud.apihub_v1.types import runtime_project_attachment_service @@ -317,13 +317,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc.py index c2bb82f9ccf8..d79d41a07955 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import runtime_project_attachment_service @@ -350,12 +350,12 @@ def create_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_runtime_project_attachment" not in self._stubs: - self._stubs[ - "create_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/CreateRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.CreateRuntimeProjectAttachmentRequest.serialize, - response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + self._stubs["create_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/CreateRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.CreateRuntimeProjectAttachmentRequest.serialize, + response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + ) ) return self._stubs["create_runtime_project_attachment"] @@ -381,12 +381,12 @@ def get_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_runtime_project_attachment" not in self._stubs: - self._stubs[ - "get_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/GetRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.GetRuntimeProjectAttachmentRequest.serialize, - response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + self._stubs["get_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/GetRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.GetRuntimeProjectAttachmentRequest.serialize, + response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + ) ) return self._stubs["get_runtime_project_attachment"] @@ -413,12 +413,12 @@ def list_runtime_project_attachments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_runtime_project_attachments" not in self._stubs: - self._stubs[ - "list_runtime_project_attachments" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/ListRuntimeProjectAttachments", - request_serializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsRequest.serialize, - response_deserializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse.deserialize, + self._stubs["list_runtime_project_attachments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/ListRuntimeProjectAttachments", + request_serializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsRequest.serialize, + response_deserializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse.deserialize, + ) ) return self._stubs["list_runtime_project_attachments"] @@ -447,12 +447,12 @@ def delete_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_runtime_project_attachment" not in self._stubs: - self._stubs[ - "delete_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/DeleteRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.DeleteRuntimeProjectAttachmentRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/DeleteRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.DeleteRuntimeProjectAttachmentRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_runtime_project_attachment"] @@ -480,12 +480,12 @@ def lookup_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_runtime_project_attachment" not in self._stubs: - self._stubs[ - "lookup_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/LookupRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentRequest.serialize, - response_deserializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse.deserialize, + self._stubs["lookup_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/LookupRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentRequest.serialize, + response_deserializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse.deserialize, + ) ) return self._stubs["lookup_runtime_project_attachment"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc_asyncio.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc_asyncio.py index f8ba41f02a01..76ad4053a3e1 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apihub_v1.types import runtime_project_attachment_service @@ -358,12 +358,12 @@ def create_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_runtime_project_attachment" not in self._stubs: - self._stubs[ - "create_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/CreateRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.CreateRuntimeProjectAttachmentRequest.serialize, - response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + self._stubs["create_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/CreateRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.CreateRuntimeProjectAttachmentRequest.serialize, + response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + ) ) return self._stubs["create_runtime_project_attachment"] @@ -389,12 +389,12 @@ def get_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_runtime_project_attachment" not in self._stubs: - self._stubs[ - "get_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/GetRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.GetRuntimeProjectAttachmentRequest.serialize, - response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + self._stubs["get_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/GetRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.GetRuntimeProjectAttachmentRequest.serialize, + response_deserializer=runtime_project_attachment_service.RuntimeProjectAttachment.deserialize, + ) ) return self._stubs["get_runtime_project_attachment"] @@ -423,12 +423,12 @@ def list_runtime_project_attachments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_runtime_project_attachments" not in self._stubs: - self._stubs[ - "list_runtime_project_attachments" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/ListRuntimeProjectAttachments", - request_serializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsRequest.serialize, - response_deserializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse.deserialize, + self._stubs["list_runtime_project_attachments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/ListRuntimeProjectAttachments", + request_serializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsRequest.serialize, + response_deserializer=runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse.deserialize, + ) ) return self._stubs["list_runtime_project_attachments"] @@ -457,12 +457,12 @@ def delete_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_runtime_project_attachment" not in self._stubs: - self._stubs[ - "delete_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/DeleteRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.DeleteRuntimeProjectAttachmentRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/DeleteRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.DeleteRuntimeProjectAttachmentRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_runtime_project_attachment"] @@ -492,12 +492,12 @@ def lookup_runtime_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_runtime_project_attachment" not in self._stubs: - self._stubs[ - "lookup_runtime_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/LookupRuntimeProjectAttachment", - request_serializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentRequest.serialize, - response_deserializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse.deserialize, + self._stubs["lookup_runtime_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apihub.v1.RuntimeProjectAttachmentService/LookupRuntimeProjectAttachment", + request_serializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentRequest.serialize, + response_deserializer=runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse.deserialize, + ) ) return self._stubs["lookup_runtime_project_attachment"] diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest.py index 09728526d3ee..7d649e428d19 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -649,9 +649,7 @@ def __call__( """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseCreateRuntimeProjectAttachment._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseCreateRuntimeProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_create_runtime_project_attachment( request, metadata @@ -722,11 +720,10 @@ def __call__( resp = self._interceptor.post_create_runtime_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_runtime_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_runtime_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -809,9 +806,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseDeleteRuntimeProjectAttachment._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseDeleteRuntimeProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_delete_runtime_project_attachment( request, metadata @@ -833,7 +828,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -934,9 +929,7 @@ def __call__( """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetRuntimeProjectAttachment._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetRuntimeProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_get_runtime_project_attachment( request, metadata @@ -1002,11 +995,10 @@ def __call__( resp = self._interceptor.post_get_runtime_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_runtime_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_runtime_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1096,9 +1088,7 @@ def __call__( """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListRuntimeProjectAttachments._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListRuntimeProjectAttachments._get_http_options() request, metadata = self._interceptor.pre_list_runtime_project_attachments( request, metadata @@ -1155,9 +1145,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse() - ) + resp = runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse() pb_resp = runtime_project_attachment_service.ListRuntimeProjectAttachmentsResponse.pb( resp ) @@ -1166,11 +1154,10 @@ def __call__( resp = self._interceptor.post_list_runtime_project_attachments(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_runtime_project_attachments_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_runtime_project_attachments_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1260,9 +1247,7 @@ def __call__( """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseLookupRuntimeProjectAttachment._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseLookupRuntimeProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_lookup_runtime_project_attachment( request, metadata @@ -1319,9 +1304,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse() - ) + resp = runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse() pb_resp = runtime_project_attachment_service.LookupRuntimeProjectAttachmentResponse.pb( resp ) @@ -1330,11 +1313,10 @@ def __call__( resp = self._interceptor.post_lookup_runtime_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_lookup_runtime_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_lookup_runtime_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1370,7 +1352,9 @@ def create_runtime_project_attachment( ]: # 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._CreateRuntimeProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateRuntimeProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_runtime_project_attachment( @@ -1381,7 +1365,9 @@ def delete_runtime_project_attachment( ]: # 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._DeleteRuntimeProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteRuntimeProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_runtime_project_attachment( @@ -1392,7 +1378,9 @@ def get_runtime_project_attachment( ]: # 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._GetRuntimeProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._GetRuntimeProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_runtime_project_attachments( @@ -1403,7 +1391,9 @@ def list_runtime_project_attachments( ]: # 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._ListRuntimeProjectAttachments(self._session, self._host, self._interceptor) # type: ignore + return self._ListRuntimeProjectAttachments( + self._session, self._host, self._interceptor + ) # type: ignore @property def lookup_runtime_project_attachment( @@ -1414,7 +1404,9 @@ def lookup_runtime_project_attachment( ]: # 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._LookupRuntimeProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._LookupRuntimeProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1474,9 +1466,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1617,9 +1607,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1756,9 +1744,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1876,9 +1862,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1994,9 +1978,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2135,9 +2117,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRuntimeProjectAttachmentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest_base.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest_base.py index 4f3fe21d042e..fe2a4a49ac7e 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest_base.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/services/runtime_project_attachment_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.apihub_v1.types import runtime_project_attachment_service diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/apihub_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/apihub_service.py index bacb28f8857d..54b39bf45939 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/apihub_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/apihub_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.apihub_v1.types import common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/collect_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/collect_service.py index 70e678572c94..453f58a91d73 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/collect_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/collect_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.apihub_v1.types import common_fields @@ -53,6 +53,7 @@ class CollectionType(proto.Enum): The collection type is delete. This should be used when an API is deleted at the source. """ + COLLECTION_TYPE_UNSPECIFIED = 0 COLLECTION_TYPE_UPSERT = 1 COLLECTION_TYPE_DELETE = 2 diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/common_fields.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/common_fields.py index e48dd0f2232b..f48f2a80af9e 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/common_fields.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/common_fields.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -80,6 +80,7 @@ class LintState(proto.Enum): LINT_STATE_ERROR (2): Linting encountered errors. """ + LINT_STATE_UNSPECIFIED = 0 LINT_STATE_SUCCESS = 1 LINT_STATE_ERROR = 2 @@ -96,6 +97,7 @@ class Linter(proto.Enum): OTHER (2): Linter type other. """ + LINTER_UNSPECIFIED = 0 SPECTRAL = 1 OTHER = 2 @@ -116,6 +118,7 @@ class Severity(proto.Enum): SEVERITY_HINT (4): Severity hint. """ + SEVERITY_UNSPECIFIED = 0 SEVERITY_ERROR = 1 SEVERITY_WARNING = 2 @@ -141,6 +144,7 @@ class AuthType(proto.Enum): Oauth 2.0 client credentials grant authentication. """ + AUTH_TYPE_UNSPECIFIED = 0 NO_AUTH = 1 GOOGLE_SERVICE_ACCOUNT = 2 @@ -162,6 +166,7 @@ class PluginCategory(proto.Enum): API_PRODUCER plugins represent plugins built for API Producers like Cloud Run, Application Integration etc. """ + PLUGIN_CATEGORY_UNSPECIFIED = 0 API_GATEWAY = 1 API_PRODUCER = 2 @@ -621,6 +626,7 @@ class ParsingMode(proto.Enum): strict, meaning that parsing errors in the spec contents will fail the API call. """ + PARSING_MODE_UNSPECIFIED = 0 RELAXED = 1 STRICT = 2 @@ -1021,6 +1027,7 @@ class Type(proto.Enum): SCHEMA (1): Definition type schema. """ + TYPE_UNSPECIFIED = 0 SCHEMA = 1 @@ -1127,6 +1134,7 @@ class DefinitionType(proto.Enum): USER_DEFINED (2): The attribute is defined by the user. """ + DEFINITION_TYPE_UNSPECIFIED = 0 SYSTEM_DEFINED = 1 USER_DEFINED = 2 @@ -1157,6 +1165,7 @@ class Scope(proto.Enum): PLUGIN (9): Attribute can be linked to a Plugin. """ + SCOPE_UNSPECIFIED = 0 API = 1 VERSION = 2 @@ -1183,6 +1192,7 @@ class DataType(proto.Enum): URI (4): Attribute's value is of type uri. """ + DATA_TYPE_UNSPECIFIED = 0 ENUM = 1 JSON = 2 @@ -1372,6 +1382,7 @@ class Format(proto.Enum): OPEN_API_SPEC_3_1 (3): OpenAPI Spec v3.1. """ + FORMAT_UNSPECIFIED = 0 OPEN_API_SPEC_2_0 = 1 OPEN_API_SPEC_3_0 = 2 @@ -1477,6 +1488,7 @@ class Method(proto.Enum): TRACE (8): Trace Operation type. """ + METHOD_UNSPECIFIED = 0 GET = 1 PUT = 2 @@ -1744,6 +1756,7 @@ class State(proto.Enum): it is validated by the admin or manually created in the API hub. """ + STATE_UNSPECIFIED = 0 PROPOSED = 1 VALIDATED = 2 @@ -1758,6 +1771,7 @@ class DiscoveryMode(proto.Enum): Manual mode of discovery when the dependency is defined by the user. """ + DISCOVERY_MODE_UNSPECIFIED = 0 MANUAL = 1 @@ -1880,6 +1894,7 @@ class Error(proto.Enum): SUPPLIER_RECREATED (2): Supplier entity has been recreated. """ + ERROR_UNSPECIFIED = 0 SUPPLIER_NOT_FOUND = 1 SUPPLIER_RECREATED = 2 @@ -2177,6 +2192,7 @@ class State(proto.Enum): The ApiHub instance encountered an error during a state change. """ + STATE_UNSPECIFIED = 0 INACTIVE = 1 CREATING = 2 @@ -2223,6 +2239,7 @@ class EncryptionType(proto.Enum): Encryption using customer managed encryption key. """ + ENCRYPTION_TYPE_UNSPECIFIED = 0 GMEK = 1 CMEK = 2 @@ -2456,6 +2473,7 @@ class ValueType(proto.Enum): MULTI_INT (8): Value type is multi int. """ + VALUE_TYPE_UNSPECIFIED = 0 STRING = 1 INT = 2 @@ -2786,6 +2804,7 @@ class HttpElementLocation(proto.Enum): COOKIE (5): Element is in the HTTP request cookie. """ + HTTP_ELEMENT_LOCATION_UNSPECIFIED = 0 QUERY = 1 HEADER = 2 @@ -2876,6 +2895,7 @@ class SourceType(proto.Enum): PLUGIN (1): Source type plugin. """ + SOURCE_TYPE_UNSPECIFIED = 0 PLUGIN = 1 @@ -2993,6 +3013,7 @@ class Style(proto.Enum): GRAPHQL (3): Style is GraphQL API """ + STYLE_UNSPECIFIED = 0 REST = 1 GRPC = 2 @@ -3010,6 +3031,7 @@ class SourceType(proto.Enum): GCP_ILB (2): GCP internal load balancer. """ + SOURCE_TYPE_UNSPECIFIED = 0 GCP_XLB = 1 GCP_ILB = 2 @@ -3136,6 +3158,7 @@ class Classification(proto.Enum): Operation does not have a matched catalog operation. """ + CLASSIFICATION_UNSPECIFIED = 0 KNOWN = 1 UNKNOWN = 2 @@ -3242,6 +3265,7 @@ class DataType(proto.Enum): UUID (5): UUID data type """ + DATA_TYPE_UNSPECIFIED = 0 BOOL = 1 INTEGER = 2 diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/curate_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/curate_service.py index d0f5a65b821f..2afcfd6019f3 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/curate_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/curate_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -292,6 +292,7 @@ class LastExecutionState(proto.Enum): FAILED (2): The last curation execution failed. """ + LAST_EXECUTION_STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -309,6 +310,7 @@ class ErrorCode(proto.Enum): The curation is not authorized to trigger the endpoint uri. """ + ERROR_CODE_UNSPECIFIED = 0 INTERNAL_ERROR = 1 UNAUTHORIZED = 2 @@ -354,12 +356,12 @@ class PluginInstanceActionID(proto.Message): number=4, message="Endpoint", ) - plugin_instance_actions: MutableSequence[ - PluginInstanceActionID - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=PluginInstanceActionID, + plugin_instance_actions: MutableSequence[PluginInstanceActionID] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=PluginInstanceActionID, + ) ) last_execution_state: LastExecutionState = proto.Field( proto.ENUM, diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/discovery_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/discovery_service.py index 342d748e9a28..304677407e55 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/discovery_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/discovery_service.py @@ -158,12 +158,12 @@ class ListDiscoveredApiOperationsResponse(proto.Message): def raw_page(self): return self - discovered_api_operations: MutableSequence[ - common_fields.DiscoveredApiOperation - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=common_fields.DiscoveredApiOperation, + discovered_api_operations: MutableSequence[common_fields.DiscoveredApiOperation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=common_fields.DiscoveredApiOperation, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/host_project_registration_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/host_project_registration_service.py index 4bbdabb01492..57620688d0d6 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/host_project_registration_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/host_project_registration_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -171,12 +171,12 @@ class ListHostProjectRegistrationsResponse(proto.Message): def raw_page(self): return self - host_project_registrations: MutableSequence[ - "HostProjectRegistration" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="HostProjectRegistration", + host_project_registrations: MutableSequence["HostProjectRegistration"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="HostProjectRegistration", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/linting_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/linting_service.py index f6c23faf3061..d17f12a658bd 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/linting_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/linting_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.apihub_v1.types import common_fields diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/plugin_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/plugin_service.py index 751474eaf0c5..d781ba399a69 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/plugin_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/plugin_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.apihub_v1.types import common_fields @@ -70,6 +70,7 @@ class ActionType(proto.Enum): SYNC_RUNTIME_DATA (2): Action type for sync runtime data. """ + ACTION_TYPE_UNSPECIFIED = 0 SYNC_METADATA = 1 SYNC_RUNTIME_DATA = 2 @@ -98,6 +99,7 @@ class GatewayType(proto.Enum): The gateway type for any other types of gateways. """ + GATEWAY_TYPE_UNSPECIFIED = 0 APIGEE_X_AND_HYBRID = 1 APIGEE_EDGE_PUBLIC_CLOUD = 2 @@ -121,6 +123,7 @@ class CurationType(proto.Enum): Custom curation for API metadata will be used. """ + CURATION_TYPE_UNSPECIFIED = 0 DEFAULT_CURATION_FOR_API_METADATA = 1 CUSTOM_CURATION_FOR_API_METADATA = 2 @@ -219,6 +222,7 @@ class State(proto.Enum): DISABLED (2): The plugin is disabled. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -238,6 +242,7 @@ class OwnershipType(proto.Enum): [CreatePlugin][google.cloud.apihub.v1.ApiHubPlugin.CreatePlugin] method. """ + OWNERSHIP_TYPE_UNSPECIFIED = 0 SYSTEM_OWNED = 1 USER_OWNED = 2 @@ -299,12 +304,12 @@ class AuthConfigTemplate(proto.Message): the corresponding service account. """ - supported_auth_types: MutableSequence[ - common_fields.AuthType - ] = proto.RepeatedField( - proto.ENUM, - number=1, - enum=common_fields.AuthType, + supported_auth_types: MutableSequence[common_fields.AuthType] = ( + proto.RepeatedField( + proto.ENUM, + number=1, + enum=common_fields.AuthType, + ) ) service_account: common_fields.GoogleServiceAccountConfig = proto.Field( proto.MESSAGE, @@ -439,6 +444,7 @@ class TriggerMode(proto.Enum): service need not handle this action id as part of the execute call. """ + TRIGGER_MODE_UNSPECIFIED = 0 API_HUB_ON_DEMAND_TRIGGER = 1 API_HUB_SCHEDULE_TRIGGER = 2 @@ -590,6 +596,7 @@ class State(proto.Enum): enable/disable on actions can only be triggered if plugin instance is in Active state. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -750,6 +757,7 @@ class State(proto.Enum): running on the plugin instance and plugin instance action. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -771,13 +779,13 @@ class State(proto.Enum): number=3, message=common_fields.AuthConfig, ) - additional_config: MutableMapping[ - str, common_fields.ConfigVariable - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=4, - message=common_fields.ConfigVariable, + additional_config: MutableMapping[str, common_fields.ConfigVariable] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=4, + message=common_fields.ConfigVariable, + ) ) state: State = proto.Field( proto.ENUM, @@ -877,6 +885,7 @@ class CurrentExecutionState(proto.Enum): The plugin instance is not running an execution. """ + CURRENT_EXECUTION_STATE_UNSPECIFIED = 0 RUNNING = 1 NOT_RUNNING = 2 @@ -911,6 +920,7 @@ class Result(proto.Enum): FAILED (2): The plugin instance execution failed. """ + RESULT_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 diff --git a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/runtime_project_attachment_service.py b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/runtime_project_attachment_service.py index a8ba820484e0..b2d439e63692 100644 --- a/packages/google-cloud-apihub/google/cloud/apihub_v1/types/runtime_project_attachment_service.py +++ b/packages/google-cloud-apihub/google/cloud/apihub_v1/types/runtime_project_attachment_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -176,12 +176,12 @@ class ListRuntimeProjectAttachmentsResponse(proto.Message): def raw_page(self): return self - runtime_project_attachments: MutableSequence[ - "RuntimeProjectAttachment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="RuntimeProjectAttachment", + runtime_project_attachments: MutableSequence["RuntimeProjectAttachment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="RuntimeProjectAttachment", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-apihub/noxfile.py b/packages/google-cloud-apihub/noxfile.py index 992343b1528a..f38dcde2ddbc 100644 --- a/packages/google-cloud-apihub/noxfile.py +++ b/packages/google-cloud-apihub/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub.py index f13055099f55..2ab8402bc6cb 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub import ( ApiHubAsyncClient, @@ -899,10 +904,9 @@ def test_api_hub_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -947,10 +951,9 @@ def test_api_hub_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +989,9 @@ def test_api_hub_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1214,13 +1216,13 @@ def test_api_hub_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5795,9 +5797,9 @@ def test_get_spec_contents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_spec_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_spec_contents] = ( + mock_rpc + ) request = {} client.get_spec_contents(request) @@ -7309,9 +7311,9 @@ def test_create_api_operation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_operation] = ( + mock_rpc + ) request = {} client.create_api_operation(request) @@ -7673,9 +7675,9 @@ def test_get_api_operation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_operation] = ( + mock_rpc + ) request = {} client.get_api_operation(request) @@ -8020,9 +8022,9 @@ def test_list_api_operations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_operations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_operations] = ( + mock_rpc + ) request = {} client.list_api_operations(request) @@ -8562,9 +8564,9 @@ def test_update_api_operation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_operation] = ( + mock_rpc + ) request = {} client.update_api_operation(request) @@ -8913,9 +8915,9 @@ def test_delete_api_operation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_operation] = ( + mock_rpc + ) request = {} client.delete_api_operation(request) @@ -9591,9 +9593,9 @@ def test_create_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deployment] = ( + mock_rpc + ) request = {} client.create_deployment(request) @@ -10315,9 +10317,9 @@ def test_list_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -10848,9 +10850,9 @@ def test_update_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_deployment] = ( + mock_rpc + ) request = {} client.update_deployment(request) @@ -11208,9 +11210,9 @@ def test_delete_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deployment] = ( + mock_rpc + ) request = {} client.delete_deployment(request) @@ -11553,9 +11555,9 @@ def test_create_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_attribute] = ( + mock_rpc + ) request = {} client.create_attribute(request) @@ -12285,9 +12287,9 @@ def test_update_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_attribute] = ( + mock_rpc + ) request = {} client.update_attribute(request) @@ -12634,9 +12636,9 @@ def test_delete_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_attribute] = ( + mock_rpc + ) request = {} client.delete_attribute(request) @@ -13477,9 +13479,9 @@ def test_search_resources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_resources] = ( + mock_rpc + ) request = {} client.search_resources(request) @@ -14022,9 +14024,9 @@ def test_create_external_api_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_external_api] = ( + mock_rpc + ) request = {} client.create_external_api(request) @@ -14394,9 +14396,9 @@ def test_get_external_api_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_external_api] = ( + mock_rpc + ) request = {} client.get_external_api(request) @@ -14737,9 +14739,9 @@ def test_update_external_api_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_external_api] = ( + mock_rpc + ) request = {} client.update_external_api(request) @@ -15094,9 +15096,9 @@ def test_delete_external_api_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_external_api] = ( + mock_rpc + ) request = {} client.delete_external_api(request) @@ -15429,9 +15431,9 @@ def test_list_external_apis_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_external_apis - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_external_apis] = ( + mock_rpc + ) request = {} client.list_external_apis(request) @@ -18248,9 +18250,9 @@ def test_get_spec_contents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_spec_contents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_spec_contents] = ( + mock_rpc + ) request = {} client.get_spec_contents(request) @@ -19055,9 +19057,9 @@ def test_create_api_operation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_api_operation] = ( + mock_rpc + ) request = {} client.create_api_operation(request) @@ -19252,9 +19254,9 @@ def test_get_api_operation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_operation] = ( + mock_rpc + ) request = {} client.get_api_operation(request) @@ -19436,9 +19438,9 @@ def test_list_api_operations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_api_operations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_api_operations] = ( + mock_rpc + ) request = {} client.list_api_operations(request) @@ -19702,9 +19704,9 @@ def test_update_api_operation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_api_operation] = ( + mock_rpc + ) request = {} client.update_api_operation(request) @@ -19896,9 +19898,9 @@ def test_delete_api_operation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_api_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_api_operation] = ( + mock_rpc + ) request = {} client.delete_api_operation(request) @@ -20253,9 +20255,9 @@ def test_create_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deployment] = ( + mock_rpc + ) request = {} client.create_deployment(request) @@ -20628,9 +20630,9 @@ def test_list_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -20888,9 +20890,9 @@ def test_update_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_deployment] = ( + mock_rpc + ) request = {} client.update_deployment(request) @@ -21080,9 +21082,9 @@ def test_delete_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deployment] = ( + mock_rpc + ) request = {} client.delete_deployment(request) @@ -21257,9 +21259,9 @@ def test_create_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_attribute] = ( + mock_rpc + ) request = {} client.create_attribute(request) @@ -21630,9 +21632,9 @@ def test_update_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_attribute] = ( + mock_rpc + ) request = {} client.update_attribute(request) @@ -21822,9 +21824,9 @@ def test_delete_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_attribute] = ( + mock_rpc + ) request = {} client.delete_attribute(request) @@ -22255,9 +22257,9 @@ def test_search_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_resources] = ( + mock_rpc + ) request = {} client.search_resources(request) @@ -22515,9 +22517,9 @@ def test_create_external_api_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_external_api] = ( + mock_rpc + ) request = {} client.create_external_api(request) @@ -22710,9 +22712,9 @@ def test_get_external_api_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_external_api] = ( + mock_rpc + ) request = {} client.get_external_api(request) @@ -22894,9 +22896,9 @@ def test_update_external_api_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_external_api] = ( + mock_rpc + ) request = {} client.update_external_api(request) @@ -23088,9 +23090,9 @@ def test_delete_external_api_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_external_api - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_external_api] = ( + mock_rpc + ) request = {} client.delete_external_api(request) @@ -23267,9 +23269,9 @@ def test_list_external_apis_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_external_apis - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_external_apis] = ( + mock_rpc + ) request = {} client.list_external_apis(request) @@ -25593,8 +25595,9 @@ def test_create_api_rest_bad_request(request_type=apihub_service.CreateApiReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25780,17 +25783,15 @@ def test_create_api_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_create_api" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_create_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_create_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiHubRestInterceptor, "post_create_api") as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_create_api_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_create_api") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25841,8 +25842,9 @@ def test_get_api_rest_bad_request(request_type=apihub_service.GetApiRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25913,17 +25915,15 @@ def test_get_api_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_get_api" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_get_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_get_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiHubRestInterceptor, "post_get_api") as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_api_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_get_api") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25972,8 +25972,9 @@ def test_list_apis_rest_bad_request(request_type=apihub_service.ListApisRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26034,17 +26035,15 @@ def test_list_apis_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_list_apis" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_list_apis_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_list_apis" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiHubRestInterceptor, "post_list_apis") as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_list_apis_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_list_apis") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26095,8 +26094,9 @@ def test_update_api_rest_bad_request(request_type=apihub_service.UpdateApiReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26282,17 +26282,15 @@ def test_update_api_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_update_api" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_update_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_update_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiHubRestInterceptor, "post_update_api") as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_update_api_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_update_api") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26343,8 +26341,9 @@ def test_delete_api_rest_bad_request(request_type=apihub_service.DeleteApiReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26399,13 +26398,11 @@ def test_delete_api_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "pre_delete_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_delete_api") as pre, + ): pre.assert_not_called() pb_message = apihub_service.DeleteApiRequest.pb( apihub_service.DeleteApiRequest() @@ -26450,8 +26447,9 @@ def test_create_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26637,17 +26635,19 @@ def test_create_version_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_create_version" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_create_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_create_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_create_version" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_create_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_create_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26700,8 +26700,9 @@ def test_get_version_rest_bad_request(request_type=apihub_service.GetVersionRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26778,17 +26779,15 @@ def test_get_version_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_get_version" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_get_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_get_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiHubRestInterceptor, "post_get_version") as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_version_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_get_version") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26841,8 +26840,9 @@ def test_list_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26903,17 +26903,17 @@ def test_list_versions_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_list_versions" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_list_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_list_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_list_versions" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_list_versions_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_list_versions") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26975,8 +26975,9 @@ def test_update_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27166,17 +27167,19 @@ def test_update_version_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_update_version" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_update_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_update_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_update_version" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_update_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_update_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27231,8 +27234,9 @@ def test_delete_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27289,13 +27293,13 @@ def test_delete_version_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "pre_delete_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_delete_version" + ) as pre, + ): pre.assert_not_called() pb_message = apihub_service.DeleteVersionRequest.pb( apihub_service.DeleteVersionRequest() @@ -27340,8 +27344,9 @@ def test_create_spec_rest_bad_request(request_type=apihub_service.CreateSpecRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27540,17 +27545,15 @@ def test_create_spec_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_create_spec" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_create_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_create_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiHubRestInterceptor, "post_create_spec") as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_create_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_create_spec") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27603,8 +27606,9 @@ def test_get_spec_rest_bad_request(request_type=apihub_service.GetSpecRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27673,17 +27677,15 @@ def test_get_spec_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_get_spec" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_get_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_get_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiHubRestInterceptor, "post_get_spec") as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_get_spec") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27736,8 +27738,9 @@ def test_get_spec_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27802,17 +27805,19 @@ def test_get_spec_contents_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_get_spec_contents" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_get_spec_contents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_get_spec_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_spec_contents" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_spec_contents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_get_spec_contents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27865,8 +27870,9 @@ def test_list_specs_rest_bad_request(request_type=apihub_service.ListSpecsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27929,17 +27935,15 @@ def test_list_specs_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_list_specs" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_list_specs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_list_specs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiHubRestInterceptor, "post_list_specs") as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_list_specs_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_list_specs") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27996,8 +28000,9 @@ def test_update_spec_rest_bad_request(request_type=apihub_service.UpdateSpecRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28198,17 +28203,15 @@ def test_update_spec_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_update_spec" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_update_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_update_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiHubRestInterceptor, "post_update_spec") as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_update_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_update_spec") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28261,8 +28264,9 @@ def test_delete_spec_rest_bad_request(request_type=apihub_service.DeleteSpecRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28319,13 +28323,11 @@ def test_delete_spec_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "pre_delete_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_delete_spec") as pre, + ): pre.assert_not_called() pb_message = apihub_service.DeleteSpecRequest.pb( apihub_service.DeleteSpecRequest() @@ -28372,8 +28374,9 @@ def test_create_api_operation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28533,17 +28536,19 @@ def test_create_api_operation_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_create_api_operation" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_create_api_operation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_create_api_operation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_create_api_operation" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_create_api_operation_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_create_api_operation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28598,8 +28603,9 @@ def test_get_api_operation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28664,17 +28670,19 @@ def test_get_api_operation_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_get_api_operation" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_get_api_operation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_get_api_operation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_api_operation" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_api_operation_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_get_api_operation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28729,8 +28737,9 @@ def test_list_api_operations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28793,17 +28802,19 @@ def test_list_api_operations_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_list_api_operations" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_list_api_operations_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_list_api_operations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_list_api_operations" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_list_api_operations_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_list_api_operations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28865,8 +28876,9 @@ def test_update_api_operation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29028,17 +29040,19 @@ def test_update_api_operation_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_update_api_operation" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_update_api_operation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_update_api_operation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_update_api_operation" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_update_api_operation_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_update_api_operation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29093,8 +29107,9 @@ def test_delete_api_operation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29151,13 +29166,13 @@ def test_delete_api_operation_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "pre_delete_api_operation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_delete_api_operation" + ) as pre, + ): pre.assert_not_called() pb_message = apihub_service.DeleteApiOperationRequest.pb( apihub_service.DeleteApiOperationRequest() @@ -29204,8 +29219,9 @@ def test_get_definition_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29272,17 +29288,19 @@ def test_get_definition_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_get_definition" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_get_definition_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_get_definition" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_definition" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_definition_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_get_definition" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29335,8 +29353,9 @@ def test_create_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29524,17 +29543,19 @@ def test_create_deployment_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_create_deployment" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_create_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_create_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_create_deployment" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_create_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_create_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29587,8 +29608,9 @@ def test_get_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29663,17 +29685,19 @@ def test_get_deployment_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_get_deployment" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_get_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_get_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_deployment" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_get_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29726,8 +29750,9 @@ def test_list_deployments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29788,17 +29813,19 @@ def test_list_deployments_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_list_deployments" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_list_deployments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_list_deployments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_list_deployments" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_list_deployments_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_list_deployments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29858,8 +29885,9 @@ def test_update_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30049,17 +30077,19 @@ def test_update_deployment_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_update_deployment" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_update_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_update_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_update_deployment" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_update_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_update_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30112,8 +30142,9 @@ def test_delete_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30168,13 +30199,13 @@ def test_delete_deployment_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "pre_delete_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_delete_deployment" + ) as pre, + ): pre.assert_not_called() pb_message = apihub_service.DeleteDeploymentRequest.pb( apihub_service.DeleteDeploymentRequest() @@ -30219,8 +30250,9 @@ def test_create_attribute_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30385,17 +30417,19 @@ def test_create_attribute_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_create_attribute" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_create_attribute_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_create_attribute" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_create_attribute" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_create_attribute_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_create_attribute" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30448,8 +30482,9 @@ def test_get_attribute_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30527,17 +30562,17 @@ def test_get_attribute_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_get_attribute" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_get_attribute_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_get_attribute" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_attribute" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_attribute_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ApiHubRestInterceptor, "pre_get_attribute") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30592,8 +30627,9 @@ def test_update_attribute_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30760,17 +30796,19 @@ def test_update_attribute_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_update_attribute" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_update_attribute_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_update_attribute" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_update_attribute" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_update_attribute_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_update_attribute" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30823,8 +30861,9 @@ def test_delete_attribute_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30879,13 +30918,13 @@ def test_delete_attribute_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "pre_delete_attribute" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_delete_attribute" + ) as pre, + ): pre.assert_not_called() pb_message = apihub_service.DeleteAttributeRequest.pb( apihub_service.DeleteAttributeRequest() @@ -30930,8 +30969,9 @@ def test_list_attributes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30992,17 +31032,19 @@ def test_list_attributes_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_list_attributes" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_list_attributes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_list_attributes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_list_attributes" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_list_attributes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_list_attributes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31060,8 +31102,9 @@ def test_search_resources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31122,17 +31165,19 @@ def test_search_resources_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_search_resources" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_search_resources_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_search_resources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_search_resources" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_search_resources_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_search_resources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31190,8 +31235,9 @@ def test_create_external_api_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31338,17 +31384,19 @@ def test_create_external_api_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_create_external_api" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_create_external_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_create_external_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_create_external_api" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_create_external_api_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_create_external_api" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31401,8 +31449,9 @@ def test_get_external_api_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31471,17 +31520,19 @@ def test_get_external_api_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_get_external_api" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_get_external_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_get_external_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_external_api" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_get_external_api_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_get_external_api" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31538,8 +31589,9 @@ def test_update_external_api_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31690,17 +31742,19 @@ def test_update_external_api_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_update_external_api" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_update_external_api_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_update_external_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_update_external_api" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_update_external_api_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_update_external_api" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31753,8 +31807,9 @@ def test_delete_external_api_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31809,13 +31864,13 @@ def test_delete_external_api_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "pre_delete_external_api" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_delete_external_api" + ) as pre, + ): pre.assert_not_called() pb_message = apihub_service.DeleteExternalApiRequest.pb( apihub_service.DeleteExternalApiRequest() @@ -31860,8 +31915,9 @@ def test_list_external_apis_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31922,17 +31978,19 @@ def test_list_external_apis_rest_interceptors(null_interceptor): ) client = ApiHubClient(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.ApiHubRestInterceptor, "post_list_external_apis" - ) as post, mock.patch.object( - transports.ApiHubRestInterceptor, "post_list_external_apis_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubRestInterceptor, "pre_list_external_apis" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_list_external_apis" + ) as post, + mock.patch.object( + transports.ApiHubRestInterceptor, "post_list_external_apis_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubRestInterceptor, "pre_list_external_apis" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31990,8 +32048,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -32050,8 +32109,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -32112,8 +32172,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -32174,8 +32235,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -32236,8 +32298,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -32298,8 +32361,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33236,11 +33300,14 @@ def test_api_hub_base_transport(): def test_api_hub_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apihub_v1.services.api_hub.transports.ApiHubTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apihub_v1.services.api_hub.transports.ApiHubTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiHubTransport( @@ -33257,9 +33324,12 @@ def test_api_hub_base_transport_with_credentials_file(): def test_api_hub_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apihub_v1.services.api_hub.transports.ApiHubTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apihub_v1.services.api_hub.transports.ApiHubTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiHubTransport() @@ -33331,11 +33401,12 @@ def test_api_hub_transport_auth_gdch_credentials(transport_class): def test_api_hub_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_collect.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_collect.py index 47fb0e644881..f81c7f37e468 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_collect.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_collect.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_collect import ( ApiHubCollectAsyncClient, @@ -952,10 +952,9 @@ def test_api_hub_collect_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +999,9 @@ def test_api_hub_collect_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1037,9 @@ def test_api_hub_collect_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1285,13 +1282,13 @@ def test_api_hub_collect_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1399,9 +1396,9 @@ def test_collect_api_data_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_api_data - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_api_data] = ( + mock_rpc + ) request = {} client.collect_api_data(request) @@ -1735,9 +1732,9 @@ def test_collect_api_data_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_api_data - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_api_data] = ( + mock_rpc + ) request = {} client.collect_api_data(request) @@ -2117,8 +2114,9 @@ def test_collect_api_data_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2175,19 +2173,21 @@ def test_collect_api_data_rest_interceptors(null_interceptor): ) client = ApiHubCollectClient(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.ApiHubCollectRestInterceptor, "post_collect_api_data" - ) as post, mock.patch.object( - transports.ApiHubCollectRestInterceptor, "post_collect_api_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubCollectRestInterceptor, "pre_collect_api_data" - ) as pre: + 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.ApiHubCollectRestInterceptor, "post_collect_api_data" + ) as post, + mock.patch.object( + transports.ApiHubCollectRestInterceptor, + "post_collect_api_data_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubCollectRestInterceptor, "pre_collect_api_data" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2240,8 +2240,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2300,8 +2301,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2362,8 +2364,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2424,8 +2427,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2486,8 +2490,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2548,8 +2553,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2705,11 +2711,14 @@ def test_api_hub_collect_base_transport(): def test_api_hub_collect_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apihub_v1.services.api_hub_collect.transports.ApiHubCollectTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apihub_v1.services.api_hub_collect.transports.ApiHubCollectTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiHubCollectTransport( @@ -2726,9 +2735,12 @@ def test_api_hub_collect_base_transport_with_credentials_file(): def test_api_hub_collect_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apihub_v1.services.api_hub_collect.transports.ApiHubCollectTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apihub_v1.services.api_hub_collect.transports.ApiHubCollectTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiHubCollectTransport() @@ -2800,11 +2812,12 @@ def test_api_hub_collect_transport_auth_gdch_credentials(transport_class): def test_api_hub_collect_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_curate.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_curate.py index 31f53927c15e..a1e3fb17008d 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_curate.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_curate.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_curate import ( ApiHubCurateAsyncClient, @@ -930,10 +935,9 @@ def test_api_hub_curate_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +982,9 @@ def test_api_hub_curate_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1020,9 @@ def test_api_hub_curate_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1259,13 +1261,13 @@ def test_api_hub_curate_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4583,8 +4585,9 @@ def test_create_curation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4749,17 +4752,19 @@ def test_create_curation_rest_interceptors(null_interceptor): ) client = ApiHubCurateClient(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.ApiHubCurateRestInterceptor, "post_create_curation" - ) as post, mock.patch.object( - transports.ApiHubCurateRestInterceptor, "post_create_curation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubCurateRestInterceptor, "pre_create_curation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "post_create_curation" + ) as post, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "post_create_curation_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "pre_create_curation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4810,8 +4815,9 @@ def test_get_curation_rest_bad_request(request_type=curate_service.GetCurationRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4890,17 +4896,19 @@ def test_get_curation_rest_interceptors(null_interceptor): ) client = ApiHubCurateClient(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.ApiHubCurateRestInterceptor, "post_get_curation" - ) as post, mock.patch.object( - transports.ApiHubCurateRestInterceptor, "post_get_curation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubCurateRestInterceptor, "pre_get_curation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "post_get_curation" + ) as post, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "post_get_curation_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "pre_get_curation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4953,8 +4961,9 @@ def test_list_curations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5017,17 +5026,19 @@ def test_list_curations_rest_interceptors(null_interceptor): ) client = ApiHubCurateClient(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.ApiHubCurateRestInterceptor, "post_list_curations" - ) as post, mock.patch.object( - transports.ApiHubCurateRestInterceptor, "post_list_curations_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubCurateRestInterceptor, "pre_list_curations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "post_list_curations" + ) as post, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "post_list_curations_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "pre_list_curations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5087,8 +5098,9 @@ def test_update_curation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5255,17 +5267,19 @@ def test_update_curation_rest_interceptors(null_interceptor): ) client = ApiHubCurateClient(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.ApiHubCurateRestInterceptor, "post_update_curation" - ) as post, mock.patch.object( - transports.ApiHubCurateRestInterceptor, "post_update_curation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubCurateRestInterceptor, "pre_update_curation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "post_update_curation" + ) as post, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "post_update_curation_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "pre_update_curation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5318,8 +5332,9 @@ def test_delete_curation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5376,13 +5391,13 @@ def test_delete_curation_rest_interceptors(null_interceptor): ) client = ApiHubCurateClient(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.ApiHubCurateRestInterceptor, "pre_delete_curation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubCurateRestInterceptor, "pre_delete_curation" + ) as pre, + ): pre.assert_not_called() pb_message = curate_service.DeleteCurationRequest.pb( curate_service.DeleteCurationRequest() @@ -5427,8 +5442,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5487,8 +5503,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5549,8 +5566,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5611,8 +5629,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5673,8 +5692,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5735,8 +5755,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5954,11 +5975,14 @@ def test_api_hub_curate_base_transport(): def test_api_hub_curate_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apihub_v1.services.api_hub_curate.transports.ApiHubCurateTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apihub_v1.services.api_hub_curate.transports.ApiHubCurateTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiHubCurateTransport( @@ -5975,9 +5999,12 @@ def test_api_hub_curate_base_transport_with_credentials_file(): def test_api_hub_curate_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apihub_v1.services.api_hub_curate.transports.ApiHubCurateTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apihub_v1.services.api_hub_curate.transports.ApiHubCurateTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiHubCurateTransport() @@ -6049,11 +6076,12 @@ def test_api_hub_curate_transport_auth_gdch_credentials(transport_class): def test_api_hub_curate_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_dependencies.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_dependencies.py index 4cb6ed4a4cbc..dea608893fe3 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_dependencies.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_dependencies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_dependencies import ( ApiHubDependenciesAsyncClient, @@ -986,10 +991,9 @@ def test_api_hub_dependencies_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1038,9 @@ def test_api_hub_dependencies_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1073,10 +1076,9 @@ def test_api_hub_dependencies_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1324,13 +1326,13 @@ def test_api_hub_dependencies_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1449,9 +1451,9 @@ def test_create_dependency_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_dependency - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_dependency] = ( + mock_rpc + ) request = {} client.create_dependency(request) @@ -2151,9 +2153,9 @@ def test_update_dependency_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_dependency - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_dependency] = ( + mock_rpc + ) request = {} client.update_dependency(request) @@ -2503,9 +2505,9 @@ def test_delete_dependency_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_dependency - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_dependency] = ( + mock_rpc + ) request = {} client.delete_dependency(request) @@ -2837,9 +2839,9 @@ def test_list_dependencies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_dependencies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_dependencies] = ( + mock_rpc + ) request = {} client.list_dependencies(request) @@ -3310,9 +3312,9 @@ def test_create_dependency_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_dependency - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_dependency] = ( + mock_rpc + ) request = {} client.create_dependency(request) @@ -3685,9 +3687,9 @@ def test_update_dependency_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_dependency - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_dependency] = ( + mock_rpc + ) request = {} client.update_dependency(request) @@ -3877,9 +3879,9 @@ def test_delete_dependency_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_dependency - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_dependency] = ( + mock_rpc + ) request = {} client.delete_dependency(request) @@ -4054,9 +4056,9 @@ def test_list_dependencies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_dependencies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_dependencies] = ( + mock_rpc + ) request = {} client.list_dependencies(request) @@ -4692,8 +4694,9 @@ def test_create_dependency_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4845,18 +4848,20 @@ def test_create_dependency_rest_interceptors(null_interceptor): ) client = ApiHubDependenciesClient(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.ApiHubDependenciesRestInterceptor, "post_create_dependency" - ) as post, mock.patch.object( - transports.ApiHubDependenciesRestInterceptor, - "post_create_dependency_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubDependenciesRestInterceptor, "pre_create_dependency" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, "post_create_dependency" + ) as post, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, + "post_create_dependency_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, "pre_create_dependency" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4909,8 +4914,9 @@ def test_get_dependency_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4979,18 +4985,20 @@ def test_get_dependency_rest_interceptors(null_interceptor): ) client = ApiHubDependenciesClient(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.ApiHubDependenciesRestInterceptor, "post_get_dependency" - ) as post, mock.patch.object( - transports.ApiHubDependenciesRestInterceptor, - "post_get_dependency_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubDependenciesRestInterceptor, "pre_get_dependency" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, "post_get_dependency" + ) as post, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, + "post_get_dependency_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, "pre_get_dependency" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5047,8 +5055,9 @@ def test_update_dependency_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5204,18 +5213,20 @@ def test_update_dependency_rest_interceptors(null_interceptor): ) client = ApiHubDependenciesClient(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.ApiHubDependenciesRestInterceptor, "post_update_dependency" - ) as post, mock.patch.object( - transports.ApiHubDependenciesRestInterceptor, - "post_update_dependency_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubDependenciesRestInterceptor, "pre_update_dependency" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, "post_update_dependency" + ) as post, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, + "post_update_dependency_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, "pre_update_dependency" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5268,8 +5279,9 @@ def test_delete_dependency_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5326,13 +5338,13 @@ def test_delete_dependency_rest_interceptors(null_interceptor): ) client = ApiHubDependenciesClient(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.ApiHubDependenciesRestInterceptor, "pre_delete_dependency" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, "pre_delete_dependency" + ) as pre, + ): pre.assert_not_called() pb_message = apihub_service.DeleteDependencyRequest.pb( apihub_service.DeleteDependencyRequest() @@ -5377,8 +5389,9 @@ def test_list_dependencies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5441,18 +5454,20 @@ def test_list_dependencies_rest_interceptors(null_interceptor): ) client = ApiHubDependenciesClient(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.ApiHubDependenciesRestInterceptor, "post_list_dependencies" - ) as post, mock.patch.object( - transports.ApiHubDependenciesRestInterceptor, - "post_list_dependencies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubDependenciesRestInterceptor, "pre_list_dependencies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, "post_list_dependencies" + ) as post, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, + "post_list_dependencies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubDependenciesRestInterceptor, "pre_list_dependencies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5510,8 +5525,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5570,8 +5586,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5632,8 +5649,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5694,8 +5712,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5756,8 +5775,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5818,8 +5838,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6045,11 +6066,14 @@ def test_api_hub_dependencies_base_transport(): def test_api_hub_dependencies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apihub_v1.services.api_hub_dependencies.transports.ApiHubDependenciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apihub_v1.services.api_hub_dependencies.transports.ApiHubDependenciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiHubDependenciesTransport( @@ -6066,9 +6090,12 @@ def test_api_hub_dependencies_base_transport_with_credentials_file(): def test_api_hub_dependencies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apihub_v1.services.api_hub_dependencies.transports.ApiHubDependenciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apihub_v1.services.api_hub_dependencies.transports.ApiHubDependenciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiHubDependenciesTransport() @@ -6140,11 +6167,12 @@ def test_api_hub_dependencies_transport_auth_gdch_credentials(transport_class): def test_api_hub_dependencies_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_discovery.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_discovery.py index 6a931d9263f2..0396fd176d13 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_discovery.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_discovery.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_discovery import ( ApiHubDiscoveryAsyncClient, @@ -972,10 +977,9 @@ def test_api_hub_discovery_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1020,10 +1024,9 @@ def test_api_hub_discovery_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1062,9 @@ def test_api_hub_discovery_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1305,13 +1307,13 @@ def test_api_hub_discovery_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4456,8 +4458,9 @@ def test_list_discovered_api_observations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4522,20 +4525,22 @@ def test_list_discovered_api_observations_rest_interceptors(null_interceptor): ) client = ApiHubDiscoveryClient(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.ApiHubDiscoveryRestInterceptor, - "post_list_discovered_api_observations", - ) as post, mock.patch.object( - transports.ApiHubDiscoveryRestInterceptor, - "post_list_discovered_api_observations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubDiscoveryRestInterceptor, - "pre_list_discovered_api_observations", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubDiscoveryRestInterceptor, + "post_list_discovered_api_observations", + ) as post, + mock.patch.object( + transports.ApiHubDiscoveryRestInterceptor, + "post_list_discovered_api_observations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubDiscoveryRestInterceptor, + "pre_list_discovered_api_observations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4595,8 +4600,9 @@ def test_get_discovered_api_observation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4681,18 +4687,22 @@ def test_get_discovered_api_observation_rest_interceptors(null_interceptor): ) client = ApiHubDiscoveryClient(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.ApiHubDiscoveryRestInterceptor, "post_get_discovered_api_observation" - ) as post, mock.patch.object( - transports.ApiHubDiscoveryRestInterceptor, - "post_get_discovered_api_observation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubDiscoveryRestInterceptor, "pre_get_discovered_api_observation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubDiscoveryRestInterceptor, + "post_get_discovered_api_observation", + ) as post, + mock.patch.object( + transports.ApiHubDiscoveryRestInterceptor, + "post_get_discovered_api_observation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubDiscoveryRestInterceptor, + "pre_get_discovered_api_observation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4752,8 +4762,9 @@ def test_list_discovered_api_operations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4820,18 +4831,22 @@ def test_list_discovered_api_operations_rest_interceptors(null_interceptor): ) client = ApiHubDiscoveryClient(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.ApiHubDiscoveryRestInterceptor, "post_list_discovered_api_operations" - ) as post, mock.patch.object( - transports.ApiHubDiscoveryRestInterceptor, - "post_list_discovered_api_operations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubDiscoveryRestInterceptor, "pre_list_discovered_api_operations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubDiscoveryRestInterceptor, + "post_list_discovered_api_operations", + ) as post, + mock.patch.object( + transports.ApiHubDiscoveryRestInterceptor, + "post_list_discovered_api_operations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubDiscoveryRestInterceptor, + "pre_list_discovered_api_operations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4891,8 +4906,9 @@ def test_get_discovered_api_operation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4964,18 +4980,22 @@ def test_get_discovered_api_operation_rest_interceptors(null_interceptor): ) client = ApiHubDiscoveryClient(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.ApiHubDiscoveryRestInterceptor, "post_get_discovered_api_operation" - ) as post, mock.patch.object( - transports.ApiHubDiscoveryRestInterceptor, - "post_get_discovered_api_operation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubDiscoveryRestInterceptor, "pre_get_discovered_api_operation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubDiscoveryRestInterceptor, + "post_get_discovered_api_operation", + ) as post, + mock.patch.object( + transports.ApiHubDiscoveryRestInterceptor, + "post_get_discovered_api_operation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubDiscoveryRestInterceptor, + "pre_get_discovered_api_operation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5033,8 +5053,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5093,8 +5114,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5155,8 +5177,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5217,8 +5240,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5279,8 +5303,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5341,8 +5366,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5547,11 +5573,14 @@ def test_api_hub_discovery_base_transport(): def test_api_hub_discovery_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apihub_v1.services.api_hub_discovery.transports.ApiHubDiscoveryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apihub_v1.services.api_hub_discovery.transports.ApiHubDiscoveryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiHubDiscoveryTransport( @@ -5568,9 +5597,12 @@ def test_api_hub_discovery_base_transport_with_credentials_file(): def test_api_hub_discovery_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apihub_v1.services.api_hub_discovery.transports.ApiHubDiscoveryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apihub_v1.services.api_hub_discovery.transports.ApiHubDiscoveryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiHubDiscoveryTransport() @@ -5642,11 +5674,12 @@ def test_api_hub_discovery_transport_auth_gdch_credentials(transport_class): def test_api_hub_discovery_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_plugin.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_plugin.py index 52e763dc2f17..4b87c9f74a53 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_plugin.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_api_hub_plugin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.api_hub_plugin import ( ApiHubPluginAsyncClient, @@ -940,10 +940,9 @@ def test_api_hub_plugin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_api_hub_plugin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_api_hub_plugin_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1269,13 +1266,13 @@ def test_api_hub_plugin_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3644,9 +3641,9 @@ def test_create_plugin_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_plugin_instance] = ( + mock_rpc + ) request = {} client.create_plugin_instance(request) @@ -4386,9 +4383,9 @@ def test_get_plugin_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_plugin_instance] = ( + mock_rpc + ) request = {} client.get_plugin_instance(request) @@ -4741,9 +4738,9 @@ def test_list_plugin_instances_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_plugin_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_plugin_instances] = ( + mock_rpc + ) request = {} client.list_plugin_instances(request) @@ -6008,9 +6005,9 @@ def test_update_plugin_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_plugin_instance] = ( + mock_rpc + ) request = {} client.update_plugin_instance(request) @@ -6366,9 +6363,9 @@ def test_delete_plugin_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_plugin_instance] = ( + mock_rpc + ) request = {} client.delete_plugin_instance(request) @@ -7806,9 +7803,9 @@ def test_create_plugin_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_plugin_instance] = ( + mock_rpc + ) request = {} client.create_plugin_instance(request) @@ -8205,9 +8202,9 @@ def test_get_plugin_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_plugin_instance] = ( + mock_rpc + ) request = {} client.get_plugin_instance(request) @@ -8390,9 +8387,9 @@ def test_list_plugin_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_plugin_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_plugin_instances] = ( + mock_rpc + ) request = {} client.list_plugin_instances(request) @@ -9059,9 +9056,9 @@ def test_update_plugin_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_plugin_instance] = ( + mock_rpc + ) request = {} client.update_plugin_instance(request) @@ -9246,9 +9243,9 @@ def test_delete_plugin_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_plugin_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_plugin_instance] = ( + mock_rpc + ) request = {} client.delete_plugin_instance(request) @@ -10266,8 +10263,9 @@ def test_get_plugin_rest_bad_request(request_type=plugin_service.GetPluginReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10342,17 +10340,19 @@ def test_get_plugin_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_get_plugin" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "post_get_plugin_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_get_plugin" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_get_plugin" + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_get_plugin_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_get_plugin" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10405,8 +10405,9 @@ def test_enable_plugin_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10481,17 +10482,19 @@ def test_enable_plugin_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_enable_plugin" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "post_enable_plugin_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_enable_plugin" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_enable_plugin" + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_enable_plugin_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_enable_plugin" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10544,8 +10547,9 @@ def test_disable_plugin_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10620,17 +10624,19 @@ def test_disable_plugin_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_disable_plugin" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "post_disable_plugin_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_disable_plugin" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_disable_plugin" + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_disable_plugin_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_disable_plugin" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10683,8 +10689,9 @@ def test_create_plugin_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10886,17 +10893,19 @@ def test_create_plugin_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_create_plugin" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "post_create_plugin_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_create_plugin" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_create_plugin" + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_create_plugin_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_create_plugin" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10947,8 +10956,9 @@ def test_list_plugins_rest_bad_request(request_type=plugin_service.ListPluginsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11011,17 +11021,19 @@ def test_list_plugins_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_list_plugins" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "post_list_plugins_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_list_plugins" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_list_plugins" + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_list_plugins_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_list_plugins" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11076,8 +11088,9 @@ def test_delete_plugin_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11134,19 +11147,20 @@ def test_delete_plugin_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_delete_plugin" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "post_delete_plugin_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_delete_plugin" - ) as pre: + 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.ApiHubPluginRestInterceptor, "post_delete_plugin" + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_delete_plugin_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_delete_plugin" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11199,8 +11213,9 @@ def test_create_plugin_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11381,20 +11396,21 @@ def test_create_plugin_instance_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_create_plugin_instance" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, - "post_create_plugin_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_create_plugin_instance" - ) as pre: + 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.ApiHubPluginRestInterceptor, "post_create_plugin_instance" + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, + "post_create_plugin_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_create_plugin_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11449,8 +11465,9 @@ def test_execute_plugin_instance_action_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11509,20 +11526,22 @@ def test_execute_plugin_instance_action_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_execute_plugin_instance_action" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, - "post_execute_plugin_instance_action_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_execute_plugin_instance_action" - ) as pre: + 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.ApiHubPluginRestInterceptor, + "post_execute_plugin_instance_action", + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, + "post_execute_plugin_instance_action_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_execute_plugin_instance_action" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11577,8 +11596,9 @@ def test_get_plugin_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11651,17 +11671,20 @@ def test_get_plugin_instance_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_get_plugin_instance" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "post_get_plugin_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_get_plugin_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_get_plugin_instance" + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, + "post_get_plugin_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_get_plugin_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11716,8 +11739,9 @@ def test_list_plugin_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11780,18 +11804,20 @@ def test_list_plugin_instances_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_list_plugin_instances" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, - "post_list_plugin_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_list_plugin_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_list_plugin_instances" + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, + "post_list_plugin_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_list_plugin_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11851,8 +11877,9 @@ def test_enable_plugin_instance_action_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11911,20 +11938,21 @@ def test_enable_plugin_instance_action_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_enable_plugin_instance_action" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, - "post_enable_plugin_instance_action_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_enable_plugin_instance_action" - ) as pre: + 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.ApiHubPluginRestInterceptor, "post_enable_plugin_instance_action" + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, + "post_enable_plugin_instance_action_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_enable_plugin_instance_action" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11979,8 +12007,9 @@ def test_disable_plugin_instance_action_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12039,20 +12068,22 @@ def test_disable_plugin_instance_action_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_disable_plugin_instance_action" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, - "post_disable_plugin_instance_action_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_disable_plugin_instance_action" - ) as pre: + 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.ApiHubPluginRestInterceptor, + "post_disable_plugin_instance_action", + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, + "post_disable_plugin_instance_action_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_disable_plugin_instance_action" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12109,8 +12140,9 @@ def test_update_plugin_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12309,18 +12341,20 @@ def test_update_plugin_instance_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_update_plugin_instance" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, - "post_update_plugin_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_update_plugin_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "post_update_plugin_instance" + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, + "post_update_plugin_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_update_plugin_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12377,8 +12411,9 @@ def test_delete_plugin_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12437,20 +12472,21 @@ def test_delete_plugin_instance_rest_interceptors(null_interceptor): ) client = ApiHubPluginClient(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.ApiHubPluginRestInterceptor, "post_delete_plugin_instance" - ) as post, mock.patch.object( - transports.ApiHubPluginRestInterceptor, - "post_delete_plugin_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ApiHubPluginRestInterceptor, "pre_delete_plugin_instance" - ) as pre: + 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.ApiHubPluginRestInterceptor, "post_delete_plugin_instance" + ) as post, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, + "post_delete_plugin_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApiHubPluginRestInterceptor, "pre_delete_plugin_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12503,8 +12539,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12563,8 +12600,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12625,8 +12663,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12687,8 +12726,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12749,8 +12789,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12811,8 +12852,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13257,11 +13299,14 @@ def test_api_hub_plugin_base_transport(): def test_api_hub_plugin_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apihub_v1.services.api_hub_plugin.transports.ApiHubPluginTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apihub_v1.services.api_hub_plugin.transports.ApiHubPluginTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiHubPluginTransport( @@ -13278,9 +13323,12 @@ def test_api_hub_plugin_base_transport_with_credentials_file(): def test_api_hub_plugin_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apihub_v1.services.api_hub_plugin.transports.ApiHubPluginTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apihub_v1.services.api_hub_plugin.transports.ApiHubPluginTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApiHubPluginTransport() @@ -13352,11 +13400,12 @@ def test_api_hub_plugin_transport_auth_gdch_credentials(transport_class): def test_api_hub_plugin_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_host_project_registration_service.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_host_project_registration_service.py index c8f144af3ce3..9604e3aff759 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_host_project_registration_service.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_host_project_registration_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.host_project_registration_service import ( HostProjectRegistrationServiceAsyncClient, @@ -1055,10 +1060,9 @@ def test_host_project_registration_service_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1103,10 +1107,9 @@ def test_host_project_registration_service_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1142,10 +1145,9 @@ def test_host_project_registration_service_client_get_mtls_endpoint_and_cert_sou "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1406,13 +1408,13 @@ def test_host_project_registration_service_client_create_channel_credentials_fil ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2822,9 +2824,9 @@ def test_create_host_project_registration_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "hostProjectRegistrationId" - ] = "host_project_registration_id_value" + jsonified_request["hostProjectRegistrationId"] = ( + "host_project_registration_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -3767,8 +3769,9 @@ def test_create_host_project_registration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3915,20 +3918,22 @@ def test_create_host_project_registration_rest_interceptors(null_interceptor): ) client = HostProjectRegistrationServiceClient(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.HostProjectRegistrationServiceRestInterceptor, - "post_create_host_project_registration", - ) as post, mock.patch.object( - transports.HostProjectRegistrationServiceRestInterceptor, - "post_create_host_project_registration_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HostProjectRegistrationServiceRestInterceptor, - "pre_create_host_project_registration", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HostProjectRegistrationServiceRestInterceptor, + "post_create_host_project_registration", + ) as post, + mock.patch.object( + transports.HostProjectRegistrationServiceRestInterceptor, + "post_create_host_project_registration_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HostProjectRegistrationServiceRestInterceptor, + "pre_create_host_project_registration", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3994,8 +3999,9 @@ def test_get_host_project_registration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4066,20 +4072,22 @@ def test_get_host_project_registration_rest_interceptors(null_interceptor): ) client = HostProjectRegistrationServiceClient(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.HostProjectRegistrationServiceRestInterceptor, - "post_get_host_project_registration", - ) as post, mock.patch.object( - transports.HostProjectRegistrationServiceRestInterceptor, - "post_get_host_project_registration_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HostProjectRegistrationServiceRestInterceptor, - "pre_get_host_project_registration", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HostProjectRegistrationServiceRestInterceptor, + "post_get_host_project_registration", + ) as post, + mock.patch.object( + transports.HostProjectRegistrationServiceRestInterceptor, + "post_get_host_project_registration_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HostProjectRegistrationServiceRestInterceptor, + "pre_get_host_project_registration", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4141,8 +4149,9 @@ def test_list_host_project_registrations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4211,20 +4220,22 @@ def test_list_host_project_registrations_rest_interceptors(null_interceptor): ) client = HostProjectRegistrationServiceClient(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.HostProjectRegistrationServiceRestInterceptor, - "post_list_host_project_registrations", - ) as post, mock.patch.object( - transports.HostProjectRegistrationServiceRestInterceptor, - "post_list_host_project_registrations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HostProjectRegistrationServiceRestInterceptor, - "pre_list_host_project_registrations", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HostProjectRegistrationServiceRestInterceptor, + "post_list_host_project_registrations", + ) as post, + mock.patch.object( + transports.HostProjectRegistrationServiceRestInterceptor, + "post_list_host_project_registrations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HostProjectRegistrationServiceRestInterceptor, + "pre_list_host_project_registrations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4288,8 +4299,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4348,8 +4360,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4410,8 +4423,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4472,8 +4486,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4534,8 +4549,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4596,8 +4612,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4785,11 +4802,14 @@ def test_host_project_registration_service_base_transport(): def test_host_project_registration_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apihub_v1.services.host_project_registration_service.transports.HostProjectRegistrationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apihub_v1.services.host_project_registration_service.transports.HostProjectRegistrationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HostProjectRegistrationServiceTransport( @@ -4806,9 +4826,12 @@ def test_host_project_registration_service_base_transport_with_credentials_file( def test_host_project_registration_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apihub_v1.services.host_project_registration_service.transports.HostProjectRegistrationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apihub_v1.services.host_project_registration_service.transports.HostProjectRegistrationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HostProjectRegistrationServiceTransport() @@ -4887,11 +4910,12 @@ def test_host_project_registration_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_linting_service.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_linting_service.py index d4015b6d7777..49262cbb151b 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_linting_service.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_linting_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.apihub_v1.services.linting_service import ( LintingServiceAsyncClient, @@ -947,10 +952,9 @@ def test_linting_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -995,10 +999,9 @@ def test_linting_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1037,9 @@ def test_linting_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1280,13 +1282,13 @@ def test_linting_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1724,9 +1726,9 @@ def test_update_style_guide_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_style_guide - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_style_guide] = ( + mock_rpc + ) request = {} client.update_style_guide(request) @@ -2766,9 +2768,9 @@ def test_update_style_guide_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_style_guide - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_style_guide] = ( + mock_rpc + ) request = {} client.update_style_guide(request) @@ -3569,8 +3571,9 @@ def test_get_style_guide_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3637,17 +3640,20 @@ def test_get_style_guide_rest_interceptors(null_interceptor): ) client = LintingServiceClient(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.LintingServiceRestInterceptor, "post_get_style_guide" - ) as post, mock.patch.object( - transports.LintingServiceRestInterceptor, "post_get_style_guide_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LintingServiceRestInterceptor, "pre_get_style_guide" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LintingServiceRestInterceptor, "post_get_style_guide" + ) as post, + mock.patch.object( + transports.LintingServiceRestInterceptor, + "post_get_style_guide_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LintingServiceRestInterceptor, "pre_get_style_guide" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3704,8 +3710,9 @@ def test_update_style_guide_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3846,18 +3853,20 @@ def test_update_style_guide_rest_interceptors(null_interceptor): ) client = LintingServiceClient(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.LintingServiceRestInterceptor, "post_update_style_guide" - ) as post, mock.patch.object( - transports.LintingServiceRestInterceptor, - "post_update_style_guide_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LintingServiceRestInterceptor, "pre_update_style_guide" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LintingServiceRestInterceptor, "post_update_style_guide" + ) as post, + mock.patch.object( + transports.LintingServiceRestInterceptor, + "post_update_style_guide_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LintingServiceRestInterceptor, "pre_update_style_guide" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3912,8 +3921,9 @@ def test_get_style_guide_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3980,18 +3990,20 @@ def test_get_style_guide_contents_rest_interceptors(null_interceptor): ) client = LintingServiceClient(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.LintingServiceRestInterceptor, "post_get_style_guide_contents" - ) as post, mock.patch.object( - transports.LintingServiceRestInterceptor, - "post_get_style_guide_contents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LintingServiceRestInterceptor, "pre_get_style_guide_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LintingServiceRestInterceptor, "post_get_style_guide_contents" + ) as post, + mock.patch.object( + transports.LintingServiceRestInterceptor, + "post_get_style_guide_contents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LintingServiceRestInterceptor, "pre_get_style_guide_contents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4046,8 +4058,9 @@ def test_lint_spec_rest_bad_request(request_type=linting_service.LintSpecRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4106,13 +4119,13 @@ def test_lint_spec_rest_interceptors(null_interceptor): ) client = LintingServiceClient(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.LintingServiceRestInterceptor, "pre_lint_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LintingServiceRestInterceptor, "pre_lint_spec" + ) as pre, + ): pre.assert_not_called() pb_message = linting_service.LintSpecRequest.pb( linting_service.LintSpecRequest() @@ -4157,8 +4170,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4217,8 +4231,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4279,8 +4294,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4341,8 +4357,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4403,8 +4420,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4465,8 +4483,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4667,11 +4686,14 @@ def test_linting_service_base_transport(): def test_linting_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apihub_v1.services.linting_service.transports.LintingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apihub_v1.services.linting_service.transports.LintingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LintingServiceTransport( @@ -4688,9 +4710,12 @@ def test_linting_service_base_transport_with_credentials_file(): def test_linting_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apihub_v1.services.linting_service.transports.LintingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apihub_v1.services.linting_service.transports.LintingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LintingServiceTransport() @@ -4762,11 +4787,12 @@ def test_linting_service_transport_auth_gdch_credentials(transport_class): def test_linting_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_provisioning.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_provisioning.py index b5d660e572f5..6627609dd17b 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_provisioning.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_provisioning.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.provisioning import ( ProvisioningAsyncClient, @@ -938,10 +938,9 @@ def test_provisioning_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +985,9 @@ def test_provisioning_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1023,9 @@ def test_provisioning_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1267,13 +1264,13 @@ def test_provisioning_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2108,9 +2105,9 @@ def test_get_api_hub_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_hub_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_hub_instance] = ( + mock_rpc + ) request = {} client.get_api_hub_instance(request) @@ -3106,9 +3103,9 @@ def test_get_api_hub_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_api_hub_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_api_hub_instance] = ( + mock_rpc + ) request = {} client.get_api_hub_instance(request) @@ -3797,8 +3794,9 @@ def test_create_api_hub_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3939,20 +3937,21 @@ def test_create_api_hub_instance_rest_interceptors(null_interceptor): ) client = ProvisioningClient(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.ProvisioningRestInterceptor, "post_create_api_hub_instance" - ) as post, mock.patch.object( - transports.ProvisioningRestInterceptor, - "post_create_api_hub_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProvisioningRestInterceptor, "pre_create_api_hub_instance" - ) as pre: + 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.ProvisioningRestInterceptor, "post_create_api_hub_instance" + ) as post, + mock.patch.object( + transports.ProvisioningRestInterceptor, + "post_create_api_hub_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProvisioningRestInterceptor, "pre_create_api_hub_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4007,8 +4006,9 @@ def test_delete_api_hub_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4067,20 +4067,21 @@ def test_delete_api_hub_instance_rest_interceptors(null_interceptor): ) client = ProvisioningClient(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.ProvisioningRestInterceptor, "post_delete_api_hub_instance" - ) as post, mock.patch.object( - transports.ProvisioningRestInterceptor, - "post_delete_api_hub_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProvisioningRestInterceptor, "pre_delete_api_hub_instance" - ) as pre: + 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.ProvisioningRestInterceptor, "post_delete_api_hub_instance" + ) as post, + mock.patch.object( + transports.ProvisioningRestInterceptor, + "post_delete_api_hub_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProvisioningRestInterceptor, "pre_delete_api_hub_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4135,8 +4136,9 @@ def test_get_api_hub_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4207,18 +4209,20 @@ def test_get_api_hub_instance_rest_interceptors(null_interceptor): ) client = ProvisioningClient(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.ProvisioningRestInterceptor, "post_get_api_hub_instance" - ) as post, mock.patch.object( - transports.ProvisioningRestInterceptor, - "post_get_api_hub_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProvisioningRestInterceptor, "pre_get_api_hub_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProvisioningRestInterceptor, "post_get_api_hub_instance" + ) as post, + mock.patch.object( + transports.ProvisioningRestInterceptor, + "post_get_api_hub_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProvisioningRestInterceptor, "pre_get_api_hub_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4273,8 +4277,9 @@ def test_lookup_api_hub_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4336,18 +4341,20 @@ def test_lookup_api_hub_instance_rest_interceptors(null_interceptor): ) client = ProvisioningClient(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.ProvisioningRestInterceptor, "post_lookup_api_hub_instance" - ) as post, mock.patch.object( - transports.ProvisioningRestInterceptor, - "post_lookup_api_hub_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProvisioningRestInterceptor, "pre_lookup_api_hub_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProvisioningRestInterceptor, "post_lookup_api_hub_instance" + ) as post, + mock.patch.object( + transports.ProvisioningRestInterceptor, + "post_lookup_api_hub_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProvisioningRestInterceptor, "pre_lookup_api_hub_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4405,8 +4412,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4465,8 +4473,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4527,8 +4536,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4589,8 +4599,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4651,8 +4662,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4713,8 +4725,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4941,11 +4954,14 @@ def test_provisioning_base_transport(): def test_provisioning_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apihub_v1.services.provisioning.transports.ProvisioningTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apihub_v1.services.provisioning.transports.ProvisioningTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProvisioningTransport( @@ -4962,9 +4978,12 @@ def test_provisioning_base_transport_with_credentials_file(): def test_provisioning_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apihub_v1.services.provisioning.transports.ProvisioningTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apihub_v1.services.provisioning.transports.ProvisioningTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProvisioningTransport() @@ -5036,11 +5055,12 @@ def test_provisioning_transport_auth_gdch_credentials(transport_class): def test_provisioning_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_runtime_project_attachment_service.py b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_runtime_project_attachment_service.py index 16108b4aeb58..27ce69eaf6ab 100644 --- a/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_runtime_project_attachment_service.py +++ b/packages/google-cloud-apihub/tests/unit/gapic/apihub_v1/test_runtime_project_attachment_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apihub_v1.services.runtime_project_attachment_service import ( RuntimeProjectAttachmentServiceAsyncClient, @@ -1062,10 +1067,9 @@ def test_runtime_project_attachment_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1110,10 +1114,9 @@ def test_runtime_project_attachment_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1149,10 +1152,9 @@ def test_runtime_project_attachment_service_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1413,13 +1415,13 @@ def test_runtime_project_attachment_service_client_create_channel_credentials_fi ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3539,9 +3541,9 @@ def test_create_runtime_project_attachment_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "runtimeProjectAttachmentId" - ] = "runtime_project_attachment_id_value" + jsonified_request["runtimeProjectAttachmentId"] = ( + "runtime_project_attachment_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -4981,8 +4983,9 @@ def test_create_runtime_project_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5129,20 +5132,22 @@ def test_create_runtime_project_attachment_rest_interceptors(null_interceptor): ) client = RuntimeProjectAttachmentServiceClient(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.RuntimeProjectAttachmentServiceRestInterceptor, - "post_create_runtime_project_attachment", - ) as post, mock.patch.object( - transports.RuntimeProjectAttachmentServiceRestInterceptor, - "post_create_runtime_project_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RuntimeProjectAttachmentServiceRestInterceptor, - "pre_create_runtime_project_attachment", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "post_create_runtime_project_attachment", + ) as post, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "post_create_runtime_project_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "pre_create_runtime_project_attachment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5208,8 +5213,9 @@ def test_get_runtime_project_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5280,20 +5286,22 @@ def test_get_runtime_project_attachment_rest_interceptors(null_interceptor): ) client = RuntimeProjectAttachmentServiceClient(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.RuntimeProjectAttachmentServiceRestInterceptor, - "post_get_runtime_project_attachment", - ) as post, mock.patch.object( - transports.RuntimeProjectAttachmentServiceRestInterceptor, - "post_get_runtime_project_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RuntimeProjectAttachmentServiceRestInterceptor, - "pre_get_runtime_project_attachment", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "post_get_runtime_project_attachment", + ) as post, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "post_get_runtime_project_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "pre_get_runtime_project_attachment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5359,8 +5367,9 @@ def test_list_runtime_project_attachments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5429,20 +5438,22 @@ def test_list_runtime_project_attachments_rest_interceptors(null_interceptor): ) client = RuntimeProjectAttachmentServiceClient(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.RuntimeProjectAttachmentServiceRestInterceptor, - "post_list_runtime_project_attachments", - ) as post, mock.patch.object( - transports.RuntimeProjectAttachmentServiceRestInterceptor, - "post_list_runtime_project_attachments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RuntimeProjectAttachmentServiceRestInterceptor, - "pre_list_runtime_project_attachments", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "post_list_runtime_project_attachments", + ) as post, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "post_list_runtime_project_attachments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "pre_list_runtime_project_attachments", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5506,8 +5517,9 @@ def test_delete_runtime_project_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5566,14 +5578,14 @@ def test_delete_runtime_project_attachment_rest_interceptors(null_interceptor): ) client = RuntimeProjectAttachmentServiceClient(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.RuntimeProjectAttachmentServiceRestInterceptor, - "pre_delete_runtime_project_attachment", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "pre_delete_runtime_project_attachment", + ) as pre, + ): pre.assert_not_called() pb_message = runtime_project_attachment_service.DeleteRuntimeProjectAttachmentRequest.pb( runtime_project_attachment_service.DeleteRuntimeProjectAttachmentRequest() @@ -5620,8 +5632,9 @@ def test_lookup_runtime_project_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5688,20 +5701,22 @@ def test_lookup_runtime_project_attachment_rest_interceptors(null_interceptor): ) client = RuntimeProjectAttachmentServiceClient(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.RuntimeProjectAttachmentServiceRestInterceptor, - "post_lookup_runtime_project_attachment", - ) as post, mock.patch.object( - transports.RuntimeProjectAttachmentServiceRestInterceptor, - "post_lookup_runtime_project_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RuntimeProjectAttachmentServiceRestInterceptor, - "pre_lookup_runtime_project_attachment", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "post_lookup_runtime_project_attachment", + ) as post, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "post_lookup_runtime_project_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RuntimeProjectAttachmentServiceRestInterceptor, + "pre_lookup_runtime_project_attachment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5763,8 +5778,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5823,8 +5839,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5885,8 +5902,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5947,8 +5965,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6009,8 +6028,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6071,8 +6091,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6310,11 +6331,14 @@ def test_runtime_project_attachment_service_base_transport(): def test_runtime_project_attachment_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apihub_v1.services.runtime_project_attachment_service.transports.RuntimeProjectAttachmentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apihub_v1.services.runtime_project_attachment_service.transports.RuntimeProjectAttachmentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RuntimeProjectAttachmentServiceTransport( @@ -6331,9 +6355,12 @@ def test_runtime_project_attachment_service_base_transport_with_credentials_file def test_runtime_project_attachment_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apihub_v1.services.runtime_project_attachment_service.transports.RuntimeProjectAttachmentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apihub_v1.services.runtime_project_attachment_service.transports.RuntimeProjectAttachmentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RuntimeProjectAttachmentServiceTransport() @@ -6412,11 +6439,12 @@ def test_runtime_project_attachment_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-appengine-admin/docs/conf.py b/packages/google-cloud-appengine-admin/docs/conf.py index 1f6c5606d156..ea33b484d208 100644 --- a/packages/google-cloud-appengine-admin/docs/conf.py +++ b/packages/google-cloud-appengine-admin/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-appengine-admin documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/__init__.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/__init__.py index 4cc2b3054f63..437020511a2d 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/__init__.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.applications import ApplicationsAsyncClient, ApplicationsClient from .services.authorized_certificates import ( AuthorizedCertificatesAsyncClient, diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/async_client.py index 3cb229766a50..19d30cd7f040 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation as gac_operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import duration_pb2 # type: ignore +import google.api_core.operation as gac_operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore from google.cloud.appengine_admin_v1.types import appengine, application from google.cloud.appengine_admin_v1.types import operation as ga_operation @@ -111,7 +111,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ApplicationsAsyncClient: The constructed client. """ - return ApplicationsClient.from_service_account_info.__func__(ApplicationsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ApplicationsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ApplicationsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +128,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ApplicationsAsyncClient: The constructed client. """ - return ApplicationsClient.from_service_account_file.__func__(ApplicationsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ApplicationsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ApplicationsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/client.py index d78d18912f83..72136a3afc1c 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation as gac_operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import duration_pb2 # type: ignore +import google.api_core.operation as gac_operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore from google.cloud.appengine_admin_v1.types import appengine, application from google.cloud.appengine_admin_v1.types import operation as ga_operation @@ -600,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ApplicationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ApplicationsClient._read_environment_variables() + ) self._client_cert_source = ApplicationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ApplicationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/base.py index 7e97af103208..42b58a4dd0c2 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, application diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc.py index 016932ec909f..83e2e6661b26 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, application diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py index cf74d017d13a..a2995e8361da 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, application diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/rest.py index 1b1c33660219..ed43c201899a 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/applications/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -490,9 +490,7 @@ def __call__( """ - http_options = ( - _BaseApplicationsRestTransport._BaseCreateApplication._get_http_options() - ) + http_options = _BaseApplicationsRestTransport._BaseCreateApplication._get_http_options() request, metadata = self._interceptor.pre_create_application( request, metadata @@ -518,7 +516,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -791,9 +789,7 @@ def __call__( """ - http_options = ( - _BaseApplicationsRestTransport._BaseRepairApplication._get_http_options() - ) + http_options = _BaseApplicationsRestTransport._BaseRepairApplication._get_http_options() request, metadata = self._interceptor.pre_repair_application( request, metadata @@ -819,7 +815,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -944,9 +940,7 @@ def __call__( """ - http_options = ( - _BaseApplicationsRestTransport._BaseUpdateApplication._get_http_options() - ) + http_options = _BaseApplicationsRestTransport._BaseUpdateApplication._get_http_options() request, metadata = self._interceptor.pre_update_application( request, metadata @@ -972,7 +966,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py index 10a78c7ff603..2500137063de 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.authorized_certificates import pagers from google.cloud.appengine_admin_v1.types import appengine, certificate @@ -118,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AuthorizedCertificatesAsyncClient: The constructed client. """ - return AuthorizedCertificatesClient.from_service_account_info.__func__(AuthorizedCertificatesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AuthorizedCertificatesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AuthorizedCertificatesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +135,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AuthorizedCertificatesAsyncClient: The constructed client. """ - return AuthorizedCertificatesClient.from_service_account_file.__func__(AuthorizedCertificatesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AuthorizedCertificatesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + AuthorizedCertificatesAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -172,7 +176,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AuthorizedCertificatesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AuthorizedCertificatesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AuthorizedCertificatesTransport: diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/client.py index 2615a44fe3ca..f3e78b39b64d 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.authorized_certificates import pagers from google.cloud.appengine_admin_v1.types import appengine, certificate @@ -80,9 +80,7 @@ class AuthorizedCertificatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AuthorizedCertificatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AuthorizedCertificatesTransport]] _transport_registry["grpc"] = AuthorizedCertificatesGrpcTransport _transport_registry["grpc_asyncio"] = AuthorizedCertificatesGrpcAsyncIOTransport _transport_registry["rest"] = AuthorizedCertificatesRestTransport @@ -609,11 +607,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AuthorizedCertificatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AuthorizedCertificatesClient._read_environment_variables() + ) self._client_cert_source = AuthorizedCertificatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -648,8 +644,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AuthorizedCertificatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py index 82799da9fd2e..fd1ff7268080 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py index 8a2cd57fe131..686c4eabc3c0 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AuthorizedCertificatesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AuthorizedCertificatesTransport]] _transport_registry["grpc"] = AuthorizedCertificatesGrpcTransport _transport_registry["grpc_asyncio"] = AuthorizedCertificatesGrpcAsyncIOTransport _transport_registry["rest"] = AuthorizedCertificatesRestTransport diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/base.py index 8bd08d54ed4c..14f359bf23c6 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, certificate diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc.py index 65fe142134f8..f89120186996 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.appengine_admin_v1.types import appengine, certificate @@ -347,12 +347,12 @@ def list_authorized_certificates( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_authorized_certificates" not in self._stubs: - self._stubs[ - "list_authorized_certificates" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/ListAuthorizedCertificates", - request_serializer=appengine.ListAuthorizedCertificatesRequest.serialize, - response_deserializer=appengine.ListAuthorizedCertificatesResponse.deserialize, + self._stubs["list_authorized_certificates"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/ListAuthorizedCertificates", + request_serializer=appengine.ListAuthorizedCertificatesRequest.serialize, + response_deserializer=appengine.ListAuthorizedCertificatesResponse.deserialize, + ) ) return self._stubs["list_authorized_certificates"] @@ -377,12 +377,12 @@ def get_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_authorized_certificate" not in self._stubs: - self._stubs[ - "get_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/GetAuthorizedCertificate", - request_serializer=appengine.GetAuthorizedCertificateRequest.serialize, - response_deserializer=certificate.AuthorizedCertificate.deserialize, + self._stubs["get_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/GetAuthorizedCertificate", + request_serializer=appengine.GetAuthorizedCertificateRequest.serialize, + response_deserializer=certificate.AuthorizedCertificate.deserialize, + ) ) return self._stubs["get_authorized_certificate"] @@ -408,12 +408,12 @@ def create_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_authorized_certificate" not in self._stubs: - self._stubs[ - "create_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/CreateAuthorizedCertificate", - request_serializer=appengine.CreateAuthorizedCertificateRequest.serialize, - response_deserializer=certificate.AuthorizedCertificate.deserialize, + self._stubs["create_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/CreateAuthorizedCertificate", + request_serializer=appengine.CreateAuthorizedCertificateRequest.serialize, + response_deserializer=certificate.AuthorizedCertificate.deserialize, + ) ) return self._stubs["create_authorized_certificate"] @@ -444,12 +444,12 @@ def update_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_authorized_certificate" not in self._stubs: - self._stubs[ - "update_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/UpdateAuthorizedCertificate", - request_serializer=appengine.UpdateAuthorizedCertificateRequest.serialize, - response_deserializer=certificate.AuthorizedCertificate.deserialize, + self._stubs["update_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/UpdateAuthorizedCertificate", + request_serializer=appengine.UpdateAuthorizedCertificateRequest.serialize, + response_deserializer=certificate.AuthorizedCertificate.deserialize, + ) ) return self._stubs["update_authorized_certificate"] @@ -472,12 +472,12 @@ def delete_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_authorized_certificate" not in self._stubs: - self._stubs[ - "delete_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/DeleteAuthorizedCertificate", - request_serializer=appengine.DeleteAuthorizedCertificateRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/DeleteAuthorizedCertificate", + request_serializer=appengine.DeleteAuthorizedCertificateRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_authorized_certificate"] diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc_asyncio.py index 32a56d44bd79..0af5c558e76e 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, certificate @@ -355,12 +355,12 @@ def list_authorized_certificates( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_authorized_certificates" not in self._stubs: - self._stubs[ - "list_authorized_certificates" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/ListAuthorizedCertificates", - request_serializer=appengine.ListAuthorizedCertificatesRequest.serialize, - response_deserializer=appengine.ListAuthorizedCertificatesResponse.deserialize, + self._stubs["list_authorized_certificates"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/ListAuthorizedCertificates", + request_serializer=appengine.ListAuthorizedCertificatesRequest.serialize, + response_deserializer=appengine.ListAuthorizedCertificatesResponse.deserialize, + ) ) return self._stubs["list_authorized_certificates"] @@ -386,12 +386,12 @@ def get_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_authorized_certificate" not in self._stubs: - self._stubs[ - "get_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/GetAuthorizedCertificate", - request_serializer=appengine.GetAuthorizedCertificateRequest.serialize, - response_deserializer=certificate.AuthorizedCertificate.deserialize, + self._stubs["get_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/GetAuthorizedCertificate", + request_serializer=appengine.GetAuthorizedCertificateRequest.serialize, + response_deserializer=certificate.AuthorizedCertificate.deserialize, + ) ) return self._stubs["get_authorized_certificate"] @@ -417,12 +417,12 @@ def create_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_authorized_certificate" not in self._stubs: - self._stubs[ - "create_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/CreateAuthorizedCertificate", - request_serializer=appengine.CreateAuthorizedCertificateRequest.serialize, - response_deserializer=certificate.AuthorizedCertificate.deserialize, + self._stubs["create_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/CreateAuthorizedCertificate", + request_serializer=appengine.CreateAuthorizedCertificateRequest.serialize, + response_deserializer=certificate.AuthorizedCertificate.deserialize, + ) ) return self._stubs["create_authorized_certificate"] @@ -453,12 +453,12 @@ def update_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_authorized_certificate" not in self._stubs: - self._stubs[ - "update_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/UpdateAuthorizedCertificate", - request_serializer=appengine.UpdateAuthorizedCertificateRequest.serialize, - response_deserializer=certificate.AuthorizedCertificate.deserialize, + self._stubs["update_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/UpdateAuthorizedCertificate", + request_serializer=appengine.UpdateAuthorizedCertificateRequest.serialize, + response_deserializer=certificate.AuthorizedCertificate.deserialize, + ) ) return self._stubs["update_authorized_certificate"] @@ -483,12 +483,12 @@ def delete_authorized_certificate( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_authorized_certificate" not in self._stubs: - self._stubs[ - "delete_authorized_certificate" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.AuthorizedCertificates/DeleteAuthorizedCertificate", - request_serializer=appengine.DeleteAuthorizedCertificateRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_authorized_certificate"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.AuthorizedCertificates/DeleteAuthorizedCertificate", + request_serializer=appengine.DeleteAuthorizedCertificateRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_authorized_certificate"] diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest.py index f956121ab090..81230a5827a8 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -490,9 +490,7 @@ def __call__( """ - http_options = ( - _BaseAuthorizedCertificatesRestTransport._BaseCreateAuthorizedCertificate._get_http_options() - ) + http_options = _BaseAuthorizedCertificatesRestTransport._BaseCreateAuthorizedCertificate._get_http_options() request, metadata = self._interceptor.pre_create_authorized_certificate( request, metadata @@ -561,11 +559,10 @@ def __call__( resp = self._interceptor.post_create_authorized_certificate(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_authorized_certificate_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_authorized_certificate_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -647,9 +644,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAuthorizedCertificatesRestTransport._BaseDeleteAuthorizedCertificate._get_http_options() - ) + http_options = _BaseAuthorizedCertificatesRestTransport._BaseDeleteAuthorizedCertificate._get_http_options() request, metadata = self._interceptor.pre_delete_authorized_certificate( request, metadata @@ -671,7 +666,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -767,9 +762,7 @@ def __call__( """ - http_options = ( - _BaseAuthorizedCertificatesRestTransport._BaseGetAuthorizedCertificate._get_http_options() - ) + http_options = _BaseAuthorizedCertificatesRestTransport._BaseGetAuthorizedCertificate._get_http_options() request, metadata = self._interceptor.pre_get_authorized_certificate( request, metadata @@ -922,9 +915,7 @@ def __call__( """ - http_options = ( - _BaseAuthorizedCertificatesRestTransport._BaseListAuthorizedCertificates._get_http_options() - ) + http_options = _BaseAuthorizedCertificatesRestTransport._BaseListAuthorizedCertificates._get_http_options() request, metadata = self._interceptor.pre_list_authorized_certificates( request, metadata @@ -1081,9 +1072,7 @@ def __call__( """ - http_options = ( - _BaseAuthorizedCertificatesRestTransport._BaseUpdateAuthorizedCertificate._get_http_options() - ) + http_options = _BaseAuthorizedCertificatesRestTransport._BaseUpdateAuthorizedCertificate._get_http_options() request, metadata = self._interceptor.pre_update_authorized_certificate( request, metadata @@ -1152,11 +1141,10 @@ def __call__( resp = self._interceptor.post_update_authorized_certificate(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_authorized_certificate_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_authorized_certificate_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1192,7 +1180,9 @@ def create_authorized_certificate( ]: # 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._CreateAuthorizedCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._CreateAuthorizedCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_authorized_certificate( @@ -1200,7 +1190,9 @@ def delete_authorized_certificate( ) -> Callable[[appengine.DeleteAuthorizedCertificateRequest], empty_pb2.Empty]: # 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._DeleteAuthorizedCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAuthorizedCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_authorized_certificate( @@ -1210,7 +1202,9 @@ def get_authorized_certificate( ]: # 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._GetAuthorizedCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._GetAuthorizedCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_authorized_certificates( @@ -1221,7 +1215,9 @@ def list_authorized_certificates( ]: # 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._ListAuthorizedCertificates(self._session, self._host, self._interceptor) # type: ignore + return self._ListAuthorizedCertificates( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_authorized_certificate( @@ -1232,7 +1228,9 @@ def update_authorized_certificate( ]: # 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._UpdateAuthorizedCertificate(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAuthorizedCertificate( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest_base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest_base.py index b21bec204e51..39f00a1d017b 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest_base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.appengine_admin_v1.types import appengine, certificate diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/async_client.py index e1e63800bc60..2f42e00c3f10 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -114,7 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AuthorizedDomainsAsyncClient: The constructed client. """ - return AuthorizedDomainsClient.from_service_account_info.__func__(AuthorizedDomainsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AuthorizedDomainsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AuthorizedDomainsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AuthorizedDomainsAsyncClient: The constructed client. """ - return AuthorizedDomainsClient.from_service_account_file.__func__(AuthorizedDomainsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AuthorizedDomainsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AuthorizedDomainsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/client.py index 039bf8e83afb..ce6aedd58404 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class AuthorizedDomainsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AuthorizedDomainsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AuthorizedDomainsTransport]] _transport_registry["grpc"] = AuthorizedDomainsGrpcTransport _transport_registry["grpc_asyncio"] = AuthorizedDomainsGrpcAsyncIOTransport _transport_registry["rest"] = AuthorizedDomainsRestTransport @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AuthorizedDomainsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AuthorizedDomainsClient._read_environment_variables() + ) self._client_cert_source = AuthorizedDomainsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -644,8 +640,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AuthorizedDomainsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py index dd1ef6cf9bba..b661dffaf16f 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py index a7596352c9d8..d09dadb0a9bd 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py index fc410bde8dc4..c76625483ecf 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.appengine_admin_v1.types import appengine diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py index 67dfc209d653..018c382272bb 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/rest.py index 3f08a82d27e8..d29250992bd6 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/authorized_domains/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -284,9 +284,7 @@ def __call__( """ - http_options = ( - _BaseAuthorizedDomainsRestTransport._BaseListAuthorizedDomains._get_http_options() - ) + http_options = _BaseAuthorizedDomainsRestTransport._BaseListAuthorizedDomains._get_http_options() request, metadata = self._interceptor.pre_list_authorized_domains( request, metadata diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/async_client.py index e09b237a53a2..143ad917f4e5 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation as gac_operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore +import google.api_core.operation as gac_operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.domain_mappings import pagers from google.cloud.appengine_admin_v1.types import appengine, domain_mapping @@ -116,7 +116,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DomainMappingsAsyncClient: The constructed client. """ - return DomainMappingsClient.from_service_account_info.__func__(DomainMappingsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DomainMappingsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DomainMappingsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +133,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DomainMappingsAsyncClient: The constructed client. """ - return DomainMappingsClient.from_service_account_file.__func__(DomainMappingsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DomainMappingsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DomainMappingsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/client.py index b40a3b7d727e..e4f946f4e1b2 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation as gac_operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore +import google.api_core.operation as gac_operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.domain_mappings import pagers from google.cloud.appengine_admin_v1.types import appengine, domain_mapping @@ -83,9 +83,7 @@ class DomainMappingsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DomainMappingsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DomainMappingsTransport]] _transport_registry["grpc"] = DomainMappingsGrpcTransport _transport_registry["grpc_asyncio"] = DomainMappingsGrpcAsyncIOTransport _transport_registry["rest"] = DomainMappingsRestTransport @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DomainMappingsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DomainMappingsClient._read_environment_variables() + ) self._client_cert_source = DomainMappingsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DomainMappingsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py index 9d01155bf811..91645c638b8b 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py index 8510cc891841..6035be42c379 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, domain_mapping diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py index 738454660b29..5094f07f29e3 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, domain_mapping diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py index 43ccd5368e96..d8b390ea0fec 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, domain_mapping diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/rest.py index a35805c70c58..5a19d0fb8cf3 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/domain_mappings/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -550,9 +550,7 @@ def __call__( """ - http_options = ( - _BaseDomainMappingsRestTransport._BaseCreateDomainMapping._get_http_options() - ) + http_options = _BaseDomainMappingsRestTransport._BaseCreateDomainMapping._get_http_options() request, metadata = self._interceptor.pre_create_domain_mapping( request, metadata @@ -578,7 +576,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -704,9 +702,7 @@ def __call__( """ - http_options = ( - _BaseDomainMappingsRestTransport._BaseDeleteDomainMapping._get_http_options() - ) + http_options = _BaseDomainMappingsRestTransport._BaseDeleteDomainMapping._get_http_options() request, metadata = self._interceptor.pre_delete_domain_mapping( request, metadata @@ -728,7 +724,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -850,9 +846,7 @@ def __call__( """ - http_options = ( - _BaseDomainMappingsRestTransport._BaseGetDomainMapping._get_http_options() - ) + http_options = _BaseDomainMappingsRestTransport._BaseGetDomainMapping._get_http_options() request, metadata = self._interceptor.pre_get_domain_mapping( request, metadata @@ -999,9 +993,7 @@ def __call__( """ - http_options = ( - _BaseDomainMappingsRestTransport._BaseListDomainMappings._get_http_options() - ) + http_options = _BaseDomainMappingsRestTransport._BaseListDomainMappings._get_http_options() request, metadata = self._interceptor.pre_list_domain_mappings( request, metadata @@ -1153,9 +1145,7 @@ def __call__( """ - http_options = ( - _BaseDomainMappingsRestTransport._BaseUpdateDomainMapping._get_http_options() - ) + http_options = _BaseDomainMappingsRestTransport._BaseUpdateDomainMapping._get_http_options() request, metadata = self._interceptor.pre_update_domain_mapping( request, metadata @@ -1181,7 +1171,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/async_client.py index 291d4545687d..d15b7d0fcc87 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -115,7 +115,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FirewallAsyncClient: The constructed client. """ - return FirewallClient.from_service_account_info.__func__(FirewallAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = FirewallClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(FirewallAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +132,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FirewallAsyncClient: The constructed client. """ - return FirewallClient.from_service_account_file.__func__(FirewallAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = FirewallClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(FirewallAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/client.py index 7d192d189895..e3a1898d6e24 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -608,11 +608,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FirewallClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FirewallClient._read_environment_variables() + ) self._client_cert_source = FirewallClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -647,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FirewallTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/pagers.py index 6b0e26b0db47..9dacf6fda002 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/base.py index b7ecd0c4f8c1..4117fd4b8c7c 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, firewall diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc.py index 6de3e6bde244..8ac35be68eb6 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.appengine_admin_v1.types import appengine, firewall @@ -389,12 +389,12 @@ def batch_update_ingress_rules( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_ingress_rules" not in self._stubs: - self._stubs[ - "batch_update_ingress_rules" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.Firewall/BatchUpdateIngressRules", - request_serializer=appengine.BatchUpdateIngressRulesRequest.serialize, - response_deserializer=appengine.BatchUpdateIngressRulesResponse.deserialize, + self._stubs["batch_update_ingress_rules"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.Firewall/BatchUpdateIngressRules", + request_serializer=appengine.BatchUpdateIngressRulesRequest.serialize, + response_deserializer=appengine.BatchUpdateIngressRulesResponse.deserialize, + ) ) return self._stubs["batch_update_ingress_rules"] diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc_asyncio.py index e6dd55b5f8d6..4f6e9ac426d7 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, firewall @@ -398,12 +398,12 @@ def batch_update_ingress_rules( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_ingress_rules" not in self._stubs: - self._stubs[ - "batch_update_ingress_rules" - ] = self._logged_channel.unary_unary( - "/google.appengine.v1.Firewall/BatchUpdateIngressRules", - request_serializer=appengine.BatchUpdateIngressRulesRequest.serialize, - response_deserializer=appengine.BatchUpdateIngressRulesResponse.deserialize, + self._stubs["batch_update_ingress_rules"] = ( + self._logged_channel.unary_unary( + "/google.appengine.v1.Firewall/BatchUpdateIngressRules", + request_serializer=appengine.BatchUpdateIngressRulesRequest.serialize, + response_deserializer=appengine.BatchUpdateIngressRulesResponse.deserialize, + ) ) return self._stubs["batch_update_ingress_rules"] diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest.py index e42773e97d74..4a8f900ca0f3 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -539,9 +539,7 @@ def __call__( Response message for ``Firewall.UpdateAllIngressRules``. """ - http_options = ( - _BaseFirewallRestTransport._BaseBatchUpdateIngressRules._get_http_options() - ) + http_options = _BaseFirewallRestTransport._BaseBatchUpdateIngressRules._get_http_options() request, metadata = self._interceptor.pre_batch_update_ingress_rules( request, metadata @@ -868,7 +866,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1371,7 +1369,9 @@ def batch_update_ingress_rules( ]: # 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._BatchUpdateIngressRules(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateIngressRules( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_ingress_rule( diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest_base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest_base.py index 5697a49619b3..937766eeea7a 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest_base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/firewall/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.appengine_admin_v1.types import appengine, firewall diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/async_client.py index 4b77b779dfe2..9d7ba0460829 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation as gac_operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as gac_operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.instances import pagers from google.cloud.appengine_admin_v1.types import appengine, instance @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: InstancesAsyncClient: The constructed client. """ - return InstancesClient.from_service_account_info.__func__(InstancesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = InstancesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(InstancesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: InstancesAsyncClient: The constructed client. """ - return InstancesClient.from_service_account_file.__func__(InstancesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = InstancesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(InstancesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/client.py index 4a9f9e2d9015..63b71f0b2121 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation as gac_operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as gac_operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.instances import pagers from google.cloud.appengine_admin_v1.types import appengine, instance @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstancesClient._read_environment_variables() + ) self._client_cert_source = InstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/pagers.py index 3aa7c8cb6bf5..510157eb6226 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/base.py index 17fd1aa5dad2..fd3c50c66890 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, instance diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc.py index 46a04f3da6a4..692f0b7ef416 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, instance diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py index 0b884d0bdd3a..cb3461fe03a8 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, instance diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/rest.py index 2fd58a0b451a..80c6efb3cc3c 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/instances/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -516,7 +516,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -666,7 +666,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/async_client.py index 40fde837c081..3cf5a5a57ad6 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -44,14 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation as gac_operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore +import google.api_core.operation as gac_operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.services import pagers -from google.cloud.appengine_admin_v1.types import appengine, network_settings +from google.cloud.appengine_admin_v1.types import appengine, network_settings, service from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import service from .client import ServicesClient from .transports.base import DEFAULT_CLIENT_INFO, ServicesTransport @@ -109,7 +108,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ServicesAsyncClient: The constructed client. """ - return ServicesClient.from_service_account_info.__func__(ServicesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ServicesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ServicesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -125,7 +125,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ServicesAsyncClient: The constructed client. """ - return ServicesClient.from_service_account_file.__func__(ServicesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ServicesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ServicesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/client.py index ce45e74a39aa..48f17675d6a0 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -61,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation as gac_operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore +import google.api_core.operation as gac_operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.services import pagers -from google.cloud.appengine_admin_v1.types import appengine, network_settings +from google.cloud.appengine_admin_v1.types import appengine, network_settings, service from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import service from .transports.base import DEFAULT_CLIENT_INFO, ServicesTransport from .transports.grpc import ServicesGrpcTransport @@ -602,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServicesClient._read_environment_variables() + ) self._client_cert_source = ServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/pagers.py index 9d6255602818..d819a68b5ce4 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/base.py index 19d7031d57ca..e1e560d131af 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, service diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc.py index d16c79450f05..fb326a494a35 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, service diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py index 81367d87e6d4..e1e96c558e77 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, service diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/rest.py index d88e407f57d9..9b02f4edff39 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/services/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -505,7 +505,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -963,7 +963,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/async_client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/async_client.py index 3d1b1b906fca..021c909a1132 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/async_client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation as gac_operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as gac_operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.versions import pagers -from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy +from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy, version from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import version from .client import VersionsClient from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport @@ -111,7 +110,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_info.__func__(VersionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = VersionsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(VersionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +127,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_file.__func__(VersionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = VersionsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(VersionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/client.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/client.py index 4b54a3ec42ff..a27269e84cc8 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/client.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation as gac_operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as gac_operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.versions import pagers -from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy +from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy, version from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import version from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport from .transports.grpc import VersionsGrpcTransport @@ -604,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VersionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VersionsClient._read_environment_variables() + ) self._client_cert_source = VersionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +640,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VersionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/pagers.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/pagers.py index 2b850ad5f8ac..ea393bb6ac5d 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/pagers.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/base.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/base.py index b347ce47134d..28c3046bf5ac 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/base.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.appengine_admin_v1 import gapic_version as package_version from google.cloud.appengine_admin_v1.types import appengine, version diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc.py index 8c866946e586..4afb2cfe3e0e 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, version diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py index a32ed2bc5683..92da4c13961e 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.appengine_admin_v1.types import appengine, version diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/rest.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/rest.py index 544eee366380..c234841ba071 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/rest.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/services/versions/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -564,7 +564,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -714,7 +714,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1163,7 +1163,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/__init__.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/__init__.py index a07f2784027d..dd66cc3217fe 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/__init__.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/__init__.py @@ -75,23 +75,56 @@ UpdateVersionRequest, VersionView, ) -from .application import Application, UrlDispatchRule -from .audit_data import AuditData, CreateVersionMethod, UpdateServiceMethod +from .application import ( + Application, + UrlDispatchRule, +) +from .audit_data import ( + AuditData, + CreateVersionMethod, + UpdateServiceMethod, +) from .certificate import ( AuthorizedCertificate, CertificateRawData, ManagedCertificate, ManagementStatus, ) -from .deploy import CloudBuildOptions, ContainerInfo, Deployment, FileInfo, ZipInfo -from .domain import AuthorizedDomain -from .domain_mapping import DomainMapping, ResourceRecord, SslSettings -from .firewall import FirewallRule -from .instance import Instance -from .location import LocationMetadata -from .network_settings import NetworkSettings -from .operation import CreateVersionMetadataV1, OperationMetadataV1 -from .service import Service, TrafficSplit +from .deploy import ( + CloudBuildOptions, + ContainerInfo, + Deployment, + FileInfo, + ZipInfo, +) +from .domain import ( + AuthorizedDomain, +) +from .domain_mapping import ( + DomainMapping, + ResourceRecord, + SslSettings, +) +from .firewall import ( + FirewallRule, +) +from .instance import ( + Instance, +) +from .location import ( + LocationMetadata, +) +from .network_settings import ( + NetworkSettings, +) +from .operation import ( + CreateVersionMetadataV1, + OperationMetadataV1, +) +from .service import ( + Service, + TrafficSplit, +) from .version import ( AutomaticScaling, BasicScaling, diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/app_yaml.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/app_yaml.py index f8c59aeeff57..95bfdd6f0569 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/app_yaml.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/app_yaml.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -54,6 +54,7 @@ class AuthFailAction(proto.Enum): Rejects request with a ``401`` HTTP status code and an error message. """ + AUTH_FAIL_ACTION_UNSPECIFIED = 0 AUTH_FAIL_ACTION_REDIRECT = 1 AUTH_FAIL_ACTION_UNAUTHORIZED = 2 @@ -77,6 +78,7 @@ class LoginRequirement(proto.Enum): If the user has signed in, the handler proceeds normally. Otherwise, the auth_fail_action is taken. """ + LOGIN_UNSPECIFIED = 0 LOGIN_OPTIONAL = 1 LOGIN_ADMIN = 2 @@ -110,6 +112,7 @@ class SecurityLevel(proto.Enum): redirected to the HTTPS URL with the same path. Query parameters are reserved for the redirect. """ + _pb_options = {"allow_alias": True} SECURE_UNSPECIFIED = 0 SECURE_DEFAULT = 0 @@ -194,6 +197,7 @@ class ErrorCode(proto.Enum): Deadline reached before the application responds. """ + _pb_options = {"allow_alias": True} ERROR_CODE_UNSPECIFIED = 0 ERROR_CODE_DEFAULT = 0 @@ -282,6 +286,7 @@ class RedirectHttpResponseCode(proto.Enum): REDIRECT_HTTP_RESPONSE_CODE_307 (4): ``307 Temporary Redirect`` code. """ + REDIRECT_HTTP_RESPONSE_CODE_UNSPECIFIED = 0 REDIRECT_HTTP_RESPONSE_CODE_301 = 1 REDIRECT_HTTP_RESPONSE_CODE_302 = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/appengine.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/appengine.py index ae10861546f8..bc7720fdb5a5 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/appengine.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/appengine.py @@ -17,14 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.appengine_admin_v1.types import domain_mapping as ga_domain_mapping from google.cloud.appengine_admin_v1.types import application as ga_application from google.cloud.appengine_admin_v1.types import certificate as ga_certificate -from google.cloud.appengine_admin_v1.types import domain -from google.cloud.appengine_admin_v1.types import firewall, instance +from google.cloud.appengine_admin_v1.types import domain, firewall, instance +from google.cloud.appengine_admin_v1.types import domain_mapping as ga_domain_mapping from google.cloud.appengine_admin_v1.types import service as ga_service from google.cloud.appengine_admin_v1.types import version as ga_version @@ -95,6 +94,7 @@ class VersionView(proto.Enum): resources, but is not returned in ``Get`` or ``List`` by default. """ + BASIC = 0 FULL = 1 @@ -112,6 +112,7 @@ class AuthorizedCertificateView(proto.Enum): information on the domain mappings that have this certificate mapped. """ + BASIC_CERTIFICATE = 0 FULL_CERTIFICATE = 1 @@ -135,6 +136,7 @@ class DomainOverrideStrategy(proto.Enum): Engine application, that app will no longer serve from that domain. """ + UNSPECIFIED_DOMAIN_OVERRIDE_STRATEGY = 0 STRICT = 1 OVERRIDE = 2 @@ -923,12 +925,12 @@ class ListAuthorizedCertificatesResponse(proto.Message): def raw_page(self): return self - certificates: MutableSequence[ - ga_certificate.AuthorizedCertificate - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=ga_certificate.AuthorizedCertificate, + certificates: MutableSequence[ga_certificate.AuthorizedCertificate] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=ga_certificate.AuthorizedCertificate, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1074,12 +1076,12 @@ class ListDomainMappingsResponse(proto.Message): def raw_page(self): return self - domain_mappings: MutableSequence[ - ga_domain_mapping.DomainMapping - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=ga_domain_mapping.DomainMapping, + domain_mappings: MutableSequence[ga_domain_mapping.DomainMapping] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=ga_domain_mapping.DomainMapping, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/application.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/application.py index c8bddfe60c8c..e163675593b8 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/application.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/application.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -120,6 +120,7 @@ class ServingStatus(proto.Enum): SYSTEM_DISABLED (3): Application has been disabled by the system. """ + UNSPECIFIED = 0 SERVING = 1 USER_DISABLED = 2 @@ -138,6 +139,7 @@ class DatabaseType(proto.Enum): CLOUD_DATASTORE_COMPATIBILITY (3): Cloud Firestore in Datastore Mode """ + DATABASE_TYPE_UNSPECIFIED = 0 CLOUD_DATASTORE = 1 CLOUD_FIRESTORE = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/certificate.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/certificate.py index 706abd3c3022..4c6335704491 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/certificate.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/certificate.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -72,6 +72,7 @@ class ManagementStatus(proto.Enum): domain. The last successfully provisioned certificate may still be serving. """ + MANAGEMENT_STATUS_UNSPECIFIED = 0 OK = 1 PENDING = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/deploy.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/deploy.py index 5a5060d6a9eb..59e01f568217 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/deploy.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/deploy.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/domain_mapping.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/domain_mapping.py index aca8bc775edc..d3a00e351a3a 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/domain_mapping.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/domain_mapping.py @@ -125,6 +125,7 @@ class SslManagementType(proto.Enum): SSL support or a user-obtained SSL certificate has been explictly mapped to this domain. """ + SSL_MANAGEMENT_TYPE_UNSPECIFIED = 0 AUTOMATIC = 1 MANUAL = 2 @@ -175,6 +176,7 @@ class RecordType(proto.Enum): A CNAME resource record. Data is a domain name to be aliased. """ + RECORD_TYPE_UNSPECIFIED = 0 A = 1 AAAA = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/firewall.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/firewall.py index b8b0ea570eb6..6dca5f5e3663 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/firewall.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/firewall.py @@ -73,6 +73,7 @@ class Action(proto.Enum): DENY (2): Matching requests are denied. """ + UNSPECIFIED_ACTION = 0 ALLOW = 1 DENY = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/instance.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/instance.py index fee47cc73381..68992ec5e287 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/instance.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/instance.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -104,6 +104,7 @@ class Availability(proto.Enum): DYNAMIC (2): No description available. """ + UNSPECIFIED = 0 RESIDENT = 1 DYNAMIC = 2 @@ -142,6 +143,7 @@ class LivenessState(proto.Enum): cannot be established, or the server does not respond within the specified timeout. """ + LIVENESS_STATE_UNSPECIFIED = 0 UNKNOWN = 1 HEALTHY = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/network_settings.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/network_settings.py index 211a6045870e..80f99816c4d3 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/network_settings.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/network_settings.py @@ -52,6 +52,7 @@ class IngressTrafficAllowed(proto.Enum): Allow HTTP traffic from private VPC sources and through load balancers. """ + INGRESS_TRAFFIC_ALLOWED_UNSPECIFIED = 0 INGRESS_TRAFFIC_ALLOWED_ALL = 1 INGRESS_TRAFFIC_ALLOWED_INTERNAL_ONLY = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/operation.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/operation.py index d79b90441c48..b9a859918274 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/operation.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/operation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/service.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/service.py index d653f81d84e0..d54e666008fc 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/service.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/service.py @@ -149,6 +149,7 @@ class ShardBy(proto.Enum): probability proportional to the version's traffic share. """ + UNSPECIFIED = 0 COOKIE = 1 IP = 2 diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/version.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/version.py index cb6ece0151df..1704295d73ba 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/version.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/types/version.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.appengine_admin_v1.types import app_yaml, deploy @@ -77,6 +77,7 @@ class InboundServiceType(proto.Enum): INBOUND_SERVICE_WARMUP (9): Enables warmup requests. """ + INBOUND_SERVICE_UNSPECIFIED = 0 INBOUND_SERVICE_MAIL = 1 INBOUND_SERVICE_MAIL_BOUNCE = 2 @@ -103,6 +104,7 @@ class ServingStatus(proto.Enum): settings are ignored until the state of the version changes to ``SERVING``. """ + SERVING_STATUS_UNSPECIFIED = 0 SERVING = 1 STOPPED = 2 @@ -556,6 +558,7 @@ class RolloutStrategy(proto.Enum): Endpoints service configuration ID will be updated with each rollout. """ + UNSPECIFIED_ROLLOUT_STRATEGY = 0 FIXED = 1 MANAGED = 2 @@ -1051,6 +1054,7 @@ class EgressSetting(proto.Enum): Use the VPC Access Connector for private IP space from RFC1918. """ + EGRESS_SETTING_UNSPECIFIED = 0 ALL_TRAFFIC = 1 PRIVATE_IP_RANGES = 2 diff --git a/packages/google-cloud-appengine-admin/noxfile.py b/packages/google-cloud-appengine-admin/noxfile.py index 89f252592c01..48556b06c6c4 100644 --- a/packages/google-cloud-appengine-admin/noxfile.py +++ b/packages/google-cloud-appengine-admin/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_applications.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_applications.py index b8bbf5b48ceb..54c4f8c07d50 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_applications.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_applications.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.applications import ( ApplicationsAsyncClient, @@ -938,10 +938,9 @@ def test_applications_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +985,9 @@ def test_applications_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1023,9 @@ def test_applications_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1267,13 +1264,13 @@ def test_applications_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1750,9 +1747,9 @@ def test_create_application_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_application] = ( + mock_rpc + ) request = {} client.create_application(request) @@ -1944,9 +1941,9 @@ def test_update_application_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_application] = ( + mock_rpc + ) request = {} client.update_application(request) @@ -2203,9 +2200,9 @@ def test_repair_application_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.repair_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.repair_application] = ( + mock_rpc + ) request = {} client.repair_application(request) @@ -2489,9 +2486,9 @@ def test_create_application_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_application] = ( + mock_rpc + ) request = {} client.create_application(request) @@ -2533,9 +2530,9 @@ def test_update_application_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_application] = ( + mock_rpc + ) request = {} client.update_application(request) @@ -2577,9 +2574,9 @@ def test_repair_application_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.repair_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.repair_application] = ( + mock_rpc + ) request = {} client.repair_application(request) @@ -2942,8 +2939,9 @@ def test_get_application_rest_bad_request(request_type=appengine.GetApplicationR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3028,17 +3026,19 @@ def test_get_application_rest_interceptors(null_interceptor): ) client = ApplicationsClient(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.ApplicationsRestInterceptor, "post_get_application" - ) as post, mock.patch.object( - transports.ApplicationsRestInterceptor, "post_get_application_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApplicationsRestInterceptor, "pre_get_application" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ApplicationsRestInterceptor, "post_get_application" + ) as post, + mock.patch.object( + transports.ApplicationsRestInterceptor, "post_get_application_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ApplicationsRestInterceptor, "pre_get_application" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3091,8 +3091,9 @@ def test_create_application_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3243,19 +3244,21 @@ def test_create_application_rest_interceptors(null_interceptor): ) client = ApplicationsClient(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.ApplicationsRestInterceptor, "post_create_application" - ) as post, mock.patch.object( - transports.ApplicationsRestInterceptor, "post_create_application_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApplicationsRestInterceptor, "pre_create_application" - ) as pre: + 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.ApplicationsRestInterceptor, "post_create_application" + ) as post, + mock.patch.object( + transports.ApplicationsRestInterceptor, + "post_create_application_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApplicationsRestInterceptor, "pre_create_application" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3308,8 +3311,9 @@ def test_update_application_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3460,19 +3464,21 @@ def test_update_application_rest_interceptors(null_interceptor): ) client = ApplicationsClient(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.ApplicationsRestInterceptor, "post_update_application" - ) as post, mock.patch.object( - transports.ApplicationsRestInterceptor, "post_update_application_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApplicationsRestInterceptor, "pre_update_application" - ) as pre: + 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.ApplicationsRestInterceptor, "post_update_application" + ) as post, + mock.patch.object( + transports.ApplicationsRestInterceptor, + "post_update_application_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApplicationsRestInterceptor, "pre_update_application" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3525,8 +3531,9 @@ def test_repair_application_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3583,19 +3590,21 @@ def test_repair_application_rest_interceptors(null_interceptor): ) client = ApplicationsClient(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.ApplicationsRestInterceptor, "post_repair_application" - ) as post, mock.patch.object( - transports.ApplicationsRestInterceptor, "post_repair_application_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ApplicationsRestInterceptor, "pre_repair_application" - ) as pre: + 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.ApplicationsRestInterceptor, "post_repair_application" + ) as post, + mock.patch.object( + transports.ApplicationsRestInterceptor, + "post_repair_application_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ApplicationsRestInterceptor, "pre_repair_application" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3808,11 +3817,14 @@ def test_applications_base_transport(): def test_applications_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.appengine_admin_v1.services.applications.transports.ApplicationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.appengine_admin_v1.services.applications.transports.ApplicationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApplicationsTransport( @@ -3833,9 +3845,12 @@ def test_applications_base_transport_with_credentials_file(): def test_applications_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.appengine_admin_v1.services.applications.transports.ApplicationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.appengine_admin_v1.services.applications.transports.ApplicationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ApplicationsTransport() @@ -3915,11 +3930,12 @@ def test_applications_transport_auth_gdch_credentials(transport_class): def test_applications_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py index 2f2b0112a714..c133b79d415f 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.authorized_certificates import ( AuthorizedCertificatesAsyncClient, @@ -998,10 +1003,9 @@ def test_authorized_certificates_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1050,9 @@ def test_authorized_certificates_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1088,9 @@ def test_authorized_certificates_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1344,13 +1346,13 @@ def test_authorized_certificates_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3594,8 +3596,9 @@ def test_list_authorized_certificates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3658,20 +3661,22 @@ def test_list_authorized_certificates_rest_interceptors(null_interceptor): ) client = AuthorizedCertificatesClient(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.AuthorizedCertificatesRestInterceptor, - "post_list_authorized_certificates", - ) as post, mock.patch.object( - transports.AuthorizedCertificatesRestInterceptor, - "post_list_authorized_certificates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AuthorizedCertificatesRestInterceptor, - "pre_list_authorized_certificates", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "post_list_authorized_certificates", + ) as post, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "post_list_authorized_certificates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "pre_list_authorized_certificates", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3729,8 +3734,9 @@ def test_get_authorized_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3803,20 +3809,22 @@ def test_get_authorized_certificate_rest_interceptors(null_interceptor): ) client = AuthorizedCertificatesClient(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.AuthorizedCertificatesRestInterceptor, - "post_get_authorized_certificate", - ) as post, mock.patch.object( - transports.AuthorizedCertificatesRestInterceptor, - "post_get_authorized_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AuthorizedCertificatesRestInterceptor, - "pre_get_authorized_certificate", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "post_get_authorized_certificate", + ) as post, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "post_get_authorized_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "pre_get_authorized_certificate", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3871,8 +3879,9 @@ def test_create_authorized_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4029,20 +4038,22 @@ def test_create_authorized_certificate_rest_interceptors(null_interceptor): ) client = AuthorizedCertificatesClient(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.AuthorizedCertificatesRestInterceptor, - "post_create_authorized_certificate", - ) as post, mock.patch.object( - transports.AuthorizedCertificatesRestInterceptor, - "post_create_authorized_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AuthorizedCertificatesRestInterceptor, - "pre_create_authorized_certificate", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "post_create_authorized_certificate", + ) as post, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "post_create_authorized_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "pre_create_authorized_certificate", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4097,8 +4108,9 @@ def test_update_authorized_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4255,20 +4267,22 @@ def test_update_authorized_certificate_rest_interceptors(null_interceptor): ) client = AuthorizedCertificatesClient(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.AuthorizedCertificatesRestInterceptor, - "post_update_authorized_certificate", - ) as post, mock.patch.object( - transports.AuthorizedCertificatesRestInterceptor, - "post_update_authorized_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AuthorizedCertificatesRestInterceptor, - "pre_update_authorized_certificate", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "post_update_authorized_certificate", + ) as post, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "post_update_authorized_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "pre_update_authorized_certificate", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4323,8 +4337,9 @@ def test_delete_authorized_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4381,14 +4396,14 @@ def test_delete_authorized_certificate_rest_interceptors(null_interceptor): ) client = AuthorizedCertificatesClient(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.AuthorizedCertificatesRestInterceptor, - "pre_delete_authorized_certificate", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AuthorizedCertificatesRestInterceptor, + "pre_delete_authorized_certificate", + ) as pre, + ): pre.assert_not_called() pb_message = appengine.DeleteAuthorizedCertificateRequest.pb( appengine.DeleteAuthorizedCertificateRequest() @@ -4596,11 +4611,14 @@ def test_authorized_certificates_base_transport(): def test_authorized_certificates_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.appengine_admin_v1.services.authorized_certificates.transports.AuthorizedCertificatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.appengine_admin_v1.services.authorized_certificates.transports.AuthorizedCertificatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AuthorizedCertificatesTransport( @@ -4621,9 +4639,12 @@ def test_authorized_certificates_base_transport_with_credentials_file(): def test_authorized_certificates_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.appengine_admin_v1.services.authorized_certificates.transports.AuthorizedCertificatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.appengine_admin_v1.services.authorized_certificates.transports.AuthorizedCertificatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AuthorizedCertificatesTransport() @@ -4705,11 +4726,12 @@ def test_authorized_certificates_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py index c8f360cbc7a2..a96924f772e7 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -978,10 +983,9 @@ def test_authorized_domains_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1030,9 @@ def test_authorized_domains_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1065,10 +1068,9 @@ def test_authorized_domains_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1316,13 +1318,13 @@ def test_authorized_domains_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2102,8 +2104,9 @@ def test_list_authorized_domains_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2166,18 +2169,20 @@ def test_list_authorized_domains_rest_interceptors(null_interceptor): ) client = AuthorizedDomainsClient(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.AuthorizedDomainsRestInterceptor, "post_list_authorized_domains" - ) as post, mock.patch.object( - transports.AuthorizedDomainsRestInterceptor, - "post_list_authorized_domains_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AuthorizedDomainsRestInterceptor, "pre_list_authorized_domains" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AuthorizedDomainsRestInterceptor, "post_list_authorized_domains" + ) as post, + mock.patch.object( + transports.AuthorizedDomainsRestInterceptor, + "post_list_authorized_domains_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AuthorizedDomainsRestInterceptor, "pre_list_authorized_domains" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2304,11 +2309,14 @@ def test_authorized_domains_base_transport(): def test_authorized_domains_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.appengine_admin_v1.services.authorized_domains.transports.AuthorizedDomainsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.appengine_admin_v1.services.authorized_domains.transports.AuthorizedDomainsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AuthorizedDomainsTransport( @@ -2329,9 +2337,12 @@ def test_authorized_domains_base_transport_with_credentials_file(): def test_authorized_domains_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.appengine_admin_v1.services.authorized_domains.transports.AuthorizedDomainsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.appengine_admin_v1.services.authorized_domains.transports.AuthorizedDomainsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AuthorizedDomainsTransport() @@ -2411,11 +2422,12 @@ def test_authorized_domains_transport_auth_gdch_credentials(transport_class): def test_authorized_domains_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py index e608479a01ed..b76f4d124dc7 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.domain_mappings import ( DomainMappingsAsyncClient, @@ -958,10 +958,9 @@ def test_domain_mappings_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1005,9 @@ def test_domain_mappings_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1043,9 @@ def test_domain_mappings_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1291,13 +1288,13 @@ def test_domain_mappings_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1416,9 +1413,9 @@ def test_list_domain_mappings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_domain_mappings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_domain_mappings] = ( + mock_rpc + ) request = {} client.list_domain_mappings(request) @@ -1875,9 +1872,9 @@ def test_get_domain_mapping_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_domain_mapping] = ( + mock_rpc + ) request = {} client.get_domain_mapping(request) @@ -2130,9 +2127,9 @@ def test_create_domain_mapping_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_domain_mapping] = ( + mock_rpc + ) request = {} client.create_domain_mapping(request) @@ -2390,9 +2387,9 @@ def test_update_domain_mapping_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_domain_mapping] = ( + mock_rpc + ) request = {} client.update_domain_mapping(request) @@ -2650,9 +2647,9 @@ def test_delete_domain_mapping_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_domain_mapping] = ( + mock_rpc + ) request = {} client.delete_domain_mapping(request) @@ -2844,9 +2841,9 @@ def test_list_domain_mappings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_domain_mappings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_domain_mappings] = ( + mock_rpc + ) request = {} client.list_domain_mappings(request) @@ -2947,9 +2944,9 @@ def test_get_domain_mapping_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_domain_mapping] = ( + mock_rpc + ) request = {} client.get_domain_mapping(request) @@ -2988,9 +2985,9 @@ def test_create_domain_mapping_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_domain_mapping] = ( + mock_rpc + ) request = {} client.create_domain_mapping(request) @@ -3033,9 +3030,9 @@ def test_update_domain_mapping_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_domain_mapping] = ( + mock_rpc + ) request = {} client.update_domain_mapping(request) @@ -3078,9 +3075,9 @@ def test_delete_domain_mapping_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_domain_mapping - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_domain_mapping] = ( + mock_rpc + ) request = {} client.delete_domain_mapping(request) @@ -3492,8 +3489,9 @@ def test_list_domain_mappings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3556,18 +3554,20 @@ def test_list_domain_mappings_rest_interceptors(null_interceptor): ) client = DomainMappingsClient(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.DomainMappingsRestInterceptor, "post_list_domain_mappings" - ) as post, mock.patch.object( - transports.DomainMappingsRestInterceptor, - "post_list_domain_mappings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainMappingsRestInterceptor, "pre_list_domain_mappings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainMappingsRestInterceptor, "post_list_domain_mappings" + ) as post, + mock.patch.object( + transports.DomainMappingsRestInterceptor, + "post_list_domain_mappings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainMappingsRestInterceptor, "pre_list_domain_mappings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3625,8 +3625,9 @@ def test_get_domain_mapping_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3691,18 +3692,20 @@ def test_get_domain_mapping_rest_interceptors(null_interceptor): ) client = DomainMappingsClient(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.DomainMappingsRestInterceptor, "post_get_domain_mapping" - ) as post, mock.patch.object( - transports.DomainMappingsRestInterceptor, - "post_get_domain_mapping_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainMappingsRestInterceptor, "pre_get_domain_mapping" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainMappingsRestInterceptor, "post_get_domain_mapping" + ) as post, + mock.patch.object( + transports.DomainMappingsRestInterceptor, + "post_get_domain_mapping_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainMappingsRestInterceptor, "pre_get_domain_mapping" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3757,8 +3760,9 @@ def test_create_domain_mapping_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3894,20 +3898,21 @@ def test_create_domain_mapping_rest_interceptors(null_interceptor): ) client = DomainMappingsClient(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.DomainMappingsRestInterceptor, "post_create_domain_mapping" - ) as post, mock.patch.object( - transports.DomainMappingsRestInterceptor, - "post_create_domain_mapping_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainMappingsRestInterceptor, "pre_create_domain_mapping" - ) as pre: + 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.DomainMappingsRestInterceptor, "post_create_domain_mapping" + ) as post, + mock.patch.object( + transports.DomainMappingsRestInterceptor, + "post_create_domain_mapping_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainMappingsRestInterceptor, "pre_create_domain_mapping" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3960,8 +3965,9 @@ def test_update_domain_mapping_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4097,20 +4103,21 @@ def test_update_domain_mapping_rest_interceptors(null_interceptor): ) client = DomainMappingsClient(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.DomainMappingsRestInterceptor, "post_update_domain_mapping" - ) as post, mock.patch.object( - transports.DomainMappingsRestInterceptor, - "post_update_domain_mapping_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainMappingsRestInterceptor, "pre_update_domain_mapping" - ) as pre: + 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.DomainMappingsRestInterceptor, "post_update_domain_mapping" + ) as post, + mock.patch.object( + transports.DomainMappingsRestInterceptor, + "post_update_domain_mapping_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainMappingsRestInterceptor, "pre_update_domain_mapping" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4163,8 +4170,9 @@ def test_delete_domain_mapping_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4221,20 +4229,21 @@ def test_delete_domain_mapping_rest_interceptors(null_interceptor): ) client = DomainMappingsClient(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.DomainMappingsRestInterceptor, "post_delete_domain_mapping" - ) as post, mock.patch.object( - transports.DomainMappingsRestInterceptor, - "post_delete_domain_mapping_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainMappingsRestInterceptor, "pre_delete_domain_mapping" - ) as pre: + 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.DomainMappingsRestInterceptor, "post_delete_domain_mapping" + ) as post, + mock.patch.object( + transports.DomainMappingsRestInterceptor, + "post_delete_domain_mapping_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainMappingsRestInterceptor, "pre_delete_domain_mapping" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4472,11 +4481,14 @@ def test_domain_mappings_base_transport(): def test_domain_mappings_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.appengine_admin_v1.services.domain_mappings.transports.DomainMappingsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.appengine_admin_v1.services.domain_mappings.transports.DomainMappingsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DomainMappingsTransport( @@ -4497,9 +4509,12 @@ def test_domain_mappings_base_transport_with_credentials_file(): def test_domain_mappings_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.appengine_admin_v1.services.domain_mappings.transports.DomainMappingsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.appengine_admin_v1.services.domain_mappings.transports.DomainMappingsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DomainMappingsTransport() @@ -4579,11 +4594,12 @@ def test_domain_mappings_transport_auth_gdch_credentials(transport_class): def test_domain_mappings_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_firewall.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_firewall.py index 6ec03ff1fc35..f8523a3a2ff2 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_firewall.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_firewall.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.firewall import ( FirewallAsyncClient, @@ -908,10 +913,9 @@ def test_firewall_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -956,10 +960,9 @@ def test_firewall_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -995,10 +998,9 @@ def test_firewall_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1223,13 +1225,13 @@ def test_firewall_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1350,9 +1352,9 @@ def test_list_ingress_rules_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ingress_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ingress_rules] = ( + mock_rpc + ) request = {} client.list_ingress_rules(request) @@ -2064,9 +2066,9 @@ def test_create_ingress_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ingress_rule] = ( + mock_rpc + ) request = {} client.create_ingress_rule(request) @@ -2325,9 +2327,9 @@ def test_get_ingress_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ingress_rule] = ( + mock_rpc + ) request = {} client.get_ingress_rule(request) @@ -2586,9 +2588,9 @@ def test_update_ingress_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ingress_rule] = ( + mock_rpc + ) request = {} client.update_ingress_rule(request) @@ -2844,9 +2846,9 @@ def test_delete_ingress_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_ingress_rule] = ( + mock_rpc + ) request = {} client.delete_ingress_rule(request) @@ -3024,9 +3026,9 @@ def test_list_ingress_rules_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ingress_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ingress_rules] = ( + mock_rpc + ) request = {} client.list_ingress_rules(request) @@ -3168,9 +3170,9 @@ def test_create_ingress_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ingress_rule] = ( + mock_rpc + ) request = {} client.create_ingress_rule(request) @@ -3206,9 +3208,9 @@ def test_get_ingress_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ingress_rule] = ( + mock_rpc + ) request = {} client.get_ingress_rule(request) @@ -3246,9 +3248,9 @@ def test_update_ingress_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ingress_rule] = ( + mock_rpc + ) request = {} client.update_ingress_rule(request) @@ -3286,9 +3288,9 @@ def test_delete_ingress_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_ingress_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_ingress_rule] = ( + mock_rpc + ) request = {} client.delete_ingress_rule(request) @@ -3752,8 +3754,9 @@ def test_list_ingress_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3814,17 +3817,19 @@ def test_list_ingress_rules_rest_interceptors(null_interceptor): ) client = FirewallClient(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.FirewallRestInterceptor, "post_list_ingress_rules" - ) as post, mock.patch.object( - transports.FirewallRestInterceptor, "post_list_ingress_rules_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallRestInterceptor, "pre_list_ingress_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallRestInterceptor, "post_list_ingress_rules" + ) as post, + mock.patch.object( + transports.FirewallRestInterceptor, "post_list_ingress_rules_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallRestInterceptor, "pre_list_ingress_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3879,8 +3884,9 @@ def test_batch_update_ingress_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3938,18 +3944,20 @@ def test_batch_update_ingress_rules_rest_interceptors(null_interceptor): ) client = FirewallClient(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.FirewallRestInterceptor, "post_batch_update_ingress_rules" - ) as post, mock.patch.object( - transports.FirewallRestInterceptor, - "post_batch_update_ingress_rules_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallRestInterceptor, "pre_batch_update_ingress_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallRestInterceptor, "post_batch_update_ingress_rules" + ) as post, + mock.patch.object( + transports.FirewallRestInterceptor, + "post_batch_update_ingress_rules_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallRestInterceptor, "pre_batch_update_ingress_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4007,8 +4015,9 @@ def test_create_ingress_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4148,17 +4157,19 @@ def test_create_ingress_rule_rest_interceptors(null_interceptor): ) client = FirewallClient(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.FirewallRestInterceptor, "post_create_ingress_rule" - ) as post, mock.patch.object( - transports.FirewallRestInterceptor, "post_create_ingress_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallRestInterceptor, "pre_create_ingress_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallRestInterceptor, "post_create_ingress_rule" + ) as post, + mock.patch.object( + transports.FirewallRestInterceptor, "post_create_ingress_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallRestInterceptor, "pre_create_ingress_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4211,8 +4222,9 @@ def test_get_ingress_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4279,17 +4291,19 @@ def test_get_ingress_rule_rest_interceptors(null_interceptor): ) client = FirewallClient(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.FirewallRestInterceptor, "post_get_ingress_rule" - ) as post, mock.patch.object( - transports.FirewallRestInterceptor, "post_get_ingress_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallRestInterceptor, "pre_get_ingress_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallRestInterceptor, "post_get_ingress_rule" + ) as post, + mock.patch.object( + transports.FirewallRestInterceptor, "post_get_ingress_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallRestInterceptor, "pre_get_ingress_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4342,8 +4356,9 @@ def test_update_ingress_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4483,17 +4498,19 @@ def test_update_ingress_rule_rest_interceptors(null_interceptor): ) client = FirewallClient(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.FirewallRestInterceptor, "post_update_ingress_rule" - ) as post, mock.patch.object( - transports.FirewallRestInterceptor, "post_update_ingress_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallRestInterceptor, "pre_update_ingress_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallRestInterceptor, "post_update_ingress_rule" + ) as post, + mock.patch.object( + transports.FirewallRestInterceptor, "post_update_ingress_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallRestInterceptor, "pre_update_ingress_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4546,8 +4563,9 @@ def test_delete_ingress_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4602,13 +4620,13 @@ def test_delete_ingress_rule_rest_interceptors(null_interceptor): ) client = FirewallClient(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.FirewallRestInterceptor, "pre_delete_ingress_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallRestInterceptor, "pre_delete_ingress_rule" + ) as pre, + ): pre.assert_not_called() pb_message = appengine.DeleteIngressRuleRequest.pb( appengine.DeleteIngressRuleRequest() @@ -4837,11 +4855,14 @@ def test_firewall_base_transport(): def test_firewall_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.appengine_admin_v1.services.firewall.transports.FirewallTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.appengine_admin_v1.services.firewall.transports.FirewallTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FirewallTransport( @@ -4862,9 +4883,12 @@ def test_firewall_base_transport_with_credentials_file(): def test_firewall_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.appengine_admin_v1.services.firewall.transports.FirewallTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.appengine_admin_v1.services.firewall.transports.FirewallTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FirewallTransport() @@ -4944,11 +4968,12 @@ def test_firewall_transport_auth_gdch_credentials(transport_class): def test_firewall_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_instances.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_instances.py index 6da33c6f0e57..a20803425401 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_instances.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.instances import ( InstancesAsyncClient, @@ -927,10 +927,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +974,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1012,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1246,13 +1243,13 @@ def test_instances_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3058,8 +3055,9 @@ def test_list_instances_rest_bad_request(request_type=appengine.ListInstancesReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3120,17 +3118,19 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3183,8 +3183,9 @@ def test_get_instance_rest_bad_request(request_type=appengine.GetInstanceRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3277,17 +3278,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3338,8 +3341,9 @@ def test_delete_instance_rest_bad_request(request_type=appengine.DeleteInstanceR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3396,19 +3400,20 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_delete_instance" - ) as pre: + 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.InstancesRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_delete_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3461,8 +3466,9 @@ def test_debug_instance_rest_bad_request(request_type=appengine.DebugInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3519,19 +3525,20 @@ def test_debug_instance_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_debug_instance" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_debug_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_debug_instance" - ) as pre: + 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.InstancesRestInterceptor, "post_debug_instance" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_debug_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_debug_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3736,11 +3743,14 @@ def test_instances_base_transport(): def test_instances_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.appengine_admin_v1.services.instances.transports.InstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.appengine_admin_v1.services.instances.transports.InstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstancesTransport( @@ -3761,9 +3771,12 @@ def test_instances_base_transport_with_credentials_file(): def test_instances_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.appengine_admin_v1.services.instances.transports.InstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.appengine_admin_v1.services.instances.transports.InstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstancesTransport() @@ -3843,11 +3856,12 @@ def test_instances_transport_auth_gdch_credentials(transport_class): def test_instances_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_services.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_services.py index 4d2f185a0140..7a1692b1b104 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_services.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.services import ( ServicesAsyncClient, @@ -70,9 +70,8 @@ pagers, transports, ) -from google.cloud.appengine_admin_v1.types import appengine, network_settings +from google.cloud.appengine_admin_v1.types import appengine, network_settings, service from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -921,10 +920,9 @@ def test_services_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +967,9 @@ def test_services_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1005,9 @@ def test_services_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1236,13 +1232,13 @@ def test_services_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2976,8 +2972,9 @@ def test_list_services_rest_bad_request(request_type=appengine.ListServicesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3038,17 +3035,19 @@ def test_list_services_rest_interceptors(null_interceptor): ) client = ServicesClient(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.ServicesRestInterceptor, "post_list_services" - ) as post, mock.patch.object( - transports.ServicesRestInterceptor, "post_list_services_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServicesRestInterceptor, "pre_list_services" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServicesRestInterceptor, "post_list_services" + ) as post, + mock.patch.object( + transports.ServicesRestInterceptor, "post_list_services_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServicesRestInterceptor, "pre_list_services" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3099,8 +3098,9 @@ def test_get_service_rest_bad_request(request_type=appengine.GetServiceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3163,17 +3163,17 @@ def test_get_service_rest_interceptors(null_interceptor): ) client = ServicesClient(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.ServicesRestInterceptor, "post_get_service" - ) as post, mock.patch.object( - transports.ServicesRestInterceptor, "post_get_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServicesRestInterceptor, "pre_get_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServicesRestInterceptor, "post_get_service" + ) as post, + mock.patch.object( + transports.ServicesRestInterceptor, "post_get_service_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ServicesRestInterceptor, "pre_get_service") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3222,8 +3222,9 @@ def test_update_service_rest_bad_request(request_type=appengine.UpdateServiceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3352,19 +3353,20 @@ def test_update_service_rest_interceptors(null_interceptor): ) client = ServicesClient(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.ServicesRestInterceptor, "post_update_service" - ) as post, mock.patch.object( - transports.ServicesRestInterceptor, "post_update_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServicesRestInterceptor, "pre_update_service" - ) as pre: + 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.ServicesRestInterceptor, "post_update_service" + ) as post, + mock.patch.object( + transports.ServicesRestInterceptor, "post_update_service_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServicesRestInterceptor, "pre_update_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3413,8 +3415,9 @@ def test_delete_service_rest_bad_request(request_type=appengine.DeleteServiceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3469,19 +3472,20 @@ def test_delete_service_rest_interceptors(null_interceptor): ) client = ServicesClient(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.ServicesRestInterceptor, "post_delete_service" - ) as post, mock.patch.object( - transports.ServicesRestInterceptor, "post_delete_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServicesRestInterceptor, "pre_delete_service" - ) as pre: + 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.ServicesRestInterceptor, "post_delete_service" + ) as post, + mock.patch.object( + transports.ServicesRestInterceptor, "post_delete_service_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServicesRestInterceptor, "pre_delete_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3686,11 +3690,14 @@ def test_services_base_transport(): def test_services_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.appengine_admin_v1.services.services.transports.ServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.appengine_admin_v1.services.services.transports.ServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServicesTransport( @@ -3711,9 +3718,12 @@ def test_services_base_transport_with_credentials_file(): def test_services_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.appengine_admin_v1.services.services.transports.ServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.appengine_admin_v1.services.services.transports.ServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServicesTransport() @@ -3793,11 +3803,12 @@ def test_services_transport_auth_gdch_credentials(transport_class): def test_services_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_versions.py b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_versions.py index f3aa79657252..0b548e2daaf1 100644 --- a/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_versions.py +++ b/packages/google-cloud-appengine-admin/tests/unit/gapic/appengine_admin_v1/test_versions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.appengine_admin_v1.services.versions import ( VersionsAsyncClient, @@ -72,9 +72,8 @@ pagers, transports, ) -from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy +from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy, version from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import version CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -923,10 +922,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +969,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1007,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1238,13 +1234,13 @@ def test_versions_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3398,8 +3394,9 @@ def test_list_versions_rest_bad_request(request_type=appengine.ListVersionsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3460,17 +3457,19 @@ def test_list_versions_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_list_versions" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_list_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_list_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_list_versions" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_list_versions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_list_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3521,8 +3520,9 @@ def test_get_version_rest_bad_request(request_type=appengine.GetVersionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3621,17 +3621,17 @@ def test_get_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_get_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_get_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_get_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_get_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_get_version_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VersionsRestInterceptor, "pre_get_version") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3680,8 +3680,9 @@ def test_create_version_rest_bad_request(request_type=appengine.CreateVersionReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3966,19 +3967,20 @@ def test_create_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_create_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_create_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_create_version" - ) as pre: + 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.VersionsRestInterceptor, "post_create_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_create_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_create_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4027,8 +4029,9 @@ def test_update_version_rest_bad_request(request_type=appengine.UpdateVersionReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4313,19 +4316,20 @@ def test_update_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_update_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_update_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_update_version" - ) as pre: + 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.VersionsRestInterceptor, "post_update_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_update_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_update_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4374,8 +4378,9 @@ def test_delete_version_rest_bad_request(request_type=appengine.DeleteVersionReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4430,19 +4435,20 @@ def test_delete_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_delete_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_delete_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_delete_version" - ) as pre: + 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.VersionsRestInterceptor, "post_delete_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_delete_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_delete_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4668,11 +4674,14 @@ def test_versions_base_transport(): def test_versions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.appengine_admin_v1.services.versions.transports.VersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.appengine_admin_v1.services.versions.transports.VersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VersionsTransport( @@ -4693,9 +4702,12 @@ def test_versions_base_transport_with_credentials_file(): def test_versions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.appengine_admin_v1.services.versions.transports.VersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.appengine_admin_v1.services.versions.transports.VersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VersionsTransport() @@ -4775,11 +4787,12 @@ def test_versions_transport_auth_gdch_credentials(transport_class): def test_versions_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-appengine-logging/docs/conf.py b/packages/google-cloud-appengine-logging/docs/conf.py index 4e4497a0af4a..e127e27a06b8 100644 --- a/packages/google-cloud-appengine-logging/docs/conf.py +++ b/packages/google-cloud-appengine-logging/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-appengine-logging documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/__init__.py b/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/__init__.py index 1b8f2c459f3b..dfb8b1975712 100644 --- a/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/__init__.py +++ b/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.request_log import LogLine, RequestLog, SourceLocation, SourceReference if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/types/__init__.py b/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/types/__init__.py index f3e9e9adafed..60c54b1253b5 100644 --- a/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/types/__init__.py +++ b/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/types/__init__.py @@ -13,7 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .request_log import LogLine, RequestLog, SourceLocation, SourceReference +from .request_log import ( + LogLine, + RequestLog, + SourceLocation, + SourceReference, +) __all__ = ( "LogLine", diff --git a/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/types/request_log.py b/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/types/request_log.py index 293d1bed2a02..2afecb69587d 100644 --- a/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/types/request_log.py +++ b/packages/google-cloud-appengine-logging/google/cloud/appengine_logging_v1/types/request_log.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.logging.type import log_severity_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.logging.type.log_severity_pb2 as log_severity_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-appengine-logging/noxfile.py b/packages/google-cloud-appengine-logging/noxfile.py index 18c73d8c070d..babd0ddcea65 100644 --- a/packages/google-cloud-appengine-logging/noxfile.py +++ b/packages/google-cloud-appengine-logging/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-apphub/docs/conf.py b/packages/google-cloud-apphub/docs/conf.py index 3c6939ac3228..af70ce8b2560 100644 --- a/packages/google-cloud-apphub/docs/conf.py +++ b/packages/google-cloud-apphub/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-apphub documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/__init__.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/__init__.py index 8619478baed4..ad9bc019a640 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/__init__.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.app_hub import AppHubAsyncClient, AppHubClient from .types.apphub_service import ( CreateApplicationRequest, diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/async_client.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/async_client.py index c38d0527408e..9a094a140bdc 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/async_client.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apphub_v1 import gapic_version as package_version @@ -44,28 +44,32 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apphub_v1.services.app_hub import pagers from google.cloud.apphub_v1.types import ( - service_project_attachment as gca_service_project_attachment, + apphub_service, + application, + attributes, + service, + service_project_attachment, + workload, ) -from google.cloud.apphub_v1.types import apphub_service -from google.cloud.apphub_v1.types import application from google.cloud.apphub_v1.types import application as gca_application -from google.cloud.apphub_v1.types import attributes -from google.cloud.apphub_v1.types import service from google.cloud.apphub_v1.types import service as gca_service -from google.cloud.apphub_v1.types import service_project_attachment -from google.cloud.apphub_v1.types import workload +from google.cloud.apphub_v1.types import ( + service_project_attachment as gca_service_project_attachment, +) from google.cloud.apphub_v1.types import workload as gca_workload from .client import AppHubClient @@ -142,7 +146,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AppHubAsyncClient: The constructed client. """ - return AppHubClient.from_service_account_info.__func__(AppHubAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AppHubClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AppHubAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +163,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AppHubAsyncClient: The constructed client. """ - return AppHubClient.from_service_account_file.__func__(AppHubAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AppHubClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AppHubAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/client.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/client.py index 2df4795e6467..f944bcabf1d4 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/client.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apphub_v1 import gapic_version as package_version @@ -61,28 +61,32 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apphub_v1.services.app_hub import pagers from google.cloud.apphub_v1.types import ( - service_project_attachment as gca_service_project_attachment, + apphub_service, + application, + attributes, + service, + service_project_attachment, + workload, ) -from google.cloud.apphub_v1.types import apphub_service -from google.cloud.apphub_v1.types import application from google.cloud.apphub_v1.types import application as gca_application -from google.cloud.apphub_v1.types import attributes -from google.cloud.apphub_v1.types import service from google.cloud.apphub_v1.types import service as gca_service -from google.cloud.apphub_v1.types import service_project_attachment -from google.cloud.apphub_v1.types import workload +from google.cloud.apphub_v1.types import ( + service_project_attachment as gca_service_project_attachment, +) from google.cloud.apphub_v1.types import workload as gca_workload from .transports.base import DEFAULT_CLIENT_INFO, AppHubTransport @@ -755,11 +759,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AppHubClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AppHubClient._read_environment_variables() + ) self._client_cert_source = AppHubClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -794,8 +796,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AppHubTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/pagers.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/pagers.py index 1773057463b6..df3acf78db98 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/pagers.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/pagers.py @@ -73,7 +73,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -235,7 +235,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -393,7 +393,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -469,7 +469,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -549,7 +549,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -627,7 +627,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -709,7 +709,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -785,7 +785,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -865,7 +865,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -941,7 +941,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/base.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/base.py index 57957ab15315..d5e1ddf41aeb 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/base.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.apphub_v1 import gapic_version as package_version from google.cloud.apphub_v1.types import ( @@ -777,13 +779,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc.py index 83062da68856..1aeb0ef16606 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.apphub_v1.types import ( apphub_service, @@ -373,12 +375,12 @@ def lookup_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_service_project_attachment" not in self._stubs: - self._stubs[ - "lookup_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/LookupServiceProjectAttachment", - request_serializer=apphub_service.LookupServiceProjectAttachmentRequest.serialize, - response_deserializer=apphub_service.LookupServiceProjectAttachmentResponse.deserialize, + self._stubs["lookup_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/LookupServiceProjectAttachment", + request_serializer=apphub_service.LookupServiceProjectAttachmentRequest.serialize, + response_deserializer=apphub_service.LookupServiceProjectAttachmentResponse.deserialize, + ) ) return self._stubs["lookup_service_project_attachment"] @@ -405,12 +407,12 @@ def list_service_project_attachments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_service_project_attachments" not in self._stubs: - self._stubs[ - "list_service_project_attachments" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/ListServiceProjectAttachments", - request_serializer=apphub_service.ListServiceProjectAttachmentsRequest.serialize, - response_deserializer=apphub_service.ListServiceProjectAttachmentsResponse.deserialize, + self._stubs["list_service_project_attachments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/ListServiceProjectAttachments", + request_serializer=apphub_service.ListServiceProjectAttachmentsRequest.serialize, + response_deserializer=apphub_service.ListServiceProjectAttachmentsResponse.deserialize, + ) ) return self._stubs["list_service_project_attachments"] @@ -436,12 +438,12 @@ def create_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_project_attachment" not in self._stubs: - self._stubs[ - "create_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/CreateServiceProjectAttachment", - request_serializer=apphub_service.CreateServiceProjectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/CreateServiceProjectAttachment", + request_serializer=apphub_service.CreateServiceProjectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_service_project_attachment"] @@ -467,12 +469,12 @@ def get_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_service_project_attachment" not in self._stubs: - self._stubs[ - "get_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/GetServiceProjectAttachment", - request_serializer=apphub_service.GetServiceProjectAttachmentRequest.serialize, - response_deserializer=service_project_attachment.ServiceProjectAttachment.deserialize, + self._stubs["get_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/GetServiceProjectAttachment", + request_serializer=apphub_service.GetServiceProjectAttachmentRequest.serialize, + response_deserializer=service_project_attachment.ServiceProjectAttachment.deserialize, + ) ) return self._stubs["get_service_project_attachment"] @@ -498,12 +500,12 @@ def delete_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_project_attachment" not in self._stubs: - self._stubs[ - "delete_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/DeleteServiceProjectAttachment", - request_serializer=apphub_service.DeleteServiceProjectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/DeleteServiceProjectAttachment", + request_serializer=apphub_service.DeleteServiceProjectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_service_project_attachment"] @@ -533,12 +535,12 @@ def detach_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "detach_service_project_attachment" not in self._stubs: - self._stubs[ - "detach_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/DetachServiceProjectAttachment", - request_serializer=apphub_service.DetachServiceProjectAttachmentRequest.serialize, - response_deserializer=apphub_service.DetachServiceProjectAttachmentResponse.deserialize, + self._stubs["detach_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/DetachServiceProjectAttachment", + request_serializer=apphub_service.DetachServiceProjectAttachmentRequest.serialize, + response_deserializer=apphub_service.DetachServiceProjectAttachmentResponse.deserialize, + ) ) return self._stubs["detach_service_project_attachment"] @@ -845,12 +847,12 @@ def lookup_discovered_workload( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_discovered_workload" not in self._stubs: - self._stubs[ - "lookup_discovered_workload" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/LookupDiscoveredWorkload", - request_serializer=apphub_service.LookupDiscoveredWorkloadRequest.serialize, - response_deserializer=apphub_service.LookupDiscoveredWorkloadResponse.deserialize, + self._stubs["lookup_discovered_workload"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/LookupDiscoveredWorkload", + request_serializer=apphub_service.LookupDiscoveredWorkloadRequest.serialize, + response_deserializer=apphub_service.LookupDiscoveredWorkloadResponse.deserialize, + ) ) return self._stubs["lookup_discovered_workload"] diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc_asyncio.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc_asyncio.py index 23de8ea45709..eb7d73610ee6 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc_asyncio.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.apphub_v1.types import ( apphub_service, @@ -381,12 +383,12 @@ def lookup_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_service_project_attachment" not in self._stubs: - self._stubs[ - "lookup_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/LookupServiceProjectAttachment", - request_serializer=apphub_service.LookupServiceProjectAttachmentRequest.serialize, - response_deserializer=apphub_service.LookupServiceProjectAttachmentResponse.deserialize, + self._stubs["lookup_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/LookupServiceProjectAttachment", + request_serializer=apphub_service.LookupServiceProjectAttachmentRequest.serialize, + response_deserializer=apphub_service.LookupServiceProjectAttachmentResponse.deserialize, + ) ) return self._stubs["lookup_service_project_attachment"] @@ -413,12 +415,12 @@ def list_service_project_attachments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_service_project_attachments" not in self._stubs: - self._stubs[ - "list_service_project_attachments" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/ListServiceProjectAttachments", - request_serializer=apphub_service.ListServiceProjectAttachmentsRequest.serialize, - response_deserializer=apphub_service.ListServiceProjectAttachmentsResponse.deserialize, + self._stubs["list_service_project_attachments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/ListServiceProjectAttachments", + request_serializer=apphub_service.ListServiceProjectAttachmentsRequest.serialize, + response_deserializer=apphub_service.ListServiceProjectAttachmentsResponse.deserialize, + ) ) return self._stubs["list_service_project_attachments"] @@ -445,12 +447,12 @@ def create_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_project_attachment" not in self._stubs: - self._stubs[ - "create_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/CreateServiceProjectAttachment", - request_serializer=apphub_service.CreateServiceProjectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/CreateServiceProjectAttachment", + request_serializer=apphub_service.CreateServiceProjectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_service_project_attachment"] @@ -476,12 +478,12 @@ def get_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_service_project_attachment" not in self._stubs: - self._stubs[ - "get_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/GetServiceProjectAttachment", - request_serializer=apphub_service.GetServiceProjectAttachmentRequest.serialize, - response_deserializer=service_project_attachment.ServiceProjectAttachment.deserialize, + self._stubs["get_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/GetServiceProjectAttachment", + request_serializer=apphub_service.GetServiceProjectAttachmentRequest.serialize, + response_deserializer=service_project_attachment.ServiceProjectAttachment.deserialize, + ) ) return self._stubs["get_service_project_attachment"] @@ -508,12 +510,12 @@ def delete_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_project_attachment" not in self._stubs: - self._stubs[ - "delete_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/DeleteServiceProjectAttachment", - request_serializer=apphub_service.DeleteServiceProjectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/DeleteServiceProjectAttachment", + request_serializer=apphub_service.DeleteServiceProjectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_service_project_attachment"] @@ -543,12 +545,12 @@ def detach_service_project_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "detach_service_project_attachment" not in self._stubs: - self._stubs[ - "detach_service_project_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/DetachServiceProjectAttachment", - request_serializer=apphub_service.DetachServiceProjectAttachmentRequest.serialize, - response_deserializer=apphub_service.DetachServiceProjectAttachmentResponse.deserialize, + self._stubs["detach_service_project_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/DetachServiceProjectAttachment", + request_serializer=apphub_service.DetachServiceProjectAttachmentRequest.serialize, + response_deserializer=apphub_service.DetachServiceProjectAttachmentResponse.deserialize, + ) ) return self._stubs["detach_service_project_attachment"] @@ -864,12 +866,12 @@ def lookup_discovered_workload( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_discovered_workload" not in self._stubs: - self._stubs[ - "lookup_discovered_workload" - ] = self._logged_channel.unary_unary( - "/google.cloud.apphub.v1.AppHub/LookupDiscoveredWorkload", - request_serializer=apphub_service.LookupDiscoveredWorkloadRequest.serialize, - response_deserializer=apphub_service.LookupDiscoveredWorkloadResponse.deserialize, + self._stubs["lookup_discovered_workload"] = ( + self._logged_channel.unary_unary( + "/google.cloud.apphub.v1.AppHub/LookupDiscoveredWorkload", + request_serializer=apphub_service.LookupDiscoveredWorkloadRequest.serialize, + response_deserializer=apphub_service.LookupDiscoveredWorkloadResponse.deserialize, + ) ) return self._stubs["lookup_discovered_workload"] diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest.py index dd171be3467e..2db7a0a84cde 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2090,7 +2092,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2243,7 +2245,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2370,9 +2372,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseCreateServiceProjectAttachment._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseCreateServiceProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_create_service_project_attachment( request, metadata @@ -2398,7 +2398,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2441,11 +2441,10 @@ def __call__( resp = self._interceptor.post_create_service_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_service_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_service_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2556,7 +2555,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2708,7 +2707,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2855,7 +2854,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2980,9 +2979,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseDeleteServiceProjectAttachment._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseDeleteServiceProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_delete_service_project_attachment( request, metadata @@ -3004,7 +3001,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3046,11 +3043,10 @@ def __call__( resp = self._interceptor.post_delete_service_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_service_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_service_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3156,7 +3152,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3281,9 +3277,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseDetachServiceProjectAttachment._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseDetachServiceProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_detach_service_project_attachment( request, metadata @@ -3354,11 +3348,10 @@ def __call__( resp = self._interceptor.post_detach_service_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_detach_service_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_detach_service_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4059,9 +4052,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseGetServiceProjectAttachment._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseGetServiceProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_get_service_project_attachment( request, metadata @@ -4125,11 +4116,10 @@ def __call__( resp = self._interceptor.post_get_service_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_service_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_service_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4663,9 +4653,7 @@ def __call__( Response for ListDiscoveredWorkloads. """ - http_options = ( - _BaseAppHubRestTransport._BaseListDiscoveredWorkloads._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseListDiscoveredWorkloads._get_http_options() request, metadata = self._interceptor.pre_list_discovered_workloads( request, metadata @@ -4815,9 +4803,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseListServiceProjectAttachments._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseListServiceProjectAttachments._get_http_options() request, metadata = self._interceptor.pre_list_service_project_attachments( request, metadata @@ -4881,11 +4867,10 @@ def __call__( resp = self._interceptor.post_list_service_project_attachments(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_service_project_attachments_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_service_project_attachments_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5264,9 +5249,7 @@ def __call__( Response for LookupDiscoveredService. """ - http_options = ( - _BaseAppHubRestTransport._BaseLookupDiscoveredService._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseLookupDiscoveredService._get_http_options() request, metadata = self._interceptor.pre_lookup_discovered_service( request, metadata @@ -5415,9 +5398,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseLookupDiscoveredWorkload._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseLookupDiscoveredWorkload._get_http_options() request, metadata = self._interceptor.pre_lookup_discovered_workload( request, metadata @@ -5569,9 +5550,7 @@ def __call__( """ - http_options = ( - _BaseAppHubRestTransport._BaseLookupServiceProjectAttachment._get_http_options() - ) + http_options = _BaseAppHubRestTransport._BaseLookupServiceProjectAttachment._get_http_options() request, metadata = self._interceptor.pre_lookup_service_project_attachment( request, metadata @@ -5637,11 +5616,10 @@ def __call__( resp = self._interceptor.post_lookup_service_project_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_lookup_service_project_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_lookup_service_project_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5762,7 +5740,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5915,7 +5893,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6068,7 +6046,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6159,7 +6137,9 @@ def create_service_project_attachment( ]: # 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._CreateServiceProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateServiceProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_workload( @@ -6193,7 +6173,9 @@ def delete_service_project_attachment( ]: # 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._DeleteServiceProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteServiceProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_workload( @@ -6212,7 +6194,9 @@ def detach_service_project_attachment( ]: # 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._DetachServiceProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._DetachServiceProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_application( @@ -6259,7 +6243,9 @@ def get_service_project_attachment( ]: # 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._GetServiceProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._GetServiceProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_workload( @@ -6289,7 +6275,9 @@ def list_discovered_services( ]: # 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._ListDiscoveredServices(self._session, self._host, self._interceptor) # type: ignore + return self._ListDiscoveredServices( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_discovered_workloads( @@ -6300,7 +6288,9 @@ def list_discovered_workloads( ]: # 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._ListDiscoveredWorkloads(self._session, self._host, self._interceptor) # type: ignore + return self._ListDiscoveredWorkloads( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_service_project_attachments( @@ -6311,7 +6301,9 @@ def list_service_project_attachments( ]: # 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._ListServiceProjectAttachments(self._session, self._host, self._interceptor) # type: ignore + return self._ListServiceProjectAttachments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_services( @@ -6342,7 +6334,9 @@ def lookup_discovered_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._LookupDiscoveredService(self._session, self._host, self._interceptor) # type: ignore + return self._LookupDiscoveredService( + self._session, self._host, self._interceptor + ) # type: ignore @property def lookup_discovered_workload( @@ -6353,7 +6347,9 @@ def lookup_discovered_workload( ]: # 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._LookupDiscoveredWorkload(self._session, self._host, self._interceptor) # type: ignore + return self._LookupDiscoveredWorkload( + self._session, self._host, self._interceptor + ) # type: ignore @property def lookup_service_project_attachment( @@ -6364,7 +6360,9 @@ def lookup_service_project_attachment( ]: # 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._LookupServiceProjectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._LookupServiceProjectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_application( diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest_base.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest_base.py index e1ee40f866d3..d02950dd1e9c 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest_base.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/services/app_hub/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/__init__.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/__init__.py index 8e8ae6176b3d..832cdbebb610 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/__init__.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/__init__.py @@ -53,10 +53,25 @@ UpdateServiceRequest, UpdateWorkloadRequest, ) -from .application import Application, Scope -from .attributes import Attributes, ContactInfo, Criticality, Environment -from .service import DiscoveredService, Service, ServiceProperties, ServiceReference -from .service_project_attachment import ServiceProjectAttachment +from .application import ( + Application, + Scope, +) +from .attributes import ( + Attributes, + ContactInfo, + Criticality, + Environment, +) +from .service import ( + DiscoveredService, + Service, + ServiceProperties, + ServiceReference, +) +from .service_project_attachment import ( + ServiceProjectAttachment, +) from .workload import ( DiscoveredWorkload, Workload, diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/apphub_service.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/apphub_service.py index 030c3cbce725..b0446e2cc7a1 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/apphub_service.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/apphub_service.py @@ -17,15 +17,15 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.apphub_v1.types import application as gca_application +from google.cloud.apphub_v1.types import service as gca_service from google.cloud.apphub_v1.types import ( service_project_attachment as gca_service_project_attachment, ) -from google.cloud.apphub_v1.types import application as gca_application -from google.cloud.apphub_v1.types import service as gca_service from google.cloud.apphub_v1.types import workload as gca_workload __protobuf__ = proto.module( @@ -454,12 +454,12 @@ class ListDiscoveredServicesResponse(proto.Message): def raw_page(self): return self - discovered_services: MutableSequence[ - gca_service.DiscoveredService - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gca_service.DiscoveredService, + discovered_services: MutableSequence[gca_service.DiscoveredService] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gca_service.DiscoveredService, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1075,12 +1075,12 @@ class ListDiscoveredWorkloadsResponse(proto.Message): def raw_page(self): return self - discovered_workloads: MutableSequence[ - gca_workload.DiscoveredWorkload - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gca_workload.DiscoveredWorkload, + discovered_workloads: MutableSequence[gca_workload.DiscoveredWorkload] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gca_workload.DiscoveredWorkload, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/application.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/application.py index f60180cf6a10..8b6c612b23fa 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/application.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/application.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.apphub_v1.types import attributes as gca_attributes @@ -80,6 +80,7 @@ class State(proto.Enum): DELETING (3): The Application is being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -147,6 +148,7 @@ class Type(proto.Enum): GLOBAL (2): Global type. """ + TYPE_UNSPECIFIED = 0 REGIONAL = 1 GLOBAL = 2 diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/attributes.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/attributes.py index 8e5f62f2a7bd..1c0b3568cbac 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/attributes.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/attributes.py @@ -102,6 +102,7 @@ class Type(proto.Enum): LOW (4): Low impact. """ + TYPE_UNSPECIFIED = 0 MISSION_CRITICAL = 1 HIGH = 2 @@ -138,6 +139,7 @@ class Type(proto.Enum): DEVELOPMENT (4): Development environment. """ + TYPE_UNSPECIFIED = 0 PRODUCTION = 1 STAGING = 2 diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service.py index 685adda04634..1c88bc2b0229 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.apphub_v1.types import attributes as gca_attributes @@ -90,6 +90,7 @@ class State(proto.Enum): The underlying networking resources have been deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service_project_attachment.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service_project_attachment.py index fb8fa106728a..16962705e2c2 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service_project_attachment.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/service_project_attachment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -74,6 +74,7 @@ class State(proto.Enum): The ServiceProjectAttachment is being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/workload.py b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/workload.py index fdb0c97a7bc7..0cd7a837d393 100644 --- a/packages/google-cloud-apphub/google/cloud/apphub_v1/types/workload.py +++ b/packages/google-cloud-apphub/google/cloud/apphub_v1/types/workload.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.apphub_v1.types import attributes as gca_attributes @@ -90,6 +90,7 @@ class State(proto.Enum): The underlying compute resources have been deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-apphub/noxfile.py b/packages/google-cloud-apphub/noxfile.py index 5d0bfeac654a..d109c4950b20 100644 --- a/packages/google-cloud-apphub/noxfile.py +++ b/packages/google-cloud-apphub/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-apphub/tests/unit/gapic/apphub_v1/test_app_hub.py b/packages/google-cloud-apphub/tests/unit/gapic/apphub_v1/test_app_hub.py index bd3f1a2fe06e..b7fc740ea0f7 100644 --- a/packages/google-cloud-apphub/tests/unit/gapic/apphub_v1/test_app_hub.py +++ b/packages/google-cloud-apphub/tests/unit/gapic/apphub_v1/test_app_hub.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.apphub_v1.services.app_hub import ( AppHubAsyncClient, @@ -76,16 +78,18 @@ transports, ) from google.cloud.apphub_v1.types import ( - service_project_attachment as gca_service_project_attachment, + apphub_service, + application, + attributes, + service, + service_project_attachment, + workload, ) -from google.cloud.apphub_v1.types import apphub_service -from google.cloud.apphub_v1.types import application from google.cloud.apphub_v1.types import application as gca_application -from google.cloud.apphub_v1.types import attributes -from google.cloud.apphub_v1.types import service from google.cloud.apphub_v1.types import service as gca_service -from google.cloud.apphub_v1.types import service_project_attachment -from google.cloud.apphub_v1.types import workload +from google.cloud.apphub_v1.types import ( + service_project_attachment as gca_service_project_attachment, +) from google.cloud.apphub_v1.types import workload as gca_workload CRED_INFO_JSON = { @@ -923,10 +927,9 @@ def test_app_hub_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +974,9 @@ def test_app_hub_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1012,9 @@ def test_app_hub_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1238,13 +1239,13 @@ def test_app_hub_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4245,9 +4246,9 @@ def test_get_discovered_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_discovered_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_discovered_service] = ( + mock_rpc + ) request = {} client.get_discovered_service(request) @@ -9957,9 +9958,9 @@ def test_list_applications_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_applications - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_applications] = ( + mock_rpc + ) request = {} client.list_applications(request) @@ -10503,9 +10504,9 @@ def test_create_application_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_application] = ( + mock_rpc + ) request = {} client.create_application(request) @@ -11208,9 +11209,9 @@ def test_update_application_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_application] = ( + mock_rpc + ) request = {} client.update_application(request) @@ -11566,9 +11567,9 @@ def test_delete_application_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_application] = ( + mock_rpc + ) request = {} client.delete_application(request) @@ -12367,9 +12368,9 @@ def test_create_service_project_attachment_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "serviceProjectAttachmentId" - ] = "service_project_attachment_id_value" + jsonified_request["serviceProjectAttachmentId"] = ( + "service_project_attachment_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -13393,9 +13394,9 @@ def test_get_discovered_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_discovered_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_discovered_service] = ( + mock_rpc + ) request = {} client.get_discovered_service(request) @@ -16531,9 +16532,9 @@ def test_list_applications_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_applications - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_applications] = ( + mock_rpc + ) request = {} client.list_applications(request) @@ -16795,9 +16796,9 @@ def test_create_application_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_application] = ( + mock_rpc + ) request = {} client.create_application(request) @@ -17195,9 +17196,9 @@ def test_update_application_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_application] = ( + mock_rpc + ) request = {} client.update_application(request) @@ -17398,9 +17399,9 @@ def test_delete_application_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_application - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_application] = ( + mock_rpc + ) request = {} client.delete_application(request) @@ -19051,8 +19052,9 @@ def test_lookup_service_project_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19112,18 +19114,20 @@ def test_lookup_service_project_attachment_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_lookup_service_project_attachment" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, - "post_lookup_service_project_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_lookup_service_project_attachment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_lookup_service_project_attachment" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, + "post_lookup_service_project_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_lookup_service_project_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19181,8 +19185,9 @@ def test_list_service_project_attachments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19247,18 +19252,20 @@ def test_list_service_project_attachments_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_list_service_project_attachments" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, - "post_list_service_project_attachments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_list_service_project_attachments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_list_service_project_attachments" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, + "post_list_service_project_attachments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_list_service_project_attachments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19316,8 +19323,9 @@ def test_create_service_project_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19452,20 +19460,21 @@ def test_create_service_project_attachment_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_create_service_project_attachment" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, - "post_create_service_project_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_create_service_project_attachment" - ) as pre: + 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.AppHubRestInterceptor, "post_create_service_project_attachment" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, + "post_create_service_project_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_create_service_project_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19520,8 +19529,9 @@ def test_get_service_project_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19595,18 +19605,20 @@ def test_get_service_project_attachment_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_get_service_project_attachment" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, - "post_get_service_project_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_get_service_project_attachment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_get_service_project_attachment" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, + "post_get_service_project_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_get_service_project_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19666,8 +19678,9 @@ def test_delete_service_project_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19724,20 +19737,21 @@ def test_delete_service_project_attachment_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_delete_service_project_attachment" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, - "post_delete_service_project_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_delete_service_project_attachment" - ) as pre: + 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.AppHubRestInterceptor, "post_delete_service_project_attachment" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, + "post_delete_service_project_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_delete_service_project_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19790,8 +19804,9 @@ def test_detach_service_project_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19851,18 +19866,20 @@ def test_detach_service_project_attachment_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_detach_service_project_attachment" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, - "post_detach_service_project_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_detach_service_project_attachment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_detach_service_project_attachment" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, + "post_detach_service_project_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_detach_service_project_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19920,8 +19937,9 @@ def test_list_discovered_services_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19984,17 +20002,20 @@ def test_list_discovered_services_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_list_discovered_services" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_list_discovered_services_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_list_discovered_services" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_list_discovered_services" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, + "post_list_discovered_services_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_list_discovered_services" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20054,8 +20075,9 @@ def test_get_discovered_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20118,17 +20140,20 @@ def test_get_discovered_service_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_get_discovered_service" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_get_discovered_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_get_discovered_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_get_discovered_service" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, + "post_get_discovered_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_get_discovered_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20181,8 +20206,9 @@ def test_lookup_discovered_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20240,17 +20266,20 @@ def test_lookup_discovered_service_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_lookup_discovered_service" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_lookup_discovered_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_lookup_discovered_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_lookup_discovered_service" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, + "post_lookup_discovered_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_lookup_discovered_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20308,8 +20337,9 @@ def test_list_services_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20372,17 +20402,17 @@ def test_list_services_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_list_services" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_list_services_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_list_services" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_list_services" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_list_services_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AppHubRestInterceptor, "pre_list_services") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20440,8 +20470,9 @@ def test_create_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20588,19 +20619,20 @@ def test_create_service_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_create_service" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_create_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_create_service" - ) as pre: + 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.AppHubRestInterceptor, "post_create_service" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_create_service_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_create_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20653,8 +20685,9 @@ def test_get_service_rest_bad_request(request_type=apphub_service.GetServiceRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20727,17 +20760,15 @@ def test_get_service_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_get_service" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_get_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_get_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AppHubRestInterceptor, "post_get_service") as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_get_service_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AppHubRestInterceptor, "pre_get_service") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20794,8 +20825,9 @@ def test_update_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20946,19 +20978,20 @@ def test_update_service_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_update_service" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_update_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_update_service" - ) as pre: + 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.AppHubRestInterceptor, "post_update_service" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_update_service_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_update_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21013,8 +21046,9 @@ def test_delete_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21071,19 +21105,20 @@ def test_delete_service_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_delete_service" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_delete_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_delete_service" - ) as pre: + 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.AppHubRestInterceptor, "post_delete_service" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_delete_service_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_delete_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21136,8 +21171,9 @@ def test_list_discovered_workloads_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21200,17 +21236,20 @@ def test_list_discovered_workloads_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_list_discovered_workloads" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_list_discovered_workloads_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_list_discovered_workloads" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_list_discovered_workloads" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, + "post_list_discovered_workloads_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_list_discovered_workloads" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21270,8 +21309,9 @@ def test_get_discovered_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21334,17 +21374,20 @@ def test_get_discovered_workload_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_get_discovered_workload" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_get_discovered_workload_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_get_discovered_workload" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_get_discovered_workload" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, + "post_get_discovered_workload_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_get_discovered_workload" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21399,8 +21442,9 @@ def test_lookup_discovered_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21458,18 +21502,20 @@ def test_lookup_discovered_workload_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_lookup_discovered_workload" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, - "post_lookup_discovered_workload_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_lookup_discovered_workload" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_lookup_discovered_workload" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, + "post_lookup_discovered_workload_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_lookup_discovered_workload" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21527,8 +21573,9 @@ def test_list_workloads_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21591,17 +21638,19 @@ def test_list_workloads_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_list_workloads" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_list_workloads_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_list_workloads" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_list_workloads" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_list_workloads_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_list_workloads" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21659,8 +21708,9 @@ def test_create_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21807,19 +21857,20 @@ def test_create_workload_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_create_workload" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_create_workload_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_create_workload" - ) as pre: + 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.AppHubRestInterceptor, "post_create_workload" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_create_workload_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_create_workload" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21872,8 +21923,9 @@ def test_get_workload_rest_bad_request(request_type=apphub_service.GetWorkloadRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21946,17 +21998,17 @@ def test_get_workload_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_get_workload" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_get_workload_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_get_workload" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_get_workload" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_get_workload_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AppHubRestInterceptor, "pre_get_workload") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22013,8 +22065,9 @@ def test_update_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22165,19 +22218,20 @@ def test_update_workload_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_update_workload" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_update_workload_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_update_workload" - ) as pre: + 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.AppHubRestInterceptor, "post_update_workload" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_update_workload_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_update_workload" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22232,8 +22286,9 @@ def test_delete_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22290,19 +22345,20 @@ def test_delete_workload_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_delete_workload" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_delete_workload_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_delete_workload" - ) as pre: + 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.AppHubRestInterceptor, "post_delete_workload" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_delete_workload_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_delete_workload" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22355,8 +22411,9 @@ def test_list_applications_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22419,17 +22476,19 @@ def test_list_applications_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_list_applications" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_list_applications_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_list_applications" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_list_applications" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_list_applications_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_list_applications" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22487,8 +22546,9 @@ def test_create_application_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22629,19 +22689,20 @@ def test_create_application_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_create_application" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_create_application_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_create_application" - ) as pre: + 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.AppHubRestInterceptor, "post_create_application" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_create_application_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_create_application" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22694,8 +22755,9 @@ def test_get_application_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22764,17 +22826,19 @@ def test_get_application_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_get_application" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_get_application_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_get_application" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppHubRestInterceptor, "post_get_application" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_get_application_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_get_application" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22831,8 +22895,9 @@ def test_update_application_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22977,19 +23042,20 @@ def test_update_application_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_update_application" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_update_application_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_update_application" - ) as pre: + 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.AppHubRestInterceptor, "post_update_application" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_update_application_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_update_application" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23042,8 +23108,9 @@ def test_delete_application_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23098,19 +23165,20 @@ def test_delete_application_rest_interceptors(null_interceptor): ) client = AppHubClient(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.AppHubRestInterceptor, "post_delete_application" - ) as post, mock.patch.object( - transports.AppHubRestInterceptor, "post_delete_application_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AppHubRestInterceptor, "pre_delete_application" - ) as pre: + 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.AppHubRestInterceptor, "post_delete_application" + ) as post, + mock.patch.object( + transports.AppHubRestInterceptor, "post_delete_application_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AppHubRestInterceptor, "pre_delete_application" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23163,8 +23231,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -23223,8 +23292,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -23285,8 +23355,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -23349,8 +23420,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -23413,8 +23485,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -23477,8 +23550,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -23539,8 +23613,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -23601,8 +23676,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -23663,8 +23739,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24401,11 +24478,14 @@ def test_app_hub_base_transport(): def test_app_hub_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.apphub_v1.services.app_hub.transports.AppHubTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.apphub_v1.services.app_hub.transports.AppHubTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AppHubTransport( @@ -24422,9 +24502,12 @@ def test_app_hub_base_transport_with_credentials_file(): def test_app_hub_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.apphub_v1.services.app_hub.transports.AppHubTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.apphub_v1.services.app_hub.transports.AppHubTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AppHubTransport() @@ -24496,11 +24579,12 @@ def test_app_hub_transport_auth_gdch_credentials(transport_class): def test_app_hub_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-artifact-registry/docs/conf.py b/packages/google-cloud-artifact-registry/docs/conf.py index d934a18be05c..a90f20c27c3e 100644 --- a/packages/google-cloud-artifact-registry/docs/conf.py +++ b/packages/google-cloud-artifact-registry/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-artifact-registry documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/__init__.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/__init__.py index d65bace512d3..5f8f0726919a 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/__init__.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.artifact_registry import ( ArtifactRegistryAsyncClient, ArtifactRegistryClient, diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/async_client.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/async_client.py index 12614d55839f..b24c21f0de80 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/async_client.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.artifactregistry_v1 import gapic_version as package_version @@ -44,39 +44,43 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.artifactregistry_v1.services.artifact_registry import pagers -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + service, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import service, settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config from .client import ArtifactRegistryClient from .transports.base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport @@ -203,7 +207,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ArtifactRegistryAsyncClient: The constructed client. """ - return ArtifactRegistryClient.from_service_account_info.__func__(ArtifactRegistryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ArtifactRegistryClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ArtifactRegistryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -219,7 +224,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ArtifactRegistryAsyncClient: The constructed client. """ - return ArtifactRegistryClient.from_service_account_file.__func__(ArtifactRegistryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ArtifactRegistryClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ArtifactRegistryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -4867,7 +4873,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import artifactregistry_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -4983,7 +4989,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import artifactregistry_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -5100,7 +5106,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import artifactregistry_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/client.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/client.py index d8e9ddb023de..cc50a6f8c8dd 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/client.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.artifactregistry_v1 import gapic_version as package_version @@ -61,39 +61,43 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.artifactregistry_v1.services.artifact_registry import pagers -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + service, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import service, settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config from .transports.base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport from .transports.grpc import ArtifactRegistryGrpcTransport @@ -109,9 +113,7 @@ class ArtifactRegistryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ArtifactRegistryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ArtifactRegistryTransport]] _transport_registry["grpc"] = ArtifactRegistryGrpcTransport _transport_registry["grpc_asyncio"] = ArtifactRegistryGrpcAsyncIOTransport _transport_registry["rest"] = ArtifactRegistryRestTransport @@ -1016,11 +1018,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ArtifactRegistryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ArtifactRegistryClient._read_environment_variables() + ) self._client_cert_source = ArtifactRegistryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1055,8 +1055,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ArtifactRegistryTransport, transport) self._api_endpoint = self._transport.host @@ -5510,7 +5509,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import artifactregistry_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -5625,7 +5624,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import artifactregistry_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -5741,7 +5740,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import artifactregistry_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/pagers.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/pagers.py index 9bfe72415650..fc9033120415 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/pagers.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/pagers.py @@ -76,7 +76,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -152,7 +152,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -308,7 +308,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -388,7 +388,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -464,7 +464,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -544,7 +544,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -620,7 +620,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -700,7 +700,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -776,7 +776,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -856,7 +856,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -932,7 +932,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1012,7 +1012,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1088,7 +1088,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1168,7 +1168,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1244,7 +1244,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1324,7 +1324,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1400,7 +1400,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1480,7 +1480,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1556,7 +1556,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1636,7 +1636,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1712,7 +1712,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/base.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/base.py index 35bf3844eb8d..e179008f5ee6 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/base.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/base.py @@ -17,40 +17,43 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.artifactregistry_v1 import gapic_version as package_version -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc.py index 6c121c1d8004..dfef683662c4 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc.py @@ -16,43 +16,46 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config from .base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc_asyncio.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc_asyncio.py index 45bfe2f6e6e5..155d8ce8470c 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc_asyncio.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc_asyncio.py @@ -17,45 +17,48 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config from .base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport from .grpc import ArtifactRegistryGrpcTransport diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest.py index 3511c433979d..eb5eb8577a65 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest.py @@ -16,43 +16,46 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseArtifactRegistryRestTransport @@ -3021,9 +3024,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseBatchDeleteVersions._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseBatchDeleteVersions._get_http_options() request, metadata = self._interceptor.pre_batch_delete_versions( request, metadata @@ -3049,7 +3050,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3176,9 +3177,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseCreateAttachment._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseCreateAttachment._get_http_options() request, metadata = self._interceptor.pre_create_attachment( request, metadata @@ -3204,7 +3203,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3331,9 +3330,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseCreateRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseCreateRepository._get_http_options() request, metadata = self._interceptor.pre_create_repository( request, metadata @@ -3359,7 +3356,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3793,9 +3790,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeleteAttachment._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeleteAttachment._get_http_options() request, metadata = self._interceptor.pre_delete_attachment( request, metadata @@ -3817,7 +3812,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3962,7 +3957,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4085,9 +4080,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeletePackage._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeletePackage._get_http_options() request, metadata = self._interceptor.pre_delete_package(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseDeletePackage._get_transcoded_request( @@ -4107,7 +4100,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4231,9 +4224,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeleteRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeleteRepository._get_http_options() request, metadata = self._interceptor.pre_delete_repository( request, metadata @@ -4255,7 +4246,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4393,7 +4384,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4499,7 +4490,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4590,9 +4581,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeleteVersion._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeleteVersion._get_http_options() request, metadata = self._interceptor.pre_delete_version(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseDeleteVersion._get_transcoded_request( @@ -4612,7 +4601,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4737,9 +4726,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseExportArtifact._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseExportArtifact._get_http_options() request, metadata = self._interceptor.pre_export_artifact(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseExportArtifact._get_transcoded_request( @@ -4763,7 +4750,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4890,9 +4877,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetAttachment._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetAttachment._get_http_options() request, metadata = self._interceptor.pre_get_attachment(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseGetAttachment._get_transcoded_request( @@ -5042,9 +5027,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetDockerImage._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetDockerImage._get_http_options() request, metadata = self._interceptor.pre_get_docker_image( request, metadata @@ -5561,9 +5544,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetMavenArtifact._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetMavenArtifact._get_http_options() request, metadata = self._interceptor.pre_get_maven_artifact( request, metadata @@ -5709,9 +5690,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetNpmPackage._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetNpmPackage._get_http_options() request, metadata = self._interceptor.pre_get_npm_package(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseGetNpmPackage._get_transcoded_request( @@ -6003,9 +5982,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetProjectSettings._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetProjectSettings._get_http_options() request, metadata = self._interceptor.pre_get_project_settings( request, metadata @@ -6152,9 +6129,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetPythonPackage._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetPythonPackage._get_http_options() request, metadata = self._interceptor.pre_get_python_package( request, metadata @@ -6300,9 +6275,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetRepository._get_http_options() request, metadata = self._interceptor.pre_get_repository(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseGetRepository._get_transcoded_request( @@ -6900,9 +6873,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetVPCSCConfig._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetVPCSCConfig._get_http_options() request, metadata = self._interceptor.pre_get_vpcsc_config( request, metadata @@ -7052,9 +7023,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseImportAptArtifacts._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseImportAptArtifacts._get_http_options() request, metadata = self._interceptor.pre_import_apt_artifacts( request, metadata @@ -7080,7 +7049,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7207,9 +7176,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseImportYumArtifacts._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseImportYumArtifacts._get_http_options() request, metadata = self._interceptor.pre_import_yum_artifacts( request, metadata @@ -7235,7 +7202,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7359,9 +7326,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListAttachments._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListAttachments._get_http_options() request, metadata = self._interceptor.pre_list_attachments( request, metadata @@ -7510,9 +7475,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListDockerImages._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListDockerImages._get_http_options() request, metadata = self._interceptor.pre_list_docker_images( request, metadata @@ -7805,9 +7768,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListMavenArtifacts._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListMavenArtifacts._get_http_options() request, metadata = self._interceptor.pre_list_maven_artifacts( request, metadata @@ -7956,9 +7917,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListNpmPackages._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListNpmPackages._get_http_options() request, metadata = self._interceptor.pre_list_npm_packages( request, metadata @@ -8251,9 +8210,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListPythonPackages._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListPythonPackages._get_http_options() request, metadata = self._interceptor.pre_list_python_packages( request, metadata @@ -8402,9 +8359,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListRepositories._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListRepositories._get_http_options() request, metadata = self._interceptor.pre_list_repositories( request, metadata @@ -9211,9 +9166,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -9518,9 +9471,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdatePackage._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdatePackage._get_http_options() request, metadata = self._interceptor.pre_update_package(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseUpdatePackage._get_transcoded_request( @@ -9671,9 +9622,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdateProjectSettings._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdateProjectSettings._get_http_options() request, metadata = self._interceptor.pre_update_project_settings( request, metadata @@ -9828,9 +9777,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdateRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdateRepository._get_http_options() request, metadata = self._interceptor.pre_update_repository( request, metadata @@ -10295,9 +10242,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdateVersion._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdateVersion._get_http_options() request, metadata = self._interceptor.pre_update_version(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseUpdateVersion._get_transcoded_request( @@ -10448,9 +10393,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdateVPCSCConfig._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdateVPCSCConfig._get_http_options() request, metadata = self._interceptor.pre_update_vpcsc_config( request, metadata @@ -11127,9 +11070,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest_base.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest_base.py index fd092fc2c9af..08a5c36181b4 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest_base.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/services/artifact_registry/transports/rest_base.py @@ -17,34 +17,37 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config from .base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/__init__.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/__init__.py index ae936e3c1384..34ba68f9e01e 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/__init__.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/__init__.py @@ -62,9 +62,15 @@ ListFilesResponse, UpdateFileRequest, ) -from .generic import GenericArtifact -from .go import GoModule -from .kfp_artifact import KfpArtifact +from .generic import ( + GenericArtifact, +) +from .go import ( + GoModule, +) +from .kfp_artifact import ( + KfpArtifact, +) from .package import ( DeletePackageRequest, GetPackageRequest, @@ -97,7 +103,9 @@ Rule, UpdateRuleRequest, ) -from .service import OperationMetadata +from .service import ( + OperationMetadata, +) from .settings import ( GetProjectSettingsRequest, ProjectSettings, @@ -123,7 +131,11 @@ Version, VersionView, ) -from .vpcsc_config import GetVPCSCConfigRequest, UpdateVPCSCConfigRequest, VPCSCConfig +from .vpcsc_config import ( + GetVPCSCConfigRequest, + UpdateVPCSCConfigRequest, + VPCSCConfig, +) from .yum_artifact import ( ImportYumArtifactsErrorInfo, ImportYumArtifactsGcsSource, diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/apt_artifact.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/apt_artifact.py index 758f7ff9406d..6c8d41c20043 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/apt_artifact.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/apt_artifact.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -70,6 +70,7 @@ class PackageType(proto.Enum): SOURCE (2): Source package. """ + PACKAGE_TYPE_UNSPECIFIED = 0 BINARY = 1 SOURCE = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/artifact.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/artifact.py index 9bef9fa901c3..c2e133f5e40b 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/artifact.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/artifact.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/attachment.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/attachment.py index de99ab72c301..451a4eb4cfcc 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/attachment.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/attachment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/file.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/file.py index 39a40ba369a9..f788da4129a2 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/file.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/file.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -56,6 +56,7 @@ class HashType(proto.Enum): MD5 (2): MD5 hash. """ + HASH_TYPE_UNSPECIFIED = 0 SHA256 = 1 MD5 = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/generic.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/generic.py index fe92306c7ef0..62dd8c4fa0de 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/generic.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/generic.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/go.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/go.py index d48924e77a87..d0effa11fc9a 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/go.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/go.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/package.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/package.py index 4d9b155cd752..aa637be0f61a 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/package.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/package.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/repository.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/repository.py index 4b7d81a38e9f..e339981d2788 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/repository.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/repository.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -115,6 +115,7 @@ class TagState(proto.Enum): ANY (3): Applies to all versions. """ + TAG_STATE_UNSPECIFIED = 0 TAGGED = 1 UNTAGGED = 2 @@ -219,6 +220,7 @@ class Action(proto.Enum): KEEP (2): Keep action. """ + ACTION_UNSPECIFIED = 0 DELETE = 1 KEEP = 2 @@ -395,6 +397,7 @@ class PublicRepository(proto.Enum): DOCKER_HUB (1): Docker Hub. """ + PUBLIC_REPOSITORY_UNSPECIFIED = 0 DOCKER_HUB = 1 @@ -458,6 +461,7 @@ class PublicRepository(proto.Enum): MAVEN_CENTRAL (1): Maven Central. """ + PUBLIC_REPOSITORY_UNSPECIFIED = 0 MAVEN_CENTRAL = 1 @@ -525,6 +529,7 @@ class PublicRepository(proto.Enum): NPMJS (1): npmjs. """ + PUBLIC_REPOSITORY_UNSPECIFIED = 0 NPMJS = 1 @@ -592,6 +597,7 @@ class PublicRepository(proto.Enum): PYPI (1): PyPI. """ + PUBLIC_REPOSITORY_UNSPECIFIED = 0 PYPI = 1 @@ -671,6 +677,7 @@ class RepositoryBase(proto.Enum): DEBIAN_SNAPSHOT (3): Archived Debian. """ + REPOSITORY_BASE_UNSPECIFIED = 0 DEBIAN = 1 UBUNTU = 2 @@ -773,6 +780,7 @@ class RepositoryBase(proto.Enum): Fedora Extra Packages for Enterprise Linux (EPEL). """ + REPOSITORY_BASE_UNSPECIFIED = 0 CENTOS = 1 CENTOS_DEBUG = 2 @@ -1024,6 +1032,7 @@ class Format(proto.Enum): RUBY (12): Ruby package format. """ + FORMAT_UNSPECIFIED = 0 DOCKER = 1 MAVEN = 2 @@ -1052,6 +1061,7 @@ class Mode(proto.Enum): A remote repository to serve artifacts from a remote source. """ + MODE_UNSPECIFIED = 0 STANDARD_REPOSITORY = 1 VIRTUAL_REPOSITORY = 2 @@ -1086,6 +1096,7 @@ class VersionPolicy(proto.Enum): SNAPSHOT - repository will accept only Snapshot versions. """ + VERSION_POLICY_UNSPECIFIED = 0 RELEASE = 1 SNAPSHOT = 2 @@ -1154,6 +1165,7 @@ class EnablementConfig(proto.Enum): No automatic vulnerability scanning will be performed for this repository. """ + ENABLEMENT_CONFIG_UNSPECIFIED = 0 INHERITED = 1 DISABLED = 2 @@ -1176,6 +1188,7 @@ class EnablementState(proto.Enum): Vulnerability scanning is active for this repository. """ + ENABLEMENT_STATE_UNSPECIFIED = 0 SCANNING_UNSUPPORTED = 1 SCANNING_DISABLED = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/rule.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/rule.py index d1aef39d7a2f..ce0dd89388e2 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/rule.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/rule.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -70,6 +70,7 @@ class Action(proto.Enum): DENY (2): Deny the operation. """ + ACTION_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -83,6 +84,7 @@ class Operation(proto.Enum): DOWNLOAD (1): Download operation. """ + OPERATION_UNSPECIFIED = 0 DOWNLOAD = 1 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/settings.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/settings.py index f1c4c43aa1fc..b8752b5bde77 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/settings.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/settings.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -71,6 +71,7 @@ class RedirectionState(proto.Enum): Redirection is partially enabled and missing images are copied from GCR """ + REDIRECTION_STATE_UNSPECIFIED = 0 REDIRECTION_FROM_GCR_IO_DISABLED = 1 REDIRECTION_FROM_GCR_IO_ENABLED = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/tag.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/tag.py index 1858da1e5617..37f737c8d84c 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/tag.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/tag.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/version.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/version.py index 9ca0909f4592..bcc222b1575d 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/version.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/version.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.artifactregistry_v1.types import file, tag @@ -54,6 +54,7 @@ class VersionView(proto.Enum): FULL (2): Include everything. """ + VERSION_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/vpcsc_config.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/vpcsc_config.py index 4a00a5c17cec..35a1944e6635 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/vpcsc_config.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/vpcsc_config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -66,6 +66,7 @@ class VPCSCPolicy(proto.Enum): Upstreams for the Remote Repositories if the resource is in the perimeter. """ + VPCSC_POLICY_UNSPECIFIED = 0 DENY = 1 ALLOW = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/yum_artifact.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/yum_artifact.py index 0bb7f45ce2bd..8b2ab7acad04 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/yum_artifact.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1/types/yum_artifact.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -62,6 +62,7 @@ class PackageType(proto.Enum): SOURCE (2): Source package (.srpm). """ + PACKAGE_TYPE_UNSPECIFIED = 0 BINARY = 1 SOURCE = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/__init__.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/__init__.py index 79f516af2b6b..fb16f489aa29 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/__init__.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.artifact_registry import ( ArtifactRegistryAsyncClient, ArtifactRegistryClient, diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/async_client.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/async_client.py index 4a7048d6e5e0..e1ef74f56805 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/async_client.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.artifactregistry_v1beta2 import gapic_version as package_version @@ -44,24 +44,30 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.artifactregistry_v1beta2.services.artifact_registry import pagers -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + service, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import service, settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact from .client import ArtifactRegistryClient from .transports.base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport @@ -160,7 +166,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ArtifactRegistryAsyncClient: The constructed client. """ - return ArtifactRegistryClient.from_service_account_info.__func__(ArtifactRegistryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ArtifactRegistryClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ArtifactRegistryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -176,7 +183,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ArtifactRegistryAsyncClient: The constructed client. """ - return ArtifactRegistryClient.from_service_account_file.__func__(ArtifactRegistryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ArtifactRegistryClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ArtifactRegistryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -2738,7 +2746,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import artifactregistry_v1beta2 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -2854,7 +2862,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import artifactregistry_v1beta2 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -2971,7 +2979,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import artifactregistry_v1beta2 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/client.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/client.py index 7c2173bae746..945172688d34 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/client.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.artifactregistry_v1beta2 import gapic_version as package_version @@ -61,24 +61,30 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.artifactregistry_v1beta2.services.artifact_registry import pagers -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + service, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import service, settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact from .transports.base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport from .transports.grpc import ArtifactRegistryGrpcTransport @@ -94,9 +100,7 @@ class ArtifactRegistryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ArtifactRegistryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ArtifactRegistryTransport]] _transport_registry["grpc"] = ArtifactRegistryGrpcTransport _transport_registry["grpc_asyncio"] = ArtifactRegistryGrpcAsyncIOTransport _transport_registry["rest"] = ArtifactRegistryRestTransport @@ -792,11 +796,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ArtifactRegistryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ArtifactRegistryClient._read_environment_variables() + ) self._client_cert_source = ArtifactRegistryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -831,8 +833,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ArtifactRegistryTransport, transport) self._api_endpoint = self._transport.host @@ -3249,7 +3250,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import artifactregistry_v1beta2 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -3364,7 +3365,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import artifactregistry_v1beta2 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -3480,7 +3481,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import artifactregistry_v1beta2 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/pagers.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/pagers.py index d419d4f7e36a..f561d55d733b 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/pagers.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/pagers.py @@ -73,7 +73,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -149,7 +149,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -385,7 +385,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -461,7 +461,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -541,7 +541,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -617,7 +617,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -697,7 +697,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -773,7 +773,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/base.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/base.py index 04cdc34dad30..fa0f8bad128d 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/base.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/base.py @@ -17,27 +17,32 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.artifactregistry_v1beta2 import gapic_version as package_version -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc.py index 1290247681f2..e0238c2a1ab2 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc.py @@ -16,30 +16,35 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact from .base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc_asyncio.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc_asyncio.py index a846b80f00f2..6e28de0f6086 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc_asyncio.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc_asyncio.py @@ -17,32 +17,37 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact from .base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport from .grpc import ArtifactRegistryGrpcTransport diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest.py index 15af8ab73f11..76bbbeb8cc36 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest.py @@ -16,30 +16,35 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseArtifactRegistryRestTransport @@ -1650,9 +1655,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseCreateRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseCreateRepository._get_http_options() request, metadata = self._interceptor.pre_create_repository( request, metadata @@ -1678,7 +1681,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1955,9 +1958,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeletePackage._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeletePackage._get_http_options() request, metadata = self._interceptor.pre_delete_package(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseDeletePackage._get_transcoded_request( @@ -1977,7 +1978,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2101,9 +2102,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeleteRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeleteRepository._get_http_options() request, metadata = self._interceptor.pre_delete_repository( request, metadata @@ -2125,7 +2124,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2263,7 +2262,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2354,9 +2353,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseDeleteVersion._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseDeleteVersion._get_http_options() request, metadata = self._interceptor.pre_delete_version(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseDeleteVersion._get_transcoded_request( @@ -2376,7 +2373,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3016,9 +3013,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetProjectSettings._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetProjectSettings._get_http_options() request, metadata = self._interceptor.pre_get_project_settings( request, metadata @@ -3164,9 +3159,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseGetRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseGetRepository._get_http_options() request, metadata = self._interceptor.pre_get_repository(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseGetRepository._get_transcoded_request( @@ -3614,9 +3607,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseImportAptArtifacts._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseImportAptArtifacts._get_http_options() request, metadata = self._interceptor.pre_import_apt_artifacts( request, metadata @@ -3642,7 +3633,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3769,9 +3760,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseImportYumArtifacts._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseImportYumArtifacts._get_http_options() request, metadata = self._interceptor.pre_import_yum_artifacts( request, metadata @@ -3797,7 +3786,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4209,9 +4198,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListRepositories._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListRepositories._get_http_options() request, metadata = self._interceptor.pre_list_repositories( request, metadata @@ -4874,9 +4861,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5029,9 +5014,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdateProjectSettings._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdateProjectSettings._get_http_options() request, metadata = self._interceptor.pre_update_project_settings( request, metadata @@ -5186,9 +5169,7 @@ def __call__( """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseUpdateRepository._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseUpdateRepository._get_http_options() request, metadata = self._interceptor.pre_update_repository( request, metadata @@ -5821,9 +5802,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseArtifactRegistryRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseArtifactRegistryRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseArtifactRegistryRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest_base.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest_base.py index fa12e861e43b..020262de4acb 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest_base.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/rest_base.py @@ -17,21 +17,26 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact from .base import DEFAULT_CLIENT_INFO, ArtifactRegistryTransport diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/__init__.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/__init__.py index 591fc4bcbdfd..49121e432f10 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/__init__.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/__init__.py @@ -21,7 +21,13 @@ ImportAptArtifactsRequest, ImportAptArtifactsResponse, ) -from .file import File, GetFileRequest, Hash, ListFilesRequest, ListFilesResponse +from .file import ( + File, + GetFileRequest, + Hash, + ListFilesRequest, + ListFilesResponse, +) from .package import ( DeletePackageRequest, GetPackageRequest, @@ -38,7 +44,9 @@ Repository, UpdateRepositoryRequest, ) -from .service import OperationMetadata +from .service import ( + OperationMetadata, +) from .settings import ( GetProjectSettingsRequest, ProjectSettings, diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/apt_artifact.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/apt_artifact.py index 8d7ebfda1eef..b6332227b606 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/apt_artifact.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/apt_artifact.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -70,6 +70,7 @@ class PackageType(proto.Enum): SOURCE (2): Source package. """ + PACKAGE_TYPE_UNSPECIFIED = 0 BINARY = 1 SOURCE = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/file.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/file.py index ad7e6df1131a..933f187c721b 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/file.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/file.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -53,6 +53,7 @@ class HashType(proto.Enum): MD5 (2): MD5 hash. """ + HASH_TYPE_UNSPECIFIED = 0 SHA256 = 1 MD5 = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/package.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/package.py index aef033236337..3f5891d9a7d4 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/package.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/package.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/repository.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/repository.py index 9a03f1db7301..b09fccea3749 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/repository.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/repository.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -98,6 +98,7 @@ class Format(proto.Enum): PYTHON (8): Python package format. """ + FORMAT_UNSPECIFIED = 0 DOCKER = 1 MAVEN = 2 @@ -135,6 +136,7 @@ class VersionPolicy(proto.Enum): SNAPSHOT - repository will accept only Snapshot versions. """ + VERSION_POLICY_UNSPECIFIED = 0 RELEASE = 1 SNAPSHOT = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/settings.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/settings.py index d924cd8bc15d..b4557cf3db94 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/settings.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/settings.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -62,6 +62,7 @@ class RedirectionState(proto.Enum): Redirection is enabled, and has been finalized so cannot be reverted. """ + REDIRECTION_STATE_UNSPECIFIED = 0 REDIRECTION_FROM_GCR_IO_DISABLED = 1 REDIRECTION_FROM_GCR_IO_ENABLED = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/tag.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/tag.py index 8a0b467b3112..4bfe25063664 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/tag.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/tag.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/version.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/version.py index 1cca5af18793..3062ef4a0d8e 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/version.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/version.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.artifactregistry_v1beta2.types import tag @@ -50,6 +50,7 @@ class VersionView(proto.Enum): FULL (2): Include everything. """ + VERSION_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 diff --git a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/yum_artifact.py b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/yum_artifact.py index 025e3e2ff045..ee870187de96 100644 --- a/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/yum_artifact.py +++ b/packages/google-cloud-artifact-registry/google/cloud/artifactregistry_v1beta2/types/yum_artifact.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -62,6 +62,7 @@ class PackageType(proto.Enum): SOURCE (2): Source package (.srpm). """ + PACKAGE_TYPE_UNSPECIFIED = 0 BINARY = 1 SOURCE = 2 diff --git a/packages/google-cloud-artifact-registry/noxfile.py b/packages/google-cloud-artifact-registry/noxfile.py index 1fb96e3aed91..b5360aec7711 100644 --- a/packages/google-cloud-artifact-registry/noxfile.py +++ b/packages/google-cloud-artifact-registry/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_async.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_async.py index c86e751c91cf..a79a246566e0 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_async.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START artifactregistry_v1_generated_ArtifactRegistry_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_sync.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_sync.py index 943e4067eafe..07c8d8c9fbc0 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_sync.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START artifactregistry_v1_generated_ArtifactRegistry_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_async.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_async.py index 86f321c7b93d..f82e5fc18bc8 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_async.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START artifactregistry_v1_generated_ArtifactRegistry_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_sync.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_sync.py index 59cdd73b2e03..bf81bfa8fadb 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_sync.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START artifactregistry_v1_generated_ArtifactRegistry_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_async.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_async.py index a468710616eb..80bc6cfb23a0 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_async.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START artifactregistry_v1_generated_ArtifactRegistry_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_sync.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_sync.py index 4e77d8d9911f..20b9f4c89791 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_sync.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1_generated_artifact_registry_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START artifactregistry_v1_generated_ArtifactRegistry_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_async.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_async.py index 7a9dc70cbb8f..6de97280a555 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_async.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START artifactregistry_v1beta2_generated_ArtifactRegistry_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1beta2 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_sync.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_sync.py index 4314a73e6d8d..e921fede777a 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_sync.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START artifactregistry_v1beta2_generated_ArtifactRegistry_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1beta2 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_async.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_async.py index 98f40346762a..4b17c8863759 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_async.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START artifactregistry_v1beta2_generated_ArtifactRegistry_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1beta2 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_sync.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_sync.py index 7ab3ba99cbf8..1a304ebec175 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_sync.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START artifactregistry_v1beta2_generated_ArtifactRegistry_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1beta2 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_async.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_async.py index ec0aa8fb6798..62463e89c610 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_async.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START artifactregistry_v1beta2_generated_ArtifactRegistry_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1beta2 diff --git a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_sync.py b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_sync.py index 3405590b2fc8..40b5e7b0f6cd 100644 --- a/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_sync.py +++ b/packages/google-cloud-artifact-registry/samples/generated_samples/artifactregistry_v1beta2_generated_artifact_registry_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-artifact-registry -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START artifactregistry_v1beta2_generated_ArtifactRegistry_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import artifactregistry_v1beta2 diff --git a/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1/test_artifact_registry.py b/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1/test_artifact_registry.py index c7bd2d76f3c3..027128d8056c 100644 --- a/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1/test_artifact_registry.py +++ b/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1/test_artifact_registry.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,19 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,25 +64,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.artifactregistry_v1.services.artifact_registry import ( ArtifactRegistryAsyncClient, @@ -78,26 +78,30 @@ pagers, transports, ) -from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config -from google.cloud.artifactregistry_v1.types import apt_artifact, artifact -from google.cloud.artifactregistry_v1.types import attachment +from google.cloud.artifactregistry_v1.types import ( + apt_artifact, + artifact, + attachment, + export, + file, + package, + repository, + rule, + service, + settings, + tag, + version, + vpcsc_config, + yum_artifact, +) from google.cloud.artifactregistry_v1.types import attachment as gda_attachment -from google.cloud.artifactregistry_v1.types import export -from google.cloud.artifactregistry_v1.types import file from google.cloud.artifactregistry_v1.types import file as gda_file -from google.cloud.artifactregistry_v1.types import package from google.cloud.artifactregistry_v1.types import package as gda_package -from google.cloud.artifactregistry_v1.types import repository from google.cloud.artifactregistry_v1.types import repository as gda_repository -from google.cloud.artifactregistry_v1.types import rule from google.cloud.artifactregistry_v1.types import rule as gda_rule -from google.cloud.artifactregistry_v1.types import service, settings -from google.cloud.artifactregistry_v1.types import tag from google.cloud.artifactregistry_v1.types import tag as gda_tag -from google.cloud.artifactregistry_v1.types import version from google.cloud.artifactregistry_v1.types import version as gda_version -from google.cloud.artifactregistry_v1.types import vpcsc_config -from google.cloud.artifactregistry_v1.types import yum_artifact +from google.cloud.artifactregistry_v1.types import vpcsc_config as gda_vpcsc_config CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1009,10 +1013,9 @@ def test_artifact_registry_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1060,9 @@ def test_artifact_registry_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1098,9 @@ def test_artifact_registry_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1347,13 +1348,13 @@ def test_artifact_registry_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1473,9 +1474,9 @@ def test_list_docker_images_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_docker_images - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_docker_images] = ( + mock_rpc + ) request = {} client.list_docker_images(request) @@ -2020,9 +2021,9 @@ def test_get_docker_image_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_docker_image - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_docker_image] = ( + mock_rpc + ) request = {} client.get_docker_image(request) @@ -2363,9 +2364,9 @@ def test_list_maven_artifacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_maven_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_maven_artifacts] = ( + mock_rpc + ) request = {} client.list_maven_artifacts(request) @@ -2914,9 +2915,9 @@ def test_get_maven_artifact_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_maven_artifact - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_maven_artifact] = ( + mock_rpc + ) request = {} client.get_maven_artifact(request) @@ -3263,9 +3264,9 @@ def test_list_npm_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_npm_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_npm_packages] = ( + mock_rpc + ) request = {} client.list_npm_packages(request) @@ -4139,9 +4140,9 @@ def test_list_python_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_python_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_python_packages] = ( + mock_rpc + ) request = {} client.list_python_packages(request) @@ -4688,9 +4689,9 @@ def test_get_python_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_python_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_python_package] = ( + mock_rpc + ) request = {} client.get_python_package(request) @@ -5032,9 +5033,9 @@ def test_import_apt_artifacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_apt_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_apt_artifacts] = ( + mock_rpc + ) request = {} client.import_apt_artifacts(request) @@ -5291,9 +5292,9 @@ def test_import_yum_artifacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_yum_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_yum_artifacts] = ( + mock_rpc + ) request = {} client.import_yum_artifacts(request) @@ -5557,9 +5558,9 @@ def test_list_repositories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -6460,9 +6461,9 @@ def test_create_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -6866,9 +6867,9 @@ def test_update_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -7256,9 +7257,9 @@ def test_delete_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -9948,9 +9949,9 @@ def test_batch_delete_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_versions] = ( + mock_rpc + ) request = {} client.batch_delete_versions(request) @@ -16328,9 +16329,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -16610,9 +16611,9 @@ def test_get_project_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_project_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_project_settings] = ( + mock_rpc + ) request = {} client.get_project_settings(request) @@ -17316,9 +17317,9 @@ def test_get_vpcsc_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_vpcsc_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_vpcsc_config] = ( + mock_rpc + ) request = {} client.get_vpcsc_config(request) @@ -17647,9 +17648,9 @@ def test_update_vpcsc_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_vpcsc_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_vpcsc_config] = ( + mock_rpc + ) request = {} client.update_vpcsc_config(request) @@ -18328,9 +18329,9 @@ def test_list_attachments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_attachments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_attachments] = ( + mock_rpc + ) request = {} client.list_attachments(request) @@ -19193,9 +19194,9 @@ def test_create_attachment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_attachment] = ( + mock_rpc + ) request = {} client.create_attachment(request) @@ -19556,9 +19557,9 @@ def test_delete_attachment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_attachment] = ( + mock_rpc + ) request = {} client.delete_attachment(request) @@ -20087,9 +20088,9 @@ def test_list_docker_images_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_docker_images - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_docker_images] = ( + mock_rpc + ) request = {} client.list_docker_images(request) @@ -20349,9 +20350,9 @@ def test_get_docker_image_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_docker_image - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_docker_image] = ( + mock_rpc + ) request = {} client.get_docker_image(request) @@ -20533,9 +20534,9 @@ def test_list_maven_artifacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_maven_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_maven_artifacts] = ( + mock_rpc + ) request = {} client.list_maven_artifacts(request) @@ -20797,9 +20798,9 @@ def test_get_maven_artifact_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_maven_artifact - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_maven_artifact] = ( + mock_rpc + ) request = {} client.get_maven_artifact(request) @@ -20979,9 +20980,9 @@ def test_list_npm_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_npm_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_npm_packages] = ( + mock_rpc + ) request = {} client.list_npm_packages(request) @@ -21421,9 +21422,9 @@ def test_list_python_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_python_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_python_packages] = ( + mock_rpc + ) request = {} client.list_python_packages(request) @@ -21685,9 +21686,9 @@ def test_get_python_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_python_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_python_package] = ( + mock_rpc + ) request = {} client.get_python_package(request) @@ -21869,9 +21870,9 @@ def test_import_apt_artifacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_apt_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_apt_artifacts] = ( + mock_rpc + ) request = {} client.import_apt_artifacts(request) @@ -21913,9 +21914,9 @@ def test_import_yum_artifacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_yum_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_yum_artifacts] = ( + mock_rpc + ) request = {} client.import_yum_artifacts(request) @@ -21955,9 +21956,9 @@ def test_list_repositories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -22397,9 +22398,9 @@ def test_create_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -22613,9 +22614,9 @@ def test_update_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -22723,9 +22724,9 @@ def test_delete_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -23875,9 +23876,9 @@ def test_batch_delete_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_versions] = ( + mock_rpc + ) request = {} client.batch_delete_versions(request) @@ -26734,9 +26735,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -26869,9 +26870,9 @@ def test_get_project_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_project_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_project_settings] = ( + mock_rpc + ) request = {} client.get_project_settings(request) @@ -27150,9 +27151,9 @@ def test_get_vpcsc_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_vpcsc_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_vpcsc_config] = ( + mock_rpc + ) request = {} client.get_vpcsc_config(request) @@ -27331,9 +27332,9 @@ def test_update_vpcsc_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_vpcsc_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_vpcsc_config] = ( + mock_rpc + ) request = {} client.update_vpcsc_config(request) @@ -27531,9 +27532,9 @@ def test_list_attachments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_attachments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_attachments] = ( + mock_rpc + ) request = {} client.list_attachments(request) @@ -27975,9 +27976,9 @@ def test_create_attachment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_attachment] = ( + mock_rpc + ) request = {} client.create_attachment(request) @@ -28185,9 +28186,9 @@ def test_delete_attachment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_attachment] = ( + mock_rpc + ) request = {} client.delete_attachment(request) @@ -31119,8 +31120,9 @@ def test_list_docker_images_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31183,18 +31185,20 @@ def test_list_docker_images_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_docker_images" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_list_docker_images_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_docker_images" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_docker_images" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_list_docker_images_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_docker_images" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31249,8 +31253,9 @@ def test_get_docker_image_rest_bad_request(request_type=artifact.GetDockerImageR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31325,18 +31330,20 @@ def test_get_docker_image_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_docker_image" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_get_docker_image_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_docker_image" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_docker_image" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_get_docker_image_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_docker_image" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31387,8 +31394,9 @@ def test_list_maven_artifacts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31451,18 +31459,20 @@ def test_list_maven_artifacts_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_maven_artifacts" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_list_maven_artifacts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_maven_artifacts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_maven_artifacts" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_list_maven_artifacts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_maven_artifacts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31522,8 +31532,9 @@ def test_get_maven_artifact_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31596,18 +31607,20 @@ def test_get_maven_artifact_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_maven_artifact" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_get_maven_artifact_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_maven_artifact" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_maven_artifact" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_get_maven_artifact_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_maven_artifact" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31660,8 +31673,9 @@ def test_list_npm_packages_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31724,18 +31738,20 @@ def test_list_npm_packages_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_npm_packages" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_list_npm_packages_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_npm_packages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_npm_packages" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_list_npm_packages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_npm_packages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31790,8 +31806,9 @@ def test_get_npm_package_rest_bad_request(request_type=artifact.GetNpmPackageReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31862,17 +31879,20 @@ def test_get_npm_package_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_npm_package" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_npm_package_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_npm_package" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_npm_package" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_get_npm_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_npm_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31923,8 +31943,9 @@ def test_list_python_packages_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31987,18 +32008,20 @@ def test_list_python_packages_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_python_packages" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_list_python_packages_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_python_packages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_python_packages" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_list_python_packages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_python_packages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32058,8 +32081,9 @@ def test_get_python_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32130,18 +32154,20 @@ def test_get_python_package_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_python_package" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_get_python_package_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_python_package" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_python_package" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_get_python_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_python_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32194,8 +32220,9 @@ def test_import_apt_artifacts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32252,20 +32279,21 @@ def test_import_apt_artifacts_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_import_apt_artifacts" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_import_apt_artifacts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_import_apt_artifacts" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_import_apt_artifacts" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_import_apt_artifacts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_import_apt_artifacts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32318,8 +32346,9 @@ def test_import_yum_artifacts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32376,20 +32405,21 @@ def test_import_yum_artifacts_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_import_yum_artifacts" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_import_yum_artifacts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_import_yum_artifacts" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_import_yum_artifacts" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_import_yum_artifacts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_import_yum_artifacts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32442,8 +32472,9 @@ def test_list_repositories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32506,18 +32537,20 @@ def test_list_repositories_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_repositories" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_list_repositories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_repositories" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_repositories" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_list_repositories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_repositories" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32573,8 +32606,9 @@ def test_get_repository_rest_bad_request(request_type=repository.GetRepositoryRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32657,17 +32691,20 @@ def test_get_repository_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_repository" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_repository_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_repository" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_get_repository_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32720,8 +32757,9 @@ def test_create_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32916,20 +32954,21 @@ def test_create_repository_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_create_repository" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_create_repository_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_create_repository" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_create_repository" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_create_repository_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_create_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32986,8 +33025,9 @@ def test_update_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33212,18 +33252,20 @@ def test_update_repository_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_update_repository" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_update_repository_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_update_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_repository" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_update_repository_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_update_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33276,8 +33318,9 @@ def test_delete_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33334,20 +33377,21 @@ def test_delete_repository_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_delete_repository" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_delete_repository_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_delete_repository" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_delete_repository" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_delete_repository_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_delete_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33398,8 +33442,9 @@ def test_list_packages_rest_bad_request(request_type=package.ListPackagesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33462,17 +33507,20 @@ def test_list_packages_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_packages" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_list_packages_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_packages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_packages" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_list_packages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_packages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33525,8 +33573,9 @@ def test_get_package_rest_bad_request(request_type=package.GetPackageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33593,17 +33642,19 @@ def test_get_package_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_package" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_package_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_package" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_package" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_package_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33654,8 +33705,9 @@ def test_delete_package_rest_bad_request(request_type=package.DeletePackageReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33714,19 +33766,21 @@ def test_delete_package_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_delete_package" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_delete_package_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_delete_package" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_delete_package" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_delete_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_delete_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33777,8 +33831,9 @@ def test_list_versions_rest_bad_request(request_type=version.ListVersionsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33843,17 +33898,20 @@ def test_list_versions_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_versions" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_list_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_versions" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_list_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33906,8 +33964,9 @@ def test_get_version_rest_bad_request(request_type=version.GetVersionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33974,17 +34033,19 @@ def test_get_version_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_version" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_version" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34035,8 +34096,9 @@ def test_delete_version_rest_bad_request(request_type=version.DeleteVersionReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34095,19 +34157,21 @@ def test_delete_version_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_delete_version" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_delete_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_delete_version" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_delete_version" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_delete_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_delete_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34160,8 +34224,9 @@ def test_batch_delete_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34220,20 +34285,21 @@ def test_batch_delete_versions_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_batch_delete_versions" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_batch_delete_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_batch_delete_versions" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_batch_delete_versions" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_batch_delete_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_batch_delete_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34288,8 +34354,9 @@ def test_update_version_rest_bad_request(request_type=gda_version.UpdateVersionR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34435,17 +34502,20 @@ def test_update_version_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_update_version" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_update_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_update_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_version" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_update_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_update_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34496,8 +34566,9 @@ def test_list_files_rest_bad_request(request_type=file.ListFilesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34560,17 +34631,19 @@ def test_list_files_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_files" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_list_files_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_files" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_files" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_files_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_files" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34621,8 +34694,9 @@ def test_get_file_rest_bad_request(request_type=file.GetFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34691,17 +34765,19 @@ def test_get_file_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_file" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_file" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_file_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_file" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34752,8 +34828,9 @@ def test_delete_file_rest_bad_request(request_type=file.DeleteFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34812,19 +34889,20 @@ def test_delete_file_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_delete_file" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_delete_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_delete_file" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_delete_file" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_delete_file_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_delete_file" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34877,8 +34955,9 @@ def test_update_file_rest_bad_request(request_type=gda_file.UpdateFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35026,17 +35105,19 @@ def test_update_file_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_update_file" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_update_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_update_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_file" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_file_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_update_file" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35087,8 +35168,9 @@ def test_list_tags_rest_bad_request(request_type=tag.ListTagsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35153,17 +35235,19 @@ def test_list_tags_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_tags" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_list_tags_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_tags" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_tags" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_tags_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_tags" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35214,8 +35298,9 @@ def test_get_tag_rest_bad_request(request_type=tag.GetTagRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35282,17 +35367,19 @@ def test_get_tag_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_tag" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_tag_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_tag" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_tag" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_tag_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_tag" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35343,8 +35430,9 @@ def test_create_tag_rest_bad_request(request_type=gda_tag.CreateTagRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35479,17 +35567,19 @@ def test_create_tag_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_create_tag" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_create_tag_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_create_tag" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_create_tag" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_create_tag_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_create_tag" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35542,8 +35632,9 @@ def test_update_tag_rest_bad_request(request_type=gda_tag.UpdateTagRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35683,17 +35774,19 @@ def test_update_tag_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_update_tag" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_update_tag_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_update_tag" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_tag" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_tag_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_update_tag" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35744,8 +35837,9 @@ def test_delete_tag_rest_bad_request(request_type=tag.DeleteTagRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35804,13 +35898,13 @@ def test_delete_tag_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "pre_delete_tag" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_delete_tag" + ) as pre, + ): pre.assert_not_called() pb_message = tag.DeleteTagRequest.pb(tag.DeleteTagRequest()) transcode.return_value = { @@ -35851,8 +35945,9 @@ def test_create_rule_rest_bad_request(request_type=gda_rule.CreateRuleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36000,17 +36095,19 @@ def test_create_rule_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_create_rule" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_create_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_create_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_create_rule" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_create_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_create_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36059,8 +36156,9 @@ def test_list_rules_rest_bad_request(request_type=rule.ListRulesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36123,17 +36221,19 @@ def test_list_rules_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_rules" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_list_rules_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_rules" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_rules_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36184,8 +36284,9 @@ def test_get_rule_rest_bad_request(request_type=rule.GetRuleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36256,17 +36357,19 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36319,8 +36422,9 @@ def test_update_rule_rest_bad_request(request_type=gda_rule.UpdateRuleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36472,17 +36576,19 @@ def test_update_rule_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_update_rule" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_update_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_update_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_rule" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_update_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36533,8 +36639,9 @@ def test_delete_rule_rest_bad_request(request_type=rule.DeleteRuleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36593,13 +36700,13 @@ def test_delete_rule_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "pre_delete_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_delete_rule" + ) as pre, + ): pre.assert_not_called() pb_message = rule.DeleteRuleRequest.pb(rule.DeleteRuleRequest()) transcode.return_value = { @@ -36644,8 +36751,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36709,17 +36817,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36772,8 +36883,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36837,17 +36949,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36900,8 +37015,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36963,18 +37079,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37030,8 +37148,9 @@ def test_get_project_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37101,18 +37220,20 @@ def test_get_project_settings_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_project_settings" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_get_project_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_project_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_project_settings" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_get_project_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_project_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37165,8 +37286,9 @@ def test_update_project_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37308,18 +37430,20 @@ def test_update_project_settings_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_update_project_settings" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_update_project_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_update_project_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_project_settings" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_update_project_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_update_project_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37372,8 +37496,9 @@ def test_get_vpcsc_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37438,18 +37563,20 @@ def test_get_vpcsc_config_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_vpcsc_config" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_get_vpcsc_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_vpcsc_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_vpcsc_config" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_get_vpcsc_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_vpcsc_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37504,8 +37631,9 @@ def test_update_vpcsc_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37643,18 +37771,20 @@ def test_update_vpcsc_config_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_update_vpcsc_config" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_update_vpcsc_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_update_vpcsc_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_vpcsc_config" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_update_vpcsc_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_update_vpcsc_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37711,8 +37841,9 @@ def test_update_package_rest_bad_request(request_type=gda_package.UpdatePackageR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37855,17 +37986,20 @@ def test_update_package_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_update_package" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_update_package_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_update_package" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_package" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_update_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_update_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37918,8 +38052,9 @@ def test_list_attachments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37982,18 +38117,20 @@ def test_list_attachments_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_attachments" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_list_attachments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_attachments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_attachments" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_list_attachments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_attachments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38048,8 +38185,9 @@ def test_get_attachment_rest_bad_request(request_type=attachment.GetAttachmentRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38124,17 +38262,20 @@ def test_get_attachment_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_attachment" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_attachment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_attachment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_attachment" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_get_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38187,8 +38328,9 @@ def test_create_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38323,20 +38465,21 @@ def test_create_attachment_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_create_attachment" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_create_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_create_attachment" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_create_attachment" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_create_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_create_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38391,8 +38534,9 @@ def test_delete_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38451,20 +38595,21 @@ def test_delete_attachment_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_delete_attachment" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_delete_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_delete_attachment" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_delete_attachment" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_delete_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_delete_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38517,8 +38662,9 @@ def test_export_artifact_rest_bad_request(request_type=export.ExportArtifactRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38577,19 +38723,21 @@ def test_export_artifact_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_export_artifact" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_export_artifact_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_export_artifact" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_export_artifact" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_export_artifact_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_export_artifact" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38640,8 +38788,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -38700,8 +38849,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -38762,8 +38912,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39983,11 +40134,14 @@ def test_artifact_registry_base_transport(): def test_artifact_registry_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.artifactregistry_v1.services.artifact_registry.transports.ArtifactRegistryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.artifactregistry_v1.services.artifact_registry.transports.ArtifactRegistryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ArtifactRegistryTransport( @@ -40007,9 +40161,12 @@ def test_artifact_registry_base_transport_with_credentials_file(): def test_artifact_registry_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.artifactregistry_v1.services.artifact_registry.transports.ArtifactRegistryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.artifactregistry_v1.services.artifact_registry.transports.ArtifactRegistryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ArtifactRegistryTransport() @@ -40087,11 +40244,12 @@ def test_artifact_registry_transport_auth_gdch_credentials(transport_class): def test_artifact_registry_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1beta2/test_artifact_registry.py b/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1beta2/test_artifact_registry.py index bc6bb63c3837..ef1e22f779b6 100644 --- a/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1beta2/test_artifact_registry.py +++ b/packages/google-cloud-artifact-registry/tests/unit/gapic/artifactregistry_v1beta2/test_artifact_registry.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +63,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.artifactregistry_v1beta2.services.artifact_registry import ( ArtifactRegistryAsyncClient, @@ -77,13 +77,19 @@ pagers, transports, ) -from google.cloud.artifactregistry_v1beta2.types import apt_artifact, file, package +from google.cloud.artifactregistry_v1beta2.types import ( + apt_artifact, + file, + package, + repository, + service, + settings, + tag, + version, + yum_artifact, +) from google.cloud.artifactregistry_v1beta2.types import repository as gda_repository -from google.cloud.artifactregistry_v1beta2.types import repository -from google.cloud.artifactregistry_v1beta2.types import service, settings -from google.cloud.artifactregistry_v1beta2.types import tag from google.cloud.artifactregistry_v1beta2.types import tag as gda_tag -from google.cloud.artifactregistry_v1beta2.types import version, yum_artifact CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -995,10 +1001,9 @@ def test_artifact_registry_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1048,9 @@ def test_artifact_registry_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1086,9 @@ def test_artifact_registry_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1333,13 +1336,13 @@ def test_artifact_registry_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1452,9 +1455,9 @@ def test_import_apt_artifacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_apt_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_apt_artifacts] = ( + mock_rpc + ) request = {} client.import_apt_artifacts(request) @@ -1711,9 +1714,9 @@ def test_import_yum_artifacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_yum_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_yum_artifacts] = ( + mock_rpc + ) request = {} client.import_yum_artifacts(request) @@ -1973,9 +1976,9 @@ def test_list_repositories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -2848,9 +2851,9 @@ def test_create_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -3240,9 +3243,9 @@ def test_update_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -3616,9 +3619,9 @@ def test_delete_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -9488,9 +9491,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -9768,9 +9771,9 @@ def test_get_project_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_project_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_project_settings] = ( + mock_rpc + ) request = {} client.get_project_settings(request) @@ -10404,9 +10407,9 @@ def test_import_apt_artifacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_apt_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_apt_artifacts] = ( + mock_rpc + ) request = {} client.import_apt_artifacts(request) @@ -10448,9 +10451,9 @@ def test_import_yum_artifacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_yum_artifacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_yum_artifacts] = ( + mock_rpc + ) request = {} client.import_yum_artifacts(request) @@ -10490,9 +10493,9 @@ def test_list_repositories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -10928,9 +10931,9 @@ def test_create_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -11122,9 +11125,9 @@ def test_update_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -11232,9 +11235,9 @@ def test_delete_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -13172,9 +13175,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -13307,9 +13310,9 @@ def test_get_project_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_project_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_project_settings] = ( + mock_rpc + ) request = {} client.get_project_settings(request) @@ -14943,8 +14946,9 @@ def test_import_apt_artifacts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15001,20 +15005,21 @@ def test_import_apt_artifacts_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_import_apt_artifacts" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_import_apt_artifacts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_import_apt_artifacts" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_import_apt_artifacts" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_import_apt_artifacts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_import_apt_artifacts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15067,8 +15072,9 @@ def test_import_yum_artifacts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15125,20 +15131,21 @@ def test_import_yum_artifacts_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_import_yum_artifacts" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_import_yum_artifacts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_import_yum_artifacts" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_import_yum_artifacts" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_import_yum_artifacts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_import_yum_artifacts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15191,8 +15198,9 @@ def test_list_repositories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15255,18 +15263,20 @@ def test_list_repositories_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_repositories" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_list_repositories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_repositories" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_repositories" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_list_repositories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_repositories" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15322,8 +15332,9 @@ def test_get_repository_rest_bad_request(request_type=repository.GetRepositoryRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15392,17 +15403,20 @@ def test_get_repository_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_repository" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_repository_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_repository" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_get_repository_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15455,8 +15469,9 @@ def test_create_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15590,20 +15605,21 @@ def test_create_repository_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_create_repository" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_create_repository_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_create_repository" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_create_repository" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_create_repository_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_create_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15660,8 +15676,9 @@ def test_update_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15811,18 +15828,20 @@ def test_update_repository_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_update_repository" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_update_repository_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_update_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_repository" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_update_repository_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_update_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15875,8 +15894,9 @@ def test_delete_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15933,20 +15953,21 @@ def test_delete_repository_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_delete_repository" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_delete_repository_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_delete_repository" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_delete_repository" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_delete_repository_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_delete_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15997,8 +16018,9 @@ def test_list_packages_rest_bad_request(request_type=package.ListPackagesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16061,17 +16083,20 @@ def test_list_packages_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_packages" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_list_packages_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_packages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_packages" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_list_packages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_packages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16124,8 +16149,9 @@ def test_get_package_rest_bad_request(request_type=package.GetPackageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16192,17 +16218,19 @@ def test_get_package_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_package" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_package_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_package" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_package" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_package_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16253,8 +16281,9 @@ def test_delete_package_rest_bad_request(request_type=package.DeletePackageReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16313,19 +16342,21 @@ def test_delete_package_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_delete_package" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_delete_package_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_delete_package" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_delete_package" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_delete_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_delete_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16376,8 +16407,9 @@ def test_list_versions_rest_bad_request(request_type=version.ListVersionsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16442,17 +16474,20 @@ def test_list_versions_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_versions" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_list_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_versions" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_list_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16505,8 +16540,9 @@ def test_get_version_rest_bad_request(request_type=version.GetVersionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16573,17 +16609,19 @@ def test_get_version_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_version" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_version" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16634,8 +16672,9 @@ def test_delete_version_rest_bad_request(request_type=version.DeleteVersionReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16694,19 +16733,21 @@ def test_delete_version_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_delete_version" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_delete_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_delete_version" - ) as pre: + 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.ArtifactRegistryRestInterceptor, "post_delete_version" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_delete_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_delete_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16755,8 +16796,9 @@ def test_list_files_rest_bad_request(request_type=file.ListFilesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16819,17 +16861,19 @@ def test_list_files_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_files" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_list_files_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_files" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_files" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_files_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_files" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16880,8 +16924,9 @@ def test_get_file_rest_bad_request(request_type=file.GetFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16950,17 +16995,19 @@ def test_get_file_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_file" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_file" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_file_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_file" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17011,8 +17058,9 @@ def test_list_tags_rest_bad_request(request_type=tag.ListTagsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17077,17 +17125,19 @@ def test_list_tags_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_list_tags" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_list_tags_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_list_tags" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_tags" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_list_tags_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_list_tags" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17138,8 +17188,9 @@ def test_get_tag_rest_bad_request(request_type=tag.GetTagRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17206,17 +17257,19 @@ def test_get_tag_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_tag" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_tag_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_tag" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_tag" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_tag_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_tag" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17267,8 +17320,9 @@ def test_create_tag_rest_bad_request(request_type=gda_tag.CreateTagRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17403,17 +17457,19 @@ def test_create_tag_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_create_tag" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_create_tag_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_create_tag" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_create_tag" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_create_tag_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_create_tag" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17466,8 +17522,9 @@ def test_update_tag_rest_bad_request(request_type=gda_tag.UpdateTagRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17607,17 +17664,19 @@ def test_update_tag_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_update_tag" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_update_tag_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_update_tag" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_tag" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_tag_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_update_tag" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17668,8 +17727,9 @@ def test_delete_tag_rest_bad_request(request_type=tag.DeleteTagRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17728,13 +17788,13 @@ def test_delete_tag_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "pre_delete_tag" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_delete_tag" + ) as pre, + ): pre.assert_not_called() pb_message = tag.DeleteTagRequest.pb(tag.DeleteTagRequest()) transcode.return_value = { @@ -17779,8 +17839,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17844,17 +17905,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17907,8 +17971,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17972,17 +18037,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18035,8 +18103,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18098,18 +18167,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18165,8 +18236,9 @@ def test_get_project_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18234,18 +18306,20 @@ def test_get_project_settings_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_get_project_settings" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_get_project_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_get_project_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_get_project_settings" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_get_project_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_get_project_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18298,8 +18372,9 @@ def test_update_project_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18438,18 +18513,20 @@ def test_update_project_settings_rest_interceptors(null_interceptor): ) client = ArtifactRegistryClient(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.ArtifactRegistryRestInterceptor, "post_update_project_settings" - ) as post, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, - "post_update_project_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ArtifactRegistryRestInterceptor, "pre_update_project_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "post_update_project_settings" + ) as post, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, + "post_update_project_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ArtifactRegistryRestInterceptor, "pre_update_project_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18502,8 +18579,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18562,8 +18640,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -19237,11 +19316,14 @@ def test_artifact_registry_base_transport(): def test_artifact_registry_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.artifactregistry_v1beta2.services.artifact_registry.transports.ArtifactRegistryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.artifactregistry_v1beta2.services.artifact_registry.transports.ArtifactRegistryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ArtifactRegistryTransport( @@ -19261,9 +19343,12 @@ def test_artifact_registry_base_transport_with_credentials_file(): def test_artifact_registry_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.artifactregistry_v1beta2.services.artifact_registry.transports.ArtifactRegistryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.artifactregistry_v1beta2.services.artifact_registry.transports.ArtifactRegistryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ArtifactRegistryTransport() @@ -19341,11 +19426,12 @@ def test_artifact_registry_transport_auth_gdch_credentials(transport_class): def test_artifact_registry_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-asset/docs/conf.py b/packages/google-cloud-asset/docs/conf.py index f78a78551387..c71b29074de6 100644 --- a/packages/google-cloud-asset/docs/conf.py +++ b/packages/google-cloud-asset/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-asset documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1/__init__.py index 4995dd9ee511..b3d2b7bb144c 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.asset_service import AssetServiceAsyncClient, AssetServiceClient from .types.asset_enrichment_resourceowners import ResourceOwners from .types.asset_service import ( diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/async_client.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/async_client.py index 6caa46827b94..c06009e1d67b 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/async_client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.asset_v1.services.asset_service import pagers from google.cloud.asset_v1.types import asset_service, assets @@ -131,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AssetServiceAsyncClient: The constructed client. """ - return AssetServiceClient.from_service_account_info.__func__(AssetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AssetServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AssetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AssetServiceAsyncClient: The constructed client. """ - return AssetServiceClient.from_service_account_file.__func__(AssetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AssetServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AssetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/client.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/client.py index b8ba1e9e2fe0..2814645640b6 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.asset_v1.services.asset_service import pagers from google.cloud.asset_v1.types import asset_service, assets @@ -728,11 +728,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssetServiceClient._read_environment_variables() + ) self._client_cert_source = AssetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -767,8 +765,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/pagers.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/pagers.py index 11261a60e0eb..64466fe1186a 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/pagers.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -769,7 +769,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -851,7 +851,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -935,7 +935,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1021,7 +1021,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1101,7 +1101,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/base.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/base.py index 1e84a3aa5fa9..c3826a96437a 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/base.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.asset_v1 import gapic_version as package_version from google.cloud.asset_v1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc.py index 79af106f4ac6..7c7e10a8342f 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.asset_v1.types import asset_service @@ -696,12 +696,12 @@ def analyze_iam_policy_longrunning( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "analyze_iam_policy_longrunning" not in self._stubs: - self._stubs[ - "analyze_iam_policy_longrunning" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/AnalyzeIamPolicyLongrunning", - request_serializer=asset_service.AnalyzeIamPolicyLongrunningRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["analyze_iam_policy_longrunning"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/AnalyzeIamPolicyLongrunning", + request_serializer=asset_service.AnalyzeIamPolicyLongrunningRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["analyze_iam_policy_longrunning"] @@ -939,12 +939,12 @@ def batch_get_effective_iam_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_effective_iam_policies" not in self._stubs: - self._stubs[ - "batch_get_effective_iam_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/BatchGetEffectiveIamPolicies", - request_serializer=asset_service.BatchGetEffectiveIamPoliciesRequest.serialize, - response_deserializer=asset_service.BatchGetEffectiveIamPoliciesResponse.deserialize, + self._stubs["batch_get_effective_iam_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/BatchGetEffectiveIamPolicies", + request_serializer=asset_service.BatchGetEffectiveIamPoliciesRequest.serialize, + response_deserializer=asset_service.BatchGetEffectiveIamPoliciesResponse.deserialize, + ) ) return self._stubs["batch_get_effective_iam_policies"] @@ -1001,12 +1001,12 @@ def analyze_org_policy_governed_containers( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "analyze_org_policy_governed_containers" not in self._stubs: - self._stubs[ - "analyze_org_policy_governed_containers" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedContainers", - request_serializer=asset_service.AnalyzeOrgPolicyGovernedContainersRequest.serialize, - response_deserializer=asset_service.AnalyzeOrgPolicyGovernedContainersResponse.deserialize, + self._stubs["analyze_org_policy_governed_containers"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedContainers", + request_serializer=asset_service.AnalyzeOrgPolicyGovernedContainersRequest.serialize, + response_deserializer=asset_service.AnalyzeOrgPolicyGovernedContainersResponse.deserialize, + ) ) return self._stubs["analyze_org_policy_governed_containers"] @@ -1082,12 +1082,12 @@ def analyze_org_policy_governed_assets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "analyze_org_policy_governed_assets" not in self._stubs: - self._stubs[ - "analyze_org_policy_governed_assets" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedAssets", - request_serializer=asset_service.AnalyzeOrgPolicyGovernedAssetsRequest.serialize, - response_deserializer=asset_service.AnalyzeOrgPolicyGovernedAssetsResponse.deserialize, + self._stubs["analyze_org_policy_governed_assets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedAssets", + request_serializer=asset_service.AnalyzeOrgPolicyGovernedAssetsRequest.serialize, + response_deserializer=asset_service.AnalyzeOrgPolicyGovernedAssetsResponse.deserialize, + ) ) return self._stubs["analyze_org_policy_governed_assets"] diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc_asyncio.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc_asyncio.py index 95cf373f261f..9b59dfa7cfd8 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.asset_v1.types import asset_service @@ -714,12 +714,12 @@ def analyze_iam_policy_longrunning( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "analyze_iam_policy_longrunning" not in self._stubs: - self._stubs[ - "analyze_iam_policy_longrunning" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/AnalyzeIamPolicyLongrunning", - request_serializer=asset_service.AnalyzeIamPolicyLongrunningRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["analyze_iam_policy_longrunning"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/AnalyzeIamPolicyLongrunning", + request_serializer=asset_service.AnalyzeIamPolicyLongrunningRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["analyze_iam_policy_longrunning"] @@ -964,12 +964,12 @@ def batch_get_effective_iam_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_effective_iam_policies" not in self._stubs: - self._stubs[ - "batch_get_effective_iam_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/BatchGetEffectiveIamPolicies", - request_serializer=asset_service.BatchGetEffectiveIamPoliciesRequest.serialize, - response_deserializer=asset_service.BatchGetEffectiveIamPoliciesResponse.deserialize, + self._stubs["batch_get_effective_iam_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/BatchGetEffectiveIamPolicies", + request_serializer=asset_service.BatchGetEffectiveIamPoliciesRequest.serialize, + response_deserializer=asset_service.BatchGetEffectiveIamPoliciesResponse.deserialize, + ) ) return self._stubs["batch_get_effective_iam_policies"] @@ -1026,12 +1026,12 @@ def analyze_org_policy_governed_containers( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "analyze_org_policy_governed_containers" not in self._stubs: - self._stubs[ - "analyze_org_policy_governed_containers" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedContainers", - request_serializer=asset_service.AnalyzeOrgPolicyGovernedContainersRequest.serialize, - response_deserializer=asset_service.AnalyzeOrgPolicyGovernedContainersResponse.deserialize, + self._stubs["analyze_org_policy_governed_containers"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedContainers", + request_serializer=asset_service.AnalyzeOrgPolicyGovernedContainersRequest.serialize, + response_deserializer=asset_service.AnalyzeOrgPolicyGovernedContainersResponse.deserialize, + ) ) return self._stubs["analyze_org_policy_governed_containers"] @@ -1107,12 +1107,12 @@ def analyze_org_policy_governed_assets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "analyze_org_policy_governed_assets" not in self._stubs: - self._stubs[ - "analyze_org_policy_governed_assets" - ] = self._logged_channel.unary_unary( - "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedAssets", - request_serializer=asset_service.AnalyzeOrgPolicyGovernedAssetsRequest.serialize, - response_deserializer=asset_service.AnalyzeOrgPolicyGovernedAssetsResponse.deserialize, + self._stubs["analyze_org_policy_governed_assets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.asset.v1.AssetService/AnalyzeOrgPolicyGovernedAssets", + request_serializer=asset_service.AnalyzeOrgPolicyGovernedAssetsRequest.serialize, + response_deserializer=asset_service.AnalyzeOrgPolicyGovernedAssetsResponse.deserialize, + ) ) return self._stubs["analyze_org_policy_governed_assets"] diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest.py index 45f1b5d7fca5..f0d585eb84e5 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1681,9 +1681,7 @@ def __call__( """ - http_options = ( - _BaseAssetServiceRestTransport._BaseAnalyzeIamPolicyLongrunning._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseAnalyzeIamPolicyLongrunning._get_http_options() request, metadata = self._interceptor.pre_analyze_iam_policy_longrunning( request, metadata @@ -1709,7 +1707,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1752,11 +1750,10 @@ def __call__( resp = self._interceptor.post_analyze_iam_policy_longrunning(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_analyze_iam_policy_longrunning_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_analyze_iam_policy_longrunning_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1991,9 +1988,7 @@ def __call__( """ - http_options = ( - _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicies._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicies._get_http_options() request, metadata = self._interceptor.pre_analyze_org_policies( request, metadata @@ -2144,15 +2139,12 @@ def __call__( """ - http_options = ( - _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicyGovernedAssets._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicyGovernedAssets._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_analyze_org_policy_governed_assets( - request, metadata + request, metadata = ( + self._interceptor.pre_analyze_org_policy_governed_assets( + request, metadata + ) ) transcoded_request = _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicyGovernedAssets._get_transcoded_request( http_options, request @@ -2215,11 +2207,10 @@ def __call__( resp = self._interceptor.post_analyze_org_policy_governed_assets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_analyze_org_policy_governed_assets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_analyze_org_policy_governed_assets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2307,15 +2298,12 @@ def __call__( """ - http_options = ( - _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicyGovernedContainers._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicyGovernedContainers._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_analyze_org_policy_governed_containers( - request, metadata + request, metadata = ( + self._interceptor.pre_analyze_org_policy_governed_containers( + request, metadata + ) ) transcoded_request = _BaseAssetServiceRestTransport._BaseAnalyzeOrgPolicyGovernedContainers._get_transcoded_request( http_options, request @@ -2376,11 +2364,10 @@ def __call__( resp = self._interceptor.post_analyze_org_policy_governed_containers(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_analyze_org_policy_governed_containers_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_analyze_org_policy_governed_containers_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2461,9 +2448,7 @@ def __call__( Batch get assets history response. """ - http_options = ( - _BaseAssetServiceRestTransport._BaseBatchGetAssetsHistory._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseBatchGetAssetsHistory._get_http_options() request, metadata = self._interceptor.pre_batch_get_assets_history( request, metadata @@ -2614,9 +2599,7 @@ def __call__( """ - http_options = ( - _BaseAssetServiceRestTransport._BaseBatchGetEffectiveIamPolicies._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseBatchGetEffectiveIamPolicies._get_http_options() request, metadata = self._interceptor.pre_batch_get_effective_iam_policies( request, metadata @@ -2682,11 +2665,10 @@ def __call__( resp = self._interceptor.post_batch_get_effective_iam_policies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_batch_get_effective_iam_policies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_batch_get_effective_iam_policies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3109,7 +3091,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3217,7 +3199,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3339,7 +3321,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4364,9 +4346,7 @@ def __call__( Search all IAM policies response. """ - http_options = ( - _BaseAssetServiceRestTransport._BaseSearchAllIamPolicies._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseSearchAllIamPolicies._get_http_options() request, metadata = self._interceptor.pre_search_all_iam_policies( request, metadata @@ -4512,9 +4492,7 @@ def __call__( Search all resources response. """ - http_options = ( - _BaseAssetServiceRestTransport._BaseSearchAllResources._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseSearchAllResources._get_http_options() request, metadata = self._interceptor.pre_search_all_resources( request, metadata @@ -4942,7 +4920,9 @@ def analyze_iam_policy_longrunning( ]: # 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._AnalyzeIamPolicyLongrunning(self._session, self._host, self._interceptor) # type: ignore + return self._AnalyzeIamPolicyLongrunning( + self._session, self._host, self._interceptor + ) # type: ignore @property def analyze_move( @@ -4974,7 +4954,9 @@ def analyze_org_policy_governed_assets( ]: # 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._AnalyzeOrgPolicyGovernedAssets(self._session, self._host, self._interceptor) # type: ignore + return self._AnalyzeOrgPolicyGovernedAssets( + self._session, self._host, self._interceptor + ) # type: ignore @property def analyze_org_policy_governed_containers( @@ -4985,7 +4967,9 @@ def analyze_org_policy_governed_containers( ]: # 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._AnalyzeOrgPolicyGovernedContainers(self._session, self._host, self._interceptor) # type: ignore + return self._AnalyzeOrgPolicyGovernedContainers( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_get_assets_history( @@ -5007,7 +4991,9 @@ def batch_get_effective_iam_policies( ]: # 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._BatchGetEffectiveIamPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetEffectiveIamPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_feed( diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest_base.py b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest_base.py index f0306667e7b5..33b72d66dfb6 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest_base.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/services/asset_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.asset_v1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/types/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1/types/__init__.py index d9f3fdd63167..fb95d771c1e4 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/types/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .asset_enrichment_resourceowners import ResourceOwners +from .asset_enrichment_resourceowners import ( + ResourceOwners, +) from .asset_service import ( AnalyzeIamPolicyLongrunningMetadata, AnalyzeIamPolicyLongrunningRequest, diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/types/asset_service.py b/packages/google-cloud-asset/google/cloud/asset_v1/types/asset_service.py index 041fb4f0f133..00710e016331 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/types/asset_service.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/types/asset_service.py @@ -17,13 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore import proto # type: ignore from google.cloud.asset_v1.types import assets as gca_assets @@ -116,6 +116,7 @@ class ContentType(proto.Enum): RELATIONSHIP (7): The related resources. """ + CONTENT_TYPE_UNSPECIFIED = 0 RESOURCE = 1 IAM_POLICY = 2 @@ -910,6 +911,7 @@ class PartitionKey(proto.Enum): additional timestamp column representing when the request was received. """ + PARTITION_KEY_UNSPECIFIED = 0 READ_TIME = 1 REQUEST_TIME = 2 @@ -1888,23 +1890,23 @@ class IamPolicyAnalysis(proto.Message): number=1, message="IamPolicyAnalysisQuery", ) - analysis_results: MutableSequence[ - gca_assets.IamPolicyAnalysisResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=gca_assets.IamPolicyAnalysisResult, + analysis_results: MutableSequence[gca_assets.IamPolicyAnalysisResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=gca_assets.IamPolicyAnalysisResult, + ) ) fully_explored: bool = proto.Field( proto.BOOL, number=3, ) - non_critical_errors: MutableSequence[ - gca_assets.IamPolicyAnalysisState - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gca_assets.IamPolicyAnalysisState, + non_critical_errors: MutableSequence[gca_assets.IamPolicyAnalysisState] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gca_assets.IamPolicyAnalysisState, + ) ) main_analysis: IamPolicyAnalysis = proto.Field( @@ -1912,12 +1914,12 @@ class IamPolicyAnalysis(proto.Message): number=1, message=IamPolicyAnalysis, ) - service_account_impersonation_analysis: MutableSequence[ - IamPolicyAnalysis - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=IamPolicyAnalysis, + service_account_impersonation_analysis: MutableSequence[IamPolicyAnalysis] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=IamPolicyAnalysis, + ) ) fully_explored: bool = proto.Field( proto.BOOL, @@ -2032,6 +2034,7 @@ class PartitionKey(proto.Enum): additional timestamp column representing when the request was received. """ + PARTITION_KEY_UNSPECIFIED = 0 REQUEST_TIME = 1 @@ -2448,6 +2451,7 @@ class AnalysisView(proto.Enum): will prevent the specified resource move at runtime. """ + ANALYSIS_VIEW_UNSPECIFIED = 0 FULL = 1 BASIC = 2 @@ -3320,6 +3324,7 @@ class ConstraintDefault(proto.Enum): constraints. Indicate that enforcement is on for boolean constraints. """ + CONSTRAINT_DEFAULT_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -3452,6 +3457,7 @@ class MethodType(proto.Enum): Constraint applied when enforcing forced tagging. """ + METHOD_TYPE_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 @@ -3470,6 +3476,7 @@ class ActionType(proto.Enum): DENY (2): Deny action type. """ + ACTION_TYPE_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -3849,12 +3856,12 @@ class GovernedContainer(proto.Message): proto.STRING, number=7, ) - effective_tags: MutableSequence[ - gca_assets.EffectiveTagDetails - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message=gca_assets.EffectiveTagDetails, + effective_tags: MutableSequence[gca_assets.EffectiveTagDetails] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message=gca_assets.EffectiveTagDetails, + ) ) @property @@ -4045,12 +4052,12 @@ class GovernedResource(proto.Message): proto.STRING, number=8, ) - effective_tags: MutableSequence[ - gca_assets.EffectiveTagDetails - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message=gca_assets.EffectiveTagDetails, + effective_tags: MutableSequence[gca_assets.EffectiveTagDetails] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message=gca_assets.EffectiveTagDetails, + ) ) class GovernedIamPolicy(proto.Message): diff --git a/packages/google-cloud-asset/google/cloud/asset_v1/types/assets.py b/packages/google-cloud-asset/google/cloud/asset_v1/types/assets.py index a0187cf9218f..8b563a6e78f4 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1/types/assets.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1/types/assets.py @@ -17,18 +17,16 @@ from typing import MutableMapping, MutableSequence -from google.cloud.orgpolicy.v1 import orgpolicy_pb2 # type: ignore -from google.cloud.osconfig_v1.types import inventory -from google.iam.v1 import policy_pb2 # type: ignore -from google.identity.accesscontextmanager.v1 import access_level_pb2 # type: ignore -from google.identity.accesscontextmanager.v1 import access_policy_pb2 # type: ignore -from google.identity.accesscontextmanager.v1 import ( - service_perimeter_pb2, -) # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import code_pb2 # type: ignore +import google.cloud.orgpolicy.v1.orgpolicy_pb2 as orgpolicy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.identity.accesscontextmanager.v1.access_level_pb2 as access_level_pb2 # type: ignore +import google.identity.accesscontextmanager.v1.access_policy_pb2 as access_policy_pb2 # type: ignore +import google.identity.accesscontextmanager.v1.service_perimeter_pb2 as service_perimeter_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore import proto # type: ignore +from google.cloud.osconfig_v1.types import inventory from google.cloud.asset_v1.types import asset_enrichment_resourceowners @@ -94,6 +92,7 @@ class PriorAssetState(proto.Enum): DELETED (4): prior_asset is a deletion. """ + PRIOR_ASSET_STATE_UNSPECIFIED = 0 PRESENT = 1 INVALID = 2 @@ -1462,6 +1461,7 @@ class EvaluationValue(proto.Enum): expression contains variables that are either missing input values or have not been supported by Policy Analyzer yet. """ + EVALUATION_VALUE_UNSPECIFIED = 0 TRUE = 1 FALSE = 2 @@ -1664,26 +1664,26 @@ class AccessControlList(proto.Message): defined in the above IAM policy binding. """ - resources: MutableSequence[ - "IamPolicyAnalysisResult.Resource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="IamPolicyAnalysisResult.Resource", + resources: MutableSequence["IamPolicyAnalysisResult.Resource"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="IamPolicyAnalysisResult.Resource", + ) ) - accesses: MutableSequence[ - "IamPolicyAnalysisResult.Access" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="IamPolicyAnalysisResult.Access", + accesses: MutableSequence["IamPolicyAnalysisResult.Access"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="IamPolicyAnalysisResult.Access", + ) ) - resource_edges: MutableSequence[ - "IamPolicyAnalysisResult.Edge" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="IamPolicyAnalysisResult.Edge", + resource_edges: MutableSequence["IamPolicyAnalysisResult.Edge"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="IamPolicyAnalysisResult.Edge", + ) ) condition_evaluation: "ConditionEvaluation" = proto.Field( proto.MESSAGE, @@ -1716,19 +1716,19 @@ class IdentityList(proto.Message): enabled in request. """ - identities: MutableSequence[ - "IamPolicyAnalysisResult.Identity" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="IamPolicyAnalysisResult.Identity", + identities: MutableSequence["IamPolicyAnalysisResult.Identity"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="IamPolicyAnalysisResult.Identity", + ) ) - group_edges: MutableSequence[ - "IamPolicyAnalysisResult.Edge" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="IamPolicyAnalysisResult.Edge", + group_edges: MutableSequence["IamPolicyAnalysisResult.Edge"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="IamPolicyAnalysisResult.Edge", + ) ) attached_resource_full_name: str = proto.Field( diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/__init__.py index 99992ac8cf50..ebce73f7e3cc 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.asset_service import AssetServiceAsyncClient, AssetServiceClient from .types.asset_service import ( SearchAllIamPoliciesRequest, diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/async_client.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/async_client.py index fb31e1fece9d..3352baeddc7d 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/async_client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p1beta1 import gapic_version as package_version @@ -109,7 +109,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AssetServiceAsyncClient: The constructed client. """ - return AssetServiceClient.from_service_account_info.__func__(AssetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AssetServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AssetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -125,7 +126,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AssetServiceAsyncClient: The constructed client. """ - return AssetServiceClient.from_service_account_file.__func__(AssetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AssetServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AssetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/client.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/client.py index c02fc5d08e10..f1bd3462d456 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p1beta1 import gapic_version as package_version @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssetServiceClient._read_environment_variables() + ) self._client_cert_source = AssetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/pagers.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/pagers.py index 794991b335cd..f5ea1427874e 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/pagers.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/base.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/base.py index 3a1ff3286d43..4aa7f5eb2218 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/base.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p1beta1 import gapic_version as package_version from google.cloud.asset_v1p1beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc.py index 19db61926711..405253354d25 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.asset_v1p1beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc_asyncio.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc_asyncio.py index 873556d87fdd..3f90e3808b0e 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.asset_v1p1beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/rest.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/rest.py index d49a55304d0e..e12c8535d5c1 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/rest.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/services/asset_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -340,9 +340,7 @@ def __call__( Search all IAM policies response. """ - http_options = ( - _BaseAssetServiceRestTransport._BaseSearchAllIamPolicies._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseSearchAllIamPolicies._get_http_options() request, metadata = self._interceptor.pre_search_all_iam_policies( request, metadata @@ -488,9 +486,7 @@ def __call__( Search all resources response. """ - http_options = ( - _BaseAssetServiceRestTransport._BaseSearchAllResources._get_http_options() - ) + http_options = _BaseAssetServiceRestTransport._BaseSearchAllResources._get_http_options() request, metadata = self._interceptor.pre_search_all_resources( request, metadata diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/__init__.py index 32139b2fe719..4bd7d9b700fe 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/__init__.py @@ -19,7 +19,11 @@ SearchAllResourcesRequest, SearchAllResourcesResponse, ) -from .assets import IamPolicySearchResult, Permissions, StandardResourceMetadata +from .assets import ( + IamPolicySearchResult, + Permissions, + StandardResourceMetadata, +) __all__ = ( "SearchAllIamPoliciesRequest", diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/assets.py b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/assets.py index db9d9bf425ec..500be4611732 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/assets.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p1beta1/types/assets.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.iam.v1 import policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/__init__.py index b3d9931985c7..a80a31de72b9 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.asset_service import AssetServiceAsyncClient, AssetServiceClient from .types.asset_service import ( BatchGetAssetsHistoryResponse, diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/async_client.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/async_client.py index c28656f2de34..ca2711a785de 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/async_client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p2beta1 import gapic_version as package_version @@ -110,7 +110,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AssetServiceAsyncClient: The constructed client. """ - return AssetServiceClient.from_service_account_info.__func__(AssetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AssetServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AssetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -126,7 +127,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AssetServiceAsyncClient: The constructed client. """ - return AssetServiceClient.from_service_account_file.__func__(AssetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AssetServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AssetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/client.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/client.py index 1ce7f9d4e921..8aa79db182a2 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p2beta1 import gapic_version as package_version @@ -614,11 +614,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssetServiceClient._read_environment_variables() + ) self._client_cert_source = AssetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -653,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/base.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/base.py index 29a714f11667..abd76ca51760 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/base.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.asset_v1p2beta1 import gapic_version as package_version from google.cloud.asset_v1p2beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc.py index 8045826db8e9..c2d683faedf7 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.asset_v1p2beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc_asyncio.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc_asyncio.py index 4edd1852f339..c0f1fbdf4bf5 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.asset_v1p2beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest.py index ea44203f35a7..4205a2f9b850 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -667,7 +667,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest_base.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest_base.py index 03ffecb45c46..d9bc77956940 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest_base.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/services/asset_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.asset_v1p2beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/__init__.py index 08b5c0fd84d1..7135c43325e5 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/__init__.py @@ -29,7 +29,12 @@ PubsubDestination, UpdateFeedRequest, ) -from .assets import Asset, Resource, TemporalAsset, TimeWindow +from .assets import ( + Asset, + Resource, + TemporalAsset, + TimeWindow, +) __all__ = ( "BatchGetAssetsHistoryResponse", diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/asset_service.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/asset_service.py index 0fc20c93b025..8d9887ba8d0a 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/asset_service.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/asset_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.asset_v1p2beta1.types import assets as gca_assets @@ -55,6 +55,7 @@ class ContentType(proto.Enum): IAM_POLICY (2): The actual IAM policy set on a resource. """ + CONTENT_TYPE_UNSPECIFIED = 0 RESOURCE = 1 IAM_POLICY = 2 diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/assets.py b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/assets.py index 46d85747e952..f7ee9f5bc690 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/assets.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p2beta1/types/assets.py @@ -17,15 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.cloud.orgpolicy.v1 import orgpolicy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.identity.accesscontextmanager.v1 import access_level_pb2 # type: ignore -from google.identity.accesscontextmanager.v1 import access_policy_pb2 # type: ignore -from google.identity.accesscontextmanager.v1 import ( - service_perimeter_pb2, -) # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.cloud.orgpolicy.v1.orgpolicy_pb2 as orgpolicy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.identity.accesscontextmanager.v1.access_level_pb2 as access_level_pb2 # type: ignore +import google.identity.accesscontextmanager.v1.access_policy_pb2 as access_policy_pb2 # type: ignore +import google.identity.accesscontextmanager.v1.service_perimeter_pb2 as service_perimeter_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/__init__.py index f15dc513e448..07ae62e4452e 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.asset_service import AssetServiceAsyncClient, AssetServiceClient from .types.asset_service import ContentType, ListAssetsRequest, ListAssetsResponse from .types.assets import Asset, Resource diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/async_client.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/async_client.py index 636ef197b0de..7fd40b6968a2 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/async_client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p5beta1 import gapic_version as package_version @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AssetServiceAsyncClient: The constructed client. """ - return AssetServiceClient.from_service_account_info.__func__(AssetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AssetServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AssetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AssetServiceAsyncClient: The constructed client. """ - return AssetServiceClient.from_service_account_file.__func__(AssetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AssetServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AssetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/client.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/client.py index 56a9ab9cee35..c0a8e80e8c68 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/client.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p5beta1 import gapic_version as package_version @@ -664,11 +664,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssetServiceClient._read_environment_variables() + ) self._client_cert_source = AssetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -703,8 +701,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/pagers.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/pagers.py index 92b63c63b745..db4ac60eb4c3 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/pagers.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/base.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/base.py index d274566c2dd8..ba975f3cabfe 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/base.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.asset_v1p5beta1 import gapic_version as package_version from google.cloud.asset_v1p5beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc.py index 496fdc18f57c..35d8a1eae0c2 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.asset_v1p5beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc_asyncio.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc_asyncio.py index 637952b8848e..c44a3cfe9a66 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.asset_v1p5beta1.types import asset_service diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/rest.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/rest.py index ae012e2e78ee..9b89535fd329 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/rest.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/services/asset_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/__init__.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/__init__.py index fc6776b028fe..cb53450feaa3 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/__init__.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/__init__.py @@ -13,8 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .asset_service import ContentType, ListAssetsRequest, ListAssetsResponse -from .assets import Asset, Resource +from .asset_service import ( + ContentType, + ListAssetsRequest, + ListAssetsResponse, +) +from .assets import ( + Asset, + Resource, +) __all__ = ( "ListAssetsRequest", diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/asset_service.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/asset_service.py index 834ca84c9657..1370c584ea5b 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/asset_service.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/asset_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.asset_v1p5beta1.types import assets as gca_assets @@ -48,6 +48,7 @@ class ContentType(proto.Enum): The Access Context Manager policy set on an asset. """ + CONTENT_TYPE_UNSPECIFIED = 0 RESOURCE = 1 IAM_POLICY = 2 diff --git a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/assets.py b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/assets.py index 8cbdb62359c8..84f5e9720ad3 100644 --- a/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/assets.py +++ b/packages/google-cloud-asset/google/cloud/asset_v1p5beta1/types/assets.py @@ -17,14 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.cloud.orgpolicy.v1 import orgpolicy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.identity.accesscontextmanager.v1 import access_level_pb2 # type: ignore -from google.identity.accesscontextmanager.v1 import access_policy_pb2 # type: ignore -from google.identity.accesscontextmanager.v1 import ( - service_perimeter_pb2, -) # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.cloud.orgpolicy.v1.orgpolicy_pb2 as orgpolicy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.identity.accesscontextmanager.v1.access_level_pb2 as access_level_pb2 # type: ignore +import google.identity.accesscontextmanager.v1.access_policy_pb2 as access_policy_pb2 # type: ignore +import google.identity.accesscontextmanager.v1.service_perimeter_pb2 as service_perimeter_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-asset/noxfile.py b/packages/google-cloud-asset/noxfile.py index 4ab620d50577..5a36c39832b1 100644 --- a/packages/google-cloud-asset/noxfile.py +++ b/packages/google-cloud-asset/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-asset/tests/unit/gapic/asset_v1/test_asset_service.py b/packages/google-cloud-asset/tests/unit/gapic/asset_v1/test_asset_service.py index b2a9cadb3b24..447e6339c082 100644 --- a/packages/google-cloud-asset/tests/unit/gapic/asset_v1/test_asset_service.py +++ b/packages/google-cloud-asset/tests/unit/gapic/asset_v1/test_asset_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +60,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.asset_v1.services.asset_service import ( AssetServiceAsyncClient, @@ -941,10 +941,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1270,13 +1267,13 @@ def test_asset_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4037,9 +4034,9 @@ def test_search_all_resources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_all_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_all_resources] = ( + mock_rpc + ) request = {} client.search_all_resources(request) @@ -5162,9 +5159,9 @@ def test_analyze_iam_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_iam_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_iam_policy] = ( + mock_rpc + ) request = {} client.analyze_iam_policy(request) @@ -6174,9 +6171,9 @@ def test_create_saved_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_saved_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_saved_query] = ( + mock_rpc + ) request = {} client.create_saved_query(request) @@ -6880,9 +6877,9 @@ def test_list_saved_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_saved_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_saved_queries] = ( + mock_rpc + ) request = {} client.list_saved_queries(request) @@ -7425,9 +7422,9 @@ def test_update_saved_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_saved_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_saved_query] = ( + mock_rpc + ) request = {} client.update_saved_query(request) @@ -7779,9 +7776,9 @@ def test_delete_saved_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_saved_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_saved_query] = ( + mock_rpc + ) request = {} client.delete_saved_query(request) @@ -8368,9 +8365,9 @@ def test_analyze_org_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_org_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_org_policies] = ( + mock_rpc + ) request = {} client.analyze_org_policies(request) @@ -11453,9 +11450,9 @@ def test_search_all_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_all_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_all_resources] = ( + mock_rpc + ) request = {} client.search_all_resources(request) @@ -11990,9 +11987,9 @@ def test_analyze_iam_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_iam_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_iam_policy] = ( + mock_rpc + ) request = {} client.analyze_iam_policy(request) @@ -12532,9 +12529,9 @@ def test_create_saved_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_saved_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_saved_query] = ( + mock_rpc + ) request = {} client.create_saved_query(request) @@ -12917,9 +12914,9 @@ def test_list_saved_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_saved_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_saved_queries] = ( + mock_rpc + ) request = {} client.list_saved_queries(request) @@ -13177,9 +13174,9 @@ def test_update_saved_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_saved_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_saved_query] = ( + mock_rpc + ) request = {} client.update_saved_query(request) @@ -13368,9 +13365,9 @@ def test_delete_saved_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_saved_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_saved_query] = ( + mock_rpc + ) request = {} client.delete_saved_query(request) @@ -13695,9 +13692,9 @@ def test_analyze_org_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_org_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_org_policies] = ( + mock_rpc + ) request = {} client.analyze_org_policies(request) @@ -15863,8 +15860,9 @@ def test_export_assets_rest_bad_request(request_type=asset_service.ExportAssetsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15921,19 +15919,20 @@ def test_export_assets_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_export_assets" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_export_assets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_export_assets" - ) as pre: + 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.AssetServiceRestInterceptor, "post_export_assets" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_export_assets_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_export_assets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15984,8 +15983,9 @@ def test_list_assets_rest_bad_request(request_type=asset_service.ListAssetsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16048,17 +16048,19 @@ def test_list_assets_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_list_assets" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_list_assets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_list_assets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_list_assets" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_list_assets_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_list_assets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16113,8 +16115,9 @@ def test_batch_get_assets_history_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16174,18 +16177,20 @@ def test_batch_get_assets_history_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_batch_get_assets_history" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, - "post_batch_get_assets_history_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_batch_get_assets_history" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_batch_get_assets_history" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_batch_get_assets_history_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_batch_get_assets_history" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16241,8 +16246,9 @@ def test_create_feed_rest_bad_request(request_type=asset_service.CreateFeedReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16313,17 +16319,19 @@ def test_create_feed_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_create_feed" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_create_feed_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_create_feed" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_create_feed" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_create_feed_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_create_feed" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16374,8 +16382,9 @@ def test_get_feed_rest_bad_request(request_type=asset_service.GetFeedRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16446,17 +16455,19 @@ def test_get_feed_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_get_feed" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_get_feed_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_get_feed" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_get_feed" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_get_feed_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_get_feed" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16505,8 +16516,9 @@ def test_list_feeds_rest_bad_request(request_type=asset_service.ListFeedsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16566,17 +16578,19 @@ def test_list_feeds_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_list_feeds" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_list_feeds_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_list_feeds" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_list_feeds" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_list_feeds_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_list_feeds" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16627,8 +16641,9 @@ def test_update_feed_rest_bad_request(request_type=asset_service.UpdateFeedReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16699,17 +16714,19 @@ def test_update_feed_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_update_feed" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_update_feed_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_update_feed" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_update_feed" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_update_feed_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_update_feed" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16760,8 +16777,9 @@ def test_delete_feed_rest_bad_request(request_type=asset_service.DeleteFeedReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16818,13 +16836,13 @@ def test_delete_feed_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "pre_delete_feed" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_delete_feed" + ) as pre, + ): pre.assert_not_called() pb_message = asset_service.DeleteFeedRequest.pb( asset_service.DeleteFeedRequest() @@ -16869,8 +16887,9 @@ def test_search_all_resources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16933,18 +16952,20 @@ def test_search_all_resources_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_search_all_resources" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, - "post_search_all_resources_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_search_all_resources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_search_all_resources" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_search_all_resources_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_search_all_resources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17002,8 +17023,9 @@ def test_search_all_iam_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17066,18 +17088,20 @@ def test_search_all_iam_policies_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_search_all_iam_policies" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, - "post_search_all_iam_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_search_all_iam_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_search_all_iam_policies" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_search_all_iam_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_search_all_iam_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17135,8 +17159,9 @@ def test_analyze_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17199,17 +17224,20 @@ def test_analyze_iam_policy_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_analyze_iam_policy" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_analyze_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_analyze_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_analyze_iam_policy" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_analyze_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_analyze_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17267,8 +17295,9 @@ def test_analyze_iam_policy_longrunning_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17325,20 +17354,22 @@ def test_analyze_iam_policy_longrunning_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_analyze_iam_policy_longrunning" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, - "post_analyze_iam_policy_longrunning_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_analyze_iam_policy_longrunning" - ) as pre: + 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.AssetServiceRestInterceptor, + "post_analyze_iam_policy_longrunning", + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_analyze_iam_policy_longrunning_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_analyze_iam_policy_longrunning" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17389,8 +17420,9 @@ def test_analyze_move_rest_bad_request(request_type=asset_service.AnalyzeMoveReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17450,17 +17482,19 @@ def test_analyze_move_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_analyze_move" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_analyze_move_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_analyze_move" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_analyze_move" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_analyze_move_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_analyze_move" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17513,8 +17547,9 @@ def test_query_assets_rest_bad_request(request_type=asset_service.QueryAssetsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17579,17 +17614,19 @@ def test_query_assets_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_query_assets" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_query_assets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_query_assets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_query_assets" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_query_assets_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_query_assets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17644,8 +17681,9 @@ def test_create_saved_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17810,17 +17848,20 @@ def test_create_saved_query_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_create_saved_query" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_create_saved_query_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_create_saved_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_create_saved_query" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_create_saved_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_create_saved_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17873,8 +17914,9 @@ def test_get_saved_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17943,17 +17985,19 @@ def test_get_saved_query_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_get_saved_query" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_get_saved_query_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_get_saved_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_get_saved_query" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_get_saved_query_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_get_saved_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18006,8 +18050,9 @@ def test_list_saved_queries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18070,17 +18115,20 @@ def test_list_saved_queries_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_list_saved_queries" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_list_saved_queries_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_list_saved_queries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_list_saved_queries" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_list_saved_queries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_list_saved_queries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18138,8 +18186,9 @@ def test_update_saved_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18304,17 +18353,20 @@ def test_update_saved_query_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_update_saved_query" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_update_saved_query_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_update_saved_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_update_saved_query" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_update_saved_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_update_saved_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18367,8 +18419,9 @@ def test_delete_saved_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18425,13 +18478,13 @@ def test_delete_saved_query_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "pre_delete_saved_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_delete_saved_query" + ) as pre, + ): pre.assert_not_called() pb_message = asset_service.DeleteSavedQueryRequest.pb( asset_service.DeleteSavedQueryRequest() @@ -18476,8 +18529,9 @@ def test_batch_get_effective_iam_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18539,18 +18593,22 @@ def test_batch_get_effective_iam_policies_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_batch_get_effective_iam_policies" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, - "post_batch_get_effective_iam_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_batch_get_effective_iam_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_batch_get_effective_iam_policies", + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_batch_get_effective_iam_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "pre_batch_get_effective_iam_policies", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18608,8 +18666,9 @@ def test_analyze_org_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18672,18 +18731,20 @@ def test_analyze_org_policies_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_analyze_org_policies" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, - "post_analyze_org_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_analyze_org_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_analyze_org_policies" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_analyze_org_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_analyze_org_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18741,8 +18802,9 @@ def test_analyze_org_policy_governed_containers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18807,20 +18869,22 @@ def test_analyze_org_policy_governed_containers_rest_interceptors(null_intercept ) client = AssetServiceClient(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.AssetServiceRestInterceptor, - "post_analyze_org_policy_governed_containers", - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, - "post_analyze_org_policy_governed_containers_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, - "pre_analyze_org_policy_governed_containers", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_analyze_org_policy_governed_containers", + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_analyze_org_policy_governed_containers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "pre_analyze_org_policy_governed_containers", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18878,8 +18942,9 @@ def test_analyze_org_policy_governed_assets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18944,19 +19009,22 @@ def test_analyze_org_policy_governed_assets_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, - "post_analyze_org_policy_governed_assets", - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, - "post_analyze_org_policy_governed_assets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_analyze_org_policy_governed_assets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_analyze_org_policy_governed_assets", + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_analyze_org_policy_governed_assets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "pre_analyze_org_policy_governed_assets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19016,8 +19084,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -19656,11 +19725,14 @@ def test_asset_service_base_transport(): def test_asset_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.asset_v1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.asset_v1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssetServiceTransport( @@ -19677,9 +19749,12 @@ def test_asset_service_base_transport_with_credentials_file(): def test_asset_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.asset_v1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.asset_v1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssetServiceTransport() @@ -19751,11 +19826,12 @@ def test_asset_service_transport_auth_gdch_credentials(transport_class): def test_asset_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-asset/tests/unit/gapic/asset_v1p1beta1/test_asset_service.py b/packages/google-cloud-asset/tests/unit/gapic/asset_v1p1beta1/test_asset_service.py index 0cd610334c2e..fc86210281f6 100644 --- a/packages/google-cloud-asset/tests/unit/gapic/asset_v1p1beta1/test_asset_service.py +++ b/packages/google-cloud-asset/tests/unit/gapic/asset_v1p1beta1/test_asset_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -927,10 +932,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1256,13 +1258,13 @@ def test_asset_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1381,9 +1383,9 @@ def test_search_all_resources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_all_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_all_resources] = ( + mock_rpc + ) request = {} client.search_all_resources(request) @@ -2436,9 +2438,9 @@ def test_search_all_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_all_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_all_resources] = ( + mock_rpc + ) request = {} client.search_all_resources(request) @@ -3188,8 +3190,9 @@ def test_search_all_resources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3252,18 +3255,20 @@ def test_search_all_resources_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_search_all_resources" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, - "post_search_all_resources_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_search_all_resources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_search_all_resources" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_search_all_resources_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_search_all_resources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3321,8 +3326,9 @@ def test_search_all_iam_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3385,18 +3391,20 @@ def test_search_all_iam_policies_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_search_all_iam_policies" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, - "post_search_all_iam_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_search_all_iam_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_search_all_iam_policies" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, + "post_search_all_iam_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_search_all_iam_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3548,11 +3556,14 @@ def test_asset_service_base_transport(): def test_asset_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.asset_v1p1beta1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.asset_v1p1beta1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssetServiceTransport( @@ -3569,9 +3580,12 @@ def test_asset_service_base_transport_with_credentials_file(): def test_asset_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.asset_v1p1beta1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.asset_v1p1beta1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssetServiceTransport() @@ -3643,11 +3657,12 @@ def test_asset_service_transport_auth_gdch_credentials(transport_class): def test_asset_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-asset/tests/unit/gapic/asset_v1p2beta1/test_asset_service.py b/packages/google-cloud-asset/tests/unit/gapic/asset_v1p2beta1/test_asset_service.py index dd99acf0a2ec..2ab48cede93c 100644 --- a/packages/google-cloud-asset/tests/unit/gapic/asset_v1p2beta1/test_asset_service.py +++ b/packages/google-cloud-asset/tests/unit/gapic/asset_v1p2beta1/test_asset_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.asset_v1p2beta1.services.asset_service import ( AssetServiceAsyncClient, @@ -927,10 +932,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1256,13 +1258,13 @@ def test_asset_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4161,8 +4163,9 @@ def test_create_feed_rest_bad_request(request_type=asset_service.CreateFeedReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4231,17 +4234,19 @@ def test_create_feed_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_create_feed" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_create_feed_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_create_feed" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_create_feed" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_create_feed_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_create_feed" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4292,8 +4297,9 @@ def test_get_feed_rest_bad_request(request_type=asset_service.GetFeedRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4362,17 +4368,19 @@ def test_get_feed_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_get_feed" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_get_feed_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_get_feed" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_get_feed" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_get_feed_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_get_feed" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4421,8 +4429,9 @@ def test_list_feeds_rest_bad_request(request_type=asset_service.ListFeedsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4482,17 +4491,19 @@ def test_list_feeds_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_list_feeds" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_list_feeds_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_list_feeds" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_list_feeds" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_list_feeds_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_list_feeds" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4543,8 +4554,9 @@ def test_update_feed_rest_bad_request(request_type=asset_service.UpdateFeedReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4613,17 +4625,19 @@ def test_update_feed_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_update_feed" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_update_feed_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_update_feed" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_update_feed" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_update_feed_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_update_feed" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4674,8 +4688,9 @@ def test_delete_feed_rest_bad_request(request_type=asset_service.DeleteFeedReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4732,13 +4747,13 @@ def test_delete_feed_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "pre_delete_feed" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_delete_feed" + ) as pre, + ): pre.assert_not_called() pb_message = asset_service.DeleteFeedRequest.pb( asset_service.DeleteFeedRequest() @@ -4785,8 +4800,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4999,11 +5015,14 @@ def test_asset_service_base_transport(): def test_asset_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.asset_v1p2beta1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.asset_v1p2beta1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssetServiceTransport( @@ -5020,9 +5039,12 @@ def test_asset_service_base_transport_with_credentials_file(): def test_asset_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.asset_v1p2beta1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.asset_v1p2beta1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssetServiceTransport() @@ -5094,11 +5116,12 @@ def test_asset_service_transport_auth_gdch_credentials(transport_class): def test_asset_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-asset/tests/unit/gapic/asset_v1p5beta1/test_asset_service.py b/packages/google-cloud-asset/tests/unit/gapic/asset_v1p5beta1/test_asset_service.py index f938947ad286..ec528dbfb179 100644 --- a/packages/google-cloud-asset/tests/unit/gapic/asset_v1p5beta1/test_asset_service.py +++ b/packages/google-cloud-asset/tests/unit/gapic/asset_v1p5beta1/test_asset_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.asset_v1p5beta1.services.asset_service import ( AssetServiceAsyncClient, @@ -928,10 +933,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +980,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1018,9 @@ def test_asset_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1257,13 +1259,13 @@ def test_asset_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2244,8 +2246,9 @@ def test_list_assets_rest_bad_request(request_type=asset_service.ListAssetsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2308,17 +2311,19 @@ def test_list_assets_rest_interceptors(null_interceptor): ) client = AssetServiceClient(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.AssetServiceRestInterceptor, "post_list_assets" - ) as post, mock.patch.object( - transports.AssetServiceRestInterceptor, "post_list_assets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssetServiceRestInterceptor, "pre_list_assets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_list_assets" + ) as post, + mock.patch.object( + transports.AssetServiceRestInterceptor, "post_list_assets_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AssetServiceRestInterceptor, "pre_list_assets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2440,11 +2445,14 @@ def test_asset_service_base_transport(): def test_asset_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.asset_v1p5beta1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.asset_v1p5beta1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssetServiceTransport( @@ -2461,9 +2469,12 @@ def test_asset_service_base_transport_with_credentials_file(): def test_asset_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.asset_v1p5beta1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.asset_v1p5beta1.services.asset_service.transports.AssetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssetServiceTransport() @@ -2535,11 +2546,12 @@ def test_asset_service_transport_auth_gdch_credentials(transport_class): def test_asset_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-assured-workloads/docs/conf.py b/packages/google-cloud-assured-workloads/docs/conf.py index 21dd5d232793..fd6e04a91440 100644 --- a/packages/google-cloud-assured-workloads/docs/conf.py +++ b/packages/google-cloud-assured-workloads/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-assured-workloads documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/__init__.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/__init__.py index 1619c4a8caad..05121265f1d7 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/__init__.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.assured_workloads_service import ( AssuredWorkloadsServiceAsyncClient, AssuredWorkloadsServiceClient, diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/async_client.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/async_client.py index d23eb4bab039..ab7472af56ce 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/async_client.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.assuredworkloads_v1 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.assuredworkloads_v1.services.assured_workloads_service import pagers from google.cloud.assuredworkloads_v1.types import assuredworkloads @@ -131,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AssuredWorkloadsServiceAsyncClient: The constructed client. """ - return AssuredWorkloadsServiceClient.from_service_account_info.__func__(AssuredWorkloadsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AssuredWorkloadsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AssuredWorkloadsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AssuredWorkloadsServiceAsyncClient: The constructed client. """ - return AssuredWorkloadsServiceClient.from_service_account_file.__func__(AssuredWorkloadsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AssuredWorkloadsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + AssuredWorkloadsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -185,7 +189,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AssuredWorkloadsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AssuredWorkloadsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AssuredWorkloadsServiceTransport: diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/client.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/client.py index 5f4f7efec1d9..65d5b389d99f 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/client.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.assuredworkloads_v1 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.assuredworkloads_v1.services.assured_workloads_service import pagers from google.cloud.assuredworkloads_v1.types import assuredworkloads @@ -84,9 +84,7 @@ class AssuredWorkloadsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] _transport_registry["grpc"] = AssuredWorkloadsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AssuredWorkloadsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AssuredWorkloadsServiceRestTransport @@ -656,11 +654,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssuredWorkloadsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssuredWorkloadsServiceClient._read_environment_variables() + ) self._client_cert_source = ( AssuredWorkloadsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -697,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssuredWorkloadsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/pagers.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/pagers.py index c02e44463a5e..f57706a75feb 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/pagers.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/__init__.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/__init__.py index 36a6ad6c6936..1376fc64c7b6 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/__init__.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] _transport_registry["grpc"] = AssuredWorkloadsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AssuredWorkloadsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AssuredWorkloadsServiceRestTransport diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/base.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/base.py index e8d7489a737c..0b03e2b254ac 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/base.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.assuredworkloads_v1 import gapic_version as package_version from google.cloud.assuredworkloads_v1.types import assuredworkloads diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc.py index 9a8480e9c9cf..90fe2aa81eb6 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.assuredworkloads_v1.types import assuredworkloads @@ -424,12 +424,12 @@ def restrict_allowed_resources( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restrict_allowed_resources" not in self._stubs: - self._stubs[ - "restrict_allowed_resources" - ] = self._logged_channel.unary_unary( - "/google.cloud.assuredworkloads.v1.AssuredWorkloadsService/RestrictAllowedResources", - request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, - response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + self._stubs["restrict_allowed_resources"] = ( + self._logged_channel.unary_unary( + "/google.cloud.assuredworkloads.v1.AssuredWorkloadsService/RestrictAllowedResources", + request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, + response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + ) ) return self._stubs["restrict_allowed_resources"] diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc_asyncio.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc_asyncio.py index 4699abad6579..f7432214209c 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.assuredworkloads_v1.types import assuredworkloads @@ -436,12 +436,12 @@ def restrict_allowed_resources( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restrict_allowed_resources" not in self._stubs: - self._stubs[ - "restrict_allowed_resources" - ] = self._logged_channel.unary_unary( - "/google.cloud.assuredworkloads.v1.AssuredWorkloadsService/RestrictAllowedResources", - request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, - response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + self._stubs["restrict_allowed_resources"] = ( + self._logged_channel.unary_unary( + "/google.cloud.assuredworkloads.v1.AssuredWorkloadsService/RestrictAllowedResources", + request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, + response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + ) ) return self._stubs["restrict_allowed_resources"] diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest.py index f05522b532d6..6ab9d1084389 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -665,9 +665,7 @@ def __call__( """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseCreateWorkload._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseCreateWorkload._get_http_options() request, metadata = self._interceptor.pre_create_workload(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseCreateWorkload._get_transcoded_request( @@ -691,7 +689,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -811,9 +809,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseDeleteWorkload._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseDeleteWorkload._get_http_options() request, metadata = self._interceptor.pre_delete_workload(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseDeleteWorkload._get_transcoded_request( @@ -833,7 +829,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -945,9 +941,7 @@ def __call__( """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseGetWorkload._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseGetWorkload._get_http_options() request, metadata = self._interceptor.pre_get_workload(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseGetWorkload._get_transcoded_request( @@ -1110,9 +1104,7 @@ def __call__( Response of ListWorkloads endpoint. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseListWorkloads._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseListWorkloads._get_http_options() request, metadata = self._interceptor.pre_list_workloads(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseListWorkloads._get_transcoded_request( @@ -1265,9 +1257,7 @@ def __call__( """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseRestrictAllowedResources._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseRestrictAllowedResources._get_http_options() request, metadata = self._interceptor.pre_restrict_allowed_resources( request, metadata @@ -1424,9 +1414,7 @@ def __call__( """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseUpdateWorkload._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseUpdateWorkload._get_http_options() request, metadata = self._interceptor.pre_update_workload(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseUpdateWorkload._get_transcoded_request( @@ -1594,7 +1582,9 @@ def restrict_allowed_resources( ]: # 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._RestrictAllowedResources(self._session, self._host, self._interceptor) # type: ignore + return self._RestrictAllowedResources( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_workload( @@ -1662,9 +1652,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1803,9 +1791,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest_base.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest_base.py index cb65566d3089..f461302e048a 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest_base.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/services/assured_workloads_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.assuredworkloads_v1.types import assuredworkloads diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/types/assuredworkloads.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/types/assuredworkloads.py index 0c98dedeb32d..714b2c3d8e1e 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/types/assuredworkloads.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1/types/assuredworkloads.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -342,6 +342,7 @@ class ComplianceRegime(proto.Enum): ASSURED_WORKLOADS_FOR_PARTNERS (12): Assured Workloads for Partners """ + COMPLIANCE_REGIME_UNSPECIFIED = 0 IL4 = 1 CJIS = 2 @@ -367,6 +368,7 @@ class KajEnrollmentState(proto.Enum): KAJ_ENROLLMENT_STATE_COMPLETE (2): Complete State for KAJ Enrollment. """ + KAJ_ENROLLMENT_STATE_UNSPECIFIED = 0 KAJ_ENROLLMENT_STATE_PENDING = 1 KAJ_ENROLLMENT_STATE_COMPLETE = 2 @@ -380,6 +382,7 @@ class Partner(proto.Enum): LOCAL_CONTROLS_BY_S3NS (1): S3NS regime/controls. """ + PARTNER_UNSPECIFIED = 0 LOCAL_CONTROLS_BY_S3NS = 1 @@ -412,6 +415,7 @@ class ResourceType(proto.Enum): KEYRING (3): Keyring resource that hosts encryption keys. """ + RESOURCE_TYPE_UNSPECIFIED = 0 CONSUMER_PROJECT = 1 CONSUMER_FOLDER = 4 @@ -519,6 +523,7 @@ class SetupState(proto.Enum): STATUS_COMPLETE (2): SAA enrollment comopleted. """ + SETUP_STATE_UNSPECIFIED = 0 STATUS_PENDING = 1 STATUS_COMPLETE = 2 @@ -543,6 +548,7 @@ class SetupError(proto.Enum): Returned when exception was encountered during evaluation of other criteria. """ + SETUP_ERROR_UNSPECIFIED = 0 ERROR_INVALID_BASE_SETUP = 1 ERROR_MISSING_EXTERNAL_SIGNING_KEY = 2 @@ -555,12 +561,12 @@ class SetupError(proto.Enum): optional=True, enum="Workload.SaaEnrollmentResponse.SetupState", ) - setup_errors: MutableSequence[ - "Workload.SaaEnrollmentResponse.SetupError" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="Workload.SaaEnrollmentResponse.SetupError", + setup_errors: MutableSequence["Workload.SaaEnrollmentResponse.SetupError"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="Workload.SaaEnrollmentResponse.SetupError", + ) ) name: str = proto.Field( @@ -708,6 +714,7 @@ class RestrictionType(proto.Enum): https://cloud.google.com/assured-workloads/docs/supported-products for the list of supported resources. """ + RESTRICTION_TYPE_UNSPECIFIED = 0 ALLOW_ALL_GCP_RESOURCES = 1 ALLOW_COMPLIANT_RESOURCES = 2 @@ -954,6 +961,7 @@ class State(proto.Enum): EXCEPTION (4): Violation is Exception """ + STATE_UNSPECIFIED = 0 RESOLVED = 2 UNRESOLVED = 3 @@ -999,6 +1007,7 @@ class RemediationType(proto.Enum): Remediation type for gcp.restrictCmekCryptoKeyProjects """ + REMEDIATION_TYPE_UNSPECIFIED = 0 REMEDIATION_BOOLEAN_ORG_POLICY_VIOLATION = 1 REMEDIATION_LIST_ALLOWED_VALUES_ORG_POLICY_VIOLATION = 2 diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/__init__.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/__init__.py index b0f718fbf11e..2ef0eff62acf 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/__init__.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.assured_workloads_service import ( AssuredWorkloadsServiceAsyncClient, AssuredWorkloadsServiceClient, diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/async_client.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/async_client.py index 0e224f4a9be7..a9391c1e8ca0 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/async_client.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.assuredworkloads_v1beta1 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.assuredworkloads_v1beta1.services.assured_workloads_service import ( pagers, @@ -129,7 +129,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AssuredWorkloadsServiceAsyncClient: The constructed client. """ - return AssuredWorkloadsServiceClient.from_service_account_info.__func__(AssuredWorkloadsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AssuredWorkloadsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AssuredWorkloadsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +146,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AssuredWorkloadsServiceAsyncClient: The constructed client. """ - return AssuredWorkloadsServiceClient.from_service_account_file.__func__(AssuredWorkloadsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AssuredWorkloadsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + AssuredWorkloadsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -183,7 +187,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AssuredWorkloadsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AssuredWorkloadsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AssuredWorkloadsServiceTransport: diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/client.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/client.py index 2f0ca5980991..fdb7526b2c61 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/client.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.assuredworkloads_v1beta1 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.assuredworkloads_v1beta1.services.assured_workloads_service import ( pagers, @@ -86,9 +86,7 @@ class AssuredWorkloadsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] _transport_registry["grpc"] = AssuredWorkloadsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AssuredWorkloadsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AssuredWorkloadsServiceRestTransport @@ -634,11 +632,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssuredWorkloadsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssuredWorkloadsServiceClient._read_environment_variables() + ) self._client_cert_source = ( AssuredWorkloadsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -675,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssuredWorkloadsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/pagers.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/pagers.py index ae838924f0db..1f4bccc24ea2 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/pagers.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/__init__.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/__init__.py index 36a6ad6c6936..1376fc64c7b6 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/__init__.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AssuredWorkloadsServiceTransport]] _transport_registry["grpc"] = AssuredWorkloadsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AssuredWorkloadsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AssuredWorkloadsServiceRestTransport diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/base.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/base.py index 7359cfe4816b..8d35013de49f 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/base.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.assuredworkloads_v1beta1 import gapic_version as package_version from google.cloud.assuredworkloads_v1beta1.types import assuredworkloads diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc.py index d7402d845d2b..2311822e3408 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.assuredworkloads_v1beta1.types import assuredworkloads @@ -424,12 +424,12 @@ def restrict_allowed_resources( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restrict_allowed_resources" not in self._stubs: - self._stubs[ - "restrict_allowed_resources" - ] = self._logged_channel.unary_unary( - "/google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsService/RestrictAllowedResources", - request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, - response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + self._stubs["restrict_allowed_resources"] = ( + self._logged_channel.unary_unary( + "/google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsService/RestrictAllowedResources", + request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, + response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + ) ) return self._stubs["restrict_allowed_resources"] diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc_asyncio.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc_asyncio.py index ddf6e2ffddc0..2664cde99f1f 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.assuredworkloads_v1beta1.types import assuredworkloads @@ -436,12 +436,12 @@ def restrict_allowed_resources( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restrict_allowed_resources" not in self._stubs: - self._stubs[ - "restrict_allowed_resources" - ] = self._logged_channel.unary_unary( - "/google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsService/RestrictAllowedResources", - request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, - response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + self._stubs["restrict_allowed_resources"] = ( + self._logged_channel.unary_unary( + "/google.cloud.assuredworkloads.v1beta1.AssuredWorkloadsService/RestrictAllowedResources", + request_serializer=assuredworkloads.RestrictAllowedResourcesRequest.serialize, + response_deserializer=assuredworkloads.RestrictAllowedResourcesResponse.deserialize, + ) ) return self._stubs["restrict_allowed_resources"] diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest.py index a11fef8d0fa2..abd6652ca99e 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -503,9 +503,7 @@ def __call__( """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseCreateWorkload._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseCreateWorkload._get_http_options() request, metadata = self._interceptor.pre_create_workload(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseCreateWorkload._get_transcoded_request( @@ -529,7 +527,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -649,9 +647,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseDeleteWorkload._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseDeleteWorkload._get_http_options() request, metadata = self._interceptor.pre_delete_workload(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseDeleteWorkload._get_transcoded_request( @@ -671,7 +667,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -806,9 +802,7 @@ def __call__( """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseRestrictAllowedResources._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseRestrictAllowedResources._get_http_options() request, metadata = self._interceptor.pre_restrict_allowed_resources( request, metadata @@ -980,7 +974,9 @@ def restrict_allowed_resources( ]: # 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._RestrictAllowedResources(self._session, self._host, self._interceptor) # type: ignore + return self._RestrictAllowedResources( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_workload( @@ -1048,9 +1044,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1189,9 +1183,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAssuredWorkloadsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAssuredWorkloadsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAssuredWorkloadsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest_base.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest_base.py index 9b089960fa0d..b9c305263ad8 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest_base.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.assuredworkloads_v1beta1.types import assuredworkloads diff --git a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/types/assuredworkloads.py b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/types/assuredworkloads.py index 2783c6a65164..62a23f7dc1b3 100644 --- a/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/types/assuredworkloads.py +++ b/packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/types/assuredworkloads.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -133,6 +133,7 @@ class RestrictionType(proto.Enum): https://cloud.google.com/assured-workloads/docs/supported-products for the list of supported resources. """ + RESTRICTION_TYPE_UNSPECIFIED = 0 ALLOW_ALL_GCP_RESOURCES = 1 ALLOW_COMPLIANT_RESOURCES = 2 @@ -484,6 +485,7 @@ class ComplianceRegime(proto.Enum): Assured Workloads for Australia Regions and Support controls """ + COMPLIANCE_REGIME_UNSPECIFIED = 0 IL4 = 1 CJIS = 2 @@ -508,6 +510,7 @@ class KajEnrollmentState(proto.Enum): KAJ_ENROLLMENT_STATE_COMPLETE (2): Complete State for KAJ Enrollment. """ + KAJ_ENROLLMENT_STATE_UNSPECIFIED = 0 KAJ_ENROLLMENT_STATE_PENDING = 1 KAJ_ENROLLMENT_STATE_COMPLETE = 2 @@ -540,6 +543,7 @@ class ResourceType(proto.Enum): KEYRING (3): Keyring resource that hosts encryption keys. """ + RESOURCE_TYPE_UNSPECIFIED = 0 CONSUMER_PROJECT = 1 CONSUMER_FOLDER = 4 @@ -704,6 +708,7 @@ class SetupState(proto.Enum): STATUS_COMPLETE (2): SAA enrollment comopleted. """ + SETUP_STATE_UNSPECIFIED = 0 STATUS_PENDING = 1 STATUS_COMPLETE = 2 @@ -728,6 +733,7 @@ class SetupError(proto.Enum): Returned when exception was encountered during evaluation of other criteria. """ + SETUP_ERROR_UNSPECIFIED = 0 ERROR_INVALID_BASE_SETUP = 1 ERROR_MISSING_EXTERNAL_SIGNING_KEY = 2 @@ -740,12 +746,12 @@ class SetupError(proto.Enum): optional=True, enum="Workload.SaaEnrollmentResponse.SetupState", ) - setup_errors: MutableSequence[ - "Workload.SaaEnrollmentResponse.SetupError" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="Workload.SaaEnrollmentResponse.SetupError", + setup_errors: MutableSequence["Workload.SaaEnrollmentResponse.SetupError"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="Workload.SaaEnrollmentResponse.SetupError", + ) ) name: str = proto.Field( @@ -881,12 +887,12 @@ class CreateWorkloadOperationMetadata(proto.Message): number=4, enum="Workload.ComplianceRegime", ) - resource_settings: MutableSequence[ - "Workload.ResourceSettings" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="Workload.ResourceSettings", + resource_settings: MutableSequence["Workload.ResourceSettings"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="Workload.ResourceSettings", + ) ) diff --git a/packages/google-cloud-assured-workloads/noxfile.py b/packages/google-cloud-assured-workloads/noxfile.py index 32632e5a5177..0f81ce6c650a 100644 --- a/packages/google-cloud-assured-workloads/noxfile.py +++ b/packages/google-cloud-assured-workloads/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py b/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py index fe2e58c7b929..ed3259e44fd8 100644 --- a/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py +++ b/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1/test_assured_workloads_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.assuredworkloads_v1.services.assured_workloads_service import ( AssuredWorkloadsServiceAsyncClient, @@ -1011,10 +1011,9 @@ def test_assured_workloads_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1058,9 @@ def test_assured_workloads_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1096,9 @@ def test_assured_workloads_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1357,13 +1354,13 @@ def test_assured_workloads_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4405,9 +4402,9 @@ def test_acknowledge_violation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.acknowledge_violation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.acknowledge_violation] = ( + mock_rpc + ) request = {} client.acknowledge_violation(request) @@ -6300,8 +6297,9 @@ def test_create_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6455,20 +6453,21 @@ def test_create_workload_rest_interceptors(null_interceptor): ) client = AssuredWorkloadsServiceClient(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.AssuredWorkloadsServiceRestInterceptor, "post_create_workload" - ) as post, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, - "post_create_workload_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, "pre_create_workload" - ) as pre: + 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.AssuredWorkloadsServiceRestInterceptor, "post_create_workload" + ) as post, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, + "post_create_workload_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, "pre_create_workload" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6525,8 +6524,9 @@ def test_update_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6715,18 +6715,20 @@ def test_update_workload_rest_interceptors(null_interceptor): ) client = AssuredWorkloadsServiceClient(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.AssuredWorkloadsServiceRestInterceptor, "post_update_workload" - ) as post, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, - "post_update_workload_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, "pre_update_workload" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, "post_update_workload" + ) as post, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, + "post_update_workload_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, "pre_update_workload" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6779,8 +6781,9 @@ def test_restrict_allowed_resources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6842,20 +6845,22 @@ def test_restrict_allowed_resources_rest_interceptors(null_interceptor): ) client = AssuredWorkloadsServiceClient(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.AssuredWorkloadsServiceRestInterceptor, - "post_restrict_allowed_resources", - ) as post, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, - "post_restrict_allowed_resources_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, - "pre_restrict_allowed_resources", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, + "post_restrict_allowed_resources", + ) as post, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, + "post_restrict_allowed_resources_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, + "pre_restrict_allowed_resources", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6913,8 +6918,9 @@ def test_delete_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6971,13 +6977,13 @@ def test_delete_workload_rest_interceptors(null_interceptor): ) client = AssuredWorkloadsServiceClient(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.AssuredWorkloadsServiceRestInterceptor, "pre_delete_workload" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, "pre_delete_workload" + ) as pre, + ): pre.assert_not_called() pb_message = assuredworkloads.DeleteWorkloadRequest.pb( assuredworkloads.DeleteWorkloadRequest() @@ -7022,8 +7028,9 @@ def test_get_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7111,18 +7118,20 @@ def test_get_workload_rest_interceptors(null_interceptor): ) client = AssuredWorkloadsServiceClient(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.AssuredWorkloadsServiceRestInterceptor, "post_get_workload" - ) as post, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, - "post_get_workload_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, "pre_get_workload" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, "post_get_workload" + ) as post, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, + "post_get_workload_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, "pre_get_workload" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7175,8 +7184,9 @@ def test_list_workloads_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7239,18 +7249,20 @@ def test_list_workloads_rest_interceptors(null_interceptor): ) client = AssuredWorkloadsServiceClient(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.AssuredWorkloadsServiceRestInterceptor, "post_list_workloads" - ) as post, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, - "post_list_workloads_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, "pre_list_workloads" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, "post_list_workloads" + ) as post, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, + "post_list_workloads_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, "pre_list_workloads" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7346,8 +7358,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7410,8 +7423,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7735,11 +7749,14 @@ def test_assured_workloads_service_base_transport(): def test_assured_workloads_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.assuredworkloads_v1.services.assured_workloads_service.transports.AssuredWorkloadsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.assuredworkloads_v1.services.assured_workloads_service.transports.AssuredWorkloadsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssuredWorkloadsServiceTransport( @@ -7756,9 +7773,12 @@ def test_assured_workloads_service_base_transport_with_credentials_file(): def test_assured_workloads_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.assuredworkloads_v1.services.assured_workloads_service.transports.AssuredWorkloadsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.assuredworkloads_v1.services.assured_workloads_service.transports.AssuredWorkloadsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssuredWorkloadsServiceTransport() @@ -7832,11 +7852,12 @@ def test_assured_workloads_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py b/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py index 3a0cd8613a25..990dd2953fca 100644 --- a/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py +++ b/packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.assuredworkloads_v1beta1.services.assured_workloads_service import ( AssuredWorkloadsServiceAsyncClient, @@ -1011,10 +1011,9 @@ def test_assured_workloads_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1058,9 @@ def test_assured_workloads_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1096,9 @@ def test_assured_workloads_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1357,13 +1354,13 @@ def test_assured_workloads_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3006,9 +3003,9 @@ def test_analyze_workload_move_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_workload_move - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_workload_move] = ( + mock_rpc + ) request = {} client.analyze_workload_move(request) @@ -4744,8 +4741,9 @@ def test_create_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4904,20 +4902,21 @@ def test_create_workload_rest_interceptors(null_interceptor): ) client = AssuredWorkloadsServiceClient(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.AssuredWorkloadsServiceRestInterceptor, "post_create_workload" - ) as post, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, - "post_create_workload_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, "pre_create_workload" - ) as pre: + 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.AssuredWorkloadsServiceRestInterceptor, "post_create_workload" + ) as post, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, + "post_create_workload_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, "pre_create_workload" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4982,8 +4981,9 @@ def test_restrict_allowed_resources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5045,20 +5045,22 @@ def test_restrict_allowed_resources_rest_interceptors(null_interceptor): ) client = AssuredWorkloadsServiceClient(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.AssuredWorkloadsServiceRestInterceptor, - "post_restrict_allowed_resources", - ) as post, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, - "post_restrict_allowed_resources_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AssuredWorkloadsServiceRestInterceptor, - "pre_restrict_allowed_resources", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, + "post_restrict_allowed_resources", + ) as post, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, + "post_restrict_allowed_resources_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, + "pre_restrict_allowed_resources", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5116,8 +5118,9 @@ def test_delete_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5174,13 +5177,13 @@ def test_delete_workload_rest_interceptors(null_interceptor): ) client = AssuredWorkloadsServiceClient(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.AssuredWorkloadsServiceRestInterceptor, "pre_delete_workload" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssuredWorkloadsServiceRestInterceptor, "pre_delete_workload" + ) as pre, + ): pre.assert_not_called() pb_message = assuredworkloads.DeleteWorkloadRequest.pb( assuredworkloads.DeleteWorkloadRequest() @@ -5263,8 +5266,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5327,8 +5331,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5610,11 +5615,14 @@ def test_assured_workloads_service_base_transport(): def test_assured_workloads_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.assuredworkloads_v1beta1.services.assured_workloads_service.transports.AssuredWorkloadsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.assuredworkloads_v1beta1.services.assured_workloads_service.transports.AssuredWorkloadsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssuredWorkloadsServiceTransport( @@ -5631,9 +5639,12 @@ def test_assured_workloads_service_base_transport_with_credentials_file(): def test_assured_workloads_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.assuredworkloads_v1beta1.services.assured_workloads_service.transports.AssuredWorkloadsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.assuredworkloads_v1beta1.services.assured_workloads_service.transports.AssuredWorkloadsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssuredWorkloadsServiceTransport() @@ -5707,11 +5718,12 @@ def test_assured_workloads_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-automl/docs/conf.py b/packages/google-cloud-automl/docs/conf.py index 071bd238cdf4..e6d0f2d68e42 100644 --- a/packages/google-cloud-automl/docs/conf.py +++ b/packages/google-cloud-automl/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-automl documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/__init__.py b/packages/google-cloud-automl/google/cloud/automl_v1/__init__.py index 57c856c7c4a8..2968bc863430 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/__init__.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.auto_ml import AutoMlAsyncClient, AutoMlClient from .services.prediction_service import ( PredictionServiceAsyncClient, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/async_client.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/async_client.py index 4d1ecb19e478..71816c38697f 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/async_client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1 import gapic_version as package_version @@ -44,14 +44,21 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.automl_v1.services.auto_ml import pagers from google.cloud.automl_v1.types import ( + annotation_spec, + classification, + dataset, + detection, + image, + io, + model, model_evaluation, operations, service, @@ -60,11 +67,7 @@ text_sentiment, translation, ) -from google.cloud.automl_v1.types import annotation_spec, classification -from google.cloud.automl_v1.types import dataset from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import detection, image, io -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model from .client import AutoMlClient @@ -144,7 +147,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AutoMlAsyncClient: The constructed client. """ - return AutoMlClient.from_service_account_info.__func__(AutoMlAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AutoMlClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AutoMlAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +164,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AutoMlAsyncClient: The constructed client. """ - return AutoMlClient.from_service_account_file.__func__(AutoMlAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AutoMlClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AutoMlAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/client.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/client.py index 0632529e812e..677fe4964d6c 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1 import gapic_version as package_version @@ -61,14 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.automl_v1.services.auto_ml import pagers from google.cloud.automl_v1.types import ( + annotation_spec, + classification, + dataset, + detection, + image, + io, + model, model_evaluation, operations, service, @@ -77,11 +84,7 @@ text_sentiment, translation, ) -from google.cloud.automl_v1.types import annotation_spec, classification -from google.cloud.automl_v1.types import dataset from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import detection, image, io -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model from .transports.base import DEFAULT_CLIENT_INFO, AutoMlTransport @@ -723,11 +726,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutoMlClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutoMlClient._read_environment_variables() + ) self._client_cert_source = AutoMlClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -762,8 +763,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutoMlTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/pagers.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/pagers.py index 7e48afa91db6..03820cb15976 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/pagers.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/base.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/base.py index e8117c91b946..c9cb3efd7b4b 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/base.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/base.py @@ -17,22 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1 import gapic_version as package_version -from google.cloud.automl_v1.types import annotation_spec -from google.cloud.automl_v1.types import dataset +from google.cloud.automl_v1.types import ( + annotation_spec, + dataset, + model, + model_evaluation, + service, +) from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model -from google.cloud.automl_v1.types import model_evaluation, service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc.py index 01b4eb298572..519e3d429798 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc.py @@ -16,25 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.automl_v1.types import annotation_spec -from google.cloud.automl_v1.types import dataset +from google.cloud.automl_v1.types import ( + annotation_spec, + dataset, + model, + model_evaluation, + service, +) from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model -from google.cloud.automl_v1.types import model_evaluation, service from .base import DEFAULT_CLIENT_INFO, AutoMlTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc_asyncio.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc_asyncio.py index fcd4add741e9..7906f12fbd92 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc_asyncio.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +30,17 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.automl_v1.types import annotation_spec -from google.cloud.automl_v1.types import dataset +from google.cloud.automl_v1.types import ( + annotation_spec, + dataset, + model, + model_evaluation, + service, +) from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model -from google.cloud.automl_v1.types import model_evaluation, service from .base import DEFAULT_CLIENT_INFO, AutoMlTransport from .grpc import AutoMlGrpcTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest.py index 94d1910bb375..f8d997ef53a6 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest.py @@ -16,25 +16,28 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.automl_v1.types import annotation_spec -from google.cloud.automl_v1.types import dataset +from google.cloud.automl_v1.types import ( + annotation_spec, + dataset, + model, + model_evaluation, + service, +) from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model -from google.cloud.automl_v1.types import model_evaluation, service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAutoMlRestTransport @@ -1306,7 +1309,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1458,7 +1461,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1607,7 +1610,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1753,7 +1756,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1904,7 +1907,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2056,7 +2059,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2210,7 +2213,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2960,7 +2963,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3561,7 +3564,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest_base.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest_base.py index 3e9349175a0f..1cdc8723b1ab 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest_base.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/auto_ml/transports/rest_base.py @@ -21,12 +21,15 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.automl_v1.types import annotation_spec -from google.cloud.automl_v1.types import dataset +from google.cloud.automl_v1.types import ( + annotation_spec, + dataset, + model, + model_evaluation, + service, +) from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model -from google.cloud.automl_v1.types import model_evaluation, service from .base import DEFAULT_CLIENT_INFO, AutoMlTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/async_client.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/async_client.py index 408009f0afc9..43c51bc64a0d 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/async_client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.automl_v1.types import ( annotation_payload, @@ -125,7 +125,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_info.__func__(PredictionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PredictionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PredictionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +142,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_file.__func__(PredictionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PredictionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PredictionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/client.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/client.py index 432f8795c67c..91a1ba11e732 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.automl_v1.types import ( annotation_payload, @@ -86,9 +86,7 @@ class PredictionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PredictionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PredictionServiceTransport]] _transport_registry["grpc"] = PredictionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PredictionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PredictionServiceRestTransport @@ -636,11 +634,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PredictionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PredictionServiceClient._read_environment_variables() + ) self._client_cert_source = PredictionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -675,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PredictionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/base.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/base.py index d23b40692ac1..f1741e52ab9e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/base.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1 import gapic_version as package_version from google.cloud.automl_v1.types import prediction_service diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc.py index 7e66b8ae9211..bba1dea2a238 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.automl_v1.types import prediction_service diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc_asyncio.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc_asyncio.py index 1c29d7ebdd23..82117c69796d 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.automl_v1.types import prediction_service diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/rest.py b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/rest.py index 0ca32c2eab10..d70eb1dc1422 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/rest.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/services/prediction_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -404,9 +404,7 @@ def __call__( """ - http_options = ( - _BasePredictionServiceRestTransport._BaseBatchPredict._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseBatchPredict._get_http_options() request, metadata = self._interceptor.pre_batch_predict(request, metadata) transcoded_request = _BasePredictionServiceRestTransport._BaseBatchPredict._get_transcoded_request( @@ -430,7 +428,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/__init__.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/__init__.py index 9018fc8624c1..c31e3d248b4a 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/__init__.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/__init__.py @@ -13,21 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .annotation_payload import AnnotationPayload -from .annotation_spec import AnnotationSpec +from .annotation_payload import ( + AnnotationPayload, +) +from .annotation_spec import ( + AnnotationSpec, +) from .classification import ( ClassificationAnnotation, ClassificationEvaluationMetrics, ClassificationType, ) -from .data_items import Document, DocumentDimensions, ExamplePayload, Image, TextSnippet -from .dataset import Dataset +from .data_items import ( + Document, + DocumentDimensions, + ExamplePayload, + Image, + TextSnippet, +) +from .dataset import ( + Dataset, +) from .detection import ( BoundingBoxMetricsEntry, ImageObjectDetectionAnnotation, ImageObjectDetectionEvaluationMetrics, ) -from .geometry import BoundingPoly, NormalizedVertex +from .geometry import ( + BoundingPoly, + NormalizedVertex, +) from .image import ( ImageClassificationDatasetMetadata, ImageClassificationModelDeploymentMetadata, @@ -46,8 +61,12 @@ ModelExportOutputConfig, OutputConfig, ) -from .model import Model -from .model_evaluation import ModelEvaluation +from .model import ( + Model, +) +from .model_evaluation import ( + ModelEvaluation, +) from .operations import ( BatchPredictOperationMetadata, CreateDatasetOperationMetadata, @@ -97,9 +116,17 @@ TextSentimentDatasetMetadata, TextSentimentModelMetadata, ) -from .text_extraction import TextExtractionAnnotation, TextExtractionEvaluationMetrics -from .text_segment import TextSegment -from .text_sentiment import TextSentimentAnnotation, TextSentimentEvaluationMetrics +from .text_extraction import ( + TextExtractionAnnotation, + TextExtractionEvaluationMetrics, +) +from .text_segment import ( + TextSegment, +) +from .text_sentiment import ( + TextSentimentAnnotation, + TextSentimentEvaluationMetrics, +) from .translation import ( TranslationAnnotation, TranslationDatasetMetadata, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/classification.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/classification.py index 942465a80803..f477960e5d16 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/classification.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/classification.py @@ -40,6 +40,7 @@ class ClassificationType(proto.Enum): MULTILABEL (2): Multiple labels are allowed for one example. """ + CLASSIFICATION_TYPE_UNSPECIFIED = 0 MULTICLASS = 1 MULTILABEL = 2 @@ -272,12 +273,12 @@ class Row(proto.Message): proto.STRING, number=3, ) - row: MutableSequence[ - "ClassificationEvaluationMetrics.ConfusionMatrix.Row" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ClassificationEvaluationMetrics.ConfusionMatrix.Row", + row: MutableSequence["ClassificationEvaluationMetrics.ConfusionMatrix.Row"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ClassificationEvaluationMetrics.ConfusionMatrix.Row", + ) ) au_prc: float = proto.Field( @@ -292,12 +293,12 @@ class Row(proto.Message): proto.FLOAT, number=7, ) - confidence_metrics_entry: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ConfidenceMetricsEntry, + confidence_metrics_entry: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ConfidenceMetricsEntry, + ) ) confusion_matrix: ConfusionMatrix = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/data_items.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/data_items.py index d21db733f1ae..ce813e5041b3 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/data_items.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/data_items.py @@ -125,6 +125,7 @@ class DocumentDimensionUnit(proto.Enum): Document dimension is measured in points. 72 points = 1 inch. """ + DOCUMENT_DIMENSION_UNIT_UNSPECIFIED = 0 INCH = 1 CENTIMETER = 2 @@ -232,6 +233,7 @@ class TextSegmentType(proto.Enum): child of another TABLE_ROW TextSegment if its span is subspan of another TextSegment with type TABLE_ROW. """ + TEXT_SEGMENT_TYPE_UNSPECIFIED = 0 TOKEN = 1 PARAGRAPH = 2 diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/dataset.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/dataset.py index ac7bde5588dd..e7a922ab027c 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/dataset.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/dataset.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.automl_v1.types import image, text, translation diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/detection.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/detection.py index 5140cd3a784e..b77505eb103b 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/detection.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/detection.py @@ -118,12 +118,12 @@ class ConfidenceMetricsEntry(proto.Message): proto.FLOAT, number=2, ) - confidence_metrics_entries: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ConfidenceMetricsEntry, + confidence_metrics_entries: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ConfidenceMetricsEntry, + ) ) @@ -152,12 +152,12 @@ class ImageObjectDetectionEvaluationMetrics(proto.Message): proto.INT32, number=1, ) - bounding_box_metrics_entries: MutableSequence[ - "BoundingBoxMetricsEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="BoundingBoxMetricsEntry", + bounding_box_metrics_entries: MutableSequence["BoundingBoxMetricsEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="BoundingBoxMetricsEntry", + ) ) bounding_box_mean_average_precision: float = proto.Field( proto.FLOAT, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/model.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/model.py index 4297a96d05ad..0f8e93021956 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/model.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/model.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.automl_v1.types import image, text, translation @@ -118,6 +118,7 @@ class DeploymentState(proto.Enum): UNDEPLOYED (2): Model is not deployed. """ + DEPLOYMENT_STATE_UNSPECIFIED = 0 DEPLOYED = 1 UNDEPLOYED = 2 diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/model_evaluation.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/model_evaluation.py index e49f86556260..18da7c1e930a 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/model_evaluation.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/model_evaluation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.automl_v1.types import ( diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/operations.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/operations.py index 061e87ef6080..7d188597d2fb 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/operations.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/operations.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.automl_v1.types import io diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/prediction_service.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/prediction_service.py index 0ffdf44e0807..89291c0a6c43 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/prediction_service.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/prediction_service.py @@ -131,12 +131,12 @@ class PredictResponse(proto.Message): API. """ - payload: MutableSequence[ - annotation_payload.AnnotationPayload - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=annotation_payload.AnnotationPayload, + payload: MutableSequence[annotation_payload.AnnotationPayload] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=annotation_payload.AnnotationPayload, + ) ) preprocessed_input: data_items.ExamplePayload = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/service.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/service.py index a9562c273e4c..45b6480446af 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/service.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/service.py @@ -17,13 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.automl_v1.types import model_evaluation as gca_model_evaluation from google.cloud.automl_v1.types import dataset as gca_dataset from google.cloud.automl_v1.types import image, io from google.cloud.automl_v1.types import model as gca_model +from google.cloud.automl_v1.types import model_evaluation as gca_model_evaluation __protobuf__ = proto.module( package="google.cloud.automl.v1", @@ -605,12 +605,12 @@ class ListModelEvaluationsResponse(proto.Message): def raw_page(self): return self - model_evaluation: MutableSequence[ - gca_model_evaluation.ModelEvaluation - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gca_model_evaluation.ModelEvaluation, + model_evaluation: MutableSequence[gca_model_evaluation.ModelEvaluation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gca_model_evaluation.ModelEvaluation, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1/types/text_extraction.py b/packages/google-cloud-automl/google/cloud/automl_v1/types/text_extraction.py index ae082887b724..b857211c009e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1/types/text_extraction.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1/types/text_extraction.py @@ -114,12 +114,12 @@ class ConfidenceMetricsEntry(proto.Message): proto.FLOAT, number=1, ) - confidence_metrics_entries: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=ConfidenceMetricsEntry, + confidence_metrics_entries: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=ConfidenceMetricsEntry, + ) ) diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/__init__.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/__init__.py index a1f1fc15f50e..310edefc5778 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/__init__.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.auto_ml import AutoMlAsyncClient, AutoMlClient from .services.prediction_service import ( PredictionServiceAsyncClient, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/async_client.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/async_client.py index 7533fc20b042..348622152b2e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/async_client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1beta1 import gapic_version as package_version @@ -44,19 +44,28 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.automl_v1beta1.services.auto_ml import pagers from google.cloud.automl_v1beta1.types import ( + annotation_spec, + classification, + column_spec, + data_stats, + data_types, + dataset, + detection, + image, + io, + model, model_evaluation, operations, regression, service, -) -from google.cloud.automl_v1beta1.types import ( + table_spec, tables, text, text_extraction, @@ -64,16 +73,9 @@ translation, video, ) -from google.cloud.automl_v1beta1.types import annotation_spec, classification -from google.cloud.automl_v1beta1.types import column_spec from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import data_stats, data_types -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import detection, image, io -from google.cloud.automl_v1beta1.types import model from google.cloud.automl_v1beta1.types import model as gca_model -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec from .client import AutoMlClient @@ -157,7 +159,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AutoMlAsyncClient: The constructed client. """ - return AutoMlClient.from_service_account_info.__func__(AutoMlAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AutoMlClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AutoMlAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +176,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AutoMlAsyncClient: The constructed client. """ - return AutoMlClient.from_service_account_file.__func__(AutoMlAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AutoMlClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AutoMlAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/client.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/client.py index cf97a10bd88c..a5369ac90190 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1beta1 import gapic_version as package_version @@ -61,19 +61,28 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.automl_v1beta1.services.auto_ml import pagers from google.cloud.automl_v1beta1.types import ( + annotation_spec, + classification, + column_spec, + data_stats, + data_types, + dataset, + detection, + image, + io, + model, model_evaluation, operations, regression, service, -) -from google.cloud.automl_v1beta1.types import ( + table_spec, tables, text, text_extraction, @@ -81,16 +90,9 @@ translation, video, ) -from google.cloud.automl_v1beta1.types import annotation_spec, classification -from google.cloud.automl_v1beta1.types import column_spec from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import data_stats, data_types -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import detection, image, io -from google.cloud.automl_v1beta1.types import model from google.cloud.automl_v1beta1.types import model as gca_model -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec from .transports.base import DEFAULT_CLIENT_INFO, AutoMlTransport @@ -782,11 +784,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutoMlClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutoMlClient._read_environment_variables() + ) self._client_cert_source = AutoMlClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -821,8 +821,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutoMlTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/pagers.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/pagers.py index 0504688a952a..749e21f28c22 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/pagers.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/pagers.py @@ -74,7 +74,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -150,7 +150,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -230,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -306,7 +306,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -386,7 +386,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -462,7 +462,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -542,7 +542,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -618,7 +618,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -698,7 +698,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -774,7 +774,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/base.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/base.py index 98ee2fb98ca3..ce1c05664a4e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/base.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/base.py @@ -17,23 +17,27 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1beta1 import gapic_version as package_version -from google.cloud.automl_v1beta1.types import annotation_spec -from google.cloud.automl_v1beta1.types import column_spec +from google.cloud.automl_v1beta1.types import ( + annotation_spec, + column_spec, + dataset, + model, + model_evaluation, + service, + table_spec, +) from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import model, model_evaluation, service -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc.py index d064f40be786..565f764ca60d 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc.py @@ -16,26 +16,30 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.automl_v1beta1.types import annotation_spec -from google.cloud.automl_v1beta1.types import column_spec +from google.cloud.automl_v1beta1.types import ( + annotation_spec, + column_spec, + dataset, + model, + model_evaluation, + service, + table_spec, +) from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import model, model_evaluation, service -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec from .base import DEFAULT_CLIENT_INFO, AutoMlTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc_asyncio.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc_asyncio.py index 9fd7a322b7f5..67e2e92ddced 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc_asyncio.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,18 +30,19 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.automl_v1beta1.types import annotation_spec -from google.cloud.automl_v1beta1.types import column_spec +from google.cloud.automl_v1beta1.types import ( + annotation_spec, + column_spec, + dataset, + model, + model_evaluation, + service, + table_spec, +) from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import model, model_evaluation, service -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec from .base import DEFAULT_CLIENT_INFO, AutoMlTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest.py index 57140dba954c..75408d107828 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest.py @@ -16,26 +16,30 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.automl_v1beta1.types import annotation_spec -from google.cloud.automl_v1beta1.types import column_spec +from google.cloud.automl_v1beta1.types import ( + annotation_spec, + column_spec, + dataset, + model, + model_evaluation, + service, + table_spec, +) from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import model, model_evaluation, service -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -1793,7 +1797,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1942,7 +1946,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2088,7 +2092,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2239,7 +2243,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2391,7 +2395,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2517,9 +2521,7 @@ def __call__( """ - http_options = ( - _BaseAutoMlRestTransport._BaseExportEvaluatedExamples._get_http_options() - ) + http_options = _BaseAutoMlRestTransport._BaseExportEvaluatedExamples._get_http_options() request, metadata = self._interceptor.pre_export_evaluated_examples( request, metadata @@ -2545,7 +2547,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2699,7 +2701,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3759,7 +3761,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4664,7 +4666,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5274,7 +5276,9 @@ def export_evaluated_examples( ) -> Callable[[service.ExportEvaluatedExamplesRequest], 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._ExportEvaluatedExamples(self._session, self._host, self._interceptor) # type: ignore + return self._ExportEvaluatedExamples( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_model( diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest_base.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest_base.py index 80110baefaee..e32c7a58fb3e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest_base.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/auto_ml/transports/rest_base.py @@ -21,13 +21,17 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.automl_v1beta1.types import annotation_spec -from google.cloud.automl_v1beta1.types import column_spec +from google.cloud.automl_v1beta1.types import ( + annotation_spec, + column_spec, + dataset, + model, + model_evaluation, + service, + table_spec, +) from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import model, model_evaluation, service -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec from .base import DEFAULT_CLIENT_INFO, AutoMlTransport diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/async_client.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/async_client.py index aaa357b22b69..ed838f6f7924 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/async_client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1beta1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.automl_v1beta1.types import ( annotation_payload, @@ -125,7 +125,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_info.__func__(PredictionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PredictionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PredictionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +142,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PredictionServiceAsyncClient: The constructed client. """ - return PredictionServiceClient.from_service_account_file.__func__(PredictionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PredictionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PredictionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/client.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/client.py index 0ede06c96742..9d1a32f09425 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/client.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1beta1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.automl_v1beta1.types import ( annotation_payload, @@ -86,9 +86,7 @@ class PredictionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PredictionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PredictionServiceTransport]] _transport_registry["grpc"] = PredictionServiceGrpcTransport _transport_registry["grpc_asyncio"] = PredictionServiceGrpcAsyncIOTransport _transport_registry["rest"] = PredictionServiceRestTransport @@ -636,11 +634,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PredictionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PredictionServiceClient._read_environment_variables() + ) self._client_cert_source = PredictionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -675,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PredictionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/base.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/base.py index 17a39871be51..eeea7c02063b 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/base.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.automl_v1beta1 import gapic_version as package_version from google.cloud.automl_v1beta1.types import prediction_service diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc.py index 734269bc50dc..fad7578f4d01 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.automl_v1beta1.types import prediction_service diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc_asyncio.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc_asyncio.py index a87be5ac055d..6ba6e3e1c425 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.automl_v1beta1.types import prediction_service diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/rest.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/rest.py index ce1b15ae3af6..92d5dadad104 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/rest.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/services/prediction_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -404,9 +404,7 @@ def __call__( """ - http_options = ( - _BasePredictionServiceRestTransport._BaseBatchPredict._get_http_options() - ) + http_options = _BasePredictionServiceRestTransport._BaseBatchPredict._get_http_options() request, metadata = self._interceptor.pre_batch_predict(request, metadata) transcoded_request = _BasePredictionServiceRestTransport._BaseBatchPredict._get_transcoded_request( @@ -430,7 +428,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/__init__.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/__init__.py index 41cef9e61fd2..7b1929f7e8cd 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/__init__.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/__init__.py @@ -13,15 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .annotation_payload import AnnotationPayload -from .annotation_spec import AnnotationSpec +from .annotation_payload import ( + AnnotationPayload, +) +from .annotation_spec import ( + AnnotationSpec, +) from .classification import ( ClassificationAnnotation, ClassificationEvaluationMetrics, ClassificationType, VideoClassificationAnnotation, ) -from .column_spec import ColumnSpec +from .column_spec import ( + ColumnSpec, +) from .data_items import ( Document, DocumentDimensions, @@ -40,8 +46,14 @@ StructStats, TimestampStats, ) -from .data_types import DataType, StructType, TypeCode -from .dataset import Dataset +from .data_types import ( + DataType, + StructType, + TypeCode, +) +from .dataset import ( + Dataset, +) from .detection import ( BoundingBoxMetricsEntry, ImageObjectDetectionAnnotation, @@ -49,7 +61,10 @@ VideoObjectTrackingAnnotation, VideoObjectTrackingEvaluationMetrics, ) -from .geometry import BoundingPoly, NormalizedVertex +from .geometry import ( + BoundingPoly, + NormalizedVertex, +) from .image import ( ImageClassificationDatasetMetadata, ImageClassificationModelDeploymentMetadata, @@ -72,8 +87,12 @@ ModelExportOutputConfig, OutputConfig, ) -from .model import Model -from .model_evaluation import ModelEvaluation +from .model import ( + Model, +) +from .model_evaluation import ( + ModelEvaluation, +) from .operations import ( BatchPredictOperationMetadata, CreateModelOperationMetadata, @@ -92,8 +111,12 @@ PredictRequest, PredictResponse, ) -from .ranges import DoubleRange -from .regression import RegressionEvaluationMetrics +from .ranges import ( + DoubleRange, +) +from .regression import ( + RegressionEvaluationMetrics, +) from .service import ( CreateDatasetRequest, CreateModelRequest, @@ -125,14 +148,18 @@ UpdateDatasetRequest, UpdateTableSpecRequest, ) -from .table_spec import TableSpec +from .table_spec import ( + TableSpec, +) from .tables import ( TablesAnnotation, TablesDatasetMetadata, TablesModelColumnInfo, TablesModelMetadata, ) -from .temporal import TimeSegment +from .temporal import ( + TimeSegment, +) from .text import ( TextClassificationDatasetMetadata, TextClassificationModelMetadata, @@ -141,9 +168,17 @@ TextSentimentDatasetMetadata, TextSentimentModelMetadata, ) -from .text_extraction import TextExtractionAnnotation, TextExtractionEvaluationMetrics -from .text_segment import TextSegment -from .text_sentiment import TextSentimentAnnotation, TextSentimentEvaluationMetrics +from .text_extraction import ( + TextExtractionAnnotation, + TextExtractionEvaluationMetrics, +) +from .text_segment import ( + TextSegment, +) +from .text_sentiment import ( + TextSentimentAnnotation, + TextSentimentEvaluationMetrics, +) from .translation import ( TranslationAnnotation, TranslationDatasetMetadata, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/annotation_payload.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/annotation_payload.py index 6c7d71ec323e..3c6089cdd69e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/annotation_payload.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/annotation_payload.py @@ -20,10 +20,10 @@ import proto # type: ignore from google.cloud.automl_v1beta1.types import classification as gca_classification -from google.cloud.automl_v1beta1.types import text_extraction as gca_text_extraction -from google.cloud.automl_v1beta1.types import text_sentiment as gca_text_sentiment from google.cloud.automl_v1beta1.types import detection from google.cloud.automl_v1beta1.types import tables as gca_tables +from google.cloud.automl_v1beta1.types import text_extraction as gca_text_extraction +from google.cloud.automl_v1beta1.types import text_sentiment as gca_text_sentiment from google.cloud.automl_v1beta1.types import translation as gca_translation __protobuf__ = proto.module( diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/classification.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/classification.py index da1ce6beacd8..a9f1cc1c609a 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/classification.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/classification.py @@ -43,6 +43,7 @@ class ClassificationType(proto.Enum): MULTILABEL (2): Multiple labels are allowed for one example. """ + CLASSIFICATION_TYPE_UNSPECIFIED = 0 MULTICLASS = 1 MULTILABEL = 2 @@ -337,12 +338,12 @@ class Row(proto.Message): proto.STRING, number=3, ) - row: MutableSequence[ - "ClassificationEvaluationMetrics.ConfusionMatrix.Row" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ClassificationEvaluationMetrics.ConfusionMatrix.Row", + row: MutableSequence["ClassificationEvaluationMetrics.ConfusionMatrix.Row"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ClassificationEvaluationMetrics.ConfusionMatrix.Row", + ) ) au_prc: float = proto.Field( @@ -361,12 +362,12 @@ class Row(proto.Message): proto.FLOAT, number=7, ) - confidence_metrics_entry: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ConfidenceMetricsEntry, + confidence_metrics_entry: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ConfidenceMetricsEntry, + ) ) confusion_matrix: ConfusionMatrix = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_items.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_items.py index 4cd98a2da6b7..05cb49aacc9c 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_items.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_items.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.automl_v1beta1.types import geometry, io @@ -142,6 +142,7 @@ class DocumentDimensionUnit(proto.Enum): Document dimension is measured in points. 72 points = 1 inch. """ + DOCUMENT_DIMENSION_UNIT_UNSPECIFIED = 0 INCH = 1 CENTIMETER = 2 @@ -250,6 +251,7 @@ class TextSegmentType(proto.Enum): child of another TABLE_ROW TextSegment if its span is subspan of another TextSegment with type TABLE_ROW. """ + TEXT_SEGMENT_TYPE_UNSPECIFIED = 0 TOKEN = 1 PARAGRAPH = 2 diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_types.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_types.py index 4d847e71967e..2f7430700972 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_types.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/data_types.py @@ -65,6 +65,7 @@ class TypeCode(proto.Enum): ``string`` (bytes should be base64-encoded, as described in RFC 4648, section 4). """ + TYPE_CODE_UNSPECIFIED = 0 FLOAT64 = 3 TIMESTAMP = 4 diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/dataset.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/dataset.py index 6f22c54a431b..4eaeb92d8c83 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/dataset.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/dataset.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.automl_v1beta1.types import image, tables, text, translation, video diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/detection.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/detection.py index 72e25f3e7b6b..ef8329bc073e 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/detection.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/detection.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore from google.cloud.automl_v1beta1.types import geometry @@ -172,12 +172,12 @@ class ConfidenceMetricsEntry(proto.Message): proto.FLOAT, number=2, ) - confidence_metrics_entries: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ConfidenceMetricsEntry, + confidence_metrics_entries: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ConfidenceMetricsEntry, + ) ) @@ -206,12 +206,12 @@ class ImageObjectDetectionEvaluationMetrics(proto.Message): proto.INT32, number=1, ) - bounding_box_metrics_entries: MutableSequence[ - "BoundingBoxMetricsEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="BoundingBoxMetricsEntry", + bounding_box_metrics_entries: MutableSequence["BoundingBoxMetricsEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="BoundingBoxMetricsEntry", + ) ) bounding_box_mean_average_precision: float = proto.Field( proto.FLOAT, @@ -253,12 +253,12 @@ class VideoObjectTrackingEvaluationMetrics(proto.Message): proto.INT32, number=2, ) - bounding_box_metrics_entries: MutableSequence[ - "BoundingBoxMetricsEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="BoundingBoxMetricsEntry", + bounding_box_metrics_entries: MutableSequence["BoundingBoxMetricsEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="BoundingBoxMetricsEntry", + ) ) bounding_box_mean_average_precision: float = proto.Field( proto.FLOAT, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/model.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/model.py index efc5c1a65f18..aa4fd6d7a25b 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/model.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/model.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.automl_v1beta1.types import image, tables, text, translation, video @@ -114,6 +114,7 @@ class DeploymentState(proto.Enum): UNDEPLOYED (2): Model is not deployed. """ + DEPLOYMENT_STATE_UNSPECIFIED = 0 DEPLOYED = 1 UNDEPLOYED = 2 diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/model_evaluation.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/model_evaluation.py index 6c35c806a99a..ca911377083c 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/model_evaluation.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/model_evaluation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.automl_v1beta1.types import ( diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/operations.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/operations.py index ad7adc0b8daa..9d9bea17616d 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/operations.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/operations.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.automl_v1beta1.types import io diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/prediction_service.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/prediction_service.py index 49c70e9a4966..375da0fa955f 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/prediction_service.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/prediction_service.py @@ -121,12 +121,12 @@ class PredictResponse(proto.Message): Analysis API. """ - payload: MutableSequence[ - annotation_payload.AnnotationPayload - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=annotation_payload.AnnotationPayload, + payload: MutableSequence[annotation_payload.AnnotationPayload] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=annotation_payload.AnnotationPayload, + ) ) preprocessed_input: data_items.ExamplePayload = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/service.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/service.py index 2d54d7649065..eb905fd7f780 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/service.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/service.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.automl_v1beta1.types import model_evaluation as gca_model_evaluation from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec from google.cloud.automl_v1beta1.types import dataset as gca_dataset from google.cloud.automl_v1beta1.types import image, io from google.cloud.automl_v1beta1.types import model as gca_model +from google.cloud.automl_v1beta1.types import model_evaluation as gca_model_evaluation from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec __protobuf__ = proto.module( @@ -858,12 +858,12 @@ class ListModelEvaluationsResponse(proto.Message): def raw_page(self): return self - model_evaluation: MutableSequence[ - gca_model_evaluation.ModelEvaluation - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gca_model_evaluation.ModelEvaluation, + model_evaluation: MutableSequence[gca_model_evaluation.ModelEvaluation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gca_model_evaluation.ModelEvaluation, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/tables.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/tables.py index 4f77d2e4c55c..836fd3a27646 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/tables.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/tables.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.automl_v1beta1.types import column_spec, data_stats, ranges @@ -119,13 +119,13 @@ class TablesDatasetMetadata(proto.Message): proto.STRING, number=4, ) - target_column_correlations: MutableMapping[ - str, data_stats.CorrelationStats - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=6, - message=data_stats.CorrelationStats, + target_column_correlations: MutableMapping[str, data_stats.CorrelationStats] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=6, + message=data_stats.CorrelationStats, + ) ) stats_update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, @@ -268,23 +268,23 @@ class TablesModelMetadata(proto.Message): number=2, message=column_spec.ColumnSpec, ) - input_feature_column_specs: MutableSequence[ - column_spec.ColumnSpec - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=column_spec.ColumnSpec, + input_feature_column_specs: MutableSequence[column_spec.ColumnSpec] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=column_spec.ColumnSpec, + ) ) optimization_objective: str = proto.Field( proto.STRING, number=4, ) - tables_model_column_info: MutableSequence[ - "TablesModelColumnInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="TablesModelColumnInfo", + tables_model_column_info: MutableSequence["TablesModelColumnInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="TablesModelColumnInfo", + ) ) train_budget_milli_node_hours: int = proto.Field( proto.INT64, @@ -368,12 +368,12 @@ class TablesAnnotation(proto.Message): number=2, message=struct_pb2.Value, ) - tables_model_column_info: MutableSequence[ - "TablesModelColumnInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="TablesModelColumnInfo", + tables_model_column_info: MutableSequence["TablesModelColumnInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="TablesModelColumnInfo", + ) ) baseline_score: float = proto.Field( proto.FLOAT, diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/temporal.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/temporal.py index a8d9c2bc581e..dff8cb3a1c8a 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/temporal.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/temporal.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/text_extraction.py b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/text_extraction.py index e1765705c957..036cde48de90 100644 --- a/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/text_extraction.py +++ b/packages/google-cloud-automl/google/cloud/automl_v1beta1/types/text_extraction.py @@ -114,12 +114,12 @@ class ConfidenceMetricsEntry(proto.Message): proto.FLOAT, number=1, ) - confidence_metrics_entries: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=ConfidenceMetricsEntry, + confidence_metrics_entries: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=ConfidenceMetricsEntry, + ) ) diff --git a/packages/google-cloud-automl/noxfile.py b/packages/google-cloud-automl/noxfile.py index 4a482fbfa495..db3cd369b388 100644 --- a/packages/google-cloud-automl/noxfile.py +++ b/packages/google-cloud-automl/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -150,42 +149,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_auto_ml.py b/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_auto_ml.py index ed9ed15047ee..33ed335d808a 100644 --- a/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_auto_ml.py +++ b/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_auto_ml.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.automl_v1.services.auto_ml import ( AutoMlAsyncClient, @@ -72,6 +72,13 @@ transports, ) from google.cloud.automl_v1.types import ( + annotation_spec, + classification, + dataset, + detection, + image, + io, + model, model_evaluation, operations, service, @@ -80,11 +87,7 @@ text_sentiment, translation, ) -from google.cloud.automl_v1.types import annotation_spec, classification -from google.cloud.automl_v1.types import dataset from google.cloud.automl_v1.types import dataset as gca_dataset -from google.cloud.automl_v1.types import detection, image, io -from google.cloud.automl_v1.types import model from google.cloud.automl_v1.types import model as gca_model CRED_INFO_JSON = { @@ -922,10 +925,9 @@ def test_auto_ml_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -970,10 +972,9 @@ def test_auto_ml_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1009,10 +1010,9 @@ def test_auto_ml_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1237,13 +1237,13 @@ def test_auto_ml_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3979,9 +3979,9 @@ def test_get_annotation_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_annotation_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_annotation_spec] = ( + mock_rpc + ) request = {} client.get_annotation_spec(request) @@ -7252,9 +7252,9 @@ def test_get_model_evaluation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_model_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_model_evaluation] = ( + mock_rpc + ) request = {} client.get_model_evaluation(request) @@ -7604,9 +7604,9 @@ def test_list_model_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_model_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_model_evaluations] = ( + mock_rpc + ) request = {} client.list_model_evaluations(request) @@ -9462,9 +9462,9 @@ def test_get_annotation_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_annotation_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_annotation_spec] = ( + mock_rpc + ) request = {} client.get_annotation_spec(request) @@ -11181,9 +11181,9 @@ def test_get_model_evaluation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_model_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_model_evaluation] = ( + mock_rpc + ) request = {} client.get_model_evaluation(request) @@ -11366,9 +11366,9 @@ def test_list_model_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_model_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_model_evaluations] = ( + mock_rpc + ) request = {} client.list_model_evaluations(request) @@ -12640,8 +12640,9 @@ def test_create_dataset_rest_bad_request(request_type=service.CreateDatasetReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12781,19 +12782,20 @@ def test_create_dataset_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_create_dataset" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_create_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_create_dataset" - ) as pre: + 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.AutoMlRestInterceptor, "post_create_dataset" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_create_dataset_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_create_dataset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12842,8 +12844,9 @@ def test_get_dataset_rest_bad_request(request_type=service.GetDatasetRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12912,17 +12915,15 @@ def test_get_dataset_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_get_dataset" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_get_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_get_dataset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoMlRestInterceptor, "post_get_dataset") as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_dataset_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_get_dataset") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12971,8 +12972,9 @@ def test_list_datasets_rest_bad_request(request_type=service.ListDatasetsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13033,17 +13035,17 @@ def test_list_datasets_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_list_datasets" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_list_datasets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_list_datasets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_list_datasets" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_list_datasets_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_list_datasets") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13096,8 +13098,9 @@ def test_update_dataset_rest_bad_request(request_type=service.UpdateDatasetReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13253,17 +13256,19 @@ def test_update_dataset_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_update_dataset" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_update_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_update_dataset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_update_dataset" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_update_dataset_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_update_dataset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13312,8 +13317,9 @@ def test_delete_dataset_rest_bad_request(request_type=service.DeleteDatasetReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13368,19 +13374,20 @@ def test_delete_dataset_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_delete_dataset" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_delete_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_delete_dataset" - ) as pre: + 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.AutoMlRestInterceptor, "post_delete_dataset" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_delete_dataset_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_delete_dataset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13429,8 +13436,9 @@ def test_import_data_rest_bad_request(request_type=service.ImportDataRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13485,19 +13493,16 @@ def test_import_data_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_import_data" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_import_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_import_data" - ) as pre: + 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.AutoMlRestInterceptor, "post_import_data") as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_import_data_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_import_data") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13546,8 +13551,9 @@ def test_export_data_rest_bad_request(request_type=service.ExportDataRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13602,19 +13608,16 @@ def test_export_data_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_export_data" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_export_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_export_data" - ) as pre: + 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.AutoMlRestInterceptor, "post_export_data") as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_export_data_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_export_data") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13667,8 +13670,9 @@ def test_get_annotation_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13735,17 +13739,19 @@ def test_get_annotation_spec_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_get_annotation_spec" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_get_annotation_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_get_annotation_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_annotation_spec" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_annotation_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_get_annotation_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13798,8 +13804,9 @@ def test_create_model_rest_bad_request(request_type=service.CreateModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13956,19 +13963,18 @@ def test_create_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_create_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_create_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_create_model" - ) as pre: + 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.AutoMlRestInterceptor, "post_create_model" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_create_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_create_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14017,8 +14023,9 @@ def test_get_model_rest_bad_request(request_type=service.GetModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14087,17 +14094,15 @@ def test_get_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_get_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_get_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_get_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoMlRestInterceptor, "post_get_model") as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_get_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14146,8 +14151,9 @@ def test_list_models_rest_bad_request(request_type=service.ListModelsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14208,17 +14214,15 @@ def test_list_models_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_list_models" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_list_models_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_list_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoMlRestInterceptor, "post_list_models") as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_list_models_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_list_models") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14267,8 +14271,9 @@ def test_delete_model_rest_bad_request(request_type=service.DeleteModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14323,19 +14328,18 @@ def test_delete_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_delete_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_delete_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_delete_model" - ) as pre: + 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.AutoMlRestInterceptor, "post_delete_model" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_delete_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_delete_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14386,8 +14390,9 @@ def test_update_model_rest_bad_request(request_type=service.UpdateModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14560,17 +14565,17 @@ def test_update_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_update_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_update_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_update_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_update_model" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_update_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_update_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14619,8 +14624,9 @@ def test_deploy_model_rest_bad_request(request_type=service.DeployModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14675,19 +14681,18 @@ def test_deploy_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_deploy_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_deploy_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_deploy_model" - ) as pre: + 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.AutoMlRestInterceptor, "post_deploy_model" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_deploy_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_deploy_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14736,8 +14741,9 @@ def test_undeploy_model_rest_bad_request(request_type=service.UndeployModelReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14792,19 +14798,20 @@ def test_undeploy_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_undeploy_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_undeploy_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_undeploy_model" - ) as pre: + 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.AutoMlRestInterceptor, "post_undeploy_model" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_undeploy_model_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_undeploy_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14853,8 +14860,9 @@ def test_export_model_rest_bad_request(request_type=service.ExportModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14909,19 +14917,18 @@ def test_export_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_export_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_export_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_export_model" - ) as pre: + 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.AutoMlRestInterceptor, "post_export_model" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_export_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_export_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14974,8 +14981,9 @@ def test_get_model_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15044,17 +15052,19 @@ def test_get_model_evaluation_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_get_model_evaluation" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_get_model_evaluation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_get_model_evaluation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_model_evaluation" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_model_evaluation_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_get_model_evaluation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15109,8 +15119,9 @@ def test_list_model_evaluations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15171,17 +15182,20 @@ def test_list_model_evaluations_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_list_model_evaluations" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_list_model_evaluations_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_list_model_evaluations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_list_model_evaluations" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, + "post_list_model_evaluations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_list_model_evaluations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15693,11 +15707,14 @@ def test_auto_ml_base_transport(): def test_auto_ml_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.automl_v1.services.auto_ml.transports.AutoMlTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.automl_v1.services.auto_ml.transports.AutoMlTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutoMlTransport( @@ -15714,9 +15731,12 @@ def test_auto_ml_base_transport_with_credentials_file(): def test_auto_ml_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.automl_v1.services.auto_ml.transports.AutoMlTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.automl_v1.services.auto_ml.transports.AutoMlTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutoMlTransport() @@ -15788,11 +15808,12 @@ def test_auto_ml_transport_auth_gdch_credentials(transport_class): def test_auto_ml_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_prediction_service.py b/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_prediction_service.py index 7121b3e6b4aa..c4013349f725 100644 --- a/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_prediction_service.py +++ b/packages/google-cloud-automl/tests/unit/gapic/automl_v1/test_prediction_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -995,10 +995,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1042,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1080,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1333,13 +1330,13 @@ def test_prediction_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2727,8 +2724,9 @@ def test_predict_rest_bad_request(request_type=prediction_service.PredictRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2788,17 +2786,19 @@ def test_predict_rest_interceptors(null_interceptor): ) client = PredictionServiceClient(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.PredictionServiceRestInterceptor, "post_predict" - ) as post, mock.patch.object( - transports.PredictionServiceRestInterceptor, "post_predict_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PredictionServiceRestInterceptor, "pre_predict" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "post_predict" + ) as post, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "post_predict_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "pre_predict" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2853,8 +2853,9 @@ def test_batch_predict_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2911,19 +2912,21 @@ def test_batch_predict_rest_interceptors(null_interceptor): ) client = PredictionServiceClient(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.PredictionServiceRestInterceptor, "post_batch_predict" - ) as post, mock.patch.object( - transports.PredictionServiceRestInterceptor, "post_batch_predict_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PredictionServiceRestInterceptor, "pre_batch_predict" - ) as pre: + 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.PredictionServiceRestInterceptor, "post_batch_predict" + ) as post, + mock.patch.object( + transports.PredictionServiceRestInterceptor, + "post_batch_predict_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "pre_batch_predict" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3088,11 +3091,14 @@ def test_prediction_service_base_transport(): def test_prediction_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.automl_v1.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.automl_v1.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PredictionServiceTransport( @@ -3109,9 +3115,12 @@ def test_prediction_service_base_transport_with_credentials_file(): def test_prediction_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.automl_v1.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.automl_v1.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PredictionServiceTransport() @@ -3183,11 +3192,12 @@ def test_prediction_service_transport_auth_gdch_credentials(transport_class): def test_prediction_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_auto_ml.py b/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_auto_ml.py index ada18388cac1..d300978aa218 100644 --- a/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_auto_ml.py +++ b/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_auto_ml.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.automl_v1beta1.services.auto_ml import ( AutoMlAsyncClient, @@ -72,12 +72,21 @@ transports, ) from google.cloud.automl_v1beta1.types import ( + annotation_spec, + classification, + column_spec, + data_stats, + data_types, + dataset, + detection, + image, + io, + model, model_evaluation, operations, regression, service, -) -from google.cloud.automl_v1beta1.types import ( + table_spec, tables, text, text_extraction, @@ -85,16 +94,9 @@ translation, video, ) -from google.cloud.automl_v1beta1.types import annotation_spec, classification -from google.cloud.automl_v1beta1.types import column_spec from google.cloud.automl_v1beta1.types import column_spec as gca_column_spec -from google.cloud.automl_v1beta1.types import data_stats, data_types -from google.cloud.automl_v1beta1.types import dataset from google.cloud.automl_v1beta1.types import dataset as gca_dataset -from google.cloud.automl_v1beta1.types import detection, image, io -from google.cloud.automl_v1beta1.types import model from google.cloud.automl_v1beta1.types import model as gca_model -from google.cloud.automl_v1beta1.types import table_spec from google.cloud.automl_v1beta1.types import table_spec as gca_table_spec CRED_INFO_JSON = { @@ -932,10 +934,9 @@ def test_auto_ml_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +981,9 @@ def test_auto_ml_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1019,9 @@ def test_auto_ml_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1247,13 +1246,13 @@ def test_auto_ml_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3987,9 +3986,9 @@ def test_get_annotation_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_annotation_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_annotation_spec] = ( + mock_rpc + ) request = {} client.get_annotation_spec(request) @@ -4673,9 +4672,9 @@ def test_list_table_specs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_table_specs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_table_specs] = ( + mock_rpc + ) request = {} client.list_table_specs(request) @@ -5202,9 +5201,9 @@ def test_update_table_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_table_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_table_spec] = ( + mock_rpc + ) request = {} client.update_table_spec(request) @@ -5886,9 +5885,9 @@ def test_list_column_specs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_column_specs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_column_specs] = ( + mock_rpc + ) request = {} client.list_column_specs(request) @@ -6429,9 +6428,9 @@ def test_update_column_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_column_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_column_spec] = ( + mock_rpc + ) request = {} client.update_column_spec(request) @@ -9709,9 +9708,9 @@ def test_get_model_evaluation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_model_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_model_evaluation] = ( + mock_rpc + ) request = {} client.get_model_evaluation(request) @@ -10061,9 +10060,9 @@ def test_list_model_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_model_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_model_evaluations] = ( + mock_rpc + ) request = {} client.list_model_evaluations(request) @@ -11904,9 +11903,9 @@ def test_get_annotation_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_annotation_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_annotation_spec] = ( + mock_rpc + ) request = {} client.get_annotation_spec(request) @@ -12266,9 +12265,9 @@ def test_list_table_specs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_table_specs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_table_specs] = ( + mock_rpc + ) request = {} client.list_table_specs(request) @@ -12530,9 +12529,9 @@ def test_update_table_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_table_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_table_spec] = ( + mock_rpc + ) request = {} client.update_table_spec(request) @@ -12894,9 +12893,9 @@ def test_list_column_specs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_column_specs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_column_specs] = ( + mock_rpc + ) request = {} client.list_column_specs(request) @@ -13160,9 +13159,9 @@ def test_update_column_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_column_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_column_spec] = ( + mock_rpc + ) request = {} client.update_column_spec(request) @@ -14890,9 +14889,9 @@ def test_get_model_evaluation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_model_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_model_evaluation] = ( + mock_rpc + ) request = {} client.get_model_evaluation(request) @@ -15075,9 +15074,9 @@ def test_list_model_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_model_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_model_evaluations] = ( + mock_rpc + ) request = {} client.list_model_evaluations(request) @@ -16646,8 +16645,9 @@ def test_create_dataset_rest_bad_request(request_type=service.CreateDatasetReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16810,17 +16810,19 @@ def test_create_dataset_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_create_dataset" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_create_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_create_dataset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_create_dataset" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_create_dataset_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_create_dataset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16869,8 +16871,9 @@ def test_get_dataset_rest_bad_request(request_type=service.GetDatasetRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16939,17 +16942,15 @@ def test_get_dataset_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_get_dataset" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_get_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_get_dataset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoMlRestInterceptor, "post_get_dataset") as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_dataset_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_get_dataset") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16998,8 +16999,9 @@ def test_list_datasets_rest_bad_request(request_type=service.ListDatasetsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17060,17 +17062,17 @@ def test_list_datasets_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_list_datasets" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_list_datasets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_list_datasets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_list_datasets" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_list_datasets_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_list_datasets") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17123,8 +17125,9 @@ def test_update_dataset_rest_bad_request(request_type=service.UpdateDatasetReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17289,17 +17292,19 @@ def test_update_dataset_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_update_dataset" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_update_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_update_dataset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_update_dataset" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_update_dataset_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_update_dataset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17348,8 +17353,9 @@ def test_delete_dataset_rest_bad_request(request_type=service.DeleteDatasetReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17404,19 +17410,20 @@ def test_delete_dataset_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_delete_dataset" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_delete_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_delete_dataset" - ) as pre: + 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.AutoMlRestInterceptor, "post_delete_dataset" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_delete_dataset_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_delete_dataset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17465,8 +17472,9 @@ def test_import_data_rest_bad_request(request_type=service.ImportDataRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17521,19 +17529,16 @@ def test_import_data_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_import_data" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_import_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_import_data" - ) as pre: + 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.AutoMlRestInterceptor, "post_import_data") as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_import_data_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_import_data") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17582,8 +17587,9 @@ def test_export_data_rest_bad_request(request_type=service.ExportDataRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17638,19 +17644,16 @@ def test_export_data_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_export_data" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_export_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_export_data" - ) as pre: + 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.AutoMlRestInterceptor, "post_export_data") as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_export_data_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_export_data") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17703,8 +17706,9 @@ def test_get_annotation_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17771,17 +17775,19 @@ def test_get_annotation_spec_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_get_annotation_spec" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_get_annotation_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_get_annotation_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_annotation_spec" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_annotation_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_get_annotation_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17836,8 +17842,9 @@ def test_get_table_spec_rest_bad_request(request_type=service.GetTableSpecReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17910,17 +17917,19 @@ def test_get_table_spec_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_get_table_spec" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_get_table_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_get_table_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_table_spec" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_table_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_get_table_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17969,8 +17978,9 @@ def test_list_table_specs_rest_bad_request(request_type=service.ListTableSpecsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18031,17 +18041,19 @@ def test_list_table_specs_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_list_table_specs" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_list_table_specs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_list_table_specs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_list_table_specs" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_list_table_specs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_list_table_specs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18098,8 +18110,9 @@ def test_update_table_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18258,17 +18271,19 @@ def test_update_table_spec_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_update_table_spec" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_update_table_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_update_table_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_update_table_spec" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_update_table_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_update_table_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18319,8 +18334,9 @@ def test_get_column_spec_rest_bad_request(request_type=service.GetColumnSpecRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18387,17 +18403,19 @@ def test_get_column_spec_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_get_column_spec" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_get_column_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_get_column_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_column_spec" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_column_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_get_column_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18450,8 +18468,9 @@ def test_list_column_specs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18514,17 +18533,19 @@ def test_list_column_specs_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_list_column_specs" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_list_column_specs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_list_column_specs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_list_column_specs" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_list_column_specs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_list_column_specs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18581,8 +18602,9 @@ def test_update_column_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18756,17 +18778,19 @@ def test_update_column_spec_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_update_column_spec" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_update_column_spec_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_update_column_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_update_column_spec" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_update_column_spec_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_update_column_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18817,8 +18841,9 @@ def test_create_model_rest_bad_request(request_type=service.CreateModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19031,19 +19056,18 @@ def test_create_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_create_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_create_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_create_model" - ) as pre: + 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.AutoMlRestInterceptor, "post_create_model" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_create_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_create_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19092,8 +19116,9 @@ def test_get_model_rest_bad_request(request_type=service.GetModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19160,17 +19185,15 @@ def test_get_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_get_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_get_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_get_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoMlRestInterceptor, "post_get_model") as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_get_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19219,8 +19242,9 @@ def test_list_models_rest_bad_request(request_type=service.ListModelsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19281,17 +19305,15 @@ def test_list_models_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_list_models" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_list_models_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_list_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoMlRestInterceptor, "post_list_models") as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_list_models_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_list_models") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19340,8 +19362,9 @@ def test_delete_model_rest_bad_request(request_type=service.DeleteModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19396,19 +19419,18 @@ def test_delete_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_delete_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_delete_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_delete_model" - ) as pre: + 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.AutoMlRestInterceptor, "post_delete_model" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_delete_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_delete_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19457,8 +19479,9 @@ def test_deploy_model_rest_bad_request(request_type=service.DeployModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19513,19 +19536,18 @@ def test_deploy_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_deploy_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_deploy_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_deploy_model" - ) as pre: + 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.AutoMlRestInterceptor, "post_deploy_model" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_deploy_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_deploy_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19574,8 +19596,9 @@ def test_undeploy_model_rest_bad_request(request_type=service.UndeployModelReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19630,19 +19653,20 @@ def test_undeploy_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_undeploy_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_undeploy_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_undeploy_model" - ) as pre: + 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.AutoMlRestInterceptor, "post_undeploy_model" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_undeploy_model_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_undeploy_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19691,8 +19715,9 @@ def test_export_model_rest_bad_request(request_type=service.ExportModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19747,19 +19772,18 @@ def test_export_model_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_export_model" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_export_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_export_model" - ) as pre: + 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.AutoMlRestInterceptor, "post_export_model" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_export_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoMlRestInterceptor, "pre_export_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19810,8 +19834,9 @@ def test_export_evaluated_examples_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19866,19 +19891,21 @@ def test_export_evaluated_examples_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_export_evaluated_examples" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_export_evaluated_examples_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_export_evaluated_examples" - ) as pre: + 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.AutoMlRestInterceptor, "post_export_evaluated_examples" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, + "post_export_evaluated_examples_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_export_evaluated_examples" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19933,8 +19960,9 @@ def test_get_model_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20003,17 +20031,19 @@ def test_get_model_evaluation_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_get_model_evaluation" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_get_model_evaluation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_get_model_evaluation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_model_evaluation" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_get_model_evaluation_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_get_model_evaluation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20068,8 +20098,9 @@ def test_list_model_evaluations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20130,17 +20161,20 @@ def test_list_model_evaluations_rest_interceptors(null_interceptor): ) client = AutoMlClient(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.AutoMlRestInterceptor, "post_list_model_evaluations" - ) as post, mock.patch.object( - transports.AutoMlRestInterceptor, "post_list_model_evaluations_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoMlRestInterceptor, "pre_list_model_evaluations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoMlRestInterceptor, "post_list_model_evaluations" + ) as post, + mock.patch.object( + transports.AutoMlRestInterceptor, + "post_list_model_evaluations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutoMlRestInterceptor, "pre_list_model_evaluations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20786,11 +20820,14 @@ def test_auto_ml_base_transport(): def test_auto_ml_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.automl_v1beta1.services.auto_ml.transports.AutoMlTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.automl_v1beta1.services.auto_ml.transports.AutoMlTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutoMlTransport( @@ -20807,9 +20844,12 @@ def test_auto_ml_base_transport_with_credentials_file(): def test_auto_ml_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.automl_v1beta1.services.auto_ml.transports.AutoMlTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.automl_v1beta1.services.auto_ml.transports.AutoMlTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutoMlTransport() @@ -20881,11 +20921,12 @@ def test_auto_ml_transport_auth_gdch_credentials(transport_class): def test_auto_ml_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_prediction_service.py b/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_prediction_service.py index 01317e7fc499..5768abdae8f3 100644 --- a/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_prediction_service.py +++ b/packages/google-cloud-automl/tests/unit/gapic/automl_v1beta1/test_prediction_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,16 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.cloud.automl_v1beta1.services.prediction_service import ( PredictionServiceAsyncClient, @@ -996,10 +996,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1043,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1081,9 @@ def test_prediction_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1334,13 +1331,13 @@ def test_prediction_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2729,8 +2726,9 @@ def test_predict_rest_bad_request(request_type=prediction_service.PredictRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2790,17 +2788,19 @@ def test_predict_rest_interceptors(null_interceptor): ) client = PredictionServiceClient(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.PredictionServiceRestInterceptor, "post_predict" - ) as post, mock.patch.object( - transports.PredictionServiceRestInterceptor, "post_predict_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PredictionServiceRestInterceptor, "pre_predict" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "post_predict" + ) as post, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "post_predict_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "pre_predict" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2855,8 +2855,9 @@ def test_batch_predict_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2913,19 +2914,21 @@ def test_batch_predict_rest_interceptors(null_interceptor): ) client = PredictionServiceClient(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.PredictionServiceRestInterceptor, "post_batch_predict" - ) as post, mock.patch.object( - transports.PredictionServiceRestInterceptor, "post_batch_predict_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PredictionServiceRestInterceptor, "pre_batch_predict" - ) as pre: + 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.PredictionServiceRestInterceptor, "post_batch_predict" + ) as post, + mock.patch.object( + transports.PredictionServiceRestInterceptor, + "post_batch_predict_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PredictionServiceRestInterceptor, "pre_batch_predict" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3090,11 +3093,14 @@ def test_prediction_service_base_transport(): def test_prediction_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.automl_v1beta1.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.automl_v1beta1.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PredictionServiceTransport( @@ -3111,9 +3117,12 @@ def test_prediction_service_base_transport_with_credentials_file(): def test_prediction_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.automl_v1beta1.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.automl_v1beta1.services.prediction_service.transports.PredictionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PredictionServiceTransport() @@ -3185,11 +3194,12 @@ def test_prediction_service_transport_auth_gdch_credentials(transport_class): def test_prediction_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-backupdr/docs/conf.py b/packages/google-cloud-backupdr/docs/conf.py index 14ef596b1330..8eef560722ef 100644 --- a/packages/google-cloud-backupdr/docs/conf.py +++ b/packages/google-cloud-backupdr/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-backupdr documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/__init__.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/__init__.py index a2752e102651..fa24b2a46714 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/__init__.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.backup_dr import BackupDRAsyncClient, BackupDRClient from .services.backup_dr_protection_summary import ( BackupDrProtectionSummaryAsyncClient, diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/async_client.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/async_client.py index e2d5c90b56e6..e6ac7085e07e 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/async_client.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.backupdr_v1 import gapic_version as package_version @@ -44,17 +44,19 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.backupdr_v1.services.backup_dr import pagers from google.cloud.backupdr_v1.types import ( @@ -161,7 +163,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BackupDRAsyncClient: The constructed client. """ - return BackupDRClient.from_service_account_info.__func__(BackupDRAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BackupDRClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BackupDRAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -177,7 +180,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BackupDRAsyncClient: The constructed client. """ - return BackupDRClient.from_service_account_file.__func__(BackupDRAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BackupDRClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BackupDRAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/client.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/client.py index bd7ff4798831..15952a4fac03 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/client.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.backupdr_v1 import gapic_version as package_version @@ -61,17 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.backupdr_v1.services.backup_dr import pagers from google.cloud.backupdr_v1.types import ( @@ -895,11 +897,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackupDRClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackupDRClient._read_environment_variables() + ) self._client_cert_source = BackupDRClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -934,8 +934,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackupDRTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/pagers.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/pagers.py index 47ed1bcd23c2..da9050ae8711 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/pagers.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/pagers.py @@ -73,7 +73,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -149,7 +149,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -385,7 +385,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -461,7 +461,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -541,7 +541,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -617,7 +617,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -697,7 +697,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -773,7 +773,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -853,7 +853,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -931,7 +931,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1013,7 +1013,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1089,7 +1089,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1169,7 +1169,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1245,7 +1245,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1325,7 +1325,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1405,7 +1405,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1490,7 +1490,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1579,7 +1579,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1667,7 +1667,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1745,7 +1745,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1829,7 +1829,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1914,7 +1914,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/base.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/base.py index bbf3385198a7..5c9e5c0a0fc9 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/base.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.backupdr_v1 import gapic_version as package_version from google.cloud.backupdr_v1.types import ( @@ -902,13 +904,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc.py index ae742db7fe47..df4cf7cfd250 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.backupdr_v1.types import ( backupdr, @@ -535,12 +537,12 @@ def fetch_usable_backup_vaults( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_usable_backup_vaults" not in self._stubs: - self._stubs[ - "fetch_usable_backup_vaults" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchUsableBackupVaults", - request_serializer=backupvault.FetchUsableBackupVaultsRequest.serialize, - response_deserializer=backupvault.FetchUsableBackupVaultsResponse.deserialize, + self._stubs["fetch_usable_backup_vaults"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchUsableBackupVaults", + request_serializer=backupvault.FetchUsableBackupVaultsRequest.serialize, + response_deserializer=backupvault.FetchUsableBackupVaultsResponse.deserialize, + ) ) return self._stubs["fetch_usable_backup_vaults"] @@ -751,12 +753,12 @@ def fetch_backups_for_resource_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_backups_for_resource_type" not in self._stubs: - self._stubs[ - "fetch_backups_for_resource_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchBackupsForResourceType", - request_serializer=backupvault.FetchBackupsForResourceTypeRequest.serialize, - response_deserializer=backupvault.FetchBackupsForResourceTypeResponse.deserialize, + self._stubs["fetch_backups_for_resource_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchBackupsForResourceType", + request_serializer=backupvault.FetchBackupsForResourceTypeRequest.serialize, + response_deserializer=backupvault.FetchBackupsForResourceTypeResponse.deserialize, + ) ) return self._stubs["fetch_backups_for_resource_type"] @@ -1047,12 +1049,12 @@ def list_backup_plan_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_backup_plan_revisions" not in self._stubs: - self._stubs[ - "list_backup_plan_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanRevisions", - request_serializer=backupplan.ListBackupPlanRevisionsRequest.serialize, - response_deserializer=backupplan.ListBackupPlanRevisionsResponse.deserialize, + self._stubs["list_backup_plan_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanRevisions", + request_serializer=backupplan.ListBackupPlanRevisionsRequest.serialize, + response_deserializer=backupplan.ListBackupPlanRevisionsResponse.deserialize, + ) ) return self._stubs["list_backup_plan_revisions"] @@ -1078,12 +1080,12 @@ def create_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_backup_plan_association" not in self._stubs: - self._stubs[ - "create_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/CreateBackupPlanAssociation", - request_serializer=backupplanassociation.CreateBackupPlanAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/CreateBackupPlanAssociation", + request_serializer=backupplanassociation.CreateBackupPlanAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_backup_plan_association"] @@ -1109,12 +1111,12 @@ def update_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_backup_plan_association" not in self._stubs: - self._stubs[ - "update_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/UpdateBackupPlanAssociation", - request_serializer=backupplanassociation.UpdateBackupPlanAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/UpdateBackupPlanAssociation", + request_serializer=backupplanassociation.UpdateBackupPlanAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_backup_plan_association"] @@ -1140,12 +1142,12 @@ def get_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_backup_plan_association" not in self._stubs: - self._stubs[ - "get_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/GetBackupPlanAssociation", - request_serializer=backupplanassociation.GetBackupPlanAssociationRequest.serialize, - response_deserializer=backupplanassociation.BackupPlanAssociation.deserialize, + self._stubs["get_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/GetBackupPlanAssociation", + request_serializer=backupplanassociation.GetBackupPlanAssociationRequest.serialize, + response_deserializer=backupplanassociation.BackupPlanAssociation.deserialize, + ) ) return self._stubs["get_backup_plan_association"] @@ -1172,12 +1174,12 @@ def list_backup_plan_associations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_backup_plan_associations" not in self._stubs: - self._stubs[ - "list_backup_plan_associations" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanAssociations", - request_serializer=backupplanassociation.ListBackupPlanAssociationsRequest.serialize, - response_deserializer=backupplanassociation.ListBackupPlanAssociationsResponse.deserialize, + self._stubs["list_backup_plan_associations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanAssociations", + request_serializer=backupplanassociation.ListBackupPlanAssociationsRequest.serialize, + response_deserializer=backupplanassociation.ListBackupPlanAssociationsResponse.deserialize, + ) ) return self._stubs["list_backup_plan_associations"] @@ -1205,12 +1207,12 @@ def fetch_backup_plan_associations_for_resource_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_backup_plan_associations_for_resource_type" not in self._stubs: - self._stubs[ - "fetch_backup_plan_associations_for_resource_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchBackupPlanAssociationsForResourceType", - request_serializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeRequest.serialize, - response_deserializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse.deserialize, + self._stubs["fetch_backup_plan_associations_for_resource_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchBackupPlanAssociationsForResourceType", + request_serializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeRequest.serialize, + response_deserializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse.deserialize, + ) ) return self._stubs["fetch_backup_plan_associations_for_resource_type"] @@ -1236,12 +1238,12 @@ def delete_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_backup_plan_association" not in self._stubs: - self._stubs[ - "delete_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/DeleteBackupPlanAssociation", - request_serializer=backupplanassociation.DeleteBackupPlanAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/DeleteBackupPlanAssociation", + request_serializer=backupplanassociation.DeleteBackupPlanAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_backup_plan_association"] @@ -1325,12 +1327,12 @@ def list_data_source_references( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_data_source_references" not in self._stubs: - self._stubs[ - "list_data_source_references" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/ListDataSourceReferences", - request_serializer=datasourcereference.ListDataSourceReferencesRequest.serialize, - response_deserializer=datasourcereference.ListDataSourceReferencesResponse.deserialize, + self._stubs["list_data_source_references"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/ListDataSourceReferences", + request_serializer=datasourcereference.ListDataSourceReferencesRequest.serialize, + response_deserializer=datasourcereference.ListDataSourceReferencesResponse.deserialize, + ) ) return self._stubs["list_data_source_references"] @@ -1358,12 +1360,12 @@ def fetch_data_source_references_for_resource_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_data_source_references_for_resource_type" not in self._stubs: - self._stubs[ - "fetch_data_source_references_for_resource_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchDataSourceReferencesForResourceType", - request_serializer=datasourcereference.FetchDataSourceReferencesForResourceTypeRequest.serialize, - response_deserializer=datasourcereference.FetchDataSourceReferencesForResourceTypeResponse.deserialize, + self._stubs["fetch_data_source_references_for_resource_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchDataSourceReferencesForResourceType", + request_serializer=datasourcereference.FetchDataSourceReferencesForResourceTypeRequest.serialize, + response_deserializer=datasourcereference.FetchDataSourceReferencesForResourceTypeResponse.deserialize, + ) ) return self._stubs["fetch_data_source_references_for_resource_type"] diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc_asyncio.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc_asyncio.py index 1ea85b16888f..3c9f1d0ff52e 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc_asyncio.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.backupdr_v1.types import ( backupdr, @@ -553,12 +555,12 @@ def fetch_usable_backup_vaults( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_usable_backup_vaults" not in self._stubs: - self._stubs[ - "fetch_usable_backup_vaults" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchUsableBackupVaults", - request_serializer=backupvault.FetchUsableBackupVaultsRequest.serialize, - response_deserializer=backupvault.FetchUsableBackupVaultsResponse.deserialize, + self._stubs["fetch_usable_backup_vaults"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchUsableBackupVaults", + request_serializer=backupvault.FetchUsableBackupVaultsRequest.serialize, + response_deserializer=backupvault.FetchUsableBackupVaultsResponse.deserialize, + ) ) return self._stubs["fetch_usable_backup_vaults"] @@ -782,12 +784,12 @@ def fetch_backups_for_resource_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_backups_for_resource_type" not in self._stubs: - self._stubs[ - "fetch_backups_for_resource_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchBackupsForResourceType", - request_serializer=backupvault.FetchBackupsForResourceTypeRequest.serialize, - response_deserializer=backupvault.FetchBackupsForResourceTypeResponse.deserialize, + self._stubs["fetch_backups_for_resource_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchBackupsForResourceType", + request_serializer=backupvault.FetchBackupsForResourceTypeRequest.serialize, + response_deserializer=backupvault.FetchBackupsForResourceTypeResponse.deserialize, + ) ) return self._stubs["fetch_backups_for_resource_type"] @@ -1092,12 +1094,12 @@ def list_backup_plan_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_backup_plan_revisions" not in self._stubs: - self._stubs[ - "list_backup_plan_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanRevisions", - request_serializer=backupplan.ListBackupPlanRevisionsRequest.serialize, - response_deserializer=backupplan.ListBackupPlanRevisionsResponse.deserialize, + self._stubs["list_backup_plan_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanRevisions", + request_serializer=backupplan.ListBackupPlanRevisionsRequest.serialize, + response_deserializer=backupplan.ListBackupPlanRevisionsResponse.deserialize, + ) ) return self._stubs["list_backup_plan_revisions"] @@ -1123,12 +1125,12 @@ def create_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_backup_plan_association" not in self._stubs: - self._stubs[ - "create_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/CreateBackupPlanAssociation", - request_serializer=backupplanassociation.CreateBackupPlanAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/CreateBackupPlanAssociation", + request_serializer=backupplanassociation.CreateBackupPlanAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_backup_plan_association"] @@ -1154,12 +1156,12 @@ def update_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_backup_plan_association" not in self._stubs: - self._stubs[ - "update_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/UpdateBackupPlanAssociation", - request_serializer=backupplanassociation.UpdateBackupPlanAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/UpdateBackupPlanAssociation", + request_serializer=backupplanassociation.UpdateBackupPlanAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_backup_plan_association"] @@ -1185,12 +1187,12 @@ def get_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_backup_plan_association" not in self._stubs: - self._stubs[ - "get_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/GetBackupPlanAssociation", - request_serializer=backupplanassociation.GetBackupPlanAssociationRequest.serialize, - response_deserializer=backupplanassociation.BackupPlanAssociation.deserialize, + self._stubs["get_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/GetBackupPlanAssociation", + request_serializer=backupplanassociation.GetBackupPlanAssociationRequest.serialize, + response_deserializer=backupplanassociation.BackupPlanAssociation.deserialize, + ) ) return self._stubs["get_backup_plan_association"] @@ -1217,12 +1219,12 @@ def list_backup_plan_associations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_backup_plan_associations" not in self._stubs: - self._stubs[ - "list_backup_plan_associations" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanAssociations", - request_serializer=backupplanassociation.ListBackupPlanAssociationsRequest.serialize, - response_deserializer=backupplanassociation.ListBackupPlanAssociationsResponse.deserialize, + self._stubs["list_backup_plan_associations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/ListBackupPlanAssociations", + request_serializer=backupplanassociation.ListBackupPlanAssociationsRequest.serialize, + response_deserializer=backupplanassociation.ListBackupPlanAssociationsResponse.deserialize, + ) ) return self._stubs["list_backup_plan_associations"] @@ -1252,12 +1254,12 @@ def fetch_backup_plan_associations_for_resource_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_backup_plan_associations_for_resource_type" not in self._stubs: - self._stubs[ - "fetch_backup_plan_associations_for_resource_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchBackupPlanAssociationsForResourceType", - request_serializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeRequest.serialize, - response_deserializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse.deserialize, + self._stubs["fetch_backup_plan_associations_for_resource_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchBackupPlanAssociationsForResourceType", + request_serializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeRequest.serialize, + response_deserializer=backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse.deserialize, + ) ) return self._stubs["fetch_backup_plan_associations_for_resource_type"] @@ -1283,12 +1285,12 @@ def delete_backup_plan_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_backup_plan_association" not in self._stubs: - self._stubs[ - "delete_backup_plan_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/DeleteBackupPlanAssociation", - request_serializer=backupplanassociation.DeleteBackupPlanAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_backup_plan_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/DeleteBackupPlanAssociation", + request_serializer=backupplanassociation.DeleteBackupPlanAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_backup_plan_association"] @@ -1373,12 +1375,12 @@ def list_data_source_references( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_data_source_references" not in self._stubs: - self._stubs[ - "list_data_source_references" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/ListDataSourceReferences", - request_serializer=datasourcereference.ListDataSourceReferencesRequest.serialize, - response_deserializer=datasourcereference.ListDataSourceReferencesResponse.deserialize, + self._stubs["list_data_source_references"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/ListDataSourceReferences", + request_serializer=datasourcereference.ListDataSourceReferencesRequest.serialize, + response_deserializer=datasourcereference.ListDataSourceReferencesResponse.deserialize, + ) ) return self._stubs["list_data_source_references"] @@ -1406,12 +1408,12 @@ def fetch_data_source_references_for_resource_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_data_source_references_for_resource_type" not in self._stubs: - self._stubs[ - "fetch_data_source_references_for_resource_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDR/FetchDataSourceReferencesForResourceType", - request_serializer=datasourcereference.FetchDataSourceReferencesForResourceTypeRequest.serialize, - response_deserializer=datasourcereference.FetchDataSourceReferencesForResourceTypeResponse.deserialize, + self._stubs["fetch_data_source_references_for_resource_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDR/FetchDataSourceReferencesForResourceType", + request_serializer=datasourcereference.FetchDataSourceReferencesForResourceTypeRequest.serialize, + response_deserializer=datasourcereference.FetchDataSourceReferencesForResourceTypeResponse.deserialize, + ) ) return self._stubs["fetch_data_source_references_for_resource_type"] diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest.py index 850a894716f5..2d8802ec5030 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2655,7 +2657,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2782,9 +2784,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseCreateBackupPlanAssociation._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseCreateBackupPlanAssociation._get_http_options() request, metadata = self._interceptor.pre_create_backup_plan_association( request, metadata @@ -2810,7 +2810,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2851,11 +2851,10 @@ def __call__( resp = self._interceptor.post_create_backup_plan_association(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_backup_plan_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_backup_plan_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2966,7 +2965,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3092,9 +3091,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseCreateManagementServer._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseCreateManagementServer._get_http_options() request, metadata = self._interceptor.pre_create_management_server( request, metadata @@ -3120,7 +3117,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3268,7 +3265,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3417,7 +3414,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3542,9 +3539,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseDeleteBackupPlanAssociation._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseDeleteBackupPlanAssociation._get_http_options() request, metadata = self._interceptor.pre_delete_backup_plan_association( request, metadata @@ -3566,7 +3561,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3606,11 +3601,10 @@ def __call__( resp = self._interceptor.post_delete_backup_plan_association(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_backup_plan_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_backup_plan_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3716,7 +3710,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3840,9 +3834,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseDeleteManagementServer._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseDeleteManagementServer._get_http_options() request, metadata = self._interceptor.pre_delete_management_server( request, metadata @@ -3864,7 +3856,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3993,15 +3985,12 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseFetchBackupPlanAssociationsForResourceType._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseFetchBackupPlanAssociationsForResourceType._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_fetch_backup_plan_associations_for_resource_type( - request, metadata + request, metadata = ( + self._interceptor.pre_fetch_backup_plan_associations_for_resource_type( + request, metadata + ) ) transcoded_request = _BaseBackupDRRestTransport._BaseFetchBackupPlanAssociationsForResourceType._get_transcoded_request( http_options, request @@ -4055,9 +4044,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse() - ) + resp = backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse() pb_resp = backupplanassociation.FetchBackupPlanAssociationsForResourceTypeResponse.pb( resp ) @@ -4070,11 +4057,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_backup_plan_associations_for_resource_type_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_backup_plan_associations_for_resource_type_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4159,9 +4145,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseFetchBackupsForResourceType._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseFetchBackupsForResourceType._get_http_options() request, metadata = self._interceptor.pre_fetch_backups_for_resource_type( request, metadata @@ -4225,11 +4209,10 @@ def __call__( resp = self._interceptor.post_fetch_backups_for_resource_type(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_backups_for_resource_type_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_backups_for_resource_type_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4321,15 +4304,12 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseFetchDataSourceReferencesForResourceType._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseFetchDataSourceReferencesForResourceType._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_fetch_data_source_references_for_resource_type( - request, metadata + request, metadata = ( + self._interceptor.pre_fetch_data_source_references_for_resource_type( + request, metadata + ) ) transcoded_request = _BaseBackupDRRestTransport._BaseFetchDataSourceReferencesForResourceType._get_transcoded_request( http_options, request @@ -4400,11 +4380,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_data_source_references_for_resource_type_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_data_source_references_for_resource_type_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4489,9 +4468,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseFetchUsableBackupVaults._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseFetchUsableBackupVaults._get_http_options() request, metadata = self._interceptor.pre_fetch_usable_backup_vaults( request, metadata @@ -4940,9 +4917,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseGetBackupPlanAssociation._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseGetBackupPlanAssociation._get_http_options() request, metadata = self._interceptor.pre_get_backup_plan_association( request, metadata @@ -5091,9 +5066,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseGetBackupPlanRevision._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseGetBackupPlanRevision._get_http_options() request, metadata = self._interceptor.pre_get_backup_plan_revision( request, metadata @@ -5546,9 +5519,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseGetDataSourceReference._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseGetDataSourceReference._get_http_options() request, metadata = self._interceptor.pre_get_data_source_reference( request, metadata @@ -5876,7 +5847,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6001,9 +5972,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseListBackupPlanAssociations._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseListBackupPlanAssociations._get_http_options() request, metadata = self._interceptor.pre_list_backup_plan_associations( request, metadata @@ -6067,11 +6036,10 @@ def __call__( resp = self._interceptor.post_list_backup_plan_associations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_backup_plan_associations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_backup_plan_associations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6156,9 +6124,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseListBackupPlanRevisions._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseListBackupPlanRevisions._get_http_options() request, metadata = self._interceptor.pre_list_backup_plan_revisions( request, metadata @@ -6761,9 +6727,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseListDataSourceReferences._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseListDataSourceReferences._get_http_options() request, metadata = self._interceptor.pre_list_data_source_references( request, metadata @@ -7069,9 +7033,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseListManagementServers._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseListManagementServers._get_http_options() request, metadata = self._interceptor.pre_list_management_servers( request, metadata @@ -7252,7 +7214,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7408,7 +7370,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7562,7 +7524,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7720,7 +7682,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7847,9 +7809,7 @@ def __call__( """ - http_options = ( - _BaseBackupDRRestTransport._BaseUpdateBackupPlanAssociation._get_http_options() - ) + http_options = _BaseBackupDRRestTransport._BaseUpdateBackupPlanAssociation._get_http_options() request, metadata = self._interceptor.pre_update_backup_plan_association( request, metadata @@ -7875,7 +7835,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7916,11 +7876,10 @@ def __call__( resp = self._interceptor.post_update_backup_plan_association(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_backup_plan_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_backup_plan_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8032,7 +7991,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8190,7 +8149,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8274,7 +8233,9 @@ def create_backup_plan_association( ]: # 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._CreateBackupPlanAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateBackupPlanAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_backup_vault( @@ -8290,7 +8251,9 @@ def create_management_server( ) -> Callable[[backupdr.CreateManagementServerRequest], 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._CreateManagementServer(self._session, self._host, self._interceptor) # type: ignore + return self._CreateManagementServer( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_backup( @@ -8317,7 +8280,9 @@ def delete_backup_plan_association( ]: # 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._DeleteBackupPlanAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteBackupPlanAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_backup_vault( @@ -8333,7 +8298,9 @@ def delete_management_server( ) -> Callable[[backupdr.DeleteManagementServerRequest], 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._DeleteManagementServer(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteManagementServer( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_backup_plan_associations_for_resource_type( @@ -8344,7 +8311,9 @@ def fetch_backup_plan_associations_for_resource_type( ]: # 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._FetchBackupPlanAssociationsForResourceType(self._session, self._host, self._interceptor) # type: ignore + return self._FetchBackupPlanAssociationsForResourceType( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_backups_for_resource_type( @@ -8355,7 +8324,9 @@ def fetch_backups_for_resource_type( ]: # 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._FetchBackupsForResourceType(self._session, self._host, self._interceptor) # type: ignore + return self._FetchBackupsForResourceType( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_data_source_references_for_resource_type( @@ -8366,7 +8337,9 @@ def fetch_data_source_references_for_resource_type( ]: # 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._FetchDataSourceReferencesForResourceType(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDataSourceReferencesForResourceType( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_usable_backup_vaults( @@ -8377,7 +8350,9 @@ def fetch_usable_backup_vaults( ]: # 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._FetchUsableBackupVaults(self._session, self._host, self._interceptor) # type: ignore + return self._FetchUsableBackupVaults( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backup( @@ -8404,7 +8379,9 @@ def get_backup_plan_association( ]: # 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._GetBackupPlanAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._GetBackupPlanAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backup_plan_revision( @@ -8441,7 +8418,9 @@ def get_data_source_reference( ]: # 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._GetDataSourceReference(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataSourceReference( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_management_server( @@ -8468,7 +8447,9 @@ def list_backup_plan_associations( ]: # 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._ListBackupPlanAssociations(self._session, self._host, self._interceptor) # type: ignore + return self._ListBackupPlanAssociations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_backup_plan_revisions( @@ -8479,7 +8460,9 @@ def list_backup_plan_revisions( ]: # 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._ListBackupPlanRevisions(self._session, self._host, self._interceptor) # type: ignore + return self._ListBackupPlanRevisions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_backup_plans( @@ -8518,7 +8501,9 @@ def list_data_source_references( ]: # 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._ListDataSourceReferences(self._session, self._host, self._interceptor) # type: ignore + return self._ListDataSourceReferences( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_data_sources( @@ -8583,7 +8568,9 @@ def update_backup_plan_association( ]: # 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._UpdateBackupPlanAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateBackupPlanAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_backup_vault( diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest_base.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest_base.py index 8d686adec184..c2c4bc1e49e8 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest_base.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/async_client.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/async_client.py index 1725d3b6b4b4..eb5b12ed4b1e 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/async_client.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.backupdr_v1 import gapic_version as package_version @@ -45,8 +45,10 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.backupdr_v1.services.backup_dr_protection_summary import pagers @@ -130,7 +132,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BackupDrProtectionSummaryAsyncClient: The constructed client. """ - return BackupDrProtectionSummaryClient.from_service_account_info.__func__(BackupDrProtectionSummaryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + BackupDrProtectionSummaryClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func(BackupDrProtectionSummaryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +151,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BackupDrProtectionSummaryAsyncClient: The constructed client. """ - return BackupDrProtectionSummaryClient.from_service_account_file.__func__(BackupDrProtectionSummaryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + BackupDrProtectionSummaryClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + BackupDrProtectionSummaryAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -184,7 +194,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return BackupDrProtectionSummaryClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return BackupDrProtectionSummaryClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> BackupDrProtectionSummaryTransport: diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/client.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/client.py index 0181cd69131e..064a8487af0d 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/client.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.backupdr_v1 import gapic_version as package_version @@ -62,8 +62,10 @@ _LOGGER = std_logging.getLogger(__name__) from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.backupdr_v1.services.backup_dr_protection_summary import pagers @@ -83,9 +85,7 @@ class BackupDrProtectionSummaryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BackupDrProtectionSummaryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BackupDrProtectionSummaryTransport]] _transport_registry["grpc"] = BackupDrProtectionSummaryGrpcTransport _transport_registry["grpc_asyncio"] = BackupDrProtectionSummaryGrpcAsyncIOTransport _transport_registry["rest"] = BackupDrProtectionSummaryRestTransport @@ -631,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackupDrProtectionSummaryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackupDrProtectionSummaryClient._read_environment_variables() + ) self._client_cert_source = ( BackupDrProtectionSummaryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -672,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackupDrProtectionSummaryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/pagers.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/pagers.py index ce119ada6e5e..3e405b3c239b 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/pagers.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/__init__.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/__init__.py index 103fc6a34295..5c5e36c2e32e 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/__init__.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[BackupDrProtectionSummaryTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[BackupDrProtectionSummaryTransport]] _transport_registry["grpc"] = BackupDrProtectionSummaryGrpcTransport _transport_registry["grpc_asyncio"] = BackupDrProtectionSummaryGrpcAsyncIOTransport _transport_registry["rest"] = BackupDrProtectionSummaryRestTransport diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/base.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/base.py index 01231fa6965c..c6b3a6493f84 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/base.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.backupdr_v1 import gapic_version as package_version from google.cloud.backupdr_v1.types import protection_summary @@ -246,13 +248,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc.py index f51a998d9a33..517ebfe9ec32 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.backupdr_v1.types import protection_summary @@ -347,12 +349,12 @@ def list_resource_backup_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_resource_backup_configs" not in self._stubs: - self._stubs[ - "list_resource_backup_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDrProtectionSummary/ListResourceBackupConfigs", - request_serializer=protection_summary.ListResourceBackupConfigsRequest.serialize, - response_deserializer=protection_summary.ListResourceBackupConfigsResponse.deserialize, + self._stubs["list_resource_backup_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDrProtectionSummary/ListResourceBackupConfigs", + request_serializer=protection_summary.ListResourceBackupConfigsRequest.serialize, + response_deserializer=protection_summary.ListResourceBackupConfigsResponse.deserialize, + ) ) return self._stubs["list_resource_backup_configs"] diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc_asyncio.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc_asyncio.py index 1895493143cb..803f4b9ad8b5 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc_asyncio.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.backupdr_v1.types import protection_summary @@ -355,12 +357,12 @@ def list_resource_backup_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_resource_backup_configs" not in self._stubs: - self._stubs[ - "list_resource_backup_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.backupdr.v1.BackupDrProtectionSummary/ListResourceBackupConfigs", - request_serializer=protection_summary.ListResourceBackupConfigsRequest.serialize, - response_deserializer=protection_summary.ListResourceBackupConfigsResponse.deserialize, + self._stubs["list_resource_backup_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.backupdr.v1.BackupDrProtectionSummary/ListResourceBackupConfigs", + request_serializer=protection_summary.ListResourceBackupConfigsRequest.serialize, + response_deserializer=protection_summary.ListResourceBackupConfigsResponse.deserialize, + ) ) return self._stubs["list_resource_backup_configs"] diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest.py index 0230d3ef62c5..f3c0a6984b67 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -511,9 +513,7 @@ def __call__( """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseListResourceBackupConfigs._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseListResourceBackupConfigs._get_http_options() request, metadata = self._interceptor.pre_list_resource_backup_configs( request, metadata @@ -616,7 +616,9 @@ def list_resource_backup_configs( ]: # 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._ListResourceBackupConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListResourceBackupConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -676,9 +678,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseBackupDrProtectionSummaryRestTransport._BaseGetLocation._get_transcoded_request( @@ -819,9 +819,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseBackupDrProtectionSummaryRestTransport._BaseListLocations._get_transcoded_request( @@ -962,9 +960,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseBackupDrProtectionSummaryRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1106,9 +1102,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseBackupDrProtectionSummaryRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1255,9 +1249,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1401,9 +1393,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1523,9 +1513,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1643,9 +1631,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseBackupDrProtectionSummaryRestTransport._BaseGetOperation._get_transcoded_request( @@ -1786,9 +1772,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseBackupDrProtectionSummaryRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseBackupDrProtectionSummaryRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseBackupDrProtectionSummaryRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest_base.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest_base.py index 9652ff7ba879..95c19a66ebce 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest_base.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/services/backup_dr_protection_summary/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/__init__.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/__init__.py index 93036c68775b..d01a8ef3992b 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/__init__.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/__init__.py @@ -98,7 +98,9 @@ UpdateBackupVaultRequest, UpdateDataSourceRequest, ) -from .backupvault_ba import BackupApplianceBackupProperties +from .backupvault_ba import ( + BackupApplianceBackupProperties, +) from .backupvault_cloudsql import ( CloudSqlInstanceBackupPlanAssociationProperties, CloudSqlInstanceBackupProperties, diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupdr.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupdr.py index 376c9929660b..6badb9df307f 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupdr.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupdr.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore from google.cloud.backupdr_v1.types import backupvault_cloudsql @@ -69,6 +69,7 @@ class PeeringMode(proto.Enum): provides an IP address range for multiple Google Cloud services, including Cloud BackupDR. """ + PEERING_MODE_UNSPECIFIED = 0 PRIVATE_SERVICE_ACCESS = 1 @@ -227,6 +228,7 @@ class InstanceType(proto.Enum): Instance for backup and restore management (i.e., AGM). """ + INSTANCE_TYPE_UNSPECIFIED = 0 BACKUP_RESTORE = 1 @@ -260,6 +262,7 @@ class InstanceState(proto.Enum): from the statusMessage field of Instance resource. """ + INSTANCE_STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplan.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplan.py index eab394c22b70..11fa54a7c446 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplan.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplan.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import month_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.month_pb2 as month_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -141,6 +141,7 @@ class State(proto.Enum): UPDATING (5): The resource is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -350,6 +351,7 @@ class RecurrenceType(proto.Enum): YEARLY (5): The ``BackupRule`` is to be applied yearly. """ + RECURRENCE_TYPE_UNSPECIFIED = 0 HOURLY = 1 DAILY = 2 @@ -458,6 +460,7 @@ class WeekOfMonth(proto.Enum): LAST (5): The last week of the month. """ + WEEK_OF_MONTH_UNSPECIFIED = 0 FIRST = 1 SECOND = 2 @@ -789,6 +792,7 @@ class State(proto.Enum): The resource has been created but is not usable. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplanassociation.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplanassociation.py index 22d7f37ecca3..8ba8f5dffeef 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplanassociation.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupplanassociation.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.backupdr_v1.types import backupvault_cloudsql @@ -127,6 +127,7 @@ class State(proto.Enum): UPDATING (5): The resource is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -223,6 +224,7 @@ class LastBackupState(proto.Enum): FAILED (4): The last backup operation failed. """ + LAST_BACKUP_STATE_UNSPECIFIED = 0 FIRST_BACKUP_PENDING = 1 PERMISSION_DENIED = 2 @@ -373,12 +375,12 @@ class ListBackupPlanAssociationsResponse(proto.Message): def raw_page(self): return self - backup_plan_associations: MutableSequence[ - "BackupPlanAssociation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="BackupPlanAssociation", + backup_plan_associations: MutableSequence["BackupPlanAssociation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="BackupPlanAssociation", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -481,12 +483,12 @@ class FetchBackupPlanAssociationsForResourceTypeResponse(proto.Message): def raw_page(self): return self - backup_plan_associations: MutableSequence[ - "BackupPlanAssociation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="BackupPlanAssociation", + backup_plan_associations: MutableSequence["BackupPlanAssociation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="BackupPlanAssociation", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault.py index 6159e75a7647..1f2705391802 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.backupdr_v1.types import ( @@ -91,6 +91,7 @@ class BackupConfigState(proto.Enum): The data source is no longer protected (but may have backups under it) """ + BACKUP_CONFIG_STATE_UNSPECIFIED = 0 ACTIVE = 1 PASSIVE = 2 @@ -111,6 +112,7 @@ class BackupView(proto.Enum): This is the default value (for both ListBackups and GetBackup). """ + BACKUP_VIEW_UNSPECIFIED = 0 BACKUP_VIEW_BASIC = 1 BACKUP_VIEW_FULL = 2 @@ -132,6 +134,7 @@ class BackupVaultView(proto.Enum): This is the default value (for both ListBackupVaults and GetBackupVault). """ + BACKUP_VAULT_VIEW_UNSPECIFIED = 0 BACKUP_VAULT_VIEW_BASIC = 1 BACKUP_VAULT_VIEW_FULL = 2 @@ -255,6 +258,7 @@ class BackupRetentionInheritance(proto.Enum): together and have the same value. Invalid update requests will be rejected by the server. """ + BACKUP_RETENTION_INHERITANCE_UNSPECIFIED = 0 INHERIT_VAULT_RETENTION = 1 MATCH_BACKUP_EXPIRE_TIME = 2 @@ -278,6 +282,7 @@ class State(proto.Enum): UPDATING (5): The backup vault is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -306,6 +311,7 @@ class AccessRestriction(proto.Enum): current organization will be denied except for backup appliance. """ + ACCESS_RESTRICTION_UNSPECIFIED = 0 WITHIN_PROJECT = 1 WITHIN_ORGANIZATION = 2 @@ -522,6 +528,7 @@ class State(proto.Enum): The data source is experiencing an issue and might be unusable. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -650,6 +657,7 @@ class LastBackupState(proto.Enum): The most recent backup could not be run/failed because of the lack of permissions """ + LAST_BACKUP_STATE_UNSPECIFIED = 0 FIRST_BACKUP_PENDING = 1 SUCCEEDED = 2 @@ -1192,6 +1200,7 @@ class State(proto.Enum): UPLOADING (5): The backup is being uploaded. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -1212,6 +1221,7 @@ class BackupType(proto.Enum): ON_DEMAND_OPERATIONAL (3): Operational backup. """ + BACKUP_TYPE_UNSPECIFIED = 0 SCHEDULED = 1 ON_DEMAND = 2 diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_ba.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_ba.py index c203566a770c..cb2afd87c121 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_ba.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_ba.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_cloudsql.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_cloudsql.py index f34bde2f8946..2ffa329e79df 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_cloudsql.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_cloudsql.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -188,6 +188,7 @@ class Edition(proto.Enum): ENTERPRISE_PLUS (2): Enterprise Plus edition. """ + EDITION_UNSPECIFIED = 0 ENTERPRISE = 1 ENTERPRISE_PLUS = 2 diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_disk.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_disk.py index 02c7ab10a04a..90704e09550c 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_disk.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_disk.py @@ -195,6 +195,7 @@ class AccessMode(proto.Enum): The AccessMode means the disk can be attached to multiple instances in RO mode. """ + READ_WRITE_SINGLE = 0 READ_WRITE_MANY = 1 READ_ONLY_MANY = 2 @@ -210,6 +211,7 @@ class Architecture(proto.Enum): ARM64 (2): Disks with architecture ARM64 """ + ARCHITECTURE_UNSPECIFIED = 0 X86_64 = 1 ARM64 = 2 @@ -233,12 +235,12 @@ class Architecture(proto.Enum): proto.STRING, number=4, ) - guest_os_feature: MutableSequence[ - backupvault_gce.GuestOsFeature - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=backupvault_gce.GuestOsFeature, + guest_os_feature: MutableSequence[backupvault_gce.GuestOsFeature] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=backupvault_gce.GuestOsFeature, + ) ) disk_encryption_key: backupvault_gce.CustomerEncryptionKey = proto.Field( proto.MESSAGE, @@ -367,6 +369,7 @@ class Architecture(proto.Enum): ARM64 (2): Disks with architecture ARM64 """ + ARCHITECTURE_UNSPECIFIED = 0 X86_64 = 1 ARM64 = 2 @@ -380,12 +383,12 @@ class Architecture(proto.Enum): proto.STRING, number=2, ) - guest_os_feature: MutableSequence[ - backupvault_gce.GuestOsFeature - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=backupvault_gce.GuestOsFeature, + guest_os_feature: MutableSequence[backupvault_gce.GuestOsFeature] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=backupvault_gce.GuestOsFeature, + ) ) architecture: Architecture = proto.Field( proto.ENUM, diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_gce.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_gce.py index 9c0a89e1bc34..85563eb8213d 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_gce.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/backupvault_gce.py @@ -64,6 +64,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 0 NONE = 1 STOP = 2 @@ -413,6 +414,7 @@ class InstancePrivateIpv6GoogleAccess(proto.Enum): network interface will be assigned an internal IPv6 prefix if it doesn't have before. """ + INSTANCE_PRIVATE_IPV6_GOOGLE_ACCESS_UNSPECIFIED = 0 INHERIT_FROM_SUBNETWORK = 1 ENABLE_OUTBOUND_VM_ACCESS_TO_GOOGLE = 2 @@ -965,6 +967,7 @@ class StackType(proto.Enum): The network interface can have both IPv4 and IPv6 addresses. """ + STACK_TYPE_UNSPECIFIED = 0 IPV4_ONLY = 1 IPV4_IPV6 = 2 @@ -983,6 +986,7 @@ class Ipv6AccessType(proto.Enum): This network interface can have external IPv6. """ + UNSPECIFIED_IPV6_ACCESS_TYPE = 0 INTERNAL = 1 EXTERNAL = 2 @@ -998,6 +1002,7 @@ class NicType(proto.Enum): GVNIC (2): GVNIC """ + NIC_TYPE_UNSPECIFIED = 0 VIRTIO_NET = 1 GVNIC = 2 @@ -1101,6 +1106,7 @@ class Tier(proto.Enum): TIER_1 (2): Tier 1 network performance config. """ + TIER_UNSPECIFIED = 0 DEFAULT = 1 TIER_1 = 2 @@ -1177,6 +1183,7 @@ class AccessType(proto.Enum): DIRECT_IPV6 (2): Direct IPv6 access. """ + ACCESS_TYPE_UNSPECIFIED = 0 ONE_TO_ONE_NAT = 1 DIRECT_IPV6 = 2 @@ -1195,6 +1202,7 @@ class NetworkTier(proto.Enum): Public internet quality, only limited support for other networking products. """ + NETWORK_TIER_UNSPECIFIED = 0 PREMIUM = 1 STANDARD = 2 @@ -1331,6 +1339,7 @@ class Type(proto.Enum): Must specify key value fields for specifying the reservations. """ + TYPE_UNSPECIFIED = 0 NO_RESERVATION = 1 ANY_RESERVATION = 2 @@ -1421,6 +1430,7 @@ class OnHostMaintenance(proto.Enum): automatically migrate instances out of the way of maintenance events. """ + ON_HOST_MAINTENANCE_UNSPECIFIED = 0 TERMINATE = 1 MIGRATE = 1000 @@ -1437,6 +1447,7 @@ class ProvisioningModel(proto.Enum): SPOT (2): Heavily discounted, no guaranteed runtime. """ + PROVISIONING_MODEL_UNSPECIFIED = 0 STANDARD = 1 SPOT = 2 @@ -1453,6 +1464,7 @@ class InstanceTerminationAction(proto.Enum): Stop the VM without storing in-memory content. default action. """ + INSTANCE_TERMINATION_ACTION_UNSPECIFIED = 0 DELETE = 1 STOP = 2 @@ -1493,6 +1505,7 @@ class Operator(proto.Enum): Requires Compute Engine to avoid certain nodes. """ + OPERATOR_UNSPECIFIED = 0 IN = 1 NOT_IN = 2 @@ -1738,6 +1751,7 @@ class DiskType(proto.Enum): PERSISTENT (2): A persistent disk type. """ + DISK_TYPE_UNSPECIFIED = 0 SCRATCH = 1 PERSISTENT = 2 @@ -1763,6 +1777,7 @@ class DiskMode(proto.Enum): a disk to prevent mounting the disk while it is being snapshotted. """ + DISK_MODE_UNSPECIFIED = 0 READ_WRITE = 1 READ_ONLY = 2 @@ -1783,6 +1798,7 @@ class DiskInterface(proto.Enum): ISCSI (4): ISCSI Disk Interface. """ + DISK_INTERFACE_UNSPECIFIED = 0 SCSI = 1 NVME = 2 @@ -1798,6 +1814,7 @@ class DiskSavedState(proto.Enum): PRESERVED (1): Disk state has been preserved. """ + DISK_SAVED_STATE_UNSPECIFIED = 0 PRESERVED = 1 @@ -1969,6 +1986,7 @@ class FeatureType(proto.Enum): SEV_LIVE_MIGRATABLE_V2 (14): SEV_LIVE_MIGRATABLE_V2 feature type. """ + FEATURE_TYPE_UNSPECIFIED = 0 VIRTIO_SCSI_MULTIQUEUE = 1 WINDOWS = 2 diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/datasourcereference.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/datasourcereference.py index 9b92db143850..a4d5afa672ef 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/datasourcereference.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/datasourcereference.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.backupdr_v1.types import backupvault, backupvault_cloudsql @@ -283,12 +283,12 @@ class ListDataSourceReferencesResponse(proto.Message): def raw_page(self): return self - data_source_references: MutableSequence[ - "DataSourceReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="DataSourceReference", + data_source_references: MutableSequence["DataSourceReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="DataSourceReference", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -395,12 +395,12 @@ class FetchDataSourceReferencesForResourceTypeResponse(proto.Message): def raw_page(self): return self - data_source_references: MutableSequence[ - "DataSourceReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="DataSourceReference", + data_source_references: MutableSequence["DataSourceReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="DataSourceReference", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/protection_summary.py b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/protection_summary.py index a2d6b637d386..ffd46ebfcd3c 100644 --- a/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/protection_summary.py +++ b/packages/google-cloud-backupdr/google/cloud/backupdr_v1/types/protection_summary.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -99,12 +99,12 @@ class ListResourceBackupConfigsResponse(proto.Message): def raw_page(self): return self - resource_backup_configs: MutableSequence[ - "ResourceBackupConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ResourceBackupConfig", + resource_backup_configs: MutableSequence["ResourceBackupConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ResourceBackupConfig", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -174,6 +174,7 @@ class ResourceType(proto.Enum): COMPUTE_ENGINE_REGIONAL_DISK (4): Compute Engine Regional Disk. """ + RESOURCE_TYPE_UNSPECIFIED = 0 CLOUD_SQL_INSTANCE = 1 COMPUTE_ENGINE_VM = 2 @@ -206,12 +207,12 @@ class ResourceType(proto.Enum): proto.STRING, number=6, ) - backup_configs_details: MutableSequence[ - "BackupConfigDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="BackupConfigDetails", + backup_configs_details: MutableSequence["BackupConfigDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="BackupConfigDetails", + ) ) backup_configured: bool = proto.Field( proto.BOOL, @@ -305,6 +306,7 @@ class Type(proto.Enum): Backup config is Google Cloud Backup and DR's Template. """ + TYPE_UNSPECIFIED = 0 CLOUD_SQL_INSTANCE_BACKUP_CONFIG = 1 COMPUTE_ENGINE_RESOURCE_POLICY = 2 @@ -331,6 +333,7 @@ class State(proto.Enum): Like the source project is deleted. For eg. PlanAssociation, BackupPlan is deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 @@ -494,6 +497,7 @@ class Type(proto.Enum): MULTI_REGIONAL (3): Location type is multi regional. """ + TYPE_UNSPECIFIED = 0 ZONAL = 1 REGIONAL = 2 diff --git a/packages/google-cloud-backupdr/noxfile.py b/packages/google-cloud-backupdr/noxfile.py index 534835ace6aa..85df7471fb86 100644 --- a/packages/google-cloud-backupdr/noxfile.py +++ b/packages/google-cloud-backupdr/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr.py b/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr.py index 2050cabaac87..ba92f521e368 100644 --- a/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr.py +++ b/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,19 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.month_pb2 as month_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,28 +64,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import month_pb2 # type: ignore from google.cloud.backupdr_v1.services.backup_dr import ( BackupDRAsyncClient, @@ -940,10 +942,9 @@ def test_backup_dr_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +989,9 @@ def test_backup_dr_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1027,9 @@ def test_backup_dr_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1255,13 +1254,13 @@ def test_backup_dr_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1943,9 +1942,9 @@ def test_get_management_server_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_management_server - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_management_server] = ( + mock_rpc + ) request = {} client.get_management_server(request) @@ -3015,9 +3014,9 @@ def test_create_backup_vault_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_vault] = ( + mock_rpc + ) request = {} client.create_backup_vault(request) @@ -3391,9 +3390,9 @@ def test_list_backup_vaults_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_vaults - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_vaults] = ( + mock_rpc + ) request = {} client.list_backup_vaults(request) @@ -4513,9 +4512,9 @@ def test_get_backup_vault_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_vault] = ( + mock_rpc + ) request = {} client.get_backup_vault(request) @@ -4863,9 +4862,9 @@ def test_update_backup_vault_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_vault] = ( + mock_rpc + ) request = {} client.update_backup_vault(request) @@ -5220,9 +5219,9 @@ def test_delete_backup_vault_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_vault] = ( + mock_rpc + ) request = {} client.delete_backup_vault(request) @@ -5574,9 +5573,9 @@ def test_list_data_sources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_sources] = ( + mock_rpc + ) request = {} client.list_data_sources(request) @@ -6459,9 +6458,9 @@ def test_update_data_source_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_source - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_source] = ( + mock_rpc + ) request = {} client.update_data_source(request) @@ -9254,9 +9253,9 @@ def test_create_backup_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_plan] = ( + mock_rpc + ) request = {} client.create_backup_plan(request) @@ -9615,9 +9614,9 @@ def test_update_backup_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_plan] = ( + mock_rpc + ) request = {} client.update_backup_plan(request) @@ -10342,9 +10341,9 @@ def test_list_backup_plans_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_plans - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_plans] = ( + mock_rpc + ) request = {} client.list_backup_plans(request) @@ -10884,9 +10883,9 @@ def test_delete_backup_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_plan] = ( + mock_rpc + ) request = {} client.delete_backup_plan(request) @@ -16618,9 +16617,9 @@ def test_initialize_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.initialize_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.initialize_service] = ( + mock_rpc + ) request = {} client.initialize_service(request) @@ -17078,9 +17077,9 @@ def test_get_management_server_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_management_server - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_management_server] = ( + mock_rpc + ) request = {} client.get_management_server(request) @@ -17671,9 +17670,9 @@ def test_create_backup_vault_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_vault] = ( + mock_rpc + ) request = {} client.create_backup_vault(request) @@ -17893,9 +17892,9 @@ def test_list_backup_vaults_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_vaults - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_vaults] = ( + mock_rpc + ) request = {} client.list_backup_vaults(request) @@ -18422,9 +18421,9 @@ def test_get_backup_vault_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_vault] = ( + mock_rpc + ) request = {} client.get_backup_vault(request) @@ -18608,9 +18607,9 @@ def test_update_backup_vault_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_vault] = ( + mock_rpc + ) request = {} client.update_backup_vault(request) @@ -18817,9 +18816,9 @@ def test_delete_backup_vault_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_vault] = ( + mock_rpc + ) request = {} client.delete_backup_vault(request) @@ -19021,9 +19020,9 @@ def test_list_data_sources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_sources] = ( + mock_rpc + ) request = {} client.list_data_sources(request) @@ -19469,9 +19468,9 @@ def test_update_data_source_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_source - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_source] = ( + mock_rpc + ) request = {} client.update_data_source(request) @@ -20975,9 +20974,9 @@ def test_create_backup_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_plan] = ( + mock_rpc + ) request = {} client.create_backup_plan(request) @@ -21195,9 +21194,9 @@ def test_update_backup_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_plan] = ( + mock_rpc + ) request = {} client.update_backup_plan(request) @@ -21576,9 +21575,9 @@ def test_list_backup_plans_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_plans - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_plans] = ( + mock_rpc + ) request = {} client.list_backup_plans(request) @@ -21840,9 +21839,9 @@ def test_delete_backup_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_plan] = ( + mock_rpc + ) request = {} client.delete_backup_plan(request) @@ -24852,9 +24851,9 @@ def test_initialize_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.initialize_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.initialize_service] = ( + mock_rpc + ) request = {} client.initialize_service(request) @@ -27039,8 +27038,9 @@ def test_list_management_servers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27103,17 +27103,20 @@ def test_list_management_servers_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_list_management_servers" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_list_management_servers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_list_management_servers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_list_management_servers" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_list_management_servers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_list_management_servers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27173,8 +27176,9 @@ def test_get_management_server_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27251,17 +27255,20 @@ def test_get_management_server_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_get_management_server" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_get_management_server_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_get_management_server" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_get_management_server" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_get_management_server_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_get_management_server" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27314,8 +27321,9 @@ def test_create_management_server_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27461,20 +27469,21 @@ def test_create_management_server_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_create_management_server" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_create_management_server_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_create_management_server" - ) as pre: + 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.BackupDRRestInterceptor, "post_create_management_server" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_create_management_server_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_create_management_server" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27529,8 +27538,9 @@ def test_delete_management_server_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27587,20 +27597,21 @@ def test_delete_management_server_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_delete_management_server" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_delete_management_server_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_delete_management_server" - ) as pre: + 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.BackupDRRestInterceptor, "post_delete_management_server" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_delete_management_server_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_delete_management_server" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27653,8 +27664,9 @@ def test_create_backup_vault_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27796,19 +27808,20 @@ def test_create_backup_vault_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_create_backup_vault" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_create_backup_vault_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_create_backup_vault" - ) as pre: + 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.BackupDRRestInterceptor, "post_create_backup_vault" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_create_backup_vault_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_create_backup_vault" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27861,8 +27874,9 @@ def test_list_backup_vaults_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27925,17 +27939,19 @@ def test_list_backup_vaults_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_list_backup_vaults" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_list_backup_vaults_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_list_backup_vaults" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_list_backup_vaults" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_list_backup_vaults_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_list_backup_vaults" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27993,8 +28009,9 @@ def test_fetch_usable_backup_vaults_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28057,18 +28074,20 @@ def test_fetch_usable_backup_vaults_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_fetch_usable_backup_vaults" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_fetch_usable_backup_vaults_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_fetch_usable_backup_vaults" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_fetch_usable_backup_vaults" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_fetch_usable_backup_vaults_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_fetch_usable_backup_vaults" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28126,8 +28145,9 @@ def test_get_backup_vault_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28214,17 +28234,19 @@ def test_get_backup_vault_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_get_backup_vault" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_get_backup_vault_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_get_backup_vault" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_get_backup_vault" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_get_backup_vault_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_get_backup_vault" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28281,8 +28303,9 @@ def test_update_backup_vault_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28428,19 +28451,20 @@ def test_update_backup_vault_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_update_backup_vault" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_update_backup_vault_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_update_backup_vault" - ) as pre: + 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.BackupDRRestInterceptor, "post_update_backup_vault" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_update_backup_vault_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_update_backup_vault" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28493,8 +28517,9 @@ def test_delete_backup_vault_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28549,19 +28574,20 @@ def test_delete_backup_vault_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_delete_backup_vault" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_delete_backup_vault_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_delete_backup_vault" - ) as pre: + 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.BackupDRRestInterceptor, "post_delete_backup_vault" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_delete_backup_vault_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_delete_backup_vault" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28614,8 +28640,9 @@ def test_list_data_sources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28678,17 +28705,19 @@ def test_list_data_sources_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_list_data_sources" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_list_data_sources_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_list_data_sources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_list_data_sources" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_list_data_sources_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_list_data_sources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28748,8 +28777,9 @@ def test_get_data_source_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28824,17 +28854,19 @@ def test_get_data_source_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_get_data_source" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_get_data_source_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_get_data_source" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_get_data_source" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_get_data_source_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_get_data_source" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28891,8 +28923,9 @@ def test_update_data_source_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29097,19 +29130,20 @@ def test_update_data_source_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_update_data_source" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_update_data_source_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_update_data_source" - ) as pre: + 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.BackupDRRestInterceptor, "post_update_data_source" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_update_data_source_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_update_data_source" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29162,8 +29196,9 @@ def test_list_backups_rest_bad_request(request_type=backupvault.ListBackupsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29228,17 +29263,19 @@ def test_list_backups_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_list_backups" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_list_backups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_list_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_list_backups" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_list_backups_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_list_backups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29293,8 +29330,9 @@ def test_fetch_backups_for_resource_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29357,18 +29395,20 @@ def test_fetch_backups_for_resource_type_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_fetch_backups_for_resource_type" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_fetch_backups_for_resource_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_fetch_backups_for_resource_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_fetch_backups_for_resource_type" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_fetch_backups_for_resource_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_fetch_backups_for_resource_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29426,8 +29466,9 @@ def test_get_backup_rest_bad_request(request_type=backupvault.GetBackupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29511,17 +29552,17 @@ def test_get_backup_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_get_backup" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_get_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_get_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_get_backup" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_get_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BackupDRRestInterceptor, "pre_get_backup") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29574,8 +29615,9 @@ def test_update_backup_rest_bad_request(request_type=backupvault.UpdateBackupReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29873,19 +29915,20 @@ def test_update_backup_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_update_backup" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_update_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_update_backup" - ) as pre: + 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.BackupDRRestInterceptor, "post_update_backup" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_update_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_update_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29938,8 +29981,9 @@ def test_delete_backup_rest_bad_request(request_type=backupvault.DeleteBackupReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29996,19 +30040,20 @@ def test_delete_backup_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_delete_backup" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_delete_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_delete_backup" - ) as pre: + 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.BackupDRRestInterceptor, "post_delete_backup" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_delete_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_delete_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30061,8 +30106,9 @@ def test_restore_backup_rest_bad_request(request_type=backupvault.RestoreBackupR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30119,19 +30165,20 @@ def test_restore_backup_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_restore_backup" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_restore_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_restore_backup" - ) as pre: + 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.BackupDRRestInterceptor, "post_restore_backup" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_restore_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_restore_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30184,8 +30231,9 @@ def test_create_backup_plan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30345,19 +30393,20 @@ def test_create_backup_plan_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_create_backup_plan" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_create_backup_plan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_create_backup_plan" - ) as pre: + 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.BackupDRRestInterceptor, "post_create_backup_plan" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_create_backup_plan_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_create_backup_plan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30414,8 +30463,9 @@ def test_update_backup_plan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30579,19 +30629,20 @@ def test_update_backup_plan_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_update_backup_plan" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_update_backup_plan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_update_backup_plan" - ) as pre: + 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.BackupDRRestInterceptor, "post_update_backup_plan" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_update_backup_plan_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_update_backup_plan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30642,8 +30693,9 @@ def test_get_backup_plan_rest_bad_request(request_type=backupplan.GetBackupPlanR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30724,17 +30776,19 @@ def test_get_backup_plan_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_get_backup_plan" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_get_backup_plan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_get_backup_plan" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_get_backup_plan" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_get_backup_plan_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_get_backup_plan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30787,8 +30841,9 @@ def test_list_backup_plans_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30851,17 +30906,19 @@ def test_list_backup_plans_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_list_backup_plans" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_list_backup_plans_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_list_backup_plans" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_list_backup_plans" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_list_backup_plans_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_list_backup_plans" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30916,8 +30973,9 @@ def test_delete_backup_plan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30972,19 +31030,20 @@ def test_delete_backup_plan_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_delete_backup_plan" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_delete_backup_plan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_delete_backup_plan" - ) as pre: + 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.BackupDRRestInterceptor, "post_delete_backup_plan" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_delete_backup_plan_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_delete_backup_plan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31039,8 +31098,9 @@ def test_get_backup_plan_revision_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31107,18 +31167,20 @@ def test_get_backup_plan_revision_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_get_backup_plan_revision" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_get_backup_plan_revision_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_get_backup_plan_revision" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_get_backup_plan_revision" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_get_backup_plan_revision_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_get_backup_plan_revision" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31173,8 +31235,9 @@ def test_list_backup_plan_revisions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31237,18 +31300,20 @@ def test_list_backup_plan_revisions_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_list_backup_plan_revisions" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_list_backup_plan_revisions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_list_backup_plan_revisions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_list_backup_plan_revisions" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_list_backup_plan_revisions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_list_backup_plan_revisions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31306,8 +31371,9 @@ def test_create_backup_plan_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31465,20 +31531,21 @@ def test_create_backup_plan_association_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_create_backup_plan_association" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_create_backup_plan_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_create_backup_plan_association" - ) as pre: + 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.BackupDRRestInterceptor, "post_create_backup_plan_association" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_create_backup_plan_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_create_backup_plan_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31535,8 +31602,9 @@ def test_update_backup_plan_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31698,20 +31766,21 @@ def test_update_backup_plan_association_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_update_backup_plan_association" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_update_backup_plan_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_update_backup_plan_association" - ) as pre: + 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.BackupDRRestInterceptor, "post_update_backup_plan_association" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_update_backup_plan_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_update_backup_plan_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31766,8 +31835,9 @@ def test_get_backup_plan_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31844,18 +31914,20 @@ def test_get_backup_plan_association_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_get_backup_plan_association" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_get_backup_plan_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_get_backup_plan_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_get_backup_plan_association" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_get_backup_plan_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_get_backup_plan_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31913,8 +31985,9 @@ def test_list_backup_plan_associations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31979,18 +32052,20 @@ def test_list_backup_plan_associations_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_list_backup_plan_associations" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_list_backup_plan_associations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_list_backup_plan_associations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_list_backup_plan_associations" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_list_backup_plan_associations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_list_backup_plan_associations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32048,8 +32123,9 @@ def test_fetch_backup_plan_associations_for_resource_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32120,20 +32196,22 @@ def test_fetch_backup_plan_associations_for_resource_type_rest_interceptors( ) client = BackupDRClient(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.BackupDRRestInterceptor, - "post_fetch_backup_plan_associations_for_resource_type", - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_fetch_backup_plan_associations_for_resource_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, - "pre_fetch_backup_plan_associations_for_resource_type", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_fetch_backup_plan_associations_for_resource_type", + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_fetch_backup_plan_associations_for_resource_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, + "pre_fetch_backup_plan_associations_for_resource_type", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32197,8 +32275,9 @@ def test_delete_backup_plan_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32255,20 +32334,21 @@ def test_delete_backup_plan_association_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_delete_backup_plan_association" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_delete_backup_plan_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_delete_backup_plan_association" - ) as pre: + 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.BackupDRRestInterceptor, "post_delete_backup_plan_association" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_delete_backup_plan_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_delete_backup_plan_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32323,8 +32403,9 @@ def test_trigger_backup_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32381,19 +32462,20 @@ def test_trigger_backup_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_trigger_backup" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_trigger_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_trigger_backup" - ) as pre: + 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.BackupDRRestInterceptor, "post_trigger_backup" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_trigger_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_trigger_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32448,8 +32530,9 @@ def test_get_data_source_reference_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32522,18 +32605,20 @@ def test_get_data_source_reference_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_get_data_source_reference" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_get_data_source_reference_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_get_data_source_reference" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_get_data_source_reference" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_get_data_source_reference_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_get_data_source_reference" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32591,8 +32676,9 @@ def test_list_data_source_references_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32657,18 +32743,20 @@ def test_list_data_source_references_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_list_data_source_references" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_list_data_source_references_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_list_data_source_references" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_list_data_source_references" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_list_data_source_references_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_list_data_source_references" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32726,8 +32814,9 @@ def test_fetch_data_source_references_for_resource_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32796,20 +32885,22 @@ def test_fetch_data_source_references_for_resource_type_rest_interceptors( ) client = BackupDRClient(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.BackupDRRestInterceptor, - "post_fetch_data_source_references_for_resource_type", - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, - "post_fetch_data_source_references_for_resource_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, - "pre_fetch_data_source_references_for_resource_type", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_fetch_data_source_references_for_resource_type", + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, + "post_fetch_data_source_references_for_resource_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, + "pre_fetch_data_source_references_for_resource_type", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32871,8 +32962,9 @@ def test_initialize_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32927,19 +33019,20 @@ def test_initialize_service_rest_interceptors(null_interceptor): ) client = BackupDRClient(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.BackupDRRestInterceptor, "post_initialize_service" - ) as post, mock.patch.object( - transports.BackupDRRestInterceptor, "post_initialize_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupDRRestInterceptor, "pre_initialize_service" - ) as pre: + 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.BackupDRRestInterceptor, "post_initialize_service" + ) as post, + mock.patch.object( + transports.BackupDRRestInterceptor, "post_initialize_service_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupDRRestInterceptor, "pre_initialize_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32992,8 +33085,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33052,8 +33146,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33115,8 +33210,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33180,8 +33276,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33245,8 +33342,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33309,8 +33407,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33371,8 +33470,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33433,8 +33533,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33495,8 +33596,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -34473,11 +34575,14 @@ def test_backup_dr_base_transport(): def test_backup_dr_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.backupdr_v1.services.backup_dr.transports.BackupDRTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.backupdr_v1.services.backup_dr.transports.BackupDRTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackupDRTransport( @@ -34494,9 +34599,12 @@ def test_backup_dr_base_transport_with_credentials_file(): def test_backup_dr_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.backupdr_v1.services.backup_dr.transports.BackupDRTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.backupdr_v1.services.backup_dr.transports.BackupDRTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackupDRTransport() @@ -34568,11 +34676,12 @@ def test_backup_dr_transport_auth_gdch_credentials(transport_class): def test_backup_dr_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr_protection_summary.py b/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr_protection_summary.py index 004b3ae35fc2..b0e220e6192e 100644 --- a/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr_protection_summary.py +++ b/packages/google-cloud-backupdr/tests/unit/gapic/backupdr_v1/test_backup_dr_protection_summary.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -1013,10 +1020,9 @@ def test_backup_dr_protection_summary_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1067,9 @@ def test_backup_dr_protection_summary_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1105,9 @@ def test_backup_dr_protection_summary_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1362,13 +1366,13 @@ def test_backup_dr_protection_summary_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2409,8 +2413,9 @@ def test_list_resource_backup_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2475,20 +2480,22 @@ def test_list_resource_backup_configs_rest_interceptors(null_interceptor): ) client = BackupDrProtectionSummaryClient(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.BackupDrProtectionSummaryRestInterceptor, - "post_list_resource_backup_configs", - ) as post, mock.patch.object( - transports.BackupDrProtectionSummaryRestInterceptor, - "post_list_resource_backup_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupDrProtectionSummaryRestInterceptor, - "pre_list_resource_backup_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupDrProtectionSummaryRestInterceptor, + "post_list_resource_backup_configs", + ) as post, + mock.patch.object( + transports.BackupDrProtectionSummaryRestInterceptor, + "post_list_resource_backup_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupDrProtectionSummaryRestInterceptor, + "pre_list_resource_backup_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2546,8 +2553,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2606,8 +2614,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2669,8 +2678,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2734,8 +2744,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2799,8 +2810,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2863,8 +2875,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2925,8 +2938,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2987,8 +3001,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3049,8 +3064,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3189,11 +3205,14 @@ def test_backup_dr_protection_summary_base_transport(): def test_backup_dr_protection_summary_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.backupdr_v1.services.backup_dr_protection_summary.transports.BackupDrProtectionSummaryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.backupdr_v1.services.backup_dr_protection_summary.transports.BackupDrProtectionSummaryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackupDrProtectionSummaryTransport( @@ -3210,9 +3229,12 @@ def test_backup_dr_protection_summary_base_transport_with_credentials_file(): def test_backup_dr_protection_summary_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.backupdr_v1.services.backup_dr_protection_summary.transports.BackupDrProtectionSummaryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.backupdr_v1.services.backup_dr_protection_summary.transports.BackupDrProtectionSummaryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackupDrProtectionSummaryTransport() @@ -3286,11 +3308,12 @@ def test_backup_dr_protection_summary_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bare-metal-solution/docs/conf.py b/packages/google-cloud-bare-metal-solution/docs/conf.py index 781029782c7e..51f7bd2c0dc4 100644 --- a/packages/google-cloud-bare-metal-solution/docs/conf.py +++ b/packages/google-cloud-bare-metal-solution/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-bare-metal-solution documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/__init__.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/__init__.py index 93289bed9b5c..7a83511f942a 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/__init__.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.bare_metal_solution import ( BareMetalSolutionAsyncClient, BareMetalSolutionClient, diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/async_client.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/async_client.py index 391e4204a2c6..5b04613a9d3c 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/async_client.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bare_metal_solution_v2 import gapic_version as package_version @@ -44,34 +44,40 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.bare_metal_solution_v2.services.bare_metal_solution import pagers -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + baremetalsolution, + common, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import baremetalsolution, common -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) from .client import BareMetalSolutionClient from .transports.base import DEFAULT_CLIENT_INFO, BareMetalSolutionTransport @@ -204,7 +210,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BareMetalSolutionAsyncClient: The constructed client. """ - return BareMetalSolutionClient.from_service_account_info.__func__(BareMetalSolutionAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BareMetalSolutionClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BareMetalSolutionAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -220,7 +227,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BareMetalSolutionAsyncClient: The constructed client. """ - return BareMetalSolutionClient.from_service_account_file.__func__(BareMetalSolutionAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BareMetalSolutionClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BareMetalSolutionAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/client.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/client.py index 38f358101ede..8d4db1088095 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/client.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bare_metal_solution_v2 import gapic_version as package_version @@ -61,34 +61,40 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.bare_metal_solution_v2.services.bare_metal_solution import pagers -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + baremetalsolution, + common, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import baremetalsolution, common -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) from .transports.base import DEFAULT_CLIENT_INFO, BareMetalSolutionTransport from .transports.grpc import BareMetalSolutionGrpcTransport @@ -104,9 +110,7 @@ class BareMetalSolutionClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BareMetalSolutionTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BareMetalSolutionTransport]] _transport_registry["grpc"] = BareMetalSolutionGrpcTransport _transport_registry["grpc_asyncio"] = BareMetalSolutionGrpcAsyncIOTransport _transport_registry["rest"] = BareMetalSolutionRestTransport @@ -993,11 +997,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BareMetalSolutionClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BareMetalSolutionClient._read_environment_variables() + ) self._client_cert_source = BareMetalSolutionClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1032,8 +1034,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BareMetalSolutionTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/pagers.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/pagers.py index c8121b7773b2..37bd8ece0f77 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/pagers.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/pagers.py @@ -77,7 +77,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -153,7 +153,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +233,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -309,7 +309,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -389,7 +389,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -465,7 +465,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -545,7 +545,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -621,7 +621,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -701,7 +701,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -777,7 +777,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -857,7 +857,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -933,7 +933,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1013,7 +1013,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1089,7 +1089,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1169,7 +1169,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1245,7 +1245,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1325,7 +1325,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1401,7 +1401,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/base.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/base.py index 8ee6a3bf2b7b..9a6dc18d16c9 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/base.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/base.py @@ -17,36 +17,41 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bare_metal_solution_v2 import gapic_version as package_version -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc.py index a218bad9f26d..c06656bd6543 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc.py @@ -16,39 +16,44 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) from .base import DEFAULT_CLIENT_INFO, BareMetalSolutionTransport @@ -575,12 +580,12 @@ def enable_interactive_serial_console( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_interactive_serial_console" not in self._stubs: - self._stubs[ - "enable_interactive_serial_console" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/EnableInteractiveSerialConsole", - request_serializer=instance.EnableInteractiveSerialConsoleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_interactive_serial_console"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/EnableInteractiveSerialConsole", + request_serializer=instance.EnableInteractiveSerialConsoleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_interactive_serial_console"] @@ -607,12 +612,12 @@ def disable_interactive_serial_console( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_interactive_serial_console" not in self._stubs: - self._stubs[ - "disable_interactive_serial_console" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/DisableInteractiveSerialConsole", - request_serializer=instance.DisableInteractiveSerialConsoleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_interactive_serial_console"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/DisableInteractiveSerialConsole", + request_serializer=instance.DisableInteractiveSerialConsoleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_interactive_serial_console"] @@ -1415,12 +1420,12 @@ def submit_provisioning_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "submit_provisioning_config" not in self._stubs: - self._stubs[ - "submit_provisioning_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/SubmitProvisioningConfig", - request_serializer=provisioning.SubmitProvisioningConfigRequest.serialize, - response_deserializer=provisioning.SubmitProvisioningConfigResponse.deserialize, + self._stubs["submit_provisioning_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/SubmitProvisioningConfig", + request_serializer=provisioning.SubmitProvisioningConfigRequest.serialize, + response_deserializer=provisioning.SubmitProvisioningConfigResponse.deserialize, + ) ) return self._stubs["submit_provisioning_config"] @@ -1473,12 +1478,12 @@ def create_provisioning_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_provisioning_config" not in self._stubs: - self._stubs[ - "create_provisioning_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/CreateProvisioningConfig", - request_serializer=provisioning.CreateProvisioningConfigRequest.serialize, - response_deserializer=provisioning.ProvisioningConfig.deserialize, + self._stubs["create_provisioning_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/CreateProvisioningConfig", + request_serializer=provisioning.CreateProvisioningConfigRequest.serialize, + response_deserializer=provisioning.ProvisioningConfig.deserialize, + ) ) return self._stubs["create_provisioning_config"] @@ -1503,12 +1508,12 @@ def update_provisioning_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_provisioning_config" not in self._stubs: - self._stubs[ - "update_provisioning_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/UpdateProvisioningConfig", - request_serializer=provisioning.UpdateProvisioningConfigRequest.serialize, - response_deserializer=provisioning.ProvisioningConfig.deserialize, + self._stubs["update_provisioning_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/UpdateProvisioningConfig", + request_serializer=provisioning.UpdateProvisioningConfigRequest.serialize, + response_deserializer=provisioning.ProvisioningConfig.deserialize, + ) ) return self._stubs["update_provisioning_config"] diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc_asyncio.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc_asyncio.py index 28c4390cf2b2..bdbf31bf9182 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc_asyncio.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/grpc_asyncio.py @@ -17,41 +17,46 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) from .base import DEFAULT_CLIENT_INFO, BareMetalSolutionTransport from .grpc import BareMetalSolutionGrpcTransport @@ -588,12 +593,12 @@ def enable_interactive_serial_console( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_interactive_serial_console" not in self._stubs: - self._stubs[ - "enable_interactive_serial_console" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/EnableInteractiveSerialConsole", - request_serializer=instance.EnableInteractiveSerialConsoleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_interactive_serial_console"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/EnableInteractiveSerialConsole", + request_serializer=instance.EnableInteractiveSerialConsoleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_interactive_serial_console"] @@ -621,12 +626,12 @@ def disable_interactive_serial_console( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_interactive_serial_console" not in self._stubs: - self._stubs[ - "disable_interactive_serial_console" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/DisableInteractiveSerialConsole", - request_serializer=instance.DisableInteractiveSerialConsoleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_interactive_serial_console"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/DisableInteractiveSerialConsole", + request_serializer=instance.DisableInteractiveSerialConsoleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_interactive_serial_console"] @@ -1461,12 +1466,12 @@ def submit_provisioning_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "submit_provisioning_config" not in self._stubs: - self._stubs[ - "submit_provisioning_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/SubmitProvisioningConfig", - request_serializer=provisioning.SubmitProvisioningConfigRequest.serialize, - response_deserializer=provisioning.SubmitProvisioningConfigResponse.deserialize, + self._stubs["submit_provisioning_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/SubmitProvisioningConfig", + request_serializer=provisioning.SubmitProvisioningConfigRequest.serialize, + response_deserializer=provisioning.SubmitProvisioningConfigResponse.deserialize, + ) ) return self._stubs["submit_provisioning_config"] @@ -1521,12 +1526,12 @@ def create_provisioning_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_provisioning_config" not in self._stubs: - self._stubs[ - "create_provisioning_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/CreateProvisioningConfig", - request_serializer=provisioning.CreateProvisioningConfigRequest.serialize, - response_deserializer=provisioning.ProvisioningConfig.deserialize, + self._stubs["create_provisioning_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/CreateProvisioningConfig", + request_serializer=provisioning.CreateProvisioningConfigRequest.serialize, + response_deserializer=provisioning.ProvisioningConfig.deserialize, + ) ) return self._stubs["create_provisioning_config"] @@ -1552,12 +1557,12 @@ def update_provisioning_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_provisioning_config" not in self._stubs: - self._stubs[ - "update_provisioning_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.baremetalsolution.v2.BareMetalSolution/UpdateProvisioningConfig", - request_serializer=provisioning.UpdateProvisioningConfigRequest.serialize, - response_deserializer=provisioning.ProvisioningConfig.deserialize, + self._stubs["update_provisioning_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.baremetalsolution.v2.BareMetalSolution/UpdateProvisioningConfig", + request_serializer=provisioning.UpdateProvisioningConfigRequest.serialize, + response_deserializer=provisioning.ProvisioningConfig.deserialize, + ) ) return self._stubs["update_provisioning_config"] diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest.py index 289739c5f0db..4f4016ccdc63 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest.py @@ -16,39 +16,44 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseBareMetalSolutionRestTransport @@ -2676,9 +2681,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseCreateNfsShare._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseCreateNfsShare._get_http_options() request, metadata = self._interceptor.pre_create_nfs_share( request, metadata @@ -2704,7 +2707,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2828,9 +2831,7 @@ def __call__( A provisioning configuration. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseCreateProvisioningConfig._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseCreateProvisioningConfig._get_http_options() request, metadata = self._interceptor.pre_create_provisioning_config( request, metadata @@ -2985,9 +2986,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseCreateSSHKey._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseCreateSSHKey._get_http_options() request, metadata = self._interceptor.pre_create_ssh_key(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseCreateSSHKey._get_transcoded_request( @@ -3139,9 +3138,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseCreateVolumeSnapshot._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseCreateVolumeSnapshot._get_http_options() request, metadata = self._interceptor.pre_create_volume_snapshot( request, metadata @@ -3298,9 +3295,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseDeleteNfsShare._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseDeleteNfsShare._get_http_options() request, metadata = self._interceptor.pre_delete_nfs_share( request, metadata @@ -3322,7 +3317,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3439,9 +3434,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseDeleteSSHKey._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseDeleteSSHKey._get_http_options() request, metadata = self._interceptor.pre_delete_ssh_key(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseDeleteSSHKey._get_transcoded_request( @@ -3461,7 +3454,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3547,9 +3540,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseDeleteVolumeSnapshot._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseDeleteVolumeSnapshot._get_http_options() request, metadata = self._interceptor.pre_delete_volume_snapshot( request, metadata @@ -3571,7 +3562,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3692,7 +3683,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3822,15 +3813,12 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseDisableInteractiveSerialConsole._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseDisableInteractiveSerialConsole._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_disable_interactive_serial_console( - request, metadata + request, metadata = ( + self._interceptor.pre_disable_interactive_serial_console( + request, metadata + ) ) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseDisableInteractiveSerialConsole._get_transcoded_request( http_options, request @@ -3853,7 +3841,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3894,11 +3882,10 @@ def __call__( resp = self._interceptor.post_disable_interactive_serial_console(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_disable_interactive_serial_console_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_disable_interactive_serial_console_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3984,9 +3971,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseEnableInteractiveSerialConsole._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseEnableInteractiveSerialConsole._get_http_options() request, metadata = self._interceptor.pre_enable_interactive_serial_console( request, metadata @@ -4012,7 +3997,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4053,11 +4038,10 @@ def __call__( resp = self._interceptor.post_enable_interactive_serial_console(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_enable_interactive_serial_console_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_enable_interactive_serial_console_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4167,7 +4151,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4319,7 +4303,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5027,9 +5011,7 @@ def __call__( A provisioning configuration. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseGetProvisioningConfig._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseGetProvisioningConfig._get_http_options() request, metadata = self._interceptor.pre_get_provisioning_config( request, metadata @@ -5324,9 +5306,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseGetVolumeSnapshot._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseGetVolumeSnapshot._get_http_options() request, metadata = self._interceptor.pre_get_volume_snapshot( request, metadata @@ -5474,9 +5454,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListInstances._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListInstances._get_http_options() request, metadata = self._interceptor.pre_list_instances(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseListInstances._get_transcoded_request( @@ -5768,9 +5746,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListNetworks._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListNetworks._get_http_options() request, metadata = self._interceptor.pre_list_networks(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseListNetworks._get_transcoded_request( @@ -5913,9 +5889,7 @@ def __call__( Response with Networks with IPs """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListNetworkUsage._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListNetworkUsage._get_http_options() request, metadata = self._interceptor.pre_list_network_usage( request, metadata @@ -6065,9 +6039,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListNfsShares._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListNfsShares._get_http_options() request, metadata = self._interceptor.pre_list_nfs_shares(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseListNfsShares._get_transcoded_request( @@ -6212,9 +6184,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListOSImages._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListOSImages._get_http_options() request, metadata = self._interceptor.pre_list_os_images(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseListOSImages._get_transcoded_request( @@ -6360,9 +6330,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListProvisioningQuotas._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListProvisioningQuotas._get_http_options() request, metadata = self._interceptor.pre_list_provisioning_quotas( request, metadata @@ -6806,9 +6774,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListVolumeSnapshots._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListVolumeSnapshots._get_http_options() request, metadata = self._interceptor.pre_list_volume_snapshots( request, metadata @@ -6959,9 +6925,7 @@ def __call__( A server. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseRenameInstance._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseRenameInstance._get_http_options() request, metadata = self._interceptor.pre_rename_instance(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseRenameInstance._get_transcoded_request( @@ -7111,9 +7075,7 @@ def __call__( A Network. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseRenameNetwork._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseRenameNetwork._get_http_options() request, metadata = self._interceptor.pre_rename_network(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseRenameNetwork._get_transcoded_request( @@ -7263,9 +7225,7 @@ def __call__( An NFS share. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseRenameNfsShare._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseRenameNfsShare._get_http_options() request, metadata = self._interceptor.pre_rename_nfs_share( request, metadata @@ -7416,9 +7376,7 @@ def __call__( A storage volume. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseRenameVolume._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseRenameVolume._get_http_options() request, metadata = self._interceptor.pre_rename_volume(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseRenameVolume._get_transcoded_request( @@ -7570,9 +7528,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseResetInstance._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseResetInstance._get_http_options() request, metadata = self._interceptor.pre_reset_instance(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseResetInstance._get_transcoded_request( @@ -7596,7 +7552,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7721,9 +7677,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseResizeVolume._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseResizeVolume._get_http_options() request, metadata = self._interceptor.pre_resize_volume(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseResizeVolume._get_transcoded_request( @@ -7747,7 +7701,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7874,9 +7828,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseRestoreVolumeSnapshot._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseRestoreVolumeSnapshot._get_http_options() request, metadata = self._interceptor.pre_restore_volume_snapshot( request, metadata @@ -7902,7 +7854,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8030,9 +7982,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseStartInstance._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseStartInstance._get_http_options() request, metadata = self._interceptor.pre_start_instance(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseStartInstance._get_transcoded_request( @@ -8056,7 +8006,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8181,9 +8131,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseStopInstance._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseStopInstance._get_http_options() request, metadata = self._interceptor.pre_stop_instance(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseStopInstance._get_transcoded_request( @@ -8207,7 +8155,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8333,9 +8281,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseSubmitProvisioningConfig._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseSubmitProvisioningConfig._get_http_options() request, metadata = self._interceptor.pre_submit_provisioning_config( request, metadata @@ -8494,9 +8440,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseUpdateInstance._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseUpdateInstance._get_http_options() request, metadata = self._interceptor.pre_update_instance(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseUpdateInstance._get_transcoded_request( @@ -8520,7 +8464,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8647,9 +8591,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseUpdateNetwork._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseUpdateNetwork._get_http_options() request, metadata = self._interceptor.pre_update_network(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseUpdateNetwork._get_transcoded_request( @@ -8673,7 +8615,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8800,9 +8742,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseUpdateNfsShare._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseUpdateNfsShare._get_http_options() request, metadata = self._interceptor.pre_update_nfs_share( request, metadata @@ -8828,7 +8768,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8953,9 +8893,7 @@ def __call__( A provisioning configuration. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseUpdateProvisioningConfig._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseUpdateProvisioningConfig._get_http_options() request, metadata = self._interceptor.pre_update_provisioning_config( request, metadata @@ -9110,9 +9048,7 @@ def __call__( """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseUpdateVolume._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseUpdateVolume._get_http_options() request, metadata = self._interceptor.pre_update_volume(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseUpdateVolume._get_transcoded_request( @@ -9136,7 +9072,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9219,7 +9155,9 @@ def create_provisioning_config( ]: # 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._CreateProvisioningConfig(self._session, self._host, self._interceptor) # type: ignore + return self._CreateProvisioningConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_ssh_key( @@ -9280,7 +9218,9 @@ def disable_interactive_serial_console( ]: # 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._DisableInteractiveSerialConsole(self._session, self._host, self._interceptor) # type: ignore + return self._DisableInteractiveSerialConsole( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_interactive_serial_console( @@ -9290,7 +9230,9 @@ def enable_interactive_serial_console( ]: # 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._EnableInteractiveSerialConsole(self._session, self._host, self._interceptor) # type: ignore + return self._EnableInteractiveSerialConsole( + self._session, self._host, self._interceptor + ) # type: ignore @property def evict_lun(self) -> Callable[[lun.EvictLunRequest], operations_pb2.Operation]: @@ -9415,7 +9357,9 @@ def list_provisioning_quotas( ]: # 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._ListProvisioningQuotas(self._session, self._host, self._interceptor) # type: ignore + return self._ListProvisioningQuotas( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_ssh_keys( @@ -9525,7 +9469,9 @@ def submit_provisioning_config( ]: # 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._SubmitProvisioningConfig(self._session, self._host, self._interceptor) # type: ignore + return self._SubmitProvisioningConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_instance( @@ -9559,7 +9505,9 @@ def update_provisioning_config( ]: # 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._UpdateProvisioningConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateProvisioningConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_volume( @@ -9767,9 +9715,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseBareMetalSolutionRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseBareMetalSolutionRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseBareMetalSolutionRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest_base.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest_base.py index 97ec640cdc33..a09bb13e1520 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest_base.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/services/bare_metal_solution/transports/rest_base.py @@ -17,30 +17,35 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) from .base import DEFAULT_CLIENT_INFO, BareMetalSolutionTransport diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/__init__.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/__init__.py index c387cd97a15b..15f8c9a95387 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/__init__.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/__init__.py @@ -13,8 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .baremetalsolution import OperationMetadata, ResetInstanceResponse -from .common import VolumePerformanceTier, WorkloadProfile +from .baremetalsolution import ( + OperationMetadata, + ResetInstanceResponse, +) +from .common import ( + VolumePerformanceTier, + WorkloadProfile, +) from .instance import ( DetachLunRequest, DisableInteractiveSerialConsoleRequest, @@ -34,7 +40,13 @@ StopInstanceResponse, UpdateInstanceRequest, ) -from .lun import EvictLunRequest, GetLunRequest, ListLunsRequest, ListLunsResponse, Lun +from .lun import ( + EvictLunRequest, + GetLunRequest, + ListLunsRequest, + ListLunsResponse, + Lun, +) from .network import ( VRF, GetNetworkRequest, @@ -60,7 +72,11 @@ RenameNfsShareRequest, UpdateNfsShareRequest, ) -from .osimage import ListOSImagesRequest, ListOSImagesResponse, OSImage +from .osimage import ( + ListOSImagesRequest, + ListOSImagesResponse, + OSImage, +) from .provisioning import ( CreateProvisioningConfigRequest, GetProvisioningConfigRequest, diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/baremetalsolution.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/baremetalsolution.py index 0bf36c20bd99..b864eabade98 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/baremetalsolution.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/baremetalsolution.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/common.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/common.py index bf028e008f28..a19580811169 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/common.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/common.py @@ -41,6 +41,7 @@ class VolumePerformanceTier(proto.Enum): VOLUME_PERFORMANCE_TIER_HT (3): High throughput aggregates. """ + VOLUME_PERFORMANCE_TIER_UNSPECIFIED = 0 VOLUME_PERFORMANCE_TIER_SHARED = 1 VOLUME_PERFORMANCE_TIER_ASSIGNED = 2 @@ -58,6 +59,7 @@ class WorkloadProfile(proto.Enum): WORKLOAD_PROFILE_HANA (2): The workload profile is hana. """ + WORKLOAD_PROFILE_UNSPECIFIED = 0 WORKLOAD_PROFILE_GENERIC = 1 WORKLOAD_PROFILE_HANA = 2 diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/instance.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/instance.py index cde75fcae9bf..30ebabe79aff 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/instance.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/instance.py @@ -17,13 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.bare_metal_solution_v2.types import common +from google.cloud.bare_metal_solution_v2.types import common, network, volume from google.cloud.bare_metal_solution_v2.types import lun as gcb_lun -from google.cloud.bare_metal_solution_v2.types import network, volume __protobuf__ = proto.module( package="google.cloud.baremetalsolution.v2", @@ -144,6 +143,7 @@ class State(proto.Enum): SHUTDOWN (7): The server is shutdown. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -532,6 +532,7 @@ class InterfaceType(proto.Enum): NIC (2): NIC interface type. """ + INTERFACE_TYPE_UNSPECIFIED = 0 BOND = 1 NIC = 2 diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/lun.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/lun.py index 88ee013c5421..1215792ba512 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/lun.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/lun.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -86,6 +86,7 @@ class State(proto.Enum): The LUN is in cool off state. It will be deleted after ``expire_time``. """ + STATE_UNSPECIFIED = 0 CREATING = 1 UPDATING = 2 @@ -103,6 +104,7 @@ class MultiprotocolType(proto.Enum): LINUX (1): Server with Linux OS. """ + MULTIPROTOCOL_TYPE_UNSPECIFIED = 0 LINUX = 1 @@ -117,6 +119,7 @@ class StorageType(proto.Enum): HDD (2): This storage type for this LUN is HDD. """ + STORAGE_TYPE_UNSPECIFIED = 0 SSD = 1 HDD = 2 diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/network.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/network.py index 765446380460..f394d1f9eac3 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/network.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/network.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -101,6 +101,7 @@ class Type(proto.Enum): Private network, a network local to the Bare Metal Solution environment. """ + TYPE_UNSPECIFIED = 0 CLIENT = 1 PRIVATE = 2 @@ -120,6 +121,7 @@ class State(proto.Enum): UPDATING (4): The Network is being updated. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 PROVISIONED = 2 @@ -260,6 +262,7 @@ class State(proto.Enum): PROVISIONED (2): The vrf is provisioned. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 PROVISIONED = 2 @@ -416,12 +419,12 @@ class LogicalNetworkInterface(proto.Message): number=5, ) - logical_network_interfaces: MutableSequence[ - LogicalNetworkInterface - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=LogicalNetworkInterface, + logical_network_interfaces: MutableSequence[LogicalNetworkInterface] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=LogicalNetworkInterface, + ) ) name: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/nfs_share.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/nfs_share.py index 38be06166702..2aabc11c1af2 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/nfs_share.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/nfs_share.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -82,6 +82,7 @@ class State(proto.Enum): The NFS Share has been requested to be deleted. """ + STATE_UNSPECIFIED = 0 PROVISIONED = 1 CREATING = 2 @@ -101,6 +102,7 @@ class MountPermissions(proto.Enum): NFS share can be mount with read-write permissions. """ + MOUNT_PERMISSIONS_UNSPECIFIED = 0 READ = 1 READ_WRITE = 2 @@ -116,6 +118,7 @@ class StorageType(proto.Enum): HDD (2): This storage type for this volume is HDD. """ + STORAGE_TYPE_UNSPECIFIED = 0 SSD = 1 HDD = 2 diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/provisioning.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/provisioning.py index 05216d82d9ed..d5675b55fc3b 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/provisioning.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/provisioning.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.bare_metal_solution_v2.types import common, network @@ -118,6 +118,7 @@ class State(proto.Enum): The request is submitted for provisioning, with error return. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 SUBMITTED = 2 @@ -289,6 +290,7 @@ class AssetType(proto.Enum): ASSET_TYPE_NETWORK (3): The network asset type. """ + ASSET_TYPE_UNSPECIFIED = 0 ASSET_TYPE_SERVER = 1 ASSET_TYPE_STORAGE = 2 @@ -458,6 +460,7 @@ class NetworkConfig(proto.Enum): Instance part of multiple (or single) client networks and private networks. """ + NETWORKCONFIG_UNSPECIFIED = 0 SINGLE_VLAN = 1 MULTI_VLAN = 2 @@ -595,6 +598,7 @@ class Type(proto.Enum): DISK (2): This Volume is on disk. """ + TYPE_UNSPECIFIED = 0 FLASH = 1 DISK = 2 @@ -610,6 +614,7 @@ class Protocol(proto.Enum): PROTOCOL_NFS (2): Network file system. """ + PROTOCOL_UNSPECIFIED = 0 PROTOCOL_FC = 1 PROTOCOL_NFS = 2 @@ -680,6 +685,7 @@ class Permissions(proto.Enum): READ_WRITE (2): Read-write permission. """ + PERMISSIONS_UNSPECIFIED = 0 READ_ONLY = 1 READ_WRITE = 2 @@ -822,6 +828,7 @@ class Type(proto.Enum): Private network, that is a network local to the BMS POD. """ + TYPE_UNSPECIFIED = 0 CLIENT = 1 PRIVATE = 2 @@ -841,6 +848,7 @@ class Bandwidth(proto.Enum): BW_10_GBPS (4): 10 Gbps. """ + BANDWIDTH_UNSPECIFIED = 0 BW_1_GBPS = 1 BW_2_GBPS = 2 @@ -865,6 +873,7 @@ class ServiceCidr(proto.Enum): Use the highest /28 block of the network to host services. """ + SERVICE_CIDR_UNSPECIFIED = 0 DISABLED = 1 HIGH_26 = 2 diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume.py index a207d063e773..fcc1fb9462a8 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.bare_metal_solution_v2.types import common @@ -130,6 +130,7 @@ class StorageType(proto.Enum): HDD (2): This storage type for this volume is HDD. """ + STORAGE_TYPE_UNSPECIFIED = 0 SSD = 1 HDD = 2 @@ -153,6 +154,7 @@ class State(proto.Enum): The storage volume is in cool off state. It will be deleted after ``expire_time``. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -176,6 +178,7 @@ class SnapshotAutoDeleteBehavior(proto.Enum): NEWEST_FIRST (3): Delete the newest snapshots first. """ + SNAPSHOT_AUTO_DELETE_BEHAVIOR_UNSPECIFIED = 0 DISABLED = 1 OLDEST_FIRST = 2 @@ -194,6 +197,7 @@ class Protocol(proto.Enum): volume. Such volumes cannot be manipulated via Volumes API. """ + PROTOCOL_UNSPECIFIED = 0 FIBRE_CHANNEL = 1 NFS = 2 @@ -209,6 +213,7 @@ class WorkloadProfile(proto.Enum): HANA (2): The workload profile is hana. """ + WORKLOAD_PROFILE_UNSPECIFIED = 0 GENERIC = 1 HANA = 2 diff --git a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume_snapshot.py b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume_snapshot.py index 1b17ba095577..05b015bdca33 100644 --- a/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume_snapshot.py +++ b/packages/google-cloud-bare-metal-solution/google/cloud/bare_metal_solution_v2/types/volume_snapshot.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -69,6 +69,7 @@ class SnapshotType(proto.Enum): Snapshot was taken automatically as a part of a snapshot schedule. """ + SNAPSHOT_TYPE_UNSPECIFIED = 0 AD_HOC = 1 SCHEDULED = 2 diff --git a/packages/google-cloud-bare-metal-solution/noxfile.py b/packages/google-cloud-bare-metal-solution/noxfile.py index 4e8077b8ed61..6603eeb00ae5 100644 --- a/packages/google-cloud-bare-metal-solution/noxfile.py +++ b/packages/google-cloud-bare-metal-solution/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bare-metal-solution/tests/unit/gapic/bare_metal_solution_v2/test_bare_metal_solution.py b/packages/google-cloud-bare-metal-solution/tests/unit/gapic/bare_metal_solution_v2/test_bare_metal_solution.py index 6cc555f3c444..6958daa570d8 100644 --- a/packages/google-cloud-bare-metal-solution/tests/unit/gapic/bare_metal_solution_v2/test_bare_metal_solution.py +++ b/packages/google-cloud-bare-metal-solution/tests/unit/gapic/bare_metal_solution_v2/test_bare_metal_solution.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.bare_metal_solution_v2.services.bare_metal_solution import ( BareMetalSolutionAsyncClient, @@ -75,23 +77,27 @@ pagers, transports, ) -from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ( - volume_snapshot as gcb_volume_snapshot, + baremetalsolution, + common, + instance, + lun, + network, + nfs_share, + osimage, + provisioning, + ssh_key, + volume, + volume_snapshot, ) -from google.cloud.bare_metal_solution_v2.types import baremetalsolution, common -from google.cloud.bare_metal_solution_v2.types import instance from google.cloud.bare_metal_solution_v2.types import instance as gcb_instance -from google.cloud.bare_metal_solution_v2.types import lun -from google.cloud.bare_metal_solution_v2.types import network from google.cloud.bare_metal_solution_v2.types import network as gcb_network -from google.cloud.bare_metal_solution_v2.types import nfs_share -from google.cloud.bare_metal_solution_v2.types import osimage, provisioning -from google.cloud.bare_metal_solution_v2.types import ssh_key +from google.cloud.bare_metal_solution_v2.types import nfs_share as gcb_nfs_share from google.cloud.bare_metal_solution_v2.types import ssh_key as gcb_ssh_key -from google.cloud.bare_metal_solution_v2.types import volume from google.cloud.bare_metal_solution_v2.types import volume as gcb_volume -from google.cloud.bare_metal_solution_v2.types import volume_snapshot +from google.cloud.bare_metal_solution_v2.types import ( + volume_snapshot as gcb_volume_snapshot, +) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1011,10 +1017,9 @@ def test_bare_metal_solution_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1064,9 @@ def test_bare_metal_solution_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1102,9 @@ def test_bare_metal_solution_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1349,13 +1352,13 @@ def test_bare_metal_solution_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -9127,9 +9130,9 @@ def test_list_network_usage_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_usage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_usage] = ( + mock_rpc + ) request = {} client.list_network_usage(request) @@ -10170,9 +10173,9 @@ def test_create_volume_snapshot_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_volume_snapshot - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_volume_snapshot] = ( + mock_rpc + ) request = {} client.create_volume_snapshot(request) @@ -10875,9 +10878,9 @@ def test_delete_volume_snapshot_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_volume_snapshot - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_volume_snapshot] = ( + mock_rpc + ) request = {} client.delete_volume_snapshot(request) @@ -11216,9 +11219,9 @@ def test_get_volume_snapshot_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_volume_snapshot - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_volume_snapshot] = ( + mock_rpc + ) request = {} client.get_volume_snapshot(request) @@ -11571,9 +11574,9 @@ def test_list_volume_snapshots_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_volume_snapshots - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_volume_snapshots] = ( + mock_rpc + ) request = {} client.list_volume_snapshots(request) @@ -14175,9 +14178,9 @@ def test_update_nfs_share_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_nfs_share] = ( + mock_rpc + ) request = {} client.update_nfs_share(request) @@ -14514,9 +14517,9 @@ def test_create_nfs_share_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_nfs_share] = ( + mock_rpc + ) request = {} client.create_nfs_share(request) @@ -14870,9 +14873,9 @@ def test_rename_nfs_share_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rename_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rename_nfs_share] = ( + mock_rpc + ) request = {} client.rename_nfs_share(request) @@ -15210,9 +15213,9 @@ def test_delete_nfs_share_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_nfs_share] = ( + mock_rpc + ) request = {} client.delete_nfs_share(request) @@ -22381,9 +22384,9 @@ def test_list_network_usage_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_usage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_usage] = ( + mock_rpc + ) request = {} client.list_network_usage(request) @@ -22918,9 +22921,9 @@ def test_create_volume_snapshot_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_volume_snapshot - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_volume_snapshot] = ( + mock_rpc + ) request = {} client.create_volume_snapshot(request) @@ -23299,9 +23302,9 @@ def test_delete_volume_snapshot_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_volume_snapshot - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_volume_snapshot] = ( + mock_rpc + ) request = {} client.delete_volume_snapshot(request) @@ -23478,9 +23481,9 @@ def test_get_volume_snapshot_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_volume_snapshot - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_volume_snapshot] = ( + mock_rpc + ) request = {} client.get_volume_snapshot(request) @@ -23663,9 +23666,9 @@ def test_list_volume_snapshots_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_volume_snapshots - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_volume_snapshots] = ( + mock_rpc + ) request = {} client.list_volume_snapshots(request) @@ -24969,9 +24972,9 @@ def test_update_nfs_share_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_nfs_share] = ( + mock_rpc + ) request = {} client.update_nfs_share(request) @@ -25152,9 +25155,9 @@ def test_create_nfs_share_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_nfs_share] = ( + mock_rpc + ) request = {} client.create_nfs_share(request) @@ -25341,9 +25344,9 @@ def test_rename_nfs_share_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rename_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rename_nfs_share] = ( + mock_rpc + ) request = {} client.rename_nfs_share(request) @@ -25538,9 +25541,9 @@ def test_delete_nfs_share_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_nfs_share - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_nfs_share] = ( + mock_rpc + ) request = {} client.delete_nfs_share(request) @@ -29586,8 +29589,9 @@ def test_list_instances_rest_bad_request(request_type=instance.ListInstancesRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29652,17 +29656,20 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_list_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29713,8 +29720,9 @@ def test_get_instance_rest_bad_request(request_type=instance.GetInstanceRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29799,17 +29807,20 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_get_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29862,8 +29873,9 @@ def test_update_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30118,20 +30130,21 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_update_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_update_instance" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_update_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30182,8 +30195,9 @@ def test_rename_instance_rest_bad_request(request_type=instance.RenameInstanceRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30268,18 +30282,20 @@ def test_rename_instance_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_rename_instance" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_rename_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_rename_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_rename_instance" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_rename_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_rename_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30328,8 +30344,9 @@ def test_reset_instance_rest_bad_request(request_type=instance.ResetInstanceRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30386,19 +30403,21 @@ def test_reset_instance_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_reset_instance" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_reset_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_reset_instance" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_reset_instance" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_reset_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_reset_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30447,8 +30466,9 @@ def test_start_instance_rest_bad_request(request_type=instance.StartInstanceRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30505,19 +30525,21 @@ def test_start_instance_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_start_instance" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_start_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_start_instance" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_start_instance" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_start_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_start_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30566,8 +30588,9 @@ def test_stop_instance_rest_bad_request(request_type=instance.StopInstanceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30624,19 +30647,21 @@ def test_stop_instance_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_stop_instance" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_stop_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_stop_instance" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_stop_instance" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_stop_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_stop_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30687,8 +30712,9 @@ def test_enable_interactive_serial_console_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30745,22 +30771,23 @@ def test_enable_interactive_serial_console_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, - "post_enable_interactive_serial_console", - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_enable_interactive_serial_console_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "pre_enable_interactive_serial_console", - ) as pre: + 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.BareMetalSolutionRestInterceptor, + "post_enable_interactive_serial_console", + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_enable_interactive_serial_console_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "pre_enable_interactive_serial_console", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30813,8 +30840,9 @@ def test_disable_interactive_serial_console_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30871,22 +30899,23 @@ def test_disable_interactive_serial_console_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, - "post_disable_interactive_serial_console", - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_disable_interactive_serial_console_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "pre_disable_interactive_serial_console", - ) as pre: + 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.BareMetalSolutionRestInterceptor, + "post_disable_interactive_serial_console", + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_disable_interactive_serial_console_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "pre_disable_interactive_serial_console", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30937,8 +30966,9 @@ def test_detach_lun_rest_bad_request(request_type=gcb_instance.DetachLunRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30995,19 +31025,20 @@ def test_detach_lun_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_detach_lun" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_detach_lun_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_detach_lun" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_detach_lun" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_detach_lun_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_detach_lun" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31056,8 +31087,9 @@ def test_list_ssh_keys_rest_bad_request(request_type=ssh_key.ListSSHKeysRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31120,17 +31152,20 @@ def test_list_ssh_keys_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_list_ssh_keys" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_list_ssh_keys_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_list_ssh_keys" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_list_ssh_keys" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_list_ssh_keys_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_list_ssh_keys" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31181,8 +31216,9 @@ def test_create_ssh_key_rest_bad_request(request_type=gcb_ssh_key.CreateSSHKeyRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31315,17 +31351,20 @@ def test_create_ssh_key_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_create_ssh_key" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_create_ssh_key_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_create_ssh_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_create_ssh_key" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_create_ssh_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_create_ssh_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31376,8 +31415,9 @@ def test_delete_ssh_key_rest_bad_request(request_type=ssh_key.DeleteSSHKeyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31434,13 +31474,13 @@ def test_delete_ssh_key_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "pre_delete_ssh_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_delete_ssh_key" + ) as pre, + ): pre.assert_not_called() pb_message = ssh_key.DeleteSSHKeyRequest.pb(ssh_key.DeleteSSHKeyRequest()) transcode.return_value = { @@ -31481,8 +31521,9 @@ def test_list_volumes_rest_bad_request(request_type=volume.ListVolumesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31547,17 +31588,20 @@ def test_list_volumes_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_list_volumes" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_list_volumes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_list_volumes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_list_volumes" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_list_volumes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_list_volumes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31606,8 +31650,9 @@ def test_get_volume_rest_bad_request(request_type=volume.GetVolumeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31716,17 +31761,19 @@ def test_get_volume_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_get_volume" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_get_volume_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_get_volume" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_get_volume" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_get_volume_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_get_volume" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31777,8 +31824,9 @@ def test_update_volume_rest_bad_request(request_type=gcb_volume.UpdateVolumeRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31935,19 +31983,21 @@ def test_update_volume_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_update_volume" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_update_volume_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_update_volume" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_update_volume" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_update_volume_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_update_volume" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31996,8 +32046,9 @@ def test_rename_volume_rest_bad_request(request_type=volume.RenameVolumeRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32106,17 +32157,20 @@ def test_rename_volume_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_rename_volume" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_rename_volume_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_rename_volume" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_rename_volume" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_rename_volume_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_rename_volume" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32165,8 +32219,9 @@ def test_evict_volume_rest_bad_request(request_type=volume.EvictVolumeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32223,19 +32278,21 @@ def test_evict_volume_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_evict_volume" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_evict_volume_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_evict_volume" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_evict_volume" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_evict_volume_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_evict_volume" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32284,8 +32341,9 @@ def test_resize_volume_rest_bad_request(request_type=gcb_volume.ResizeVolumeRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32342,19 +32400,21 @@ def test_resize_volume_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_resize_volume" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_resize_volume_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_resize_volume" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_resize_volume" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_resize_volume_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_resize_volume" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32403,8 +32463,9 @@ def test_list_networks_rest_bad_request(request_type=network.ListNetworksRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32469,17 +32530,20 @@ def test_list_networks_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_list_networks" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_list_networks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_list_networks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_list_networks" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_list_networks_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_list_networks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32532,8 +32596,9 @@ def test_list_network_usage_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32593,18 +32658,20 @@ def test_list_network_usage_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_list_network_usage" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_list_network_usage_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_list_network_usage" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_list_network_usage" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_list_network_usage_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_list_network_usage" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32657,8 +32724,9 @@ def test_get_network_rest_bad_request(request_type=network.GetNetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32743,17 +32811,20 @@ def test_get_network_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_get_network" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_get_network_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_get_network" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_get_network" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_get_network_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_get_network" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32804,8 +32875,9 @@ def test_update_network_rest_bad_request(request_type=gcb_network.UpdateNetworkR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32977,19 +33049,21 @@ def test_update_network_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_update_network" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_update_network_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_update_network" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_update_network" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_update_network_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_update_network" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33042,8 +33116,9 @@ def test_create_volume_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33191,18 +33266,20 @@ def test_create_volume_snapshot_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_create_volume_snapshot" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_create_volume_snapshot_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_create_volume_snapshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_create_volume_snapshot" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_create_volume_snapshot_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_create_volume_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33259,8 +33336,9 @@ def test_restore_volume_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33319,20 +33397,21 @@ def test_restore_volume_snapshot_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_restore_volume_snapshot" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_restore_volume_snapshot_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_restore_volume_snapshot" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_restore_volume_snapshot" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_restore_volume_snapshot_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_restore_volume_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33387,8 +33466,9 @@ def test_delete_volume_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33447,13 +33527,13 @@ def test_delete_volume_snapshot_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "pre_delete_volume_snapshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_delete_volume_snapshot" + ) as pre, + ): pre.assert_not_called() pb_message = volume_snapshot.DeleteVolumeSnapshotRequest.pb( volume_snapshot.DeleteVolumeSnapshotRequest() @@ -33500,8 +33580,9 @@ def test_get_volume_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33574,18 +33655,20 @@ def test_get_volume_snapshot_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_get_volume_snapshot" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_get_volume_snapshot_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_get_volume_snapshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_get_volume_snapshot" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_get_volume_snapshot_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_get_volume_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33640,8 +33723,9 @@ def test_list_volume_snapshots_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33706,18 +33790,20 @@ def test_list_volume_snapshots_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_list_volume_snapshots" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_list_volume_snapshots_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_list_volume_snapshots" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_list_volume_snapshots" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_list_volume_snapshots_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_list_volume_snapshots" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33775,8 +33861,9 @@ def test_get_lun_rest_bad_request(request_type=lun.GetLunRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33861,17 +33948,19 @@ def test_get_lun_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_get_lun" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_get_lun_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_get_lun" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_get_lun" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_get_lun_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_get_lun" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33920,8 +34009,9 @@ def test_list_luns_rest_bad_request(request_type=lun.ListLunsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33986,17 +34076,19 @@ def test_list_luns_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_list_luns" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_list_luns_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_list_luns" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_list_luns" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_list_luns_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_list_luns" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34047,8 +34139,9 @@ def test_evict_lun_rest_bad_request(request_type=lun.EvictLunRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34107,19 +34200,20 @@ def test_evict_lun_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_evict_lun" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_evict_lun_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_evict_lun" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_evict_lun" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_evict_lun_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_evict_lun" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34168,8 +34262,9 @@ def test_get_nfs_share_rest_bad_request(request_type=nfs_share.GetNfsShareReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34244,17 +34339,20 @@ def test_get_nfs_share_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_get_nfs_share" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_get_nfs_share_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_get_nfs_share" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_get_nfs_share" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_get_nfs_share_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_get_nfs_share" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34303,8 +34401,9 @@ def test_list_nfs_shares_rest_bad_request(request_type=nfs_share.ListNfsSharesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34369,18 +34468,20 @@ def test_list_nfs_shares_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_list_nfs_shares" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_list_nfs_shares_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_list_nfs_shares" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_list_nfs_shares" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_list_nfs_shares_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_list_nfs_shares" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34435,8 +34536,9 @@ def test_update_nfs_share_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34584,20 +34686,21 @@ def test_update_nfs_share_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_update_nfs_share" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_update_nfs_share_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_update_nfs_share" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_update_nfs_share" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_update_nfs_share_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_update_nfs_share" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34650,8 +34753,9 @@ def test_create_nfs_share_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34797,20 +34901,21 @@ def test_create_nfs_share_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_create_nfs_share" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_create_nfs_share_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_create_nfs_share" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_create_nfs_share" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_create_nfs_share_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_create_nfs_share" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34863,8 +34968,9 @@ def test_rename_nfs_share_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34939,18 +35045,20 @@ def test_rename_nfs_share_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_rename_nfs_share" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_rename_nfs_share_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_rename_nfs_share" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_rename_nfs_share" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_rename_nfs_share_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_rename_nfs_share" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35003,8 +35111,9 @@ def test_delete_nfs_share_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35061,20 +35170,21 @@ def test_delete_nfs_share_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_delete_nfs_share" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_delete_nfs_share_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_delete_nfs_share" - ) as pre: + 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.BareMetalSolutionRestInterceptor, "post_delete_nfs_share" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_delete_nfs_share_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_delete_nfs_share" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35127,8 +35237,9 @@ def test_list_provisioning_quotas_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35191,18 +35302,20 @@ def test_list_provisioning_quotas_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_list_provisioning_quotas" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_list_provisioning_quotas_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_list_provisioning_quotas" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_list_provisioning_quotas" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_list_provisioning_quotas_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_list_provisioning_quotas" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35260,8 +35373,9 @@ def test_submit_provisioning_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35321,18 +35435,22 @@ def test_submit_provisioning_config_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_submit_provisioning_config" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_submit_provisioning_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_submit_provisioning_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_submit_provisioning_config", + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_submit_provisioning_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "pre_submit_provisioning_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35392,8 +35510,9 @@ def test_get_provisioning_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35476,18 +35595,20 @@ def test_get_provisioning_config_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_get_provisioning_config" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_get_provisioning_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_get_provisioning_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_get_provisioning_config" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_get_provisioning_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_get_provisioning_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35542,8 +35663,9 @@ def test_create_provisioning_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35784,18 +35906,22 @@ def test_create_provisioning_config_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_create_provisioning_config" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_create_provisioning_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_create_provisioning_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_create_provisioning_config", + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_create_provisioning_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "pre_create_provisioning_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35854,8 +35980,9 @@ def test_update_provisioning_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36100,18 +36227,22 @@ def test_update_provisioning_config_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_update_provisioning_config" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, - "post_update_provisioning_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_update_provisioning_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_update_provisioning_config", + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_update_provisioning_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "pre_update_provisioning_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36164,8 +36295,9 @@ def test_rename_network_rest_bad_request(request_type=network.RenameNetworkReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36250,17 +36382,20 @@ def test_rename_network_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_rename_network" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_rename_network_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_rename_network" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_rename_network" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_rename_network_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_rename_network" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36309,8 +36444,9 @@ def test_list_os_images_rest_bad_request(request_type=osimage.ListOSImagesReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36373,17 +36509,20 @@ def test_list_os_images_rest_interceptors(null_interceptor): ) client = BareMetalSolutionClient(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.BareMetalSolutionRestInterceptor, "post_list_os_images" - ) as post, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "post_list_os_images_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BareMetalSolutionRestInterceptor, "pre_list_os_images" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "post_list_os_images" + ) as post, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, + "post_list_os_images_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BareMetalSolutionRestInterceptor, "pre_list_os_images" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36436,8 +36575,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -36496,8 +36636,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -37578,11 +37719,14 @@ def test_bare_metal_solution_base_transport(): def test_bare_metal_solution_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bare_metal_solution_v2.services.bare_metal_solution.transports.BareMetalSolutionTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bare_metal_solution_v2.services.bare_metal_solution.transports.BareMetalSolutionTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BareMetalSolutionTransport( @@ -37599,9 +37743,12 @@ def test_bare_metal_solution_base_transport_with_credentials_file(): def test_bare_metal_solution_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bare_metal_solution_v2.services.bare_metal_solution.transports.BareMetalSolutionTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bare_metal_solution_v2.services.bare_metal_solution.transports.BareMetalSolutionTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BareMetalSolutionTransport() @@ -37673,11 +37820,12 @@ def test_bare_metal_solution_transport_auth_gdch_credentials(transport_class): def test_bare_metal_solution_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-batch/docs/conf.py b/packages/google-cloud-batch/docs/conf.py index 72808f45d4e3..ca866fa02166 100644 --- a/packages/google-cloud-batch/docs/conf.py +++ b/packages/google-cloud-batch/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-batch documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/__init__.py b/packages/google-cloud-batch/google/cloud/batch_v1/__init__.py index 2159404d7bce..6500c1193ac4 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/__init__.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.batch_service import BatchServiceAsyncClient, BatchServiceClient from .types.batch import ( CancelJobRequest, diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/async_client.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/async_client.py index ce6ec9790126..e98933a4132a 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/async_client.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.batch_v1 import gapic_version as package_version @@ -44,18 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.batch_v1.services.batch_service import pagers -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task from .client import BatchServiceClient from .transports.base import DEFAULT_CLIENT_INFO, BatchServiceTransport @@ -126,7 +124,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BatchServiceAsyncClient: The constructed client. """ - return BatchServiceClient.from_service_account_info.__func__(BatchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BatchServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BatchServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +141,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BatchServiceAsyncClient: The constructed client. """ - return BatchServiceClient.from_service_account_file.__func__(BatchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BatchServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BatchServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/client.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/client.py index ec8dac799e48..5e7e2e959e9a 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/client.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.batch_v1 import gapic_version as package_version @@ -61,18 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.batch_v1.services.batch_service import pagers -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task from .transports.base import DEFAULT_CLIENT_INFO, BatchServiceTransport from .transports.grpc import BatchServiceGrpcTransport @@ -681,11 +679,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BatchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BatchServiceClient._read_environment_variables() + ) self._client_cert_source = BatchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -720,8 +716,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BatchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/pagers.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/pagers.py index e8efad43bdea..1618ac99e9a3 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/pagers.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/base.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/base.py index 1f90bcb10762..84287f55cb27 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/base.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/base.py @@ -17,21 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.batch_v1 import gapic_version as package_version -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -336,13 +334,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc.py index d3f65e0cf65b..8f13e650bac7 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc.py @@ -16,24 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task from .base import DEFAULT_CLIENT_INFO, BatchServiceTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc_asyncio.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc_asyncio.py index 2bcc720524a6..92ec9ba09f7b 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,15 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task from .base import DEFAULT_CLIENT_INFO, BatchServiceTransport from .grpc import BatchServiceGrpcTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest.py index 07d80e15359e..ffbf6c5e86ac 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest.py @@ -16,24 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseBatchServiceRestTransport @@ -827,7 +825,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1131,7 +1129,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest_base.py b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest_base.py index ba6e9047a57a..9e37244ce597 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest_base.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/services/batch_service/transports/rest_base.py @@ -22,10 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task from .base import DEFAULT_CLIENT_INFO, BatchServiceTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/types/__init__.py b/packages/google-cloud-batch/google/cloud/batch_v1/types/__init__.py index 67bcf0f8b04b..cd2884a9359e 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/types/__init__.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/types/__init__.py @@ -46,7 +46,11 @@ TaskSpec, TaskStatus, ) -from .volume import GCS, NFS, Volume +from .volume import ( + GCS, + NFS, + Volume, +) __all__ = ( "CancelJobRequest", diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/types/batch.py b/packages/google-cloud-batch/google/cloud/batch_v1/types/batch.py index be788e115d03..3e5a1e157a43 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/types/batch.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/types/batch.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.batch_v1.types import job as gcb_job diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/types/job.py b/packages/google-cloud-batch/google/cloud/batch_v1/types/job.py index 24a06f00ff5f..09b7bd35af99 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/types/job.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/types/job.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.batch_v1.types import task @@ -180,6 +180,7 @@ class Destination(proto.Enum): Logs are saved to the file path specified in the ``logsPath`` field. """ + DESTINATION_UNSPECIFIED = 0 CLOUD_LOGGING = 1 PATH = 2 @@ -272,6 +273,7 @@ class State(proto.Enum): executions were stopped and the resources were cleaned up. """ + STATE_UNSPECIFIED = 0 QUEUED = 1 SCHEDULED = 2 @@ -397,6 +399,7 @@ class Type(proto.Enum): TASK_STATE_CHANGED (2): Notify users that the task state has changed. """ + TYPE_UNSPECIFIED = 0 JOB_STATE_CHANGED = 1 TASK_STATE_CHANGED = 2 @@ -526,6 +529,7 @@ class ProvisioningModel(proto.Enum): Instance is provisioned with DWS Flex Start and has limited max run duration. """ + PROVISIONING_MODEL_UNSPECIFIED = 0 STANDARD = 1 SPOT = 2 @@ -786,12 +790,12 @@ class InstancePolicy(proto.Message): number=4, enum="AllocationPolicy.ProvisioningModel", ) - accelerators: MutableSequence[ - "AllocationPolicy.Accelerator" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="AllocationPolicy.Accelerator", + accelerators: MutableSequence["AllocationPolicy.Accelerator"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="AllocationPolicy.Accelerator", + ) ) boot_disk: "AllocationPolicy.Disk" = proto.Field( proto.MESSAGE, @@ -954,12 +958,12 @@ class NetworkPolicy(proto.Message): Network configurations. """ - network_interfaces: MutableSequence[ - "AllocationPolicy.NetworkInterface" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AllocationPolicy.NetworkInterface", + network_interfaces: MutableSequence["AllocationPolicy.NetworkInterface"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AllocationPolicy.NetworkInterface", + ) ) class PlacementPolicy(proto.Message): @@ -1106,6 +1110,7 @@ class SchedulingPolicy(proto.Enum): Run Tasks sequentially with increased task index. """ + SCHEDULING_POLICY_UNSPECIFIED = 0 AS_SOON_AS_POSSIBLE = 1 IN_ORDER = 2 diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/types/task.py b/packages/google-cloud-batch/google/cloud/batch_v1/types/task.py index 6b0b2664291b..b13d309a63bd 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1/types/task.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1/types/task.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.batch_v1.types import volume @@ -213,6 +213,7 @@ class State(proto.Enum): The Task has not been executed when the Job finishes. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ASSIGNED = 2 @@ -692,6 +693,7 @@ class Action(proto.Enum): Action that tasks in the group will be stopped immediately. """ + ACTION_UNSPECIFIED = 0 RETRY_TASK = 1 FAIL_TASK = 2 diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/__init__.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/__init__.py index 6bdca485ae0a..fb14a6536194 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/__init__.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.batch_service import BatchServiceAsyncClient, BatchServiceClient from .types.batch import ( CancelJobRequest, diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/async_client.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/async_client.py index b25ae1761b44..b1fa3d0f056e 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/async_client.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.batch_v1alpha import gapic_version as package_version @@ -44,24 +44,26 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.batch_v1alpha.services.batch_service import pagers from google.cloud.batch_v1alpha.types import ( - resource_allowance as gcb_resource_allowance, + batch, + job, + notification, + resource_allowance, + task, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import notification -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task +from google.cloud.batch_v1alpha.types import ( + resource_allowance as gcb_resource_allowance, +) from .client import BatchServiceClient from .transports.base import DEFAULT_CLIENT_INFO, BatchServiceTransport @@ -136,7 +138,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BatchServiceAsyncClient: The constructed client. """ - return BatchServiceClient.from_service_account_info.__func__(BatchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BatchServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BatchServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -152,7 +155,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BatchServiceAsyncClient: The constructed client. """ - return BatchServiceClient.from_service_account_file.__func__(BatchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BatchServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BatchServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/client.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/client.py index ac143ed617cc..5623d76e1fa2 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/client.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.batch_v1alpha import gapic_version as package_version @@ -61,24 +61,26 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.batch_v1alpha.services.batch_service import pagers from google.cloud.batch_v1alpha.types import ( - resource_allowance as gcb_resource_allowance, + batch, + job, + notification, + resource_allowance, + task, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import notification -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task +from google.cloud.batch_v1alpha.types import ( + resource_allowance as gcb_resource_allowance, +) from .transports.base import DEFAULT_CLIENT_INFO, BatchServiceTransport from .transports.grpc import BatchServiceGrpcTransport @@ -709,11 +711,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BatchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BatchServiceClient._read_environment_variables() + ) self._client_cert_source = BatchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -748,8 +748,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BatchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/pagers.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/pagers.py index ceae4b50843b..1c92706651cd 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/pagers.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/base.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/base.py index 8232b1aa66cf..f2fa07d23472 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/base.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/base.py @@ -17,25 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.batch_v1alpha import gapic_version as package_version +from google.cloud.batch_v1alpha.types import batch, job, resource_allowance, task +from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import ( resource_allowance as gcb_resource_allowance, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job -from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -451,13 +448,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc.py index 0437d99862ac..595616f40a50 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc.py @@ -16,28 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.batch_v1alpha.types import batch, job, resource_allowance, task +from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import ( resource_allowance as gcb_resource_allowance, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job -from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task from .base import DEFAULT_CLIENT_INFO, BatchServiceTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc_asyncio.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc_asyncio.py index ca6b3fa64c87..05c5d268f4dd 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,19 +31,13 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.batch_v1alpha.types import batch, job, resource_allowance, task +from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import ( resource_allowance as gcb_resource_allowance, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job -from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task from .base import DEFAULT_CLIENT_INFO, BatchServiceTransport from .grpc import BatchServiceGrpcTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest.py index cc9081bea9b0..222b275ed877 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest.py @@ -16,28 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.batch_v1alpha.types import batch, job, resource_allowance, task +from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import ( resource_allowance as gcb_resource_allowance, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job -from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseBatchServiceRestTransport @@ -1171,7 +1168,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1452,9 +1449,7 @@ def __call__( """ - http_options = ( - _BaseBatchServiceRestTransport._BaseCreateResourceAllowance._get_http_options() - ) + http_options = _BaseBatchServiceRestTransport._BaseCreateResourceAllowance._get_http_options() request, metadata = self._interceptor.pre_create_resource_allowance( request, metadata @@ -1634,7 +1629,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1758,9 +1753,7 @@ def __call__( """ - http_options = ( - _BaseBatchServiceRestTransport._BaseDeleteResourceAllowance._get_http_options() - ) + http_options = _BaseBatchServiceRestTransport._BaseDeleteResourceAllowance._get_http_options() request, metadata = self._interceptor.pre_delete_resource_allowance( request, metadata @@ -1782,7 +1775,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2052,9 +2045,7 @@ def __call__( """ - http_options = ( - _BaseBatchServiceRestTransport._BaseGetResourceAllowance._get_http_options() - ) + http_options = _BaseBatchServiceRestTransport._BaseGetResourceAllowance._get_http_options() request, metadata = self._interceptor.pre_get_resource_allowance( request, metadata @@ -2492,9 +2483,7 @@ def __call__( ListResourceAllowances Response. """ - http_options = ( - _BaseBatchServiceRestTransport._BaseListResourceAllowances._get_http_options() - ) + http_options = _BaseBatchServiceRestTransport._BaseListResourceAllowances._get_http_options() request, metadata = self._interceptor.pre_list_resource_allowances( request, metadata @@ -2948,9 +2937,7 @@ def __call__( """ - http_options = ( - _BaseBatchServiceRestTransport._BaseUpdateResourceAllowance._get_http_options() - ) + http_options = _BaseBatchServiceRestTransport._BaseUpdateResourceAllowance._get_http_options() request, metadata = self._interceptor.pre_update_resource_allowance( request, metadata @@ -3069,7 +3056,9 @@ def create_resource_allowance( ]: # 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._CreateResourceAllowance(self._session, self._host, self._interceptor) # type: ignore + return self._CreateResourceAllowance( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_job( @@ -3085,7 +3074,9 @@ def delete_resource_allowance( ) -> Callable[[batch.DeleteResourceAllowanceRequest], 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._DeleteResourceAllowance(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteResourceAllowance( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_job(self) -> Callable[[batch.GetJobRequest], job.Job]: @@ -3123,7 +3114,9 @@ def list_resource_allowances( ]: # 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._ListResourceAllowances(self._session, self._host, self._interceptor) # type: ignore + return self._ListResourceAllowances( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_tasks(self) -> Callable[[batch.ListTasksRequest], batch.ListTasksResponse]: @@ -3145,7 +3138,9 @@ def update_resource_allowance( ]: # 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._UpdateResourceAllowance(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateResourceAllowance( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest_base.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest_base.py index 1a64306a21d0..32cc6621cdf0 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest_base.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/services/batch_service/transports/rest_base.py @@ -22,14 +22,11 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.batch_v1alpha.types import batch, job, resource_allowance, task +from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import ( resource_allowance as gcb_resource_allowance, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job -from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task from .base import DEFAULT_CLIENT_INFO, BatchServiceTransport diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/__init__.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/__init__.py index 6f8e7fadec80..6fac08015197 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/__init__.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/__init__.py @@ -44,7 +44,9 @@ ServiceAccount, TaskGroup, ) -from .notification import Notification +from .notification import ( + Notification, +) from .resource_allowance import ( CalendarPeriod, ResourceAllowance, @@ -65,7 +67,12 @@ TaskSpec, TaskStatus, ) -from .volume import GCS, NFS, PD, Volume +from .volume import ( + GCS, + NFS, + PD, + Volume, +) __all__ = ( "CancelJobRequest", diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/batch.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/batch.py index 5b6b53c1ee13..0fe2987c66c7 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/batch.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/batch.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import ( resource_allowance as gcb_resource_allowance, ) -from google.cloud.batch_v1alpha.types import job as gcb_job from google.cloud.batch_v1alpha.types import task __protobuf__ = proto.module( @@ -601,12 +601,12 @@ class ListResourceAllowancesResponse(proto.Message): def raw_page(self): return self - resource_allowances: MutableSequence[ - gcb_resource_allowance.ResourceAllowance - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcb_resource_allowance.ResourceAllowance, + resource_allowances: MutableSequence[gcb_resource_allowance.ResourceAllowance] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcb_resource_allowance.ResourceAllowance, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py index 7c0ffdd0e451..eb9b9456db49 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.batch_v1alpha.types import task @@ -108,6 +108,7 @@ class SchedulingPolicy(proto.Enum): AS_SOON_AS_POSSIBLE (1): Run all TaskGroups as soon as possible. """ + SCHEDULING_POLICY_UNSPECIFIED = 0 AS_SOON_AS_POSSIBLE = 1 @@ -220,6 +221,7 @@ class Destination(proto.Enum): Logs are saved to the file path specified in the ``logsPath`` field. """ + DESTINATION_UNSPECIFIED = 0 CLOUD_LOGGING = 1 PATH = 2 @@ -290,6 +292,7 @@ class Type(proto.Enum): FINISHED (3): SUCCEEDED or FAILED. """ + TYPE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -356,6 +359,7 @@ class State(proto.Enum): executions were stopped and the resources were cleaned up. """ + STATE_UNSPECIFIED = 0 QUEUED = 1 SCHEDULED = 2 @@ -500,6 +504,7 @@ class Type(proto.Enum): TASK_STATE_CHANGED (2): Notify users that the task state has changed. """ + TYPE_UNSPECIFIED = 0 JOB_STATE_CHANGED = 1 TASK_STATE_CHANGED = 2 @@ -638,6 +643,7 @@ class ProvisioningModel(proto.Enum): Instance is provisioned with DWS Flex Start and has limited max run duration. """ + PROVISIONING_MODEL_UNSPECIFIED = 0 STANDARD = 1 SPOT = 2 @@ -912,12 +918,12 @@ class InstancePolicy(proto.Message): number=4, enum="AllocationPolicy.ProvisioningModel", ) - accelerators: MutableSequence[ - "AllocationPolicy.Accelerator" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="AllocationPolicy.Accelerator", + accelerators: MutableSequence["AllocationPolicy.Accelerator"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="AllocationPolicy.Accelerator", + ) ) boot_disk: "AllocationPolicy.Disk" = proto.Field( proto.MESSAGE, @@ -1080,12 +1086,12 @@ class NetworkPolicy(proto.Message): Network configurations. """ - network_interfaces: MutableSequence[ - "AllocationPolicy.NetworkInterface" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AllocationPolicy.NetworkInterface", + network_interfaces: MutableSequence["AllocationPolicy.NetworkInterface"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AllocationPolicy.NetworkInterface", + ) ) class PlacementPolicy(proto.Message): @@ -1272,6 +1278,7 @@ class SchedulingPolicy(proto.Enum): Run Tasks sequentially with increased task index. """ + SCHEDULING_POLICY_UNSPECIFIED = 0 AS_SOON_AS_POSSIBLE = 1 IN_ORDER = 2 diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/resource_allowance.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/resource_allowance.py index 7a339b66ccd9..173f1ffa4324 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/resource_allowance.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/resource_allowance.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore from google.cloud.batch_v1alpha.types import notification @@ -60,6 +60,7 @@ class CalendarPeriod(proto.Enum): DAY (5): The day starts at 12:00am. """ + CALENDAR_PERIOD_UNSPECIFIED = 0 MONTH = 1 QUARTER = 2 @@ -79,6 +80,7 @@ class ResourceAllowanceState(proto.Enum): RESOURCE_ALLOWANCE_DEPLETED (2): ResourceAllowance limit is reached. """ + RESOURCE_ALLOWANCE_STATE_UNSPECIFIED = 0 RESOURCE_ALLOWANCE_ACTIVE = 1 RESOURCE_ALLOWANCE_DEPLETED = 2 diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/task.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/task.py index ba79aa953a9a..2dabc0c06b8f 100644 --- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/task.py +++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/task.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.batch_v1alpha.types import volume @@ -233,6 +233,7 @@ class State(proto.Enum): The Task has not been executed when the Job finishes. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ASSIGNED = 2 @@ -732,6 +733,7 @@ class Action(proto.Enum): Action that tasks in the group will be stopped immediately. """ + ACTION_UNSPECIFIED = 0 RETRY_TASK = 1 FAIL_TASK = 2 diff --git a/packages/google-cloud-batch/noxfile.py b/packages/google-cloud-batch/noxfile.py index d70e974c1e14..62d640decdec 100644 --- a/packages/google-cloud-batch/noxfile.py +++ b/packages/google-cloud-batch/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-batch/tests/unit/gapic/batch_v1/test_batch_service.py b/packages/google-cloud-batch/tests/unit/gapic/batch_v1/test_batch_service.py index dccffc233387..c542f7d59d7b 100644 --- a/packages/google-cloud-batch/tests/unit/gapic/batch_v1/test_batch_service.py +++ b/packages/google-cloud-batch/tests/unit/gapic/batch_v1/test_batch_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.batch_v1.services.batch_service import ( BatchServiceAsyncClient, @@ -72,10 +72,8 @@ pagers, transports, ) -from google.cloud.batch_v1.types import batch -from google.cloud.batch_v1.types import job +from google.cloud.batch_v1.types import batch, job, task, volume from google.cloud.batch_v1.types import job as gcb_job -from google.cloud.batch_v1.types import task, volume CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -943,10 +941,9 @@ def test_batch_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +988,9 @@ def test_batch_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1026,9 @@ def test_batch_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1272,13 +1267,13 @@ def test_batch_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5703,8 +5698,9 @@ def test_create_job_rest_bad_request(request_type=batch.CreateJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6004,17 +6000,19 @@ def test_create_job_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_create_job" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_create_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_create_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_create_job" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_create_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_create_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6063,8 +6061,9 @@ def test_get_job_rest_bad_request(request_type=batch.GetJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6131,17 +6130,17 @@ def test_get_job_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_get_job" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_get_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_get_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_get_job" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_get_job_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BatchServiceRestInterceptor, "pre_get_job") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6190,8 +6189,9 @@ def test_delete_job_rest_bad_request(request_type=batch.DeleteJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6248,19 +6248,20 @@ def test_delete_job_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_delete_job" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_delete_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_delete_job" - ) as pre: + 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.BatchServiceRestInterceptor, "post_delete_job" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_delete_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_delete_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6309,8 +6310,9 @@ def test_cancel_job_rest_bad_request(request_type=batch.CancelJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6367,19 +6369,20 @@ def test_cancel_job_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_cancel_job" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_cancel_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_cancel_job" - ) as pre: + 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.BatchServiceRestInterceptor, "post_cancel_job" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_cancel_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_cancel_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6428,8 +6431,9 @@ def test_list_jobs_rest_bad_request(request_type=batch.ListJobsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6494,17 +6498,19 @@ def test_list_jobs_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_list_jobs" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_list_jobs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_list_jobs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_list_jobs" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_list_jobs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_list_jobs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6555,8 +6561,9 @@ def test_get_task_rest_bad_request(request_type=batch.GetTaskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6621,17 +6628,19 @@ def test_get_task_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_get_task" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_get_task_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_get_task" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_get_task" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_get_task_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_get_task" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6682,8 +6691,9 @@ def test_list_tasks_rest_bad_request(request_type=batch.ListTasksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6750,17 +6760,19 @@ def test_list_tasks_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_list_tasks" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_list_tasks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_list_tasks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_list_tasks" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_list_tasks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_list_tasks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6811,8 +6823,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6871,8 +6884,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6933,8 +6947,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6995,8 +7010,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7057,8 +7073,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7119,8 +7136,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7402,11 +7420,14 @@ def test_batch_service_base_transport(): def test_batch_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.batch_v1.services.batch_service.transports.BatchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.batch_v1.services.batch_service.transports.BatchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BatchServiceTransport( @@ -7423,9 +7444,12 @@ def test_batch_service_base_transport_with_credentials_file(): def test_batch_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.batch_v1.services.batch_service.transports.BatchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.batch_v1.services.batch_service.transports.BatchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BatchServiceTransport() @@ -7497,11 +7521,12 @@ def test_batch_service_transport_auth_gdch_credentials(transport_class): def test_batch_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py b/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py index e5a8d80c80b3..4c6e5278890d 100644 --- a/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py +++ b/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.batch_v1alpha.services.batch_service import ( BatchServiceAsyncClient, @@ -75,14 +75,17 @@ transports, ) from google.cloud.batch_v1alpha.types import ( - resource_allowance as gcb_resource_allowance, + batch, + job, + notification, + resource_allowance, + task, + volume, ) -from google.cloud.batch_v1alpha.types import batch -from google.cloud.batch_v1alpha.types import job from google.cloud.batch_v1alpha.types import job as gcb_job -from google.cloud.batch_v1alpha.types import notification -from google.cloud.batch_v1alpha.types import resource_allowance -from google.cloud.batch_v1alpha.types import task, volume +from google.cloud.batch_v1alpha.types import ( + resource_allowance as gcb_resource_allowance, +) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -950,10 +953,9 @@ def test_batch_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +1000,9 @@ def test_batch_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1038,9 @@ def test_batch_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1279,13 +1279,13 @@ def test_batch_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4851,9 +4851,9 @@ def test_get_resource_allowance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_allowance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_allowance] = ( + mock_rpc + ) request = {} client.get_resource_allowance(request) @@ -8071,9 +8071,9 @@ def test_get_resource_allowance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_allowance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_allowance] = ( + mock_rpc + ) request = {} client.get_resource_allowance(request) @@ -9698,8 +9698,9 @@ def test_create_job_rest_bad_request(request_type=batch.CreateJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10035,17 +10036,19 @@ def test_create_job_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_create_job" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_create_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_create_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_create_job" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_create_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_create_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10094,8 +10097,9 @@ def test_get_job_rest_bad_request(request_type=batch.GetJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10164,17 +10168,17 @@ def test_get_job_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_get_job" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_get_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_get_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_get_job" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_get_job_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BatchServiceRestInterceptor, "pre_get_job") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10223,8 +10227,9 @@ def test_delete_job_rest_bad_request(request_type=batch.DeleteJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10281,19 +10286,20 @@ def test_delete_job_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_delete_job" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_delete_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_delete_job" - ) as pre: + 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.BatchServiceRestInterceptor, "post_delete_job" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_delete_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_delete_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10342,8 +10348,9 @@ def test_cancel_job_rest_bad_request(request_type=batch.CancelJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10400,19 +10407,20 @@ def test_cancel_job_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_cancel_job" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_cancel_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_cancel_job" - ) as pre: + 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.BatchServiceRestInterceptor, "post_cancel_job" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_cancel_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_cancel_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10461,8 +10469,9 @@ def test_update_job_rest_bad_request(request_type=batch.UpdateJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10798,17 +10807,19 @@ def test_update_job_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_update_job" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_update_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_update_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_update_job" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_update_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_update_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10857,8 +10868,9 @@ def test_list_jobs_rest_bad_request(request_type=batch.ListJobsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10923,17 +10935,19 @@ def test_list_jobs_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_list_jobs" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_list_jobs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_list_jobs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_list_jobs" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_list_jobs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_list_jobs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10984,8 +10998,9 @@ def test_get_task_rest_bad_request(request_type=batch.GetTaskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11050,17 +11065,19 @@ def test_get_task_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_get_task" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_get_task_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_get_task" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_get_task" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_get_task_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_get_task" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11111,8 +11128,9 @@ def test_list_tasks_rest_bad_request(request_type=batch.ListTasksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11179,17 +11197,19 @@ def test_list_tasks_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_list_tasks" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, "post_list_tasks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_list_tasks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_list_tasks" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_list_tasks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_list_tasks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11240,8 +11260,9 @@ def test_create_resource_allowance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11398,18 +11419,20 @@ def test_create_resource_allowance_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_create_resource_allowance" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, - "post_create_resource_allowance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_create_resource_allowance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_create_resource_allowance" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, + "post_create_resource_allowance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_create_resource_allowance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11469,8 +11492,9 @@ def test_get_resource_allowance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11537,18 +11561,20 @@ def test_get_resource_allowance_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_get_resource_allowance" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, - "post_get_resource_allowance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_get_resource_allowance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_get_resource_allowance" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, + "post_get_resource_allowance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_get_resource_allowance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11608,8 +11634,9 @@ def test_delete_resource_allowance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11668,20 +11695,21 @@ def test_delete_resource_allowance_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_delete_resource_allowance" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, - "post_delete_resource_allowance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_delete_resource_allowance" - ) as pre: + 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.BatchServiceRestInterceptor, "post_delete_resource_allowance" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, + "post_delete_resource_allowance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_delete_resource_allowance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11734,8 +11762,9 @@ def test_list_resource_allowances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11800,18 +11829,20 @@ def test_list_resource_allowances_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_list_resource_allowances" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, - "post_list_resource_allowances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_list_resource_allowances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_list_resource_allowances" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, + "post_list_resource_allowances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_list_resource_allowances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11873,8 +11904,9 @@ def test_update_resource_allowance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12035,18 +12067,20 @@ def test_update_resource_allowance_rest_interceptors(null_interceptor): ) client = BatchServiceClient(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.BatchServiceRestInterceptor, "post_update_resource_allowance" - ) as post, mock.patch.object( - transports.BatchServiceRestInterceptor, - "post_update_resource_allowance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BatchServiceRestInterceptor, "pre_update_resource_allowance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchServiceRestInterceptor, "post_update_resource_allowance" + ) as post, + mock.patch.object( + transports.BatchServiceRestInterceptor, + "post_update_resource_allowance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BatchServiceRestInterceptor, "pre_update_resource_allowance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12104,8 +12138,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12164,8 +12199,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12226,8 +12262,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12288,8 +12325,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12350,8 +12388,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12412,8 +12451,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12831,11 +12871,14 @@ def test_batch_service_base_transport(): def test_batch_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.batch_v1alpha.services.batch_service.transports.BatchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.batch_v1alpha.services.batch_service.transports.BatchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BatchServiceTransport( @@ -12852,9 +12895,12 @@ def test_batch_service_base_transport_with_credentials_file(): def test_batch_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.batch_v1alpha.services.batch_service.transports.BatchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.batch_v1alpha.services.batch_service.transports.BatchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BatchServiceTransport() @@ -12926,11 +12972,12 @@ def test_batch_service_transport_auth_gdch_credentials(transport_class): def test_batch_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-beyondcorp-appconnections/docs/conf.py b/packages/google-cloud-beyondcorp-appconnections/docs/conf.py index c01967b8ea09..79e1b0de820b 100644 --- a/packages/google-cloud-beyondcorp-appconnections/docs/conf.py +++ b/packages/google-cloud-beyondcorp-appconnections/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-beyondcorp-appconnections documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/__init__.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/__init__.py index 123b1edcce52..85033ba07e6b 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/__init__.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.app_connections_service import ( AppConnectionsServiceAsyncClient, AppConnectionsServiceClient, diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/async_client.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/async_client.py index 5a417c41bbe6..53d9d40dc083 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/async_client.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appconnections_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_appconnections_v1.services.app_connections_service import ( pagers, @@ -151,7 +153,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AppConnectionsServiceAsyncClient: The constructed client. """ - return AppConnectionsServiceClient.from_service_account_info.__func__(AppConnectionsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AppConnectionsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AppConnectionsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -167,7 +170,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AppConnectionsServiceAsyncClient: The constructed client. """ - return AppConnectionsServiceClient.from_service_account_file.__func__(AppConnectionsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AppConnectionsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AppConnectionsServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -205,7 +209,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AppConnectionsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AppConnectionsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AppConnectionsServiceTransport: diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/client.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/client.py index f1e072c00477..26eb8c6f6440 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/client.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appconnections_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_appconnections_v1.services.app_connections_service import ( pagers, @@ -90,9 +92,7 @@ class AppConnectionsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AppConnectionsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AppConnectionsServiceTransport]] _transport_registry["grpc"] = AppConnectionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AppConnectionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AppConnectionsServiceRestTransport @@ -698,11 +698,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AppConnectionsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AppConnectionsServiceClient._read_environment_variables() + ) self._client_cert_source = AppConnectionsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -737,8 +735,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AppConnectionsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/pagers.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/pagers.py index 4f2a184fcb30..9e8eca307d2a 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/pagers.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -309,7 +309,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/__init__.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/__init__.py index 2b3d709cb733..9c4930076768 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/__init__.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AppConnectionsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AppConnectionsServiceTransport]] _transport_registry["grpc"] = AppConnectionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AppConnectionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AppConnectionsServiceRestTransport diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/base.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/base.py index ebdd4e962d49..fb96e37a108b 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/base.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appconnections_v1 import gapic_version as package_version from google.cloud.beyondcorp_appconnections_v1.types import app_connections_service @@ -318,13 +320,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc.py index 5ab4e08a8fb8..961829ba523e 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_appconnections_v1.types import app_connections_service diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc_asyncio.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc_asyncio.py index 1e5e8827548e..2e5e0314b7b9 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_appconnections_v1.types import app_connections_service diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest.py index 6dd40ff974bf..a0082f4281cc 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -865,9 +867,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseCreateAppConnection._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseCreateAppConnection._get_http_options() request, metadata = self._interceptor.pre_create_app_connection( request, metadata @@ -893,7 +893,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1021,9 +1021,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseDeleteAppConnection._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseDeleteAppConnection._get_http_options() request, metadata = self._interceptor.pre_delete_app_connection( request, metadata @@ -1045,7 +1043,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1177,9 +1175,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseGetAppConnection._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseGetAppConnection._get_http_options() request, metadata = self._interceptor.pre_get_app_connection( request, metadata @@ -1331,9 +1327,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseListAppConnections._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseListAppConnections._get_http_options() request, metadata = self._interceptor.pre_list_app_connections( request, metadata @@ -1487,9 +1481,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseResolveAppConnections._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseResolveAppConnections._get_http_options() request, metadata = self._interceptor.pre_resolve_app_connections( request, metadata @@ -1645,9 +1637,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseUpdateAppConnection._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseUpdateAppConnection._get_http_options() request, metadata = self._interceptor.pre_update_app_connection( request, metadata @@ -1673,7 +1663,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1863,9 +1853,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseAppConnectionsServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -2004,9 +1992,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAppConnectionsServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -2145,9 +2131,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseAppConnectionsServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2287,9 +2271,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseAppConnectionsServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2434,9 +2416,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2582,9 +2562,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2704,9 +2682,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2824,9 +2800,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAppConnectionsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2965,9 +2939,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAppConnectionsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAppConnectionsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAppConnectionsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest_base.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest_base.py index 2ebc81b00525..9b6cf6a66e56 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest_base.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/services/app_connections_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/types/app_connections_service.py b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/types/app_connections_service.py index e42d0fcc9fba..4f9162f33eba 100644 --- a/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/types/app_connections_service.py +++ b/packages/google-cloud-beyondcorp-appconnections/google/cloud/beyondcorp_appconnections_v1/types/app_connections_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -477,6 +477,7 @@ class Type(proto.Enum): TCP Proxy based BeyondCorp AppConnection. API will default to this if unset. """ + TYPE_UNSPECIFIED = 0 TCP_PROXY = 1 @@ -500,6 +501,7 @@ class State(proto.Enum): the future. This happens when CCFE sends ProjectState = OFF. """ + STATE_UNSPECIFIED = 0 CREATING = 1 CREATED = 2 @@ -558,6 +560,7 @@ class Type(proto.Enum): Gateway hosted in a GCP regional managed instance group. """ + TYPE_UNSPECIFIED = 0 GCP_REGIONAL_MIG = 1 diff --git a/packages/google-cloud-beyondcorp-appconnections/noxfile.py b/packages/google-cloud-beyondcorp-appconnections/noxfile.py index 63c00ada0c75..3c1f53267746 100644 --- a/packages/google-cloud-beyondcorp-appconnections/noxfile.py +++ b/packages/google-cloud-beyondcorp-appconnections/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-beyondcorp-appconnections/tests/unit/gapic/beyondcorp_appconnections_v1/test_app_connections_service.py b/packages/google-cloud-beyondcorp-appconnections/tests/unit/gapic/beyondcorp_appconnections_v1/test_app_connections_service.py index 9ecd8dc8ed71..b10153464752 100644 --- a/packages/google-cloud-beyondcorp-appconnections/tests/unit/gapic/beyondcorp_appconnections_v1/test_app_connections_service.py +++ b/packages/google-cloud-beyondcorp-appconnections/tests/unit/gapic/beyondcorp_appconnections_v1/test_app_connections_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_appconnections_v1.services.app_connections_service import ( AppConnectionsServiceAsyncClient, @@ -1011,10 +1013,9 @@ def test_app_connections_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1060,9 @@ def test_app_connections_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1098,9 @@ def test_app_connections_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1357,13 +1356,13 @@ def test_app_connections_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1484,9 +1483,9 @@ def test_list_app_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_app_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_app_connections] = ( + mock_rpc + ) request = {} client.list_app_connections(request) @@ -2044,9 +2043,9 @@ def test_get_app_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_app_connection] = ( + mock_rpc + ) request = {} client.get_app_connection(request) @@ -2398,9 +2397,9 @@ def test_create_app_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_app_connection] = ( + mock_rpc + ) request = {} client.create_app_connection(request) @@ -2765,9 +2764,9 @@ def test_update_app_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_app_connection] = ( + mock_rpc + ) request = {} client.update_app_connection(request) @@ -3124,9 +3123,9 @@ def test_delete_app_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_app_connection] = ( + mock_rpc + ) request = {} client.delete_app_connection(request) @@ -3970,9 +3969,9 @@ def test_list_app_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_app_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_app_connections] = ( + mock_rpc + ) request = {} client.list_app_connections(request) @@ -4241,9 +4240,9 @@ def test_get_app_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_app_connection] = ( + mock_rpc + ) request = {} client.get_app_connection(request) @@ -4426,9 +4425,9 @@ def test_create_app_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_app_connection] = ( + mock_rpc + ) request = {} client.create_app_connection(request) @@ -4635,9 +4634,9 @@ def test_update_app_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_app_connection] = ( + mock_rpc + ) request = {} client.update_app_connection(request) @@ -4843,9 +4842,9 @@ def test_delete_app_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_app_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_app_connection] = ( + mock_rpc + ) request = {} client.delete_app_connection(request) @@ -5761,8 +5760,9 @@ def test_list_app_connections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5829,18 +5829,20 @@ def test_list_app_connections_rest_interceptors(null_interceptor): ) client = AppConnectionsServiceClient(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.AppConnectionsServiceRestInterceptor, "post_list_app_connections" - ) as post, mock.patch.object( - transports.AppConnectionsServiceRestInterceptor, - "post_list_app_connections_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppConnectionsServiceRestInterceptor, "pre_list_app_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, "post_list_app_connections" + ) as post, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, + "post_list_app_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, "pre_list_app_connections" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5898,8 +5900,9 @@ def test_get_app_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5972,18 +5975,20 @@ def test_get_app_connection_rest_interceptors(null_interceptor): ) client = AppConnectionsServiceClient(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.AppConnectionsServiceRestInterceptor, "post_get_app_connection" - ) as post, mock.patch.object( - transports.AppConnectionsServiceRestInterceptor, - "post_get_app_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppConnectionsServiceRestInterceptor, "pre_get_app_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, "post_get_app_connection" + ) as post, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, + "post_get_app_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, "pre_get_app_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6041,8 +6046,9 @@ def test_create_app_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6186,20 +6192,22 @@ def test_create_app_connection_rest_interceptors(null_interceptor): ) client = AppConnectionsServiceClient(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.AppConnectionsServiceRestInterceptor, "post_create_app_connection" - ) as post, mock.patch.object( - transports.AppConnectionsServiceRestInterceptor, - "post_create_app_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppConnectionsServiceRestInterceptor, "pre_create_app_connection" - ) as pre: + 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.AppConnectionsServiceRestInterceptor, + "post_create_app_connection", + ) as post, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, + "post_create_app_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, "pre_create_app_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6256,8 +6264,9 @@ def test_update_app_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6405,20 +6414,22 @@ def test_update_app_connection_rest_interceptors(null_interceptor): ) client = AppConnectionsServiceClient(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.AppConnectionsServiceRestInterceptor, "post_update_app_connection" - ) as post, mock.patch.object( - transports.AppConnectionsServiceRestInterceptor, - "post_update_app_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppConnectionsServiceRestInterceptor, "pre_update_app_connection" - ) as pre: + 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.AppConnectionsServiceRestInterceptor, + "post_update_app_connection", + ) as post, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, + "post_update_app_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, "pre_update_app_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6471,8 +6482,9 @@ def test_delete_app_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6529,20 +6541,22 @@ def test_delete_app_connection_rest_interceptors(null_interceptor): ) client = AppConnectionsServiceClient(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.AppConnectionsServiceRestInterceptor, "post_delete_app_connection" - ) as post, mock.patch.object( - transports.AppConnectionsServiceRestInterceptor, - "post_delete_app_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppConnectionsServiceRestInterceptor, "pre_delete_app_connection" - ) as pre: + 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.AppConnectionsServiceRestInterceptor, + "post_delete_app_connection", + ) as post, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, + "post_delete_app_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, "pre_delete_app_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6595,8 +6609,9 @@ def test_resolve_app_connections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6663,18 +6678,22 @@ def test_resolve_app_connections_rest_interceptors(null_interceptor): ) client = AppConnectionsServiceClient(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.AppConnectionsServiceRestInterceptor, "post_resolve_app_connections" - ) as post, mock.patch.object( - transports.AppConnectionsServiceRestInterceptor, - "post_resolve_app_connections_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppConnectionsServiceRestInterceptor, "pre_resolve_app_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, + "post_resolve_app_connections", + ) as post, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, + "post_resolve_app_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppConnectionsServiceRestInterceptor, + "pre_resolve_app_connections", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6732,8 +6751,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6792,8 +6812,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6855,8 +6876,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6920,8 +6942,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6985,8 +7008,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7049,8 +7073,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7111,8 +7136,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7173,8 +7199,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7235,8 +7262,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7512,11 +7540,14 @@ def test_app_connections_service_base_transport(): def test_app_connections_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.beyondcorp_appconnections_v1.services.app_connections_service.transports.AppConnectionsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.beyondcorp_appconnections_v1.services.app_connections_service.transports.AppConnectionsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AppConnectionsServiceTransport( @@ -7533,9 +7564,12 @@ def test_app_connections_service_base_transport_with_credentials_file(): def test_app_connections_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.beyondcorp_appconnections_v1.services.app_connections_service.transports.AppConnectionsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.beyondcorp_appconnections_v1.services.app_connections_service.transports.AppConnectionsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AppConnectionsServiceTransport() @@ -7609,11 +7643,12 @@ def test_app_connections_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-beyondcorp-appconnectors/docs/conf.py b/packages/google-cloud-beyondcorp-appconnectors/docs/conf.py index ea625e416989..fe51ce5622bf 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/docs/conf.py +++ b/packages/google-cloud-beyondcorp-appconnectors/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-beyondcorp-appconnectors documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/__init__.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/__init__.py index 9f1b8f8f9781..c5d4e3ed90c9 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/__init__.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.app_connectors_service import ( AppConnectorsServiceAsyncClient, AppConnectorsServiceClient, diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/async_client.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/async_client.py index df1196846405..f1211b065c58 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/async_client.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appconnectors_v1 import gapic_version as package_version @@ -44,24 +44,28 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_appconnectors_v1.services.app_connectors_service import ( pagers, ) -from google.cloud.beyondcorp_appconnectors_v1.types import app_connectors_service +from google.cloud.beyondcorp_appconnectors_v1.types import ( + app_connectors_service, + resource_info, +) from google.cloud.beyondcorp_appconnectors_v1.types import ( resource_info as gcba_resource_info, ) -from google.cloud.beyondcorp_appconnectors_v1.types import resource_info from .client import AppConnectorsServiceClient from .transports.base import DEFAULT_CLIENT_INFO, AppConnectorsServiceTransport @@ -145,7 +149,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AppConnectorsServiceAsyncClient: The constructed client. """ - return AppConnectorsServiceClient.from_service_account_info.__func__(AppConnectorsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AppConnectorsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AppConnectorsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -161,7 +166,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AppConnectorsServiceAsyncClient: The constructed client. """ - return AppConnectorsServiceClient.from_service_account_file.__func__(AppConnectorsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AppConnectorsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AppConnectorsServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -199,7 +205,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AppConnectorsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AppConnectorsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AppConnectorsServiceTransport: diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/client.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/client.py index e484c38a1d31..31af72863945 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/client.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appconnectors_v1 import gapic_version as package_version @@ -61,24 +61,28 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_appconnectors_v1.services.app_connectors_service import ( pagers, ) -from google.cloud.beyondcorp_appconnectors_v1.types import app_connectors_service +from google.cloud.beyondcorp_appconnectors_v1.types import ( + app_connectors_service, + resource_info, +) from google.cloud.beyondcorp_appconnectors_v1.types import ( resource_info as gcba_resource_info, ) -from google.cloud.beyondcorp_appconnectors_v1.types import resource_info from .transports.base import DEFAULT_CLIENT_INFO, AppConnectorsServiceTransport from .transports.grpc import AppConnectorsServiceGrpcTransport @@ -94,9 +98,7 @@ class AppConnectorsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AppConnectorsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AppConnectorsServiceTransport]] _transport_registry["grpc"] = AppConnectorsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AppConnectorsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AppConnectorsServiceRestTransport @@ -654,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AppConnectorsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AppConnectorsServiceClient._read_environment_variables() + ) self._client_cert_source = AppConnectorsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -693,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AppConnectorsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/pagers.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/pagers.py index 95141db2b1ea..d0f3d2bb10ba 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/pagers.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/__init__.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/__init__.py index c1b790f02c5c..19cfcd8ae187 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/__init__.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import AppConnectorsServiceRestInterceptor, AppConnectorsServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AppConnectorsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AppConnectorsServiceTransport]] _transport_registry["grpc"] = AppConnectorsServiceGrpcTransport _transport_registry["grpc_asyncio"] = AppConnectorsServiceGrpcAsyncIOTransport _transport_registry["rest"] = AppConnectorsServiceRestTransport diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/base.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/base.py index 827ed4bd7a30..56f172b7d625 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/base.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appconnectors_v1 import gapic_version as package_version from google.cloud.beyondcorp_appconnectors_v1.types import app_connectors_service @@ -315,13 +317,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc.py index 9218a34bdea8..9113d86d1c2e 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_appconnectors_v1.types import app_connectors_service diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc_asyncio.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc_asyncio.py index 38a52235f46a..30403d375f84 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_appconnectors_v1.types import app_connectors_service diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest.py index 980700bc4bd9..67c57658439d 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -862,9 +864,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseCreateAppConnector._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseCreateAppConnector._get_http_options() request, metadata = self._interceptor.pre_create_app_connector( request, metadata @@ -890,7 +890,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1018,9 +1018,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseDeleteAppConnector._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseDeleteAppConnector._get_http_options() request, metadata = self._interceptor.pre_delete_app_connector( request, metadata @@ -1042,7 +1040,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1176,9 +1174,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseGetAppConnector._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseGetAppConnector._get_http_options() request, metadata = self._interceptor.pre_get_app_connector( request, metadata @@ -1328,9 +1324,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseListAppConnectors._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseListAppConnectors._get_http_options() request, metadata = self._interceptor.pre_list_app_connectors( request, metadata @@ -1485,9 +1479,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseReportStatus._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseReportStatus._get_http_options() request, metadata = self._interceptor.pre_report_status(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseReportStatus._get_transcoded_request( @@ -1511,7 +1503,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1638,9 +1630,7 @@ def __call__( """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseUpdateAppConnector._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseUpdateAppConnector._get_http_options() request, metadata = self._interceptor.pre_update_app_connector( request, metadata @@ -1666,7 +1656,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1855,9 +1845,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1996,9 +1984,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -2137,9 +2123,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2279,9 +2263,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2426,9 +2408,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2574,9 +2554,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2694,9 +2672,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2812,9 +2788,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2953,9 +2927,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAppConnectorsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAppConnectorsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAppConnectorsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest_base.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest_base.py index 53480cbaa245..3a3bb55d60ed 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest_base.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/services/app_connectors_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/__init__.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/__init__.py index 66f1f484bf1b..adefd9971c10 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/__init__.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/__init__.py @@ -29,7 +29,10 @@ ReportStatusRequest, UpdateAppConnectorRequest, ) -from .resource_info import HealthStatus, ResourceInfo +from .resource_info import ( + HealthStatus, + ResourceInfo, +) __all__ = ( "AppConnectorInstanceConfig", diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/app_connector_instance_config.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/app_connector_instance_config.py index 62f24507cc52..93174ecd25ee 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/app_connector_instance_config.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/app_connector_instance_config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/app_connectors_service.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/app_connectors_service.py index 72f4b912bf47..5aa1c8d74b86 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/app_connectors_service.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/app_connectors_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.beyondcorp_appconnectors_v1.types import ( @@ -427,6 +427,7 @@ class State(proto.Enum): the future. This happens when CCFE sends ProjectState = OFF. """ + STATE_UNSPECIFIED = 0 CREATING = 1 CREATED = 2 diff --git a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/resource_info.py b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/resource_info.py index e26482c4edd2..6023372f50e4 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/resource_info.py +++ b/packages/google-cloud-beyondcorp-appconnectors/google/cloud/beyondcorp_appconnectors_v1/types/resource_info.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -46,6 +46,7 @@ class HealthStatus(proto.Enum): DEGRADED (4): Some sub-resources are UNHEALTHY. """ + HEALTH_STATUS_UNSPECIFIED = 0 HEALTHY = 1 UNHEALTHY = 2 diff --git a/packages/google-cloud-beyondcorp-appconnectors/noxfile.py b/packages/google-cloud-beyondcorp-appconnectors/noxfile.py index 1b0d5be15902..9656c7d62134 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/noxfile.py +++ b/packages/google-cloud-beyondcorp-appconnectors/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-beyondcorp-appconnectors/tests/unit/gapic/beyondcorp_appconnectors_v1/test_app_connectors_service.py b/packages/google-cloud-beyondcorp-appconnectors/tests/unit/gapic/beyondcorp_appconnectors_v1/test_app_connectors_service.py index ce46c9257b27..1ab5f1d11b47 100644 --- a/packages/google-cloud-beyondcorp-appconnectors/tests/unit/gapic/beyondcorp_appconnectors_v1/test_app_connectors_service.py +++ b/packages/google-cloud-beyondcorp-appconnectors/tests/unit/gapic/beyondcorp_appconnectors_v1/test_app_connectors_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_appconnectors_v1.services.app_connectors_service import ( AppConnectorsServiceAsyncClient, @@ -76,11 +78,13 @@ pagers, transports, ) -from google.cloud.beyondcorp_appconnectors_v1.types import app_connectors_service +from google.cloud.beyondcorp_appconnectors_v1.types import ( + app_connectors_service, + resource_info, +) from google.cloud.beyondcorp_appconnectors_v1.types import ( resource_info as gcba_resource_info, ) -from google.cloud.beyondcorp_appconnectors_v1.types import resource_info CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1014,10 +1018,9 @@ def test_app_connectors_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1065,9 @@ def test_app_connectors_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1101,10 +1103,9 @@ def test_app_connectors_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,13 +1361,13 @@ def test_app_connectors_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1487,9 +1488,9 @@ def test_list_app_connectors_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_app_connectors - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_app_connectors] = ( + mock_rpc + ) request = {} client.list_app_connectors(request) @@ -2039,9 +2040,9 @@ def test_get_app_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_app_connector] = ( + mock_rpc + ) request = {} client.get_app_connector(request) @@ -2388,9 +2389,9 @@ def test_create_app_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_app_connector] = ( + mock_rpc + ) request = {} client.create_app_connector(request) @@ -2754,9 +2755,9 @@ def test_update_app_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_app_connector] = ( + mock_rpc + ) request = {} client.update_app_connector(request) @@ -3112,9 +3113,9 @@ def test_delete_app_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_app_connector] = ( + mock_rpc + ) request = {} client.delete_app_connector(request) @@ -3733,9 +3734,9 @@ def test_list_app_connectors_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_app_connectors - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_app_connectors] = ( + mock_rpc + ) request = {} client.list_app_connectors(request) @@ -3998,9 +3999,9 @@ def test_get_app_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_app_connector] = ( + mock_rpc + ) request = {} client.get_app_connector(request) @@ -4182,9 +4183,9 @@ def test_create_app_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_app_connector] = ( + mock_rpc + ) request = {} client.create_app_connector(request) @@ -4390,9 +4391,9 @@ def test_update_app_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_app_connector] = ( + mock_rpc + ) request = {} client.update_app_connector(request) @@ -4595,9 +4596,9 @@ def test_delete_app_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_app_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_app_connector] = ( + mock_rpc + ) request = {} client.delete_app_connector(request) @@ -5402,8 +5403,9 @@ def test_list_app_connectors_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5468,18 +5470,20 @@ def test_list_app_connectors_rest_interceptors(null_interceptor): ) client = AppConnectorsServiceClient(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.AppConnectorsServiceRestInterceptor, "post_list_app_connectors" - ) as post, mock.patch.object( - transports.AppConnectorsServiceRestInterceptor, - "post_list_app_connectors_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppConnectorsServiceRestInterceptor, "pre_list_app_connectors" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, "post_list_app_connectors" + ) as post, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, + "post_list_app_connectors_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, "pre_list_app_connectors" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5537,8 +5541,9 @@ def test_get_app_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5607,18 +5612,20 @@ def test_get_app_connector_rest_interceptors(null_interceptor): ) client = AppConnectorsServiceClient(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.AppConnectorsServiceRestInterceptor, "post_get_app_connector" - ) as post, mock.patch.object( - transports.AppConnectorsServiceRestInterceptor, - "post_get_app_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppConnectorsServiceRestInterceptor, "pre_get_app_connector" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, "post_get_app_connector" + ) as post, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, + "post_get_app_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, "pre_get_app_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5676,8 +5683,9 @@ def test_create_app_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5823,20 +5831,21 @@ def test_create_app_connector_rest_interceptors(null_interceptor): ) client = AppConnectorsServiceClient(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.AppConnectorsServiceRestInterceptor, "post_create_app_connector" - ) as post, mock.patch.object( - transports.AppConnectorsServiceRestInterceptor, - "post_create_app_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppConnectorsServiceRestInterceptor, "pre_create_app_connector" - ) as pre: + 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.AppConnectorsServiceRestInterceptor, "post_create_app_connector" + ) as post, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, + "post_create_app_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, "pre_create_app_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5893,8 +5902,9 @@ def test_update_app_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6044,20 +6054,21 @@ def test_update_app_connector_rest_interceptors(null_interceptor): ) client = AppConnectorsServiceClient(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.AppConnectorsServiceRestInterceptor, "post_update_app_connector" - ) as post, mock.patch.object( - transports.AppConnectorsServiceRestInterceptor, - "post_update_app_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppConnectorsServiceRestInterceptor, "pre_update_app_connector" - ) as pre: + 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.AppConnectorsServiceRestInterceptor, "post_update_app_connector" + ) as post, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, + "post_update_app_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, "pre_update_app_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6110,8 +6121,9 @@ def test_delete_app_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6168,20 +6180,21 @@ def test_delete_app_connector_rest_interceptors(null_interceptor): ) client = AppConnectorsServiceClient(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.AppConnectorsServiceRestInterceptor, "post_delete_app_connector" - ) as post, mock.patch.object( - transports.AppConnectorsServiceRestInterceptor, - "post_delete_app_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppConnectorsServiceRestInterceptor, "pre_delete_app_connector" - ) as pre: + 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.AppConnectorsServiceRestInterceptor, "post_delete_app_connector" + ) as post, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, + "post_delete_app_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, "pre_delete_app_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6236,8 +6249,9 @@ def test_report_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6296,20 +6310,21 @@ def test_report_status_rest_interceptors(null_interceptor): ) client = AppConnectorsServiceClient(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.AppConnectorsServiceRestInterceptor, "post_report_status" - ) as post, mock.patch.object( - transports.AppConnectorsServiceRestInterceptor, - "post_report_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppConnectorsServiceRestInterceptor, "pre_report_status" - ) as pre: + 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.AppConnectorsServiceRestInterceptor, "post_report_status" + ) as post, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, + "post_report_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppConnectorsServiceRestInterceptor, "pre_report_status" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6362,8 +6377,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6422,8 +6438,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6485,8 +6502,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6550,8 +6568,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6615,8 +6634,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6679,8 +6699,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6741,8 +6762,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6803,8 +6825,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6865,8 +6888,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7140,11 +7164,14 @@ def test_app_connectors_service_base_transport(): def test_app_connectors_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.beyondcorp_appconnectors_v1.services.app_connectors_service.transports.AppConnectorsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.beyondcorp_appconnectors_v1.services.app_connectors_service.transports.AppConnectorsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AppConnectorsServiceTransport( @@ -7161,9 +7188,12 @@ def test_app_connectors_service_base_transport_with_credentials_file(): def test_app_connectors_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.beyondcorp_appconnectors_v1.services.app_connectors_service.transports.AppConnectorsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.beyondcorp_appconnectors_v1.services.app_connectors_service.transports.AppConnectorsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AppConnectorsServiceTransport() @@ -7235,11 +7265,12 @@ def test_app_connectors_service_transport_auth_gdch_credentials(transport_class) def test_app_connectors_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-beyondcorp-appgateways/docs/conf.py b/packages/google-cloud-beyondcorp-appgateways/docs/conf.py index 60f64257a4d0..4400408eb2b6 100644 --- a/packages/google-cloud-beyondcorp-appgateways/docs/conf.py +++ b/packages/google-cloud-beyondcorp-appgateways/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-beyondcorp-appgateways documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/__init__.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/__init__.py index db9e6e9d6cd6..8af6c5cf3cbb 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/__init__.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.app_gateways_service import ( AppGatewaysServiceAsyncClient, AppGatewaysServiceClient, diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/async_client.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/async_client.py index 0703326e6d7b..71a9715cb16a 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/async_client.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appgateways_v1 import gapic_version as package_version @@ -44,14 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_appgateways_v1.services.app_gateways_service import pagers from google.cloud.beyondcorp_appgateways_v1.types import app_gateways_service @@ -138,7 +140,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AppGatewaysServiceAsyncClient: The constructed client. """ - return AppGatewaysServiceClient.from_service_account_info.__func__(AppGatewaysServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AppGatewaysServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AppGatewaysServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +157,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AppGatewaysServiceAsyncClient: The constructed client. """ - return AppGatewaysServiceClient.from_service_account_file.__func__(AppGatewaysServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AppGatewaysServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AppGatewaysServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -192,7 +196,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AppGatewaysServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AppGatewaysServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AppGatewaysServiceTransport: diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/client.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/client.py index 6761d4d0c01b..cd6ac0dfd0cf 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/client.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appgateways_v1 import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_appgateways_v1.services.app_gateways_service import pagers from google.cloud.beyondcorp_appgateways_v1.types import app_gateways_service @@ -87,9 +89,7 @@ class AppGatewaysServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AppGatewaysServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AppGatewaysServiceTransport]] _transport_registry["grpc"] = AppGatewaysServiceGrpcTransport _transport_registry["grpc_asyncio"] = AppGatewaysServiceGrpcAsyncIOTransport _transport_registry["rest"] = AppGatewaysServiceRestTransport @@ -649,11 +649,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AppGatewaysServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AppGatewaysServiceClient._read_environment_variables() + ) self._client_cert_source = AppGatewaysServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -688,8 +686,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AppGatewaysServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/pagers.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/pagers.py index 89807f735394..6fd76b1ff1ad 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/pagers.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/__init__.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/__init__.py index 869b54bb5c5e..44a7edad7d3c 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/__init__.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import AppGatewaysServiceRestInterceptor, AppGatewaysServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AppGatewaysServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AppGatewaysServiceTransport]] _transport_registry["grpc"] = AppGatewaysServiceGrpcTransport _transport_registry["grpc_asyncio"] = AppGatewaysServiceGrpcAsyncIOTransport _transport_registry["rest"] = AppGatewaysServiceRestTransport diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/base.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/base.py index 79318da05210..ab6ffc49d786 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/base.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_appgateways_v1 import gapic_version as package_version from google.cloud.beyondcorp_appgateways_v1.types import app_gateways_service @@ -286,13 +288,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc.py index 369d4123dac8..a390116601fc 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_appgateways_v1.types import app_gateways_service diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc_asyncio.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc_asyncio.py index e061e1e337fe..ed875c7936c8 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_appgateways_v1.types import app_gateways_service diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest.py index 557c84117026..65b9367c8f2b 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -748,9 +750,7 @@ def __call__( """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseCreateAppGateway._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseCreateAppGateway._get_http_options() request, metadata = self._interceptor.pre_create_app_gateway( request, metadata @@ -776,7 +776,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -902,9 +902,7 @@ def __call__( """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseDeleteAppGateway._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseDeleteAppGateway._get_http_options() request, metadata = self._interceptor.pre_delete_app_gateway( request, metadata @@ -926,7 +924,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1056,9 +1054,7 @@ def __call__( """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseGetAppGateway._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseGetAppGateway._get_http_options() request, metadata = self._interceptor.pre_get_app_gateway(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseGetAppGateway._get_transcoded_request( @@ -1204,9 +1200,7 @@ def __call__( """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseListAppGateways._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseListAppGateways._get_http_options() request, metadata = self._interceptor.pre_list_app_gateways( request, metadata @@ -1397,9 +1391,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1538,9 +1530,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1679,9 +1669,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1821,9 +1809,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1968,9 +1954,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2116,9 +2100,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2236,9 +2218,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2354,9 +2334,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2495,9 +2473,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAppGatewaysServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAppGatewaysServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAppGatewaysServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest_base.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest_base.py index 0ed718873792..b3bb50a5202b 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest_base.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/services/app_gateways_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/types/app_gateways_service.py b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/types/app_gateways_service.py index 4241a06d56e7..43cb60cfe222 100644 --- a/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/types/app_gateways_service.py +++ b/packages/google-cloud-beyondcorp-appgateways/google/cloud/beyondcorp_appgateways_v1/types/app_gateways_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -301,6 +301,7 @@ class Type(proto.Enum): TCP Proxy based BeyondCorp Connection. API will default to this if unset. """ + TYPE_UNSPECIFIED = 0 TCP_PROXY = 1 @@ -323,6 +324,7 @@ class State(proto.Enum): future. This happens when CCFE sends ProjectState = OFF. """ + STATE_UNSPECIFIED = 0 CREATING = 1 CREATED = 2 @@ -341,6 +343,7 @@ class HostType(proto.Enum): AppGateway hosted in a GCP regional managed instance group. """ + HOST_TYPE_UNSPECIFIED = 0 GCP_REGIONAL_MIG = 1 diff --git a/packages/google-cloud-beyondcorp-appgateways/noxfile.py b/packages/google-cloud-beyondcorp-appgateways/noxfile.py index f9fbba106994..6c447b12359d 100644 --- a/packages/google-cloud-beyondcorp-appgateways/noxfile.py +++ b/packages/google-cloud-beyondcorp-appgateways/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-beyondcorp-appgateways/tests/unit/gapic/beyondcorp_appgateways_v1/test_app_gateways_service.py b/packages/google-cloud-beyondcorp-appgateways/tests/unit/gapic/beyondcorp_appgateways_v1/test_app_gateways_service.py index af0809fcef43..4f0cdfe3d23e 100644 --- a/packages/google-cloud-beyondcorp-appgateways/tests/unit/gapic/beyondcorp_appgateways_v1/test_app_gateways_service.py +++ b/packages/google-cloud-beyondcorp-appgateways/tests/unit/gapic/beyondcorp_appgateways_v1/test_app_gateways_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +57,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_appgateways_v1.services.app_gateways_service import ( AppGatewaysServiceAsyncClient, @@ -998,10 +1000,9 @@ def test_app_gateways_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1047,9 @@ def test_app_gateways_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1085,9 @@ def test_app_gateways_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,13 +1335,13 @@ def test_app_gateways_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1461,9 +1460,9 @@ def test_list_app_gateways_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_app_gateways - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_app_gateways] = ( + mock_rpc + ) request = {} client.list_app_gateways(request) @@ -2360,9 +2359,9 @@ def test_create_app_gateway_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_app_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_app_gateway] = ( + mock_rpc + ) request = {} client.create_app_gateway(request) @@ -2728,9 +2727,9 @@ def test_delete_app_gateway_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_app_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_app_gateway] = ( + mock_rpc + ) request = {} client.delete_app_gateway(request) @@ -3007,9 +3006,9 @@ def test_list_app_gateways_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_app_gateways - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_app_gateways] = ( + mock_rpc + ) request = {} client.list_app_gateways(request) @@ -3451,9 +3450,9 @@ def test_create_app_gateway_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_app_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_app_gateway] = ( + mock_rpc + ) request = {} client.create_app_gateway(request) @@ -3659,9 +3658,9 @@ def test_delete_app_gateway_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_app_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_app_gateway] = ( + mock_rpc + ) request = {} client.delete_app_gateway(request) @@ -4179,8 +4178,9 @@ def test_list_app_gateways_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4245,18 +4245,20 @@ def test_list_app_gateways_rest_interceptors(null_interceptor): ) client = AppGatewaysServiceClient(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.AppGatewaysServiceRestInterceptor, "post_list_app_gateways" - ) as post, mock.patch.object( - transports.AppGatewaysServiceRestInterceptor, - "post_list_app_gateways_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppGatewaysServiceRestInterceptor, "pre_list_app_gateways" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppGatewaysServiceRestInterceptor, "post_list_app_gateways" + ) as post, + mock.patch.object( + transports.AppGatewaysServiceRestInterceptor, + "post_list_app_gateways_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppGatewaysServiceRestInterceptor, "pre_list_app_gateways" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4314,8 +4316,9 @@ def test_get_app_gateway_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4392,18 +4395,20 @@ def test_get_app_gateway_rest_interceptors(null_interceptor): ) client = AppGatewaysServiceClient(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.AppGatewaysServiceRestInterceptor, "post_get_app_gateway" - ) as post, mock.patch.object( - transports.AppGatewaysServiceRestInterceptor, - "post_get_app_gateway_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppGatewaysServiceRestInterceptor, "pre_get_app_gateway" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AppGatewaysServiceRestInterceptor, "post_get_app_gateway" + ) as post, + mock.patch.object( + transports.AppGatewaysServiceRestInterceptor, + "post_get_app_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppGatewaysServiceRestInterceptor, "pre_get_app_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4458,8 +4463,9 @@ def test_create_app_gateway_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4596,20 +4602,21 @@ def test_create_app_gateway_rest_interceptors(null_interceptor): ) client = AppGatewaysServiceClient(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.AppGatewaysServiceRestInterceptor, "post_create_app_gateway" - ) as post, mock.patch.object( - transports.AppGatewaysServiceRestInterceptor, - "post_create_app_gateway_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppGatewaysServiceRestInterceptor, "pre_create_app_gateway" - ) as pre: + 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.AppGatewaysServiceRestInterceptor, "post_create_app_gateway" + ) as post, + mock.patch.object( + transports.AppGatewaysServiceRestInterceptor, + "post_create_app_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppGatewaysServiceRestInterceptor, "pre_create_app_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4662,8 +4669,9 @@ def test_delete_app_gateway_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4720,20 +4728,21 @@ def test_delete_app_gateway_rest_interceptors(null_interceptor): ) client = AppGatewaysServiceClient(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.AppGatewaysServiceRestInterceptor, "post_delete_app_gateway" - ) as post, mock.patch.object( - transports.AppGatewaysServiceRestInterceptor, - "post_delete_app_gateway_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AppGatewaysServiceRestInterceptor, "pre_delete_app_gateway" - ) as pre: + 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.AppGatewaysServiceRestInterceptor, "post_delete_app_gateway" + ) as post, + mock.patch.object( + transports.AppGatewaysServiceRestInterceptor, + "post_delete_app_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AppGatewaysServiceRestInterceptor, "pre_delete_app_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4786,8 +4795,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4846,8 +4856,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4909,8 +4920,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4974,8 +4986,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5039,8 +5052,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5103,8 +5117,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5165,8 +5180,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5227,8 +5243,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5289,8 +5306,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5518,11 +5536,14 @@ def test_app_gateways_service_base_transport(): def test_app_gateways_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.beyondcorp_appgateways_v1.services.app_gateways_service.transports.AppGatewaysServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.beyondcorp_appgateways_v1.services.app_gateways_service.transports.AppGatewaysServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AppGatewaysServiceTransport( @@ -5539,9 +5560,12 @@ def test_app_gateways_service_base_transport_with_credentials_file(): def test_app_gateways_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.beyondcorp_appgateways_v1.services.app_gateways_service.transports.AppGatewaysServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.beyondcorp_appgateways_v1.services.app_gateways_service.transports.AppGatewaysServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AppGatewaysServiceTransport() @@ -5613,11 +5637,12 @@ def test_app_gateways_service_transport_auth_gdch_credentials(transport_class): def test_app_gateways_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/docs/conf.py b/packages/google-cloud-beyondcorp-clientconnectorservices/docs/conf.py index 6ed9f2d89ed5..2b9c2b8112ff 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/docs/conf.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-beyondcorp-clientconnectorservices documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/__init__.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/__init__.py index bb7aaaaa4227..8cf8b104168d 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/__init__.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/__init__.py @@ -30,6 +30,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.client_connector_services_service import ( ClientConnectorServicesServiceAsyncClient, ClientConnectorServicesServiceClient, @@ -49,7 +50,9 @@ api_core, "check_dependency_versions" ): # pragma: NO COVER api_core.check_python_version("google.cloud.beyondcorp_clientconnectorservices_v1") # type: ignore - api_core.check_dependency_versions("google.cloud.beyondcorp_clientconnectorservices_v1") # type: ignore + api_core.check_dependency_versions( + "google.cloud.beyondcorp_clientconnectorservices_v1" + ) # type: ignore else: # pragma: NO COVER # An older version of api_core is installed which does not define the # functions above. We do equivalent checks manually. diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/async_client.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/async_client.py index f4bbc49a5022..5895ba66b2e2 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/async_client.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_clientconnectorservices_v1 import ( gapic_version as package_version, @@ -46,15 +46,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_clientconnectorservices_v1.services.client_connector_services_service import ( pagers, @@ -155,7 +157,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ClientConnectorServicesServiceAsyncClient: The constructed client. """ - return ClientConnectorServicesServiceClient.from_service_account_info.__func__(ClientConnectorServicesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ClientConnectorServicesServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + ClientConnectorServicesServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +178,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ClientConnectorServicesServiceAsyncClient: The constructed client. """ - return ClientConnectorServicesServiceClient.from_service_account_file.__func__(ClientConnectorServicesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ClientConnectorServicesServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + ClientConnectorServicesServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -209,7 +221,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ClientConnectorServicesServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ClientConnectorServicesServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ClientConnectorServicesServiceTransport: diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/client.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/client.py index 43e80570cb37..35e7ff3d0563 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/client.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_clientconnectorservices_v1 import ( gapic_version as package_version, @@ -63,15 +63,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_clientconnectorservices_v1.services.client_connector_services_service import ( pagers, @@ -97,13 +99,11 @@ class ClientConnectorServicesServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ClientConnectorServicesServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ClientConnectorServicesServiceTransport]] _transport_registry["grpc"] = ClientConnectorServicesServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = ClientConnectorServicesServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + ClientConnectorServicesServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = ClientConnectorServicesServiceRestTransport def get_transport_class( @@ -664,11 +664,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ClientConnectorServicesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ClientConnectorServicesServiceClient._read_environment_variables() + ) self._client_cert_source = ( ClientConnectorServicesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -709,8 +707,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ClientConnectorServicesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/pagers.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/pagers.py index 8fac82bcd1fd..0c584b2755a9 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/pagers.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -162,7 +162,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/__init__.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/__init__.py index 54680d7b6d48..bc889729b942 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/__init__.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ClientConnectorServicesServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ClientConnectorServicesServiceTransport]] _transport_registry["grpc"] = ClientConnectorServicesServiceGrpcTransport _transport_registry["grpc_asyncio"] = ClientConnectorServicesServiceGrpcAsyncIOTransport _transport_registry["rest"] = ClientConnectorServicesServiceRestTransport diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/base.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/base.py index 5c713bb67e02..7e63adbf46c7 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/base.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_clientconnectorservices_v1 import ( gapic_version as package_version, @@ -307,13 +309,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc.py index 864cdce22361..763334953597 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_clientconnectorservices_v1.types import ( client_connector_services_service, @@ -379,12 +381,12 @@ def list_client_connector_services( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_client_connector_services" not in self._stubs: - self._stubs[ - "list_client_connector_services" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/ListClientConnectorServices", - request_serializer=client_connector_services_service.ListClientConnectorServicesRequest.serialize, - response_deserializer=client_connector_services_service.ListClientConnectorServicesResponse.deserialize, + self._stubs["list_client_connector_services"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/ListClientConnectorServices", + request_serializer=client_connector_services_service.ListClientConnectorServicesRequest.serialize, + response_deserializer=client_connector_services_service.ListClientConnectorServicesResponse.deserialize, + ) ) return self._stubs["list_client_connector_services"] @@ -410,12 +412,12 @@ def get_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_client_connector_service" not in self._stubs: - self._stubs[ - "get_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/GetClientConnectorService", - request_serializer=client_connector_services_service.GetClientConnectorServiceRequest.serialize, - response_deserializer=client_connector_services_service.ClientConnectorService.deserialize, + self._stubs["get_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/GetClientConnectorService", + request_serializer=client_connector_services_service.GetClientConnectorServiceRequest.serialize, + response_deserializer=client_connector_services_service.ClientConnectorService.deserialize, + ) ) return self._stubs["get_client_connector_service"] @@ -443,12 +445,12 @@ def create_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_client_connector_service" not in self._stubs: - self._stubs[ - "create_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/CreateClientConnectorService", - request_serializer=client_connector_services_service.CreateClientConnectorServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/CreateClientConnectorService", + request_serializer=client_connector_services_service.CreateClientConnectorServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_client_connector_service"] @@ -476,12 +478,12 @@ def update_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_client_connector_service" not in self._stubs: - self._stubs[ - "update_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/UpdateClientConnectorService", - request_serializer=client_connector_services_service.UpdateClientConnectorServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/UpdateClientConnectorService", + request_serializer=client_connector_services_service.UpdateClientConnectorServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_client_connector_service"] @@ -508,12 +510,12 @@ def delete_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_client_connector_service" not in self._stubs: - self._stubs[ - "delete_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/DeleteClientConnectorService", - request_serializer=client_connector_services_service.DeleteClientConnectorServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/DeleteClientConnectorService", + request_serializer=client_connector_services_service.DeleteClientConnectorServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_client_connector_service"] diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc_asyncio.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc_asyncio.py index 84a64970f7dc..c54e71824e48 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_clientconnectorservices_v1.types import ( client_connector_services_service, @@ -389,12 +391,12 @@ def list_client_connector_services( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_client_connector_services" not in self._stubs: - self._stubs[ - "list_client_connector_services" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/ListClientConnectorServices", - request_serializer=client_connector_services_service.ListClientConnectorServicesRequest.serialize, - response_deserializer=client_connector_services_service.ListClientConnectorServicesResponse.deserialize, + self._stubs["list_client_connector_services"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/ListClientConnectorServices", + request_serializer=client_connector_services_service.ListClientConnectorServicesRequest.serialize, + response_deserializer=client_connector_services_service.ListClientConnectorServicesResponse.deserialize, + ) ) return self._stubs["list_client_connector_services"] @@ -420,12 +422,12 @@ def get_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_client_connector_service" not in self._stubs: - self._stubs[ - "get_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/GetClientConnectorService", - request_serializer=client_connector_services_service.GetClientConnectorServiceRequest.serialize, - response_deserializer=client_connector_services_service.ClientConnectorService.deserialize, + self._stubs["get_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/GetClientConnectorService", + request_serializer=client_connector_services_service.GetClientConnectorServiceRequest.serialize, + response_deserializer=client_connector_services_service.ClientConnectorService.deserialize, + ) ) return self._stubs["get_client_connector_service"] @@ -453,12 +455,12 @@ def create_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_client_connector_service" not in self._stubs: - self._stubs[ - "create_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/CreateClientConnectorService", - request_serializer=client_connector_services_service.CreateClientConnectorServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/CreateClientConnectorService", + request_serializer=client_connector_services_service.CreateClientConnectorServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_client_connector_service"] @@ -486,12 +488,12 @@ def update_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_client_connector_service" not in self._stubs: - self._stubs[ - "update_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/UpdateClientConnectorService", - request_serializer=client_connector_services_service.UpdateClientConnectorServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/UpdateClientConnectorService", + request_serializer=client_connector_services_service.UpdateClientConnectorServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_client_connector_service"] @@ -518,12 +520,12 @@ def delete_client_connector_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_client_connector_service" not in self._stubs: - self._stubs[ - "delete_client_connector_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/DeleteClientConnectorService", - request_serializer=client_connector_services_service.DeleteClientConnectorServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_client_connector_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorServicesService/DeleteClientConnectorService", + request_serializer=client_connector_services_service.DeleteClientConnectorServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_client_connector_service"] diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest.py index 0b5119ec2d2f..f03117b3cf6e 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -813,9 +815,7 @@ def __call__( """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseCreateClientConnectorService._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseCreateClientConnectorService._get_http_options() request, metadata = self._interceptor.pre_create_client_connector_service( request, metadata @@ -841,7 +841,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -882,11 +882,10 @@ def __call__( resp = self._interceptor.post_create_client_connector_service(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_client_connector_service_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_client_connector_service_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -973,9 +972,7 @@ def __call__( """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseDeleteClientConnectorService._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseDeleteClientConnectorService._get_http_options() request, metadata = self._interceptor.pre_delete_client_connector_service( request, metadata @@ -997,7 +994,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1037,11 +1034,10 @@ def __call__( resp = self._interceptor.post_delete_client_connector_service(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_client_connector_service_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_client_connector_service_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1127,9 +1123,7 @@ def __call__( """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseGetClientConnectorService._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseGetClientConnectorService._get_http_options() request, metadata = self._interceptor.pre_get_client_connector_service( request, metadata @@ -1282,9 +1276,7 @@ def __call__( """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseListClientConnectorServices._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseListClientConnectorServices._get_http_options() request, metadata = self._interceptor.pre_list_client_connector_services( request, metadata @@ -1352,11 +1344,10 @@ def __call__( resp = self._interceptor.post_list_client_connector_services(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_client_connector_services_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_client_connector_services_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1446,9 +1437,7 @@ def __call__( """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseUpdateClientConnectorService._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseUpdateClientConnectorService._get_http_options() request, metadata = self._interceptor.pre_update_client_connector_service( request, metadata @@ -1474,7 +1463,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1515,11 +1504,10 @@ def __call__( resp = self._interceptor.post_update_client_connector_service(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_client_connector_service_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_client_connector_service_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1553,7 +1541,9 @@ def create_client_connector_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._CreateClientConnectorService(self._session, self._host, self._interceptor) # type: ignore + return self._CreateClientConnectorService( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_client_connector_service( @@ -1564,7 +1554,9 @@ def delete_client_connector_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._DeleteClientConnectorService(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteClientConnectorService( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_client_connector_service( @@ -1575,7 +1567,9 @@ def get_client_connector_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._GetClientConnectorService(self._session, self._host, self._interceptor) # type: ignore + return self._GetClientConnectorService( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_client_connector_services( @@ -1586,7 +1580,9 @@ def list_client_connector_services( ]: # 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._ListClientConnectorServices(self._session, self._host, self._interceptor) # type: ignore + return self._ListClientConnectorServices( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_client_connector_service( @@ -1597,7 +1593,9 @@ def update_client_connector_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._UpdateClientConnectorService(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateClientConnectorService( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1657,9 +1655,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseClientConnectorServicesServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1800,9 +1796,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseClientConnectorServicesServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1941,9 +1935,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseClientConnectorServicesServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2085,9 +2077,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseClientConnectorServicesServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2236,9 +2226,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2382,9 +2370,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2502,9 +2488,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2620,9 +2604,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseClientConnectorServicesServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2763,9 +2745,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseClientConnectorServicesServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseClientConnectorServicesServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseClientConnectorServicesServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest_base.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest_base.py index 75c967aabb58..2c5feb46697a 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest_base.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/services/client_connector_services_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/types/client_connector_services_service.py b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/types/client_connector_services_service.py index 93b050de6730..c3500a5f003c 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/types/client_connector_services_service.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/google/cloud/beyondcorp_clientconnectorservices_v1/types/client_connector_services_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -86,6 +86,7 @@ class State(proto.Enum): ClientConnectorService encountered an error and is in an indeterministic state. """ + STATE_UNSPECIFIED = 0 CREATING = 1 UPDATING = 2 @@ -129,6 +130,7 @@ class TransportProtocol(proto.Enum): TCP (1): TCP protocol. """ + TRANSPORT_PROTOCOL_UNSPECIFIED = 0 TCP = 1 @@ -307,12 +309,12 @@ class ListClientConnectorServicesResponse(proto.Message): def raw_page(self): return self - client_connector_services: MutableSequence[ - "ClientConnectorService" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ClientConnectorService", + client_connector_services: MutableSequence["ClientConnectorService"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ClientConnectorService", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/noxfile.py b/packages/google-cloud-beyondcorp-clientconnectorservices/noxfile.py index 43afa2888611..fbee0ffca0ad 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/noxfile.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_create_client_connector_service_async.py b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_create_client_connector_service_async.py index 396ed096f137..dc703c1475f5 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_create_client_connector_service_async.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_create_client_connector_service_async.py @@ -36,9 +36,7 @@ async def sample_create_client_connector_service(): # Create a client - client = ( - beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() - ) + client = beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() # Initialize request argument(s) client_connector_service = ( diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_delete_client_connector_service_async.py b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_delete_client_connector_service_async.py index 3978e679cf5b..ca4dbd80fe6b 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_delete_client_connector_service_async.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_delete_client_connector_service_async.py @@ -36,9 +36,7 @@ async def sample_delete_client_connector_service(): # Create a client - client = ( - beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() - ) + client = beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() # Initialize request argument(s) request = beyondcorp_clientconnectorservices_v1.DeleteClientConnectorServiceRequest( diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_get_client_connector_service_async.py b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_get_client_connector_service_async.py index 374eb28b4da4..8bd715c7af59 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_get_client_connector_service_async.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_get_client_connector_service_async.py @@ -36,9 +36,7 @@ async def sample_get_client_connector_service(): # Create a client - client = ( - beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() - ) + client = beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() # Initialize request argument(s) request = beyondcorp_clientconnectorservices_v1.GetClientConnectorServiceRequest( diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_list_client_connector_services_async.py b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_list_client_connector_services_async.py index 70dd3a53f7ee..4fac1c057f62 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_list_client_connector_services_async.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_list_client_connector_services_async.py @@ -36,9 +36,7 @@ async def sample_list_client_connector_services(): # Create a client - client = ( - beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() - ) + client = beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() # Initialize request argument(s) request = beyondcorp_clientconnectorservices_v1.ListClientConnectorServicesRequest( diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_update_client_connector_service_async.py b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_update_client_connector_service_async.py index 9da0f3b14c66..f7b7314377ad 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_update_client_connector_service_async.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/samples/generated_samples/beyondcorp_v1_generated_client_connector_services_service_update_client_connector_service_async.py @@ -36,9 +36,7 @@ async def sample_update_client_connector_service(): # Create a client - client = ( - beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() - ) + client = beyondcorp_clientconnectorservices_v1.ClientConnectorServicesServiceAsyncClient() # Initialize request argument(s) client_connector_service = ( diff --git a/packages/google-cloud-beyondcorp-clientconnectorservices/tests/unit/gapic/beyondcorp_clientconnectorservices_v1/test_client_connector_services_service.py b/packages/google-cloud-beyondcorp-clientconnectorservices/tests/unit/gapic/beyondcorp_clientconnectorservices_v1/test_client_connector_services_service.py index 8fc6acc960d4..e2bba49338c5 100644 --- a/packages/google-cloud-beyondcorp-clientconnectorservices/tests/unit/gapic/beyondcorp_clientconnectorservices_v1/test_client_connector_services_service.py +++ b/packages/google-cloud-beyondcorp-clientconnectorservices/tests/unit/gapic/beyondcorp_clientconnectorservices_v1/test_client_connector_services_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_clientconnectorservices_v1.services.client_connector_services_service import ( ClientConnectorServicesServiceAsyncClient, @@ -1071,10 +1073,9 @@ def test_client_connector_services_service_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1119,10 +1120,9 @@ def test_client_connector_services_service_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1158,10 +1158,9 @@ def test_client_connector_services_service_client_get_mtls_endpoint_and_cert_sou "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1422,13 +1421,13 @@ def test_client_connector_services_service_client_create_channel_credentials_fil ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5026,8 +5025,9 @@ def test_list_client_connector_services_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5098,20 +5098,22 @@ def test_list_client_connector_services_rest_interceptors(null_interceptor): ) client = ClientConnectorServicesServiceClient(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.ClientConnectorServicesServiceRestInterceptor, - "post_list_client_connector_services", - ) as post, mock.patch.object( - transports.ClientConnectorServicesServiceRestInterceptor, - "post_list_client_connector_services_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClientConnectorServicesServiceRestInterceptor, - "pre_list_client_connector_services", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClientConnectorServicesServiceRestInterceptor, + "post_list_client_connector_services", + ) as post, + mock.patch.object( + transports.ClientConnectorServicesServiceRestInterceptor, + "post_list_client_connector_services_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClientConnectorServicesServiceRestInterceptor, + "pre_list_client_connector_services", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5175,8 +5177,9 @@ def test_get_client_connector_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5252,20 +5255,22 @@ def test_get_client_connector_service_rest_interceptors(null_interceptor): ) client = ClientConnectorServicesServiceClient(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.ClientConnectorServicesServiceRestInterceptor, - "post_get_client_connector_service", - ) as post, mock.patch.object( - transports.ClientConnectorServicesServiceRestInterceptor, - "post_get_client_connector_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClientConnectorServicesServiceRestInterceptor, - "pre_get_client_connector_service", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClientConnectorServicesServiceRestInterceptor, + "post_get_client_connector_service", + ) as post, + mock.patch.object( + transports.ClientConnectorServicesServiceRestInterceptor, + "post_get_client_connector_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClientConnectorServicesServiceRestInterceptor, + "pre_get_client_connector_service", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5325,8 +5330,9 @@ def test_create_client_connector_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5470,22 +5476,23 @@ def test_create_client_connector_service_rest_interceptors(null_interceptor): ) client = ClientConnectorServicesServiceClient(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.ClientConnectorServicesServiceRestInterceptor, - "post_create_client_connector_service", - ) as post, mock.patch.object( - transports.ClientConnectorServicesServiceRestInterceptor, - "post_create_client_connector_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClientConnectorServicesServiceRestInterceptor, - "pre_create_client_connector_service", - ) as pre: + 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.ClientConnectorServicesServiceRestInterceptor, + "post_create_client_connector_service", + ) as post, + mock.patch.object( + transports.ClientConnectorServicesServiceRestInterceptor, + "post_create_client_connector_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClientConnectorServicesServiceRestInterceptor, + "pre_create_client_connector_service", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5546,8 +5553,9 @@ def test_update_client_connector_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5695,22 +5703,23 @@ def test_update_client_connector_service_rest_interceptors(null_interceptor): ) client = ClientConnectorServicesServiceClient(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.ClientConnectorServicesServiceRestInterceptor, - "post_update_client_connector_service", - ) as post, mock.patch.object( - transports.ClientConnectorServicesServiceRestInterceptor, - "post_update_client_connector_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClientConnectorServicesServiceRestInterceptor, - "pre_update_client_connector_service", - ) as pre: + 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.ClientConnectorServicesServiceRestInterceptor, + "post_update_client_connector_service", + ) as post, + mock.patch.object( + transports.ClientConnectorServicesServiceRestInterceptor, + "post_update_client_connector_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClientConnectorServicesServiceRestInterceptor, + "pre_update_client_connector_service", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5769,8 +5778,9 @@ def test_delete_client_connector_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5829,22 +5839,23 @@ def test_delete_client_connector_service_rest_interceptors(null_interceptor): ) client = ClientConnectorServicesServiceClient(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.ClientConnectorServicesServiceRestInterceptor, - "post_delete_client_connector_service", - ) as post, mock.patch.object( - transports.ClientConnectorServicesServiceRestInterceptor, - "post_delete_client_connector_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClientConnectorServicesServiceRestInterceptor, - "pre_delete_client_connector_service", - ) as pre: + 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.ClientConnectorServicesServiceRestInterceptor, + "post_delete_client_connector_service", + ) as post, + mock.patch.object( + transports.ClientConnectorServicesServiceRestInterceptor, + "post_delete_client_connector_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClientConnectorServicesServiceRestInterceptor, + "pre_delete_client_connector_service", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5901,8 +5912,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5961,8 +5973,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6024,8 +6037,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6089,8 +6103,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6154,8 +6169,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6218,8 +6234,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6280,8 +6297,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6342,8 +6360,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6404,8 +6423,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6668,11 +6688,14 @@ def test_client_connector_services_service_base_transport(): def test_client_connector_services_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.beyondcorp_clientconnectorservices_v1.services.client_connector_services_service.transports.ClientConnectorServicesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.beyondcorp_clientconnectorservices_v1.services.client_connector_services_service.transports.ClientConnectorServicesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ClientConnectorServicesServiceTransport( @@ -6689,9 +6712,12 @@ def test_client_connector_services_service_base_transport_with_credentials_file( def test_client_connector_services_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.beyondcorp_clientconnectorservices_v1.services.client_connector_services_service.transports.ClientConnectorServicesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.beyondcorp_clientconnectorservices_v1.services.client_connector_services_service.transports.ClientConnectorServicesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ClientConnectorServicesServiceTransport() @@ -6770,11 +6796,12 @@ def test_client_connector_services_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-beyondcorp-clientgateways/docs/conf.py b/packages/google-cloud-beyondcorp-clientgateways/docs/conf.py index 4a4016c88ff2..a8dcc84abb89 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/docs/conf.py +++ b/packages/google-cloud-beyondcorp-clientgateways/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-beyondcorp-clientgateways documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/__init__.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/__init__.py index 69950315b3a7..75040a147446 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/__init__.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.client_gateways_service import ( ClientGatewaysServiceAsyncClient, ClientGatewaysServiceClient, diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/async_client.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/async_client.py index 2097a362754a..737ff7cb9139 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/async_client.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_clientgateways_v1 import gapic_version as package_version @@ -44,14 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_clientgateways_v1.services.client_gateways_service import ( pagers, @@ -139,7 +141,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ClientGatewaysServiceAsyncClient: The constructed client. """ - return ClientGatewaysServiceClient.from_service_account_info.__func__(ClientGatewaysServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ClientGatewaysServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ClientGatewaysServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +158,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ClientGatewaysServiceAsyncClient: The constructed client. """ - return ClientGatewaysServiceClient.from_service_account_file.__func__(ClientGatewaysServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ClientGatewaysServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ClientGatewaysServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -193,7 +197,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ClientGatewaysServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ClientGatewaysServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ClientGatewaysServiceTransport: diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/client.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/client.py index aaec1dcacfd2..51930ecbdfe0 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/client.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_clientgateways_v1 import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_clientgateways_v1.services.client_gateways_service import ( pagers, @@ -89,9 +91,7 @@ class ClientGatewaysServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ClientGatewaysServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ClientGatewaysServiceTransport]] _transport_registry["grpc"] = ClientGatewaysServiceGrpcTransport _transport_registry["grpc_asyncio"] = ClientGatewaysServiceGrpcAsyncIOTransport _transport_registry["rest"] = ClientGatewaysServiceRestTransport @@ -648,11 +648,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ClientGatewaysServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ClientGatewaysServiceClient._read_environment_variables() + ) self._client_cert_source = ClientGatewaysServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -687,8 +685,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ClientGatewaysServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/pagers.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/pagers.py index 33a182126680..c7d8b4ae4bb2 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/pagers.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/__init__.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/__init__.py index 8ed9f73eaa32..577632851a82 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/__init__.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ClientGatewaysServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ClientGatewaysServiceTransport]] _transport_registry["grpc"] = ClientGatewaysServiceGrpcTransport _transport_registry["grpc_asyncio"] = ClientGatewaysServiceGrpcAsyncIOTransport _transport_registry["rest"] = ClientGatewaysServiceRestTransport diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/base.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/base.py index 32de9e5adb58..1bb232b18b89 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/base.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.beyondcorp_clientgateways_v1 import gapic_version as package_version from google.cloud.beyondcorp_clientgateways_v1.types import client_gateways_service @@ -287,13 +289,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc.py index d20bddf9c8cf..3ee4a15c6086 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_clientgateways_v1.types import client_gateways_service diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc_asyncio.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc_asyncio.py index 2436bf47eb01..de3013041a44 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.beyondcorp_clientgateways_v1.types import client_gateways_service diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest.py index 07ceb4a5fb18..47a97952308a 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -744,9 +746,7 @@ def __call__( """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseCreateClientGateway._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseCreateClientGateway._get_http_options() request, metadata = self._interceptor.pre_create_client_gateway( request, metadata @@ -772,7 +772,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -899,9 +899,7 @@ def __call__( """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseDeleteClientGateway._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseDeleteClientGateway._get_http_options() request, metadata = self._interceptor.pre_delete_client_gateway( request, metadata @@ -923,7 +921,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1048,9 +1046,7 @@ def __call__( """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseGetClientGateway._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseGetClientGateway._get_http_options() request, metadata = self._interceptor.pre_get_client_gateway( request, metadata @@ -1202,9 +1198,7 @@ def __call__( """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseListClientGateways._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseListClientGateways._get_http_options() request, metadata = self._interceptor.pre_list_client_gateways( request, metadata @@ -1400,9 +1394,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseClientGatewaysServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1541,9 +1533,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseClientGatewaysServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1682,9 +1672,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseClientGatewaysServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1824,9 +1812,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseClientGatewaysServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1971,9 +1957,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2119,9 +2103,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2241,9 +2223,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2361,9 +2341,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseClientGatewaysServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2502,9 +2480,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseClientGatewaysServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseClientGatewaysServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseClientGatewaysServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest_base.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest_base.py index 0b43d53f800f..495300a447ee 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest_base.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/services/client_gateways_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/types/client_gateways_service.py b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/types/client_gateways_service.py index 391357258d8d..2766a29dd66c 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/types/client_gateways_service.py +++ b/packages/google-cloud-beyondcorp-clientgateways/google/cloud/beyondcorp_clientgateways_v1/types/client_gateways_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -80,6 +80,7 @@ class State(proto.Enum): ClientGateway encountered an error and is in indeterministic state. """ + STATE_UNSPECIFIED = 0 CREATING = 1 UPDATING = 2 diff --git a/packages/google-cloud-beyondcorp-clientgateways/noxfile.py b/packages/google-cloud-beyondcorp-clientgateways/noxfile.py index d0bf8e29363b..c035d174bec0 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/noxfile.py +++ b/packages/google-cloud-beyondcorp-clientgateways/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-beyondcorp-clientgateways/tests/unit/gapic/beyondcorp_clientgateways_v1/test_client_gateways_service.py b/packages/google-cloud-beyondcorp-clientgateways/tests/unit/gapic/beyondcorp_clientgateways_v1/test_client_gateways_service.py index 65f5c3bbd9ba..5d14a65bd41e 100644 --- a/packages/google-cloud-beyondcorp-clientgateways/tests/unit/gapic/beyondcorp_clientgateways_v1/test_client_gateways_service.py +++ b/packages/google-cloud-beyondcorp-clientgateways/tests/unit/gapic/beyondcorp_clientgateways_v1/test_client_gateways_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +57,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.beyondcorp_clientgateways_v1.services.client_gateways_service import ( ClientGatewaysServiceAsyncClient, @@ -1010,10 +1012,9 @@ def test_client_gateways_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1059,9 @@ def test_client_gateways_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1097,10 +1097,9 @@ def test_client_gateways_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1356,13 +1355,13 @@ def test_client_gateways_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1483,9 +1482,9 @@ def test_list_client_gateways_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_client_gateways - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_client_gateways] = ( + mock_rpc + ) request = {} client.list_client_gateways(request) @@ -2039,9 +2038,9 @@ def test_get_client_gateway_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_client_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_client_gateway] = ( + mock_rpc + ) request = {} client.get_client_gateway(request) @@ -2389,9 +2388,9 @@ def test_create_client_gateway_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_client_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_client_gateway] = ( + mock_rpc + ) request = {} client.create_client_gateway(request) @@ -2758,9 +2757,9 @@ def test_delete_client_gateway_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_client_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_client_gateway] = ( + mock_rpc + ) request = {} client.delete_client_gateway(request) @@ -3039,9 +3038,9 @@ def test_list_client_gateways_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_client_gateways - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_client_gateways] = ( + mock_rpc + ) request = {} client.list_client_gateways(request) @@ -3310,9 +3309,9 @@ def test_get_client_gateway_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_client_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_client_gateway] = ( + mock_rpc + ) request = {} client.get_client_gateway(request) @@ -3495,9 +3494,9 @@ def test_create_client_gateway_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_client_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_client_gateway] = ( + mock_rpc + ) request = {} client.create_client_gateway(request) @@ -3704,9 +3703,9 @@ def test_delete_client_gateway_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_client_gateway - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_client_gateway] = ( + mock_rpc + ) request = {} client.delete_client_gateway(request) @@ -4225,8 +4224,9 @@ def test_list_client_gateways_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4293,18 +4293,20 @@ def test_list_client_gateways_rest_interceptors(null_interceptor): ) client = ClientGatewaysServiceClient(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.ClientGatewaysServiceRestInterceptor, "post_list_client_gateways" - ) as post, mock.patch.object( - transports.ClientGatewaysServiceRestInterceptor, - "post_list_client_gateways_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClientGatewaysServiceRestInterceptor, "pre_list_client_gateways" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClientGatewaysServiceRestInterceptor, "post_list_client_gateways" + ) as post, + mock.patch.object( + transports.ClientGatewaysServiceRestInterceptor, + "post_list_client_gateways_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClientGatewaysServiceRestInterceptor, "pre_list_client_gateways" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4362,8 +4364,9 @@ def test_get_client_gateway_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4432,18 +4435,20 @@ def test_get_client_gateway_rest_interceptors(null_interceptor): ) client = ClientGatewaysServiceClient(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.ClientGatewaysServiceRestInterceptor, "post_get_client_gateway" - ) as post, mock.patch.object( - transports.ClientGatewaysServiceRestInterceptor, - "post_get_client_gateway_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClientGatewaysServiceRestInterceptor, "pre_get_client_gateway" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClientGatewaysServiceRestInterceptor, "post_get_client_gateway" + ) as post, + mock.patch.object( + transports.ClientGatewaysServiceRestInterceptor, + "post_get_client_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClientGatewaysServiceRestInterceptor, "pre_get_client_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4501,8 +4506,9 @@ def test_create_client_gateway_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4636,20 +4642,22 @@ def test_create_client_gateway_rest_interceptors(null_interceptor): ) client = ClientGatewaysServiceClient(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.ClientGatewaysServiceRestInterceptor, "post_create_client_gateway" - ) as post, mock.patch.object( - transports.ClientGatewaysServiceRestInterceptor, - "post_create_client_gateway_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClientGatewaysServiceRestInterceptor, "pre_create_client_gateway" - ) as pre: + 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.ClientGatewaysServiceRestInterceptor, + "post_create_client_gateway", + ) as post, + mock.patch.object( + transports.ClientGatewaysServiceRestInterceptor, + "post_create_client_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClientGatewaysServiceRestInterceptor, "pre_create_client_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4702,8 +4710,9 @@ def test_delete_client_gateway_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4760,20 +4769,22 @@ def test_delete_client_gateway_rest_interceptors(null_interceptor): ) client = ClientGatewaysServiceClient(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.ClientGatewaysServiceRestInterceptor, "post_delete_client_gateway" - ) as post, mock.patch.object( - transports.ClientGatewaysServiceRestInterceptor, - "post_delete_client_gateway_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClientGatewaysServiceRestInterceptor, "pre_delete_client_gateway" - ) as pre: + 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.ClientGatewaysServiceRestInterceptor, + "post_delete_client_gateway", + ) as post, + mock.patch.object( + transports.ClientGatewaysServiceRestInterceptor, + "post_delete_client_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClientGatewaysServiceRestInterceptor, "pre_delete_client_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4826,8 +4837,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4886,8 +4898,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4949,8 +4962,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5014,8 +5028,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5079,8 +5094,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5143,8 +5159,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5205,8 +5222,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5267,8 +5285,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5329,8 +5348,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5560,11 +5580,14 @@ def test_client_gateways_service_base_transport(): def test_client_gateways_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.beyondcorp_clientgateways_v1.services.client_gateways_service.transports.ClientGatewaysServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.beyondcorp_clientgateways_v1.services.client_gateways_service.transports.ClientGatewaysServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ClientGatewaysServiceTransport( @@ -5581,9 +5604,12 @@ def test_client_gateways_service_base_transport_with_credentials_file(): def test_client_gateways_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.beyondcorp_clientgateways_v1.services.client_gateways_service.transports.ClientGatewaysServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.beyondcorp_clientgateways_v1.services.client_gateways_service.transports.ClientGatewaysServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ClientGatewaysServiceTransport() @@ -5657,11 +5683,12 @@ def test_client_gateways_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-biglake/docs/conf.py b/packages/google-cloud-biglake/docs/conf.py index a2d1883c18b4..c322d8b0695f 100644 --- a/packages/google-cloud-biglake/docs/conf.py +++ b/packages/google-cloud-biglake/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-biglake documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/__init__.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/__init__.py index f7506a1924d5..bd7f0f90e7a6 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/__init__.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.iceberg_catalog_service import ( IcebergCatalogServiceAsyncClient, IcebergCatalogServiceClient, diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/async_client.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/async_client.py index a77d5fdd0ffd..2122bb875b1b 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/async_client.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.biglake_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.biglake_v1.services.iceberg_catalog_service import pagers from google.cloud.biglake_v1.types import iceberg_rest_catalog @@ -146,7 +146,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IcebergCatalogServiceAsyncClient: The constructed client. """ - return IcebergCatalogServiceClient.from_service_account_info.__func__(IcebergCatalogServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = IcebergCatalogServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(IcebergCatalogServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -162,7 +163,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IcebergCatalogServiceAsyncClient: The constructed client. """ - return IcebergCatalogServiceClient.from_service_account_file.__func__(IcebergCatalogServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = IcebergCatalogServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(IcebergCatalogServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -200,7 +202,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return IcebergCatalogServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return IcebergCatalogServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> IcebergCatalogServiceTransport: diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/client.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/client.py index e64cb10fe274..241e5ddff79e 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/client.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.biglake_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.biglake_v1.services.iceberg_catalog_service import pagers from google.cloud.biglake_v1.types import iceberg_rest_catalog @@ -81,9 +81,7 @@ class IcebergCatalogServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IcebergCatalogServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IcebergCatalogServiceTransport]] _transport_registry["grpc"] = IcebergCatalogServiceGrpcTransport _transport_registry["grpc_asyncio"] = IcebergCatalogServiceGrpcAsyncIOTransport _transport_registry["rest"] = IcebergCatalogServiceRestTransport @@ -652,11 +650,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IcebergCatalogServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IcebergCatalogServiceClient._read_environment_variables() + ) self._client_cert_source = IcebergCatalogServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -691,8 +687,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IcebergCatalogServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/pagers.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/pagers.py index 6e4d13397363..330b927bdf38 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/pagers.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/__init__.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/__init__.py index 9be2072c2b6d..fd8ed43c7ba8 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/__init__.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[IcebergCatalogServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[IcebergCatalogServiceTransport]] _transport_registry["grpc"] = IcebergCatalogServiceGrpcTransport _transport_registry["grpc_asyncio"] = IcebergCatalogServiceGrpcAsyncIOTransport _transport_registry["rest"] = IcebergCatalogServiceRestTransport diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/base.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/base.py index b41e2699eac8..b6d98455415a 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/base.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.biglake_v1 import gapic_version as package_version from google.cloud.biglake_v1.types import iceberg_rest_catalog diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc.py index fa42e4126269..6b3728733129 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.biglake_v1.types import iceberg_rest_catalog diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc_asyncio.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc_asyncio.py index a2a3b3ad5ea3..7457c6be5bb6 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.biglake_v1.types import iceberg_rest_catalog diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/rest.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/rest.py index db78917852ae..12840494aaee 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/rest.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/services/iceberg_catalog_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -547,9 +547,7 @@ def __call__( The Iceberg REST Catalog information. """ - http_options = ( - _BaseIcebergCatalogServiceRestTransport._BaseCreateIcebergCatalog._get_http_options() - ) + http_options = _BaseIcebergCatalogServiceRestTransport._BaseCreateIcebergCatalog._get_http_options() request, metadata = self._interceptor.pre_create_iceberg_catalog( request, metadata @@ -707,9 +705,7 @@ def __call__( """ - http_options = ( - _BaseIcebergCatalogServiceRestTransport._BaseFailoverIcebergCatalog._get_http_options() - ) + http_options = _BaseIcebergCatalogServiceRestTransport._BaseFailoverIcebergCatalog._get_http_options() request, metadata = self._interceptor.pre_failover_iceberg_catalog( request, metadata @@ -863,9 +859,7 @@ def __call__( The Iceberg REST Catalog information. """ - http_options = ( - _BaseIcebergCatalogServiceRestTransport._BaseGetIcebergCatalog._get_http_options() - ) + http_options = _BaseIcebergCatalogServiceRestTransport._BaseGetIcebergCatalog._get_http_options() request, metadata = self._interceptor.pre_get_iceberg_catalog( request, metadata @@ -1016,9 +1010,7 @@ def __call__( """ - http_options = ( - _BaseIcebergCatalogServiceRestTransport._BaseListIcebergCatalogs._get_http_options() - ) + http_options = _BaseIcebergCatalogServiceRestTransport._BaseListIcebergCatalogs._get_http_options() request, metadata = self._interceptor.pre_list_iceberg_catalogs( request, metadata @@ -1171,9 +1163,7 @@ def __call__( The Iceberg REST Catalog information. """ - http_options = ( - _BaseIcebergCatalogServiceRestTransport._BaseUpdateIcebergCatalog._get_http_options() - ) + http_options = _BaseIcebergCatalogServiceRestTransport._BaseUpdateIcebergCatalog._get_http_options() request, metadata = self._interceptor.pre_update_iceberg_catalog( request, metadata @@ -1292,7 +1282,9 @@ def failover_iceberg_catalog( ]: # 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._FailoverIcebergCatalog(self._session, self._host, self._interceptor) # type: ignore + return self._FailoverIcebergCatalog( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_iceberg_catalog( diff --git a/packages/google-cloud-biglake/google/cloud/biglake_v1/types/iceberg_rest_catalog.py b/packages/google-cloud-biglake/google/cloud/biglake_v1/types/iceberg_rest_catalog.py index 549ba43aed89..d587c7610281 100644 --- a/packages/google-cloud-biglake/google/cloud/biglake_v1/types/iceberg_rest_catalog.py +++ b/packages/google-cloud-biglake/google/cloud/biglake_v1/types/iceberg_rest_catalog.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -82,6 +82,7 @@ class CatalogType(proto.Enum): Catalog type for Google Cloud Storage Buckets. """ + CATALOG_TYPE_UNSPECIFIED = 0 CATALOG_TYPE_GCS_BUCKET = 1 @@ -110,6 +111,7 @@ class CredentialMode(proto.Enum): https://github.com/apache/iceberg/blob/931865ecaf40a827f9081dddb675bf1c95c05461/open-api/rest-catalog-open-api.yaml#L1854 for more details. """ + CREDENTIAL_MODE_UNSPECIFIED = 0 CREDENTIAL_MODE_END_USER = 1 CREDENTIAL_MODE_VENDED_CREDENTIALS = 2 @@ -250,6 +252,7 @@ class CatalogView(proto.Enum): CATALOG_VIEW_FULL (2): Include all fields of the catalog. """ + CATALOG_VIEW_UNSPECIFIED = 0 CATALOG_VIEW_BASIC = 1 CATALOG_VIEW_FULL = 2 diff --git a/packages/google-cloud-biglake/noxfile.py b/packages/google-cloud-biglake/noxfile.py index 5bce68fc8bb3..5e097f9ee768 100644 --- a/packages/google-cloud-biglake/noxfile.py +++ b/packages/google-cloud-biglake/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-biglake/tests/unit/gapic/biglake_v1/test_iceberg_catalog_service.py b/packages/google-cloud-biglake/tests/unit/gapic/biglake_v1/test_iceberg_catalog_service.py index 9135da48481f..27348bcc4b4d 100644 --- a/packages/google-cloud-biglake/tests/unit/gapic/biglake_v1/test_iceberg_catalog_service.py +++ b/packages/google-cloud-biglake/tests/unit/gapic/biglake_v1/test_iceberg_catalog_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.biglake_v1.services.iceberg_catalog_service import ( IcebergCatalogServiceAsyncClient, @@ -996,10 +1001,9 @@ def test_iceberg_catalog_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1048,9 @@ def test_iceberg_catalog_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1086,9 @@ def test_iceberg_catalog_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1342,13 +1344,13 @@ def test_iceberg_catalog_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1480,9 +1482,9 @@ def test_get_iceberg_catalog_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_iceberg_catalog - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_iceberg_catalog] = ( + mock_rpc + ) request = {} client.get_iceberg_catalog(request) @@ -1843,9 +1845,9 @@ def test_list_iceberg_catalogs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_iceberg_catalogs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_iceberg_catalogs] = ( + mock_rpc + ) request = {} client.list_iceberg_catalogs(request) @@ -2404,9 +2406,9 @@ def test_update_iceberg_catalog_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_iceberg_catalog - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_iceberg_catalog] = ( + mock_rpc + ) request = {} client.update_iceberg_catalog(request) @@ -2791,9 +2793,9 @@ def test_create_iceberg_catalog_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_iceberg_catalog - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_iceberg_catalog] = ( + mock_rpc + ) request = {} client.create_iceberg_catalog(request) @@ -3450,9 +3452,9 @@ def test_get_iceberg_catalog_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_iceberg_catalog - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_iceberg_catalog] = ( + mock_rpc + ) request = {} client.get_iceberg_catalog(request) @@ -3633,9 +3635,9 @@ def test_list_iceberg_catalogs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_iceberg_catalogs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_iceberg_catalogs] = ( + mock_rpc + ) request = {} client.list_iceberg_catalogs(request) @@ -3899,9 +3901,9 @@ def test_update_iceberg_catalog_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_iceberg_catalog - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_iceberg_catalog] = ( + mock_rpc + ) request = {} client.update_iceberg_catalog(request) @@ -4084,9 +4086,9 @@ def test_create_iceberg_catalog_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_iceberg_catalog - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_iceberg_catalog] = ( + mock_rpc + ) request = {} client.create_iceberg_catalog(request) @@ -4886,8 +4888,9 @@ def test_get_iceberg_catalog_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4966,18 +4969,20 @@ def test_get_iceberg_catalog_rest_interceptors(null_interceptor): ) client = IcebergCatalogServiceClient(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.IcebergCatalogServiceRestInterceptor, "post_get_iceberg_catalog" - ) as post, mock.patch.object( - transports.IcebergCatalogServiceRestInterceptor, - "post_get_iceberg_catalog_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IcebergCatalogServiceRestInterceptor, "pre_get_iceberg_catalog" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, "post_get_iceberg_catalog" + ) as post, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, + "post_get_iceberg_catalog_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, "pre_get_iceberg_catalog" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5035,8 +5040,9 @@ def test_list_iceberg_catalogs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5101,18 +5107,21 @@ def test_list_iceberg_catalogs_rest_interceptors(null_interceptor): ) client = IcebergCatalogServiceClient(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.IcebergCatalogServiceRestInterceptor, "post_list_iceberg_catalogs" - ) as post, mock.patch.object( - transports.IcebergCatalogServiceRestInterceptor, - "post_list_iceberg_catalogs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IcebergCatalogServiceRestInterceptor, "pre_list_iceberg_catalogs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, + "post_list_iceberg_catalogs", + ) as post, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, + "post_list_iceberg_catalogs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, "pre_list_iceberg_catalogs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5170,8 +5179,9 @@ def test_update_iceberg_catalog_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5329,18 +5339,22 @@ def test_update_iceberg_catalog_rest_interceptors(null_interceptor): ) client = IcebergCatalogServiceClient(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.IcebergCatalogServiceRestInterceptor, "post_update_iceberg_catalog" - ) as post, mock.patch.object( - transports.IcebergCatalogServiceRestInterceptor, - "post_update_iceberg_catalog_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IcebergCatalogServiceRestInterceptor, "pre_update_iceberg_catalog" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, + "post_update_iceberg_catalog", + ) as post, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, + "post_update_iceberg_catalog_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, + "pre_update_iceberg_catalog", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5398,8 +5412,9 @@ def test_create_iceberg_catalog_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5557,18 +5572,22 @@ def test_create_iceberg_catalog_rest_interceptors(null_interceptor): ) client = IcebergCatalogServiceClient(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.IcebergCatalogServiceRestInterceptor, "post_create_iceberg_catalog" - ) as post, mock.patch.object( - transports.IcebergCatalogServiceRestInterceptor, - "post_create_iceberg_catalog_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IcebergCatalogServiceRestInterceptor, "pre_create_iceberg_catalog" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, + "post_create_iceberg_catalog", + ) as post, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, + "post_create_iceberg_catalog_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, + "pre_create_iceberg_catalog", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5626,8 +5645,9 @@ def test_failover_iceberg_catalog_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5689,18 +5709,22 @@ def test_failover_iceberg_catalog_rest_interceptors(null_interceptor): ) client = IcebergCatalogServiceClient(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.IcebergCatalogServiceRestInterceptor, "post_failover_iceberg_catalog" - ) as post, mock.patch.object( - transports.IcebergCatalogServiceRestInterceptor, - "post_failover_iceberg_catalog_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IcebergCatalogServiceRestInterceptor, "pre_failover_iceberg_catalog" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, + "post_failover_iceberg_catalog", + ) as post, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, + "post_failover_iceberg_catalog_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IcebergCatalogServiceRestInterceptor, + "pre_failover_iceberg_catalog", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5921,11 +5945,14 @@ def test_iceberg_catalog_service_base_transport(): def test_iceberg_catalog_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.biglake_v1.services.iceberg_catalog_service.transports.IcebergCatalogServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.biglake_v1.services.iceberg_catalog_service.transports.IcebergCatalogServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IcebergCatalogServiceTransport( @@ -5945,9 +5972,12 @@ def test_iceberg_catalog_service_base_transport_with_credentials_file(): def test_iceberg_catalog_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.biglake_v1.services.iceberg_catalog_service.transports.IcebergCatalogServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.biglake_v1.services.iceberg_catalog_service.transports.IcebergCatalogServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IcebergCatalogServiceTransport() @@ -6027,11 +6057,12 @@ def test_iceberg_catalog_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-analyticshub/docs/conf.py b/packages/google-cloud-bigquery-analyticshub/docs/conf.py index c0a8628cc491..859222201688 100644 --- a/packages/google-cloud-bigquery-analyticshub/docs/conf.py +++ b/packages/google-cloud-bigquery-analyticshub/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-bigquery-analyticshub documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/__init__.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/__init__.py index 8fd80eded13b..2479e51e6097 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/__init__.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.analytics_hub_service import ( AnalyticsHubServiceAsyncClient, AnalyticsHubServiceClient, diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/async_client.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/async_client.py index 0eebba4c4bb2..b7a34edacb0b 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/async_client.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_analyticshub_v1 import gapic_version as package_version @@ -44,14 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.bigquery_analyticshub_v1.services.analytics_hub_service import pagers from google.cloud.bigquery_analyticshub_v1.types import analyticshub @@ -155,7 +155,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AnalyticsHubServiceAsyncClient: The constructed client. """ - return AnalyticsHubServiceClient.from_service_account_info.__func__(AnalyticsHubServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AnalyticsHubServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AnalyticsHubServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +172,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AnalyticsHubServiceAsyncClient: The constructed client. """ - return AnalyticsHubServiceClient.from_service_account_file.__func__(AnalyticsHubServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AnalyticsHubServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AnalyticsHubServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -209,7 +211,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AnalyticsHubServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AnalyticsHubServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AnalyticsHubServiceTransport: @@ -2682,7 +2686,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_analyticshub_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -2798,7 +2802,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_analyticshub_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -2914,7 +2918,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_analyticshub_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/client.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/client.py index 7ba3fb4a3ae9..6cf0ae1a5342 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/client.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_analyticshub_v1 import gapic_version as package_version @@ -61,14 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.bigquery_analyticshub_v1.services.analytics_hub_service import pagers from google.cloud.bigquery_analyticshub_v1.types import analyticshub @@ -86,9 +86,7 @@ class AnalyticsHubServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AnalyticsHubServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsHubServiceTransport]] _transport_registry["grpc"] = AnalyticsHubServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsHubServiceGrpcAsyncIOTransport @@ -818,11 +816,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AnalyticsHubServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AnalyticsHubServiceClient._read_environment_variables() + ) self._client_cert_source = AnalyticsHubServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -857,8 +853,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AnalyticsHubServiceTransport, transport) self._api_endpoint = self._transport.host @@ -3221,7 +3216,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_analyticshub_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -3336,7 +3331,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_analyticshub_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -3451,7 +3446,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_analyticshub_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/pagers.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/pagers.py index d3354d539393..4240ee9b35e1 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/pagers.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -769,7 +769,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -851,7 +851,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -927,7 +927,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/__init__.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/__init__.py index d97066cc7aaf..2be520d8722d 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import AnalyticsHubServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AnalyticsHubServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsHubServiceTransport]] _transport_registry["grpc"] = AnalyticsHubServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsHubServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/base.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/base.py index 877b3dc763eb..6b3210659f2e 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/base.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/base.py @@ -17,17 +17,17 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_analyticshub_v1 import gapic_version as package_version from google.cloud.bigquery_analyticshub_v1.types import analyticshub diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc.py index 44a2968a17ee..f0dae5dee629 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc.py @@ -16,21 +16,21 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.bigquery_analyticshub_v1.types import analyticshub @@ -816,12 +816,12 @@ def list_shared_resource_subscriptions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_shared_resource_subscriptions" not in self._stubs: - self._stubs[ - "list_shared_resource_subscriptions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.analyticshub.v1.AnalyticsHubService/ListSharedResourceSubscriptions", - request_serializer=analyticshub.ListSharedResourceSubscriptionsRequest.serialize, - response_deserializer=analyticshub.ListSharedResourceSubscriptionsResponse.deserialize, + self._stubs["list_shared_resource_subscriptions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.analyticshub.v1.AnalyticsHubService/ListSharedResourceSubscriptions", + request_serializer=analyticshub.ListSharedResourceSubscriptionsRequest.serialize, + response_deserializer=analyticshub.ListSharedResourceSubscriptionsResponse.deserialize, + ) ) return self._stubs["list_shared_resource_subscriptions"] diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc_asyncio.py index 0841643ecc27..56653a77abff 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/services/analytics_hub_service/transports/grpc_asyncio.py @@ -17,23 +17,23 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_analyticshub_v1.types import analyticshub @@ -837,12 +837,12 @@ def list_shared_resource_subscriptions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_shared_resource_subscriptions" not in self._stubs: - self._stubs[ - "list_shared_resource_subscriptions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.analyticshub.v1.AnalyticsHubService/ListSharedResourceSubscriptions", - request_serializer=analyticshub.ListSharedResourceSubscriptionsRequest.serialize, - response_deserializer=analyticshub.ListSharedResourceSubscriptionsResponse.deserialize, + self._stubs["list_shared_resource_subscriptions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.analyticshub.v1.AnalyticsHubService/ListSharedResourceSubscriptions", + request_serializer=analyticshub.ListSharedResourceSubscriptionsRequest.serialize, + response_deserializer=analyticshub.ListSharedResourceSubscriptionsResponse.deserialize, + ) ) return self._stubs["list_shared_resource_subscriptions"] diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/types/analyticshub.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/types/analyticshub.py index 6cd91f3f7806..db43c9f87681 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/types/analyticshub.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/types/analyticshub.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore from google.cloud.bigquery_analyticshub_v1.types import pubsub @@ -97,6 +97,7 @@ class DiscoveryType(proto.Enum): The Data exchange/listing can be discovered in the 'Public' results list. """ + DISCOVERY_TYPE_UNSPECIFIED = 0 DISCOVERY_TYPE_PRIVATE = 1 DISCOVERY_TYPE_PUBLIC = 2 @@ -114,6 +115,7 @@ class SharedResourceType(proto.Enum): PUBSUB_TOPIC (2): Pub/Sub Topic Asset. """ + SHARED_RESOURCE_TYPE_UNSPECIFIED = 0 BIGQUERY_DATASET = 1 PUBSUB_TOPIC = 2 @@ -290,6 +292,7 @@ class State(proto.Enum): APPROVED (4): The QueryTemplate is in approved state. """ + STATE_UNSPECIFIED = 0 DRAFTED = 1 PENDING = 2 @@ -361,6 +364,7 @@ class RoutineType(proto.Enum): TABLE_VALUED_FUNCTION (1): Non-built-in persistent TVF. """ + ROUTINE_TYPE_UNSPECIFIED = 0 TABLE_VALUED_FUNCTION = 1 @@ -898,6 +902,7 @@ class State(proto.Enum): dataexchange.listings.subscribe permission can subscribe to this listing. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 @@ -948,6 +953,7 @@ class Category(proto.Enum): CATEGORY_GOOGLE_EARTH_ENGINE (20): No description available. """ + CATEGORY_UNSPECIFIED = 0 CATEGORY_OTHERS = 1 CATEGORY_ADVERTISING_AND_MARKETING = 2 @@ -1107,6 +1113,7 @@ class ReplicaState(proto.Enum): The replica is unavailable, does not exist, or has not been backfilled yet. """ + REPLICA_STATE_UNSPECIFIED = 0 READY_TO_USE = 1 UNAVAILABLE = 2 @@ -1121,6 +1128,7 @@ class PrimaryState(proto.Enum): PRIMARY_REPLICA (1): The replica is the primary replica. """ + PRIMARY_STATE_UNSPECIFIED = 0 PRIMARY_REPLICA = 1 @@ -1164,12 +1172,12 @@ class PrimaryState(proto.Enum): proto.STRING, number=5, ) - effective_replicas: MutableSequence[ - "Listing.BigQueryDatasetSource.Replica" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="Listing.BigQueryDatasetSource.Replica", + effective_replicas: MutableSequence["Listing.BigQueryDatasetSource.Replica"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="Listing.BigQueryDatasetSource.Replica", + ) ) class PubSubTopicSource(proto.Message): @@ -1275,6 +1283,7 @@ class CommercialState(proto.Enum): Commercialization is complete and available for use. """ + COMMERCIAL_STATE_UNSPECIFIED = 0 ONBOARDING = 1 ACTIVE = 2 @@ -1421,6 +1430,7 @@ class StoredProcedureType(proto.Enum): SQL_PROCEDURE (1): SQL stored procedure. """ + STORED_PROCEDURE_TYPE_UNSPECIFIED = 0 SQL_PROCEDURE = 1 @@ -1428,12 +1438,12 @@ class StoredProcedureType(proto.Enum): proto.BOOL, number=1, ) - allowed_stored_procedure_types: MutableSequence[ - StoredProcedureType - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum=StoredProcedureType, + allowed_stored_procedure_types: MutableSequence[StoredProcedureType] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum=StoredProcedureType, + ) ) @@ -1530,6 +1540,7 @@ class State(proto.Enum): This subscription has been cancelled or revoked and the data is no longer accessible. """ + STATE_UNSPECIFIED = 0 STATE_ACTIVE = 1 STATE_STALE = 2 @@ -2323,12 +2334,12 @@ class ListSharedResourceSubscriptionsResponse(proto.Message): def raw_page(self): return self - shared_resource_subscriptions: MutableSequence[ - "Subscription" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Subscription", + shared_resource_subscriptions: MutableSequence["Subscription"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Subscription", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/types/pubsub.py b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/types/pubsub.py index 5b46a55e5913..55eafdc64f0d 100644 --- a/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/types/pubsub.py +++ b/packages/google-cloud-bigquery-analyticshub/google/cloud/bigquery_analyticshub_v1/types/pubsub.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-bigquery-analyticshub/noxfile.py b/packages/google-cloud-bigquery-analyticshub/noxfile.py index fca276edf046..7930d0e50af4 100644 --- a/packages/google-cloud-bigquery-analyticshub/noxfile.py +++ b/packages/google-cloud-bigquery-analyticshub/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_async.py index 2bbd3eb0e74c..0877ad1a0cd8 100644 --- a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-analyticshub -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START analyticshub_v1_generated_AnalyticsHubService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_analyticshub_v1 diff --git a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_sync.py index 5e782f64e0cb..f56831c36fc9 100644 --- a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-analyticshub -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START analyticshub_v1_generated_AnalyticsHubService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_analyticshub_v1 diff --git a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_async.py index 4e9741efe69a..f1fbbf68c55d 100644 --- a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-analyticshub -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START analyticshub_v1_generated_AnalyticsHubService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_analyticshub_v1 diff --git a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_sync.py index ccae9ffef9a7..82ceaed960d9 100644 --- a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-analyticshub -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START analyticshub_v1_generated_AnalyticsHubService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_analyticshub_v1 diff --git a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_async.py index 243c5387ce7d..5ceeffb6370a 100644 --- a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-analyticshub -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START analyticshub_v1_generated_AnalyticsHubService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_analyticshub_v1 diff --git a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_sync.py index 3aa0de2a6465..30c4cb6bc826 100644 --- a/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-analyticshub/samples/generated_samples/analyticshub_v1_generated_analytics_hub_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-analyticshub -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START analyticshub_v1_generated_AnalyticsHubService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_analyticshub_v1 diff --git a/packages/google-cloud-bigquery-analyticshub/tests/unit/gapic/bigquery_analyticshub_v1/test_analytics_hub_service.py b/packages/google-cloud-bigquery-analyticshub/tests/unit/gapic/bigquery_analyticshub_v1/test_analytics_hub_service.py index 4a4879072fb1..cf7921228210 100644 --- a/packages/google-cloud-bigquery-analyticshub/tests/unit/gapic/bigquery_analyticshub_v1/test_analytics_hub_service.py +++ b/packages/google-cloud-bigquery-analyticshub/tests/unit/gapic/bigquery_analyticshub_v1/test_analytics_hub_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,19 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,24 +60,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.bigquery_analyticshub_v1.services.analytics_hub_service import ( AnalyticsHubServiceAsyncClient, @@ -978,10 +978,9 @@ def test_analytics_hub_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1025,9 @@ def test_analytics_hub_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1065,10 +1063,9 @@ def test_analytics_hub_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1313,13 +1310,13 @@ def test_analytics_hub_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1437,9 +1434,9 @@ def test_list_data_exchanges_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_exchanges - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_exchanges] = ( + mock_rpc + ) request = {} client.list_data_exchanges(request) @@ -2541,9 +2538,9 @@ def test_get_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_exchange] = ( + mock_rpc + ) request = {} client.get_data_exchange(request) @@ -2916,9 +2913,9 @@ def test_create_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_exchange] = ( + mock_rpc + ) request = {} client.create_data_exchange(request) @@ -3295,9 +3292,9 @@ def test_update_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_exchange] = ( + mock_rpc + ) request = {} client.update_data_exchange(request) @@ -3659,9 +3656,9 @@ def test_delete_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_exchange] = ( + mock_rpc + ) request = {} client.delete_data_exchange(request) @@ -5995,9 +5992,9 @@ def test_subscribe_listing_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.subscribe_listing - ] = mock_rpc + client._transport._wrapped_methods[client._transport.subscribe_listing] = ( + mock_rpc + ) request = {} client.subscribe_listing(request) @@ -6683,9 +6680,9 @@ def test_refresh_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.refresh_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.refresh_subscription] = ( + mock_rpc + ) request = {} client.refresh_subscription(request) @@ -7039,9 +7036,9 @@ def test_get_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_subscription] = ( + mock_rpc + ) request = {} client.get_subscription(request) @@ -7386,9 +7383,9 @@ def test_list_subscriptions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_subscriptions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_subscriptions] = ( + mock_rpc + ) request = {} client.list_subscriptions(request) @@ -8475,9 +8472,9 @@ def test_revoke_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.revoke_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.revoke_subscription] = ( + mock_rpc + ) request = {} client.revoke_subscription(request) @@ -8810,9 +8807,9 @@ def test_delete_subscription_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_subscription - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_subscription] = ( + mock_rpc + ) request = {} client.delete_subscription(request) @@ -9679,9 +9676,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -9969,9 +9966,9 @@ def test_create_query_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_query_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_query_template] = ( + mock_rpc + ) request = {} client.create_query_template(request) @@ -10355,9 +10352,9 @@ def test_get_query_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_query_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_query_template] = ( + mock_rpc + ) request = {} client.get_query_template(request) @@ -10710,9 +10707,9 @@ def test_list_query_templates_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_query_templates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_query_templates] = ( + mock_rpc + ) request = {} client.list_query_templates(request) @@ -11262,9 +11259,9 @@ def test_update_query_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_query_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_query_template] = ( + mock_rpc + ) request = {} client.update_query_template(request) @@ -11624,9 +11621,9 @@ def test_delete_query_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_query_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_query_template] = ( + mock_rpc + ) request = {} client.delete_query_template(request) @@ -11970,9 +11967,9 @@ def test_submit_query_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_query_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_query_template] = ( + mock_rpc + ) request = {} client.submit_query_template(request) @@ -12337,9 +12334,9 @@ def test_approve_query_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.approve_query_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.approve_query_template] = ( + mock_rpc + ) request = {} client.approve_query_template(request) @@ -14357,11 +14354,14 @@ def test_analytics_hub_service_base_transport(): def test_analytics_hub_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_analyticshub_v1.services.analytics_hub_service.transports.AnalyticsHubServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_analyticshub_v1.services.analytics_hub_service.transports.AnalyticsHubServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AnalyticsHubServiceTransport( @@ -14381,9 +14381,12 @@ def test_analytics_hub_service_base_transport_with_credentials_file(): def test_analytics_hub_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_analyticshub_v1.services.analytics_hub_service.transports.AnalyticsHubServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_analyticshub_v1.services.analytics_hub_service.transports.AnalyticsHubServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AnalyticsHubServiceTransport() @@ -14460,11 +14463,12 @@ def test_analytics_hub_service_transport_auth_gdch_credentials(transport_class): def test_analytics_hub_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-biglake/docs/conf.py b/packages/google-cloud-bigquery-biglake/docs/conf.py index 4140351d5ce9..b7aa4d0ba50e 100644 --- a/packages/google-cloud-bigquery-biglake/docs/conf.py +++ b/packages/google-cloud-bigquery-biglake/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-bigquery-biglake documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/__init__.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/__init__.py index 9cc7930e05b7..05f6277e64b4 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/__init__.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.metastore_service import ( MetastoreServiceAsyncClient, MetastoreServiceClient, diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/async_client.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/async_client.py index 8cb13c80eca4..db1027754421 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/async_client.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_biglake_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_biglake_v1.services.metastore_service import pagers from google.cloud.bigquery_biglake_v1.types import metastore @@ -131,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetastoreServiceAsyncClient: The constructed client. """ - return MetastoreServiceClient.from_service_account_info.__func__(MetastoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MetastoreServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(MetastoreServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetastoreServiceAsyncClient: The constructed client. """ - return MetastoreServiceClient.from_service_account_file.__func__(MetastoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MetastoreServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(MetastoreServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/client.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/client.py index f62aca93993f..30a8df06a647 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/client.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_biglake_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_biglake_v1.services.metastore_service import pagers from google.cloud.bigquery_biglake_v1.types import metastore @@ -81,9 +81,7 @@ class MetastoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MetastoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MetastoreServiceTransport]] _transport_registry["grpc"] = MetastoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetastoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = MetastoreServiceRestTransport @@ -686,11 +684,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetastoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetastoreServiceClient._read_environment_variables() + ) self._client_cert_source = MetastoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -725,8 +721,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetastoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/pagers.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/pagers.py index f6be1ef07891..3580a730b6f0 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/pagers.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/base.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/base.py index 24fc561a235d..a00a976bedbf 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/base.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_biglake_v1 import gapic_version as package_version from google.cloud.bigquery_biglake_v1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc.py index 1bd2ca0086a4..cbaf6e66682e 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_biglake_v1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc_asyncio.py index f5fbe114e17a..3c6a9eebb73b 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_biglake_v1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/rest.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/rest.py index f374a02336ff..fa0b59c411cf 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/rest.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/services/metastore_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1028,9 +1028,7 @@ def __call__( """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseCreateCatalog._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseCreateCatalog._get_http_options() request, metadata = self._interceptor.pre_create_catalog(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseCreateCatalog._get_transcoded_request( @@ -1179,9 +1177,7 @@ def __call__( Database is the container of tables. """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseCreateDatabase._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseCreateDatabase._get_http_options() request, metadata = self._interceptor.pre_create_database(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseCreateDatabase._get_transcoded_request( @@ -1482,9 +1478,7 @@ def __call__( """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseDeleteCatalog._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseDeleteCatalog._get_http_options() request, metadata = self._interceptor.pre_delete_catalog(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseDeleteCatalog._get_transcoded_request( @@ -1627,9 +1621,7 @@ def __call__( Database is the container of tables. """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseDeleteDatabase._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseDeleteDatabase._get_http_options() request, metadata = self._interceptor.pre_delete_database(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseDeleteDatabase._get_transcoded_request( @@ -2505,9 +2497,7 @@ def __call__( """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseListDatabases._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseListDatabases._get_http_options() request, metadata = self._interceptor.pre_list_databases(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseListDatabases._get_transcoded_request( @@ -2949,9 +2939,7 @@ def __call__( Database is the container of tables. """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseUpdateDatabase._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseUpdateDatabase._get_http_options() request, metadata = self._interceptor.pre_update_database(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseUpdateDatabase._get_transcoded_request( diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/types/metastore.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/types/metastore.py index d1462962ab72..5faddc828c51 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/types/metastore.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1/types/metastore.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -66,6 +66,7 @@ class TableView(proto.Enum): FULL (2): Include everything. """ + TABLE_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -160,6 +161,7 @@ class Type(proto.Enum): Represents a database storing tables compatible with Hive Metastore tables. """ + TYPE_UNSPECIFIED = 0 HIVE = 1 @@ -246,6 +248,7 @@ class Type(proto.Enum): Represents a table compatible with Hive Metastore tables. """ + TYPE_UNSPECIFIED = 0 HIVE = 1 diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/__init__.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/__init__.py index a9aeb77caa2b..8ab79e96e0c8 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/__init__.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.metastore_service import ( MetastoreServiceAsyncClient, MetastoreServiceClient, diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/async_client.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/async_client.py index 763405be6f2d..ba7aab4481dc 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/async_client.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_biglake_v1alpha1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_biglake_v1alpha1.services.metastore_service import pagers from google.cloud.bigquery_biglake_v1alpha1.types import metastore @@ -133,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetastoreServiceAsyncClient: The constructed client. """ - return MetastoreServiceClient.from_service_account_info.__func__(MetastoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MetastoreServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(MetastoreServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetastoreServiceAsyncClient: The constructed client. """ - return MetastoreServiceClient.from_service_account_file.__func__(MetastoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MetastoreServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(MetastoreServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/client.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/client.py index e87d0445d447..76e7f0415716 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/client.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_biglake_v1alpha1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_biglake_v1alpha1.services.metastore_service import pagers from google.cloud.bigquery_biglake_v1alpha1.types import metastore @@ -81,9 +81,7 @@ class MetastoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MetastoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MetastoreServiceTransport]] _transport_registry["grpc"] = MetastoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetastoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = MetastoreServiceRestTransport @@ -712,11 +710,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetastoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetastoreServiceClient._read_environment_variables() + ) self._client_cert_source = MetastoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -751,8 +747,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetastoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/pagers.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/pagers.py index 52f65f7df103..79365f36592f 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/pagers.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/base.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/base.py index f2059257f8d7..83b5b5b4f902 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/base.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_biglake_v1alpha1 import gapic_version as package_version from google.cloud.bigquery_biglake_v1alpha1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc.py index 300c0af106dc..b77909d00158 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_biglake_v1alpha1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc_asyncio.py index ab9ba7022d02..70c3cbf1e3b6 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_biglake_v1alpha1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest.py index 2f10f63f95d7..3f9e8401ef37 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1354,9 +1354,7 @@ def __call__( """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseCreateCatalog._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseCreateCatalog._get_http_options() request, metadata = self._interceptor.pre_create_catalog(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseCreateCatalog._get_transcoded_request( @@ -1505,9 +1503,7 @@ def __call__( Database is the container of tables. """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseCreateDatabase._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseCreateDatabase._get_http_options() request, metadata = self._interceptor.pre_create_database(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseCreateDatabase._get_transcoded_request( @@ -1959,9 +1955,7 @@ def __call__( """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseDeleteCatalog._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseDeleteCatalog._get_http_options() request, metadata = self._interceptor.pre_delete_catalog(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseDeleteCatalog._get_transcoded_request( @@ -2104,9 +2098,7 @@ def __call__( Database is the container of tables. """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseDeleteDatabase._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseDeleteDatabase._get_http_options() request, metadata = self._interceptor.pre_delete_database(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseDeleteDatabase._get_transcoded_request( @@ -2267,7 +2259,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3089,9 +3081,7 @@ def __call__( """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseListDatabases._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseListDatabases._get_http_options() request, metadata = self._interceptor.pre_list_databases(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseListDatabases._get_transcoded_request( @@ -3680,9 +3670,7 @@ def __call__( Database is the container of tables. """ - http_options = ( - _BaseMetastoreServiceRestTransport._BaseUpdateDatabase._get_http_options() - ) + http_options = _BaseMetastoreServiceRestTransport._BaseUpdateDatabase._get_http_options() request, metadata = self._interceptor.pre_update_database(request, metadata) transcoded_request = _BaseMetastoreServiceRestTransport._BaseUpdateDatabase._get_transcoded_request( diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest_base.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest_base.py index b8229c930d95..0ad4c15ee445 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/services/metastore_service/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.bigquery_biglake_v1alpha1.types import metastore diff --git a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/types/metastore.py b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/types/metastore.py index 7ea36dabcfb2..4f21c6007160 100644 --- a/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/types/metastore.py +++ b/packages/google-cloud-bigquery-biglake/google/cloud/bigquery_biglake_v1alpha1/types/metastore.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -72,6 +72,7 @@ class TableView(proto.Enum): FULL (2): Include everything. """ + TABLE_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -166,6 +167,7 @@ class Type(proto.Enum): Represents a database storing tables compatible with Hive Metastore tables. """ + TYPE_UNSPECIFIED = 0 HIVE = 1 @@ -252,6 +254,7 @@ class Type(proto.Enum): Represents a table compatible with Hive Metastore tables. """ + TYPE_UNSPECIFIED = 0 HIVE = 1 @@ -329,6 +332,7 @@ class Type(proto.Enum): An exclusive lock prevents another lock from being created on the same resource. """ + TYPE_UNSPECIFIED = 0 EXCLUSIVE = 1 @@ -343,6 +347,7 @@ class State(proto.Enum): ACQUIRED (2): The lock has been acquired. """ + STATE_UNSPECIFIED = 0 WAITING = 1 ACQUIRED = 2 diff --git a/packages/google-cloud-bigquery-biglake/noxfile.py b/packages/google-cloud-bigquery-biglake/noxfile.py index e0bd615fb48a..d67ebe19a719 100644 --- a/packages/google-cloud-bigquery-biglake/noxfile.py +++ b/packages/google-cloud-bigquery-biglake/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1/test_metastore_service.py b/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1/test_metastore_service.py index 5852221a7a9e..72a2e58df0a9 100644 --- a/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1/test_metastore_service.py +++ b/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1/test_metastore_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.bigquery_biglake_v1.services.metastore_service import ( MetastoreServiceAsyncClient, @@ -972,10 +977,9 @@ def test_metastore_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1020,10 +1024,9 @@ def test_metastore_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1062,9 @@ def test_metastore_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1310,13 +1312,13 @@ def test_metastore_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -10878,8 +10880,9 @@ def test_create_catalog_rest_bad_request(request_type=metastore.CreateCatalogReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11016,17 +11019,20 @@ def test_create_catalog_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_create_catalog" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_create_catalog_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_create_catalog" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_create_catalog" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_create_catalog_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_create_catalog" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11075,8 +11081,9 @@ def test_delete_catalog_rest_bad_request(request_type=metastore.DeleteCatalogReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11139,17 +11146,20 @@ def test_delete_catalog_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_delete_catalog" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_delete_catalog_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_delete_catalog" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_delete_catalog" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_delete_catalog_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_delete_catalog" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11198,8 +11208,9 @@ def test_get_catalog_rest_bad_request(request_type=metastore.GetCatalogRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11262,17 +11273,19 @@ def test_get_catalog_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_get_catalog" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_get_catalog_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_get_catalog" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_get_catalog" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_get_catalog_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_get_catalog" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11321,8 +11334,9 @@ def test_list_catalogs_rest_bad_request(request_type=metastore.ListCatalogsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11385,17 +11399,20 @@ def test_list_catalogs_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_list_catalogs" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_list_catalogs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_list_catalogs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_list_catalogs" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_list_catalogs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_list_catalogs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11446,8 +11463,9 @@ def test_create_database_rest_bad_request(request_type=metastore.CreateDatabaseR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11588,17 +11606,20 @@ def test_create_database_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_create_database" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_create_database_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_create_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_create_database" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_create_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_create_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11651,8 +11672,9 @@ def test_delete_database_rest_bad_request(request_type=metastore.DeleteDatabaseR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11719,17 +11741,20 @@ def test_delete_database_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_delete_database" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_delete_database_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_delete_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_delete_database" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_delete_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_delete_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11784,8 +11809,9 @@ def test_update_database_rest_bad_request(request_type=metastore.UpdateDatabaseR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11930,17 +11956,20 @@ def test_update_database_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_update_database" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_update_database_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_update_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_update_database" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_update_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_update_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11993,8 +12022,9 @@ def test_get_database_rest_bad_request(request_type=metastore.GetDatabaseRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12061,17 +12091,20 @@ def test_get_database_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_get_database" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_get_database_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_get_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_get_database" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_get_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_get_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12120,8 +12153,9 @@ def test_list_databases_rest_bad_request(request_type=metastore.ListDatabasesReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12184,17 +12218,20 @@ def test_list_databases_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_list_databases" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_list_databases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_list_databases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_list_databases" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_list_databases_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_list_databases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12247,8 +12284,9 @@ def test_create_table_rest_bad_request(request_type=metastore.CreateTableRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12403,17 +12441,20 @@ def test_create_table_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_create_table" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_create_table_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_create_table" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_create_table" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_create_table_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_create_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12464,8 +12505,9 @@ def test_delete_table_rest_bad_request(request_type=metastore.DeleteTableRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12534,17 +12576,20 @@ def test_delete_table_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_delete_table" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_delete_table_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_delete_table" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_delete_table" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_delete_table_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_delete_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12597,8 +12642,9 @@ def test_update_table_rest_bad_request(request_type=metastore.UpdateTableRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12755,17 +12801,20 @@ def test_update_table_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_update_table" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_update_table_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_update_table" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_update_table" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_update_table_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_update_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12816,8 +12865,9 @@ def test_rename_table_rest_bad_request(request_type=metastore.RenameTableRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12886,17 +12936,20 @@ def test_rename_table_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_rename_table" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_rename_table_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_rename_table" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_rename_table" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_rename_table_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_rename_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12947,8 +13000,9 @@ def test_get_table_rest_bad_request(request_type=metastore.GetTableRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13017,17 +13071,19 @@ def test_get_table_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_get_table" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_get_table_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_get_table" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_get_table" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_get_table_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_get_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13078,8 +13134,9 @@ def test_list_tables_rest_bad_request(request_type=metastore.ListTablesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13144,17 +13201,19 @@ def test_list_tables_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_list_tables" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_list_tables_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_list_tables" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_list_tables" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_list_tables_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_list_tables" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13570,11 +13629,14 @@ def test_metastore_service_base_transport(): def test_metastore_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_biglake_v1.services.metastore_service.transports.MetastoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_biglake_v1.services.metastore_service.transports.MetastoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetastoreServiceTransport( @@ -13594,9 +13656,12 @@ def test_metastore_service_base_transport_with_credentials_file(): def test_metastore_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_biglake_v1.services.metastore_service.transports.MetastoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_biglake_v1.services.metastore_service.transports.MetastoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetastoreServiceTransport() @@ -13674,11 +13739,12 @@ def test_metastore_service_transport_auth_gdch_credentials(transport_class): def test_metastore_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1alpha1/test_metastore_service.py b/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1alpha1/test_metastore_service.py index d224d91a95cd..ad409fe78c63 100644 --- a/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1alpha1/test_metastore_service.py +++ b/packages/google-cloud-bigquery-biglake/tests/unit/gapic/bigquery_biglake_v1alpha1/test_metastore_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.bigquery_biglake_v1alpha1.services.metastore_service import ( MetastoreServiceAsyncClient, @@ -972,10 +977,9 @@ def test_metastore_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1020,10 +1024,9 @@ def test_metastore_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1062,9 @@ def test_metastore_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1310,13 +1312,13 @@ def test_metastore_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -13363,8 +13365,9 @@ def test_create_catalog_rest_bad_request(request_type=metastore.CreateCatalogReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13501,17 +13504,20 @@ def test_create_catalog_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_create_catalog" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_create_catalog_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_create_catalog" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_create_catalog" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_create_catalog_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_create_catalog" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13560,8 +13566,9 @@ def test_delete_catalog_rest_bad_request(request_type=metastore.DeleteCatalogReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13624,17 +13631,20 @@ def test_delete_catalog_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_delete_catalog" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_delete_catalog_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_delete_catalog" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_delete_catalog" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_delete_catalog_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_delete_catalog" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13683,8 +13693,9 @@ def test_get_catalog_rest_bad_request(request_type=metastore.GetCatalogRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13747,17 +13758,19 @@ def test_get_catalog_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_get_catalog" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_get_catalog_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_get_catalog" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_get_catalog" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_get_catalog_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_get_catalog" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13806,8 +13819,9 @@ def test_list_catalogs_rest_bad_request(request_type=metastore.ListCatalogsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13870,17 +13884,20 @@ def test_list_catalogs_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_list_catalogs" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_list_catalogs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_list_catalogs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_list_catalogs" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_list_catalogs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_list_catalogs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13931,8 +13948,9 @@ def test_create_database_rest_bad_request(request_type=metastore.CreateDatabaseR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14073,17 +14091,20 @@ def test_create_database_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_create_database" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_create_database_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_create_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_create_database" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_create_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_create_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14136,8 +14157,9 @@ def test_delete_database_rest_bad_request(request_type=metastore.DeleteDatabaseR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14204,17 +14226,20 @@ def test_delete_database_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_delete_database" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_delete_database_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_delete_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_delete_database" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_delete_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_delete_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14269,8 +14294,9 @@ def test_update_database_rest_bad_request(request_type=metastore.UpdateDatabaseR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14415,17 +14441,20 @@ def test_update_database_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_update_database" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_update_database_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_update_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_update_database" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_update_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_update_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14478,8 +14507,9 @@ def test_get_database_rest_bad_request(request_type=metastore.GetDatabaseRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14546,17 +14576,20 @@ def test_get_database_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_get_database" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_get_database_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_get_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_get_database" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_get_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_get_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14605,8 +14638,9 @@ def test_list_databases_rest_bad_request(request_type=metastore.ListDatabasesReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14669,17 +14703,20 @@ def test_list_databases_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_list_databases" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_list_databases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_list_databases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_list_databases" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_list_databases_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_list_databases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14732,8 +14769,9 @@ def test_create_table_rest_bad_request(request_type=metastore.CreateTableRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14888,17 +14926,20 @@ def test_create_table_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_create_table" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_create_table_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_create_table" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_create_table" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_create_table_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_create_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14949,8 +14990,9 @@ def test_delete_table_rest_bad_request(request_type=metastore.DeleteTableRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15019,17 +15061,20 @@ def test_delete_table_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_delete_table" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_delete_table_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_delete_table" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_delete_table" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_delete_table_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_delete_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15082,8 +15127,9 @@ def test_update_table_rest_bad_request(request_type=metastore.UpdateTableRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15240,17 +15286,20 @@ def test_update_table_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_update_table" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_update_table_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_update_table" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_update_table" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_update_table_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_update_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15301,8 +15350,9 @@ def test_rename_table_rest_bad_request(request_type=metastore.RenameTableRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15371,17 +15421,20 @@ def test_rename_table_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_rename_table" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_rename_table_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_rename_table" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_rename_table" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, + "post_rename_table_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_rename_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15432,8 +15485,9 @@ def test_get_table_rest_bad_request(request_type=metastore.GetTableRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15502,17 +15556,19 @@ def test_get_table_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_get_table" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_get_table_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_get_table" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_get_table" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_get_table_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_get_table" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15563,8 +15619,9 @@ def test_list_tables_rest_bad_request(request_type=metastore.ListTablesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15629,17 +15686,19 @@ def test_list_tables_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_list_tables" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_list_tables_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_list_tables" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_list_tables" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_list_tables_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_list_tables" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15692,8 +15751,9 @@ def test_create_lock_rest_bad_request(request_type=metastore.CreateLockRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15837,17 +15897,19 @@ def test_create_lock_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_create_lock" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_create_lock_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_create_lock" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_create_lock" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_create_lock_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_create_lock" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15898,8 +15960,9 @@ def test_delete_lock_rest_bad_request(request_type=metastore.DeleteLockRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15958,13 +16021,13 @@ def test_delete_lock_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "pre_delete_lock" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_delete_lock" + ) as pre, + ): pre.assert_not_called() pb_message = metastore.DeleteLockRequest.pb(metastore.DeleteLockRequest()) transcode.return_value = { @@ -16007,8 +16070,9 @@ def test_check_lock_rest_bad_request(request_type=metastore.CheckLockRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16078,17 +16142,19 @@ def test_check_lock_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_check_lock" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_check_lock_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_check_lock" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_check_lock" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_check_lock_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_check_lock" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16139,8 +16205,9 @@ def test_list_locks_rest_bad_request(request_type=metastore.ListLocksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16205,17 +16272,19 @@ def test_list_locks_rest_interceptors(null_interceptor): ) client = MetastoreServiceClient(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.MetastoreServiceRestInterceptor, "post_list_locks" - ) as post, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "post_list_locks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetastoreServiceRestInterceptor, "pre_list_locks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_list_locks" + ) as post, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "post_list_locks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MetastoreServiceRestInterceptor, "pre_list_locks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16715,11 +16784,14 @@ def test_metastore_service_base_transport(): def test_metastore_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_biglake_v1alpha1.services.metastore_service.transports.MetastoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_biglake_v1alpha1.services.metastore_service.transports.MetastoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetastoreServiceTransport( @@ -16739,9 +16811,12 @@ def test_metastore_service_base_transport_with_credentials_file(): def test_metastore_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_biglake_v1alpha1.services.metastore_service.transports.MetastoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_biglake_v1alpha1.services.metastore_service.transports.MetastoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetastoreServiceTransport() @@ -16819,11 +16894,12 @@ def test_metastore_service_transport_auth_gdch_credentials(transport_class): def test_metastore_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-connection/docs/conf.py b/packages/google-cloud-bigquery-connection/docs/conf.py index 060e3fcd130b..22728baf2c33 100644 --- a/packages/google-cloud-bigquery-connection/docs/conf.py +++ b/packages/google-cloud-bigquery-connection/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-bigquery-connection documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/__init__.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/__init__.py index 7d65235e7746..a22c3c9ad153 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/__init__.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.connection_service import ( ConnectionServiceAsyncClient, ConnectionServiceClient, diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/async_client.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/async_client.py index 72e51c0f51c4..2cf16120eb48 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/async_client.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_connection_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.bigquery_connection_v1.services.connection_service import pagers -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from .client import ConnectionServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ConnectionServiceTransport @@ -122,7 +122,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConnectionServiceAsyncClient: The constructed client. """ - return ConnectionServiceClient.from_service_account_info.__func__(ConnectionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConnectionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConnectionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +139,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConnectionServiceAsyncClient: The constructed client. """ - return ConnectionServiceClient.from_service_account_file.__func__(ConnectionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConnectionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConnectionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -925,7 +927,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_connection_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -1067,7 +1069,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_connection_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -1213,7 +1215,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_connection_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/client.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/client.py index 0a70601cf4d5..dbcf343836f6 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/client.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_connection_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.bigquery_connection_v1.services.connection_service import pagers -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from .transports.base import DEFAULT_CLIENT_INFO, ConnectionServiceTransport from .transports.grpc import ConnectionServiceGrpcTransport @@ -83,9 +83,7 @@ class ConnectionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConnectionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConnectionServiceTransport]] _transport_registry["grpc"] = ConnectionServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConnectionServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConnectionServiceRestTransport @@ -675,11 +673,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConnectionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConnectionServiceClient._read_environment_variables() + ) self._client_cert_source = ConnectionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -714,8 +710,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConnectionServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1394,7 +1389,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_connection_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -1537,7 +1532,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_connection_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -1684,7 +1679,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_connection_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/pagers.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/pagers.py index 442938ce3eae..83abb6d65f58 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/pagers.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/base.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/base.py index 32a2293b384e..d2bcabe1a341 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/base.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_connection_v1 import gapic_version as package_version -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc.py index 2eb70d66eeb8..b098fded95d8 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from .base import DEFAULT_CLIENT_INFO, ConnectionServiceTransport diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc_asyncio.py index b77171b37134..1b11230697c4 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc_asyncio.py @@ -17,25 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from .base import DEFAULT_CLIENT_INFO, ConnectionServiceTransport from .grpc import ConnectionServiceGrpcTransport diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest.py index 59a2cd09adba..3d7592561057 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest.py @@ -16,23 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConnectionServiceRestTransport @@ -642,9 +642,7 @@ def __call__( """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseCreateConnection._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseCreateConnection._get_http_options() request, metadata = self._interceptor.pre_create_connection( request, metadata @@ -791,9 +789,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseDeleteConnection._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseDeleteConnection._get_http_options() request, metadata = self._interceptor.pre_delete_connection( request, metadata @@ -815,7 +811,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -908,9 +904,7 @@ def __call__( """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseGetConnection._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseGetConnection._get_http_options() request, metadata = self._interceptor.pre_get_connection(request, metadata) transcoded_request = _BaseConnectionServiceRestTransport._BaseGetConnection._get_transcoded_request( @@ -1128,9 +1122,7 @@ def __call__( """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseConnectionServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1281,9 +1273,7 @@ def __call__( """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseListConnections._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseListConnections._get_http_options() request, metadata = self._interceptor.pre_list_connections( request, metadata @@ -1505,9 +1495,7 @@ def __call__( """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseConnectionServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1656,9 +1644,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1813,9 +1799,7 @@ def __call__( """ - http_options = ( - _BaseConnectionServiceRestTransport._BaseUpdateConnection._get_http_options() - ) + http_options = _BaseConnectionServiceRestTransport._BaseUpdateConnection._get_http_options() request, metadata = self._interceptor.pre_update_connection( request, metadata diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest_base.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest_base.py index 295de8b92683..3f2a157a9033 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/services/connection_service/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from .base import DEFAULT_CLIENT_INFO, ConnectionServiceTransport diff --git a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/types/connection.py b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/types/connection.py index 431f020750f7..18530974c603 100644 --- a/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/types/connection.py +++ b/packages/google-cloud-bigquery-connection/google/cloud/bigquery_connection_v1/types/connection.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -359,6 +359,7 @@ class DatabaseType(proto.Enum): MYSQL (2): Cloud SQL for MySQL. """ + DATABASE_TYPE_UNSPECIFIED = 0 POSTGRES = 1 MYSQL = 2 diff --git a/packages/google-cloud-bigquery-connection/noxfile.py b/packages/google-cloud-bigquery-connection/noxfile.py index 65946dd1c7e6..37ed8d288d30 100644 --- a/packages/google-cloud-bigquery-connection/noxfile.py +++ b/packages/google-cloud-bigquery-connection/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_async.py index ed07eb7f2f0b..1597986573a5 100644 --- a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-connection -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigqueryconnection_v1_generated_ConnectionService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_connection_v1 diff --git a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_sync.py index 85cbe37980a7..c33f2a8cfe35 100644 --- a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-connection -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigqueryconnection_v1_generated_ConnectionService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_connection_v1 diff --git a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_async.py index 11be0b124233..3be1e576575c 100644 --- a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-connection -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigqueryconnection_v1_generated_ConnectionService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_connection_v1 diff --git a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_sync.py index bc9881693e9b..2ca01965d3b1 100644 --- a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-connection -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigqueryconnection_v1_generated_ConnectionService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_connection_v1 diff --git a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_async.py index fc00dcb0eeb6..c473009835cb 100644 --- a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-connection -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigqueryconnection_v1_generated_ConnectionService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_connection_v1 diff --git a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_sync.py index bdedc54d4bd6..3f9222ebe9db 100644 --- a/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-connection/samples/generated_samples/bigqueryconnection_v1_generated_connection_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-connection -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigqueryconnection_v1_generated_ConnectionService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_connection_v1 diff --git a/packages/google-cloud-bigquery-connection/tests/unit/gapic/bigquery_connection_v1/test_connection_service.py b/packages/google-cloud-bigquery-connection/tests/unit/gapic/bigquery_connection_v1/test_connection_service.py index 60733859bc32..114888edef56 100644 --- a/packages/google-cloud-bigquery-connection/tests/unit/gapic/bigquery_connection_v1/test_connection_service.py +++ b/packages/google-cloud-bigquery-connection/tests/unit/gapic/bigquery_connection_v1/test_connection_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.bigquery_connection_v1.services.connection_service import ( ConnectionServiceAsyncClient, @@ -63,8 +68,8 @@ pagers, transports, ) -from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection from google.cloud.bigquery_connection_v1.types import connection +from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -984,10 +989,9 @@ def test_connection_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1036,9 @@ def test_connection_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1071,10 +1074,9 @@ def test_connection_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1322,13 +1324,13 @@ def test_connection_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1454,9 +1456,9 @@ def test_create_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -2165,9 +2167,9 @@ def test_list_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -2698,9 +2700,9 @@ def test_update_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -3065,9 +3067,9 @@ def test_delete_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -4078,9 +4080,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4379,9 +4381,9 @@ def test_create_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -4754,9 +4756,9 @@ def test_list_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -5030,9 +5032,9 @@ def test_update_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -5228,9 +5230,9 @@ def test_delete_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -5769,9 +5771,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6492,8 +6494,9 @@ def test_create_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6691,18 +6694,20 @@ def test_create_connection_rest_interceptors(null_interceptor): ) client = ConnectionServiceClient(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.ConnectionServiceRestInterceptor, "post_create_connection" - ) as post, mock.patch.object( - transports.ConnectionServiceRestInterceptor, - "post_create_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConnectionServiceRestInterceptor, "pre_create_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "post_create_connection" + ) as post, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, + "post_create_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "pre_create_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6753,8 +6758,9 @@ def test_get_connection_rest_bad_request(request_type=connection.GetConnectionRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6827,17 +6833,20 @@ def test_get_connection_rest_interceptors(null_interceptor): ) client = ConnectionServiceClient(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.ConnectionServiceRestInterceptor, "post_get_connection" - ) as post, mock.patch.object( - transports.ConnectionServiceRestInterceptor, "post_get_connection_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConnectionServiceRestInterceptor, "pre_get_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "post_get_connection" + ) as post, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, + "post_get_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "pre_get_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6890,8 +6899,9 @@ def test_list_connections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6954,18 +6964,20 @@ def test_list_connections_rest_interceptors(null_interceptor): ) client = ConnectionServiceClient(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.ConnectionServiceRestInterceptor, "post_list_connections" - ) as post, mock.patch.object( - transports.ConnectionServiceRestInterceptor, - "post_list_connections_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConnectionServiceRestInterceptor, "pre_list_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "post_list_connections" + ) as post, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, + "post_list_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "pre_list_connections" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7020,8 +7032,9 @@ def test_update_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7219,18 +7232,20 @@ def test_update_connection_rest_interceptors(null_interceptor): ) client = ConnectionServiceClient(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.ConnectionServiceRestInterceptor, "post_update_connection" - ) as post, mock.patch.object( - transports.ConnectionServiceRestInterceptor, - "post_update_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConnectionServiceRestInterceptor, "pre_update_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "post_update_connection" + ) as post, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, + "post_update_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "pre_update_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7283,8 +7298,9 @@ def test_delete_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7341,13 +7357,13 @@ def test_delete_connection_rest_interceptors(null_interceptor): ) client = ConnectionServiceClient(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.ConnectionServiceRestInterceptor, "pre_delete_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "pre_delete_connection" + ) as pre, + ): pre.assert_not_called() pb_message = connection.DeleteConnectionRequest.pb( connection.DeleteConnectionRequest() @@ -7394,8 +7410,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7459,17 +7476,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ConnectionServiceClient(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.ConnectionServiceRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ConnectionServiceRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConnectionServiceRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7522,8 +7542,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7587,17 +7608,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ConnectionServiceClient(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.ConnectionServiceRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ConnectionServiceRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConnectionServiceRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7650,8 +7674,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7713,18 +7738,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ConnectionServiceClient(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.ConnectionServiceRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ConnectionServiceRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConnectionServiceRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConnectionServiceRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8004,11 +8031,14 @@ def test_connection_service_base_transport(): def test_connection_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_connection_v1.services.connection_service.transports.ConnectionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_connection_v1.services.connection_service.transports.ConnectionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConnectionServiceTransport( @@ -8028,9 +8058,12 @@ def test_connection_service_base_transport_with_credentials_file(): def test_connection_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_connection_v1.services.connection_service.transports.ConnectionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_connection_v1.services.connection_service.transports.ConnectionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConnectionServiceTransport() @@ -8108,11 +8141,12 @@ def test_connection_service_transport_auth_gdch_credentials(transport_class): def test_connection_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-data-exchange/docs/conf.py b/packages/google-cloud-bigquery-data-exchange/docs/conf.py index 27e4671f4528..507c8f51d192 100644 --- a/packages/google-cloud-bigquery-data-exchange/docs/conf.py +++ b/packages/google-cloud-bigquery-data-exchange/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-bigquery-data-exchange documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/__init__.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/__init__.py index 6dcb3dde344f..286c97e34d23 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/__init__.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.analytics_hub_service import ( AnalyticsHubServiceAsyncClient, AnalyticsHubServiceClient, diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/async_client.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/async_client.py index d0142ac5d4ca..2c442e45114e 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/async_client.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_data_exchange_v1beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.bigquery_data_exchange_v1beta1.services.analytics_hub_service import ( pagers, @@ -133,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AnalyticsHubServiceAsyncClient: The constructed client. """ - return AnalyticsHubServiceClient.from_service_account_info.__func__(AnalyticsHubServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AnalyticsHubServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AnalyticsHubServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AnalyticsHubServiceAsyncClient: The constructed client. """ - return AnalyticsHubServiceClient.from_service_account_file.__func__(AnalyticsHubServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AnalyticsHubServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AnalyticsHubServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -187,7 +189,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AnalyticsHubServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AnalyticsHubServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AnalyticsHubServiceTransport: @@ -1778,7 +1782,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_data_exchange_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -1894,7 +1898,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_data_exchange_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -2010,7 +2014,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_data_exchange_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/client.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/client.py index ad5b5156c948..255fa207cb97 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/client.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_data_exchange_v1beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.bigquery_data_exchange_v1beta1.services.analytics_hub_service import ( pagers, @@ -84,9 +84,7 @@ class AnalyticsHubServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AnalyticsHubServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsHubServiceTransport]] _transport_registry["grpc"] = AnalyticsHubServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsHubServiceGrpcAsyncIOTransport @@ -677,11 +675,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AnalyticsHubServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AnalyticsHubServiceClient._read_environment_variables() + ) self._client_cert_source = AnalyticsHubServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -716,8 +712,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AnalyticsHubServiceTransport, transport) self._api_endpoint = self._transport.host @@ -2217,7 +2212,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_data_exchange_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -2332,7 +2327,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_data_exchange_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -2447,7 +2442,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_data_exchange_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/pagers.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/pagers.py index 551718929727..6a7c0c5b8d08 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/pagers.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/__init__.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/__init__.py index d97066cc7aaf..2be520d8722d 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import AnalyticsHubServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AnalyticsHubServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AnalyticsHubServiceTransport]] _transport_registry["grpc"] = AnalyticsHubServiceGrpcTransport _transport_registry["grpc_asyncio"] = AnalyticsHubServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/base.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/base.py index cce4699cf89b..0bc3b48fa999 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/base.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/base.py @@ -17,17 +17,17 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_data_exchange_v1beta1 import gapic_version as package_version from google.cloud.bigquery_data_exchange_v1beta1.types import dataexchange diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc.py index 37b86433902e..363dba685ed7 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc.py @@ -16,21 +16,21 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.bigquery_data_exchange_v1beta1.types import dataexchange diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc_asyncio.py index 4d7f3f7ae808..6789d617eb18 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/services/analytics_hub_service/transports/grpc_asyncio.py @@ -17,23 +17,23 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_data_exchange_v1beta1.types import dataexchange diff --git a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/types/dataexchange.py b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/types/dataexchange.py index 6fd2b3bf7e44..224bc6f98e65 100644 --- a/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/types/dataexchange.py +++ b/packages/google-cloud-bigquery-data-exchange/google/cloud/bigquery_data_exchange_v1beta1/types/dataexchange.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -320,6 +320,7 @@ class State(proto.Enum): dataexchange.listings.subscribe permission can subscribe to this listing. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 @@ -368,6 +369,7 @@ class Category(proto.Enum): CATEGORY_TRAVEL_AND_TOURISM (19): No description available. """ + CATEGORY_UNSPECIFIED = 0 CATEGORY_OTHERS = 1 CATEGORY_ADVERTISING_AND_MARKETING = 2 diff --git a/packages/google-cloud-bigquery-data-exchange/noxfile.py b/packages/google-cloud-bigquery-data-exchange/noxfile.py index fb36003e1b27..1f77510236a7 100644 --- a/packages/google-cloud-bigquery-data-exchange/noxfile.py +++ b/packages/google-cloud-bigquery-data-exchange/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_async.py index 6c09b31047db..8582cd75e789 100644 --- a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-data-exchange -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START analyticshub_v1beta1_generated_AnalyticsHubService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_data_exchange_v1beta1 diff --git a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_sync.py index 4ddabc084878..01a97bb23b74 100644 --- a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-data-exchange -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START analyticshub_v1beta1_generated_AnalyticsHubService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_data_exchange_v1beta1 diff --git a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_async.py index 4ea046ee7068..17ff814c0eb9 100644 --- a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-data-exchange -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START analyticshub_v1beta1_generated_AnalyticsHubService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_data_exchange_v1beta1 diff --git a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_sync.py index 9668fc08229e..be438a2b7519 100644 --- a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-data-exchange -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START analyticshub_v1beta1_generated_AnalyticsHubService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_data_exchange_v1beta1 diff --git a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_async.py index 92b6499a2bdf..3dc4265a4bf1 100644 --- a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-data-exchange -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START analyticshub_v1beta1_generated_AnalyticsHubService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_data_exchange_v1beta1 diff --git a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_sync.py index 0fcec42bd632..1aebcbafd499 100644 --- a/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-data-exchange/samples/generated_samples/analyticshub_v1beta1_generated_analytics_hub_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-data-exchange -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START analyticshub_v1beta1_generated_AnalyticsHubService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_data_exchange_v1beta1 diff --git a/packages/google-cloud-bigquery-data-exchange/tests/unit/gapic/bigquery_data_exchange_v1beta1/test_analytics_hub_service.py b/packages/google-cloud-bigquery-data-exchange/tests/unit/gapic/bigquery_data_exchange_v1beta1/test_analytics_hub_service.py index 8e9b3f26cd55..f17509500e4d 100644 --- a/packages/google-cloud-bigquery-data-exchange/tests/unit/gapic/bigquery_data_exchange_v1beta1/test_analytics_hub_service.py +++ b/packages/google-cloud-bigquery-data-exchange/tests/unit/gapic/bigquery_data_exchange_v1beta1/test_analytics_hub_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,21 +39,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.bigquery_data_exchange_v1beta1.services.analytics_hub_service import ( AnalyticsHubServiceAsyncClient, @@ -966,10 +971,9 @@ def test_analytics_hub_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1018,9 @@ def test_analytics_hub_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1053,10 +1056,9 @@ def test_analytics_hub_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1301,13 +1303,13 @@ def test_analytics_hub_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1425,9 +1427,9 @@ def test_list_data_exchanges_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_exchanges - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_exchanges] = ( + mock_rpc + ) request = {} client.list_data_exchanges(request) @@ -2525,9 +2527,9 @@ def test_get_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_exchange] = ( + mock_rpc + ) request = {} client.get_data_exchange(request) @@ -2892,9 +2894,9 @@ def test_create_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_exchange] = ( + mock_rpc + ) request = {} client.create_data_exchange(request) @@ -3263,9 +3265,9 @@ def test_update_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_exchange] = ( + mock_rpc + ) request = {} client.update_data_exchange(request) @@ -3623,9 +3625,9 @@ def test_delete_data_exchange_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_exchange - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_exchange] = ( + mock_rpc + ) request = {} client.delete_data_exchange(request) @@ -5911,9 +5913,9 @@ def test_subscribe_listing_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.subscribe_listing - ] = mock_rpc + client._transport._wrapped_methods[client._transport.subscribe_listing] = ( + mock_rpc + ) request = {} client.subscribe_listing(request) @@ -6770,9 +6772,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -7928,11 +7930,14 @@ def test_analytics_hub_service_base_transport(): def test_analytics_hub_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_data_exchange_v1beta1.services.analytics_hub_service.transports.AnalyticsHubServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_data_exchange_v1beta1.services.analytics_hub_service.transports.AnalyticsHubServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AnalyticsHubServiceTransport( @@ -7952,9 +7957,12 @@ def test_analytics_hub_service_base_transport_with_credentials_file(): def test_analytics_hub_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_data_exchange_v1beta1.services.analytics_hub_service.transports.AnalyticsHubServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_data_exchange_v1beta1.services.analytics_hub_service.transports.AnalyticsHubServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AnalyticsHubServiceTransport() @@ -8031,11 +8039,12 @@ def test_analytics_hub_service_transport_auth_gdch_credentials(transport_class): def test_analytics_hub_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-datapolicies/docs/conf.py b/packages/google-cloud-bigquery-datapolicies/docs/conf.py index 0cd5143eb43c..989838047892 100644 --- a/packages/google-cloud-bigquery-datapolicies/docs/conf.py +++ b/packages/google-cloud-bigquery-datapolicies/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-bigquery-datapolicies documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/__init__.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/__init__.py index 072cbb85997e..9e4d3cef6e83 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/__init__.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_policy_service import ( DataPolicyServiceAsyncClient, DataPolicyServiceClient, diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/async_client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/async_client.py index b76c2ab80b94..6e96bc6dd0aa 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/async_client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v1.services.data_policy_service import pagers from google.cloud.bigquery_datapolicies_v1.types import datapolicy @@ -121,7 +121,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_info.__func__(DataPolicyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataPolicyServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataPolicyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +138,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_file.__func__(DataPolicyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataPolicyServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataPolicyServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -1042,7 +1044,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -1158,7 +1160,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -1275,7 +1277,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/client.py index b4bfff3427a8..630c9b093855 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v1.services.data_policy_service import pagers from google.cloud.bigquery_datapolicies_v1.types import datapolicy @@ -82,9 +82,7 @@ class DataPolicyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataPolicyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataPolicyServiceTransport]] _transport_registry["grpc"] = DataPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataPolicyServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataPolicyServiceRestTransport @@ -632,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataPolicyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataPolicyServiceClient._read_environment_variables() + ) self._client_cert_source = DataPolicyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -671,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataPolicyServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1466,7 +1461,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -1581,7 +1576,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -1697,7 +1692,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/pagers.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/pagers.py index 36b4e74ed0b9..7a34d33d4d8c 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/pagers.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/base.py index 134bf4eb4d79..b8beac6e9a67 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v1 import gapic_version as package_version from google.cloud.bigquery_datapolicies_v1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc.py index f3910bfb7f0d..8be3e0ffe779 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_datapolicies_v1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc_asyncio.py index 578671d44d52..16fe1871c9b3 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_datapolicies_v1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest.py index bfd87d4ae215..e2139099b658 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -695,9 +695,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseCreateDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseCreateDataPolicy._get_http_options() request, metadata = self._interceptor.pre_create_data_policy( request, metadata @@ -844,9 +842,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseDeleteDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseDeleteDataPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_data_policy( request, metadata @@ -868,7 +864,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -958,9 +954,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_http_options() request, metadata = self._interceptor.pre_get_data_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_transcoded_request( @@ -1178,9 +1172,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1331,9 +1323,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseListDataPolicies._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseListDataPolicies._get_http_options() request, metadata = self._interceptor.pre_list_data_policies( request, metadata @@ -1482,9 +1472,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseRenameDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseRenameDataPolicy._get_http_options() request, metadata = self._interceptor.pre_rename_data_policy( request, metadata @@ -1709,9 +1697,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1860,9 +1846,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2014,9 +1998,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseUpdateDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseUpdateDataPolicy._get_http_options() request, metadata = self._interceptor.pre_update_data_policy( request, metadata diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest_base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest_base.py index 252a15d4f977..359b74638414 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/services/data_policy_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.bigquery_datapolicies_v1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/types/datapolicy.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/types/datapolicy.py index 2ae3755cfd6f..3b794f4dfb63 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/types/datapolicy.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1/types/datapolicy.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -260,6 +260,7 @@ class DataPolicyType(proto.Enum): Used to create a data policy for data masking. """ + DATA_POLICY_TYPE_UNSPECIFIED = 0 COLUMN_LEVEL_SECURITY_POLICY = 3 DATA_MASKING_POLICY = 2 @@ -388,6 +389,7 @@ class PredefinedExpression(proto.Enum): system variable. For more information, see the System variables reference. """ + PREDEFINED_EXPRESSION_UNSPECIFIED = 0 SHA256 = 3 ALWAYS_NULL = 5 diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/__init__.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/__init__.py index 60dcf15741bc..1b4e76aa7a8a 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/__init__.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_policy_service import ( DataPolicyServiceAsyncClient, DataPolicyServiceClient, diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/async_client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/async_client.py index a2dd85be5938..43d2513c4f1e 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/async_client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v1beta1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v1beta1.services.data_policy_service import ( pagers, @@ -123,7 +123,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_info.__func__(DataPolicyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataPolicyServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataPolicyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +140,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_file.__func__(DataPolicyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataPolicyServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataPolicyServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -924,7 +926,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -1040,7 +1042,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -1157,7 +1159,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/client.py index 0ad4ab2c9e9a..982347813a6e 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v1beta1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v1beta1.services.data_policy_service import ( pagers, @@ -83,9 +83,7 @@ class DataPolicyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataPolicyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataPolicyServiceTransport]] _transport_registry["grpc"] = DataPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataPolicyServiceGrpcAsyncIOTransport @@ -632,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataPolicyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataPolicyServiceClient._read_environment_variables() + ) self._client_cert_source = DataPolicyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -671,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataPolicyServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1349,7 +1344,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -1464,7 +1459,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -1580,7 +1575,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/pagers.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/pagers.py index c13a214b5221..acdd4ba54c16 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/pagers.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/base.py index 74b8b452c6ad..a431c68b8bd5 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v1beta1 import gapic_version as package_version from google.cloud.bigquery_datapolicies_v1beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc.py index 31d3b5107113..118ee2ad85eb 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_datapolicies_v1beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc_asyncio.py index 9ebfdf5304de..c118ecd854ef 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/services/data_policy_service/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_datapolicies_v1beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/types/datapolicy.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/types/datapolicy.py index db7d19ed804b..2d00cecc0adc 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/types/datapolicy.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v1beta1/types/datapolicy.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -224,6 +224,7 @@ class DataPolicyType(proto.Enum): Used to create a data policy for data masking. """ + DATA_POLICY_TYPE_UNSPECIFIED = 0 COLUMN_LEVEL_SECURITY_POLICY = 3 DATA_MASKING_POLICY = 2 @@ -304,6 +305,7 @@ class PredefinedExpression(proto.Enum): - STRUCT: NOT_APPLICABLE - JSON: NULL """ + PREDEFINED_EXPRESSION_UNSPECIFIED = 0 SHA256 = 3 ALWAYS_NULL = 5 diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/__init__.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/__init__.py index 674f50dad48e..39b8fc64e7be 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/__init__.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_policy_service import ( DataPolicyServiceAsyncClient, DataPolicyServiceClient, diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/async_client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/async_client.py index e24f3a8b0457..da7672d543fb 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/async_client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v2 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v2.services.data_policy_service import pagers from google.cloud.bigquery_datapolicies_v2.types import datapolicy @@ -125,7 +125,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_info.__func__(DataPolicyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataPolicyServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataPolicyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +142,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_file.__func__(DataPolicyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataPolicyServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataPolicyServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -1211,7 +1213,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v2 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -1327,7 +1329,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v2 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -1444,7 +1446,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v2 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/client.py index 39ebd51ec5a0..cb8fd1bc0203 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v2 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v2.services.data_policy_service import pagers from google.cloud.bigquery_datapolicies_v2.types import datapolicy @@ -82,9 +82,7 @@ class DataPolicyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataPolicyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataPolicyServiceTransport]] _transport_registry["grpc"] = DataPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataPolicyServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataPolicyServiceRestTransport @@ -678,11 +676,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataPolicyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataPolicyServiceClient._read_environment_variables() + ) self._client_cert_source = DataPolicyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -717,8 +713,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataPolicyServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1674,7 +1669,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v2 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -1789,7 +1784,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v2 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -1905,7 +1900,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v2 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/pagers.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/pagers.py index ecd9be589c42..c94a28399242 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/pagers.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/base.py index 6ae9d88364a4..a9ad428af1f2 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v2 import gapic_version as package_version from google.cloud.bigquery_datapolicies_v2.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc.py index b634c7a85a22..d6b1cacb8a85 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_datapolicies_v2.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc_asyncio.py index 85255f8a72c4..b954f690fc45 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_datapolicies_v2.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest.py index 070a155958b2..b21702351b82 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -900,9 +900,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseCreateDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseCreateDataPolicy._get_http_options() request, metadata = self._interceptor.pre_create_data_policy( request, metadata @@ -1049,9 +1047,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseDeleteDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseDeleteDataPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_data_policy( request, metadata @@ -1073,7 +1069,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1163,9 +1159,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_http_options() request, metadata = self._interceptor.pre_get_data_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_transcoded_request( @@ -1383,9 +1377,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1536,9 +1528,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseListDataPolicies._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseListDataPolicies._get_http_options() request, metadata = self._interceptor.pre_list_data_policies( request, metadata @@ -1687,9 +1677,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseRemoveGrantees._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseRemoveGrantees._get_http_options() request, metadata = self._interceptor.pre_remove_grantees(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseRemoveGrantees._get_transcoded_request( @@ -1912,9 +1900,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2063,9 +2049,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2217,9 +2201,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseUpdateDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseUpdateDataPolicy._get_http_options() request, metadata = self._interceptor.pre_update_data_policy( request, metadata diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest_base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest_base.py index 38b3159658e0..8d24d4a4dd85 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/services/data_policy_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.bigquery_datapolicies_v2.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/types/datapolicy.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/types/datapolicy.py index d93cc4dbb548..7af3f7b531bc 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/types/datapolicy.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2/types/datapolicy.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -351,6 +351,7 @@ class DataPolicyType(proto.Enum): GET and LIST operations for V1 data policies in V2 api. """ + DATA_POLICY_TYPE_UNSPECIFIED = 0 DATA_MASKING_POLICY = 1 RAW_DATA_ACCESS_POLICY = 2 @@ -370,6 +371,7 @@ class Version(proto.Enum): V2 (2): V2 data policy version. """ + VERSION_UNSPECIFIED = 0 V1 = 1 V2 = 2 @@ -517,6 +519,7 @@ class PredefinedExpression(proto.Enum): hash / masked result to be different for each query. Hence the name "random hash". """ + PREDEFINED_EXPRESSION_UNSPECIFIED = 0 SHA256 = 1 ALWAYS_NULL = 2 diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/__init__.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/__init__.py index df62f0d8620c..b8eb3a39ad5e 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/__init__.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_policy_service import ( DataPolicyServiceAsyncClient, DataPolicyServiceClient, diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/async_client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/async_client.py index 86e90dff9d33..6bc5e5fb12f9 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/async_client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v2beta1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v2beta1.services.data_policy_service import ( pagers, @@ -125,7 +125,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_info.__func__(DataPolicyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataPolicyServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataPolicyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +142,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataPolicyServiceAsyncClient: The constructed client. """ - return DataPolicyServiceClient.from_service_account_file.__func__(DataPolicyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataPolicyServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataPolicyServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -1211,7 +1213,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v2beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -1327,7 +1329,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v2beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -1444,7 +1446,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v2beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/client.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/client.py index 0fd847f27223..c8cdc3231e2d 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/client.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datapolicies_v2beta1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v2beta1.services.data_policy_service import ( pagers, @@ -84,9 +84,7 @@ class DataPolicyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataPolicyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataPolicyServiceTransport]] _transport_registry["grpc"] = DataPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataPolicyServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataPolicyServiceRestTransport @@ -658,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataPolicyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataPolicyServiceClient._read_environment_variables() + ) self._client_cert_source = DataPolicyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -697,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataPolicyServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1654,7 +1649,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v2beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -1769,7 +1764,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v2beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -1885,7 +1880,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_datapolicies_v2beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/pagers.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/pagers.py index a0bbc3ad8aba..6beca69a6cf7 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/pagers.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/base.py index 6ed19a787e46..b463702e0ab4 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v2beta1 import gapic_version as package_version from google.cloud.bigquery_datapolicies_v2beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc.py index a0b0a6ccc7a3..2a43b507cd50 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_datapolicies_v2beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc_asyncio.py index 50011f020279..15a97e04478c 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_datapolicies_v2beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest.py index bae1d9c8c806..245bcabdce4c 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -900,9 +900,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseCreateDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseCreateDataPolicy._get_http_options() request, metadata = self._interceptor.pre_create_data_policy( request, metadata @@ -1049,9 +1047,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseDeleteDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseDeleteDataPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_data_policy( request, metadata @@ -1073,7 +1069,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1163,9 +1159,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_http_options() request, metadata = self._interceptor.pre_get_data_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseGetDataPolicy._get_transcoded_request( @@ -1383,9 +1377,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1536,9 +1528,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseListDataPolicies._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseListDataPolicies._get_http_options() request, metadata = self._interceptor.pre_list_data_policies( request, metadata @@ -1687,9 +1677,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseRemoveGrantees._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseRemoveGrantees._get_http_options() request, metadata = self._interceptor.pre_remove_grantees(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseRemoveGrantees._get_transcoded_request( @@ -1912,9 +1900,7 @@ def __call__( """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataPolicyServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2063,9 +2049,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2217,9 +2201,7 @@ def __call__( Represents the label-policy binding. """ - http_options = ( - _BaseDataPolicyServiceRestTransport._BaseUpdateDataPolicy._get_http_options() - ) + http_options = _BaseDataPolicyServiceRestTransport._BaseUpdateDataPolicy._get_http_options() request, metadata = self._interceptor.pre_update_data_policy( request, metadata diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest_base.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest_base.py index 5b2aaa5d5911..208d33fb164e 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/services/data_policy_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.bigquery_datapolicies_v2beta1.types import datapolicy diff --git a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/types/datapolicy.py b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/types/datapolicy.py index 2dd93e8cc134..ab09949cf6fb 100644 --- a/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/types/datapolicy.py +++ b/packages/google-cloud-bigquery-datapolicies/google/cloud/bigquery_datapolicies_v2beta1/types/datapolicy.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -324,6 +324,7 @@ class DataPolicyType(proto.Enum): Used to create a data policy for raw data access. """ + DATA_POLICY_TYPE_UNSPECIFIED = 0 DATA_MASKING_POLICY = 1 RAW_DATA_ACCESS_POLICY = 2 @@ -342,6 +343,7 @@ class Version(proto.Enum): V2 (2): V2 data policy version. """ + VERSION_UNSPECIFIED = 0 V1 = 1 V2 = 2 @@ -433,6 +435,7 @@ class PredefinedExpression(proto.Enum): - STRUCT: NOT_APPLICABLE - JSON: NULL """ + PREDEFINED_EXPRESSION_UNSPECIFIED = 0 SHA256 = 1 ALWAYS_NULL = 2 diff --git a/packages/google-cloud-bigquery-datapolicies/noxfile.py b/packages/google-cloud-bigquery-datapolicies/noxfile.py index 42d398433113..8a2a750a5da0 100644 --- a/packages/google-cloud-bigquery-datapolicies/noxfile.py +++ b/packages/google-cloud-bigquery-datapolicies/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_async.py index cd44234819f4..66ec9f92b129 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1_generated_DataPolicyService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_sync.py index 7bb5bc0216c4..3a669686bac2 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1_generated_DataPolicyService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_async.py index bdda456c3276..1268cd521d89 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1_generated_DataPolicyService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_sync.py index 0ce30278a4d2..0594916ea20f 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1_generated_DataPolicyService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_async.py index b53290e24f74..e55daf5ac3d0 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1_generated_DataPolicyService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_sync.py index 473cf546df3d..87cfc1c66baf 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1_generated_data_policy_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1_generated_DataPolicyService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_async.py index 724307b90fc3..a49d65de20fd 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1beta1_generated_DataPolicyService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_sync.py index 71594a941606..ecab0065a1b4 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1beta1_generated_DataPolicyService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_async.py index b5a036513a22..4b0ed461a800 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1beta1_generated_DataPolicyService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_sync.py index 571ea1760a4b..9d8d76a9f628 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1beta1_generated_DataPolicyService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_async.py index ae6c17e9f245..0040262abd43 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1beta1_generated_DataPolicyService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_sync.py index d2e65787a0d4..511851113f4b 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v1beta1_generated_data_policy_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v1beta1_generated_DataPolicyService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v1beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_async.py index 1d18992890b9..66b32c73fda1 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2_generated_DataPolicyService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_sync.py index 5e1fae842f51..c24e722be1b6 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2_generated_DataPolicyService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_async.py index 9f9b011b3932..425528fe7132 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2_generated_DataPolicyService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_sync.py index fcf16f55358e..63cce6596fea 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2_generated_DataPolicyService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_async.py index 1dcc117fbf76..34a252a9eb10 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2_generated_DataPolicyService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_sync.py index feaa0f8f78f6..64f74a3836cf 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2_generated_data_policy_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2_generated_DataPolicyService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_async.py index 39971d17a710..4a07f8ddac62 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2beta1_generated_DataPolicyService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_sync.py index ec726d55b7f2..e16feca4d0dd 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2beta1_generated_DataPolicyService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_async.py index 935515e595ea..6708fd721e2a 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2beta1_generated_DataPolicyService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_sync.py index ab52a288a105..6d05f4697f39 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2beta1_generated_DataPolicyService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_async.py index be5ed149bcec..c400dc7c6ede 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2beta1_generated_DataPolicyService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_sync.py index 80907caf4575..227d57733ff7 100644 --- a/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-datapolicies/samples/generated_samples/bigquerydatapolicy_v2beta1_generated_data_policy_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-datapolicies -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigquerydatapolicy_v2beta1_generated_DataPolicyService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_datapolicies_v2beta1 diff --git a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1/test_data_policy_service.py b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1/test_data_policy_service.py index f47182b84004..596b160d5165 100644 --- a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1/test_data_policy_service.py +++ b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1/test_data_policy_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v1.services.data_policy_service import ( DataPolicyServiceAsyncClient, @@ -983,10 +988,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1035,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1070,10 +1073,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1321,13 +1323,13 @@ def test_data_policy_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1451,9 +1453,9 @@ def test_create_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -1813,9 +1815,9 @@ def test_update_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -2181,9 +2183,9 @@ def test_rename_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rename_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rename_data_policy] = ( + mock_rpc + ) request = {} client.rename_data_policy(request) @@ -2536,9 +2538,9 @@ def test_delete_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -3210,9 +3212,9 @@ def test_list_data_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -4274,9 +4276,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4481,9 +4483,9 @@ def test_create_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -4674,9 +4676,9 @@ def test_update_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -4860,9 +4862,9 @@ def test_rename_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rename_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rename_data_policy] = ( + mock_rpc + ) request = {} client.rename_data_policy(request) @@ -5059,9 +5061,9 @@ def test_delete_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -5418,9 +5420,9 @@ def test_list_data_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -5926,9 +5928,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6638,8 +6640,9 @@ def test_create_data_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6784,18 +6787,20 @@ def test_create_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_create_data_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_create_data_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_create_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_create_data_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_create_data_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_create_data_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6852,8 +6857,9 @@ def test_update_data_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7002,18 +7008,20 @@ def test_update_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_update_data_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_update_data_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_update_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_update_data_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_update_data_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_update_data_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7066,8 +7074,9 @@ def test_rename_data_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7138,18 +7147,20 @@ def test_rename_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_rename_data_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_rename_data_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_rename_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_rename_data_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_rename_data_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_rename_data_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7202,8 +7213,9 @@ def test_delete_data_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7260,13 +7272,13 @@ def test_delete_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "pre_delete_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_delete_data_policy" + ) as pre, + ): pre.assert_not_called() pb_message = datapolicy.DeleteDataPolicyRequest.pb( datapolicy.DeleteDataPolicyRequest() @@ -7309,8 +7321,9 @@ def test_get_data_policy_rest_bad_request(request_type=datapolicy.GetDataPolicyR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7381,18 +7394,20 @@ def test_get_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_get_data_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_get_data_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_get_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_get_data_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_get_data_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_get_data_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7445,8 +7460,9 @@ def test_list_data_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7509,18 +7525,20 @@ def test_list_data_policies_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_list_data_policies" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_list_data_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_list_data_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_list_data_policies" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_list_data_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_list_data_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7580,8 +7598,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7645,17 +7664,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7708,8 +7730,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7773,17 +7796,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7836,8 +7862,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7899,18 +7926,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8215,11 +8244,14 @@ def test_data_policy_service_base_transport(): def test_data_policy_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_datapolicies_v1.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_datapolicies_v1.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataPolicyServiceTransport( @@ -8239,9 +8271,12 @@ def test_data_policy_service_base_transport_with_credentials_file(): def test_data_policy_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_datapolicies_v1.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_datapolicies_v1.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataPolicyServiceTransport() @@ -8319,11 +8354,12 @@ def test_data_policy_service_transport_auth_gdch_credentials(transport_class): def test_data_policy_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1beta1/test_data_policy_service.py b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1beta1/test_data_policy_service.py index 4c5ddea396f3..8f110f1e9e97 100644 --- a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1beta1/test_data_policy_service.py +++ b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v1beta1/test_data_policy_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,19 +39,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v1beta1.services.data_policy_service import ( DataPolicyServiceAsyncClient, @@ -954,10 +959,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1002,10 +1006,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1044,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1285,13 +1287,13 @@ def test_data_policy_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1415,9 +1417,9 @@ def test_create_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -1777,9 +1779,9 @@ def test_update_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -2132,9 +2134,9 @@ def test_delete_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -2804,9 +2806,9 @@ def test_list_data_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -3868,9 +3870,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4639,11 +4641,14 @@ def test_data_policy_service_base_transport(): def test_data_policy_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_datapolicies_v1beta1.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_datapolicies_v1beta1.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataPolicyServiceTransport( @@ -4663,9 +4668,12 @@ def test_data_policy_service_base_transport_with_credentials_file(): def test_data_policy_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_datapolicies_v1beta1.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_datapolicies_v1beta1.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataPolicyServiceTransport() @@ -4742,11 +4750,12 @@ def test_data_policy_service_transport_auth_gdch_credentials(transport_class): def test_data_policy_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2/test_data_policy_service.py b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2/test_data_policy_service.py index 984a6e012ee6..c5a9fdbda53a 100644 --- a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2/test_data_policy_service.py +++ b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2/test_data_policy_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v2.services.data_policy_service import ( DataPolicyServiceAsyncClient, @@ -983,10 +988,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1035,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1070,10 +1073,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1321,13 +1323,13 @@ def test_data_policy_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1460,9 +1462,9 @@ def test_create_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -2597,9 +2599,9 @@ def test_update_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -2984,9 +2986,9 @@ def test_delete_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -3673,9 +3675,9 @@ def test_list_data_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -4737,9 +4739,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4944,9 +4946,9 @@ def test_create_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -5540,9 +5542,9 @@ def test_update_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -5747,9 +5749,9 @@ def test_delete_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -6106,9 +6108,9 @@ def test_list_data_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -6614,9 +6616,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -7392,8 +7394,9 @@ def test_create_data_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7471,18 +7474,20 @@ def test_create_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_create_data_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_create_data_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_create_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_create_data_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_create_data_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_create_data_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7535,8 +7540,9 @@ def test_add_grantees_rest_bad_request(request_type=datapolicy.AddGranteesReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7616,17 +7622,20 @@ def test_add_grantees_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_add_grantees" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "post_add_grantees_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_add_grantees" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_add_grantees" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_add_grantees_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_add_grantees" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7679,8 +7688,9 @@ def test_remove_grantees_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7760,18 +7770,20 @@ def test_remove_grantees_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_remove_grantees" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_remove_grantees_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_remove_grantees" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_remove_grantees" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_remove_grantees_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_remove_grantees" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7828,8 +7840,9 @@ def test_update_data_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7988,18 +8001,20 @@ def test_update_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_update_data_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_update_data_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_update_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_update_data_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_update_data_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_update_data_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8052,8 +8067,9 @@ def test_delete_data_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8110,13 +8126,13 @@ def test_delete_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "pre_delete_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_delete_data_policy" + ) as pre, + ): pre.assert_not_called() pb_message = datapolicy.DeleteDataPolicyRequest.pb( datapolicy.DeleteDataPolicyRequest() @@ -8159,8 +8175,9 @@ def test_get_data_policy_rest_bad_request(request_type=datapolicy.GetDataPolicyR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8238,18 +8255,20 @@ def test_get_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_get_data_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_get_data_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_get_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_get_data_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_get_data_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_get_data_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8302,8 +8321,9 @@ def test_list_data_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8366,18 +8386,20 @@ def test_list_data_policies_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_list_data_policies" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_list_data_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_list_data_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_list_data_policies" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_list_data_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_list_data_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8437,8 +8459,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8502,17 +8525,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8565,8 +8591,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8630,17 +8657,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8693,8 +8723,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8756,18 +8787,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9091,11 +9124,14 @@ def test_data_policy_service_base_transport(): def test_data_policy_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_datapolicies_v2.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_datapolicies_v2.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataPolicyServiceTransport( @@ -9115,9 +9151,12 @@ def test_data_policy_service_base_transport_with_credentials_file(): def test_data_policy_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_datapolicies_v2.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_datapolicies_v2.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataPolicyServiceTransport() @@ -9195,11 +9234,12 @@ def test_data_policy_service_transport_auth_gdch_credentials(transport_class): def test_data_policy_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2beta1/test_data_policy_service.py b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2beta1/test_data_policy_service.py index e2bd8d39b630..5674c1ab5047 100644 --- a/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2beta1/test_data_policy_service.py +++ b/packages/google-cloud-bigquery-datapolicies/tests/unit/gapic/bigquery_datapolicies_v2beta1/test_data_policy_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.bigquery_datapolicies_v2beta1.services.data_policy_service import ( DataPolicyServiceAsyncClient, @@ -983,10 +988,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1035,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1070,10 +1073,9 @@ def test_data_policy_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1321,13 +1323,13 @@ def test_data_policy_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1460,9 +1462,9 @@ def test_create_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -2597,9 +2599,9 @@ def test_update_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -2984,9 +2986,9 @@ def test_delete_data_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -3671,9 +3673,9 @@ def test_list_data_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -4735,9 +4737,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4942,9 +4944,9 @@ def test_create_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_policy] = ( + mock_rpc + ) request = {} client.create_data_policy(request) @@ -5538,9 +5540,9 @@ def test_update_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_policy] = ( + mock_rpc + ) request = {} client.update_data_policy(request) @@ -5732,9 +5734,9 @@ def test_delete_data_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_policy] = ( + mock_rpc + ) request = {} client.delete_data_policy(request) @@ -6091,9 +6093,9 @@ def test_list_data_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_policies] = ( + mock_rpc + ) request = {} client.list_data_policies(request) @@ -6597,9 +6599,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -7375,8 +7377,9 @@ def test_create_data_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7454,18 +7457,20 @@ def test_create_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_create_data_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_create_data_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_create_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_create_data_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_create_data_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_create_data_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7518,8 +7523,9 @@ def test_add_grantees_rest_bad_request(request_type=datapolicy.AddGranteesReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7599,17 +7605,20 @@ def test_add_grantees_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_add_grantees" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "post_add_grantees_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_add_grantees" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_add_grantees" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_add_grantees_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_add_grantees" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7662,8 +7671,9 @@ def test_remove_grantees_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7743,18 +7753,20 @@ def test_remove_grantees_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_remove_grantees" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_remove_grantees_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_remove_grantees" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_remove_grantees" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_remove_grantees_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_remove_grantees" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7811,8 +7823,9 @@ def test_update_data_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7971,18 +7984,20 @@ def test_update_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_update_data_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_update_data_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_update_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_update_data_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_update_data_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_update_data_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8035,8 +8050,9 @@ def test_delete_data_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8093,13 +8109,13 @@ def test_delete_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "pre_delete_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_delete_data_policy" + ) as pre, + ): pre.assert_not_called() pb_message = datapolicy.DeleteDataPolicyRequest.pb( datapolicy.DeleteDataPolicyRequest() @@ -8142,8 +8158,9 @@ def test_get_data_policy_rest_bad_request(request_type=datapolicy.GetDataPolicyR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8221,18 +8238,20 @@ def test_get_data_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_get_data_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_get_data_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_get_data_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_get_data_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_get_data_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_get_data_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8285,8 +8304,9 @@ def test_list_data_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8349,18 +8369,20 @@ def test_list_data_policies_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_list_data_policies" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_list_data_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_list_data_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_list_data_policies" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_list_data_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_list_data_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8420,8 +8442,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8485,17 +8508,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8548,8 +8574,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8613,17 +8640,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8676,8 +8706,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8739,18 +8770,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = DataPolicyServiceClient(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.DataPolicyServiceRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataPolicyServiceRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataPolicyServiceRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9074,11 +9107,14 @@ def test_data_policy_service_base_transport(): def test_data_policy_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_datapolicies_v2beta1.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_datapolicies_v2beta1.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataPolicyServiceTransport( @@ -9098,9 +9134,12 @@ def test_data_policy_service_base_transport_with_credentials_file(): def test_data_policy_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_datapolicies_v2beta1.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_datapolicies_v2beta1.services.data_policy_service.transports.DataPolicyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataPolicyServiceTransport() @@ -9178,11 +9217,12 @@ def test_data_policy_service_transport_auth_gdch_credentials(transport_class): def test_data_policy_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-datatransfer/docs/conf.py b/packages/google-cloud-bigquery-datatransfer/docs/conf.py index 76b62d549aa0..6bb0c57e4ea3 100644 --- a/packages/google-cloud-bigquery-datatransfer/docs/conf.py +++ b/packages/google-cloud-bigquery-datatransfer/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-bigquery-datatransfer documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/__init__.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/__init__.py index a3f485409113..fd7335d8023c 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/__init__.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_transfer_service import ( DataTransferServiceAsyncClient, DataTransferServiceClient, diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/async_client.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/async_client.py index 3c7338f28ac2..22c344e850a4 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/async_client.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datatransfer_v1 import gapic_version as package_version @@ -45,12 +45,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.bigquery_datatransfer_v1.services.data_transfer_service import pagers from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer @@ -131,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataTransferServiceAsyncClient: The constructed client. """ - return DataTransferServiceClient.from_service_account_info.__func__(DataTransferServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataTransferServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataTransferServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataTransferServiceAsyncClient: The constructed client. """ - return DataTransferServiceClient.from_service_account_file.__func__(DataTransferServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataTransferServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataTransferServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -185,7 +187,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataTransferServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataTransferServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataTransferServiceTransport: diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/client.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/client.py index de97a998fc5b..1ea2ea896fd9 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/client.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_datatransfer_v1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.bigquery_datatransfer_v1.services.data_transfer_service import pagers from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer @@ -85,9 +85,7 @@ class DataTransferServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataTransferServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataTransferServiceTransport]] _transport_registry["grpc"] = DataTransferServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataTransferServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataTransferServiceRestTransport @@ -672,11 +670,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataTransferServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataTransferServiceClient._read_environment_variables() + ) self._client_cert_source = DataTransferServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -711,8 +707,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataTransferServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/pagers.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/pagers.py index df1ff367b00e..d457e9675774 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/pagers.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/__init__.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/__init__.py index 7a2276d6b11f..93f26c5ea89e 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import DataTransferServiceRestInterceptor, DataTransferServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataTransferServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataTransferServiceTransport]] _transport_registry["grpc"] = DataTransferServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataTransferServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataTransferServiceRestTransport diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/base.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/base.py index 6c2f8bee2180..bba198be487e 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/base.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_datatransfer_v1 import gapic_version as package_version from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc.py index c4385d69dd6b..28d420a066fd 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer @@ -574,12 +574,12 @@ def start_manual_transfer_runs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "start_manual_transfer_runs" not in self._stubs: - self._stubs[ - "start_manual_transfer_runs" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.datatransfer.v1.DataTransferService/StartManualTransferRuns", - request_serializer=datatransfer.StartManualTransferRunsRequest.serialize, - response_deserializer=datatransfer.StartManualTransferRunsResponse.deserialize, + self._stubs["start_manual_transfer_runs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.datatransfer.v1.DataTransferService/StartManualTransferRuns", + request_serializer=datatransfer.StartManualTransferRunsRequest.serialize, + response_deserializer=datatransfer.StartManualTransferRunsResponse.deserialize, + ) ) return self._stubs["start_manual_transfer_runs"] diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc_asyncio.py index b478fe63cbd9..195fe511facb 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer @@ -593,12 +593,12 @@ def start_manual_transfer_runs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "start_manual_transfer_runs" not in self._stubs: - self._stubs[ - "start_manual_transfer_runs" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.datatransfer.v1.DataTransferService/StartManualTransferRuns", - request_serializer=datatransfer.StartManualTransferRunsRequest.serialize, - response_deserializer=datatransfer.StartManualTransferRunsResponse.deserialize, + self._stubs["start_manual_transfer_runs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.datatransfer.v1.DataTransferService/StartManualTransferRuns", + request_serializer=datatransfer.StartManualTransferRunsRequest.serialize, + response_deserializer=datatransfer.StartManualTransferRunsResponse.deserialize, + ) ) return self._stubs["start_manual_transfer_runs"] diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest.py index ec910eee575c..1b96db40e650 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1053,9 +1053,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseCheckValidCreds._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseCheckValidCreds._get_http_options() request, metadata = self._interceptor.pre_check_valid_creds( request, metadata @@ -1228,9 +1226,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseCreateTransferConfig._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseCreateTransferConfig._get_http_options() request, metadata = self._interceptor.pre_create_transfer_config( request, metadata @@ -1381,9 +1377,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseDeleteTransferConfig._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseDeleteTransferConfig._get_http_options() request, metadata = self._interceptor.pre_delete_transfer_config( request, metadata @@ -1405,7 +1399,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1493,9 +1487,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseDeleteTransferRun._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseDeleteTransferRun._get_http_options() request, metadata = self._interceptor.pre_delete_transfer_run( request, metadata @@ -1517,7 +1509,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1606,9 +1598,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseEnrollDataSources._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseEnrollDataSources._get_http_options() request, metadata = self._interceptor.pre_enroll_data_sources( request, metadata @@ -1634,7 +1624,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1728,9 +1718,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseGetDataSource._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseGetDataSource._get_http_options() request, metadata = self._interceptor.pre_get_data_source(request, metadata) transcoded_request = _BaseDataTransferServiceRestTransport._BaseGetDataSource._get_transcoded_request( @@ -1881,9 +1869,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseGetTransferConfig._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseGetTransferConfig._get_http_options() request, metadata = self._interceptor.pre_get_transfer_config( request, metadata @@ -2031,9 +2017,7 @@ def __call__( Represents a data transfer run. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseGetTransferRun._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseGetTransferRun._get_http_options() request, metadata = self._interceptor.pre_get_transfer_run( request, metadata @@ -2182,9 +2166,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseListDataSources._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseListDataSources._get_http_options() request, metadata = self._interceptor.pre_list_data_sources( request, metadata @@ -2334,9 +2316,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseListTransferConfigs._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseListTransferConfigs._get_http_options() request, metadata = self._interceptor.pre_list_transfer_configs( request, metadata @@ -2489,9 +2469,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseListTransferLogs._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseListTransferLogs._get_http_options() request, metadata = self._interceptor.pre_list_transfer_logs( request, metadata @@ -2640,9 +2618,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseListTransferRuns._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseListTransferRuns._get_http_options() request, metadata = self._interceptor.pre_list_transfer_runs( request, metadata @@ -2793,9 +2769,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseScheduleTransferRuns._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseScheduleTransferRuns._get_http_options() request, metadata = self._interceptor.pre_schedule_transfer_runs( request, metadata @@ -2954,9 +2928,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseStartManualTransferRuns._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseStartManualTransferRuns._get_http_options() request, metadata = self._interceptor.pre_start_manual_transfer_runs( request, metadata @@ -3108,9 +3080,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseUnenrollDataSources._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseUnenrollDataSources._get_http_options() request, metadata = self._interceptor.pre_unenroll_data_sources( request, metadata @@ -3136,7 +3106,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3244,9 +3214,7 @@ def __call__( """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseUpdateTransferConfig._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseUpdateTransferConfig._get_http_options() request, metadata = self._interceptor.pre_update_transfer_config( request, metadata @@ -3470,7 +3438,9 @@ def start_manual_transfer_runs( ]: # 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._StartManualTransferRuns(self._session, self._host, self._interceptor) # type: ignore + return self._StartManualTransferRuns( + self._session, self._host, self._interceptor + ) # type: ignore @property def unenroll_data_sources( @@ -3546,9 +3516,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDataTransferServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -3687,9 +3655,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataTransferServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataTransferServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataTransferServiceRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest_base.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest_base.py index dc906fd183a1..2dcd598406e8 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/services/data_transfer_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.bigquery_datatransfer_v1.types import datatransfer, transfer diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/datatransfer.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/datatransfer.py index 2e2889f747a0..4db571428896 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/datatransfer.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/datatransfer.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore from google.cloud.bigquery_datatransfer_v1.types import transfer @@ -126,6 +126,7 @@ class Type(proto.Enum): LIST (7): List of strings parameter. """ + TYPE_UNSPECIFIED = 0 STRING = 1 INTEGER = 2 @@ -285,6 +286,7 @@ class AuthorizationType(proto.Enum): FIRST_PARTY_OAUTH (3): Use First Party OAuth. """ + AUTHORIZATION_TYPE_UNSPECIFIED = 0 AUTHORIZATION_CODE = 1 GOOGLE_PLUS_AUTHORIZATION_CODE = 2 @@ -308,6 +310,7 @@ class DataRefreshType(proto.Enum): days. Allows custom values to be set for each transfer config. """ + DATA_REFRESH_TYPE_UNSPECIFIED = 0 SLIDING_WINDOW = 1 CUSTOM_SLIDING_WINDOW = 2 @@ -863,6 +866,7 @@ class RunAttempt(proto.Enum): LATEST (1): Only latest run per day should be returned. """ + RUN_ATTEMPT_UNSPECIFIED = 0 LATEST = 1 @@ -956,12 +960,12 @@ class ListTransferLogsRequest(proto.Message): proto.INT32, number=5, ) - message_types: MutableSequence[ - transfer.TransferMessage.MessageSeverity - ] = proto.RepeatedField( - proto.ENUM, - number=6, - enum=transfer.TransferMessage.MessageSeverity, + message_types: MutableSequence[transfer.TransferMessage.MessageSeverity] = ( + proto.RepeatedField( + proto.ENUM, + number=6, + enum=transfer.TransferMessage.MessageSeverity, + ) ) diff --git a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/transfer.py b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/transfer.py index 3bb3bf924ada..6665c9f662c2 100644 --- a/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/transfer.py +++ b/packages/google-cloud-bigquery-datatransfer/google/cloud/bigquery_datatransfer_v1/types/transfer.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -56,6 +56,7 @@ class TransferType(proto.Enum): source currently doesn't support multiple transfer configs per project. """ + _pb_options = {"deprecated": True} TRANSFER_TYPE_UNSPECIFIED = 0 BATCH = 1 @@ -80,6 +81,7 @@ class TransferState(proto.Enum): CANCELLED (6): Data transfer is cancelled (6). """ + TRANSFER_STATE_UNSPECIFIED = 0 PENDING = 2 RUNNING = 3 @@ -690,6 +692,7 @@ class MessageSeverity(proto.Enum): ERROR (3): Error message. """ + MESSAGE_SEVERITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-bigquery-datatransfer/noxfile.py b/packages/google-cloud-bigquery-datatransfer/noxfile.py index 7157f8f22ca2..cde92cc6311c 100644 --- a/packages/google-cloud-bigquery-datatransfer/noxfile.py +++ b/packages/google-cloud-bigquery-datatransfer/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-datatransfer/tests/unit/gapic/bigquery_datatransfer_v1/test_data_transfer_service.py b/packages/google-cloud-bigquery-datatransfer/tests/unit/gapic/bigquery_datatransfer_v1/test_data_transfer_service.py index a4ce563e743e..0ecba1487051 100644 --- a/packages/google-cloud-bigquery-datatransfer/tests/unit/gapic/bigquery_datatransfer_v1/test_data_transfer_service.py +++ b/packages/google-cloud-bigquery-datatransfer/tests/unit/gapic/bigquery_datatransfer_v1/test_data_transfer_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,22 +43,27 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.bigquery_datatransfer_v1.services.data_transfer_service import ( DataTransferServiceAsyncClient, @@ -1000,10 +1005,9 @@ def test_data_transfer_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1048,10 +1052,9 @@ def test_data_transfer_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1087,10 +1090,9 @@ def test_data_transfer_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1346,13 +1348,13 @@ def test_data_transfer_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1860,9 +1862,9 @@ def test_list_data_sources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_sources] = ( + mock_rpc + ) request = {} client.list_data_sources(request) @@ -2429,9 +2431,9 @@ def test_create_transfer_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_transfer_config] = ( + mock_rpc + ) request = {} client.create_transfer_config(request) @@ -2823,9 +2825,9 @@ def test_update_transfer_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_transfer_config] = ( + mock_rpc + ) request = {} client.update_transfer_config(request) @@ -3191,9 +3193,9 @@ def test_delete_transfer_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_transfer_config] = ( + mock_rpc + ) request = {} client.delete_transfer_config(request) @@ -3543,9 +3545,9 @@ def test_get_transfer_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transfer_config] = ( + mock_rpc + ) request = {} client.get_transfer_config(request) @@ -3905,9 +3907,9 @@ def test_list_transfer_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transfer_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transfer_configs] = ( + mock_rpc + ) request = {} client.list_transfer_configs(request) @@ -4447,9 +4449,9 @@ def test_schedule_transfer_runs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.schedule_transfer_runs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.schedule_transfer_runs] = ( + mock_rpc + ) request = {} client.schedule_transfer_runs(request) @@ -5062,9 +5064,9 @@ def test_get_transfer_run_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transfer_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transfer_run] = ( + mock_rpc + ) request = {} client.get_transfer_run(request) @@ -5400,9 +5402,9 @@ def test_delete_transfer_run_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_transfer_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_transfer_run] = ( + mock_rpc + ) request = {} client.delete_transfer_run(request) @@ -5734,9 +5736,9 @@ def test_list_transfer_runs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transfer_runs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transfer_runs] = ( + mock_rpc + ) request = {} client.list_transfer_runs(request) @@ -6279,9 +6281,9 @@ def test_list_transfer_logs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transfer_logs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transfer_logs] = ( + mock_rpc + ) request = {} client.list_transfer_logs(request) @@ -6820,9 +6822,9 @@ def test_check_valid_creds_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.check_valid_creds - ] = mock_rpc + client._transport._wrapped_methods[client._transport.check_valid_creds] = ( + mock_rpc + ) request = {} client.check_valid_creds(request) @@ -7158,9 +7160,9 @@ def test_enroll_data_sources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enroll_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enroll_data_sources] = ( + mock_rpc + ) request = {} client.enroll_data_sources(request) @@ -7404,9 +7406,9 @@ def test_unenroll_data_sources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.unenroll_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.unenroll_data_sources] = ( + mock_rpc + ) request = {} client.unenroll_data_sources(request) @@ -7763,9 +7765,9 @@ def test_list_data_sources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_sources] = ( + mock_rpc + ) request = {} client.list_data_sources(request) @@ -8024,9 +8026,9 @@ def test_create_transfer_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_transfer_config] = ( + mock_rpc + ) request = {} client.create_transfer_config(request) @@ -8232,9 +8234,9 @@ def test_update_transfer_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_transfer_config] = ( + mock_rpc + ) request = {} client.update_transfer_config(request) @@ -8441,9 +8443,9 @@ def test_delete_transfer_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_transfer_config] = ( + mock_rpc + ) request = {} client.delete_transfer_config(request) @@ -8620,9 +8622,9 @@ def test_get_transfer_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transfer_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transfer_config] = ( + mock_rpc + ) request = {} client.get_transfer_config(request) @@ -8805,9 +8807,9 @@ def test_list_transfer_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transfer_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transfer_configs] = ( + mock_rpc + ) request = {} client.list_transfer_configs(request) @@ -9068,9 +9070,9 @@ def test_schedule_transfer_runs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.schedule_transfer_runs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.schedule_transfer_runs] = ( + mock_rpc + ) request = {} client.schedule_transfer_runs(request) @@ -9390,9 +9392,9 @@ def test_get_transfer_run_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_transfer_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_transfer_run] = ( + mock_rpc + ) request = {} client.get_transfer_run(request) @@ -9574,9 +9576,9 @@ def test_delete_transfer_run_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_transfer_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_transfer_run] = ( + mock_rpc + ) request = {} client.delete_transfer_run(request) @@ -9753,9 +9755,9 @@ def test_list_transfer_runs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transfer_runs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transfer_runs] = ( + mock_rpc + ) request = {} client.list_transfer_runs(request) @@ -10021,9 +10023,9 @@ def test_list_transfer_logs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transfer_logs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transfer_logs] = ( + mock_rpc + ) request = {} client.list_transfer_logs(request) @@ -10285,9 +10287,9 @@ def test_check_valid_creds_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.check_valid_creds - ] = mock_rpc + client._transport._wrapped_methods[client._transport.check_valid_creds] = ( + mock_rpc + ) request = {} client.check_valid_creds(request) @@ -10470,9 +10472,9 @@ def test_enroll_data_sources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enroll_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enroll_data_sources] = ( + mock_rpc + ) request = {} client.enroll_data_sources(request) @@ -10593,9 +10595,9 @@ def test_unenroll_data_sources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.unenroll_data_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.unenroll_data_sources] = ( + mock_rpc + ) request = {} client.unenroll_data_sources(request) @@ -11681,8 +11683,9 @@ def test_get_data_source_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11781,18 +11784,20 @@ def test_get_data_source_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "post_get_data_source" - ) as post, mock.patch.object( - transports.DataTransferServiceRestInterceptor, - "post_get_data_source_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTransferServiceRestInterceptor, "pre_get_data_source" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "post_get_data_source" + ) as post, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_get_data_source_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_get_data_source" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11845,8 +11850,9 @@ def test_list_data_sources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11909,18 +11915,20 @@ def test_list_data_sources_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "post_list_data_sources" - ) as post, mock.patch.object( - transports.DataTransferServiceRestInterceptor, - "post_list_data_sources_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTransferServiceRestInterceptor, "pre_list_data_sources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "post_list_data_sources" + ) as post, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_list_data_sources_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_list_data_sources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11978,8 +11986,9 @@ def test_create_transfer_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12173,18 +12182,20 @@ def test_create_transfer_config_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "post_create_transfer_config" - ) as post, mock.patch.object( - transports.DataTransferServiceRestInterceptor, - "post_create_transfer_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTransferServiceRestInterceptor, "pre_create_transfer_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "post_create_transfer_config" + ) as post, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_create_transfer_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_create_transfer_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12241,8 +12252,9 @@ def test_update_transfer_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12440,18 +12452,20 @@ def test_update_transfer_config_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "post_update_transfer_config" - ) as post, mock.patch.object( - transports.DataTransferServiceRestInterceptor, - "post_update_transfer_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTransferServiceRestInterceptor, "pre_update_transfer_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "post_update_transfer_config" + ) as post, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_update_transfer_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_update_transfer_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12506,8 +12520,9 @@ def test_delete_transfer_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12566,13 +12581,13 @@ def test_delete_transfer_config_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "pre_delete_transfer_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_delete_transfer_config" + ) as pre, + ): pre.assert_not_called() pb_message = datatransfer.DeleteTransferConfigRequest.pb( datatransfer.DeleteTransferConfigRequest() @@ -12619,8 +12634,9 @@ def test_get_transfer_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12704,18 +12720,20 @@ def test_get_transfer_config_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "post_get_transfer_config" - ) as post, mock.patch.object( - transports.DataTransferServiceRestInterceptor, - "post_get_transfer_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTransferServiceRestInterceptor, "pre_get_transfer_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "post_get_transfer_config" + ) as post, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_get_transfer_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_get_transfer_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12768,8 +12786,9 @@ def test_list_transfer_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12832,18 +12851,20 @@ def test_list_transfer_configs_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "post_list_transfer_configs" - ) as post, mock.patch.object( - transports.DataTransferServiceRestInterceptor, - "post_list_transfer_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTransferServiceRestInterceptor, "pre_list_transfer_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "post_list_transfer_configs" + ) as post, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_list_transfer_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_list_transfer_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12903,8 +12924,9 @@ def test_schedule_transfer_runs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12966,18 +12988,20 @@ def test_schedule_transfer_runs_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "post_schedule_transfer_runs" - ) as post, mock.patch.object( - transports.DataTransferServiceRestInterceptor, - "post_schedule_transfer_runs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTransferServiceRestInterceptor, "pre_schedule_transfer_runs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "post_schedule_transfer_runs" + ) as post, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_schedule_transfer_runs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_schedule_transfer_runs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13037,8 +13061,9 @@ def test_start_manual_transfer_runs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13100,18 +13125,22 @@ def test_start_manual_transfer_runs_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "post_start_manual_transfer_runs" - ) as post, mock.patch.object( - transports.DataTransferServiceRestInterceptor, - "post_start_manual_transfer_runs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTransferServiceRestInterceptor, "pre_start_manual_transfer_runs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_start_manual_transfer_runs", + ) as post, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_start_manual_transfer_runs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "pre_start_manual_transfer_runs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13171,8 +13200,9 @@ def test_get_transfer_run_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13248,18 +13278,20 @@ def test_get_transfer_run_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "post_get_transfer_run" - ) as post, mock.patch.object( - transports.DataTransferServiceRestInterceptor, - "post_get_transfer_run_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTransferServiceRestInterceptor, "pre_get_transfer_run" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "post_get_transfer_run" + ) as post, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_get_transfer_run_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_get_transfer_run" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13314,8 +13346,9 @@ def test_delete_transfer_run_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13374,13 +13407,13 @@ def test_delete_transfer_run_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "pre_delete_transfer_run" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_delete_transfer_run" + ) as pre, + ): pre.assert_not_called() pb_message = datatransfer.DeleteTransferRunRequest.pb( datatransfer.DeleteTransferRunRequest() @@ -13427,8 +13460,9 @@ def test_list_transfer_runs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13493,18 +13527,20 @@ def test_list_transfer_runs_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "post_list_transfer_runs" - ) as post, mock.patch.object( - transports.DataTransferServiceRestInterceptor, - "post_list_transfer_runs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTransferServiceRestInterceptor, "pre_list_transfer_runs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "post_list_transfer_runs" + ) as post, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_list_transfer_runs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_list_transfer_runs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13564,8 +13600,9 @@ def test_list_transfer_logs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13630,18 +13667,20 @@ def test_list_transfer_logs_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "post_list_transfer_logs" - ) as post, mock.patch.object( - transports.DataTransferServiceRestInterceptor, - "post_list_transfer_logs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTransferServiceRestInterceptor, "pre_list_transfer_logs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "post_list_transfer_logs" + ) as post, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_list_transfer_logs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_list_transfer_logs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13699,8 +13738,9 @@ def test_check_valid_creds_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13763,18 +13803,20 @@ def test_check_valid_creds_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "post_check_valid_creds" - ) as post, mock.patch.object( - transports.DataTransferServiceRestInterceptor, - "post_check_valid_creds_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTransferServiceRestInterceptor, "pre_check_valid_creds" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "post_check_valid_creds" + ) as post, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, + "post_check_valid_creds_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_check_valid_creds" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13832,8 +13874,9 @@ def test_enroll_data_sources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13890,13 +13933,13 @@ def test_enroll_data_sources_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "pre_enroll_data_sources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_enroll_data_sources" + ) as pre, + ): pre.assert_not_called() pb_message = datatransfer.EnrollDataSourcesRequest.pb( datatransfer.EnrollDataSourcesRequest() @@ -13941,8 +13984,9 @@ def test_unenroll_data_sources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13999,13 +14043,13 @@ def test_unenroll_data_sources_rest_interceptors(null_interceptor): ) client = DataTransferServiceClient(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.DataTransferServiceRestInterceptor, "pre_unenroll_data_sources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTransferServiceRestInterceptor, "pre_unenroll_data_sources" + ) as pre, + ): pre.assert_not_called() pb_message = datatransfer.UnenrollDataSourcesRequest.pb( datatransfer.UnenrollDataSourcesRequest() @@ -14050,8 +14094,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14110,8 +14155,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14584,11 +14630,14 @@ def test_data_transfer_service_base_transport(): def test_data_transfer_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_datatransfer_v1.services.data_transfer_service.transports.DataTransferServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_datatransfer_v1.services.data_transfer_service.transports.DataTransferServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataTransferServiceTransport( @@ -14605,9 +14654,12 @@ def test_data_transfer_service_base_transport_with_credentials_file(): def test_data_transfer_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_datatransfer_v1.services.data_transfer_service.transports.DataTransferServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_datatransfer_v1.services.data_transfer_service.transports.DataTransferServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataTransferServiceTransport() @@ -14679,11 +14731,12 @@ def test_data_transfer_service_transport_auth_gdch_credentials(transport_class): def test_data_transfer_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-logging/docs/conf.py b/packages/google-cloud-bigquery-logging/docs/conf.py index 465438ece409..31e14761f6b4 100644 --- a/packages/google-cloud-bigquery-logging/docs/conf.py +++ b/packages/google-cloud-bigquery-logging/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-bigquery-logging documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/__init__.py b/packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/__init__.py index c8f9f992fcaa..fcd4d8cdebe3 100644 --- a/packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/__init__.py +++ b/packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.audit_data import ( AuditData, BigQueryAcl, diff --git a/packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/types/audit_data.py b/packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/types/audit_data.py index c711fcc0e753..804c4aadf3b0 100644 --- a/packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/types/audit_data.py +++ b/packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/types/audit_data.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-bigquery-logging/noxfile.py b/packages/google-cloud-bigquery-logging/noxfile.py index b14969c771b6..310636da3a17 100644 --- a/packages/google-cloud-bigquery-logging/noxfile.py +++ b/packages/google-cloud-bigquery-logging/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-migration/docs/conf.py b/packages/google-cloud-bigquery-migration/docs/conf.py index 6b96d13c7bcf..0f7475584fe3 100644 --- a/packages/google-cloud-bigquery-migration/docs/conf.py +++ b/packages/google-cloud-bigquery-migration/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-bigquery-migration documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/__init__.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/__init__.py index 5fa1869e10ef..7cd6902401a4 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/__init__.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.migration_service import ( MigrationServiceAsyncClient, MigrationServiceClient, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/async_client.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/async_client.py index 91283108e252..f18a2270813b 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/async_client.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import error_details_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore from google.cloud.bigquery_migration_v2.services.migration_service import pagers from google.cloud.bigquery_migration_v2.types import ( @@ -129,7 +129,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MigrationServiceAsyncClient: The constructed client. """ - return MigrationServiceClient.from_service_account_info.__func__(MigrationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MigrationServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(MigrationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +146,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MigrationServiceAsyncClient: The constructed client. """ - return MigrationServiceClient.from_service_account_file.__func__(MigrationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MigrationServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(MigrationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/client.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/client.py index 74f6fca84256..8f699cd2ed33 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/client.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import error_details_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore from google.cloud.bigquery_migration_v2.services.migration_service import pagers from google.cloud.bigquery_migration_v2.types import ( @@ -85,9 +85,7 @@ class MigrationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MigrationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MigrationServiceTransport]] _transport_registry["grpc"] = MigrationServiceGrpcTransport _transport_registry["grpc_asyncio"] = MigrationServiceGrpcAsyncIOTransport @@ -652,11 +650,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MigrationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MigrationServiceClient._read_environment_variables() + ) self._client_cert_source = MigrationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -691,8 +687,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MigrationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/pagers.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/pagers.py index e250732c1fb4..085817a45412 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/pagers.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -230,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -308,7 +308,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/base.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/base.py index 85fdb5cfbd21..28a2b6366d15 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/base.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_migration_v2 import gapic_version as package_version from google.cloud.bigquery_migration_v2.types import ( diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc.py index 56be5c76c088..c96be6ad43e5 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_migration_v2.types import ( migration_entities, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc_asyncio.py index 64acf2b72322..af82c8b62fc9 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/services/migration_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_migration_v2.types import ( migration_entities, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/__init__.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/__init__.py index ab4720f6619f..f8eeabbfabe5 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/__init__.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/__init__.py @@ -20,8 +20,17 @@ MigrationWorkflow, TranslationTaskResult, ) -from .migration_error_details import ErrorDetail, ErrorLocation, ResourceErrorDetail -from .migration_metrics import Point, TimeInterval, TimeSeries, TypedValue +from .migration_error_details import ( + ErrorDetail, + ErrorLocation, + ResourceErrorDetail, +) +from .migration_metrics import ( + Point, + TimeInterval, + TimeSeries, + TypedValue, +) from .migration_service import ( CreateMigrationWorkflowRequest, DeleteMigrationWorkflowRequest, @@ -67,8 +76,12 @@ TargetSpec, TranslationDetails, ) -from .translation_suggestion import TranslationReportRecord -from .translation_usability import GcsReportLogMessage +from .translation_suggestion import ( + TranslationReportRecord, +) +from .translation_usability import ( + GcsReportLogMessage, +) __all__ = ( "MigrationSubtask", diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_entities.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_entities.py index aaf0a1524dac..6646d0eea0fa 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_entities.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_entities.py @@ -17,19 +17,19 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import error_details_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore import proto # type: ignore from google.cloud.bigquery_migration_v2.types import ( migration_error_details, migration_metrics, translation_config, + translation_usability, ) from google.cloud.bigquery_migration_v2.types import ( translation_details as gcbm_translation_details, ) -from google.cloud.bigquery_migration_v2.types import translation_usability __protobuf__ = proto.module( package="google.cloud.bigquery.migration.v2", @@ -92,6 +92,7 @@ class State(proto.Enum): (e.g. forced termination), they will not be scheduled. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 RUNNING = 2 @@ -217,6 +218,7 @@ class State(proto.Enum): FAILED (6): The task finished unsuccessfully. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ORCHESTRATING = 2 @@ -371,6 +373,7 @@ class State(proto.Enum): The subtask is pending a dependency. It will be scheduled once its dependencies are done. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 RUNNING = 2 @@ -460,19 +463,19 @@ class TranslationTaskResult(proto.Message): a migration workflow. """ - translated_literals: MutableSequence[ - gcbm_translation_details.Literal - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcbm_translation_details.Literal, + translated_literals: MutableSequence[gcbm_translation_details.Literal] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcbm_translation_details.Literal, + ) ) - report_log_messages: MutableSequence[ - translation_usability.GcsReportLogMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=translation_usability.GcsReportLogMessage, + report_log_messages: MutableSequence[translation_usability.GcsReportLogMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=translation_usability.GcsReportLogMessage, + ) ) diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_error_details.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_error_details.py index a3efc42e86df..7443945e85f8 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_error_details.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_error_details.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.rpc import error_details_pb2 # type: ignore +import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_metrics.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_metrics.py index 3e1d3dc1c46f..593b0489cbec 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_metrics.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_metrics.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.api import distribution_pb2 # type: ignore -from google.api import metric_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api.distribution_pb2 as distribution_pb2 # type: ignore +import google.api.metric_pb2 as metric_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_service.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_service.py index bea039ece0d2..f6b92940e500 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_service.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/migration_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.bigquery_migration_v2.types import migration_entities @@ -141,12 +141,12 @@ class ListMigrationWorkflowsResponse(proto.Message): def raw_page(self): return self - migration_workflows: MutableSequence[ - migration_entities.MigrationWorkflow - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=migration_entities.MigrationWorkflow, + migration_workflows: MutableSequence[migration_entities.MigrationWorkflow] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=migration_entities.MigrationWorkflow, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -275,12 +275,12 @@ class ListMigrationSubtasksResponse(proto.Message): def raw_page(self): return self - migration_subtasks: MutableSequence[ - migration_entities.MigrationSubtask - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=migration_entities.MigrationSubtask, + migration_subtasks: MutableSequence[migration_entities.MigrationSubtask] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=migration_entities.MigrationSubtask, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_config.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_config.py index 63f66db134e4..ce84fd118705 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_config.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_config.py @@ -351,6 +351,7 @@ class Mode(proto.Enum): BTEQ (2): BTEQ mode (which includes SQL). """ + MODE_UNSPECIFIED = 0 SQL = 1 BTEQ = 2 @@ -499,6 +500,7 @@ class Type(proto.Enum): FUNCTION (7): The object being mapped is a function. """ + TYPE_UNSPECIFIED = 0 DATABASE = 1 SCHEMA = 2 diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_suggestion.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_suggestion.py index 077e2e5f4e44..df466647b3e7 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_suggestion.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2/types/translation_suggestion.py @@ -61,6 +61,7 @@ class Severity(proto.Enum): ERROR (3): ERROR type. Translation failed. """ + SEVERITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/__init__.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/__init__.py index db36133683dd..11b72e38e435 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/__init__.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.migration_service import ( MigrationServiceAsyncClient, MigrationServiceClient, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/async_client.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/async_client.py index 2578ae7fd4cc..c83f51bc2dbb 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/async_client.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2alpha import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import error_details_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore from google.cloud.bigquery_migration_v2alpha.services.migration_service import pagers from google.cloud.bigquery_migration_v2alpha.types import ( @@ -129,7 +129,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MigrationServiceAsyncClient: The constructed client. """ - return MigrationServiceClient.from_service_account_info.__func__(MigrationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MigrationServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(MigrationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +146,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MigrationServiceAsyncClient: The constructed client. """ - return MigrationServiceClient.from_service_account_file.__func__(MigrationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MigrationServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(MigrationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/client.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/client.py index ff28ed713ece..487302e185d2 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/client.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2alpha import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import error_details_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore from google.cloud.bigquery_migration_v2alpha.services.migration_service import pagers from google.cloud.bigquery_migration_v2alpha.types import ( @@ -85,9 +85,7 @@ class MigrationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MigrationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MigrationServiceTransport]] _transport_registry["grpc"] = MigrationServiceGrpcTransport _transport_registry["grpc_asyncio"] = MigrationServiceGrpcAsyncIOTransport @@ -652,11 +650,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MigrationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MigrationServiceClient._read_environment_variables() + ) self._client_cert_source = MigrationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -691,8 +687,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MigrationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/pagers.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/pagers.py index 4cf9e6dd69a5..12991ca05699 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/pagers.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -230,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -308,7 +308,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/base.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/base.py index 9b5edd67e6e4..c4af6da7e24b 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/base.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_migration_v2alpha import gapic_version as package_version from google.cloud.bigquery_migration_v2alpha.types import ( diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc.py index 4f39cb209023..4b49035003f2 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_migration_v2alpha.types import ( migration_entities, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc_asyncio.py index 74de384c0a98..8ab9b9e95d8d 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/migration_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_migration_v2alpha.types import ( migration_entities, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/async_client.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/async_client.py index 4d00cbd2dbbf..02c0fce45b38 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/async_client.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2alpha import gapic_version as package_version @@ -114,7 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SqlTranslationServiceAsyncClient: The constructed client. """ - return SqlTranslationServiceClient.from_service_account_info.__func__(SqlTranslationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SqlTranslationServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SqlTranslationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SqlTranslationServiceAsyncClient: The constructed client. """ - return SqlTranslationServiceClient.from_service_account_file.__func__(SqlTranslationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SqlTranslationServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SqlTranslationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -168,7 +170,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SqlTranslationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SqlTranslationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SqlTranslationServiceTransport: diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/client.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/client.py index ecd06a3ede7e..605a9d0bd957 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/client.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2alpha import gapic_version as package_version @@ -76,9 +76,7 @@ class SqlTranslationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SqlTranslationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SqlTranslationServiceTransport]] _transport_registry["grpc"] = SqlTranslationServiceGrpcTransport _transport_registry["grpc_asyncio"] = SqlTranslationServiceGrpcAsyncIOTransport @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SqlTranslationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SqlTranslationServiceClient._read_environment_variables() + ) self._client_cert_source = SqlTranslationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SqlTranslationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/__init__.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/__init__.py index 16855a83d770..8c53db322b1a 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import SqlTranslationServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SqlTranslationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SqlTranslationServiceTransport]] _transport_registry["grpc"] = SqlTranslationServiceGrpcTransport _transport_registry["grpc_asyncio"] = SqlTranslationServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/base.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/base.py index 2c095e47f485..9050218b0e99 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/base.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_migration_v2alpha import gapic_version as package_version from google.cloud.bigquery_migration_v2alpha.types import translation_service diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc.py index ef08356b88d8..7345cda2ff82 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_migration_v2alpha.types import translation_service diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc_asyncio.py index c49eafc35d3e..e03f8a1bbaa8 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/services/sql_translation_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_migration_v2alpha.types import translation_service diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/__init__.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/__init__.py index 4d041a4bd68e..1d3f2c95d04f 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/__init__.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/__init__.py @@ -13,15 +13,27 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .assessment_task import AssessmentOrchestrationResultDetails, AssessmentTaskDetails +from .assessment_task import ( + AssessmentOrchestrationResultDetails, + AssessmentTaskDetails, +) from .migration_entities import ( MigrationSubtask, MigrationTask, MigrationTaskOrchestrationResult, MigrationWorkflow, ) -from .migration_error_details import ErrorDetail, ErrorLocation, ResourceErrorDetail -from .migration_metrics import Point, TimeInterval, TimeSeries, TypedValue +from .migration_error_details import ( + ErrorDetail, + ErrorLocation, + ResourceErrorDetail, +) +from .migration_metrics import ( + Point, + TimeInterval, + TimeSeries, + TypedValue, +) from .migration_service import ( CreateMigrationWorkflowRequest, DeleteMigrationWorkflowRequest, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_entities.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_entities.py index f4135895998c..70fb6568b631 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_entities.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_entities.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import error_details_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore import proto # type: ignore from google.cloud.bigquery_migration_v2alpha.types import ( @@ -89,6 +89,7 @@ class State(proto.Enum): (e.g. forced termination), they will not be scheduled. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 RUNNING = 2 @@ -193,6 +194,7 @@ class State(proto.Enum): FAILED (6): The task finished unsuccessfully. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ORCHESTRATING = 2 @@ -323,6 +325,7 @@ class State(proto.Enum): still finish but no new lease renewals will be granted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 RUNNING = 2 diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_error_details.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_error_details.py index c91cb8e52dab..00edfb0c665e 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_error_details.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_error_details.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.rpc import error_details_pb2 # type: ignore +import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_metrics.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_metrics.py index 19484920f061..ab37d843277e 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_metrics.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_metrics.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.api import distribution_pb2 # type: ignore -from google.api import metric_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api.distribution_pb2 as distribution_pb2 # type: ignore +import google.api.metric_pb2 as metric_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_service.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_service.py index e571ba53d49e..5275f2ed3aa7 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_service.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/migration_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.bigquery_migration_v2alpha.types import migration_entities @@ -141,12 +141,12 @@ class ListMigrationWorkflowsResponse(proto.Message): def raw_page(self): return self - migration_workflows: MutableSequence[ - migration_entities.MigrationWorkflow - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=migration_entities.MigrationWorkflow, + migration_workflows: MutableSequence[migration_entities.MigrationWorkflow] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=migration_entities.MigrationWorkflow, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -275,12 +275,12 @@ class ListMigrationSubtasksResponse(proto.Message): def raw_page(self): return self - migration_subtasks: MutableSequence[ - migration_entities.MigrationSubtask - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=migration_entities.MigrationSubtask, + migration_subtasks: MutableSequence[migration_entities.MigrationSubtask] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=migration_entities.MigrationSubtask, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_service.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_service.py index 2f5269a9505f..525ae555bff1 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_service.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_service.py @@ -53,6 +53,7 @@ class SqlTranslationSourceDialect(proto.Enum): TERADATA (1): Teradata SQL. """ + SQL_TRANSLATION_SOURCE_DIALECT_UNSPECIFIED = 0 TERADATA = 1 @@ -165,6 +166,7 @@ class SqlTranslationErrorType(proto.Enum): Found unsupported functions in the input SQL query that are not able to translate. """ + SQL_TRANSLATION_ERROR_TYPE_UNSPECIFIED = 0 SQL_PARSE_ERROR = 1 UNSUPPORTED_SQL_FUNCTION = 2 diff --git a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_task.py b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_task.py index f1e064349d26..846bb6e205c5 100644 --- a/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_task.py +++ b/packages/google-cloud-bigquery-migration/google/cloud/bigquery_migration_v2alpha/types/translation_task.py @@ -136,6 +136,7 @@ class FileEncoding(proto.Enum): UTF_16BE (6): File encoding is UTF_16BE. """ + FILE_ENCODING_UNSPECIFIED = 0 UTF_8 = 1 ISO_8859_1 = 2 @@ -165,6 +166,7 @@ class TokenType(proto.Enum): TIMESTAMP (7): Token type as timestamp. """ + TOKEN_TYPE_UNSPECIFIED = 0 STRING = 1 INT64 = 2 @@ -271,6 +273,7 @@ class IdentifierCase(proto.Enum): LOWER (3): Identifiers will be in lower cases. """ + IDENTIFIER_CASE_UNSPECIFIED = 0 ORIGINAL = 1 UPPER = 2 @@ -287,6 +290,7 @@ class IdentifierRewriteMode(proto.Enum): REWRITE_ALL (2): All SQL identifiers will be rewrite. """ + IDENTIFIER_REWRITE_MODE_UNSPECIFIED = 0 NONE = 1 REWRITE_ALL = 2 diff --git a/packages/google-cloud-bigquery-migration/noxfile.py b/packages/google-cloud-bigquery-migration/noxfile.py index 82baad669e03..2c12f98ba3f5 100644 --- a/packages/google-cloud-bigquery-migration/noxfile.py +++ b/packages/google-cloud-bigquery-migration/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2/test_migration_service.py b/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2/test_migration_service.py index 2a154e96d09e..26a08c1eb8c4 100644 --- a/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2/test_migration_service.py +++ b/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2/test_migration_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,20 +39,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import distribution_pb2 # type: ignore -from google.api import metric_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.api.distribution_pb2 as distribution_pb2 # type: ignore +import google.api.metric_pb2 as metric_pb2 # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import error_details_pb2 # type: ignore from google.cloud.bigquery_migration_v2.services.migration_service import ( MigrationServiceAsyncClient, @@ -955,10 +960,9 @@ def test_migration_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1007,9 @@ def test_migration_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1045,9 @@ def test_migration_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1286,13 +1288,13 @@ def test_migration_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1771,9 +1773,9 @@ def test_get_migration_workflow_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_migration_workflow - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_migration_workflow] = ( + mock_rpc + ) request = {} client.get_migration_workflow(request) @@ -3339,9 +3341,9 @@ def test_get_migration_subtask_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_migration_subtask - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_migration_subtask] = ( + mock_rpc + ) request = {} client.get_migration_subtask(request) @@ -4691,11 +4693,14 @@ def test_migration_service_base_transport(): def test_migration_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_migration_v2.services.migration_service.transports.MigrationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_migration_v2.services.migration_service.transports.MigrationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MigrationServiceTransport( @@ -4712,9 +4717,12 @@ def test_migration_service_base_transport_with_credentials_file(): def test_migration_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_migration_v2.services.migration_service.transports.MigrationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_migration_v2.services.migration_service.transports.MigrationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MigrationServiceTransport() @@ -4785,11 +4793,12 @@ def test_migration_service_transport_auth_gdch_credentials(transport_class): def test_migration_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_migration_service.py b/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_migration_service.py index cc3c12a13e61..ce801be7d1fa 100644 --- a/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_migration_service.py +++ b/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_migration_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,18 +39,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import error_details_pb2 # type: ignore from google.cloud.bigquery_migration_v2alpha.services.migration_service import ( MigrationServiceAsyncClient, @@ -952,10 +957,9 @@ def test_migration_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +1004,9 @@ def test_migration_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1042,9 @@ def test_migration_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1283,13 +1285,13 @@ def test_migration_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1768,9 +1770,9 @@ def test_get_migration_workflow_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_migration_workflow - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_migration_workflow] = ( + mock_rpc + ) request = {} client.get_migration_workflow(request) @@ -3336,9 +3338,9 @@ def test_get_migration_subtask_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_migration_subtask - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_migration_subtask] = ( + mock_rpc + ) request = {} client.get_migration_subtask(request) @@ -4688,11 +4690,14 @@ def test_migration_service_base_transport(): def test_migration_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_migration_v2alpha.services.migration_service.transports.MigrationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_migration_v2alpha.services.migration_service.transports.MigrationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MigrationServiceTransport( @@ -4709,9 +4714,12 @@ def test_migration_service_base_transport_with_credentials_file(): def test_migration_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_migration_v2alpha.services.migration_service.transports.MigrationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_migration_v2alpha.services.migration_service.transports.MigrationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MigrationServiceTransport() @@ -4782,11 +4790,12 @@ def test_migration_service_transport_auth_gdch_credentials(transport_class): def test_migration_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_sql_translation_service.py b/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_sql_translation_service.py index cf66e28d5362..bf4cd083c664 100644 --- a/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_sql_translation_service.py +++ b/packages/google-cloud-bigquery-migration/tests/unit/gapic/bigquery_migration_v2alpha/test_sql_translation_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,11 +39,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -960,10 +965,9 @@ def test_sql_translation_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1012,9 @@ def test_sql_translation_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1050,9 @@ def test_sql_translation_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1295,13 +1297,13 @@ def test_sql_translation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1596,9 +1598,7 @@ def test_translate_query_flattened(): mock_val = "parent_value" assert arg == mock_val arg = args[0].source_dialect - mock_val = ( - translation_service.TranslateQueryRequest.SqlTranslationSourceDialect.TERADATA - ) + mock_val = translation_service.TranslateQueryRequest.SqlTranslationSourceDialect.TERADATA assert arg == mock_val arg = args[0].query mock_val = "query_value" @@ -1651,9 +1651,7 @@ async def test_translate_query_flattened_async(): mock_val = "parent_value" assert arg == mock_val arg = args[0].source_dialect - mock_val = ( - translation_service.TranslateQueryRequest.SqlTranslationSourceDialect.TERADATA - ) + mock_val = translation_service.TranslateQueryRequest.SqlTranslationSourceDialect.TERADATA assert arg == mock_val arg = args[0].query mock_val = "query_value" @@ -1896,11 +1894,14 @@ def test_sql_translation_service_base_transport(): def test_sql_translation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_migration_v2alpha.services.sql_translation_service.transports.SqlTranslationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_migration_v2alpha.services.sql_translation_service.transports.SqlTranslationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SqlTranslationServiceTransport( @@ -1917,9 +1918,12 @@ def test_sql_translation_service_base_transport_with_credentials_file(): def test_sql_translation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_migration_v2alpha.services.sql_translation_service.transports.SqlTranslationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_migration_v2alpha.services.sql_translation_service.transports.SqlTranslationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SqlTranslationServiceTransport() @@ -1992,11 +1996,12 @@ def test_sql_translation_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-reservation/docs/conf.py b/packages/google-cloud-bigquery-reservation/docs/conf.py index 3e5b8143620a..0626f440807f 100644 --- a/packages/google-cloud-bigquery-reservation/docs/conf.py +++ b/packages/google-cloud-bigquery-reservation/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-bigquery-reservation documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/__init__.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/__init__.py index a276315a13db..df2b76396659 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/__init__.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.reservation_service import ( ReservationServiceAsyncClient, ReservationServiceClient, diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py index f398519c989f..d2b2851c52fb 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_reservation_v1 import gapic_version as package_version @@ -45,15 +45,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.bigquery_reservation_v1.services.reservation_service import pagers -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from .client import ReservationServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ReservationServiceTransport @@ -157,7 +157,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ReservationServiceAsyncClient: The constructed client. """ - return ReservationServiceClient.from_service_account_info.__func__(ReservationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ReservationServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ReservationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +174,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ReservationServiceAsyncClient: The constructed client. """ - return ReservationServiceClient.from_service_account_file.__func__(ReservationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ReservationServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ReservationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -211,7 +213,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ReservationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ReservationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ReservationServiceTransport: @@ -3234,7 +3238,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_reservation_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -3383,7 +3387,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_reservation_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -3528,7 +3532,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_reservation_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/client.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/client.py index 4905751fe042..4787accb29e9 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/client.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_reservation_v1 import gapic_version as package_version @@ -61,15 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.bigquery_reservation_v1.services.reservation_service import pagers -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from .transports.base import DEFAULT_CLIENT_INFO, ReservationServiceTransport from .transports.grpc import ReservationServiceGrpcTransport @@ -85,9 +85,7 @@ class ReservationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReservationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReservationServiceTransport]] _transport_registry["grpc"] = ReservationServiceGrpcTransport _transport_registry["grpc_asyncio"] = ReservationServiceGrpcAsyncIOTransport _transport_registry["rest"] = ReservationServiceRestTransport @@ -737,11 +735,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationServiceClient._read_environment_variables() + ) self._client_cert_source = ReservationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -776,8 +772,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationServiceTransport, transport) self._api_endpoint = self._transport.host @@ -3692,7 +3687,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_reservation_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -3842,7 +3837,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_reservation_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -3988,7 +3983,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import bigquery_reservation_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/pagers.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/pagers.py index 8627ddb401f8..7a5ee2157454 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/pagers.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/__init__.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/__init__.py index 3c070b3a9abe..16c412a7fada 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ReservationServiceRestInterceptor, ReservationServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ReservationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ReservationServiceTransport]] _transport_registry["grpc"] = ReservationServiceGrpcTransport _transport_registry["grpc_asyncio"] = ReservationServiceGrpcAsyncIOTransport _transport_registry["rest"] = ReservationServiceRestTransport diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/base.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/base.py index 483fd140ab26..a3216df37cb1 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/base.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_reservation_v1 import gapic_version as package_version -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc.py index ec6f8f55dd60..de99768eacea 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from .base import DEFAULT_CLIENT_INFO, ReservationServiceTransport @@ -531,12 +531,12 @@ def create_capacity_commitment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_capacity_commitment" not in self._stubs: - self._stubs[ - "create_capacity_commitment" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/CreateCapacityCommitment", - request_serializer=reservation.CreateCapacityCommitmentRequest.serialize, - response_deserializer=reservation.CapacityCommitment.deserialize, + self._stubs["create_capacity_commitment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/CreateCapacityCommitment", + request_serializer=reservation.CreateCapacityCommitmentRequest.serialize, + response_deserializer=reservation.CapacityCommitment.deserialize, + ) ) return self._stubs["create_capacity_commitment"] @@ -619,12 +619,12 @@ def delete_capacity_commitment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_capacity_commitment" not in self._stubs: - self._stubs[ - "delete_capacity_commitment" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/DeleteCapacityCommitment", - request_serializer=reservation.DeleteCapacityCommitmentRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_capacity_commitment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/DeleteCapacityCommitment", + request_serializer=reservation.DeleteCapacityCommitmentRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_capacity_commitment"] @@ -656,12 +656,12 @@ def update_capacity_commitment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_capacity_commitment" not in self._stubs: - self._stubs[ - "update_capacity_commitment" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/UpdateCapacityCommitment", - request_serializer=reservation.UpdateCapacityCommitmentRequest.serialize, - response_deserializer=reservation.CapacityCommitment.deserialize, + self._stubs["update_capacity_commitment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/UpdateCapacityCommitment", + request_serializer=reservation.UpdateCapacityCommitmentRequest.serialize, + response_deserializer=reservation.CapacityCommitment.deserialize, + ) ) return self._stubs["update_capacity_commitment"] @@ -732,12 +732,12 @@ def merge_capacity_commitments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "merge_capacity_commitments" not in self._stubs: - self._stubs[ - "merge_capacity_commitments" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/MergeCapacityCommitments", - request_serializer=reservation.MergeCapacityCommitmentsRequest.serialize, - response_deserializer=reservation.CapacityCommitment.deserialize, + self._stubs["merge_capacity_commitments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/MergeCapacityCommitments", + request_serializer=reservation.MergeCapacityCommitmentsRequest.serialize, + response_deserializer=reservation.CapacityCommitment.deserialize, + ) ) return self._stubs["merge_capacity_commitments"] diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc_asyncio.py index 59baf98587eb..aa879acbfeb1 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc_asyncio.py @@ -17,25 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from .base import DEFAULT_CLIENT_INFO, ReservationServiceTransport from .grpc import ReservationServiceGrpcTransport @@ -547,12 +547,12 @@ def create_capacity_commitment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_capacity_commitment" not in self._stubs: - self._stubs[ - "create_capacity_commitment" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/CreateCapacityCommitment", - request_serializer=reservation.CreateCapacityCommitmentRequest.serialize, - response_deserializer=reservation.CapacityCommitment.deserialize, + self._stubs["create_capacity_commitment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/CreateCapacityCommitment", + request_serializer=reservation.CreateCapacityCommitmentRequest.serialize, + response_deserializer=reservation.CapacityCommitment.deserialize, + ) ) return self._stubs["create_capacity_commitment"] @@ -638,12 +638,12 @@ def delete_capacity_commitment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_capacity_commitment" not in self._stubs: - self._stubs[ - "delete_capacity_commitment" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/DeleteCapacityCommitment", - request_serializer=reservation.DeleteCapacityCommitmentRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_capacity_commitment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/DeleteCapacityCommitment", + request_serializer=reservation.DeleteCapacityCommitmentRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_capacity_commitment"] @@ -676,12 +676,12 @@ def update_capacity_commitment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_capacity_commitment" not in self._stubs: - self._stubs[ - "update_capacity_commitment" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/UpdateCapacityCommitment", - request_serializer=reservation.UpdateCapacityCommitmentRequest.serialize, - response_deserializer=reservation.CapacityCommitment.deserialize, + self._stubs["update_capacity_commitment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/UpdateCapacityCommitment", + request_serializer=reservation.UpdateCapacityCommitmentRequest.serialize, + response_deserializer=reservation.CapacityCommitment.deserialize, + ) ) return self._stubs["update_capacity_commitment"] @@ -753,12 +753,12 @@ def merge_capacity_commitments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "merge_capacity_commitments" not in self._stubs: - self._stubs[ - "merge_capacity_commitments" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.reservation.v1.ReservationService/MergeCapacityCommitments", - request_serializer=reservation.MergeCapacityCommitmentsRequest.serialize, - response_deserializer=reservation.CapacityCommitment.deserialize, + self._stubs["merge_capacity_commitments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.reservation.v1.ReservationService/MergeCapacityCommitments", + request_serializer=reservation.MergeCapacityCommitmentsRequest.serialize, + response_deserializer=reservation.CapacityCommitment.deserialize, + ) ) return self._stubs["merge_capacity_commitments"] diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest.py index 997d189958b7..dcf1dfc39087 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest.py @@ -16,23 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseReservationServiceRestTransport @@ -1749,9 +1749,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseCreateAssignment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseCreateAssignment._get_http_options() request, metadata = self._interceptor.pre_create_assignment( request, metadata @@ -1918,9 +1916,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseCreateCapacityCommitment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseCreateCapacityCommitment._get_http_options() request, metadata = self._interceptor.pre_create_capacity_commitment( request, metadata @@ -2076,9 +2072,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseCreateReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseCreateReservation._get_http_options() request, metadata = self._interceptor.pre_create_reservation( request, metadata @@ -2232,9 +2226,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseCreateReservationGroup._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseCreateReservationGroup._get_http_options() request, metadata = self._interceptor.pre_create_reservation_group( request, metadata @@ -2385,9 +2377,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseDeleteAssignment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseDeleteAssignment._get_http_options() request, metadata = self._interceptor.pre_delete_assignment( request, metadata @@ -2409,7 +2399,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2496,9 +2486,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseDeleteCapacityCommitment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseDeleteCapacityCommitment._get_http_options() request, metadata = self._interceptor.pre_delete_capacity_commitment( request, metadata @@ -2520,7 +2508,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2608,9 +2596,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseDeleteReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseDeleteReservation._get_http_options() request, metadata = self._interceptor.pre_delete_reservation( request, metadata @@ -2632,7 +2618,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2718,9 +2704,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseDeleteReservationGroup._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseDeleteReservationGroup._get_http_options() request, metadata = self._interceptor.pre_delete_reservation_group( request, metadata @@ -2742,7 +2726,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2837,9 +2821,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseFailoverReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseFailoverReservation._get_http_options() request, metadata = self._interceptor.pre_failover_reservation( request, metadata @@ -2992,9 +2974,7 @@ def __call__( Represents a BI Reservation. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseGetBiReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseGetBiReservation._get_http_options() request, metadata = self._interceptor.pre_get_bi_reservation( request, metadata @@ -3154,9 +3134,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseGetCapacityCommitment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseGetCapacityCommitment._get_http_options() request, metadata = self._interceptor.pre_get_capacity_commitment( request, metadata @@ -3378,9 +3356,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseReservationServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -3526,9 +3502,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseGetReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseGetReservation._get_http_options() request, metadata = self._interceptor.pre_get_reservation(request, metadata) transcoded_request = _BaseReservationServiceRestTransport._BaseGetReservation._get_transcoded_request( @@ -3674,9 +3648,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseGetReservationGroup._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseGetReservationGroup._get_http_options() request, metadata = self._interceptor.pre_get_reservation_group( request, metadata @@ -3826,9 +3798,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseListAssignments._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseListAssignments._get_http_options() request, metadata = self._interceptor.pre_list_assignments( request, metadata @@ -3978,9 +3948,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseListCapacityCommitments._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseListCapacityCommitments._get_http_options() request, metadata = self._interceptor.pre_list_capacity_commitments( request, metadata @@ -4132,9 +4100,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseListReservationGroups._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseListReservationGroups._get_http_options() request, metadata = self._interceptor.pre_list_reservation_groups( request, metadata @@ -4286,9 +4252,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseListReservations._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseListReservations._get_http_options() request, metadata = self._interceptor.pre_list_reservations( request, metadata @@ -4452,9 +4416,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseMergeCapacityCommitments._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseMergeCapacityCommitments._get_http_options() request, metadata = self._interceptor.pre_merge_capacity_commitments( request, metadata @@ -4618,9 +4580,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseMoveAssignment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseMoveAssignment._get_http_options() request, metadata = self._interceptor.pre_move_assignment(request, metadata) transcoded_request = _BaseReservationServiceRestTransport._BaseMoveAssignment._get_transcoded_request( @@ -4773,9 +4733,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseSearchAllAssignments._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseSearchAllAssignments._get_http_options() request, metadata = self._interceptor.pre_search_all_assignments( request, metadata @@ -4929,9 +4887,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseSearchAssignments._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseSearchAssignments._get_http_options() request, metadata = self._interceptor.pre_search_assignments( request, metadata @@ -5154,9 +5110,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseReservationServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -5308,9 +5262,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseSplitCapacityCommitment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseSplitCapacityCommitment._get_http_options() request, metadata = self._interceptor.pre_split_capacity_commitment( request, metadata @@ -5465,9 +5417,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5624,9 +5574,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseUpdateAssignment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseUpdateAssignment._get_http_options() request, metadata = self._interceptor.pre_update_assignment( request, metadata @@ -5777,9 +5725,7 @@ def __call__( Represents a BI Reservation. """ - http_options = ( - _BaseReservationServiceRestTransport._BaseUpdateBiReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseUpdateBiReservation._get_http_options() request, metadata = self._interceptor.pre_update_bi_reservation( request, metadata @@ -5948,9 +5894,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseUpdateCapacityCommitment._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseUpdateCapacityCommitment._get_http_options() request, metadata = self._interceptor.pre_update_capacity_commitment( request, metadata @@ -6106,9 +6050,7 @@ def __call__( """ - http_options = ( - _BaseReservationServiceRestTransport._BaseUpdateReservation._get_http_options() - ) + http_options = _BaseReservationServiceRestTransport._BaseUpdateReservation._get_http_options() request, metadata = self._interceptor.pre_update_reservation( request, metadata @@ -6219,7 +6161,9 @@ def create_capacity_commitment( ]: # 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._CreateCapacityCommitment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCapacityCommitment( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_reservation( @@ -6239,7 +6183,9 @@ def create_reservation_group( ]: # 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._CreateReservationGroup(self._session, self._host, self._interceptor) # type: ignore + return self._CreateReservationGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_assignment( @@ -6255,7 +6201,9 @@ def delete_capacity_commitment( ) -> Callable[[reservation.DeleteCapacityCommitmentRequest], empty_pb2.Empty]: # 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._DeleteCapacityCommitment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCapacityCommitment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_reservation( @@ -6271,7 +6219,9 @@ def delete_reservation_group( ) -> Callable[[reservation.DeleteReservationGroupRequest], empty_pb2.Empty]: # 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._DeleteReservationGroup(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteReservationGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def failover_reservation( @@ -6344,7 +6294,9 @@ def list_capacity_commitments( ]: # 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._ListCapacityCommitments(self._session, self._host, self._interceptor) # type: ignore + return self._ListCapacityCommitments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_reservation_groups( @@ -6375,7 +6327,9 @@ def merge_capacity_commitments( ]: # 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._MergeCapacityCommitments(self._session, self._host, self._interceptor) # type: ignore + return self._MergeCapacityCommitments( + self._session, self._host, self._interceptor + ) # type: ignore @property def move_assignment( @@ -6423,7 +6377,9 @@ def split_capacity_commitment( ]: # 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._SplitCapacityCommitment(self._session, self._host, self._interceptor) # type: ignore + return self._SplitCapacityCommitment( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( @@ -6460,7 +6416,9 @@ def update_capacity_commitment( ]: # 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._UpdateCapacityCommitment(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCapacityCommitment( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_reservation( diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest_base.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest_base.py index 05dc1f45f992..503fafebdd2c 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest_base.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/services/reservation_service/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from .base import DEFAULT_CLIENT_INFO, ReservationServiceTransport diff --git a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/types/reservation.py b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/types/reservation.py index 2cdffa3551cb..9829cd7325eb 100644 --- a/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/types/reservation.py +++ b/packages/google-cloud-bigquery-reservation/google/cloud/bigquery_reservation_v1/types/reservation.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -88,6 +88,7 @@ class Edition(proto.Enum): ENTERPRISE_PLUS (3): Enterprise Plus edition. """ + EDITION_UNSPECIFIED = 0 STANDARD = 1 ENTERPRISE = 2 @@ -114,6 +115,7 @@ class FailoverMode(proto.Enum): writes are replicated to the secondary. There can be data loss for hard failover. """ + FAILOVER_MODE_UNSPECIFIED = 0 SOFT = 1 HARD = 2 @@ -373,6 +375,7 @@ class ScalingMode(proto.Enum): be set to false. Otherwise the request will be rejected with error code ``google.rpc.Code.INVALID_ARGUMENT``. """ + SCALING_MODE_UNSPECIFIED = 0 AUTOSCALE_ONLY = 1 IDLE_SLOTS_ONLY = 2 @@ -718,6 +721,7 @@ class CommitmentPlan(proto.Enum): renewal_plan is NONE, capacity commitment will be removed at the end of its commitment period. """ + COMMITMENT_PLAN_UNSPECIFIED = 0 FLEX = 3 FLEX_FLAT_RATE = 7 @@ -747,6 +751,7 @@ class State(proto.Enum): Capacity commitment is failed to be activated by the backend. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ACTIVE = 2 @@ -1443,6 +1448,7 @@ class JobType(proto.Enum): priority over a default BACKGROUND reservation assignment (if it exists). """ + JOB_TYPE_UNSPECIFIED = 0 PIPELINE = 1 QUERY = 2 @@ -1467,6 +1473,7 @@ class State(proto.Enum): ACTIVE (2): Assignment is ready. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-bigquery-reservation/noxfile.py b/packages/google-cloud-bigquery-reservation/noxfile.py index 2d2510302db0..9dc852f65156 100644 --- a/packages/google-cloud-bigquery-reservation/noxfile.py +++ b/packages/google-cloud-bigquery-reservation/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_async.py b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_async.py index 5112660e3160..d617d2c60f86 100644 --- a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_async.py +++ b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-reservation -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigqueryreservation_v1_generated_ReservationService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_reservation_v1 diff --git a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_sync.py b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_sync.py index b5562ac5e24b..bbc6a317891b 100644 --- a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-reservation -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigqueryreservation_v1_generated_ReservationService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_reservation_v1 diff --git a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_async.py b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_async.py index aee282d6ad98..84cfd345a4f1 100644 --- a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_async.py +++ b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-reservation -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigqueryreservation_v1_generated_ReservationService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_reservation_v1 diff --git a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_sync.py b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_sync.py index 5be48ab69869..c5f7d565048b 100644 --- a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_sync.py +++ b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-reservation -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigqueryreservation_v1_generated_ReservationService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_reservation_v1 diff --git a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_async.py b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_async.py index 59c3533f454d..9e1836e7e570 100644 --- a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_async.py +++ b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-reservation -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigqueryreservation_v1_generated_ReservationService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_reservation_v1 diff --git a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_sync.py b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_sync.py index 71fb5faa7c99..6933dfd7e90b 100644 --- a/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-bigquery-reservation/samples/generated_samples/bigqueryreservation_v1_generated_reservation_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-bigquery-reservation -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START bigqueryreservation_v1_generated_ReservationService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import bigquery_reservation_v1 diff --git a/packages/google-cloud-bigquery-reservation/tests/unit/gapic/bigquery_reservation_v1/test_reservation_service.py b/packages/google-cloud-bigquery-reservation/tests/unit/gapic/bigquery_reservation_v1/test_reservation_service.py index 656d42267d44..bbf22b4f2211 100644 --- a/packages/google-cloud-bigquery-reservation/tests/unit/gapic/bigquery_reservation_v1/test_reservation_service.py +++ b/packages/google-cloud-bigquery-reservation/tests/unit/gapic/bigquery_reservation_v1/test_reservation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,22 +43,27 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.bigquery_reservation_v1.services.reservation_service import ( ReservationServiceAsyncClient, @@ -66,8 +71,8 @@ pagers, transports, ) -from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation from google.cloud.bigquery_reservation_v1.types import reservation +from google.cloud.bigquery_reservation_v1.types import reservation as gcbr_reservation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -991,10 +996,9 @@ def test_reservation_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1043,9 @@ def test_reservation_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1081,9 @@ def test_reservation_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1329,13 +1331,13 @@ def test_reservation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1477,9 +1479,9 @@ def test_create_reservation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_reservation] = ( + mock_rpc + ) request = {} client.create_reservation(request) @@ -1863,9 +1865,9 @@ def test_list_reservations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_reservations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_reservations] = ( + mock_rpc + ) request = {} client.list_reservations(request) @@ -2770,9 +2772,9 @@ def test_delete_reservation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_reservation] = ( + mock_rpc + ) request = {} client.delete_reservation(request) @@ -3122,9 +3124,9 @@ def test_update_reservation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_reservation] = ( + mock_rpc + ) request = {} client.update_reservation(request) @@ -3520,9 +3522,9 @@ def test_failover_reservation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_reservation] = ( + mock_rpc + ) request = {} client.failover_reservation(request) @@ -6546,9 +6548,9 @@ def test_create_assignment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_assignment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_assignment] = ( + mock_rpc + ) request = {} client.create_assignment(request) @@ -6901,9 +6903,9 @@ def test_list_assignments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_assignments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_assignments] = ( + mock_rpc + ) request = {} client.list_assignments(request) @@ -7421,9 +7423,9 @@ def test_delete_assignment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_assignment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_assignment] = ( + mock_rpc + ) request = {} client.delete_assignment(request) @@ -7757,9 +7759,9 @@ def test_search_assignments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_assignments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_assignments] = ( + mock_rpc + ) request = {} client.search_assignments(request) @@ -8315,9 +8317,9 @@ def test_search_all_assignments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_all_assignments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_all_assignments] = ( + mock_rpc + ) request = {} client.search_all_assignments(request) @@ -9224,9 +9226,9 @@ def test_update_assignment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_assignment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_assignment] = ( + mock_rpc + ) request = {} client.update_assignment(request) @@ -9585,9 +9587,9 @@ def test_get_bi_reservation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_bi_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_bi_reservation] = ( + mock_rpc + ) request = {} client.get_bi_reservation(request) @@ -9927,9 +9929,9 @@ def test_update_bi_reservation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_bi_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_bi_reservation] = ( + mock_rpc + ) request = {} client.update_bi_reservation(request) @@ -10961,9 +10963,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -11496,9 +11498,9 @@ def test_get_reservation_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_reservation_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_reservation_group] = ( + mock_rpc + ) request = {} client.get_reservation_group(request) @@ -12647,9 +12649,9 @@ def test_create_reservation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_reservation] = ( + mock_rpc + ) request = {} client.create_reservation(request) @@ -12834,9 +12836,9 @@ def test_list_reservations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_reservations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_reservations] = ( + mock_rpc + ) request = {} client.list_reservations(request) @@ -13274,9 +13276,9 @@ def test_delete_reservation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_reservation] = ( + mock_rpc + ) request = {} client.delete_reservation(request) @@ -13453,9 +13455,9 @@ def test_update_reservation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_reservation] = ( + mock_rpc + ) request = {} client.update_reservation(request) @@ -13557,9 +13559,9 @@ def test_failover_reservation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.failover_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.failover_reservation] = ( + mock_rpc + ) request = {} client.failover_reservation(request) @@ -14903,9 +14905,9 @@ def test_create_assignment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_assignment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_assignment] = ( + mock_rpc + ) request = {} client.create_assignment(request) @@ -15090,9 +15092,9 @@ def test_list_assignments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_assignments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_assignments] = ( + mock_rpc + ) request = {} client.list_assignments(request) @@ -15352,9 +15354,9 @@ def test_delete_assignment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_assignment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_assignment] = ( + mock_rpc + ) request = {} client.delete_assignment(request) @@ -15531,9 +15533,9 @@ def test_search_assignments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_assignments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_assignments] = ( + mock_rpc + ) request = {} client.search_assignments(request) @@ -15796,9 +15798,9 @@ def test_search_all_assignments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_all_assignments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_all_assignments] = ( + mock_rpc + ) request = {} client.search_all_assignments(request) @@ -16241,9 +16243,9 @@ def test_update_assignment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_assignment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_assignment] = ( + mock_rpc + ) request = {} client.update_assignment(request) @@ -16345,9 +16347,9 @@ def test_get_bi_reservation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_bi_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_bi_reservation] = ( + mock_rpc + ) request = {} client.get_bi_reservation(request) @@ -16528,9 +16530,9 @@ def test_update_bi_reservation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_bi_reservation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_bi_reservation] = ( + mock_rpc + ) request = {} client.update_bi_reservation(request) @@ -16995,9 +16997,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -17283,9 +17285,9 @@ def test_get_reservation_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_reservation_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_reservation_group] = ( + mock_rpc + ) request = {} client.get_reservation_group(request) @@ -19581,8 +19583,9 @@ def test_create_reservation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19770,18 +19773,20 @@ def test_create_reservation_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_create_reservation" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_create_reservation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_create_reservation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_create_reservation" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_create_reservation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_create_reservation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19836,8 +19841,9 @@ def test_list_reservations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19900,18 +19906,20 @@ def test_list_reservations_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_list_reservations" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_list_reservations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_list_reservations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_list_reservations" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_list_reservations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_list_reservations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19969,8 +19977,9 @@ def test_get_reservation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20055,18 +20064,20 @@ def test_get_reservation_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_get_reservation" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_get_reservation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_get_reservation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_get_reservation" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_get_reservation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_get_reservation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20119,8 +20130,9 @@ def test_delete_reservation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20177,13 +20189,13 @@ def test_delete_reservation_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "pre_delete_reservation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_delete_reservation" + ) as pre, + ): pre.assert_not_called() pb_message = reservation.DeleteReservationRequest.pb( reservation.DeleteReservationRequest() @@ -20232,8 +20244,9 @@ def test_update_reservation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20425,18 +20438,20 @@ def test_update_reservation_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_update_reservation" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_update_reservation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_update_reservation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_update_reservation" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_update_reservation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_update_reservation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20491,8 +20506,9 @@ def test_failover_reservation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20577,18 +20593,20 @@ def test_failover_reservation_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_failover_reservation" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_failover_reservation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_failover_reservation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_failover_reservation" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_failover_reservation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_failover_reservation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20641,8 +20659,9 @@ def test_create_capacity_commitment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20810,18 +20829,22 @@ def test_create_capacity_commitment_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_create_capacity_commitment" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_create_capacity_commitment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_create_capacity_commitment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_create_capacity_commitment", + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_create_capacity_commitment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "pre_create_capacity_commitment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20876,8 +20899,9 @@ def test_list_capacity_commitments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20940,18 +20964,22 @@ def test_list_capacity_commitments_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_list_capacity_commitments" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_list_capacity_commitments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_list_capacity_commitments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_list_capacity_commitments", + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_list_capacity_commitments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "pre_list_capacity_commitments", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21011,8 +21039,9 @@ def test_get_capacity_commitment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21091,18 +21120,20 @@ def test_get_capacity_commitment_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_get_capacity_commitment" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_get_capacity_commitment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_get_capacity_commitment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_get_capacity_commitment" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_get_capacity_commitment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_get_capacity_commitment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21159,8 +21190,9 @@ def test_delete_capacity_commitment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21219,13 +21251,14 @@ def test_delete_capacity_commitment_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "pre_delete_capacity_commitment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "pre_delete_capacity_commitment", + ) as pre, + ): pre.assert_not_called() pb_message = reservation.DeleteCapacityCommitmentRequest.pb( reservation.DeleteCapacityCommitmentRequest() @@ -21274,8 +21307,9 @@ def test_update_capacity_commitment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21447,18 +21481,22 @@ def test_update_capacity_commitment_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_update_capacity_commitment" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_update_capacity_commitment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_update_capacity_commitment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_update_capacity_commitment", + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_update_capacity_commitment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "pre_update_capacity_commitment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21515,8 +21553,9 @@ def test_split_capacity_commitment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21578,18 +21617,22 @@ def test_split_capacity_commitment_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_split_capacity_commitment" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_split_capacity_commitment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_split_capacity_commitment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_split_capacity_commitment", + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_split_capacity_commitment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "pre_split_capacity_commitment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21647,8 +21690,9 @@ def test_merge_capacity_commitments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21725,18 +21769,22 @@ def test_merge_capacity_commitments_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_merge_capacity_commitments" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_merge_capacity_commitments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_merge_capacity_commitments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_merge_capacity_commitments", + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_merge_capacity_commitments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "pre_merge_capacity_commitments", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21791,8 +21839,9 @@ def test_create_assignment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21938,18 +21987,20 @@ def test_create_assignment_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_create_assignment" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_create_assignment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_create_assignment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_create_assignment" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_create_assignment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_create_assignment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22002,8 +22053,9 @@ def test_list_assignments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22066,18 +22118,20 @@ def test_list_assignments_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_list_assignments" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_list_assignments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_list_assignments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_list_assignments" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_list_assignments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_list_assignments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22137,8 +22191,9 @@ def test_delete_assignment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22197,13 +22252,13 @@ def test_delete_assignment_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "pre_delete_assignment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_delete_assignment" + ) as pre, + ): pre.assert_not_called() pb_message = reservation.DeleteAssignmentRequest.pb( reservation.DeleteAssignmentRequest() @@ -22248,8 +22303,9 @@ def test_search_assignments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22312,18 +22368,20 @@ def test_search_assignments_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_search_assignments" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_search_assignments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_search_assignments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_search_assignments" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_search_assignments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_search_assignments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22381,8 +22439,9 @@ def test_search_all_assignments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22445,18 +22504,20 @@ def test_search_all_assignments_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_search_all_assignments" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_search_all_assignments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_search_all_assignments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_search_all_assignments" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_search_all_assignments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_search_all_assignments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22516,8 +22577,9 @@ def test_move_assignment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22590,18 +22652,20 @@ def test_move_assignment_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_move_assignment" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_move_assignment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_move_assignment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_move_assignment" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_move_assignment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_move_assignment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22658,8 +22722,9 @@ def test_update_assignment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22809,18 +22874,20 @@ def test_update_assignment_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_update_assignment" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_update_assignment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_update_assignment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_update_assignment" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_update_assignment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_update_assignment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22873,8 +22940,9 @@ def test_get_bi_reservation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22939,18 +23007,20 @@ def test_get_bi_reservation_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_get_bi_reservation" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_get_bi_reservation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_get_bi_reservation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_get_bi_reservation" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_get_bi_reservation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_get_bi_reservation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23005,8 +23075,9 @@ def test_update_bi_reservation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23152,18 +23223,20 @@ def test_update_bi_reservation_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_update_bi_reservation" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_update_bi_reservation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_update_bi_reservation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_update_bi_reservation" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_update_bi_reservation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_update_bi_reservation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23218,8 +23291,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23283,18 +23357,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23347,8 +23423,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23412,18 +23489,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23476,8 +23555,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23539,18 +23619,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23606,8 +23688,9 @@ def test_create_reservation_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23740,18 +23823,21 @@ def test_create_reservation_group_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_create_reservation_group" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_create_reservation_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_create_reservation_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_create_reservation_group", + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_create_reservation_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_create_reservation_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23808,8 +23894,9 @@ def test_get_reservation_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23874,18 +23961,20 @@ def test_get_reservation_group_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_get_reservation_group" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_get_reservation_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_get_reservation_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_get_reservation_group" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_get_reservation_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_get_reservation_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23942,8 +24031,9 @@ def test_delete_reservation_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24002,13 +24092,13 @@ def test_delete_reservation_group_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "pre_delete_reservation_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_delete_reservation_group" + ) as pre, + ): pre.assert_not_called() pb_message = reservation.DeleteReservationGroupRequest.pb( reservation.DeleteReservationGroupRequest() @@ -24053,8 +24143,9 @@ def test_list_reservation_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24117,18 +24208,20 @@ def test_list_reservation_groups_rest_interceptors(null_interceptor): ) client = ReservationServiceClient(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.ReservationServiceRestInterceptor, "post_list_reservation_groups" - ) as post, mock.patch.object( - transports.ReservationServiceRestInterceptor, - "post_list_reservation_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationServiceRestInterceptor, "pre_list_reservation_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "post_list_reservation_groups" + ) as post, + mock.patch.object( + transports.ReservationServiceRestInterceptor, + "post_list_reservation_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationServiceRestInterceptor, "pre_list_reservation_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24891,11 +24984,14 @@ def test_reservation_service_base_transport(): def test_reservation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_reservation_v1.services.reservation_service.transports.ReservationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_reservation_v1.services.reservation_service.transports.ReservationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationServiceTransport( @@ -24915,9 +25011,12 @@ def test_reservation_service_base_transport_with_credentials_file(): def test_reservation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_reservation_v1.services.reservation_service.transports.ReservationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_reservation_v1.services.reservation_service.transports.ReservationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationServiceTransport() @@ -24995,11 +25094,12 @@ def test_reservation_service_transport_auth_gdch_credentials(transport_class): def test_reservation_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-storage/docs/conf.py b/packages/google-cloud-bigquery-storage/docs/conf.py index 48f599a9ba8d..01851d9f6c09 100644 --- a/packages/google-cloud-bigquery-storage/docs/conf.py +++ b/packages/google-cloud-bigquery-storage/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-bigquery-storage documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/__init__.py index 050d120d5d3e..b3ebb66b6eef 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from google.cloud.bigquery_storage_v1 import client, types diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/async_client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/async_client.py index d2c3463541ae..8715db3a1979 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/async_client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1 import gapic_version as package_version @@ -46,7 +46,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_storage_v1.types import arrow, avro, storage, stream @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BigQueryReadAsyncClient: The constructed client. """ - return BigQueryReadClient.from_service_account_info.__func__(BigQueryReadAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BigQueryReadClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BigQueryReadAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BigQueryReadAsyncClient: The constructed client. """ - return BigQueryReadClient.from_service_account_file.__func__(BigQueryReadAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BigQueryReadClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BigQueryReadAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/client.py index 21074c9ace5a..efad33d545bf 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_storage_v1.types import arrow, avro, storage, stream @@ -667,11 +667,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BigQueryReadClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BigQueryReadClient._read_environment_variables() + ) self._client_cert_source = BigQueryReadClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -706,8 +704,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BigQueryReadTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/base.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/base.py index ae0c02a80771..4f8f8b1cae88 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/base.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1 import gapic_version as package_version from google.cloud.bigquery_storage_v1.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc.py index af53d73e3dd9..1bb4eb1b974d 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_storage_v1.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc_asyncio.py index 8c46d504d13f..77cfc5f750f9 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_read/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_storage_v1.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/async_client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/async_client.py index 4d70a8cfe54a..9f6e9ec2023c 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/async_client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1 import gapic_version as package_version @@ -47,8 +47,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.bigquery_storage_v1.types import storage, stream, table @@ -127,7 +127,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BigQueryWriteAsyncClient: The constructed client. """ - return BigQueryWriteClient.from_service_account_info.__func__(BigQueryWriteAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BigQueryWriteClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BigQueryWriteAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BigQueryWriteAsyncClient: The constructed client. """ - return BigQueryWriteClient.from_service_account_file.__func__(BigQueryWriteAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BigQueryWriteClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BigQueryWriteAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/client.py index 41188eefe4db..5a95b6e76176 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1 import gapic_version as package_version @@ -63,8 +63,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.bigquery_storage_v1.types import storage, stream, table @@ -651,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BigQueryWriteClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BigQueryWriteClient._read_environment_variables() + ) self._client_cert_source = BigQueryWriteClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -690,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BigQueryWriteTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/base.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/base.py index d0fdf09bf803..83c409bfdde1 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/base.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1 import gapic_version as package_version from google.cloud.bigquery_storage_v1.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc.py index d9bdeba663a1..65235810b39a 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_storage_v1.types import storage, stream @@ -500,12 +500,12 @@ def batch_commit_write_streams( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_commit_write_streams" not in self._stubs: - self._stubs[ - "batch_commit_write_streams" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1.BigQueryWrite/BatchCommitWriteStreams", - request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, - response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + self._stubs["batch_commit_write_streams"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1.BigQueryWrite/BatchCommitWriteStreams", + request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, + response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + ) ) return self._stubs["batch_commit_write_streams"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc_asyncio.py index 51287a1b6269..83dfecb3d713 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/services/big_query_write/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_storage_v1.types import storage, stream @@ -509,12 +509,12 @@ def batch_commit_write_streams( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_commit_write_streams" not in self._stubs: - self._stubs[ - "batch_commit_write_streams" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1.BigQueryWrite/BatchCommitWriteStreams", - request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, - response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + self._stubs["batch_commit_write_streams"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1.BigQueryWrite/BatchCommitWriteStreams", + request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, + response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + ) ) return self._stubs["batch_commit_write_streams"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/__init__.py index 93a69b9b56e6..895bca758ba0 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/__init__.py @@ -13,9 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .arrow import ArrowRecordBatch, ArrowSchema, ArrowSerializationOptions -from .avro import AvroRows, AvroSchema, AvroSerializationOptions -from .protobuf import ProtoRows, ProtoSchema +from .arrow import ( + ArrowRecordBatch, + ArrowSchema, + ArrowSerializationOptions, +) +from .avro import ( + AvroRows, + AvroSchema, + AvroSerializationOptions, +) +from .protobuf import ( + ProtoRows, + ProtoSchema, +) from .storage import ( AppendRowsRequest, AppendRowsResponse, @@ -37,8 +48,17 @@ StreamStats, ThrottleState, ) -from .stream import DataFormat, ReadSession, ReadStream, WriteStream, WriteStreamView -from .table import TableFieldSchema, TableSchema +from .stream import ( + DataFormat, + ReadSession, + ReadStream, + WriteStream, + WriteStreamView, +) +from .table import ( + TableFieldSchema, + TableSchema, +) __all__ = ( "ArrowRecordBatch", diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/arrow.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/arrow.py index 209e32a032ad..1f6e684c5540 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/arrow.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/arrow.py @@ -95,6 +95,7 @@ class CompressionCodec(proto.Enum): ZSTD (2): Zstandard compression. """ + COMPRESSION_UNSPECIFIED = 0 LZ4_FRAME = 1 ZSTD = 2 @@ -123,6 +124,7 @@ class PicosTimestampPrecision(proto.Enum): picosecond value. The value will be encoded as a string which conforms to ISO 8601 format. """ + PICOS_TIMESTAMP_PRECISION_UNSPECIFIED = 0 TIMESTAMP_PRECISION_MICROS = 1 TIMESTAMP_PRECISION_NANOS = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/avro.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/avro.py index 45526830a575..1c2ab654a821 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/avro.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/avro.py @@ -113,6 +113,7 @@ class PicosTimestampPrecision(proto.Enum): picosecond value. The value will be encoded as a string which conforms to ISO 8601 format. """ + PICOS_TIMESTAMP_PRECISION_UNSPECIFIED = 0 TIMESTAMP_PRECISION_MICROS = 1 TIMESTAMP_PRECISION_NANOS = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/protobuf.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/protobuf.py index 3f00c5f33efc..84defb9f6dc5 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/protobuf.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/protobuf.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import descriptor_pb2 # type: ignore +import google.protobuf.descriptor_pb2 as descriptor_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/storage.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/storage.py index 3f05715199f0..69c8b9c2da1e 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/storage.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/storage.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.bigquery_storage_v1.types import arrow, avro, protobuf, stream, table @@ -500,6 +500,7 @@ class MissingValueInterpretation(proto.Enum): default value if declared in the table schema, NULL otherwise. """ + MISSING_VALUE_INTERPRETATION_UNSPECIFIED = 0 NULL_VALUE = 1 DEFAULT_VALUE = 2 @@ -585,13 +586,13 @@ class ProtoData(proto.Message): proto.STRING, number=6, ) - missing_value_interpretations: MutableMapping[ - str, MissingValueInterpretation - ] = proto.MapField( - proto.STRING, - proto.ENUM, - number=7, - enum=MissingValueInterpretation, + missing_value_interpretations: MutableMapping[str, MissingValueInterpretation] = ( + proto.MapField( + proto.STRING, + proto.ENUM, + number=7, + enum=MissingValueInterpretation, + ) ) default_missing_value_interpretation: MissingValueInterpretation = proto.Field( proto.ENUM, @@ -907,6 +908,7 @@ class StorageErrorCode(proto.Enum): Permission denied while using customer-managed encryption key. """ + STORAGE_ERROR_CODE_UNSPECIFIED = 0 TABLE_NOT_FOUND = 1 STREAM_ALREADY_COMMITTED = 2 @@ -960,6 +962,7 @@ class RowErrorCode(proto.Enum): FIELDS_ERROR (1): One or more fields in the row has errors. """ + ROW_ERROR_CODE_UNSPECIFIED = 0 FIELDS_ERROR = 1 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/stream.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/stream.py index 135b9e9b09e1..918703038b9c 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/stream.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/stream.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.bigquery_storage_v1.types import arrow, avro @@ -50,6 +50,7 @@ class DataFormat(proto.Enum): message format. See https://arrow.apache.org/ for more details. """ + DATA_FORMAT_UNSPECIFIED = 0 AVRO = 1 ARROW = 2 @@ -73,6 +74,7 @@ class WriteStreamView(proto.Enum): CreateWriteStream returns the full projection of write stream metadata. """ + WRITE_STREAM_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -271,6 +273,7 @@ class ResponseCompressionCodec(proto.Enum): RESPONSE_COMPRESSION_CODEC_LZ4 (2): Use raw LZ4 compression. """ + RESPONSE_COMPRESSION_CODEC_UNSPECIFIED = 0 RESPONSE_COMPRESSION_CODEC_LZ4 = 2 @@ -435,6 +438,7 @@ class Type(proto.Enum): Data is only visible up to the offset to which it was flushed. """ + TYPE_UNSPECIFIED = 0 COMMITTED = 1 PENDING = 2 @@ -451,6 +455,7 @@ class WriteMode(proto.Enum): It is the default value if customers do not specify it. """ + WRITE_MODE_UNSPECIFIED = 0 INSERT = 1 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/table.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/table.py index f41fa9a14d67..5b2d085a9f23 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/table.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1/types/table.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -185,6 +185,7 @@ class Type(proto.Enum): RANGE (16): RANGE """ + TYPE_UNSPECIFIED = 0 STRING = 1 INT64 = 2 @@ -216,6 +217,7 @@ class Mode(proto.Enum): REPEATED (3): No description available. """ + MODE_UNSPECIFIED = 0 NULLABLE = 1 REQUIRED = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/__init__.py index 0e43a48f9c71..0ff6ecd049de 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + if hasattr(api_core, "check_python_version") and hasattr( api_core, "check_dependency_versions" ): # pragma: NO COVER diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/async_client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/async_client.py index fef3e06aff74..86d772a4185a 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/async_client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1alpha import gapic_version as package_version @@ -131,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetastorePartitionServiceAsyncClient: The constructed client. """ - return MetastorePartitionServiceClient.from_service_account_info.__func__(MetastorePartitionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MetastorePartitionServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func(MetastorePartitionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetastorePartitionServiceAsyncClient: The constructed client. """ - return MetastorePartitionServiceClient.from_service_account_file.__func__(MetastorePartitionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MetastorePartitionServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + MetastorePartitionServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -185,7 +193,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return MetastorePartitionServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return MetastorePartitionServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> MetastorePartitionServiceTransport: diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/client.py index d5bf020cb87e..068e4443ab32 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1alpha import gapic_version as package_version @@ -78,9 +78,7 @@ class MetastorePartitionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MetastorePartitionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MetastorePartitionServiceTransport]] _transport_registry["grpc"] = MetastorePartitionServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetastorePartitionServiceGrpcAsyncIOTransport @@ -653,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetastorePartitionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetastorePartitionServiceClient._read_environment_variables() + ) self._client_cert_source = ( MetastorePartitionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetastorePartitionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/__init__.py index 830d53c2088f..6fa517d14e00 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import MetastorePartitionServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[MetastorePartitionServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[MetastorePartitionServiceTransport]] _transport_registry["grpc"] = MetastorePartitionServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetastorePartitionServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/base.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/base.py index b0402e860a45..0d28635e60a7 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/base.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_storage_v1alpha import gapic_version as package_version from google.cloud.bigquery_storage_v1alpha.types import metastore_partition diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc.py index fcd8454bc9b6..76f0d1376746 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_storage_v1alpha.types import metastore_partition @@ -348,12 +348,12 @@ def batch_create_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_create_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_create_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchCreateMetastorePartitions", - request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + self._stubs["batch_create_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchCreateMetastorePartitions", + request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_create_metastore_partitions"] @@ -379,12 +379,12 @@ def batch_delete_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_delete_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_delete_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchDeleteMetastorePartitions", - request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["batch_delete_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchDeleteMetastorePartitions", + request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["batch_delete_metastore_partitions"] @@ -411,12 +411,12 @@ def batch_update_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_update_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchUpdateMetastorePartitions", - request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + self._stubs["batch_update_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchUpdateMetastorePartitions", + request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_update_metastore_partitions"] @@ -478,12 +478,12 @@ def stream_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_metastore_partitions" not in self._stubs: - self._stubs[ - "stream_metastore_partitions" - ] = self._logged_channel.stream_stream( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/StreamMetastorePartitions", - request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + self._stubs["stream_metastore_partitions"] = ( + self._logged_channel.stream_stream( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/StreamMetastorePartitions", + request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["stream_metastore_partitions"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc_asyncio.py index 2f32c46b5544..b81caa4c9a63 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/services/metastore_partition_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_storage_v1alpha.types import metastore_partition @@ -356,12 +356,12 @@ def batch_create_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_create_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_create_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchCreateMetastorePartitions", - request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + self._stubs["batch_create_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchCreateMetastorePartitions", + request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_create_metastore_partitions"] @@ -388,12 +388,12 @@ def batch_delete_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_delete_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_delete_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchDeleteMetastorePartitions", - request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["batch_delete_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchDeleteMetastorePartitions", + request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["batch_delete_metastore_partitions"] @@ -420,12 +420,12 @@ def batch_update_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_update_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchUpdateMetastorePartitions", - request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + self._stubs["batch_update_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/BatchUpdateMetastorePartitions", + request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_update_metastore_partitions"] @@ -487,12 +487,12 @@ def stream_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_metastore_partitions" not in self._stubs: - self._stubs[ - "stream_metastore_partitions" - ] = self._logged_channel.stream_stream( - "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/StreamMetastorePartitions", - request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + self._stubs["stream_metastore_partitions"] = ( + self._logged_channel.stream_stream( + "/google.cloud.bigquery.storage.v1alpha.MetastorePartitionService/StreamMetastorePartitions", + request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["stream_metastore_partitions"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/types/metastore_partition.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/types/metastore_partition.py index 3d6c7364faab..953f0dcf40c2 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/types/metastore_partition.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/types/metastore_partition.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.bigquery_storage_v1alpha.types import partition @@ -162,12 +162,12 @@ class BatchDeleteMetastorePartitionsRequest(proto.Message): proto.STRING, number=1, ) - partition_values: MutableSequence[ - partition.MetastorePartitionValues - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=partition.MetastorePartitionValues, + partition_values: MutableSequence[partition.MetastorePartitionValues] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=partition.MetastorePartitionValues, + ) ) trace_id: str = proto.Field( proto.STRING, @@ -356,12 +356,12 @@ class StreamMetastorePartitionsRequest(proto.Message): proto.STRING, number=1, ) - metastore_partitions: MutableSequence[ - partition.MetastorePartition - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=partition.MetastorePartition, + metastore_partitions: MutableSequence[partition.MetastorePartition] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=partition.MetastorePartition, + ) ) skip_existing_partitions: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/types/partition.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/types/partition.py index ee34aa237f4b..dde296a96b4e 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/types/partition.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1alpha/types/partition.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/__init__.py index 7e49ead2f6a8..b4394f8bd3fc 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + if hasattr(api_core, "check_python_version") and hasattr( api_core, "check_dependency_versions" ): # pragma: NO COVER diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/async_client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/async_client.py index fb4a917e7d10..c129c46e4685 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/async_client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta import gapic_version as package_version @@ -131,7 +131,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetastorePartitionServiceAsyncClient: The constructed client. """ - return MetastorePartitionServiceClient.from_service_account_info.__func__(MetastorePartitionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + MetastorePartitionServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func(MetastorePartitionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetastorePartitionServiceAsyncClient: The constructed client. """ - return MetastorePartitionServiceClient.from_service_account_file.__func__(MetastorePartitionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + MetastorePartitionServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + MetastorePartitionServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -185,7 +193,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return MetastorePartitionServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return MetastorePartitionServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> MetastorePartitionServiceTransport: diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/client.py index 8ad6fccbd146..f4cb6522be41 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta import gapic_version as package_version @@ -78,9 +78,7 @@ class MetastorePartitionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MetastorePartitionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MetastorePartitionServiceTransport]] _transport_registry["grpc"] = MetastorePartitionServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetastorePartitionServiceGrpcAsyncIOTransport @@ -653,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetastorePartitionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetastorePartitionServiceClient._read_environment_variables() + ) self._client_cert_source = ( MetastorePartitionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetastorePartitionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/__init__.py index 830d53c2088f..6fa517d14e00 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import MetastorePartitionServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[MetastorePartitionServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[MetastorePartitionServiceTransport]] _transport_registry["grpc"] = MetastorePartitionServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetastorePartitionServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/base.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/base.py index 8b51d300e52d..d731a0f6bd96 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/base.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.bigquery_storage_v1beta import gapic_version as package_version from google.cloud.bigquery_storage_v1beta.types import metastore_partition diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc.py index 9e826e1b090e..47e8bdd06780 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_storage_v1beta.types import metastore_partition @@ -348,12 +348,12 @@ def batch_create_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_create_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_create_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchCreateMetastorePartitions", - request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + self._stubs["batch_create_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchCreateMetastorePartitions", + request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_create_metastore_partitions"] @@ -379,12 +379,12 @@ def batch_delete_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_delete_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_delete_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchDeleteMetastorePartitions", - request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["batch_delete_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchDeleteMetastorePartitions", + request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["batch_delete_metastore_partitions"] @@ -411,12 +411,12 @@ def batch_update_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_update_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchUpdateMetastorePartitions", - request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + self._stubs["batch_update_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchUpdateMetastorePartitions", + request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_update_metastore_partitions"] @@ -478,12 +478,12 @@ def stream_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_metastore_partitions" not in self._stubs: - self._stubs[ - "stream_metastore_partitions" - ] = self._logged_channel.stream_stream( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/StreamMetastorePartitions", - request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + self._stubs["stream_metastore_partitions"] = ( + self._logged_channel.stream_stream( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/StreamMetastorePartitions", + request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["stream_metastore_partitions"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc_asyncio.py index 8bccb420bebd..77125af97365 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/services/metastore_partition_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_storage_v1beta.types import metastore_partition @@ -356,12 +356,12 @@ def batch_create_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_create_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_create_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchCreateMetastorePartitions", - request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + self._stubs["batch_create_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchCreateMetastorePartitions", + request_serializer=metastore_partition.BatchCreateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchCreateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_create_metastore_partitions"] @@ -388,12 +388,12 @@ def batch_delete_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_delete_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_delete_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchDeleteMetastorePartitions", - request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["batch_delete_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchDeleteMetastorePartitions", + request_serializer=metastore_partition.BatchDeleteMetastorePartitionsRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["batch_delete_metastore_partitions"] @@ -420,12 +420,12 @@ def batch_update_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_metastore_partitions" not in self._stubs: - self._stubs[ - "batch_update_metastore_partitions" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchUpdateMetastorePartitions", - request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + self._stubs["batch_update_metastore_partitions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/BatchUpdateMetastorePartitions", + request_serializer=metastore_partition.BatchUpdateMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.BatchUpdateMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["batch_update_metastore_partitions"] @@ -487,12 +487,12 @@ def stream_metastore_partitions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_metastore_partitions" not in self._stubs: - self._stubs[ - "stream_metastore_partitions" - ] = self._logged_channel.stream_stream( - "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/StreamMetastorePartitions", - request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, - response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + self._stubs["stream_metastore_partitions"] = ( + self._logged_channel.stream_stream( + "/google.cloud.bigquery.storage.v1beta.MetastorePartitionService/StreamMetastorePartitions", + request_serializer=metastore_partition.StreamMetastorePartitionsRequest.serialize, + response_deserializer=metastore_partition.StreamMetastorePartitionsResponse.deserialize, + ) ) return self._stubs["stream_metastore_partitions"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/types/metastore_partition.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/types/metastore_partition.py index bae4198bca74..7c701cc2fc09 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/types/metastore_partition.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/types/metastore_partition.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.bigquery_storage_v1beta.types import partition @@ -162,12 +162,12 @@ class BatchDeleteMetastorePartitionsRequest(proto.Message): proto.STRING, number=1, ) - partition_values: MutableSequence[ - partition.MetastorePartitionValues - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=partition.MetastorePartitionValues, + partition_values: MutableSequence[partition.MetastorePartitionValues] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=partition.MetastorePartitionValues, + ) ) trace_id: str = proto.Field( proto.STRING, @@ -361,12 +361,12 @@ class StreamMetastorePartitionsRequest(proto.Message): proto.STRING, number=1, ) - metastore_partitions: MutableSequence[ - partition.MetastorePartition - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=partition.MetastorePartition, + metastore_partitions: MutableSequence[partition.MetastorePartition] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=partition.MetastorePartition, + ) ) skip_existing_partitions: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/types/partition.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/types/partition.py index 246a3dde8572..1355e49d3ff9 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/types/partition.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta/types/partition.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/__init__.py index b56f2a59cd10..4b00053d2314 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from google.cloud.bigquery_storage_v1beta2 import client, types diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/async_client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/async_client.py index 6550d3c90ce5..23b8f9e8eabc 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/async_client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta2 import gapic_version as package_version @@ -46,7 +46,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_storage_v1beta2.types import arrow, avro, storage, stream @@ -122,7 +122,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BigQueryReadAsyncClient: The constructed client. """ - return BigQueryReadClient.from_service_account_info.__func__(BigQueryReadAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BigQueryReadClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BigQueryReadAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +139,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BigQueryReadAsyncClient: The constructed client. """ - return BigQueryReadClient.from_service_account_file.__func__(BigQueryReadAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BigQueryReadClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BigQueryReadAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/client.py index c881b30d97c2..7bd1ef2a2f7c 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta2 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.bigquery_storage_v1beta2.types import arrow, avro, storage, stream @@ -670,11 +670,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BigQueryReadClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BigQueryReadClient._read_environment_variables() + ) self._client_cert_source = BigQueryReadClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -709,8 +707,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BigQueryReadTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/base.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/base.py index 5c23579c3c81..04af897a34bc 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/base.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta2 import gapic_version as package_version from google.cloud.bigquery_storage_v1beta2.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc.py index 933070d70ea1..70b00dd46044 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_storage_v1beta2.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc_asyncio.py index 4e1fbd8b82db..d9480070e515 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_read/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_storage_v1beta2.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/async_client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/async_client.py index 6f48fd185884..719fecd688a9 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/async_client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -31,15 +32,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta2 import gapic_version as package_version @@ -48,8 +48,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.bigquery_storage_v1beta2.types import storage, stream, table @@ -129,7 +129,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BigQueryWriteAsyncClient: The constructed client. """ - return BigQueryWriteClient.from_service_account_info.__func__(BigQueryWriteAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BigQueryWriteClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BigQueryWriteAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +146,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BigQueryWriteAsyncClient: The constructed client. """ - return BigQueryWriteClient.from_service_account_file.__func__(BigQueryWriteAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BigQueryWriteClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BigQueryWriteAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/client.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/client.py index d22adaad172b..1339a1cfce53 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/client.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta2 import gapic_version as package_version @@ -63,8 +63,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.bigquery_storage_v1beta2.types import storage, stream, table @@ -652,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BigQueryWriteClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BigQueryWriteClient._read_environment_variables() + ) self._client_cert_source = BigQueryWriteClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -691,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BigQueryWriteTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/base.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/base.py index d798bfa8bf80..3ec7406c9a90 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/base.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.bigquery_storage_v1beta2 import gapic_version as package_version from google.cloud.bigquery_storage_v1beta2.types import storage, stream diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc.py index df8e539747c0..215b3f16cdf1 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.bigquery_storage_v1beta2.types import storage, stream @@ -487,12 +487,12 @@ def batch_commit_write_streams( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_commit_write_streams" not in self._stubs: - self._stubs[ - "batch_commit_write_streams" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta2.BigQueryWrite/BatchCommitWriteStreams", - request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, - response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + self._stubs["batch_commit_write_streams"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta2.BigQueryWrite/BatchCommitWriteStreams", + request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, + response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + ) ) return self._stubs["batch_commit_write_streams"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc_asyncio.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc_asyncio.py index d952688a5509..9359e87d9816 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc_asyncio.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/services/big_query_write/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.bigquery_storage_v1beta2.types import storage, stream @@ -496,12 +496,12 @@ def batch_commit_write_streams( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_commit_write_streams" not in self._stubs: - self._stubs[ - "batch_commit_write_streams" - ] = self._logged_channel.unary_unary( - "/google.cloud.bigquery.storage.v1beta2.BigQueryWrite/BatchCommitWriteStreams", - request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, - response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + self._stubs["batch_commit_write_streams"] = ( + self._logged_channel.unary_unary( + "/google.cloud.bigquery.storage.v1beta2.BigQueryWrite/BatchCommitWriteStreams", + request_serializer=storage.BatchCommitWriteStreamsRequest.serialize, + response_deserializer=storage.BatchCommitWriteStreamsResponse.deserialize, + ) ) return self._stubs["batch_commit_write_streams"] diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/__init__.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/__init__.py index 98d72add4983..c8e573647b52 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/__init__.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/__init__.py @@ -13,9 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .arrow import ArrowRecordBatch, ArrowSchema, ArrowSerializationOptions -from .avro import AvroRows, AvroSchema -from .protobuf import ProtoRows, ProtoSchema +from .arrow import ( + ArrowRecordBatch, + ArrowSchema, + ArrowSerializationOptions, +) +from .avro import ( + AvroRows, + AvroSchema, +) +from .protobuf import ( + ProtoRows, + ProtoSchema, +) from .storage import ( AppendRowsRequest, AppendRowsResponse, @@ -36,8 +46,16 @@ StreamStats, ThrottleState, ) -from .stream import DataFormat, ReadSession, ReadStream, WriteStream -from .table import TableFieldSchema, TableSchema +from .stream import ( + DataFormat, + ReadSession, + ReadStream, + WriteStream, +) +from .table import ( + TableFieldSchema, + TableSchema, +) __all__ = ( "ArrowRecordBatch", diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/arrow.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/arrow.py index e079fe1ed52f..5975fc695e32 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/arrow.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/arrow.py @@ -85,6 +85,7 @@ class Format(proto.Enum): Use the message format as of Apache Arrow Release 0.15. """ + FORMAT_UNSPECIFIED = 0 ARROW_0_14 = 1 ARROW_0_15 = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/protobuf.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/protobuf.py index 445a00c48229..d3838615cd79 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/protobuf.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/protobuf.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import descriptor_pb2 # type: ignore +import google.protobuf.descriptor_pb2 as descriptor_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/storage.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/storage.py index 11145e5e2dd7..2ef57feb0eef 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/storage.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/storage.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.bigquery_storage_v1beta2.types import ( @@ -668,6 +668,7 @@ class StorageErrorCode(proto.Enum): STREAM_FINALIZED (6): Stream is finalized. """ + STORAGE_ERROR_CODE_UNSPECIFIED = 0 TABLE_NOT_FOUND = 1 STREAM_ALREADY_COMMITTED = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/stream.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/stream.py index 74e02a5ad7a0..23590aa9a106 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/stream.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/stream.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.bigquery_storage_v1beta2.types import arrow, avro @@ -49,6 +49,7 @@ class DataFormat(proto.Enum): message format. See https://arrow.apache.org/ for more details. """ + DATA_FORMAT_UNSPECIFIED = 0 AVRO = 1 ARROW = 2 @@ -263,6 +264,7 @@ class Type(proto.Enum): Data is only visible up to the offset to which it was flushed. """ + TYPE_UNSPECIFIED = 0 COMMITTED = 1 PENDING = 2 diff --git a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/table.py b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/table.py index 4263b6544f75..400838337bf7 100644 --- a/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/table.py +++ b/packages/google-cloud-bigquery-storage/google/cloud/bigquery_storage_v1beta2/types/table.py @@ -103,6 +103,7 @@ class Type(proto.Enum): JSON (15): JSON, String """ + TYPE_UNSPECIFIED = 0 STRING = 1 INT64 = 2 @@ -133,6 +134,7 @@ class Mode(proto.Enum): REPEATED (3): No description available. """ + MODE_UNSPECIFIED = 0 NULLABLE = 1 REQUIRED = 2 diff --git a/packages/google-cloud-bigquery-storage/noxfile.py b/packages/google-cloud-bigquery-storage/noxfile.py index 25e0b39cd444..ab6d6a7e2f56 100644 --- a/packages/google-cloud-bigquery-storage/noxfile.py +++ b/packages/google-cloud-bigquery-storage/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -160,42 +159,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_read.py b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_read.py index 8f91c771f153..0125d9f22791 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_read.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_read.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,15 +39,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.bigquery_storage_v1.services.big_query_read import ( BigQueryReadAsyncClient, @@ -907,10 +912,9 @@ def test_big_query_read_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +959,9 @@ def test_big_query_read_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +997,9 @@ def test_big_query_read_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1234,13 +1236,13 @@ def test_big_query_read_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1368,9 +1370,9 @@ def test_create_read_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_read_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_read_session] = ( + mock_rpc + ) request = {} client.create_read_session(request) @@ -2059,9 +2061,9 @@ def test_split_read_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.split_read_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.split_read_stream] = ( + mock_rpc + ) request = {} client.split_read_stream(request) @@ -2549,11 +2551,14 @@ def test_big_query_read_base_transport(): def test_big_query_read_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_storage_v1.services.big_query_read.transports.BigQueryReadTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_storage_v1.services.big_query_read.transports.BigQueryReadTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BigQueryReadTransport( @@ -2573,9 +2578,12 @@ def test_big_query_read_base_transport_with_credentials_file(): def test_big_query_read_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_storage_v1.services.big_query_read.transports.BigQueryReadTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_storage_v1.services.big_query_read.transports.BigQueryReadTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BigQueryReadTransport() @@ -2652,11 +2660,12 @@ def test_big_query_read_transport_auth_gdch_credentials(transport_class): def test_big_query_read_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_write.py b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_write.py index b1f90ac031dc..d510c51c98b7 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_write.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1/test_big_query_write.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,18 +39,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.descriptor_pb2 as descriptor_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import descriptor_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.bigquery_storage_v1.services.big_query_write import ( BigQueryWriteAsyncClient, @@ -931,10 +936,9 @@ def test_big_query_write_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +983,9 @@ def test_big_query_write_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1021,9 @@ def test_big_query_write_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1262,13 +1264,13 @@ def test_big_query_write_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1391,9 +1393,9 @@ def test_create_write_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_write_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_write_stream] = ( + mock_rpc + ) request = {} client.create_write_stream(request) @@ -1893,9 +1895,9 @@ def test_get_write_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_write_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_write_stream] = ( + mock_rpc + ) request = {} client.get_write_stream(request) @@ -2227,9 +2229,9 @@ def test_finalize_write_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.finalize_write_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.finalize_write_stream] = ( + mock_rpc + ) request = {} client.finalize_write_stream(request) @@ -3567,11 +3569,14 @@ def test_big_query_write_base_transport(): def test_big_query_write_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_storage_v1.services.big_query_write.transports.BigQueryWriteTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_storage_v1.services.big_query_write.transports.BigQueryWriteTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BigQueryWriteTransport( @@ -3592,9 +3597,12 @@ def test_big_query_write_base_transport_with_credentials_file(): def test_big_query_write_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_storage_v1.services.big_query_write.transports.BigQueryWriteTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_storage_v1.services.big_query_write.transports.BigQueryWriteTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BigQueryWriteTransport() @@ -3673,11 +3681,12 @@ def test_big_query_write_transport_auth_gdch_credentials(transport_class): def test_big_query_write_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1alpha/test_metastore_partition_service.py b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1alpha/test_metastore_partition_service.py index d45a0b2daf00..0a12fe8150dd 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1alpha/test_metastore_partition_service.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1alpha/test_metastore_partition_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,16 +39,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.bigquery_storage_v1alpha.services.metastore_partition_service import ( MetastorePartitionServiceAsyncClient, @@ -976,10 +981,9 @@ def test_metastore_partition_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1028,9 @@ def test_metastore_partition_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1066,9 @@ def test_metastore_partition_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1314,13 +1316,13 @@ def test_metastore_partition_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2986,11 +2988,14 @@ def test_metastore_partition_service_base_transport(): def test_metastore_partition_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_storage_v1alpha.services.metastore_partition_service.transports.MetastorePartitionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_storage_v1alpha.services.metastore_partition_service.transports.MetastorePartitionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetastorePartitionServiceTransport( @@ -3010,9 +3015,12 @@ def test_metastore_partition_service_base_transport_with_credentials_file(): def test_metastore_partition_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_storage_v1alpha.services.metastore_partition_service.transports.MetastorePartitionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_storage_v1alpha.services.metastore_partition_service.transports.MetastorePartitionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetastorePartitionServiceTransport() @@ -3091,11 +3099,12 @@ def test_metastore_partition_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta/test_metastore_partition_service.py b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta/test_metastore_partition_service.py index 06e371e0abcd..83ed25788f6c 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta/test_metastore_partition_service.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta/test_metastore_partition_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,16 +39,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.bigquery_storage_v1beta.services.metastore_partition_service import ( MetastorePartitionServiceAsyncClient, @@ -976,10 +981,9 @@ def test_metastore_partition_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1028,9 @@ def test_metastore_partition_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1066,9 @@ def test_metastore_partition_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1314,13 +1316,13 @@ def test_metastore_partition_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2986,11 +2988,14 @@ def test_metastore_partition_service_base_transport(): def test_metastore_partition_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_storage_v1beta.services.metastore_partition_service.transports.MetastorePartitionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_storage_v1beta.services.metastore_partition_service.transports.MetastorePartitionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetastorePartitionServiceTransport( @@ -3010,9 +3015,12 @@ def test_metastore_partition_service_base_transport_with_credentials_file(): def test_metastore_partition_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_storage_v1beta.services.metastore_partition_service.transports.MetastorePartitionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_storage_v1beta.services.metastore_partition_service.transports.MetastorePartitionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetastorePartitionServiceTransport() @@ -3091,11 +3099,12 @@ def test_metastore_partition_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_read.py b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_read.py index 4ef52adbf875..72b83ca5cb97 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_read.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_read.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,15 +39,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.bigquery_storage_v1beta2.services.big_query_read import ( BigQueryReadAsyncClient, @@ -907,10 +912,9 @@ def test_big_query_read_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +959,9 @@ def test_big_query_read_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +997,9 @@ def test_big_query_read_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1234,13 +1236,13 @@ def test_big_query_read_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1360,9 +1362,9 @@ def test_create_read_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_read_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_read_session] = ( + mock_rpc + ) request = {} client.create_read_session(request) @@ -2043,9 +2045,9 @@ def test_split_read_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.split_read_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.split_read_stream] = ( + mock_rpc + ) request = {} client.split_read_stream(request) @@ -2529,11 +2531,14 @@ def test_big_query_read_base_transport(): def test_big_query_read_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_storage_v1beta2.services.big_query_read.transports.BigQueryReadTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_storage_v1beta2.services.big_query_read.transports.BigQueryReadTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BigQueryReadTransport( @@ -2553,9 +2558,12 @@ def test_big_query_read_base_transport_with_credentials_file(): def test_big_query_read_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_storage_v1beta2.services.big_query_read.transports.BigQueryReadTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_storage_v1beta2.services.big_query_read.transports.BigQueryReadTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BigQueryReadTransport() @@ -2632,11 +2640,12 @@ def test_big_query_read_transport_auth_gdch_credentials(transport_class): def test_big_query_read_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_write.py b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_write.py index c64f3cca1ae0..e6f0e310e4b6 100644 --- a/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_write.py +++ b/packages/google-cloud-bigquery-storage/tests/unit/gapic/bigquery_storage_v1beta2/test_big_query_write.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,18 +39,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.descriptor_pb2 as descriptor_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import descriptor_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.bigquery_storage_v1beta2.services.big_query_write import ( BigQueryWriteAsyncClient, @@ -925,10 +930,9 @@ def test_big_query_write_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +977,9 @@ def test_big_query_write_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1015,9 @@ def test_big_query_write_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1256,13 +1258,13 @@ def test_big_query_write_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1381,9 +1383,9 @@ def test_create_write_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_write_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_write_stream] = ( + mock_rpc + ) request = {} client.create_write_stream(request) @@ -1875,9 +1877,9 @@ def test_get_write_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_write_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_write_stream] = ( + mock_rpc + ) request = {} client.get_write_stream(request) @@ -2205,9 +2207,9 @@ def test_finalize_write_stream_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.finalize_write_stream - ] = mock_rpc + client._transport._wrapped_methods[client._transport.finalize_write_stream] = ( + mock_rpc + ) request = {} client.finalize_write_stream(request) @@ -3541,11 +3543,14 @@ def test_big_query_write_base_transport(): def test_big_query_write_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.bigquery_storage_v1beta2.services.big_query_write.transports.BigQueryWriteTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.bigquery_storage_v1beta2.services.big_query_write.transports.BigQueryWriteTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BigQueryWriteTransport( @@ -3566,9 +3571,12 @@ def test_big_query_write_base_transport_with_credentials_file(): def test_big_query_write_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.bigquery_storage_v1beta2.services.big_query_write.transports.BigQueryWriteTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.bigquery_storage_v1beta2.services.big_query_write.transports.BigQueryWriteTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BigQueryWriteTransport() @@ -3647,11 +3655,12 @@ def test_big_query_write_transport_auth_gdch_credentials(transport_class): def test_big_query_write_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-billing-budgets/docs/conf.py b/packages/google-cloud-billing-budgets/docs/conf.py index c58e6d72952f..b0aed81be6c9 100644 --- a/packages/google-cloud-billing-budgets/docs/conf.py +++ b/packages/google-cloud-billing-budgets/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-billing-budgets documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/__init__.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/__init__.py index 3348259131e8..7354da8e932b 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/__init__.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.budget_service import BudgetServiceAsyncClient, BudgetServiceClient from .types.budget_model import ( Budget, diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/async_client.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/async_client.py index 93ab63af81f8..2a04d7a61b2b 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/async_client.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing.budgets_v1 import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.billing.budgets_v1.services.budget_service import pagers from google.cloud.billing.budgets_v1.types import budget_model, budget_service @@ -118,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BudgetServiceAsyncClient: The constructed client. """ - return BudgetServiceClient.from_service_account_info.__func__(BudgetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BudgetServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BudgetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +135,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BudgetServiceAsyncClient: The constructed client. """ - return BudgetServiceClient.from_service_account_file.__func__(BudgetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BudgetServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BudgetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/client.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/client.py index 476c5a54b07c..72a85f673da6 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/client.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing.budgets_v1 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.billing.budgets_v1.services.budget_service import pagers from google.cloud.billing.budgets_v1.types import budget_model, budget_service @@ -620,11 +620,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BudgetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BudgetServiceClient._read_environment_variables() + ) self._client_cert_source = BudgetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -659,8 +657,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BudgetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/pagers.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/pagers.py index c965d4b799c4..9ee372e1b170 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/pagers.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/base.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/base.py index 3cfd2167d725..09e5b803c4dc 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/base.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.billing.budgets_v1 import gapic_version as package_version from google.cloud.billing.budgets_v1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc.py index 6d70d7c5327e..a8f65cd97791 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.billing.budgets_v1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc_asyncio.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc_asyncio.py index f58af023cfa7..0a06d1359006 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.billing.budgets_v1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest.py index 0a0ad9678645..84a91baf7754 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -638,7 +638,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest_base.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest_base.py index e51199bcd35e..3084176ccd2e 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest_base.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/services/budget_service/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.billing.budgets_v1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/types/budget_model.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/types/budget_model.py index 40497b009259..4b642b504fe9 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/types/budget_model.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/types/budget_model.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -58,6 +58,7 @@ class CalendarPeriod(proto.Enum): YEAR (3): A year. Year starts on January 1. """ + CALENDAR_PERIOD_UNSPECIFIED = 0 MONTH = 1 QUARTER = 2 @@ -246,6 +247,7 @@ class Basis(proto.Enum): It cannot be set in combination with [Filter.custom_period][google.cloud.billing.budgets.v1.Filter.custom_period]. """ + BASIS_UNSPECIFIED = 0 CURRENT_SPEND = 1 FORECASTED_SPEND = 2 @@ -482,6 +484,7 @@ class CreditTypesTreatment(proto.Enum): gross cost to determine the spend for threshold calculations. """ + CREDIT_TYPES_TREATMENT_UNSPECIFIED = 0 INCLUDE_ALL_CREDITS = 1 EXCLUDE_ALL_CREDITS = 2 diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/types/budget_service.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/types/budget_service.py index 654f0f2fcf33..c23ee9e2a443 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/types/budget_service.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1/types/budget_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.billing.budgets_v1.types import budget_model diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/__init__.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/__init__.py index d4802f876684..50537ad6605a 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/__init__.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.budget_service import BudgetServiceAsyncClient, BudgetServiceClient from .types.budget_model import ( AllUpdatesRule, diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/async_client.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/async_client.py index 2143fcc2f06c..d4c9d0ab6572 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/async_client.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing.budgets_v1beta1 import gapic_version as package_version @@ -116,7 +116,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BudgetServiceAsyncClient: The constructed client. """ - return BudgetServiceClient.from_service_account_info.__func__(BudgetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BudgetServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BudgetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +133,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BudgetServiceAsyncClient: The constructed client. """ - return BudgetServiceClient.from_service_account_file.__func__(BudgetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BudgetServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BudgetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/client.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/client.py index 7b673aa5d382..88bc1348bc1c 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/client.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing.budgets_v1beta1 import gapic_version as package_version @@ -616,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BudgetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BudgetServiceClient._read_environment_variables() + ) self._client_cert_source = BudgetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -655,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BudgetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/pagers.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/pagers.py index 627a0fd4827c..3f908aea5dac 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/pagers.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/base.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/base.py index 8caebcf3a193..b0f473baf4c9 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/base.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.billing.budgets_v1beta1 import gapic_version as package_version from google.cloud.billing.budgets_v1beta1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc.py index 85f5af7434a0..952f7505aaa9 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.billing.budgets_v1beta1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc_asyncio.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc_asyncio.py index 927f17a10b44..ff64eae54490 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.billing.budgets_v1beta1.types import budget_model, budget_service diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/types/budget_model.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/types/budget_model.py index c786bfb90521..7ec742eff256 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/types/budget_model.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/types/budget_model.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -58,6 +58,7 @@ class CalendarPeriod(proto.Enum): YEAR (3): A year. Year starts on January 1. """ + CALENDAR_PERIOD_UNSPECIFIED = 0 MONTH = 1 QUARTER = 2 @@ -248,6 +249,7 @@ class Basis(proto.Enum): It cannot be set in combination with [Filter.custom_period][google.cloud.billing.budgets.v1beta1.Filter.custom_period]. """ + BASIS_UNSPECIFIED = 0 CURRENT_SPEND = 1 FORECASTED_SPEND = 2 @@ -452,6 +454,7 @@ class CreditTypesTreatment(proto.Enum): gross cost to determine the spend for threshold calculations. """ + CREDIT_TYPES_TREATMENT_UNSPECIFIED = 0 INCLUDE_ALL_CREDITS = 1 EXCLUDE_ALL_CREDITS = 2 diff --git a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/types/budget_service.py b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/types/budget_service.py index bc613433df39..877fa7744640 100644 --- a/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/types/budget_service.py +++ b/packages/google-cloud-billing-budgets/google/cloud/billing/budgets_v1beta1/types/budget_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.billing.budgets_v1beta1.types import budget_model diff --git a/packages/google-cloud-billing-budgets/noxfile.py b/packages/google-cloud-billing-budgets/noxfile.py index babdcec91fa4..8a411bc43b9a 100644 --- a/packages/google-cloud-billing-budgets/noxfile.py +++ b/packages/google-cloud-billing-budgets/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1/test_budget_service.py b/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1/test_budget_service.py index 9bc890c3ed4e..c2b2458e589d 100644 --- a/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1/test_budget_service.py +++ b/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1/test_budget_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import money_pb2 # type: ignore from google.cloud.billing.budgets_v1.services.budget_service import ( BudgetServiceAsyncClient, @@ -945,10 +950,9 @@ def test_budget_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +997,9 @@ def test_budget_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1035,9 @@ def test_budget_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1278,13 +1280,13 @@ def test_budget_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4481,8 +4483,9 @@ def test_create_budget_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4657,17 +4660,19 @@ def test_create_budget_rest_interceptors(null_interceptor): ) client = BudgetServiceClient(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.BudgetServiceRestInterceptor, "post_create_budget" - ) as post, mock.patch.object( - transports.BudgetServiceRestInterceptor, "post_create_budget_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BudgetServiceRestInterceptor, "pre_create_budget" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "post_create_budget" + ) as post, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "post_create_budget_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "pre_create_budget" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4720,8 +4725,9 @@ def test_update_budget_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4896,17 +4902,19 @@ def test_update_budget_rest_interceptors(null_interceptor): ) client = BudgetServiceClient(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.BudgetServiceRestInterceptor, "post_update_budget" - ) as post, mock.patch.object( - transports.BudgetServiceRestInterceptor, "post_update_budget_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BudgetServiceRestInterceptor, "pre_update_budget" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "post_update_budget" + ) as post, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "post_update_budget_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "pre_update_budget" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4957,8 +4965,9 @@ def test_get_budget_rest_bad_request(request_type=budget_service.GetBudgetReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5025,17 +5034,19 @@ def test_get_budget_rest_interceptors(null_interceptor): ) client = BudgetServiceClient(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.BudgetServiceRestInterceptor, "post_get_budget" - ) as post, mock.patch.object( - transports.BudgetServiceRestInterceptor, "post_get_budget_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BudgetServiceRestInterceptor, "pre_get_budget" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "post_get_budget" + ) as post, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "post_get_budget_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "pre_get_budget" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5086,8 +5097,9 @@ def test_list_budgets_rest_bad_request(request_type=budget_service.ListBudgetsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5150,17 +5162,19 @@ def test_list_budgets_rest_interceptors(null_interceptor): ) client = BudgetServiceClient(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.BudgetServiceRestInterceptor, "post_list_budgets" - ) as post, mock.patch.object( - transports.BudgetServiceRestInterceptor, "post_list_budgets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BudgetServiceRestInterceptor, "pre_list_budgets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "post_list_budgets" + ) as post, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "post_list_budgets_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "pre_list_budgets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5215,8 +5229,9 @@ def test_delete_budget_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5273,13 +5288,13 @@ def test_delete_budget_rest_interceptors(null_interceptor): ) client = BudgetServiceClient(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.BudgetServiceRestInterceptor, "pre_delete_budget" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BudgetServiceRestInterceptor, "pre_delete_budget" + ) as pre, + ): pre.assert_not_called() pb_message = budget_service.DeleteBudgetRequest.pb( budget_service.DeleteBudgetRequest() @@ -5477,11 +5492,14 @@ def test_budget_service_base_transport(): def test_budget_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.billing.budgets_v1.services.budget_service.transports.BudgetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.billing.budgets_v1.services.budget_service.transports.BudgetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BudgetServiceTransport( @@ -5501,9 +5519,12 @@ def test_budget_service_base_transport_with_credentials_file(): def test_budget_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.billing.budgets_v1.services.budget_service.transports.BudgetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.billing.budgets_v1.services.budget_service.transports.BudgetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BudgetServiceTransport() @@ -5581,11 +5602,12 @@ def test_budget_service_transport_auth_gdch_credentials(transport_class): def test_budget_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1beta1/test_budget_service.py b/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1beta1/test_budget_service.py index fad71a75b5c6..d6a4d0c261f3 100644 --- a/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1beta1/test_budget_service.py +++ b/packages/google-cloud-billing-budgets/tests/unit/gapic/budgets_v1beta1/test_budget_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,18 +39,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import money_pb2 # type: ignore from google.cloud.billing.budgets_v1beta1.services.budget_service import ( BudgetServiceAsyncClient, @@ -926,10 +931,9 @@ def test_budget_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -974,10 +978,9 @@ def test_budget_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1013,10 +1016,9 @@ def test_budget_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1257,13 +1259,13 @@ def test_budget_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3111,11 +3113,14 @@ def test_budget_service_base_transport(): def test_budget_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.billing.budgets_v1beta1.services.budget_service.transports.BudgetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.billing.budgets_v1beta1.services.budget_service.transports.BudgetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BudgetServiceTransport( @@ -3135,9 +3140,12 @@ def test_budget_service_base_transport_with_credentials_file(): def test_budget_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.billing.budgets_v1beta1.services.budget_service.transports.BudgetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.billing.budgets_v1beta1.services.budget_service.transports.BudgetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BudgetServiceTransport() @@ -3214,11 +3222,12 @@ def test_budget_service_transport_auth_gdch_credentials(transport_class): def test_budget_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-billing/docs/conf.py b/packages/google-cloud-billing/docs/conf.py index 5141ca39de72..7aef3e5708d8 100644 --- a/packages/google-cloud-billing/docs/conf.py +++ b/packages/google-cloud-billing/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-billing documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/__init__.py b/packages/google-cloud-billing/google/cloud/billing_v1/__init__.py index 8191db500843..d9a2484e60cd 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/__init__.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_billing import CloudBillingAsyncClient, CloudBillingClient from .services.cloud_catalog import CloudCatalogAsyncClient, CloudCatalogClient from .types.cloud_billing import ( diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/async_client.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/async_client.py index c20e023e0724..0d0e07c8166a 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/async_client.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.cloud.billing_v1.services.cloud_billing import pagers from google.cloud.billing_v1.types import cloud_billing @@ -126,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudBillingAsyncClient: The constructed client. """ - return CloudBillingClient.from_service_account_info.__func__(CloudBillingAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudBillingClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudBillingAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudBillingAsyncClient: The constructed client. """ - return CloudBillingClient.from_service_account_file.__func__(CloudBillingAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudBillingClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CloudBillingAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -1246,7 +1248,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import billing_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -1388,7 +1390,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import billing_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -1531,7 +1533,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import billing_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/client.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/client.py index ca3642d04b62..7cbbf8508ac9 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/client.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.cloud.billing_v1.services.cloud_billing import pagers from google.cloud.billing_v1.types import cloud_billing @@ -661,11 +661,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudBillingClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudBillingClient._read_environment_variables() + ) self._client_cert_source = CloudBillingClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -700,8 +698,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudBillingTransport, transport) self._api_endpoint = self._transport.host @@ -1695,7 +1692,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import billing_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -1838,7 +1835,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import billing_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -1982,7 +1979,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import billing_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/pagers.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/pagers.py index d8056858e532..603456ba83ff 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/pagers.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/base.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/base.py index a2f04fb0c528..cee1f5fd7beb 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/base.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing_v1 import gapic_version as package_version from google.cloud.billing_v1.types import cloud_billing diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc.py index 9e0f86df4bc1..4a92b6b360a0 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.billing_v1.types import cloud_billing @@ -582,12 +582,12 @@ def update_project_billing_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_project_billing_info" not in self._stubs: - self._stubs[ - "update_project_billing_info" - ] = self._logged_channel.unary_unary( - "/google.cloud.billing.v1.CloudBilling/UpdateProjectBillingInfo", - request_serializer=cloud_billing.UpdateProjectBillingInfoRequest.serialize, - response_deserializer=cloud_billing.ProjectBillingInfo.deserialize, + self._stubs["update_project_billing_info"] = ( + self._logged_channel.unary_unary( + "/google.cloud.billing.v1.CloudBilling/UpdateProjectBillingInfo", + request_serializer=cloud_billing.UpdateProjectBillingInfoRequest.serialize, + response_deserializer=cloud_billing.ProjectBillingInfo.deserialize, + ) ) return self._stubs["update_project_billing_info"] diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc_asyncio.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc_asyncio.py index a048beedde52..f8b16c3a9938 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc_asyncio.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.billing_v1.types import cloud_billing @@ -594,12 +594,12 @@ def update_project_billing_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_project_billing_info" not in self._stubs: - self._stubs[ - "update_project_billing_info" - ] = self._logged_channel.unary_unary( - "/google.cloud.billing.v1.CloudBilling/UpdateProjectBillingInfo", - request_serializer=cloud_billing.UpdateProjectBillingInfoRequest.serialize, - response_deserializer=cloud_billing.ProjectBillingInfo.deserialize, + self._stubs["update_project_billing_info"] = ( + self._logged_channel.unary_unary( + "/google.cloud.billing.v1.CloudBilling/UpdateProjectBillingInfo", + request_serializer=cloud_billing.UpdateProjectBillingInfoRequest.serialize, + response_deserializer=cloud_billing.ProjectBillingInfo.deserialize, + ) ) return self._stubs["update_project_billing_info"] diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest.py index ce8bc20edf43..f9a5c3e5ce53 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -859,9 +859,7 @@ def __call__( """ - http_options = ( - _BaseCloudBillingRestTransport._BaseCreateBillingAccount._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseCreateBillingAccount._get_http_options() request, metadata = self._interceptor.pre_create_billing_account( request, metadata @@ -1013,9 +1011,7 @@ def __call__( """ - http_options = ( - _BaseCloudBillingRestTransport._BaseGetBillingAccount._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseGetBillingAccount._get_http_options() request, metadata = self._interceptor.pre_get_billing_account( request, metadata @@ -1386,9 +1382,7 @@ def __call__( """ - http_options = ( - _BaseCloudBillingRestTransport._BaseGetProjectBillingInfo._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseGetProjectBillingInfo._get_http_options() request, metadata = self._interceptor.pre_get_project_billing_info( request, metadata @@ -1534,9 +1528,7 @@ def __call__( Response message for ``ListBillingAccounts``. """ - http_options = ( - _BaseCloudBillingRestTransport._BaseListBillingAccounts._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseListBillingAccounts._get_http_options() request, metadata = self._interceptor.pre_list_billing_accounts( request, metadata @@ -1682,9 +1674,7 @@ def __call__( Request message for ``ListProjectBillingInfoResponse``. """ - http_options = ( - _BaseCloudBillingRestTransport._BaseListProjectBillingInfo._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseListProjectBillingInfo._get_http_options() request, metadata = self._interceptor.pre_list_project_billing_info( request, metadata @@ -1834,9 +1824,7 @@ def __call__( """ - http_options = ( - _BaseCloudBillingRestTransport._BaseMoveBillingAccount._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseMoveBillingAccount._get_http_options() request, metadata = self._interceptor.pre_move_billing_account( request, metadata @@ -2215,9 +2203,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseCloudBillingRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2370,9 +2356,7 @@ def __call__( """ - http_options = ( - _BaseCloudBillingRestTransport._BaseUpdateBillingAccount._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseUpdateBillingAccount._get_http_options() request, metadata = self._interceptor.pre_update_billing_account( request, metadata @@ -2530,9 +2514,7 @@ def __call__( """ - http_options = ( - _BaseCloudBillingRestTransport._BaseUpdateProjectBillingInfo._get_http_options() - ) + http_options = _BaseCloudBillingRestTransport._BaseUpdateProjectBillingInfo._get_http_options() request, metadata = self._interceptor.pre_update_project_billing_info( request, metadata @@ -2689,7 +2671,9 @@ def list_project_billing_info( ]: # 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._ListProjectBillingInfo(self._session, self._host, self._interceptor) # type: ignore + return self._ListProjectBillingInfo( + self._session, self._host, self._interceptor + ) # type: ignore @property def move_billing_account( @@ -2739,7 +2723,9 @@ def update_project_billing_info( ]: # 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._UpdateProjectBillingInfo(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateProjectBillingInfo( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest_base.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest_base.py index 75550bafd48c..3ce5992483e9 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest_base.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_billing/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.protobuf import json_format from google.cloud.billing_v1.types import cloud_billing diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/async_client.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/async_client.py index fdef6e39b3ba..2560af5eb727 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/async_client.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing_v1 import gapic_version as package_version @@ -114,7 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudCatalogAsyncClient: The constructed client. """ - return CloudCatalogClient.from_service_account_info.__func__(CloudCatalogAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudCatalogClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudCatalogAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudCatalogAsyncClient: The constructed client. """ - return CloudCatalogClient.from_service_account_file.__func__(CloudCatalogAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudCatalogClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CloudCatalogAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/client.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/client.py index 9aca9f378c8f..aefea94ba17c 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/client.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing_v1 import gapic_version as package_version @@ -631,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudCatalogClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudCatalogClient._read_environment_variables() + ) self._client_cert_source = CloudCatalogClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -670,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudCatalogTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/pagers.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/pagers.py index 38c75d48f806..bdeabdeec074 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/pagers.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/base.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/base.py index 7365be61a2f8..3595cafa2fc6 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/base.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.billing_v1 import gapic_version as package_version from google.cloud.billing_v1.types import cloud_catalog diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc.py index 4e558f87a475..c6b33088b49a 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.billing_v1.types import cloud_catalog diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc_asyncio.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc_asyncio.py index 56026f2a147f..b7e8ba1a6a0d 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc_asyncio.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.billing_v1.types import cloud_catalog diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/rest.py b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/rest.py index 4b489347b3b4..957a55f92f38 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/rest.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/services/cloud_catalog/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/types/cloud_billing.py b/packages/google-cloud-billing/google/cloud/billing_v1/types/cloud_billing.py index 3014c08c1e8a..3db578cd1940 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/types/cloud_billing.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/types/cloud_billing.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-billing/google/cloud/billing_v1/types/cloud_catalog.py b/packages/google-cloud-billing/google/cloud/billing_v1/types/cloud_catalog.py index 797e7725d458..2b0cd71d8d41 100644 --- a/packages/google-cloud-billing/google/cloud/billing_v1/types/cloud_catalog.py +++ b/packages/google-cloud-billing/google/cloud/billing_v1/types/cloud_catalog.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -375,6 +375,7 @@ class AggregationLevel(proto.Enum): PROJECT (2): No description available. """ + AGGREGATION_LEVEL_UNSPECIFIED = 0 ACCOUNT = 1 PROJECT = 2 @@ -392,6 +393,7 @@ class AggregationInterval(proto.Enum): MONTHLY (2): No description available. """ + AGGREGATION_INTERVAL_UNSPECIFIED = 0 DAILY = 1 MONTHLY = 2 @@ -442,6 +444,7 @@ class Type(proto.Enum): The sku is associated with multiple regions, e.g. "us-west2" and "us-east1". """ + TYPE_UNSPECIFIED = 0 GLOBAL = 1 REGIONAL = 2 diff --git a/packages/google-cloud-billing/noxfile.py b/packages/google-cloud-billing/noxfile.py index 66a1e9d22664..b558f34491fe 100644 --- a/packages/google-cloud-billing/noxfile.py +++ b/packages/google-cloud-billing/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_async.py b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_async.py index 2d7e5d64f776..552184318b7b 100644 --- a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_async.py +++ b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-billing -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START cloudbilling_v1_generated_CloudBilling_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import billing_v1 diff --git a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_sync.py b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_sync.py index 9fc7e74333ae..d4134dc23913 100644 --- a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_sync.py +++ b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-billing -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START cloudbilling_v1_generated_CloudBilling_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import billing_v1 diff --git a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_async.py b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_async.py index 14721efd7743..7cee6a2c05f7 100644 --- a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_async.py +++ b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-billing -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START cloudbilling_v1_generated_CloudBilling_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import billing_v1 diff --git a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_sync.py b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_sync.py index 875fbc20d07c..032d655bc1eb 100644 --- a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_sync.py +++ b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-billing -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START cloudbilling_v1_generated_CloudBilling_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import billing_v1 diff --git a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_async.py b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_async.py index d2190dedd05a..b93db658b1d1 100644 --- a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_async.py +++ b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-billing -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START cloudbilling_v1_generated_CloudBilling_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import billing_v1 diff --git a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_sync.py b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_sync.py index 5ef8f5521837..d2f98c945ad4 100644 --- a/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_sync.py +++ b/packages/google-cloud-billing/samples/generated_samples/cloudbilling_v1_generated_cloud_billing_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-billing -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START cloudbilling_v1_generated_CloudBilling_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import billing_v1 diff --git a/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_billing.py b/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_billing.py index bdcdb3120918..631bb2f9a779 100644 --- a/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_billing.py +++ b/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_billing.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.billing_v1.services.cloud_billing import ( CloudBillingAsyncClient, @@ -931,10 +936,9 @@ def test_cloud_billing_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +983,9 @@ def test_cloud_billing_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1021,9 @@ def test_cloud_billing_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1260,13 +1262,13 @@ def test_cloud_billing_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1393,9 +1395,9 @@ def test_get_billing_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_billing_account] = ( + mock_rpc + ) request = {} client.get_billing_account(request) @@ -1749,9 +1751,9 @@ def test_list_billing_accounts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_billing_accounts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_billing_accounts] = ( + mock_rpc + ) request = {} client.list_billing_accounts(request) @@ -2236,9 +2238,9 @@ def test_update_billing_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_billing_account] = ( + mock_rpc + ) request = {} client.update_billing_account(request) @@ -2609,9 +2611,9 @@ def test_create_billing_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_billing_account] = ( + mock_rpc + ) request = {} client.create_billing_account(request) @@ -4856,9 +4858,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5239,9 +5241,9 @@ def test_move_billing_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_billing_account] = ( + mock_rpc + ) request = {} client.move_billing_account(request) @@ -5437,9 +5439,9 @@ def test_get_billing_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_billing_account] = ( + mock_rpc + ) request = {} client.get_billing_account(request) @@ -5618,9 +5620,9 @@ def test_list_billing_accounts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_billing_accounts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_billing_accounts] = ( + mock_rpc + ) request = {} client.list_billing_accounts(request) @@ -5778,9 +5780,9 @@ def test_update_billing_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_billing_account] = ( + mock_rpc + ) request = {} client.update_billing_account(request) @@ -5972,9 +5974,9 @@ def test_create_billing_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_billing_account] = ( + mock_rpc + ) request = {} client.create_billing_account(request) @@ -7133,9 +7135,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -7326,9 +7328,9 @@ def test_move_billing_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_billing_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_billing_account] = ( + mock_rpc + ) request = {} client.move_billing_account(request) @@ -8170,8 +8172,9 @@ def test_get_billing_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8244,17 +8247,20 @@ def test_get_billing_account_rest_interceptors(null_interceptor): ) client = CloudBillingClient(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.CloudBillingRestInterceptor, "post_get_billing_account" - ) as post, mock.patch.object( - transports.CloudBillingRestInterceptor, "post_get_billing_account_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBillingRestInterceptor, "pre_get_billing_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_get_billing_account" + ) as post, + mock.patch.object( + transports.CloudBillingRestInterceptor, + "post_get_billing_account_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBillingRestInterceptor, "pre_get_billing_account" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8309,8 +8315,9 @@ def test_list_billing_accounts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8373,18 +8380,20 @@ def test_list_billing_accounts_rest_interceptors(null_interceptor): ) client = CloudBillingClient(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.CloudBillingRestInterceptor, "post_list_billing_accounts" - ) as post, mock.patch.object( - transports.CloudBillingRestInterceptor, - "post_list_billing_accounts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudBillingRestInterceptor, "pre_list_billing_accounts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_list_billing_accounts" + ) as post, + mock.patch.object( + transports.CloudBillingRestInterceptor, + "post_list_billing_accounts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBillingRestInterceptor, "pre_list_billing_accounts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8442,8 +8451,9 @@ def test_update_billing_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8591,18 +8601,20 @@ def test_update_billing_account_rest_interceptors(null_interceptor): ) client = CloudBillingClient(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.CloudBillingRestInterceptor, "post_update_billing_account" - ) as post, mock.patch.object( - transports.CloudBillingRestInterceptor, - "post_update_billing_account_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudBillingRestInterceptor, "pre_update_billing_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_update_billing_account" + ) as post, + mock.patch.object( + transports.CloudBillingRestInterceptor, + "post_update_billing_account_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBillingRestInterceptor, "pre_update_billing_account" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8657,8 +8669,9 @@ def test_create_billing_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8808,18 +8821,20 @@ def test_create_billing_account_rest_interceptors(null_interceptor): ) client = CloudBillingClient(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.CloudBillingRestInterceptor, "post_create_billing_account" - ) as post, mock.patch.object( - transports.CloudBillingRestInterceptor, - "post_create_billing_account_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudBillingRestInterceptor, "pre_create_billing_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_create_billing_account" + ) as post, + mock.patch.object( + transports.CloudBillingRestInterceptor, + "post_create_billing_account_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBillingRestInterceptor, "pre_create_billing_account" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8874,8 +8889,9 @@ def test_list_project_billing_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8938,18 +8954,20 @@ def test_list_project_billing_info_rest_interceptors(null_interceptor): ) client = CloudBillingClient(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.CloudBillingRestInterceptor, "post_list_project_billing_info" - ) as post, mock.patch.object( - transports.CloudBillingRestInterceptor, - "post_list_project_billing_info_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudBillingRestInterceptor, "pre_list_project_billing_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_list_project_billing_info" + ) as post, + mock.patch.object( + transports.CloudBillingRestInterceptor, + "post_list_project_billing_info_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBillingRestInterceptor, "pre_list_project_billing_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9007,8 +9025,9 @@ def test_get_project_billing_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9077,18 +9096,20 @@ def test_get_project_billing_info_rest_interceptors(null_interceptor): ) client = CloudBillingClient(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.CloudBillingRestInterceptor, "post_get_project_billing_info" - ) as post, mock.patch.object( - transports.CloudBillingRestInterceptor, - "post_get_project_billing_info_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudBillingRestInterceptor, "pre_get_project_billing_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_get_project_billing_info" + ) as post, + mock.patch.object( + transports.CloudBillingRestInterceptor, + "post_get_project_billing_info_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBillingRestInterceptor, "pre_get_project_billing_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9143,8 +9164,9 @@ def test_update_project_billing_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9290,18 +9312,20 @@ def test_update_project_billing_info_rest_interceptors(null_interceptor): ) client = CloudBillingClient(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.CloudBillingRestInterceptor, "post_update_project_billing_info" - ) as post, mock.patch.object( - transports.CloudBillingRestInterceptor, - "post_update_project_billing_info_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudBillingRestInterceptor, "pre_update_project_billing_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_update_project_billing_info" + ) as post, + mock.patch.object( + transports.CloudBillingRestInterceptor, + "post_update_project_billing_info_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBillingRestInterceptor, "pre_update_project_billing_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9356,8 +9380,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9419,17 +9444,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = CloudBillingClient(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.CloudBillingRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.CloudBillingRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBillingRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudBillingRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9480,8 +9507,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9543,17 +9571,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = CloudBillingClient(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.CloudBillingRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.CloudBillingRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBillingRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudBillingRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9604,8 +9634,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9665,18 +9696,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = CloudBillingClient(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.CloudBillingRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.CloudBillingRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudBillingRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.CloudBillingRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBillingRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9732,8 +9765,9 @@ def test_move_billing_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9806,18 +9840,20 @@ def test_move_billing_account_rest_interceptors(null_interceptor): ) client = CloudBillingClient(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.CloudBillingRestInterceptor, "post_move_billing_account" - ) as post, mock.patch.object( - transports.CloudBillingRestInterceptor, - "post_move_billing_account_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudBillingRestInterceptor, "pre_move_billing_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBillingRestInterceptor, "post_move_billing_account" + ) as post, + mock.patch.object( + transports.CloudBillingRestInterceptor, + "post_move_billing_account_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBillingRestInterceptor, "pre_move_billing_account" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10169,11 +10205,14 @@ def test_cloud_billing_base_transport(): def test_cloud_billing_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.billing_v1.services.cloud_billing.transports.CloudBillingTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.billing_v1.services.cloud_billing.transports.CloudBillingTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudBillingTransport( @@ -10194,9 +10233,12 @@ def test_cloud_billing_base_transport_with_credentials_file(): def test_cloud_billing_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.billing_v1.services.cloud_billing.transports.CloudBillingTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.billing_v1.services.cloud_billing.transports.CloudBillingTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudBillingTransport() @@ -10276,11 +10318,12 @@ def test_cloud_billing_transport_auth_gdch_credentials(transport_class): def test_cloud_billing_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_catalog.py b/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_catalog.py index 70ba79e3115e..2ea0dbef6408 100644 --- a/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_catalog.py +++ b/packages/google-cloud-billing/tests/unit/gapic/billing_v1/test_cloud_catalog.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.billing_v1.services.cloud_catalog import ( CloudCatalogAsyncClient, @@ -927,10 +932,9 @@ def test_cloud_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_cloud_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_cloud_catalog_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1256,13 +1258,13 @@ def test_cloud_catalog_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2765,8 +2767,9 @@ def test_list_services_rest_bad_request(request_type=cloud_catalog.ListServicesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2829,17 +2832,19 @@ def test_list_services_rest_interceptors(null_interceptor): ) client = CloudCatalogClient(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.CloudCatalogRestInterceptor, "post_list_services" - ) as post, mock.patch.object( - transports.CloudCatalogRestInterceptor, "post_list_services_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudCatalogRestInterceptor, "pre_list_services" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudCatalogRestInterceptor, "post_list_services" + ) as post, + mock.patch.object( + transports.CloudCatalogRestInterceptor, "post_list_services_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudCatalogRestInterceptor, "pre_list_services" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2892,8 +2897,9 @@ def test_list_skus_rest_bad_request(request_type=cloud_catalog.ListSkusRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2956,17 +2962,19 @@ def test_list_skus_rest_interceptors(null_interceptor): ) client = CloudCatalogClient(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.CloudCatalogRestInterceptor, "post_list_skus" - ) as post, mock.patch.object( - transports.CloudCatalogRestInterceptor, "post_list_skus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudCatalogRestInterceptor, "pre_list_skus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudCatalogRestInterceptor, "post_list_skus" + ) as post, + mock.patch.object( + transports.CloudCatalogRestInterceptor, "post_list_skus_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudCatalogRestInterceptor, "pre_list_skus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3109,11 +3117,14 @@ def test_cloud_catalog_base_transport(): def test_cloud_catalog_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.billing_v1.services.cloud_catalog.transports.CloudCatalogTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.billing_v1.services.cloud_catalog.transports.CloudCatalogTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudCatalogTransport( @@ -3134,9 +3145,12 @@ def test_cloud_catalog_base_transport_with_credentials_file(): def test_cloud_catalog_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.billing_v1.services.cloud_catalog.transports.CloudCatalogTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.billing_v1.services.cloud_catalog.transports.CloudCatalogTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudCatalogTransport() @@ -3216,11 +3230,12 @@ def test_cloud_catalog_transport_auth_gdch_credentials(transport_class): def test_cloud_catalog_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/types/resources.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/types/resources.py index 5d8c6038d25e..01e87c449b80 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/types/resources.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1/types/resources.py @@ -67,8 +67,9 @@ class Policy(proto.Message): For ``clusterId`` syntax restrictions see https://cloud.google.com/container-engine/reference/rest/v1/projects.zones.clusters. kubernetes_namespace_admission_rules (MutableMapping[str, google.cloud.binaryauthorization_v1.types.AdmissionRule]): - Optional. Per-kubernetes-namespace admission rules. K8s - namespace spec format: [a-z.-]+, e.g. 'some-namespace' + Optional. Per-kubernetes-namespace admission + rules. K8s namespace spec format: [a-z.-]+, e.g. + 'some-namespace' kubernetes_service_account_admission_rules (MutableMapping[str, google.cloud.binaryauthorization_v1.types.AdmissionRule]): Optional. Per-kubernetes-service-account admission rules. Service account spec format: ``namespace:serviceaccount``. @@ -232,9 +233,10 @@ class EvaluationMode(proto.Enum): ALWAYS_ALLOW (1): This rule allows all all pod creations. REQUIRE_ATTESTATION (2): - This rule allows a pod creation if all the attestors listed - in 'require_attestations_by' have valid attestations for all - of the images in the pod spec. + This rule allows a pod creation if all the + attestors listed in 'require_attestations_by' + have valid attestations for all of the images in + the pod spec. ALWAYS_DENY (3): This rule denies all pod creations. """ @@ -422,13 +424,17 @@ class SignatureAlgorithm(proto.Enum): RSA_PSS_4096_SHA512 (4): RSASSA-PSS 4096 bit key with a SHA512 digest. RSA_SIGN_PKCS1_2048_SHA256 (5): - RSASSA-PKCS1-v1_5 with a 2048 bit key and a SHA256 digest. + RSASSA-PKCS1-v1_5 with a 2048 bit key and a + SHA256 digest. RSA_SIGN_PKCS1_3072_SHA256 (6): - RSASSA-PKCS1-v1_5 with a 3072 bit key and a SHA256 digest. + RSASSA-PKCS1-v1_5 with a 3072 bit key and a + SHA256 digest. RSA_SIGN_PKCS1_4096_SHA256 (7): - RSASSA-PKCS1-v1_5 with a 4096 bit key and a SHA256 digest. + RSASSA-PKCS1-v1_5 with a 4096 bit key and a + SHA256 digest. RSA_SIGN_PKCS1_4096_SHA512 (8): - RSASSA-PKCS1-v1_5 with a 4096 bit key and a SHA512 digest. + RSASSA-PKCS1-v1_5 with a 4096 bit key and a + SHA512 digest. ECDSA_P256_SHA256 (9): ECDSA on the NIST P-256 curve with a SHA256 digest. diff --git a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/resources.py b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/resources.py index f2867083d511..8ffb3092a3d0 100644 --- a/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/resources.py +++ b/packages/google-cloud-binary-authorization/google/cloud/binaryauthorization_v1beta1/types/resources.py @@ -296,7 +296,8 @@ class Attestor(proto.Message): may be updated. The field may be displayed in chooser dialogs. user_owned_drydock_note (google.cloud.binaryauthorization_v1beta1.types.UserOwnedDrydockNote): - A Drydock ATTESTATION_AUTHORITY Note, created by the user. + A Drydock ATTESTATION_AUTHORITY Note, created by + the user. This field is a member of `oneof`_ ``attestor_type``. update_time (google.protobuf.timestamp_pb2.Timestamp): @@ -421,13 +422,17 @@ class SignatureAlgorithm(proto.Enum): RSA_PSS_4096_SHA512 (4): RSASSA-PSS 4096 bit key with a SHA512 digest. RSA_SIGN_PKCS1_2048_SHA256 (5): - RSASSA-PKCS1-v1_5 with a 2048 bit key and a SHA256 digest. + RSASSA-PKCS1-v1_5 with a 2048 bit key and a + SHA256 digest. RSA_SIGN_PKCS1_3072_SHA256 (6): - RSASSA-PKCS1-v1_5 with a 3072 bit key and a SHA256 digest. + RSASSA-PKCS1-v1_5 with a 3072 bit key and a + SHA256 digest. RSA_SIGN_PKCS1_4096_SHA256 (7): - RSASSA-PKCS1-v1_5 with a 4096 bit key and a SHA256 digest. + RSASSA-PKCS1-v1_5 with a 4096 bit key and a + SHA256 digest. RSA_SIGN_PKCS1_4096_SHA512 (8): - RSASSA-PKCS1-v1_5 with a 4096 bit key and a SHA512 digest. + RSASSA-PKCS1-v1_5 with a 4096 bit key and a + SHA512 digest. ECDSA_P256_SHA256 (9): ECDSA on the NIST P-256 curve with a SHA256 digest. diff --git a/packages/google-cloud-build/docs/conf.py b/packages/google-cloud-build/docs/conf.py index dc399123ec0b..5e7dc0524080 100644 --- a/packages/google-cloud-build/docs/conf.py +++ b/packages/google-cloud-build/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-build documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/__init__.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/__init__.py index 941d82419843..7ecfef9b20ad 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/__init__.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_build import CloudBuildAsyncClient, CloudBuildClient from .types.cloudbuild import ( ApprovalConfig, diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/async_client.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/async_client.py index 8cb10192be43..fab0f2fe5fcb 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/async_client.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.cloudbuild_v1 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.devtools.cloudbuild_v1.services.cloud_build import pagers from google.cloud.devtools.cloudbuild_v1.types import cloudbuild @@ -162,7 +162,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudBuildAsyncClient: The constructed client. """ - return CloudBuildClient.from_service_account_info.__func__(CloudBuildAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudBuildClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudBuildAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -178,7 +179,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudBuildAsyncClient: The constructed client. """ - return CloudBuildClient.from_service_account_file.__func__(CloudBuildAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudBuildClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CloudBuildAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/client.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/client.py index c681266e1f95..e63bf42f31ff 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/client.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.cloudbuild_v1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.devtools.cloudbuild_v1.services.cloud_build import pagers from google.cloud.devtools.cloudbuild_v1.types import cloudbuild @@ -899,11 +899,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudBuildClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudBuildClient._read_environment_variables() + ) self._client_cert_source = CloudBuildClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -938,8 +936,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudBuildTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/pagers.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/pagers.py index 2f75d66d0763..e1f8e417a8f9 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/pagers.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/base.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/base.py index 0dccbcf94935..6ebd11b952be 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/base.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.devtools.cloudbuild_v1 import gapic_version as package_version from google.cloud.devtools.cloudbuild_v1.types import cloudbuild diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc.py index 8b9de6fbc366..648778a654cb 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.devtools.cloudbuild_v1.types import cloudbuild @@ -894,12 +894,12 @@ def get_default_service_account( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_default_service_account" not in self._stubs: - self._stubs[ - "get_default_service_account" - ] = self._logged_channel.unary_unary( - "/google.devtools.cloudbuild.v1.CloudBuild/GetDefaultServiceAccount", - request_serializer=cloudbuild.GetDefaultServiceAccountRequest.serialize, - response_deserializer=cloudbuild.DefaultServiceAccount.deserialize, + self._stubs["get_default_service_account"] = ( + self._logged_channel.unary_unary( + "/google.devtools.cloudbuild.v1.CloudBuild/GetDefaultServiceAccount", + request_serializer=cloudbuild.GetDefaultServiceAccountRequest.serialize, + response_deserializer=cloudbuild.DefaultServiceAccount.deserialize, + ) ) return self._stubs["get_default_service_account"] diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc_asyncio.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc_asyncio.py index a1dabaff7cb3..58fe81736430 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc_asyncio.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.devtools.cloudbuild_v1.types import cloudbuild @@ -925,12 +925,12 @@ def get_default_service_account( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_default_service_account" not in self._stubs: - self._stubs[ - "get_default_service_account" - ] = self._logged_channel.unary_unary( - "/google.devtools.cloudbuild.v1.CloudBuild/GetDefaultServiceAccount", - request_serializer=cloudbuild.GetDefaultServiceAccountRequest.serialize, - response_deserializer=cloudbuild.DefaultServiceAccount.deserialize, + self._stubs["get_default_service_account"] = ( + self._logged_channel.unary_unary( + "/google.devtools.cloudbuild.v1.CloudBuild/GetDefaultServiceAccount", + request_serializer=cloudbuild.GetDefaultServiceAccountRequest.serialize, + response_deserializer=cloudbuild.DefaultServiceAccount.deserialize, + ) ) return self._stubs["get_default_service_account"] diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest.py index 59980c8bf4e5..a1ca48576788 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1337,7 +1337,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1669,7 +1669,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1977,7 +1977,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2118,7 +2118,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2233,7 +2233,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2673,9 +2673,7 @@ def __call__( The default service account used for ``Builds``. """ - http_options = ( - _BaseCloudBuildRestTransport._BaseGetDefaultServiceAccount._get_http_options() - ) + http_options = _BaseCloudBuildRestTransport._BaseGetDefaultServiceAccount._get_http_options() request, metadata = self._interceptor.pre_get_default_service_account( request, metadata @@ -3431,9 +3429,7 @@ def __call__( """ - http_options = ( - _BaseCloudBuildRestTransport._BaseReceiveTriggerWebhook._get_http_options() - ) + http_options = _BaseCloudBuildRestTransport._BaseReceiveTriggerWebhook._get_http_options() request, metadata = self._interceptor.pre_receive_trigger_webhook( request, metadata @@ -3616,7 +3612,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3770,7 +3766,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4078,7 +4074,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4223,7 +4219,9 @@ def get_default_service_account( ]: # 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._GetDefaultServiceAccount(self._session, self._host, self._interceptor) # type: ignore + return self._GetDefaultServiceAccount( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_worker_pool( diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest_base.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest_base.py index c42417b0986e..0cfbacb7a5ce 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest_base.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/services/cloud_build/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.devtools.cloudbuild_v1.types import cloudbuild diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/types/cloudbuild.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/types/cloudbuild.py index a67a8ce56ac5..d0f9b184f560 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/types/cloudbuild.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v1/types/cloudbuild.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.api import httpbody_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -249,6 +249,7 @@ class SourceFetcher(proto.Enum): Use the Cloud Storage Fetcher tool to download the source file. """ + SOURCE_FETCHER_UNSPECIFIED = 0 GSUTIL = 1 GCS_FETCHER = 2 @@ -1265,6 +1266,7 @@ class Status(proto.Enum): Build was enqueued for longer than the value of ``queue_ttl``. """ + STATUS_UNKNOWN = 0 PENDING = 10 QUEUED = 1 @@ -1303,6 +1305,7 @@ class Priority(proto.Enum): e.g. alerts that a feature used in the build is pending removal """ + PRIORITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 @@ -1350,6 +1353,7 @@ class FailureType(proto.Enum): FETCH_SOURCE_FAILED (6): The source fetching has failed. """ + FAILURE_TYPE_UNSPECIFIED = 0 PUSH_FAILED = 1 PUSH_IMAGE_NOT_FOUND = 2 @@ -2126,6 +2130,7 @@ class HashType(proto.Enum): SHA512 (4): Use a sha512 hash. """ + NONE = 0 SHA256 = 1 MD5 = 2 @@ -2466,6 +2471,7 @@ class State(proto.Enum): Build was cancelled while it was still pending approval. """ + STATE_UNSPECIFIED = 0 PENDING = 1 APPROVED = 2 @@ -2546,6 +2552,7 @@ class Decision(proto.Enum): REJECTED (2): Build is rejected. """ + DECISION_UNSPECIFIED = 0 APPROVED = 1 REJECTED = 2 @@ -2697,6 +2704,7 @@ class RepoType(proto.Enum): GITLAB (4): A GitLab-hosted repo. """ + UNKNOWN = 0 CLOUD_SOURCE_REPOSITORIES = 1 GITHUB = 2 @@ -3018,6 +3026,7 @@ class RepositoryType(proto.Enum): GITLAB_ENTERPRISE (3): The SCM repo is GITLAB Enterprise. """ + REPOSITORY_TYPE_UNSPECIFIED = 0 GITHUB = 1 GITHUB_ENTERPRISE = 2 @@ -3148,6 +3157,7 @@ class State(proto.Enum): Some of the subscription's field are misconfigured. """ + STATE_UNSPECIFIED = 0 OK = 1 SUBSCRIPTION_DELETED = 2 @@ -3206,6 +3216,7 @@ class State(proto.Enum): SECRET_DELETED (2): The secret provided in auth_method has been deleted. """ + STATE_UNSPECIFIED = 0 OK = 1 SECRET_DELETED = 2 @@ -3286,6 +3297,7 @@ class CommentControl(proto.Enum): with write permissions or above must comment ``/gcbrun`` in order to fire a build. """ + COMMENTS_DISABLED = 0 COMMENTS_ENABLED = 1 COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY = 2 @@ -3650,6 +3662,7 @@ class VerifyOption(proto.Enum): VERIFIED (1): Build must be verified. """ + NOT_VERIFIED = 0 VERIFIED = 1 @@ -3672,6 +3685,7 @@ class MachineType(proto.Enum): E2_MEDIUM (7): E2 machine with 1 CPU. """ + UNSPECIFIED = 0 N1_HIGHCPU_8 = 1 N1_HIGHCPU_32 = 2 @@ -3692,6 +3706,7 @@ class SubstitutionOption(proto.Enum): Do not fail the build if error in substitutions checks. """ + MUST_MATCH = 0 ALLOW_LOOSE = 1 @@ -3711,6 +3726,7 @@ class LogStreamingOption(proto.Enum): Storage; they will be written when the build is completed. """ + STREAM_DEFAULT = 0 STREAM_ON = 1 STREAM_OFF = 2 @@ -3738,6 +3754,7 @@ class LoggingMode(proto.Enum): Turn off all logging. No build logs will be captured. """ + LOGGING_UNSPECIFIED = 0 LEGACY = 1 GCS_ONLY = 2 @@ -3761,6 +3778,7 @@ class DefaultLogsBucketBehavior(proto.Enum): Bucket is located in a Google-owned project and is not regionalized. """ + DEFAULT_LOGS_BUCKET_BEHAVIOR_UNSPECIFIED = 0 REGIONAL_USER_OWNED_BUCKET = 1 LEGACY_BUCKET = 2 @@ -4110,6 +4128,7 @@ class State(proto.Enum): UPDATING (5): ``WorkerPool`` is being updated; new builds cannot be run. """ + STATE_UNSPECIFIED = 0 CREATING = 1 RUNNING = 2 @@ -4263,6 +4282,7 @@ class EgressOption(proto.Enum): If set, workers are created with a public address which allows for public internet egress. """ + EGRESS_OPTION_UNSPECIFIED = 0 NO_PUBLIC_EGRESS = 1 PUBLIC_EGRESS = 2 diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/__init__.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/__init__.py index 91989338b72a..17eb7b29fd55 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/__init__.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.repository_manager import ( RepositoryManagerAsyncClient, RepositoryManagerClient, diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/async_client.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/async_client.py index e0c1d39f98d9..90c958b120fe 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/async_client.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.cloudbuild_v2 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.devtools.cloudbuild_v2.services.repository_manager import pagers from google.cloud.devtools.cloudbuild_v2.types import cloudbuild, repositories @@ -131,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RepositoryManagerAsyncClient: The constructed client. """ - return RepositoryManagerClient.from_service_account_info.__func__(RepositoryManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = RepositoryManagerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(RepositoryManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RepositoryManagerAsyncClient: The constructed client. """ - return RepositoryManagerClient.from_service_account_file.__func__(RepositoryManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = RepositoryManagerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(RepositoryManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/client.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/client.py index 98b93b59a50b..538d48914f68 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/client.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.cloudbuild_v2 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.devtools.cloudbuild_v2.services.repository_manager import pagers from google.cloud.devtools.cloudbuild_v2.types import cloudbuild, repositories @@ -88,9 +90,7 @@ class RepositoryManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RepositoryManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RepositoryManagerTransport]] _transport_registry["grpc"] = RepositoryManagerGrpcTransport _transport_registry["grpc_asyncio"] = RepositoryManagerGrpcAsyncIOTransport _transport_registry["rest"] = RepositoryManagerRestTransport @@ -706,11 +706,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RepositoryManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RepositoryManagerClient._read_environment_variables() + ) self._client_cert_source = RepositoryManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -745,8 +743,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RepositoryManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/pagers.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/pagers.py index b95005eabb3d..73b2be46805d 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/pagers.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/base.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/base.py index 50880e188dbd..4114f7afbadc 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/base.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devtools.cloudbuild_v2 import gapic_version as package_version from google.cloud.devtools.cloudbuild_v2.types import repositories @@ -470,7 +472,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc.py index d4086a17bd9d..baf585f843f8 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.devtools.cloudbuild_v2.types import repositories @@ -689,12 +691,12 @@ def fetch_linkable_repositories( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_linkable_repositories" not in self._stubs: - self._stubs[ - "fetch_linkable_repositories" - ] = self._logged_channel.unary_unary( - "/google.devtools.cloudbuild.v2.RepositoryManager/FetchLinkableRepositories", - request_serializer=repositories.FetchLinkableRepositoriesRequest.serialize, - response_deserializer=repositories.FetchLinkableRepositoriesResponse.deserialize, + self._stubs["fetch_linkable_repositories"] = ( + self._logged_channel.unary_unary( + "/google.devtools.cloudbuild.v2.RepositoryManager/FetchLinkableRepositories", + request_serializer=repositories.FetchLinkableRepositoriesRequest.serialize, + response_deserializer=repositories.FetchLinkableRepositoriesResponse.deserialize, + ) ) return self._stubs["fetch_linkable_repositories"] diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc_asyncio.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc_asyncio.py index db0c4a57245f..b3ad07d22445 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.devtools.cloudbuild_v2.types import repositories @@ -715,12 +717,12 @@ def fetch_linkable_repositories( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_linkable_repositories" not in self._stubs: - self._stubs[ - "fetch_linkable_repositories" - ] = self._logged_channel.unary_unary( - "/google.devtools.cloudbuild.v2.RepositoryManager/FetchLinkableRepositories", - request_serializer=repositories.FetchLinkableRepositoriesRequest.serialize, - response_deserializer=repositories.FetchLinkableRepositoriesResponse.deserialize, + self._stubs["fetch_linkable_repositories"] = ( + self._logged_channel.unary_unary( + "/google.devtools.cloudbuild.v2.RepositoryManager/FetchLinkableRepositories", + request_serializer=repositories.FetchLinkableRepositoriesRequest.serialize, + response_deserializer=repositories.FetchLinkableRepositoriesResponse.deserialize, + ) ) return self._stubs["fetch_linkable_repositories"] diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest.py index b67d6927ebd0..2e076e1638d4 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1192,9 +1194,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseBatchCreateRepositories._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseBatchCreateRepositories._get_http_options() request, metadata = self._interceptor.pre_batch_create_repositories( request, metadata @@ -1220,7 +1220,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1348,9 +1348,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseCreateConnection._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseCreateConnection._get_http_options() request, metadata = self._interceptor.pre_create_connection( request, metadata @@ -1376,7 +1374,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1502,9 +1500,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseCreateRepository._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseCreateRepository._get_http_options() request, metadata = self._interceptor.pre_create_repository( request, metadata @@ -1530,7 +1526,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1655,9 +1651,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseDeleteConnection._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseDeleteConnection._get_http_options() request, metadata = self._interceptor.pre_delete_connection( request, metadata @@ -1679,7 +1673,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1803,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseDeleteRepository._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseDeleteRepository._get_http_options() request, metadata = self._interceptor.pre_delete_repository( request, metadata @@ -1827,7 +1819,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1947,9 +1939,7 @@ def __call__( Response for fetching git refs """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseFetchGitRefs._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseFetchGitRefs._get_http_options() request, metadata = self._interceptor.pre_fetch_git_refs(request, metadata) transcoded_request = _BaseRepositoryManagerRestTransport._BaseFetchGitRefs._get_transcoded_request( @@ -2098,9 +2088,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseFetchLinkableRepositories._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseFetchLinkableRepositories._get_http_options() request, metadata = self._interceptor.pre_fetch_linkable_repositories( request, metadata @@ -2252,9 +2240,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseFetchReadToken._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseFetchReadToken._get_http_options() request, metadata = self._interceptor.pre_fetch_read_token( request, metadata @@ -2410,9 +2396,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseFetchReadWriteToken._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseFetchReadWriteToken._get_http_options() request, metadata = self._interceptor.pre_fetch_read_write_token( request, metadata @@ -2570,9 +2554,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseGetConnection._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseGetConnection._get_http_options() request, metadata = self._interceptor.pre_get_connection(request, metadata) transcoded_request = _BaseRepositoryManagerRestTransport._BaseGetConnection._get_transcoded_request( @@ -2718,9 +2700,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseGetRepository._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseGetRepository._get_http_options() request, metadata = self._interceptor.pre_get_repository(request, metadata) transcoded_request = _BaseRepositoryManagerRestTransport._BaseGetRepository._get_transcoded_request( @@ -2866,9 +2846,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseListConnections._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseListConnections._get_http_options() request, metadata = self._interceptor.pre_list_connections( request, metadata @@ -3018,9 +2996,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseListRepositories._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseListRepositories._get_http_options() request, metadata = self._interceptor.pre_list_repositories( request, metadata @@ -3171,9 +3147,7 @@ def __call__( """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseUpdateConnection._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseUpdateConnection._get_http_options() request, metadata = self._interceptor.pre_update_connection( request, metadata @@ -3199,7 +3173,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3274,7 +3248,9 @@ def batch_create_repositories( ]: # 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._BatchCreateRepositories(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateRepositories( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_connection( @@ -3327,7 +3303,9 @@ def fetch_linkable_repositories( ]: # 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._FetchLinkableRepositories(self._session, self._host, self._interceptor) # type: ignore + return self._FetchLinkableRepositories( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_read_token( @@ -3451,9 +3429,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRepositoryManagerRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -3592,9 +3568,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRepositoryManagerRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -3739,9 +3713,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3885,9 +3857,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -4007,9 +3977,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRepositoryManagerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRepositoryManagerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRepositoryManagerRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest_base.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest_base.py index d57d488a556a..533cad4f1835 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest_base.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/services/repository_manager/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/__init__.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/__init__.py index b9a329fffb45..3dfb3f8988c4 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/__init__.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .cloudbuild import OperationMetadata, RunWorkflowCustomOperationMetadata +from .cloudbuild import ( + OperationMetadata, + RunWorkflowCustomOperationMetadata, +) from .repositories import ( BatchCreateRepositoriesRequest, BatchCreateRepositoriesResponse, diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/cloudbuild.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/cloudbuild.py index 8dbd05602e7e..1f3dd336ac9f 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/cloudbuild.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/cloudbuild.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/repositories.py b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/repositories.py index 28a9c1f73ada..ccfd05c8e15f 100644 --- a/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/repositories.py +++ b/packages/google-cloud-build/google/cloud/devtools/cloudbuild_v2/types/repositories.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.api import httpbody_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -236,6 +236,7 @@ class Stage(proto.Enum): COMPLETE (10): Installation process has been completed. """ + STAGE_UNSPECIFIED = 0 PENDING_CREATE_APP = 1 PENDING_USER_OAUTH = 2 @@ -1206,6 +1207,7 @@ class RefType(proto.Enum): BRANCH (2): To fetch branches. """ + REF_TYPE_UNSPECIFIED = 0 TAG = 1 BRANCH = 2 diff --git a/packages/google-cloud-build/noxfile.py b/packages/google-cloud-build/noxfile.py index 713a0e3df06b..6dd2500965d5 100644 --- a/packages/google-cloud-build/noxfile.py +++ b/packages/google-cloud-build/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v1/test_cloud_build.py b/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v1/test_cloud_build.py index 7bcbd64df37c..787c2a7aaefc 100644 --- a/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v1/test_cloud_build.py +++ b/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v1/test_cloud_build.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,8 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,20 +61,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.devtools.cloudbuild_v1.services.cloud_build import ( CloudBuildAsyncClient, @@ -934,10 +934,9 @@ def test_cloud_build_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +981,9 @@ def test_cloud_build_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1019,9 @@ def test_cloud_build_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1253,13 +1250,13 @@ def test_cloud_build_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3370,9 +3367,9 @@ def test_create_build_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_build_trigger] = ( + mock_rpc + ) request = {} client.create_build_trigger(request) @@ -3705,9 +3702,9 @@ def test_get_build_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_build_trigger] = ( + mock_rpc + ) request = {} client.get_build_trigger(request) @@ -4023,9 +4020,9 @@ def test_list_build_triggers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_build_triggers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_build_triggers] = ( + mock_rpc + ) request = {} client.list_build_triggers(request) @@ -4499,9 +4496,9 @@ def test_delete_build_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_build_trigger] = ( + mock_rpc + ) request = {} client.delete_build_trigger(request) @@ -4809,9 +4806,9 @@ def test_update_build_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_build_trigger] = ( + mock_rpc + ) request = {} client.update_build_trigger(request) @@ -5122,9 +5119,9 @@ def test_run_build_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_build_trigger] = ( + mock_rpc + ) request = {} client.run_build_trigger(request) @@ -5683,9 +5680,9 @@ def test_create_worker_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_worker_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_worker_pool] = ( + mock_rpc + ) request = {} client.create_worker_pool(request) @@ -6263,9 +6260,9 @@ def test_delete_worker_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_worker_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_worker_pool] = ( + mock_rpc + ) request = {} client.delete_worker_pool(request) @@ -6539,9 +6536,9 @@ def test_update_worker_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_worker_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_worker_pool] = ( + mock_rpc + ) request = {} client.update_worker_pool(request) @@ -6832,9 +6829,9 @@ def test_list_worker_pools_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_worker_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_worker_pools] = ( + mock_rpc + ) request = {} client.list_worker_pools(request) @@ -8722,9 +8719,9 @@ def test_create_build_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_build_trigger] = ( + mock_rpc + ) request = {} client.create_build_trigger(request) @@ -8915,9 +8912,9 @@ def test_get_build_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_build_trigger] = ( + mock_rpc + ) request = {} client.get_build_trigger(request) @@ -9115,9 +9112,9 @@ def test_list_build_triggers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_build_triggers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_build_triggers] = ( + mock_rpc + ) request = {} client.list_build_triggers(request) @@ -9375,9 +9372,9 @@ def test_delete_build_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_build_trigger] = ( + mock_rpc + ) request = {} client.delete_build_trigger(request) @@ -9570,9 +9567,9 @@ def test_update_build_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_build_trigger] = ( + mock_rpc + ) request = {} client.update_build_trigger(request) @@ -9770,9 +9767,9 @@ def test_run_build_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_build_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_build_trigger] = ( + mock_rpc + ) request = {} client.run_build_trigger(request) @@ -10011,9 +10008,9 @@ def test_create_worker_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_worker_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_worker_pool] = ( + mock_rpc + ) request = {} client.create_worker_pool(request) @@ -10411,9 +10408,9 @@ def test_delete_worker_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_worker_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_worker_pool] = ( + mock_rpc + ) request = {} client.delete_worker_pool(request) @@ -10611,9 +10608,9 @@ def test_update_worker_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_worker_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_worker_pool] = ( + mock_rpc + ) request = {} client.update_worker_pool(request) @@ -10807,9 +10804,9 @@ def test_list_worker_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_worker_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_worker_pools] = ( + mock_rpc + ) request = {} client.list_worker_pools(request) @@ -13579,8 +13576,9 @@ def test_create_build_rest_bad_request(request_type=cloudbuild.CreateBuildReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13937,19 +13935,20 @@ def test_create_build_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_create_build" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_create_build_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_create_build" - ) as pre: + 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.CloudBuildRestInterceptor, "post_create_build" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_create_build_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_create_build" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13998,8 +13997,9 @@ def test_get_build_rest_bad_request(request_type=cloudbuild.GetBuildRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14082,17 +14082,17 @@ def test_get_build_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_get_build" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_get_build_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_get_build" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_get_build" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_get_build_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.CloudBuildRestInterceptor, "pre_get_build") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14141,8 +14141,9 @@ def test_list_builds_rest_bad_request(request_type=cloudbuild.ListBuildsRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14205,17 +14206,19 @@ def test_list_builds_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_list_builds" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_list_builds_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_list_builds" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_list_builds" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_list_builds_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_list_builds" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14266,8 +14269,9 @@ def test_cancel_build_rest_bad_request(request_type=cloudbuild.CancelBuildReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14350,17 +14354,19 @@ def test_cancel_build_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_cancel_build" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_cancel_build_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_cancel_build" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_cancel_build" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_cancel_build_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_cancel_build" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14409,8 +14415,9 @@ def test_retry_build_rest_bad_request(request_type=cloudbuild.RetryBuildRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14467,19 +14474,20 @@ def test_retry_build_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_retry_build" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_retry_build_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_retry_build" - ) as pre: + 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.CloudBuildRestInterceptor, "post_retry_build" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_retry_build_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_retry_build" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14528,8 +14536,9 @@ def test_approve_build_rest_bad_request(request_type=cloudbuild.ApproveBuildRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14586,19 +14595,20 @@ def test_approve_build_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_approve_build" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_approve_build_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_approve_build" - ) as pre: + 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.CloudBuildRestInterceptor, "post_approve_build" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_approve_build_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_approve_build" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14649,8 +14659,9 @@ def test_create_build_trigger_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15095,17 +15106,20 @@ def test_create_build_trigger_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_create_build_trigger" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_create_build_trigger_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_create_build_trigger" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_create_build_trigger" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, + "post_create_build_trigger_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_create_build_trigger" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15158,8 +15172,9 @@ def test_get_build_trigger_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15241,17 +15256,19 @@ def test_get_build_trigger_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_get_build_trigger" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_get_build_trigger_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_get_build_trigger" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_get_build_trigger" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_get_build_trigger_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_get_build_trigger" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15304,8 +15321,9 @@ def test_list_build_triggers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15368,17 +15386,20 @@ def test_list_build_triggers_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_list_build_triggers" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_list_build_triggers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_list_build_triggers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_list_build_triggers" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, + "post_list_build_triggers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_list_build_triggers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15436,8 +15457,9 @@ def test_delete_build_trigger_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15494,13 +15516,13 @@ def test_delete_build_trigger_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "pre_delete_build_trigger" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_delete_build_trigger" + ) as pre, + ): pre.assert_not_called() pb_message = cloudbuild.DeleteBuildTriggerRequest.pb( cloudbuild.DeleteBuildTriggerRequest() @@ -15545,8 +15567,9 @@ def test_update_build_trigger_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15991,17 +16014,20 @@ def test_update_build_trigger_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_update_build_trigger" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_update_build_trigger_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_update_build_trigger" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_update_build_trigger" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, + "post_update_build_trigger_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_update_build_trigger" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16054,8 +16080,9 @@ def test_run_build_trigger_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16189,19 +16216,20 @@ def test_run_build_trigger_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_run_build_trigger" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_run_build_trigger_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_run_build_trigger" - ) as pre: + 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.CloudBuildRestInterceptor, "post_run_build_trigger" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_run_build_trigger_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_run_build_trigger" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16254,8 +16282,9 @@ def test_receive_trigger_webhook_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16392,18 +16421,20 @@ def test_receive_trigger_webhook_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_receive_trigger_webhook" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, - "post_receive_trigger_webhook_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_receive_trigger_webhook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_receive_trigger_webhook" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, + "post_receive_trigger_webhook_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_receive_trigger_webhook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16461,8 +16492,9 @@ def test_create_worker_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16614,19 +16646,21 @@ def test_create_worker_pool_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_create_worker_pool" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_create_worker_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_create_worker_pool" - ) as pre: + 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.CloudBuildRestInterceptor, "post_create_worker_pool" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, + "post_create_worker_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_create_worker_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16677,8 +16711,9 @@ def test_get_worker_pool_rest_bad_request(request_type=cloudbuild.GetWorkerPoolR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16749,17 +16784,19 @@ def test_get_worker_pool_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_get_worker_pool" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_get_worker_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_get_worker_pool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_get_worker_pool" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_get_worker_pool_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_get_worker_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16812,8 +16849,9 @@ def test_delete_worker_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16870,19 +16908,21 @@ def test_delete_worker_pool_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_delete_worker_pool" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_delete_worker_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_delete_worker_pool" - ) as pre: + 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.CloudBuildRestInterceptor, "post_delete_worker_pool" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, + "post_delete_worker_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_delete_worker_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16939,8 +16979,9 @@ def test_update_worker_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17096,19 +17137,21 @@ def test_update_worker_pool_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_update_worker_pool" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_update_worker_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_update_worker_pool" - ) as pre: + 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.CloudBuildRestInterceptor, "post_update_worker_pool" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, + "post_update_worker_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_update_worker_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17161,8 +17204,9 @@ def test_list_worker_pools_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17225,17 +17269,19 @@ def test_list_worker_pools_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_list_worker_pools" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, "post_list_worker_pools_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_list_worker_pools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_list_worker_pools" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_list_worker_pools_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_list_worker_pools" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17290,8 +17336,9 @@ def test_get_default_service_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17356,18 +17403,20 @@ def test_get_default_service_account_rest_interceptors(null_interceptor): ) client = CloudBuildClient(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.CloudBuildRestInterceptor, "post_get_default_service_account" - ) as post, mock.patch.object( - transports.CloudBuildRestInterceptor, - "post_get_default_service_account_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudBuildRestInterceptor, "pre_get_default_service_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudBuildRestInterceptor, "post_get_default_service_account" + ) as post, + mock.patch.object( + transports.CloudBuildRestInterceptor, + "post_get_default_service_account_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudBuildRestInterceptor, "pre_get_default_service_account" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18435,11 +18484,14 @@ def test_cloud_build_base_transport(): def test_cloud_build_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.devtools.cloudbuild_v1.services.cloud_build.transports.CloudBuildTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.devtools.cloudbuild_v1.services.cloud_build.transports.CloudBuildTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudBuildTransport( @@ -18456,9 +18508,12 @@ def test_cloud_build_base_transport_with_credentials_file(): def test_cloud_build_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.devtools.cloudbuild_v1.services.cloud_build.transports.CloudBuildTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.devtools.cloudbuild_v1.services.cloud_build.transports.CloudBuildTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudBuildTransport() @@ -18530,11 +18585,12 @@ def test_cloud_build_transport_auth_gdch_credentials(transport_class): def test_cloud_build_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v2/test_repository_manager.py b/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v2/test_repository_manager.py index 9fdccebff099..0bb2686e2c2d 100644 --- a/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v2/test_repository_manager.py +++ b/packages/google-cloud-build/tests/unit/gapic/cloudbuild_v2/test_repository_manager.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.devtools.cloudbuild_v2.services.repository_manager import ( RepositoryManagerAsyncClient, @@ -995,10 +997,9 @@ def test_repository_manager_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1044,9 @@ def test_repository_manager_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1082,9 @@ def test_repository_manager_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1333,13 +1332,13 @@ def test_repository_manager_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1449,9 +1448,9 @@ def test_create_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -2148,9 +2147,9 @@ def test_list_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -2668,9 +2667,9 @@ def test_update_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -3023,9 +3022,9 @@ def test_delete_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -3368,9 +3367,9 @@ def test_create_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -4430,9 +4429,9 @@ def test_list_repositories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -4970,9 +4969,9 @@ def test_delete_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -5319,9 +5318,9 @@ def test_fetch_read_write_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_write_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_write_token] = ( + mock_rpc + ) request = {} client.fetch_read_write_token(request) @@ -5655,9 +5654,9 @@ def test_fetch_read_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_token] = ( + mock_rpc + ) request = {} client.fetch_read_token(request) @@ -6702,9 +6701,9 @@ def test_create_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -7090,9 +7089,9 @@ def test_list_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -7348,9 +7347,9 @@ def test_update_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -7546,9 +7545,9 @@ def test_delete_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -7742,9 +7741,9 @@ def test_create_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -8327,9 +8326,9 @@ def test_list_repositories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -8591,9 +8590,9 @@ def test_delete_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -8790,9 +8789,9 @@ def test_fetch_read_write_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_write_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_write_token] = ( + mock_rpc + ) request = {} client.fetch_read_write_token(request) @@ -8973,9 +8972,9 @@ def test_fetch_read_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_token] = ( + mock_rpc + ) request = {} client.fetch_read_token(request) @@ -10364,8 +10363,9 @@ def test_create_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10549,20 +10549,21 @@ def test_create_connection_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_create_connection" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, - "post_create_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_create_connection" - ) as pre: + 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.RepositoryManagerRestInterceptor, "post_create_connection" + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_create_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_create_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10615,8 +10616,9 @@ def test_get_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10685,17 +10687,20 @@ def test_get_connection_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_get_connection" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "post_get_connection_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_get_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "post_get_connection" + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_get_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_get_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10748,8 +10753,9 @@ def test_list_connections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10812,18 +10818,20 @@ def test_list_connections_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_list_connections" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, - "post_list_connections_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_list_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "post_list_connections" + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_list_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_list_connections" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10883,8 +10891,9 @@ def test_update_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11070,20 +11079,21 @@ def test_update_connection_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_update_connection" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, - "post_update_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_update_connection" - ) as pre: + 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.RepositoryManagerRestInterceptor, "post_update_connection" + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_update_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_update_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11136,8 +11146,9 @@ def test_delete_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11194,20 +11205,21 @@ def test_delete_connection_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_delete_connection" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, - "post_delete_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_delete_connection" - ) as pre: + 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.RepositoryManagerRestInterceptor, "post_delete_connection" + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_delete_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_delete_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11260,8 +11272,9 @@ def test_create_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11394,20 +11407,21 @@ def test_create_repository_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_create_repository" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, - "post_create_repository_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_create_repository" - ) as pre: + 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.RepositoryManagerRestInterceptor, "post_create_repository" + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_create_repository_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_create_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11460,8 +11474,9 @@ def test_batch_create_repositories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11518,20 +11533,22 @@ def test_batch_create_repositories_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_batch_create_repositories" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, - "post_batch_create_repositories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_batch_create_repositories" - ) as pre: + 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.RepositoryManagerRestInterceptor, + "post_batch_create_repositories", + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_batch_create_repositories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_batch_create_repositories" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11586,8 +11603,9 @@ def test_get_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11658,17 +11676,20 @@ def test_get_repository_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_get_repository" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "post_get_repository_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_get_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "post_get_repository" + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_get_repository_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_get_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11721,8 +11742,9 @@ def test_list_repositories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11785,18 +11807,20 @@ def test_list_repositories_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_list_repositories" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, - "post_list_repositories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_list_repositories" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "post_list_repositories" + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_list_repositories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_list_repositories" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11856,8 +11880,9 @@ def test_delete_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11916,20 +11941,21 @@ def test_delete_repository_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_delete_repository" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, - "post_delete_repository_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_delete_repository" - ) as pre: + 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.RepositoryManagerRestInterceptor, "post_delete_repository" + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_delete_repository_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_delete_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11984,8 +12010,9 @@ def test_fetch_read_write_token_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12050,18 +12077,20 @@ def test_fetch_read_write_token_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_fetch_read_write_token" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, - "post_fetch_read_write_token_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_fetch_read_write_token" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "post_fetch_read_write_token" + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_fetch_read_write_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_fetch_read_write_token" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12121,8 +12150,9 @@ def test_fetch_read_token_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12187,18 +12217,20 @@ def test_fetch_read_token_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_fetch_read_token" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, - "post_fetch_read_token_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_fetch_read_token" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "post_fetch_read_token" + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_fetch_read_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_fetch_read_token" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12258,8 +12290,9 @@ def test_fetch_linkable_repositories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12324,18 +12357,22 @@ def test_fetch_linkable_repositories_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_fetch_linkable_repositories" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, - "post_fetch_linkable_repositories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_fetch_linkable_repositories" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_fetch_linkable_repositories", + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_fetch_linkable_repositories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "pre_fetch_linkable_repositories", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12393,8 +12430,9 @@ def test_fetch_git_refs_rest_bad_request(request_type=repositories.FetchGitRefsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12459,17 +12497,20 @@ def test_fetch_git_refs_rest_interceptors(null_interceptor): ) client = RepositoryManagerClient(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.RepositoryManagerRestInterceptor, "post_fetch_git_refs" - ) as post, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "post_fetch_git_refs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RepositoryManagerRestInterceptor, "pre_fetch_git_refs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "post_fetch_git_refs" + ) as post, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, + "post_fetch_git_refs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RepositoryManagerRestInterceptor, "pre_fetch_git_refs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12526,8 +12567,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12590,8 +12632,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12654,8 +12697,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12718,8 +12762,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12780,8 +12825,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13227,11 +13273,14 @@ def test_repository_manager_base_transport(): def test_repository_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.devtools.cloudbuild_v2.services.repository_manager.transports.RepositoryManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.devtools.cloudbuild_v2.services.repository_manager.transports.RepositoryManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RepositoryManagerTransport( @@ -13248,9 +13297,12 @@ def test_repository_manager_base_transport_with_credentials_file(): def test_repository_manager_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.devtools.cloudbuild_v2.services.repository_manager.transports.RepositoryManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.devtools.cloudbuild_v2.services.repository_manager.transports.RepositoryManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RepositoryManagerTransport() @@ -13322,11 +13374,12 @@ def test_repository_manager_transport_auth_gdch_credentials(transport_class): def test_repository_manager_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-capacityplanner/docs/conf.py b/packages/google-cloud-capacityplanner/docs/conf.py index d0c7a86b573e..9c05f0c6ec6e 100644 --- a/packages/google-cloud-capacityplanner/docs/conf.py +++ b/packages/google-cloud-capacityplanner/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-capacityplanner documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/__init__.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/__init__.py index 244a07238ba0..2ffce14f2317 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/__init__.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.usage_service import UsageServiceAsyncClient, UsageServiceClient from .types.allocation import Allocation from .types.future_reservation import FutureReservation diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/async_client.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/async_client.py index 7f0477d154ac..2f955c67e43c 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/async_client.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.capacityplanner_v1beta import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.capacityplanner_v1beta.types import usage_service @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UsageServiceAsyncClient: The constructed client. """ - return UsageServiceClient.from_service_account_info.__func__(UsageServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = UsageServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(UsageServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UsageServiceAsyncClient: The constructed client. """ - return UsageServiceClient.from_service_account_file.__func__(UsageServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = UsageServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(UsageServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/client.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/client.py index df52fc80bf7f..4ad7654c8aa3 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/client.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.capacityplanner_v1beta import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.capacityplanner_v1beta.types import usage_service @@ -644,11 +644,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UsageServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UsageServiceClient._read_environment_variables() + ) self._client_cert_source = UsageServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -683,8 +681,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UsageServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/base.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/base.py index 9da401542175..e3c59e99d1df 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/base.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.capacityplanner_v1beta import gapic_version as package_version from google.cloud.capacityplanner_v1beta.types import usage_service diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc.py index 19564ed80eee..adc97d8fc873 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.capacityplanner_v1beta.types import usage_service diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc_asyncio.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc_asyncio.py index b96df6b75b1e..f169d043227e 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.capacityplanner_v1beta.types import usage_service diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/rest.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/rest.py index 23add23cd0ea..d7217f802f55 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/rest.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/services/usage_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -627,7 +627,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -753,9 +753,7 @@ def __call__( """ - http_options = ( - _BaseUsageServiceRestTransport._BaseExportReservationsUsage._get_http_options() - ) + http_options = _BaseUsageServiceRestTransport._BaseExportReservationsUsage._get_http_options() request, metadata = self._interceptor.pre_export_reservations_usage( request, metadata @@ -781,7 +779,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -906,9 +904,7 @@ def __call__( """ - http_options = ( - _BaseUsageServiceRestTransport._BaseExportUsageHistories._get_http_options() - ) + http_options = _BaseUsageServiceRestTransport._BaseExportUsageHistories._get_http_options() request, metadata = self._interceptor.pre_export_usage_histories( request, metadata @@ -934,7 +930,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1207,9 +1203,7 @@ def __call__( The ``QueryReservations`` response. """ - http_options = ( - _BaseUsageServiceRestTransport._BaseQueryReservations._get_http_options() - ) + http_options = _BaseUsageServiceRestTransport._BaseQueryReservations._get_http_options() request, metadata = self._interceptor.pre_query_reservations( request, metadata @@ -1356,9 +1350,7 @@ def __call__( The ``QueryUsageHistories`` response. """ - http_options = ( - _BaseUsageServiceRestTransport._BaseQueryUsageHistories._get_http_options() - ) + http_options = _BaseUsageServiceRestTransport._BaseQueryUsageHistories._get_http_options() request, metadata = self._interceptor.pre_query_usage_histories( request, metadata @@ -1471,7 +1463,9 @@ def export_reservations_usage( ]: # 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._ExportReservationsUsage(self._session, self._host, self._interceptor) # type: ignore + return self._ExportReservationsUsage( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_usage_histories( diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/__init__.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/__init__.py index 1d75a7a9d3d1..c3c457e9b497 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/__init__.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/__init__.py @@ -13,9 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .allocation import Allocation -from .future_reservation import FutureReservation -from .location import LocationIdentifier, LocationLevel +from .allocation import ( + Allocation, +) +from .future_reservation import ( + FutureReservation, +) +from .location import ( + LocationIdentifier, + LocationLevel, +) from .resource import ( ResourceAttribute, ResourceContainer, diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/allocation.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/allocation.py index d0ed45dc5f8b..85a6811dc5c4 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/allocation.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/allocation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -82,6 +82,7 @@ class Status(proto.Enum): UPDATING (5): Reservation is currently being resized. """ + STATUS_UNSPECIFIED = 0 INVALID = 1 CREATING = 2 @@ -176,6 +177,7 @@ class DiskInterface(proto.Enum): ISCSI (4): ISCSI disk interface. """ + DISK_INTERFACE_UNSPECIFIED = 0 SCSI = 1 NVME = 2 @@ -264,6 +266,7 @@ class ShareType(proto.Enum): Shared-reservation is open to direct child projects of specific folders. """ + SHARE_TYPE_UNSPECIFIED = 0 ORGANIZATION = 1 SPECIFIC_PROJECTS = 2 diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/future_reservation.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/future_reservation.py index 15137bf3bf36..126955e11e04 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/future_reservation.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/future_reservation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.capacityplanner_v1beta.types import allocation @@ -204,6 +204,7 @@ class ProcurementStatus(proto.Enum): the Future Reservation will be restored to the last known good state. """ + PROCUREMENT_STATUS_UNSPECIFIED = 0 PENDING_APPROVAL = 1 APPROVED = 2 diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/location.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/location.py index 971b3c6ef48c..a2ebf28601e5 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/location.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/location.py @@ -47,6 +47,7 @@ class LocationLevel(proto.Enum): MULTI_REGION (6): Multiple regions. """ + LOCATION_LEVEL_UNSPECIFIED = 0 REGION = 1 ZONE = 2 diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/resource.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/resource.py index 81253f285db6..d680e66c6fd1 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/resource.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/resource.py @@ -76,6 +76,7 @@ class Unit(proto.Enum): KOPS (18): No description available. """ + UNIT_UNSPECIFIED = 0 UNIT_COUNT = 1 KB = 2 @@ -123,6 +124,7 @@ class Type(proto.Enum): ORG (3): No description available. """ + TYPE_UNSPECIFIED = 0 PROJECT = 1 FOLDER = 2 diff --git a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/usage_service.py b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/usage_service.py index 0d11e29a888b..921b8511accb 100644 --- a/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/usage_service.py +++ b/packages/google-cloud-capacityplanner/google/cloud/capacityplanner_v1beta/types/usage_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore from google.cloud.capacityplanner_v1beta.types import allocation, future_reservation @@ -388,6 +388,7 @@ class ReservationType(proto.Enum): RESERVATION_TYPE_ALL (3): All reservations. """ + RESERVATION_TYPE_UNSPECIFIED = 0 RESERVATION_TYPE_ALLOCATION = 1 RESERVATION_TYPE_FUTURE_RESERVATION = 2 @@ -406,6 +407,7 @@ class ShareType(proto.Enum): Shared-reservation is open to specific projects. """ + SHARE_TYPE_UNSPECIFIED = 0 SHARE_TYPE_LOCAL = 1 SHARE_TYPE_SPECIFIC_PROJECTS = 2 @@ -427,6 +429,7 @@ class OwnershipType(proto.Enum): Container (project/folder/organization), but not owned by them. """ + OWNERSHIP_TYPE_UNSPECIFIED = 0 OWNERSHIP_TYPE_OWNED = 1 OWNERSHIP_TYPE_SHARED_BY_OTHERS = 2 @@ -448,6 +451,7 @@ class ReservationDataLevel(proto.Enum): limited fields which are useful for Capacity Planning. """ + RESERVATION_DATA_LEVEL_UNSPECIFIED = 0 RESERVATION_DATA_LEVEL_AGGREGATED = 1 RESERVATION_DATA_LEVEL_PER_RESERVATION = 2 @@ -604,6 +608,7 @@ class ForecastType(proto.Enum): Yearly Seasonality model provides generic seasonality beyond BFCM. """ + FORECAST_TYPE_UNSPECIFIED = 0 STATISTICAL = 1 STATISTICAL_WITH_BFCM = 2 @@ -625,6 +630,7 @@ class Bounds(proto.Enum): The time series represents the lower bound of the forecast. """ + BOUNDS_UNSPECIFIED = 0 LOWER_BOUND = 1 MEDIAN = 2 @@ -649,6 +655,7 @@ class PredictionInterval(proto.Enum): ``PREDICTION_INTERVAL_50`` means that the ``UPPER_BOUND`` will represent the 75th precentile. """ + PREDICTION_INTERVAL_UNSPECIFIED = 0 PREDICTION_INTERVAL_90 = 1 PREDICTION_INTERVAL_50 = 2 @@ -718,6 +725,7 @@ class AggregationMethod(proto.Enum): Time series values represent the 99th percentile of the sampled values. """ + AGGREGATION_METHOD_UNSPECIFIED = 0 MEDIAN = 1 PEAK = 2 @@ -794,6 +802,7 @@ class LocationType(proto.Enum): Time series values represent usage aggregated at the zone level. """ + LOCATION_TYPE_UNSPECIFIED = 0 REGIONAL = 1 ZONAL = 2 @@ -891,12 +900,12 @@ class ReservationData(proto.Message): number=5, message="TimeSeries", ) - future_reservations: MutableSequence[ - future_reservation.FutureReservation - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=future_reservation.FutureReservation, + future_reservations: MutableSequence[future_reservation.FutureReservation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=future_reservation.FutureReservation, + ) ) allocations: MutableSequence[allocation.Allocation] = proto.RepeatedField( proto.MESSAGE, @@ -1286,6 +1295,7 @@ class ShareType(proto.Enum): Shared-reservation is open to specific projects. """ + SHARE_TYPE_UNSPECIFIED = 0 SHARE_TYPE_LOCAL = 1 SHARE_TYPE_SPECIFIC_PROJECTS = 2 @@ -1471,6 +1481,7 @@ class PartitionKey(proto.Enum): additional timestamp column representing when the request was received. """ + PARTITION_KEY_UNSPECIFIED = 0 REQUEST_TIME = 1 @@ -1494,6 +1505,7 @@ class WriteDisposition(proto.Enum): If the table already exists and contains data, an error is returned. """ + WRITE_DISPOSITION_UNSPECIFIED = 0 WRITE_APPEND = 1 WRITE_TRUNCATE = 2 @@ -1513,6 +1525,7 @@ class CreateDisposition(proto.Enum): If the table does not exist, an error will be returned. """ + CREATE_DISPOSITION_UNSPECIFIED = 0 CREATE_IF_NEEDED = 1 CREATE_NEVER = 2 diff --git a/packages/google-cloud-capacityplanner/noxfile.py b/packages/google-cloud-capacityplanner/noxfile.py index c581eeab4ef0..f780073a1b8a 100644 --- a/packages/google-cloud-capacityplanner/noxfile.py +++ b/packages/google-cloud-capacityplanner/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-capacityplanner/tests/unit/gapic/capacityplanner_v1beta/test_usage_service.py b/packages/google-cloud-capacityplanner/tests/unit/gapic/capacityplanner_v1beta/test_usage_service.py index b29079e1e850..828079fcf939 100644 --- a/packages/google-cloud-capacityplanner/tests/unit/gapic/capacityplanner_v1beta/test_usage_service.py +++ b/packages/google-cloud-capacityplanner/tests/unit/gapic/capacityplanner_v1beta/test_usage_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,16 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.type import date_pb2 # type: ignore from google.cloud.capacityplanner_v1beta.services.usage_service import ( UsageServiceAsyncClient, @@ -936,10 +936,9 @@ def test_usage_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +983,9 @@ def test_usage_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1021,9 @@ def test_usage_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1265,13 +1262,13 @@ def test_usage_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1395,9 +1392,9 @@ def test_query_usage_histories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_usage_histories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_usage_histories] = ( + mock_rpc + ) request = {} client.query_usage_histories(request) @@ -1896,9 +1893,9 @@ def test_query_reservations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_reservations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_reservations] = ( + mock_rpc + ) request = {} client.query_reservations(request) @@ -2242,9 +2239,9 @@ def test_export_usage_histories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_usage_histories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_usage_histories] = ( + mock_rpc + ) request = {} client.export_usage_histories(request) @@ -2506,9 +2503,9 @@ def test_export_forecasts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_forecasts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_forecasts] = ( + mock_rpc + ) request = {} client.export_forecasts(request) @@ -2962,9 +2959,9 @@ def test_query_usage_histories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_usage_histories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_usage_histories] = ( + mock_rpc + ) request = {} client.query_usage_histories(request) @@ -3232,9 +3229,9 @@ def test_query_reservations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_reservations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_reservations] = ( + mock_rpc + ) request = {} client.query_reservations(request) @@ -3472,9 +3469,9 @@ def test_export_usage_histories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_usage_histories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_usage_histories] = ( + mock_rpc + ) request = {} client.export_usage_histories(request) @@ -3609,9 +3606,9 @@ def test_export_forecasts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_forecasts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_forecasts] = ( + mock_rpc + ) request = {} client.export_forecasts(request) @@ -4296,8 +4293,9 @@ def test_query_usage_histories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4357,18 +4355,20 @@ def test_query_usage_histories_rest_interceptors(null_interceptor): ) client = UsageServiceClient(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.UsageServiceRestInterceptor, "post_query_usage_histories" - ) as post, mock.patch.object( - transports.UsageServiceRestInterceptor, - "post_query_usage_histories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UsageServiceRestInterceptor, "pre_query_usage_histories" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UsageServiceRestInterceptor, "post_query_usage_histories" + ) as post, + mock.patch.object( + transports.UsageServiceRestInterceptor, + "post_query_usage_histories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UsageServiceRestInterceptor, "pre_query_usage_histories" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4426,8 +4426,9 @@ def test_query_forecasts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4487,17 +4488,19 @@ def test_query_forecasts_rest_interceptors(null_interceptor): ) client = UsageServiceClient(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.UsageServiceRestInterceptor, "post_query_forecasts" - ) as post, mock.patch.object( - transports.UsageServiceRestInterceptor, "post_query_forecasts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UsageServiceRestInterceptor, "pre_query_forecasts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UsageServiceRestInterceptor, "post_query_forecasts" + ) as post, + mock.patch.object( + transports.UsageServiceRestInterceptor, "post_query_forecasts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.UsageServiceRestInterceptor, "pre_query_forecasts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4555,8 +4558,9 @@ def test_query_reservations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4616,17 +4620,20 @@ def test_query_reservations_rest_interceptors(null_interceptor): ) client = UsageServiceClient(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.UsageServiceRestInterceptor, "post_query_reservations" - ) as post, mock.patch.object( - transports.UsageServiceRestInterceptor, "post_query_reservations_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UsageServiceRestInterceptor, "pre_query_reservations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UsageServiceRestInterceptor, "post_query_reservations" + ) as post, + mock.patch.object( + transports.UsageServiceRestInterceptor, + "post_query_reservations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UsageServiceRestInterceptor, "pre_query_reservations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4684,8 +4691,9 @@ def test_export_usage_histories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4742,20 +4750,21 @@ def test_export_usage_histories_rest_interceptors(null_interceptor): ) client = UsageServiceClient(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.UsageServiceRestInterceptor, "post_export_usage_histories" - ) as post, mock.patch.object( - transports.UsageServiceRestInterceptor, - "post_export_usage_histories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UsageServiceRestInterceptor, "pre_export_usage_histories" - ) as pre: + 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.UsageServiceRestInterceptor, "post_export_usage_histories" + ) as post, + mock.patch.object( + transports.UsageServiceRestInterceptor, + "post_export_usage_histories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UsageServiceRestInterceptor, "pre_export_usage_histories" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4808,8 +4817,9 @@ def test_export_forecasts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4866,19 +4876,21 @@ def test_export_forecasts_rest_interceptors(null_interceptor): ) client = UsageServiceClient(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.UsageServiceRestInterceptor, "post_export_forecasts" - ) as post, mock.patch.object( - transports.UsageServiceRestInterceptor, "post_export_forecasts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UsageServiceRestInterceptor, "pre_export_forecasts" - ) as pre: + 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.UsageServiceRestInterceptor, "post_export_forecasts" + ) as post, + mock.patch.object( + transports.UsageServiceRestInterceptor, + "post_export_forecasts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UsageServiceRestInterceptor, "pre_export_forecasts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4931,8 +4943,9 @@ def test_export_reservations_usage_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4989,20 +5002,21 @@ def test_export_reservations_usage_rest_interceptors(null_interceptor): ) client = UsageServiceClient(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.UsageServiceRestInterceptor, "post_export_reservations_usage" - ) as post, mock.patch.object( - transports.UsageServiceRestInterceptor, - "post_export_reservations_usage_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UsageServiceRestInterceptor, "pre_export_reservations_usage" - ) as pre: + 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.UsageServiceRestInterceptor, "post_export_reservations_usage" + ) as post, + mock.patch.object( + transports.UsageServiceRestInterceptor, + "post_export_reservations_usage_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UsageServiceRestInterceptor, "pre_export_reservations_usage" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5259,11 +5273,14 @@ def test_usage_service_base_transport(): def test_usage_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.capacityplanner_v1beta.services.usage_service.transports.UsageServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.capacityplanner_v1beta.services.usage_service.transports.UsageServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UsageServiceTransport( @@ -5283,9 +5300,12 @@ def test_usage_service_base_transport_with_credentials_file(): def test_usage_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.capacityplanner_v1beta.services.usage_service.transports.UsageServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.capacityplanner_v1beta.services.usage_service.transports.UsageServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UsageServiceTransport() @@ -5363,11 +5383,12 @@ def test_usage_service_transport_auth_gdch_credentials(transport_class): def test_usage_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-certificate-manager/docs/conf.py b/packages/google-cloud-certificate-manager/docs/conf.py index 9280f87f2878..7ce0608c5d27 100644 --- a/packages/google-cloud-certificate-manager/docs/conf.py +++ b/packages/google-cloud-certificate-manager/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-certificate-manager documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/__init__.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/__init__.py index 073b8f0cf6da..8e89455479cb 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/__init__.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.certificate_manager import ( CertificateManagerAsyncClient, CertificateManagerClient, diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/async_client.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/async_client.py index 8f94e79ac9a4..e07cc3fe3ce5 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/async_client.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.certificate_manager_v1 import gapic_version as package_version @@ -44,23 +44,25 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.certificate_manager_v1.services.certificate_manager import pagers -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config from .client import CertificateManagerClient from .transports.base import DEFAULT_CLIENT_INFO, CertificateManagerTransport @@ -186,7 +188,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CertificateManagerAsyncClient: The constructed client. """ - return CertificateManagerClient.from_service_account_info.__func__(CertificateManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CertificateManagerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CertificateManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -202,7 +205,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CertificateManagerAsyncClient: The constructed client. """ - return CertificateManagerClient.from_service_account_file.__func__(CertificateManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CertificateManagerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CertificateManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -240,7 +244,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CertificateManagerClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CertificateManagerClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CertificateManagerTransport: diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/client.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/client.py index 1d68173b634a..f2171cb1f8f9 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/client.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.certificate_manager_v1 import gapic_version as package_version @@ -61,23 +61,25 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.certificate_manager_v1.services.certificate_manager import pagers -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config from .transports.base import DEFAULT_CLIENT_INFO, CertificateManagerTransport from .transports.grpc import CertificateManagerGrpcTransport @@ -93,9 +95,7 @@ class CertificateManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CertificateManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CertificateManagerTransport]] _transport_registry["grpc"] = CertificateManagerGrpcTransport _transport_registry["grpc_asyncio"] = CertificateManagerGrpcAsyncIOTransport _transport_registry["rest"] = CertificateManagerRestTransport @@ -803,11 +803,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CertificateManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CertificateManagerClient._read_environment_variables() + ) self._client_cert_source = CertificateManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -842,8 +840,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CertificateManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/pagers.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/pagers.py index a3f314b8f931..09dfcb923687 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/pagers.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -307,7 +307,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -389,7 +389,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -467,7 +467,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -549,7 +549,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -627,7 +627,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -711,7 +711,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -798,7 +798,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -886,7 +886,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -962,7 +962,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/__init__.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/__init__.py index 27a1788e2e7a..3c46675f0143 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/__init__.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import CertificateManagerRestInterceptor, CertificateManagerRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CertificateManagerTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CertificateManagerTransport]] _transport_registry["grpc"] = CertificateManagerGrpcTransport _transport_registry["grpc_asyncio"] = CertificateManagerGrpcAsyncIOTransport _transport_registry["rest"] = CertificateManagerRestTransport diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/base.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/base.py index 2898383e522c..b8eeb0c0d9b6 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/base.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/base.py @@ -17,24 +17,26 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.certificate_manager_v1 import gapic_version as package_version -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -870,13 +872,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc.py index aad5e868a617..6b8a729d24a4 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc.py @@ -16,27 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config from .base import DEFAULT_CLIENT_INFO, CertificateManagerTransport @@ -685,12 +687,12 @@ def list_certificate_map_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_map_entries" not in self._stubs: - self._stubs[ - "list_certificate_map_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateMapEntries", - request_serializer=certificate_manager.ListCertificateMapEntriesRequest.serialize, - response_deserializer=certificate_manager.ListCertificateMapEntriesResponse.deserialize, + self._stubs["list_certificate_map_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateMapEntries", + request_serializer=certificate_manager.ListCertificateMapEntriesRequest.serialize, + response_deserializer=certificate_manager.ListCertificateMapEntriesResponse.deserialize, + ) ) return self._stubs["list_certificate_map_entries"] @@ -745,12 +747,12 @@ def create_certificate_map_entry( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_map_entry" not in self._stubs: - self._stubs[ - "create_certificate_map_entry" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateMapEntry", - request_serializer=certificate_manager.CreateCertificateMapEntryRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_map_entry"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateMapEntry", + request_serializer=certificate_manager.CreateCertificateMapEntryRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_map_entry"] @@ -775,12 +777,12 @@ def update_certificate_map_entry( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_map_entry" not in self._stubs: - self._stubs[ - "update_certificate_map_entry" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/UpdateCertificateMapEntry", - request_serializer=certificate_manager.UpdateCertificateMapEntryRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_map_entry"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/UpdateCertificateMapEntry", + request_serializer=certificate_manager.UpdateCertificateMapEntryRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_map_entry"] @@ -805,12 +807,12 @@ def delete_certificate_map_entry( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_certificate_map_entry" not in self._stubs: - self._stubs[ - "delete_certificate_map_entry" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateMapEntry", - request_serializer=certificate_manager.DeleteCertificateMapEntryRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_certificate_map_entry"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateMapEntry", + request_serializer=certificate_manager.DeleteCertificateMapEntryRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_certificate_map_entry"] @@ -982,12 +984,12 @@ def list_certificate_issuance_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_issuance_configs" not in self._stubs: - self._stubs[ - "list_certificate_issuance_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateIssuanceConfigs", - request_serializer=certificate_issuance_config.ListCertificateIssuanceConfigsRequest.serialize, - response_deserializer=certificate_issuance_config.ListCertificateIssuanceConfigsResponse.deserialize, + self._stubs["list_certificate_issuance_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateIssuanceConfigs", + request_serializer=certificate_issuance_config.ListCertificateIssuanceConfigsRequest.serialize, + response_deserializer=certificate_issuance_config.ListCertificateIssuanceConfigsResponse.deserialize, + ) ) return self._stubs["list_certificate_issuance_configs"] @@ -1014,12 +1016,12 @@ def get_certificate_issuance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_certificate_issuance_config" not in self._stubs: - self._stubs[ - "get_certificate_issuance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/GetCertificateIssuanceConfig", - request_serializer=certificate_issuance_config.GetCertificateIssuanceConfigRequest.serialize, - response_deserializer=certificate_issuance_config.CertificateIssuanceConfig.deserialize, + self._stubs["get_certificate_issuance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/GetCertificateIssuanceConfig", + request_serializer=certificate_issuance_config.GetCertificateIssuanceConfigRequest.serialize, + response_deserializer=certificate_issuance_config.CertificateIssuanceConfig.deserialize, + ) ) return self._stubs["get_certificate_issuance_config"] @@ -1047,12 +1049,12 @@ def create_certificate_issuance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_issuance_config" not in self._stubs: - self._stubs[ - "create_certificate_issuance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateIssuanceConfig", - request_serializer=gcc_certificate_issuance_config.CreateCertificateIssuanceConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_issuance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateIssuanceConfig", + request_serializer=gcc_certificate_issuance_config.CreateCertificateIssuanceConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_issuance_config"] @@ -1079,12 +1081,12 @@ def delete_certificate_issuance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_certificate_issuance_config" not in self._stubs: - self._stubs[ - "delete_certificate_issuance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateIssuanceConfig", - request_serializer=certificate_issuance_config.DeleteCertificateIssuanceConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_certificate_issuance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateIssuanceConfig", + request_serializer=certificate_issuance_config.DeleteCertificateIssuanceConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_certificate_issuance_config"] diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc_asyncio.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc_asyncio.py index a8765269549d..5facfe547702 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,18 +31,17 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config from .base import DEFAULT_CLIENT_INFO, CertificateManagerTransport from .grpc import CertificateManagerGrpcTransport @@ -700,12 +702,12 @@ def list_certificate_map_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_map_entries" not in self._stubs: - self._stubs[ - "list_certificate_map_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateMapEntries", - request_serializer=certificate_manager.ListCertificateMapEntriesRequest.serialize, - response_deserializer=certificate_manager.ListCertificateMapEntriesResponse.deserialize, + self._stubs["list_certificate_map_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateMapEntries", + request_serializer=certificate_manager.ListCertificateMapEntriesRequest.serialize, + response_deserializer=certificate_manager.ListCertificateMapEntriesResponse.deserialize, + ) ) return self._stubs["list_certificate_map_entries"] @@ -761,12 +763,12 @@ def create_certificate_map_entry( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_map_entry" not in self._stubs: - self._stubs[ - "create_certificate_map_entry" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateMapEntry", - request_serializer=certificate_manager.CreateCertificateMapEntryRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_map_entry"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateMapEntry", + request_serializer=certificate_manager.CreateCertificateMapEntryRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_map_entry"] @@ -792,12 +794,12 @@ def update_certificate_map_entry( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_map_entry" not in self._stubs: - self._stubs[ - "update_certificate_map_entry" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/UpdateCertificateMapEntry", - request_serializer=certificate_manager.UpdateCertificateMapEntryRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_map_entry"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/UpdateCertificateMapEntry", + request_serializer=certificate_manager.UpdateCertificateMapEntryRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_map_entry"] @@ -823,12 +825,12 @@ def delete_certificate_map_entry( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_certificate_map_entry" not in self._stubs: - self._stubs[ - "delete_certificate_map_entry" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateMapEntry", - request_serializer=certificate_manager.DeleteCertificateMapEntryRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_certificate_map_entry"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateMapEntry", + request_serializer=certificate_manager.DeleteCertificateMapEntryRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_certificate_map_entry"] @@ -1003,12 +1005,12 @@ def list_certificate_issuance_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_issuance_configs" not in self._stubs: - self._stubs[ - "list_certificate_issuance_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateIssuanceConfigs", - request_serializer=certificate_issuance_config.ListCertificateIssuanceConfigsRequest.serialize, - response_deserializer=certificate_issuance_config.ListCertificateIssuanceConfigsResponse.deserialize, + self._stubs["list_certificate_issuance_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/ListCertificateIssuanceConfigs", + request_serializer=certificate_issuance_config.ListCertificateIssuanceConfigsRequest.serialize, + response_deserializer=certificate_issuance_config.ListCertificateIssuanceConfigsResponse.deserialize, + ) ) return self._stubs["list_certificate_issuance_configs"] @@ -1035,12 +1037,12 @@ def get_certificate_issuance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_certificate_issuance_config" not in self._stubs: - self._stubs[ - "get_certificate_issuance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/GetCertificateIssuanceConfig", - request_serializer=certificate_issuance_config.GetCertificateIssuanceConfigRequest.serialize, - response_deserializer=certificate_issuance_config.CertificateIssuanceConfig.deserialize, + self._stubs["get_certificate_issuance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/GetCertificateIssuanceConfig", + request_serializer=certificate_issuance_config.GetCertificateIssuanceConfigRequest.serialize, + response_deserializer=certificate_issuance_config.CertificateIssuanceConfig.deserialize, + ) ) return self._stubs["get_certificate_issuance_config"] @@ -1068,12 +1070,12 @@ def create_certificate_issuance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_issuance_config" not in self._stubs: - self._stubs[ - "create_certificate_issuance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateIssuanceConfig", - request_serializer=gcc_certificate_issuance_config.CreateCertificateIssuanceConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_issuance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/CreateCertificateIssuanceConfig", + request_serializer=gcc_certificate_issuance_config.CreateCertificateIssuanceConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_issuance_config"] @@ -1100,12 +1102,12 @@ def delete_certificate_issuance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_certificate_issuance_config" not in self._stubs: - self._stubs[ - "delete_certificate_issuance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateIssuanceConfig", - request_serializer=certificate_issuance_config.DeleteCertificateIssuanceConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_certificate_issuance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.certificatemanager.v1.CertificateManager/DeleteCertificateIssuanceConfig", + request_serializer=certificate_issuance_config.DeleteCertificateIssuanceConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_certificate_issuance_config"] diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest.py index a1f0c57da61a..97e0b593a6c1 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest.py @@ -16,27 +16,29 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseCertificateManagerRestTransport @@ -2139,9 +2141,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCreateCertificate._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCreateCertificate._get_http_options() request, metadata = self._interceptor.pre_create_certificate( request, metadata @@ -2167,7 +2167,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2297,15 +2297,12 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCreateCertificateIssuanceConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCreateCertificateIssuanceConfig._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_certificate_issuance_config( - request, metadata + request, metadata = ( + self._interceptor.pre_create_certificate_issuance_config( + request, metadata + ) ) transcoded_request = _BaseCertificateManagerRestTransport._BaseCreateCertificateIssuanceConfig._get_transcoded_request( http_options, request @@ -2328,7 +2325,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2369,11 +2366,10 @@ def __call__( resp = self._interceptor.post_create_certificate_issuance_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_certificate_issuance_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_certificate_issuance_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2457,9 +2453,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCreateCertificateMap._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCreateCertificateMap._get_http_options() request, metadata = self._interceptor.pre_create_certificate_map( request, metadata @@ -2485,7 +2479,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2614,9 +2608,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCreateCertificateMapEntry._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCreateCertificateMapEntry._get_http_options() request, metadata = self._interceptor.pre_create_certificate_map_entry( request, metadata @@ -2642,7 +2634,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2768,9 +2760,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCreateDnsAuthorization._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCreateDnsAuthorization._get_http_options() request, metadata = self._interceptor.pre_create_dns_authorization( request, metadata @@ -2796,7 +2786,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2924,9 +2914,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCreateTrustConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCreateTrustConfig._get_http_options() request, metadata = self._interceptor.pre_create_trust_config( request, metadata @@ -2952,7 +2940,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3077,9 +3065,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteCertificate._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteCertificate._get_http_options() request, metadata = self._interceptor.pre_delete_certificate( request, metadata @@ -3101,7 +3087,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3229,15 +3215,12 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteCertificateIssuanceConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteCertificateIssuanceConfig._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_certificate_issuance_config( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_certificate_issuance_config( + request, metadata + ) ) transcoded_request = _BaseCertificateManagerRestTransport._BaseDeleteCertificateIssuanceConfig._get_transcoded_request( http_options, request @@ -3256,7 +3239,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3296,11 +3279,10 @@ def __call__( resp = self._interceptor.post_delete_certificate_issuance_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_certificate_issuance_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_certificate_issuance_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3383,9 +3365,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteCertificateMap._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteCertificateMap._get_http_options() request, metadata = self._interceptor.pre_delete_certificate_map( request, metadata @@ -3407,7 +3387,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3534,9 +3514,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteCertificateMapEntry._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteCertificateMapEntry._get_http_options() request, metadata = self._interceptor.pre_delete_certificate_map_entry( request, metadata @@ -3558,7 +3536,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3682,9 +3660,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteDnsAuthorization._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteDnsAuthorization._get_http_options() request, metadata = self._interceptor.pre_delete_dns_authorization( request, metadata @@ -3706,7 +3682,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3832,9 +3808,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteTrustConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteTrustConfig._get_http_options() request, metadata = self._interceptor.pre_delete_trust_config( request, metadata @@ -3856,7 +3830,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3977,9 +3951,7 @@ def __call__( Defines TLS certificate. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetCertificate._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetCertificate._get_http_options() request, metadata = self._interceptor.pre_get_certificate(request, metadata) transcoded_request = _BaseCertificateManagerRestTransport._BaseGetCertificate._get_transcoded_request( @@ -4125,9 +4097,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetCertificateIssuanceConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetCertificateIssuanceConfig._get_http_options() request, metadata = self._interceptor.pre_get_certificate_issuance_config( request, metadata @@ -4191,11 +4161,10 @@ def __call__( resp = self._interceptor.post_get_certificate_issuance_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_certificate_issuance_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_certificate_issuance_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4281,9 +4250,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetCertificateMap._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetCertificateMap._get_http_options() request, metadata = self._interceptor.pre_get_certificate_map( request, metadata @@ -4430,9 +4397,7 @@ def __call__( Defines a certificate map entry. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetCertificateMapEntry._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetCertificateMapEntry._get_http_options() request, metadata = self._interceptor.pre_get_certificate_map_entry( request, metadata @@ -4584,9 +4549,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetDnsAuthorization._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetDnsAuthorization._get_http_options() request, metadata = self._interceptor.pre_get_dns_authorization( request, metadata @@ -4735,9 +4698,7 @@ def __call__( Defines a trust config. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetTrustConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetTrustConfig._get_http_options() request, metadata = self._interceptor.pre_get_trust_config( request, metadata @@ -4888,9 +4849,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListCertificateIssuanceConfigs._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListCertificateIssuanceConfigs._get_http_options() request, metadata = self._interceptor.pre_list_certificate_issuance_configs( request, metadata @@ -4958,11 +4917,10 @@ def __call__( resp = self._interceptor.post_list_certificate_issuance_configs(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_certificate_issuance_configs_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_certificate_issuance_configs_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5045,9 +5003,7 @@ def __call__( Response for the ``ListCertificateMapEntries`` method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListCertificateMapEntries._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListCertificateMapEntries._get_http_options() request, metadata = self._interceptor.pre_list_certificate_map_entries( request, metadata @@ -5196,9 +5152,7 @@ def __call__( Response for the ``ListCertificateMaps`` method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListCertificateMaps._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListCertificateMaps._get_http_options() request, metadata = self._interceptor.pre_list_certificate_maps( request, metadata @@ -5349,9 +5303,7 @@ def __call__( Response for the ``ListCertificates`` method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListCertificates._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListCertificates._get_http_options() request, metadata = self._interceptor.pre_list_certificates( request, metadata @@ -5498,9 +5450,7 @@ def __call__( Response for the ``ListDnsAuthorizations`` method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListDnsAuthorizations._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListDnsAuthorizations._get_http_options() request, metadata = self._interceptor.pre_list_dns_authorizations( request, metadata @@ -5651,9 +5601,7 @@ def __call__( Response for the ``ListTrustConfigs`` method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListTrustConfigs._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListTrustConfigs._get_http_options() request, metadata = self._interceptor.pre_list_trust_configs( request, metadata @@ -5804,9 +5752,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseUpdateCertificate._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseUpdateCertificate._get_http_options() request, metadata = self._interceptor.pre_update_certificate( request, metadata @@ -5832,7 +5778,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5958,9 +5904,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseUpdateCertificateMap._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseUpdateCertificateMap._get_http_options() request, metadata = self._interceptor.pre_update_certificate_map( request, metadata @@ -5986,7 +5930,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6115,9 +6059,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseUpdateCertificateMapEntry._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseUpdateCertificateMapEntry._get_http_options() request, metadata = self._interceptor.pre_update_certificate_map_entry( request, metadata @@ -6143,7 +6085,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6269,9 +6211,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseUpdateDnsAuthorization._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseUpdateDnsAuthorization._get_http_options() request, metadata = self._interceptor.pre_update_dns_authorization( request, metadata @@ -6297,7 +6237,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6425,9 +6365,7 @@ def __call__( """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseUpdateTrustConfig._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseUpdateTrustConfig._get_http_options() request, metadata = self._interceptor.pre_update_trust_config( request, metadata @@ -6453,7 +6391,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6539,7 +6477,9 @@ def create_certificate_issuance_config( ]: # 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._CreateCertificateIssuanceConfig(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCertificateIssuanceConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_certificate_map( @@ -6559,7 +6499,9 @@ def create_certificate_map_entry( ]: # 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._CreateCertificateMapEntry(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCertificateMapEntry( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_dns_authorization( @@ -6569,7 +6511,9 @@ def create_dns_authorization( ]: # 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._CreateDnsAuthorization(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDnsAuthorization( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_trust_config( @@ -6600,7 +6544,9 @@ def delete_certificate_issuance_config( ]: # 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._DeleteCertificateIssuanceConfig(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCertificateIssuanceConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_certificate_map( @@ -6620,7 +6566,9 @@ def delete_certificate_map_entry( ]: # 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._DeleteCertificateMapEntry(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCertificateMapEntry( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_dns_authorization( @@ -6630,7 +6578,9 @@ def delete_dns_authorization( ]: # 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._DeleteDnsAuthorization(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDnsAuthorization( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_trust_config( @@ -6659,7 +6609,9 @@ def get_certificate_issuance_config( ]: # 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._GetCertificateIssuanceConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetCertificateIssuanceConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_certificate_map( @@ -6681,7 +6633,9 @@ def get_certificate_map_entry( ]: # 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._GetCertificateMapEntry(self._session, self._host, self._interceptor) # type: ignore + return self._GetCertificateMapEntry( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_dns_authorization( @@ -6711,7 +6665,9 @@ def list_certificate_issuance_configs( ]: # 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._ListCertificateIssuanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListCertificateIssuanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_certificate_map_entries( @@ -6722,7 +6678,9 @@ def list_certificate_map_entries( ]: # 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._ListCertificateMapEntries(self._session, self._host, self._interceptor) # type: ignore + return self._ListCertificateMapEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_certificate_maps( @@ -6795,7 +6753,9 @@ def update_certificate_map_entry( ]: # 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._UpdateCertificateMapEntry(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCertificateMapEntry( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_dns_authorization( @@ -6805,7 +6765,9 @@ def update_dns_authorization( ]: # 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._UpdateDnsAuthorization(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDnsAuthorization( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_trust_config( @@ -6875,9 +6837,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseCertificateManagerRestTransport._BaseGetLocation._get_transcoded_request( @@ -7016,9 +6976,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseCertificateManagerRestTransport._BaseListLocations._get_transcoded_request( @@ -7155,9 +7113,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -7275,9 +7231,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -7393,9 +7347,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCertificateManagerRestTransport._BaseGetOperation._get_transcoded_request( @@ -7534,9 +7486,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCertificateManagerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCertificateManagerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCertificateManagerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest_base.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest_base.py index efa80ec971c0..24caba953e9e 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest_base.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/services/certificate_manager/transports/rest_base.py @@ -22,13 +22,15 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config from .base import DEFAULT_CLIENT_INFO, CertificateManagerTransport diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_issuance_config.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_issuance_config.py index 9dfcbba6794a..df69724112be 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_issuance_config.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_issuance_config.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -103,12 +103,12 @@ class ListCertificateIssuanceConfigsResponse(proto.Message): def raw_page(self): return self - certificate_issuance_configs: MutableSequence[ - "CertificateIssuanceConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CertificateIssuanceConfig", + certificate_issuance_configs: MutableSequence["CertificateIssuanceConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CertificateIssuanceConfig", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -232,6 +232,7 @@ class KeyAlgorithm(proto.Enum): ECDSA_P256 (4): Specifies ECDSA with curve P256. """ + KEY_ALGORITHM_UNSPECIFIED = 0 RSA_2048 = 1 ECDSA_P256 = 4 diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_manager.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_manager.py index 0108570e152e..0fbcd91efed0 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_manager.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/certificate_manager.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -70,6 +70,7 @@ class ServingState(proto.Enum): Update is in progress. Some frontends may serve this configuration. """ + SERVING_STATE_UNSPECIFIED = 0 ACTIVE = 1 PENDING = 2 @@ -486,12 +487,12 @@ class ListCertificateMapEntriesResponse(proto.Message): def raw_page(self): return self - certificate_map_entries: MutableSequence[ - "CertificateMapEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CertificateMapEntry", + certificate_map_entries: MutableSequence["CertificateMapEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CertificateMapEntry", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -890,6 +891,7 @@ class Scope(proto.Enum): Google Cloud regions. See https://cloud.google.com/compute/docs/regions-zones. """ + DEFAULT = 0 EDGE_CACHE = 1 ALL_REGIONS = 2 @@ -972,6 +974,7 @@ class State(proto.Enum): The certificate management is working, and a certificate has been provisioned. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 FAILED = 2 @@ -1008,6 +1011,7 @@ class Reason(proto.Enum): internal rate limits of the system. Provisioning may take longer to complete. """ + REASON_UNSPECIFIED = 0 AUTHORIZATION_ISSUE = 1 RATE_LIMITED = 2 @@ -1064,6 +1068,7 @@ class State(proto.Enum): ``failure_reason`` and ``details`` fields for more information. """ + STATE_UNSPECIFIED = 0 AUTHORIZING = 1 AUTHORIZED = 6 @@ -1088,6 +1093,7 @@ class FailureReason(proto.Enum): domain, e.g. for certificates per top-level private domain. """ + FAILURE_REASON_UNSPECIFIED = 0 CONFIG = 1 CAA = 2 @@ -1285,12 +1291,12 @@ class IpConfig(proto.Message): number=3, oneof="target_proxy", ) - ip_configs: MutableSequence[ - "CertificateMap.GclbTarget.IpConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="CertificateMap.GclbTarget.IpConfig", + ip_configs: MutableSequence["CertificateMap.GclbTarget.IpConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="CertificateMap.GclbTarget.IpConfig", + ) ) name: str = proto.Field( @@ -1385,6 +1391,7 @@ class Matcher(proto.Enum): wasn't specified in the request or SNI couldn't be found in the map. """ + MATCHER_UNSPECIFIED = 0 PRIMARY = 1 @@ -1484,6 +1491,7 @@ class Type(proto.Enum): management of Google-managed certificates with DNS authorization across multiple projects. """ + TYPE_UNSPECIFIED = 0 FIXED_RECORD = 1 PER_PROJECT_RECORD = 2 diff --git a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/trust_config.py b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/trust_config.py index dba99953f053..d3923356483a 100644 --- a/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/trust_config.py +++ b/packages/google-cloud-certificate-manager/google/cloud/certificate_manager_v1/types/trust_config.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -312,12 +312,12 @@ class TrustStore(proto.Message): number=1, message="TrustConfig.TrustAnchor", ) - intermediate_cas: MutableSequence[ - "TrustConfig.IntermediateCA" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="TrustConfig.IntermediateCA", + intermediate_cas: MutableSequence["TrustConfig.IntermediateCA"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="TrustConfig.IntermediateCA", + ) ) name: str = proto.Field( diff --git a/packages/google-cloud-certificate-manager/noxfile.py b/packages/google-cloud-certificate-manager/noxfile.py index 1ba6ac8992a0..408d331915f1 100644 --- a/packages/google-cloud-certificate-manager/noxfile.py +++ b/packages/google-cloud-certificate-manager/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_async.py b/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_async.py index 5c33cd9f47fe..86df2e0d8ee2 100644 --- a/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_async.py +++ b/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_async.py @@ -40,9 +40,7 @@ async def sample_create_certificate_issuance_config(): # Initialize request argument(s) certificate_issuance_config = certificate_manager_v1.CertificateIssuanceConfig() - certificate_issuance_config.certificate_authority_config.certificate_authority_service_config.ca_pool = ( - "ca_pool_value" - ) + certificate_issuance_config.certificate_authority_config.certificate_authority_service_config.ca_pool = "ca_pool_value" certificate_issuance_config.rotation_window_percentage = 2788 certificate_issuance_config.key_algorithm = "ECDSA_P256" diff --git a/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_sync.py b/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_sync.py index d2f260e50ee8..ee2b52639614 100644 --- a/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_sync.py +++ b/packages/google-cloud-certificate-manager/samples/generated_samples/certificatemanager_v1_generated_certificate_manager_create_certificate_issuance_config_sync.py @@ -40,9 +40,7 @@ def sample_create_certificate_issuance_config(): # Initialize request argument(s) certificate_issuance_config = certificate_manager_v1.CertificateIssuanceConfig() - certificate_issuance_config.certificate_authority_config.certificate_authority_service_config.ca_pool = ( - "ca_pool_value" - ) + certificate_issuance_config.certificate_authority_config.certificate_authority_service_config.ca_pool = "ca_pool_value" certificate_issuance_config.rotation_window_percentage = 2788 certificate_issuance_config.key_algorithm = "ECDSA_P256" diff --git a/packages/google-cloud-certificate-manager/tests/unit/gapic/certificate_manager_v1/test_certificate_manager.py b/packages/google-cloud-certificate-manager/tests/unit/gapic/certificate_manager_v1/test_certificate_manager.py index f2303de53602..254da5a4209d 100644 --- a/packages/google-cloud-certificate-manager/tests/unit/gapic/certificate_manager_v1/test_certificate_manager.py +++ b/packages/google-cloud-certificate-manager/tests/unit/gapic/certificate_manager_v1/test_certificate_manager.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.certificate_manager_v1.services.certificate_manager import ( CertificateManagerAsyncClient, @@ -73,13 +73,15 @@ pagers, transports, ) -from google.cloud.certificate_manager_v1.types import certificate_issuance_config +from google.cloud.certificate_manager_v1.types import ( + certificate_issuance_config, + certificate_manager, + trust_config, +) from google.cloud.certificate_manager_v1.types import ( certificate_issuance_config as gcc_certificate_issuance_config, ) from google.cloud.certificate_manager_v1.types import trust_config as gcc_trust_config -from google.cloud.certificate_manager_v1.types import certificate_manager -from google.cloud.certificate_manager_v1.types import trust_config CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1003,10 +1005,9 @@ def test_certificate_manager_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1051,10 +1052,9 @@ def test_certificate_manager_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1090,10 +1090,9 @@ def test_certificate_manager_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1341,13 +1340,13 @@ def test_certificate_manager_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1466,9 +1465,9 @@ def test_list_certificates_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_certificates] = ( + mock_rpc + ) request = {} client.list_certificates(request) @@ -2351,9 +2350,9 @@ def test_create_certificate_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_certificate] = ( + mock_rpc + ) request = {} client.create_certificate(request) @@ -2713,9 +2712,9 @@ def test_update_certificate_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_certificate] = ( + mock_rpc + ) request = {} client.update_certificate(request) @@ -3069,9 +3068,9 @@ def test_delete_certificate_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_certificate] = ( + mock_rpc + ) request = {} client.delete_certificate(request) @@ -3427,9 +3426,9 @@ def test_list_certificate_maps_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_certificate_maps - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_certificate_maps] = ( + mock_rpc + ) request = {} client.list_certificate_maps(request) @@ -3975,9 +3974,9 @@ def test_get_certificate_map_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_certificate_map] = ( + mock_rpc + ) request = {} client.get_certificate_map(request) @@ -4319,9 +4318,9 @@ def test_create_certificate_map_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_certificate_map] = ( + mock_rpc + ) request = {} client.create_certificate_map(request) @@ -4682,9 +4681,9 @@ def test_update_certificate_map_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_certificate_map] = ( + mock_rpc + ) request = {} client.update_certificate_map(request) @@ -5039,9 +5038,9 @@ def test_delete_certificate_map_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_certificate_map] = ( + mock_rpc + ) request = {} client.delete_certificate_map(request) @@ -7954,9 +7953,9 @@ def test_get_dns_authorization_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_dns_authorization - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_dns_authorization] = ( + mock_rpc + ) request = {} client.get_dns_authorization(request) @@ -11051,9 +11050,9 @@ def test_list_trust_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_trust_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_trust_configs] = ( + mock_rpc + ) request = {} client.list_trust_configs(request) @@ -11594,9 +11593,9 @@ def test_get_trust_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_trust_config] = ( + mock_rpc + ) request = {} client.get_trust_config(request) @@ -11928,9 +11927,9 @@ def test_create_trust_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_trust_config] = ( + mock_rpc + ) request = {} client.create_trust_config(request) @@ -12290,9 +12289,9 @@ def test_update_trust_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_trust_config] = ( + mock_rpc + ) request = {} client.update_trust_config(request) @@ -12648,9 +12647,9 @@ def test_delete_trust_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_trust_config] = ( + mock_rpc + ) request = {} client.delete_trust_config(request) @@ -12926,9 +12925,9 @@ def test_list_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_certificates] = ( + mock_rpc + ) request = {} client.list_certificates(request) @@ -13370,9 +13369,9 @@ def test_create_certificate_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_certificate] = ( + mock_rpc + ) request = {} client.create_certificate(request) @@ -13580,9 +13579,9 @@ def test_update_certificate_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_certificate] = ( + mock_rpc + ) request = {} client.update_certificate(request) @@ -13773,9 +13772,9 @@ def test_delete_certificate_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_certificate] = ( + mock_rpc + ) request = {} client.delete_certificate(request) @@ -13957,9 +13956,9 @@ def test_list_certificate_maps_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_certificate_maps - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_certificate_maps] = ( + mock_rpc + ) request = {} client.list_certificate_maps(request) @@ -14223,9 +14222,9 @@ def test_get_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_certificate_map] = ( + mock_rpc + ) request = {} client.get_certificate_map(request) @@ -14408,9 +14407,9 @@ def test_create_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_certificate_map] = ( + mock_rpc + ) request = {} client.create_certificate_map(request) @@ -14619,9 +14618,9 @@ def test_update_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_certificate_map] = ( + mock_rpc + ) request = {} client.update_certificate_map(request) @@ -14813,9 +14812,9 @@ def test_delete_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_certificate_map] = ( + mock_rpc + ) request = {} client.delete_certificate_map(request) @@ -16332,9 +16331,9 @@ def test_get_dns_authorization_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_dns_authorization - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_dns_authorization] = ( + mock_rpc + ) request = {} client.get_dns_authorization(request) @@ -17637,9 +17636,9 @@ def test_create_certificate_issuance_config_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "certificateIssuanceConfigId" - ] = "certificate_issuance_config_id_value" + jsonified_request["certificateIssuanceConfigId"] = ( + "certificate_issuance_config_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -18000,9 +17999,9 @@ def test_list_trust_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_trust_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_trust_configs] = ( + mock_rpc + ) request = {} client.list_trust_configs(request) @@ -18262,9 +18261,9 @@ def test_get_trust_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_trust_config] = ( + mock_rpc + ) request = {} client.get_trust_config(request) @@ -18446,9 +18445,9 @@ def test_create_trust_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_trust_config] = ( + mock_rpc + ) request = {} client.create_trust_config(request) @@ -18656,9 +18655,9 @@ def test_update_trust_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_trust_config] = ( + mock_rpc + ) request = {} client.update_trust_config(request) @@ -18849,9 +18848,9 @@ def test_delete_trust_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_trust_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_trust_config] = ( + mock_rpc + ) request = {} client.delete_trust_config(request) @@ -20651,8 +20650,9 @@ def test_list_certificates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20717,18 +20717,20 @@ def test_list_certificates_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_list_certificates" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_list_certificates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_list_certificates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "post_list_certificates" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_list_certificates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_list_certificates" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20786,8 +20788,9 @@ def test_get_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20858,18 +20861,20 @@ def test_get_certificate_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_get_certificate" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_get_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_get_certificate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "post_get_certificate" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_get_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_get_certificate" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20924,8 +20929,9 @@ def test_create_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21082,20 +21088,21 @@ def test_create_certificate_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_create_certificate" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_create_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_create_certificate" - ) as pre: + 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.CertificateManagerRestInterceptor, "post_create_certificate" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_create_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_create_certificate" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21152,8 +21159,9 @@ def test_update_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21314,20 +21322,21 @@ def test_update_certificate_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_update_certificate" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_update_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_update_certificate" - ) as pre: + 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.CertificateManagerRestInterceptor, "post_update_certificate" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_update_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_update_certificate" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21380,8 +21389,9 @@ def test_delete_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21438,20 +21448,21 @@ def test_delete_certificate_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_delete_certificate" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_delete_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_delete_certificate" - ) as pre: + 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.CertificateManagerRestInterceptor, "post_delete_certificate" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_delete_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_delete_certificate" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21504,8 +21515,9 @@ def test_list_certificate_maps_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21570,18 +21582,20 @@ def test_list_certificate_maps_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_list_certificate_maps" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_list_certificate_maps_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_list_certificate_maps" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "post_list_certificate_maps" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_list_certificate_maps_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_list_certificate_maps" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21641,8 +21655,9 @@ def test_get_certificate_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21709,18 +21724,20 @@ def test_get_certificate_map_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_get_certificate_map" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_get_certificate_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_get_certificate_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "post_get_certificate_map" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_get_certificate_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_get_certificate_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21775,8 +21792,9 @@ def test_create_certificate_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21916,20 +21934,21 @@ def test_create_certificate_map_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_create_certificate_map" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_create_certificate_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_create_certificate_map" - ) as pre: + 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.CertificateManagerRestInterceptor, "post_create_certificate_map" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_create_certificate_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_create_certificate_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21986,8 +22005,9 @@ def test_update_certificate_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22131,20 +22151,21 @@ def test_update_certificate_map_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_update_certificate_map" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_update_certificate_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_update_certificate_map" - ) as pre: + 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.CertificateManagerRestInterceptor, "post_update_certificate_map" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_update_certificate_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_update_certificate_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22199,8 +22220,9 @@ def test_delete_certificate_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22259,20 +22281,21 @@ def test_delete_certificate_map_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_delete_certificate_map" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_delete_certificate_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_delete_certificate_map" - ) as pre: + 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.CertificateManagerRestInterceptor, "post_delete_certificate_map" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_delete_certificate_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_delete_certificate_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22327,8 +22350,9 @@ def test_list_certificate_map_entries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22397,19 +22421,22 @@ def test_list_certificate_map_entries_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, - "post_list_certificate_map_entries", - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_list_certificate_map_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_list_certificate_map_entries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_list_certificate_map_entries", + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_list_certificate_map_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "pre_list_certificate_map_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22469,8 +22496,9 @@ def test_get_certificate_map_entry_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22542,18 +22570,22 @@ def test_get_certificate_map_entry_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_get_certificate_map_entry" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_get_certificate_map_entry_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_get_certificate_map_entry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_get_certificate_map_entry", + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_get_certificate_map_entry_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "pre_get_certificate_map_entry", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22613,8 +22645,9 @@ def test_create_certificate_map_entry_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22755,21 +22788,23 @@ def test_create_certificate_map_entry_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, - "post_create_certificate_map_entry", - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_create_certificate_map_entry_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_create_certificate_map_entry" - ) as pre: + 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.CertificateManagerRestInterceptor, + "post_create_certificate_map_entry", + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_create_certificate_map_entry_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "pre_create_certificate_map_entry", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22826,8 +22861,9 @@ def test_update_certificate_map_entry_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22970,21 +23006,23 @@ def test_update_certificate_map_entry_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, - "post_update_certificate_map_entry", - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_update_certificate_map_entry_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_update_certificate_map_entry" - ) as pre: + 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.CertificateManagerRestInterceptor, + "post_update_certificate_map_entry", + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_update_certificate_map_entry_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "pre_update_certificate_map_entry", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23039,8 +23077,9 @@ def test_delete_certificate_map_entry_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23099,21 +23138,23 @@ def test_delete_certificate_map_entry_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, - "post_delete_certificate_map_entry", - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_delete_certificate_map_entry_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_delete_certificate_map_entry" - ) as pre: + 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.CertificateManagerRestInterceptor, + "post_delete_certificate_map_entry", + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_delete_certificate_map_entry_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "pre_delete_certificate_map_entry", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23166,8 +23207,9 @@ def test_list_dns_authorizations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23234,18 +23276,20 @@ def test_list_dns_authorizations_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_list_dns_authorizations" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_list_dns_authorizations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_list_dns_authorizations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "post_list_dns_authorizations" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_list_dns_authorizations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_list_dns_authorizations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23305,8 +23349,9 @@ def test_get_dns_authorization_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23377,18 +23422,20 @@ def test_get_dns_authorization_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_get_dns_authorization" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_get_dns_authorization_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_get_dns_authorization" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "post_get_dns_authorization" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_get_dns_authorization_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_get_dns_authorization" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23446,8 +23493,9 @@ def test_create_dns_authorization_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23587,20 +23635,22 @@ def test_create_dns_authorization_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_create_dns_authorization" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_create_dns_authorization_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_create_dns_authorization" - ) as pre: + 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.CertificateManagerRestInterceptor, + "post_create_dns_authorization", + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_create_dns_authorization_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_create_dns_authorization" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23657,8 +23707,9 @@ def test_update_dns_authorization_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23802,20 +23853,22 @@ def test_update_dns_authorization_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_update_dns_authorization" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_update_dns_authorization_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_update_dns_authorization" - ) as pre: + 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.CertificateManagerRestInterceptor, + "post_update_dns_authorization", + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_update_dns_authorization_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_update_dns_authorization" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23870,8 +23923,9 @@ def test_delete_dns_authorization_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23930,20 +23984,22 @@ def test_delete_dns_authorization_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_delete_dns_authorization" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_delete_dns_authorization_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_delete_dns_authorization" - ) as pre: + 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.CertificateManagerRestInterceptor, + "post_delete_dns_authorization", + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_delete_dns_authorization_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_delete_dns_authorization" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23996,8 +24052,9 @@ def test_list_certificate_issuance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24068,20 +24125,22 @@ def test_list_certificate_issuance_configs_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, - "post_list_certificate_issuance_configs", - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_list_certificate_issuance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "pre_list_certificate_issuance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_list_certificate_issuance_configs", + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_list_certificate_issuance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "pre_list_certificate_issuance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24147,8 +24206,9 @@ def test_get_certificate_issuance_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24224,20 +24284,22 @@ def test_get_certificate_issuance_config_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, - "post_get_certificate_issuance_config", - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_get_certificate_issuance_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "pre_get_certificate_issuance_config", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_get_certificate_issuance_config", + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_get_certificate_issuance_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "pre_get_certificate_issuance_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24295,8 +24357,9 @@ def test_create_certificate_issuance_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24439,22 +24502,23 @@ def test_create_certificate_issuance_config_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, - "post_create_certificate_issuance_config", - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_create_certificate_issuance_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "pre_create_certificate_issuance_config", - ) as pre: + 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.CertificateManagerRestInterceptor, + "post_create_certificate_issuance_config", + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_create_certificate_issuance_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "pre_create_certificate_issuance_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24513,8 +24577,9 @@ def test_delete_certificate_issuance_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24573,22 +24638,23 @@ def test_delete_certificate_issuance_config_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, - "post_delete_certificate_issuance_config", - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_delete_certificate_issuance_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "pre_delete_certificate_issuance_config", - ) as pre: + 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.CertificateManagerRestInterceptor, + "post_delete_certificate_issuance_config", + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_delete_certificate_issuance_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "pre_delete_certificate_issuance_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24643,8 +24709,9 @@ def test_list_trust_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24709,18 +24776,20 @@ def test_list_trust_configs_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_list_trust_configs" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_list_trust_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_list_trust_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "post_list_trust_configs" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_list_trust_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_list_trust_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24778,8 +24847,9 @@ def test_get_trust_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24846,18 +24916,20 @@ def test_get_trust_config_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_get_trust_config" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_get_trust_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_get_trust_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "post_get_trust_config" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_get_trust_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_get_trust_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24910,8 +24982,9 @@ def test_create_trust_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25049,20 +25122,21 @@ def test_create_trust_config_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_create_trust_config" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_create_trust_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_create_trust_config" - ) as pre: + 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.CertificateManagerRestInterceptor, "post_create_trust_config" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_create_trust_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_create_trust_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25119,8 +25193,9 @@ def test_update_trust_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25262,20 +25337,21 @@ def test_update_trust_config_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_update_trust_config" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_update_trust_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_update_trust_config" - ) as pre: + 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.CertificateManagerRestInterceptor, "post_update_trust_config" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_update_trust_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_update_trust_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25328,8 +25404,9 @@ def test_delete_trust_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25386,20 +25463,21 @@ def test_delete_trust_config_rest_interceptors(null_interceptor): ) client = CertificateManagerClient(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.CertificateManagerRestInterceptor, "post_delete_trust_config" - ) as post, mock.patch.object( - transports.CertificateManagerRestInterceptor, - "post_delete_trust_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateManagerRestInterceptor, "pre_delete_trust_config" - ) as pre: + 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.CertificateManagerRestInterceptor, "post_delete_trust_config" + ) as post, + mock.patch.object( + transports.CertificateManagerRestInterceptor, + "post_delete_trust_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateManagerRestInterceptor, "pre_delete_trust_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25452,8 +25530,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -25512,8 +25591,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -25574,8 +25654,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -25636,8 +25717,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -25698,8 +25780,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -25760,8 +25843,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -26565,11 +26649,14 @@ def test_certificate_manager_base_transport(): def test_certificate_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.certificate_manager_v1.services.certificate_manager.transports.CertificateManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.certificate_manager_v1.services.certificate_manager.transports.CertificateManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CertificateManagerTransport( @@ -26586,9 +26673,12 @@ def test_certificate_manager_base_transport_with_credentials_file(): def test_certificate_manager_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.certificate_manager_v1.services.certificate_manager.transports.CertificateManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.certificate_manager_v1.services.certificate_manager.transports.CertificateManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CertificateManagerTransport() @@ -26660,11 +26750,12 @@ def test_certificate_manager_transport_auth_gdch_credentials(transport_class): def test_certificate_manager_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-channel/docs/conf.py b/packages/google-cloud-channel/docs/conf.py index c47d385e8a49..8000db57ba06 100644 --- a/packages/google-cloud-channel/docs/conf.py +++ b/packages/google-cloud-channel/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-channel documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/__init__.py b/packages/google-cloud-channel/google/cloud/channel_v1/__init__.py index 9f411215e31f..3abadca6274d 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/__init__.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_channel_reports_service import ( CloudChannelReportsServiceAsyncClient, CloudChannelReportsServiceClient, diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/async_client.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/async_client.py index 23d8b8caca3e..59a93157aca2 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/async_client.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.channel_v1 import gapic_version as package_version @@ -45,8 +45,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.cloud.channel_v1.services.cloud_channel_reports_service import pagers @@ -139,7 +139,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudChannelReportsServiceAsyncClient: The constructed client. """ - return CloudChannelReportsServiceClient.from_service_account_info.__func__(CloudChannelReportsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudChannelReportsServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + CloudChannelReportsServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +160,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudChannelReportsServiceAsyncClient: The constructed client. """ - return CloudChannelReportsServiceClient.from_service_account_file.__func__(CloudChannelReportsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudChannelReportsServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + CloudChannelReportsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -193,7 +203,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudChannelReportsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudChannelReportsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudChannelReportsServiceTransport: diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/client.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/client.py index 3c407da786c3..b9f21f1ae9a9 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/client.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.channel_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.cloud.channel_v1.services.cloud_channel_reports_service import pagers @@ -81,9 +81,7 @@ class CloudChannelReportsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudChannelReportsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudChannelReportsServiceTransport]] _transport_registry["grpc"] = CloudChannelReportsServiceGrpcTransport _transport_registry["grpc_asyncio"] = CloudChannelReportsServiceGrpcAsyncIOTransport @@ -651,11 +649,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudChannelReportsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudChannelReportsServiceClient._read_environment_variables() + ) self._client_cert_source = ( CloudChannelReportsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -692,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudChannelReportsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/pagers.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/pagers.py index 6c81d8435a85..6d3f5caab795 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/pagers.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/__init__.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/__init__.py index 466e15153ea7..710e81dcb066 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/__init__.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import CloudChannelReportsServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudChannelReportsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudChannelReportsServiceTransport]] _transport_registry["grpc"] = CloudChannelReportsServiceGrpcTransport _transport_registry["grpc_asyncio"] = CloudChannelReportsServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/base.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/base.py index b2791b5de22e..a68e908dd7ce 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/base.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.channel_v1 import gapic_version as package_version from google.cloud.channel_v1.types import reports_service @@ -245,13 +245,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc.py index 6112cfb4647d..6ad65e05702a 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.channel_v1.types import reports_service diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc_asyncio.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc_asyncio.py index a5fb68d6ce49..db9820124ef7 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.channel_v1.types import reports_service diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/async_client.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/async_client.py index 4bb20a057ecf..2c9a7ee250ce 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/async_client.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.channel_v1 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore from google.cloud.channel_v1.services.cloud_channel_service import pagers from google.cloud.channel_v1.types import ( @@ -190,7 +190,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudChannelServiceAsyncClient: The constructed client. """ - return CloudChannelServiceClient.from_service_account_info.__func__(CloudChannelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudChannelServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudChannelServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -206,7 +207,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudChannelServiceAsyncClient: The constructed client. """ - return CloudChannelServiceClient.from_service_account_file.__func__(CloudChannelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudChannelServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CloudChannelServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -244,7 +246,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudChannelServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudChannelServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudChannelServiceTransport: diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/client.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/client.py index dd72cde7df3a..e69c2d33b88b 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/client.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.channel_v1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore from google.cloud.channel_v1.services.cloud_channel_service import pagers from google.cloud.channel_v1.types import ( @@ -95,9 +95,7 @@ class CloudChannelServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudChannelServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudChannelServiceTransport]] _transport_registry["grpc"] = CloudChannelServiceGrpcTransport _transport_registry["grpc_asyncio"] = CloudChannelServiceGrpcAsyncIOTransport @@ -847,11 +845,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudChannelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudChannelServiceClient._read_environment_variables() + ) self._client_cert_source = CloudChannelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -886,8 +882,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudChannelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/pagers.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/pagers.py index f143b116c5a3..612fcefbbe42 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/pagers.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/pagers.py @@ -76,7 +76,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -152,7 +152,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -308,7 +308,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -388,7 +388,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -464,7 +464,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -544,7 +544,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -620,7 +620,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -700,7 +700,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -776,7 +776,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -856,7 +856,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -932,7 +932,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1014,7 +1014,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1092,7 +1092,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1174,7 +1174,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1250,7 +1250,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1330,7 +1330,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1406,7 +1406,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1486,7 +1486,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1562,7 +1562,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1642,7 +1642,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1718,7 +1718,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1798,7 +1798,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1874,7 +1874,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1954,7 +1954,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2030,7 +2030,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2110,7 +2110,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2186,7 +2186,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2266,7 +2266,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2342,7 +2342,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2422,7 +2422,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2498,7 +2498,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/__init__.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/__init__.py index 73ed6663903f..5d2ea401bfb9 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/__init__.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import CloudChannelServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudChannelServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudChannelServiceTransport]] _transport_registry["grpc"] = CloudChannelServiceGrpcTransport _transport_registry["grpc_asyncio"] = CloudChannelServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/base.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/base.py index 654dafc0db1d..530fb094dc72 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/base.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.channel_v1 import gapic_version as package_version from google.cloud.channel_v1.types import ( @@ -961,13 +961,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc.py index 0aa0307b1311..788c03bdba83 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.channel_v1.types import ( channel_partner_links, @@ -487,12 +487,12 @@ def check_cloud_identity_accounts_exist( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_cloud_identity_accounts_exist" not in self._stubs: - self._stubs[ - "check_cloud_identity_accounts_exist" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CheckCloudIdentityAccountsExist", - request_serializer=service.CheckCloudIdentityAccountsExistRequest.serialize, - response_deserializer=service.CheckCloudIdentityAccountsExistResponse.deserialize, + self._stubs["check_cloud_identity_accounts_exist"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CheckCloudIdentityAccountsExist", + request_serializer=service.CheckCloudIdentityAccountsExistRequest.serialize, + response_deserializer=service.CheckCloudIdentityAccountsExistResponse.deserialize, + ) ) return self._stubs["check_cloud_identity_accounts_exist"] @@ -1451,12 +1451,12 @@ def transfer_entitlements_to_google( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "transfer_entitlements_to_google" not in self._stubs: - self._stubs[ - "transfer_entitlements_to_google" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/TransferEntitlementsToGoogle", - request_serializer=service.TransferEntitlementsToGoogleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["transfer_entitlements_to_google"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/TransferEntitlementsToGoogle", + request_serializer=service.TransferEntitlementsToGoogleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["transfer_entitlements_to_google"] @@ -1496,12 +1496,12 @@ def list_channel_partner_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_channel_partner_links" not in self._stubs: - self._stubs[ - "list_channel_partner_links" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerLinks", - request_serializer=service.ListChannelPartnerLinksRequest.serialize, - response_deserializer=service.ListChannelPartnerLinksResponse.deserialize, + self._stubs["list_channel_partner_links"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerLinks", + request_serializer=service.ListChannelPartnerLinksRequest.serialize, + response_deserializer=service.ListChannelPartnerLinksResponse.deserialize, + ) ) return self._stubs["list_channel_partner_links"] @@ -1594,12 +1594,12 @@ def create_channel_partner_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_channel_partner_link" not in self._stubs: - self._stubs[ - "create_channel_partner_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerLink", - request_serializer=service.CreateChannelPartnerLinkRequest.serialize, - response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + self._stubs["create_channel_partner_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerLink", + request_serializer=service.CreateChannelPartnerLinkRequest.serialize, + response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + ) ) return self._stubs["create_channel_partner_link"] @@ -1649,12 +1649,12 @@ def update_channel_partner_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_channel_partner_link" not in self._stubs: - self._stubs[ - "update_channel_partner_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerLink", - request_serializer=service.UpdateChannelPartnerLinkRequest.serialize, - response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + self._stubs["update_channel_partner_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerLink", + request_serializer=service.UpdateChannelPartnerLinkRequest.serialize, + response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + ) ) return self._stubs["update_channel_partner_link"] @@ -1694,12 +1694,12 @@ def get_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_customer_repricing_config" not in self._stubs: - self._stubs[ - "get_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/GetCustomerRepricingConfig", - request_serializer=service.GetCustomerRepricingConfigRequest.serialize, - response_deserializer=repricing.CustomerRepricingConfig.deserialize, + self._stubs["get_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/GetCustomerRepricingConfig", + request_serializer=service.GetCustomerRepricingConfigRequest.serialize, + response_deserializer=repricing.CustomerRepricingConfig.deserialize, + ) ) return self._stubs["get_customer_repricing_config"] @@ -1750,12 +1750,12 @@ def list_customer_repricing_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_customer_repricing_configs" not in self._stubs: - self._stubs[ - "list_customer_repricing_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListCustomerRepricingConfigs", - request_serializer=service.ListCustomerRepricingConfigsRequest.serialize, - response_deserializer=service.ListCustomerRepricingConfigsResponse.deserialize, + self._stubs["list_customer_repricing_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListCustomerRepricingConfigs", + request_serializer=service.ListCustomerRepricingConfigsRequest.serialize, + response_deserializer=service.ListCustomerRepricingConfigsResponse.deserialize, + ) ) return self._stubs["list_customer_repricing_configs"] @@ -1828,12 +1828,12 @@ def create_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_customer_repricing_config" not in self._stubs: - self._stubs[ - "create_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CreateCustomerRepricingConfig", - request_serializer=service.CreateCustomerRepricingConfigRequest.serialize, - response_deserializer=repricing.CustomerRepricingConfig.deserialize, + self._stubs["create_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CreateCustomerRepricingConfig", + request_serializer=service.CreateCustomerRepricingConfigRequest.serialize, + response_deserializer=repricing.CustomerRepricingConfig.deserialize, + ) ) return self._stubs["create_customer_repricing_config"] @@ -1892,12 +1892,12 @@ def update_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_customer_repricing_config" not in self._stubs: - self._stubs[ - "update_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/UpdateCustomerRepricingConfig", - request_serializer=service.UpdateCustomerRepricingConfigRequest.serialize, - response_deserializer=repricing.CustomerRepricingConfig.deserialize, + self._stubs["update_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/UpdateCustomerRepricingConfig", + request_serializer=service.UpdateCustomerRepricingConfigRequest.serialize, + response_deserializer=repricing.CustomerRepricingConfig.deserialize, + ) ) return self._stubs["update_customer_repricing_config"] @@ -1938,12 +1938,12 @@ def delete_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_customer_repricing_config" not in self._stubs: - self._stubs[ - "delete_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/DeleteCustomerRepricingConfig", - request_serializer=service.DeleteCustomerRepricingConfigRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/DeleteCustomerRepricingConfig", + request_serializer=service.DeleteCustomerRepricingConfigRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_customer_repricing_config"] @@ -1985,12 +1985,12 @@ def get_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "get_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/GetChannelPartnerRepricingConfig", - request_serializer=service.GetChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + self._stubs["get_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/GetChannelPartnerRepricingConfig", + request_serializer=service.GetChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + ) ) return self._stubs["get_channel_partner_repricing_config"] @@ -2040,12 +2040,12 @@ def list_channel_partner_repricing_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_channel_partner_repricing_configs" not in self._stubs: - self._stubs[ - "list_channel_partner_repricing_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerRepricingConfigs", - request_serializer=service.ListChannelPartnerRepricingConfigsRequest.serialize, - response_deserializer=service.ListChannelPartnerRepricingConfigsResponse.deserialize, + self._stubs["list_channel_partner_repricing_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerRepricingConfigs", + request_serializer=service.ListChannelPartnerRepricingConfigsRequest.serialize, + response_deserializer=service.ListChannelPartnerRepricingConfigsResponse.deserialize, + ) ) return self._stubs["list_channel_partner_repricing_configs"] @@ -2117,12 +2117,12 @@ def create_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "create_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerRepricingConfig", - request_serializer=service.CreateChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + self._stubs["create_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerRepricingConfig", + request_serializer=service.CreateChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + ) ) return self._stubs["create_channel_partner_repricing_config"] @@ -2181,12 +2181,12 @@ def update_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "update_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerRepricingConfig", - request_serializer=service.UpdateChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + self._stubs["update_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerRepricingConfig", + request_serializer=service.UpdateChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + ) ) return self._stubs["update_channel_partner_repricing_config"] @@ -2229,12 +2229,12 @@ def delete_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "delete_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/DeleteChannelPartnerRepricingConfig", - request_serializer=service.DeleteChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/DeleteChannelPartnerRepricingConfig", + request_serializer=service.DeleteChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_channel_partner_repricing_config"] @@ -2322,12 +2322,12 @@ def list_sku_group_billable_skus( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_sku_group_billable_skus" not in self._stubs: - self._stubs[ - "list_sku_group_billable_skus" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListSkuGroupBillableSkus", - request_serializer=service.ListSkuGroupBillableSkusRequest.serialize, - response_deserializer=service.ListSkuGroupBillableSkusResponse.deserialize, + self._stubs["list_sku_group_billable_skus"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListSkuGroupBillableSkus", + request_serializer=service.ListSkuGroupBillableSkusRequest.serialize, + response_deserializer=service.ListSkuGroupBillableSkusResponse.deserialize, + ) ) return self._stubs["list_sku_group_billable_skus"] @@ -2577,12 +2577,12 @@ def query_eligible_billing_accounts( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_eligible_billing_accounts" not in self._stubs: - self._stubs[ - "query_eligible_billing_accounts" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/QueryEligibleBillingAccounts", - request_serializer=service.QueryEligibleBillingAccountsRequest.serialize, - response_deserializer=service.QueryEligibleBillingAccountsResponse.deserialize, + self._stubs["query_eligible_billing_accounts"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/QueryEligibleBillingAccounts", + request_serializer=service.QueryEligibleBillingAccountsRequest.serialize, + response_deserializer=service.QueryEligibleBillingAccountsResponse.deserialize, + ) ) return self._stubs["query_eligible_billing_accounts"] diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc_asyncio.py b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc_asyncio.py index 942863535f24..ac0774aedb87 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/services/cloud_channel_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.channel_v1.types import ( channel_partner_links, @@ -497,12 +497,12 @@ def check_cloud_identity_accounts_exist( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_cloud_identity_accounts_exist" not in self._stubs: - self._stubs[ - "check_cloud_identity_accounts_exist" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CheckCloudIdentityAccountsExist", - request_serializer=service.CheckCloudIdentityAccountsExistRequest.serialize, - response_deserializer=service.CheckCloudIdentityAccountsExistResponse.deserialize, + self._stubs["check_cloud_identity_accounts_exist"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CheckCloudIdentityAccountsExist", + request_serializer=service.CheckCloudIdentityAccountsExistRequest.serialize, + response_deserializer=service.CheckCloudIdentityAccountsExistResponse.deserialize, + ) ) return self._stubs["check_cloud_identity_accounts_exist"] @@ -1484,12 +1484,12 @@ def transfer_entitlements_to_google( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "transfer_entitlements_to_google" not in self._stubs: - self._stubs[ - "transfer_entitlements_to_google" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/TransferEntitlementsToGoogle", - request_serializer=service.TransferEntitlementsToGoogleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["transfer_entitlements_to_google"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/TransferEntitlementsToGoogle", + request_serializer=service.TransferEntitlementsToGoogleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["transfer_entitlements_to_google"] @@ -1529,12 +1529,12 @@ def list_channel_partner_links( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_channel_partner_links" not in self._stubs: - self._stubs[ - "list_channel_partner_links" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerLinks", - request_serializer=service.ListChannelPartnerLinksRequest.serialize, - response_deserializer=service.ListChannelPartnerLinksResponse.deserialize, + self._stubs["list_channel_partner_links"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerLinks", + request_serializer=service.ListChannelPartnerLinksRequest.serialize, + response_deserializer=service.ListChannelPartnerLinksResponse.deserialize, + ) ) return self._stubs["list_channel_partner_links"] @@ -1628,12 +1628,12 @@ def create_channel_partner_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_channel_partner_link" not in self._stubs: - self._stubs[ - "create_channel_partner_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerLink", - request_serializer=service.CreateChannelPartnerLinkRequest.serialize, - response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + self._stubs["create_channel_partner_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerLink", + request_serializer=service.CreateChannelPartnerLinkRequest.serialize, + response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + ) ) return self._stubs["create_channel_partner_link"] @@ -1683,12 +1683,12 @@ def update_channel_partner_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_channel_partner_link" not in self._stubs: - self._stubs[ - "update_channel_partner_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerLink", - request_serializer=service.UpdateChannelPartnerLinkRequest.serialize, - response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + self._stubs["update_channel_partner_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerLink", + request_serializer=service.UpdateChannelPartnerLinkRequest.serialize, + response_deserializer=channel_partner_links.ChannelPartnerLink.deserialize, + ) ) return self._stubs["update_channel_partner_link"] @@ -1729,12 +1729,12 @@ def get_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_customer_repricing_config" not in self._stubs: - self._stubs[ - "get_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/GetCustomerRepricingConfig", - request_serializer=service.GetCustomerRepricingConfigRequest.serialize, - response_deserializer=repricing.CustomerRepricingConfig.deserialize, + self._stubs["get_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/GetCustomerRepricingConfig", + request_serializer=service.GetCustomerRepricingConfigRequest.serialize, + response_deserializer=repricing.CustomerRepricingConfig.deserialize, + ) ) return self._stubs["get_customer_repricing_config"] @@ -1785,12 +1785,12 @@ def list_customer_repricing_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_customer_repricing_configs" not in self._stubs: - self._stubs[ - "list_customer_repricing_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListCustomerRepricingConfigs", - request_serializer=service.ListCustomerRepricingConfigsRequest.serialize, - response_deserializer=service.ListCustomerRepricingConfigsResponse.deserialize, + self._stubs["list_customer_repricing_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListCustomerRepricingConfigs", + request_serializer=service.ListCustomerRepricingConfigsRequest.serialize, + response_deserializer=service.ListCustomerRepricingConfigsResponse.deserialize, + ) ) return self._stubs["list_customer_repricing_configs"] @@ -1863,12 +1863,12 @@ def create_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_customer_repricing_config" not in self._stubs: - self._stubs[ - "create_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CreateCustomerRepricingConfig", - request_serializer=service.CreateCustomerRepricingConfigRequest.serialize, - response_deserializer=repricing.CustomerRepricingConfig.deserialize, + self._stubs["create_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CreateCustomerRepricingConfig", + request_serializer=service.CreateCustomerRepricingConfigRequest.serialize, + response_deserializer=repricing.CustomerRepricingConfig.deserialize, + ) ) return self._stubs["create_customer_repricing_config"] @@ -1927,12 +1927,12 @@ def update_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_customer_repricing_config" not in self._stubs: - self._stubs[ - "update_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/UpdateCustomerRepricingConfig", - request_serializer=service.UpdateCustomerRepricingConfigRequest.serialize, - response_deserializer=repricing.CustomerRepricingConfig.deserialize, + self._stubs["update_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/UpdateCustomerRepricingConfig", + request_serializer=service.UpdateCustomerRepricingConfigRequest.serialize, + response_deserializer=repricing.CustomerRepricingConfig.deserialize, + ) ) return self._stubs["update_customer_repricing_config"] @@ -1975,12 +1975,12 @@ def delete_customer_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_customer_repricing_config" not in self._stubs: - self._stubs[ - "delete_customer_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/DeleteCustomerRepricingConfig", - request_serializer=service.DeleteCustomerRepricingConfigRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_customer_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/DeleteCustomerRepricingConfig", + request_serializer=service.DeleteCustomerRepricingConfigRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_customer_repricing_config"] @@ -2022,12 +2022,12 @@ def get_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "get_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/GetChannelPartnerRepricingConfig", - request_serializer=service.GetChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + self._stubs["get_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/GetChannelPartnerRepricingConfig", + request_serializer=service.GetChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + ) ) return self._stubs["get_channel_partner_repricing_config"] @@ -2077,12 +2077,12 @@ def list_channel_partner_repricing_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_channel_partner_repricing_configs" not in self._stubs: - self._stubs[ - "list_channel_partner_repricing_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerRepricingConfigs", - request_serializer=service.ListChannelPartnerRepricingConfigsRequest.serialize, - response_deserializer=service.ListChannelPartnerRepricingConfigsResponse.deserialize, + self._stubs["list_channel_partner_repricing_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListChannelPartnerRepricingConfigs", + request_serializer=service.ListChannelPartnerRepricingConfigsRequest.serialize, + response_deserializer=service.ListChannelPartnerRepricingConfigsResponse.deserialize, + ) ) return self._stubs["list_channel_partner_repricing_configs"] @@ -2154,12 +2154,12 @@ def create_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "create_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerRepricingConfig", - request_serializer=service.CreateChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + self._stubs["create_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/CreateChannelPartnerRepricingConfig", + request_serializer=service.CreateChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + ) ) return self._stubs["create_channel_partner_repricing_config"] @@ -2218,12 +2218,12 @@ def update_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "update_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerRepricingConfig", - request_serializer=service.UpdateChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + self._stubs["update_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/UpdateChannelPartnerRepricingConfig", + request_serializer=service.UpdateChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=repricing.ChannelPartnerRepricingConfig.deserialize, + ) ) return self._stubs["update_channel_partner_repricing_config"] @@ -2266,12 +2266,12 @@ def delete_channel_partner_repricing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_channel_partner_repricing_config" not in self._stubs: - self._stubs[ - "delete_channel_partner_repricing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/DeleteChannelPartnerRepricingConfig", - request_serializer=service.DeleteChannelPartnerRepricingConfigRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_channel_partner_repricing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/DeleteChannelPartnerRepricingConfig", + request_serializer=service.DeleteChannelPartnerRepricingConfigRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_channel_partner_repricing_config"] @@ -2361,12 +2361,12 @@ def list_sku_group_billable_skus( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_sku_group_billable_skus" not in self._stubs: - self._stubs[ - "list_sku_group_billable_skus" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/ListSkuGroupBillableSkus", - request_serializer=service.ListSkuGroupBillableSkusRequest.serialize, - response_deserializer=service.ListSkuGroupBillableSkusResponse.deserialize, + self._stubs["list_sku_group_billable_skus"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/ListSkuGroupBillableSkus", + request_serializer=service.ListSkuGroupBillableSkusRequest.serialize, + response_deserializer=service.ListSkuGroupBillableSkusResponse.deserialize, + ) ) return self._stubs["list_sku_group_billable_skus"] @@ -2622,12 +2622,12 @@ def query_eligible_billing_accounts( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_eligible_billing_accounts" not in self._stubs: - self._stubs[ - "query_eligible_billing_accounts" - ] = self._logged_channel.unary_unary( - "/google.cloud.channel.v1.CloudChannelService/QueryEligibleBillingAccounts", - request_serializer=service.QueryEligibleBillingAccountsRequest.serialize, - response_deserializer=service.QueryEligibleBillingAccountsResponse.deserialize, + self._stubs["query_eligible_billing_accounts"] = ( + self._logged_channel.unary_unary( + "/google.cloud.channel.v1.CloudChannelService/QueryEligibleBillingAccounts", + request_serializer=service.QueryEligibleBillingAccountsRequest.serialize, + response_deserializer=service.QueryEligibleBillingAccountsResponse.deserialize, + ) ) return self._stubs["query_eligible_billing_accounts"] diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/__init__.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/__init__.py index 51d7b4f5feca..2b54684ee63e 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/__init__.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/__init__.py @@ -13,15 +13,27 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .billing_accounts import BillingAccount +from .billing_accounts import ( + BillingAccount, +) from .channel_partner_links import ( ChannelPartnerLink, ChannelPartnerLinkState, ChannelPartnerLinkView, ) -from .common import AdminUser, CloudIdentityInfo, EduData, Value -from .customers import ContactInfo, Customer -from .entitlement_changes import EntitlementChange +from .common import ( + AdminUser, + CloudIdentityInfo, + EduData, + Value, +) +from .customers import ( + ContactInfo, + Customer, +) +from .entitlement_changes import ( + EntitlementChange, +) from .entitlements import ( AssociationInfo, CommitmentSettings, @@ -52,8 +64,16 @@ PromotionalOrderType, ResourceType, ) -from .operations import OperationMetadata -from .products import MarketingInfo, Media, MediaType, Product, Sku +from .operations import ( + OperationMetadata, +) +from .products import ( + MarketingInfo, + Media, + MediaType, + Product, + Sku, +) from .reports_service import ( Column, DateRange, @@ -161,7 +181,11 @@ UpdateCustomerRepricingConfigRequest, UpdateCustomerRequest, ) -from .subscriber_event import CustomerEvent, EntitlementEvent, SubscriberEvent +from .subscriber_event import ( + CustomerEvent, + EntitlementEvent, + SubscriberEvent, +) __all__ = ( "BillingAccount", diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/billing_accounts.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/billing_accounts.py index d085995e843f..8872dfd4f3a2 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/billing_accounts.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/billing_accounts.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/channel_partner_links.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/channel_partner_links.py index e65a7f8b76b8..dd207db5b28c 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/channel_partner_links.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/channel_partner_links.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.channel_v1.types import common @@ -47,6 +47,7 @@ class ChannelPartnerLinkView(proto.Enum): FULL (2): Includes all fields. """ + UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -71,6 +72,7 @@ class ChannelPartnerLinkState(proto.Enum): Status when the reseller is suspended by Google or distributor. """ + CHANNEL_PARTNER_LINK_STATE_UNSPECIFIED = 0 INVITED = 1 ACTIVE = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/common.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/common.py index 12977d9cf3ae..be428c6060e7 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/common.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/common.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -55,6 +55,7 @@ class InstituteType(proto.Enum): UNIVERSITY (2): Higher Education Universities & Colleges """ + INSTITUTE_TYPE_UNSPECIFIED = 0 K12 = 1 UNIVERSITY = 2 @@ -80,6 +81,7 @@ class InstituteSize(proto.Enum): SIZE_10001_OR_MORE (7): 10,001 + """ + INSTITUTE_SIZE_UNSPECIFIED = 0 SIZE_1_100 = 1 SIZE_101_500 = 2 @@ -148,6 +150,7 @@ class CustomerType(proto.Enum): Team customer which needs email verification to use services. """ + CUSTOMER_TYPE_UNSPECIFIED = 0 DOMAIN = 1 TEAM = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/customers.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/customers.py index 969a16ff4a0e..7f19a298a23a 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/customers.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/customers.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore import proto # type: ignore from google.cloud.channel_v1.types import common @@ -111,6 +111,7 @@ class CustomerAttestationState(proto.Enum): information provided is correct. Contact information of customer will be mandatory. """ + CUSTOMER_ATTESTATION_STATE_UNSPECIFIED = 0 EXEMPT = 1 NON_EXEMPT_AND_INFO_VERIFIED = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlement_changes.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlement_changes.py index 0975d3058801..eedd31af2c11 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlement_changes.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlement_changes.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.channel_v1.types import entitlements @@ -126,6 +126,7 @@ class ChangeType(proto.Enum): TRIAL_STARTED (15): Entitlement started trial. """ + CHANGE_TYPE_UNSPECIFIED = 0 CREATED = 1 PRICE_PLAN_SWITCHED = 3 @@ -157,6 +158,7 @@ class OperatorType(proto.Enum): RESELLER (4): Reseller user. """ + OPERATOR_TYPE_UNSPECIFIED = 0 CUSTOMER_SERVICE_REPRESENTATIVE = 1 SYSTEM = 2 @@ -180,6 +182,7 @@ class CancellationReason(proto.Enum): while still keeping other entitlement(s) with the reseller. """ + CANCELLATION_REASON_UNSPECIFIED = 0 SERVICE_TERMINATED = 1 RELATIONSHIP_ENDED = 2 @@ -205,6 +208,7 @@ class ActivationReason(proto.Enum): cancellation, added a payment plan to a trial entitlement, etc.) """ + ACTIVATION_REASON_UNSPECIFIED = 0 RESELLER_REVOKED_SUSPENSION = 1 CUSTOMER_ACCEPTED_PENDING_TOS = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlements.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlements.py index 91251d925285..2ae46ca9e255 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlements.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/entitlements.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.channel_v1.types import common, offers, products @@ -130,6 +130,7 @@ class ProvisioningState(proto.Enum): SUSPENDED (5): The entitlement is currently suspended. """ + PROVISIONING_STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 5 @@ -156,6 +157,7 @@ class SuspensionReason(proto.Enum): Other reasons (internal reasons, abuse, etc.). """ + SUSPENSION_REASON_UNSPECIFIED = 0 RESELLER_INITIATED = 1 TRIAL_ENDED = 2 @@ -467,6 +469,7 @@ class Reason(proto.Enum): this Product. See https://support.google.com/channelservices/answer/9759265 """ + REASON_UNSPECIFIED = 0 PENDING_TOS_ACCEPTANCE = 1 SKU_NOT_ELIGIBLE = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/offers.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/offers.py index 53945957d8f9..59c18e891e93 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/offers.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/offers.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore import proto # type: ignore from google.cloud.channel_v1.types import common, products @@ -63,6 +63,7 @@ class PromotionalOrderType(proto.Enum): Orders for modifying an existing customer's promotion on the same SKU. """ + PROMOTIONAL_TYPE_UNSPECIFIED = 0 NEW_UPGRADE = 1 TRANSFER = 2 @@ -86,6 +87,7 @@ class PaymentPlan(proto.Enum): OFFLINE (5): Price and ordering not available through API. """ + PAYMENT_PLAN_UNSPECIFIED = 0 COMMITMENT = 1 FLEXIBLE = 2 @@ -107,6 +109,7 @@ class PaymentType(proto.Enum): Postpay. Reseller is charged at the end of the Payment cycle. """ + PAYMENT_TYPE_UNSPECIFIED = 0 PREPAY = 1 POSTPAY = 2 @@ -143,6 +146,7 @@ class ResourceType(proto.Enum): For Google Cloud subscriptions like Anthos or SAP. """ + RESOURCE_TYPE_UNSPECIFIED = 0 SEAT = 1 MAU = 2 @@ -166,6 +170,7 @@ class PeriodType(proto.Enum): YEAR (3): Year. """ + PERIOD_TYPE_UNSPECIFIED = 0 DAY = 1 MONTH = 2 @@ -189,6 +194,7 @@ class DiscountType(proto.Enum): DEAL_CODE (5): Deal code discount. """ + DISCOUNT_TYPE_UNSPECIFIED = 0 REGIONAL_DISCOUNT = 1 PROMOTIONAL_DISCOUNT = 2 @@ -324,6 +330,7 @@ class ParameterType(proto.Enum): BOOLEAN (4): Boolean type. """ + PARAMETER_TYPE_UNSPECIFIED = 0 INT64 = 1 STRING = 2 @@ -394,19 +401,19 @@ class CustomerConstraints(proto.Message): proto.STRING, number=1, ) - allowed_customer_types: MutableSequence[ - common.CloudIdentityInfo.CustomerType - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum=common.CloudIdentityInfo.CustomerType, - ) - promotional_order_types: MutableSequence[ - "PromotionalOrderType" - ] = proto.RepeatedField( - proto.ENUM, - number=3, - enum="PromotionalOrderType", + allowed_customer_types: MutableSequence[common.CloudIdentityInfo.CustomerType] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum=common.CloudIdentityInfo.CustomerType, + ) + ) + promotional_order_types: MutableSequence["PromotionalOrderType"] = ( + proto.RepeatedField( + proto.ENUM, + number=3, + enum="PromotionalOrderType", + ) ) diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/operations.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/operations.py index 86176fec55ae..e897436b8ab4 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/operations.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/operations.py @@ -77,6 +77,7 @@ class OperationType(proto.Enum): Long Running Operation was triggered by ProvisionCloudIdentity. """ + OPERATION_TYPE_UNSPECIFIED = 0 CREATE_ENTITLEMENT = 1 CHANGE_RENEWAL_SETTINGS = 3 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/products.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/products.py index fe519becb708..fa7f4f9d53ef 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/products.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/products.py @@ -40,6 +40,7 @@ class MediaType(proto.Enum): MEDIA_TYPE_IMAGE (1): Type of image. """ + MEDIA_TYPE_UNSPECIFIED = 0 MEDIA_TYPE_IMAGE = 1 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/reports_service.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/reports_service.py index b7f16154c3d0..af74ada16fa7 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/reports_service.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/reports_service.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import decimal_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.decimal_pb2 as decimal_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -392,6 +392,7 @@ class DataType(proto.Enum): DATE_TIME (6): ReportValues for this column will use date_time_value. """ + DATA_TYPE_UNSPECIFIED = 0 STRING = 1 INT = 2 @@ -599,6 +600,7 @@ class State(proto.Enum): FAILED (4): Report failed. """ + STATE_UNSPECIFIED = 0 STARTED = 1 WRITING = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/repricing.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/repricing.py index 4dea3dff405d..19cadc655d31 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/repricing.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/repricing.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import decimal_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.decimal_pb2 as decimal_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -55,6 +55,7 @@ class RebillingBasis(proto.Enum): the customer would see if they viewed the bill in the Google Cloud Console. """ + REBILLING_BASIS_UNSPECIFIED = 0 COST_AT_LIST = 1 DIRECT_CUSTOMER_COST = 2 diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/service.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/service.py index 1aab0f0820b0..fe38533840f6 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/service.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/service.py @@ -17,20 +17,18 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore +from google.cloud.channel_v1.types import billing_accounts, common, repricing from google.cloud.channel_v1.types import ( channel_partner_links as gcc_channel_partner_links, ) -from google.cloud.channel_v1.types import entitlement_changes as gcc_entitlement_changes -from google.cloud.channel_v1.types import billing_accounts -from google.cloud.channel_v1.types import common from google.cloud.channel_v1.types import customers as gcc_customers +from google.cloud.channel_v1.types import entitlement_changes as gcc_entitlement_changes from google.cloud.channel_v1.types import entitlements as gcc_entitlements from google.cloud.channel_v1.types import offers as gcc_offers from google.cloud.channel_v1.types import products as gcc_products -from google.cloud.channel_v1.types import repricing __protobuf__ = proto.module( package="google.cloud.channel.v1", @@ -213,12 +211,12 @@ class CheckCloudIdentityAccountsExistResponse(proto.Message): the domain. """ - cloud_identity_accounts: MutableSequence[ - "CloudIdentityCustomerAccount" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CloudIdentityCustomerAccount", + cloud_identity_accounts: MutableSequence["CloudIdentityCustomerAccount"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CloudIdentityCustomerAccount", + ) ) @@ -676,12 +674,12 @@ class ListTransferableSkusResponse(proto.Message): def raw_page(self): return self - transferable_skus: MutableSequence[ - gcc_entitlements.TransferableSku - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcc_entitlements.TransferableSku, + transferable_skus: MutableSequence[gcc_entitlements.TransferableSku] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcc_entitlements.TransferableSku, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1099,12 +1097,12 @@ class ListCustomerRepricingConfigsResponse(proto.Message): def raw_page(self): return self - customer_repricing_configs: MutableSequence[ - repricing.CustomerRepricingConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=repricing.CustomerRepricingConfig, + customer_repricing_configs: MutableSequence[repricing.CustomerRepricingConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=repricing.CustomerRepricingConfig, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -2341,6 +2339,7 @@ class ChangeType(proto.Enum): SKU is a downgrade on the current entitlement. """ + CHANGE_TYPE_UNSPECIFIED = 0 UPGRADE = 1 DOWNGRADE = 2 @@ -2663,12 +2662,12 @@ class SkuPurchaseGroup(proto.Message): proto.STRING, number=1, ) - billing_account_purchase_infos: MutableSequence[ - "BillingAccountPurchaseInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="BillingAccountPurchaseInfo", + billing_account_purchase_infos: MutableSequence["BillingAccountPurchaseInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="BillingAccountPurchaseInfo", + ) ) @@ -2939,12 +2938,12 @@ class ListEntitlementChangesResponse(proto.Message): def raw_page(self): return self - entitlement_changes: MutableSequence[ - gcc_entitlement_changes.EntitlementChange - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcc_entitlement_changes.EntitlementChange, + entitlement_changes: MutableSequence[gcc_entitlement_changes.EntitlementChange] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcc_entitlement_changes.EntitlementChange, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/types/subscriber_event.py b/packages/google-cloud-channel/google/cloud/channel_v1/types/subscriber_event.py index 4c08d87fd64f..3c7606a8f422 100644 --- a/packages/google-cloud-channel/google/cloud/channel_v1/types/subscriber_event.py +++ b/packages/google-cloud-channel/google/cloud/channel_v1/types/subscriber_event.py @@ -54,6 +54,7 @@ class Type(proto.Enum): Primary domain of the customer has been verified. """ + TYPE_UNSPECIFIED = 0 PRIMARY_DOMAIN_CHANGED = 1 PRIMARY_DOMAIN_VERIFIED = 2 @@ -122,6 +123,7 @@ class Type(proto.Enum): LICENSE_CAP_CHANGED (13): License cap was changed for the entitlement. """ + TYPE_UNSPECIFIED = 0 CREATED = 1 PRICE_PLAN_SWITCHED = 3 diff --git a/packages/google-cloud-channel/noxfile.py b/packages/google-cloud-channel/noxfile.py index c71c71424157..cd7abc47be4e 100644 --- a/packages/google-cloud-channel/noxfile.py +++ b/packages/google-cloud-channel/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_reports_service.py b/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_reports_service.py index e3e65b869e13..4a97a24883e0 100644 --- a/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_reports_service.py +++ b/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_reports_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,18 +54,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore from google.cloud.channel_v1.services.cloud_channel_reports_service import ( CloudChannelReportsServiceAsyncClient, @@ -1000,10 +1000,9 @@ def test_cloud_channel_reports_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1048,10 +1047,9 @@ def test_cloud_channel_reports_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1087,10 +1085,9 @@ def test_cloud_channel_reports_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1338,13 +1335,13 @@ def test_cloud_channel_reports_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1710,9 +1707,9 @@ def test_fetch_report_results_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_report_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_report_results] = ( + mock_rpc + ) request = {} client.fetch_report_results(request) @@ -3013,11 +3010,14 @@ def test_cloud_channel_reports_service_base_transport(): def test_cloud_channel_reports_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.channel_v1.services.cloud_channel_reports_service.transports.CloudChannelReportsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.channel_v1.services.cloud_channel_reports_service.transports.CloudChannelReportsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudChannelReportsServiceTransport( @@ -3036,9 +3036,12 @@ def test_cloud_channel_reports_service_base_transport_with_credentials_file(): def test_cloud_channel_reports_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.channel_v1.services.cloud_channel_reports_service.transports.CloudChannelReportsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.channel_v1.services.cloud_channel_reports_service.transports.CloudChannelReportsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudChannelReportsServiceTransport() @@ -3115,11 +3118,12 @@ def test_cloud_channel_reports_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_service.py b/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_service.py index 674fc5222a79..9614abc9a809 100644 --- a/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_service.py +++ b/packages/google-cloud-channel/tests/unit/gapic/channel_v1/test_cloud_channel_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,17 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.decimal_pb2 as decimal_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,22 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import decimal_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore from google.cloud.channel_v1.services.cloud_channel_service import ( CloudChannelServiceAsyncClient, @@ -987,10 +987,9 @@ def test_cloud_channel_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1034,9 @@ def test_cloud_channel_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1072,9 @@ def test_cloud_channel_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1322,13 +1319,13 @@ def test_cloud_channel_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3902,9 +3899,9 @@ def test_list_entitlements_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entitlements - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entitlements] = ( + mock_rpc + ) request = {} client.list_entitlements(request) @@ -4370,9 +4367,9 @@ def test_list_transferable_skus_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_transferable_skus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_transferable_skus] = ( + mock_rpc + ) request = {} client.list_transferable_skus(request) @@ -5575,9 +5572,9 @@ def test_create_entitlement_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entitlement] = ( + mock_rpc + ) request = {} client.create_entitlement(request) @@ -5836,9 +5833,9 @@ def test_change_parameters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.change_parameters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.change_parameters] = ( + mock_rpc + ) request = {} client.change_parameters(request) @@ -6614,9 +6611,9 @@ def test_start_paid_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_paid_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_paid_service] = ( + mock_rpc + ) request = {} client.start_paid_service(request) @@ -6875,9 +6872,9 @@ def test_suspend_entitlement_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_entitlement] = ( + mock_rpc + ) request = {} client.suspend_entitlement(request) @@ -7136,9 +7133,9 @@ def test_cancel_entitlement_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_entitlement] = ( + mock_rpc + ) request = {} client.cancel_entitlement(request) @@ -7397,9 +7394,9 @@ def test_activate_entitlement_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.activate_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.activate_entitlement] = ( + mock_rpc + ) request = {} client.activate_entitlement(request) @@ -7661,9 +7658,9 @@ def test_transfer_entitlements_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.transfer_entitlements - ] = mock_rpc + client._transport._wrapped_methods[client._transport.transfer_entitlements] = ( + mock_rpc + ) request = {} client.transfer_entitlements(request) @@ -15911,9 +15908,9 @@ def test_list_purchasable_skus_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_purchasable_skus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_purchasable_skus] = ( + mock_rpc + ) request = {} client.list_purchasable_skus(request) @@ -17085,9 +17082,9 @@ def test_register_subscriber_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.register_subscriber - ] = mock_rpc + client._transport._wrapped_methods[client._transport.register_subscriber] = ( + mock_rpc + ) request = {} client.register_subscriber(request) @@ -17345,9 +17342,9 @@ def test_unregister_subscriber_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.unregister_subscriber - ] = mock_rpc + client._transport._wrapped_methods[client._transport.unregister_subscriber] = ( + mock_rpc + ) request = {} client.unregister_subscriber(request) @@ -17602,9 +17599,9 @@ def test_list_subscribers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_subscribers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_subscribers] = ( + mock_rpc + ) request = {} client.list_subscribers(request) @@ -21250,11 +21247,14 @@ def test_cloud_channel_service_base_transport(): def test_cloud_channel_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.channel_v1.services.cloud_channel_service.transports.CloudChannelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.channel_v1.services.cloud_channel_service.transports.CloudChannelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudChannelServiceTransport( @@ -21271,9 +21271,12 @@ def test_cloud_channel_service_base_transport_with_credentials_file(): def test_cloud_channel_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.channel_v1.services.cloud_channel_service.transports.CloudChannelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.channel_v1.services.cloud_channel_service.transports.CloudChannelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudChannelServiceTransport() @@ -21344,11 +21347,12 @@ def test_cloud_channel_service_transport_auth_gdch_credentials(transport_class): def test_cloud_channel_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-chronicle/docs/conf.py b/packages/google-cloud-chronicle/docs/conf.py index 4439326b5c99..cfcf29347711 100644 --- a/packages/google-cloud-chronicle/docs/conf.py +++ b/packages/google-cloud-chronicle/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-chronicle documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/__init__.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/__init__.py index aa822e99ded8..e51581438276 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/__init__.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_access_control_service import ( DataAccessControlServiceAsyncClient, DataAccessControlServiceClient, diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/async_client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/async_client.py index fd38bdcdbb66..5229b03a22ab 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/async_client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -45,9 +45,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.chronicle_v1.services.data_access_control_service import pagers from google.cloud.chronicle_v1.types import data_access_control @@ -136,7 +136,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataAccessControlServiceAsyncClient: The constructed client. """ - return DataAccessControlServiceClient.from_service_account_info.__func__(DataAccessControlServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataAccessControlServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataAccessControlServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -152,7 +153,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataAccessControlServiceAsyncClient: The constructed client. """ - return DataAccessControlServiceClient.from_service_account_file.__func__(DataAccessControlServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataAccessControlServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + DataAccessControlServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -190,7 +194,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataAccessControlServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataAccessControlServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataAccessControlServiceTransport: diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/client.py index 6a206049d499..5f86d5e292c0 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -62,9 +62,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.chronicle_v1.services.data_access_control_service import pagers from google.cloud.chronicle_v1.types import data_access_control @@ -83,9 +83,7 @@ class DataAccessControlServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataAccessControlServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataAccessControlServiceTransport]] _transport_registry["grpc"] = DataAccessControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataAccessControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataAccessControlServiceRestTransport @@ -659,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataAccessControlServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataAccessControlServiceClient._read_environment_variables() + ) self._client_cert_source = ( DataAccessControlServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -700,8 +696,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataAccessControlServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/pagers.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/pagers.py index 691eb92361c8..4f8af239ccf0 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/pagers.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/__init__.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/__init__.py index b3d2a688a4a8..31bf01f3458c 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/__init__.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataAccessControlServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataAccessControlServiceTransport]] _transport_registry["grpc"] = DataAccessControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataAccessControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataAccessControlServiceRestTransport diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/base.py index 5fb5d2087a18..4e3f631edd04 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.chronicle_v1 import gapic_version as package_version from google.cloud.chronicle_v1.types import data_access_control @@ -393,13 +393,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc.py index bebe52c672d1..254c494f03bc 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import data_access_control diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc_asyncio.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc_asyncio.py index b7874fc57f34..72e806f45951 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import data_access_control diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest.py index 8e07f5eb821e..eeeb89ba9386 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -836,9 +836,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseCreateDataAccessLabel._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseCreateDataAccessLabel._get_http_options() request, metadata = self._interceptor.pre_create_data_access_label( request, metadata @@ -995,9 +993,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseCreateDataAccessScope._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseCreateDataAccessScope._get_http_options() request, metadata = self._interceptor.pre_create_data_access_scope( request, metadata @@ -1146,9 +1142,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseDeleteDataAccessLabel._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseDeleteDataAccessLabel._get_http_options() request, metadata = self._interceptor.pre_delete_data_access_label( request, metadata @@ -1170,7 +1164,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1256,9 +1250,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseDeleteDataAccessScope._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseDeleteDataAccessScope._get_http_options() request, metadata = self._interceptor.pre_delete_data_access_scope( request, metadata @@ -1280,7 +1272,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1372,9 +1364,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseGetDataAccessLabel._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseGetDataAccessLabel._get_http_options() request, metadata = self._interceptor.pre_get_data_access_label( request, metadata @@ -1527,9 +1517,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseGetDataAccessScope._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseGetDataAccessScope._get_http_options() request, metadata = self._interceptor.pre_get_data_access_scope( request, metadata @@ -1681,9 +1669,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseListDataAccessLabels._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseListDataAccessLabels._get_http_options() request, metadata = self._interceptor.pre_list_data_access_labels( request, metadata @@ -1835,9 +1821,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseListDataAccessScopes._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseListDataAccessScopes._get_http_options() request, metadata = self._interceptor.pre_list_data_access_scopes( request, metadata @@ -1990,9 +1974,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseUpdateDataAccessLabel._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseUpdateDataAccessLabel._get_http_options() request, metadata = self._interceptor.pre_update_data_access_label( request, metadata @@ -2149,9 +2131,7 @@ def __call__( """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseUpdateDataAccessScope._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseUpdateDataAccessScope._get_http_options() request, metadata = self._interceptor.pre_update_data_access_scope( request, metadata @@ -2408,9 +2388,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2530,9 +2508,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2650,9 +2626,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataAccessControlServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2793,9 +2767,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataAccessControlServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataAccessControlServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataAccessControlServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest_base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest_base.py index 0d5d7b5e3b0e..9bd7d0e65fcc 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest_base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/data_access_control_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.chronicle_v1.types import data_access_control diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/async_client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/async_client.py index a95118f1d2ad..9fb554ac3fe6 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/async_client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -45,9 +45,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.chronicle_v1.services.entity_service import pagers from google.cloud.chronicle_v1.types import entity @@ -118,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EntityServiceAsyncClient: The constructed client. """ - return EntityServiceClient.from_service_account_info.__func__(EntityServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EntityServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EntityServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +135,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EntityServiceAsyncClient: The constructed client. """ - return EntityServiceClient.from_service_account_file.__func__(EntityServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EntityServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EntityServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/client.py index 091b314b74ec..d16afa81e708 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -62,9 +62,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.chronicle_v1.services.entity_service import pagers from google.cloud.chronicle_v1.types import entity @@ -625,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EntityServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EntityServiceClient._read_environment_variables() + ) self._client_cert_source = EntityServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EntityServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/pagers.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/pagers.py index cf3a07b89446..71d4c575fc7b 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/pagers.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/base.py index ca22a9357732..ad4e07823be3 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.chronicle_v1 import gapic_version as package_version from google.cloud.chronicle_v1.types import entity @@ -281,13 +281,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc.py index ff497ff6081a..acaf5dcf3575 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import entity diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc_asyncio.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc_asyncio.py index 06d59d58f086..cccde9e213e0 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import entity diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest.py index 115cc8acce89..a9abe4a6a192 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -721,7 +721,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest_base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest_base.py index 5c2e18ee71ca..ed3c8bea1819 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest_base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/entity_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.chronicle_v1.types import entity diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/async_client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/async_client.py index 7bbb6337a72a..b4110cb88ae1 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/async_client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -117,7 +117,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: InstanceServiceAsyncClient: The constructed client. """ - return InstanceServiceClient.from_service_account_info.__func__(InstanceServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = InstanceServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(InstanceServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +134,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: InstanceServiceAsyncClient: The constructed client. """ - return InstanceServiceClient.from_service_account_file.__func__(InstanceServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = InstanceServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(InstanceServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/client.py index 4000169fa174..459aa599fc4a 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class InstanceServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceServiceTransport]] _transport_registry["grpc"] = InstanceServiceGrpcTransport _transport_registry["grpc_asyncio"] = InstanceServiceGrpcAsyncIOTransport _transport_registry["rest"] = InstanceServiceRestTransport @@ -626,11 +624,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceServiceClient._read_environment_variables() + ) self._client_cert_source = InstanceServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +661,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/base.py index fc7c6565c636..f9aaf3982ff8 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version from google.cloud.chronicle_v1.types import instance @@ -215,13 +215,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc.py index 4f37e008d9f8..fa53ff6db62e 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import instance diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc_asyncio.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc_asyncio.py index 07861d9dd529..5ad003b8b197 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import instance diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/rest.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/rest.py index e598078744c0..e27467ec92a7 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/rest.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/instance_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -525,9 +525,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseInstanceServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseInstanceServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -644,9 +642,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseInstanceServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseInstanceServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -901,9 +897,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseInstanceServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseInstanceServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseInstanceServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/async_client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/async_client.py index 2cb1a0628097..5592f33044ff 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/async_client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -45,13 +45,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.chronicle_v1.services.reference_list_service import pagers -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from .client import ReferenceListServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ReferenceListServiceTransport @@ -123,7 +123,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ReferenceListServiceAsyncClient: The constructed client. """ - return ReferenceListServiceClient.from_service_account_info.__func__(ReferenceListServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ReferenceListServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ReferenceListServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +140,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ReferenceListServiceAsyncClient: The constructed client. """ - return ReferenceListServiceClient.from_service_account_file.__func__(ReferenceListServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ReferenceListServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ReferenceListServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -177,7 +179,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ReferenceListServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ReferenceListServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ReferenceListServiceTransport: diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/client.py index ed45b252d404..bdffa01e29d2 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -62,13 +62,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.chronicle_v1.services.reference_list_service import pagers -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from .transports.base import DEFAULT_CLIENT_INFO, ReferenceListServiceTransport from .transports.grpc import ReferenceListServiceGrpcTransport @@ -84,9 +84,7 @@ class ReferenceListServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReferenceListServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReferenceListServiceTransport]] _transport_registry["grpc"] = ReferenceListServiceGrpcTransport _transport_registry["grpc_asyncio"] = ReferenceListServiceGrpcAsyncIOTransport _transport_registry["rest"] = ReferenceListServiceRestTransport @@ -634,11 +632,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReferenceListServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReferenceListServiceClient._read_environment_variables() + ) self._client_cert_source = ReferenceListServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -673,8 +669,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReferenceListServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/pagers.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/pagers.py index 99cc566cc5c7..69718ac61cb2 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/pagers.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/__init__.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/__init__.py index 4873910335ae..5dcd8cbdd655 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/__init__.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ReferenceListServiceRestInterceptor, ReferenceListServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ReferenceListServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ReferenceListServiceTransport]] _transport_registry["grpc"] = ReferenceListServiceGrpcTransport _transport_registry["grpc_asyncio"] = ReferenceListServiceGrpcAsyncIOTransport _transport_registry["rest"] = ReferenceListServiceRestTransport diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/base.py index 0402ecfd7f09..a3f5aaf69794 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/base.py @@ -17,18 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -276,13 +276,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc.py index 76583ba93787..79f266ee2179 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc.py @@ -16,21 +16,21 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from .base import DEFAULT_CLIENT_INFO, ReferenceListServiceTransport diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc_asyncio.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc_asyncio.py index 1d98b3c0f023..db9d4c4c0cab 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,13 +30,10 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from .base import DEFAULT_CLIENT_INFO, ReferenceListServiceTransport from .grpc import ReferenceListServiceGrpcTransport diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest.py index 4ea4a43d50bf..be673689e286 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest.py @@ -16,21 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseReferenceListServiceRestTransport @@ -559,9 +559,7 @@ def __call__( """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseCreateReferenceList._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseCreateReferenceList._get_http_options() request, metadata = self._interceptor.pre_create_reference_list( request, metadata @@ -720,9 +718,7 @@ def __call__( """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseGetReferenceList._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseGetReferenceList._get_http_options() request, metadata = self._interceptor.pre_get_reference_list( request, metadata @@ -872,9 +868,7 @@ def __call__( """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseListReferenceLists._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseListReferenceLists._get_http_options() request, metadata = self._interceptor.pre_list_reference_lists( request, metadata @@ -1028,9 +1022,7 @@ def __call__( """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseUpdateReferenceList._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseUpdateReferenceList._get_http_options() request, metadata = self._interceptor.pre_update_reference_list( request, metadata @@ -1228,9 +1220,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1348,9 +1338,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1466,9 +1454,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseReferenceListServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1607,9 +1593,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseReferenceListServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseReferenceListServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseReferenceListServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest_base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest_base.py index 8bae1e70e493..6f1160ede561 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest_base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/reference_list_service/transports/rest_base.py @@ -21,8 +21,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from .base import DEFAULT_CLIENT_INFO, ReferenceListServiceTransport diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/async_client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/async_client.py index def009172c89..d10bff2410f5 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/async_client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -45,12 +45,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.chronicle_v1.services.rule_service import pagers from google.cloud.chronicle_v1.types import rule @@ -132,7 +132,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RuleServiceAsyncClient: The constructed client. """ - return RuleServiceClient.from_service_account_info.__func__(RuleServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = RuleServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(RuleServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +149,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RuleServiceAsyncClient: The constructed client. """ - return RuleServiceClient.from_service_account_file.__func__(RuleServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = RuleServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(RuleServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/client.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/client.py index 333d2eeee442..497d3842d96e 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/client.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.chronicle_v1 import gapic_version as package_version @@ -62,12 +62,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.chronicle_v1.services.rule_service import pagers from google.cloud.chronicle_v1.types import rule @@ -727,11 +727,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RuleServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RuleServiceClient._read_environment_variables() + ) self._client_cert_source = RuleServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -766,8 +764,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RuleServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/pagers.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/pagers.py index 8affd608a3a4..50c9ddc24e3f 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/pagers.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/base.py index 3f33f9e5d6f6..94b95e641109 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.chronicle_v1 import gapic_version as package_version from google.cloud.chronicle_v1.types import rule @@ -428,13 +428,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc.py index 592a171b9e6a..71e41a3ec547 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import rule from google.cloud.chronicle_v1.types import rule as gcc_rule diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc_asyncio.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc_asyncio.py index e9477bed009e..6f01668b757e 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.chronicle_v1.types import rule from google.cloud.chronicle_v1.types import rule as gcc_rule diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest.py index 79a0f5ee497b..43a7fe435369 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1008,7 +1008,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1309,7 +1309,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1996,9 +1996,7 @@ def __call__( """ - http_options = ( - _BaseRuleServiceRestTransport._BaseListRuleDeployments._get_http_options() - ) + http_options = _BaseRuleServiceRestTransport._BaseListRuleDeployments._get_http_options() request, metadata = self._interceptor.pre_list_rule_deployments( request, metadata @@ -2603,9 +2601,7 @@ def __call__( """ - http_options = ( - _BaseRuleServiceRestTransport._BaseUpdateRuleDeployment._get_http_options() - ) + http_options = _BaseRuleServiceRestTransport._BaseUpdateRuleDeployment._get_http_options() request, metadata = self._interceptor.pre_update_rule_deployment( request, metadata diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest_base.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest_base.py index b9d03b98b8e7..eddfd2de8392 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest_base.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/services/rule_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.chronicle_v1.types import rule diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/__init__.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/__init__.py index 399355c9fd56..00886c66dedf 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/__init__.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/__init__.py @@ -41,7 +41,10 @@ Watchlist, WatchlistUserPreferences, ) -from .instance import GetInstanceRequest, Instance +from .instance import ( + GetInstanceRequest, + Instance, +) from .reference_list import ( CreateReferenceListRequest, GetReferenceListRequest, diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/data_access_control.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/data_access_control.py index 50dd8c139add..58b3cc872e95 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/data_access_control.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/data_access_control.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -520,19 +520,19 @@ class DataAccessScope(proto.Message): proto.STRING, number=1, ) - allowed_data_access_labels: MutableSequence[ - "DataAccessLabelReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="DataAccessLabelReference", - ) - denied_data_access_labels: MutableSequence[ - "DataAccessLabelReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="DataAccessLabelReference", + allowed_data_access_labels: MutableSequence["DataAccessLabelReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="DataAccessLabelReference", + ) + ) + denied_data_access_labels: MutableSequence["DataAccessLabelReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="DataAccessLabelReference", + ) ) display_name: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/entity.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/entity.py index 711d98b90f83..e11d097ce925 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/entity.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/entity.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/reference_list.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/reference_list.py index 87a1efde90e7..77274eb6b6a9 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/reference_list.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/reference_list.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -54,6 +54,7 @@ class ReferenceListSyntaxType(proto.Enum): REFERENCE_LIST_SYNTAX_TYPE_CIDR (3): List contains only CIDR patterns. """ + REFERENCE_LIST_SYNTAX_TYPE_UNSPECIFIED = 0 REFERENCE_LIST_SYNTAX_TYPE_PLAIN_TEXT_STRING = 1 REFERENCE_LIST_SYNTAX_TYPE_REGEX = 2 @@ -79,6 +80,7 @@ class ReferenceListView(proto.Enum): metadata, content lines, associated rule counts. This is the default view for GetReferenceList. """ + REFERENCE_LIST_VIEW_UNSPECIFIED = 0 REFERENCE_LIST_VIEW_BASIC = 1 REFERENCE_LIST_VIEW_FULL = 2 diff --git a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/rule.py b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/rule.py index 849845d51d71..6dcd1a898268 100644 --- a/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/rule.py +++ b/packages/google-cloud-chronicle/google/cloud/chronicle_v1/types/rule.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -70,6 +70,7 @@ class RunFrequency(proto.Enum): DAILY (3): Executes once per day. """ + RUN_FREQUENCY_UNSPECIFIED = 0 LIVE = 1 HOURLY = 2 @@ -90,6 +91,7 @@ class RuleType(proto.Enum): Rule checks for correlation between multiple events """ + RULE_TYPE_UNSPECIFIED = 0 SINGLE_EVENT = 1 MULTI_EVENT = 2 @@ -120,6 +122,7 @@ class RuleView(proto.Enum): Returned fields include: revision_id and revision_create_time. """ + RULE_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -221,6 +224,7 @@ class CompilationState(proto.Enum): This is possible if a backwards-incompatible change was made to the compiler. """ + COMPILATION_STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -292,12 +296,12 @@ class CompilationState(proto.Enum): proto.STRING, number=16, ) - compilation_diagnostics: MutableSequence[ - "CompilationDiagnostic" - ] = proto.RepeatedField( - proto.MESSAGE, - number=17, - message="CompilationDiagnostic", + compilation_diagnostics: MutableSequence["CompilationDiagnostic"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=17, + message="CompilationDiagnostic", + ) ) near_real_time_live_rule_eligible: bool = proto.Field( proto.BOOL, @@ -376,6 +380,7 @@ class ExecutionState(proto.Enum): PAUSED (3): Paused rules are not executed at all. """ + EXECUTION_STATE_UNSPECIFIED = 0 DEFAULT = 1 LIMITED = 2 @@ -468,6 +473,7 @@ class State(proto.Enum): FAILED (4): Failed state. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 DONE = 2 @@ -1056,6 +1062,7 @@ class Severity(proto.Enum): ERROR (2): A compilation error. """ + SEVERITY_UNSPECIFIED = 0 WARNING = 1 ERROR = 2 diff --git a/packages/google-cloud-chronicle/noxfile.py b/packages/google-cloud-chronicle/noxfile.py index db0eb71ead15..3f3c8f898d19 100644 --- a/packages/google-cloud-chronicle/noxfile.py +++ b/packages/google-cloud-chronicle/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_data_access_control_service.py b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_data_access_control_service.py index c708176f1c40..537c10fbac69 100644 --- a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_data_access_control_service.py +++ b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_data_access_control_service.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,17 +44,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.chronicle_v1.services.data_access_control_service import ( DataAccessControlServiceAsyncClient, @@ -1007,10 +1012,9 @@ def test_data_access_control_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1055,10 +1059,9 @@ def test_data_access_control_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1094,10 +1097,9 @@ def test_data_access_control_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1354,13 +1356,13 @@ def test_data_access_control_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1873,9 +1875,9 @@ def test_get_data_access_label_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_access_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_access_label] = ( + mock_rpc + ) request = {} client.get_data_access_label(request) @@ -3875,9 +3877,9 @@ def test_get_data_access_scope_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_access_scope - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_access_scope] = ( + mock_rpc + ) request = {} client.get_data_access_scope(request) @@ -5635,9 +5637,9 @@ def test_get_data_access_label_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_access_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_access_label] = ( + mock_rpc + ) request = {} client.get_data_access_label(request) @@ -6677,9 +6679,9 @@ def test_get_data_access_scope_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_access_scope - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_access_scope] = ( + mock_rpc + ) request = {} client.get_data_access_scope(request) @@ -8153,8 +8155,9 @@ def test_create_data_access_label_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8305,20 +8308,22 @@ def test_create_data_access_label_rest_interceptors(null_interceptor): ) client = DataAccessControlServiceClient(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.DataAccessControlServiceRestInterceptor, - "post_create_data_access_label", - ) as post, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "post_create_data_access_label_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "pre_create_data_access_label", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_create_data_access_label", + ) as post, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_create_data_access_label_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "pre_create_data_access_label", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8378,8 +8383,9 @@ def test_get_data_access_label_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8453,18 +8459,22 @@ def test_get_data_access_label_rest_interceptors(null_interceptor): ) client = DataAccessControlServiceClient(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.DataAccessControlServiceRestInterceptor, "post_get_data_access_label" - ) as post, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "post_get_data_access_label_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, "pre_get_data_access_label" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_get_data_access_label", + ) as post, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_get_data_access_label_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "pre_get_data_access_label", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8522,8 +8532,9 @@ def test_list_data_access_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8586,20 +8597,22 @@ def test_list_data_access_labels_rest_interceptors(null_interceptor): ) client = DataAccessControlServiceClient(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.DataAccessControlServiceRestInterceptor, - "post_list_data_access_labels", - ) as post, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "post_list_data_access_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "pre_list_data_access_labels", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_list_data_access_labels", + ) as post, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_list_data_access_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "pre_list_data_access_labels", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8661,8 +8674,9 @@ def test_update_data_access_label_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8817,20 +8831,22 @@ def test_update_data_access_label_rest_interceptors(null_interceptor): ) client = DataAccessControlServiceClient(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.DataAccessControlServiceRestInterceptor, - "post_update_data_access_label", - ) as post, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "post_update_data_access_label_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "pre_update_data_access_label", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_update_data_access_label", + ) as post, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_update_data_access_label_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "pre_update_data_access_label", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8890,8 +8906,9 @@ def test_delete_data_access_label_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8950,14 +8967,14 @@ def test_delete_data_access_label_rest_interceptors(null_interceptor): ) client = DataAccessControlServiceClient(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.DataAccessControlServiceRestInterceptor, - "pre_delete_data_access_label", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "pre_delete_data_access_label", + ) as pre, + ): pre.assert_not_called() pb_message = data_access_control.DeleteDataAccessLabelRequest.pb( data_access_control.DeleteDataAccessLabelRequest() @@ -9002,8 +9019,9 @@ def test_create_data_access_scope_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9168,20 +9186,22 @@ def test_create_data_access_scope_rest_interceptors(null_interceptor): ) client = DataAccessControlServiceClient(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.DataAccessControlServiceRestInterceptor, - "post_create_data_access_scope", - ) as post, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "post_create_data_access_scope_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "pre_create_data_access_scope", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_create_data_access_scope", + ) as post, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_create_data_access_scope_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "pre_create_data_access_scope", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9241,8 +9261,9 @@ def test_get_data_access_scope_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9317,18 +9338,22 @@ def test_get_data_access_scope_rest_interceptors(null_interceptor): ) client = DataAccessControlServiceClient(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.DataAccessControlServiceRestInterceptor, "post_get_data_access_scope" - ) as post, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "post_get_data_access_scope_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, "pre_get_data_access_scope" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_get_data_access_scope", + ) as post, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_get_data_access_scope_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "pre_get_data_access_scope", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9386,8 +9411,9 @@ def test_list_data_access_scopes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9452,20 +9478,22 @@ def test_list_data_access_scopes_rest_interceptors(null_interceptor): ) client = DataAccessControlServiceClient(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.DataAccessControlServiceRestInterceptor, - "post_list_data_access_scopes", - ) as post, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "post_list_data_access_scopes_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "pre_list_data_access_scopes", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_list_data_access_scopes", + ) as post, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_list_data_access_scopes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "pre_list_data_access_scopes", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9527,8 +9555,9 @@ def test_update_data_access_scope_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9697,20 +9726,22 @@ def test_update_data_access_scope_rest_interceptors(null_interceptor): ) client = DataAccessControlServiceClient(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.DataAccessControlServiceRestInterceptor, - "post_update_data_access_scope", - ) as post, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "post_update_data_access_scope_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAccessControlServiceRestInterceptor, - "pre_update_data_access_scope", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_update_data_access_scope", + ) as post, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "post_update_data_access_scope_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "pre_update_data_access_scope", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9770,8 +9801,9 @@ def test_delete_data_access_scope_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9830,14 +9862,14 @@ def test_delete_data_access_scope_rest_interceptors(null_interceptor): ) client = DataAccessControlServiceClient(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.DataAccessControlServiceRestInterceptor, - "pre_delete_data_access_scope", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAccessControlServiceRestInterceptor, + "pre_delete_data_access_scope", + ) as pre, + ): pre.assert_not_called() pb_message = data_access_control.DeleteDataAccessScopeRequest.pb( data_access_control.DeleteDataAccessScopeRequest() @@ -9887,8 +9919,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9954,8 +9987,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10021,8 +10055,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10085,8 +10120,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10427,11 +10463,14 @@ def test_data_access_control_service_base_transport(): def test_data_access_control_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.chronicle_v1.services.data_access_control_service.transports.DataAccessControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.chronicle_v1.services.data_access_control_service.transports.DataAccessControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataAccessControlServiceTransport( @@ -10448,9 +10487,12 @@ def test_data_access_control_service_base_transport_with_credentials_file(): def test_data_access_control_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.chronicle_v1.services.data_access_control_service.transports.DataAccessControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.chronicle_v1.services.data_access_control_service.transports.DataAccessControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataAccessControlServiceTransport() @@ -10524,11 +10566,12 @@ def test_data_access_control_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_entity_service.py b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_entity_service.py index e0886682715a..53c62a680693 100644 --- a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_entity_service.py +++ b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_entity_service.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,17 +44,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.chronicle_v1.services.entity_service import ( EntityServiceAsyncClient, @@ -945,10 +950,9 @@ def test_entity_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +997,9 @@ def test_entity_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1035,9 @@ def test_entity_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1278,13 +1280,13 @@ def test_entity_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2251,9 +2253,9 @@ def test_create_watchlist_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_watchlist - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_watchlist] = ( + mock_rpc + ) request = {} client.create_watchlist(request) @@ -2600,9 +2602,9 @@ def test_update_watchlist_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_watchlist - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_watchlist] = ( + mock_rpc + ) request = {} client.update_watchlist(request) @@ -2934,9 +2936,9 @@ def test_delete_watchlist_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_watchlist - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_watchlist] = ( + mock_rpc + ) request = {} client.delete_watchlist(request) @@ -3634,9 +3636,9 @@ def test_create_watchlist_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_watchlist - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_watchlist] = ( + mock_rpc + ) request = {} client.create_watchlist(request) @@ -3831,9 +3833,9 @@ def test_update_watchlist_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_watchlist - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_watchlist] = ( + mock_rpc + ) request = {} client.update_watchlist(request) @@ -4015,9 +4017,9 @@ def test_delete_watchlist_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_watchlist - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_watchlist] = ( + mock_rpc + ) request = {} client.delete_watchlist(request) @@ -4558,8 +4560,9 @@ def test_get_watchlist_rest_bad_request(request_type=entity.GetWatchlistRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4630,17 +4633,19 @@ def test_get_watchlist_rest_interceptors(null_interceptor): ) client = EntityServiceClient(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.EntityServiceRestInterceptor, "post_get_watchlist" - ) as post, mock.patch.object( - transports.EntityServiceRestInterceptor, "post_get_watchlist_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityServiceRestInterceptor, "pre_get_watchlist" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityServiceRestInterceptor, "post_get_watchlist" + ) as post, + mock.patch.object( + transports.EntityServiceRestInterceptor, "post_get_watchlist_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EntityServiceRestInterceptor, "pre_get_watchlist" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4689,8 +4694,9 @@ def test_list_watchlists_rest_bad_request(request_type=entity.ListWatchlistsRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4753,17 +4759,20 @@ def test_list_watchlists_rest_interceptors(null_interceptor): ) client = EntityServiceClient(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.EntityServiceRestInterceptor, "post_list_watchlists" - ) as post, mock.patch.object( - transports.EntityServiceRestInterceptor, "post_list_watchlists_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityServiceRestInterceptor, "pre_list_watchlists" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityServiceRestInterceptor, "post_list_watchlists" + ) as post, + mock.patch.object( + transports.EntityServiceRestInterceptor, + "post_list_watchlists_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityServiceRestInterceptor, "pre_list_watchlists" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4814,8 +4823,9 @@ def test_create_watchlist_rest_bad_request(request_type=entity.CreateWatchlistRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4962,17 +4972,20 @@ def test_create_watchlist_rest_interceptors(null_interceptor): ) client = EntityServiceClient(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.EntityServiceRestInterceptor, "post_create_watchlist" - ) as post, mock.patch.object( - transports.EntityServiceRestInterceptor, "post_create_watchlist_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityServiceRestInterceptor, "pre_create_watchlist" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityServiceRestInterceptor, "post_create_watchlist" + ) as post, + mock.patch.object( + transports.EntityServiceRestInterceptor, + "post_create_watchlist_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityServiceRestInterceptor, "pre_create_watchlist" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5025,8 +5038,9 @@ def test_update_watchlist_rest_bad_request(request_type=entity.UpdateWatchlistRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5177,17 +5191,20 @@ def test_update_watchlist_rest_interceptors(null_interceptor): ) client = EntityServiceClient(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.EntityServiceRestInterceptor, "post_update_watchlist" - ) as post, mock.patch.object( - transports.EntityServiceRestInterceptor, "post_update_watchlist_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityServiceRestInterceptor, "pre_update_watchlist" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityServiceRestInterceptor, "post_update_watchlist" + ) as post, + mock.patch.object( + transports.EntityServiceRestInterceptor, + "post_update_watchlist_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityServiceRestInterceptor, "pre_update_watchlist" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5238,8 +5255,9 @@ def test_delete_watchlist_rest_bad_request(request_type=entity.DeleteWatchlistRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5298,13 +5316,13 @@ def test_delete_watchlist_rest_interceptors(null_interceptor): ) client = EntityServiceClient(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.EntityServiceRestInterceptor, "pre_delete_watchlist" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityServiceRestInterceptor, "pre_delete_watchlist" + ) as pre, + ): pre.assert_not_called() pb_message = entity.DeleteWatchlistRequest.pb(entity.DeleteWatchlistRequest()) transcode.return_value = { @@ -5352,8 +5370,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5419,8 +5438,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5486,8 +5506,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5550,8 +5571,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5767,11 +5789,14 @@ def test_entity_service_base_transport(): def test_entity_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.chronicle_v1.services.entity_service.transports.EntityServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.chronicle_v1.services.entity_service.transports.EntityServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EntityServiceTransport( @@ -5788,9 +5813,12 @@ def test_entity_service_base_transport_with_credentials_file(): def test_entity_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.chronicle_v1.services.entity_service.transports.EntityServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.chronicle_v1.services.entity_service.transports.EntityServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EntityServiceTransport() @@ -5862,11 +5890,12 @@ def test_entity_service_transport_auth_gdch_credentials(transport_class): def test_entity_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_instance_service.py b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_instance_service.py index fcd250ed91b6..f60749b16323 100644 --- a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_instance_service.py +++ b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_instance_service.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,11 +44,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -970,10 +975,9 @@ def test_instance_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1022,9 @@ def test_instance_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1060,9 @@ def test_instance_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1303,13 +1305,13 @@ def test_instance_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2011,8 +2013,9 @@ def test_get_instance_rest_bad_request(request_type=instance.GetInstanceRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2075,17 +2078,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = InstanceServiceClient(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.InstanceServiceRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.InstanceServiceRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceServiceRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceServiceRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.InstanceServiceRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceServiceRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2141,8 +2146,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2208,8 +2214,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2275,8 +2282,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2339,8 +2347,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2472,11 +2481,14 @@ def test_instance_service_base_transport(): def test_instance_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.chronicle_v1.services.instance_service.transports.InstanceServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.chronicle_v1.services.instance_service.transports.InstanceServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceServiceTransport( @@ -2493,9 +2505,12 @@ def test_instance_service_base_transport_with_credentials_file(): def test_instance_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.chronicle_v1.services.instance_service.transports.InstanceServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.chronicle_v1.services.instance_service.transports.InstanceServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceServiceTransport() @@ -2567,11 +2582,12 @@ def test_instance_service_transport_auth_gdch_credentials(transport_class): def test_instance_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_reference_list_service.py b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_reference_list_service.py index 77e90272047e..85fe8bb7c15a 100644 --- a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_reference_list_service.py +++ b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_reference_list_service.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,17 +44,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.chronicle_v1.services.reference_list_service import ( ReferenceListServiceAsyncClient, @@ -62,8 +67,8 @@ pagers, transports, ) -from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list from google.cloud.chronicle_v1.types import reference_list +from google.cloud.chronicle_v1.types import reference_list as gcc_reference_list CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -997,10 +1002,9 @@ def test_reference_list_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1049,9 @@ def test_reference_list_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1084,10 +1087,9 @@ def test_reference_list_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1343,13 +1345,13 @@ def test_reference_list_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1475,9 +1477,9 @@ def test_get_reference_list_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_reference_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_reference_list] = ( + mock_rpc + ) request = {} client.get_reference_list(request) @@ -1831,9 +1833,9 @@ def test_list_reference_lists_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_reference_lists - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_reference_lists] = ( + mock_rpc + ) request = {} client.list_reference_lists(request) @@ -2391,9 +2393,9 @@ def test_create_reference_list_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_reference_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_reference_list] = ( + mock_rpc + ) request = {} client.create_reference_list(request) @@ -2776,9 +2778,9 @@ def test_update_reference_list_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_reference_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_reference_list] = ( + mock_rpc + ) request = {} client.update_reference_list(request) @@ -3073,9 +3075,9 @@ def test_get_reference_list_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_reference_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_reference_list] = ( + mock_rpc + ) request = {} client.get_reference_list(request) @@ -3259,9 +3261,9 @@ def test_list_reference_lists_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_reference_lists - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_reference_lists] = ( + mock_rpc + ) request = {} client.list_reference_lists(request) @@ -3526,9 +3528,9 @@ def test_create_reference_list_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_reference_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_reference_list] = ( + mock_rpc + ) request = {} client.create_reference_list(request) @@ -3740,9 +3742,9 @@ def test_update_reference_list_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_reference_list - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_reference_list] = ( + mock_rpc + ) request = {} client.update_reference_list(request) @@ -4266,8 +4268,9 @@ def test_get_reference_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4345,18 +4348,20 @@ def test_get_reference_list_rest_interceptors(null_interceptor): ) client = ReferenceListServiceClient(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.ReferenceListServiceRestInterceptor, "post_get_reference_list" - ) as post, mock.patch.object( - transports.ReferenceListServiceRestInterceptor, - "post_get_reference_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReferenceListServiceRestInterceptor, "pre_get_reference_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReferenceListServiceRestInterceptor, "post_get_reference_list" + ) as post, + mock.patch.object( + transports.ReferenceListServiceRestInterceptor, + "post_get_reference_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReferenceListServiceRestInterceptor, "pre_get_reference_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4411,8 +4416,9 @@ def test_list_reference_lists_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4475,18 +4481,20 @@ def test_list_reference_lists_rest_interceptors(null_interceptor): ) client = ReferenceListServiceClient(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.ReferenceListServiceRestInterceptor, "post_list_reference_lists" - ) as post, mock.patch.object( - transports.ReferenceListServiceRestInterceptor, - "post_list_reference_lists_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReferenceListServiceRestInterceptor, "pre_list_reference_lists" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReferenceListServiceRestInterceptor, "post_list_reference_lists" + ) as post, + mock.patch.object( + transports.ReferenceListServiceRestInterceptor, + "post_list_reference_lists_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReferenceListServiceRestInterceptor, "pre_list_reference_lists" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4544,8 +4552,9 @@ def test_create_reference_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4705,18 +4714,20 @@ def test_create_reference_list_rest_interceptors(null_interceptor): ) client = ReferenceListServiceClient(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.ReferenceListServiceRestInterceptor, "post_create_reference_list" - ) as post, mock.patch.object( - transports.ReferenceListServiceRestInterceptor, - "post_create_reference_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReferenceListServiceRestInterceptor, "pre_create_reference_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReferenceListServiceRestInterceptor, "post_create_reference_list" + ) as post, + mock.patch.object( + transports.ReferenceListServiceRestInterceptor, + "post_create_reference_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReferenceListServiceRestInterceptor, "pre_create_reference_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4775,8 +4786,9 @@ def test_update_reference_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4940,18 +4952,20 @@ def test_update_reference_list_rest_interceptors(null_interceptor): ) client = ReferenceListServiceClient(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.ReferenceListServiceRestInterceptor, "post_update_reference_list" - ) as post, mock.patch.object( - transports.ReferenceListServiceRestInterceptor, - "post_update_reference_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReferenceListServiceRestInterceptor, "pre_update_reference_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReferenceListServiceRestInterceptor, "post_update_reference_list" + ) as post, + mock.patch.object( + transports.ReferenceListServiceRestInterceptor, + "post_update_reference_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReferenceListServiceRestInterceptor, "pre_update_reference_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5011,8 +5025,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5078,8 +5093,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5145,8 +5161,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5209,8 +5226,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5413,11 +5431,14 @@ def test_reference_list_service_base_transport(): def test_reference_list_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.chronicle_v1.services.reference_list_service.transports.ReferenceListServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.chronicle_v1.services.reference_list_service.transports.ReferenceListServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReferenceListServiceTransport( @@ -5434,9 +5455,12 @@ def test_reference_list_service_base_transport_with_credentials_file(): def test_reference_list_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.chronicle_v1.services.reference_list_service.transports.ReferenceListServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.chronicle_v1.services.reference_list_service.transports.ReferenceListServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReferenceListServiceTransport() @@ -5508,11 +5532,12 @@ def test_reference_list_service_transport_auth_gdch_credentials(transport_class) def test_reference_list_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_rule_service.py b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_rule_service.py index 78be11929b55..308f84093925 100644 --- a/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_rule_service.py +++ b/packages/google-cloud-chronicle/tests/unit/gapic/chronicle_v1/test_rule_service.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,18 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.chronicle_v1.services.rule_service import ( RuleServiceAsyncClient, @@ -937,10 +937,9 @@ def test_rule_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_rule_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_rule_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1256,13 +1253,13 @@ def test_rule_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3310,9 +3307,9 @@ def test_list_rule_revisions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_rule_revisions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_rule_revisions] = ( + mock_rpc + ) request = {} client.list_rule_revisions(request) @@ -3844,9 +3841,9 @@ def test_create_retrohunt_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_retrohunt - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_retrohunt] = ( + mock_rpc + ) request = {} client.create_retrohunt(request) @@ -5054,9 +5051,9 @@ def test_get_rule_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_rule_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_rule_deployment] = ( + mock_rpc + ) request = {} client.get_rule_deployment(request) @@ -5410,9 +5407,9 @@ def test_list_rule_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_rule_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_rule_deployments] = ( + mock_rpc + ) request = {} client.list_rule_deployments(request) @@ -5964,9 +5961,9 @@ def test_update_rule_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_rule_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_rule_deployment] = ( + mock_rpc + ) request = {} client.update_rule_deployment(request) @@ -7241,9 +7238,9 @@ def test_list_rule_revisions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_rule_revisions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_rule_revisions] = ( + mock_rpc + ) request = {} client.list_rule_revisions(request) @@ -7503,9 +7500,9 @@ def test_create_retrohunt_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_retrohunt - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_retrohunt] = ( + mock_rpc + ) request = {} client.create_retrohunt(request) @@ -8133,9 +8130,9 @@ def test_get_rule_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_rule_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_rule_deployment] = ( + mock_rpc + ) request = {} client.get_rule_deployment(request) @@ -8318,9 +8315,9 @@ def test_list_rule_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_rule_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_rule_deployments] = ( + mock_rpc + ) request = {} client.list_rule_deployments(request) @@ -8583,9 +8580,9 @@ def test_update_rule_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_rule_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_rule_deployment] = ( + mock_rpc + ) request = {} client.update_rule_deployment(request) @@ -9525,8 +9522,9 @@ def test_create_rule_rest_bad_request(request_type=gcc_rule.CreateRuleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9710,17 +9708,19 @@ def test_create_rule_rest_interceptors(null_interceptor): ) client = RuleServiceClient(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.RuleServiceRestInterceptor, "post_create_rule" - ) as post, mock.patch.object( - transports.RuleServiceRestInterceptor, "post_create_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleServiceRestInterceptor, "pre_create_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_create_rule" + ) as post, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_create_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RuleServiceRestInterceptor, "pre_create_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9771,8 +9771,9 @@ def test_get_rule_rest_bad_request(request_type=rule.GetRuleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9859,17 +9860,17 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = RuleServiceClient(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.RuleServiceRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.RuleServiceRestInterceptor, "post_get_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleServiceRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_get_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RuleServiceRestInterceptor, "pre_get_rule") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9918,8 +9919,9 @@ def test_list_rules_rest_bad_request(request_type=rule.ListRulesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9982,17 +9984,19 @@ def test_list_rules_rest_interceptors(null_interceptor): ) client = RuleServiceClient(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.RuleServiceRestInterceptor, "post_list_rules" - ) as post, mock.patch.object( - transports.RuleServiceRestInterceptor, "post_list_rules_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleServiceRestInterceptor, "pre_list_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_list_rules" + ) as post, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_list_rules_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RuleServiceRestInterceptor, "pre_list_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10045,8 +10049,9 @@ def test_update_rule_rest_bad_request(request_type=gcc_rule.UpdateRuleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10234,17 +10239,19 @@ def test_update_rule_rest_interceptors(null_interceptor): ) client = RuleServiceClient(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.RuleServiceRestInterceptor, "post_update_rule" - ) as post, mock.patch.object( - transports.RuleServiceRestInterceptor, "post_update_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleServiceRestInterceptor, "pre_update_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_update_rule" + ) as post, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_update_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RuleServiceRestInterceptor, "pre_update_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10295,8 +10302,9 @@ def test_delete_rule_rest_bad_request(request_type=rule.DeleteRuleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10355,13 +10363,13 @@ def test_delete_rule_rest_interceptors(null_interceptor): ) client = RuleServiceClient(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.RuleServiceRestInterceptor, "pre_delete_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleServiceRestInterceptor, "pre_delete_rule" + ) as pre, + ): pre.assert_not_called() pb_message = rule.DeleteRuleRequest.pb(rule.DeleteRuleRequest()) transcode.return_value = { @@ -10406,8 +10414,9 @@ def test_list_rule_revisions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10472,17 +10481,20 @@ def test_list_rule_revisions_rest_interceptors(null_interceptor): ) client = RuleServiceClient(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.RuleServiceRestInterceptor, "post_list_rule_revisions" - ) as post, mock.patch.object( - transports.RuleServiceRestInterceptor, "post_list_rule_revisions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleServiceRestInterceptor, "pre_list_rule_revisions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_list_rule_revisions" + ) as post, + mock.patch.object( + transports.RuleServiceRestInterceptor, + "post_list_rule_revisions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RuleServiceRestInterceptor, "pre_list_rule_revisions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10535,8 +10547,9 @@ def test_create_retrohunt_rest_bad_request(request_type=rule.CreateRetrohuntRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10672,19 +10685,20 @@ def test_create_retrohunt_rest_interceptors(null_interceptor): ) client = RuleServiceClient(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.RuleServiceRestInterceptor, "post_create_retrohunt" - ) as post, mock.patch.object( - transports.RuleServiceRestInterceptor, "post_create_retrohunt_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleServiceRestInterceptor, "pre_create_retrohunt" - ) as pre: + 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.RuleServiceRestInterceptor, "post_create_retrohunt" + ) as post, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_create_retrohunt_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RuleServiceRestInterceptor, "pre_create_retrohunt" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10735,8 +10749,9 @@ def test_get_retrohunt_rest_bad_request(request_type=rule.GetRetrohuntRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10805,17 +10820,19 @@ def test_get_retrohunt_rest_interceptors(null_interceptor): ) client = RuleServiceClient(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.RuleServiceRestInterceptor, "post_get_retrohunt" - ) as post, mock.patch.object( - transports.RuleServiceRestInterceptor, "post_get_retrohunt_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleServiceRestInterceptor, "pre_get_retrohunt" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_get_retrohunt" + ) as post, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_get_retrohunt_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RuleServiceRestInterceptor, "pre_get_retrohunt" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10866,8 +10883,9 @@ def test_list_retrohunts_rest_bad_request(request_type=rule.ListRetrohuntsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10932,17 +10950,19 @@ def test_list_retrohunts_rest_interceptors(null_interceptor): ) client = RuleServiceClient(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.RuleServiceRestInterceptor, "post_list_retrohunts" - ) as post, mock.patch.object( - transports.RuleServiceRestInterceptor, "post_list_retrohunts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleServiceRestInterceptor, "pre_list_retrohunts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_list_retrohunts" + ) as post, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_list_retrohunts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RuleServiceRestInterceptor, "pre_list_retrohunts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10997,8 +11017,9 @@ def test_get_rule_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11077,17 +11098,20 @@ def test_get_rule_deployment_rest_interceptors(null_interceptor): ) client = RuleServiceClient(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.RuleServiceRestInterceptor, "post_get_rule_deployment" - ) as post, mock.patch.object( - transports.RuleServiceRestInterceptor, "post_get_rule_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleServiceRestInterceptor, "pre_get_rule_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_get_rule_deployment" + ) as post, + mock.patch.object( + transports.RuleServiceRestInterceptor, + "post_get_rule_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RuleServiceRestInterceptor, "pre_get_rule_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11140,8 +11164,9 @@ def test_list_rule_deployments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11206,18 +11231,20 @@ def test_list_rule_deployments_rest_interceptors(null_interceptor): ) client = RuleServiceClient(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.RuleServiceRestInterceptor, "post_list_rule_deployments" - ) as post, mock.patch.object( - transports.RuleServiceRestInterceptor, - "post_list_rule_deployments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RuleServiceRestInterceptor, "pre_list_rule_deployments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_list_rule_deployments" + ) as post, + mock.patch.object( + transports.RuleServiceRestInterceptor, + "post_list_rule_deployments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RuleServiceRestInterceptor, "pre_list_rule_deployments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11276,8 +11303,9 @@ def test_update_rule_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11437,18 +11465,20 @@ def test_update_rule_deployment_rest_interceptors(null_interceptor): ) client = RuleServiceClient(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.RuleServiceRestInterceptor, "post_update_rule_deployment" - ) as post, mock.patch.object( - transports.RuleServiceRestInterceptor, - "post_update_rule_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RuleServiceRestInterceptor, "pre_update_rule_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleServiceRestInterceptor, "post_update_rule_deployment" + ) as post, + mock.patch.object( + transports.RuleServiceRestInterceptor, + "post_update_rule_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RuleServiceRestInterceptor, "pre_update_rule_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11506,8 +11536,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11573,8 +11604,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11640,8 +11672,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11704,8 +11737,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12098,11 +12132,14 @@ def test_rule_service_base_transport(): def test_rule_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.chronicle_v1.services.rule_service.transports.RuleServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.chronicle_v1.services.rule_service.transports.RuleServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RuleServiceTransport( @@ -12119,9 +12156,12 @@ def test_rule_service_base_transport_with_credentials_file(): def test_rule_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.chronicle_v1.services.rule_service.transports.RuleServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.chronicle_v1.services.rule_service.transports.RuleServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RuleServiceTransport() @@ -12193,11 +12233,12 @@ def test_rule_service_transport_auth_gdch_credentials(transport_class): def test_rule_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-cloudcontrolspartner/docs/conf.py b/packages/google-cloud-cloudcontrolspartner/docs/conf.py index 7058653e7644..e9c681888a72 100644 --- a/packages/google-cloud-cloudcontrolspartner/docs/conf.py +++ b/packages/google-cloud-cloudcontrolspartner/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-cloudcontrolspartner documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/__init__.py index eb8e14b670ab..3208f1618be8 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_controls_partner_core import ( CloudControlsPartnerCoreAsyncClient, CloudControlsPartnerCoreClient, diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/async_client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/async_client.py index e37bf4e622d0..fc1496c999d8 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/async_client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1 import gapic_version as package_version @@ -45,8 +45,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_core import ( pagers, @@ -158,7 +158,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudControlsPartnerCoreAsyncClient: The constructed client. """ - return CloudControlsPartnerCoreClient.from_service_account_info.__func__(CloudControlsPartnerCoreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudControlsPartnerCoreClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudControlsPartnerCoreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -174,7 +175,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudControlsPartnerCoreAsyncClient: The constructed client. """ - return CloudControlsPartnerCoreClient.from_service_account_file.__func__(CloudControlsPartnerCoreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudControlsPartnerCoreClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + CloudControlsPartnerCoreAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -212,7 +216,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudControlsPartnerCoreClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudControlsPartnerCoreClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudControlsPartnerCoreTransport: diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/client.py index 4dab7cb4cb44..2c1af5775759 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_core import ( pagers, @@ -90,9 +90,7 @@ class CloudControlsPartnerCoreClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] _transport_registry["grpc"] = CloudControlsPartnerCoreGrpcTransport _transport_registry["grpc_asyncio"] = CloudControlsPartnerCoreGrpcAsyncIOTransport _transport_registry["rest"] = CloudControlsPartnerCoreRestTransport @@ -756,11 +754,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudControlsPartnerCoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudControlsPartnerCoreClient._read_environment_variables() + ) self._client_cert_source = ( CloudControlsPartnerCoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -797,8 +793,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudControlsPartnerCoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/pagers.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/pagers.py index 251cae2b4a67..107607ad627c 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/pagers.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -385,7 +385,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -467,7 +467,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/__init__.py index 7e12015112d7..ef4b94fbb7f7 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] _transport_registry["grpc"] = CloudControlsPartnerCoreGrpcTransport _transport_registry["grpc_asyncio"] = CloudControlsPartnerCoreGrpcAsyncIOTransport _transport_registry["rest"] = CloudControlsPartnerCoreRestTransport diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/base.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/base.py index 28ff0f09d075..28b243ecc164 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/base.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1 import gapic_version as package_version from google.cloud.cloudcontrolspartner_v1.types import ( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc.py index d106664bc8a1..ea5bc98c2bbe 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.cloudcontrolspartner_v1.types import ( access_approval_requests, @@ -517,12 +517,12 @@ def list_access_approval_requests( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_access_approval_requests" not in self._stubs: - self._stubs[ - "list_access_approval_requests" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudcontrolspartner.v1.CloudControlsPartnerCore/ListAccessApprovalRequests", - request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, - response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + self._stubs["list_access_approval_requests"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudcontrolspartner.v1.CloudControlsPartnerCore/ListAccessApprovalRequests", + request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, + response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + ) ) return self._stubs["list_access_approval_requests"] diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc_asyncio.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc_asyncio.py index 65f3f877cd0e..936173fa0180 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudcontrolspartner_v1.types import ( access_approval_requests, @@ -530,12 +530,12 @@ def list_access_approval_requests( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_access_approval_requests" not in self._stubs: - self._stubs[ - "list_access_approval_requests" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudcontrolspartner.v1.CloudControlsPartnerCore/ListAccessApprovalRequests", - request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, - response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + self._stubs["list_access_approval_requests"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudcontrolspartner.v1.CloudControlsPartnerCore/ListAccessApprovalRequests", + request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, + response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + ) ) return self._stubs["list_access_approval_requests"] diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest.py index f5eb5e4a6251..38fb53b700b6 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -809,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseCreateCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseCreateCustomer._get_http_options() request, metadata = self._interceptor.pre_create_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseCreateCustomer._get_transcoded_request( @@ -957,9 +955,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseDeleteCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseDeleteCustomer._get_http_options() request, metadata = self._interceptor.pre_delete_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseDeleteCustomer._get_transcoded_request( @@ -979,7 +975,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1072,9 +1068,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetCustomer._get_http_options() request, metadata = self._interceptor.pre_get_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseGetCustomer._get_transcoded_request( @@ -1220,9 +1214,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetEkmConnections._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetEkmConnections._get_http_options() request, metadata = self._interceptor.pre_get_ekm_connections( request, metadata @@ -1369,9 +1361,7 @@ def __call__( Message describing Partner resource """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartner._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartner._get_http_options() request, metadata = self._interceptor.pre_get_partner(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartner._get_transcoded_request( @@ -1517,9 +1507,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartnerPermissions._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartnerPermissions._get_http_options() request, metadata = self._interceptor.pre_get_partner_permissions( request, metadata @@ -1670,9 +1658,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetWorkload._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetWorkload._get_http_options() request, metadata = self._interceptor.pre_get_workload(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseGetWorkload._get_transcoded_request( @@ -1821,9 +1807,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseListAccessApprovalRequests._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseListAccessApprovalRequests._get_http_options() request, metadata = self._interceptor.pre_list_access_approval_requests( request, metadata @@ -1889,11 +1873,10 @@ def __call__( resp = self._interceptor.post_list_access_approval_requests(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_access_approval_requests_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_access_approval_requests_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1977,9 +1960,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseListCustomers._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseListCustomers._get_http_options() request, metadata = self._interceptor.pre_list_customers(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseListCustomers._get_transcoded_request( @@ -2126,9 +2107,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseListWorkloads._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseListWorkloads._get_http_options() request, metadata = self._interceptor.pre_list_workloads(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseListWorkloads._get_transcoded_request( @@ -2278,9 +2257,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseUpdateCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseUpdateCustomer._get_http_options() request, metadata = self._interceptor.pre_update_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseUpdateCustomer._get_transcoded_request( @@ -2443,7 +2420,9 @@ def list_access_approval_requests( ]: # 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._ListAccessApprovalRequests(self._session, self._host, self._interceptor) # type: ignore + return self._ListAccessApprovalRequests( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_customers( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest_base.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest_base.py index a1fd307f9120..404953da76c9 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest_base.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_core/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.cloudcontrolspartner_v1.types import ( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/async_client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/async_client.py index ffb9a12da4da..8baf056d1f03 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/async_client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1 import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_monitoring import ( pagers, @@ -130,7 +130,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudControlsPartnerMonitoringAsyncClient: The constructed client. """ - return CloudControlsPartnerMonitoringClient.from_service_account_info.__func__(CloudControlsPartnerMonitoringAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudControlsPartnerMonitoringClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + CloudControlsPartnerMonitoringAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +151,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudControlsPartnerMonitoringAsyncClient: The constructed client. """ - return CloudControlsPartnerMonitoringClient.from_service_account_file.__func__(CloudControlsPartnerMonitoringAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudControlsPartnerMonitoringClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + CloudControlsPartnerMonitoringAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -184,7 +194,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudControlsPartnerMonitoringClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudControlsPartnerMonitoringClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudControlsPartnerMonitoringTransport: diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/client.py index 279a28719cd5..464e67d53ec6 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_monitoring import ( pagers, @@ -85,13 +85,11 @@ class CloudControlsPartnerMonitoringClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] _transport_registry["grpc"] = CloudControlsPartnerMonitoringGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = CloudControlsPartnerMonitoringGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + CloudControlsPartnerMonitoringGrpcAsyncIOTransport + ) _transport_registry["rest"] = CloudControlsPartnerMonitoringRestTransport def get_transport_class( @@ -645,11 +643,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudControlsPartnerMonitoringClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudControlsPartnerMonitoringClient._read_environment_variables() + ) self._client_cert_source = ( CloudControlsPartnerMonitoringClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -690,8 +686,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudControlsPartnerMonitoringTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/pagers.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/pagers.py index b38d5b9651ca..6eb22bbb71e3 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/pagers.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/__init__.py index 0e065d4f866c..55f3aa972f1d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] _transport_registry["grpc"] = CloudControlsPartnerMonitoringGrpcTransport _transport_registry["grpc_asyncio"] = CloudControlsPartnerMonitoringGrpcAsyncIOTransport _transport_registry["rest"] = CloudControlsPartnerMonitoringRestTransport diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/base.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/base.py index 12f6676d5fd9..d132da0a21cc 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/base.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1 import gapic_version as package_version from google.cloud.cloudcontrolspartner_v1.types import violations diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc.py index 50b4fbb60742..b3c2aa0643f5 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.cloudcontrolspartner_v1.types import violations diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py index 7f24d654b836..4ae8471f554e 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudcontrolspartner_v1.types import violations diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/rest.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/rest.py index fe30f345d92b..80beea881acb 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/rest.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/services/cloud_controls_partner_monitoring/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -337,9 +337,7 @@ def __call__( Details of resource Violation """ - http_options = ( - _BaseCloudControlsPartnerMonitoringRestTransport._BaseGetViolation._get_http_options() - ) + http_options = _BaseCloudControlsPartnerMonitoringRestTransport._BaseGetViolation._get_http_options() request, metadata = self._interceptor.pre_get_violation(request, metadata) transcoded_request = _BaseCloudControlsPartnerMonitoringRestTransport._BaseGetViolation._get_transcoded_request( @@ -487,9 +485,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerMonitoringRestTransport._BaseListViolations._get_http_options() - ) + http_options = _BaseCloudControlsPartnerMonitoringRestTransport._BaseListViolations._get_http_options() request, metadata = self._interceptor.pre_list_violations(request, metadata) transcoded_request = _BaseCloudControlsPartnerMonitoringRestTransport._BaseListViolations._get_transcoded_request( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/__init__.py index 628600477002..4ddab3b759da 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/__init__.py @@ -19,8 +19,12 @@ ListAccessApprovalRequestsRequest, ListAccessApprovalRequestsResponse, ) -from .completion_state import CompletionState -from .core import OperationMetadata +from .completion_state import ( + CompletionState, +) +from .core import ( + OperationMetadata, +) from .customer_workloads import ( GetWorkloadRequest, ListWorkloadsRequest, @@ -40,9 +44,21 @@ ListCustomersResponse, UpdateCustomerRequest, ) -from .ekm_connections import EkmConnection, EkmConnections, GetEkmConnectionsRequest -from .partner_permissions import GetPartnerPermissionsRequest, PartnerPermissions -from .partners import EkmMetadata, GetPartnerRequest, Partner, Sku +from .ekm_connections import ( + EkmConnection, + EkmConnections, + GetEkmConnectionsRequest, +) +from .partner_permissions import ( + GetPartnerPermissionsRequest, + PartnerPermissions, +) +from .partners import ( + EkmMetadata, + GetPartnerRequest, + Partner, + Sku, +) from .violations import ( GetViolationRequest, ListViolationsRequest, diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/access_approval_requests.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/access_approval_requests.py index 1b062ac1c1e2..608a840b97f2 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/access_approval_requests.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/access_approval_requests.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -134,12 +134,12 @@ class ListAccessApprovalRequestsResponse(proto.Message): def raw_page(self): return self - access_approval_requests: MutableSequence[ - "AccessApprovalRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AccessApprovalRequest", + access_approval_requests: MutableSequence["AccessApprovalRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AccessApprovalRequest", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -206,6 +206,7 @@ class Type(proto.Enum): outage, or for security, fraud, abuse, or compliance review purposes. """ + TYPE_UNSPECIFIED = 0 CUSTOMER_INITIATED_SUPPORT = 1 GOOGLE_INITIATED_SERVICE = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/completion_state.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/completion_state.py index 9a21336fd3ff..20838bd88481 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/completion_state.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/completion_state.py @@ -43,6 +43,7 @@ class CompletionState(proto.Enum): NOT_APPLICABLE (4): Not applicable state. """ + COMPLETION_STATE_UNSPECIFIED = 0 PENDING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/core.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/core.py index 41ca78409c15..6cae35e92797 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/core.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/core.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customer_workloads.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customer_workloads.py index c436b857dd06..a326298a4a4d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customer_workloads.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customer_workloads.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.cloudcontrolspartner_v1.types import ( @@ -90,6 +90,7 @@ class Partner(proto.Enum): Arabia) partner offering without EKM provisioning. """ + PARTNER_UNSPECIFIED = 0 PARTNER_LOCAL_CONTROLS_BY_S3NS = 1 PARTNER_SOVEREIGN_CONTROLS_BY_T_SYSTEMS = 2 @@ -271,6 +272,7 @@ class Step(proto.Enum): SIGNED_ACCESS_APPROVAL_CONFIGURED (2): Signed Access Approval step. """ + STEP_UNSPECIFIED = 0 EKM_PROVISIONED = 1 SIGNED_ACCESS_APPROVAL_CONFIGURED = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customers.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customers.py index 9a24e0b39564..947efcdfc0aa 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customers.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/customers.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.cloudcontrolspartner_v1.types import ( @@ -248,6 +248,7 @@ class Step(proto.Enum): CUSTOMER_ENVIRONMENT (2): Customer Environment """ + STEP_UNSPECIFIED = 0 KAJ_ENROLLMENT = 1 CUSTOMER_ENVIRONMENT = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/ekm_connections.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/ekm_connections.py index d5805d7702ce..d03a4e862c9b 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/ekm_connections.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/ekm_connections.py @@ -96,6 +96,7 @@ class ConnectionState(proto.Enum): PERMISSION_DENIED (4): Permission denied EKM connection state """ + CONNECTION_STATE_UNSPECIFIED = 0 AVAILABLE = 1 NOT_AVAILABLE = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partner_permissions.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partner_permissions.py index cc24dc640f87..ccfeb95e10b8 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partner_permissions.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partner_permissions.py @@ -61,6 +61,7 @@ class Permission(proto.Enum): Permission for support case details for Access Transparency log entries """ + PERMISSION_UNSPECIFIED = 0 ACCESS_TRANSPARENCY_AND_EMERGENCY_ACCESS_LOGS = 1 ASSURED_WORKLOADS_MONITORING = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partners.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partners.py index bde986d6cd5c..a1f261920da6 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partners.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/partners.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -168,6 +168,7 @@ class EkmSolution(proto.Enum): VIRTRU (4): This enum value is never used. """ + EKM_SOLUTION_UNSPECIFIED = 0 FORTANIX = 1 FUTUREX = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/violations.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/violations.py index bcffe15957a3..feada4ca5d34 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/violations.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1/types/violations.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -85,6 +85,7 @@ class State(proto.Enum): EXCEPTION (3): Violation is Exception """ + STATE_UNSPECIFIED = 0 RESOLVED = 1 UNRESOLVED = 2 @@ -132,6 +133,7 @@ class RemediationType(proto.Enum): REMEDIATION_RESOURCE_VIOLATION (5): Remediation type for resource violation. """ + REMEDIATION_TYPE_UNSPECIFIED = 0 REMEDIATION_BOOLEAN_ORG_POLICY_VIOLATION = 1 REMEDIATION_LIST_ALLOWED_VALUES_ORG_POLICY_VIOLATION = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/__init__.py index 8c462d7059c0..f067f9a662fb 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_controls_partner_core import ( CloudControlsPartnerCoreAsyncClient, CloudControlsPartnerCoreClient, diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/async_client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/async_client.py index 138a0e83ec59..956b4ad4e935 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/async_client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1beta import gapic_version as package_version @@ -45,8 +45,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_core import ( pagers, @@ -158,7 +158,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudControlsPartnerCoreAsyncClient: The constructed client. """ - return CloudControlsPartnerCoreClient.from_service_account_info.__func__(CloudControlsPartnerCoreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudControlsPartnerCoreClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudControlsPartnerCoreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -174,7 +175,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudControlsPartnerCoreAsyncClient: The constructed client. """ - return CloudControlsPartnerCoreClient.from_service_account_file.__func__(CloudControlsPartnerCoreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudControlsPartnerCoreClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + CloudControlsPartnerCoreAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -212,7 +216,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudControlsPartnerCoreClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudControlsPartnerCoreClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudControlsPartnerCoreTransport: diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/client.py index 84635501cd41..99df982544ab 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1beta import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_core import ( pagers, @@ -90,9 +90,7 @@ class CloudControlsPartnerCoreClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] _transport_registry["grpc"] = CloudControlsPartnerCoreGrpcTransport _transport_registry["grpc_asyncio"] = CloudControlsPartnerCoreGrpcAsyncIOTransport _transport_registry["rest"] = CloudControlsPartnerCoreRestTransport @@ -756,11 +754,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudControlsPartnerCoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudControlsPartnerCoreClient._read_environment_variables() + ) self._client_cert_source = ( CloudControlsPartnerCoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -797,8 +793,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudControlsPartnerCoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/pagers.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/pagers.py index 4e8c89bebbc7..12fad950ab4d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/pagers.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -385,7 +385,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -467,7 +467,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/__init__.py index 7e12015112d7..ef4b94fbb7f7 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerCoreTransport]] _transport_registry["grpc"] = CloudControlsPartnerCoreGrpcTransport _transport_registry["grpc_asyncio"] = CloudControlsPartnerCoreGrpcAsyncIOTransport _transport_registry["rest"] = CloudControlsPartnerCoreRestTransport diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/base.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/base.py index 8a01a95296c7..aaee1524e8a4 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/base.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1beta import gapic_version as package_version from google.cloud.cloudcontrolspartner_v1beta.types import ( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc.py index 2a0980545853..ec73460e8b8c 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.cloudcontrolspartner_v1beta.types import ( access_approval_requests, @@ -517,12 +517,12 @@ def list_access_approval_requests( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_access_approval_requests" not in self._stubs: - self._stubs[ - "list_access_approval_requests" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudcontrolspartner.v1beta.CloudControlsPartnerCore/ListAccessApprovalRequests", - request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, - response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + self._stubs["list_access_approval_requests"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudcontrolspartner.v1beta.CloudControlsPartnerCore/ListAccessApprovalRequests", + request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, + response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + ) ) return self._stubs["list_access_approval_requests"] diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc_asyncio.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc_asyncio.py index 8e5cf02dc8c0..46428aeb36a6 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudcontrolspartner_v1beta.types import ( access_approval_requests, @@ -530,12 +530,12 @@ def list_access_approval_requests( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_access_approval_requests" not in self._stubs: - self._stubs[ - "list_access_approval_requests" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudcontrolspartner.v1beta.CloudControlsPartnerCore/ListAccessApprovalRequests", - request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, - response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + self._stubs["list_access_approval_requests"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudcontrolspartner.v1beta.CloudControlsPartnerCore/ListAccessApprovalRequests", + request_serializer=access_approval_requests.ListAccessApprovalRequestsRequest.serialize, + response_deserializer=access_approval_requests.ListAccessApprovalRequestsResponse.deserialize, + ) ) return self._stubs["list_access_approval_requests"] diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest.py index a84b28900522..7631542f2a9d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -809,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseCreateCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseCreateCustomer._get_http_options() request, metadata = self._interceptor.pre_create_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseCreateCustomer._get_transcoded_request( @@ -957,9 +955,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseDeleteCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseDeleteCustomer._get_http_options() request, metadata = self._interceptor.pre_delete_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseDeleteCustomer._get_transcoded_request( @@ -979,7 +975,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1072,9 +1068,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetCustomer._get_http_options() request, metadata = self._interceptor.pre_get_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseGetCustomer._get_transcoded_request( @@ -1220,9 +1214,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetEkmConnections._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetEkmConnections._get_http_options() request, metadata = self._interceptor.pre_get_ekm_connections( request, metadata @@ -1369,9 +1361,7 @@ def __call__( Message describing Partner resource """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartner._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartner._get_http_options() request, metadata = self._interceptor.pre_get_partner(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartner._get_transcoded_request( @@ -1517,9 +1507,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartnerPermissions._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetPartnerPermissions._get_http_options() request, metadata = self._interceptor.pre_get_partner_permissions( request, metadata @@ -1670,9 +1658,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseGetWorkload._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseGetWorkload._get_http_options() request, metadata = self._interceptor.pre_get_workload(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseGetWorkload._get_transcoded_request( @@ -1821,9 +1807,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseListAccessApprovalRequests._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseListAccessApprovalRequests._get_http_options() request, metadata = self._interceptor.pre_list_access_approval_requests( request, metadata @@ -1889,11 +1873,10 @@ def __call__( resp = self._interceptor.post_list_access_approval_requests(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_access_approval_requests_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_access_approval_requests_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1977,9 +1960,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseListCustomers._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseListCustomers._get_http_options() request, metadata = self._interceptor.pre_list_customers(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseListCustomers._get_transcoded_request( @@ -2126,9 +2107,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseListWorkloads._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseListWorkloads._get_http_options() request, metadata = self._interceptor.pre_list_workloads(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseListWorkloads._get_transcoded_request( @@ -2278,9 +2257,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerCoreRestTransport._BaseUpdateCustomer._get_http_options() - ) + http_options = _BaseCloudControlsPartnerCoreRestTransport._BaseUpdateCustomer._get_http_options() request, metadata = self._interceptor.pre_update_customer(request, metadata) transcoded_request = _BaseCloudControlsPartnerCoreRestTransport._BaseUpdateCustomer._get_transcoded_request( @@ -2443,7 +2420,9 @@ def list_access_approval_requests( ]: # 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._ListAccessApprovalRequests(self._session, self._host, self._interceptor) # type: ignore + return self._ListAccessApprovalRequests( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_customers( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest_base.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest_base.py index 93385db4da36..d550d525d5bd 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest_base.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_core/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.cloudcontrolspartner_v1beta.types import ( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/async_client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/async_client.py index 5ff196c0fb99..983c8ca09a30 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/async_client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1beta import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_monitoring import ( pagers, @@ -130,7 +130,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudControlsPartnerMonitoringAsyncClient: The constructed client. """ - return CloudControlsPartnerMonitoringClient.from_service_account_info.__func__(CloudControlsPartnerMonitoringAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CloudControlsPartnerMonitoringClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + CloudControlsPartnerMonitoringAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +151,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudControlsPartnerMonitoringAsyncClient: The constructed client. """ - return CloudControlsPartnerMonitoringClient.from_service_account_file.__func__(CloudControlsPartnerMonitoringAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CloudControlsPartnerMonitoringClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + CloudControlsPartnerMonitoringAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -184,7 +194,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudControlsPartnerMonitoringClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudControlsPartnerMonitoringClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudControlsPartnerMonitoringTransport: diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/client.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/client.py index 47739b4a926e..16b12d6e5745 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/client.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1beta import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_monitoring import ( pagers, @@ -85,13 +85,11 @@ class CloudControlsPartnerMonitoringClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] _transport_registry["grpc"] = CloudControlsPartnerMonitoringGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = CloudControlsPartnerMonitoringGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + CloudControlsPartnerMonitoringGrpcAsyncIOTransport + ) _transport_registry["rest"] = CloudControlsPartnerMonitoringRestTransport def get_transport_class( @@ -645,11 +643,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudControlsPartnerMonitoringClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudControlsPartnerMonitoringClient._read_environment_variables() + ) self._client_cert_source = ( CloudControlsPartnerMonitoringClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -690,8 +686,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudControlsPartnerMonitoringTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/pagers.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/pagers.py index 2fd3289be70f..e0fcfd09968d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/pagers.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/__init__.py index 0e065d4f866c..55f3aa972f1d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudControlsPartnerMonitoringTransport]] _transport_registry["grpc"] = CloudControlsPartnerMonitoringGrpcTransport _transport_registry["grpc_asyncio"] = CloudControlsPartnerMonitoringGrpcAsyncIOTransport _transport_registry["rest"] = CloudControlsPartnerMonitoringRestTransport diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/base.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/base.py index 6dc57586c1ce..43c836078926 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/base.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudcontrolspartner_v1beta import gapic_version as package_version from google.cloud.cloudcontrolspartner_v1beta.types import violations diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc.py index fba5924341e1..76b17116f731 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.cloudcontrolspartner_v1beta.types import violations diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py index de6b0dceb645..4d382f41e2c2 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudcontrolspartner_v1beta.types import violations diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/rest.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/rest.py index 3c63f099f0d9..1da4a7e933c6 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/rest.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/services/cloud_controls_partner_monitoring/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -337,9 +337,7 @@ def __call__( Details of resource Violation """ - http_options = ( - _BaseCloudControlsPartnerMonitoringRestTransport._BaseGetViolation._get_http_options() - ) + http_options = _BaseCloudControlsPartnerMonitoringRestTransport._BaseGetViolation._get_http_options() request, metadata = self._interceptor.pre_get_violation(request, metadata) transcoded_request = _BaseCloudControlsPartnerMonitoringRestTransport._BaseGetViolation._get_transcoded_request( @@ -487,9 +485,7 @@ def __call__( """ - http_options = ( - _BaseCloudControlsPartnerMonitoringRestTransport._BaseListViolations._get_http_options() - ) + http_options = _BaseCloudControlsPartnerMonitoringRestTransport._BaseListViolations._get_http_options() request, metadata = self._interceptor.pre_list_violations(request, metadata) transcoded_request = _BaseCloudControlsPartnerMonitoringRestTransport._BaseListViolations._get_transcoded_request( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/__init__.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/__init__.py index 628600477002..4ddab3b759da 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/__init__.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/__init__.py @@ -19,8 +19,12 @@ ListAccessApprovalRequestsRequest, ListAccessApprovalRequestsResponse, ) -from .completion_state import CompletionState -from .core import OperationMetadata +from .completion_state import ( + CompletionState, +) +from .core import ( + OperationMetadata, +) from .customer_workloads import ( GetWorkloadRequest, ListWorkloadsRequest, @@ -40,9 +44,21 @@ ListCustomersResponse, UpdateCustomerRequest, ) -from .ekm_connections import EkmConnection, EkmConnections, GetEkmConnectionsRequest -from .partner_permissions import GetPartnerPermissionsRequest, PartnerPermissions -from .partners import EkmMetadata, GetPartnerRequest, Partner, Sku +from .ekm_connections import ( + EkmConnection, + EkmConnections, + GetEkmConnectionsRequest, +) +from .partner_permissions import ( + GetPartnerPermissionsRequest, + PartnerPermissions, +) +from .partners import ( + EkmMetadata, + GetPartnerRequest, + Partner, + Sku, +) from .violations import ( GetViolationRequest, ListViolationsRequest, diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/access_approval_requests.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/access_approval_requests.py index d9da73d5b02c..116db51e4e59 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/access_approval_requests.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/access_approval_requests.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -134,12 +134,12 @@ class ListAccessApprovalRequestsResponse(proto.Message): def raw_page(self): return self - access_approval_requests: MutableSequence[ - "AccessApprovalRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AccessApprovalRequest", + access_approval_requests: MutableSequence["AccessApprovalRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AccessApprovalRequest", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -206,6 +206,7 @@ class Type(proto.Enum): outage, or for security, fraud, abuse, or compliance review purposes. """ + TYPE_UNSPECIFIED = 0 CUSTOMER_INITIATED_SUPPORT = 1 GOOGLE_INITIATED_SERVICE = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/completion_state.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/completion_state.py index d45697509278..a48778b6b32f 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/completion_state.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/completion_state.py @@ -43,6 +43,7 @@ class CompletionState(proto.Enum): NOT_APPLICABLE (4): Not applicable state. """ + COMPLETION_STATE_UNSPECIFIED = 0 PENDING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/core.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/core.py index 76ed26d9fa74..4e9b6ed7c9bb 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/core.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/core.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customer_workloads.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customer_workloads.py index ff8c92f8b4c8..7d42f7900ad4 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customer_workloads.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customer_workloads.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.cloudcontrolspartner_v1beta.types import ( @@ -90,6 +90,7 @@ class Partner(proto.Enum): Arabia) partner offering without EKM provisioning. """ + PARTNER_UNSPECIFIED = 0 PARTNER_LOCAL_CONTROLS_BY_S3NS = 1 PARTNER_SOVEREIGN_CONTROLS_BY_T_SYSTEMS = 2 @@ -271,6 +272,7 @@ class Step(proto.Enum): SIGNED_ACCESS_APPROVAL_CONFIGURED (2): Signed Access Approval step. """ + STEP_UNSPECIFIED = 0 EKM_PROVISIONED = 1 SIGNED_ACCESS_APPROVAL_CONFIGURED = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customers.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customers.py index 2632e3d259ec..07f4f4b40361 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customers.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/customers.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.cloudcontrolspartner_v1beta.types import ( @@ -248,6 +248,7 @@ class Step(proto.Enum): CUSTOMER_ENVIRONMENT (2): Customer Environment """ + STEP_UNSPECIFIED = 0 KAJ_ENROLLMENT = 1 CUSTOMER_ENVIRONMENT = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/ekm_connections.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/ekm_connections.py index 4cf1b535ddcc..5869e8a12ae5 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/ekm_connections.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/ekm_connections.py @@ -96,6 +96,7 @@ class ConnectionState(proto.Enum): PERMISSION_DENIED (4): Permission denied EKM connection state """ + CONNECTION_STATE_UNSPECIFIED = 0 AVAILABLE = 1 NOT_AVAILABLE = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partner_permissions.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partner_permissions.py index 477071d9ed3a..7ad488802a5d 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partner_permissions.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partner_permissions.py @@ -61,6 +61,7 @@ class Permission(proto.Enum): Permission for support case details for Access Transparency log entries """ + PERMISSION_UNSPECIFIED = 0 ACCESS_TRANSPARENCY_AND_EMERGENCY_ACCESS_LOGS = 1 ASSURED_WORKLOADS_MONITORING = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partners.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partners.py index a30430ac3a77..63f6684205ee 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partners.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/partners.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -168,6 +168,7 @@ class EkmSolution(proto.Enum): VIRTRU (4): This enum value is never used. """ + EKM_SOLUTION_UNSPECIFIED = 0 FORTANIX = 1 FUTUREX = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/violations.py b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/violations.py index 282759d3e2f9..d1a7eb7e1470 100644 --- a/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/violations.py +++ b/packages/google-cloud-cloudcontrolspartner/google/cloud/cloudcontrolspartner_v1beta/types/violations.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -85,6 +85,7 @@ class State(proto.Enum): EXCEPTION (3): Violation is Exception """ + STATE_UNSPECIFIED = 0 RESOLVED = 1 UNRESOLVED = 2 @@ -132,6 +133,7 @@ class RemediationType(proto.Enum): REMEDIATION_RESOURCE_VIOLATION (5): Remediation type for resource violation. """ + REMEDIATION_TYPE_UNSPECIFIED = 0 REMEDIATION_BOOLEAN_ORG_POLICY_VIOLATION = 1 REMEDIATION_LIST_ALLOWED_VALUES_ORG_POLICY_VIOLATION = 2 diff --git a/packages/google-cloud-cloudcontrolspartner/noxfile.py b/packages/google-cloud-cloudcontrolspartner/noxfile.py index ffa044a73222..7f2279138961 100644 --- a/packages/google-cloud-cloudcontrolspartner/noxfile.py +++ b/packages/google-cloud-cloudcontrolspartner/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_core.py b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_core.py index 161305d22db3..e2ab0538d986 100644 --- a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_core.py +++ b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_core.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_core import ( CloudControlsPartnerCoreAsyncClient, @@ -1013,10 +1018,9 @@ def test_cloud_controls_partner_core_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1065,9 @@ def test_cloud_controls_partner_core_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1103,9 @@ def test_cloud_controls_partner_core_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,13 +1362,13 @@ def test_cloud_controls_partner_core_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3218,9 +3220,9 @@ def test_get_ekm_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ekm_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ekm_connections] = ( + mock_rpc + ) request = {} client.get_ekm_connections(request) @@ -6624,9 +6626,9 @@ def test_get_ekm_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ekm_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ekm_connections] = ( + mock_rpc + ) request = {} client.get_ekm_connections(request) @@ -8691,8 +8693,9 @@ def test_get_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8772,18 +8775,20 @@ def test_get_workload_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_get_workload" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_get_workload_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_workload" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_get_workload" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_workload_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_workload" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8840,8 +8845,9 @@ def test_list_workloads_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8908,18 +8914,20 @@ def test_list_workloads_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_list_workloads" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_list_workloads_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_list_workloads" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_list_workloads" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_list_workloads_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_list_workloads" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8975,8 +8983,9 @@ def test_get_customer_rest_bad_request(request_type=customers.GetCustomerRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9045,18 +9054,20 @@ def test_get_customer_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_get_customer" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_get_customer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_customer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_get_customer" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_customer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_customer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9105,8 +9116,9 @@ def test_list_customers_rest_bad_request(request_type=customers.ListCustomersReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9171,18 +9183,20 @@ def test_list_customers_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_list_customers" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_list_customers_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_list_customers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_list_customers" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_list_customers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_list_customers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9237,8 +9251,9 @@ def test_get_ekm_connections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9303,18 +9318,22 @@ def test_get_ekm_connections_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_get_ekm_connections" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_get_ekm_connections_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_ekm_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_ekm_connections", + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_ekm_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "pre_get_ekm_connections", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9371,8 +9390,9 @@ def test_get_partner_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9443,20 +9463,22 @@ def test_get_partner_permissions_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, - "post_get_partner_permissions", - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_get_partner_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "pre_get_partner_permissions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_partner_permissions", + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_partner_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "pre_get_partner_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9516,8 +9538,9 @@ def test_list_access_approval_requests_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9586,20 +9609,22 @@ def test_list_access_approval_requests_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, - "post_list_access_approval_requests", - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_list_access_approval_requests_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "pre_list_access_approval_requests", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_list_access_approval_requests", + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_list_access_approval_requests_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "pre_list_access_approval_requests", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9659,8 +9684,9 @@ def test_get_partner_rest_bad_request(request_type=partners.GetPartnerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9727,18 +9753,20 @@ def test_get_partner_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_get_partner" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_get_partner_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_partner" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_get_partner" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_partner_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_partner" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9787,8 +9815,9 @@ def test_create_customer_rest_bad_request(request_type=customers.CreateCustomerR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9940,18 +9969,20 @@ def test_create_customer_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_create_customer" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_create_customer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_create_customer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_create_customer" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_create_customer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_create_customer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10006,8 +10037,9 @@ def test_update_customer_rest_bad_request(request_type=customers.UpdateCustomerR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10163,18 +10195,20 @@ def test_update_customer_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_update_customer" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_update_customer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_update_customer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_update_customer" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_update_customer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_update_customer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10225,8 +10259,9 @@ def test_delete_customer_rest_bad_request(request_type=customers.DeleteCustomerR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10283,13 +10318,13 @@ def test_delete_customer_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "pre_delete_customer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_delete_customer" + ) as pre, + ): pre.assert_not_called() pb_message = customers.DeleteCustomerRequest.pb( customers.DeleteCustomerRequest() @@ -10619,11 +10654,14 @@ def test_cloud_controls_partner_core_base_transport(): def test_cloud_controls_partner_core_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_core.transports.CloudControlsPartnerCoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_core.transports.CloudControlsPartnerCoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudControlsPartnerCoreTransport( @@ -10640,9 +10678,12 @@ def test_cloud_controls_partner_core_base_transport_with_credentials_file(): def test_cloud_controls_partner_core_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_core.transports.CloudControlsPartnerCoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_core.transports.CloudControlsPartnerCoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudControlsPartnerCoreTransport() @@ -10716,11 +10757,12 @@ def test_cloud_controls_partner_core_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_monitoring.py b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_monitoring.py index 33b0775be165..6fcf103ea9e1 100644 --- a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_monitoring.py +++ b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1/test_cloud_controls_partner_monitoring.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_monitoring import ( CloudControlsPartnerMonitoringAsyncClient, @@ -1054,10 +1059,9 @@ def test_cloud_controls_partner_monitoring_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1102,10 +1106,9 @@ def test_cloud_controls_partner_monitoring_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1141,10 +1144,9 @@ def test_cloud_controls_partner_monitoring_client_get_mtls_endpoint_and_cert_sou "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1405,13 +1407,13 @@ def test_cloud_controls_partner_monitoring_client_create_channel_credentials_fil ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2989,8 +2991,9 @@ def test_list_violations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3057,18 +3060,22 @@ def test_list_violations_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerMonitoringClient(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.CloudControlsPartnerMonitoringRestInterceptor, "post_list_violations" - ) as post, mock.patch.object( - transports.CloudControlsPartnerMonitoringRestInterceptor, - "post_list_violations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerMonitoringRestInterceptor, "pre_list_violations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerMonitoringRestInterceptor, + "post_list_violations", + ) as post, + mock.patch.object( + transports.CloudControlsPartnerMonitoringRestInterceptor, + "post_list_violations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerMonitoringRestInterceptor, + "pre_list_violations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3123,8 +3130,9 @@ def test_get_violation_rest_bad_request(request_type=violations.GetViolationRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3199,18 +3207,22 @@ def test_get_violation_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerMonitoringClient(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.CloudControlsPartnerMonitoringRestInterceptor, "post_get_violation" - ) as post, mock.patch.object( - transports.CloudControlsPartnerMonitoringRestInterceptor, - "post_get_violation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerMonitoringRestInterceptor, "pre_get_violation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerMonitoringRestInterceptor, + "post_get_violation", + ) as post, + mock.patch.object( + transports.CloudControlsPartnerMonitoringRestInterceptor, + "post_get_violation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerMonitoringRestInterceptor, + "pre_get_violation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3351,11 +3363,14 @@ def test_cloud_controls_partner_monitoring_base_transport(): def test_cloud_controls_partner_monitoring_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_monitoring.transports.CloudControlsPartnerMonitoringTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_monitoring.transports.CloudControlsPartnerMonitoringTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudControlsPartnerMonitoringTransport( @@ -3372,9 +3387,12 @@ def test_cloud_controls_partner_monitoring_base_transport_with_credentials_file( def test_cloud_controls_partner_monitoring_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_monitoring.transports.CloudControlsPartnerMonitoringTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.cloudcontrolspartner_v1.services.cloud_controls_partner_monitoring.transports.CloudControlsPartnerMonitoringTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudControlsPartnerMonitoringTransport() @@ -3453,11 +3471,12 @@ def test_cloud_controls_partner_monitoring_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_core.py b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_core.py index 0cfc633264ac..c1e9bc991996 100644 --- a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_core.py +++ b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_core.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_core import ( CloudControlsPartnerCoreAsyncClient, @@ -1013,10 +1018,9 @@ def test_cloud_controls_partner_core_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1065,9 @@ def test_cloud_controls_partner_core_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1103,9 @@ def test_cloud_controls_partner_core_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,13 +1362,13 @@ def test_cloud_controls_partner_core_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3218,9 +3220,9 @@ def test_get_ekm_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ekm_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ekm_connections] = ( + mock_rpc + ) request = {} client.get_ekm_connections(request) @@ -6624,9 +6626,9 @@ def test_get_ekm_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ekm_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ekm_connections] = ( + mock_rpc + ) request = {} client.get_ekm_connections(request) @@ -8692,8 +8694,9 @@ def test_get_workload_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8773,18 +8776,20 @@ def test_get_workload_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_get_workload" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_get_workload_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_workload" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_get_workload" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_workload_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_workload" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8841,8 +8846,9 @@ def test_list_workloads_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8909,18 +8915,20 @@ def test_list_workloads_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_list_workloads" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_list_workloads_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_list_workloads" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_list_workloads" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_list_workloads_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_list_workloads" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8976,8 +8984,9 @@ def test_get_customer_rest_bad_request(request_type=customers.GetCustomerRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9046,18 +9055,20 @@ def test_get_customer_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_get_customer" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_get_customer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_customer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_get_customer" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_customer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_customer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9106,8 +9117,9 @@ def test_list_customers_rest_bad_request(request_type=customers.ListCustomersReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9172,18 +9184,20 @@ def test_list_customers_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_list_customers" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_list_customers_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_list_customers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_list_customers" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_list_customers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_list_customers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9238,8 +9252,9 @@ def test_get_ekm_connections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9304,18 +9319,22 @@ def test_get_ekm_connections_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_get_ekm_connections" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_get_ekm_connections_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_ekm_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_ekm_connections", + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_ekm_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "pre_get_ekm_connections", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9372,8 +9391,9 @@ def test_get_partner_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9444,20 +9464,22 @@ def test_get_partner_permissions_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, - "post_get_partner_permissions", - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_get_partner_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "pre_get_partner_permissions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_partner_permissions", + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_partner_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "pre_get_partner_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9517,8 +9539,9 @@ def test_list_access_approval_requests_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9587,20 +9610,22 @@ def test_list_access_approval_requests_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, - "post_list_access_approval_requests", - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_list_access_approval_requests_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "pre_list_access_approval_requests", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_list_access_approval_requests", + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_list_access_approval_requests_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "pre_list_access_approval_requests", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9660,8 +9685,9 @@ def test_get_partner_rest_bad_request(request_type=partners.GetPartnerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9728,18 +9754,20 @@ def test_get_partner_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_get_partner" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_get_partner_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_partner" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_get_partner" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_get_partner_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_get_partner" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9788,8 +9816,9 @@ def test_create_customer_rest_bad_request(request_type=customers.CreateCustomerR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9941,18 +9970,20 @@ def test_create_customer_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_create_customer" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_create_customer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_create_customer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_create_customer" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_create_customer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_create_customer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10007,8 +10038,9 @@ def test_update_customer_rest_bad_request(request_type=customers.UpdateCustomerR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10164,18 +10196,20 @@ def test_update_customer_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "post_update_customer" - ) as post, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, - "post_update_customer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerCoreRestInterceptor, "pre_update_customer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "post_update_customer" + ) as post, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, + "post_update_customer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_update_customer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10226,8 +10260,9 @@ def test_delete_customer_rest_bad_request(request_type=customers.DeleteCustomerR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10284,13 +10319,13 @@ def test_delete_customer_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerCoreClient(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.CloudControlsPartnerCoreRestInterceptor, "pre_delete_customer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerCoreRestInterceptor, "pre_delete_customer" + ) as pre, + ): pre.assert_not_called() pb_message = customers.DeleteCustomerRequest.pb( customers.DeleteCustomerRequest() @@ -10620,11 +10655,14 @@ def test_cloud_controls_partner_core_base_transport(): def test_cloud_controls_partner_core_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_core.transports.CloudControlsPartnerCoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_core.transports.CloudControlsPartnerCoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudControlsPartnerCoreTransport( @@ -10641,9 +10679,12 @@ def test_cloud_controls_partner_core_base_transport_with_credentials_file(): def test_cloud_controls_partner_core_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_core.transports.CloudControlsPartnerCoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_core.transports.CloudControlsPartnerCoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudControlsPartnerCoreTransport() @@ -10717,11 +10758,12 @@ def test_cloud_controls_partner_core_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_monitoring.py b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_monitoring.py index d93818b72ccf..0fcce20fad9d 100644 --- a/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_monitoring.py +++ b/packages/google-cloud-cloudcontrolspartner/tests/unit/gapic/cloudcontrolspartner_v1beta/test_cloud_controls_partner_monitoring.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_monitoring import ( CloudControlsPartnerMonitoringAsyncClient, @@ -1054,10 +1059,9 @@ def test_cloud_controls_partner_monitoring_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1102,10 +1106,9 @@ def test_cloud_controls_partner_monitoring_client_get_mtls_endpoint_and_cert_sou client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1141,10 +1144,9 @@ def test_cloud_controls_partner_monitoring_client_get_mtls_endpoint_and_cert_sou "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1405,13 +1407,13 @@ def test_cloud_controls_partner_monitoring_client_create_channel_credentials_fil ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2989,8 +2991,9 @@ def test_list_violations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3057,18 +3060,22 @@ def test_list_violations_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerMonitoringClient(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.CloudControlsPartnerMonitoringRestInterceptor, "post_list_violations" - ) as post, mock.patch.object( - transports.CloudControlsPartnerMonitoringRestInterceptor, - "post_list_violations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerMonitoringRestInterceptor, "pre_list_violations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerMonitoringRestInterceptor, + "post_list_violations", + ) as post, + mock.patch.object( + transports.CloudControlsPartnerMonitoringRestInterceptor, + "post_list_violations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerMonitoringRestInterceptor, + "pre_list_violations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3123,8 +3130,9 @@ def test_get_violation_rest_bad_request(request_type=violations.GetViolationRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3199,18 +3207,22 @@ def test_get_violation_rest_interceptors(null_interceptor): ) client = CloudControlsPartnerMonitoringClient(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.CloudControlsPartnerMonitoringRestInterceptor, "post_get_violation" - ) as post, mock.patch.object( - transports.CloudControlsPartnerMonitoringRestInterceptor, - "post_get_violation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudControlsPartnerMonitoringRestInterceptor, "pre_get_violation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudControlsPartnerMonitoringRestInterceptor, + "post_get_violation", + ) as post, + mock.patch.object( + transports.CloudControlsPartnerMonitoringRestInterceptor, + "post_get_violation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudControlsPartnerMonitoringRestInterceptor, + "pre_get_violation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3351,11 +3363,14 @@ def test_cloud_controls_partner_monitoring_base_transport(): def test_cloud_controls_partner_monitoring_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_monitoring.transports.CloudControlsPartnerMonitoringTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_monitoring.transports.CloudControlsPartnerMonitoringTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudControlsPartnerMonitoringTransport( @@ -3372,9 +3387,12 @@ def test_cloud_controls_partner_monitoring_base_transport_with_credentials_file( def test_cloud_controls_partner_monitoring_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_monitoring.transports.CloudControlsPartnerMonitoringTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.cloudcontrolspartner_v1beta.services.cloud_controls_partner_monitoring.transports.CloudControlsPartnerMonitoringTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudControlsPartnerMonitoringTransport() @@ -3453,11 +3471,12 @@ def test_cloud_controls_partner_monitoring_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-cloudsecuritycompliance/docs/conf.py b/packages/google-cloud-cloudsecuritycompliance/docs/conf.py index 15df9e19cec1..628e5d39ebdd 100644 --- a/packages/google-cloud-cloudsecuritycompliance/docs/conf.py +++ b/packages/google-cloud-cloudsecuritycompliance/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-cloudsecuritycompliance documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/__init__.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/__init__.py index 58d42b5bd4bc..740ae08c99e0 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/__init__.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.audit import AuditAsyncClient, AuditClient from .services.cm_enrollment_service import ( CmEnrollmentServiceAsyncClient, diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/async_client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/async_client.py index d14507caa644..0675d2a211bf 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/async_client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.audit import pagers from google.cloud.cloudsecuritycompliance_v1.types import audit, common @@ -115,7 +115,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AuditAsyncClient: The constructed client. """ - return AuditClient.from_service_account_info.__func__(AuditAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AuditClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AuditAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +132,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AuditAsyncClient: The constructed client. """ - return AuditClient.from_service_account_file.__func__(AuditAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AuditClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AuditAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/client.py index a86b210ae8f0..42fa10554449 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.audit import pagers from google.cloud.cloudsecuritycompliance_v1.types import audit, common @@ -648,11 +648,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AuditClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AuditClient._read_environment_variables() + ) self._client_cert_source = AuditClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -687,8 +685,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AuditTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/pagers.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/pagers.py index 1bbd4a9a1685..74aa6a9d937d 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/pagers.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/base.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/base.py index 0c49fc188404..f33f0e9a19e3 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/base.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version from google.cloud.cloudsecuritycompliance_v1.types import audit @@ -288,13 +288,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc.py index 10d24a3cfd5d..8f3dd685a75e 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import audit @@ -363,12 +363,12 @@ def generate_framework_audit_scope_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_framework_audit_scope_report" not in self._stubs: - self._stubs[ - "generate_framework_audit_scope_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Audit/GenerateFrameworkAuditScopeReport", - request_serializer=audit.GenerateFrameworkAuditScopeReportRequest.serialize, - response_deserializer=audit.GenerateFrameworkAuditScopeReportResponse.deserialize, + self._stubs["generate_framework_audit_scope_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Audit/GenerateFrameworkAuditScopeReport", + request_serializer=audit.GenerateFrameworkAuditScopeReportRequest.serialize, + response_deserializer=audit.GenerateFrameworkAuditScopeReportResponse.deserialize, + ) ) return self._stubs["generate_framework_audit_scope_report"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc_asyncio.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc_asyncio.py index 42476cd5a877..17ba0374dfbb 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import audit @@ -371,12 +371,12 @@ def generate_framework_audit_scope_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_framework_audit_scope_report" not in self._stubs: - self._stubs[ - "generate_framework_audit_scope_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Audit/GenerateFrameworkAuditScopeReport", - request_serializer=audit.GenerateFrameworkAuditScopeReportRequest.serialize, - response_deserializer=audit.GenerateFrameworkAuditScopeReportResponse.deserialize, + self._stubs["generate_framework_audit_scope_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Audit/GenerateFrameworkAuditScopeReport", + request_serializer=audit.GenerateFrameworkAuditScopeReportRequest.serialize, + response_deserializer=audit.GenerateFrameworkAuditScopeReportResponse.deserialize, + ) ) return self._stubs["generate_framework_audit_scope_report"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/rest.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/rest.py index efbb42fb7ce5..542b16924bd7 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/rest.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/audit/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -682,7 +682,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -808,15 +808,12 @@ def __call__( """ - http_options = ( - _BaseAuditRestTransport._BaseGenerateFrameworkAuditScopeReport._get_http_options() - ) + http_options = _BaseAuditRestTransport._BaseGenerateFrameworkAuditScopeReport._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_generate_framework_audit_scope_report( - request, metadata + request, metadata = ( + self._interceptor.pre_generate_framework_audit_scope_report( + request, metadata + ) ) transcoded_request = _BaseAuditRestTransport._BaseGenerateFrameworkAuditScopeReport._get_transcoded_request( http_options, request @@ -884,11 +881,10 @@ def __call__( resp = self._interceptor.post_generate_framework_audit_scope_report(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_framework_audit_scope_report_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_framework_audit_scope_report_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1234,7 +1230,9 @@ def generate_framework_audit_scope_report( ]: # 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._GenerateFrameworkAuditScopeReport(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateFrameworkAuditScopeReport( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_framework_audit( diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/async_client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/async_client.py index 7bb5d5abd16d..ebae01b84535 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/async_client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import cm_enrollment_service @@ -120,7 +120,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CmEnrollmentServiceAsyncClient: The constructed client. """ - return CmEnrollmentServiceClient.from_service_account_info.__func__(CmEnrollmentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CmEnrollmentServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CmEnrollmentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +137,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CmEnrollmentServiceAsyncClient: The constructed client. """ - return CmEnrollmentServiceClient.from_service_account_file.__func__(CmEnrollmentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CmEnrollmentServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CmEnrollmentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -174,7 +176,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CmEnrollmentServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CmEnrollmentServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CmEnrollmentServiceTransport: diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/client.py index a726418440d3..c1d0a12e6d3b 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import cm_enrollment_service @@ -81,9 +81,7 @@ class CmEnrollmentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CmEnrollmentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CmEnrollmentServiceTransport]] _transport_registry["grpc"] = CmEnrollmentServiceGrpcTransport _transport_registry["grpc_asyncio"] = CmEnrollmentServiceGrpcAsyncIOTransport _transport_registry["rest"] = CmEnrollmentServiceRestTransport @@ -627,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CmEnrollmentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CmEnrollmentServiceClient._read_environment_variables() + ) self._client_cert_source = CmEnrollmentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -666,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CmEnrollmentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/__init__.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/__init__.py index d2f862b421d1..1bd5c54075ae 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/__init__.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import CmEnrollmentServiceRestInterceptor, CmEnrollmentServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CmEnrollmentServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CmEnrollmentServiceTransport]] _transport_registry["grpc"] = CmEnrollmentServiceGrpcTransport _transport_registry["grpc_asyncio"] = CmEnrollmentServiceGrpcAsyncIOTransport _transport_registry["rest"] = CmEnrollmentServiceRestTransport diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/base.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/base.py index de684e668a78..8d6dcc1b0e0c 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/base.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version from google.cloud.cloudsecuritycompliance_v1.types import cm_enrollment_service @@ -255,13 +255,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc.py index e88207dfec9f..96bb7da3013c 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import cm_enrollment_service @@ -384,12 +384,12 @@ def calculate_effective_cm_enrollment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "calculate_effective_cm_enrollment" not in self._stubs: - self._stubs[ - "calculate_effective_cm_enrollment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.CmEnrollmentService/CalculateEffectiveCmEnrollment", - request_serializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentRequest.serialize, - response_deserializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentResponse.deserialize, + self._stubs["calculate_effective_cm_enrollment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.CmEnrollmentService/CalculateEffectiveCmEnrollment", + request_serializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentRequest.serialize, + response_deserializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentResponse.deserialize, + ) ) return self._stubs["calculate_effective_cm_enrollment"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc_asyncio.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc_asyncio.py index b7f6a020b4cf..21665322f67e 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import cm_enrollment_service @@ -392,12 +392,12 @@ def calculate_effective_cm_enrollment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "calculate_effective_cm_enrollment" not in self._stubs: - self._stubs[ - "calculate_effective_cm_enrollment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.CmEnrollmentService/CalculateEffectiveCmEnrollment", - request_serializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentRequest.serialize, - response_deserializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentResponse.deserialize, + self._stubs["calculate_effective_cm_enrollment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.CmEnrollmentService/CalculateEffectiveCmEnrollment", + request_serializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentRequest.serialize, + response_deserializer=cm_enrollment_service.CalculateEffectiveCmEnrollmentResponse.deserialize, + ) ) return self._stubs["calculate_effective_cm_enrollment"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/rest.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/rest.py index b2b970056b1a..dfa49d57ee1a 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/rest.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/cm_enrollment_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -495,9 +495,7 @@ def __call__( """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseCalculateEffectiveCmEnrollment._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseCalculateEffectiveCmEnrollment._get_http_options() request, metadata = self._interceptor.pre_calculate_effective_cm_enrollment( request, metadata @@ -563,11 +561,10 @@ def __call__( resp = self._interceptor.post_calculate_effective_cm_enrollment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_calculate_effective_cm_enrollment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_calculate_effective_cm_enrollment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -652,9 +649,7 @@ def __call__( """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseUpdateCmEnrollment._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseUpdateCmEnrollment._get_http_options() request, metadata = self._interceptor.pre_update_cm_enrollment( request, metadata @@ -762,7 +757,9 @@ def calculate_effective_cm_enrollment( ]: # 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._CalculateEffectiveCmEnrollment(self._session, self._host, self._interceptor) # type: ignore + return self._CalculateEffectiveCmEnrollment( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_cm_enrollment( @@ -833,9 +830,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseCmEnrollmentServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -974,9 +969,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseCmEnrollmentServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1113,9 +1106,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1233,9 +1224,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1351,9 +1340,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCmEnrollmentServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1492,9 +1479,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCmEnrollmentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCmEnrollmentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCmEnrollmentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/async_client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/async_client.py index 7db583592ea3..c863d8ba8be6 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/async_client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.config import pagers from google.cloud.cloudsecuritycompliance_v1.types import common, config @@ -112,7 +112,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConfigAsyncClient: The constructed client. """ - return ConfigClient.from_service_account_info.__func__(ConfigAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConfigClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConfigAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +129,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConfigAsyncClient: The constructed client. """ - return ConfigClient.from_service_account_file.__func__(ConfigAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConfigClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConfigAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/client.py index 8e1877a7aa76..2fcf5bbcc970 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.config import pagers from google.cloud.cloudsecuritycompliance_v1.types import common, config @@ -647,11 +647,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConfigClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConfigClient._read_environment_variables() + ) self._client_cert_source = ConfigClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -686,8 +684,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConfigTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/pagers.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/pagers.py index 028fa34a32b0..21fa1cd0e707 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/pagers.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/base.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/base.py index 5278f2b0d5db..308d0d170df1 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/base.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version from google.cloud.cloudsecuritycompliance_v1.types import common, config @@ -383,13 +383,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc.py index 7978591db5cd..5726ec7905b8 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import common, config diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc_asyncio.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc_asyncio.py index 09ed665d2c8d..e134cedd1a80 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import common, config diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest.py index 6d0b2e177e39..5604c92fd2e3 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1181,7 +1181,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1293,7 +1293,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest_base.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest_base.py index 1e34ad7ca7ff..1d3f9fd61974 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest_base.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/config/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.cloudsecuritycompliance_v1.types import common, config diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/async_client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/async_client.py index 708af6987a97..b25a154bd00c 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/async_client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.deployment import pagers from google.cloud.cloudsecuritycompliance_v1.types import common, deployment @@ -126,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DeploymentAsyncClient: The constructed client. """ - return DeploymentClient.from_service_account_info.__func__(DeploymentAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DeploymentClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DeploymentAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DeploymentAsyncClient: The constructed client. """ - return DeploymentClient.from_service_account_file.__func__(DeploymentAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DeploymentClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DeploymentAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/client.py index 1ae290360506..3b319ebf9de8 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.deployment import pagers from google.cloud.cloudsecuritycompliance_v1.types import common, deployment @@ -671,11 +671,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeploymentClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeploymentClient._read_environment_variables() + ) self._client_cert_source = DeploymentClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -710,8 +708,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeploymentTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/pagers.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/pagers.py index d314b4d51c41..ee88a695abdc 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/pagers.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/base.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/base.py index 663cb609884d..fdb5743d604b 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/base.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version from google.cloud.cloudsecuritycompliance_v1.types import deployment @@ -339,13 +339,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc.py index 424683773525..e2053013e715 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import deployment @@ -366,12 +366,12 @@ def create_framework_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_framework_deployment" not in self._stubs: - self._stubs[ - "create_framework_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/CreateFrameworkDeployment", - request_serializer=deployment.CreateFrameworkDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_framework_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/CreateFrameworkDeployment", + request_serializer=deployment.CreateFrameworkDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_framework_deployment"] @@ -396,12 +396,12 @@ def delete_framework_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_framework_deployment" not in self._stubs: - self._stubs[ - "delete_framework_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/DeleteFrameworkDeployment", - request_serializer=deployment.DeleteFrameworkDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_framework_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/DeleteFrameworkDeployment", + request_serializer=deployment.DeleteFrameworkDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_framework_deployment"] @@ -456,12 +456,12 @@ def list_framework_deployments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_framework_deployments" not in self._stubs: - self._stubs[ - "list_framework_deployments" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListFrameworkDeployments", - request_serializer=deployment.ListFrameworkDeploymentsRequest.serialize, - response_deserializer=deployment.ListFrameworkDeploymentsResponse.deserialize, + self._stubs["list_framework_deployments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListFrameworkDeployments", + request_serializer=deployment.ListFrameworkDeploymentsRequest.serialize, + response_deserializer=deployment.ListFrameworkDeploymentsResponse.deserialize, + ) ) return self._stubs["list_framework_deployments"] @@ -486,12 +486,12 @@ def get_cloud_control_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_cloud_control_deployment" not in self._stubs: - self._stubs[ - "get_cloud_control_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/GetCloudControlDeployment", - request_serializer=deployment.GetCloudControlDeploymentRequest.serialize, - response_deserializer=deployment.CloudControlDeployment.deserialize, + self._stubs["get_cloud_control_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/GetCloudControlDeployment", + request_serializer=deployment.GetCloudControlDeploymentRequest.serialize, + response_deserializer=deployment.CloudControlDeployment.deserialize, + ) ) return self._stubs["get_cloud_control_deployment"] @@ -518,12 +518,12 @@ def list_cloud_control_deployments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_cloud_control_deployments" not in self._stubs: - self._stubs[ - "list_cloud_control_deployments" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListCloudControlDeployments", - request_serializer=deployment.ListCloudControlDeploymentsRequest.serialize, - response_deserializer=deployment.ListCloudControlDeploymentsResponse.deserialize, + self._stubs["list_cloud_control_deployments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListCloudControlDeployments", + request_serializer=deployment.ListCloudControlDeploymentsRequest.serialize, + response_deserializer=deployment.ListCloudControlDeploymentsResponse.deserialize, + ) ) return self._stubs["list_cloud_control_deployments"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc_asyncio.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc_asyncio.py index 3ae8033159f6..7b6c55380bfe 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import deployment @@ -375,12 +375,12 @@ def create_framework_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_framework_deployment" not in self._stubs: - self._stubs[ - "create_framework_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/CreateFrameworkDeployment", - request_serializer=deployment.CreateFrameworkDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_framework_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/CreateFrameworkDeployment", + request_serializer=deployment.CreateFrameworkDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_framework_deployment"] @@ -406,12 +406,12 @@ def delete_framework_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_framework_deployment" not in self._stubs: - self._stubs[ - "delete_framework_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/DeleteFrameworkDeployment", - request_serializer=deployment.DeleteFrameworkDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_framework_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/DeleteFrameworkDeployment", + request_serializer=deployment.DeleteFrameworkDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_framework_deployment"] @@ -467,12 +467,12 @@ def list_framework_deployments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_framework_deployments" not in self._stubs: - self._stubs[ - "list_framework_deployments" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListFrameworkDeployments", - request_serializer=deployment.ListFrameworkDeploymentsRequest.serialize, - response_deserializer=deployment.ListFrameworkDeploymentsResponse.deserialize, + self._stubs["list_framework_deployments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListFrameworkDeployments", + request_serializer=deployment.ListFrameworkDeploymentsRequest.serialize, + response_deserializer=deployment.ListFrameworkDeploymentsResponse.deserialize, + ) ) return self._stubs["list_framework_deployments"] @@ -498,12 +498,12 @@ def get_cloud_control_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_cloud_control_deployment" not in self._stubs: - self._stubs[ - "get_cloud_control_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/GetCloudControlDeployment", - request_serializer=deployment.GetCloudControlDeploymentRequest.serialize, - response_deserializer=deployment.CloudControlDeployment.deserialize, + self._stubs["get_cloud_control_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/GetCloudControlDeployment", + request_serializer=deployment.GetCloudControlDeploymentRequest.serialize, + response_deserializer=deployment.CloudControlDeployment.deserialize, + ) ) return self._stubs["get_cloud_control_deployment"] @@ -530,12 +530,12 @@ def list_cloud_control_deployments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_cloud_control_deployments" not in self._stubs: - self._stubs[ - "list_cloud_control_deployments" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListCloudControlDeployments", - request_serializer=deployment.ListCloudControlDeploymentsRequest.serialize, - response_deserializer=deployment.ListCloudControlDeploymentsResponse.deserialize, + self._stubs["list_cloud_control_deployments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Deployment/ListCloudControlDeployments", + request_serializer=deployment.ListCloudControlDeploymentsRequest.serialize, + response_deserializer=deployment.ListCloudControlDeploymentsResponse.deserialize, + ) ) return self._stubs["list_cloud_control_deployments"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/rest.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/rest.py index d62b139180f0..3c7cf1570c25 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/rest.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/deployment/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -778,9 +778,7 @@ def __call__( """ - http_options = ( - _BaseDeploymentRestTransport._BaseCreateFrameworkDeployment._get_http_options() - ) + http_options = _BaseDeploymentRestTransport._BaseCreateFrameworkDeployment._get_http_options() request, metadata = self._interceptor.pre_create_framework_deployment( request, metadata @@ -806,7 +804,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -931,9 +929,7 @@ def __call__( """ - http_options = ( - _BaseDeploymentRestTransport._BaseDeleteFrameworkDeployment._get_http_options() - ) + http_options = _BaseDeploymentRestTransport._BaseDeleteFrameworkDeployment._get_http_options() request, metadata = self._interceptor.pre_delete_framework_deployment( request, metadata @@ -955,7 +951,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1081,9 +1077,7 @@ def __call__( """ - http_options = ( - _BaseDeploymentRestTransport._BaseGetCloudControlDeployment._get_http_options() - ) + http_options = _BaseDeploymentRestTransport._BaseGetCloudControlDeployment._get_http_options() request, metadata = self._interceptor.pre_get_cloud_control_deployment( request, metadata @@ -1233,9 +1227,7 @@ def __call__( """ - http_options = ( - _BaseDeploymentRestTransport._BaseGetFrameworkDeployment._get_http_options() - ) + http_options = _BaseDeploymentRestTransport._BaseGetFrameworkDeployment._get_http_options() request, metadata = self._interceptor.pre_get_framework_deployment( request, metadata @@ -1383,9 +1375,7 @@ def __call__( """ - http_options = ( - _BaseDeploymentRestTransport._BaseListCloudControlDeployments._get_http_options() - ) + http_options = _BaseDeploymentRestTransport._BaseListCloudControlDeployments._get_http_options() request, metadata = self._interceptor.pre_list_cloud_control_deployments( request, metadata @@ -1451,11 +1441,10 @@ def __call__( resp = self._interceptor.post_list_cloud_control_deployments(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_cloud_control_deployments_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_cloud_control_deployments_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1537,9 +1526,7 @@ def __call__( The response message for [ListFrameworkDeployments][]. """ - http_options = ( - _BaseDeploymentRestTransport._BaseListFrameworkDeployments._get_http_options() - ) + http_options = _BaseDeploymentRestTransport._BaseListFrameworkDeployments._get_http_options() request, metadata = self._interceptor.pre_list_framework_deployments( request, metadata @@ -1639,7 +1626,9 @@ def create_framework_deployment( ]: # 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._CreateFrameworkDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateFrameworkDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_framework_deployment( @@ -1649,7 +1638,9 @@ def delete_framework_deployment( ]: # 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._DeleteFrameworkDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteFrameworkDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_cloud_control_deployment( @@ -1659,7 +1650,9 @@ def get_cloud_control_deployment( ]: # 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._GetCloudControlDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._GetCloudControlDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_framework_deployment( @@ -1669,7 +1662,9 @@ def get_framework_deployment( ]: # 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._GetFrameworkDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._GetFrameworkDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_cloud_control_deployments( @@ -1680,7 +1675,9 @@ def list_cloud_control_deployments( ]: # 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._ListCloudControlDeployments(self._session, self._host, self._interceptor) # type: ignore + return self._ListCloudControlDeployments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_framework_deployments( @@ -1691,7 +1688,9 @@ def list_framework_deployments( ]: # 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._ListFrameworkDeployments(self._session, self._host, self._interceptor) # type: ignore + return self._ListFrameworkDeployments( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/async_client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/async_client.py index 915f2ac94bea..364f78408c53 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/async_client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.monitoring import pagers from google.cloud.cloudsecuritycompliance_v1.types import common, monitoring @@ -131,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MonitoringAsyncClient: The constructed client. """ - return MonitoringClient.from_service_account_info.__func__(MonitoringAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MonitoringClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(MonitoringAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MonitoringAsyncClient: The constructed client. """ - return MonitoringClient.from_service_account_file.__func__(MonitoringAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MonitoringClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(MonitoringAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/client.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/client.py index e4211e866dc7..28893ee9ac60 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/client.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.monitoring import pagers from google.cloud.cloudsecuritycompliance_v1.types import common, monitoring @@ -690,11 +690,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MonitoringClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MonitoringClient._read_environment_variables() + ) self._client_cert_source = MonitoringClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -729,8 +727,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MonitoringTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/pagers.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/pagers.py index ba0032ac4612..47fce5791206 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/pagers.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -461,7 +461,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/base.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/base.py index 39afc861da61..0c6fd1d42bce 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/base.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudsecuritycompliance_v1 import gapic_version as package_version from google.cloud.cloudsecuritycompliance_v1.types import monitoring @@ -333,13 +333,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc.py index 3ed517af1b0d..d387a1a32b82 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import monitoring @@ -347,12 +347,12 @@ def list_framework_compliance_summaries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_framework_compliance_summaries" not in self._stubs: - self._stubs[ - "list_framework_compliance_summaries" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListFrameworkComplianceSummaries", - request_serializer=monitoring.ListFrameworkComplianceSummariesRequest.serialize, - response_deserializer=monitoring.ListFrameworkComplianceSummariesResponse.deserialize, + self._stubs["list_framework_compliance_summaries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListFrameworkComplianceSummaries", + request_serializer=monitoring.ListFrameworkComplianceSummariesRequest.serialize, + response_deserializer=monitoring.ListFrameworkComplianceSummariesResponse.deserialize, + ) ) return self._stubs["list_framework_compliance_summaries"] @@ -410,12 +410,12 @@ def fetch_framework_compliance_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_framework_compliance_report" not in self._stubs: - self._stubs[ - "fetch_framework_compliance_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/FetchFrameworkComplianceReport", - request_serializer=monitoring.FetchFrameworkComplianceReportRequest.serialize, - response_deserializer=monitoring.FrameworkComplianceReport.deserialize, + self._stubs["fetch_framework_compliance_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/FetchFrameworkComplianceReport", + request_serializer=monitoring.FetchFrameworkComplianceReportRequest.serialize, + response_deserializer=monitoring.FrameworkComplianceReport.deserialize, + ) ) return self._stubs["fetch_framework_compliance_report"] @@ -443,12 +443,12 @@ def list_control_compliance_summaries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_control_compliance_summaries" not in self._stubs: - self._stubs[ - "list_control_compliance_summaries" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListControlComplianceSummaries", - request_serializer=monitoring.ListControlComplianceSummariesRequest.serialize, - response_deserializer=monitoring.ListControlComplianceSummariesResponse.deserialize, + self._stubs["list_control_compliance_summaries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListControlComplianceSummaries", + request_serializer=monitoring.ListControlComplianceSummariesRequest.serialize, + response_deserializer=monitoring.ListControlComplianceSummariesResponse.deserialize, + ) ) return self._stubs["list_control_compliance_summaries"] @@ -476,12 +476,12 @@ def aggregate_framework_compliance_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "aggregate_framework_compliance_report" not in self._stubs: - self._stubs[ - "aggregate_framework_compliance_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/AggregateFrameworkComplianceReport", - request_serializer=monitoring.AggregateFrameworkComplianceReportRequest.serialize, - response_deserializer=monitoring.AggregateFrameworkComplianceReportResponse.deserialize, + self._stubs["aggregate_framework_compliance_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/AggregateFrameworkComplianceReport", + request_serializer=monitoring.AggregateFrameworkComplianceReportRequest.serialize, + response_deserializer=monitoring.AggregateFrameworkComplianceReportResponse.deserialize, + ) ) return self._stubs["aggregate_framework_compliance_report"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc_asyncio.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc_asyncio.py index a998d221f40a..268d9946ecc5 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc_asyncio.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import monitoring @@ -355,12 +355,12 @@ def list_framework_compliance_summaries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_framework_compliance_summaries" not in self._stubs: - self._stubs[ - "list_framework_compliance_summaries" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListFrameworkComplianceSummaries", - request_serializer=monitoring.ListFrameworkComplianceSummariesRequest.serialize, - response_deserializer=monitoring.ListFrameworkComplianceSummariesResponse.deserialize, + self._stubs["list_framework_compliance_summaries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListFrameworkComplianceSummaries", + request_serializer=monitoring.ListFrameworkComplianceSummariesRequest.serialize, + response_deserializer=monitoring.ListFrameworkComplianceSummariesResponse.deserialize, + ) ) return self._stubs["list_framework_compliance_summaries"] @@ -418,12 +418,12 @@ def fetch_framework_compliance_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_framework_compliance_report" not in self._stubs: - self._stubs[ - "fetch_framework_compliance_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/FetchFrameworkComplianceReport", - request_serializer=monitoring.FetchFrameworkComplianceReportRequest.serialize, - response_deserializer=monitoring.FrameworkComplianceReport.deserialize, + self._stubs["fetch_framework_compliance_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/FetchFrameworkComplianceReport", + request_serializer=monitoring.FetchFrameworkComplianceReportRequest.serialize, + response_deserializer=monitoring.FrameworkComplianceReport.deserialize, + ) ) return self._stubs["fetch_framework_compliance_report"] @@ -451,12 +451,12 @@ def list_control_compliance_summaries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_control_compliance_summaries" not in self._stubs: - self._stubs[ - "list_control_compliance_summaries" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListControlComplianceSummaries", - request_serializer=monitoring.ListControlComplianceSummariesRequest.serialize, - response_deserializer=monitoring.ListControlComplianceSummariesResponse.deserialize, + self._stubs["list_control_compliance_summaries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/ListControlComplianceSummaries", + request_serializer=monitoring.ListControlComplianceSummariesRequest.serialize, + response_deserializer=monitoring.ListControlComplianceSummariesResponse.deserialize, + ) ) return self._stubs["list_control_compliance_summaries"] @@ -484,12 +484,12 @@ def aggregate_framework_compliance_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "aggregate_framework_compliance_report" not in self._stubs: - self._stubs[ - "aggregate_framework_compliance_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.cloudsecuritycompliance.v1.Monitoring/AggregateFrameworkComplianceReport", - request_serializer=monitoring.AggregateFrameworkComplianceReportRequest.serialize, - response_deserializer=monitoring.AggregateFrameworkComplianceReportResponse.deserialize, + self._stubs["aggregate_framework_compliance_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.cloudsecuritycompliance.v1.Monitoring/AggregateFrameworkComplianceReport", + request_serializer=monitoring.AggregateFrameworkComplianceReportRequest.serialize, + response_deserializer=monitoring.AggregateFrameworkComplianceReportResponse.deserialize, + ) ) return self._stubs["aggregate_framework_compliance_report"] diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/rest.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/rest.py index bc744a7c3e0b..c165e20eb839 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/rest.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/services/monitoring/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -670,15 +670,12 @@ def __call__( """ - http_options = ( - _BaseMonitoringRestTransport._BaseAggregateFrameworkComplianceReport._get_http_options() - ) + http_options = _BaseMonitoringRestTransport._BaseAggregateFrameworkComplianceReport._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_aggregate_framework_compliance_report( - request, metadata + request, metadata = ( + self._interceptor.pre_aggregate_framework_compliance_report( + request, metadata + ) ) transcoded_request = _BaseMonitoringRestTransport._BaseAggregateFrameworkComplianceReport._get_transcoded_request( http_options, request @@ -739,11 +736,10 @@ def __call__( resp = self._interceptor.post_aggregate_framework_compliance_report(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_aggregate_framework_compliance_report_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_aggregate_framework_compliance_report_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -831,9 +827,7 @@ def __call__( """ - http_options = ( - _BaseMonitoringRestTransport._BaseFetchFrameworkComplianceReport._get_http_options() - ) + http_options = _BaseMonitoringRestTransport._BaseFetchFrameworkComplianceReport._get_http_options() request, metadata = self._interceptor.pre_fetch_framework_compliance_report( request, metadata @@ -899,11 +893,10 @@ def __call__( resp = self._interceptor.post_fetch_framework_compliance_report(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_framework_compliance_report_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_framework_compliance_report_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -989,9 +982,7 @@ def __call__( """ - http_options = ( - _BaseMonitoringRestTransport._BaseListControlComplianceSummaries._get_http_options() - ) + http_options = _BaseMonitoringRestTransport._BaseListControlComplianceSummaries._get_http_options() request, metadata = self._interceptor.pre_list_control_compliance_summaries( request, metadata @@ -1057,11 +1048,10 @@ def __call__( resp = self._interceptor.post_list_control_compliance_summaries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_control_compliance_summaries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_control_compliance_summaries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1144,9 +1134,7 @@ def __call__( The response message for [ListFindingSummaries][]. """ - http_options = ( - _BaseMonitoringRestTransport._BaseListFindingSummaries._get_http_options() - ) + http_options = _BaseMonitoringRestTransport._BaseListFindingSummaries._get_http_options() request, metadata = self._interceptor.pre_list_finding_summaries( request, metadata @@ -1297,15 +1285,12 @@ def __call__( """ - http_options = ( - _BaseMonitoringRestTransport._BaseListFrameworkComplianceSummaries._get_http_options() - ) + http_options = _BaseMonitoringRestTransport._BaseListFrameworkComplianceSummaries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_framework_compliance_summaries( - request, metadata + request, metadata = ( + self._interceptor.pre_list_framework_compliance_summaries( + request, metadata + ) ) transcoded_request = _BaseMonitoringRestTransport._BaseListFrameworkComplianceSummaries._get_transcoded_request( http_options, request @@ -1368,11 +1353,10 @@ def __call__( resp = self._interceptor.post_list_framework_compliance_summaries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_framework_compliance_summaries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_framework_compliance_summaries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1410,7 +1394,9 @@ def aggregate_framework_compliance_report( ]: # 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._AggregateFrameworkComplianceReport(self._session, self._host, self._interceptor) # type: ignore + return self._AggregateFrameworkComplianceReport( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_framework_compliance_report( @@ -1421,7 +1407,9 @@ def fetch_framework_compliance_report( ]: # 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._FetchFrameworkComplianceReport(self._session, self._host, self._interceptor) # type: ignore + return self._FetchFrameworkComplianceReport( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_control_compliance_summaries( @@ -1432,7 +1420,9 @@ def list_control_compliance_summaries( ]: # 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._ListControlComplianceSummaries(self._session, self._host, self._interceptor) # type: ignore + return self._ListControlComplianceSummaries( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_finding_summaries( @@ -1454,7 +1444,9 @@ def list_framework_compliance_summaries( ]: # 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._ListFrameworkComplianceSummaries(self._session, self._host, self._interceptor) # type: ignore + return self._ListFrameworkComplianceSummaries( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/audit.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/audit.py index 96053402b325..50696760b396 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/audit.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/audit.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import common @@ -63,6 +63,7 @@ class ComplianceState(proto.Enum): AUDIT_NOT_SUPPORTED (5): The resource can't be audited. """ + COMPLIANCE_STATE_UNSPECIFIED = 0 COMPLIANT = 1 VIOLATION = 2 @@ -102,6 +103,7 @@ class Format(proto.Enum): The report format is the Open Document Format (ODF). """ + FORMAT_UNSPECIFIED = 0 ODF = 1 @@ -275,6 +277,7 @@ class Format(proto.Enum): The format for the framework audit report is Open Document. """ + FORMAT_UNSPECIFIED = 0 ODF = 1 @@ -347,6 +350,7 @@ class State(proto.Enum): SUCCEEDED (5): The audit completed successfully. """ + STATE_UNSPECIFIED = 0 SCHEDULED = 1 RUNNING = 2 @@ -402,12 +406,12 @@ class State(proto.Enum): number=10, message="CloudControlGroupAuditDetails", ) - cloud_control_audit_details: MutableSequence[ - "CloudControlAuditDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=11, - message="CloudControlAuditDetails", + cloud_control_audit_details: MutableSequence["CloudControlAuditDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=11, + message="CloudControlAuditDetails", + ) ) operation_id: str = proto.Field( proto.STRING, @@ -605,12 +609,12 @@ class CloudControlGroupAuditDetails(proto.Message): number=11, message=common.ControlFamily, ) - cloud_control_details: MutableSequence[ - "CloudControlAuditDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message="CloudControlAuditDetails", + cloud_control_details: MutableSequence["CloudControlAuditDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message="CloudControlAuditDetails", + ) ) report_summary: "ReportSummary" = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/cm_enrollment_service.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/cm_enrollment_service.py index 07d5d0d3983c..f38b43b9c252 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/cm_enrollment_service.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/cm_enrollment_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/common.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/common.py index eb3e5a23b1d1..3d138a56faa0 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/common.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/common.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -67,6 +67,7 @@ class RegulatoryControlResponsibilityType(proto.Enum): SHARED (3): Shared responsibility. """ + REGULATORY_CONTROL_RESPONSIBILITY_TYPE_UNSPECIFIED = 0 GOOGLE = 1 CUSTOMER = 2 @@ -89,6 +90,7 @@ class EnforcementMode(proto.Enum): The cloud control is enforced to audit for non-compliance. """ + ENFORCEMENT_MODE_UNSPECIFIED = 0 PREVENTIVE = 1 DETECTIVE = 2 @@ -112,6 +114,7 @@ class FrameworkCategory(proto.Enum): CUSTOM_FRAMEWORK (5): A user-created framework. """ + FRAMEWORK_CATEGORY_UNSPECIFIED = 0 INDUSTRY_DEFINED_STANDARD = 1 ASSURED_WORKLOADS = 2 @@ -160,6 +163,7 @@ class CloudControlCategory(proto.Enum): The business continuity and disaster recovery (BCDR) category. """ + CLOUD_CONTROL_CATEGORY_UNSPECIFIED = 0 CC_CATEGORY_INFRASTRUCTURE = 1 CC_CATEGORY_ARTIFICIAL_INTELLIGENCE = 2 @@ -191,6 +195,7 @@ class CloudProvider(proto.Enum): GCP (3): Google Cloud. """ + CLOUD_PROVIDER_UNSPECIFIED = 0 AWS = 1 AZURE = 2 @@ -261,6 +266,7 @@ class Severity(proto.Enum): minimal access to an environment but can't access data, execute code, or create resources. """ + SEVERITY_UNSPECIFIED = 0 CRITICAL = 1 HIGH = 2 @@ -283,6 +289,7 @@ class RuleActionType(proto.Enum): RULE_ACTION_TYPE_AUDIT (3): The rule is intended to audit non-compliance. """ + RULE_ACTION_TYPE_UNSPECIFIED = 0 RULE_ACTION_TYPE_PREVENTIVE = 1 RULE_ACTION_TYPE_DETECTIVE = 2 @@ -307,6 +314,7 @@ class TargetResourceType(proto.Enum): The target resource is an application in App Hub. """ + TARGET_RESOURCE_TYPE_UNSPECIFIED = 0 TARGET_RESOURCE_CRM_TYPE_ORG = 1 TARGET_RESOURCE_CRM_TYPE_FOLDER = 2 @@ -367,6 +375,7 @@ class FrameworkType(proto.Enum): A framework that's created and managed by you. """ + FRAMEWORK_TYPE_UNSPECIFIED = 0 BUILT_IN = 1 CUSTOM = 2 @@ -407,19 +416,19 @@ class FrameworkType(proto.Enum): number=10, enum="CloudProvider", ) - supported_target_resource_types: MutableSequence[ - "TargetResourceType" - ] = proto.RepeatedField( - proto.ENUM, - number=11, - enum="TargetResourceType", + supported_target_resource_types: MutableSequence["TargetResourceType"] = ( + proto.RepeatedField( + proto.ENUM, + number=11, + enum="TargetResourceType", + ) ) - supported_enforcement_modes: MutableSequence[ - "EnforcementMode" - ] = proto.RepeatedField( - proto.ENUM, - number=13, - enum="EnforcementMode", + supported_enforcement_modes: MutableSequence["EnforcementMode"] = ( + proto.RepeatedField( + proto.ENUM, + number=13, + enum="EnforcementMode", + ) ) @@ -583,6 +592,7 @@ class Type(proto.Enum): A cloud control that's provided and managed by Google. """ + TYPE_UNSPECIFIED = 0 CUSTOM = 1 BUILT_IN = 2 @@ -603,12 +613,12 @@ class Type(proto.Enum): proto.STRING, number=5, ) - supported_enforcement_modes: MutableSequence[ - "EnforcementMode" - ] = proto.RepeatedField( - proto.ENUM, - number=7, - enum="EnforcementMode", + supported_enforcement_modes: MutableSequence["EnforcementMode"] = ( + proto.RepeatedField( + proto.ENUM, + number=7, + enum="EnforcementMode", + ) ) parameter_spec: MutableSequence["ParameterSpec"] = proto.RepeatedField( proto.MESSAGE, @@ -652,12 +662,12 @@ class Type(proto.Enum): number=17, message=timestamp_pb2.Timestamp, ) - supported_target_resource_types: MutableSequence[ - "TargetResourceType" - ] = proto.RepeatedField( - proto.ENUM, - number=18, - enum="TargetResourceType", + supported_target_resource_types: MutableSequence["TargetResourceType"] = ( + proto.RepeatedField( + proto.ENUM, + number=18, + enum="TargetResourceType", + ) ) @@ -707,6 +717,7 @@ class ValueType(proto.Enum): ONEOF (7): A oneOf value. """ + VALUE_TYPE_UNSPECIFIED = 0 STRING = 3 BOOLEAN = 4 @@ -740,12 +751,12 @@ class ValueType(proto.Enum): number=6, message="ParamValue", ) - substitution_rules: MutableSequence[ - "ParameterSubstitutionRule" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="ParameterSubstitutionRule", + substitution_rules: MutableSequence["ParameterSubstitutionRule"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="ParameterSubstitutionRule", + ) ) sub_parameters: MutableSequence["ParameterSpec"] = proto.RepeatedField( proto.MESSAGE, diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/config.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/config.py index 398ae17b8c99..03b81dd052c4 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/config.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import common diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/deployment.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/deployment.py index 7a3dbc283439..554cda6f4f39 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/deployment.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/deployment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import common @@ -77,6 +77,7 @@ class DeploymentState(proto.Enum): successfully. Retrying the operation resumes from the first failed step. """ + DEPLOYMENT_STATE_UNSPECIFIED = 0 DEPLOYMENT_STATE_VALIDATING = 1 DEPLOYMENT_STATE_CREATING = 2 @@ -185,12 +186,12 @@ class FrameworkDeployment(proto.Message): proto.STRING, number=5, ) - cloud_control_metadata: MutableSequence[ - "CloudControlMetadata" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="CloudControlMetadata", + cloud_control_metadata: MutableSequence["CloudControlMetadata"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="CloudControlMetadata", + ) ) deployment_state: "DeploymentState" = proto.Field( proto.ENUM, @@ -328,12 +329,12 @@ class CloudControlDeployment(proto.Message): number=10, message=common.CloudControl, ) - framework_deployment_references: MutableSequence[ - "FrameworkDeploymentReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=11, - message="FrameworkDeploymentReference", + framework_deployment_references: MutableSequence["FrameworkDeploymentReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=11, + message="FrameworkDeploymentReference", + ) ) target_resource_display_name: str = proto.Field( proto.STRING, @@ -746,12 +747,12 @@ class ListCloudControlDeploymentsResponse(proto.Message): def raw_page(self): return self - cloud_control_deployments: MutableSequence[ - "CloudControlDeployment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CloudControlDeployment", + cloud_control_deployments: MutableSequence["CloudControlDeployment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CloudControlDeployment", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/monitoring.py b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/monitoring.py index d5d4d4750a9c..05c7f5ef108c 100644 --- a/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/monitoring.py +++ b/packages/google-cloud-cloudsecuritycompliance/google/cloud/cloudsecuritycompliance_v1/types/monitoring.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore from google.cloud.cloudsecuritycompliance_v1.types import common @@ -65,6 +65,7 @@ class EvaluationState(proto.Enum): EVALUATION_STATE_NOT_ASSESSED (3): The control is not assessed. """ + EVALUATION_STATE_UNSPECIFIED = 0 EVALUATION_STATE_PASSED = 1 EVALUATION_STATE_FAILED = 2 @@ -108,6 +109,7 @@ class FindingClass(proto.Enum): attack paths converge, based on attack path simulations (APS). """ + FINDING_CLASS_UNSPECIFIED = 0 THREAT = 1 VULNERABILITY = 2 @@ -174,12 +176,12 @@ class ListFrameworkComplianceSummariesResponse(proto.Message): def raw_page(self): return self - framework_compliance_summaries: MutableSequence[ - "FrameworkComplianceSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="FrameworkComplianceSummary", + framework_compliance_summaries: MutableSequence["FrameworkComplianceSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="FrameworkComplianceSummary", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -246,19 +248,19 @@ class FrameworkComplianceReport(proto.Message): number=5, enum=common.Framework.FrameworkType, ) - supported_cloud_providers: MutableSequence[ - common.CloudProvider - ] = proto.RepeatedField( - proto.ENUM, - number=6, - enum=common.CloudProvider, + supported_cloud_providers: MutableSequence[common.CloudProvider] = ( + proto.RepeatedField( + proto.ENUM, + number=6, + enum=common.CloudProvider, + ) ) - framework_categories: MutableSequence[ - common.FrameworkCategory - ] = proto.RepeatedField( - proto.ENUM, - number=7, - enum=common.FrameworkCategory, + framework_categories: MutableSequence[common.FrameworkCategory] = ( + proto.RepeatedField( + proto.ENUM, + number=7, + enum=common.FrameworkCategory, + ) ) framework_display_name: str = proto.Field( proto.STRING, @@ -276,12 +278,12 @@ class FrameworkComplianceReport(proto.Message): proto.INT64, number=11, ) - target_resource_details: MutableSequence[ - "TargetResourceDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message="TargetResourceDetails", + target_resource_details: MutableSequence["TargetResourceDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message="TargetResourceDetails", + ) ) @@ -438,12 +440,12 @@ class ListControlComplianceSummariesResponse(proto.Message): def raw_page(self): return self - control_compliance_summaries: MutableSequence[ - "ControlComplianceSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ControlComplianceSummary", + control_compliance_summaries: MutableSequence["ControlComplianceSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ControlComplianceSummary", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -491,12 +493,12 @@ class AggregateFrameworkComplianceReportResponse(proto.Message): The list of aggregated compliance reports. """ - aggregated_compliance_reports: MutableSequence[ - "AggregatedComplianceReport" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AggregatedComplianceReport", + aggregated_compliance_reports: MutableSequence["AggregatedComplianceReport"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AggregatedComplianceReport", + ) ) @@ -580,19 +582,19 @@ class FrameworkComplianceSummary(proto.Message): number=3, enum=common.Framework.FrameworkType, ) - supported_cloud_providers: MutableSequence[ - common.CloudProvider - ] = proto.RepeatedField( - proto.ENUM, - number=4, - enum=common.CloudProvider, + supported_cloud_providers: MutableSequence[common.CloudProvider] = ( + proto.RepeatedField( + proto.ENUM, + number=4, + enum=common.CloudProvider, + ) ) - framework_categories: MutableSequence[ - common.FrameworkCategory - ] = proto.RepeatedField( - proto.ENUM, - number=5, - enum=common.FrameworkCategory, + framework_categories: MutableSequence[common.FrameworkCategory] = ( + proto.RepeatedField( + proto.ENUM, + number=5, + enum=common.FrameworkCategory, + ) ) framework_display_name: str = proto.Field( proto.STRING, @@ -610,12 +612,12 @@ class FrameworkComplianceSummary(proto.Message): proto.INT64, number=9, ) - target_resource_details: MutableSequence[ - "TargetResourceDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message="TargetResourceDetails", + target_resource_details: MutableSequence["TargetResourceDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message="TargetResourceDetails", + ) ) diff --git a/packages/google-cloud-cloudsecuritycompliance/noxfile.py b/packages/google-cloud-cloudsecuritycompliance/noxfile.py index e4eb3ebb0ced..a440e878909d 100644 --- a/packages/google-cloud-cloudsecuritycompliance/noxfile.py +++ b/packages/google-cloud-cloudsecuritycompliance/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_async.py b/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_async.py index e1f4a1a517fc..c53952d45ba8 100644 --- a/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_async.py +++ b/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_async.py @@ -47,9 +47,7 @@ async def sample_create_framework_deployment(): framework_deployment.cloud_control_metadata.cloud_control_details.name = ( "name_value" ) - framework_deployment.cloud_control_metadata.cloud_control_details.major_revision_id = ( - 1811 - ) + framework_deployment.cloud_control_metadata.cloud_control_details.major_revision_id = 1811 framework_deployment.cloud_control_metadata.enforcement_mode = "AUDIT" request = cloudsecuritycompliance_v1.CreateFrameworkDeploymentRequest( diff --git a/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_sync.py b/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_sync.py index 473f826d185d..6033b0efc48a 100644 --- a/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_sync.py +++ b/packages/google-cloud-cloudsecuritycompliance/samples/generated_samples/cloudsecuritycompliance_v1_generated_deployment_create_framework_deployment_sync.py @@ -47,9 +47,7 @@ def sample_create_framework_deployment(): framework_deployment.cloud_control_metadata.cloud_control_details.name = ( "name_value" ) - framework_deployment.cloud_control_metadata.cloud_control_details.major_revision_id = ( - 1811 - ) + framework_deployment.cloud_control_metadata.cloud_control_details.major_revision_id = 1811 framework_deployment.cloud_control_metadata.enforcement_mode = "AUDIT" request = cloudsecuritycompliance_v1.CreateFrameworkDeploymentRequest( diff --git a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_audit.py b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_audit.py index 340d9aa0b7c2..751f5684267b 100644 --- a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_audit.py +++ b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_audit.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.audit import ( AuditAsyncClient, @@ -903,10 +903,9 @@ def test_audit_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -951,10 +950,9 @@ def test_audit_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +988,9 @@ def test_audit_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1218,13 +1215,13 @@ def test_audit_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1707,9 +1704,9 @@ def test_create_framework_audit_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_framework_audit - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_framework_audit] = ( + mock_rpc + ) request = {} client.create_framework_audit(request) @@ -2080,9 +2077,9 @@ def test_list_framework_audits_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_framework_audits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_framework_audits] = ( + mock_rpc + ) request = {} client.list_framework_audits(request) @@ -2635,9 +2632,9 @@ def test_get_framework_audit_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_framework_audit - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_framework_audit] = ( + mock_rpc + ) request = {} client.get_framework_audit(request) @@ -3132,9 +3129,9 @@ def test_create_framework_audit_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_framework_audit - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_framework_audit] = ( + mock_rpc + ) request = {} client.create_framework_audit(request) @@ -3329,9 +3326,9 @@ def test_list_framework_audits_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_framework_audits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_framework_audits] = ( + mock_rpc + ) request = {} client.list_framework_audits(request) @@ -3589,9 +3586,9 @@ def test_get_framework_audit_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_framework_audit - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_framework_audit] = ( + mock_rpc + ) request = {} client.get_framework_audit(request) @@ -4101,8 +4098,9 @@ def test_generate_framework_audit_scope_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4166,18 +4164,21 @@ def test_generate_framework_audit_scope_report_rest_interceptors(null_intercepto ) client = AuditClient(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.AuditRestInterceptor, "post_generate_framework_audit_scope_report" - ) as post, mock.patch.object( - transports.AuditRestInterceptor, - "post_generate_framework_audit_scope_report_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AuditRestInterceptor, "pre_generate_framework_audit_scope_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AuditRestInterceptor, + "post_generate_framework_audit_scope_report", + ) as post, + mock.patch.object( + transports.AuditRestInterceptor, + "post_generate_framework_audit_scope_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AuditRestInterceptor, "pre_generate_framework_audit_scope_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4235,8 +4236,9 @@ def test_create_framework_audit_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4424,19 +4426,20 @@ def test_create_framework_audit_rest_interceptors(null_interceptor): ) client = AuditClient(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.AuditRestInterceptor, "post_create_framework_audit" - ) as post, mock.patch.object( - transports.AuditRestInterceptor, "post_create_framework_audit_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AuditRestInterceptor, "pre_create_framework_audit" - ) as pre: + 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.AuditRestInterceptor, "post_create_framework_audit" + ) as post, + mock.patch.object( + transports.AuditRestInterceptor, "post_create_framework_audit_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AuditRestInterceptor, "pre_create_framework_audit" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4489,8 +4492,9 @@ def test_list_framework_audits_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4551,17 +4555,19 @@ def test_list_framework_audits_rest_interceptors(null_interceptor): ) client = AuditClient(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.AuditRestInterceptor, "post_list_framework_audits" - ) as post, mock.patch.object( - transports.AuditRestInterceptor, "post_list_framework_audits_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AuditRestInterceptor, "pre_list_framework_audits" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AuditRestInterceptor, "post_list_framework_audits" + ) as post, + mock.patch.object( + transports.AuditRestInterceptor, "post_list_framework_audits_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AuditRestInterceptor, "pre_list_framework_audits" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4618,8 +4624,9 @@ def test_get_framework_audit_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4694,17 +4701,19 @@ def test_get_framework_audit_rest_interceptors(null_interceptor): ) client = AuditClient(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.AuditRestInterceptor, "post_get_framework_audit" - ) as post, mock.patch.object( - transports.AuditRestInterceptor, "post_get_framework_audit_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AuditRestInterceptor, "pre_get_framework_audit" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AuditRestInterceptor, "post_get_framework_audit" + ) as post, + mock.patch.object( + transports.AuditRestInterceptor, "post_get_framework_audit_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AuditRestInterceptor, "pre_get_framework_audit" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4755,8 +4764,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4815,8 +4825,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "organizations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4877,8 +4888,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4941,8 +4953,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5005,8 +5018,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5069,8 +5083,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5297,11 +5312,14 @@ def test_audit_base_transport(): def test_audit_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.cloudsecuritycompliance_v1.services.audit.transports.AuditTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.cloudsecuritycompliance_v1.services.audit.transports.AuditTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AuditTransport( @@ -5318,9 +5336,12 @@ def test_audit_base_transport_with_credentials_file(): def test_audit_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.cloudsecuritycompliance_v1.services.audit.transports.AuditTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.cloudsecuritycompliance_v1.services.audit.transports.AuditTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AuditTransport() @@ -5392,11 +5413,12 @@ def test_audit_transport_auth_gdch_credentials(transport_class): def test_audit_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_cm_enrollment_service.py b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_cm_enrollment_service.py index 730b7ce8f262..feea40c712b3 100644 --- a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_cm_enrollment_service.py +++ b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_cm_enrollment_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.cm_enrollment_service import ( CmEnrollmentServiceAsyncClient, @@ -994,10 +999,9 @@ def test_cm_enrollment_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1046,9 @@ def test_cm_enrollment_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1084,9 @@ def test_cm_enrollment_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1340,13 +1342,13 @@ def test_cm_enrollment_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1457,9 +1459,9 @@ def test_update_cm_enrollment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cm_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cm_enrollment] = ( + mock_rpc + ) request = {} client.update_cm_enrollment(request) @@ -2092,9 +2094,9 @@ def test_update_cm_enrollment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cm_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cm_enrollment] = ( + mock_rpc + ) request = {} client.update_cm_enrollment(request) @@ -2697,8 +2699,9 @@ def test_update_cm_enrollment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2841,18 +2844,20 @@ def test_update_cm_enrollment_rest_interceptors(null_interceptor): ) client = CmEnrollmentServiceClient(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.CmEnrollmentServiceRestInterceptor, "post_update_cm_enrollment" - ) as post, mock.patch.object( - transports.CmEnrollmentServiceRestInterceptor, - "post_update_cm_enrollment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmEnrollmentServiceRestInterceptor, "pre_update_cm_enrollment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CmEnrollmentServiceRestInterceptor, "post_update_cm_enrollment" + ) as post, + mock.patch.object( + transports.CmEnrollmentServiceRestInterceptor, + "post_update_cm_enrollment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmEnrollmentServiceRestInterceptor, "pre_update_cm_enrollment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2907,8 +2912,9 @@ def test_calculate_effective_cm_enrollment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2972,20 +2978,22 @@ def test_calculate_effective_cm_enrollment_rest_interceptors(null_interceptor): ) client = CmEnrollmentServiceClient(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.CmEnrollmentServiceRestInterceptor, - "post_calculate_effective_cm_enrollment", - ) as post, mock.patch.object( - transports.CmEnrollmentServiceRestInterceptor, - "post_calculate_effective_cm_enrollment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmEnrollmentServiceRestInterceptor, - "pre_calculate_effective_cm_enrollment", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CmEnrollmentServiceRestInterceptor, + "post_calculate_effective_cm_enrollment", + ) as post, + mock.patch.object( + transports.CmEnrollmentServiceRestInterceptor, + "post_calculate_effective_cm_enrollment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmEnrollmentServiceRestInterceptor, + "pre_calculate_effective_cm_enrollment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3047,8 +3055,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3107,8 +3116,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "organizations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3169,8 +3179,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3233,8 +3244,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3297,8 +3309,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3361,8 +3374,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3521,11 +3535,14 @@ def test_cm_enrollment_service_base_transport(): def test_cm_enrollment_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.cloudsecuritycompliance_v1.services.cm_enrollment_service.transports.CmEnrollmentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.cloudsecuritycompliance_v1.services.cm_enrollment_service.transports.CmEnrollmentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CmEnrollmentServiceTransport( @@ -3542,9 +3559,12 @@ def test_cm_enrollment_service_base_transport_with_credentials_file(): def test_cm_enrollment_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.cloudsecuritycompliance_v1.services.cm_enrollment_service.transports.CmEnrollmentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.cloudsecuritycompliance_v1.services.cm_enrollment_service.transports.CmEnrollmentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CmEnrollmentServiceTransport() @@ -3616,11 +3636,12 @@ def test_cm_enrollment_service_transport_auth_gdch_credentials(transport_class): def test_cm_enrollment_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_config.py b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_config.py index 2ef7a74c7610..5cb487f3539e 100644 --- a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_config.py +++ b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_config.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.config import ( ConfigAsyncClient, @@ -899,10 +904,9 @@ def test_config_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -947,10 +951,9 @@ def test_config_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +989,9 @@ def test_config_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1214,13 +1216,13 @@ def test_config_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2227,9 +2229,9 @@ def test_create_framework_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_framework - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_framework] = ( + mock_rpc + ) request = {} client.create_framework(request) @@ -2604,9 +2606,9 @@ def test_update_framework_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_framework - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_framework] = ( + mock_rpc + ) request = {} client.update_framework(request) @@ -2952,9 +2954,9 @@ def test_delete_framework_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_framework - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_framework] = ( + mock_rpc + ) request = {} client.delete_framework(request) @@ -3276,9 +3278,9 @@ def test_list_cloud_controls_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cloud_controls - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cloud_controls] = ( + mock_rpc + ) request = {} client.list_cloud_controls(request) @@ -3845,9 +3847,9 @@ def test_get_cloud_control_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cloud_control] = ( + mock_rpc + ) request = {} client.get_cloud_control(request) @@ -4240,9 +4242,9 @@ def test_create_cloud_control_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_cloud_control] = ( + mock_rpc + ) request = {} client.create_cloud_control(request) @@ -4649,9 +4651,9 @@ def test_update_cloud_control_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cloud_control] = ( + mock_rpc + ) request = {} client.update_cloud_control(request) @@ -5021,9 +5023,9 @@ def test_delete_cloud_control_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cloud_control] = ( + mock_rpc + ) request = {} client.delete_cloud_control(request) @@ -5717,9 +5719,9 @@ def test_create_framework_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_framework - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_framework] = ( + mock_rpc + ) request = {} client.create_framework(request) @@ -5926,9 +5928,9 @@ def test_update_framework_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_framework - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_framework] = ( + mock_rpc + ) request = {} client.update_framework(request) @@ -6123,9 +6125,9 @@ def test_delete_framework_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_framework - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_framework] = ( + mock_rpc + ) request = {} client.delete_framework(request) @@ -6302,9 +6304,9 @@ def test_list_cloud_controls_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cloud_controls - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cloud_controls] = ( + mock_rpc + ) request = {} client.list_cloud_controls(request) @@ -6558,9 +6560,9 @@ def test_get_cloud_control_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cloud_control] = ( + mock_rpc + ) request = {} client.get_cloud_control(request) @@ -6744,9 +6746,9 @@ def test_create_cloud_control_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_cloud_control] = ( + mock_rpc + ) request = {} client.create_cloud_control(request) @@ -6955,9 +6957,9 @@ def test_update_cloud_control_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cloud_control] = ( + mock_rpc + ) request = {} client.update_cloud_control(request) @@ -7141,9 +7143,9 @@ def test_delete_cloud_control_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cloud_control - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cloud_control] = ( + mock_rpc + ) request = {} client.delete_cloud_control(request) @@ -7994,8 +7996,9 @@ def test_list_frameworks_rest_bad_request(request_type=config.ListFrameworksRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8056,17 +8059,19 @@ def test_list_frameworks_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_list_frameworks" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_list_frameworks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_list_frameworks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_frameworks" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_frameworks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_list_frameworks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8119,8 +8124,9 @@ def test_get_framework_rest_bad_request(request_type=config.GetFrameworkRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8203,17 +8209,17 @@ def test_get_framework_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_get_framework" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_get_framework_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_get_framework" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_framework" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_framework_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ConfigRestInterceptor, "pre_get_framework") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8262,8 +8268,9 @@ def test_create_framework_rest_bad_request(request_type=config.CreateFrameworkRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8442,17 +8449,19 @@ def test_create_framework_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_create_framework" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_create_framework_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_create_framework" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_create_framework" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_create_framework_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_create_framework" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8505,8 +8514,9 @@ def test_update_framework_rest_bad_request(request_type=config.UpdateFrameworkRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8689,17 +8699,19 @@ def test_update_framework_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_update_framework" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_update_framework_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_update_framework" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_update_framework" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_update_framework_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_update_framework" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8750,8 +8762,9 @@ def test_delete_framework_rest_bad_request(request_type=config.DeleteFrameworkRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8808,13 +8821,13 @@ def test_delete_framework_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "pre_delete_framework" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_delete_framework" + ) as pre, + ): pre.assert_not_called() pb_message = config.DeleteFrameworkRequest.pb(config.DeleteFrameworkRequest()) transcode.return_value = { @@ -8857,8 +8870,9 @@ def test_list_cloud_controls_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8919,17 +8933,19 @@ def test_list_cloud_controls_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_list_cloud_controls" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_list_cloud_controls_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_list_cloud_controls" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_cloud_controls" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_cloud_controls_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_list_cloud_controls" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8984,8 +9000,9 @@ def test_get_cloud_control_rest_bad_request(request_type=config.GetCloudControlR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9076,17 +9093,19 @@ def test_get_cloud_control_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_get_cloud_control" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_get_cloud_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_get_cloud_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_cloud_control" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_cloud_control_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_get_cloud_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9137,8 +9156,9 @@ def test_create_cloud_control_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9352,17 +9372,19 @@ def test_create_cloud_control_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_create_cloud_control" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_create_cloud_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_create_cloud_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_create_cloud_control" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_create_cloud_control_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_create_cloud_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9419,8 +9441,9 @@ def test_update_cloud_control_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9638,17 +9661,19 @@ def test_update_cloud_control_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_update_cloud_control" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_update_cloud_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_update_cloud_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_update_cloud_control" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_update_cloud_control_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_update_cloud_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9703,8 +9728,9 @@ def test_delete_cloud_control_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9761,13 +9787,13 @@ def test_delete_cloud_control_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "pre_delete_cloud_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_delete_cloud_control" + ) as pre, + ): pre.assert_not_called() pb_message = config.DeleteCloudControlRequest.pb( config.DeleteCloudControlRequest() @@ -9812,8 +9838,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9872,8 +9899,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "organizations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9934,8 +9962,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9998,8 +10027,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10062,8 +10092,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10126,8 +10157,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10460,11 +10492,14 @@ def test_config_base_transport(): def test_config_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.cloudsecuritycompliance_v1.services.config.transports.ConfigTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.cloudsecuritycompliance_v1.services.config.transports.ConfigTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConfigTransport( @@ -10481,9 +10516,12 @@ def test_config_base_transport_with_credentials_file(): def test_config_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.cloudsecuritycompliance_v1.services.config.transports.ConfigTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.cloudsecuritycompliance_v1.services.config.transports.ConfigTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConfigTransport() @@ -10555,11 +10593,12 @@ def test_config_transport_auth_gdch_credentials(transport_class): def test_config_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_deployment.py b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_deployment.py index 8952cf7b7248..6b264fc33dd2 100644 --- a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_deployment.py +++ b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_deployment.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.deployment import ( DeploymentAsyncClient, @@ -931,10 +931,9 @@ def test_deployment_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +978,9 @@ def test_deployment_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1016,9 @@ def test_deployment_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1250,13 +1247,13 @@ def test_deployment_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5585,8 +5582,9 @@ def test_create_framework_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5765,20 +5763,21 @@ def test_create_framework_deployment_rest_interceptors(null_interceptor): ) client = DeploymentClient(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.DeploymentRestInterceptor, "post_create_framework_deployment" - ) as post, mock.patch.object( - transports.DeploymentRestInterceptor, - "post_create_framework_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeploymentRestInterceptor, "pre_create_framework_deployment" - ) as pre: + 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.DeploymentRestInterceptor, "post_create_framework_deployment" + ) as post, + mock.patch.object( + transports.DeploymentRestInterceptor, + "post_create_framework_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeploymentRestInterceptor, "pre_create_framework_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5833,8 +5832,9 @@ def test_delete_framework_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5893,20 +5893,21 @@ def test_delete_framework_deployment_rest_interceptors(null_interceptor): ) client = DeploymentClient(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.DeploymentRestInterceptor, "post_delete_framework_deployment" - ) as post, mock.patch.object( - transports.DeploymentRestInterceptor, - "post_delete_framework_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeploymentRestInterceptor, "pre_delete_framework_deployment" - ) as pre: + 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.DeploymentRestInterceptor, "post_delete_framework_deployment" + ) as post, + mock.patch.object( + transports.DeploymentRestInterceptor, + "post_delete_framework_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeploymentRestInterceptor, "pre_delete_framework_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5961,8 +5962,9 @@ def test_get_framework_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6040,18 +6042,20 @@ def test_get_framework_deployment_rest_interceptors(null_interceptor): ) client = DeploymentClient(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.DeploymentRestInterceptor, "post_get_framework_deployment" - ) as post, mock.patch.object( - transports.DeploymentRestInterceptor, - "post_get_framework_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeploymentRestInterceptor, "pre_get_framework_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeploymentRestInterceptor, "post_get_framework_deployment" + ) as post, + mock.patch.object( + transports.DeploymentRestInterceptor, + "post_get_framework_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeploymentRestInterceptor, "pre_get_framework_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6106,8 +6110,9 @@ def test_list_framework_deployments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6170,18 +6175,20 @@ def test_list_framework_deployments_rest_interceptors(null_interceptor): ) client = DeploymentClient(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.DeploymentRestInterceptor, "post_list_framework_deployments" - ) as post, mock.patch.object( - transports.DeploymentRestInterceptor, - "post_list_framework_deployments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeploymentRestInterceptor, "pre_list_framework_deployments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeploymentRestInterceptor, "post_list_framework_deployments" + ) as post, + mock.patch.object( + transports.DeploymentRestInterceptor, + "post_list_framework_deployments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeploymentRestInterceptor, "pre_list_framework_deployments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6241,8 +6248,9 @@ def test_get_cloud_control_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6320,18 +6328,20 @@ def test_get_cloud_control_deployment_rest_interceptors(null_interceptor): ) client = DeploymentClient(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.DeploymentRestInterceptor, "post_get_cloud_control_deployment" - ) as post, mock.patch.object( - transports.DeploymentRestInterceptor, - "post_get_cloud_control_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeploymentRestInterceptor, "pre_get_cloud_control_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeploymentRestInterceptor, "post_get_cloud_control_deployment" + ) as post, + mock.patch.object( + transports.DeploymentRestInterceptor, + "post_get_cloud_control_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeploymentRestInterceptor, "pre_get_cloud_control_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6386,8 +6396,9 @@ def test_list_cloud_control_deployments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6450,18 +6461,20 @@ def test_list_cloud_control_deployments_rest_interceptors(null_interceptor): ) client = DeploymentClient(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.DeploymentRestInterceptor, "post_list_cloud_control_deployments" - ) as post, mock.patch.object( - transports.DeploymentRestInterceptor, - "post_list_cloud_control_deployments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeploymentRestInterceptor, "pre_list_cloud_control_deployments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeploymentRestInterceptor, "post_list_cloud_control_deployments" + ) as post, + mock.patch.object( + transports.DeploymentRestInterceptor, + "post_list_cloud_control_deployments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeploymentRestInterceptor, "pre_list_cloud_control_deployments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6519,8 +6532,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6579,8 +6593,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "organizations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6641,8 +6656,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6705,8 +6721,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6769,8 +6786,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6833,8 +6851,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7107,11 +7126,14 @@ def test_deployment_base_transport(): def test_deployment_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.cloudsecuritycompliance_v1.services.deployment.transports.DeploymentTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.cloudsecuritycompliance_v1.services.deployment.transports.DeploymentTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeploymentTransport( @@ -7128,9 +7150,12 @@ def test_deployment_base_transport_with_credentials_file(): def test_deployment_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.cloudsecuritycompliance_v1.services.deployment.transports.DeploymentTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.cloudsecuritycompliance_v1.services.deployment.transports.DeploymentTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeploymentTransport() @@ -7202,11 +7227,12 @@ def test_deployment_transport_auth_gdch_credentials(transport_class): def test_deployment_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_monitoring.py b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_monitoring.py index 55afc710b857..5b89326c39fa 100644 --- a/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_monitoring.py +++ b/packages/google-cloud-cloudsecuritycompliance/tests/unit/gapic/cloudsecuritycompliance_v1/test_monitoring.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.cloudsecuritycompliance_v1.services.monitoring import ( MonitoringAsyncClient, @@ -922,10 +927,9 @@ def test_monitoring_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -970,10 +974,9 @@ def test_monitoring_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1009,10 +1012,9 @@ def test_monitoring_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1241,13 +1243,13 @@ def test_monitoring_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1920,9 +1922,9 @@ def test_list_finding_summaries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_finding_summaries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_finding_summaries] = ( + mock_rpc + ) request = {} client.list_finding_summaries(request) @@ -3945,9 +3947,9 @@ def test_list_finding_summaries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_finding_summaries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_finding_summaries] = ( + mock_rpc + ) request = {} client.list_finding_summaries(request) @@ -5275,8 +5277,9 @@ def test_list_framework_compliance_summaries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5341,18 +5344,22 @@ def test_list_framework_compliance_summaries_rest_interceptors(null_interceptor) ) client = MonitoringClient(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.MonitoringRestInterceptor, "post_list_framework_compliance_summaries" - ) as post, mock.patch.object( - transports.MonitoringRestInterceptor, - "post_list_framework_compliance_summaries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MonitoringRestInterceptor, "pre_list_framework_compliance_summaries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MonitoringRestInterceptor, + "post_list_framework_compliance_summaries", + ) as post, + mock.patch.object( + transports.MonitoringRestInterceptor, + "post_list_framework_compliance_summaries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MonitoringRestInterceptor, + "pre_list_framework_compliance_summaries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5410,8 +5417,9 @@ def test_list_finding_summaries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5474,18 +5482,20 @@ def test_list_finding_summaries_rest_interceptors(null_interceptor): ) client = MonitoringClient(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.MonitoringRestInterceptor, "post_list_finding_summaries" - ) as post, mock.patch.object( - transports.MonitoringRestInterceptor, - "post_list_finding_summaries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MonitoringRestInterceptor, "pre_list_finding_summaries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MonitoringRestInterceptor, "post_list_finding_summaries" + ) as post, + mock.patch.object( + transports.MonitoringRestInterceptor, + "post_list_finding_summaries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MonitoringRestInterceptor, "pre_list_finding_summaries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5545,8 +5555,9 @@ def test_fetch_framework_compliance_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5629,18 +5640,22 @@ def test_fetch_framework_compliance_report_rest_interceptors(null_interceptor): ) client = MonitoringClient(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.MonitoringRestInterceptor, "post_fetch_framework_compliance_report" - ) as post, mock.patch.object( - transports.MonitoringRestInterceptor, - "post_fetch_framework_compliance_report_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MonitoringRestInterceptor, "pre_fetch_framework_compliance_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MonitoringRestInterceptor, + "post_fetch_framework_compliance_report", + ) as post, + mock.patch.object( + transports.MonitoringRestInterceptor, + "post_fetch_framework_compliance_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MonitoringRestInterceptor, + "pre_fetch_framework_compliance_report", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5700,8 +5715,9 @@ def test_list_control_compliance_summaries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5768,18 +5784,22 @@ def test_list_control_compliance_summaries_rest_interceptors(null_interceptor): ) client = MonitoringClient(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.MonitoringRestInterceptor, "post_list_control_compliance_summaries" - ) as post, mock.patch.object( - transports.MonitoringRestInterceptor, - "post_list_control_compliance_summaries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MonitoringRestInterceptor, "pre_list_control_compliance_summaries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MonitoringRestInterceptor, + "post_list_control_compliance_summaries", + ) as post, + mock.patch.object( + transports.MonitoringRestInterceptor, + "post_list_control_compliance_summaries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MonitoringRestInterceptor, + "pre_list_control_compliance_summaries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5839,8 +5859,9 @@ def test_aggregate_framework_compliance_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5904,20 +5925,22 @@ def test_aggregate_framework_compliance_report_rest_interceptors(null_intercepto ) client = MonitoringClient(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.MonitoringRestInterceptor, - "post_aggregate_framework_compliance_report", - ) as post, mock.patch.object( - transports.MonitoringRestInterceptor, - "post_aggregate_framework_compliance_report_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MonitoringRestInterceptor, - "pre_aggregate_framework_compliance_report", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MonitoringRestInterceptor, + "post_aggregate_framework_compliance_report", + ) as post, + mock.patch.object( + transports.MonitoringRestInterceptor, + "post_aggregate_framework_compliance_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MonitoringRestInterceptor, + "pre_aggregate_framework_compliance_report", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5975,8 +5998,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6035,8 +6059,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "organizations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6097,8 +6122,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6161,8 +6187,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6225,8 +6252,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6289,8 +6317,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6518,11 +6547,14 @@ def test_monitoring_base_transport(): def test_monitoring_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.cloudsecuritycompliance_v1.services.monitoring.transports.MonitoringTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.cloudsecuritycompliance_v1.services.monitoring.transports.MonitoringTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MonitoringTransport( @@ -6539,9 +6571,12 @@ def test_monitoring_base_transport_with_credentials_file(): def test_monitoring_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.cloudsecuritycompliance_v1.services.monitoring.transports.MonitoringTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.cloudsecuritycompliance_v1.services.monitoring.transports.MonitoringTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MonitoringTransport() @@ -6613,11 +6648,12 @@ def test_monitoring_transport_auth_gdch_credentials(transport_class): def test_monitoring_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-commerce-consumer-procurement/docs/conf.py b/packages/google-cloud-commerce-consumer-procurement/docs/conf.py index 50d79a81cc19..4a495305531a 100644 --- a/packages/google-cloud-commerce-consumer-procurement/docs/conf.py +++ b/packages/google-cloud-commerce-consumer-procurement/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-commerce-consumer-procurement documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/__init__.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/__init__.py index 3d321573aa88..5255a3d806c9 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/__init__.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/__init__.py @@ -30,6 +30,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.consumer_procurement_service import ( ConsumerProcurementServiceAsyncClient, ConsumerProcurementServiceClient, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/async_client.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/async_client.py index bd4d11ab094d..0e5b985c6e19 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/async_client.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1 import ( gapic_version as package_version, @@ -46,10 +46,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1.services.consumer_procurement_service import ( pagers, @@ -143,7 +143,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConsumerProcurementServiceAsyncClient: The constructed client. """ - return ConsumerProcurementServiceClient.from_service_account_info.__func__(ConsumerProcurementServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConsumerProcurementServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + ConsumerProcurementServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +164,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConsumerProcurementServiceAsyncClient: The constructed client. """ - return ConsumerProcurementServiceClient.from_service_account_file.__func__(ConsumerProcurementServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConsumerProcurementServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + ConsumerProcurementServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -197,7 +207,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConsumerProcurementServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConsumerProcurementServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConsumerProcurementServiceTransport: diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/client.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/client.py index c9506bbdb309..9b8175faf341 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/client.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1 import ( gapic_version as package_version, @@ -63,10 +63,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1.services.consumer_procurement_service import ( pagers, @@ -90,9 +90,7 @@ class ConsumerProcurementServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConsumerProcurementServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConsumerProcurementServiceTransport]] _transport_registry["grpc"] = ConsumerProcurementServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConsumerProcurementServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConsumerProcurementServiceRestTransport @@ -660,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConsumerProcurementServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConsumerProcurementServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConsumerProcurementServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -701,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConsumerProcurementServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/pagers.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/pagers.py index 9e385376ee57..7854aa98c540 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/pagers.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/__init__.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/__init__.py index 63bd78670d71..1edabe5054b7 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/__init__.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConsumerProcurementServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConsumerProcurementServiceTransport]] _transport_registry["grpc"] = ConsumerProcurementServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConsumerProcurementServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConsumerProcurementServiceRestTransport diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/base.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/base.py index a20619190bfc..ba85d1d22e1d 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/base.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1 import ( gapic_version as package_version, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc.py index 593ac00258f2..c61ace9496de 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.commerce_consumer_procurement_v1.types import ( order, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc_asyncio.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc_asyncio.py index 5a8332e5f75e..690d1357aaba 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.commerce_consumer_procurement_v1.types import ( order, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/rest.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/rest.py index fac56914d124..94d15bba1223 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/rest.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/consumer_procurement_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -577,9 +577,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseCancelOrder._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseCancelOrder._get_http_options() request, metadata = self._interceptor.pre_cancel_order(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseCancelOrder._get_transcoded_request( @@ -603,7 +601,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -746,9 +744,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseGetOrder._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseGetOrder._get_http_options() request, metadata = self._interceptor.pre_get_order(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseGetOrder._get_transcoded_request( @@ -894,9 +890,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseListOrders._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseListOrders._get_http_options() request, metadata = self._interceptor.pre_list_orders(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseListOrders._get_transcoded_request( @@ -1048,9 +1042,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseModifyOrder._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseModifyOrder._get_http_options() request, metadata = self._interceptor.pre_modify_order(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseModifyOrder._get_transcoded_request( @@ -1074,7 +1066,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1203,9 +1195,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BasePlaceOrder._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BasePlaceOrder._get_http_options() request, metadata = self._interceptor.pre_place_order(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BasePlaceOrder._get_transcoded_request( @@ -1229,7 +1219,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1396,9 +1386,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/async_client.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/async_client.py index 0a5786f17e25..e45457a92952 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/async_client.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1 import ( gapic_version as package_version, @@ -46,8 +46,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1.services.license_management_service import ( pagers, @@ -130,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LicenseManagementServiceAsyncClient: The constructed client. """ - return LicenseManagementServiceClient.from_service_account_info.__func__(LicenseManagementServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = LicenseManagementServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(LicenseManagementServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +147,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LicenseManagementServiceAsyncClient: The constructed client. """ - return LicenseManagementServiceClient.from_service_account_file.__func__(LicenseManagementServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = LicenseManagementServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + LicenseManagementServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -184,7 +188,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return LicenseManagementServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return LicenseManagementServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> LicenseManagementServiceTransport: diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/client.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/client.py index aa6d0a8af99d..d01d5d9aab88 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/client.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1 import ( gapic_version as package_version, @@ -63,8 +63,8 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1.services.license_management_service import ( pagers, @@ -87,9 +87,7 @@ class LicenseManagementServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LicenseManagementServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LicenseManagementServiceTransport]] _transport_registry["grpc"] = LicenseManagementServiceGrpcTransport _transport_registry["grpc_asyncio"] = LicenseManagementServiceGrpcAsyncIOTransport _transport_registry["rest"] = LicenseManagementServiceRestTransport @@ -633,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LicenseManagementServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LicenseManagementServiceClient._read_environment_variables() + ) self._client_cert_source = ( LicenseManagementServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -674,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LicenseManagementServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/pagers.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/pagers.py index 5cc1693d399d..036563990665 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/pagers.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -153,7 +153,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/__init__.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/__init__.py index a2c6b4459d37..0c8620231e11 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/__init__.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[LicenseManagementServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[LicenseManagementServiceTransport]] _transport_registry["grpc"] = LicenseManagementServiceGrpcTransport _transport_registry["grpc_asyncio"] = LicenseManagementServiceGrpcAsyncIOTransport _transport_registry["rest"] = LicenseManagementServiceRestTransport diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/base.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/base.py index 63e93eaba292..535448dcab45 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/base.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1 import ( gapic_version as package_version, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc.py index 821822ae379c..399b1548d3bd 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.commerce_consumer_procurement_v1.types import ( license_management_service, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc_asyncio.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc_asyncio.py index 6399e7941fc7..3d64e26ef8e7 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.commerce_consumer_procurement_v1.types import ( license_management_service, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/rest.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/rest.py index ee3fd76a3699..f1a4e4c1c747 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/rest.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/services/license_management_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -551,9 +551,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagementServiceRestTransport._BaseAssign._get_http_options() - ) + http_options = _BaseLicenseManagementServiceRestTransport._BaseAssign._get_http_options() request, metadata = self._interceptor.pre_assign(request, metadata) transcoded_request = _BaseLicenseManagementServiceRestTransport._BaseAssign._get_transcoded_request( @@ -706,9 +704,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagementServiceRestTransport._BaseEnumerateLicensedUsers._get_http_options() - ) + http_options = _BaseLicenseManagementServiceRestTransport._BaseEnumerateLicensedUsers._get_http_options() request, metadata = self._interceptor.pre_enumerate_licensed_users( request, metadata @@ -858,9 +854,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagementServiceRestTransport._BaseGetLicensePool._get_http_options() - ) + http_options = _BaseLicenseManagementServiceRestTransport._BaseGetLicensePool._get_http_options() request, metadata = self._interceptor.pre_get_license_pool( request, metadata @@ -1013,9 +1007,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagementServiceRestTransport._BaseUnassign._get_http_options() - ) + http_options = _BaseLicenseManagementServiceRestTransport._BaseUnassign._get_http_options() request, metadata = self._interceptor.pre_unassign(request, metadata) transcoded_request = _BaseLicenseManagementServiceRestTransport._BaseUnassign._get_transcoded_request( @@ -1169,9 +1161,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagementServiceRestTransport._BaseUpdateLicensePool._get_http_options() - ) + http_options = _BaseLicenseManagementServiceRestTransport._BaseUpdateLicensePool._get_http_options() request, metadata = self._interceptor.pre_update_license_pool( request, metadata @@ -1290,7 +1280,9 @@ def enumerate_licensed_users( ]: # 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._EnumerateLicensedUsers(self._session, self._host, self._interceptor) # type: ignore + return self._EnumerateLicensedUsers( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_license_pool( @@ -1383,9 +1375,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseLicenseManagementServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseLicenseManagementServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseLicenseManagementServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/license_management_service.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/license_management_service.py index 9890b2ee77b0..6a2411520ae7 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/license_management_service.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/license_management_service.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/order.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/order.py index 9a0df11dd78b..62cb79f07316 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/order.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/order.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -53,6 +53,7 @@ class LineItemChangeType(proto.Enum): LINE_ITEM_CHANGE_TYPE_REVERT_CANCELLATION (4): The change is to revert a cancellation. """ + LINE_ITEM_CHANGE_TYPE_UNSPECIFIED = 0 LINE_ITEM_CHANGE_TYPE_CREATE = 1 LINE_ITEM_CHANGE_TYPE_UPDATE = 2 @@ -98,6 +99,7 @@ class LineItemChangeState(proto.Enum): state. This state is only applicable for pending change. """ + LINE_ITEM_CHANGE_STATE_UNSPECIFIED = 0 LINE_ITEM_CHANGE_STATE_PENDING_APPROVAL = 1 LINE_ITEM_CHANGE_STATE_APPROVED = 2 @@ -124,6 +126,7 @@ class LineItemChangeStateReasonType(proto.Enum): Change is in current state due to system-initiated cancellation. """ + LINE_ITEM_CHANGE_STATE_REASON_TYPE_UNSPECIFIED = 0 LINE_ITEM_CHANGE_STATE_REASON_TYPE_EXPIRED = 1 LINE_ITEM_CHANGE_STATE_REASON_TYPE_USER_CANCELLED = 2 diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/procurement_service.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/procurement_service.py index 7471616ae14f..d106b6bbbea9 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/procurement_service.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1/types/procurement_service.py @@ -52,6 +52,7 @@ class AutoRenewalBehavior(proto.Enum): Auto Renewal will be disabled on subscription. """ + AUTO_RENEWAL_BEHAVIOR_UNSPECIFIED = 0 AUTO_RENEWAL_BEHAVIOR_ENABLE = 1 AUTO_RENEWAL_BEHAVIOR_DISABLE = 2 @@ -334,6 +335,7 @@ class CancellationPolicy(proto.Enum): order is not subscription based, the request will fail. """ + CANCELLATION_POLICY_UNSPECIFIED = 0 CANCELLATION_POLICY_CANCEL_IMMEDIATELY = 1 CANCELLATION_POLICY_CANCEL_AT_TERM_END = 2 diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/__init__.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/__init__.py index e50412c9f87b..509b937da6fb 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/__init__.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/__init__.py @@ -30,6 +30,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.consumer_procurement_service import ( ConsumerProcurementServiceAsyncClient, ConsumerProcurementServiceClient, @@ -57,7 +58,9 @@ api_core, "check_dependency_versions" ): # pragma: NO COVER api_core.check_python_version("google.cloud.commerce_consumer_procurement_v1alpha1") # type: ignore - api_core.check_dependency_versions("google.cloud.commerce_consumer_procurement_v1alpha1") # type: ignore + api_core.check_dependency_versions( + "google.cloud.commerce_consumer_procurement_v1alpha1" + ) # type: ignore else: # pragma: NO COVER # An older version of api_core is installed which does not define the # functions above. We do equivalent checks manually. diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/async_client.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/async_client.py index a8df8941b4ae..071663fb7d02 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/async_client.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1alpha1 import ( gapic_version as package_version, @@ -46,10 +46,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1alpha1.services.consumer_procurement_service import ( pagers, @@ -143,7 +143,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConsumerProcurementServiceAsyncClient: The constructed client. """ - return ConsumerProcurementServiceClient.from_service_account_info.__func__(ConsumerProcurementServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConsumerProcurementServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + ConsumerProcurementServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +164,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConsumerProcurementServiceAsyncClient: The constructed client. """ - return ConsumerProcurementServiceClient.from_service_account_file.__func__(ConsumerProcurementServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConsumerProcurementServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + ConsumerProcurementServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -197,7 +207,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConsumerProcurementServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConsumerProcurementServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConsumerProcurementServiceTransport: diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/client.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/client.py index 21a6f74701c6..416661f058e3 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/client.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1alpha1 import ( gapic_version as package_version, @@ -63,10 +63,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1alpha1.services.consumer_procurement_service import ( pagers, @@ -90,9 +90,7 @@ class ConsumerProcurementServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConsumerProcurementServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConsumerProcurementServiceTransport]] _transport_registry["grpc"] = ConsumerProcurementServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConsumerProcurementServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConsumerProcurementServiceRestTransport @@ -660,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConsumerProcurementServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConsumerProcurementServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConsumerProcurementServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -701,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConsumerProcurementServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/pagers.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/pagers.py index 5d460385a710..64870cfdc44b 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/pagers.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/__init__.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/__init__.py index 63bd78670d71..1edabe5054b7 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/__init__.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConsumerProcurementServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConsumerProcurementServiceTransport]] _transport_registry["grpc"] = ConsumerProcurementServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConsumerProcurementServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConsumerProcurementServiceRestTransport diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/base.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/base.py index a1bd880a03db..ba86469dd3cc 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/base.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.commerce_consumer_procurement_v1alpha1 import ( gapic_version as package_version, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc.py index 1a35bb3e91a0..22a991bd96fe 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.commerce_consumer_procurement_v1alpha1.types import ( order, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc_asyncio.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc_asyncio.py index bdb6ac5aea1d..277ea13d647b 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.commerce_consumer_procurement_v1alpha1.types import ( order, diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/rest.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/rest.py index 11e301b6701b..641b4f0b2b91 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/rest.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/services/consumer_procurement_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -483,9 +483,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseGetOrder._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseGetOrder._get_http_options() request, metadata = self._interceptor.pre_get_order(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseGetOrder._get_transcoded_request( @@ -631,9 +629,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseListOrders._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseListOrders._get_http_options() request, metadata = self._interceptor.pre_list_orders(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseListOrders._get_transcoded_request( @@ -785,9 +781,7 @@ def __call__( """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BasePlaceOrder._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BasePlaceOrder._get_http_options() request, metadata = self._interceptor.pre_place_order(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BasePlaceOrder._get_transcoded_request( @@ -811,7 +805,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -962,9 +956,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConsumerProcurementServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConsumerProcurementServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConsumerProcurementServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/types/order.py b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/types/order.py index 7c02b4a766c0..9e4d9ea61eb8 100644 --- a/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/types/order.py +++ b/packages/google-cloud-commerce-consumer-procurement/google/cloud/commerce_consumer_procurement_v1alpha1/types/order.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -53,6 +53,7 @@ class LineItemChangeType(proto.Enum): LINE_ITEM_CHANGE_TYPE_REVERT_CANCELLATION (4): The change is to revert a cancellation. """ + LINE_ITEM_CHANGE_TYPE_UNSPECIFIED = 0 LINE_ITEM_CHANGE_TYPE_CREATE = 1 LINE_ITEM_CHANGE_TYPE_UPDATE = 2 @@ -92,6 +93,7 @@ class LineItemChangeState(proto.Enum): be overwritten or cancelled when it's in this state. """ + LINE_ITEM_CHANGE_STATE_UNSPECIFIED = 0 LINE_ITEM_CHANGE_STATE_PENDING_APPROVAL = 1 LINE_ITEM_CHANGE_STATE_APPROVED = 2 @@ -118,6 +120,7 @@ class LineItemChangeStateReasonType(proto.Enum): Change is in current state due to system-initiated cancellation. """ + LINE_ITEM_CHANGE_STATE_REASON_TYPE_UNSPECIFIED = 0 LINE_ITEM_CHANGE_STATE_REASON_TYPE_EXPIRED = 1 LINE_ITEM_CHANGE_STATE_REASON_TYPE_USER_CANCELLED = 2 diff --git a/packages/google-cloud-commerce-consumer-procurement/noxfile.py b/packages/google-cloud-commerce-consumer-procurement/noxfile.py index 91a2881e44c7..8f7dc8a54cc6 100644 --- a/packages/google-cloud-commerce-consumer-procurement/noxfile.py +++ b/packages/google-cloud-commerce-consumer-procurement/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_consumer_procurement_service.py b/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_consumer_procurement_service.py index 8e2116ded598..642b74b663b0 100644 --- a/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_consumer_procurement_service.py +++ b/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_consumer_procurement_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,16 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1.services.consumer_procurement_service import ( ConsumerProcurementServiceAsyncClient, @@ -1034,10 +1034,9 @@ def test_consumer_procurement_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1081,9 @@ def test_consumer_procurement_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1121,10 +1119,9 @@ def test_consumer_procurement_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1383,13 +1380,13 @@ def test_consumer_procurement_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4186,8 +4183,9 @@ def test_place_order_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4244,20 +4242,21 @@ def test_place_order_rest_interceptors(null_interceptor): ) client = ConsumerProcurementServiceClient(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.ConsumerProcurementServiceRestInterceptor, "post_place_order" - ) as post, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, - "post_place_order_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, "pre_place_order" - ) as pre: + 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.ConsumerProcurementServiceRestInterceptor, "post_place_order" + ) as post, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, + "post_place_order_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, "pre_place_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4308,8 +4307,9 @@ def test_get_order_rest_bad_request(request_type=procurement_service.GetOrderReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4376,18 +4376,20 @@ def test_get_order_rest_interceptors(null_interceptor): ) client = ConsumerProcurementServiceClient(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.ConsumerProcurementServiceRestInterceptor, "post_get_order" - ) as post, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, - "post_get_order_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, "pre_get_order" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, "post_get_order" + ) as post, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, + "post_get_order_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, "pre_get_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4440,8 +4442,9 @@ def test_list_orders_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4504,18 +4507,20 @@ def test_list_orders_rest_interceptors(null_interceptor): ) client = ConsumerProcurementServiceClient(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.ConsumerProcurementServiceRestInterceptor, "post_list_orders" - ) as post, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, - "post_list_orders_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, "pre_list_orders" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, "post_list_orders" + ) as post, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, + "post_list_orders_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, "pre_list_orders" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4573,8 +4578,9 @@ def test_modify_order_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4631,20 +4637,21 @@ def test_modify_order_rest_interceptors(null_interceptor): ) client = ConsumerProcurementServiceClient(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.ConsumerProcurementServiceRestInterceptor, "post_modify_order" - ) as post, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, - "post_modify_order_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, "pre_modify_order" - ) as pre: + 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.ConsumerProcurementServiceRestInterceptor, "post_modify_order" + ) as post, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, + "post_modify_order_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, "pre_modify_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4697,8 +4704,9 @@ def test_cancel_order_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4755,20 +4763,21 @@ def test_cancel_order_rest_interceptors(null_interceptor): ) client = ConsumerProcurementServiceClient(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.ConsumerProcurementServiceRestInterceptor, "post_cancel_order" - ) as post, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, - "post_cancel_order_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, "pre_cancel_order" - ) as pre: + 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.ConsumerProcurementServiceRestInterceptor, "post_cancel_order" + ) as post, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, + "post_cancel_order_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, "pre_cancel_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4823,8 +4832,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5059,11 +5069,14 @@ def test_consumer_procurement_service_base_transport(): def test_consumer_procurement_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.commerce_consumer_procurement_v1.services.consumer_procurement_service.transports.ConsumerProcurementServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.commerce_consumer_procurement_v1.services.consumer_procurement_service.transports.ConsumerProcurementServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConsumerProcurementServiceTransport( @@ -5080,9 +5093,12 @@ def test_consumer_procurement_service_base_transport_with_credentials_file(): def test_consumer_procurement_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.commerce_consumer_procurement_v1.services.consumer_procurement_service.transports.ConsumerProcurementServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.commerce_consumer_procurement_v1.services.consumer_procurement_service.transports.ConsumerProcurementServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConsumerProcurementServiceTransport() @@ -5156,11 +5172,12 @@ def test_consumer_procurement_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_license_management_service.py b/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_license_management_service.py index 45e81b2252b3..5c38fe9781c0 100644 --- a/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_license_management_service.py +++ b/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1/test_license_management_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1.services.license_management_service import ( LicenseManagementServiceAsyncClient, @@ -1008,10 +1013,9 @@ def test_license_management_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1056,10 +1060,9 @@ def test_license_management_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1095,10 +1098,9 @@ def test_license_management_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1355,13 +1357,13 @@ def test_license_management_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1472,9 +1474,9 @@ def test_get_license_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_license_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_license_pool] = ( + mock_rpc + ) request = {} client.get_license_pool(request) @@ -1808,9 +1810,9 @@ def test_update_license_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_license_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_license_pool] = ( + mock_rpc + ) request = {} client.update_license_pool(request) @@ -2192,9 +2194,9 @@ async def test_assign_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.assign - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.assign] = ( + mock_rpc + ) request = {} await client.assign(request) @@ -3299,9 +3301,9 @@ def test_get_license_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_license_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_license_pool] = ( + mock_rpc + ) request = {} client.get_license_pool(request) @@ -3481,9 +3483,9 @@ def test_update_license_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_license_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_license_pool] = ( + mock_rpc + ) request = {} client.update_license_pool(request) @@ -4700,8 +4702,9 @@ def test_get_license_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4768,18 +4771,20 @@ def test_get_license_pool_rest_interceptors(null_interceptor): ) client = LicenseManagementServiceClient(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.LicenseManagementServiceRestInterceptor, "post_get_license_pool" - ) as post, mock.patch.object( - transports.LicenseManagementServiceRestInterceptor, - "post_get_license_pool_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagementServiceRestInterceptor, "pre_get_license_pool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, "post_get_license_pool" + ) as post, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, + "post_get_license_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, "pre_get_license_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4839,8 +4844,9 @@ def test_update_license_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4989,18 +4995,22 @@ def test_update_license_pool_rest_interceptors(null_interceptor): ) client = LicenseManagementServiceClient(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.LicenseManagementServiceRestInterceptor, "post_update_license_pool" - ) as post, mock.patch.object( - transports.LicenseManagementServiceRestInterceptor, - "post_update_license_pool_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagementServiceRestInterceptor, "pre_update_license_pool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, + "post_update_license_pool", + ) as post, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, + "post_update_license_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, + "pre_update_license_pool", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5056,8 +5066,9 @@ def test_assign_rest_bad_request(request_type=license_management_service.AssignR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5117,17 +5128,20 @@ def test_assign_rest_interceptors(null_interceptor): ) client = LicenseManagementServiceClient(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.LicenseManagementServiceRestInterceptor, "post_assign" - ) as post, mock.patch.object( - transports.LicenseManagementServiceRestInterceptor, "post_assign_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagementServiceRestInterceptor, "pre_assign" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, "post_assign" + ) as post, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, + "post_assign_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, "pre_assign" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5185,8 +5199,9 @@ def test_unassign_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5246,18 +5261,20 @@ def test_unassign_rest_interceptors(null_interceptor): ) client = LicenseManagementServiceClient(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.LicenseManagementServiceRestInterceptor, "post_unassign" - ) as post, mock.patch.object( - transports.LicenseManagementServiceRestInterceptor, - "post_unassign_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagementServiceRestInterceptor, "pre_unassign" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, "post_unassign" + ) as post, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, + "post_unassign_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, "pre_unassign" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5315,8 +5332,9 @@ def test_enumerate_licensed_users_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5381,20 +5399,22 @@ def test_enumerate_licensed_users_rest_interceptors(null_interceptor): ) client = LicenseManagementServiceClient(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.LicenseManagementServiceRestInterceptor, - "post_enumerate_licensed_users", - ) as post, mock.patch.object( - transports.LicenseManagementServiceRestInterceptor, - "post_enumerate_licensed_users_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagementServiceRestInterceptor, - "pre_enumerate_licensed_users", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, + "post_enumerate_licensed_users", + ) as post, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, + "post_enumerate_licensed_users_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagementServiceRestInterceptor, + "pre_enumerate_licensed_users", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5456,8 +5476,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5674,11 +5695,14 @@ def test_license_management_service_base_transport(): def test_license_management_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.commerce_consumer_procurement_v1.services.license_management_service.transports.LicenseManagementServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.commerce_consumer_procurement_v1.services.license_management_service.transports.LicenseManagementServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LicenseManagementServiceTransport( @@ -5695,9 +5719,12 @@ def test_license_management_service_base_transport_with_credentials_file(): def test_license_management_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.commerce_consumer_procurement_v1.services.license_management_service.transports.LicenseManagementServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.commerce_consumer_procurement_v1.services.license_management_service.transports.LicenseManagementServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LicenseManagementServiceTransport() @@ -5771,11 +5798,12 @@ def test_license_management_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1alpha1/test_consumer_procurement_service.py b/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1alpha1/test_consumer_procurement_service.py index a501525349ab..069e8082032c 100644 --- a/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1alpha1/test_consumer_procurement_service.py +++ b/packages/google-cloud-commerce-consumer-procurement/tests/unit/gapic/commerce_consumer_procurement_v1alpha1/test_consumer_procurement_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,16 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.commerce_consumer_procurement_v1alpha1.services.consumer_procurement_service import ( ConsumerProcurementServiceAsyncClient, @@ -1034,10 +1034,9 @@ def test_consumer_procurement_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1081,9 @@ def test_consumer_procurement_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1121,10 +1119,9 @@ def test_consumer_procurement_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1383,13 +1380,13 @@ def test_consumer_procurement_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3356,8 +3353,9 @@ def test_place_order_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3414,20 +3412,21 @@ def test_place_order_rest_interceptors(null_interceptor): ) client = ConsumerProcurementServiceClient(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.ConsumerProcurementServiceRestInterceptor, "post_place_order" - ) as post, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, - "post_place_order_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, "pre_place_order" - ) as pre: + 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.ConsumerProcurementServiceRestInterceptor, "post_place_order" + ) as post, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, + "post_place_order_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, "pre_place_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3478,8 +3477,9 @@ def test_get_order_rest_bad_request(request_type=procurement_service.GetOrderReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3546,18 +3546,20 @@ def test_get_order_rest_interceptors(null_interceptor): ) client = ConsumerProcurementServiceClient(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.ConsumerProcurementServiceRestInterceptor, "post_get_order" - ) as post, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, - "post_get_order_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, "pre_get_order" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, "post_get_order" + ) as post, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, + "post_get_order_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, "pre_get_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3610,8 +3612,9 @@ def test_list_orders_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3674,18 +3677,20 @@ def test_list_orders_rest_interceptors(null_interceptor): ) client = ConsumerProcurementServiceClient(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.ConsumerProcurementServiceRestInterceptor, "post_list_orders" - ) as post, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, - "post_list_orders_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConsumerProcurementServiceRestInterceptor, "pre_list_orders" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, "post_list_orders" + ) as post, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, + "post_list_orders_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConsumerProcurementServiceRestInterceptor, "pre_list_orders" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3745,8 +3750,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3939,11 +3945,14 @@ def test_consumer_procurement_service_base_transport(): def test_consumer_procurement_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.commerce_consumer_procurement_v1alpha1.services.consumer_procurement_service.transports.ConsumerProcurementServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.commerce_consumer_procurement_v1alpha1.services.consumer_procurement_service.transports.ConsumerProcurementServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConsumerProcurementServiceTransport( @@ -3960,9 +3969,12 @@ def test_consumer_procurement_service_base_transport_with_credentials_file(): def test_consumer_procurement_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.commerce_consumer_procurement_v1alpha1.services.consumer_procurement_service.transports.ConsumerProcurementServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.commerce_consumer_procurement_v1alpha1.services.consumer_procurement_service.transports.ConsumerProcurementServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConsumerProcurementServiceTransport() @@ -4036,11 +4048,12 @@ def test_consumer_procurement_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-common/docs/conf.py b/packages/google-cloud-common/docs/conf.py index 8e59a5bb25f7..c9fc77327946 100644 --- a/packages/google-cloud-common/docs/conf.py +++ b/packages/google-cloud-common/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-common documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-common/google/cloud/common/__init__.py b/packages/google-cloud-common/google/cloud/common/__init__.py index fc95ec33ea31..27e96905bdd1 100644 --- a/packages/google-cloud-common/google/cloud/common/__init__.py +++ b/packages/google-cloud-common/google/cloud/common/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.operation_metadata import OperationMetadata if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-cloud-common/google/cloud/common/types/__init__.py b/packages/google-cloud-common/google/cloud/common/types/__init__.py index 8ddfca97a7da..19b7088c23e9 100644 --- a/packages/google-cloud-common/google/cloud/common/types/__init__.py +++ b/packages/google-cloud-common/google/cloud/common/types/__init__.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .operation_metadata import OperationMetadata +from .operation_metadata import ( + OperationMetadata, +) __all__ = ("OperationMetadata",) diff --git a/packages/google-cloud-common/google/cloud/common/types/operation_metadata.py b/packages/google-cloud-common/google/cloud/common/types/operation_metadata.py index 5a7375d3d49f..491a58f2170a 100644 --- a/packages/google-cloud-common/google/cloud/common/types/operation_metadata.py +++ b/packages/google-cloud-common/google/cloud/common/types/operation_metadata.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-common/noxfile.py b/packages/google-cloud-common/noxfile.py index d8e06c8b187c..7b5a075e44fc 100644 --- a/packages/google-cloud-common/noxfile.py +++ b/packages/google-cloud-common/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-compute-v1beta/docs/conf.py b/packages/google-cloud-compute-v1beta/docs/conf.py index d6e54e36aedb..72974d5150bd 100644 --- a/packages/google-cloud-compute-v1beta/docs/conf.py +++ b/packages/google-cloud-compute-v1beta/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-compute-v1beta documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/__init__.py index 40c9cdffb1a3..d449ed277d2e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.accelerator_types import AcceleratorTypesClient from .services.addresses import AddressesClient from .services.advice import AdviceClient diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/client.py index 308529af4b05..5341bdc9302c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class AcceleratorTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AcceleratorTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AcceleratorTypesTransport]] _transport_registry["rest"] = AcceleratorTypesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AcceleratorTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AcceleratorTypesClient._read_environment_variables() + ) self._client_cert_source = AcceleratorTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AcceleratorTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/pagers.py index fa37238ec35b..5cd1b4f507c7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/base.py index 85533ab60620..d0679ddf7ea4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/rest.py index 4c3b54ce90fd..5d4e3e6e5ffa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/accelerator_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -397,9 +397,7 @@ def __call__( """ - http_options = ( - _BaseAcceleratorTypesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseAcceleratorTypesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseAcceleratorTypesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/client.py index de86910171fc..059152ebe477 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.addresses import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AddressesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AddressesClient._read_environment_variables() + ) self._client_cert_source = AddressesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AddressesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/pagers.py index c1a522c7bc65..8e60a3e73029 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/base.py index 1e38b8caae0d..e0c5ee1361ed 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/rest.py index 8a820df751d3..8aad6ff5593b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/addresses/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/client.py index 7487dd01906b..454d51f652d1 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -594,11 +594,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AdviceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AdviceClient._read_environment_variables() + ) self._client_cert_source = AdviceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -633,8 +631,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AdviceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/base.py index f6b891201793..d89153f62492 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/rest.py index 716031b142c3..341fddb4f2b8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/advice/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/client.py index f8ccb0a74026..91cb3f7f4302 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.autoscalers import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutoscalersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutoscalersClient._read_environment_variables() + ) self._client_cert_source = AutoscalersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutoscalersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/pagers.py index b4d094299c72..817129bc067d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/base.py index 382bdbd4c17e..b358d38200ba 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/rest.py index 0d95cbbc7bd2..b724f976d1bb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/autoscalers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1652,9 +1652,7 @@ def __call__( """ - http_options = ( - _BaseAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/client.py index 4a0d31ca2a26..91a307a4d02b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.backend_buckets import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class BackendBucketsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BackendBucketsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BackendBucketsTransport]] _transport_registry["rest"] = BackendBucketsRestTransport def get_transport_class( @@ -600,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackendBucketsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackendBucketsClient._read_environment_variables() + ) self._client_cert_source = BackendBucketsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackendBucketsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/pagers.py index af86b8d652c7..87bed3ebfa92 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/base.py index c7b08d24962a..fa965dc86df2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/rest.py index 7cb4592f96d2..c4cebaed5cf6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_buckets/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1036,9 +1036,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseAddSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseAddSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_add_signed_url_key( request, metadata @@ -1541,9 +1539,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseDeleteSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseDeleteSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_delete_signed_url_key( request, metadata @@ -2749,9 +2745,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_edge_security_policy( request, metadata @@ -3129,9 +3123,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/client.py index 4950bf885a49..f60c8d66fe9a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.backend_services import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class BackendServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BackendServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BackendServicesTransport]] _transport_registry["rest"] = BackendServicesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackendServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackendServicesClient._read_environment_variables() + ) self._client_cert_source = BackendServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackendServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/pagers.py index 31dfca947f2b..b23b53ae6292 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/base.py index 385103610de6..82f8967c4712 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/rest.py index cc49150d3549..6318b19a3918 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/backend_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1212,9 +1212,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseAddSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseAddSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_add_signed_url_key( request, metadata @@ -1367,9 +1365,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseBackendServicesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1722,9 +1718,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseDeleteSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseDeleteSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_delete_signed_url_key( request, metadata @@ -2037,9 +2031,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseGetEffectiveSecurityPolicies._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseGetEffectiveSecurityPolicies._get_http_options() request, metadata = self._interceptor.pre_get_effective_security_policies( request, metadata @@ -2105,11 +2097,10 @@ def __call__( resp = self._interceptor.post_get_effective_security_policies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_effective_security_policies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_effective_security_policies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3264,9 +3255,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_edge_security_policy( request, metadata @@ -3675,9 +3664,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_security_policy( request, metadata @@ -3830,9 +3817,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -4163,7 +4148,9 @@ def get_effective_security_policies( ]: # 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._GetEffectiveSecurityPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._GetEffectiveSecurityPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_health( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/client.py index 6d2dd1c4cb65..f7ea42c3f7fa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.cross_site_networks import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class CrossSiteNetworksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CrossSiteNetworksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CrossSiteNetworksTransport]] _transport_registry["rest"] = CrossSiteNetworksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CrossSiteNetworksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CrossSiteNetworksClient._read_environment_variables() + ) self._client_cert_source = CrossSiteNetworksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CrossSiteNetworksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/pagers.py index 505bc099d5c0..46ffcc802900 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/base.py index af06cf1a0f07..a5a1cba520d6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/rest.py index 8de2d9283b44..8eecc5537db1 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/cross_site_networks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/client.py index b2666a8f7cfe..c115d6399f01 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.types import compute @@ -78,9 +78,7 @@ class DiskSettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DiskSettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DiskSettingsServiceTransport]] _transport_registry["rest"] = DiskSettingsServiceRestTransport def get_transport_class( @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiskSettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiskSettingsServiceClient._read_environment_variables() + ) self._client_cert_source = DiskSettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiskSettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/__init__.py index dc0f60547bda..23031b5e1ad6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import DiskSettingsServiceRestInterceptor, DiskSettingsServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DiskSettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DiskSettingsServiceTransport]] _transport_registry["rest"] = DiskSettingsServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/base.py index d5e162a2c04d..a58f437b2968 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/rest.py index 7cb81958ee4f..65fb107d07de 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_settings_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/client.py index b674c280e0d7..a85dea4b4acd 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiskTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiskTypesClient._read_environment_variables() + ) self._client_cert_source = DiskTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiskTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/pagers.py index 96b4ae471f9b..260d4cb44c1f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/base.py index 1532556f46d3..1aa08ed51ab4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/rest.py index e6f69fd98e7b..1e2f6908d564 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disk_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/client.py index a05822fa6d08..799cc7cc5491 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.disks import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DisksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DisksClient._read_environment_variables() + ) self._client_cert_source = DisksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DisksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/pagers.py index cc8df71bb8b5..2c21332139ef 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/base.py index d7723452111c..e87dad2be4f1 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/rest.py index 407fcf457a8a..8166a6b0c451 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/disks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -4152,9 +4152,7 @@ def __call__( """ - http_options = ( - _BaseDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() - ) + http_options = _BaseDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_stop_group_async_replication( request, metadata @@ -4664,7 +4662,9 @@ def remove_resource_policies( ) -> Callable[[compute.RemoveResourcePoliciesDiskRequest], compute.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._RemoveResourcePolicies(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveResourcePolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def resize(self) -> Callable[[compute.ResizeDiskRequest], compute.Operation]: @@ -4708,7 +4708,9 @@ def stop_group_async_replication( ) -> Callable[[compute.StopGroupAsyncReplicationDiskRequest], compute.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._StopGroupAsyncReplication(self._session, self._host, self._interceptor) # type: ignore + return self._StopGroupAsyncReplication( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/client.py index 47897c442401..dd7f739d2f07 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.external_vpn_gateways import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class ExternalVpnGatewaysClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ExternalVpnGatewaysTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ExternalVpnGatewaysTransport]] _transport_registry["rest"] = ExternalVpnGatewaysRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ExternalVpnGatewaysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ExternalVpnGatewaysClient._read_environment_variables() + ) self._client_cert_source = ExternalVpnGatewaysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ExternalVpnGatewaysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/pagers.py index 686b305fcab4..495d7f7384bb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/__init__.py index 9300bfbc4bb0..0fe624e4ec94 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ExternalVpnGatewaysRestInterceptor, ExternalVpnGatewaysRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ExternalVpnGatewaysTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ExternalVpnGatewaysTransport]] _transport_registry["rest"] = ExternalVpnGatewaysRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/base.py index c88195de01c4..9bf4f577d636 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/rest.py index 151dd1ba4f14..13f47d46437b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/external_vpn_gateways/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1413,9 +1413,7 @@ def __call__( """ - http_options = ( - _BaseExternalVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseExternalVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/client.py index 97c8a696161a..8da2bb1a85b4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.firewall_policies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class FirewallPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FirewallPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FirewallPoliciesTransport]] _transport_registry["rest"] = FirewallPoliciesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FirewallPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FirewallPoliciesClient._read_environment_variables() + ) self._client_cert_source = FirewallPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FirewallPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/pagers.py index 1d3b32523510..0cbf713d8f3f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/base.py index 2d20b10b1ab1..ca999aed4c70 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_organization_operations @@ -486,9 +486,9 @@ def _global_organization_operations_client( transport=self.kind, ) ) - self._extended_operations_services[ - "global_organization_operations" - ] = ex_op_service + self._extended_operations_services["global_organization_operations"] = ( + ex_op_service + ) return ex_op_service diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/rest.py index 8aa92b0c61dd..a18536d420d3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewall_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1479,9 +1479,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseFirewallPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1660,9 +1658,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseAddPacketMirroringRule._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseAddPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_add_packet_mirroring_rule( request, metadata @@ -2501,9 +2497,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseFirewallPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2874,9 +2868,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseGetPacketMirroringRule._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseGetPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_get_packet_mirroring_rule( request, metadata @@ -3511,9 +3503,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseListAssociations._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseListAssociations._get_http_options() request, metadata = self._interceptor.pre_list_associations( request, metadata @@ -4052,9 +4042,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BasePatchPacketMirroringRule._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BasePatchPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_patch_packet_mirroring_rule( request, metadata @@ -4416,9 +4404,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -4594,9 +4580,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseRemovePacketMirroringRule._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseRemovePacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_remove_packet_mirroring_rule( request, metadata @@ -5146,9 +5130,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5259,7 +5241,9 @@ def add_packet_mirroring_rule( ]: # 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._AddPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._AddPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def add_rule( @@ -5320,7 +5304,9 @@ def get_packet_mirroring_rule( ]: # 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._GetPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._GetPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_rule( @@ -5379,7 +5365,9 @@ def patch_packet_mirroring_rule( ]: # 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._PatchPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch_rule( @@ -5405,7 +5393,9 @@ def remove_packet_mirroring_rule( ]: # 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._RemovePacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._RemovePacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def remove_rule( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/client.py index 638deeebc330..29bbf1dccaed 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.firewalls import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FirewallsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FirewallsClient._read_environment_variables() + ) self._client_cert_source = FirewallsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FirewallsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/pagers.py index 373c0cd72433..2bf459153eae 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/base.py index 8e23c8b97ce9..c3247911f2d9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/rest.py index 708645e2e59f..e5e70e45cf3c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/firewalls/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/client.py index a2887849d40a..89f866614e41 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.forwarding_rules import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class ForwardingRulesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ForwardingRulesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ForwardingRulesTransport]] _transport_registry["rest"] = ForwardingRulesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ForwardingRulesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ForwardingRulesClient._read_environment_variables() + ) self._client_cert_source = ForwardingRulesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ForwardingRulesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/pagers.py index 0e1e0d0a1503..d7daa744b4ce 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/base.py index f404c5dbcfb4..42a3af5c528c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/rest.py index 82d2cf4ef00c..02a3b791ce42 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/forwarding_rules/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -724,9 +724,7 @@ def __call__( """ - http_options = ( - _BaseForwardingRulesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseForwardingRulesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseForwardingRulesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2096,9 +2094,7 @@ def __call__( """ - http_options = ( - _BaseForwardingRulesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseForwardingRulesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/client.py index 296ffb9d655b..46544d32a628 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.future_reservations import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class FutureReservationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FutureReservationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FutureReservationsTransport]] _transport_registry["rest"] = FutureReservationsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FutureReservationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FutureReservationsClient._read_environment_variables() + ) self._client_cert_source = FutureReservationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FutureReservationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/pagers.py index c91fad417231..ea7894014519 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/__init__.py index 17942ee90dd8..619aabbfdb22 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import FutureReservationsRestInterceptor, FutureReservationsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[FutureReservationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[FutureReservationsTransport]] _transport_registry["rest"] = FutureReservationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/base.py index ab487433993d..ee71f25a9697 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/rest.py index 3e645a0a2ce2..dd4e10d579e6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/future_reservations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -619,9 +619,7 @@ def __call__( """ - http_options = ( - _BaseFutureReservationsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseFutureReservationsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseFutureReservationsRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/client.py index b7e050d62888..e11db81db7e9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.global_addresses import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class GlobalAddressesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalAddressesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalAddressesTransport]] _transport_registry["rest"] = GlobalAddressesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalAddressesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalAddressesClient._read_environment_variables() + ) self._client_cert_source = GlobalAddressesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalAddressesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/pagers.py index 5221ced5f1ba..fbd9a30d9054 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/base.py index dc1d6e557e2a..649bdda4617d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/rest.py index 597d14e696e0..e75b3416d7f0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_addresses/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1640,9 +1640,7 @@ def __call__( """ - http_options = ( - _BaseGlobalAddressesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseGlobalAddressesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/client.py index 47232efc2b2c..29b6d23a7c9b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.global_forwarding_rules import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class GlobalForwardingRulesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalForwardingRulesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalForwardingRulesTransport]] _transport_registry["rest"] = GlobalForwardingRulesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalForwardingRulesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalForwardingRulesClient._read_environment_variables() + ) self._client_cert_source = GlobalForwardingRulesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalForwardingRulesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/pagers.py index 76c39f31b0fc..3304c38e1b1f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/__init__.py index 3854f4dcea54..fc066edab114 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalForwardingRulesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalForwardingRulesTransport]] _transport_registry["rest"] = GlobalForwardingRulesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/base.py index b5b7b4bfa759..e7d4f5345a16 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/rest.py index 7edded39f26a..1e6f2e678813 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_forwarding_rules/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1546,9 +1546,7 @@ def __call__( """ - http_options = ( - _BaseGlobalForwardingRulesRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseGlobalForwardingRulesRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseGlobalForwardingRulesRestTransport._BaseSetLabels._get_transcoded_request( @@ -1727,9 +1725,7 @@ def __call__( """ - http_options = ( - _BaseGlobalForwardingRulesRestTransport._BaseSetTarget._get_http_options() - ) + http_options = _BaseGlobalForwardingRulesRestTransport._BaseSetTarget._get_http_options() request, metadata = self._interceptor.pre_set_target(request, metadata) transcoded_request = _BaseGlobalForwardingRulesRestTransport._BaseSetTarget._get_transcoded_request( @@ -1880,9 +1876,7 @@ def __call__( """ - http_options = ( - _BaseGlobalForwardingRulesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseGlobalForwardingRulesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/client.py index 768da19eb5e6..13dabb70644f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.global_network_endpoint_groups import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class GlobalNetworkEndpointGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] _transport_registry["rest"] = GlobalNetworkEndpointGroupsRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalNetworkEndpointGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalNetworkEndpointGroupsClient._read_environment_variables() + ) self._client_cert_source = ( GlobalNetworkEndpointGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalNetworkEndpointGroupsTransport, transport) self._api_endpoint = self._transport.host @@ -839,9 +834,7 @@ def sample_attach_network_endpoints(): global_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_attach_endpoints_request_resource = ( - global_network_endpoint_groups_attach_endpoints_request_resource - ) + request.global_network_endpoint_groups_attach_endpoints_request_resource = global_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -990,9 +983,7 @@ def sample_attach_network_endpoints(): global_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_attach_endpoints_request_resource = ( - global_network_endpoint_groups_attach_endpoints_request_resource - ) + request.global_network_endpoint_groups_attach_endpoints_request_resource = global_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1445,9 +1436,7 @@ def sample_detach_network_endpoints(): global_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_detach_endpoints_request_resource = ( - global_network_endpoint_groups_detach_endpoints_request_resource - ) + request.global_network_endpoint_groups_detach_endpoints_request_resource = global_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1596,9 +1585,7 @@ def sample_detach_network_endpoints(): global_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_detach_endpoints_request_resource = ( - global_network_endpoint_groups_detach_endpoints_request_resource - ) + request.global_network_endpoint_groups_detach_endpoints_request_resource = global_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/pagers.py index d55a98d011f6..4e0d100db6f2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/__init__.py index 99b13497ddba..cefb9a8a2787 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] _transport_registry["rest"] = GlobalNetworkEndpointGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/base.py index 2d1b0cb29ae6..7fbc860f2433 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/rest.py index 7bec90ba00ba..bf14025569d3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_network_endpoint_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -660,9 +660,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_attach_network_endpoints( request, metadata @@ -842,9 +840,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDelete._get_transcoded_request( @@ -1020,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_detach_network_endpoints( request, metadata @@ -1183,9 +1177,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseGet._get_transcoded_request( @@ -1357,9 +1349,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseInsert._get_transcoded_request( @@ -1509,9 +1499,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseList._get_transcoded_request( @@ -1656,9 +1644,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_network_endpoints( request, metadata @@ -1761,7 +1747,9 @@ def attach_network_endpoints( ]: # 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._AttachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._AttachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete( @@ -1780,7 +1768,9 @@ def detach_network_endpoints( ]: # 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._DetachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._DetachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/client.py index dc94d24ca2f6..0b83c38fa210 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class GlobalOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalOperationsTransport]] _transport_registry["rest"] = GlobalOperationsRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalOperationsClient._read_environment_variables() + ) self._client_cert_source = GlobalOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/pagers.py index dfd5226db09e..5ed3852e24c7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/base.py index 96aa2dc75f34..80e859753755 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/rest.py index 3f9a55fe133e..bb7092572823 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -505,9 +505,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOperationsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseGlobalOperationsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseGlobalOperationsRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/client.py index 981f2bcb4d01..3070466fc1fe 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class GlobalOrganizationOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] _transport_registry["rest"] = GlobalOrganizationOperationsRestTransport def get_transport_class( @@ -609,11 +607,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalOrganizationOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalOrganizationOperationsClient._read_environment_variables() + ) self._client_cert_source = ( GlobalOrganizationOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -652,8 +648,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalOrganizationOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/pagers.py index 7d2008a4a8ec..fb8783db7acc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/__init__.py index 2a15d17dfe0e..b015c2aa78f3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] _transport_registry["rest"] = GlobalOrganizationOperationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/base.py index 565d5bbca815..97be6001281c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/rest.py index 90675a853a5e..cdd3fe0ead36 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_organization_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -402,9 +402,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOrganizationOperationsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalOrganizationOperationsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalOrganizationOperationsRestTransport._BaseDelete._get_transcoded_request( @@ -581,9 +579,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOrganizationOperationsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseGlobalOrganizationOperationsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseGlobalOrganizationOperationsRestTransport._BaseGet._get_transcoded_request( @@ -728,9 +724,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOrganizationOperationsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalOrganizationOperationsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalOrganizationOperationsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/client.py index f5190d0fdf95..19f04060cff3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.global_public_delegated_prefixes import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class GlobalPublicDelegatedPrefixesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] _transport_registry["rest"] = GlobalPublicDelegatedPrefixesRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalPublicDelegatedPrefixesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalPublicDelegatedPrefixesClient._read_environment_variables() + ) self._client_cert_source = ( GlobalPublicDelegatedPrefixesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalPublicDelegatedPrefixesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/pagers.py index d3fa123cb41e..bcff8877555b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/__init__.py index c9b6bd28dec3..f096c6964246 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] _transport_registry["rest"] = GlobalPublicDelegatedPrefixesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/base.py index c509cea03f0f..45bca8831598 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/rest.py index e902b3da73b1..3dc5da4cb9cc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_public_delegated_prefixes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -540,9 +540,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseDelete._get_transcoded_request( @@ -696,9 +694,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseGet._get_transcoded_request( @@ -870,9 +866,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseInsert._get_transcoded_request( @@ -1022,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseList._get_transcoded_request( @@ -1198,9 +1190,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BasePatch._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/client.py index 2aaf1b9b6741..e5c3c37b7ea3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.global_vm_extension_policies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class GlobalVmExtensionPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalVmExtensionPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalVmExtensionPoliciesTransport]] _transport_registry["rest"] = GlobalVmExtensionPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalVmExtensionPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalVmExtensionPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( GlobalVmExtensionPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalVmExtensionPoliciesTransport, transport) self._api_endpoint = self._transport.host @@ -967,9 +962,7 @@ def sample_delete(): global_vm_extension_policy_rollout_operation_rollout_input_resource is not None ): - request.global_vm_extension_policy_rollout_operation_rollout_input_resource = ( - global_vm_extension_policy_rollout_operation_rollout_input_resource - ) + request.global_vm_extension_policy_rollout_operation_rollout_input_resource = global_vm_extension_policy_rollout_operation_rollout_input_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1118,9 +1111,7 @@ def sample_delete(): global_vm_extension_policy_rollout_operation_rollout_input_resource is not None ): - request.global_vm_extension_policy_rollout_operation_rollout_input_resource = ( - global_vm_extension_policy_rollout_operation_rollout_input_resource - ) + request.global_vm_extension_policy_rollout_operation_rollout_input_resource = global_vm_extension_policy_rollout_operation_rollout_input_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/pagers.py index d691606078d5..91d2c5f77ad4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/__init__.py index 6cecd5a5368a..807926b3331f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalVmExtensionPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalVmExtensionPoliciesTransport]] _transport_registry["rest"] = GlobalVmExtensionPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/base.py index fd00af4d06d4..b6949bd46b92 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/rest.py index 45abd123e868..f7ab88808d62 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/global_vm_extension_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -574,9 +574,7 @@ def __call__( """ - http_options = ( - _BaseGlobalVmExtensionPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseGlobalVmExtensionPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseGlobalVmExtensionPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -756,9 +754,7 @@ def __call__( """ - http_options = ( - _BaseGlobalVmExtensionPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalVmExtensionPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalVmExtensionPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -1084,9 +1080,7 @@ def __call__( """ - http_options = ( - _BaseGlobalVmExtensionPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseGlobalVmExtensionPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseGlobalVmExtensionPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -1238,9 +1232,7 @@ def __call__( """ - http_options = ( - _BaseGlobalVmExtensionPoliciesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalVmExtensionPoliciesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalVmExtensionPoliciesRestTransport._BaseList._get_transcoded_request( @@ -1414,9 +1406,7 @@ def __call__( """ - http_options = ( - _BaseGlobalVmExtensionPoliciesRestTransport._BaseUpdate._get_http_options() - ) + http_options = _BaseGlobalVmExtensionPoliciesRestTransport._BaseUpdate._get_http_options() request, metadata = self._interceptor.pre_update(request, metadata) transcoded_request = _BaseGlobalVmExtensionPoliciesRestTransport._BaseUpdate._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/client.py index 0e57173201ad..3be7c317556b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.health_checks import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = HealthChecksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + HealthChecksClient._read_environment_variables() + ) self._client_cert_source = HealthChecksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(HealthChecksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/pagers.py index 54f1e9294d43..60bc892b115d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/base.py index a956c0308a10..68beab9ce499 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/rest.py index 9514e722ba56..727c6f035e47 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/health_checks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1670,9 +1670,7 @@ def __call__( """ - http_options = ( - _BaseHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/client.py index b38d8b6a22c7..702c979806d0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -75,9 +75,7 @@ class ImageFamilyViewsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ImageFamilyViewsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ImageFamilyViewsTransport]] _transport_registry["rest"] = ImageFamilyViewsRestTransport def get_transport_class( @@ -598,11 +596,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ImageFamilyViewsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ImageFamilyViewsClient._read_environment_variables() + ) self._client_cert_source = ImageFamilyViewsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +633,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ImageFamilyViewsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/base.py index d708b718a088..6d6294cbb1d3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/rest.py index 7f7da8b51858..9d5f374eeeba 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/image_family_views/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/client.py index 327882761ad2..43deb27934ae 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.images import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ImagesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ImagesClient._read_environment_variables() + ) self._client_cert_source = ImagesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ImagesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/pagers.py index 42b84c30a669..5e0592aa3293 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/base.py index 25c5a4836079..ca759197dbcd 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/rest.py index bd34c04c5eb5..021a34206139 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/images/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/client.py index f348b7b9ca43..47e85065a52f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.instance_group_manager_resize_requests import ( pagers, @@ -84,9 +84,7 @@ class InstanceGroupManagerResizeRequestsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] _transport_registry["rest"] = InstanceGroupManagerResizeRequestsRestTransport def get_transport_class( @@ -619,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceGroupManagerResizeRequestsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceGroupManagerResizeRequestsClient._read_environment_variables() + ) self._client_cert_source = ( InstanceGroupManagerResizeRequestsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -664,8 +660,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast( InstanceGroupManagerResizeRequestsTransport, transport diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/pagers.py index c23d87d2c61a..ee0b41350ada 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/__init__.py index 909be688fd9c..f8e449424b53 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] _transport_registry["rest"] = InstanceGroupManagerResizeRequestsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/base.py index f2dd90200a1c..6d2e88b88c49 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/rest.py index 44820c267f53..c18424ebbd0c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_manager_resize_requests/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -544,9 +544,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_http_options() request, metadata = self._interceptor.pre_cancel(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_transcoded_request( @@ -721,9 +719,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_transcoded_request( @@ -878,9 +874,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_transcoded_request( @@ -1056,9 +1050,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_transcoded_request( @@ -1210,9 +1202,7 @@ def __call__( [Output Only] A list of resize requests. """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/client.py index 8093f885ff67..baa582fe059b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.instance_group_managers import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class InstanceGroupManagersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceGroupManagersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagersTransport]] _transport_registry["rest"] = InstanceGroupManagersRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceGroupManagersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceGroupManagersClient._read_environment_variables() + ) self._client_cert_source = InstanceGroupManagersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceGroupManagersTransport, transport) self._api_endpoint = self._transport.host @@ -2716,9 +2711,7 @@ def sample_delete_per_instance_configs(): instance_group_managers_delete_per_instance_configs_req_resource is not None ): - request.instance_group_managers_delete_per_instance_configs_req_resource = ( - instance_group_managers_delete_per_instance_configs_req_resource - ) + request.instance_group_managers_delete_per_instance_configs_req_resource = instance_group_managers_delete_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2882,9 +2875,7 @@ def sample_delete_per_instance_configs(): instance_group_managers_delete_per_instance_configs_req_resource is not None ): - request.instance_group_managers_delete_per_instance_configs_req_resource = ( - instance_group_managers_delete_per_instance_configs_req_resource - ) + request.instance_group_managers_delete_per_instance_configs_req_resource = instance_group_managers_delete_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4664,9 +4655,7 @@ def sample_patch_per_instance_configs(): instance_group_managers_patch_per_instance_configs_req_resource is not None ): - request.instance_group_managers_patch_per_instance_configs_req_resource = ( - instance_group_managers_patch_per_instance_configs_req_resource - ) + request.instance_group_managers_patch_per_instance_configs_req_resource = instance_group_managers_patch_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4831,9 +4820,7 @@ def sample_patch_per_instance_configs(): instance_group_managers_patch_per_instance_configs_req_resource is not None ): - request.instance_group_managers_patch_per_instance_configs_req_resource = ( - instance_group_managers_patch_per_instance_configs_req_resource - ) + request.instance_group_managers_patch_per_instance_configs_req_resource = instance_group_managers_patch_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6868,9 +6855,7 @@ def sample_set_instance_template(): instance_group_managers_set_instance_template_request_resource is not None ): - request.instance_group_managers_set_instance_template_request_resource = ( - instance_group_managers_set_instance_template_request_resource - ) + request.instance_group_managers_set_instance_template_request_resource = instance_group_managers_set_instance_template_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7031,9 +7016,7 @@ def sample_set_instance_template(): instance_group_managers_set_instance_template_request_resource is not None ): - request.instance_group_managers_set_instance_template_request_resource = ( - instance_group_managers_set_instance_template_request_resource - ) + request.instance_group_managers_set_instance_template_request_resource = instance_group_managers_set_instance_template_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -9242,9 +9225,7 @@ def sample_update_per_instance_configs(): instance_group_managers_update_per_instance_configs_req_resource is not None ): - request.instance_group_managers_update_per_instance_configs_req_resource = ( - instance_group_managers_update_per_instance_configs_req_resource - ) + request.instance_group_managers_update_per_instance_configs_req_resource = instance_group_managers_update_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -9409,9 +9390,7 @@ def sample_update_per_instance_configs(): instance_group_managers_update_per_instance_configs_req_resource is not None ): - request.instance_group_managers_update_per_instance_configs_req_resource = ( - instance_group_managers_update_per_instance_configs_req_resource - ) + request.instance_group_managers_update_per_instance_configs_req_resource = instance_group_managers_update_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/pagers.py index 63289ac89152..0b46673ad6fa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -300,7 +300,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -380,7 +380,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/__init__.py index f219aff6d960..11971291fcaf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InstanceGroupManagersTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagersTransport]] _transport_registry["rest"] = InstanceGroupManagersRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/base.py index bd99ad04828a..2440a3bcf5fe 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/rest.py index c8642f42bbc1..f9e4e49ac1c9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_group_managers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1898,9 +1898,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() request, metadata = self._interceptor.pre_abandon_instances( request, metadata @@ -2054,9 +2052,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2233,9 +2229,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() request, metadata = self._interceptor.pre_apply_updates_to_instances( request, metadata @@ -2416,9 +2410,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() request, metadata = self._interceptor.pre_create_instances( request, metadata @@ -2776,9 +2768,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() request, metadata = self._interceptor.pre_delete_instances( request, metadata @@ -2962,9 +2952,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_delete_per_instance_configs( request, metadata @@ -3277,15 +3265,12 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseGetAvailableAcceleratorTopologies._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseGetAvailableAcceleratorTopologies._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_available_accelerator_topologies( - request, metadata + request, metadata = ( + self._interceptor.pre_get_available_accelerator_topologies( + request, metadata + ) ) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseGetAvailableAcceleratorTopologies._get_transcoded_request( http_options, request @@ -3350,11 +3335,10 @@ def __call__( resp = self._interceptor.post_get_available_accelerator_topologies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_available_accelerator_topologies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_available_accelerator_topologies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3765,9 +3749,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() request, metadata = self._interceptor.pre_list_errors(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseListErrors._get_transcoded_request( @@ -3916,9 +3898,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() request, metadata = self._interceptor.pre_list_managed_instances( request, metadata @@ -4069,9 +4049,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_list_per_instance_configs( request, metadata @@ -4433,9 +4411,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_patch_per_instance_configs( request, metadata @@ -4616,9 +4592,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() request, metadata = self._interceptor.pre_recreate_instances( request, metadata @@ -4976,9 +4950,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseResizeAdvanced._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseResizeAdvanced._get_http_options() request, metadata = self._interceptor.pre_resize_advanced(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseResizeAdvanced._get_transcoded_request( @@ -5157,9 +5129,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() request, metadata = self._interceptor.pre_resume_instances( request, metadata @@ -5342,9 +5312,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSetAutoHealingPolicies._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSetAutoHealingPolicies._get_http_options() request, metadata = self._interceptor.pre_set_auto_healing_policies( request, metadata @@ -5525,9 +5493,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() request, metadata = self._interceptor.pre_set_instance_template( request, metadata @@ -5710,9 +5676,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() request, metadata = self._interceptor.pre_set_target_pools( request, metadata @@ -5893,9 +5857,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() request, metadata = self._interceptor.pre_start_instances(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseStartInstances._get_transcoded_request( @@ -6074,9 +6036,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() request, metadata = self._interceptor.pre_stop_instances(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseStopInstances._get_transcoded_request( @@ -6255,9 +6215,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() request, metadata = self._interceptor.pre_suspend_instances( request, metadata @@ -6412,9 +6370,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -6779,9 +6735,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_update_per_instance_configs( request, metadata @@ -6905,7 +6859,9 @@ def apply_updates_to_instances( ]: # 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._ApplyUpdatesToInstances(self._session, self._host, self._interceptor) # type: ignore + return self._ApplyUpdatesToInstances( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_instances( @@ -6943,7 +6899,9 @@ def delete_per_instance_configs( ]: # 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._DeletePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( @@ -6964,7 +6922,9 @@ def get_available_accelerator_topologies( ]: # 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._GetAvailableAcceleratorTopologies(self._session, self._host, self._interceptor) # type: ignore + return self._GetAvailableAcceleratorTopologies( + self._session, self._host, self._interceptor + ) # type: ignore @property def insert( @@ -7015,7 +6975,9 @@ def list_per_instance_configs( ]: # 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._ListPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch( @@ -7033,7 +6995,9 @@ def patch_per_instance_configs( ]: # 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._PatchPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def recreate_instances( @@ -7081,7 +7045,9 @@ def set_auto_healing_policies( ]: # 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._SetAutoHealingPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._SetAutoHealingPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_instance_template( @@ -7160,7 +7126,9 @@ def update_per_instance_configs( ]: # 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._UpdatePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/client.py index c89d8e442abe..9b1ef41eeab5 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.instance_groups import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class InstanceGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupsTransport]] _transport_registry["rest"] = InstanceGroupsRestTransport def get_transport_class( @@ -600,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceGroupsClient._read_environment_variables() + ) self._client_cert_source = InstanceGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/pagers.py index aa7dc46af9d1..ece348a2868c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/base.py index 13656566417e..425b2b809e29 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/rest.py index 17b3d11ecdb9..ea96de5889e2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1968,9 +1968,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupsRestTransport._BaseRemoveInstances._get_http_options() - ) + http_options = _BaseInstanceGroupsRestTransport._BaseRemoveInstances._get_http_options() request, metadata = self._interceptor.pre_remove_instances( request, metadata @@ -2302,9 +2300,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/client.py index ce3974ba32d9..5b2bc2a269d4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.types import compute @@ -78,9 +78,7 @@ class InstanceSettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceSettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceSettingsServiceTransport]] _transport_registry["rest"] = InstanceSettingsServiceRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceSettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceSettingsServiceClient._read_environment_variables() + ) self._client_cert_source = ( InstanceSettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceSettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/__init__.py index 5e289b9ebf70..a7869d6637f2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InstanceSettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InstanceSettingsServiceTransport]] _transport_registry["rest"] = InstanceSettingsServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/base.py index e705fb4a08c8..44c3d3220024 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/rest.py index 76e16e8bb6b9..6d915a6c52dd 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_settings_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/client.py index 21055379d7a8..8c33afb9c075 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.instance_templates import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class InstanceTemplatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceTemplatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceTemplatesTransport]] _transport_registry["rest"] = InstanceTemplatesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceTemplatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceTemplatesClient._read_environment_variables() + ) self._client_cert_source = InstanceTemplatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceTemplatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/pagers.py index 7d33c5596b42..dd8772e0c37d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/base.py index 0a3e60415fbf..ef636dfc680c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/rest.py index d6855d794c8d..a485090c7f5e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instance_templates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -675,9 +675,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInstanceTemplatesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1240,9 +1238,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseInstanceTemplatesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1795,9 +1791,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseInstanceTemplatesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1948,9 +1942,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/client.py index ecc0109447d1..711e1d9f56ec 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.instances import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstancesClient._read_environment_variables() + ) self._client_cert_source = InstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/pagers.py index bae09f509cc1..e998e439ed0c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/base.py index 653b4c968e96..d0dd15a395d0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/rest.py index a12c958746fc..b3183e68f714 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instances/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -4775,9 +4775,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseDeleteNetworkInterface._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseDeleteNetworkInterface._get_http_options() request, metadata = self._interceptor.pre_delete_network_interface( request, metadata @@ -5246,9 +5244,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseGetEffectiveFirewalls._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseGetEffectiveFirewalls._get_http_options() request, metadata = self._interceptor.pre_get_effective_firewalls( request, metadata @@ -6218,9 +6214,7 @@ def __call__( A Shielded Instance Identity. """ - http_options = ( - _BaseInstancesRestTransport._BaseGetShieldedInstanceIdentity._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseGetShieldedInstanceIdentity._get_http_options() request, metadata = self._interceptor.pre_get_shielded_instance_identity( request, metadata @@ -6286,11 +6280,10 @@ def __call__( resp = self._interceptor.post_get_shielded_instance_identity(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_shielded_instance_identity_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_shielded_instance_identity_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6373,9 +6366,7 @@ def __call__( A Shielded VM Identity. """ - http_options = ( - _BaseInstancesRestTransport._BaseGetShieldedVmIdentity._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseGetShieldedVmIdentity._get_http_options() request, metadata = self._interceptor.pre_get_shielded_vm_identity( request, metadata @@ -7023,9 +7014,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BasePatchPartnerMetadata._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BasePatchPartnerMetadata._get_http_options() request, metadata = self._interceptor.pre_patch_partner_metadata( request, metadata @@ -7381,9 +7370,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseRemoveResourcePolicies._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseRemoveResourcePolicies._get_http_options() request, metadata = self._interceptor.pre_remove_resource_policies( request, metadata @@ -8073,9 +8060,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSendDiagnosticInterrupt._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSendDiagnosticInterrupt._get_http_options() request, metadata = self._interceptor.pre_send_diagnostic_interrupt( request, metadata @@ -8253,9 +8238,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSetDeletionProtection._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSetDeletionProtection._get_http_options() request, metadata = self._interceptor.pre_set_deletion_protection( request, metadata @@ -10484,15 +10467,12 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSetShieldedInstanceIntegrityPolicy._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSetShieldedInstanceIntegrityPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_set_shielded_instance_integrity_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_set_shielded_instance_integrity_policy( + request, metadata + ) ) transcoded_request = _BaseInstancesRestTransport._BaseSetShieldedInstanceIntegrityPolicy._get_transcoded_request( http_options, request @@ -10558,11 +10538,10 @@ def __call__( resp = self._interceptor.post_set_shielded_instance_integrity_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_shielded_instance_integrity_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_shielded_instance_integrity_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -10673,9 +10652,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSetShieldedVmIntegrityPolicy._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSetShieldedVmIntegrityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_shielded_vm_integrity_policy( request, metadata @@ -10746,11 +10723,10 @@ def __call__( resp = self._interceptor.post_set_shielded_vm_integrity_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_shielded_vm_integrity_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_shielded_vm_integrity_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -11040,9 +11016,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSimulateMaintenanceEvent._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSimulateMaintenanceEvent._get_http_options() request, metadata = self._interceptor.pre_simulate_maintenance_event( request, metadata @@ -11391,9 +11365,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseStartWithEncryptionKey._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseStartWithEncryptionKey._get_http_options() request, metadata = self._interceptor.pre_start_with_encryption_key( request, metadata @@ -12614,9 +12586,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseUpdateNetworkInterface._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseUpdateNetworkInterface._get_http_options() request, metadata = self._interceptor.pre_update_network_interface( request, metadata @@ -12797,9 +12767,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseUpdateShieldedInstanceConfig._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseUpdateShieldedInstanceConfig._get_http_options() request, metadata = self._interceptor.pre_update_shielded_instance_config( request, metadata @@ -12870,11 +12838,10 @@ def __call__( resp = self._interceptor.post_update_shielded_instance_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_shielded_instance_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_shielded_instance_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -12984,9 +12951,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseUpdateShieldedVmConfig._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseUpdateShieldedVmConfig._get_http_options() request, metadata = self._interceptor.pre_update_shielded_vm_config( request, metadata @@ -13151,7 +13116,9 @@ def delete_network_interface( ) -> Callable[[compute.DeleteNetworkInterfaceInstanceRequest], compute.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._DeleteNetworkInterface(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteNetworkInterface( + self._session, self._host, self._interceptor + ) # type: ignore @property def detach_disk( @@ -13229,7 +13196,9 @@ def get_shielded_instance_identity( ]: # 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._GetShieldedInstanceIdentity(self._session, self._host, self._interceptor) # type: ignore + return self._GetShieldedInstanceIdentity( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_shielded_vm_identity( @@ -13285,7 +13254,9 @@ def remove_resource_policies( ) -> Callable[[compute.RemoveResourcePoliciesInstanceRequest], compute.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._RemoveResourcePolicies(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveResourcePolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def report_host_as_faulty( @@ -13316,7 +13287,9 @@ def send_diagnostic_interrupt( ]: # 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._SendDiagnosticInterrupt(self._session, self._host, self._interceptor) # type: ignore + return self._SendDiagnosticInterrupt( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_deletion_protection( @@ -13420,7 +13393,9 @@ def set_shielded_instance_integrity_policy( ]: # 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._SetShieldedInstanceIntegrityPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._SetShieldedInstanceIntegrityPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_shielded_vm_integrity_policy( @@ -13430,7 +13405,9 @@ def set_shielded_vm_integrity_policy( ]: # 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._SetShieldedVmIntegrityPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._SetShieldedVmIntegrityPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_tags(self) -> Callable[[compute.SetTagsInstanceRequest], compute.Operation]: @@ -13444,7 +13421,9 @@ def simulate_maintenance_event( ) -> Callable[[compute.SimulateMaintenanceEventInstanceRequest], compute.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._SimulateMaintenanceEvent(self._session, self._host, self._interceptor) # type: ignore + return self._SimulateMaintenanceEvent( + self._session, self._host, self._interceptor + ) # type: ignore @property def start(self) -> Callable[[compute.StartInstanceRequest], compute.Operation]: @@ -13458,7 +13437,9 @@ def start_with_encryption_key( ) -> Callable[[compute.StartWithEncryptionKeyInstanceRequest], compute.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._StartWithEncryptionKey(self._session, self._host, self._interceptor) # type: ignore + return self._StartWithEncryptionKey( + self._session, self._host, self._interceptor + ) # type: ignore @property def stop(self) -> Callable[[compute.StopInstanceRequest], compute.Operation]: @@ -13510,7 +13491,9 @@ def update_network_interface( ) -> Callable[[compute.UpdateNetworkInterfaceInstanceRequest], compute.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._UpdateNetworkInterface(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateNetworkInterface( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_shielded_instance_config( @@ -13520,7 +13503,9 @@ def update_shielded_instance_config( ]: # 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._UpdateShieldedInstanceConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateShieldedInstanceConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_shielded_vm_config( @@ -13528,7 +13513,9 @@ def update_shielded_vm_config( ) -> Callable[[compute.UpdateShieldedVmConfigInstanceRequest], compute.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._UpdateShieldedVmConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateShieldedVmConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/client.py index aef392e9585b..4d56326549f8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.instant_snapshots import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class InstantSnapshotsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstantSnapshotsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstantSnapshotsTransport]] _transport_registry["rest"] = InstantSnapshotsRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstantSnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstantSnapshotsClient._read_environment_variables() + ) self._client_cert_source = InstantSnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstantSnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/pagers.py index b35faa8411a4..4ce56f29e62a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/base.py index 7cde8ef677f1..4f0d6791aa6d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/rest.py index aa8602d47a3b..26102b1c112e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/instant_snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -726,9 +726,7 @@ def __call__( """ - http_options = ( - _BaseInstantSnapshotsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInstantSnapshotsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInstantSnapshotsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2164,9 +2162,7 @@ def __call__( """ - http_options = ( - _BaseInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/client.py index 9d32cef1946d..4d0d2ac74771 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.interconnect_attachment_groups import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class InterconnectAttachmentGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] _transport_registry["rest"] = InterconnectAttachmentGroupsRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectAttachmentGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectAttachmentGroupsClient._read_environment_variables() + ) self._client_cert_source = ( InterconnectAttachmentGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -655,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectAttachmentGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/pagers.py index 96fa12fa38b8..d0a9ee40901b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/__init__.py index 3961ad9d29df..71f91b690f4b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] _transport_registry["rest"] = InterconnectAttachmentGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/base.py index 7cce2fb24cb1..92c04197faf6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/rest.py index 7fb3997b7d4e..dd9a525ddc18 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachment_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -770,9 +770,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseDelete._get_transcoded_request( @@ -921,9 +919,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseGet._get_transcoded_request( @@ -1142,9 +1138,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1295,9 +1289,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseGetOperationalStatus._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseGetOperationalStatus._get_http_options() request, metadata = self._interceptor.pre_get_operational_status( request, metadata @@ -1479,9 +1471,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseInsert._get_transcoded_request( @@ -1631,9 +1621,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseList._get_transcoded_request( @@ -1809,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BasePatch._get_transcoded_request( @@ -2036,9 +2022,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2191,9 +2175,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/client.py index b222e1e46a7e..15334e936f1b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.interconnect_attachments import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class InterconnectAttachmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectAttachmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentsTransport]] _transport_registry["rest"] = InterconnectAttachmentsRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectAttachmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectAttachmentsClient._read_environment_variables() + ) self._client_cert_source = ( InterconnectAttachmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectAttachmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/pagers.py index 475f0748809a..b0450b5d0521 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/__init__.py index 04ffd6c58a57..d59fde76191f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectAttachmentsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentsTransport]] _transport_registry["rest"] = InterconnectAttachmentsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/base.py index db7247e18fb9..53863dec5d54 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/rest.py index 90bda28a9121..c72f302b9ec0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_attachments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -682,9 +682,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -861,9 +859,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseDelete._get_transcoded_request( @@ -1190,9 +1186,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseInsert._get_transcoded_request( @@ -1702,9 +1696,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseSetLabels._get_transcoded_request( @@ -1855,9 +1847,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/client.py index 0083361d2edd..e7c76ea128c7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.interconnect_groups import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class InterconnectGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectGroupsTransport]] _transport_registry["rest"] = InterconnectGroupsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectGroupsClient._read_environment_variables() + ) self._client_cert_source = InterconnectGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/pagers.py index 9c0e4f419e42..70025763d914 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/__init__.py index c12b274fcacb..efbcb9c02950 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import InterconnectGroupsRestInterceptor, InterconnectGroupsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectGroupsTransport]] _transport_registry["rest"] = InterconnectGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/base.py index e812fcbfe04d..337dd510e3ba 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/rest.py index 19ada5c7c71d..c5d8a9bfcfe2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -816,9 +816,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseCreateMembers._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseCreateMembers._get_http_options() request, metadata = self._interceptor.pre_create_members(request, metadata) transcoded_request = _BaseInterconnectGroupsRestTransport._BaseCreateMembers._get_transcoded_request( @@ -1369,9 +1367,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseInterconnectGroupsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1518,9 +1514,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseGetOperationalStatus._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseGetOperationalStatus._get_http_options() request, metadata = self._interceptor.pre_get_operational_status( request, metadata @@ -2268,9 +2262,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseInterconnectGroupsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2421,9 +2413,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/client.py index 6600f4d6583b..823ebe395a60 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class InterconnectLocationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectLocationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectLocationsTransport]] _transport_registry["rest"] = InterconnectLocationsRestTransport def get_transport_class( @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectLocationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectLocationsClient._read_environment_variables() + ) self._client_cert_source = InterconnectLocationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectLocationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/pagers.py index dc2a54d19d0e..2e1dd912c22b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/__init__.py index 990c40f05d00..fe298fae537f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectLocationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectLocationsTransport]] _transport_registry["rest"] = InterconnectLocationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/base.py index 3fdf5c81020a..79b431a08f2e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/rest.py index f9b412e84534..297bfff8ba44 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_locations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/client.py index 54a40c468138..3f46306686d2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class InterconnectRemoteLocationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] _transport_registry["rest"] = InterconnectRemoteLocationsRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectRemoteLocationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectRemoteLocationsClient._read_environment_variables() + ) self._client_cert_source = ( InterconnectRemoteLocationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectRemoteLocationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/pagers.py index bbfd0ffbd36d..ac3d92987f6b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/__init__.py index 7ed7479ad72f..5f3a153d40d6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] _transport_registry["rest"] = InterconnectRemoteLocationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/base.py index da0e1e19df27..ccb029cc6478 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/rest.py index d1d7fa94bcd3..23091f01e8b0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnect_remote_locations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -352,9 +352,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectRemoteLocationsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseInterconnectRemoteLocationsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseInterconnectRemoteLocationsRestTransport._BaseGet._get_transcoded_request( @@ -502,9 +500,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectRemoteLocationsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseInterconnectRemoteLocationsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseInterconnectRemoteLocationsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/client.py index a9e1c3638964..a53e1e8c49da 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.interconnects import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectsClient._read_environment_variables() + ) self._client_cert_source = InterconnectsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/pagers.py index 8c407791ab85..90b0da342a21 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/base.py index a69227a2231c..f1dca2553178 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/rest.py index c05b574c6703..75699ff0287a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/interconnects/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2053,9 +2053,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInterconnectsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/client.py index 7f513c7c994a..aed43dddcb3c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -594,11 +594,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LicenseCodesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LicenseCodesClient._read_environment_variables() + ) self._client_cert_source = LicenseCodesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -633,8 +631,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LicenseCodesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/base.py index e7db1e6d4c37..ecbb685fa746 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/rest.py index f12c9d32eb65..a02b75a0fdd8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/license_codes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -488,9 +488,7 @@ def __call__( """ - http_options = ( - _BaseLicenseCodesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseLicenseCodesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/client.py index f32c809789dc..63811581f2aa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.licenses import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LicensesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LicensesClient._read_environment_variables() + ) self._client_cert_source = LicensesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LicensesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/pagers.py index 2b47ce54b527..c2e326aec16f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/base.py index 7a880bf4642a..34ce938f3903 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/rest.py index 6071edd278b9..50c032aff193 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/licenses/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/client.py index c8bb6d57b5ec..34825d5cb508 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.machine_images import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MachineImagesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MachineImagesClient._read_environment_variables() + ) self._client_cert_source = MachineImagesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MachineImagesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/pagers.py index 0f61551a885c..7eda5ddc823e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/base.py index c05a31fa5c82..ede1b208fc34 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/rest.py index fd52ad6840d7..4a41b202b625 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_images/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1949,9 +1949,7 @@ def __call__( """ - http_options = ( - _BaseMachineImagesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseMachineImagesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/client.py index bcc8dfe42b04..8b40a1edfdbf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MachineTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MachineTypesClient._read_environment_variables() + ) self._client_cert_source = MachineTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MachineTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/pagers.py index 6327af205b00..9665a38428bd 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/base.py index 6580e9f7247f..815995aede1a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/rest.py index 8bd92f75b9f3..a377bc05fb8c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/machine_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/client.py index 0f013bb5de83..2c97a475dea5 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.network_attachments import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class NetworkAttachmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkAttachmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkAttachmentsTransport]] _transport_registry["rest"] = NetworkAttachmentsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkAttachmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkAttachmentsClient._read_environment_variables() + ) self._client_cert_source = NetworkAttachmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkAttachmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/pagers.py index d86ea7380c37..f10c62862a4e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/__init__.py index f0a1ddd862ed..2920a592dd40 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import NetworkAttachmentsRestInterceptor, NetworkAttachmentsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkAttachmentsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkAttachmentsTransport]] _transport_registry["rest"] = NetworkAttachmentsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/base.py index 9182ff64fe0c..8fbd31a40b80 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/rest.py index 2e79457f508a..9f2465f59252 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_attachments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -731,9 +731,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkAttachmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1280,9 +1278,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseNetworkAttachmentsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2020,9 +2016,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseNetworkAttachmentsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2173,9 +2167,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/client.py index 59f8e985888b..04bfd1e87760 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.network_edge_security_services import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class NetworkEdgeSecurityServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] _transport_registry["rest"] = NetworkEdgeSecurityServicesRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkEdgeSecurityServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkEdgeSecurityServicesClient._read_environment_variables() + ) self._client_cert_source = ( NetworkEdgeSecurityServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkEdgeSecurityServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/pagers.py index 9edcfe0a36f7..25235a8891ce 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/__init__.py index 7eaed7b9e349..80d8b0a32470 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] _transport_registry["rest"] = NetworkEdgeSecurityServicesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/base.py index 576096eaa168..440ed7459719 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/rest.py index d919373a4ec9..bd958fe3779b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_edge_security_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -513,9 +513,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -694,9 +692,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseDelete._get_transcoded_request( @@ -843,9 +839,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseGet._get_transcoded_request( @@ -1019,9 +1013,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseInsert._get_transcoded_request( @@ -1200,9 +1192,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BasePatch._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/client.py index 3c997ebc3283..4248d6427554 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.network_endpoint_groups import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class NetworkEndpointGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkEndpointGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEndpointGroupsTransport]] _transport_registry["rest"] = NetworkEndpointGroupsRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkEndpointGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkEndpointGroupsClient._read_environment_variables() + ) self._client_cert_source = NetworkEndpointGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkEndpointGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/pagers.py index 214cff7d1802..1760942269b8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/__init__.py index cd78182e83fb..1b70862e7803 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkEndpointGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEndpointGroupsTransport]] _transport_registry["rest"] = NetworkEndpointGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/base.py index f0998c19e2cc..481add0b92a0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/rest.py index 51d6ae1d2b18..d3c3bba68cce 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_endpoint_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -745,9 +745,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkEndpointGroupsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -923,9 +921,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_attach_network_endpoints( request, metadata @@ -1281,9 +1277,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_detach_network_endpoints( request, metadata @@ -1918,9 +1912,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_network_endpoints( request, metadata @@ -2079,9 +2071,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2197,7 +2187,9 @@ def attach_network_endpoints( ]: # 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._AttachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._AttachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete( @@ -2215,7 +2207,9 @@ def detach_network_endpoints( ]: # 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._DetachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._DetachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/client.py index da2fabe9da0f..4f05f9a8093f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.network_firewall_policies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class NetworkFirewallPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] _transport_registry["rest"] = NetworkFirewallPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkFirewallPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkFirewallPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( NetworkFirewallPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkFirewallPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/pagers.py index 3cf0307d4a41..9c95b423e1e8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/__init__.py index 40078d68ba97..71ed19bf349c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] _transport_registry["rest"] = NetworkFirewallPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/base.py index 7497c85bf1a3..9e3413b89fb7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/rest.py index 2169bf16addf..7ee791c6f994 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_firewall_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1435,9 +1435,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1618,9 +1616,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAddPacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAddPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_add_packet_mirroring_rule( request, metadata @@ -1801,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1953,9 +1947,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2132,9 +2124,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() request, metadata = self._interceptor.pre_clone_rules(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_transcoded_request( @@ -2307,9 +2297,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -2601,9 +2589,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2826,9 +2812,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2977,9 +2961,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetPacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_get_packet_mirroring_rule( request, metadata @@ -3130,9 +3112,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -3306,9 +3286,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -3814,9 +3792,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BasePatchPacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BasePatchPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_patch_packet_mirroring_rule( request, metadata @@ -3997,9 +3973,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -4177,9 +4151,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -4359,9 +4331,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseRemovePacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseRemovePacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_remove_packet_mirroring_rule( request, metadata @@ -4536,9 +4506,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -4758,9 +4726,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -4911,9 +4877,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5028,7 +4992,9 @@ def add_packet_mirroring_rule( ]: # 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._AddPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._AddPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def add_rule( @@ -5101,7 +5067,9 @@ def get_packet_mirroring_rule( ]: # 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._GetPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._GetPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_rule( @@ -5148,7 +5116,9 @@ def patch_packet_mirroring_rule( ]: # 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._PatchPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch_rule( @@ -5177,7 +5147,9 @@ def remove_packet_mirroring_rule( ]: # 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._RemovePacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._RemovePacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def remove_rule( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/client.py index 5e2cda8a2f12..9bd8a8441c9a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class NetworkProfilesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkProfilesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkProfilesTransport]] _transport_registry["rest"] = NetworkProfilesRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkProfilesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkProfilesClient._read_environment_variables() + ) self._client_cert_source = NetworkProfilesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkProfilesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/pagers.py index d4cf40c18d78..051d9221b33e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/base.py index c7f275fc443a..50a7d181f3bb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/rest.py index edebc9dc6910..e4643603c432 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/network_profiles/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/client.py index 701c50b9b1a8..2ced20a899cc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.networks import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworksClient._read_environment_variables() + ) self._client_cert_source = NetworksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/pagers.py index 86aad0c556c2..383a4dc3ab77 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/base.py index e9eac97d2a32..76cbd44fa0b0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/rest.py index def25e9ac2af..da2552a18c43 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/networks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1209,9 +1209,7 @@ def __call__( """ - http_options = ( - _BaseNetworksRestTransport._BaseCancelRequestRemovePeering._get_http_options() - ) + http_options = _BaseNetworksRestTransport._BaseCancelRequestRemovePeering._get_http_options() request, metadata = self._interceptor.pre_cancel_request_remove_peering( request, metadata @@ -1280,11 +1278,10 @@ def __call__( resp = self._interceptor.post_cancel_request_remove_peering(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_cancel_request_remove_peering_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_cancel_request_remove_peering_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1686,9 +1683,7 @@ def __call__( """ - http_options = ( - _BaseNetworksRestTransport._BaseGetEffectiveFirewalls._get_http_options() - ) + http_options = _BaseNetworksRestTransport._BaseGetEffectiveFirewalls._get_http_options() request, metadata = self._interceptor.pre_get_effective_firewalls( request, metadata @@ -3324,7 +3319,9 @@ def cancel_request_remove_peering( ]: # 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._CancelRequestRemovePeering(self._session, self._host, self._interceptor) # type: ignore + return self._CancelRequestRemovePeering( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete(self) -> Callable[[compute.DeleteNetworkRequest], compute.Operation]: diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/client.py index 48954628642e..893282afc36c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.node_groups import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeGroupsClient._read_environment_variables() + ) self._client_cert_source = NodeGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/pagers.py index c7d6ca89e55a..6191cbec6853 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/base.py index d9e0975f5d2b..c9a7a551613b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/rest.py index 7453702b4e6e..63ffcf0ef1f2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -3385,9 +3385,7 @@ def __call__( """ - http_options = ( - _BaseNodeGroupsRestTransport._BaseSimulateMaintenanceEvent._get_http_options() - ) + http_options = _BaseNodeGroupsRestTransport._BaseSimulateMaintenanceEvent._get_http_options() request, metadata = self._interceptor.pre_simulate_maintenance_event( request, metadata @@ -3740,7 +3738,9 @@ def simulate_maintenance_event( ]: # 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._SimulateMaintenanceEvent(self._session, self._host, self._interceptor) # type: ignore + return self._SimulateMaintenanceEvent( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/client.py index 4a38bb47afdb..e23fbce9422b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.node_templates import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeTemplatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeTemplatesClient._read_environment_variables() + ) self._client_cert_source = NodeTemplatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeTemplatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/pagers.py index 2ec39315a456..87dbfcd3360d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/base.py index 93895e7db44d..ba2411aa4d37 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/rest.py index c46ba011aa39..f239fbf10ca2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_templates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1913,9 +1913,7 @@ def __call__( """ - http_options = ( - _BaseNodeTemplatesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNodeTemplatesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/client.py index 8cd82e939d77..f96737839a3a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeTypesClient._read_environment_variables() + ) self._client_cert_source = NodeTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/pagers.py index 102dda26b578..b0d2dd3f10cf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/base.py index 168025811251..f6046695285d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/rest.py index 4e29ed299a51..48dc5e9fb300 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/node_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/client.py index 88cad6b1c4c6..79d4b459464d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.organization_security_policies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class OrganizationSecurityPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] _transport_registry["rest"] = OrganizationSecurityPoliciesRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OrganizationSecurityPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OrganizationSecurityPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( OrganizationSecurityPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -655,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OrganizationSecurityPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/pagers.py index df35322f213a..59990292a04f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/__init__.py index 4ea5804aaf22..9e6f8d312955 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] _transport_registry["rest"] = OrganizationSecurityPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/base.py index 2aeb9db168eb..0fa8bf0b753e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_organization_operations @@ -403,9 +403,9 @@ def _global_organization_operations_client( transport=self.kind, ) ) - self._extended_operations_services[ - "global_organization_operations" - ] = ex_op_service + self._extended_operations_services["global_organization_operations"] = ( + ex_op_service + ) return ex_op_service diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/rest.py index 1b718cf895d5..ef9186f191c7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/organization_security_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1156,9 +1156,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1339,9 +1337,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1519,9 +1515,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseCopyRules._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseCopyRules._get_http_options() request, metadata = self._interceptor.pre_copy_rules(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseCopyRules._get_transcoded_request( @@ -1696,9 +1690,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -1849,9 +1841,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseGet._get_transcoded_request( @@ -1994,9 +1984,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2149,9 +2137,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -2325,9 +2311,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -2477,9 +2461,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseList._get_transcoded_request( @@ -2622,9 +2604,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseListAssociations._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseListAssociations._get_http_options() request, metadata = self._interceptor.pre_list_associations( request, metadata @@ -2778,15 +2758,12 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_preconfigured_expression_sets( - request, metadata + request, metadata = ( + self._interceptor.pre_list_preconfigured_expression_sets( + request, metadata + ) ) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_transcoded_request( http_options, request @@ -2849,11 +2826,10 @@ def __call__( resp = self._interceptor.post_list_preconfigured_expression_sets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_preconfigured_expression_sets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_preconfigured_expression_sets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2965,9 +2941,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseMove._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseMove._get_http_options() request, metadata = self._interceptor.pre_move(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseMove._get_transcoded_request( @@ -3139,9 +3113,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BasePatch._get_transcoded_request( @@ -3320,9 +3292,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -3502,9 +3472,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -3679,9 +3647,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -3878,7 +3844,9 @@ def list_preconfigured_expression_sets( ]: # 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._ListPreconfiguredExpressionSets(self._session, self._host, self._interceptor) # type: ignore + return self._ListPreconfiguredExpressionSets( + self._session, self._host, self._interceptor + ) # type: ignore @property def move( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/client.py index 4d9b98c162f7..cbb1a30275cf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.packet_mirrorings import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class PacketMirroringsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PacketMirroringsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PacketMirroringsTransport]] _transport_registry["rest"] = PacketMirroringsRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PacketMirroringsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PacketMirroringsClient._read_environment_variables() + ) self._client_cert_source = PacketMirroringsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PacketMirroringsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/pagers.py index 9f20e64f5117..c6ea891a2a88 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/base.py index 26cbde122826..f6ca21b53c50 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/rest.py index 2ef71134ce71..b7a6403ca27b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/packet_mirrorings/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -616,9 +616,7 @@ def __call__( Contains a list of packetMirrorings. """ - http_options = ( - _BasePacketMirroringsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BasePacketMirroringsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BasePacketMirroringsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1620,9 +1618,7 @@ def __call__( """ - http_options = ( - _BasePacketMirroringsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BasePacketMirroringsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/client.py index 80d6ffbd93df..fd830359ad6c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.preview_features import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class PreviewFeaturesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PreviewFeaturesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PreviewFeaturesTransport]] _transport_registry["rest"] = PreviewFeaturesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PreviewFeaturesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PreviewFeaturesClient._read_environment_variables() + ) self._client_cert_source = PreviewFeaturesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PreviewFeaturesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/pagers.py index 70e66ea77298..0d5a691c04db 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/base.py index 902ba7689db3..fc36ea26f1bf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/rest.py index 1d5ae7f5f5f9..9476b1eea30c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/preview_features/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/client.py index 02d2d759c544..0943c1327265 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.projects import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectsClient._read_environment_variables() + ) self._client_cert_source = ProjectsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/pagers.py index 9b069ee8ebee..71378e4983af 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/base.py index 3bce9ed82b34..aa6352fcdfc0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/rest.py index 653c7057eb9f..261f79b78548 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/projects/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2958,9 +2958,7 @@ def __call__( """ - http_options = ( - _BaseProjectsRestTransport._BaseSetCommonInstanceMetadata._get_http_options() - ) + http_options = _BaseProjectsRestTransport._BaseSetCommonInstanceMetadata._get_http_options() request, metadata = self._interceptor.pre_set_common_instance_metadata( request, metadata @@ -3140,9 +3138,7 @@ def __call__( """ - http_options = ( - _BaseProjectsRestTransport._BaseSetDefaultNetworkTier._get_http_options() - ) + http_options = _BaseProjectsRestTransport._BaseSetDefaultNetworkTier._get_http_options() request, metadata = self._interceptor.pre_set_default_network_tier( request, metadata @@ -3323,9 +3319,7 @@ def __call__( """ - http_options = ( - _BaseProjectsRestTransport._BaseSetManagedProtectionTier._get_http_options() - ) + http_options = _BaseProjectsRestTransport._BaseSetManagedProtectionTier._get_http_options() request, metadata = self._interceptor.pre_set_managed_protection_tier( request, metadata @@ -3696,7 +3690,9 @@ def set_common_instance_metadata( ) -> Callable[[compute.SetCommonInstanceMetadataProjectRequest], compute.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._SetCommonInstanceMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._SetCommonInstanceMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_default_network_tier( @@ -3712,7 +3708,9 @@ def set_managed_protection_tier( ) -> Callable[[compute.SetManagedProtectionTierProjectRequest], compute.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._SetManagedProtectionTier(self._session, self._host, self._interceptor) # type: ignore + return self._SetManagedProtectionTier( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_usage_export_bucket( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/client.py index 781af6ed6117..60c0be4083cb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.public_advertised_prefixes import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class PublicAdvertisedPrefixesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] _transport_registry["rest"] = PublicAdvertisedPrefixesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PublicAdvertisedPrefixesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PublicAdvertisedPrefixesClient._read_environment_variables() + ) self._client_cert_source = ( PublicAdvertisedPrefixesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PublicAdvertisedPrefixesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/pagers.py index 9a7d7863d81a..59dd7a78f93a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/__init__.py index 650a8a373eb5..02e1ed39d336 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] _transport_registry["rest"] = PublicAdvertisedPrefixesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/base.py index fd8ebba77d07..9050a6faa16e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/rest.py index fdb90b26a73f..8a1ea5907a71 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_advertised_prefixes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -646,9 +646,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseAnnounce._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseAnnounce._get_http_options() request, metadata = self._interceptor.pre_announce(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseAnnounce._get_transcoded_request( @@ -821,9 +819,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseDelete._get_transcoded_request( @@ -1148,9 +1144,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseInsert._get_transcoded_request( @@ -1476,9 +1470,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BasePatch._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BasePatch._get_transcoded_request( @@ -1656,9 +1648,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseWithdraw._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseWithdraw._get_http_options() request, metadata = self._interceptor.pre_withdraw(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseWithdraw._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/client.py index 8db50ed3631a..aa48306790e1 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.public_delegated_prefixes import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class PublicDelegatedPrefixesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] _transport_registry["rest"] = PublicDelegatedPrefixesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PublicDelegatedPrefixesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PublicDelegatedPrefixesClient._read_environment_variables() + ) self._client_cert_source = ( PublicDelegatedPrefixesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PublicDelegatedPrefixesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/pagers.py index 84b4a82df534..0ecc67b27f54 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/__init__.py index d648523dc57a..0f7bd60f78b7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] _transport_registry["rest"] = PublicDelegatedPrefixesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/base.py index aa0238dad891..8653f3868e91 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/rest.py index 98e3bb5f5556..68d98ff07150 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/public_delegated_prefixes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -678,9 +678,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -857,9 +855,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseAnnounce._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseAnnounce._get_http_options() request, metadata = self._interceptor.pre_announce(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseAnnounce._get_transcoded_request( @@ -1032,9 +1028,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseDelete._get_transcoded_request( @@ -1362,9 +1356,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseInsert._get_transcoded_request( @@ -1870,9 +1862,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseWithdraw._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseWithdraw._get_http_options() request, metadata = self._interceptor.pre_withdraw(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseWithdraw._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/client.py index 537123174cd9..0e009cdba8e2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_autoscalers import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionAutoscalersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionAutoscalersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionAutoscalersTransport]] _transport_registry["rest"] = RegionAutoscalersRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionAutoscalersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionAutoscalersClient._read_environment_variables() + ) self._client_cert_source = RegionAutoscalersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionAutoscalersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/pagers.py index b3d041f5ed79..96bbe7e09c29 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/base.py index c45c34fef69c..6b3b8872d14f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/rest.py index 088ef49f729b..c67651c2892c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_autoscalers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1474,9 +1474,7 @@ def __call__( """ - http_options = ( - _BaseRegionAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/client.py index f714b85f215b..36c1becffeb7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_backend_buckets import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionBackendBucketsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionBackendBucketsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionBackendBucketsTransport]] _transport_registry["rest"] = RegionBackendBucketsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionBackendBucketsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionBackendBucketsClient._read_environment_variables() + ) self._client_cert_source = RegionBackendBucketsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionBackendBucketsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/pagers.py index ba57b38f423e..e55a56f4ac84 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/__init__.py index d7bffabc6226..afd708c12c80 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionBackendBucketsRestInterceptor, RegionBackendBucketsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionBackendBucketsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionBackendBucketsTransport]] _transport_registry["rest"] = RegionBackendBucketsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/base.py index f07a8d1bf475..987c4c068712 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/rest.py index 66e511d6d1b4..082243b4e1d4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_buckets/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1131,9 +1131,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendBucketsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionBackendBucketsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionBackendBucketsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1606,9 +1604,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendBucketsRestTransport._BaseListUsable._get_http_options() - ) + http_options = _BaseRegionBackendBucketsRestTransport._BaseListUsable._get_http_options() request, metadata = self._interceptor.pre_list_usable(request, metadata) transcoded_request = _BaseRegionBackendBucketsRestTransport._BaseListUsable._get_transcoded_request( @@ -2008,9 +2004,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendBucketsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionBackendBucketsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionBackendBucketsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2161,9 +2155,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendBucketsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionBackendBucketsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/client.py index 5e3c5e5c8b1c..fdb6302453b6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_backend_services import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionBackendServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionBackendServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionBackendServicesTransport]] _transport_registry["rest"] = RegionBackendServicesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionBackendServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionBackendServicesClient._read_environment_variables() + ) self._client_cert_source = RegionBackendServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionBackendServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/pagers.py index b74914a8ae22..1d3784e18db7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/__init__.py index 9168387b112f..9b9ab96e44da 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionBackendServicesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionBackendServicesTransport]] _transport_registry["rest"] = RegionBackendServicesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/base.py index 5e84b29f5a16..d5c72f965819 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/rest.py index 569a584ecbd1..96121de7b46c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_backend_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1243,9 +1243,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseGetHealth._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseGetHealth._get_http_options() request, metadata = self._interceptor.pre_get_health(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseGetHealth._get_transcoded_request( @@ -1471,9 +1469,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1947,9 +1943,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseListUsable._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseListUsable._get_http_options() request, metadata = self._interceptor.pre_list_usable(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseListUsable._get_transcoded_request( @@ -2352,9 +2346,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2533,9 +2525,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_security_policy( request, metadata @@ -2690,9 +2680,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/client.py index e9808eb6bacb..9997dea6447f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_commitments import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionCommitmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionCommitmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionCommitmentsTransport]] _transport_registry["rest"] = RegionCommitmentsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionCommitmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionCommitmentsClient._read_environment_variables() + ) self._client_cert_source = RegionCommitmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionCommitmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/pagers.py index e5a698c0f996..38d1f489a9f4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/base.py index 5ece33156b0c..6073ffeac6be 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/rest.py index 197bf1747e3a..b085e048bbe2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_commitments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -618,9 +618,7 @@ def __call__( """ - http_options = ( - _BaseRegionCommitmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseRegionCommitmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseRegionCommitmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1260,9 +1258,7 @@ def __call__( """ - http_options = ( - _BaseRegionCommitmentsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionCommitmentsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1629,9 +1625,7 @@ def __call__( """ - http_options = ( - _BaseRegionCommitmentsRestTransport._BaseUpdateReservations._get_http_options() - ) + http_options = _BaseRegionCommitmentsRestTransport._BaseUpdateReservations._get_http_options() request, metadata = self._interceptor.pre_update_reservations( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/client.py index 39d80ee36b03..4f7ac8a93275 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_composite_health_checks import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionCompositeHealthChecksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionCompositeHealthChecksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionCompositeHealthChecksTransport]] _transport_registry["rest"] = RegionCompositeHealthChecksRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionCompositeHealthChecksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionCompositeHealthChecksClient._read_environment_variables() + ) self._client_cert_source = ( RegionCompositeHealthChecksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionCompositeHealthChecksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/pagers.py index c712f01450f2..a9acd2eb190c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/__init__.py index 3fffc275301e..2f884b8d0ed8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionCompositeHealthChecksTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionCompositeHealthChecksTransport]] _transport_registry["rest"] = RegionCompositeHealthChecksRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/base.py index 0f126ee46142..825ed67501fc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/rest.py index 4100ac193d8b..b2c5a3d85b22 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_composite_health_checks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -631,9 +631,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseRegionCompositeHealthChecksRestTransport._BaseAggregatedList._get_transcoded_request( @@ -810,9 +808,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionCompositeHealthChecksRestTransport._BaseDelete._get_transcoded_request( @@ -965,9 +961,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionCompositeHealthChecksRestTransport._BaseGet._get_transcoded_request( @@ -1139,9 +1133,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionCompositeHealthChecksRestTransport._BaseInsert._get_transcoded_request( @@ -1291,9 +1283,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionCompositeHealthChecksRestTransport._BaseList._get_transcoded_request( @@ -1467,9 +1457,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionCompositeHealthChecksRestTransport._BasePatch._get_transcoded_request( @@ -1620,9 +1608,7 @@ def __call__( """ - http_options = ( - _BaseRegionCompositeHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionCompositeHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/client.py index e0ccd17c87e7..784d97f5898d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.types import compute @@ -78,9 +78,7 @@ class RegionDiskSettingsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionDiskSettingsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionDiskSettingsTransport]] _transport_registry["rest"] = RegionDiskSettingsRestTransport def get_transport_class( @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionDiskSettingsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionDiskSettingsClient._read_environment_variables() + ) self._client_cert_source = RegionDiskSettingsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionDiskSettingsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/__init__.py index a831e60b2b86..a3d148a9f396 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionDiskSettingsRestInterceptor, RegionDiskSettingsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionDiskSettingsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionDiskSettingsTransport]] _transport_registry["rest"] = RegionDiskSettingsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/base.py index 65694a0a408b..54620a49aa73 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/rest.py index 7ed5ccb9edb3..a50ef25d058f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_settings/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/client.py index 1c50d86b9ffb..23e2767120e0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class RegionDiskTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionDiskTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionDiskTypesTransport]] _transport_registry["rest"] = RegionDiskTypesRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionDiskTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionDiskTypesClient._read_environment_variables() + ) self._client_cert_source = RegionDiskTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionDiskTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/pagers.py index a1f55769023e..bb0e3f2d2df4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/base.py index 3b600f57f2c2..74c789455e65 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/rest.py index fc234d722f5c..cd0850a2c1a0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disk_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/client.py index c2438de46513..f8e19eaa511c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_disks import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionDisksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionDisksClient._read_environment_variables() + ) self._client_cert_source = RegionDisksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionDisksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/pagers.py index 7206d9742268..9260174134b2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/base.py index 43a45698385b..cf4e8c051bdf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/rest.py index 6f94aaa160dd..16b52175c210 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_disks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1187,9 +1187,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseAddResourcePolicies._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseAddResourcePolicies._get_http_options() request, metadata = self._interceptor.pre_add_resource_policies( request, metadata @@ -2617,9 +2615,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseRemoveResourcePolicies._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseRemoveResourcePolicies._get_http_options() request, metadata = self._interceptor.pre_remove_resource_policies( request, metadata @@ -3393,9 +3389,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseStartAsyncReplication._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseStartAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_start_async_replication( request, metadata @@ -3574,9 +3568,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseStopAsyncReplication._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseStopAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_stop_async_replication( request, metadata @@ -3753,9 +3745,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_stop_group_async_replication( request, metadata @@ -3909,9 +3899,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -4248,7 +4236,9 @@ def remove_resource_policies( ) -> Callable[[compute.RemoveResourcePoliciesRegionDiskRequest], compute.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._RemoveResourcePolicies(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveResourcePolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def resize(self) -> Callable[[compute.ResizeRegionDiskRequest], compute.Operation]: @@ -4296,7 +4286,9 @@ def stop_group_async_replication( ]: # 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._StopGroupAsyncReplication(self._session, self._host, self._interceptor) # type: ignore + return self._StopGroupAsyncReplication( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/client.py index cc3cb988c1de..3375966bccf2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_health_aggregation_policies import ( pagers, @@ -84,9 +84,7 @@ class RegionHealthAggregationPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionHealthAggregationPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthAggregationPoliciesTransport]] _transport_registry["rest"] = RegionHealthAggregationPoliciesRestTransport def get_transport_class( @@ -617,11 +615,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionHealthAggregationPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionHealthAggregationPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( RegionHealthAggregationPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -662,8 +658,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionHealthAggregationPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/pagers.py index 55862d8b7170..531bf0795d88 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -150,7 +150,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/__init__.py index 278ca78ce726..854282b6a5d6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionHealthAggregationPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthAggregationPoliciesTransport]] _transport_registry["rest"] = RegionHealthAggregationPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/base.py index 0b73a0034889..5f6fc026b54f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/rest.py index 652d0fba9b71..3608fb4f7555 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_aggregation_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -635,9 +635,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseRegionHealthAggregationPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -812,9 +810,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionHealthAggregationPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -968,9 +964,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionHealthAggregationPoliciesRestTransport._BaseGet._get_transcoded_request( @@ -1142,9 +1136,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionHealthAggregationPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -1296,9 +1288,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionHealthAggregationPoliciesRestTransport._BaseList._get_transcoded_request( @@ -1472,9 +1462,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionHealthAggregationPoliciesRestTransport._BasePatch._get_transcoded_request( @@ -1629,9 +1617,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthAggregationPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionHealthAggregationPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/client.py index 2566ce08ad43..a259c0dd077d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_health_check_services import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionHealthCheckServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionHealthCheckServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthCheckServicesTransport]] _transport_registry["rest"] = RegionHealthCheckServicesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionHealthCheckServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionHealthCheckServicesClient._read_environment_variables() + ) self._client_cert_source = ( RegionHealthCheckServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionHealthCheckServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/pagers.py index a5a15769686d..f2bf3341d350 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/__init__.py index 251cbe2cc4da..d75676f50849 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionHealthCheckServicesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthCheckServicesTransport]] _transport_registry["rest"] = RegionHealthCheckServicesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/base.py index 671f860922ac..ad4532566a0f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/rest.py index ab380925a2d3..6708f93b781a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_check_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -597,9 +597,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BaseDelete._get_transcoded_request( @@ -920,9 +918,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BaseInsert._get_transcoded_request( @@ -1072,9 +1068,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BaseList._get_transcoded_request( @@ -1246,9 +1240,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BasePatch._get_transcoded_request( @@ -1399,9 +1391,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/client.py index f83df433feba..45d0ac000ba5 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_health_checks import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionHealthChecksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionHealthChecksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthChecksTransport]] _transport_registry["rest"] = RegionHealthChecksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionHealthChecksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionHealthChecksClient._read_environment_variables() + ) self._client_cert_source = RegionHealthChecksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionHealthChecksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/pagers.py index c9c7e6b2424a..785aa9944e57 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/__init__.py index 4cf5cc2f2dee..b5068a49f468 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionHealthChecksRestInterceptor, RegionHealthChecksRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionHealthChecksTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthChecksTransport]] _transport_registry["rest"] = RegionHealthChecksRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/base.py index 03c7bed64dbb..8e1f20c03ba6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/rest.py index 11d7e7d06e09..baa6ff4a9f5c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_checks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1482,9 +1482,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/client.py index 7a8becd1799c..ff81a08b21bc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_health_sources import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionHealthSourcesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionHealthSourcesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthSourcesTransport]] _transport_registry["rest"] = RegionHealthSourcesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionHealthSourcesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionHealthSourcesClient._read_environment_variables() + ) self._client_cert_source = RegionHealthSourcesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionHealthSourcesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/pagers.py index ad16f88a1dc8..13eb4910659a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/__init__.py index b1c0d0e70377..ed517a535b8f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionHealthSourcesRestInterceptor, RegionHealthSourcesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionHealthSourcesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthSourcesTransport]] _transport_registry["rest"] = RegionHealthSourcesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/base.py index 7b4626531708..69ebf9b7eeaf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/rest.py index d28f2fe3ea18..be72767136f9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_health_sources/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -617,9 +617,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthSourcesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseRegionHealthSourcesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseRegionHealthSourcesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1608,9 +1606,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthSourcesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionHealthSourcesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/client.py index eac833404d8a..f6cd8782d495 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_instance_group_manager_resize_requests import ( pagers, @@ -84,9 +84,7 @@ class RegionInstanceGroupManagerResizeRequestsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceGroupManagerResizeRequestsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupManagerResizeRequestsTransport]] _transport_registry["rest"] = RegionInstanceGroupManagerResizeRequestsRestTransport def get_transport_class( @@ -621,11 +619,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceGroupManagerResizeRequestsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceGroupManagerResizeRequestsClient._read_environment_variables() + ) self._client_cert_source = ( RegionInstanceGroupManagerResizeRequestsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -666,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast( RegionInstanceGroupManagerResizeRequestsTransport, transport diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/pagers.py index b4b2cf260913..a139ae7c4a40 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/pagers.py @@ -69,7 +69,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/__init__.py index 4b6e60b2a658..b3dbb91be6ed 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceGroupManagerResizeRequestsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupManagerResizeRequestsTransport]] _transport_registry["rest"] = RegionInstanceGroupManagerResizeRequestsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/base.py index c3179a12f4af..507118a68db2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/rest.py index f42a7db11e1f..931d7f62983d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_manager_resize_requests/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -546,9 +546,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_http_options() request, metadata = self._interceptor.pre_cancel(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_transcoded_request( @@ -721,9 +719,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_transcoded_request( @@ -876,9 +872,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_transcoded_request( @@ -1052,9 +1046,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_transcoded_request( @@ -1204,9 +1196,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/client.py index 39c26af0e1a3..3e686f0fb68e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_instance_group_managers import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionInstanceGroupManagersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] _transport_registry["rest"] = RegionInstanceGroupManagersRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceGroupManagersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceGroupManagersClient._read_environment_variables() + ) self._client_cert_source = ( RegionInstanceGroupManagersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstanceGroupManagersTransport, transport) self._api_endpoint = self._transport.host @@ -863,9 +858,7 @@ def sample_abandon_instances(): region_instance_group_managers_abandon_instances_request_resource is not None ): - request.region_instance_group_managers_abandon_instances_request_resource = ( - region_instance_group_managers_abandon_instances_request_resource - ) + request.region_instance_group_managers_abandon_instances_request_resource = region_instance_group_managers_abandon_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1039,9 +1032,7 @@ def sample_abandon_instances(): region_instance_group_managers_abandon_instances_request_resource is not None ): - request.region_instance_group_managers_abandon_instances_request_resource = ( - region_instance_group_managers_abandon_instances_request_resource - ) + request.region_instance_group_managers_abandon_instances_request_resource = region_instance_group_managers_abandon_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1234,9 +1225,7 @@ def sample_adopt_instances(): region_instance_group_managers_adopt_instances_request_resource is not None ): - request.region_instance_group_managers_adopt_instances_request_resource = ( - region_instance_group_managers_adopt_instances_request_resource - ) + request.region_instance_group_managers_adopt_instances_request_resource = region_instance_group_managers_adopt_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1404,9 +1393,7 @@ def sample_adopt_instances(): region_instance_group_managers_adopt_instances_request_resource is not None ): - request.region_instance_group_managers_adopt_instances_request_resource = ( - region_instance_group_managers_adopt_instances_request_resource - ) + request.region_instance_group_managers_adopt_instances_request_resource = region_instance_group_managers_adopt_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1593,9 +1580,7 @@ def sample_apply_updates_to_instances(): region_instance_group_managers_apply_updates_request_resource is not None ): - request.region_instance_group_managers_apply_updates_request_resource = ( - region_instance_group_managers_apply_updates_request_resource - ) + request.region_instance_group_managers_apply_updates_request_resource = region_instance_group_managers_apply_updates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1759,9 +1744,7 @@ def sample_apply_updates_to_instances(): region_instance_group_managers_apply_updates_request_resource is not None ): - request.region_instance_group_managers_apply_updates_request_resource = ( - region_instance_group_managers_apply_updates_request_resource - ) + request.region_instance_group_managers_apply_updates_request_resource = region_instance_group_managers_apply_updates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1953,9 +1936,7 @@ def sample_create_instances(): region_instance_group_managers_create_instances_request_resource is not None ): - request.region_instance_group_managers_create_instances_request_resource = ( - region_instance_group_managers_create_instances_request_resource - ) + request.region_instance_group_managers_create_instances_request_resource = region_instance_group_managers_create_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2120,9 +2101,7 @@ def sample_create_instances(): region_instance_group_managers_create_instances_request_resource is not None ): - request.region_instance_group_managers_create_instances_request_resource = ( - region_instance_group_managers_create_instances_request_resource - ) + request.region_instance_group_managers_create_instances_request_resource = region_instance_group_managers_create_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2622,9 +2601,7 @@ def sample_delete_instances(): region_instance_group_managers_delete_instances_request_resource is not None ): - request.region_instance_group_managers_delete_instances_request_resource = ( - region_instance_group_managers_delete_instances_request_resource - ) + request.region_instance_group_managers_delete_instances_request_resource = region_instance_group_managers_delete_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2798,9 +2775,7 @@ def sample_delete_instances(): region_instance_group_managers_delete_instances_request_resource is not None ): - request.region_instance_group_managers_delete_instances_request_resource = ( - region_instance_group_managers_delete_instances_request_resource - ) + request.region_instance_group_managers_delete_instances_request_resource = region_instance_group_managers_delete_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2987,9 +2962,7 @@ def sample_delete_per_instance_configs(): region_instance_group_manager_delete_instance_config_req_resource is not None ): - request.region_instance_group_manager_delete_instance_config_req_resource = ( - region_instance_group_manager_delete_instance_config_req_resource - ) + request.region_instance_group_manager_delete_instance_config_req_resource = region_instance_group_manager_delete_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -3153,9 +3126,7 @@ def sample_delete_per_instance_configs(): region_instance_group_manager_delete_instance_config_req_resource is not None ): - request.region_instance_group_manager_delete_instance_config_req_resource = ( - region_instance_group_manager_delete_instance_config_req_resource - ) + request.region_instance_group_manager_delete_instance_config_req_resource = region_instance_group_manager_delete_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4788,9 +4759,7 @@ def sample_patch_per_instance_configs(): region_instance_group_manager_patch_instance_config_req_resource is not None ): - request.region_instance_group_manager_patch_instance_config_req_resource = ( - region_instance_group_manager_patch_instance_config_req_resource - ) + request.region_instance_group_manager_patch_instance_config_req_resource = region_instance_group_manager_patch_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4956,9 +4925,7 @@ def sample_patch_per_instance_configs(): region_instance_group_manager_patch_instance_config_req_resource is not None ): - request.region_instance_group_manager_patch_instance_config_req_resource = ( - region_instance_group_manager_patch_instance_config_req_resource - ) + request.region_instance_group_manager_patch_instance_config_req_resource = region_instance_group_manager_patch_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -5885,9 +5852,7 @@ def sample_resize_advanced(): region_instance_group_managers_resize_advanced_request_resource is not None ): - request.region_instance_group_managers_resize_advanced_request_resource = ( - region_instance_group_managers_resize_advanced_request_resource - ) + request.region_instance_group_managers_resize_advanced_request_resource = region_instance_group_managers_resize_advanced_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6067,9 +6032,7 @@ def sample_resize_advanced(): region_instance_group_managers_resize_advanced_request_resource is not None ): - request.region_instance_group_managers_resize_advanced_request_resource = ( - region_instance_group_managers_resize_advanced_request_resource - ) + request.region_instance_group_managers_resize_advanced_request_resource = region_instance_group_managers_resize_advanced_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6269,9 +6232,7 @@ def sample_resume_instances(): region_instance_group_managers_resume_instances_request_resource is not None ): - request.region_instance_group_managers_resume_instances_request_resource = ( - region_instance_group_managers_resume_instances_request_resource - ) + request.region_instance_group_managers_resume_instances_request_resource = region_instance_group_managers_resume_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6446,9 +6407,7 @@ def sample_resume_instances(): region_instance_group_managers_resume_instances_request_resource is not None ): - request.region_instance_group_managers_resume_instances_request_resource = ( - region_instance_group_managers_resume_instances_request_resource - ) + request.region_instance_group_managers_resume_instances_request_resource = region_instance_group_managers_resume_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6632,9 +6591,7 @@ def sample_set_auto_healing_policies(): region_instance_group_managers_set_auto_healing_request_resource is not None ): - request.region_instance_group_managers_set_auto_healing_request_resource = ( - region_instance_group_managers_set_auto_healing_request_resource - ) + request.region_instance_group_managers_set_auto_healing_request_resource = region_instance_group_managers_set_auto_healing_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6795,9 +6752,7 @@ def sample_set_auto_healing_policies(): region_instance_group_managers_set_auto_healing_request_resource is not None ): - request.region_instance_group_managers_set_auto_healing_request_resource = ( - region_instance_group_managers_set_auto_healing_request_resource - ) + request.region_instance_group_managers_set_auto_healing_request_resource = region_instance_group_managers_set_auto_healing_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7326,9 +7281,7 @@ def sample_set_target_pools(): region_instance_group_managers_set_target_pools_request_resource is not None ): - request.region_instance_group_managers_set_target_pools_request_resource = ( - region_instance_group_managers_set_target_pools_request_resource - ) + request.region_instance_group_managers_set_target_pools_request_resource = region_instance_group_managers_set_target_pools_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7485,9 +7438,7 @@ def sample_set_target_pools(): region_instance_group_managers_set_target_pools_request_resource is not None ): - request.region_instance_group_managers_set_target_pools_request_resource = ( - region_instance_group_managers_set_target_pools_request_resource - ) + request.region_instance_group_managers_set_target_pools_request_resource = region_instance_group_managers_set_target_pools_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7687,9 +7638,7 @@ def sample_start_instances(): region_instance_group_managers_start_instances_request_resource is not None ): - request.region_instance_group_managers_start_instances_request_resource = ( - region_instance_group_managers_start_instances_request_resource - ) + request.region_instance_group_managers_start_instances_request_resource = region_instance_group_managers_start_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7864,9 +7813,7 @@ def sample_start_instances(): region_instance_group_managers_start_instances_request_resource is not None ): - request.region_instance_group_managers_start_instances_request_resource = ( - region_instance_group_managers_start_instances_request_resource - ) + request.region_instance_group_managers_start_instances_request_resource = region_instance_group_managers_start_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -8080,9 +8027,7 @@ def sample_stop_instances(): region_instance_group_managers_stop_instances_request_resource is not None ): - request.region_instance_group_managers_stop_instances_request_resource = ( - region_instance_group_managers_stop_instances_request_resource - ) + request.region_instance_group_managers_stop_instances_request_resource = region_instance_group_managers_stop_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -8271,9 +8216,7 @@ def sample_stop_instances(): region_instance_group_managers_stop_instances_request_resource is not None ): - request.region_instance_group_managers_stop_instances_request_resource = ( - region_instance_group_managers_stop_instances_request_resource - ) + request.region_instance_group_managers_stop_instances_request_resource = region_instance_group_managers_stop_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -8485,9 +8428,7 @@ def sample_suspend_instances(): region_instance_group_managers_suspend_instances_request_resource is not None ): - request.region_instance_group_managers_suspend_instances_request_resource = ( - region_instance_group_managers_suspend_instances_request_resource - ) + request.region_instance_group_managers_suspend_instances_request_resource = region_instance_group_managers_suspend_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -8674,9 +8615,7 @@ def sample_suspend_instances(): region_instance_group_managers_suspend_instances_request_resource is not None ): - request.region_instance_group_managers_suspend_instances_request_resource = ( - region_instance_group_managers_suspend_instances_request_resource - ) + request.region_instance_group_managers_suspend_instances_request_resource = region_instance_group_managers_suspend_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -9377,9 +9316,7 @@ def sample_update_per_instance_configs(): region_instance_group_manager_update_instance_config_req_resource is not None ): - request.region_instance_group_manager_update_instance_config_req_resource = ( - region_instance_group_manager_update_instance_config_req_resource - ) + request.region_instance_group_manager_update_instance_config_req_resource = region_instance_group_manager_update_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -9545,9 +9482,7 @@ def sample_update_per_instance_configs(): region_instance_group_manager_update_instance_config_req_resource is not None ): - request.region_instance_group_manager_update_instance_config_req_resource = ( - region_instance_group_manager_update_instance_config_req_resource - ) + request.region_instance_group_manager_update_instance_config_req_resource = region_instance_group_manager_update_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/pagers.py index 2536c19f8b18..c072729eadb7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -219,7 +219,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/__init__.py index 893f6c69a453..9beb4c2b5cab 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] _transport_registry["rest"] = RegionInstanceGroupManagersRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/base.py index 41b374f0d286..550c6ef4287d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/rest.py index cd1bdc8eaac0..1fd91783d38e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_group_managers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1835,9 +1835,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() request, metadata = self._interceptor.pre_abandon_instances( request, metadata @@ -2018,9 +2016,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseAdoptInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseAdoptInstances._get_http_options() request, metadata = self._interceptor.pre_adopt_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseAdoptInstances._get_transcoded_request( @@ -2204,9 +2200,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() request, metadata = self._interceptor.pre_apply_updates_to_instances( request, metadata @@ -2387,9 +2381,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() request, metadata = self._interceptor.pre_create_instances( request, metadata @@ -2571,9 +2563,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseDelete._get_transcoded_request( @@ -2747,9 +2737,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() request, metadata = self._interceptor.pre_delete_instances( request, metadata @@ -2935,9 +2923,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_delete_per_instance_configs( request, metadata @@ -3101,9 +3087,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseGet._get_transcoded_request( @@ -3275,9 +3259,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseInsert._get_transcoded_request( @@ -3429,9 +3411,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseList._get_transcoded_request( @@ -3576,9 +3556,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() request, metadata = self._interceptor.pre_list_errors(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseListErrors._get_transcoded_request( @@ -3729,9 +3707,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() request, metadata = self._interceptor.pre_list_managed_instances( request, metadata @@ -3882,9 +3858,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_list_per_instance_configs( request, metadata @@ -4064,9 +4038,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BasePatch._get_transcoded_request( @@ -4248,9 +4220,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_patch_per_instance_configs( request, metadata @@ -4431,9 +4401,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() request, metadata = self._interceptor.pre_recreate_instances( request, metadata @@ -4613,9 +4581,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseResize._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseResize._get_http_options() request, metadata = self._interceptor.pre_resize(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseResize._get_transcoded_request( @@ -4789,9 +4755,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseResizeAdvanced._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseResizeAdvanced._get_http_options() request, metadata = self._interceptor.pre_resize_advanced(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseResizeAdvanced._get_transcoded_request( @@ -4972,9 +4936,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() request, metadata = self._interceptor.pre_resume_instances( request, metadata @@ -5159,9 +5121,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSetAutoHealingPolicies._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSetAutoHealingPolicies._get_http_options() request, metadata = self._interceptor.pre_set_auto_healing_policies( request, metadata @@ -5342,9 +5302,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() request, metadata = self._interceptor.pre_set_instance_template( request, metadata @@ -5525,9 +5483,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() request, metadata = self._interceptor.pre_set_target_pools( request, metadata @@ -5710,9 +5666,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() request, metadata = self._interceptor.pre_start_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseStartInstances._get_transcoded_request( @@ -5893,9 +5847,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() request, metadata = self._interceptor.pre_stop_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseStopInstances._get_transcoded_request( @@ -6076,9 +6028,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() request, metadata = self._interceptor.pre_suspend_instances( request, metadata @@ -6231,9 +6181,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -6414,9 +6362,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseUpdate._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseUpdate._get_http_options() request, metadata = self._interceptor.pre_update(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseUpdate._get_transcoded_request( @@ -6598,9 +6544,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_update_per_instance_configs( request, metadata @@ -6724,7 +6668,9 @@ def apply_updates_to_instances( ]: # 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._ApplyUpdatesToInstances(self._session, self._host, self._interceptor) # type: ignore + return self._ApplyUpdatesToInstances( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_instances( @@ -6763,7 +6709,9 @@ def delete_per_instance_configs( ]: # 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._DeletePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( @@ -6825,7 +6773,9 @@ def list_per_instance_configs( ]: # 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._ListPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch( @@ -6844,7 +6794,9 @@ def patch_per_instance_configs( ]: # 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._PatchPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def recreate_instances( @@ -6893,7 +6845,9 @@ def set_auto_healing_policies( ]: # 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._SetAutoHealingPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._SetAutoHealingPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_instance_template( @@ -6974,7 +6928,9 @@ def update_per_instance_configs( ]: # 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._UpdatePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/client.py index 47343557e925..86bd8306ce92 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_instance_groups import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionInstanceGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupsTransport]] _transport_registry["rest"] = RegionInstanceGroupsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceGroupsClient._read_environment_variables() + ) self._client_cert_source = RegionInstanceGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstanceGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/pagers.py index 0e10ba2b7a74..11785f815073 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/__init__.py index 64ee5dcb38b2..4e1ced171a44 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionInstanceGroupsRestInterceptor, RegionInstanceGroupsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupsTransport]] _transport_registry["rest"] = RegionInstanceGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/base.py index 934b8166f9c2..7193e2955a5b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/rest.py index 1860f127dfcc..912eb722fb7a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -833,9 +833,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupsRestTransport._BaseListInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupsRestTransport._BaseListInstances._get_http_options() request, metadata = self._interceptor.pre_list_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupsRestTransport._BaseListInstances._get_transcoded_request( @@ -1016,9 +1014,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupsRestTransport._BaseSetNamedPorts._get_http_options() - ) + http_options = _BaseRegionInstanceGroupsRestTransport._BaseSetNamedPorts._get_http_options() request, metadata = self._interceptor.pre_set_named_ports(request, metadata) transcoded_request = _BaseRegionInstanceGroupsRestTransport._BaseSetNamedPorts._get_transcoded_request( @@ -1169,9 +1165,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/client.py index e23928d03338..d0092c8099a7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_instance_templates import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionInstanceTemplatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceTemplatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceTemplatesTransport]] _transport_registry["rest"] = RegionInstanceTemplatesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceTemplatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceTemplatesClient._read_environment_variables() + ) self._client_cert_source = ( RegionInstanceTemplatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstanceTemplatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/pagers.py index cbb93ffabfb8..2b4ab4d2a1c4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/__init__.py index 37ac6b1ce0d9..91c96fdb74c4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceTemplatesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceTemplatesTransport]] _transport_registry["rest"] = RegionInstanceTemplatesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/base.py index 1ab7ff52399c..759f1f9e9f56 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/rest.py index aa5d635caf7e..0669461af948 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instance_templates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -477,9 +477,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceTemplatesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionInstanceTemplatesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionInstanceTemplatesRestTransport._BaseDelete._get_transcoded_request( @@ -817,9 +815,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceTemplatesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionInstanceTemplatesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionInstanceTemplatesRestTransport._BaseInsert._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/client.py index b3dab8198e30..78c874bffb1e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.types import compute @@ -78,9 +78,7 @@ class RegionInstancesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstancesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstancesTransport]] _transport_registry["rest"] = RegionInstancesRestTransport def get_transport_class( @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstancesClient._read_environment_variables() + ) self._client_cert_source = RegionInstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/base.py index 42859c77104d..0de37a2675d8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/rest.py index cd16e36170c7..b092b954e7a0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instances/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/client.py index 84883b888133..d1125192f096 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_instant_snapshots import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionInstantSnapshotsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstantSnapshotsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstantSnapshotsTransport]] _transport_registry["rest"] = RegionInstantSnapshotsRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstantSnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstantSnapshotsClient._read_environment_variables() + ) self._client_cert_source = RegionInstantSnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstantSnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/pagers.py index 6da3a0e15063..12f7a6b363fa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/__init__.py index c79504fba846..d67a8b7e1a0e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstantSnapshotsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstantSnapshotsTransport]] _transport_registry["rest"] = RegionInstantSnapshotsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/base.py index a53c09a038a2..9f7cba7b284c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/rest.py index af62a9392ce8..c306dbdae13b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_instant_snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1070,9 +1070,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionInstantSnapshotsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1620,9 +1618,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionInstantSnapshotsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1801,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseRegionInstantSnapshotsRestTransport._BaseSetLabels._get_transcoded_request( @@ -1954,9 +1948,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/client.py index 91f9e235bf9e..4c190f9cf00e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class RegionMultiMigMembersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionMultiMigMembersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionMultiMigMembersTransport]] _transport_registry["rest"] = RegionMultiMigMembersRestTransport def get_transport_class( @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionMultiMigMembersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionMultiMigMembersClient._read_environment_variables() + ) self._client_cert_source = RegionMultiMigMembersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionMultiMigMembersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/pagers.py index 07d4eccab9fa..8cd83487a745 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/__init__.py index 3c6a7fe7211d..4fe065b6877a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionMultiMigMembersTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionMultiMigMembersTransport]] _transport_registry["rest"] = RegionMultiMigMembersRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/base.py index e0d742df9f5d..f6a127d47661 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/rest.py index c6c470d2b0ac..e0b5963d8a03 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_mig_members/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/client.py index 821433c666bb..81a95ca0810c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_multi_migs import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionMultiMigsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionMultiMigsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionMultiMigsTransport]] _transport_registry["rest"] = RegionMultiMigsRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionMultiMigsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionMultiMigsClient._read_environment_variables() + ) self._client_cert_source = RegionMultiMigsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionMultiMigsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/pagers.py index 1bf6a20d3135..7fdf0e68b9ab 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/base.py index d35949b5260c..205e8a327589 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/rest.py index 43b50c2c55e0..7206c9754484 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_multi_migs/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/client.py index d66028610aa6..bc590dd69394 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_network_endpoint_groups import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionNetworkEndpointGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] _transport_registry["rest"] = RegionNetworkEndpointGroupsRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNetworkEndpointGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNetworkEndpointGroupsClient._read_environment_variables() + ) self._client_cert_source = ( RegionNetworkEndpointGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNetworkEndpointGroupsTransport, transport) self._api_endpoint = self._transport.host @@ -852,9 +847,7 @@ def sample_attach_network_endpoints(): region_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_attach_endpoints_request_resource = ( - region_network_endpoint_groups_attach_endpoints_request_resource - ) + request.region_network_endpoint_groups_attach_endpoints_request_resource = region_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1017,9 +1010,7 @@ def sample_attach_network_endpoints(): region_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_attach_endpoints_request_resource = ( - region_network_endpoint_groups_attach_endpoints_request_resource - ) + request.region_network_endpoint_groups_attach_endpoints_request_resource = region_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1514,9 +1505,7 @@ def sample_detach_network_endpoints(): region_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_detach_endpoints_request_resource = ( - region_network_endpoint_groups_detach_endpoints_request_resource - ) + request.region_network_endpoint_groups_detach_endpoints_request_resource = region_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1679,9 +1668,7 @@ def sample_detach_network_endpoints(): region_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_detach_endpoints_request_resource = ( - region_network_endpoint_groups_detach_endpoints_request_resource - ) + request.region_network_endpoint_groups_detach_endpoints_request_resource = region_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/pagers.py index 5a123a819683..a8704417d1b6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/__init__.py index 3dd7945713af..da8323cc3026 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] _transport_registry["rest"] = RegionNetworkEndpointGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/base.py index 0b0a41277da3..b728d4f962ae 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/rest.py index be51849c59a8..afc3fb77ed79 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_endpoint_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -660,9 +660,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_attach_network_endpoints( request, metadata @@ -842,9 +840,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseDelete._get_transcoded_request( @@ -1020,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_detach_network_endpoints( request, metadata @@ -1183,9 +1177,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseGet._get_transcoded_request( @@ -1357,9 +1349,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseInsert._get_transcoded_request( @@ -1509,9 +1499,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseList._get_transcoded_request( @@ -1656,9 +1644,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_network_endpoints( request, metadata @@ -1761,7 +1747,9 @@ def attach_network_endpoints( ]: # 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._AttachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._AttachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete( @@ -1780,7 +1768,9 @@ def detach_network_endpoints( ]: # 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._DetachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._DetachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/client.py index eb77c21f7a7e..e60afcb1c663 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_network_firewall_policies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionNetworkFirewallPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] _transport_registry["rest"] = RegionNetworkFirewallPoliciesRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNetworkFirewallPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNetworkFirewallPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( RegionNetworkFirewallPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNetworkFirewallPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/pagers.py index 73e954ba9a83..662af83b15e9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/__init__.py index 433f662fc5c8..f3263c79b48b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] _transport_registry["rest"] = RegionNetworkFirewallPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/base.py index 72f96b8bab2b..3a54b34d9652 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/rest.py index b281f281392a..74b70562f3c6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_firewall_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1268,9 +1268,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1449,9 +1447,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1631,9 +1627,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() request, metadata = self._interceptor.pre_clone_rules(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_transcoded_request( @@ -1808,9 +1802,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -1957,9 +1949,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGet._get_transcoded_request( @@ -2102,9 +2092,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2253,9 +2241,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetEffectiveFirewalls._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetEffectiveFirewalls._get_http_options() request, metadata = self._interceptor.pre_get_effective_firewalls( request, metadata @@ -2482,9 +2468,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2635,9 +2619,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -2813,9 +2795,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -2965,9 +2945,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseList._get_transcoded_request( @@ -3139,9 +3117,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatch._get_transcoded_request( @@ -3320,9 +3296,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchAssociation._get_http_options() request, metadata = self._interceptor.pre_patch_association( request, metadata @@ -3503,9 +3477,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -3685,9 +3657,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -3862,9 +3832,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -4086,9 +4054,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -4241,9 +4207,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/client.py index ec5c9f2acea4..608a75ce5384 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_network_policies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionNetworkPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNetworkPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkPoliciesTransport]] _transport_registry["rest"] = RegionNetworkPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNetworkPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNetworkPoliciesClient._read_environment_variables() + ) self._client_cert_source = RegionNetworkPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNetworkPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/pagers.py index 97689cf06f1a..5e46a1f8994e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/__init__.py index 3aea4021a71d..cdc33a7ff41c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNetworkPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkPoliciesTransport]] _transport_registry["rest"] = RegionNetworkPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/base.py index 283e27478f7e..f55aabcd7ef8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/rest.py index 1b5efe483c7d..f034385a2448 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_network_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -990,9 +990,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseRegionNetworkPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1174,9 +1172,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseAddTrafficClassificationRule._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseAddTrafficClassificationRule._get_http_options() request, metadata = self._interceptor.pre_add_traffic_classification_rule( request, metadata @@ -1245,11 +1241,10 @@ def __call__( resp = self._interceptor.post_add_traffic_classification_rule(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_add_traffic_classification_rule_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_add_traffic_classification_rule_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1331,9 +1326,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseRegionNetworkPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1801,9 +1794,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseRegionNetworkPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -1958,9 +1949,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseGetTrafficClassificationRule._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseGetTrafficClassificationRule._get_http_options() request, metadata = self._interceptor.pre_get_traffic_classification_rule( request, metadata @@ -2024,11 +2013,10 @@ def __call__( resp = self._interceptor.post_get_traffic_classification_rule(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_traffic_classification_rule_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_traffic_classification_rule_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2650,9 +2638,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BasePatchTrafficClassificationRule._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BasePatchTrafficClassificationRule._get_http_options() request, metadata = self._interceptor.pre_patch_traffic_classification_rule( request, metadata @@ -2721,11 +2707,10 @@ def __call__( resp = self._interceptor.post_patch_traffic_classification_rule(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_patch_traffic_classification_rule_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_patch_traffic_classification_rule_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2835,9 +2820,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -3017,15 +3000,12 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkPoliciesRestTransport._BaseRemoveTrafficClassificationRule._get_http_options() - ) + http_options = _BaseRegionNetworkPoliciesRestTransport._BaseRemoveTrafficClassificationRule._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_remove_traffic_classification_rule( - request, metadata + request, metadata = ( + self._interceptor.pre_remove_traffic_classification_rule( + request, metadata + ) ) transcoded_request = _BaseRegionNetworkPoliciesRestTransport._BaseRemoveTrafficClassificationRule._get_transcoded_request( http_options, request @@ -3086,11 +3066,10 @@ def __call__( resp = self._interceptor.post_remove_traffic_classification_rule(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_remove_traffic_classification_rule_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_remove_traffic_classification_rule_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3134,7 +3113,9 @@ def add_traffic_classification_rule( ]: # 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._AddTrafficClassificationRule(self._session, self._host, self._interceptor) # type: ignore + return self._AddTrafficClassificationRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def aggregated_list( @@ -3183,7 +3164,9 @@ def get_traffic_classification_rule( ]: # 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._GetTrafficClassificationRule(self._session, self._host, self._interceptor) # type: ignore + return self._GetTrafficClassificationRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def insert( @@ -3220,7 +3203,9 @@ def patch_traffic_classification_rule( ]: # 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._PatchTrafficClassificationRule(self._session, self._host, self._interceptor) # type: ignore + return self._PatchTrafficClassificationRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def remove_association( @@ -3241,7 +3226,9 @@ def remove_traffic_classification_rule( ]: # 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._RemoveTrafficClassificationRule(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveTrafficClassificationRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/client.py index 839ce94aadea..0ab6788e74fe 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_notification_endpoints import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionNotificationEndpointsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNotificationEndpointsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNotificationEndpointsTransport]] _transport_registry["rest"] = RegionNotificationEndpointsRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNotificationEndpointsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNotificationEndpointsClient._read_environment_variables() + ) self._client_cert_source = ( RegionNotificationEndpointsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNotificationEndpointsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/pagers.py index 5ca6e81ce49f..dd6d33112830 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/__init__.py index 5439dcd7a1f4..520eb9a6de76 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNotificationEndpointsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNotificationEndpointsTransport]] _transport_registry["rest"] = RegionNotificationEndpointsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/base.py index dd41f07c3ca9..3630e796214a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/rest.py index b74dc5430cc4..a403e015fdee 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_notification_endpoints/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -542,9 +542,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseDelete._get_transcoded_request( @@ -698,9 +696,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseGet._get_transcoded_request( @@ -872,9 +868,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseInsert._get_transcoded_request( @@ -1024,9 +1018,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseList._get_transcoded_request( @@ -1172,9 +1164,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/client.py index dcaa42271f15..ec2fd1aad787 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class RegionOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionOperationsTransport]] _transport_registry["rest"] = RegionOperationsRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionOperationsClient._read_environment_variables() + ) self._client_cert_source = RegionOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/pagers.py index d7e9df0f9b35..0258203335ba 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/base.py index a8b20f5e6a53..14bc76304227 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/rest.py index fc3128e6ffbf..cb977b5a50a4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/client.py index 475543495d43..0db08f0f23fa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_security_policies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionSecurityPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSecurityPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSecurityPoliciesTransport]] _transport_registry["rest"] = RegionSecurityPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSecurityPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSecurityPoliciesClient._read_environment_variables() + ) self._client_cert_source = RegionSecurityPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSecurityPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/pagers.py index 33c0caa57a88..44027fae410b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/__init__.py index 974b3530fac6..05c2647ccc95 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionSecurityPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionSecurityPoliciesTransport]] _transport_registry["rest"] = RegionSecurityPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/base.py index 8102bf187ae6..a69983268bdc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/rest.py index 707a190ef1e9..c3396ee63556 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_security_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -809,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1291,9 +1289,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -1974,9 +1970,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -2154,9 +2148,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -2330,9 +2322,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseSetLabels._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/client.py index 0572760cdc62..21d400d3a720 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.types import compute @@ -78,9 +78,7 @@ class RegionSnapshotSettingsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSnapshotSettingsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSnapshotSettingsTransport]] _transport_registry["rest"] = RegionSnapshotSettingsRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSnapshotSettingsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSnapshotSettingsClient._read_environment_variables() + ) self._client_cert_source = RegionSnapshotSettingsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -644,8 +640,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSnapshotSettingsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/__init__.py index f490b4a1478c..90555f4f3793 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionSnapshotSettingsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionSnapshotSettingsTransport]] _transport_registry["rest"] = RegionSnapshotSettingsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/base.py index f4d5c4711863..9e019faad1c6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/rest.py index d20d54407e77..f132455e41c5 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshot_settings/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/client.py index 32cd9ed39a69..92810547913a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_snapshots import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionSnapshotsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSnapshotsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSnapshotsTransport]] _transport_registry["rest"] = RegionSnapshotsRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSnapshotsClient._read_environment_variables() + ) self._client_cert_source = RegionSnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/pagers.py index 7f1efc0c92d9..52e9577267cf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/base.py index 0ecf81000b26..fb019bd837e4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/rest.py index 396acbda6640..644b9d7566e5 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1959,9 +1959,7 @@ def __call__( """ - http_options = ( - _BaseRegionSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/client.py index 0a0f314a36b5..2dccd5c3d7be 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_ssl_certificates import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionSslCertificatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSslCertificatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSslCertificatesTransport]] _transport_registry["rest"] = RegionSslCertificatesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSslCertificatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSslCertificatesClient._read_environment_variables() + ) self._client_cert_source = RegionSslCertificatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSslCertificatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/pagers.py index 09753e4967f5..d7b4f97856e4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/__init__.py index 060c7906a8ce..34a9a093486c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionSslCertificatesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionSslCertificatesTransport]] _transport_registry["rest"] = RegionSslCertificatesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/base.py index 2b7d1ea5e49a..dd9d49c9c709 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/rest.py index 78bfd70d9d38..1437f44663c3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_certificates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1188,9 +1188,7 @@ def __call__( """ - http_options = ( - _BaseRegionSslCertificatesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionSslCertificatesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/client.py index 07b6a424fb40..df15b91bdf21 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_ssl_policies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionSslPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSslPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSslPoliciesTransport]] _transport_registry["rest"] = RegionSslPoliciesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSslPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSslPoliciesClient._read_environment_variables() + ) self._client_cert_source = RegionSslPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSslPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/pagers.py index 13fcf04c4986..084245247199 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/base.py index a6efbd024736..a4c4e350bcab 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/rest.py index 7ba2e6bb1dc1..79727b5743cb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_ssl_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1282,9 +1282,7 @@ def __call__( """ - http_options = ( - _BaseRegionSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() - ) + http_options = _BaseRegionSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() request, metadata = self._interceptor.pre_list_available_features( request, metadata @@ -1624,9 +1622,7 @@ def __call__( """ - http_options = ( - _BaseRegionSslPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionSslPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/client.py index 63819fc00b18..9f6445a362e2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_target_http_proxies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionTargetHttpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpProxiesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionTargetHttpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionTargetHttpProxiesClient._read_environment_variables() + ) self._client_cert_source = ( RegionTargetHttpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionTargetHttpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/pagers.py index cc782016608c..0d43331b3c7e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/__init__.py index d1f663d11aae..b1007083364a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/base.py index faa4a732c466..53e9dd239391 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/rest.py index 12fb8efb856c..0c4343a11935 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_http_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -590,9 +590,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionTargetHttpProxiesRestTransport._BaseDelete._get_transcoded_request( @@ -934,9 +932,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionTargetHttpProxiesRestTransport._BaseInsert._get_transcoded_request( @@ -1260,9 +1256,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseSetUrlMap._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseSetUrlMap._get_http_options() request, metadata = self._interceptor.pre_set_url_map(request, metadata) transcoded_request = _BaseRegionTargetHttpProxiesRestTransport._BaseSetUrlMap._get_transcoded_request( @@ -1413,9 +1407,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/client.py index 53be61826ec0..98a227092e67 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_target_https_proxies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionTargetHttpsProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpsProxiesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionTargetHttpsProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionTargetHttpsProxiesClient._read_environment_variables() + ) self._client_cert_source = ( RegionTargetHttpsProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionTargetHttpsProxiesTransport, transport) self._api_endpoint = self._transport.host @@ -2062,9 +2057,7 @@ def sample_set_ssl_certificates(): region_target_https_proxies_set_ssl_certificates_request_resource is not None ): - request.region_target_https_proxies_set_ssl_certificates_request_resource = ( - region_target_https_proxies_set_ssl_certificates_request_resource - ) + request.region_target_https_proxies_set_ssl_certificates_request_resource = region_target_https_proxies_set_ssl_certificates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2221,9 +2214,7 @@ def sample_set_ssl_certificates(): region_target_https_proxies_set_ssl_certificates_request_resource is not None ): - request.region_target_https_proxies_set_ssl_certificates_request_resource = ( - region_target_https_proxies_set_ssl_certificates_request_resource - ) + request.region_target_https_proxies_set_ssl_certificates_request_resource = region_target_https_proxies_set_ssl_certificates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/pagers.py index 2240ba572f18..cc3c7c214ca6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/__init__.py index 56fd11aaf8f8..10e93cde04da 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpsProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/base.py index 8850f642d818..3517c711a1ba 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/rest.py index 27c9b3153561..341325a67d16 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_https_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -703,9 +703,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BaseDelete._get_transcoded_request( @@ -1047,9 +1045,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BaseInsert._get_transcoded_request( @@ -1375,9 +1371,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BasePatch._get_transcoded_request( @@ -1556,9 +1550,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() request, metadata = self._interceptor.pre_set_ssl_certificates( request, metadata @@ -1741,9 +1733,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseSetUrlMap._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseSetUrlMap._get_http_options() request, metadata = self._interceptor.pre_set_url_map(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BaseSetUrlMap._get_transcoded_request( @@ -1894,9 +1884,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/client.py index 5ffce42cc74a..0a168ee33795 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_target_tcp_proxies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class RegionTargetTcpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] _transport_registry["rest"] = RegionTargetTcpProxiesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionTargetTcpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionTargetTcpProxiesClient._read_environment_variables() + ) self._client_cert_source = RegionTargetTcpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionTargetTcpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/pagers.py index b5a62779d6ec..6e052b84c12c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/__init__.py index 72e8e2cb3dfa..d3ec0d868b0d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] _transport_registry["rest"] = RegionTargetTcpProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/base.py index 732ade81ae27..2dd288939a95 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/rest.py index 89f099417e7a..6e12bb39d7b4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_target_tcp_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1165,9 +1165,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetTcpProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionTargetTcpProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/client.py index 9e40d996cacd..7ee4ce7ca2e9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.region_url_maps import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionUrlMapsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionUrlMapsClient._read_environment_variables() + ) self._client_cert_source = RegionUrlMapsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionUrlMapsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/pagers.py index e06fff712988..e25a2e71b495 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/base.py index 995947633601..1dd002632051 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/rest.py index 6b32b1443f94..7cccfadf9b2c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_url_maps/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1766,9 +1766,7 @@ def __call__( """ - http_options = ( - _BaseRegionUrlMapsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionUrlMapsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/client.py index 0a48e6099fe4..1e1fcbb3a936 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionZonesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionZonesClient._read_environment_variables() + ) self._client_cert_source = RegionZonesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionZonesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/pagers.py index 89f032e6c0a4..6e4a184ea540 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/base.py index f6e0c1a4118a..dad6754d1b1b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/rest.py index 42f07f61092d..2a10d3463614 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/region_zones/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/client.py index ce156f9816ba..3a3e7591774d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionsClient._read_environment_variables() + ) self._client_cert_source = RegionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/pagers.py index 251066e08fea..4a0f4c76b875 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/base.py index 4df397c4d2f3..9ea7a665a0df 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/rest.py index 9af8b178836f..75a2520efa4b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/regions/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/client.py index aff363a67e92..fafd42da14f7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.reservation_blocks import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class ReservationBlocksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReservationBlocksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReservationBlocksTransport]] _transport_registry["rest"] = ReservationBlocksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationBlocksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationBlocksClient._read_environment_variables() + ) self._client_cert_source = ReservationBlocksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationBlocksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/pagers.py index fa769c8c8f88..9cee4324088a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/base.py index ca99659056d7..3ac48360fc4e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/rest.py index 992febf04609..20242a326dcc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_blocks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -790,9 +790,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseReservationBlocksRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1118,9 +1116,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BasePerformMaintenance._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BasePerformMaintenance._get_http_options() request, metadata = self._interceptor.pre_perform_maintenance( request, metadata @@ -1346,9 +1342,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseReservationBlocksRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1499,9 +1493,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/client.py index 7a6d57f8b284..c05c08d85ffa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.reservation_sub_blocks import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class ReservationSubBlocksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReservationSubBlocksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReservationSubBlocksTransport]] _transport_registry["rest"] = ReservationSubBlocksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationSubBlocksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationSubBlocksClient._read_environment_variables() + ) self._client_cert_source = ReservationSubBlocksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationSubBlocksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/pagers.py index 51a10f719dec..f233067f1c7b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/__init__.py index b1aa0cc62777..3cc2955ac69c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ReservationSubBlocksRestInterceptor, ReservationSubBlocksRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ReservationSubBlocksTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ReservationSubBlocksTransport]] _transport_registry["rest"] = ReservationSubBlocksRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/base.py index bba08838f849..d991bb74d150 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/rest.py index 0b259f1a26bf..ea99740a285a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservation_sub_blocks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -849,9 +849,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseReservationSubBlocksRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1174,9 +1172,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BasePerformMaintenance._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BasePerformMaintenance._get_http_options() request, metadata = self._interceptor.pre_perform_maintenance( request, metadata @@ -1354,9 +1350,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseReportFaulty._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseReportFaulty._get_http_options() request, metadata = self._interceptor.pre_report_faulty(request, metadata) transcoded_request = _BaseReservationSubBlocksRestTransport._BaseReportFaulty._get_transcoded_request( @@ -1581,9 +1575,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseReservationSubBlocksRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1734,9 +1726,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/client.py index a1d86fbfec31..bb69c14f6eea 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.reservations import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationsClient._read_environment_variables() + ) self._client_cert_source = ReservationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/pagers.py index c20500ea284e..0ea57c632e35 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/base.py index 513eb6a97e8c..26e84fcb2a4c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/rest.py index 22c4eeaf142f..9aa9109408c3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/reservations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1882,9 +1882,7 @@ def __call__( """ - http_options = ( - _BaseReservationsRestTransport._BasePerformMaintenance._get_http_options() - ) + http_options = _BaseReservationsRestTransport._BasePerformMaintenance._get_http_options() request, metadata = self._interceptor.pre_perform_maintenance( request, metadata @@ -2448,9 +2446,7 @@ def __call__( """ - http_options = ( - _BaseReservationsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/client.py index 3a4cd1e48ec7..dddf05fc6bad 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.resource_policies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class ResourcePoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ResourcePoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ResourcePoliciesTransport]] _transport_registry["rest"] = ResourcePoliciesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ResourcePoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ResourcePoliciesClient._read_environment_variables() + ) self._client_cert_source = ResourcePoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ResourcePoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/pagers.py index 2a88ae3add34..21b4427c4372 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/base.py index ade356b5b6be..f8249734730e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/rest.py index 3da68170caaf..3c510c59f5e2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/resource_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -726,9 +726,7 @@ def __call__( Contains a list of resourcePolicies. """ - http_options = ( - _BaseResourcePoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseResourcePoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseResourcePoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2168,9 +2166,7 @@ def __call__( """ - http_options = ( - _BaseResourcePoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseResourcePoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/client.py index 218ae1bc5e1a..3ef688f3cd81 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.rollout_plans import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RolloutPlansClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RolloutPlansClient._read_environment_variables() + ) self._client_cert_source = RolloutPlansClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RolloutPlansTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/pagers.py index df19d0ab2cf8..1162fb835dcb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/base.py index d9bf56bb0456..24d69ca61bb9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/rest.py index c81c3bba0b85..28edb8d58009 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollout_plans/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/client.py index efbf33c848dd..3d0cc78d5d6f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.rollouts import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RolloutsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RolloutsClient._read_environment_variables() + ) self._client_cert_source = RolloutsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RolloutsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/pagers.py index 94afc8d29ccf..89a21c084abc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/base.py index b94883ce6580..7186635924b3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/rest.py index e22a51c19e8e..c9fba8beafea 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/rollouts/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/client.py index 149ab885a41f..18b88309913a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.routers import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RoutersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RoutersClient._read_environment_variables() + ) self._client_cert_source = RoutersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RoutersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/pagers.py index 5b0fa8a7cf63..7a883ab35729 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -298,7 +298,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -374,7 +374,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/base.py index bea66e644bd9..a33c29e1d88d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/rest.py index 867f6fa2cfae..bb45c09ed2cd 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/client.py index 58c38db6a42e..ab706f6ae554 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.routes import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RoutesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RoutesClient._read_environment_variables() + ) self._client_cert_source = RoutesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RoutesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/pagers.py index 5f0292895d68..b2780c0e7414 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/base.py index ca41b5765bdc..cfb3ac6037dd 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/rest.py index e94080e45b0c..83b9b5fac751 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/routes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/client.py index 1ed480f1c75c..f9d90a8d5212 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.security_policies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class SecurityPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SecurityPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SecurityPoliciesTransport]] _transport_registry["rest"] = SecurityPoliciesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SecurityPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SecurityPoliciesClient._read_environment_variables() + ) self._client_cert_source = SecurityPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SecurityPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/pagers.py index c33fc4d3d8ac..859c2c94c7d4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/base.py index d0243b7683b6..0e5ab1e15615 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/rest.py index 5b975b99af23..44da391cb31e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/security_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1134,9 +1134,7 @@ def __call__( """ - http_options = ( - _BaseSecurityPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseSecurityPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseSecurityPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2100,15 +2098,12 @@ def __call__( """ - http_options = ( - _BaseSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ) + http_options = _BaseSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_preconfigured_expression_sets( - request, metadata + request, metadata = ( + self._interceptor.pre_list_preconfigured_expression_sets( + request, metadata + ) ) transcoded_request = _BaseSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_transcoded_request( http_options, request @@ -2171,11 +2166,10 @@ def __call__( resp = self._interceptor.post_list_preconfigured_expression_sets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_preconfigured_expression_sets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_preconfigured_expression_sets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2978,9 +2972,7 @@ def __call__( """ - http_options = ( - _BaseSecurityPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSecurityPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3143,7 +3135,9 @@ def list_preconfigured_expression_sets( ]: # 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._ListPreconfiguredExpressionSets(self._session, self._host, self._interceptor) # type: ignore + return self._ListPreconfiguredExpressionSets( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/client.py index 06fcb6715c0b..10b122d0db6b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.service_attachments import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class ServiceAttachmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServiceAttachmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServiceAttachmentsTransport]] _transport_registry["rest"] = ServiceAttachmentsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServiceAttachmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServiceAttachmentsClient._read_environment_variables() + ) self._client_cert_source = ServiceAttachmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServiceAttachmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/pagers.py index 7bdc429e632d..104002945fc2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/__init__.py index 636b3cbe6749..e75723ac4a42 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ServiceAttachmentsRestInterceptor, ServiceAttachmentsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServiceAttachmentsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServiceAttachmentsTransport]] _transport_registry["rest"] = ServiceAttachmentsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/base.py index 62c53df7d7fa..61350b1fbc73 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/rest.py index f02404ee0f4f..120a3c1b6c8d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/service_attachments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -731,9 +731,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseServiceAttachmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1287,9 +1285,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseServiceAttachmentsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2027,9 +2023,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseServiceAttachmentsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2180,9 +2174,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/client.py index dfa5f7e94dc5..18d0260d818c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.types import compute @@ -78,9 +78,7 @@ class SnapshotSettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SnapshotSettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SnapshotSettingsServiceTransport]] _transport_registry["rest"] = SnapshotSettingsServiceRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SnapshotSettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SnapshotSettingsServiceClient._read_environment_variables() + ) self._client_cert_source = ( SnapshotSettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SnapshotSettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/__init__.py index 83b20168d6c6..a3107dbdce8d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SnapshotSettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SnapshotSettingsServiceTransport]] _transport_registry["rest"] = SnapshotSettingsServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/base.py index 3aeb3f9a05c3..44f050b7d643 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/rest.py index 9f3b99463b70..16d140eb7a0e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshot_settings_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/client.py index ab57ca0ce859..b8bd82685201 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.snapshots import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SnapshotsClient._read_environment_variables() + ) self._client_cert_source = SnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/pagers.py index 8e51adfdfd39..3df16f96ad59 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/base.py index b1facbd30add..0bd0be84c1c4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/rest.py index 3b5372d636bb..54a48bdc5fd0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/client.py index 403a0a4ce240..3cde14ada239 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.ssl_certificates import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class SslCertificatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SslCertificatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SslCertificatesTransport]] _transport_registry["rest"] = SslCertificatesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SslCertificatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SslCertificatesClient._read_environment_variables() + ) self._client_cert_source = SslCertificatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SslCertificatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/pagers.py index a459ce81e532..231b98d90a7b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/base.py index 3025d742bc4e..ddb0bb52eb4f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/rest.py index 785cf92579a7..8e25398b30a7 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_certificates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -562,9 +562,7 @@ def __call__( """ - http_options = ( - _BaseSslCertificatesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseSslCertificatesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseSslCertificatesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1400,9 +1398,7 @@ def __call__( """ - http_options = ( - _BaseSslCertificatesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSslCertificatesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/client.py index fc587af9f330..b35d6c64286c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.ssl_policies import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SslPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SslPoliciesClient._read_environment_variables() + ) self._client_cert_source = SslPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SslPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/pagers.py index 08a2137fce65..9d3db54315fa 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/base.py index 2e50a8df74e7..fcbcac6d55e6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/rest.py index 031d8edf98b2..92e423fad419 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/ssl_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1462,9 +1462,7 @@ def __call__( """ - http_options = ( - _BaseSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() - ) + http_options = _BaseSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() request, metadata = self._interceptor.pre_list_available_features( request, metadata @@ -1795,9 +1793,7 @@ def __call__( """ - http_options = ( - _BaseSslPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSslPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/client.py index a7d4ee5a7c13..3ada28b79f4b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class StoragePoolTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[StoragePoolTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[StoragePoolTypesTransport]] _transport_registry["rest"] = StoragePoolTypesRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = StoragePoolTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + StoragePoolTypesClient._read_environment_variables() + ) self._client_cert_source = StoragePoolTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(StoragePoolTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/pagers.py index 5f242e591547..a75743df6cfb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/base.py index a0320b788896..44642907f366 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/rest.py index b85e3d7a21cc..dd42327c05be 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pool_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -395,9 +395,7 @@ def __call__( """ - http_options = ( - _BaseStoragePoolTypesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseStoragePoolTypesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseStoragePoolTypesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/client.py index 50dc28316f88..a395d453774e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.storage_pools import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = StoragePoolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + StoragePoolsClient._read_environment_variables() + ) self._client_cert_source = StoragePoolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(StoragePoolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/pagers.py index 6114e726b878..b6e9507b9340 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/base.py index 63cb39d86276..d4baf966100d 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/rest.py index 779874eea2cb..f0efb927c0f6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/storage_pools/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2175,9 +2175,7 @@ def __call__( """ - http_options = ( - _BaseStoragePoolsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseStoragePoolsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/client.py index d559855fccf8..d59a2b7d4316 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.subnetworks import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SubnetworksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SubnetworksClient._read_environment_variables() + ) self._client_cert_source = SubnetworksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SubnetworksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/pagers.py index 7142ffc15088..6df969a1afe2 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/base.py index 0c5a85443e6c..11e7b32654ec 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/rest.py index cc211bcf8ff7..e99befaaf8ca 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/subnetworks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2688,9 +2688,7 @@ def __call__( """ - http_options = ( - _BaseSubnetworksRestTransport._BaseSetPrivateIpGoogleAccess._get_http_options() - ) + http_options = _BaseSubnetworksRestTransport._BaseSetPrivateIpGoogleAccess._get_http_options() request, metadata = self._interceptor.pre_set_private_ip_google_access( request, metadata @@ -2842,9 +2840,7 @@ def __call__( """ - http_options = ( - _BaseSubnetworksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSubnetworksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3023,7 +3019,9 @@ def set_private_ip_google_access( ]: # 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._SetPrivateIpGoogleAccess(self._session, self._host, self._interceptor) # type: ignore + return self._SetPrivateIpGoogleAccess( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/client.py index 0a4699327613..3c2369afcadf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.target_grpc_proxies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class TargetGrpcProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetGrpcProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetGrpcProxiesTransport]] _transport_registry["rest"] = TargetGrpcProxiesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetGrpcProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetGrpcProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetGrpcProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetGrpcProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/pagers.py index c85bc07452c6..fd96b0b2913c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/base.py index e59e26b74626..f2ce43fb7999 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/rest.py index d5f60b2854ae..11e37b541723 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_grpc_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1412,9 +1412,7 @@ def __call__( """ - http_options = ( - _BaseTargetGrpcProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetGrpcProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/client.py index f10a6eb47888..5867e6d26df3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.target_http_proxies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class TargetHttpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetHttpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetHttpProxiesTransport]] _transport_registry["rest"] = TargetHttpProxiesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetHttpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetHttpProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetHttpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetHttpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/pagers.py index adc3f5d35289..e03f42fa7a5a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/base.py index eff5349c8019..d65f6307de5c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/rest.py index bdf7990a1de7..93fed1c1bf66 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_http_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -671,9 +671,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpProxiesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetHttpProxiesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetHttpProxiesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1868,9 +1866,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetHttpProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/client.py index e463e0020104..46c9a6fcbf2b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.target_https_proxies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class TargetHttpsProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetHttpsProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetHttpsProxiesTransport]] _transport_registry["rest"] = TargetHttpsProxiesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetHttpsProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetHttpsProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetHttpsProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetHttpsProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/pagers.py index c942abe6e835..d9384a17611e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/__init__.py index b590b838910b..5aaf31dbadf8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import TargetHttpsProxiesRestInterceptor, TargetHttpsProxiesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[TargetHttpsProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[TargetHttpsProxiesTransport]] _transport_registry["rest"] = TargetHttpsProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/base.py index fcf9b48ce81c..25347813db15 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/rest.py index f46d40c43d92..91c736842f78 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_https_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -896,9 +896,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetHttpsProxiesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1941,9 +1939,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetCertificateMap._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetCertificateMap._get_http_options() request, metadata = self._interceptor.pre_set_certificate_map( request, metadata @@ -2124,9 +2120,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetQuicOverride._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetQuicOverride._get_http_options() request, metadata = self._interceptor.pre_set_quic_override( request, metadata @@ -2307,9 +2301,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() request, metadata = self._interceptor.pre_set_ssl_certificates( request, metadata @@ -2492,9 +2484,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetSslPolicy._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetSslPolicy._get_http_options() request, metadata = self._interceptor.pre_set_ssl_policy(request, metadata) transcoded_request = _BaseTargetHttpsProxiesRestTransport._BaseSetSslPolicy._get_transcoded_request( @@ -2825,9 +2815,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/client.py index 3b9083a31cf8..a9bfe8db5b51 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.target_instances import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class TargetInstancesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetInstancesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetInstancesTransport]] _transport_registry["rest"] = TargetInstancesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetInstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetInstancesClient._read_environment_variables() + ) self._client_cert_source = TargetInstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetInstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/pagers.py index 24de387175a7..e28abefac8e9 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/base.py index f6699e68683c..5dfde8b86761 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/rest.py index f7be612b3833..b54bc61da392 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_instances/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -619,9 +619,7 @@ def __call__( """ - http_options = ( - _BaseTargetInstancesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetInstancesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetInstancesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1463,9 +1461,7 @@ def __call__( """ - http_options = ( - _BaseTargetInstancesRestTransport._BaseSetSecurityPolicy._get_http_options() - ) + http_options = _BaseTargetInstancesRestTransport._BaseSetSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_security_policy( request, metadata @@ -1618,9 +1614,7 @@ def __call__( """ - http_options = ( - _BaseTargetInstancesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetInstancesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/client.py index 1832c4afadea..d6ba8053975c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.target_pools import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetPoolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetPoolsClient._read_environment_variables() + ) self._client_cert_source = TargetPoolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetPoolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/pagers.py index dfb93f39a70e..b9850946bd15 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/base.py index cf6ef8c47e97..4c425c3a2e61 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/rest.py index 9bbef28c9369..de99d4a080b0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_pools/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2996,9 +2996,7 @@ def __call__( """ - http_options = ( - _BaseTargetPoolsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetPoolsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/client.py index b1559dd3a66b..f1b6bbe80b1e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.target_ssl_proxies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class TargetSslProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetSslProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetSslProxiesTransport]] _transport_registry["rest"] = TargetSslProxiesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetSslProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetSslProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetSslProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetSslProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/pagers.py index 8c2e9ba63659..acfa9e0d15d8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/base.py index 34c4b72ba2df..d5e5c228481e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/rest.py index bd3912731aae..9b9cb18778e5 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_ssl_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1481,9 +1481,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetBackendService._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetBackendService._get_http_options() request, metadata = self._interceptor.pre_set_backend_service( request, metadata @@ -1664,9 +1662,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetCertificateMap._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetCertificateMap._get_http_options() request, metadata = self._interceptor.pre_set_certificate_map( request, metadata @@ -1846,9 +1842,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetProxyHeader._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetProxyHeader._get_http_options() request, metadata = self._interceptor.pre_set_proxy_header( request, metadata @@ -2029,9 +2023,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetSslCertificates._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetSslCertificates._get_http_options() request, metadata = self._interceptor.pre_set_ssl_certificates( request, metadata @@ -2364,9 +2356,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/client.py index c8a717808c13..054dd079b2c8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.target_tcp_proxies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class TargetTcpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetTcpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetTcpProxiesTransport]] _transport_registry["rest"] = TargetTcpProxiesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetTcpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetTcpProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetTcpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetTcpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/pagers.py index 6aac88432c91..9ceedc867e7e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/base.py index 823e6a94936e..b08ff767ab7c 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/rest.py index 2d090500f048..7dc4c1a3e9c4 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_tcp_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -674,9 +674,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetTcpProxiesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1519,9 +1517,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseSetBackendService._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseSetBackendService._get_http_options() request, metadata = self._interceptor.pre_set_backend_service( request, metadata @@ -1701,9 +1697,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseSetProxyHeader._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseSetProxyHeader._get_http_options() request, metadata = self._interceptor.pre_set_proxy_header( request, metadata @@ -1856,9 +1850,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/client.py index d0bc0d2e5929..ba0e1b9220a6 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.target_vpn_gateways import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class TargetVpnGatewaysClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetVpnGatewaysTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetVpnGatewaysTransport]] _transport_registry["rest"] = TargetVpnGatewaysRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetVpnGatewaysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetVpnGatewaysClient._read_environment_variables() + ) self._client_cert_source = TargetVpnGatewaysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetVpnGatewaysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/pagers.py index db8ab7a1d11e..dd1393871f0a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/base.py index 6c1054ca3275..15984235259a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/rest.py index 2e575af6a30f..845b5a8714a0 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/target_vpn_gateways/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -618,9 +618,7 @@ def __call__( """ - http_options = ( - _BaseTargetVpnGatewaysRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetVpnGatewaysRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetVpnGatewaysRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1614,9 +1612,7 @@ def __call__( """ - http_options = ( - _BaseTargetVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/client.py index faab43237a4b..54668e26b968 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.url_maps import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UrlMapsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UrlMapsClient._read_environment_variables() + ) self._client_cert_source = UrlMapsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UrlMapsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/pagers.py index 70d5512347e1..986ebfc5b723 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/base.py index 05888e83bd08..534064afd69e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/rest.py index e0c1358c240c..2b06acdab1bb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/url_maps/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/client.py index 9dd133464f49..9681123be4f8 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.vpn_gateways import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VpnGatewaysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VpnGatewaysClient._read_environment_variables() + ) self._client_cert_source = VpnGatewaysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VpnGatewaysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/pagers.py index 236bdf0cc377..209b84a9849b 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/base.py index a56d1945d50c..95bc6334f371 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/rest.py index a6488b60e624..b76f711dfdeb 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_gateways/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1803,9 +1803,7 @@ def __call__( """ - http_options = ( - _BaseVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/client.py index 0591d9cabe1d..2fad6094fd6f 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.vpn_tunnels import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VpnTunnelsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VpnTunnelsClient._read_environment_variables() + ) self._client_cert_source = VpnTunnelsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VpnTunnelsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/pagers.py index 3e68265cc9e1..9d90ed0a43bc 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/base.py index 98a29683af9c..c8bf7e256eaf 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import region_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/rest.py index bfe59d9bd95a..9cc78f887a13 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/vpn_tunnels/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/client.py index 6b93eaae754d..dd25f9398eea 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.wire_groups import pagers from google.cloud.compute_v1beta.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = WireGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + WireGroupsClient._read_environment_variables() + ) self._client_cert_source = WireGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(WireGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/pagers.py index 8340a9ee4870..5fb759bcef39 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/base.py index b90e3ffae9db..5f1614d53dc3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import global_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/rest.py index 90642004e18c..ab6739979721 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/wire_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/client.py index 5982e663fb91..f07b2544a190 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -76,9 +76,7 @@ class ZoneOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ZoneOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ZoneOperationsTransport]] _transport_registry["rest"] = ZoneOperationsRestTransport def get_transport_class( @@ -597,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ZoneOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ZoneOperationsClient._read_environment_variables() + ) self._client_cert_source = ZoneOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -636,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ZoneOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/pagers.py index 4a47ec4d4a79..6c1e9073d7c3 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/base.py index 659b4cb7fe0e..a8a405888b96 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/rest.py index 1e906f24158f..c4f190c90180 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/client.py index ab9e224fe02e..94e88b6aad2a 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1beta.services.zone_vm_extension_policies import pagers from google.cloud.compute_v1beta.types import compute @@ -79,9 +79,7 @@ class ZoneVmExtensionPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ZoneVmExtensionPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ZoneVmExtensionPoliciesTransport]] _transport_registry["rest"] = ZoneVmExtensionPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ZoneVmExtensionPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ZoneVmExtensionPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( ZoneVmExtensionPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ZoneVmExtensionPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/pagers.py index ced5c7e591a0..95fbda14f571 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/__init__.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/__init__.py index 601f34f0d2db..1b0b868b7c67 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/__init__.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ZoneVmExtensionPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ZoneVmExtensionPoliciesTransport]] _transport_registry["rest"] = ZoneVmExtensionPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/base.py index 489a82d5ea88..c2c2136835be 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.services import zone_operations diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/rest.py index 80bc37f48848..3a214e812f7e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zone_vm_extension_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -533,9 +533,7 @@ def __call__( """ - http_options = ( - _BaseZoneVmExtensionPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseZoneVmExtensionPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseZoneVmExtensionPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -854,9 +852,7 @@ def __call__( """ - http_options = ( - _BaseZoneVmExtensionPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseZoneVmExtensionPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseZoneVmExtensionPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -1180,9 +1176,7 @@ def __call__( """ - http_options = ( - _BaseZoneVmExtensionPoliciesRestTransport._BaseUpdate._get_http_options() - ) + http_options = _BaseZoneVmExtensionPoliciesRestTransport._BaseUpdate._get_http_options() request, metadata = self._interceptor.pre_update(request, metadata) transcoded_request = _BaseZoneVmExtensionPoliciesRestTransport._BaseUpdate._get_transcoded_request( diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/client.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/client.py index 394f551da266..b2a639827266 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/client.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ZonesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ZonesClient._read_environment_variables() + ) self._client_cert_source = ZonesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ZonesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/pagers.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/pagers.py index 534d671e7281..3f0d47afd015 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/pagers.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/base.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/base.py index 67fb34005a8f..e923070fa93e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/base.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1beta import gapic_version as package_version from google.cloud.compute_v1beta.types import compute diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/rest.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/rest.py index 5427838e719d..4bd099b1821e 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/rest.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/services/zones/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/types/compute.py b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/types/compute.py index 3ce24539f4e5..6ea00c84eeb1 100644 --- a/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/types/compute.py +++ b/packages/google-cloud-compute-v1beta/google/cloud/compute_v1beta/types/compute.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -2399,6 +2399,7 @@ class State(proto.Enum): This value has been deprecated and is no longer used. """ + UNDEFINED_STATE = 0 AVAILABLE = 442079913 DEGRADED = 396890926 @@ -2875,6 +2876,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -2895,6 +2897,7 @@ class Type(proto.Enum): ONE_TO_ONE_NAT (84090205): No description available. """ + UNDEFINED_TYPE = 0 DIRECT_IPV6 = 4397213 ONE_TO_ONE_NAT = 84090205 @@ -4866,6 +4869,7 @@ class AddressType(proto.Enum): UNSPECIFIED_TYPE (53933922): No description available. """ + UNDEFINED_ADDRESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -4886,6 +4890,7 @@ class IpVersion(proto.Enum): UNSPECIFIED_VERSION (21850000): No description available. """ + UNDEFINED_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -4906,6 +4911,7 @@ class Ipv6EndpointType(proto.Enum): VM (2743): Reserved IPv6 address can be used on VM. """ + UNDEFINED_IPV6_ENDPOINT_TYPE = 0 NETLB = 74173363 VM = 2743 @@ -4935,6 +4941,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -5008,6 +5015,7 @@ class Purpose(proto.Enum): VPC_PEERING (400800170): IP range for peer networks. """ + UNDEFINED_PURPOSE = 0 DNS_RESOLVER = 476114556 GCE_ENDPOINT = 230515243 @@ -5037,6 +5045,7 @@ class Status(proto.Enum): RESERVING (514587225): Address is being reserved. """ + UNDEFINED_STATUS = 0 IN_USE = 17393485 RESERVED = 432241448 @@ -5475,6 +5484,7 @@ class PerformanceMonitoringUnit(proto.Enum): STANDARD (484642493): Most documented core/L2 events. """ + UNDEFINED_PERFORMANCE_MONITORING_UNIT = 0 ARCHITECTURAL = 155113693 ENHANCED = 476873590 @@ -13690,6 +13700,7 @@ class Views(proto.Enum): WITH_UTILIZATION (504090633): Utilization data is included in the response. """ + UNDEFINED_VIEWS = 0 DEFAULT = 115302945 WITH_UTILIZATION = 504090633 @@ -15528,6 +15539,7 @@ class VmFamily(proto.Enum): VM_FAMILY_CLOUD_TPU_POD_SLICE_TPU7X (485271888): No description available. """ + UNDEFINED_VM_FAMILY = 0 VM_FAMILY_CLOUD_TPU_DEVICE_CT3 = 42845948 VM_FAMILY_CLOUD_TPU_LITE_DEVICE_CT5L = 108020067 @@ -15555,6 +15567,7 @@ class WorkloadType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_WORKLOAD_TYPE = 0 BATCH = 62971674 SERVING = 17781740 @@ -15682,6 +15695,7 @@ class ServiceShareType(proto.Enum): SERVICE_SHARE_TYPE_UNSPECIFIED (279057148): No description available. """ + UNDEFINED_SERVICE_SHARE_TYPE = 0 ALLOW_ALL = 475536235 DISALLOW_ALL = 277786301 @@ -15785,6 +15799,7 @@ class HealthStatus(proto.Enum): The health status of the reservation is unspecified. """ + UNDEFINED_HEALTH_STATUS = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -15873,6 +15888,7 @@ class Interface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -15966,6 +15982,7 @@ class MaintenanceInterval(proto.Enum): available. RECURRENT is used for GEN3 and Slice of Hardware VMs. """ + UNDEFINED_MAINTENANCE_INTERVAL = 0 AS_NEEDED = 500724834 PERIODIC = 142804635 @@ -16793,6 +16810,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -16815,6 +16833,7 @@ class Interface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -16837,6 +16856,7 @@ class Mode(proto.Enum): virtual machine at a time can be attached to a disk in read-write mode. """ + UNDEFINED_MODE = 0 READ_ONLY = 91950261 READ_WRITE = 173607894 @@ -16856,6 +16876,7 @@ class SavedState(proto.Enum): PRESERVED (254159736): Disk state has been preserved. """ + UNDEFINED_SAVED_STATE = 0 DISK_SAVED_STATE_UNSPECIFIED = 391290831 PRESERVED = 254159736 @@ -16873,6 +16894,7 @@ class Type(proto.Enum): SCRATCH (496778970): No description available. """ + UNDEFINED_TYPE = 0 PERSISTENT = 460683927 SCRATCH = 496778970 @@ -17247,6 +17269,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -17270,6 +17293,7 @@ class OnUpdateAction(proto.Enum): Use the existing disk, this is the default behaviour. """ + UNDEFINED_ON_UPDATE_ACTION = 0 RECREATE_DISK = 494767853 RECREATE_DISK_IF_SOURCE_CHANGED = 398099712 @@ -17534,6 +17558,7 @@ class LogType(proto.Enum): LOG_TYPE_UNSPECIFIED (154527053): Default case. Should never be this. """ + UNDEFINED_LOG_TYPE = 0 ADMIN_READ = 128951462 DATA_READ = 305224971 @@ -17718,6 +17743,7 @@ class Status(proto.Enum): Autoscaler backend hasn't read new/updated configuration """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 DELETING = 528602024 @@ -17765,13 +17791,13 @@ class Status(proto.Enum): number=138946292, optional=True, ) - scaling_schedule_status: MutableMapping[ - str, "ScalingScheduleStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=465950178, - message="ScalingScheduleStatus", + scaling_schedule_status: MutableMapping[str, "ScalingScheduleStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=465950178, + message="ScalingScheduleStatus", + ) ) self_link: str = proto.Field( proto.STRING, @@ -18164,6 +18190,7 @@ class Type(proto.Enum): autoscalers: in at least one of the zones you're using there is a resource stockout. """ + UNDEFINED_TYPE = 0 ALL_INSTANCES_UNHEALTHY = 404965477 BACKEND_SERVICE_DOES_NOT_EXIST = 191417626 @@ -18346,6 +18373,7 @@ class Mode(proto.Enum): Automatically create VMs according to the policy, but do not scale the MIG in. """ + UNDEFINED_MODE = 0 OFF = 78159 ON = 2527 @@ -18405,13 +18433,13 @@ class Mode(proto.Enum): optional=True, message="AutoscalingPolicyScaleInControl", ) - scaling_schedules: MutableMapping[ - str, "AutoscalingPolicyScalingSchedule" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=355416580, - message="AutoscalingPolicyScalingSchedule", + scaling_schedules: MutableMapping[str, "AutoscalingPolicyScalingSchedule"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=355416580, + message="AutoscalingPolicyScalingSchedule", + ) ) @@ -18479,6 +18507,7 @@ class PredictiveMethod(proto.Enum): PREDICTIVE_METHOD_UNSPECIFIED (52410265): No description available. """ + UNDEFINED_PREDICTIVE_METHOD = 0 NONE = 2402104 OPTIMIZE_AVAILABILITY = 11629437 @@ -18619,6 +18648,7 @@ class UtilizationTargetType(proto.Enum): the utilization target value to perform autoscaling. """ + UNDEFINED_UTILIZATION_TARGET_TYPE = 0 DELTA_PER_MINUTE = 87432861 DELTA_PER_SECOND = 255180029 @@ -19057,6 +19087,7 @@ class BalancingMode(proto.Enum): UTILIZATION (157008386): Balance based on the backend utilization. """ + UNDEFINED_BALANCING_MODE = 0 CONNECTION = 246311646 CUSTOM_METRICS = 331575765 @@ -19088,6 +19119,7 @@ class Preference(proto.Enum): PREFERRED (418847841): Traffic will be sent to this backend first. """ + UNDEFINED_PREFERENCE = 0 DEFAULT = 115302945 PREFERENCE_UNSPECIFIED = 496219571 @@ -19109,6 +19141,7 @@ class TrafficDuration(proto.Enum): TRAFFIC_DURATION_UNSPECIFIED (265201166): Traffic duration is unspecified. """ + UNDEFINED_TRAFFIC_DURATION = 0 LONG = 2342524 SHORT = 78875740 @@ -19326,6 +19359,7 @@ class CompressionMode(proto.Enum): responses cached by Cloud CDN will not be served to clients. """ + UNDEFINED_COMPRESSION_MODE = 0 AUTOMATIC = 165298699 DISABLED = 516696700 @@ -19349,6 +19383,7 @@ class LoadBalancingScheme(proto.Enum): Signifies that this will be used for internal Application Load Balancers. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 EXTERNAL_MANAGED = 512006923 INTERNAL_MANAGED = 37350397 @@ -19714,6 +19749,7 @@ class CacheMode(proto.Enum): performance and increasing load on the origin server. """ + UNDEFINED_CACHE_MODE = 0 CACHE_ALL_STATIC = 355027945 FORCE_CACHE_ALL = 486026928 @@ -20793,6 +20829,7 @@ class CompressionMode(proto.Enum): responses cached by Cloud CDN will not be served to clients. """ + UNDEFINED_COMPRESSION_MODE = 0 AUTOMATIC = 165298699 DISABLED = 516696700 @@ -20826,6 +20863,7 @@ class ExternalManagedMigrationState(proto.Enum): TEST_BY_PERCENTAGE (513738389): No description available. """ + UNDEFINED_EXTERNAL_MANAGED_MIGRATION_STATE = 0 PREPARE = 399612135 TEST_ALL_TRAFFIC = 79728882 @@ -20893,6 +20931,7 @@ class IpAddressSelectionPolicy(proto.Enum): IPv6 address over its IPv4 address (provided there is a healthy IPv6 address). """ + UNDEFINED_IP_ADDRESS_SELECTION_POLICY = 0 IPV4_ONLY = 22373798 IPV6_ONLY = 79632100 @@ -20931,6 +20970,7 @@ class LoadBalancingScheme(proto.Enum): INVALID_LOAD_BALANCING_SCHEME (275352060): No description available. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -21062,6 +21102,7 @@ class LocalityLbPolicy(proto.Enum): to use for computing the weights are specified via the customMetrics fields. """ + UNDEFINED_LOCALITY_LB_POLICY = 0 INVALID_LB_POLICY = 323318707 LEAST_REQUEST = 46604921 @@ -21111,6 +21152,7 @@ class Protocol(proto.Enum): protocol, it can be used with any L3/L4 Forwarding Rules. """ + UNDEFINED_PROTOCOL = 0 GRPC = 2196510 H2C = 70809 @@ -21188,6 +21230,7 @@ class SessionAffinity(proto.Enum): same backend VM while that VM remains healthy, as long as the cookie has not expired. """ + UNDEFINED_SESSION_AFFINITY = 0 CLIENT_IP = 345665051 CLIENT_IP_NO_DESTINATION = 106122516 @@ -21762,6 +21805,7 @@ class CacheMode(proto.Enum): performance and increasing load on the origin server. """ + UNDEFINED_CACHE_MODE = 0 CACHE_ALL_STATIC = 355027945 FORCE_CACHE_ALL = 486026928 @@ -22011,6 +22055,7 @@ class ConnectionPersistenceOnUnhealthyBackends(proto.Enum): NEVER_PERSIST (138646241): No description available. """ + UNDEFINED_CONNECTION_PERSISTENCE_ON_UNHEALTHY_BACKENDS = 0 ALWAYS_PERSIST = 38400900 DEFAULT_FOR_PROTOCOL = 145265356 @@ -22045,6 +22090,7 @@ class TrackingMode(proto.Enum): PER_SESSION (182099252): No description available. """ + UNDEFINED_TRACKING_MODE = 0 INVALID_TRACKING_MODE = 49234371 PER_CONNECTION = 85162848 @@ -22460,6 +22506,7 @@ class FastIPMove(proto.Enum): GARP_RA (527352630): No description available. """ + UNDEFINED_FAST_I_P_MOVE = 0 DISABLED = 516696700 GARP_RA = 527352630 @@ -22968,6 +23015,7 @@ class Name(proto.Enum): to use for computing the weights are specified via the customMetrics fields. """ + UNDEFINED_NAME = 0 INVALID_LB_POLICY = 323318707 LEAST_REQUEST = 46604921 @@ -23048,6 +23096,7 @@ class OptionalMode(proto.Enum): INCLUDE_ALL_OPTIONAL (535606965): All optional fields. """ + UNDEFINED_OPTIONAL_MODE = 0 CUSTOM = 388595569 EXCLUDE_ALL_OPTIONAL = 168636099 @@ -23174,6 +23223,7 @@ class Spillover(proto.Enum): ZONAL_AFFINITY_STAY_WITHIN_ZONE (12177782): No description available. """ + UNDEFINED_SPILLOVER = 0 ZONAL_AFFINITY_DISABLED = 230207960 ZONAL_AFFINITY_SPILL_CROSS_ZONE = 251048410 @@ -23338,12 +23388,12 @@ class BackendServiceTlsSettings(proto.Message): number=114030, optional=True, ) - subject_alt_names: MutableSequence[ - "BackendServiceTlsSettingsSubjectAltName" - ] = proto.RepeatedField( - proto.MESSAGE, - number=330029535, - message="BackendServiceTlsSettingsSubjectAltName", + subject_alt_names: MutableSequence["BackendServiceTlsSettingsSubjectAltName"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=330029535, + message="BackendServiceTlsSettingsSubjectAltName", + ) ) @@ -23581,6 +23631,7 @@ class Diagnostic(proto.Enum): REVERSE_CONCATENATED_PATH_DOWN (479337129): No description available. """ + UNDEFINED_DIAGNOSTIC = 0 ADMINISTRATIVELY_DOWN = 121685798 CONCATENATED_PATH_DOWN = 26186892 @@ -23612,6 +23663,7 @@ class State(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATE = 0 ADMIN_DOWN = 128544690 DOWN = 2104482 @@ -23790,6 +23842,7 @@ class BfdSessionInitializationMode(proto.Enum): PASSIVE (462813959): No description available. """ + UNDEFINED_BFD_SESSION_INITIALIZATION_MODE = 0 ACTIVE = 314733318 DISABLED = 516696700 @@ -23827,6 +23880,7 @@ class LocalDiagnostic(proto.Enum): REVERSE_CONCATENATED_PATH_DOWN (479337129): No description available. """ + UNDEFINED_LOCAL_DIAGNOSTIC = 0 ADMINISTRATIVELY_DOWN = 121685798 CONCATENATED_PATH_DOWN = 26186892 @@ -23858,6 +23912,7 @@ class LocalState(proto.Enum): UP (2715): No description available. """ + UNDEFINED_LOCAL_STATE = 0 ADMIN_DOWN = 128544690 DOWN = 2104482 @@ -24014,6 +24069,7 @@ class Origin(proto.Enum): BGP_ORIGIN_INCOMPLETE (452839811): No description available. """ + UNDEFINED_ORIGIN = 0 BGP_ORIGIN_EGP = 378906473 BGP_ORIGIN_IGP = 378910317 @@ -24079,6 +24135,7 @@ class Type(proto.Enum): AS_PATH_TYPE_SET (302584650): No description available. """ + UNDEFINED_TYPE = 0 AS_PATH_TYPE_SEQUENCE = 362887609 AS_PATH_TYPE_SET = 302584650 @@ -24627,6 +24684,7 @@ class Status(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DONE = 2104194 @@ -25082,12 +25140,12 @@ class CalendarModeAdviceResponse(proto.Message): their obtainability and minimize cost. """ - recommendations: MutableSequence[ - "CalendarModeRecommendation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=324515802, - message="CalendarModeRecommendation", + recommendations: MutableSequence["CalendarModeRecommendation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=324515802, + message="CalendarModeRecommendation", + ) ) @@ -25132,13 +25190,13 @@ class CalendarModeRecommendation(proto.Message): correspond to keys specified in the request. """ - recommendations_per_spec: MutableMapping[ - str, "FutureResourcesRecommendation" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=61331554, - message="FutureResourcesRecommendation", + recommendations_per_spec: MutableMapping[str, "FutureResourcesRecommendation"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=61331554, + message="FutureResourcesRecommendation", + ) ) @@ -25962,6 +26020,7 @@ class Category(proto.Enum): MACHINE (469553191): No description available. """ + UNDEFINED_CATEGORY = 0 CATEGORY_UNSPECIFIED = 509189462 LICENSE = 347869217 @@ -25987,6 +26046,7 @@ class Plan(proto.Enum): TWELVE_MONTH (173083962): No description available. """ + UNDEFINED_PLAN = 0 INVALID = 530283991 THIRTY_SIX_MONTH = 266295942 @@ -26015,6 +26075,7 @@ class Status(proto.Enum): NOT_YET_ACTIVE (20607337): No description available. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 CANCELLED = 41957681 @@ -26132,6 +26193,7 @@ class Type(proto.Enum): ``optional Type type`` definition. This ensures that the public documentation displays the new enum Type. """ + UNDEFINED_TYPE = 0 ACCELERATOR_OPTIMIZED = 280848403 ACCELERATOR_OPTIMIZED_A3 = 158574526 @@ -26822,12 +26884,12 @@ class CompositeHealthChecksScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - composite_health_checks: MutableSequence[ - "CompositeHealthCheck" - ] = proto.RepeatedField( - proto.MESSAGE, - number=517891062, - message="CompositeHealthCheck", + composite_health_checks: MutableSequence["CompositeHealthCheck"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=517891062, + message="CompositeHealthCheck", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -26875,6 +26937,7 @@ class ConfidentialInstanceType(proto.Enum): TDX (82920): Intel Trust Domain eXtension. """ + UNDEFINED_CONFIDENTIAL_INSTANCE_TYPE = 0 CONFIDENTIAL_INSTANCE_TYPE_UNSPECIFIED = 115021829 SEV = 81988 @@ -34060,6 +34123,7 @@ class State(proto.Enum): OBSOLETE (66532761): No description available. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DELETED = 120962041 @@ -35004,6 +35068,7 @@ class AccessMode(proto.Enum): The default AccessMode, means the disk can be attached to single instance in RW mode. """ + UNDEFINED_ACCESS_MODE = 0 READ_ONLY_MANY = 63460265 READ_WRITE_MANY = 488743208 @@ -35024,6 +35089,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -35044,6 +35110,7 @@ class Interface(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -35079,6 +35146,7 @@ class Status(proto.Enum): Disk is currently unavailable and cannot be accessed, attached or detached. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -35099,6 +35167,7 @@ class StorageType(proto.Enum): SSD (82404): No description available. """ + UNDEFINED_STORAGE_TYPE = 0 HDD = 71368 SSD = 82404 @@ -35119,13 +35188,13 @@ class StorageType(proto.Enum): optional=True, message="DiskAsyncReplication", ) - async_secondary_disks: MutableMapping[ - str, "DiskAsyncReplicationList" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=322925608, - message="DiskAsyncReplicationList", + async_secondary_disks: MutableMapping[str, "DiskAsyncReplicationList"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=322925608, + message="DiskAsyncReplicationList", + ) ) creation_timestamp: str = proto.Field( proto.STRING, @@ -35674,6 +35743,7 @@ class InstantiateFrom(proto.Enum): boot disk, additional read-write disks. """ + UNDEFINED_INSTANTIATE_FROM = 0 ATTACH_READ_ONLY = 513775419 BLANK = 63281460 @@ -35909,6 +35979,7 @@ class State(proto.Enum): STOPPING (350791796): Replication is stopping. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 CREATED = 135924424 @@ -35985,6 +36056,7 @@ class Policy(proto.Enum): Only allowlisted regions will be able to create region scoped snapshots """ + UNDEFINED_POLICY = 0 ALL_REGIONS = 273143585 POLICY_UNSPECIFIED = 197974922 @@ -36581,6 +36653,7 @@ class TargetShape(proto.Enum): between any two zones. Recommended for highly available serving workloads. """ + UNDEFINED_TARGET_SHAPE = 0 ANY = 64972 ANY_SINGLE_ZONE = 61100880 @@ -37006,6 +37079,7 @@ class Type(proto.Enum): The peering route corresponding to subnetwork range. """ + UNDEFINED_TYPE = 0 DYNAMIC_PEERING_ROUTE = 469794858 STATIC_PEERING_ROUTE = 473407545 @@ -37409,6 +37483,7 @@ class RedundancyType(proto.Enum): addresses that are redundant with eatch other. """ + UNDEFINED_REDUNDANCY_TYPE = 0 FOUR_IPS_REDUNDANCY = 520087913 SINGLE_IP_INTERNALLY_REDUNDANT = 133914873 @@ -37642,6 +37717,7 @@ class FileType(proto.Enum): X509 (2674086): No description available. """ + UNDEFINED_FILE_TYPE = 0 BIN = 65767 UNDEFINED = 137851184 @@ -37870,6 +37946,7 @@ class Direction(proto.Enum): Indicates that firewall should apply to incoming traffic. """ + UNDEFINED_DIRECTION = 0 EGRESS = 432880501 INGRESS = 516931221 @@ -38088,6 +38165,7 @@ class Metadata(proto.Enum): INCLUDE_ALL_METADATA (164619908): No description available. """ + UNDEFINED_METADATA = 0 EXCLUDE_ALL_METADATA = 334519954 INCLUDE_ALL_METADATA = 164619908 @@ -38352,6 +38430,7 @@ class PolicySource(proto.Enum): USER_DEFINED (491485557): No description available. """ + UNDEFINED_POLICY_SOURCE = 0 SYSTEM = 313484847 USER_DEFINED = 491485557 @@ -38371,6 +38450,7 @@ class PolicyType(proto.Enum): VPC_POLICY (74319208): No description available. """ + UNDEFINED_POLICY_TYPE = 0 RDMA_ROCE_POLICY = 148757145 VPC_POLICY = 74319208 @@ -38755,6 +38835,7 @@ class Direction(proto.Enum): INGRESS (516931221): No description available. """ + UNDEFINED_DIRECTION = 0 EGRESS = 432880501 INGRESS = 516931221 @@ -38772,6 +38853,7 @@ class TargetType(proto.Enum): INTERNAL_MANAGED_LB (309241080): No description available. """ + UNDEFINED_TARGET_TYPE = 0 INSTANCES = 131337822 INTERNAL_MANAGED_LB = 309241080 @@ -38840,12 +38922,12 @@ class TargetType(proto.Enum): proto.STRING, number=528230647, ) - target_secure_tags: MutableSequence[ - "FirewallPolicyRuleSecureTag" - ] = proto.RepeatedField( - proto.MESSAGE, - number=468132403, - message="FirewallPolicyRuleSecureTag", + target_secure_tags: MutableSequence["FirewallPolicyRuleSecureTag"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=468132403, + message="FirewallPolicyRuleSecureTag", + ) ) target_service_accounts: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -39020,6 +39102,7 @@ class DestNetworkContext(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_DEST_NETWORK_CONTEXT = 0 class DestNetworkScope(proto.Enum): @@ -39032,6 +39115,7 @@ class DestNetworkScope(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_DEST_NETWORK_SCOPE = 0 class DestNetworkType(proto.Enum): @@ -39052,6 +39136,7 @@ class DestNetworkType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_DEST_NETWORK_TYPE = 0 class SrcNetworkContext(proto.Enum): @@ -39074,6 +39159,7 @@ class SrcNetworkContext(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_SRC_NETWORK_CONTEXT = 0 class SrcNetworkScope(proto.Enum): @@ -39086,6 +39172,7 @@ class SrcNetworkScope(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_SRC_NETWORK_SCOPE = 0 class SrcNetworkType(proto.Enum): @@ -39108,6 +39195,7 @@ class SrcNetworkType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_SRC_NETWORK_TYPE = 0 dest_address_groups: MutableSequence[str] = proto.RepeatedField( @@ -39145,12 +39233,12 @@ class SrcNetworkType(proto.Enum): proto.STRING, number=119896492, ) - layer4_configs: MutableSequence[ - "FirewallPolicyRuleMatcherLayer4Config" - ] = proto.RepeatedField( - proto.MESSAGE, - number=373534261, - message="FirewallPolicyRuleMatcherLayer4Config", + layer4_configs: MutableSequence["FirewallPolicyRuleMatcherLayer4Config"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=373534261, + message="FirewallPolicyRuleMatcherLayer4Config", + ) ) src_address_groups: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -39187,12 +39275,12 @@ class SrcNetworkType(proto.Enum): proto.STRING, number=99086742, ) - src_secure_tags: MutableSequence[ - "FirewallPolicyRuleSecureTag" - ] = proto.RepeatedField( - proto.MESSAGE, - number=508791302, - message="FirewallPolicyRuleSecureTag", + src_secure_tags: MutableSequence["FirewallPolicyRuleSecureTag"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=508791302, + message="FirewallPolicyRuleSecureTag", + ) ) src_threat_intelligences: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -39271,6 +39359,7 @@ class State(proto.Enum): INEFFECTIVE (304458242): No description available. """ + UNDEFINED_STATE = 0 EFFECTIVE = 244201863 INEFFECTIVE = 304458242 @@ -39956,6 +40045,7 @@ class ExternalManagedBackendBucketMigrationState(proto.Enum): TEST_BY_PERCENTAGE (513738389): No description available. """ + UNDEFINED_EXTERNAL_MANAGED_BACKEND_BUCKET_MIGRATION_STATE = 0 PREPARE = 399612135 TEST_ALL_TRAFFIC = 79728882 @@ -39990,6 +40080,7 @@ class IPProtocolEnum(proto.Enum): UDP (83873): No description available. """ + UNDEFINED_I_P_PROTOCOL_ENUM = 0 AH = 2087 ESP = 68962 @@ -40014,6 +40105,7 @@ class IpVersion(proto.Enum): UNSPECIFIED_VERSION (21850000): No description available. """ + UNDEFINED_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -40042,6 +40134,7 @@ class LoadBalancingScheme(proto.Enum): INVALID (530283991): No description available. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -40079,6 +40172,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -40113,6 +40207,7 @@ class PscConnectionStatus(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_PSC_CONNECTION_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -40758,6 +40853,7 @@ class DeploymentType(proto.Enum): The reserved capacity is made up of highly flexible, logical reservation blocks. """ + UNDEFINED_DEPLOYMENT_TYPE = 0 DENSE = 64932607 DEPLOYMENT_TYPE_UNSPECIFIED = 234847180 @@ -40778,6 +40874,7 @@ class PlanningStatus(proto.Enum): Future Reservation has been submitted for evaluation by GCP. """ + UNDEFINED_PLANNING_STATUS = 0 DRAFT = 65307009 PLANNING_STATUS_UNSPECIFIED = 252728940 @@ -40808,6 +40905,7 @@ class ProtectionTier(proto.Enum): expected to continue as normal using the redundancies. """ + UNDEFINED_PROTECTION_TIER = 0 CAPACITY_OPTIMIZED = 17430466 PROTECTION_TIER_UNSPECIFIED = 262261984 @@ -40833,6 +40931,7 @@ class ReservationMode(proto.Enum): RESERVATION_MODE_UNSPECIFIED (233810606): No description available. """ + UNDEFINED_RESERVATION_MODE = 0 CALENDAR = 67431230 DEFAULT = 115302945 @@ -40855,6 +40954,7 @@ class SchedulingType(proto.Enum): reservation. Instead, each instance has its own maintenance window. """ + UNDEFINED_SCHEDULING_TYPE = 0 GROUPED = 474540862 GROUP_MAINTENANCE_TYPE_UNSPECIFIED = 447183678 @@ -41045,6 +41145,7 @@ class CommitmentPlan(proto.Enum): TWELVE_MONTH (173083962): No description available. """ + UNDEFINED_COMMITMENT_PLAN = 0 INVALID = 530283991 THIRTY_SIX_MONTH = 266295942 @@ -41068,6 +41169,7 @@ class PreviousCommitmentTerms(proto.Enum): No changes to associated parents Committed Used Discount(s) terms. """ + UNDEFINED_PREVIOUS_COMMITMENT_TERMS = 0 EXTEND = 448639770 PREVIOUSCOMMITMENTTERM_UNSPECIFIED = 98482448 @@ -41211,6 +41313,7 @@ class AmendmentStatus(proto.Enum): AMENDMENT_STATUS_UNSPECIFIED (412250332): No description available. """ + UNDEFINED_AMENDMENT_STATUS = 0 AMENDMENT_APPROVED = 150573001 AMENDMENT_DECLINED = 70395200 @@ -41266,6 +41369,7 @@ class ProcurementStatus(proto.Enum): being created to provide total_count reserved instance slots. This state will not persist past start_time + 24h. """ + UNDEFINED_PROCUREMENT_STATUS = 0 APPROVED = 357258935 CANCELLED = 41957681 @@ -41450,6 +41554,7 @@ class ProcurementStatus(proto.Enum): being created to provide total_count reserved instance slots. This state will not persist past start_time + 24h. """ + UNDEFINED_PROCUREMENT_STATUS = 0 APPROVED = 357258935 CANCELLED = 41957681 @@ -41865,6 +41970,7 @@ class RecommendationType(proto.Enum): RECOMMENDATION_TYPE_UNSPECIFIED (140641624): Default value, unused. """ + UNDEFINED_RECOMMENDATION_TYPE = 0 FUTURE_RESERVATION = 41036592 RECOMMENDATION_TYPE_UNSPECIFIED = 140641624 @@ -41955,6 +42061,7 @@ class Status(proto.Enum): However, another location was better and was recommended. """ + UNDEFINED_STATUS = 0 CONDITIONS_NOT_MET = 363628457 NOT_SUPPORTED = 317950466 @@ -42027,6 +42134,7 @@ class DeploymentType(proto.Enum): The reserved capacity is made up of highly flexible, logical reservation blocks. """ + UNDEFINED_DEPLOYMENT_TYPE = 0 DENSE = 64932607 DEPLOYMENT_TYPE_UNSPECIFIED = 234847180 @@ -42108,6 +42216,7 @@ class VmFamily(proto.Enum): VM_FAMILY_CLOUD_TPU_POD_SLICE_TPU7X (485271888): No description available. """ + UNDEFINED_VM_FAMILY = 0 VM_FAMILY_CLOUD_TPU_DEVICE_CT3 = 42845948 VM_FAMILY_CLOUD_TPU_LITE_DEVICE_CT5L = 108020067 @@ -42134,6 +42243,7 @@ class WorkloadType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_WORKLOAD_TYPE = 0 BATCH = 62971674 SERVING = 17781740 @@ -42186,6 +42296,7 @@ class DiskInterface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_DISK_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -42215,13 +42326,13 @@ class FutureResourcesSpecLocationPolicy(proto.Message): ALLOWed. """ - locations: MutableMapping[ - str, "FutureResourcesSpecLocationPolicyLocation" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=413423454, - message="FutureResourcesSpecLocationPolicyLocation", + locations: MutableMapping[str, "FutureResourcesSpecLocationPolicyLocation"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=413423454, + message="FutureResourcesSpecLocationPolicyLocation", + ) ) @@ -42253,6 +42364,7 @@ class Preference(proto.Enum): PREFERENCE_UNSPECIFIED (496219571): Default value, unused. """ + UNDEFINED_PREFERENCE = 0 ALLOW = 62368553 DENY = 2094604 @@ -42296,12 +42408,12 @@ class FutureResourcesSpecSpecificSKUResources(proto.Message): number=77317349, optional=True, ) - local_ssd_partitions: MutableSequence[ - "FutureResourcesSpecLocalSsdPartition" - ] = proto.RepeatedField( - proto.MESSAGE, - number=470688568, - message="FutureResourcesSpecLocalSsdPartition", + local_ssd_partitions: MutableSequence["FutureResourcesSpecLocalSsdPartition"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=470688568, + message="FutureResourcesSpecLocalSsdPartition", + ) ) machine_type: str = proto.Field( proto.STRING, @@ -42442,6 +42554,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -42569,6 +42682,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -44907,6 +45021,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 FULL = 2169487 @@ -44987,6 +45102,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 FULL = 2169487 @@ -46475,6 +46591,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 FULL = 2169487 @@ -47042,6 +47159,7 @@ class View(proto.Enum): FULL (2169487): Includes detailed topology view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 BLOCK_VIEW_UNSPECIFIED = 275070479 @@ -47142,6 +47260,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 SUB_BLOCK_VIEW_BASIC = 236009797 SUB_BLOCK_VIEW_FULL = 440711800 @@ -47987,6 +48106,7 @@ class Views(proto.Enum): WITH_UTILIZATION (504090633): Utilization data is included in the response. """ + UNDEFINED_VIEWS = 0 DEFAULT = 115302945 WITH_UTILIZATION = 504090633 @@ -48890,6 +49010,7 @@ class ScopedResourceStatus(proto.Enum): SCOPED_RESOURCE_STATUS_UNSPECIFIED (437941996): Default value. This value is unused. """ + UNDEFINED_SCOPED_RESOURCE_STATUS = 0 SCOPED_RESOURCE_STATUS_DELETING = 404198387 SCOPED_RESOURCE_STATUS_UNSPECIFIED = 437941996 @@ -48917,12 +49038,12 @@ class ScopedResourceStatus(proto.Enum): number=3355, optional=True, ) - instance_selectors: MutableSequence[ - "GlobalVmExtensionPolicyInstanceSelector" - ] = proto.RepeatedField( - proto.MESSAGE, - number=520298826, - message="GlobalVmExtensionPolicyInstanceSelector", + instance_selectors: MutableSequence["GlobalVmExtensionPolicyInstanceSelector"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=520298826, + message="GlobalVmExtensionPolicyInstanceSelector", + ) ) kind: str = proto.Field( proto.STRING, @@ -49230,6 +49351,7 @@ class PredefinedRolloutPlan(proto.Enum): SLOW_ROLLOUT (31032659): No description available. """ + UNDEFINED_PREDEFINED_ROLLOUT_PLAN = 0 FAST_ROLLOUT = 207153326 ROLLOUT_PLAN_UNSPECIFIED = 144511983 @@ -49339,6 +49461,7 @@ class State(proto.Enum): STATE_UNSPECIFIED (470755401): Default value. This value is unused. """ + UNDEFINED_STATE = 0 STATE_CANCELLED = 534636259 STATE_COMPLETED = 265728989 @@ -49441,6 +49564,7 @@ class SchedulingType(proto.Enum): reservation. Instead, each instance has its own maintenance window. """ + UNDEFINED_SCHEDULING_TYPE = 0 GROUPED = 474540862 GROUP_MAINTENANCE_TYPE_UNSPECIFIED = 447183678 @@ -49701,6 +49825,7 @@ class Type(proto.Enum): WINDOWS (456863331): No description available. """ + UNDEFINED_TYPE = 0 BARE_METAL_LINUX_COMPATIBLE = 354232740 FEATURE_TYPE_UNSPECIFIED = 531767259 @@ -49851,6 +49976,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -49869,6 +49995,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -50036,6 +50163,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -50054,6 +50182,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -50221,6 +50350,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -50239,6 +50369,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -50297,12 +50428,12 @@ class HealthAggregationPoliciesScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - health_aggregation_policies: MutableSequence[ - "HealthAggregationPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=87589904, - message="HealthAggregationPolicy", + health_aggregation_policies: MutableSequence["HealthAggregationPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=87589904, + message="HealthAggregationPolicy", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -50447,6 +50578,7 @@ class PolicyType(proto.Enum): DNS_PUBLIC_IP_POLICY (366354794): No description available. """ + UNDEFINED_POLICY_TYPE = 0 BACKEND_SERVICE_POLICY = 415582023 DNS_PUBLIC_IP_POLICY = 366354794 @@ -50848,6 +50980,7 @@ class Type(proto.Enum): TCP (82881): No description available. """ + UNDEFINED_TYPE = 0 GRPC = 2196510 GRPC_WITH_TLS = 268089571 @@ -51254,6 +51387,7 @@ class HealthStatusAggregationPolicy(proto.Enum): NO_AGGREGATION (426445124): No description available. """ + UNDEFINED_HEALTH_STATUS_AGGREGATION_POLICY = 0 AND = 64951 NO_AGGREGATION = 426445124 @@ -51282,6 +51416,7 @@ class HealthStatusAggregationStrategy(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_HEALTH_STATUS_AGGREGATION_STRATEGY = 0 creation_timestamp: str = proto.Field( @@ -51672,6 +51807,7 @@ class SourceType(proto.Enum): BACKEND_SERVICE (285792202): No description available. """ + UNDEFINED_SOURCE_TYPE = 0 BACKEND_SERVICE = 285792202 @@ -51998,6 +52134,7 @@ class HealthState(proto.Enum): UNHEALTHY (462118084): No description available. """ + UNDEFINED_HEALTH_STATE = 0 HEALTHY = 439801213 UNHEALTHY = 462118084 @@ -52015,6 +52152,7 @@ class Ipv6HealthState(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_IPV6_HEALTH_STATE = 0 class WeightError(proto.Enum): @@ -52051,6 +52189,7 @@ class WeightError(proto.Enum): updated to ENABLE or DRY_RUN and there has not been sufficient time to parse and report the backend weight. """ + UNDEFINED_WEIGHT_ERROR = 0 INVALID_WEIGHT = 383698400 MISSING_WEIGHT = 384027537 @@ -52180,6 +52319,7 @@ class HealthState(proto.Enum): UNKNOWN (433141802): No description available. """ + UNDEFINED_HEALTH_STATE = 0 DRAINING = 480455402 HEALTHY = 439801213 @@ -52202,6 +52342,7 @@ class Ipv6HealthState(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_IPV6_HEALTH_STATE = 0 backend_service: "BackendServiceReference" = proto.Field( @@ -52943,6 +53084,7 @@ class RedirectResponseCode(proto.Enum): Http Status Code 307 - Temporary Redirect maintaining HTTP method. """ + UNDEFINED_REDIRECT_RESPONSE_CODE = 0 FOUND = 67084130 MOVED_PERMANENTLY_DEFAULT = 386698449 @@ -53230,12 +53372,12 @@ class HttpRouteAction(proto.Message): optional=True, message="UrlRewrite", ) - weighted_backend_services: MutableSequence[ - "WeightedBackendService" - ] = proto.RepeatedField( - proto.MESSAGE, - number=337028049, - message="WeightedBackendService", + weighted_backend_services: MutableSequence["WeightedBackendService"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=337028049, + message="WeightedBackendService", + ) ) @@ -53620,12 +53762,12 @@ class HttpRouteRuleMatch(proto.Message): number=257898968, optional=True, ) - query_parameter_matches: MutableSequence[ - "HttpQueryParameterMatch" - ] = proto.RepeatedField( - proto.MESSAGE, - number=286231270, - message="HttpQueryParameterMatch", + query_parameter_matches: MutableSequence["HttpQueryParameterMatch"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=286231270, + message="HttpQueryParameterMatch", + ) ) regex_match: str = proto.Field( proto.STRING, @@ -53995,6 +54137,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -54011,6 +54154,7 @@ class SourceType(proto.Enum): RAW (80904): No description available. """ + UNDEFINED_SOURCE_TYPE = 0 RAW = 80904 @@ -54033,6 +54177,7 @@ class Status(proto.Enum): READY (77848963): Image has been successfully created. """ + UNDEFINED_STATUS = 0 DELETING = 528602024 FAILED = 455706685 @@ -60093,6 +60238,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_KEY_REVOCATION_ACTION_TYPE = 0 KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 467110106 NONE = 2402104 @@ -60113,6 +60259,7 @@ class PostKeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_POST_KEY_REVOCATION_ACTION_TYPE = 0 NOOP = 2402146 POST_KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 228738393 @@ -60142,6 +60289,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): Each network interface inherits PrivateIpv6GoogleAccess from its subnetwork. """ + UNDEFINED_PRIVATE_IPV6_GOOGLE_ACCESS = 0 ENABLE_BIDIRECTIONAL_ACCESS_TO_GOOGLE = 427975994 ENABLE_OUTBOUND_VM_ACCESS_TO_GOOGLE = 288210263 @@ -60190,6 +60338,7 @@ class Status(proto.Enum): The instance has stopped (either by explicit action or underlying failure). """ + UNDEFINED_STATUS = 0 DEPROVISIONING = 428935662 PENDING = 35394935 @@ -61250,6 +61399,7 @@ class FailoverAction(proto.Enum): UNKNOWN (433141802): No description available. """ + UNDEFINED_FAILOVER_ACTION = 0 NO_FAILOVER = 480957872 UNKNOWN = 433141802 @@ -61273,6 +61423,7 @@ class ListManagedInstancesResults(proto.Enum): listManagedInstances API method. maxResults and pageToken query parameters are respected. """ + UNDEFINED_LIST_MANAGED_INSTANCES_RESULTS = 0 PAGELESS = 32183464 PAGINATED = 40190637 @@ -61283,12 +61434,12 @@ class ListManagedInstancesResults(proto.Enum): optional=True, message="InstanceGroupManagerAllInstancesConfig", ) - auto_healing_policies: MutableSequence[ - "InstanceGroupManagerAutoHealingPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=456799109, - message="InstanceGroupManagerAutoHealingPolicy", + auto_healing_policies: MutableSequence["InstanceGroupManagerAutoHealingPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=456799109, + message="InstanceGroupManagerAutoHealingPolicy", + ) ) base_instance_name: str = proto.Field( proto.STRING, @@ -62020,6 +62171,7 @@ class DefaultActionOnFailure(proto.Enum): REPAIR (266277773): No description available. """ + UNDEFINED_DEFAULT_ACTION_ON_FAILURE = 0 DELETE = 402225579 DO_NOTHING = 451307513 @@ -62048,6 +62200,7 @@ class ForceUpdateOnRepair(proto.Enum): YES (87751): No description available. """ + UNDEFINED_FORCE_UPDATE_ON_REPAIR = 0 NO = 2497 YES = 87751 @@ -62080,6 +62233,7 @@ class OnFailedHealthCheck(proto.Enum): instanceLifecyclePolicy.defaultActionOnFailure field. """ + UNDEFINED_ON_FAILED_HEALTH_CHECK = 0 DEFAULT_ACTION = 463967764 @@ -62145,6 +62299,7 @@ class AllowChangingZone(proto.Enum): MIG can select a different zone for the VM during a repair. """ + UNDEFINED_ALLOW_CHANGING_ZONE = 0 NO = 2497 YES = 87751 @@ -62381,6 +62536,7 @@ class State(proto.Enum): SUCCEEDED (511103553): The request succeeded. """ + UNDEFINED_STATE = 0 ACCEPTED = 246714279 CANCELLED = 41957681 @@ -62682,6 +62838,7 @@ class Mode(proto.Enum): the standby pool when the group scales out, and replenishes the standby pool afterwards. """ + UNDEFINED_MODE = 0 MANUAL = 119397318 SCALE_OUT_POOL = 635394 @@ -63015,6 +63172,7 @@ class Mode(proto.Enum): If mode is unspecified, MIG will behave as in the default ``INDIVIDUAL`` mode. """ + UNDEFINED_MODE = 0 BULK = 2050322 INDIVIDUAL = 438800025 @@ -63179,6 +63337,7 @@ class InstanceRedistributionType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_INSTANCE_REDISTRIBUTION_TYPE = 0 class MinimalAction(proto.Enum): @@ -63210,6 +63369,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -63235,6 +63395,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 class ReplacementMethod(proto.Enum): @@ -63252,6 +63413,7 @@ class ReplacementMethod(proto.Enum): Default option: instances will be deleted and created (with a new name) """ + UNDEFINED_REPLACEMENT_METHOD = 0 RECREATE = 522644719 SUBSTITUTE = 280924314 @@ -63276,6 +63438,7 @@ class Type(proto.Enum): to existing VMs only when you selectively target specific or all VMs to be updated. """ + UNDEFINED_TYPE = 0 OPPORTUNISTIC = 429530089 @@ -63496,6 +63659,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -63526,6 +63690,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 all_instances: bool = proto.Field( @@ -63681,6 +63846,7 @@ class AcceleratorTopologyHealth(proto.Enum): infrastructure unsuitable for forming a working inter-chip connected group. """ + UNDEFINED_ACCELERATOR_TOPOLOGY_HEALTH = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -63937,12 +64103,12 @@ class InstanceGroupManagersScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - instance_group_managers: MutableSequence[ - "InstanceGroupManager" - ] = proto.RepeatedField( - proto.MESSAGE, - number=214072592, - message="InstanceGroupManager", + instance_group_managers: MutableSequence["InstanceGroupManager"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=214072592, + message="InstanceGroupManager", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -63960,12 +64126,12 @@ class InstanceGroupManagersSetAutoHealingRequest(proto.Message): """ - auto_healing_policies: MutableSequence[ - "InstanceGroupManagerAutoHealingPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=456799109, - message="InstanceGroupManagerAutoHealingPolicy", + auto_healing_policies: MutableSequence["InstanceGroupManagerAutoHealingPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=456799109, + message="InstanceGroupManagerAutoHealingPolicy", + ) ) @@ -64249,6 +64415,7 @@ class InstanceState(proto.Enum): Includes instances in the generated list only if they have a RUNNING state. """ + UNDEFINED_INSTANCE_STATE = 0 ALL = 64897 RUNNING = 121282975 @@ -64637,6 +64804,7 @@ class Action(proto.Enum): performed as post-instance creation (subject to future extensions). """ + UNDEFINED_ACTION = 0 ABANDONING = 388244813 ADOPTING = 414293554 @@ -64963,6 +65131,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_KEY_REVOCATION_ACTION_TYPE = 0 KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 467110106 NONE = 2402104 @@ -64983,6 +65152,7 @@ class PostKeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_POST_KEY_REVOCATION_ACTION_TYPE = 0 NOOP = 2402146 POST_KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 228738393 @@ -65013,6 +65183,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): Each network interface inherits PrivateIpv6GoogleAccess from its subnetwork. """ + UNDEFINED_PRIVATE_IPV6_GOOGLE_ACCESS = 0 ENABLE_BIDIRECTIONAL_ACCESS_TO_GOOGLE = 427975994 ENABLE_OUTBOUND_VM_ACCESS_TO_GOOGLE = 288210263 @@ -65685,6 +65856,7 @@ class Status(proto.Enum): The instance has stopped (either by explicit action or underlying failure). """ + UNDEFINED_STATUS = 0 DEPROVISIONING = 428935662 PENDING = 35394935 @@ -65740,13 +65912,13 @@ class InstancesBulkInsertOperationMetadata(proto.Message): name is key). Example key: zones/us-central1-a """ - per_location_status: MutableMapping[ - str, "BulkInsertOperationStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=167851162, - message="BulkInsertOperationStatus", + per_location_status: MutableMapping[str, "BulkInsertOperationStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=167851162, + message="BulkInsertOperationStatus", + ) ) @@ -65848,6 +66020,7 @@ class Type(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TYPE = 0 HIERARCHY = 69902869 NETWORK = 413984270 @@ -65971,6 +66144,7 @@ class DisruptionSchedule(proto.Enum): IMMEDIATE (152881041): Default value. Disrupt the VM immediately. """ + UNDEFINED_DISRUPTION_SCHEDULE = 0 DISRUPTION_SCHEDULE_UNSPECIFIED = 332543835 FUTURE = 474513859 @@ -65981,12 +66155,12 @@ class DisruptionSchedule(proto.Enum): number=95871619, optional=True, ) - fault_reasons: MutableSequence[ - "InstancesReportHostAsFaultyRequestFaultReason" - ] = proto.RepeatedField( - proto.MESSAGE, - number=168056210, - message="InstancesReportHostAsFaultyRequestFaultReason", + fault_reasons: MutableSequence["InstancesReportHostAsFaultyRequestFaultReason"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=168056210, + message="InstancesReportHostAsFaultyRequestFaultReason", + ) ) @@ -66022,6 +66196,7 @@ class Behavior(proto.Enum): UNRECOVERABLE_GPU_ERROR (363710747): No description available. """ + UNDEFINED_BEHAVIOR = 0 BEHAVIOR_UNSPECIFIED = 85734570 PERFORMANCE = 135701520 @@ -66480,6 +66655,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -66506,6 +66682,7 @@ class Status(proto.Enum): InstantSnapshot is currently unavailable and cannot be used for Disk restoration """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -67158,6 +67335,7 @@ class AvailableFeatures(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_AVAILABLE_FEATURES = 0 class InterconnectType(proto.Enum): @@ -67187,6 +67365,7 @@ class InterconnectType(proto.Enum): A partner-managed interconnection shared between customers via partner. """ + UNDEFINED_INTERCONNECT_TYPE = 0 DEDICATED = 258411983 IT_PRIVATE = 335677007 @@ -67215,6 +67394,7 @@ class LinkType(proto.Enum): LINK_TYPE_ETHERNET_400G_LR4 (127023690): 400G Ethernet, LR4 Optics. """ + UNDEFINED_LINK_TYPE = 0 LINK_TYPE_ETHERNET_100G_LR = 337672551 LINK_TYPE_ETHERNET_10G_LR = 236739749 @@ -67248,6 +67428,7 @@ class OperationalStatus(proto.Enum): attachments may be provisioned on this interconnect. """ + UNDEFINED_OPERATIONAL_STATUS = 0 OS_ACTIVE = 55721409 OS_UNPROVISIONED = 239771840 @@ -67262,6 +67443,7 @@ class RequestedFeatures(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_REQUESTED_FEATURES = 0 class State(proto.Enum): @@ -67291,6 +67473,7 @@ class State(proto.Enum): attachments may be provisioned on this interconnect. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 UNPROVISIONED = 517333979 @@ -67308,6 +67491,7 @@ class Subzone(proto.Enum): SUBZONE_B (291575439): Subzone B. """ + UNDEFINED_SUBZONE = 0 SUBZONE_A = 291575438 SUBZONE_B = 291575439 @@ -67354,12 +67538,12 @@ class Subzone(proto.Enum): number=422937596, optional=True, ) - expected_outages: MutableSequence[ - "InterconnectOutageNotification" - ] = proto.RepeatedField( - proto.MESSAGE, - number=264484123, - message="InterconnectOutageNotification", + expected_outages: MutableSequence["InterconnectOutageNotification"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=264484123, + message="InterconnectOutageNotification", + ) ) google_ip_address: str = proto.Field( proto.STRING, @@ -67596,6 +67780,7 @@ class TrafficClass(proto.Enum): Traffic Class 6, corresponding to DSCP ranges (48-63) 11xxxx. """ + UNDEFINED_TRAFFIC_CLASS = 0 TC1 = 82850 TC2 = 82851 @@ -68163,6 +68348,7 @@ class Bandwidth(proto.Enum): BPS_5G (355358572): 5 Gbit/s """ + UNDEFINED_BANDWIDTH = 0 BPS_100G = 49547952 BPS_100M = 49547958 @@ -68207,6 +68393,7 @@ class EdgeAvailabilityDomain(proto.Enum): AVAILABILITY_DOMAIN_ANY (375256373): No description available. """ + UNDEFINED_EDGE_AVAILABILITY_DOMAIN = 0 AVAILABILITY_DOMAIN_1 = 349552090 AVAILABILITY_DOMAIN_2 = 349552091 @@ -68249,6 +68436,7 @@ class Encryption(proto.Enum): receive traffic from such interconnect attachment. """ + UNDEFINED_ENCRYPTION = 0 IPSEC = 69882282 NONE = 2402104 @@ -68276,6 +68464,7 @@ class OperationalStatus(proto.Enum): Indicates that attachment is not ready to use yet, because turnup is not complete. """ + UNDEFINED_OPERATIONAL_STATUS = 0 OS_ACTIVE = 55721409 OS_UNPROVISIONED = 239771840 @@ -68299,6 +68488,7 @@ class StackType(proto.Enum): The interconnect attachment will only be assigned IPv4 addresses. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -68358,6 +68548,7 @@ class State(proto.Enum): Indicates that attachment is not ready to use yet, because turnup is not complete. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DEFUNCT = 115891759 @@ -68397,6 +68588,7 @@ class Type(proto.Enum): Attachment to a partner interconnect, created by the partner. """ + UNDEFINED_TYPE = 0 DEDICATED = 258411983 L2_DEDICATED = 336595510 @@ -68789,6 +68981,7 @@ class BgpMd5(proto.Enum): MD5_UNSUPPORTED: BGP MD5 authentication must not be configured """ + UNDEFINED_BGP_MD5 = 0 MD5_OPTIONAL = 532156673 MD5_REQUIRED = 218034496 @@ -68916,13 +69109,13 @@ class InterconnectAttachmentGroup(proto.Message): This field is a member of `oneof`_ ``_self_link``. """ - attachments: MutableMapping[ - str, "InterconnectAttachmentGroupAttachment" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=334744496, - message="InterconnectAttachmentGroupAttachment", + attachments: MutableMapping[str, "InterconnectAttachmentGroupAttachment"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=334744496, + message="InterconnectAttachmentGroupAttachment", + ) ) configured: "InterconnectAttachmentGroupConfigured" = proto.Field( proto.MESSAGE, @@ -69059,6 +69252,7 @@ class EffectiveSla(proto.Enum): PRODUCTION_NON_CRITICAL (117399223): No description available. """ + UNDEFINED_EFFECTIVE_SLA = 0 EFFECTIVE_SLA_UNSPECIFIED = 491000744 NO_SLA = 161460618 @@ -69150,6 +69344,7 @@ class BlockerType(proto.Enum): OTHER (75532016): No description available. """ + UNDEFINED_BLOCKER_TYPE = 0 BLOCKER_TYPE_UNSPECIFIED = 429793623 INCOMPATIBLE_METROS = 290410432 @@ -69224,6 +69419,7 @@ class AvailabilitySla(proto.Enum): PRODUCTION_NON_CRITICAL (117399223): No description available. """ + UNDEFINED_AVAILABILITY_SLA = 0 AVAILABILITY_SLA_UNSPECIFIED = 11186044 NO_SLA = 161460618 @@ -69247,12 +69443,12 @@ class InterconnectAttachmentGroupLogicalStructure(proto.Message): """ - regions: MutableSequence[ - "InterconnectAttachmentGroupLogicalStructureRegion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=12367871, - message="InterconnectAttachmentGroupLogicalStructureRegion", + regions: MutableSequence["InterconnectAttachmentGroupLogicalStructureRegion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12367871, + message="InterconnectAttachmentGroupLogicalStructureRegion", + ) ) @@ -69540,6 +69736,7 @@ class GroupStatus(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_GROUP_STATUS = 0 DEGRADED = 396890926 FULLY_DOWN = 255514647 @@ -69631,6 +69828,7 @@ class IsActive(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_IS_ACTIVE = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -69675,6 +69873,7 @@ class Status(proto.Enum): UNPROVISIONED (517333979): No description available. """ + UNDEFINED_STATUS = 0 ATTACHMENT_STATUS_UNKNOWN = 472477561 CONNECTION_DISABLED = 432687805 @@ -70104,12 +70303,12 @@ class InterconnectAttachmentsScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - interconnect_attachments: MutableSequence[ - "InterconnectAttachment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=425388415, - message="InterconnectAttachment", + interconnect_attachments: MutableSequence["InterconnectAttachment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=425388415, + message="InterconnectAttachment", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -70213,6 +70412,7 @@ class BundleAggregationType(proto.Enum): BUNDLE_AGGREGATION_TYPE_STATIC (50678873): LACP is disabled. """ + UNDEFINED_BUNDLE_AGGREGATION_TYPE = 0 BUNDLE_AGGREGATION_TYPE_LACP = 27758925 BUNDLE_AGGREGATION_TYPE_STATIC = 50678873 @@ -70238,16 +70438,17 @@ class BundleOperationalStatus(proto.Enum): the bundle (typically just one) have UP operational status. """ + UNDEFINED_BUNDLE_OPERATIONAL_STATUS = 0 BUNDLE_OPERATIONAL_STATUS_DOWN = 453842693 BUNDLE_OPERATIONAL_STATUS_UP = 161366462 - arp_caches: MutableSequence[ - "InterconnectDiagnosticsARPEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=414591761, - message="InterconnectDiagnosticsARPEntry", + arp_caches: MutableSequence["InterconnectDiagnosticsARPEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=414591761, + message="InterconnectDiagnosticsARPEntry", + ) ) bundle_aggregation_type: str = proto.Field( proto.STRING, @@ -70350,6 +70551,7 @@ class State(proto.Enum): this means the rest of the object should be empty. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DETACHED = 216562546 @@ -70445,6 +70647,7 @@ class State(proto.Enum): The value of the current optical power has not crossed a warning threshold. """ + UNDEFINED_STATE = 0 HIGH_ALARM = 305363284 HIGH_WARNING = 220984799 @@ -70527,16 +70730,17 @@ class OperationalStatus(proto.Enum): The interface has low level communication with the remote end. """ + UNDEFINED_OPERATIONAL_STATUS = 0 LINK_OPERATIONAL_STATUS_DOWN = 281653885 LINK_OPERATIONAL_STATUS_UP = 305879862 - arp_caches: MutableSequence[ - "InterconnectDiagnosticsARPEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=414591761, - message="InterconnectDiagnosticsARPEntry", + arp_caches: MutableSequence["InterconnectDiagnosticsARPEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=414591761, + message="InterconnectDiagnosticsARPEntry", + ) ) circuit_id: str = proto.Field( proto.STRING, @@ -70717,13 +70921,13 @@ class InterconnectGroup(proto.Message): optional=True, message="InterconnectGroupIntent", ) - interconnects: MutableMapping[ - str, "InterconnectGroupInterconnect" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=520187301, - message="InterconnectGroupInterconnect", + interconnects: MutableMapping[str, "InterconnectGroupInterconnect"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=520187301, + message="InterconnectGroupInterconnect", + ) ) kind: str = proto.Field( proto.STRING, @@ -70805,6 +71009,7 @@ class SupportedSla(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_SUPPORTED_SLA = 0 NO_SLA = 161460618 PRODUCTION_CRITICAL = 470416485 @@ -70892,6 +71097,7 @@ class BlockerType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_BLOCKER_TYPE = 0 INCOMPATIBLE_METROS = 290410432 NOT_AVAILABLE = 140722205 @@ -70964,6 +71170,7 @@ class TopologyCapability(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TOPOLOGY_CAPABILITY = 0 NO_SLA = 161460618 PRODUCTION_CRITICAL = 470416485 @@ -71007,12 +71214,12 @@ class InterconnectGroupPhysicalStructure(proto.Message): """ - metros: MutableSequence[ - "InterconnectGroupPhysicalStructureMetros" - ] = proto.RepeatedField( - proto.MESSAGE, - number=533067386, - message="InterconnectGroupPhysicalStructureMetros", + metros: MutableSequence["InterconnectGroupPhysicalStructureMetros"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=533067386, + message="InterconnectGroupPhysicalStructureMetros", + ) ) @@ -71145,6 +71352,7 @@ class IntentMismatchBehavior(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_INTENT_MISMATCH_BEHAVIOR = 0 CREATE = 385389820 REJECT = 266102687 @@ -71317,6 +71525,7 @@ class InterconnectType(proto.Enum): A partner-managed interconnection shared between customers via partner. """ + UNDEFINED_INTERCONNECT_TYPE = 0 DEDICATED = 258411983 IT_PRIVATE = 335677007 @@ -71346,6 +71555,7 @@ class LinkType(proto.Enum): LINK_TYPE_ETHERNET_400G_LR4 (127023690): 400G Ethernet, LR4 Optics. """ + UNDEFINED_LINK_TYPE = 0 LINK_TYPE_ETHERNET_100G_LR = 337672551 LINK_TYPE_ETHERNET_10G_LR = 236739749 @@ -71365,6 +71575,7 @@ class RequestedFeatures(proto.Enum): IF_MACSEC (396279300): Media Access Control security (MACsec) """ + UNDEFINED_REQUESTED_FEATURES = 0 IF_CROSS_SITE_NETWORK = 469111095 IF_L2_FORWARDING = 125563860 @@ -71610,6 +71821,7 @@ class GroupStatus(proto.Enum): GROUPS_STATUS_UNSPECIFIED (261932693): No description available. """ + UNDEFINED_GROUP_STATUS = 0 DEGRADED = 396890926 FULLY_DOWN = 255514647 @@ -71696,6 +71908,7 @@ class IsActive(proto.Enum): IS_ACTIVE_UNSPECIFIED (274948243): No description available. """ + UNDEFINED_IS_ACTIVE = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -71967,6 +72180,7 @@ class AvailableFeatures(proto.Enum): IF_MACSEC (396279300): Media Access Control security (MACsec) """ + UNDEFINED_AVAILABLE_FEATURES = 0 IF_CROSS_SITE_NETWORK = 469111095 IF_L2_FORWARDING = 125563860 @@ -71986,6 +72200,7 @@ class AvailableLinkTypes(proto.Enum): LINK_TYPE_ETHERNET_400G_LR4 (127023690): 400G Ethernet, LR4 Optics. """ + UNDEFINED_AVAILABLE_LINK_TYPES = 0 LINK_TYPE_ETHERNET_100G_LR = 337672551 LINK_TYPE_ETHERNET_10G_LR = 236739749 @@ -72028,6 +72243,7 @@ class Continent(proto.Enum): SOUTH_AMERICA (32597340): No description available. """ + UNDEFINED_CONTINENT = 0 AFRICA = 317443706 ASIA_PAC = 119782269 @@ -72062,6 +72278,7 @@ class Status(proto.Enum): The InterconnectLocation is closed for provisioning new Interconnects. """ + UNDEFINED_STATUS = 0 AVAILABLE = 442079913 CLOSED = 380163436 @@ -72141,23 +72358,23 @@ class Status(proto.Enum): number=536567094, optional=True, ) - region_infos: MutableSequence[ - "InterconnectLocationRegionInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=312194170, - message="InterconnectLocationRegionInfo", + region_infos: MutableSequence["InterconnectLocationRegionInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=312194170, + message="InterconnectLocationRegionInfo", + ) ) self_link: str = proto.Field( proto.STRING, number=456214797, optional=True, ) - single_region_production_critical_peer_locations: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=439537103, + single_region_production_critical_peer_locations: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=439537103, + ) ) status: str = proto.Field( proto.STRING, @@ -72331,6 +72548,7 @@ class LocationPresence(proto.Enum): [Deprecated] This region shares the same regional network presence as this InterconnectLocation. """ + UNDEFINED_LOCATION_PRESENCE = 0 GLOBAL = 494663587 LOCAL_REGION = 403535464 @@ -72395,12 +72613,12 @@ class InterconnectMacsec(proto.Message): number=532597451, optional=True, ) - pre_shared_keys: MutableSequence[ - "InterconnectMacsecPreSharedKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=420308466, - message="InterconnectMacsecPreSharedKey", + pre_shared_keys: MutableSequence["InterconnectMacsecPreSharedKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=420308466, + message="InterconnectMacsecPreSharedKey", + ) ) @@ -72420,12 +72638,12 @@ class InterconnectMacsecConfig(proto.Message): link. """ - pre_shared_keys: MutableSequence[ - "InterconnectMacsecConfigPreSharedKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=420308466, - message="InterconnectMacsecConfigPreSharedKey", + pre_shared_keys: MutableSequence["InterconnectMacsecConfigPreSharedKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=420308466, + message="InterconnectMacsecConfigPreSharedKey", + ) ) @@ -72636,6 +72854,7 @@ class IssueType(proto.Enum): window. The interconnect as a whole should remain up, albeit with reduced bandwidth. """ + UNDEFINED_ISSUE_TYPE = 0 IT_OUTAGE = 175779973 IT_PARTIAL_OUTAGE = 92103971 @@ -72662,6 +72881,7 @@ class Source(proto.Enum): NSRC_GOOGLE (510574562): [Deprecated] This notification was generated by Google. """ + UNDEFINED_SOURCE = 0 GOOGLE = 497439289 NSRC_GOOGLE = 510574562 @@ -72705,6 +72925,7 @@ class State(proto.Enum): [Deprecated] The outage associated with this notification was canceled before the outage was due to start. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 CANCELLED = 41957681 @@ -72959,6 +73180,7 @@ class Continent(proto.Enum): SOUTH_AMERICA (32597340): No description available. """ + UNDEFINED_CONTINENT = 0 AFRICA = 317443706 ASIA_PAC = 119782269 @@ -72984,6 +73206,7 @@ class Lacp(proto.Enum): bundleAggregationType as "static". GCP does not support LAGs without LACP, so requestedLinkCount must be 1. """ + UNDEFINED_LACP = 0 LACP_SUPPORTED = 339576113 LACP_UNSUPPORTED = 203930104 @@ -73012,6 +73235,7 @@ class Status(proto.Enum): The InterconnectRemoteLocation is closed for provisioning new Cross-Cloud Interconnects. """ + UNDEFINED_STATUS = 0 AVAILABLE = 442079913 CLOSED = 380163436 @@ -73204,6 +73428,7 @@ class PortPairRemoteLocation(proto.Enum): to provision a redundant pair of Cross-Cloud Interconnects using two different remote locations in the same city. """ + UNDEFINED_PORT_PAIR_REMOTE_LOCATION = 0 PORT_PAIR_MATCHING_REMOTE_LOCATION = 207291859 PORT_PAIR_UNCONSTRAINED_REMOTE_LOCATION = 60609829 @@ -73228,6 +73453,7 @@ class PortPairVlan(proto.Enum): PORT_PAIR_UNCONSTRAINED_VLAN (175227948): PORT_PAIR_UNCONSTRAINED_VLAN means there is no constraint. """ + UNDEFINED_PORT_PAIR_VLAN = 0 PORT_PAIR_MATCHING_VLAN = 250295358 PORT_PAIR_UNCONSTRAINED_VLAN = 175227948 @@ -73887,6 +74113,7 @@ class State(proto.Enum): TERMINATED (250018339): Reserved state. """ + UNDEFINED_STATE = 0 DISABLED = 516696700 ENABLED = 182130465 @@ -75481,6 +75708,7 @@ class AddressFamily(proto.Enum): UNSPECIFIED_IP_VERSION (72938440): No description available. """ + UNDEFINED_ADDRESS_FAMILY = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -75501,6 +75729,7 @@ class RouteType(proto.Enum): UNSPECIFIED_ROUTE_TYPE (248064440): No description available. """ + UNDEFINED_ROUTE_TYPE = 0 ADVERTISED = 20302109 LEARNED = 231892419 @@ -79446,6 +79675,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 FULL = 2169487 @@ -79991,6 +80221,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 FULL = 2169487 @@ -84427,6 +84658,7 @@ class Direction(proto.Enum): OUTGOING (307438444): For routes exported from local network. """ + UNDEFINED_DIRECTION = 0 INCOMING = 338552870 OUTGOING = 307438444 @@ -88234,6 +88466,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 FULL = 2169487 @@ -93967,6 +94200,7 @@ class Views(proto.Enum): WITH_UTILIZATION (504090633): Utilization data is included in the response. """ + UNDEFINED_VIEWS = 0 DEFAULT = 115302945 WITH_UTILIZATION = 504090633 @@ -97520,6 +97754,7 @@ class TargetShape(proto.Enum): impact of zonal failure. Recommended for highly available serving workloads. """ + UNDEFINED_TARGET_SHAPE = 0 ANY = 64972 ANY_SINGLE_ZONE = 61100880 @@ -97571,6 +97806,7 @@ class Preference(proto.Enum): PREFERENCE_UNSPECIFIED (496219571): Default value, unused. """ + UNDEFINED_PREFERENCE = 0 ALLOW = 62368553 DENY = 2094604 @@ -97781,6 +98017,7 @@ class Status(proto.Enum): UPLOADING (267603489): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -97860,12 +98097,12 @@ class Status(proto.Enum): number=456214797, optional=True, ) - source_disk_encryption_keys: MutableSequence[ - "SourceDiskEncryptionKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=370408498, - message="SourceDiskEncryptionKey", + source_disk_encryption_keys: MutableSequence["SourceDiskEncryptionKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=370408498, + message="SourceDiskEncryptionKey", + ) ) source_instance: str = proto.Field( proto.STRING, @@ -98076,6 +98313,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -98563,6 +98801,7 @@ class CurrentAction(proto.Enum): performed as post-instance creation (subject to future extensions). """ + UNDEFINED_CURRENT_ACTION = 0 ABANDONING = 388244813 ADOPTING = 414293554 @@ -98619,6 +98858,7 @@ class InstanceStatus(proto.Enum): The instance has stopped (either by explicit action or underlying failure). """ + UNDEFINED_INSTANCE_STATUS = 0 DEPROVISIONING = 428935662 PENDING = 35394935 @@ -98652,6 +98892,7 @@ class TargetStatus(proto.Enum): The managed instance will eventually be DELETED. """ + UNDEFINED_TARGET_STATUS = 0 ABANDONED = 81797556 DELETED = 120962041 @@ -98677,12 +98918,12 @@ class TargetStatus(proto.Enum): number=18257045, optional=True, ) - instance_health: MutableSequence[ - "ManagedInstanceInstanceHealth" - ] = proto.RepeatedField( - proto.MESSAGE, - number=382667078, - message="ManagedInstanceInstanceHealth", + instance_health: MutableSequence["ManagedInstanceInstanceHealth"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=382667078, + message="ManagedInstanceInstanceHealth", + ) ) instance_status: str = proto.Field( proto.STRING, @@ -98808,6 +99049,7 @@ class DetailedHealthState(proto.Enum): instance but its health is not known at the moment. """ + UNDEFINED_DETAILED_HEALTH_STATE = 0 DRAINING = 480455402 HEALTHY = 439801213 @@ -98912,6 +99154,7 @@ class ProvisioningModel(proto.Enum): Standard provisioning with user controlled runtime, no discounts. """ + UNDEFINED_PROVISIONING_MODEL = 0 FLEX_START = 101746812 RESERVATION_BOUND = 293538571 @@ -99119,6 +99362,7 @@ class FilterMatchCriteria(proto.Enum): set. AmetadataFilter must never be created with this value. """ + UNDEFINED_FILTER_MATCH_CRITERIA = 0 MATCH_ALL = 180663271 MATCH_ANY = 180663346 @@ -99905,6 +100149,7 @@ class AcceleratorTopologyState(proto.Enum): accelerator topology cannot be activated due to insufficient number of running VMs. """ + UNDEFINED_ACCELERATOR_TOPOLOGY_STATE = 0 ACTIVATING = 378825968 ACTIVE = 314733318 @@ -100100,12 +100345,12 @@ class NatIpInfo(proto.Message): This field is a member of `oneof`_ ``_nat_name``. """ - nat_ip_info_mappings: MutableSequence[ - "NatIpInfoNatIpInfoMapping" - ] = proto.RepeatedField( - proto.MESSAGE, - number=241401884, - message="NatIpInfoNatIpInfoMapping", + nat_ip_info_mappings: MutableSequence["NatIpInfoNatIpInfoMapping"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=241401884, + message="NatIpInfoNatIpInfoMapping", + ) ) nat_name: str = proto.Field( proto.STRING, @@ -100152,6 +100397,7 @@ class Mode(proto.Enum): MANUAL (119397318): No description available. """ + UNDEFINED_MODE = 0 AUTO = 2020783 MANUAL = 119397318 @@ -100169,6 +100415,7 @@ class Usage(proto.Enum): UNUSED (360643030): No description available. """ + UNDEFINED_USAGE = 0 IN_USE = 17393485 UNUSED = 360643030 @@ -100373,6 +100620,7 @@ class NetworkFirewallPolicyEnforcementOrder(proto.Enum): BEFORE_CLASSIC_FIREWALL (338458349): No description available. """ + UNDEFINED_NETWORK_FIREWALL_POLICY_ENFORCEMENT_ORDER = 0 AFTER_CLASSIC_FIREWALL = 154582608 BEFORE_CLASSIC_FIREWALL = 338458349 @@ -100590,17 +100838,18 @@ class ConnectionPreference(proto.Enum): INVALID (530283991): No description available. """ + UNDEFINED_CONNECTION_PREFERENCE = 0 ACCEPT_AUTOMATIC = 75250580 ACCEPT_MANUAL = 373061341 INVALID = 530283991 - connection_endpoints: MutableSequence[ - "NetworkAttachmentConnectedEndpoint" - ] = proto.RepeatedField( - proto.MESSAGE, - number=326078813, - message="NetworkAttachmentConnectedEndpoint", + connection_endpoints: MutableSequence["NetworkAttachmentConnectedEndpoint"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=326078813, + message="NetworkAttachmentConnectedEndpoint", + ) ) connection_preference: str = proto.Field( proto.STRING, @@ -100815,6 +101064,7 @@ class Status(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -101152,13 +101402,13 @@ def raw_page(self): number=3355, optional=True, ) - items: MutableMapping[ - str, "NetworkEdgeSecurityServicesScopedList" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=100526016, - message="NetworkEdgeSecurityServicesScopedList", + items: MutableMapping[str, "NetworkEdgeSecurityServicesScopedList"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=100526016, + message="NetworkEdgeSecurityServicesScopedList", + ) ) kind: str = proto.Field( proto.STRING, @@ -101203,12 +101453,12 @@ class NetworkEdgeSecurityServicesScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - network_edge_security_services: MutableSequence[ - "NetworkEdgeSecurityService" - ] = proto.RepeatedField( - proto.MESSAGE, - number=35530156, - message="NetworkEdgeSecurityService", + network_edge_security_services: MutableSequence["NetworkEdgeSecurityService"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=35530156, + message="NetworkEdgeSecurityService", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -101508,6 +101758,7 @@ class NetworkEndpointType(proto.Enum): The network endpoint is handled by specified serverless infrastructure. """ + UNDEFINED_NETWORK_ENDPOINT_TYPE = 0 GCE_VM_IP = 401880793 GCE_VM_IP_PORT = 501838375 @@ -102107,6 +102358,7 @@ class PscConnectionStatus(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_PSC_CONNECTION_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -102296,6 +102548,7 @@ class HealthStatus(proto.Enum): Health status for network endpoints will not be provided. """ + UNDEFINED_HEALTH_STATUS = 0 SHOW = 2544381 SKIP = 2547071 @@ -102418,12 +102671,12 @@ class NetworkEndpointGroupsScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - network_endpoint_groups: MutableSequence[ - "NetworkEndpointGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29346733, - message="NetworkEndpointGroup", + network_endpoint_groups: MutableSequence["NetworkEndpointGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29346733, + message="NetworkEndpointGroup", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -102735,6 +102988,7 @@ class IgmpQuery(proto.Enum): The network interface has enabled IGMP query - v2. """ + UNDEFINED_IGMP_QUERY = 0 IGMP_QUERY_DISABLED = 28285169 IGMP_QUERY_V2 = 333493457 @@ -102759,6 +103013,7 @@ class Ipv6AccessType(proto.Enum): UNSPECIFIED_IPV6_ACCESS_TYPE (313080613): No description available. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -102785,6 +103040,7 @@ class NicType(proto.Enum): VIRTIO_NET (452123481): VIRTIO """ + UNDEFINED_NIC_TYPE = 0 GVNIC = 68209305 IDPF = 2242641 @@ -102817,6 +103073,7 @@ class StackType(proto.Enum): UNSPECIFIED_STACK_TYPE (298084569): No description available. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -103160,6 +103417,7 @@ class StackType(proto.Enum): This Peering will only allow IPv4 traffic and routes to be exchanged, even if the matching peering is IPV4_IPV6. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -103180,6 +103438,7 @@ class State(proto.Enum): peer, including the case when peer does not exist. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -103210,6 +103469,7 @@ class UpdateStrategy(proto.Enum): Peerings with update strategy UNSPECIFIED are created with update strategy INDEPENDENT. """ + UNDEFINED_UPDATE_STRATEGY = 0 CONSENSUS = 203373655 INDEPENDENT = 127011674 @@ -103345,6 +103605,7 @@ class UpdateStrategy(proto.Enum): Peerings with update strategy UNSPECIFIED are created with update strategy INDEPENDENT. """ + UNDEFINED_UPDATE_STRATEGY = 0 CONSENSUS = 203373655 INDEPENDENT = 127011674 @@ -103419,6 +103680,7 @@ class DeleteStatus(proto.Enum): The peer network admin has requested deletion of this peering connection. """ + UNDEFINED_DELETE_STATUS = 0 DELETE_ACKNOWLEDGED = 325293916 DELETE_STATUS_UNSPECIFIED = 395396446 @@ -103449,6 +103711,7 @@ class UpdateStatus(proto.Enum): UPDATE_STATUS_UNSPECIFIED (120836480): No description available. """ + UNDEFINED_UPDATE_STATUS = 0 IN_SYNC = 2273653 PENDING_LOCAL_ACKNOWLEDMENT = 229926592 @@ -103519,6 +103782,7 @@ class StackType(proto.Enum): This Peering will only allow IPv4 traffic and routes to be exchanged, even if the matching peering is IPV4_IPV6. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -103575,6 +103839,7 @@ class TotalEgressBandwidthTier(proto.Enum): TIER_1 (326919444): No description available. """ + UNDEFINED_TOTAL_EGRESS_BANDWIDTH_TIER = 0 DEFAULT = 115302945 TIER_1 = 326919444 @@ -104098,6 +104363,7 @@ class DscpMode(proto.Enum): Allows to specify custom DSCP value from selected traffic_class range. """ + UNDEFINED_DSCP_MODE = 0 AUTO = 2020783 CUSTOM = 388595569 @@ -104129,6 +104395,7 @@ class TrafficClass(proto.Enum): Traffic Class 6, corresponding to DSCP ranges (48-63) 11xxxx. """ + UNDEFINED_TRAFFIC_CLASS = 0 TC1 = 82850 TC2 = 82851 @@ -104268,6 +104535,7 @@ class State(proto.Enum): STATE_UNSPECIFIED (470755401): No description available. """ + UNDEFINED_STATE = 0 EFFECTIVE = 244201863 INEFFECTIVE = 304458242 @@ -104434,6 +104702,7 @@ class Scope(proto.Enum): ZONE (2759596): No description available. """ + UNDEFINED_SCOPE = 0 REGION = 266017524 ZONE = 2759596 @@ -104718,6 +104987,7 @@ class AddressPurposes(proto.Enum): VPC_PEERING (400800170): IP range for peer networks. """ + UNDEFINED_ADDRESS_PURPOSES = 0 DNS_RESOLVER = 476114556 GCE_ENDPOINT = 230515243 @@ -104740,6 +105010,7 @@ class AllowAddressCreation(proto.Enum): ADDRESS_CREATION_BLOCKED (534937975): No description available. """ + UNDEFINED_ALLOW_ADDRESS_CREATION = 0 ADDRESS_CREATION_ALLOWED = 181903667 ADDRESS_CREATION_BLOCKED = 534937975 @@ -104757,6 +105028,7 @@ class AllowAliasIpRanges(proto.Enum): ALIAS_IP_RANGES_BLOCKED (281030444): No description available. """ + UNDEFINED_ALLOW_ALIAS_IP_RANGES = 0 ALIAS_IP_RANGES_ALLOWED = 464867048 ALIAS_IP_RANGES_BLOCKED = 281030444 @@ -104773,6 +105045,7 @@ class AllowAutoModeSubnet(proto.Enum): AUTO_MODE_SUBNET_BLOCKED (207206006): No description available. """ + UNDEFINED_ALLOW_AUTO_MODE_SUBNET = 0 AUTO_MODE_SUBNET_ALLOWED = 391042610 AUTO_MODE_SUBNET_BLOCKED = 207206006 @@ -104790,6 +105063,7 @@ class AllowClassDFirewalls(proto.Enum): CLASS_D_FIREWALLS_BLOCKED (164382782): No description available. """ + UNDEFINED_ALLOW_CLASS_D_FIREWALLS = 0 CLASS_D_FIREWALLS_ALLOWED = 348219386 CLASS_D_FIREWALLS_BLOCKED = 164382782 @@ -104806,6 +105080,7 @@ class AllowCloudNat(proto.Enum): CLOUD_NAT_BLOCKED (62094692): No description available. """ + UNDEFINED_ALLOW_CLOUD_NAT = 0 CLOUD_NAT_ALLOWED = 245931296 CLOUD_NAT_BLOCKED = 62094692 @@ -104822,6 +105097,7 @@ class AllowCloudRouter(proto.Enum): CLOUD_ROUTER_BLOCKED (181551680): No description available. """ + UNDEFINED_ALLOW_CLOUD_ROUTER = 0 CLOUD_ROUTER_ALLOWED = 365388284 CLOUD_ROUTER_BLOCKED = 181551680 @@ -104838,6 +105114,7 @@ class AllowDefaultNicAttachment(proto.Enum): DEFAULT_NIC_ATTACHMENT_BLOCKED (364604997): No description available. """ + UNDEFINED_ALLOW_DEFAULT_NIC_ATTACHMENT = 0 DEFAULT_NIC_ATTACHMENT_ALLOWED = 11570689 DEFAULT_NIC_ATTACHMENT_BLOCKED = 364604997 @@ -104855,6 +105132,7 @@ class AllowExternalIpAccess(proto.Enum): EXTERNAL_IP_ACCESS_BLOCKED (462564501): No description available. """ + UNDEFINED_ALLOW_EXTERNAL_IP_ACCESS = 0 EXTERNAL_IP_ACCESS_ALLOWED = 109530193 EXTERNAL_IP_ACCESS_BLOCKED = 462564501 @@ -104872,6 +105150,7 @@ class AllowFirewallPolicy(proto.Enum): FIREWALL_POLICY_BLOCKED (204651742): No description available. """ + UNDEFINED_ALLOW_FIREWALL_POLICY = 0 FIREWALL_POLICY_ALLOWED = 388488346 FIREWALL_POLICY_BLOCKED = 204651742 @@ -104888,6 +105167,7 @@ class AllowInterconnect(proto.Enum): INTERCONNECT_BLOCKED (515879707): No description available. """ + UNDEFINED_ALLOW_INTERCONNECT = 0 INTERCONNECT_ALLOWED = 162845399 INTERCONNECT_BLOCKED = 515879707 @@ -104904,6 +105184,7 @@ class AllowIpForwarding(proto.Enum): IP_FORWARDING_BLOCKED (505629858): No description available. """ + UNDEFINED_ALLOW_IP_FORWARDING = 0 IP_FORWARDING_ALLOWED = 152595550 IP_FORWARDING_BLOCKED = 505629858 @@ -104920,6 +105201,7 @@ class AllowLoadBalancing(proto.Enum): LOAD_BALANCING_BLOCKED (381442285): No description available. """ + UNDEFINED_ALLOW_LOAD_BALANCING = 0 LOAD_BALANCING_ALLOWED = 28407977 LOAD_BALANCING_BLOCKED = 381442285 @@ -104936,6 +105218,7 @@ class AllowMultiNicInSameNetwork(proto.Enum): MULTI_NIC_IN_SAME_NETWORK_BLOCKED (273718815): No description available. """ + UNDEFINED_ALLOW_MULTI_NIC_IN_SAME_NETWORK = 0 MULTI_NIC_IN_SAME_NETWORK_ALLOWED = 457555419 MULTI_NIC_IN_SAME_NETWORK_BLOCKED = 273718815 @@ -104953,6 +105236,7 @@ class AllowMultiNicInSameSubnetwork(proto.Enum): MULTI_NIC_IN_SAME_SUBNETWORK_BLOCKED (104207991): No description available. """ + UNDEFINED_ALLOW_MULTI_NIC_IN_SAME_SUBNETWORK = 0 MULTI_NIC_IN_SAME_SUBNETWORK_ALLOWED = 288044595 MULTI_NIC_IN_SAME_SUBNETWORK_BLOCKED = 104207991 @@ -104969,6 +105253,7 @@ class AllowMulticast(proto.Enum): MULTICAST_BLOCKED (397727845): No description available. """ + UNDEFINED_ALLOW_MULTICAST = 0 MULTICAST_ALLOWED = 44693537 MULTICAST_BLOCKED = 397727845 @@ -104985,6 +105270,7 @@ class AllowNcc(proto.Enum): NCC_BLOCKED (283390907): No description available. """ + UNDEFINED_ALLOW_NCC = 0 NCC_ALLOWED = 467227511 NCC_BLOCKED = 283390907 @@ -105001,6 +105287,7 @@ class AllowNetworkMigration(proto.Enum): NETWORK_MIGRATION_BLOCKED (367424074): No description available. """ + UNDEFINED_ALLOW_NETWORK_MIGRATION = 0 NETWORK_MIGRATION_ALLOWED = 14389766 NETWORK_MIGRATION_BLOCKED = 367424074 @@ -105017,6 +105304,7 @@ class AllowPacketMirroring(proto.Enum): PACKET_MIRRORING_BLOCKED (445450553): No description available. """ + UNDEFINED_ALLOW_PACKET_MIRRORING = 0 PACKET_MIRRORING_ALLOWED = 92416245 PACKET_MIRRORING_BLOCKED = 445450553 @@ -105033,6 +105321,7 @@ class AllowPrivateGoogleAccess(proto.Enum): PRIVATE_GOOGLE_ACCESS_BLOCKED (36950747): No description available. """ + UNDEFINED_ALLOW_PRIVATE_GOOGLE_ACCESS = 0 PRIVATE_GOOGLE_ACCESS_ALLOWED = 220787351 PRIVATE_GOOGLE_ACCESS_BLOCKED = 36950747 @@ -105049,6 +105338,7 @@ class AllowPsc(proto.Enum): PSC_BLOCKED (524593965): No description available. """ + UNDEFINED_ALLOW_PSC = 0 PSC_ALLOWED = 171559657 PSC_BLOCKED = 524593965 @@ -105065,6 +105355,7 @@ class AllowSameNetworkUnicast(proto.Enum): SAME_NETWORK_UNICAST_BLOCKED (512767122): No description available. """ + UNDEFINED_ALLOW_SAME_NETWORK_UNICAST = 0 SAME_NETWORK_UNICAST_ALLOWED = 159732814 SAME_NETWORK_UNICAST_BLOCKED = 512767122 @@ -105081,6 +105372,7 @@ class AllowStaticRoutes(proto.Enum): STATIC_ROUTES_BLOCKED (225212360): No description available. """ + UNDEFINED_ALLOW_STATIC_ROUTES = 0 STATIC_ROUTES_ALLOWED = 409048964 STATIC_ROUTES_BLOCKED = 225212360 @@ -105097,6 +105389,7 @@ class AllowSubInterfaces(proto.Enum): SUBINTERFACES_BLOCKED (511720199): No description available. """ + UNDEFINED_ALLOW_SUB_INTERFACES = 0 SUBINTERFACES_ALLOWED = 158685891 SUBINTERFACES_BLOCKED = 511720199 @@ -105113,6 +105406,7 @@ class AllowSubnetworkCreation(proto.Enum): SUBNETWORK_CREATION_BLOCKED (511615133): No description available. """ + UNDEFINED_ALLOW_SUBNETWORK_CREATION = 0 SUBNETWORK_CREATION_ALLOWED = 158580825 SUBNETWORK_CREATION_BLOCKED = 511615133 @@ -105130,6 +105424,7 @@ class AllowVpcFirewallRules(proto.Enum): VPC_FIREWALL_RULES_BLOCKED (305749403): No description available. """ + UNDEFINED_ALLOW_VPC_FIREWALL_RULES = 0 VPC_FIREWALL_RULES_ALLOWED = 489586007 VPC_FIREWALL_RULES_BLOCKED = 305749403 @@ -105146,6 +105441,7 @@ class AllowVpcPeering(proto.Enum): VPC_PEERING_BLOCKED (77628471): No description available. """ + UNDEFINED_ALLOW_VPC_PEERING = 0 VPC_PEERING_ALLOWED = 261465075 VPC_PEERING_BLOCKED = 77628471 @@ -105162,6 +105458,7 @@ class AllowVpn(proto.Enum): VPN_BLOCKED (515198305): No description available. """ + UNDEFINED_ALLOW_VPN = 0 VPN_ALLOWED = 162163997 VPN_BLOCKED = 515198305 @@ -105178,6 +105475,7 @@ class FirewallPolicyTypes(proto.Enum): VPC_POLICY (74319208): No description available. """ + UNDEFINED_FIREWALL_POLICY_TYPES = 0 RDMA_ROCE_POLICY = 148757145 VPC_POLICY = 74319208 @@ -105202,6 +105500,7 @@ class InterfaceTypes(proto.Enum): VIRTIO_NET (452123481): VIRTIO """ + UNDEFINED_INTERFACE_TYPES = 0 GVNIC = 68209305 IDPF = 2242641 @@ -105222,6 +105521,7 @@ class Multicast(proto.Enum): MULTICAST_ULL (532211630): No description available. """ + UNDEFINED_MULTICAST = 0 MULTICAST_SDN = 532209462 MULTICAST_ULL = 532211630 @@ -105238,6 +105538,7 @@ class SubnetPurposes(proto.Enum): SUBNET_PURPOSE_PRIVATE (404371008): No description available. """ + UNDEFINED_SUBNET_PURPOSES = 0 SUBNET_PURPOSE_CUSTOM_HARDWARE = 283160275 SUBNET_PURPOSE_PRIVATE = 404371008 @@ -105256,6 +105557,7 @@ class SubnetStackTypes(proto.Enum): SUBNET_STACK_TYPE_IPV6_ONLY (98889336): No description available. """ + UNDEFINED_SUBNET_STACK_TYPES = 0 SUBNET_STACK_TYPE_IPV4_IPV6 = 41454485 SUBNET_STACK_TYPE_IPV4_ONLY = 41631034 @@ -105293,6 +105595,7 @@ class SubnetworkPurposes(proto.Enum): Subnetwork used for Regional Envoy-based Load Balancing. """ + UNDEFINED_SUBNETWORK_PURPOSES = 0 GLOBAL_MANAGED_PROXY = 236463602 INTERNAL_HTTPS_LOAD_BALANCER = 248748889 @@ -105319,6 +105622,7 @@ class SubnetworkStackTypes(proto.Enum): New VMs in this subnet will only be assigned IPv6 addresses. """ + UNDEFINED_SUBNETWORK_STACK_TYPES = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -105336,6 +105640,7 @@ class Unicast(proto.Enum): UNICAST_ULL (379956325): No description available. """ + UNDEFINED_UNICAST = 0 UNICAST_SDN = 379954157 UNICAST_ULL = 379956325 @@ -105598,6 +105903,7 @@ class NetworkType(proto.Enum): VPC (85193): VPC network. """ + UNDEFINED_NETWORK_TYPE = 0 RDMA = 2510662 ULL = 84117 @@ -105618,6 +105924,7 @@ class RdmaSubtype(proto.Enum): RDMA over Converged Ethernet (RoCE) for Bare Metal. """ + UNDEFINED_RDMA_SUBTYPE = 0 FALCON = 455787729 ROCE = 2520927 @@ -105635,6 +105942,7 @@ class UllSubtype(proto.Enum): PARTICIPANT (236028691): Exchange participant. """ + UNDEFINED_ULL_SUBTYPE = 0 OPERATOR = 282073252 PARTICIPANT = 236028691 @@ -105649,6 +105957,7 @@ class VpcSubtype(proto.Enum): REGIONAL (92288543): Regionally bound VPC network. """ + UNDEFINED_VPC_SUBTYPE = 0 REGIONAL = 92288543 @@ -105837,6 +106146,7 @@ class BgpBestPathSelectionMode(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_BGP_BEST_PATH_SELECTION_MODE = 0 LEGACY = 94234569 STANDARD = 484642493 @@ -105857,6 +106167,7 @@ class BgpInterRegionCost(proto.Enum): DEFAULT (115302945): No description available. """ + UNDEFINED_BGP_INTER_REGION_COST = 0 ADD_COST_TO_MED = 490583004 DEFAULT = 115302945 @@ -105872,6 +106183,7 @@ class EffectiveBgpInterRegionCost(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_EFFECTIVE_BGP_INTER_REGION_COST = 0 class RoutingMode(proto.Enum): @@ -105890,6 +106202,7 @@ class RoutingMode(proto.Enum): REGIONAL (92288543): No description available. """ + UNDEFINED_ROUTING_MODE = 0 GLOBAL = 494663587 REGIONAL = 92288543 @@ -106101,6 +106414,7 @@ class Type(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TYPE = 0 HIERARCHY = 69902869 NETWORK = 413984270 @@ -106375,6 +106689,7 @@ class MaintenanceInterval(proto.Enum): available. RECURRENT is used for GEN3 and Slice of Hardware VMs. """ + UNDEFINED_MAINTENANCE_INTERVAL = 0 AS_NEEDED = 500724834 PERIODIC = 142804635 @@ -106411,6 +106726,7 @@ class MaintenancePolicy(proto.Enum): TERMINATE, and they will only restart if automaticRestart = true. """ + UNDEFINED_MAINTENANCE_POLICY = 0 DEFAULT = 115302945 MAINTENANCE_POLICY_UNSPECIFIED = 72964182 @@ -106433,6 +106749,7 @@ class Status(proto.Enum): READY (77848963): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -106655,6 +106972,7 @@ class Mode(proto.Enum): Autoscaling will only scale out and will not remove nodes. """ + UNDEFINED_MODE = 0 MODE_UNSPECIFIED = 371348091 OFF = 78159 @@ -106866,6 +107184,7 @@ class CpuOvercommitType(proto.Enum): NONE (2402104): No description available. """ + UNDEFINED_CPU_OVERCOMMIT_TYPE = 0 CPU_OVERCOMMIT_TYPE_UNSPECIFIED = 520665615 ENABLED = 182130465 @@ -106889,6 +107208,7 @@ class Status(proto.Enum): REPAIRING (413483285): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -106917,12 +107237,12 @@ class Status(proto.Enum): number=95594102, message="LocalDisk", ) - instance_consumption_data: MutableSequence[ - "InstanceConsumptionData" - ] = proto.RepeatedField( - proto.MESSAGE, - number=84715576, - message="InstanceConsumptionData", + instance_consumption_data: MutableSequence["InstanceConsumptionData"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=84715576, + message="InstanceConsumptionData", + ) ) instances: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -107289,6 +107609,7 @@ class CpuOvercommitType(proto.Enum): NONE (2402104): No description available. """ + UNDEFINED_CPU_OVERCOMMIT_TYPE = 0 CPU_OVERCOMMIT_TYPE_UNSPECIFIED = 520665615 ENABLED = 182130465 @@ -107311,6 +107632,7 @@ class Status(proto.Enum): READY (77848963): The node template is ready. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -108396,6 +108718,7 @@ class Status(proto.Enum): RUNNING (121282975): No description available. """ + UNDEFINED_STATUS = 0 DONE = 2104194 PENDING = 35394935 @@ -108998,6 +109321,7 @@ class Duration(proto.Enum): MINUTE (126786068): No description available. """ + UNDEFINED_DURATION = 0 DURATION_UNSPECIFIED = 529071340 HOUR = 2223588 @@ -109023,6 +109347,7 @@ class Type(proto.Enum): TYPE_UNSPECIFIED (437714322): No description available. """ + UNDEFINED_TYPE = 0 LOOPBACK = 356174219 RECEIVE = 189660867 @@ -109187,6 +109512,7 @@ class Enable(proto.Enum): TRUE (2583950): No description available. """ + UNDEFINED_ENABLE = 0 FALSE = 66658563 TRUE = 2583950 @@ -109390,6 +109716,7 @@ class Direction(proto.Enum): INGRESS (516931221): Only ingress traffic is mirrored. """ + UNDEFINED_DIRECTION = 0 BOTH = 2044801 EGRESS = 432880501 @@ -109545,19 +109872,19 @@ class PacketMirroringMirroredResourceInfo(proto.Message): will be mirrored. """ - instances: MutableSequence[ - "PacketMirroringMirroredResourceInfoInstanceInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29097598, - message="PacketMirroringMirroredResourceInfoInstanceInfo", + instances: MutableSequence["PacketMirroringMirroredResourceInfoInstanceInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29097598, + message="PacketMirroringMirroredResourceInfoInstanceInfo", + ) ) - subnetworks: MutableSequence[ - "PacketMirroringMirroredResourceInfoSubnetInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=415853125, - message="PacketMirroringMirroredResourceInfoSubnetInfo", + subnetworks: MutableSequence["PacketMirroringMirroredResourceInfoSubnetInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=415853125, + message="PacketMirroringMirroredResourceInfoSubnetInfo", + ) ) tags: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -114666,6 +114993,7 @@ class Status(proto.Enum): The per-instance configuration has been deleted, but the deletion is not yet applied. """ + UNDEFINED_STATUS = 0 APPLYING = 352003508 DELETING = 528602024 @@ -115246,21 +115574,21 @@ class PreservedState(proto.Message): number=95594102, message="PreservedStatePreservedDisk", ) - external_i_ps: MutableMapping[ - str, "PreservedStatePreservedNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=532687245, - message="PreservedStatePreservedNetworkIp", + external_i_ps: MutableMapping[str, "PreservedStatePreservedNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=532687245, + message="PreservedStatePreservedNetworkIp", + ) ) - internal_i_ps: MutableMapping[ - str, "PreservedStatePreservedNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=215731675, - message="PreservedStatePreservedNetworkIp", + internal_i_ps: MutableMapping[str, "PreservedStatePreservedNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=215731675, + message="PreservedStatePreservedNetworkIp", + ) ) metadata: MutableMapping[str, str] = proto.MapField( proto.STRING, @@ -115315,6 +115643,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -115336,6 +115665,7 @@ class Mode(proto.Enum): VM instance at a time can be attached to a disk inREAD_WRITE mode. """ + UNDEFINED_MODE = 0 READ_ONLY = 91950261 READ_WRITE = 173607894 @@ -115397,6 +115727,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -115508,6 +115839,7 @@ class ActivationStatus(proto.Enum): ENABLED (182130465): No description available. """ + UNDEFINED_ACTIVATION_STATUS = 0 ACTIVATION_STATE_UNSPECIFIED = 632160 DISABLED = 516696700 @@ -115704,6 +116036,7 @@ class PredefinedRolloutPlan(proto.Enum): ROLLOUT_PLAN_UNSPECIFIED (144511983): No description available. """ + UNDEFINED_PREDEFINED_ROLLOUT_PLAN = 0 ROLLOUT_PLAN_FAST_ROLLOUT = 167808726 ROLLOUT_PLAN_TWO_DAY_ROLLOUT = 349866771 @@ -115800,6 +116133,7 @@ class Stage(proto.Enum): STAGE_UNSPECIFIED (63695670): No description available. """ + UNDEFINED_STAGE = 0 DEPRECATED = 463360435 GA = 2266 @@ -115983,6 +116317,7 @@ class CloudArmorTier(proto.Enum): CA_STANDARD (13156734): No description available. """ + UNDEFINED_CLOUD_ARMOR_TIER = 0 CA_ENTERPRISE_ANNUAL = 219921116 CA_ENTERPRISE_PAYGO = 453530323 @@ -116010,6 +116345,7 @@ class DefaultNetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_DEFAULT_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -116034,6 +116370,7 @@ class ManagedProtectionTier(proto.Enum): CAMP_PLUS_PAYGO (165150985): Plus tier protection monthly. """ + UNDEFINED_MANAGED_PROTECTION_TIER = 0 CAMP_PLUS_ANNUAL = 406967142 CAMP_PLUS_PAYGO = 165150985 @@ -116055,6 +116392,7 @@ class VmDnsSetting(proto.Enum): ZONAL_ONLY (521198951): No description available. """ + UNDEFINED_VM_DNS_SETTING = 0 GLOBAL_DEFAULT = 345419141 UNSPECIFIED_VM_DNS_SETTING = 35691930 @@ -116075,6 +116413,7 @@ class XpnProjectStatus(proto.Enum): UNSPECIFIED_XPN_PROJECT_STATUS (340393257): No description available. """ + UNDEFINED_XPN_PROJECT_STATUS = 0 HOST = 2223528 UNSPECIFIED_XPN_PROJECT_STATUS = 340393257 @@ -116300,6 +116639,7 @@ class CloudArmorTier(proto.Enum): CA_STANDARD (13156734): Standard protection. """ + UNDEFINED_CLOUD_ARMOR_TIER = 0 CA_ENTERPRISE_ANNUAL = 219921116 CA_ENTERPRISE_PAYGO = 453530323 @@ -116345,6 +116685,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -116386,6 +116727,7 @@ class ManagedProtectionTier(proto.Enum): CA_STANDARD (13156734): Standard protection. """ + UNDEFINED_MANAGED_PROTECTION_TIER = 0 CAMP_PLUS_ANNUAL = 406967142 CAMP_PLUS_PAYGO = 165150985 @@ -116546,6 +116888,7 @@ class ByoipApiVersion(proto.Enum): deletion takes minutes and the BGP status can be modified. """ + UNDEFINED_BYOIP_API_VERSION = 0 V1 = 2715 V2 = 2716 @@ -116568,6 +116911,7 @@ class Ipv6AccessType(proto.Enum): Cloud. All children Public Delegated Prefixes will have IPv6 access type as INTERNAL. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -116601,6 +116945,7 @@ class PdpScope(proto.Enum): The public delegated prefix is regional only. The provisioning will take a few minutes. """ + UNDEFINED_PDP_SCOPE = 0 GLOBAL = 494663587 GLOBAL_AND_REGIONAL = 318053059 @@ -116644,6 +116989,7 @@ class Status(proto.Enum): VALIDATED (66197998): Reverse DNS lookup is successful. """ + UNDEFINED_STATUS = 0 ANNOUNCED_TO_INTERNET = 177880897 INITIAL = 518841124 @@ -117031,6 +117377,7 @@ class ByoipApiVersion(proto.Enum): delete. Announce and Withdraw APIs can be used on this prefix to change the BGP status. """ + UNDEFINED_BYOIP_API_VERSION = 0 V1 = 2715 V2 = 2716 @@ -117055,6 +117402,7 @@ class Ipv6AccessType(proto.Enum): delegated prefixes will have IPv6 access type as INTERNAL. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -117090,6 +117438,7 @@ class Mode(proto.Enum): allocatablePrefixLength. Parent public delegated prefix must have IPv6 access type as INTERNAL. """ + UNDEFINED_MODE = 0 DELEGATION = 264149288 EXTERNAL_IPV6_FORWARDING_RULE_CREATION = 398684356 @@ -117136,6 +117485,7 @@ class Status(proto.Enum): The public delegated prefix is currently withdrawn but ready to be announced. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 ANNOUNCED = 365103355 @@ -117485,6 +117835,7 @@ class Ipv6AccessType(proto.Enum): delegated prefixes will have IPv6 access type as INTERNAL. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -117520,6 +117871,7 @@ class Mode(proto.Enum): allocatablePrefixLength. Parent public delegated prefix must have IPv6 access type as INTERNAL. """ + UNDEFINED_MODE = 0 DELEGATION = 264149288 EXTERNAL_IPV6_FORWARDING_RULE_CREATION = 398684356 @@ -117539,6 +117891,7 @@ class Status(proto.Enum): INACTIVE (270421099): No description available. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -117616,12 +117969,12 @@ class PublicDelegatedPrefixesScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - public_delegated_prefixes: MutableSequence[ - "PublicDelegatedPrefix" - ] = proto.RepeatedField( - proto.MESSAGE, - number=315261206, - message="PublicDelegatedPrefix", + public_delegated_prefixes: MutableSequence["PublicDelegatedPrefix"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=315261206, + message="PublicDelegatedPrefix", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -117996,6 +118349,7 @@ class Metric(proto.Enum): XPN_SERVICE_PROJECTS (95191981): No description available. """ + UNDEFINED_METRIC = 0 A2_CPUS = 153206585 AFFINITY_GROUPS = 108303563 @@ -118236,6 +118590,7 @@ class RolloutStatus(proto.Enum): ROLLOUT_STATUS_UNSPECIFIED - Rollout status is not specified. The default value. """ + UNDEFINED_ROLLOUT_STATUS = 0 IN_PROGRESS = 469193735 ROLLOUT_STATUS_UNSPECIFIED = 26864568 @@ -118400,6 +118755,7 @@ class Code(proto.Enum): UNREACHABLE (13328052): A given scope cannot be reached. """ + UNDEFINED_CODE = 0 CLEANUP_FAILED = 150308440 DEPRECATED_RESOURCE_USED = 391835586 @@ -118505,6 +118861,7 @@ class ContainerType(proto.Enum): TAR (82821): No description available. """ + UNDEFINED_CONTAINER_TYPE = 0 TAR = 82821 @@ -118786,6 +119143,7 @@ class Status(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATUS = 0 DOWN = 2104482 UP = 2715 @@ -119564,6 +119922,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -119594,6 +119953,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 all_instances: bool = proto.Field( @@ -119881,12 +120241,12 @@ class RegionInstanceGroupManagersSetAutoHealingRequest(proto.Message): """ - auto_healing_policies: MutableSequence[ - "InstanceGroupManagerAutoHealingPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=456799109, - message="InstanceGroupManagerAutoHealingPolicy", + auto_healing_policies: MutableSequence["InstanceGroupManagerAutoHealingPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=456799109, + message="InstanceGroupManagerAutoHealingPolicy", + ) ) @@ -120127,6 +120487,7 @@ class InstanceState(proto.Enum): Instance is in RUNNING state if it is running. """ + UNDEFINED_INSTANCE_STATE = 0 ALL = 64897 RUNNING = 121282975 @@ -120370,6 +120731,7 @@ class Type(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TYPE = 0 HIERARCHY = 69902869 NETWORK = 413984270 @@ -122213,6 +122575,7 @@ class DeploymentType(proto.Enum): The reserved capacity is made up of highly flexible, logical reservation blocks. """ + UNDEFINED_DEPLOYMENT_TYPE = 0 DENSE = 64932607 DEPLOYMENT_TYPE_UNSPECIFIED = 234847180 @@ -122245,6 +122608,7 @@ class ProtectionTier(proto.Enum): expected to continue as normal using the redundancies. """ + UNDEFINED_PROTECTION_TIER = 0 CAPACITY_OPTIMIZED = 17430466 PROTECTION_TIER_UNSPECIFIED = 262261984 @@ -122272,6 +122636,7 @@ class ReservationMode(proto.Enum): RESERVATION_MODE_UNSPECIFIED (233810606): No description available. """ + UNDEFINED_RESERVATION_MODE = 0 CALENDAR = 67431230 DEFAULT = 115302945 @@ -122294,6 +122659,7 @@ class SchedulingType(proto.Enum): reservation. Instead, each instance has its own maintenance window. """ + UNDEFINED_SCHEDULING_TYPE = 0 GROUPED = 474540862 GROUP_MAINTENANCE_TYPE_UNSPECIFIED = 447183678 @@ -122327,6 +122693,7 @@ class Status(proto.Enum): UPDATING (494614342): Reservation update is in progress. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -122507,6 +122874,7 @@ class ReservationOperationalMode(proto.Enum): RESERVATION_OPERATIONAL_MODE_UNSPECIFIED (194296603): No description available. """ + UNDEFINED_RESERVATION_OPERATIONAL_MODE = 0 ALL_CAPACITY = 500029880 HIGHLY_AVAILABLE_CAPACITY = 110861600 @@ -122583,6 +122951,7 @@ class ConsumeReservationType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_CONSUME_RESERVATION_TYPE = 0 ANY_RESERVATION = 200008121 NO_RESERVATION = 169322030 @@ -122799,6 +123168,7 @@ class Status(proto.Enum): Reservation block has allocated all its resources. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -122927,6 +123297,7 @@ class HealthStatus(proto.Enum): The health status of the reservation block is unspecified. """ + UNDEFINED_HEALTH_STATUS = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -122979,12 +123350,12 @@ class ReservationBlockPhysicalTopology(proto.Message): number=335221242, optional=True, ) - instances: MutableSequence[ - "ReservationBlockPhysicalTopologyInstance" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29097598, - message="ReservationBlockPhysicalTopologyInstance", + instances: MutableSequence["ReservationBlockPhysicalTopologyInstance"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29097598, + message="ReservationBlockPhysicalTopologyInstance", + ) ) @@ -123333,6 +123704,7 @@ class Status(proto.Enum): Reservation subBlock has allocated all its resources. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -123469,6 +123841,7 @@ class HealthStatus(proto.Enum): The health status of the reservation subBlock is unspecified. """ + UNDEFINED_HEALTH_STATUS = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -123670,6 +124043,7 @@ class DisruptionSchedule(proto.Enum): IMMEDIATE (152881041): All VMs will be disrupted immediately. """ + UNDEFINED_DISRUPTION_SCHEDULE = 0 DISRUPTION_SCHEDULE_UNSPECIFIED = 332543835 IMMEDIATE = 152881041 @@ -123688,6 +124062,7 @@ class FailureComponent(proto.Enum): NVLINK_SWITCH (239107153): The NVLink switch experienced the fault. """ + UNDEFINED_FAILURE_COMPONENT = 0 FAILURE_COMPONENT_UNSPECIFIED = 332003744 MULTIPLE_FAULTY_HOSTS = 423545298 @@ -123750,6 +124125,7 @@ class Behavior(proto.Enum): SWITCH_FAILURE (254909279): The subBlock experienced a switch failure. """ + UNDEFINED_BEHAVIOR = 0 FAULT_BEHAVIOR_UNSPECIFIED = 447660743 GPU_ERROR = 198817909 @@ -123808,6 +124184,7 @@ class MaintenanceScope(proto.Enum): any VMs running on them. This is not allowed for Standard ExR """ + UNDEFINED_MAINTENANCE_SCOPE = 0 ALL = 64897 MAINTENANCE_SCOPE_UNSPECIFIED = 78827328 @@ -123860,6 +124237,7 @@ class MaintenanceScope(proto.Enum): any VMs running on them. This is not allowed for Standard ExR """ + UNDEFINED_MAINTENANCE_SCOPE = 0 ALL = 64897 MAINTENANCE_SCOPE_UNSPECIFIED = 78827328 @@ -124516,6 +124894,7 @@ class Type(proto.Enum): VCPU (2628978): No description available. """ + UNDEFINED_TYPE = 0 ACCELERATOR = 429815371 LOCAL_SSD = 508934896 @@ -124693,6 +125072,7 @@ class Status(proto.Enum): READY (77848963): Resource policy is ready to be used. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -124989,6 +125369,7 @@ class AcceleratorTopologyMode(proto.Enum): demand. At the time of VM creation, the chips are not connected. """ + UNDEFINED_ACCELERATOR_TOPOLOGY_MODE = 0 AUTO_CONNECT = 491872826 PROVISION_ONLY = 399134966 @@ -125005,6 +125386,7 @@ class Collocation(proto.Enum): UNSPECIFIED_COLLOCATION (464308205): No description available. """ + UNDEFINED_COLLOCATION = 0 COLLOCATED = 103257554 UNSPECIFIED_COLLOCATION = 464308205 @@ -125410,6 +125792,7 @@ class OnSourceDiskDelete(proto.Enum): UNSPECIFIED_ON_SOURCE_DISK_DELETE (239140769): No description available. """ + UNDEFINED_ON_SOURCE_DISK_DELETE = 0 APPLY_RETENTION_POLICY = 535071332 KEEP_AUTO_SNAPSHOTS = 258925689 @@ -125531,12 +125914,12 @@ class ResourcePolicyWeeklyCycle(proto.Message): of the week. """ - day_of_weeks: MutableSequence[ - "ResourcePolicyWeeklyCycleDayOfWeek" - ] = proto.RepeatedField( - proto.MESSAGE, - number=257871834, - message="ResourcePolicyWeeklyCycleDayOfWeek", + day_of_weeks: MutableSequence["ResourcePolicyWeeklyCycleDayOfWeek"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=257871834, + message="ResourcePolicyWeeklyCycleDayOfWeek", + ) ) @@ -125596,6 +125979,7 @@ class Day(proto.Enum): WEDNESDAY (422029110): No description available. """ + UNDEFINED_DAY = 0 FRIDAY = 471398751 INVALID = 530283991 @@ -125671,6 +126055,7 @@ class AcceleratorTopologyMode(proto.Enum): demand. At the time of VM creation, the chips are not connected. """ + UNDEFINED_ACCELERATOR_TOPOLOGY_MODE = 0 AUTO_CONNECT = 491872826 PROVISION_ONLY = 399134966 @@ -125689,6 +126074,7 @@ class MaxTopologyDistance(proto.Enum): SUBBLOCK (316202573): VMs must be provisioned in the same subblock. """ + UNDEFINED_MAX_TOPOLOGY_DISTANCE = 0 BLOCK = 63294573 CLUSTER = 516333018 @@ -125708,6 +126094,7 @@ class Type(proto.Enum): MIG provisions instances as close to each other as possible for high throughput. """ + UNDEFINED_TYPE = 0 HIGH_AVAILABILITY = 409487576 HIGH_THROUGHPUT = 146499815 @@ -126075,6 +126462,7 @@ class StopState(proto.Enum): STOPPING (350791796): The instance is stopping. """ + UNDEFINED_STOP_STATE = 0 PENDING_STOP = 362509770 STOPPING = 350791796 @@ -126091,6 +126479,7 @@ class TargetState(proto.Enum): STOPPED (444276141): The instance will be stopped. """ + UNDEFINED_TARGET_STATE = 0 DELETED = 120962041 STOPPED = 444276141 @@ -126460,6 +126849,7 @@ class State(proto.Enum): WAVE_FAILED (195452995): The product failed to process the wave. """ + UNDEFINED_STATE = 0 CANCELLED = 41957681 CANCELLING = 226950512 @@ -126640,6 +127030,7 @@ class LocationScope(proto.Enum): ZONAL (85547428): Zonal scope. """ + UNDEFINED_LOCATION_SCOPE = 0 LOCATION_SCOPE_UNSPECIFIED = 416410498 REGIONAL = 92288543 @@ -126781,12 +127172,12 @@ class RolloutPlanWaveOrchestrationOptions(proto.Message): This field is a member of `oneof`_ ``_max_concurrent_resources_per_location``. """ - delays: MutableSequence[ - "RolloutPlanWaveOrchestrationOptionsDelay" - ] = proto.RepeatedField( - proto.MESSAGE, - number=275150672, - message="RolloutPlanWaveOrchestrationOptionsDelay", + delays: MutableSequence["RolloutPlanWaveOrchestrationOptionsDelay"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=275150672, + message="RolloutPlanWaveOrchestrationOptionsDelay", + ) ) max_concurrent_locations: int = proto.Field( proto.INT64, @@ -126861,6 +127252,7 @@ class Delimiter(proto.Enum): batch as soon as the previous batch of LROs is done. """ + UNDEFINED_DELIMITER = 0 DELIMITER_BATCH = 253390530 DELIMITER_LOCATION = 189398797 @@ -126891,6 +127283,7 @@ class Type(proto.Enum): batch as soon as the previous batch of LROs is done. """ + UNDEFINED_TYPE = 0 TYPE_MINIMUM = 234909673 TYPE_OFFSET = 165747000 @@ -127662,6 +128055,7 @@ class NextHopOrigin(proto.Enum): INCOMPLETE (11941214): No description available. """ + UNDEFINED_NEXT_HOP_ORIGIN = 0 EGP = 68590 IGP = 72434 @@ -127690,6 +128084,7 @@ class RouteStatus(proto.Enum): This route is being processed internally. The status will change once processed. """ + UNDEFINED_ROUTE_STATUS = 0 ACTIVE = 314733318 DROPPED = 496235424 @@ -127719,6 +128114,7 @@ class RouteType(proto.Enum): TRANSIT (187793843): No description available. """ + UNDEFINED_ROUTE_TYPE = 0 BGP = 65707 STATIC = 308331118 @@ -127915,6 +128311,7 @@ class PathSegmentType(proto.Enum): AS_SET (329846453): No description available. """ + UNDEFINED_PATH_SEGMENT_TYPE = 0 AS_CONFED_SEQUENCE = 222152624 AS_CONFED_SET = 374040307 @@ -128089,6 +128486,7 @@ class Type(proto.Enum): ROUTE_POLICY_TYPE_IMPORT (397444755): The Route Policy is an Import Policy. """ + UNDEFINED_TYPE = 0 ROUTE_POLICY_TYPE_EXPORT = 293086882 ROUTE_POLICY_TYPE_IMPORT = 397444755 @@ -128304,12 +128702,12 @@ class Router(proto.Message): number=3292052, optional=True, ) - md5_authentication_keys: MutableSequence[ - "RouterMd5AuthenticationKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=71063322, - message="RouterMd5AuthenticationKey", + md5_authentication_keys: MutableSequence["RouterMd5AuthenticationKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=71063322, + message="RouterMd5AuthenticationKey", + ) ) name: str = proto.Field( proto.STRING, @@ -128540,6 +128938,7 @@ class AdvertiseMode(proto.Enum): DEFAULT (115302945): No description available. """ + UNDEFINED_ADVERTISE_MODE = 0 CUSTOM = 388595569 DEFAULT = 115302945 @@ -128555,6 +128954,7 @@ class AdvertisedGroups(proto.Enum): Advertise all available subnets (including peer VPC subnets). """ + UNDEFINED_ADVERTISED_GROUPS = 0 ALL_SUBNETS = 3622872 @@ -128567,12 +128967,12 @@ class AdvertisedGroups(proto.Enum): proto.STRING, number=21065526, ) - advertised_ip_ranges: MutableSequence[ - "RouterAdvertisedIpRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=35449932, - message="RouterAdvertisedIpRange", + advertised_ip_ranges: MutableSequence["RouterAdvertisedIpRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=35449932, + message="RouterAdvertisedIpRange", + ) ) asn: int = proto.Field( proto.UINT32, @@ -128781,6 +129181,7 @@ class AdvertiseMode(proto.Enum): DEFAULT (115302945): No description available. """ + UNDEFINED_ADVERTISE_MODE = 0 CUSTOM = 388595569 DEFAULT = 115302945 @@ -128796,6 +129197,7 @@ class AdvertisedGroups(proto.Enum): Advertise all available subnets (including peer VPC subnets). """ + UNDEFINED_ADVERTISED_GROUPS = 0 ALL_SUBNETS = 3622872 @@ -128816,6 +129218,7 @@ class Enable(proto.Enum): TRUE (2583950): No description available. """ + UNDEFINED_ENABLE = 0 FALSE = 66658563 TRUE = 2583950 @@ -128853,6 +129256,7 @@ class ManagementType(proto.Enum): Default value, the BGP peer is manually created and managed by user. """ + UNDEFINED_MANAGEMENT_TYPE = 0 MANAGED_BY_ATTACHMENT = 458926411 MANAGED_BY_USER = 317294067 @@ -128866,12 +129270,12 @@ class ManagementType(proto.Enum): proto.STRING, number=21065526, ) - advertised_ip_ranges: MutableSequence[ - "RouterAdvertisedIpRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=35449932, - message="RouterAdvertisedIpRange", + advertised_ip_ranges: MutableSequence["RouterAdvertisedIpRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=35449932, + message="RouterAdvertisedIpRange", + ) ) advertised_route_priority: int = proto.Field( proto.UINT32, @@ -128884,12 +129288,12 @@ class ManagementType(proto.Enum): optional=True, message="RouterBgpPeerBfd", ) - custom_learned_ip_ranges: MutableSequence[ - "RouterBgpPeerCustomLearnedIpRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=481363012, - message="RouterBgpPeerCustomLearnedIpRange", + custom_learned_ip_ranges: MutableSequence["RouterBgpPeerCustomLearnedIpRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=481363012, + message="RouterBgpPeerCustomLearnedIpRange", + ) ) custom_learned_route_priority: int = proto.Field( proto.INT32, @@ -129062,6 +129466,7 @@ class SessionInitializationMode(proto.Enum): PASSIVE (462813959): No description available. """ + UNDEFINED_SESSION_INITIALIZATION_MODE = 0 ACTIVE = 314733318 DISABLED = 516696700 @@ -129236,6 +129641,7 @@ class IpVersion(proto.Enum): IPV6 (2254343): No description available. """ + UNDEFINED_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -129271,6 +129677,7 @@ class ManagementType(proto.Enum): Default value, the interface is manually created and managed by user. """ + UNDEFINED_MANAGEMENT_TYPE = 0 MANAGED_BY_ATTACHMENT = 458926411 MANAGED_BY_USER = 317294067 @@ -129658,6 +130065,7 @@ class AutoNetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_AUTO_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -129682,6 +130090,7 @@ class EndpointTypes(proto.Enum): ENDPOINT_TYPE_VM (57095474): This is the default. """ + UNDEFINED_ENDPOINT_TYPES = 0 ENDPOINT_TYPE_MANAGED_PROXY_LB = 439196930 ENDPOINT_TYPE_SWG = 159344456 @@ -129712,6 +130121,7 @@ class NatIpAllocateOption(proto.Enum): specified Nat IPs are not enough then the Nat service fails for new VMs. """ + UNDEFINED_NAT_IP_ALLOCATE_OPTION = 0 AUTO_ONLY = 182333500 MANUAL_ONLY = 261251205 @@ -129747,6 +130157,7 @@ class SourceSubnetworkIpRangesToNat(proto.Enum): A list of Subnetworks are allowed to Nat (specified in the field subnetwork below) """ + UNDEFINED_SOURCE_SUBNETWORK_IP_RANGES_TO_NAT = 0 ALL_SUBNETWORKS_ALL_IP_RANGES = 179964376 ALL_SUBNETWORKS_ALL_PRIMARY_IP_RANGES = 185573819 @@ -129783,6 +130194,7 @@ class SourceSubnetworkIpRangesToNat64(proto.Enum): If this option is used, the nat64_subnetworks field must be specified. """ + UNDEFINED_SOURCE_SUBNETWORK_IP_RANGES_TO_NAT64 = 0 ALL_IPV6_SUBNETWORKS = 341632747 LIST_OF_IPV6_SUBNETWORKS = 521079860 @@ -129801,6 +130213,7 @@ class Type(proto.Enum): NAT used for public IP translation. This is the default. """ + UNDEFINED_TYPE = 0 PRIVATE = 403485027 PUBLIC = 223389289 @@ -129854,12 +130267,12 @@ class Type(proto.Enum): number=3373707, optional=True, ) - nat64_subnetworks: MutableSequence[ - "RouterNatSubnetworkToNat64" - ] = proto.RepeatedField( - proto.MESSAGE, - number=63585701, - message="RouterNatSubnetworkToNat64", + nat64_subnetworks: MutableSequence["RouterNatSubnetworkToNat64"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=63585701, + message="RouterNatSubnetworkToNat64", + ) ) nat_ip_allocate_option: str = proto.Field( proto.STRING, @@ -129972,6 +130385,7 @@ class Filter(proto.Enum): TRANSLATIONS_ONLY (357212649): Export logs for successful connections only. """ + UNDEFINED_FILTER = 0 ALL = 64897 ERRORS_ONLY = 307484672 @@ -130143,6 +130557,7 @@ class SourceIpRangesToNat(proto.Enum): PRIMARY_IP_RANGE (297109954): The primary range is allowed to Nat. """ + UNDEFINED_SOURCE_IP_RANGES_TO_NAT = 0 ALL_IP_RANGES = 35608496 LIST_OF_SECONDARY_IP_RANGES = 192289308 @@ -130416,6 +130831,7 @@ class Status(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATUS = 0 DOWN = 2104482 UNKNOWN = 433141802 @@ -130442,6 +130858,7 @@ class StatusReason(proto.Enum): STATUS_REASON_UNSPECIFIED (394331913): No description available. """ + UNDEFINED_STATUS_REASON = 0 IPV4_PEER_ON_IPV6_ONLY_CONNECTION = 435936662 IPV6_PEER_ON_IPV4_ONLY_CONNECTION = 436304082 @@ -130621,12 +131038,12 @@ class RouterStatusNatStatus(proto.Message): number=512367468, optional=True, ) - rule_status: MutableSequence[ - "RouterStatusNatStatusNatRuleStatus" - ] = proto.RepeatedField( - proto.MESSAGE, - number=140223125, - message="RouterStatusNatStatusNatRuleStatus", + rule_status: MutableSequence["RouterStatusNatStatusNatRuleStatus"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=140223125, + message="RouterStatusNatStatusNatRuleStatus", + ) ) user_allocated_nat_ip_resources: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -131082,6 +131499,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -131100,6 +131518,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -131250,6 +131669,7 @@ class Interface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -131271,6 +131691,7 @@ class Mode(proto.Enum): virtual machine at a time can be attached to a disk in read-write mode. """ + UNDEFINED_MODE = 0 READ_ONLY = 91950261 READ_WRITE = 173607894 @@ -131291,6 +131712,7 @@ class StorageBytesStatus(proto.Enum): UP_TO_DATE (101306702): No description available. """ + UNDEFINED_STORAGE_BYTES_STATUS = 0 UPDATING = 494614342 UP_TO_DATE = 101306702 @@ -131308,6 +131730,7 @@ class Type(proto.Enum): SCRATCH (496778970): No description available. """ + UNDEFINED_TYPE = 0 PERSISTENT = 460683927 SCRATCH = 496778970 @@ -131448,6 +131871,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -131469,6 +131893,7 @@ class StorageBytesStatus(proto.Enum): UP_TO_DATE (101306702): No description available. """ + UNDEFINED_STORAGE_BYTES_STATUS = 0 UPDATING = 494614342 UP_TO_DATE = 101306702 @@ -131547,6 +131972,7 @@ class State(proto.Enum): The current autoscaling recommendation is not influenced by this scaling schedule. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DISABLED = 516696700 @@ -131718,6 +132144,7 @@ class InstanceTerminationAction(proto.Enum): Stop the VM without storing in-memory content. default action. """ + UNDEFINED_INSTANCE_TERMINATION_ACTION = 0 DELETE = 402225579 INSTANCE_TERMINATION_ACTION_UNSPECIFIED = 92954803 @@ -131755,6 +132182,7 @@ class MaintenanceInterval(proto.Enum): available. RECURRENT is used for GEN3 and Slice of Hardware VMs. """ + UNDEFINED_MAINTENANCE_INTERVAL = 0 AS_NEEDED = 500724834 PERIODIC = 142804635 @@ -131785,6 +132213,7 @@ class OnHostMaintenance(proto.Enum): restarted outside the window of maintenance events. """ + UNDEFINED_ON_HOST_MAINTENANCE = 0 MIGRATE = 165699979 TERMINATE = 527617601 @@ -131808,6 +132237,7 @@ class ProvisioningModel(proto.Enum): Standard provisioning with user controlled runtime, no discounts. """ + UNDEFINED_PROVISIONING_MODEL = 0 FLEX_START = 101746812 RESERVATION_BOUND = 293538571 @@ -131983,6 +132413,7 @@ class Operator(proto.Enum): OPERATOR_UNSPECIFIED (128892924): No description available. """ + UNDEFINED_OPERATOR = 0 IN = 2341 NOT_IN = 161144369 @@ -132457,6 +132888,7 @@ class Type(proto.Enum): FIREWALL (219901184): No description available. """ + UNDEFINED_TYPE = 0 CLOUD_ARMOR = 260640373 CLOUD_ARMOR_EDGE = 250728775 @@ -132578,12 +133010,12 @@ class Type(proto.Enum): number=3575610, optional=True, ) - user_defined_fields: MutableSequence[ - "SecurityPolicyUserDefinedField" - ] = proto.RepeatedField( - proto.MESSAGE, - number=28312739, - message="SecurityPolicyUserDefinedField", + user_defined_fields: MutableSequence["SecurityPolicyUserDefinedField"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=28312739, + message="SecurityPolicyUserDefinedField", + ) ) @@ -132706,6 +133138,7 @@ class RuleVisibility(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_RULE_VISIBILITY = 0 PREMIUM = 399530551 STANDARD = 484642493 @@ -132862,6 +133295,7 @@ class Type(proto.Enum): UNSPECIFIED_TYPE (53933922): No description available. """ + UNDEFINED_TYPE = 0 HTTP_HEADER_HOST = 374321891 HTTP_PATH = 311503228 @@ -132932,6 +133366,7 @@ class JsonParsing(proto.Enum): STANDARD_WITH_GRAPHQL (106979218): No description available. """ + UNDEFINED_JSON_PARSING = 0 DISABLED = 516696700 STANDARD = 484642493 @@ -132949,6 +133384,7 @@ class LogLevel(proto.Enum): VERBOSE (532219234): No description available. """ + UNDEFINED_LOG_LEVEL = 0 NORMAL = 161067239 VERBOSE = 532219234 @@ -133135,6 +133571,7 @@ class DdosAdaptiveProtection(proto.Enum): PREVIEW (399798184): No description available. """ + UNDEFINED_DDOS_ADAPTIVE_PROTECTION = 0 DISABLED = 516696700 ENABLED = 182130465 @@ -133154,6 +133591,7 @@ class DdosProtection(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_DDOS_PROTECTION = 0 ADVANCED = 63789090 ADVANCED_PREVIEW = 40905867 @@ -133482,6 +133920,7 @@ class Direction(proto.Enum): INGRESS (516931221): No description available. """ + UNDEFINED_DIRECTION = 0 EGRESS = 432880501 INGRESS = 516931221 @@ -133683,6 +134122,7 @@ class VersionedExpr(proto.Enum): Matches the source IP address of a request to the IP ranges supplied in config. """ + UNDEFINED_VERSIONED_EXPR = 0 FIREWALL = 219901184 SRC_IPS_V1 = 70925961 @@ -133735,12 +134175,12 @@ class SecurityPolicyRuleMatcherConfig(proto.Message): proto.STRING, number=337357713, ) - layer4_configs: MutableSequence[ - "SecurityPolicyRuleMatcherConfigLayer4Config" - ] = proto.RepeatedField( - proto.MESSAGE, - number=373534261, - message="SecurityPolicyRuleMatcherConfigLayer4Config", + layer4_configs: MutableSequence["SecurityPolicyRuleMatcherConfigLayer4Config"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=373534261, + message="SecurityPolicyRuleMatcherConfigLayer4Config", + ) ) src_ip_ranges: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -133952,12 +134392,12 @@ class SecurityPolicyRulePreconfiguredWafConfig(proto.Message): preconfigured WAF evaluation. """ - exclusions: MutableSequence[ - "SecurityPolicyRulePreconfiguredWafConfigExclusion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=208665701, - message="SecurityPolicyRulePreconfiguredWafConfigExclusion", + exclusions: MutableSequence["SecurityPolicyRulePreconfiguredWafConfigExclusion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=208665701, + message="SecurityPolicyRulePreconfiguredWafConfigExclusion", + ) ) @@ -134090,6 +134530,7 @@ class Op(proto.Enum): The operator matches if the field value starts with the specified value. """ + UNDEFINED_OP = 0 CONTAINS = 215180831 ENDS_WITH = 490402221 @@ -134298,6 +134739,7 @@ class EnforceOnKey(proto.Enum): XFF_IP (438707118): No description available. """ + UNDEFINED_ENFORCE_ON_KEY = 0 ALL = 64897 ALL_IPS = 343973966 @@ -134498,6 +134940,7 @@ class EnforceOnKeyType(proto.Enum): XFF_IP (438707118): No description available. """ + UNDEFINED_ENFORCE_ON_KEY_TYPE = 0 ALL = 64897 ALL_IPS = 343973966 @@ -134600,6 +135043,7 @@ class Type(proto.Enum): GOOGLE_RECAPTCHA (518803009): No description available. """ + UNDEFINED_TYPE = 0 EXTERNAL_302 = 395733761 GOOGLE_RECAPTCHA = 518803009 @@ -134698,6 +135142,7 @@ class Base(proto.Enum): UDP (83873): No description available. """ + UNDEFINED_BASE = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -134933,6 +135378,7 @@ class Type(proto.Enum): SERVER_BINDING_TYPE_UNSPECIFIED (180825512): No description available. """ + UNDEFINED_TYPE = 0 RESTART_NODE_ON_ANY_SERVER = 502950985 RESTART_NODE_ON_MINIMAL_SERVERS = 204166495 @@ -135184,29 +135630,30 @@ class ConnectionPreference(proto.Enum): CONNECTION_PREFERENCE_UNSPECIFIED (34590772): No description available. """ + UNDEFINED_CONNECTION_PREFERENCE = 0 ACCEPT_AUTOMATIC = 75250580 ACCEPT_MANUAL = 373061341 CONNECTION_PREFERENCE_UNSPECIFIED = 34590772 - connected_endpoints: MutableSequence[ - "ServiceAttachmentConnectedEndpoint" - ] = proto.RepeatedField( - proto.MESSAGE, - number=72223688, - message="ServiceAttachmentConnectedEndpoint", + connected_endpoints: MutableSequence["ServiceAttachmentConnectedEndpoint"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=72223688, + message="ServiceAttachmentConnectedEndpoint", + ) ) connection_preference: str = proto.Field( proto.STRING, number=285818076, optional=True, ) - consumer_accept_lists: MutableSequence[ - "ServiceAttachmentConsumerProjectLimit" - ] = proto.RepeatedField( - proto.MESSAGE, - number=402725703, - message="ServiceAttachmentConsumerProjectLimit", + consumer_accept_lists: MutableSequence["ServiceAttachmentConsumerProjectLimit"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=402725703, + message="ServiceAttachmentConsumerProjectLimit", + ) ) consumer_reject_lists: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -135455,6 +135902,7 @@ class Status(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -135661,6 +136109,7 @@ class EncapsulationProfile(proto.Enum): UNSPECIFIED_ENCAPSULATION_PROFILE (368782710): No description available. """ + UNDEFINED_ENCAPSULATION_PROFILE = 0 GENEVE_SECURITY_V1 = 374039743 UNSPECIFIED_ENCAPSULATION_PROFILE = 368782710 @@ -135682,6 +136131,7 @@ class RoutingMode(proto.Enum): UNSPECIFIED_ROUTING_MODE (126139844): No description available. """ + UNDEFINED_ROUTING_MODE = 0 PACKET_INJECTION = 321485248 STANDARD_ROUTING = 141399332 @@ -136297,6 +136747,7 @@ class State(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_STATE = 0 ABANDONED = 81797556 DONE = 2104194 @@ -141191,6 +141642,7 @@ class ShareType(proto.Enum): Shared-reservation is open to specific projects """ + UNDEFINED_SHARE_TYPE = 0 LOCAL = 72607563 ORGANIZATION = 274978099 @@ -141992,6 +142444,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -142009,6 +142462,7 @@ class SnapshotType(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_SNAPSHOT_TYPE = 0 ARCHIVE = 506752162 STANDARD = 484642493 @@ -142032,6 +142486,7 @@ class Status(proto.Enum): UPLOADING (267603489): Snapshot is being uploaded. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -142055,6 +142510,7 @@ class StorageBytesStatus(proto.Enum): UP_TO_DATE (101306702): No description available. """ + UNDEFINED_STORAGE_BYTES_STATUS = 0 UPDATING = 494614342 UP_TO_DATE = 101306702 @@ -142515,6 +142971,7 @@ class Policy(proto.Enum): Only allowlisted regions will be able to restore region scoped snapshots """ + UNDEFINED_POLICY = 0 ALL_REGIONS = 273143585 POLICY_UNSPECIFIED = 197974922 @@ -142596,6 +143053,7 @@ class Policy(proto.Enum): STORAGE_LOCATION_POLICY_UNSPECIFIED (250644592): No description available. """ + UNDEFINED_POLICY = 0 LOCAL_REGION = 403535464 NEAREST_MULTI_REGION = 212467515 @@ -142852,6 +143310,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_KEY_REVOCATION_ACTION_TYPE = 0 KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 467110106 NONE = 2402104 @@ -142872,6 +143331,7 @@ class PostKeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_POST_KEY_REVOCATION_ACTION_TYPE = 0 NOOP = 2402146 POST_KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 228738393 @@ -143092,6 +143552,7 @@ class Type(proto.Enum): TYPE_UNSPECIFIED (437714322): No description available. """ + UNDEFINED_TYPE = 0 MANAGED = 479501183 SELF_MANAGED = 434437516 @@ -143384,6 +143845,7 @@ class Status(proto.Enum): managed SslCertificate resource. For details on which domain failed, consult domain_status field. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 MANAGED_CERTIFICATE_STATUS_UNSPECIFIED = 474800850 @@ -143799,6 +144261,7 @@ class MinTlsVersion(proto.Enum): TLS_1_3 (33116737): TLS 1.3 """ + UNDEFINED_MIN_TLS_VERSION = 0 TLS_1_0 = 33116734 TLS_1_1 = 33116735 @@ -143838,6 +144301,7 @@ class Profile(proto.Enum): SSL features, intended to meet stricter compliance requirements. """ + UNDEFINED_PROFILE = 0 COMPATIBLE = 179357396 CUSTOM = 388595569 @@ -144349,29 +144813,29 @@ class StatefulPolicyPreservedState(proto.Message): network interface name. """ - disks: MutableMapping[ - str, "StatefulPolicyPreservedStateDiskDevice" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=95594102, - message="StatefulPolicyPreservedStateDiskDevice", + disks: MutableMapping[str, "StatefulPolicyPreservedStateDiskDevice"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=95594102, + message="StatefulPolicyPreservedStateDiskDevice", + ) ) - external_i_ps: MutableMapping[ - str, "StatefulPolicyPreservedStateNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=532687245, - message="StatefulPolicyPreservedStateNetworkIp", + external_i_ps: MutableMapping[str, "StatefulPolicyPreservedStateNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=532687245, + message="StatefulPolicyPreservedStateNetworkIp", + ) ) - internal_i_ps: MutableMapping[ - str, "StatefulPolicyPreservedStateNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=215731675, - message="StatefulPolicyPreservedStateNetworkIp", + internal_i_ps: MutableMapping[str, "StatefulPolicyPreservedStateNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=215731675, + message="StatefulPolicyPreservedStateNetworkIp", + ) ) @@ -144410,6 +144874,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -144457,6 +144922,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -145122,6 +145588,7 @@ class CapacityProvisioningType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_CAPACITY_PROVISIONING_TYPE = 0 class PerformanceProvisioningType(proto.Enum): @@ -145139,6 +145606,7 @@ class PerformanceProvisioningType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_PERFORMANCE_PROVISIONING_TYPE = 0 class State(proto.Enum): @@ -145165,6 +145633,7 @@ class State(proto.Enum): READY (77848963): StoragePool is ready for use. """ + UNDEFINED_STATE = 0 CREATING = 455564985 DELETING = 528602024 @@ -145450,6 +145919,7 @@ class Status(proto.Enum): Disk is currently unavailable and cannot be accessed, attached or detached. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -146622,6 +147092,7 @@ class Ipv6AccessType(proto.Enum): UNSPECIFIED_IPV6_ACCESS_TYPE (313080613): No description available. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -146650,6 +147121,7 @@ class Ipv6GceEndpoint(proto.Enum): VM_ONLY (236773428): No description available. """ + UNDEFINED_IPV6_GCE_ENDPOINT = 0 VM_AND_FR = 41830108 VM_ONLY = 236773428 @@ -146674,6 +147146,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): Outbound private IPv6 access from VMs in this subnet to Google services. """ + UNDEFINED_PRIVATE_IPV6_GOOGLE_ACCESS = 0 DISABLE_GOOGLE_ACCESS = 450958579 ENABLE_BIDIRECTIONAL_ACCESS_TO_GOOGLE = 427975994 @@ -146713,6 +147186,7 @@ class Purpose(proto.Enum): Subnetwork used for Regional Envoy-based Load Balancing. """ + UNDEFINED_PURPOSE = 0 GLOBAL_MANAGED_PROXY = 236463602 INTERNAL_HTTPS_LOAD_BALANCER = 248748889 @@ -146737,6 +147211,7 @@ class ResolveSubnetMask(proto.Enum): Only the primary range of the VM NIC will respond to ARP. """ + UNDEFINED_RESOLVE_SUBNET_MASK = 0 ARP_ALL_RANGES = 445655380 ARP_PRIMARY_RANGE = 120210048 @@ -146760,6 +147235,7 @@ class Role(proto.Enum): The BACKUP subnet that could be promoted to ACTIVE. """ + UNDEFINED_ROLE = 0 ACTIVE = 314733318 BACKUP = 341010882 @@ -146789,6 +147265,7 @@ class StackType(proto.Enum): UNSPECIFIED_STACK_TYPE (298084569): No description available. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -146813,6 +147290,7 @@ class State(proto.Enum): READY (77848963): Subnetwork is ready for use. """ + UNDEFINED_STATE = 0 DRAINING = 480455402 READY = 77848963 @@ -146949,12 +147427,12 @@ class State(proto.Enum): number=3506294, optional=True, ) - secondary_ip_ranges: MutableSequence[ - "SubnetworkSecondaryRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=136658915, - message="SubnetworkSecondaryRange", + secondary_ip_ranges: MutableSequence["SubnetworkSecondaryRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=136658915, + message="SubnetworkSecondaryRange", + ) ) self_link: str = proto.Field( proto.STRING, @@ -147225,6 +147703,7 @@ class AggregationInterval(proto.Enum): INTERVAL_5_SEC (72752429): No description available. """ + UNDEFINED_AGGREGATION_INTERVAL = 0 INTERVAL_10_MIN = 487155916 INTERVAL_15_MIN = 491773521 @@ -147250,6 +147729,7 @@ class Metadata(proto.Enum): INCLUDE_ALL_METADATA (164619908): No description available. """ + UNDEFINED_METADATA = 0 CUSTOM_METADATA = 62450749 EXCLUDE_ALL_METADATA = 334519954 @@ -147658,6 +148138,7 @@ class Policy(proto.Enum): substantial imbalance in the count of clients and backends. """ + UNDEFINED_POLICY = 0 CONSISTENT_HASH_SUBSETTING = 108989492 NONE = 2402104 @@ -148039,6 +148520,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -148057,6 +148539,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -148817,6 +149300,7 @@ class QuicOverride(proto.Enum): option is implicit if no QUIC override has been specified in the request. """ + UNDEFINED_QUIC_OVERRIDE = 0 DISABLE = 241807048 ENABLE = 438835587 @@ -149164,6 +149648,7 @@ class QuicOverride(proto.Enum): option is implicit if no QUIC override has been specified in the request. """ + UNDEFINED_QUIC_OVERRIDE = 0 DISABLE = 241807048 ENABLE = 438835587 @@ -149228,6 +149713,7 @@ class TlsEarlyData(proto.Enum): security stance and mitigated the risk of replay attacks using other mechanisms. """ + UNDEFINED_TLS_EARLY_DATA = 0 DISABLED = 516696700 PERMISSIVE = 504345247 @@ -149604,6 +150090,7 @@ class NatPolicy(proto.Enum): NO_NAT (161455491): No NAT performed. """ + UNDEFINED_NAT_POLICY = 0 NO_NAT = 161455491 @@ -150034,6 +150521,7 @@ class SessionAffinity(proto.Enum): same backend VM while that VM remains healthy, as long as the cookie has not expired. """ + UNDEFINED_SESSION_AFFINITY = 0 CLIENT_IP = 345665051 CLIENT_IP_NO_DESTINATION = 106122516 @@ -150491,6 +150979,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -150618,6 +151107,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -150828,6 +151318,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -150944,6 +151435,7 @@ class LoadBalancingScheme(proto.Enum): INTERNAL_MANAGED (37350397): No description available. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -150962,6 +151454,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -151295,6 +151788,7 @@ class Status(proto.Enum): READY (77848963): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -154311,6 +154805,7 @@ class MaintenanceReasons(proto.Enum): Maintenance due to planned update to the instance. """ + UNDEFINED_MAINTENANCE_REASONS = 0 FAILURE_DISK = 8573778 FAILURE_GPU = 467876919 @@ -154345,6 +154840,7 @@ class MaintenanceStatus(proto.Enum): Unknown maintenance status. Do not use this value. """ + UNDEFINED_MAINTENANCE_STATUS = 0 ONGOING = 473158491 PENDING = 35394935 @@ -154369,6 +154865,7 @@ class Type(proto.Enum): Unscheduled maintenance (e.g. emergency maintenance during uptime guarantee). """ + UNDEFINED_TYPE = 0 MULTIPLE = 362714640 SCHEDULED = 478400653 @@ -155207,6 +155704,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -155223,6 +155721,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 instance: str = proto.Field( @@ -157466,6 +157965,7 @@ class LoadBalancingSchemes(proto.Enum): inference is not possible, EXTERNAL will be used as the default type. """ + UNDEFINED_LOAD_BALANCING_SCHEMES = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -157664,6 +158164,7 @@ class Ipv6AccessType(proto.Enum): addresses that are only accessible over the VPC network. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -157702,6 +158203,7 @@ class Purpose(proto.Enum): Subnetwork used for Regional Envoy-based Load Balancing. """ + UNDEFINED_PURPOSE = 0 GLOBAL_MANAGED_PROXY = 236463602 INTERNAL_HTTPS_LOAD_BALANCER = 248748889 @@ -157731,6 +158233,7 @@ class Role(proto.Enum): The BACKUP subnet that could be promoted to ACTIVE. """ + UNDEFINED_ROLE = 0 ACTIVE = 314733318 BACKUP = 341010882 @@ -157758,6 +158261,7 @@ class StackType(proto.Enum): New VMs in this subnet will only be assigned IPv6 addresses. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -157798,12 +158302,12 @@ class StackType(proto.Enum): number=3506294, optional=True, ) - secondary_ip_ranges: MutableSequence[ - "UsableSubnetworkSecondaryRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=136658915, - message="UsableSubnetworkSecondaryRange", + secondary_ip_ranges: MutableSequence["UsableSubnetworkSecondaryRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=136658915, + message="UsableSubnetworkSecondaryRange", + ) ) stack_type: str = proto.Field( proto.STRING, @@ -158442,6 +158946,7 @@ class State(proto.Enum): STATE_UNSPECIFIED (470755401): Default value. Do not use. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DELETING = 528602024 @@ -158457,13 +158962,13 @@ class State(proto.Enum): number=422937596, optional=True, ) - extension_policies: MutableMapping[ - str, "VmExtensionPolicyExtensionPolicy" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=227761488, - message="VmExtensionPolicyExtensionPolicy", + extension_policies: MutableMapping[str, "VmExtensionPolicyExtensionPolicy"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=227761488, + message="VmExtensionPolicyExtensionPolicy", + ) ) global_resource_link: str = proto.Field( proto.STRING, @@ -158475,12 +158980,12 @@ class State(proto.Enum): number=3355, optional=True, ) - instance_selectors: MutableSequence[ - "VmExtensionPolicyInstanceSelector" - ] = proto.RepeatedField( - proto.MESSAGE, - number=520298826, - message="VmExtensionPolicyInstanceSelector", + instance_selectors: MutableSequence["VmExtensionPolicyInstanceSelector"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=520298826, + message="VmExtensionPolicyInstanceSelector", + ) ) kind: str = proto.Field( proto.STRING, @@ -158910,6 +159415,7 @@ class GatewayIpVersion(proto.Enum): Every HA-VPN gateway interface is configured with an IPv6 address. """ + UNDEFINED_GATEWAY_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -158932,6 +159438,7 @@ class StackType(proto.Enum): IPV6_ONLY (79632100): Enable VPN gateway with only IPv6 protocol. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -158997,12 +159504,12 @@ class StackType(proto.Enum): number=425908881, optional=True, ) - vpn_interfaces: MutableSequence[ - "VpnGatewayVpnGatewayInterface" - ] = proto.RepeatedField( - proto.MESSAGE, - number=91842181, - message="VpnGatewayVpnGatewayInterface", + vpn_interfaces: MutableSequence["VpnGatewayVpnGatewayInterface"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=91842181, + message="VpnGatewayVpnGatewayInterface", + ) ) @@ -159172,12 +159679,12 @@ class VpnGatewayStatus(proto.Message): VpnGateway. """ - vpn_connections: MutableSequence[ - "VpnGatewayStatusVpnConnection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=439334538, - message="VpnGatewayStatusVpnConnection", + vpn_connections: MutableSequence["VpnGatewayStatusVpnConnection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=439334538, + message="VpnGatewayStatusVpnConnection", + ) ) @@ -159229,6 +159736,7 @@ class State(proto.Enum): redundancy from the Cloud VPN gateway to the peer gateway """ + UNDEFINED_STATE = 0 CONNECTION_REDUNDANCY_MET = 505242907 CONNECTION_REDUNDANCY_NOT_MET = 511863311 @@ -159245,6 +159753,7 @@ class UnsatisfiedReason(proto.Enum): INCOMPLETE_TUNNELS_COVERAGE (55917437): No description available. """ + UNDEFINED_UNSATISFIED_REASON = 0 INCOMPLETE_TUNNELS_COVERAGE = 55917437 @@ -159708,6 +160217,7 @@ class CapacityTier(proto.Enum): HIGH: A VPN tunnel which can support up to 6 Gbps. """ + UNDEFINED_CAPACITY_TIER = 0 DEFAULT = 115302945 HIGH = 2217378 @@ -159789,6 +160299,7 @@ class Status(proto.Enum): ForwardingRule and Route resources are needed to setup VPN tunnel. """ + UNDEFINED_STATUS = 0 ALLOCATING_RESOURCES = 320922816 AUTHORIZATION_ERROR = 23580290 @@ -160493,6 +161004,7 @@ class Code(proto.Enum): UNREACHABLE (13328052): A given scope cannot be reached. """ + UNDEFINED_CODE = 0 CLEANUP_FAILED = 150308440 DEPRECATED_RESOURCE_USED = 391835586 @@ -160666,6 +161178,7 @@ class Code(proto.Enum): UNREACHABLE (13328052): A given scope cannot be reached. """ + UNDEFINED_CODE = 0 CLEANUP_FAILED = 150308440 DEPRECATED_RESOURCE_USED = 391835586 @@ -161044,13 +161557,13 @@ class WireGroupEndpoint(proto.Message): - Value: an Interconnect object. """ - interconnects: MutableMapping[ - str, "WireGroupEndpointInterconnect" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=520187301, - message="WireGroupEndpointInterconnect", + interconnects: MutableMapping[str, "WireGroupEndpointInterconnect"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=520187301, + message="WireGroupEndpointInterconnect", + ) ) @@ -161281,6 +161794,7 @@ class Type(proto.Enum): A single pseudowire over two Interconnect connections with no redundancy. """ + UNDEFINED_TYPE = 0 BOX_AND_CROSS = 311344644 REDUNDANT = 3891405 @@ -161416,6 +161930,7 @@ class BandwidthAllocation(proto.Enum): bandwidth from unused or underused wires to other wires in the group. """ + UNDEFINED_BANDWIDTH_ALLOCATION = 0 ALLOCATE_PER_WIRE = 358730057 SHARED_WITH_WIRE_GROUP = 286454628 @@ -161441,6 +161956,7 @@ class FaultResponse(proto.Enum): NONE (2402104): Default. """ + UNDEFINED_FAULT_RESPONSE = 0 DISABLE_PORT = 287086488 NONE = 2402104 @@ -161682,6 +162198,7 @@ class Type(proto.Enum): XPN_RESOURCE_TYPE_UNSPECIFIED (151607034): No description available. """ + UNDEFINED_TYPE = 0 PROJECT = 408671993 XPN_RESOURCE_TYPE_UNSPECIFIED = 151607034 @@ -161771,6 +162288,7 @@ class Status(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATUS = 0 DOWN = 2104482 UP = 2715 diff --git a/packages/google-cloud-compute-v1beta/noxfile.py b/packages/google-cloud-compute-v1beta/noxfile.py index 61015edd1168..3cc7b00cae9b 100644 --- a/packages/google-cloud-compute-v1beta/noxfile.py +++ b/packages/google-cloud-compute-v1beta/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-compute-v1beta/samples/generated_samples/compute_v1beta_generated_organization_security_policies_list_preconfigured_expression_sets_sync.py b/packages/google-cloud-compute-v1beta/samples/generated_samples/compute_v1beta_generated_organization_security_policies_list_preconfigured_expression_sets_sync.py index f2e65cc5958a..e674c39dd2ab 100644 --- a/packages/google-cloud-compute-v1beta/samples/generated_samples/compute_v1beta_generated_organization_security_policies_list_preconfigured_expression_sets_sync.py +++ b/packages/google-cloud-compute-v1beta/samples/generated_samples/compute_v1beta_generated_organization_security_policies_list_preconfigured_expression_sets_sync.py @@ -39,9 +39,7 @@ def sample_list_preconfigured_expression_sets(): client = compute_v1beta.OrganizationSecurityPoliciesClient() # Initialize request argument(s) - request = ( - compute_v1beta.ListPreconfiguredExpressionSetsOrganizationSecurityPoliciesRequest() - ) + request = compute_v1beta.ListPreconfiguredExpressionSetsOrganizationSecurityPoliciesRequest() # Make the request response = client.list_preconfigured_expression_sets(request=request) diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_accelerator_types.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_accelerator_types.py index fee2f79912bd..0d5de7b7bf90 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_accelerator_types.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_accelerator_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_accelerator_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_accelerator_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_accelerator_types_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2002,8 +2004,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2074,17 +2077,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = AcceleratorTypesClient(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.AcceleratorTypesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.AcceleratorTypesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AcceleratorTypesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2144,8 +2150,9 @@ def test_get_rest_bad_request(request_type=compute.GetAcceleratorTypeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2226,17 +2233,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = AcceleratorTypesClient(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.AcceleratorTypesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.AcceleratorTypesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AcceleratorTypesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AcceleratorTypesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2287,8 +2294,9 @@ def test_list_rest_bad_request(request_type=compute.ListAcceleratorTypesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2357,17 +2365,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = AcceleratorTypesClient(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.AcceleratorTypesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.AcceleratorTypesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AcceleratorTypesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2522,11 +2532,14 @@ def test_accelerator_types_base_transport(): def test_accelerator_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.accelerator_types.transports.AcceleratorTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.accelerator_types.transports.AcceleratorTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AcceleratorTypesTransport( @@ -2547,9 +2560,12 @@ def test_accelerator_types_base_transport_with_credentials_file(): def test_accelerator_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.accelerator_types.transports.AcceleratorTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.accelerator_types.transports.AcceleratorTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AcceleratorTypesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_addresses.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_addresses.py index 541d940f8836..970f6e85e16e 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_addresses.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_addresses.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_addresses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_addresses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_addresses_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3561,9 +3558,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3846,8 +3843,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3916,17 +3914,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AddressesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AddressesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3979,8 +3979,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteAddressRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4083,17 +4084,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AddressesRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AddressesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4142,8 +4141,9 @@ def test_get_rest_bad_request(request_type=compute.GetAddressRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4242,17 +4242,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AddressesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AddressesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4301,8 +4299,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertAddressRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4495,17 +4494,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AddressesRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AddressesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4554,8 +4551,9 @@ def test_list_rest_bad_request(request_type=compute.ListAddressesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4622,17 +4620,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AddressesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AddressesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4681,8 +4677,9 @@ def test_move_rest_bad_request(request_type=compute.MoveAddressRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4867,17 +4864,15 @@ def test_move_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_move" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_move_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_move" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AddressesRestInterceptor, "post_move") as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_move_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AddressesRestInterceptor, "pre_move") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4926,8 +4921,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsAddressReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5109,17 +5105,17 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AddressesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AddressesRestInterceptor, "pre_set_labels") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5172,8 +5168,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5312,17 +5309,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AddressesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.AddressesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AddressesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5584,11 +5584,14 @@ def test_addresses_base_transport(): def test_addresses_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.addresses.transports.AddressesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.addresses.transports.AddressesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AddressesTransport( @@ -5608,9 +5611,12 @@ def test_addresses_base_transport_with_credentials_file(): def test_addresses_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.addresses.transports.AddressesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.addresses.transports.AddressesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AddressesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_advice.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_advice.py index 6d39fc532c00..df90b9a5c179 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_advice.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_advice.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -849,10 +854,9 @@ def test_advice_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -897,10 +901,9 @@ def test_advice_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -936,10 +939,9 @@ def test_advice_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1396,8 +1398,9 @@ def test_calendar_mode_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1535,17 +1538,17 @@ def test_calendar_mode_rest_interceptors(null_interceptor): ) client = AdviceClient(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.AdviceRestInterceptor, "post_calendar_mode" - ) as post, mock.patch.object( - transports.AdviceRestInterceptor, "post_calendar_mode_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AdviceRestInterceptor, "pre_calendar_mode" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdviceRestInterceptor, "post_calendar_mode" + ) as post, + mock.patch.object( + transports.AdviceRestInterceptor, "post_calendar_mode_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AdviceRestInterceptor, "pre_calendar_mode") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1656,11 +1659,14 @@ def test_advice_base_transport(): def test_advice_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.advice.transports.AdviceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.advice.transports.AdviceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AdviceTransport( @@ -1680,9 +1686,12 @@ def test_advice_base_transport_with_credentials_file(): def test_advice_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.advice.transports.AdviceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.advice.transports.AdviceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AdviceTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_autoscalers.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_autoscalers.py index bb7749c60da5..d2b79147e52d 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_autoscalers.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_autoscalers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_autoscalers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_autoscalers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_autoscalers_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3150,9 +3147,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3865,8 +3862,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3937,17 +3935,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoscalersRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4000,8 +4000,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteAutoscalerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4106,17 +4107,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoscalersRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoscalersRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4167,8 +4166,9 @@ def test_get_rest_bad_request(request_type=compute.GetAutoscalerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4251,17 +4251,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoscalersRestInterceptor, "post_get") as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoscalersRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4310,8 +4308,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertAutoscalerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4528,17 +4527,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoscalersRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoscalersRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4589,8 +4586,9 @@ def test_list_rest_bad_request(request_type=compute.ListAutoscalersRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4659,17 +4657,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoscalersRestInterceptor, "post_list") as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoscalersRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4718,8 +4714,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchAutoscalerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4936,17 +4933,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoscalersRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoscalersRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4997,8 +4992,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5139,17 +5135,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutoscalersRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5202,8 +5201,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateAutoscalerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5420,17 +5420,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoscalersRestInterceptor, "post_update") as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoscalersRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5690,11 +5688,14 @@ def test_autoscalers_base_transport(): def test_autoscalers_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.autoscalers.transports.AutoscalersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.autoscalers.transports.AutoscalersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutoscalersTransport( @@ -5714,9 +5715,12 @@ def test_autoscalers_base_transport_with_credentials_file(): def test_autoscalers_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.autoscalers.transports.AutoscalersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.autoscalers.transports.AutoscalersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutoscalersTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_buckets.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_buckets.py index 7a634b2454c8..010d36d21c9e 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_buckets.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_buckets.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -902,10 +902,9 @@ def test_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +949,9 @@ def test_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +987,9 @@ def test_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1171,9 +1168,9 @@ def test_add_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key(request) @@ -1377,9 +1374,9 @@ def test_add_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key_unary(request) @@ -2256,9 +2253,9 @@ def test_delete_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key(request) @@ -2484,9 +2481,9 @@ def test_delete_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key_unary(request) @@ -5041,9 +5038,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5725,8 +5722,9 @@ def test_add_signed_url_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5906,18 +5904,20 @@ def test_add_signed_url_key_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_add_signed_url_key" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, - "post_add_signed_url_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_add_signed_url_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_add_signed_url_key" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_add_signed_url_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_add_signed_url_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5970,8 +5970,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6040,17 +6041,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6106,8 +6110,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteBackendBucketRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6212,17 +6217,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6275,8 +6282,9 @@ def test_delete_signed_url_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6381,18 +6389,20 @@ def test_delete_signed_url_key_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_delete_signed_url_key" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, - "post_delete_signed_url_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_delete_signed_url_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_delete_signed_url_key" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_delete_signed_url_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_delete_signed_url_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6443,8 +6453,9 @@ def test_get_rest_bad_request(request_type=compute.GetBackendBucketRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6531,17 +6542,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.BackendBucketsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BackendBucketsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6594,8 +6603,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6662,17 +6672,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6723,8 +6736,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertBackendBucketRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6946,17 +6960,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7007,8 +7023,9 @@ def test_list_rest_bad_request(request_type=compute.ListBackendBucketsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7077,17 +7094,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BackendBucketsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7140,8 +7157,9 @@ def test_list_usable_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7210,17 +7228,19 @@ def test_list_usable_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_list_usable" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_list_usable_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_list_usable" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_list_usable" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_list_usable_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_list_usable" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7273,8 +7293,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchBackendBucketRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7496,17 +7517,17 @@ def test_patch_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BackendBucketsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7559,8 +7580,9 @@ def test_set_edge_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7743,18 +7765,20 @@ def test_set_edge_security_policy_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_set_edge_security_policy" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, - "post_set_edge_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_set_edge_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_set_edge_security_policy" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_set_edge_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_set_edge_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7807,8 +7831,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7991,17 +8016,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8054,8 +8082,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8196,18 +8225,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8260,8 +8291,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateBackendBucketRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8483,17 +8515,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8885,11 +8919,14 @@ def test_backend_buckets_base_transport(): def test_backend_buckets_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.backend_buckets.transports.BackendBucketsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.backend_buckets.transports.BackendBucketsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackendBucketsTransport( @@ -8909,9 +8946,12 @@ def test_backend_buckets_base_transport_with_credentials_file(): def test_backend_buckets_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.backend_buckets.transports.BackendBucketsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.backend_buckets.transports.BackendBucketsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackendBucketsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_services.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_services.py index 08bacc741518..8e5c42942fa7 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_services.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_backend_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_backend_services_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_backend_services_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_backend_services_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1185,9 +1182,9 @@ def test_add_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key(request) @@ -1391,9 +1388,9 @@ def test_add_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key_unary(request) @@ -2270,9 +2267,9 @@ def test_delete_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key(request) @@ -2498,9 +2495,9 @@ def test_delete_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key_unary(request) @@ -5460,9 +5457,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -5670,9 +5667,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -5880,9 +5877,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6564,8 +6561,9 @@ def test_add_signed_url_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6745,18 +6743,20 @@ def test_add_signed_url_key_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_add_signed_url_key" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, - "post_add_signed_url_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_add_signed_url_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_add_signed_url_key" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_add_signed_url_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_add_signed_url_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6809,8 +6809,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6881,17 +6882,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6947,8 +6951,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteBackendServiceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7053,17 +7058,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7116,8 +7123,9 @@ def test_delete_signed_url_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7222,18 +7230,20 @@ def test_delete_signed_url_key_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_delete_signed_url_key" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, - "post_delete_signed_url_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_delete_signed_url_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_delete_signed_url_key" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_delete_signed_url_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_delete_signed_url_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7284,8 +7294,9 @@ def test_get_rest_bad_request(request_type=compute.GetBackendServiceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7411,17 +7422,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BackendServicesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7474,8 +7485,9 @@ def test_get_effective_security_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7539,19 +7551,22 @@ def test_get_effective_security_policies_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, - "post_get_effective_security_policies", - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, - "post_get_effective_security_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_get_effective_security_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_get_effective_security_policies", + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_get_effective_security_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "pre_get_effective_security_policies", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7613,8 +7628,9 @@ def test_get_health_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7753,17 +7769,19 @@ def test_get_health_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_get_health" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_get_health_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_get_health" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_get_health" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_get_health_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_get_health" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7818,8 +7836,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7886,17 +7905,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7947,8 +7969,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertBackendServiceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8325,17 +8348,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8386,8 +8411,9 @@ def test_list_rest_bad_request(request_type=compute.ListBackendServicesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8456,17 +8482,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BackendServicesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8519,8 +8545,9 @@ def test_list_usable_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8589,17 +8616,19 @@ def test_list_usable_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_list_usable" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_list_usable_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_list_usable" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_list_usable" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_list_usable_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_list_usable" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8652,8 +8681,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchBackendServiceRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9030,17 +9060,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9093,8 +9125,9 @@ def test_set_edge_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9277,18 +9310,20 @@ def test_set_edge_security_policy_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_set_edge_security_policy" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, - "post_set_edge_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_set_edge_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_set_edge_security_policy" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_set_edge_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_set_edge_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9341,8 +9376,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9525,17 +9561,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9588,8 +9627,9 @@ def test_set_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9772,18 +9812,20 @@ def test_set_security_policy_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_set_security_policy" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, - "post_set_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_set_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_set_security_policy" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_set_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_set_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9836,8 +9878,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9978,18 +10021,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10042,8 +10087,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateBackendServiceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10420,17 +10466,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10889,11 +10937,14 @@ def test_backend_services_base_transport(): def test_backend_services_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.backend_services.transports.BackendServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.backend_services.transports.BackendServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackendServicesTransport( @@ -10913,9 +10964,12 @@ def test_backend_services_base_transport_with_credentials_file(): def test_backend_services_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.backend_services.transports.BackendServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.backend_services.transports.BackendServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackendServicesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_cross_site_networks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_cross_site_networks.py index c37eec942652..772d5c21023c 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_cross_site_networks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_cross_site_networks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_cross_site_networks_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_cross_site_networks_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_cross_site_networks_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2963,8 +2960,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteCrossSiteNetworkRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3069,17 +3067,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = CrossSiteNetworksClient(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.CrossSiteNetworksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3130,8 +3130,9 @@ def test_get_rest_bad_request(request_type=compute.GetCrossSiteNetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3204,17 +3205,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = CrossSiteNetworksClient(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.CrossSiteNetworksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3265,8 +3268,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertCrossSiteNetworkRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3452,17 +3456,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = CrossSiteNetworksClient(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.CrossSiteNetworksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3513,8 +3519,9 @@ def test_list_rest_bad_request(request_type=compute.ListCrossSiteNetworksRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3587,17 +3594,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = CrossSiteNetworksClient(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.CrossSiteNetworksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3650,8 +3659,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchCrossSiteNetworkReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3837,17 +3847,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = CrossSiteNetworksClient(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.CrossSiteNetworksRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4042,11 +4054,14 @@ def test_cross_site_networks_base_transport(): def test_cross_site_networks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.cross_site_networks.transports.CrossSiteNetworksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.cross_site_networks.transports.CrossSiteNetworksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CrossSiteNetworksTransport( @@ -4066,9 +4081,12 @@ def test_cross_site_networks_base_transport_with_credentials_file(): def test_cross_site_networks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.cross_site_networks.transports.CrossSiteNetworksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.cross_site_networks.transports.CrossSiteNetworksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CrossSiteNetworksTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_settings_service.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_settings_service.py index fabf86971376..006f9cd95987 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_settings_service.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -934,10 +934,9 @@ def test_disk_settings_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +981,9 @@ def test_disk_settings_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1019,9 @@ def test_disk_settings_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1922,8 +1919,9 @@ def test_get_rest_bad_request(request_type=compute.GetDiskSettingRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1983,17 +1981,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = DiskSettingsServiceClient(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.DiskSettingsServiceRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.DiskSettingsServiceRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DiskSettingsServiceRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DiskSettingsServiceRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.DiskSettingsServiceRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DiskSettingsServiceRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2042,8 +2042,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchDiskSettingRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2220,17 +2221,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = DiskSettingsServiceClient(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.DiskSettingsServiceRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.DiskSettingsServiceRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DiskSettingsServiceRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DiskSettingsServiceRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.DiskSettingsServiceRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DiskSettingsServiceRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2362,11 +2365,14 @@ def test_disk_settings_service_base_transport(): def test_disk_settings_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.disk_settings_service.transports.DiskSettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.disk_settings_service.transports.DiskSettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiskSettingsServiceTransport( @@ -2386,9 +2392,12 @@ def test_disk_settings_service_base_transport_with_credentials_file(): def test_disk_settings_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.disk_settings_service.transports.DiskSettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.disk_settings_service.transports.DiskSettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiskSettingsServiceTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_types.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_types.py index 39bb2a70ef60..2e56c5f844b7 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_types.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disk_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -868,10 +873,9 @@ def test_disk_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -916,10 +920,9 @@ def test_disk_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +958,9 @@ def test_disk_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1950,8 +1952,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2020,17 +2023,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = DiskTypesClient(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.DiskTypesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.DiskTypesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DiskTypesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DiskTypesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.DiskTypesRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DiskTypesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2083,8 +2088,9 @@ def test_get_rest_bad_request(request_type=compute.GetDiskTypeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2163,17 +2169,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = DiskTypesClient(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.DiskTypesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.DiskTypesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DiskTypesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DiskTypesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.DiskTypesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DiskTypesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2222,8 +2226,9 @@ def test_list_rest_bad_request(request_type=compute.ListDiskTypesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2290,17 +2295,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = DiskTypesClient(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.DiskTypesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.DiskTypesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DiskTypesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DiskTypesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.DiskTypesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DiskTypesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2451,11 +2454,14 @@ def test_disk_types_base_transport(): def test_disk_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.disk_types.transports.DiskTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.disk_types.transports.DiskTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiskTypesTransport( @@ -2476,9 +2482,12 @@ def test_disk_types_base_transport_with_credentials_file(): def test_disk_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.disk_types.transports.DiskTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.disk_types.transports.DiskTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiskTypesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disks.py index 626d29bac1e9..6c9e36ac0a1f 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_disks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -852,10 +852,9 @@ def test_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -900,10 +899,9 @@ def test_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -939,10 +937,9 @@ def test_disks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1122,9 +1119,9 @@ def test_add_resource_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies(request) @@ -1340,9 +1337,9 @@ def test_add_resource_policies_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies_unary(request) @@ -6553,9 +6550,9 @@ def test_stop_async_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication(request) @@ -6763,9 +6760,9 @@ def test_stop_async_replication_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication_unary(request) @@ -7396,9 +7393,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -8119,8 +8116,9 @@ def test_add_resource_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8308,17 +8306,19 @@ def test_add_resource_policies_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_add_resource_policies" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_add_resource_policies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_add_resource_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_add_resource_policies" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_add_resource_policies_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_add_resource_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8371,8 +8371,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8441,17 +8442,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8502,8 +8505,9 @@ def test_bulk_insert_rest_bad_request(request_type=compute.BulkInsertDiskRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8684,17 +8688,15 @@ def test_bulk_insert_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_bulk_insert" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_bulk_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_bulk_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_bulk_insert") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_bulk_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_bulk_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8745,8 +8747,9 @@ def test_bulk_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8929,17 +8932,19 @@ def test_bulk_set_labels_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_bulk_set_labels" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_bulk_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_bulk_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_bulk_set_labels" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_bulk_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_bulk_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8992,8 +8997,9 @@ def test_create_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9211,17 +9217,19 @@ def test_create_snapshot_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_create_snapshot" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_create_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_create_snapshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_create_snapshot" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_create_snapshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_create_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9272,8 +9280,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9376,17 +9385,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9435,8 +9442,9 @@ def test_get_rest_bad_request(request_type=compute.GetDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9595,17 +9603,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_get") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9654,8 +9660,9 @@ def test_get_iam_policy_rest_bad_request(request_type=compute.GetIamPolicyDiskRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9720,17 +9727,17 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_get_iam_policy") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9781,8 +9788,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10024,17 +10032,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10083,8 +10089,9 @@ def test_list_rest_bad_request(request_type=compute.ListDisksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10151,17 +10158,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_list") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10212,8 +10217,9 @@ def test_remove_resource_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10401,17 +10407,20 @@ def test_remove_resource_policies_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_remove_resource_policies" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_remove_resource_policies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_remove_resource_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_remove_resource_policies" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, + "post_remove_resource_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_remove_resource_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10462,8 +10471,9 @@ def test_resize_rest_bad_request(request_type=compute.ResizeDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10640,17 +10650,15 @@ def test_resize_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_resize" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_resize_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_resize" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_resize") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_resize_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_resize") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10699,8 +10707,9 @@ def test_set_iam_policy_rest_bad_request(request_type=compute.SetIamPolicyDiskRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10881,17 +10890,17 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_set_iam_policy") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10942,8 +10951,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11125,17 +11135,15 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_set_labels") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_set_labels") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11186,8 +11194,9 @@ def test_start_async_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11375,17 +11384,20 @@ def test_start_async_replication_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_start_async_replication" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_start_async_replication_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_start_async_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_start_async_replication" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, + "post_start_async_replication_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_start_async_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11438,8 +11450,9 @@ def test_stop_async_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11542,17 +11555,19 @@ def test_stop_async_replication_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_stop_async_replication" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_stop_async_replication_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_stop_async_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_stop_async_replication" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_stop_async_replication_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_stop_async_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11605,8 +11620,9 @@ def test_stop_group_async_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11794,18 +11810,20 @@ def test_stop_group_async_replication_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_stop_group_async_replication" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, - "post_stop_group_async_replication_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_stop_group_async_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_stop_group_async_replication" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, + "post_stop_group_async_replication_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_stop_group_async_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11858,8 +11876,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11998,17 +12017,19 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_test_iam_permissions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12061,8 +12082,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12304,17 +12326,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_update") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12813,11 +12833,14 @@ def test_disks_base_transport(): def test_disks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.disks.transports.DisksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.disks.transports.DisksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DisksTransport( @@ -12837,9 +12860,12 @@ def test_disks_base_transport_with_credentials_file(): def test_disks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.disks.transports.DisksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.disks.transports.DisksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DisksTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_external_vpn_gateways.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_external_vpn_gateways.py index 6d202ac1b633..aa2e592dc148 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_external_vpn_gateways.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_external_vpn_gateways.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_external_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_external_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_external_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2863,9 +2860,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3135,8 +3132,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteExternalVpnGatewayRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3241,17 +3239,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ExternalVpnGatewaysClient(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.ExternalVpnGatewaysRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3302,8 +3302,9 @@ def test_get_rest_bad_request(request_type=compute.GetExternalVpnGatewayRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3380,17 +3381,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = ExternalVpnGatewaysClient(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.ExternalVpnGatewaysRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3441,8 +3444,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertExternalVpnGatewayRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3640,17 +3644,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ExternalVpnGatewaysClient(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.ExternalVpnGatewaysRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3701,8 +3707,9 @@ def test_list_rest_bad_request(request_type=compute.ListExternalVpnGatewaysReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3773,17 +3780,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = ExternalVpnGatewaysClient(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.ExternalVpnGatewaysRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3838,8 +3847,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4023,17 +4033,20 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = ExternalVpnGatewaysClient(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.ExternalVpnGatewaysRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, + "post_set_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4086,8 +4099,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4228,18 +4242,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ExternalVpnGatewaysClient(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.ExternalVpnGatewaysRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4459,11 +4475,14 @@ def test_external_vpn_gateways_base_transport(): def test_external_vpn_gateways_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.external_vpn_gateways.transports.ExternalVpnGatewaysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.external_vpn_gateways.transports.ExternalVpnGatewaysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ExternalVpnGatewaysTransport( @@ -4483,9 +4502,12 @@ def test_external_vpn_gateways_base_transport_with_credentials_file(): def test_external_vpn_gateways_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.external_vpn_gateways.transports.ExternalVpnGatewaysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.external_vpn_gateways.transports.ExternalVpnGatewaysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ExternalVpnGatewaysTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewall_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewall_policies.py index 68a9559e19a3..db606b9ce931 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewall_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewall_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_firewall_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_firewall_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_firewall_policies_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4621,9 +4618,9 @@ def test_list_associations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_associations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_associations] = ( + mock_rpc + ) request = {} client.list_associations(request) @@ -6351,9 +6348,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -6552,9 +6549,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -7746,9 +7743,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -8013,8 +8010,9 @@ def test_add_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8204,17 +8202,20 @@ def test_add_association_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_add_association" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_add_association_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_add_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_add_association" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_add_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_add_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8267,8 +8268,9 @@ def test_add_packet_mirroring_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8513,18 +8515,20 @@ def test_add_packet_mirroring_rule_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_add_packet_mirroring_rule" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, - "post_add_packet_mirroring_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_add_packet_mirroring_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_add_packet_mirroring_rule" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_add_packet_mirroring_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_add_packet_mirroring_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8575,8 +8579,9 @@ def test_add_rule_rest_bad_request(request_type=compute.AddRuleFirewallPolicyReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8821,17 +8826,19 @@ def test_add_rule_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_add_rule" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_add_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_add_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_add_rule" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_add_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_add_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8884,8 +8891,9 @@ def test_clone_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8990,17 +8998,19 @@ def test_clone_rules_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_clone_rules" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_clone_rules_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_clone_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_clone_rules" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_clone_rules_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_clone_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9051,8 +9061,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteFirewallPolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9157,17 +9168,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9218,8 +9231,9 @@ def test_get_rest_bad_request(request_type=compute.GetFirewallPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9310,17 +9324,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallPoliciesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9373,8 +9387,9 @@ def test_get_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9447,17 +9462,20 @@ def test_get_association_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_get_association" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_get_association_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_get_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get_association" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_get_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_get_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9512,8 +9530,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9580,17 +9599,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9643,8 +9665,9 @@ def test_get_packet_mirroring_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9735,18 +9758,20 @@ def test_get_packet_mirroring_rule_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_get_packet_mirroring_rule" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, - "post_get_packet_mirroring_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_get_packet_mirroring_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get_packet_mirroring_rule" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_get_packet_mirroring_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_get_packet_mirroring_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9797,8 +9822,9 @@ def test_get_rule_rest_bad_request(request_type=compute.GetRuleFirewallPolicyReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9889,17 +9915,19 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_get_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9950,8 +9978,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertFirewallPolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10231,17 +10260,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10292,8 +10323,9 @@ def test_list_rest_bad_request(request_type=compute.ListFirewallPoliciesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10360,17 +10392,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10423,8 +10457,9 @@ def test_list_associations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10487,18 +10522,20 @@ def test_list_associations_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_list_associations" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, - "post_list_associations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_list_associations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_list_associations" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_list_associations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_list_associations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10554,8 +10591,9 @@ def test_move_rest_bad_request(request_type=compute.MoveFirewallPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10660,17 +10698,19 @@ def test_move_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_move" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_move_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_move" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_move" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_move_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_move" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10721,8 +10761,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchFirewallPolicyRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11002,17 +11043,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11065,8 +11108,9 @@ def test_patch_packet_mirroring_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11311,18 +11355,22 @@ def test_patch_packet_mirroring_rule_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_patch_packet_mirroring_rule" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, - "post_patch_packet_mirroring_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_patch_packet_mirroring_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_patch_packet_mirroring_rule", + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_patch_packet_mirroring_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "pre_patch_packet_mirroring_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11375,8 +11423,9 @@ def test_patch_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11621,17 +11670,19 @@ def test_patch_rule_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_patch_rule" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_patch_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_patch_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_patch_rule" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_patch_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_patch_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11684,8 +11735,9 @@ def test_remove_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11790,18 +11842,20 @@ def test_remove_association_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_remove_association" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, - "post_remove_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_remove_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_remove_association" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_remove_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_remove_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11854,8 +11908,9 @@ def test_remove_packet_mirroring_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11960,18 +12015,22 @@ def test_remove_packet_mirroring_rule_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_remove_packet_mirroring_rule" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, - "post_remove_packet_mirroring_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_remove_packet_mirroring_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_remove_packet_mirroring_rule", + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_remove_packet_mirroring_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "pre_remove_packet_mirroring_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12024,8 +12083,9 @@ def test_remove_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12130,17 +12190,19 @@ def test_remove_rule_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_remove_rule" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_remove_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_remove_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_remove_rule" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_remove_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_remove_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12193,8 +12255,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12384,17 +12447,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12447,8 +12513,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12589,18 +12656,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13168,11 +13237,14 @@ def test_firewall_policies_base_transport(): def test_firewall_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.firewall_policies.transports.FirewallPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.firewall_policies.transports.FirewallPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FirewallPoliciesTransport( @@ -13192,9 +13264,12 @@ def test_firewall_policies_base_transport_with_credentials_file(): def test_firewall_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.firewall_policies.transports.FirewallPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.firewall_policies.transports.FirewallPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FirewallPoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewalls.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewalls.py index 94445a7cc90e..5920c672069e 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewalls.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_firewalls.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_firewalls_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_firewalls_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_firewalls_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2784,9 +2781,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3464,8 +3461,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteFirewallRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3568,17 +3566,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FirewallsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3627,8 +3623,9 @@ def test_get_rest_bad_request(request_type=compute.GetFirewallRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3721,17 +3718,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FirewallsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3780,8 +3775,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertFirewallRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3993,17 +3989,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FirewallsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4052,8 +4046,9 @@ def test_list_rest_bad_request(request_type=compute.ListFirewallsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4120,17 +4115,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FirewallsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4179,8 +4172,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchFirewallRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4392,17 +4386,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FirewallsRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4453,8 +4445,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4593,17 +4586,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.FirewallsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4656,8 +4652,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateFirewallRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4869,17 +4866,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FirewallsRestInterceptor, "post_update") as post, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallsRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5116,11 +5111,14 @@ def test_firewalls_base_transport(): def test_firewalls_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.firewalls.transports.FirewallsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.firewalls.transports.FirewallsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FirewallsTransport( @@ -5140,9 +5138,12 @@ def test_firewalls_base_transport_with_credentials_file(): def test_firewalls_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.firewalls.transports.FirewallsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.firewalls.transports.FirewallsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FirewallsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_forwarding_rules.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_forwarding_rules.py index 53f99077d62c..e5da75a4322b 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_forwarding_rules.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_forwarding_rules.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4051,9 +4048,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4336,8 +4333,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4408,17 +4406,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4478,8 +4479,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteForwardingRuleReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4588,17 +4590,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4653,8 +4657,9 @@ def test_get_rest_bad_request(request_type=compute.GetForwardingRuleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4798,17 +4803,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ForwardingRulesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4859,8 +4864,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertForwardingRuleReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5088,17 +5094,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5149,8 +5157,9 @@ def test_list_rest_bad_request(request_type=compute.ListForwardingRulesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5219,17 +5228,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ForwardingRulesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5284,8 +5293,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchForwardingRuleRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5517,17 +5527,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5580,8 +5592,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5765,17 +5778,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5832,8 +5847,9 @@ def test_set_target_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6016,17 +6032,19 @@ def test_set_target_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_set_target" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_set_target_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_set_target" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_set_target" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_set_target_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_set_target" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6079,8 +6097,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6221,18 +6240,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6515,11 +6536,14 @@ def test_forwarding_rules_base_transport(): def test_forwarding_rules_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.forwarding_rules.transports.ForwardingRulesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.forwarding_rules.transports.ForwardingRulesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ForwardingRulesTransport( @@ -6539,9 +6563,12 @@ def test_forwarding_rules_base_transport_with_credentials_file(): def test_forwarding_rules_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.forwarding_rules.transports.ForwardingRulesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.forwarding_rules.transports.ForwardingRulesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ForwardingRulesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_future_reservations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_future_reservations.py index 61a49be334c1..c85922b9054d 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_future_reservations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_future_reservations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_future_reservations_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_future_reservations_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_future_reservations_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3744,8 +3741,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3818,18 +3816,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3889,8 +3889,9 @@ def test_cancel_rest_bad_request(request_type=compute.CancelFutureReservationReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3999,17 +4000,19 @@ def test_cancel_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_cancel" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, "post_cancel_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_cancel" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_cancel" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_cancel_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_cancel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4064,8 +4067,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteFutureReservationReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4174,17 +4178,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4239,8 +4245,9 @@ def test_get_rest_bad_request(request_type=compute.GetFutureReservationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4346,17 +4353,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4407,8 +4416,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertFutureReservationReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4686,17 +4696,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4747,8 +4759,9 @@ def test_list_rest_bad_request(request_type=compute.ListFutureReservationsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4821,17 +4834,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4891,8 +4906,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateFutureReservationReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5174,17 +5190,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5421,11 +5439,14 @@ def test_future_reservations_base_transport(): def test_future_reservations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.future_reservations.transports.FutureReservationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.future_reservations.transports.FutureReservationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FutureReservationsTransport( @@ -5445,9 +5466,12 @@ def test_future_reservations_base_transport_with_credentials_file(): def test_future_reservations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.future_reservations.transports.FutureReservationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.future_reservations.transports.FutureReservationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FutureReservationsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_addresses.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_addresses.py index 4f4bb78b60e2..8b24ea7d130d 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_addresses.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_addresses.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_global_addresses_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_global_addresses_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_global_addresses_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3231,9 +3228,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3503,8 +3500,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteGlobalAddressRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3609,17 +3607,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3670,8 +3670,9 @@ def test_get_rest_bad_request(request_type=compute.GetGlobalAddressRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3772,17 +3773,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.GlobalAddressesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3833,8 +3834,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertGlobalAddressRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4029,17 +4031,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4090,8 +4094,9 @@ def test_list_rest_bad_request(request_type=compute.ListGlobalAddressesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4160,17 +4165,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.GlobalAddressesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4221,8 +4226,9 @@ def test_move_rest_bad_request(request_type=compute.MoveGlobalAddressRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4409,17 +4415,17 @@ def test_move_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_move" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "post_move_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_move" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_move" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_move_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.GlobalAddressesRestInterceptor, "pre_move") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4472,8 +4478,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4657,17 +4664,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4720,8 +4729,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4862,18 +4872,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5114,11 +5126,14 @@ def test_global_addresses_base_transport(): def test_global_addresses_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.global_addresses.transports.GlobalAddressesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.global_addresses.transports.GlobalAddressesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalAddressesTransport( @@ -5138,9 +5153,12 @@ def test_global_addresses_base_transport_with_credentials_file(): def test_global_addresses_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.global_addresses.transports.GlobalAddressesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.global_addresses.transports.GlobalAddressesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalAddressesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_forwarding_rules.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_forwarding_rules.py index 8abec45e4f05..5f4c7d915764 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_forwarding_rules.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_forwarding_rules.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_global_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_global_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_global_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3683,9 +3680,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3957,8 +3954,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4063,17 +4061,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4124,8 +4124,9 @@ def test_get_rest_bad_request(request_type=compute.GetGlobalForwardingRuleReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4265,17 +4266,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4328,8 +4331,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4557,17 +4561,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4618,8 +4624,9 @@ def test_list_rest_bad_request(request_type=compute.ListGlobalForwardingRulesReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4688,17 +4695,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4749,8 +4758,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchGlobalForwardingRuleRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4978,17 +4988,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5041,8 +5053,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5226,17 +5239,20 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, + "post_set_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5289,8 +5305,9 @@ def test_set_target_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5469,17 +5486,20 @@ def test_set_target_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_set_target" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_set_target_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_set_target" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_set_target" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, + "post_set_target_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_set_target" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5532,8 +5552,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5674,18 +5695,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5947,11 +5970,14 @@ def test_global_forwarding_rules_base_transport(): def test_global_forwarding_rules_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.global_forwarding_rules.transports.GlobalForwardingRulesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.global_forwarding_rules.transports.GlobalForwardingRulesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalForwardingRulesTransport( @@ -5971,9 +5997,12 @@ def test_global_forwarding_rules_base_transport_with_credentials_file(): def test_global_forwarding_rules_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.global_forwarding_rules.transports.GlobalForwardingRulesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.global_forwarding_rules.transports.GlobalForwardingRulesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalForwardingRulesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_network_endpoint_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_network_endpoint_groups.py index 26c91321f367..43d9fd053264 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_network_endpoint_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_network_endpoint_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_global_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_global_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_global_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3361,9 +3358,9 @@ def test_list_network_endpoints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_endpoints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_endpoints] = ( + mock_rpc + ) request = {} client.list_network_endpoints(request) @@ -3715,8 +3712,9 @@ def test_attach_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3918,20 +3916,22 @@ def test_attach_network_endpoints_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, - "post_attach_network_endpoints", - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "post_attach_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "pre_attach_network_endpoints", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_attach_network_endpoints", + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_attach_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "pre_attach_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3984,8 +3984,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4090,18 +4091,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4154,8 +4157,9 @@ def test_detach_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4357,20 +4361,22 @@ def test_detach_network_endpoints_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, - "post_detach_network_endpoints", - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "post_detach_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "pre_detach_network_endpoints", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_detach_network_endpoints", + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_detach_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "pre_detach_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4423,8 +4429,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4513,17 +4520,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4578,8 +4588,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4805,18 +4816,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4869,8 +4882,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4939,17 +4953,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5004,8 +5021,9 @@ def test_list_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5074,20 +5092,22 @@ def test_list_network_endpoints_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, - "post_list_network_endpoints", - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "post_list_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "pre_list_network_endpoints", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_list_network_endpoints", + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_list_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "pre_list_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5335,11 +5355,14 @@ def test_global_network_endpoint_groups_base_transport(): def test_global_network_endpoint_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.global_network_endpoint_groups.transports.GlobalNetworkEndpointGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.global_network_endpoint_groups.transports.GlobalNetworkEndpointGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalNetworkEndpointGroupsTransport( @@ -5359,9 +5382,12 @@ def test_global_network_endpoint_groups_base_transport_with_credentials_file(): def test_global_network_endpoint_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.global_network_endpoint_groups.transports.GlobalNetworkEndpointGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.global_network_endpoint_groups.transports.GlobalNetworkEndpointGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalNetworkEndpointGroupsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_operations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_operations.py index 8264be7f13c2..4c04936f1f54 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_operations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_global_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_global_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_global_operations_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2355,8 +2357,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2427,17 +2430,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = GlobalOperationsClient(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.GlobalOperationsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2490,8 +2496,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteGlobalOperationReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2551,17 +2558,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalOperationsClient(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.GlobalOperationsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2617,8 +2626,9 @@ def test_get_rest_bad_request(request_type=compute.GetGlobalOperationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2723,17 +2733,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalOperationsClient(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.GlobalOperationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.GlobalOperationsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2784,8 +2794,9 @@ def test_list_rest_bad_request(request_type=compute.ListGlobalOperationsRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2854,17 +2865,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalOperationsClient(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.GlobalOperationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2915,8 +2928,9 @@ def test_wait_rest_bad_request(request_type=compute.WaitGlobalOperationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3021,17 +3035,19 @@ def test_wait_rest_interceptors(null_interceptor): ) client = GlobalOperationsClient(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.GlobalOperationsRestInterceptor, "post_wait" - ) as post, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "post_wait_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "pre_wait" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_wait" + ) as post, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_wait_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "pre_wait" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3226,11 +3242,14 @@ def test_global_operations_base_transport(): def test_global_operations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.global_operations.transports.GlobalOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.global_operations.transports.GlobalOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalOperationsTransport( @@ -3250,9 +3269,12 @@ def test_global_operations_base_transport_with_credentials_file(): def test_global_operations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.global_operations.transports.GlobalOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.global_operations.transports.GlobalOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalOperationsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_organization_operations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_organization_operations.py index 83063507e9a5..7d44dedcf317 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_organization_operations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_organization_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -969,10 +974,9 @@ def test_global_organization_operations_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1021,9 @@ def test_global_organization_operations_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1056,10 +1059,9 @@ def test_global_organization_operations_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1782,8 +1784,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1845,18 +1848,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalOrganizationOperationsClient(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.GlobalOrganizationOperationsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalOrganizationOperationsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalOrganizationOperationsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1914,8 +1919,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2020,17 +2026,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalOrganizationOperationsClient(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.GlobalOrganizationOperationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalOrganizationOperationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalOrganizationOperationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2083,8 +2092,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2153,18 +2163,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalOrganizationOperationsClient(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.GlobalOrganizationOperationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalOrganizationOperationsRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalOrganizationOperationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2317,11 +2329,14 @@ def test_global_organization_operations_base_transport(): def test_global_organization_operations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.global_organization_operations.transports.GlobalOrganizationOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.global_organization_operations.transports.GlobalOrganizationOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalOrganizationOperationsTransport( @@ -2341,9 +2356,12 @@ def test_global_organization_operations_base_transport_with_credentials_file(): def test_global_organization_operations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.global_organization_operations.transports.GlobalOrganizationOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.global_organization_operations.transports.GlobalOrganizationOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalOrganizationOperationsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_public_delegated_prefixes.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_public_delegated_prefixes.py index c6bc2fe6b48d..2890c0795930 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_public_delegated_prefixes.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_public_delegated_prefixes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -987,10 +987,9 @@ def test_global_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1034,9 @@ def test_global_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1072,9 @@ def test_global_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2997,8 +2994,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3103,18 +3101,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalPublicDelegatedPrefixesClient(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.GlobalPublicDelegatedPrefixesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3167,8 +3167,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3263,18 +3264,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalPublicDelegatedPrefixesClient(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.GlobalPublicDelegatedPrefixesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, - "post_get_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3329,8 +3332,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3544,18 +3548,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = GlobalPublicDelegatedPrefixesClient(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.GlobalPublicDelegatedPrefixesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3608,8 +3614,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3678,18 +3685,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalPublicDelegatedPrefixesClient(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.GlobalPublicDelegatedPrefixesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3744,8 +3753,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3959,18 +3969,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = GlobalPublicDelegatedPrefixesClient(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.GlobalPublicDelegatedPrefixesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4165,11 +4177,14 @@ def test_global_public_delegated_prefixes_base_transport(): def test_global_public_delegated_prefixes_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.global_public_delegated_prefixes.transports.GlobalPublicDelegatedPrefixesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.global_public_delegated_prefixes.transports.GlobalPublicDelegatedPrefixesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalPublicDelegatedPrefixesTransport( @@ -4189,9 +4204,12 @@ def test_global_public_delegated_prefixes_base_transport_with_credentials_file() def test_global_public_delegated_prefixes_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.global_public_delegated_prefixes.transports.GlobalPublicDelegatedPrefixesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.global_public_delegated_prefixes.transports.GlobalPublicDelegatedPrefixesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalPublicDelegatedPrefixesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_vm_extension_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_vm_extension_policies.py index 6b99097c06d7..d29393004918 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_vm_extension_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_global_vm_extension_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -950,10 +950,9 @@ def test_global_vm_extension_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +997,9 @@ def test_global_vm_extension_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1035,9 @@ def test_global_vm_extension_policies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3271,8 +3268,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3345,18 +3343,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = GlobalVmExtensionPoliciesClient(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.GlobalVmExtensionPoliciesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.GlobalVmExtensionPoliciesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalVmExtensionPoliciesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3414,8 +3414,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3610,17 +3611,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalVmExtensionPoliciesClient(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.GlobalVmExtensionPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalVmExtensionPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalVmExtensionPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3671,8 +3675,9 @@ def test_get_rest_bad_request(request_type=compute.GetGlobalVmExtensionPolicyReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3753,17 +3758,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalVmExtensionPoliciesClient(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.GlobalVmExtensionPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalVmExtensionPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalVmExtensionPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3818,8 +3826,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4031,17 +4040,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = GlobalVmExtensionPoliciesClient(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.GlobalVmExtensionPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.GlobalVmExtensionPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalVmExtensionPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4094,8 +4106,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4168,17 +4181,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalVmExtensionPoliciesClient(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.GlobalVmExtensionPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalVmExtensionPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalVmExtensionPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4236,8 +4252,9 @@ def test_update_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4449,17 +4466,20 @@ def test_update_rest_interceptors(null_interceptor): ) client = GlobalVmExtensionPoliciesClient(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.GlobalVmExtensionPoliciesRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.GlobalVmExtensionPoliciesRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalVmExtensionPoliciesRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, + "post_update_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalVmExtensionPoliciesRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4675,11 +4695,14 @@ def test_global_vm_extension_policies_base_transport(): def test_global_vm_extension_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.global_vm_extension_policies.transports.GlobalVmExtensionPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.global_vm_extension_policies.transports.GlobalVmExtensionPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalVmExtensionPoliciesTransport( @@ -4699,9 +4722,12 @@ def test_global_vm_extension_policies_base_transport_with_credentials_file(): def test_global_vm_extension_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.global_vm_extension_policies.transports.GlobalVmExtensionPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.global_vm_extension_policies.transports.GlobalVmExtensionPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalVmExtensionPoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_health_checks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_health_checks.py index 7810daf931ea..2e46f0e9d4aa 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_health_checks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_health_checks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_health_checks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_health_checks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_health_checks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3062,9 +3059,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3738,8 +3735,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3810,17 +3808,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.HealthChecksRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3873,8 +3873,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteHealthCheckRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3979,17 +3980,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.HealthChecksRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4040,8 +4041,9 @@ def test_get_rest_bad_request(request_type=compute.GetHealthCheckRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4128,17 +4130,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.HealthChecksRestInterceptor, "post_get") as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.HealthChecksRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4187,8 +4187,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertHealthCheckRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4432,17 +4433,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.HealthChecksRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4493,8 +4494,9 @@ def test_list_rest_bad_request(request_type=compute.ListHealthChecksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4563,17 +4565,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.HealthChecksRestInterceptor, "post_list") as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.HealthChecksRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4624,8 +4624,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchHealthCheckRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4869,17 +4870,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.HealthChecksRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.HealthChecksRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4932,8 +4931,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5074,18 +5074,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HealthChecksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5138,8 +5140,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateHealthCheckRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5383,17 +5386,17 @@ def test_update_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.HealthChecksRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5653,11 +5656,14 @@ def test_health_checks_base_transport(): def test_health_checks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.health_checks.transports.HealthChecksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.health_checks.transports.HealthChecksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HealthChecksTransport( @@ -5677,9 +5683,12 @@ def test_health_checks_base_transport_with_credentials_file(): def test_health_checks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.health_checks.transports.HealthChecksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.health_checks.transports.HealthChecksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HealthChecksTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_image_family_views.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_image_family_views.py index ed1d235cfc41..3cde125a1cc6 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_image_family_views.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_image_family_views.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -909,10 +914,9 @@ def test_image_family_views_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +961,9 @@ def test_image_family_views_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +999,9 @@ def test_image_family_views_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1448,8 +1450,9 @@ def test_get_rest_bad_request(request_type=compute.GetImageFamilyViewRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1509,17 +1512,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = ImageFamilyViewsClient(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.ImageFamilyViewsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ImageFamilyViewsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImageFamilyViewsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ImageFamilyViewsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ImageFamilyViewsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImageFamilyViewsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1628,11 +1631,14 @@ def test_image_family_views_base_transport(): def test_image_family_views_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.image_family_views.transports.ImageFamilyViewsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.image_family_views.transports.ImageFamilyViewsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ImageFamilyViewsTransport( @@ -1653,9 +1659,12 @@ def test_image_family_views_base_transport_with_credentials_file(): def test_image_family_views_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.image_family_views.transports.ImageFamilyViewsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.image_family_views.transports.ImageFamilyViewsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ImageFamilyViewsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_images.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_images.py index ed0659bb48be..e709be808147 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_images.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_images.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -856,10 +856,9 @@ def test_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -904,10 +903,9 @@ def test_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -943,10 +941,9 @@ def test_images_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4172,9 +4169,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4444,8 +4441,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4548,17 +4546,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4607,8 +4603,9 @@ def test_deprecate_rest_bad_request(request_type=compute.DeprecateImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4795,17 +4792,15 @@ def test_deprecate_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_deprecate" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_deprecate_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_deprecate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_deprecate") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_deprecate_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_deprecate") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4854,8 +4849,9 @@ def test_get_rest_bad_request(request_type=compute.GetImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4968,17 +4964,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5029,8 +5023,9 @@ def test_get_from_family_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5143,17 +5138,19 @@ def test_get_from_family_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_get_from_family" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_get_from_family_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_get_from_family" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ImagesRestInterceptor, "post_get_from_family" + ) as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_get_from_family_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ImagesRestInterceptor, "pre_get_from_family" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5204,8 +5201,9 @@ def test_get_iam_policy_rest_bad_request(request_type=compute.GetIamPolicyImageR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5270,17 +5268,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ImagesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ImagesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5331,8 +5331,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5567,17 +5568,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5626,8 +5625,9 @@ def test_list_rest_bad_request(request_type=compute.ListImagesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5694,17 +5694,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5753,8 +5751,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5989,17 +5988,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6048,8 +6045,9 @@ def test_set_iam_policy_rest_bad_request(request_type=compute.SetIamPolicyImageR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6230,17 +6228,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ImagesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ImagesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6291,8 +6291,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsImageRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6474,17 +6475,15 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_set_labels") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_set_labels") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6535,8 +6534,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6675,17 +6675,19 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ImagesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_test_iam_permissions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ImagesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7010,11 +7012,14 @@ def test_images_base_transport(): def test_images_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.images.transports.ImagesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.images.transports.ImagesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ImagesTransport( @@ -7034,9 +7039,12 @@ def test_images_base_transport_with_credentials_file(): def test_images_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.images.transports.ImagesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.images.transports.ImagesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ImagesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_manager_resize_requests.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_manager_resize_requests.py index 858adb17e782..98713b3496de 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_manager_resize_requests.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_manager_resize_requests.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -997,10 +997,9 @@ def test_instance_group_manager_resize_requests_client_get_mtls_endpoint_and_cer client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1044,9 @@ def test_instance_group_manager_resize_requests_client_get_mtls_endpoint_and_cer client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1084,10 +1082,9 @@ def test_instance_group_manager_resize_requests_client_get_mtls_endpoint_and_cer "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3164,8 +3161,9 @@ def test_cancel_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3275,18 +3273,20 @@ def test_cancel_rest_interceptors(null_interceptor): ) client = InstanceGroupManagerResizeRequestsClient(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.InstanceGroupManagerResizeRequestsRestInterceptor, "post_cancel" - ) as post, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, - "post_cancel_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_cancel" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "post_cancel" + ) as post, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, + "post_cancel_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_cancel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3344,8 +3344,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3455,18 +3456,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InstanceGroupManagerResizeRequestsClient(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.InstanceGroupManagerResizeRequestsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3524,8 +3527,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3615,18 +3619,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstanceGroupManagerResizeRequestsClient(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.InstanceGroupManagerResizeRequestsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, - "post_get_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3688,8 +3694,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3949,18 +3956,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InstanceGroupManagerResizeRequestsClient(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.InstanceGroupManagerResizeRequestsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4017,8 +4026,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4093,18 +4103,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = InstanceGroupManagerResizeRequestsClient(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.InstanceGroupManagerResizeRequestsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4304,11 +4316,14 @@ def test_instance_group_manager_resize_requests_base_transport(): def test_instance_group_manager_resize_requests_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.instance_group_manager_resize_requests.transports.InstanceGroupManagerResizeRequestsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.instance_group_manager_resize_requests.transports.InstanceGroupManagerResizeRequestsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceGroupManagerResizeRequestsTransport( @@ -4328,9 +4343,12 @@ def test_instance_group_manager_resize_requests_base_transport_with_credentials_ def test_instance_group_manager_resize_requests_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.instance_group_manager_resize_requests.transports.InstanceGroupManagerResizeRequestsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.instance_group_manager_resize_requests.transports.InstanceGroupManagerResizeRequestsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceGroupManagerResizeRequestsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_managers.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_managers.py index a4a1507e6e75..8cb99a6bc9d3 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_managers.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_group_managers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_instance_group_managers_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_instance_group_managers_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_instance_group_managers_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1213,9 +1210,9 @@ def test_abandon_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances(request) @@ -1432,9 +1429,9 @@ def test_abandon_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances_unary(request) @@ -2369,9 +2366,9 @@ def test_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances(request) @@ -2588,9 +2585,9 @@ def test_create_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances_unary(request) @@ -3225,9 +3222,9 @@ def test_delete_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances(request) @@ -3444,9 +3441,9 @@ def test_delete_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances_unary(request) @@ -5520,9 +5517,9 @@ def test_list_managed_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_managed_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_managed_instances] = ( + mock_rpc + ) request = {} client.list_managed_instances(request) @@ -7017,9 +7014,9 @@ def test_recreate_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances(request) @@ -7238,9 +7235,9 @@ def test_recreate_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances_unary(request) @@ -8359,9 +8356,9 @@ def test_resume_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances(request) @@ -8578,9 +8575,9 @@ def test_resume_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances_unary(request) @@ -9260,9 +9257,9 @@ def test_set_instance_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template(request) @@ -9482,9 +9479,9 @@ def test_set_instance_template_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template_unary(request) @@ -9701,9 +9698,9 @@ def test_set_target_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools(request) @@ -9920,9 +9917,9 @@ def test_set_target_pools_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools_unary(request) @@ -11007,9 +11004,9 @@ def test_suspend_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances(request) @@ -11226,9 +11223,9 @@ def test_suspend_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances_unary(request) @@ -11447,9 +11444,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -12640,8 +12637,9 @@ def test_abandon_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12835,18 +12833,20 @@ def test_abandon_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_abandon_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_abandon_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_abandon_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_abandon_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_abandon_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_abandon_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12899,8 +12899,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12971,18 +12972,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13044,8 +13047,9 @@ def test_apply_updates_to_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13242,20 +13246,22 @@ def test_apply_updates_to_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, - "post_apply_updates_to_instances", - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_apply_updates_to_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "pre_apply_updates_to_instances", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_apply_updates_to_instances", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_apply_updates_to_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_apply_updates_to_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13312,8 +13318,9 @@ def test_create_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13519,18 +13526,20 @@ def test_create_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_create_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_create_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_create_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_create_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_create_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_create_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13587,8 +13596,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13697,17 +13707,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13764,8 +13776,9 @@ def test_delete_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13960,18 +13973,20 @@ def test_delete_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_delete_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_delete_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_delete_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_delete_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_delete_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_delete_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14028,8 +14043,9 @@ def test_delete_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14225,20 +14241,22 @@ def test_delete_per_instance_configs_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, - "post_delete_per_instance_configs", - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_delete_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "pre_delete_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_delete_per_instance_configs", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_delete_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_delete_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14293,8 +14311,9 @@ def test_get_rest_bad_request(request_type=compute.GetInstanceGroupManagerReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14406,17 +14425,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14471,8 +14492,9 @@ def test_get_available_accelerator_topologies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14540,20 +14562,22 @@ def test_get_available_accelerator_topologies_rest_interceptors(null_interceptor ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, - "post_get_available_accelerator_topologies", - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_get_available_accelerator_topologies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "pre_get_available_accelerator_topologies", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_get_available_accelerator_topologies", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_get_available_accelerator_topologies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_get_available_accelerator_topologies", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14615,8 +14639,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14940,17 +14965,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15001,8 +15028,9 @@ def test_list_rest_bad_request(request_type=compute.ListInstanceGroupManagersReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15071,17 +15099,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15140,8 +15170,9 @@ def test_list_errors_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15208,18 +15239,20 @@ def test_list_errors_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_list_errors" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_list_errors_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_list_errors" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_list_errors" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_list_errors_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_list_errors" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15281,8 +15314,9 @@ def test_list_managed_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15351,18 +15385,22 @@ def test_list_managed_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_list_managed_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_list_managed_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_list_managed_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_list_managed_instances", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_list_managed_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_list_managed_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15426,8 +15464,9 @@ def test_list_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15496,19 +15535,22 @@ def test_list_per_instance_configs_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, - "post_list_per_instance_configs", - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_list_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_list_per_instance_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_list_per_instance_configs", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_list_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_list_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15568,8 +15610,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchInstanceGroupManagerRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15897,17 +15940,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15964,8 +16009,9 @@ def test_patch_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16171,20 +16217,22 @@ def test_patch_per_instance_configs_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, - "post_patch_per_instance_configs", - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_patch_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "pre_patch_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_patch_per_instance_configs", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_patch_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_patch_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16241,8 +16289,9 @@ def test_recreate_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16436,18 +16485,20 @@ def test_recreate_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_recreate_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_recreate_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_recreate_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_recreate_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_recreate_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_recreate_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16504,8 +16555,9 @@ def test_resize_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16614,17 +16666,19 @@ def test_resize_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_resize" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_resize_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_resize" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_resize" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_resize_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_resize" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16681,8 +16735,9 @@ def test_resize_advanced_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16877,18 +16932,20 @@ def test_resize_advanced_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_resize_advanced" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_resize_advanced_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_resize_advanced" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_resize_advanced" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_resize_advanced_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_resize_advanced" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16945,8 +17002,9 @@ def test_resume_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17140,18 +17198,20 @@ def test_resume_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_resume_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_resume_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_resume_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_resume_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_resume_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_resume_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17208,8 +17268,9 @@ def test_set_auto_healing_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17405,19 +17466,22 @@ def test_set_auto_healing_policies_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, - "post_set_auto_healing_policies", - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_set_auto_healing_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_set_auto_healing_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_set_auto_healing_policies", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_set_auto_healing_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_set_auto_healing_policies", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17474,8 +17538,9 @@ def test_set_instance_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17669,18 +17734,21 @@ def test_set_instance_template_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_set_instance_template" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_set_instance_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_set_instance_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_set_instance_template", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_set_instance_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_set_instance_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17737,8 +17805,9 @@ def test_set_target_pools_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17933,18 +18002,20 @@ def test_set_target_pools_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_set_target_pools" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_set_target_pools_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_set_target_pools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_set_target_pools" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_set_target_pools_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_set_target_pools" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18001,8 +18072,9 @@ def test_start_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18196,18 +18268,20 @@ def test_start_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_start_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_start_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_start_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_start_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_start_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_start_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18264,8 +18338,9 @@ def test_stop_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18460,18 +18535,20 @@ def test_stop_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_stop_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_stop_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_stop_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_stop_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_stop_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_stop_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18528,8 +18605,9 @@ def test_suspend_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18724,18 +18802,20 @@ def test_suspend_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_suspend_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_suspend_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_suspend_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_suspend_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_suspend_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_suspend_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18788,8 +18868,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18930,18 +19011,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19000,8 +19083,9 @@ def test_update_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19329,17 +19413,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19396,8 +19482,9 @@ def test_update_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19605,20 +19692,22 @@ def test_update_per_instance_configs_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, - "post_update_per_instance_configs", - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_update_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "pre_update_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_update_per_instance_configs", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_update_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_update_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20345,11 +20434,14 @@ def test_instance_group_managers_base_transport(): def test_instance_group_managers_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.instance_group_managers.transports.InstanceGroupManagersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.instance_group_managers.transports.InstanceGroupManagersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceGroupManagersTransport( @@ -20369,9 +20461,12 @@ def test_instance_group_managers_base_transport_with_credentials_file(): def test_instance_group_managers_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.instance_group_managers.transports.InstanceGroupManagersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.instance_group_managers.transports.InstanceGroupManagersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceGroupManagersTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_groups.py index df8c8159315f..89c5cbfcb338 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -902,10 +902,9 @@ def test_instance_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +949,9 @@ def test_instance_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +987,9 @@ def test_instance_groups_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3440,10 +3437,10 @@ def test_list_instances_rest_pager(transport: str = "rest"): "zone": "sample2", "instance_group": "sample3", } - sample_request[ - "instance_groups_list_instances_request_resource" - ] = compute.InstanceGroupsListInstancesRequest( - instance_state="instance_state_value" + sample_request["instance_groups_list_instances_request_resource"] = ( + compute.InstanceGroupsListInstancesRequest( + instance_state="instance_state_value" + ) ) pager = client.list_instances(request=sample_request) @@ -3478,9 +3475,9 @@ def test_remove_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_instances] = ( + mock_rpc + ) request = {} client.remove_instances(request) @@ -3697,9 +3694,9 @@ def test_remove_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_instances] = ( + mock_rpc + ) request = {} client.remove_instances_unary(request) @@ -4352,9 +4349,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4641,8 +4638,9 @@ def test_add_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4836,17 +4834,19 @@ def test_add_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_add_instances" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_add_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_add_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_add_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_add_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_add_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4899,8 +4899,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4971,17 +4972,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5041,8 +5045,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteInstanceGroupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5151,17 +5156,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5216,8 +5223,9 @@ def test_get_rest_bad_request(request_type=compute.GetInstanceGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5306,17 +5314,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstanceGroupsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstanceGroupsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5367,8 +5373,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertInstanceGroupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5559,17 +5566,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5620,8 +5629,9 @@ def test_list_rest_bad_request(request_type=compute.ListInstanceGroupsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5690,17 +5700,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstanceGroupsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5757,8 +5767,9 @@ def test_list_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5916,17 +5927,20 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, + "post_list_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5988,8 +6002,9 @@ def test_remove_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6183,17 +6198,20 @@ def test_remove_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_remove_instances" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_remove_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_remove_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_remove_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, + "post_remove_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_remove_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6250,8 +6268,9 @@ def test_set_named_ports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6446,17 +6465,20 @@ def test_set_named_ports_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_set_named_ports" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_set_named_ports_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_set_named_ports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_set_named_ports" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, + "post_set_named_ports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_set_named_ports" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6509,8 +6531,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6651,18 +6674,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6966,11 +6991,14 @@ def test_instance_groups_base_transport(): def test_instance_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.instance_groups.transports.InstanceGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.instance_groups.transports.InstanceGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceGroupsTransport( @@ -6990,9 +7018,12 @@ def test_instance_groups_base_transport_with_credentials_file(): def test_instance_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.instance_groups.transports.InstanceGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.instance_groups.transports.InstanceGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceGroupsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_settings_service.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_settings_service.py index 3cd0b1cfe266..97067a7062f3 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_settings_service.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -940,10 +940,9 @@ def test_instance_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_instance_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_instance_settings_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1906,8 +1903,9 @@ def test_get_rest_bad_request(request_type=compute.GetInstanceSettingRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1974,17 +1972,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstanceSettingsServiceClient(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.InstanceSettingsServiceRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstanceSettingsServiceRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceSettingsServiceRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceSettingsServiceRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InstanceSettingsServiceRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceSettingsServiceRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2035,8 +2035,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchInstanceSettingRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2220,17 +2221,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = InstanceSettingsServiceClient(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.InstanceSettingsServiceRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.InstanceSettingsServiceRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceSettingsServiceRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceSettingsServiceRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.InstanceSettingsServiceRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceSettingsServiceRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2362,11 +2366,14 @@ def test_instance_settings_service_base_transport(): def test_instance_settings_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.instance_settings_service.transports.InstanceSettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.instance_settings_service.transports.InstanceSettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceSettingsServiceTransport( @@ -2386,9 +2393,12 @@ def test_instance_settings_service_base_transport_with_credentials_file(): def test_instance_settings_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.instance_settings_service.transports.InstanceSettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.instance_settings_service.transports.InstanceSettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceSettingsServiceTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_templates.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_templates.py index 3cf62472ef7b..733215e3f5a0 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_templates.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instance_templates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,22 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.cloud.compute_v1beta.services.instance_templates import ( InstanceTemplatesClient, @@ -926,10 +926,9 @@ def test_instance_templates_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -974,10 +973,9 @@ def test_instance_templates_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1013,10 +1011,9 @@ def test_instance_templates_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3118,9 +3115,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3392,8 +3389,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3462,18 +3460,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3529,8 +3529,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteInstanceTemplateRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3635,17 +3636,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3696,8 +3699,9 @@ def test_get_rest_bad_request(request_type=compute.GetInstanceTemplateRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3774,17 +3778,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3837,8 +3843,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3905,17 +3912,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3966,8 +3976,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertInstanceTemplateRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4367,17 +4378,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4428,8 +4441,9 @@ def test_list_rest_bad_request(request_type=compute.ListInstanceTemplatesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4498,17 +4512,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4563,8 +4579,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4747,17 +4764,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4810,8 +4830,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4952,18 +4973,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5225,11 +5248,14 @@ def test_instance_templates_base_transport(): def test_instance_templates_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.instance_templates.transports.InstanceTemplatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.instance_templates.transports.InstanceTemplatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceTemplatesTransport( @@ -5249,9 +5275,12 @@ def test_instance_templates_base_transport_with_credentials_file(): def test_instance_templates_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.instance_templates.transports.InstanceTemplatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.instance_templates.transports.InstanceTemplatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceTemplatesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instances.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instances.py index ed9538e1ca27..00f8d16db0ec 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instances.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,22 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.cloud.compute_v1beta.services.instances import ( InstancesClient, @@ -874,10 +874,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -922,10 +921,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -961,10 +959,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1141,9 +1138,9 @@ def test_add_access_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_access_config] = ( + mock_rpc + ) request = {} client.add_access_config(request) @@ -1385,9 +1382,9 @@ def test_add_access_config_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_access_config] = ( + mock_rpc + ) request = {} client.add_access_config_unary(request) @@ -1632,9 +1629,9 @@ def test_add_network_interface_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_network_interface - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_network_interface] = ( + mock_rpc + ) request = {} client.add_network_interface(request) @@ -1858,9 +1855,9 @@ def test_add_network_interface_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_network_interface - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_network_interface] = ( + mock_rpc + ) request = {} client.add_network_interface_unary(request) @@ -2084,9 +2081,9 @@ def test_add_resource_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies(request) @@ -2306,9 +2303,9 @@ def test_add_resource_policies_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies_unary(request) @@ -4100,9 +4097,9 @@ def test_delete_access_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_access_config] = ( + mock_rpc + ) request = {} client.delete_access_config(request) @@ -4354,9 +4351,9 @@ def test_delete_access_config_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_access_config] = ( + mock_rpc + ) request = {} client.delete_access_config_unary(request) @@ -5990,9 +5987,9 @@ def test_get_guest_attributes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_guest_attributes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_guest_attributes] = ( + mock_rpc + ) request = {} client.get_guest_attributes(request) @@ -6414,9 +6411,9 @@ def test_get_partner_metadata_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_partner_metadata - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_partner_metadata] = ( + mock_rpc + ) request = {} client.get_partner_metadata(request) @@ -6827,9 +6824,9 @@ def test_get_serial_port_output_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serial_port_output - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serial_port_output] = ( + mock_rpc + ) request = {} client.get_serial_port_output(request) @@ -8462,9 +8459,9 @@ def test_patch_partner_metadata_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_partner_metadata - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_partner_metadata] = ( + mock_rpc + ) request = {} client.patch_partner_metadata(request) @@ -8684,9 +8681,9 @@ def test_patch_partner_metadata_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_partner_metadata - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_partner_metadata] = ( + mock_rpc + ) request = {} client.patch_partner_metadata_unary(request) @@ -8905,9 +8902,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -9118,9 +9115,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -9776,9 +9773,9 @@ def test_report_host_as_faulty_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_host_as_faulty - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_host_as_faulty] = ( + mock_rpc + ) request = {} client.report_host_as_faulty(request) @@ -9998,9 +9995,9 @@ def test_report_host_as_faulty_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_host_as_faulty - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_host_as_faulty] = ( + mock_rpc + ) request = {} client.report_host_as_faulty_unary(request) @@ -11709,9 +11706,9 @@ def test_set_disk_auto_delete_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_disk_auto_delete - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_disk_auto_delete] = ( + mock_rpc + ) request = {} client.set_disk_auto_delete(request) @@ -11963,9 +11960,9 @@ def test_set_disk_auto_delete_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_disk_auto_delete - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_disk_auto_delete] = ( + mock_rpc + ) request = {} client.set_disk_auto_delete_unary(request) @@ -12861,9 +12858,9 @@ def test_set_machine_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_resources] = ( + mock_rpc + ) request = {} client.set_machine_resources(request) @@ -13083,9 +13080,9 @@ def test_set_machine_resources_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_resources] = ( + mock_rpc + ) request = {} client.set_machine_resources_unary(request) @@ -13302,9 +13299,9 @@ def test_set_machine_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_type] = ( + mock_rpc + ) request = {} client.set_machine_type(request) @@ -13521,9 +13518,9 @@ def test_set_machine_type_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_type] = ( + mock_rpc + ) request = {} client.set_machine_type_unary(request) @@ -14168,9 +14165,9 @@ def test_set_min_cpu_platform_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_min_cpu_platform - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_min_cpu_platform] = ( + mock_rpc + ) request = {} client.set_min_cpu_platform(request) @@ -14389,9 +14386,9 @@ def test_set_min_cpu_platform_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_min_cpu_platform - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_min_cpu_platform] = ( + mock_rpc + ) request = {} client.set_min_cpu_platform_unary(request) @@ -15468,9 +15465,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -15689,9 +15686,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -15910,9 +15907,9 @@ def test_set_service_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_service_account] = ( + mock_rpc + ) request = {} client.set_service_account(request) @@ -16131,9 +16128,9 @@ def test_set_service_account_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_service_account] = ( + mock_rpc + ) request = {} client.set_service_account_unary(request) @@ -19890,9 +19887,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -20567,9 +20564,9 @@ def test_update_access_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_access_config] = ( + mock_rpc + ) request = {} client.update_access_config(request) @@ -20813,9 +20810,9 @@ def test_update_access_config_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_access_config] = ( + mock_rpc + ) request = {} client.update_access_config_unary(request) @@ -21060,9 +21057,9 @@ def test_update_display_device_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_display_device - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_display_device] = ( + mock_rpc + ) request = {} client.update_display_device(request) @@ -21278,9 +21275,9 @@ def test_update_display_device_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_display_device - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_display_device] = ( + mock_rpc + ) request = {} client.update_display_device_unary(request) @@ -22961,8 +22958,9 @@ def test_add_access_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23148,17 +23146,19 @@ def test_add_access_config_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_add_access_config" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_add_access_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_add_access_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_add_access_config" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_add_access_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_add_access_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23211,8 +23211,9 @@ def test_add_network_interface_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23428,17 +23429,20 @@ def test_add_network_interface_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_add_network_interface" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_add_network_interface_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_add_network_interface" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_add_network_interface" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_add_network_interface_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_add_network_interface" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23491,8 +23495,9 @@ def test_add_resource_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23680,17 +23685,20 @@ def test_add_resource_policies_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_add_resource_policies" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_add_resource_policies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_add_resource_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_add_resource_policies" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_add_resource_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_add_resource_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23743,8 +23751,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23813,17 +23822,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23876,8 +23887,9 @@ def test_attach_disk_rest_bad_request(request_type=compute.AttachDiskInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24108,17 +24120,19 @@ def test_attach_disk_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_attach_disk" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_attach_disk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_attach_disk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_attach_disk" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_attach_disk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_attach_disk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24169,8 +24183,9 @@ def test_bulk_insert_rest_bad_request(request_type=compute.BulkInsertInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24561,17 +24576,19 @@ def test_bulk_insert_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_bulk_insert" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_bulk_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_bulk_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_bulk_insert" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_bulk_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_bulk_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24622,8 +24639,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24726,17 +24744,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24787,8 +24803,9 @@ def test_delete_access_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24891,17 +24908,20 @@ def test_delete_access_config_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_delete_access_config" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_delete_access_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_delete_access_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_delete_access_config" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_delete_access_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_delete_access_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24954,8 +24974,9 @@ def test_delete_network_interface_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25058,18 +25079,20 @@ def test_delete_network_interface_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_delete_network_interface" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_delete_network_interface_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_delete_network_interface" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_delete_network_interface" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_delete_network_interface_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_delete_network_interface" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25120,8 +25143,9 @@ def test_detach_disk_rest_bad_request(request_type=compute.DetachDiskInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25224,17 +25248,19 @@ def test_detach_disk_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_detach_disk" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_detach_disk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_detach_disk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_detach_disk" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_detach_disk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_detach_disk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25285,8 +25311,9 @@ def test_get_rest_bad_request(request_type=compute.GetInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25406,17 +25433,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25467,8 +25492,9 @@ def test_get_effective_firewalls_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25526,18 +25552,20 @@ def test_get_effective_firewalls_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_effective_firewalls" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_get_effective_firewalls_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_effective_firewalls" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_effective_firewalls" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_get_effective_firewalls_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_effective_firewalls" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25595,8 +25623,9 @@ def test_get_guest_attributes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25665,17 +25694,20 @@ def test_get_guest_attributes_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_guest_attributes" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_get_guest_attributes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_guest_attributes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_guest_attributes" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_get_guest_attributes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_guest_attributes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25728,8 +25760,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25794,17 +25827,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25857,8 +25892,9 @@ def test_get_partner_metadata_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25919,17 +25955,20 @@ def test_get_partner_metadata_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_partner_metadata" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_get_partner_metadata_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_partner_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_partner_metadata" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_get_partner_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_partner_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25982,8 +26021,9 @@ def test_get_screenshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26046,17 +26086,19 @@ def test_get_screenshot_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_screenshot" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_get_screenshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_screenshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_screenshot" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_screenshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_screenshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26109,8 +26151,9 @@ def test_get_serial_port_output_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26179,17 +26222,20 @@ def test_get_serial_port_output_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_serial_port_output" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_get_serial_port_output_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_serial_port_output" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_serial_port_output" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_get_serial_port_output_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_serial_port_output" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26242,8 +26288,9 @@ def test_get_shielded_instance_identity_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26304,18 +26351,20 @@ def test_get_shielded_instance_identity_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_shielded_instance_identity" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_get_shielded_instance_identity_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_shielded_instance_identity" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_shielded_instance_identity" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_get_shielded_instance_identity_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_shielded_instance_identity" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26370,8 +26419,9 @@ def test_get_shielded_vm_identity_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26432,18 +26482,20 @@ def test_get_shielded_vm_identity_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_shielded_vm_identity" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_get_shielded_vm_identity_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_shielded_vm_identity" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_shielded_vm_identity" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_get_shielded_vm_identity_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_shielded_vm_identity" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26494,8 +26546,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26928,17 +26981,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26987,8 +27038,9 @@ def test_list_rest_bad_request(request_type=compute.ListInstancesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27055,17 +27107,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27116,8 +27166,9 @@ def test_list_referrers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27184,17 +27235,19 @@ def test_list_referrers_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_list_referrers" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_list_referrers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_list_referrers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_list_referrers" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_list_referrers_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_list_referrers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27249,8 +27302,9 @@ def test_patch_partner_metadata_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27430,17 +27484,20 @@ def test_patch_partner_metadata_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_patch_partner_metadata" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_patch_partner_metadata_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_patch_partner_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_patch_partner_metadata" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_patch_partner_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_patch_partner_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27493,8 +27550,9 @@ def test_perform_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27597,17 +27655,20 @@ def test_perform_maintenance_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_perform_maintenance" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_perform_maintenance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_perform_maintenance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_perform_maintenance" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_perform_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_perform_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27660,8 +27721,9 @@ def test_remove_resource_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27849,18 +27911,20 @@ def test_remove_resource_policies_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_remove_resource_policies" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_remove_resource_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_remove_resource_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_remove_resource_policies" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_remove_resource_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_remove_resource_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27913,8 +27977,9 @@ def test_report_host_as_faulty_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28105,17 +28170,20 @@ def test_report_host_as_faulty_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_report_host_as_faulty" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_report_host_as_faulty_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_report_host_as_faulty" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_report_host_as_faulty" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_report_host_as_faulty_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_report_host_as_faulty" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28166,8 +28234,9 @@ def test_reset_rest_bad_request(request_type=compute.ResetInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28270,17 +28339,15 @@ def test_reset_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_reset" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_reset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_reset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_reset") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_reset_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_reset") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28329,8 +28396,9 @@ def test_resume_rest_bad_request(request_type=compute.ResumeInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28523,17 +28591,15 @@ def test_resume_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_resume" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_resume_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_resume" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_resume") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_resume_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_resume") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28584,8 +28650,9 @@ def test_send_diagnostic_interrupt_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28643,18 +28710,20 @@ def test_send_diagnostic_interrupt_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_send_diagnostic_interrupt" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_send_diagnostic_interrupt_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_send_diagnostic_interrupt" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_send_diagnostic_interrupt" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_send_diagnostic_interrupt_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_send_diagnostic_interrupt" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28712,8 +28781,9 @@ def test_set_deletion_protection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28816,18 +28886,20 @@ def test_set_deletion_protection_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_deletion_protection" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_set_deletion_protection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_deletion_protection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_deletion_protection" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_deletion_protection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_deletion_protection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28880,8 +28952,9 @@ def test_set_disk_auto_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28984,17 +29057,20 @@ def test_set_disk_auto_delete_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_disk_auto_delete" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_disk_auto_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_disk_auto_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_disk_auto_delete" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_disk_auto_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_disk_auto_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29047,8 +29123,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29229,17 +29306,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29290,8 +29369,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsInstanceReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29475,17 +29555,17 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_set_labels") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29538,8 +29618,9 @@ def test_set_machine_resources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29729,17 +29810,20 @@ def test_set_machine_resources_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_machine_resources" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_machine_resources_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_machine_resources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_machine_resources" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_machine_resources_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_machine_resources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29792,8 +29876,9 @@ def test_set_machine_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29981,17 +30066,19 @@ def test_set_machine_type_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_machine_type" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_machine_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_machine_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_machine_type" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_machine_type_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_machine_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30042,8 +30129,9 @@ def test_set_metadata_rest_bad_request(request_type=compute.SetMetadataInstanceR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30218,17 +30306,19 @@ def test_set_metadata_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_metadata" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_metadata_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_metadata" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_metadata_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30281,8 +30371,9 @@ def test_set_min_cpu_platform_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30470,17 +30561,20 @@ def test_set_min_cpu_platform_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_min_cpu_platform" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_min_cpu_platform_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_min_cpu_platform" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_min_cpu_platform" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_min_cpu_platform_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_min_cpu_platform" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30531,8 +30625,9 @@ def test_set_name_rest_bad_request(request_type=compute.SetNameInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30714,17 +30809,15 @@ def test_set_name_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_name" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_name_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_name" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_set_name") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_name_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_set_name") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30775,8 +30868,9 @@ def test_set_scheduling_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30975,17 +31069,19 @@ def test_set_scheduling_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_scheduling" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_scheduling_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_scheduling" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_scheduling" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_scheduling_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_scheduling" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31038,8 +31134,9 @@ def test_set_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31231,17 +31328,20 @@ def test_set_security_policy_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_security_policy" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_security_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_security_policy" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31294,8 +31394,9 @@ def test_set_service_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31484,17 +31585,20 @@ def test_set_service_account_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_service_account" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_service_account_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_service_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_service_account" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_service_account_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_service_account" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31547,8 +31651,9 @@ def test_set_shielded_instance_integrity_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31736,20 +31841,22 @@ def test_set_shielded_instance_integrity_policy_rest_interceptors(null_intercept ) client = InstancesClient(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.InstancesRestInterceptor, - "post_set_shielded_instance_integrity_policy", - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_set_shielded_instance_integrity_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, - "pre_set_shielded_instance_integrity_policy", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_shielded_instance_integrity_policy", + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_shielded_instance_integrity_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, + "pre_set_shielded_instance_integrity_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31802,8 +31909,9 @@ def test_set_shielded_vm_integrity_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31986,18 +32094,20 @@ def test_set_shielded_vm_integrity_policy_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_shielded_vm_integrity_policy" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_set_shielded_vm_integrity_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_shielded_vm_integrity_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_shielded_vm_integrity_policy" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_shielded_vm_integrity_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_shielded_vm_integrity_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32048,8 +32158,9 @@ def test_set_tags_rest_bad_request(request_type=compute.SetTagsInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32223,17 +32334,15 @@ def test_set_tags_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_tags" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_tags_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_tags" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_set_tags") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_tags_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_set_tags") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32284,8 +32393,9 @@ def test_simulate_maintenance_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32388,18 +32498,20 @@ def test_simulate_maintenance_event_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_simulate_maintenance_event" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_simulate_maintenance_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_simulate_maintenance_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_simulate_maintenance_event" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_simulate_maintenance_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_simulate_maintenance_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32450,8 +32562,9 @@ def test_start_rest_bad_request(request_type=compute.StartInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32554,17 +32667,15 @@ def test_start_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_start" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_start_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_start" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_start") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_start_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_start") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32615,8 +32726,9 @@ def test_start_with_encryption_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32815,18 +32927,20 @@ def test_start_with_encryption_key_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_start_with_encryption_key" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_start_with_encryption_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_start_with_encryption_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_start_with_encryption_key" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_start_with_encryption_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_start_with_encryption_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32877,8 +32991,9 @@ def test_stop_rest_bad_request(request_type=compute.StopInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32981,17 +33096,15 @@ def test_stop_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_stop" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_stop_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_stop" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_stop") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_stop_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_stop") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33040,8 +33153,9 @@ def test_suspend_rest_bad_request(request_type=compute.SuspendInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33144,17 +33258,15 @@ def test_suspend_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_suspend" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_suspend_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_suspend" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_suspend") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_suspend_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_suspend") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33205,8 +33317,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33345,17 +33458,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33408,8 +33524,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33842,17 +33959,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_update") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33903,8 +34018,9 @@ def test_update_access_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34090,17 +34206,20 @@ def test_update_access_config_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_update_access_config" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_update_access_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_update_access_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_update_access_config" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_update_access_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_update_access_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34153,8 +34272,9 @@ def test_update_display_device_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34329,17 +34449,20 @@ def test_update_display_device_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_update_display_device" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_update_display_device_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_update_display_device" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_update_display_device" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_update_display_device_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_update_display_device" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34392,8 +34515,9 @@ def test_update_network_interface_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34609,18 +34733,20 @@ def test_update_network_interface_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_update_network_interface" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_update_network_interface_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_update_network_interface" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_update_network_interface" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_update_network_interface_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_update_network_interface" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34673,8 +34799,9 @@ def test_update_shielded_instance_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34857,18 +34984,20 @@ def test_update_shielded_instance_config_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_update_shielded_instance_config" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_update_shielded_instance_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_update_shielded_instance_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_update_shielded_instance_config" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_update_shielded_instance_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_update_shielded_instance_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34921,8 +35050,9 @@ def test_update_shielded_vm_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35103,18 +35233,20 @@ def test_update_shielded_vm_config_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_update_shielded_vm_config" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_update_shielded_vm_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_update_shielded_vm_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_update_shielded_vm_config" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_update_shielded_vm_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_update_shielded_vm_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36444,11 +36576,14 @@ def test_instances_base_transport(): def test_instances_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.instances.transports.InstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.instances.transports.InstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstancesTransport( @@ -36468,9 +36603,12 @@ def test_instances_base_transport_with_credentials_file(): def test_instances_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.instances.transports.InstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.instances.transports.InstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstancesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instant_snapshots.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instant_snapshots.py index c977525b7137..7786c1a63494 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instant_snapshots.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_instant_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_instant_snapshots_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_instant_snapshots_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_instant_snapshots_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3615,9 +3612,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3900,8 +3897,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3972,17 +3970,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4042,8 +4043,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteInstantSnapshotReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4152,17 +4154,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4217,8 +4221,9 @@ def test_get_rest_bad_request(request_type=compute.GetInstantSnapshotRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4317,17 +4322,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstantSnapshotsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4380,8 +4385,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4448,17 +4454,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4509,8 +4518,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertInstantSnapshotReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4709,17 +4719,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4770,8 +4782,9 @@ def test_list_rest_bad_request(request_type=compute.ListInstantSnapshotsRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4840,17 +4853,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4905,8 +4920,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5089,17 +5105,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5152,8 +5171,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5337,17 +5357,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5400,8 +5422,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5542,18 +5565,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5836,11 +5861,14 @@ def test_instant_snapshots_base_transport(): def test_instant_snapshots_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.instant_snapshots.transports.InstantSnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.instant_snapshots.transports.InstantSnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstantSnapshotsTransport( @@ -5860,9 +5888,12 @@ def test_instant_snapshots_base_transport_with_credentials_file(): def test_instant_snapshots_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.instant_snapshots.transports.InstantSnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.instant_snapshots.transports.InstantSnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstantSnapshotsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachment_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachment_groups.py index c8757d1f2f3e..acf027f92dd5 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachment_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachment_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -976,10 +976,9 @@ def test_interconnect_attachment_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1023,9 @@ def test_interconnect_attachment_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1061,9 @@ def test_interconnect_attachment_groups_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1298,9 +1295,9 @@ def test_delete_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -1504,9 +1501,9 @@ def test_delete_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -1706,9 +1703,9 @@ def test_get_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -2065,9 +2062,9 @@ def test_get_operational_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_operational_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_operational_status] = ( + mock_rpc + ) request = {} client.get_operational_status(request) @@ -2105,9 +2102,9 @@ def test_get_operational_status_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -2998,9 +2995,9 @@ def test_patch_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -3230,9 +3227,9 @@ def test_patch_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -3622,9 +3619,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3896,8 +3893,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4002,18 +4000,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4066,8 +4066,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4144,17 +4145,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4212,8 +4216,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4280,18 +4285,21 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_get_iam_policy", + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4344,8 +4352,9 @@ def test_get_operational_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4414,20 +4423,22 @@ def test_get_operational_status_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, - "post_get_operational_status", - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_get_operational_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "pre_get_operational_status", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_get_operational_status", + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_get_operational_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "pre_get_operational_status", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4489,8 +4500,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4727,18 +4739,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4791,8 +4805,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4865,18 +4880,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4934,8 +4951,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5172,18 +5190,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5236,8 +5256,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5420,18 +5441,21 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_set_iam_policy", + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5484,8 +5508,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5628,20 +5653,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, - "post_test_iam_permissions", - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "pre_test_iam_permissions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5926,11 +5953,14 @@ def test_interconnect_attachment_groups_base_transport(): def test_interconnect_attachment_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.interconnect_attachment_groups.transports.InterconnectAttachmentGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.interconnect_attachment_groups.transports.InterconnectAttachmentGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectAttachmentGroupsTransport( @@ -5950,9 +5980,12 @@ def test_interconnect_attachment_groups_base_transport_with_credentials_file(): def test_interconnect_attachment_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.interconnect_attachment_groups.transports.InterconnectAttachmentGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.interconnect_attachment_groups.transports.InterconnectAttachmentGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectAttachmentGroupsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachments.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachments.py index 8495e35b4346..96077ea82876 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachments.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_attachments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_interconnect_attachments_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_interconnect_attachments_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_interconnect_attachments_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3701,9 +3698,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3986,8 +3983,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4058,18 +4056,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4131,8 +4131,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4241,17 +4242,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4306,8 +4310,9 @@ def test_get_rest_bad_request(request_type=compute.GetInterconnectAttachmentRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4472,17 +4477,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4537,8 +4544,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4786,17 +4794,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4847,8 +4858,9 @@ def test_list_rest_bad_request(request_type=compute.ListInterconnectAttachmentsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4917,17 +4929,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4986,8 +5000,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5239,17 +5254,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5302,8 +5320,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5487,18 +5506,20 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, - "post_set_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "post_set_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5551,8 +5572,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5693,18 +5715,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5966,11 +5992,14 @@ def test_interconnect_attachments_base_transport(): def test_interconnect_attachments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.interconnect_attachments.transports.InterconnectAttachmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.interconnect_attachments.transports.InterconnectAttachmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectAttachmentsTransport( @@ -5990,9 +6019,12 @@ def test_interconnect_attachments_base_transport_with_credentials_file(): def test_interconnect_attachments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.interconnect_attachments.transports.InterconnectAttachmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.interconnect_attachments.transports.InterconnectAttachmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectAttachmentsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_groups.py index 43450884f1c7..e231484319b8 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_interconnect_groups_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_interconnect_groups_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_interconnect_groups_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2400,9 +2397,9 @@ def test_get_operational_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_operational_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_operational_status] = ( + mock_rpc + ) request = {} client.get_operational_status(request) @@ -3952,9 +3949,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4226,8 +4223,9 @@ def test_create_members_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4438,18 +4436,20 @@ def test_create_members_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_create_members" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, - "post_create_members_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_create_members" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_create_members" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, + "post_create_members_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_create_members" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4500,8 +4500,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteInterconnectGroupReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4606,17 +4607,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4667,8 +4670,9 @@ def test_get_rest_bad_request(request_type=compute.GetInterconnectGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4743,17 +4747,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4806,8 +4812,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4874,18 +4881,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4938,8 +4947,9 @@ def test_get_operational_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5004,18 +5014,20 @@ def test_get_operational_status_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_get_operational_status" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, - "post_get_operational_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_get_operational_status" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_get_operational_status" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, + "post_get_operational_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_get_operational_status" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5071,8 +5083,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertInterconnectGroupReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5301,17 +5314,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5362,8 +5377,9 @@ def test_list_rest_bad_request(request_type=compute.ListInterconnectGroupsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5436,17 +5452,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5502,8 +5520,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchInterconnectGroupReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5732,17 +5751,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5795,8 +5816,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5979,18 +6001,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6043,8 +6067,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6185,18 +6210,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6502,11 +6529,14 @@ def test_interconnect_groups_base_transport(): def test_interconnect_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.interconnect_groups.transports.InterconnectGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.interconnect_groups.transports.InterconnectGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectGroupsTransport( @@ -6526,9 +6556,12 @@ def test_interconnect_groups_base_transport_with_credentials_file(): def test_interconnect_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.interconnect_groups.transports.InterconnectGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.interconnect_groups.transports.InterconnectGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectGroupsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_locations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_locations.py index ab4a8f499923..c7e40847feaf 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_locations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_locations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -930,10 +935,9 @@ def test_interconnect_locations_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +982,9 @@ def test_interconnect_locations_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1020,9 @@ def test_interconnect_locations_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1726,8 +1728,9 @@ def test_get_rest_bad_request(request_type=compute.GetInterconnectLocationReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1830,17 +1833,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = InterconnectLocationsClient(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.InterconnectLocationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InterconnectLocationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectLocationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectLocationsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InterconnectLocationsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectLocationsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1893,8 +1898,9 @@ def test_list_rest_bad_request(request_type=compute.ListInterconnectLocationsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1963,17 +1969,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = InterconnectLocationsClient(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.InterconnectLocationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InterconnectLocationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectLocationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectLocationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InterconnectLocationsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectLocationsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2107,11 +2115,14 @@ def test_interconnect_locations_base_transport(): def test_interconnect_locations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.interconnect_locations.transports.InterconnectLocationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.interconnect_locations.transports.InterconnectLocationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectLocationsTransport( @@ -2132,9 +2143,12 @@ def test_interconnect_locations_base_transport_with_credentials_file(): def test_interconnect_locations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.interconnect_locations.transports.InterconnectLocationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.interconnect_locations.transports.InterconnectLocationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectLocationsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_remote_locations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_remote_locations.py index 37f31775babc..0599a2450513 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_remote_locations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnect_remote_locations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -967,10 +972,9 @@ def test_interconnect_remote_locations_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1019,9 @@ def test_interconnect_remote_locations_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1054,10 +1057,9 @@ def test_interconnect_remote_locations_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1283,9 +1285,9 @@ def test_get_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectRemoteLocation" - ] = "interconnect_remote_location_value" + jsonified_request["interconnectRemoteLocation"] = ( + "interconnect_remote_location_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -1779,8 +1781,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1879,17 +1882,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = InterconnectRemoteLocationsClient(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.InterconnectRemoteLocationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InterconnectRemoteLocationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectRemoteLocationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectRemoteLocationsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InterconnectRemoteLocationsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectRemoteLocationsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1944,8 +1950,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2014,17 +2021,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = InterconnectRemoteLocationsClient(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.InterconnectRemoteLocationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InterconnectRemoteLocationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectRemoteLocationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectRemoteLocationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InterconnectRemoteLocationsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectRemoteLocationsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2161,11 +2171,14 @@ def test_interconnect_remote_locations_base_transport(): def test_interconnect_remote_locations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.interconnect_remote_locations.transports.InterconnectRemoteLocationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.interconnect_remote_locations.transports.InterconnectRemoteLocationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectRemoteLocationsTransport( @@ -2186,9 +2199,12 @@ def test_interconnect_remote_locations_base_transport_with_credentials_file(): def test_interconnect_remote_locations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.interconnect_remote_locations.transports.InterconnectRemoteLocationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.interconnect_remote_locations.transports.InterconnectRemoteLocationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectRemoteLocationsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnects.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnects.py index 362808dcf41f..b6190f397308 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnects.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_interconnects.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_interconnects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_interconnects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_interconnects_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1941,9 +1938,9 @@ def test_get_macsec_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_macsec_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_macsec_config] = ( + mock_rpc + ) request = {} client.get_macsec_config(request) @@ -3593,9 +3590,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3865,8 +3862,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteInterconnectRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3971,17 +3969,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InterconnectsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4032,8 +4030,9 @@ def test_get_rest_bad_request(request_type=compute.GetInterconnectRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4154,17 +4153,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InterconnectsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InterconnectsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4215,8 +4212,9 @@ def test_get_diagnostics_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4276,17 +4274,20 @@ def test_get_diagnostics_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_get_diagnostics" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_get_diagnostics_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_get_diagnostics" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_get_diagnostics" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, + "post_get_diagnostics_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectsRestInterceptor, "pre_get_diagnostics" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4344,8 +4345,9 @@ def test_get_macsec_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4408,17 +4410,20 @@ def test_get_macsec_config_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_get_macsec_config" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_get_macsec_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_get_macsec_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_get_macsec_config" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, + "post_get_macsec_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectsRestInterceptor, "pre_get_macsec_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4474,8 +4479,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertInterconnectRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4733,17 +4739,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InterconnectsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4794,8 +4800,9 @@ def test_list_rest_bad_request(request_type=compute.ListInterconnectsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4864,17 +4871,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InterconnectsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InterconnectsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4925,8 +4930,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchInterconnectRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5184,17 +5190,17 @@ def test_patch_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InterconnectsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5245,8 +5251,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsInterconnectR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5430,17 +5437,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectsRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5493,8 +5502,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5635,18 +5645,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5931,11 +5943,14 @@ def test_interconnects_base_transport(): def test_interconnects_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.interconnects.transports.InterconnectsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.interconnects.transports.InterconnectsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectsTransport( @@ -5955,9 +5970,12 @@ def test_interconnects_base_transport_with_credentials_file(): def test_interconnects_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.interconnects.transports.InterconnectsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.interconnects.transports.InterconnectsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_license_codes.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_license_codes.py index 6a47722b07fc..1ec1badf5f0d 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_license_codes.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_license_codes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +882,9 @@ def test_license_codes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +929,9 @@ def test_license_codes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +967,9 @@ def test_license_codes_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,9 +1338,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -1608,8 +1610,9 @@ def test_get_rest_bad_request(request_type=compute.GetLicenseCodeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1686,17 +1689,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = LicenseCodesClient(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.LicenseCodesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.LicenseCodesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicenseCodesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LicenseCodesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.LicenseCodesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LicenseCodesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1747,8 +1748,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1889,18 +1891,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = LicenseCodesClient(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.LicenseCodesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.LicenseCodesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseCodesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseCodesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.LicenseCodesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseCodesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2036,11 +2040,14 @@ def test_license_codes_base_transport(): def test_license_codes_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.license_codes.transports.LicenseCodesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.license_codes.transports.LicenseCodesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LicenseCodesTransport( @@ -2061,9 +2068,12 @@ def test_license_codes_base_transport_with_credentials_file(): def test_license_codes_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.license_codes.transports.LicenseCodesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.license_codes.transports.LicenseCodesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LicenseCodesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_licenses.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_licenses.py index 8a7d8902a126..e5a90aa012e5 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_licenses.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_licenses.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -870,10 +870,9 @@ def test_licenses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -918,10 +917,9 @@ def test_licenses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +955,9 @@ def test_licenses_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2813,9 +2810,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3533,8 +3530,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteLicenseRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3637,17 +3635,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LicensesRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LicensesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3696,8 +3692,9 @@ def test_get_rest_bad_request(request_type=compute.GetLicenseRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3798,17 +3795,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LicensesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LicensesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3859,8 +3854,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3925,17 +3921,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicensesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LicensesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3986,8 +3984,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertLicenseRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4190,17 +4189,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LicensesRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LicensesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4249,8 +4246,9 @@ def test_list_rest_bad_request(request_type=compute.ListLicensesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4315,17 +4313,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LicensesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LicensesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4378,8 +4374,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4560,17 +4557,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicensesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LicensesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4623,8 +4622,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4763,17 +4763,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicensesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.LicensesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicensesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4826,8 +4829,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateLicenseRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5030,17 +5034,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LicensesRestInterceptor, "post_update") as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LicensesRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5298,11 +5300,14 @@ def test_licenses_base_transport(): def test_licenses_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.licenses.transports.LicensesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.licenses.transports.LicensesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LicensesTransport( @@ -5322,9 +5327,12 @@ def test_licenses_base_transport_with_credentials_file(): def test_licenses_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.licenses.transports.LicensesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.licenses.transports.LicensesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LicensesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_images.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_images.py index 7707ef6f3f85..821c0d3c3d27 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_images.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_images.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,22 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.cloud.compute_v1beta.services.machine_images import ( MachineImagesClient, @@ -899,10 +899,9 @@ def test_machine_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -947,10 +946,9 @@ def test_machine_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -986,10 +984,9 @@ def test_machine_images_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3228,9 +3225,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3500,8 +3497,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteMachineImageRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3606,17 +3604,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.MachineImagesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3667,8 +3665,9 @@ def test_get_rest_bad_request(request_type=compute.GetMachineImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3757,17 +3756,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.MachineImagesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.MachineImagesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3818,8 +3815,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3886,17 +3884,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MachineImagesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3947,8 +3947,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertMachineImageRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4390,17 +4391,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.MachineImagesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4451,8 +4452,9 @@ def test_list_rest_bad_request(request_type=compute.ListMachineImagesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4521,17 +4523,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.MachineImagesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.MachineImagesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4584,8 +4584,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4768,17 +4769,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MachineImagesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4829,8 +4832,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsMachineImageR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5014,17 +5018,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MachineImagesRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5077,8 +5083,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5219,18 +5226,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MachineImagesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5492,11 +5501,14 @@ def test_machine_images_base_transport(): def test_machine_images_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.machine_images.transports.MachineImagesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.machine_images.transports.MachineImagesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MachineImagesTransport( @@ -5516,9 +5528,12 @@ def test_machine_images_base_transport_with_credentials_file(): def test_machine_images_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.machine_images.transports.MachineImagesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.machine_images.transports.MachineImagesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MachineImagesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_types.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_types.py index fba67b51c627..da8c1732de01 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_types.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_machine_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -878,10 +883,9 @@ def test_machine_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -926,10 +930,9 @@ def test_machine_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +968,9 @@ def test_machine_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1963,8 +1965,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2035,17 +2038,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = MachineTypesClient(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.MachineTypesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.MachineTypesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineTypesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineTypesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.MachineTypesRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MachineTypesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2098,8 +2103,9 @@ def test_get_rest_bad_request(request_type=compute.GetMachineTypeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2188,17 +2194,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = MachineTypesClient(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.MachineTypesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.MachineTypesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineTypesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.MachineTypesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.MachineTypesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.MachineTypesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2247,8 +2251,9 @@ def test_list_rest_bad_request(request_type=compute.ListMachineTypesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2317,17 +2322,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = MachineTypesClient(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.MachineTypesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.MachineTypesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineTypesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.MachineTypesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.MachineTypesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.MachineTypesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2480,11 +2483,14 @@ def test_machine_types_base_transport(): def test_machine_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.machine_types.transports.MachineTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.machine_types.transports.MachineTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MachineTypesTransport( @@ -2505,9 +2511,12 @@ def test_machine_types_base_transport_with_credentials_file(): def test_machine_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.machine_types.transports.MachineTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.machine_types.transports.MachineTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MachineTypesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_attachments.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_attachments.py index 45e07526678a..76c73eb4b9c6 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_attachments.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_attachments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_network_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_network_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_network_attachments_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3661,9 +3658,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3946,8 +3943,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4016,18 +4014,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4087,8 +4087,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteNetworkAttachmentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4197,17 +4198,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4262,8 +4265,9 @@ def test_get_rest_bad_request(request_type=compute.GetNetworkAttachmentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4356,17 +4360,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4419,8 +4425,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4487,18 +4494,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4549,8 +4558,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertNetworkAttachmentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4764,17 +4774,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4825,8 +4837,9 @@ def test_list_rest_bad_request(request_type=compute.ListNetworkAttachmentsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4895,17 +4908,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4962,8 +4977,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchNetworkAttachmentReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5181,17 +5197,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5244,8 +5262,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5428,18 +5447,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5492,8 +5513,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5634,18 +5656,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5928,11 +5952,14 @@ def test_network_attachments_base_transport(): def test_network_attachments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.network_attachments.transports.NetworkAttachmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.network_attachments.transports.NetworkAttachmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkAttachmentsTransport( @@ -5952,9 +5979,12 @@ def test_network_attachments_base_transport_with_credentials_file(): def test_network_attachments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.network_attachments.transports.NetworkAttachmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.network_attachments.transports.NetworkAttachmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkAttachmentsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_edge_security_services.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_edge_security_services.py index 135fa8bf5c0e..4a8d98277501 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_edge_security_services.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_edge_security_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_network_edge_security_services_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_network_edge_security_services_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_network_edge_security_services_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1576,9 +1573,9 @@ def test_delete_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -1790,9 +1787,9 @@ def test_delete_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -2000,9 +1997,9 @@ def test_get_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -2644,9 +2641,9 @@ def test_patch_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -2878,9 +2875,9 @@ def test_patch_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -3141,8 +3138,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3215,18 +3213,21 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NetworkEdgeSecurityServicesClient(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.NetworkEdgeSecurityServicesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, + "post_aggregated_list", + ) as post, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3288,8 +3289,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3398,18 +3400,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NetworkEdgeSecurityServicesClient(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.NetworkEdgeSecurityServicesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3466,8 +3470,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3552,17 +3557,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = NetworkEdgeSecurityServicesClient(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.NetworkEdgeSecurityServicesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3617,8 +3625,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3813,18 +3822,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NetworkEdgeSecurityServicesClient(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.NetworkEdgeSecurityServicesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3881,8 +3892,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4081,18 +4093,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = NetworkEdgeSecurityServicesClient(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.NetworkEdgeSecurityServicesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4287,11 +4301,14 @@ def test_network_edge_security_services_base_transport(): def test_network_edge_security_services_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.network_edge_security_services.transports.NetworkEdgeSecurityServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.network_edge_security_services.transports.NetworkEdgeSecurityServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkEdgeSecurityServicesTransport( @@ -4311,9 +4328,12 @@ def test_network_edge_security_services_base_transport_with_credentials_file(): def test_network_edge_security_services_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.network_edge_security_services.transports.NetworkEdgeSecurityServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.network_edge_security_services.transports.NetworkEdgeSecurityServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkEdgeSecurityServicesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_endpoint_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_endpoint_groups.py index dee183dbac64..9de673429c51 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_endpoint_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_endpoint_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3700,9 +3697,9 @@ def test_list_network_endpoints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_endpoints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_endpoints] = ( + mock_rpc + ) request = {} client.list_network_endpoints(request) @@ -3982,16 +3979,16 @@ def test_list_network_endpoints_rest_pager(transport: str = "rest"): "zone": "sample2", "network_endpoint_group": "sample3", } - sample_request[ - "network_endpoint_groups_list_endpoints_request_resource" - ] = compute.NetworkEndpointGroupsListEndpointsRequest( - endpoint_filters=[ - compute.NetworkEndpointGroupsListEndpointsRequestNetworkEndpointFilter( - network_endpoint=compute.NetworkEndpoint( - annotations={"key_value": "value_value"} + sample_request["network_endpoint_groups_list_endpoints_request_resource"] = ( + compute.NetworkEndpointGroupsListEndpointsRequest( + endpoint_filters=[ + compute.NetworkEndpointGroupsListEndpointsRequestNetworkEndpointFilter( + network_endpoint=compute.NetworkEndpoint( + annotations={"key_value": "value_value"} + ) ) - ) - ] + ] + ) ) pager = client.list_network_endpoints(request=sample_request) @@ -4030,9 +4027,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4315,8 +4312,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4387,18 +4385,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4460,8 +4460,9 @@ def test_attach_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4665,18 +4666,22 @@ def test_attach_network_endpoints_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_attach_network_endpoints" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, - "post_attach_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_attach_network_endpoints" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_attach_network_endpoints", + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_attach_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "pre_attach_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4733,8 +4738,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4843,17 +4849,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4910,8 +4918,9 @@ def test_detach_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5115,18 +5124,22 @@ def test_detach_network_endpoints_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_detach_network_endpoints" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, - "post_detach_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_detach_network_endpoints" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_detach_network_endpoints", + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_detach_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "pre_detach_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5181,8 +5194,9 @@ def test_get_rest_bad_request(request_type=compute.GetNetworkEndpointGroupReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5275,17 +5289,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5340,8 +5356,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5567,17 +5584,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5628,8 +5647,9 @@ def test_list_rest_bad_request(request_type=compute.ListNetworkEndpointGroupsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5698,17 +5718,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5767,8 +5789,9 @@ def test_list_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5939,18 +5962,22 @@ def test_list_network_endpoints_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_list_network_endpoints" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, - "post_list_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_list_network_endpoints" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_list_network_endpoints", + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_list_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "pre_list_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6008,8 +6035,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6150,18 +6178,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6450,11 +6480,14 @@ def test_network_endpoint_groups_base_transport(): def test_network_endpoint_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.network_endpoint_groups.transports.NetworkEndpointGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.network_endpoint_groups.transports.NetworkEndpointGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkEndpointGroupsTransport( @@ -6474,9 +6507,12 @@ def test_network_endpoint_groups_base_transport_with_credentials_file(): def test_network_endpoint_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.network_endpoint_groups.transports.NetworkEndpointGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.network_endpoint_groups.transports.NetworkEndpointGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkEndpointGroupsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_firewall_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_firewall_policies.py index 33dc6c556b6d..065983e9cdb1 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_firewall_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_firewall_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_network_firewall_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_network_firewall_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_network_firewall_policies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -6572,9 +6569,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -6784,9 +6781,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -8040,9 +8037,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -8314,8 +8311,9 @@ def test_add_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8505,18 +8503,20 @@ def test_add_association_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_add_association" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_add_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_add_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_add_association" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_add_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_add_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8569,8 +8569,9 @@ def test_add_packet_mirroring_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8815,20 +8816,22 @@ def test_add_packet_mirroring_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, - "post_add_packet_mirroring_rule", - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_add_packet_mirroring_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "pre_add_packet_mirroring_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_add_packet_mirroring_rule", + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_add_packet_mirroring_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "pre_add_packet_mirroring_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8881,8 +8884,9 @@ def test_add_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9127,17 +9131,20 @@ def test_add_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_add_rule" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_add_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_add_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_add_rule" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_add_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_add_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9190,8 +9197,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9262,18 +9270,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9331,8 +9341,9 @@ def test_clone_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9437,18 +9448,20 @@ def test_clone_rules_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_clone_rules" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_clone_rules_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_clone_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_clone_rules" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_clone_rules_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_clone_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9501,8 +9514,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9607,17 +9621,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9668,8 +9685,9 @@ def test_get_rest_bad_request(request_type=compute.GetNetworkFirewallPolicyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9760,17 +9778,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9823,8 +9843,9 @@ def test_get_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9897,18 +9918,20 @@ def test_get_association_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_get_association" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_get_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_get_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_get_association" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_get_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_get_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9963,8 +9986,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10031,18 +10055,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10095,8 +10121,9 @@ def test_get_packet_mirroring_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10187,20 +10214,22 @@ def test_get_packet_mirroring_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, - "post_get_packet_mirroring_rule", - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_get_packet_mirroring_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "pre_get_packet_mirroring_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_get_packet_mirroring_rule", + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_get_packet_mirroring_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "pre_get_packet_mirroring_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10253,8 +10282,9 @@ def test_get_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10345,17 +10375,20 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_get_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_get_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10408,8 +10441,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10689,17 +10723,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10750,8 +10787,9 @@ def test_list_rest_bad_request(request_type=compute.ListNetworkFirewallPoliciesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10818,17 +10856,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10879,8 +10919,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchNetworkFirewallPolicyR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11160,17 +11201,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11223,8 +11267,9 @@ def test_patch_packet_mirroring_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11471,20 +11516,22 @@ def test_patch_packet_mirroring_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, - "post_patch_packet_mirroring_rule", - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_patch_packet_mirroring_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "pre_patch_packet_mirroring_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_patch_packet_mirroring_rule", + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_patch_packet_mirroring_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "pre_patch_packet_mirroring_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11537,8 +11584,9 @@ def test_patch_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11783,18 +11831,20 @@ def test_patch_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_patch_rule" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_patch_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_patch_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_patch_rule" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_patch_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_patch_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11847,8 +11897,9 @@ def test_remove_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11953,18 +12004,20 @@ def test_remove_association_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_remove_association" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_remove_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_remove_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_remove_association" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_remove_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_remove_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12017,8 +12070,9 @@ def test_remove_packet_mirroring_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12123,20 +12177,22 @@ def test_remove_packet_mirroring_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, - "post_remove_packet_mirroring_rule", - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_remove_packet_mirroring_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "pre_remove_packet_mirroring_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_remove_packet_mirroring_rule", + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_remove_packet_mirroring_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "pre_remove_packet_mirroring_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12189,8 +12245,9 @@ def test_remove_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12295,18 +12352,20 @@ def test_remove_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_remove_rule" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_remove_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_remove_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_remove_rule" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_remove_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_remove_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12359,8 +12418,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12543,18 +12603,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12607,8 +12669,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12749,18 +12812,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13305,11 +13372,14 @@ def test_network_firewall_policies_base_transport(): def test_network_firewall_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.network_firewall_policies.transports.NetworkFirewallPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.network_firewall_policies.transports.NetworkFirewallPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkFirewallPoliciesTransport( @@ -13329,9 +13399,12 @@ def test_network_firewall_policies_base_transport_with_credentials_file(): def test_network_firewall_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.network_firewall_policies.transports.NetworkFirewallPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.network_firewall_policies.transports.NetworkFirewallPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkFirewallPoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_profiles.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_profiles.py index 2d2727807528..5f77597a8758 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_profiles.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_network_profiles.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -909,10 +914,9 @@ def test_network_profiles_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +961,9 @@ def test_network_profiles_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +999,9 @@ def test_network_profiles_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1696,8 +1698,9 @@ def test_get_rest_bad_request(request_type=compute.GetNetworkProfileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1774,17 +1777,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = NetworkProfilesClient(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.NetworkProfilesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NetworkProfilesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkProfilesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkProfilesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.NetworkProfilesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworkProfilesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1835,8 +1838,9 @@ def test_list_rest_bad_request(request_type=compute.ListNetworkProfilesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1909,17 +1913,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = NetworkProfilesClient(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.NetworkProfilesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NetworkProfilesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkProfilesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkProfilesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.NetworkProfilesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworkProfilesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2056,11 +2060,14 @@ def test_network_profiles_base_transport(): def test_network_profiles_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.network_profiles.transports.NetworkProfilesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.network_profiles.transports.NetworkProfilesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkProfilesTransport( @@ -2081,9 +2088,12 @@ def test_network_profiles_base_transport_with_credentials_file(): def test_network_profiles_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.network_profiles.transports.NetworkProfilesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.network_profiles.transports.NetworkProfilesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkProfilesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_networks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_networks.py index 4f9e7371c8bb..30e0ce030b15 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_networks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_networks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -870,10 +870,9 @@ def test_networks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -918,10 +917,9 @@ def test_networks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +955,9 @@ def test_networks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3404,9 +3401,9 @@ def test_list_peering_routes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_peering_routes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_peering_routes] = ( + mock_rpc + ) request = {} client.list_peering_routes(request) @@ -4500,9 +4497,9 @@ def test_request_remove_peering_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.request_remove_peering - ] = mock_rpc + client._transport._wrapped_methods[client._transport.request_remove_peering] = ( + mock_rpc + ) request = {} client.request_remove_peering(request) @@ -4711,9 +4708,9 @@ def test_request_remove_peering_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.request_remove_peering - ] = mock_rpc + client._transport._wrapped_methods[client._transport.request_remove_peering] = ( + mock_rpc + ) request = {} client.request_remove_peering_unary(request) @@ -4922,9 +4919,9 @@ def test_switch_to_custom_mode_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switch_to_custom_mode - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switch_to_custom_mode] = ( + mock_rpc + ) request = {} client.switch_to_custom_mode(request) @@ -5125,9 +5122,9 @@ def test_switch_to_custom_mode_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switch_to_custom_mode - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switch_to_custom_mode] = ( + mock_rpc + ) request = {} client.switch_to_custom_mode_unary(request) @@ -5327,9 +5324,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6011,8 +6008,9 @@ def test_add_peering_rest_bad_request(request_type=compute.AddPeeringNetworkRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6226,17 +6224,17 @@ def test_add_peering_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_add_peering" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_add_peering_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_add_peering" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_add_peering" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_add_peering_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworksRestInterceptor, "pre_add_peering") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6289,8 +6287,9 @@ def test_cancel_request_remove_peering_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6478,18 +6477,20 @@ def test_cancel_request_remove_peering_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_cancel_request_remove_peering" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, - "post_cancel_request_remove_peering_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_cancel_request_remove_peering" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_cancel_request_remove_peering" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, + "post_cancel_request_remove_peering_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_cancel_request_remove_peering" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6540,8 +6541,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteNetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6644,17 +6646,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NetworksRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworksRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6703,8 +6703,9 @@ def test_get_rest_bad_request(request_type=compute.GetNetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6800,17 +6801,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NetworksRestInterceptor, "post_get") as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworksRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6861,8 +6860,9 @@ def test_get_effective_firewalls_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6920,17 +6920,20 @@ def test_get_effective_firewalls_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_get_effective_firewalls" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_get_effective_firewalls_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_get_effective_firewalls" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_get_effective_firewalls" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, + "post_get_effective_firewalls_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_get_effective_firewalls" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6986,8 +6989,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertNetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7216,17 +7220,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NetworksRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworksRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7275,8 +7277,9 @@ def test_list_rest_bad_request(request_type=compute.ListNetworksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7343,17 +7346,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NetworksRestInterceptor, "post_list") as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworksRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7404,8 +7405,9 @@ def test_list_peering_routes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7472,17 +7474,19 @@ def test_list_peering_routes_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_list_peering_routes" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_list_peering_routes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_list_peering_routes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_list_peering_routes" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_list_peering_routes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_list_peering_routes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7535,8 +7539,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchNetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7765,17 +7770,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NetworksRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworksRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7826,8 +7829,9 @@ def test_remove_peering_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8011,17 +8015,19 @@ def test_remove_peering_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_remove_peering" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_remove_peering_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_remove_peering" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_remove_peering" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_remove_peering_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_remove_peering" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8074,8 +8080,9 @@ def test_request_remove_peering_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8263,17 +8270,20 @@ def test_request_remove_peering_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_request_remove_peering" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_request_remove_peering_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_request_remove_peering" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_request_remove_peering" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, + "post_request_remove_peering_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_request_remove_peering" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8326,8 +8336,9 @@ def test_switch_to_custom_mode_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8430,17 +8441,20 @@ def test_switch_to_custom_mode_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_switch_to_custom_mode" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_switch_to_custom_mode_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_switch_to_custom_mode" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_switch_to_custom_mode" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, + "post_switch_to_custom_mode_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_switch_to_custom_mode" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8493,8 +8507,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8633,17 +8648,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8698,8 +8716,9 @@ def test_update_peering_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8913,17 +8932,19 @@ def test_update_peering_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_update_peering" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_update_peering_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_update_peering" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_update_peering" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_update_peering_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_update_peering" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9319,11 +9340,14 @@ def test_networks_base_transport(): def test_networks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.networks.transports.NetworksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.networks.transports.NetworksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworksTransport( @@ -9343,9 +9367,12 @@ def test_networks_base_transport_with_credentials_file(): def test_networks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.networks.transports.NetworksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.networks.transports.NetworksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworksTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_groups.py index a895eba9399f..c46e69a51926 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +877,9 @@ def test_node_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +924,9 @@ def test_node_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +962,9 @@ def test_node_groups_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4548,9 +4545,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -4769,9 +4766,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -5199,9 +5196,9 @@ def test_set_node_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_template] = ( + mock_rpc + ) request = {} client.set_node_template(request) @@ -5418,9 +5415,9 @@ def test_set_node_template_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_template] = ( + mock_rpc + ) request = {} client.set_node_template_unary(request) @@ -6083,9 +6080,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6366,8 +6363,9 @@ def test_add_nodes_rest_bad_request(request_type=compute.AddNodesNodeGroupReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6553,17 +6551,17 @@ def test_add_nodes_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_add_nodes" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_add_nodes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_add_nodes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_add_nodes" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_add_nodes_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeGroupsRestInterceptor, "pre_add_nodes") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6616,8 +6614,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6688,17 +6687,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6751,8 +6752,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteNodeGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6857,17 +6859,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeGroupsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeGroupsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6918,8 +6918,9 @@ def test_delete_nodes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7107,17 +7108,19 @@ def test_delete_nodes_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_delete_nodes" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_delete_nodes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_delete_nodes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_delete_nodes" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_delete_nodes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_delete_nodes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7168,8 +7171,9 @@ def test_get_rest_bad_request(request_type=compute.GetNodeGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7258,17 +7262,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeGroupsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeGroupsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7319,8 +7321,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7387,17 +7390,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7448,8 +7453,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertNodeGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7651,17 +7657,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeGroupsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeGroupsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7710,8 +7714,9 @@ def test_list_rest_bad_request(request_type=compute.ListNodeGroupsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7780,17 +7785,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeGroupsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeGroupsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7839,8 +7842,9 @@ def test_list_nodes_rest_bad_request(request_type=compute.ListNodesNodeGroupsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7909,17 +7913,19 @@ def test_list_nodes_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_list_nodes" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_list_nodes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_list_nodes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_list_nodes" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_list_nodes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_list_nodes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7972,8 +7978,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchNodeGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8175,17 +8182,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeGroupsRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeGroupsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8236,8 +8241,9 @@ def test_perform_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8428,17 +8434,20 @@ def test_perform_maintenance_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_perform_maintenance" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_perform_maintenance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_perform_maintenance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_perform_maintenance" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, + "post_perform_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_perform_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8491,8 +8500,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8675,17 +8685,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8738,8 +8750,9 @@ def test_set_node_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8929,17 +8942,19 @@ def test_set_node_template_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_set_node_template" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_set_node_template_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_set_node_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_set_node_template" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_set_node_template_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_set_node_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8992,8 +9007,9 @@ def test_simulate_maintenance_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9183,18 +9199,20 @@ def test_simulate_maintenance_event_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_simulate_maintenance_event" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, - "post_simulate_maintenance_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_simulate_maintenance_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_simulate_maintenance_event" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, + "post_simulate_maintenance_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_simulate_maintenance_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9247,8 +9265,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9389,17 +9408,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9814,11 +9836,14 @@ def test_node_groups_base_transport(): def test_node_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.node_groups.transports.NodeGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.node_groups.transports.NodeGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeGroupsTransport( @@ -9838,9 +9863,12 @@ def test_node_groups_base_transport_with_credentials_file(): def test_node_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.node_groups.transports.NodeGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.node_groups.transports.NodeGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeGroupsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_templates.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_templates.py index c43ed2815452..4f6d95a2d1bb 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_templates.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_templates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_node_templates_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_node_templates_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_node_templates_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3157,9 +3154,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3442,8 +3439,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3514,17 +3512,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3581,8 +3582,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteNodeTemplateRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3691,17 +3693,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeTemplatesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3756,8 +3758,9 @@ def test_get_rest_bad_request(request_type=compute.GetNodeTemplateRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3844,17 +3847,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeTemplatesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeTemplatesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3905,8 +3906,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3973,17 +3975,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4034,8 +4038,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertNodeTemplateRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4235,17 +4240,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeTemplatesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4296,8 +4301,9 @@ def test_list_rest_bad_request(request_type=compute.ListNodeTemplatesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4366,17 +4372,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeTemplatesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeTemplatesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4429,8 +4433,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4613,17 +4618,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4676,8 +4683,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4818,18 +4826,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5091,11 +5101,14 @@ def test_node_templates_base_transport(): def test_node_templates_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.node_templates.transports.NodeTemplatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.node_templates.transports.NodeTemplatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeTemplatesTransport( @@ -5115,9 +5128,12 @@ def test_node_templates_base_transport_with_credentials_file(): def test_node_templates_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.node_templates.transports.NodeTemplatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.node_templates.transports.NodeTemplatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeTemplatesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_types.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_types.py index 7645a420c574..55054ac2c5c7 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_types.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_node_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -868,10 +873,9 @@ def test_node_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -916,10 +920,9 @@ def test_node_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +958,9 @@ def test_node_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1950,8 +1952,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2020,17 +2023,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NodeTypesClient(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.NodeTypesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NodeTypesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTypesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTypesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.NodeTypesRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeTypesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2083,8 +2088,9 @@ def test_get_rest_bad_request(request_type=compute.GetNodeTypeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2167,17 +2173,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = NodeTypesClient(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.NodeTypesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NodeTypesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTypesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeTypesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.NodeTypesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeTypesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2226,8 +2230,9 @@ def test_list_rest_bad_request(request_type=compute.ListNodeTypesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2294,17 +2299,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = NodeTypesClient(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.NodeTypesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NodeTypesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTypesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeTypesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.NodeTypesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeTypesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2455,11 +2458,14 @@ def test_node_types_base_transport(): def test_node_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.node_types.transports.NodeTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.node_types.transports.NodeTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeTypesTransport( @@ -2480,9 +2486,12 @@ def test_node_types_base_transport_with_credentials_file(): def test_node_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.node_types.transports.NodeTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.node_types.transports.NodeTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeTypesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_organization_security_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_organization_security_policies.py index 11f65ea273ff..49de02ca7b22 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_organization_security_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_organization_security_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -976,10 +976,9 @@ def test_organization_security_policies_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1023,9 @@ def test_organization_security_policies_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1061,9 @@ def test_organization_security_policies_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3879,9 +3876,9 @@ def test_list_associations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_associations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_associations] = ( + mock_rpc + ) request = {} client.list_associations(request) @@ -5210,9 +5207,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -5411,9 +5408,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -6076,8 +6073,9 @@ def test_add_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6268,18 +6266,22 @@ def test_add_association_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_add_association" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_add_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_add_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_add_association", + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_add_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "pre_add_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6332,8 +6334,9 @@ def test_add_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6618,18 +6621,20 @@ def test_add_rule_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_add_rule" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_add_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_add_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_add_rule" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_add_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_add_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6682,8 +6687,9 @@ def test_copy_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6788,18 +6794,20 @@ def test_copy_rules_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_copy_rules" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_copy_rules_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_copy_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_copy_rules" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_copy_rules_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_copy_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6852,8 +6860,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6958,18 +6967,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7022,8 +7033,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7114,17 +7126,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7177,8 +7192,9 @@ def test_get_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7253,18 +7269,22 @@ def test_get_association_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_get_association" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_get_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_get_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_get_association", + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_get_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "pre_get_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7319,8 +7339,9 @@ def test_get_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7403,18 +7424,20 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_get_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_get_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7467,8 +7490,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7862,18 +7886,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7926,8 +7952,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7994,18 +8021,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8058,8 +8087,9 @@ def test_list_associations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8126,18 +8156,22 @@ def test_list_associations_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_list_associations" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_list_associations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_list_associations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_list_associations", + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_list_associations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "pre_list_associations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8199,8 +8233,9 @@ def test_list_preconfigured_expression_sets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8266,20 +8301,22 @@ def test_list_preconfigured_expression_sets_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, - "post_list_preconfigured_expression_sets", - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_list_preconfigured_expression_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "pre_list_preconfigured_expression_sets", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_list_preconfigured_expression_sets", + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_list_preconfigured_expression_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "pre_list_preconfigured_expression_sets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8343,8 +8380,9 @@ def test_move_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8449,18 +8487,20 @@ def test_move_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_move" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_move_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_move" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_move" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_move_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_move" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8513,8 +8553,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8908,18 +8949,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8972,8 +9015,9 @@ def test_patch_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9258,18 +9302,20 @@ def test_patch_rule_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_patch_rule" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_patch_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_patch_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_patch_rule" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_patch_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_patch_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9322,8 +9368,9 @@ def test_remove_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9428,19 +9475,22 @@ def test_remove_association_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, - "post_remove_association", - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_remove_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_remove_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_remove_association", + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_remove_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "pre_remove_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9493,8 +9543,9 @@ def test_remove_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9599,18 +9650,20 @@ def test_remove_rule_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_remove_rule" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_remove_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_remove_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_remove_rule" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_remove_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_remove_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10044,11 +10097,14 @@ def test_organization_security_policies_base_transport(): def test_organization_security_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.organization_security_policies.transports.OrganizationSecurityPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.organization_security_policies.transports.OrganizationSecurityPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrganizationSecurityPoliciesTransport( @@ -10068,9 +10124,12 @@ def test_organization_security_policies_base_transport_with_credentials_file(): def test_organization_security_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.organization_security_policies.transports.OrganizationSecurityPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.organization_security_policies.transports.OrganizationSecurityPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrganizationSecurityPoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_packet_mirrorings.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_packet_mirrorings.py index b707bd0bb797..67041cdefa8c 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_packet_mirrorings.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_packet_mirrorings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_packet_mirrorings_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_packet_mirrorings_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_packet_mirrorings_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3213,9 +3210,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3498,8 +3495,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3570,17 +3568,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3640,8 +3641,9 @@ def test_delete_rest_bad_request(request_type=compute.DeletePacketMirroringReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3750,17 +3752,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3815,8 +3819,9 @@ def test_get_rest_bad_request(request_type=compute.GetPacketMirroringRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3899,17 +3904,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PacketMirroringsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3960,8 +3965,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertPacketMirroringReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4164,17 +4170,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4225,8 +4233,9 @@ def test_list_rest_bad_request(request_type=compute.ListPacketMirroringsRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4295,17 +4304,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4362,8 +4373,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchPacketMirroringRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4570,17 +4582,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4633,8 +4647,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4775,18 +4790,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5027,11 +5044,14 @@ def test_packet_mirrorings_base_transport(): def test_packet_mirrorings_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.packet_mirrorings.transports.PacketMirroringsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.packet_mirrorings.transports.PacketMirroringsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PacketMirroringsTransport( @@ -5051,9 +5071,12 @@ def test_packet_mirrorings_base_transport_with_credentials_file(): def test_packet_mirrorings_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.packet_mirrorings.transports.PacketMirroringsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.packet_mirrorings.transports.PacketMirroringsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PacketMirroringsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_preview_features.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_preview_features.py index 2d486df27999..9e571a8958be 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_preview_features.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_preview_features.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_preview_features_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_preview_features_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_preview_features_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2111,8 +2108,9 @@ def test_get_rest_bad_request(request_type=compute.GetPreviewFeatureRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2187,17 +2185,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = PreviewFeaturesClient(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.PreviewFeaturesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.PreviewFeaturesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PreviewFeaturesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PreviewFeaturesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2248,8 +2246,9 @@ def test_list_rest_bad_request(request_type=compute.ListPreviewFeaturesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2320,17 +2319,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = PreviewFeaturesClient(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.PreviewFeaturesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.PreviewFeaturesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PreviewFeaturesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PreviewFeaturesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2381,8 +2380,9 @@ def test_update_rest_bad_request(request_type=compute.UpdatePreviewFeatureReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2582,17 +2582,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = PreviewFeaturesClient(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.PreviewFeaturesRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.PreviewFeaturesRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PreviewFeaturesRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2745,11 +2747,14 @@ def test_preview_features_base_transport(): def test_preview_features_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.preview_features.transports.PreviewFeaturesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.preview_features.transports.PreviewFeaturesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PreviewFeaturesTransport( @@ -2769,9 +2774,12 @@ def test_preview_features_base_transport_with_credentials_file(): def test_preview_features_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.preview_features.transports.PreviewFeaturesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.preview_features.transports.PreviewFeaturesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PreviewFeaturesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_projects.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_projects.py index cb2f257dff22..ef40b0dc3c54 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_projects.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_projects.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -870,10 +870,9 @@ def test_projects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -918,10 +917,9 @@ def test_projects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +955,9 @@ def test_projects_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1137,9 +1134,9 @@ def test_disable_xpn_host_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_host - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_host] = ( + mock_rpc + ) request = {} client.disable_xpn_host(request) @@ -1323,9 +1320,9 @@ def test_disable_xpn_host_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_host - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_host] = ( + mock_rpc + ) request = {} client.disable_xpn_host_unary(request) @@ -1511,9 +1508,9 @@ def test_disable_xpn_resource_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_resource] = ( + mock_rpc + ) request = {} client.disable_xpn_resource(request) @@ -1714,9 +1711,9 @@ def test_disable_xpn_resource_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_resource] = ( + mock_rpc + ) request = {} client.disable_xpn_resource_unary(request) @@ -2283,9 +2280,9 @@ def test_enable_xpn_resource_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_xpn_resource] = ( + mock_rpc + ) request = {} client.enable_xpn_resource(request) @@ -2486,9 +2483,9 @@ def test_enable_xpn_resource_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_xpn_resource] = ( + mock_rpc + ) request = {} client.enable_xpn_resource_unary(request) @@ -3038,9 +3035,9 @@ def test_get_xpn_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_xpn_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_xpn_resources] = ( + mock_rpc + ) request = {} client.get_xpn_resources(request) @@ -3538,9 +3535,9 @@ def test_list_xpn_hosts_rest_pager(transport: str = "rest"): req.side_effect = return_values sample_request = {"project": "sample1"} - sample_request[ - "projects_list_xpn_hosts_request_resource" - ] = compute.ProjectsListXpnHostsRequest(organization="organization_value") + sample_request["projects_list_xpn_hosts_request_resource"] = ( + compute.ProjectsListXpnHostsRequest(organization="organization_value") + ) pager = client.list_xpn_hosts(request=sample_request) @@ -4366,9 +4363,9 @@ def test_set_cloud_armor_tier_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_cloud_armor_tier - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_cloud_armor_tier] = ( + mock_rpc + ) request = {} client.set_cloud_armor_tier(request) @@ -4569,9 +4566,9 @@ def test_set_cloud_armor_tier_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_cloud_armor_tier - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_cloud_armor_tier] = ( + mock_rpc + ) request = {} client.set_cloud_armor_tier_unary(request) @@ -6470,8 +6467,9 @@ def test_disable_xpn_host_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6574,17 +6572,19 @@ def test_disable_xpn_host_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_disable_xpn_host" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_disable_xpn_host_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_disable_xpn_host" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_disable_xpn_host" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_disable_xpn_host_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_disable_xpn_host" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6637,8 +6637,9 @@ def test_disable_xpn_resource_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6826,17 +6827,20 @@ def test_disable_xpn_resource_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_disable_xpn_resource" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_disable_xpn_resource_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_disable_xpn_resource" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_disable_xpn_resource" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, + "post_disable_xpn_resource_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_disable_xpn_resource" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6889,8 +6893,9 @@ def test_enable_xpn_host_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6993,17 +6998,19 @@ def test_enable_xpn_host_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_enable_xpn_host" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_enable_xpn_host_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_enable_xpn_host" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_enable_xpn_host" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_enable_xpn_host_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_enable_xpn_host" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7056,8 +7063,9 @@ def test_enable_xpn_resource_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7245,17 +7253,19 @@ def test_enable_xpn_resource_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_enable_xpn_resource" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_enable_xpn_resource_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_enable_xpn_resource" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_enable_xpn_resource" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_enable_xpn_resource_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_enable_xpn_resource" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7306,8 +7316,9 @@ def test_get_rest_bad_request(request_type=compute.GetProjectRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7392,17 +7403,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ProjectsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ProjectsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7451,8 +7460,9 @@ def test_get_xpn_host_rest_bad_request(request_type=compute.GetXpnHostProjectReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7537,17 +7547,19 @@ def test_get_xpn_host_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_get_xpn_host" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_get_xpn_host_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_get_xpn_host" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_get_xpn_host" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_get_xpn_host_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_get_xpn_host" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7600,8 +7612,9 @@ def test_get_xpn_resources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7664,17 +7677,19 @@ def test_get_xpn_resources_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_get_xpn_resources" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_get_xpn_resources_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_get_xpn_resources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_get_xpn_resources" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_get_xpn_resources_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_get_xpn_resources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7729,8 +7744,9 @@ def test_list_xpn_hosts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7880,17 +7896,19 @@ def test_list_xpn_hosts_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_list_xpn_hosts" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_list_xpn_hosts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_list_xpn_hosts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_list_xpn_hosts" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_list_xpn_hosts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_list_xpn_hosts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7941,8 +7959,9 @@ def test_move_disk_rest_bad_request(request_type=compute.MoveDiskProjectRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8122,17 +8141,15 @@ def test_move_disk_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_move_disk" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_move_disk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_move_disk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ProjectsRestInterceptor, "post_move_disk") as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_move_disk_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ProjectsRestInterceptor, "pre_move_disk") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8183,8 +8200,9 @@ def test_move_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8366,17 +8384,19 @@ def test_move_instance_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_move_instance" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_move_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_move_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_move_instance" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_move_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_move_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8429,8 +8449,9 @@ def test_set_cloud_armor_tier_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8618,17 +8639,20 @@ def test_set_cloud_armor_tier_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_set_cloud_armor_tier" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_set_cloud_armor_tier_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_set_cloud_armor_tier" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_set_cloud_armor_tier" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, + "post_set_cloud_armor_tier_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_set_cloud_armor_tier" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8681,8 +8705,9 @@ def test_set_common_instance_metadata_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8859,18 +8884,20 @@ def test_set_common_instance_metadata_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_set_common_instance_metadata" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, - "post_set_common_instance_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_set_common_instance_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_set_common_instance_metadata" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, + "post_set_common_instance_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_set_common_instance_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8923,8 +8950,9 @@ def test_set_default_network_tier_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9112,18 +9140,20 @@ def test_set_default_network_tier_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_set_default_network_tier" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, - "post_set_default_network_tier_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_set_default_network_tier" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_set_default_network_tier" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, + "post_set_default_network_tier_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_set_default_network_tier" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9176,8 +9206,9 @@ def test_set_managed_protection_tier_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9365,18 +9396,20 @@ def test_set_managed_protection_tier_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_set_managed_protection_tier" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, - "post_set_managed_protection_tier_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_set_managed_protection_tier" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_set_managed_protection_tier" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, + "post_set_managed_protection_tier_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_set_managed_protection_tier" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9429,8 +9462,9 @@ def test_set_usage_export_bucket_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9612,17 +9646,20 @@ def test_set_usage_export_bucket_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_set_usage_export_bucket" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_set_usage_export_bucket_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_set_usage_export_bucket" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_set_usage_export_bucket" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, + "post_set_usage_export_bucket_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_set_usage_export_bucket" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10043,11 +10080,14 @@ def test_projects_base_transport(): def test_projects_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.projects.transports.ProjectsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.projects.transports.ProjectsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectsTransport( @@ -10067,9 +10107,12 @@ def test_projects_base_transport_with_credentials_file(): def test_projects_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.projects.transports.ProjectsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.projects.transports.ProjectsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_advertised_prefixes.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_advertised_prefixes.py index 9fe4d046360d..4b5f95cb3a94 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_advertised_prefixes.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_advertised_prefixes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -945,10 +945,9 @@ def test_public_advertised_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +992,9 @@ def test_public_advertised_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1030,9 @@ def test_public_advertised_prefixes_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3763,8 +3760,9 @@ def test_announce_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3869,18 +3867,20 @@ def test_announce_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_announce" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, - "post_announce_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_announce" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_announce" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, + "post_announce_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_announce" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3933,8 +3933,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4039,17 +4040,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4100,8 +4104,9 @@ def test_get_rest_bad_request(request_type=compute.GetPublicAdvertisedPrefixeReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4190,17 +4195,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4255,8 +4262,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4461,17 +4469,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4524,8 +4535,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4594,17 +4606,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4659,8 +4674,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4865,17 +4881,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4928,8 +4947,9 @@ def test_withdraw_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5034,18 +5054,20 @@ def test_withdraw_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_withdraw" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, - "post_withdraw_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_withdraw" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_withdraw" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, + "post_withdraw_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_withdraw" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5282,11 +5304,14 @@ def test_public_advertised_prefixes_base_transport(): def test_public_advertised_prefixes_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.public_advertised_prefixes.transports.PublicAdvertisedPrefixesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.public_advertised_prefixes.transports.PublicAdvertisedPrefixesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PublicAdvertisedPrefixesTransport( @@ -5306,9 +5331,12 @@ def test_public_advertised_prefixes_base_transport_with_credentials_file(): def test_public_advertised_prefixes_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.public_advertised_prefixes.transports.PublicAdvertisedPrefixesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.public_advertised_prefixes.transports.PublicAdvertisedPrefixesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PublicAdvertisedPrefixesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_delegated_prefixes.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_delegated_prefixes.py index a8a00a1e0f48..cdebb238749e 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_delegated_prefixes.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_public_delegated_prefixes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4141,8 +4138,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4213,18 +4211,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4286,8 +4286,9 @@ def test_announce_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4396,17 +4397,20 @@ def test_announce_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_announce" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_announce_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_announce" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_announce" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, + "post_announce_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_announce" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4463,8 +4467,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4573,17 +4578,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4638,8 +4646,9 @@ def test_get_rest_bad_request(request_type=compute.GetPublicDelegatedPrefixeRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4738,17 +4747,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4803,8 +4814,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5018,17 +5030,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5079,8 +5094,9 @@ def test_list_rest_bad_request(request_type=compute.ListPublicDelegatedPrefixesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5149,17 +5165,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5218,8 +5236,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5437,17 +5456,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5504,8 +5526,9 @@ def test_withdraw_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5614,17 +5637,20 @@ def test_withdraw_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_withdraw" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_withdraw_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_withdraw" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_withdraw" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, + "post_withdraw_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_withdraw" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5882,11 +5908,14 @@ def test_public_delegated_prefixes_base_transport(): def test_public_delegated_prefixes_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.public_delegated_prefixes.transports.PublicDelegatedPrefixesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.public_delegated_prefixes.transports.PublicDelegatedPrefixesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PublicDelegatedPrefixesTransport( @@ -5906,9 +5935,12 @@ def test_public_delegated_prefixes_base_transport_with_credentials_file(): def test_public_delegated_prefixes_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.public_delegated_prefixes.transports.PublicDelegatedPrefixesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.public_delegated_prefixes.transports.PublicDelegatedPrefixesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PublicDelegatedPrefixesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_autoscalers.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_autoscalers.py index dd453730e832..b6155ac067f3 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_autoscalers.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_autoscalers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_region_autoscalers_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_region_autoscalers_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_region_autoscalers_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2929,9 +2926,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3644,8 +3641,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionAutoscalerRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3750,17 +3748,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3811,8 +3811,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionAutoscalerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3895,17 +3896,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3956,8 +3959,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionAutoscalerRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4176,17 +4180,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4237,8 +4243,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionAutoscalersRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4307,17 +4314,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4370,8 +4379,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionAutoscalerReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4588,17 +4598,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4651,8 +4663,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4793,18 +4806,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4857,8 +4872,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateRegionAutoscalerRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5077,17 +5093,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5326,11 +5344,14 @@ def test_region_autoscalers_base_transport(): def test_region_autoscalers_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_autoscalers.transports.RegionAutoscalersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_autoscalers.transports.RegionAutoscalersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionAutoscalersTransport( @@ -5350,9 +5371,12 @@ def test_region_autoscalers_base_transport_with_credentials_file(): def test_region_autoscalers_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_autoscalers.transports.RegionAutoscalersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_autoscalers.transports.RegionAutoscalersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionAutoscalersTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_buckets.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_buckets.py index 32e39d0c64c8..e6dff8f8b336 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_buckets.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_buckets.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_region_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_region_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_region_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3656,9 +3653,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3943,8 +3940,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionBackendBucketR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4053,17 +4051,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionBackendBucketsClient(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.RegionBackendBucketsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4118,8 +4118,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionBackendBucketRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4210,17 +4211,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionBackendBucketsClient(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.RegionBackendBucketsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4273,8 +4276,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4341,18 +4345,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = RegionBackendBucketsClient(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.RegionBackendBucketsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4403,8 +4409,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionBackendBucketR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4626,17 +4633,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionBackendBucketsClient(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.RegionBackendBucketsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4687,8 +4696,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionBackendBucketsRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4757,17 +4767,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionBackendBucketsClient(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.RegionBackendBucketsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4820,8 +4832,9 @@ def test_list_usable_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4890,17 +4903,20 @@ def test_list_usable_rest_interceptors(null_interceptor): ) client = RegionBackendBucketsClient(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.RegionBackendBucketsRestInterceptor, "post_list_usable" - ) as post, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "post_list_usable_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "pre_list_usable" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_list_usable" + ) as post, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, + "post_list_usable_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "pre_list_usable" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4957,8 +4973,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionBackendBucketReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5184,17 +5201,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionBackendBucketsClient(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.RegionBackendBucketsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5247,8 +5266,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5431,18 +5451,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = RegionBackendBucketsClient(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.RegionBackendBucketsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5495,8 +5517,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5637,18 +5660,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionBackendBucketsClient(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.RegionBackendBucketsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendBucketsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendBucketsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5931,11 +5956,14 @@ def test_region_backend_buckets_base_transport(): def test_region_backend_buckets_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_backend_buckets.transports.RegionBackendBucketsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_backend_buckets.transports.RegionBackendBucketsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionBackendBucketsTransport( @@ -5955,9 +5983,12 @@ def test_region_backend_buckets_base_transport_with_credentials_file(): def test_region_backend_buckets_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_backend_buckets.transports.RegionBackendBucketsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_backend_buckets.transports.RegionBackendBucketsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionBackendBucketsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_services.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_services.py index 7c887a448cbb..c98aa0238b87 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_services.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_backend_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_region_backend_services_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_region_backend_services_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_region_backend_services_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3849,9 +3846,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -4070,9 +4067,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -4291,9 +4288,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5014,8 +5011,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5124,17 +5122,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5189,8 +5189,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionBackendServiceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5320,17 +5321,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5387,8 +5390,9 @@ def test_get_health_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5531,17 +5535,20 @@ def test_get_health_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_get_health" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_get_health_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_get_health" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_get_health" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, + "post_get_health_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_get_health" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5596,8 +5603,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5664,18 +5672,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5728,8 +5738,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6106,17 +6117,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6167,8 +6180,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionBackendServicesReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6237,17 +6251,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6300,8 +6316,9 @@ def test_list_usable_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6370,18 +6387,20 @@ def test_list_usable_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_list_usable" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, - "post_list_usable_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_list_usable" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_list_usable" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, + "post_list_usable_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_list_usable" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6438,8 +6457,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionBackendServiceRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6820,17 +6840,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6883,8 +6905,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7067,18 +7090,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7135,8 +7160,9 @@ def test_set_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7323,18 +7349,20 @@ def test_set_security_policy_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_set_security_policy" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, - "post_set_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_set_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_set_security_policy" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, + "post_set_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_set_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7387,8 +7415,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7529,18 +7558,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7599,8 +7630,9 @@ def test_update_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7981,17 +8013,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8337,11 +8371,14 @@ def test_region_backend_services_base_transport(): def test_region_backend_services_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_backend_services.transports.RegionBackendServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_backend_services.transports.RegionBackendServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionBackendServicesTransport( @@ -8361,9 +8398,12 @@ def test_region_backend_services_base_transport_with_credentials_file(): def test_region_backend_services_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_backend_services.transports.RegionBackendServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_backend_services.transports.RegionBackendServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionBackendServicesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_commitments.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_commitments.py index e7c20a598a55..2835616df710 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_commitments.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_commitments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_region_commitments_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_region_commitments_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_region_commitments_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2349,9 +2346,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3014,9 +3011,9 @@ def test_update_reservations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_reservations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_reservations] = ( + mock_rpc + ) request = {} client.update_reservations(request) @@ -3247,9 +3244,9 @@ def test_update_reservations_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_reservations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_reservations] = ( + mock_rpc + ) request = {} client.update_reservations_unary(request) @@ -3550,8 +3547,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3622,18 +3620,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = RegionCommitmentsClient(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.RegionCommitmentsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3686,8 +3686,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionCommitmentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3786,17 +3787,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionCommitmentsClient(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.RegionCommitmentsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3847,8 +3850,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionCommitmentRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4174,17 +4178,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionCommitmentsClient(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.RegionCommitmentsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4235,8 +4241,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionCommitmentsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4305,17 +4312,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionCommitmentsClient(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.RegionCommitmentsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4368,8 +4377,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4510,18 +4520,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionCommitmentsClient(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.RegionCommitmentsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4574,8 +4586,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateRegionCommitmentRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4901,17 +4914,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionCommitmentsClient(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.RegionCommitmentsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4964,8 +4979,9 @@ def test_update_reservations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5264,18 +5280,20 @@ def test_update_reservations_rest_interceptors(null_interceptor): ) client = RegionCommitmentsClient(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.RegionCommitmentsRestInterceptor, "post_update_reservations" - ) as post, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, - "post_update_reservations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "pre_update_reservations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_update_reservations" + ) as post, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, + "post_update_reservations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "pre_update_reservations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5516,11 +5534,14 @@ def test_region_commitments_base_transport(): def test_region_commitments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_commitments.transports.RegionCommitmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_commitments.transports.RegionCommitmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionCommitmentsTransport( @@ -5540,9 +5561,12 @@ def test_region_commitments_base_transport_with_credentials_file(): def test_region_commitments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_commitments.transports.RegionCommitmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_commitments.transports.RegionCommitmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionCommitmentsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_composite_health_checks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_composite_health_checks.py index 3b2cecb98cb4..ac9c3ae8ae26 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_composite_health_checks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_composite_health_checks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_composite_health_checks_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_composite_health_checks_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_composite_health_checks_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3270,9 +3267,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3555,8 +3552,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3627,18 +3625,21 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = RegionCompositeHealthChecksClient(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.RegionCompositeHealthChecksRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, + "post_aggregated_list", + ) as post, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3700,8 +3701,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3810,18 +3812,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionCompositeHealthChecksClient(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.RegionCompositeHealthChecksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3878,8 +3882,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3966,17 +3971,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionCompositeHealthChecksClient(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.RegionCompositeHealthChecksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4031,8 +4039,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4225,18 +4234,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionCompositeHealthChecksClient(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.RegionCompositeHealthChecksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4289,8 +4300,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4359,17 +4371,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionCompositeHealthChecksClient(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.RegionCompositeHealthChecksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4428,8 +4443,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4626,18 +4642,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionCompositeHealthChecksClient(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.RegionCompositeHealthChecksRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4690,8 +4708,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4834,20 +4853,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionCompositeHealthChecksClient(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.RegionCompositeHealthChecksRestInterceptor, - "post_test_iam_permissions", - ) as post, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionCompositeHealthChecksRestInterceptor, - "pre_test_iam_permissions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionCompositeHealthChecksRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5088,11 +5109,14 @@ def test_region_composite_health_checks_base_transport(): def test_region_composite_health_checks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_composite_health_checks.transports.RegionCompositeHealthChecksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_composite_health_checks.transports.RegionCompositeHealthChecksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionCompositeHealthChecksTransport( @@ -5112,9 +5136,12 @@ def test_region_composite_health_checks_base_transport_with_credentials_file(): def test_region_composite_health_checks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_composite_health_checks.transports.RegionCompositeHealthChecksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_composite_health_checks.transports.RegionCompositeHealthChecksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionCompositeHealthChecksTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_settings.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_settings.py index 2fddf2791eab..c0cfe9208b65 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_settings.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_settings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -928,10 +928,9 @@ def test_region_disk_settings_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +975,9 @@ def test_region_disk_settings_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1013,9 @@ def test_region_disk_settings_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1914,8 +1911,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionDiskSettingRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1975,17 +1973,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionDiskSettingsClient(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.RegionDiskSettingsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionDiskSettingsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDiskSettingsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDiskSettingsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionDiskSettingsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionDiskSettingsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2036,8 +2036,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionDiskSettingReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2216,17 +2217,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionDiskSettingsClient(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.RegionDiskSettingsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionDiskSettingsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDiskSettingsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDiskSettingsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionDiskSettingsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionDiskSettingsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2358,11 +2361,14 @@ def test_region_disk_settings_base_transport(): def test_region_disk_settings_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_disk_settings.transports.RegionDiskSettingsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_disk_settings.transports.RegionDiskSettingsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionDiskSettingsTransport( @@ -2382,9 +2388,12 @@ def test_region_disk_settings_base_transport_with_credentials_file(): def test_region_disk_settings_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_disk_settings.transports.RegionDiskSettingsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_disk_settings.transports.RegionDiskSettingsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionDiskSettingsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_types.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_types.py index 7a007d4d76cd..84c9bc661f2f 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_types.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disk_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -909,10 +914,9 @@ def test_region_disk_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +961,9 @@ def test_region_disk_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +999,9 @@ def test_region_disk_types_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1716,8 +1718,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionDiskTypeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1798,17 +1801,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionDiskTypesClient(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.RegionDiskTypesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionDiskTypesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDiskTypesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDiskTypesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionDiskTypesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDiskTypesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1859,8 +1862,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionDiskTypesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1929,17 +1933,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionDiskTypesClient(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.RegionDiskTypesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionDiskTypesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDiskTypesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDiskTypesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionDiskTypesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDiskTypesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2071,11 +2075,14 @@ def test_region_disk_types_base_transport(): def test_region_disk_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_disk_types.transports.RegionDiskTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_disk_types.transports.RegionDiskTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionDiskTypesTransport( @@ -2096,9 +2103,12 @@ def test_region_disk_types_base_transport_with_credentials_file(): def test_region_disk_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_disk_types.transports.RegionDiskTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_disk_types.transports.RegionDiskTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionDiskTypesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disks.py index 9fd872039ecd..0f8c35b05689 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_disks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_region_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_region_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_region_disks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1151,9 +1148,9 @@ def test_add_resource_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies(request) @@ -1369,9 +1366,9 @@ def test_add_resource_policies_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies_unary(request) @@ -5859,9 +5856,9 @@ def test_stop_async_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication(request) @@ -6069,9 +6066,9 @@ def test_stop_async_replication_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication_unary(request) @@ -6702,9 +6699,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -7427,8 +7424,9 @@ def test_add_resource_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7618,18 +7616,20 @@ def test_add_resource_policies_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_add_resource_policies" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, - "post_add_resource_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_add_resource_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_add_resource_policies" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, + "post_add_resource_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_add_resource_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7680,8 +7680,9 @@ def test_bulk_insert_rest_bad_request(request_type=compute.BulkInsertRegionDiskR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7864,17 +7865,19 @@ def test_bulk_insert_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_bulk_insert" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_bulk_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_bulk_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_bulk_insert" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_bulk_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_bulk_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7927,8 +7930,9 @@ def test_create_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8150,17 +8154,19 @@ def test_create_snapshot_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_create_snapshot" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_create_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_create_snapshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_create_snapshot" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_create_snapshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_create_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8211,8 +8217,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8317,17 +8324,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionDisksRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDisksRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8378,8 +8383,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8540,17 +8546,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionDisksRestInterceptor, "post_get") as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDisksRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8601,8 +8605,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8669,17 +8674,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8730,8 +8737,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8975,17 +8983,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionDisksRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDisksRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9036,8 +9042,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionDisksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9106,17 +9113,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionDisksRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDisksRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9167,8 +9172,9 @@ def test_remove_resource_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9358,18 +9364,20 @@ def test_remove_resource_policies_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_remove_resource_policies" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, - "post_remove_resource_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_remove_resource_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_remove_resource_policies" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, + "post_remove_resource_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_remove_resource_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9420,8 +9428,9 @@ def test_resize_rest_bad_request(request_type=compute.ResizeRegionDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9604,17 +9613,15 @@ def test_resize_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_resize" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_resize_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_resize" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionDisksRestInterceptor, "post_resize") as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_resize_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDisksRestInterceptor, "pre_resize") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9667,8 +9674,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9851,17 +9859,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9912,8 +9922,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsRegionDiskReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10097,17 +10108,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10160,8 +10173,9 @@ def test_start_async_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10351,18 +10365,20 @@ def test_start_async_replication_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_start_async_replication" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, - "post_start_async_replication_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_start_async_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_start_async_replication" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, + "post_start_async_replication_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_start_async_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10415,8 +10431,9 @@ def test_stop_async_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10521,18 +10538,20 @@ def test_stop_async_replication_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_stop_async_replication" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, - "post_stop_async_replication_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_stop_async_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_stop_async_replication" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, + "post_stop_async_replication_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_stop_async_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10585,8 +10604,9 @@ def test_stop_group_async_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10776,18 +10796,20 @@ def test_stop_group_async_replication_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_stop_group_async_replication" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, - "post_stop_group_async_replication_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_stop_group_async_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_stop_group_async_replication" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, + "post_stop_group_async_replication_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_stop_group_async_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10840,8 +10862,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10982,17 +11005,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11045,8 +11071,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateRegionDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11290,17 +11317,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionDisksRestInterceptor, "post_update") as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDisksRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11759,11 +11784,14 @@ def test_region_disks_base_transport(): def test_region_disks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_disks.transports.RegionDisksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_disks.transports.RegionDisksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionDisksTransport( @@ -11783,9 +11811,12 @@ def test_region_disks_base_transport_with_credentials_file(): def test_region_disks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_disks.transports.RegionDisksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_disks.transports.RegionDisksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionDisksTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_aggregation_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_aggregation_policies.py index 87990b451dfd..93e9a7c0bcfe 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_aggregation_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_aggregation_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -998,10 +998,9 @@ def test_region_health_aggregation_policies_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1045,9 @@ def test_region_health_aggregation_policies_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1083,9 @@ def test_region_health_aggregation_policies_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3315,9 +3312,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3600,8 +3597,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3672,19 +3670,22 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = RegionHealthAggregationPoliciesClient(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.RegionHealthAggregationPoliciesRestInterceptor, - "post_aggregated_list", - ) as post, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, + "post_aggregated_list", + ) as post, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, + "pre_aggregated_list", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3746,8 +3747,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3856,18 +3858,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionHealthAggregationPoliciesClient(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.RegionHealthAggregationPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3924,8 +3928,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4014,18 +4019,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionHealthAggregationPoliciesClient(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.RegionHealthAggregationPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, - "post_get_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4080,8 +4087,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4275,18 +4283,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionHealthAggregationPoliciesClient(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.RegionHealthAggregationPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4339,8 +4349,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4409,18 +4420,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionHealthAggregationPoliciesClient(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.RegionHealthAggregationPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4482,8 +4495,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4681,18 +4695,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionHealthAggregationPoliciesClient(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.RegionHealthAggregationPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4745,8 +4761,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4889,20 +4906,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionHealthAggregationPoliciesClient(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.RegionHealthAggregationPoliciesRestInterceptor, - "post_test_iam_permissions", - ) as post, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthAggregationPoliciesRestInterceptor, - "pre_test_iam_permissions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthAggregationPoliciesRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5143,11 +5162,14 @@ def test_region_health_aggregation_policies_base_transport(): def test_region_health_aggregation_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_health_aggregation_policies.transports.RegionHealthAggregationPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_health_aggregation_policies.transports.RegionHealthAggregationPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionHealthAggregationPoliciesTransport( @@ -5167,9 +5189,12 @@ def test_region_health_aggregation_policies_base_transport_with_credentials_file def test_region_health_aggregation_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_health_aggregation_policies.transports.RegionHealthAggregationPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_health_aggregation_policies.transports.RegionHealthAggregationPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionHealthAggregationPoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_check_services.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_check_services.py index 0367dd956a48..126f9dcd0e30 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_check_services.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_check_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -950,10 +950,9 @@ def test_region_health_check_services_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +997,9 @@ def test_region_health_check_services_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1035,9 @@ def test_region_health_check_services_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2968,9 +2965,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3257,8 +3254,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3367,17 +3365,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionHealthCheckServicesClient(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.RegionHealthCheckServicesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3432,8 +3433,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionHealthCheckServiceRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3530,17 +3532,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionHealthCheckServicesClient(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.RegionHealthCheckServicesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3593,8 +3598,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3795,17 +3801,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionHealthCheckServicesClient(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.RegionHealthCheckServicesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3858,8 +3867,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3928,17 +3938,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionHealthCheckServicesClient(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.RegionHealthCheckServicesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3997,8 +4010,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4203,17 +4217,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionHealthCheckServicesClient(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.RegionHealthCheckServicesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4266,8 +4283,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4408,18 +4426,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionHealthCheckServicesClient(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.RegionHealthCheckServicesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4639,11 +4661,14 @@ def test_region_health_check_services_base_transport(): def test_region_health_check_services_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_health_check_services.transports.RegionHealthCheckServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_health_check_services.transports.RegionHealthCheckServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionHealthCheckServicesTransport( @@ -4663,9 +4688,12 @@ def test_region_health_check_services_base_transport_with_credentials_file(): def test_region_health_check_services_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_health_check_services.transports.RegionHealthCheckServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_health_check_services.transports.RegionHealthCheckServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionHealthCheckServicesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_checks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_checks.py index 2fa6c1633419..0c4db3d2ce71 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_checks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_checks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_region_health_checks_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_region_health_checks_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_region_health_checks_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2919,9 +2916,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3632,8 +3629,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionHealthCheckReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3742,17 +3740,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3807,8 +3807,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionHealthCheckRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3899,17 +3900,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3960,8 +3963,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionHealthCheckReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4207,17 +4211,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4268,8 +4274,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionHealthChecksReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4338,17 +4345,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4403,8 +4412,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionHealthCheckReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4654,17 +4664,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4717,8 +4729,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4859,18 +4872,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4927,8 +4942,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateRegionHealthCheckReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5178,17 +5194,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5427,11 +5445,14 @@ def test_region_health_checks_base_transport(): def test_region_health_checks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_health_checks.transports.RegionHealthChecksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_health_checks.transports.RegionHealthChecksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionHealthChecksTransport( @@ -5451,9 +5472,12 @@ def test_region_health_checks_base_transport_with_credentials_file(): def test_region_health_checks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_health_checks.transports.RegionHealthChecksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_health_checks.transports.RegionHealthChecksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionHealthChecksTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_sources.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_sources.py index 5f27ece7c3c2..c4aa9af53478 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_sources.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_health_sources.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_region_health_sources_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_region_health_sources_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_region_health_sources_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3225,9 +3222,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3510,8 +3507,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3582,18 +3580,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = RegionHealthSourcesClient(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.RegionHealthSourcesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3650,8 +3650,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionHealthSourceRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3760,17 +3761,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionHealthSourcesClient(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.RegionHealthSourcesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3825,8 +3828,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionHealthSourceRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3915,17 +3919,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionHealthSourcesClient(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.RegionHealthSourcesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3976,8 +3982,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionHealthSourceRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4167,17 +4174,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionHealthSourcesClient(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.RegionHealthSourcesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4228,8 +4237,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionHealthSourcesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4298,17 +4308,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionHealthSourcesClient(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.RegionHealthSourcesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4363,8 +4375,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionHealthSourceRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4558,17 +4571,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionHealthSourcesClient(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.RegionHealthSourcesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4621,8 +4636,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4763,18 +4779,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionHealthSourcesClient(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.RegionHealthSourcesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthSourcesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthSourcesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5015,11 +5033,14 @@ def test_region_health_sources_base_transport(): def test_region_health_sources_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_health_sources.transports.RegionHealthSourcesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_health_sources.transports.RegionHealthSourcesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionHealthSourcesTransport( @@ -5039,9 +5060,12 @@ def test_region_health_sources_base_transport_with_credentials_file(): def test_region_health_sources_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_health_sources.transports.RegionHealthSourcesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_health_sources.transports.RegionHealthSourcesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionHealthSourcesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_manager_resize_requests.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_manager_resize_requests.py index 96bea8c4d85f..8decce5fc9ea 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_manager_resize_requests.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_manager_resize_requests.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -186,10 +186,13 @@ def test__read_environment_variables(): == "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`" ) else: - assert RegionInstanceGroupManagerResizeRequestsClient._read_environment_variables() == ( - False, - "auto", - None, + assert ( + RegionInstanceGroupManagerResizeRequestsClient._read_environment_variables() + == ( + False, + "auto", + None, + ) ) with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): @@ -995,10 +998,9 @@ def test_region_instance_group_manager_resize_requests_client_get_mtls_endpoint_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1045,9 @@ def test_region_instance_group_manager_resize_requests_client_get_mtls_endpoint_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1083,9 @@ def test_region_instance_group_manager_resize_requests_client_get_mtls_endpoint_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3162,8 +3162,9 @@ def test_cancel_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3273,19 +3274,22 @@ def test_cancel_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagerResizeRequestsClient(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.RegionInstanceGroupManagerResizeRequestsRestInterceptor, - "post_cancel", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, - "post_cancel_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, "pre_cancel" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "post_cancel", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "post_cancel_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "pre_cancel", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3343,8 +3347,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3454,19 +3459,22 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagerResizeRequestsClient(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.RegionInstanceGroupManagerResizeRequestsRestInterceptor, - "post_delete", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "post_delete", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "pre_delete", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3524,8 +3532,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3615,18 +3624,22 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagerResizeRequestsClient(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.RegionInstanceGroupManagerResizeRequestsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, - "post_get_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "post_get", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "pre_get", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3688,8 +3701,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3951,19 +3965,22 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagerResizeRequestsClient(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.RegionInstanceGroupManagerResizeRequestsRestInterceptor, - "post_insert", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "post_insert", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "pre_insert", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4020,8 +4037,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4100,18 +4118,22 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagerResizeRequestsClient(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.RegionInstanceGroupManagerResizeRequestsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "post_list", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagerResizeRequestsRestInterceptor, + "pre_list", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4315,11 +4337,14 @@ def test_region_instance_group_manager_resize_requests_base_transport(): def test_region_instance_group_manager_resize_requests_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_instance_group_manager_resize_requests.transports.RegionInstanceGroupManagerResizeRequestsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_instance_group_manager_resize_requests.transports.RegionInstanceGroupManagerResizeRequestsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceGroupManagerResizeRequestsTransport( @@ -4339,9 +4364,12 @@ def test_region_instance_group_manager_resize_requests_base_transport_with_crede def test_region_instance_group_manager_resize_requests_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_instance_group_manager_resize_requests.transports.RegionInstanceGroupManagerResizeRequestsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_instance_group_manager_resize_requests.transports.RegionInstanceGroupManagerResizeRequestsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceGroupManagerResizeRequestsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_managers.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_managers.py index 84dc564643b7..05ccbd6a08c2 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_managers.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_group_managers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_instance_group_managers_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_instance_group_managers_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_instance_group_managers_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1252,9 +1249,9 @@ def test_abandon_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances(request) @@ -1471,9 +1468,9 @@ def test_abandon_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances_unary(request) @@ -2564,9 +2561,9 @@ def test_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances(request) @@ -2783,9 +2780,9 @@ def test_create_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances_unary(request) @@ -3420,9 +3417,9 @@ def test_delete_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances(request) @@ -3639,9 +3636,9 @@ def test_delete_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances_unary(request) @@ -5500,9 +5497,9 @@ def test_list_managed_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_managed_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_managed_instances] = ( + mock_rpc + ) request = {} client.list_managed_instances(request) @@ -6999,9 +6996,9 @@ def test_recreate_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances(request) @@ -7220,9 +7217,9 @@ def test_recreate_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances_unary(request) @@ -8341,9 +8338,9 @@ def test_resume_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances(request) @@ -8560,9 +8557,9 @@ def test_resume_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances_unary(request) @@ -9242,9 +9239,9 @@ def test_set_instance_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template(request) @@ -9464,9 +9461,9 @@ def test_set_instance_template_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template_unary(request) @@ -9683,9 +9680,9 @@ def test_set_target_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools(request) @@ -9902,9 +9899,9 @@ def test_set_target_pools_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools_unary(request) @@ -10989,9 +10986,9 @@ def test_suspend_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances(request) @@ -11208,9 +11205,9 @@ def test_suspend_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances_unary(request) @@ -11429,9 +11426,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -12622,8 +12619,9 @@ def test_abandon_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12817,18 +12815,22 @@ def test_abandon_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_abandon_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_abandon_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_abandon_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_abandon_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_abandon_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_abandon_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12885,8 +12887,9 @@ def test_adopt_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13092,18 +13095,21 @@ def test_adopt_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_adopt_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_adopt_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_adopt_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_adopt_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_adopt_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_adopt_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13160,8 +13166,9 @@ def test_apply_updates_to_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13360,20 +13367,22 @@ def test_apply_updates_to_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_apply_updates_to_instances", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_apply_updates_to_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_apply_updates_to_instances", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_apply_updates_to_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_apply_updates_to_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_apply_updates_to_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13432,8 +13441,9 @@ def test_create_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13639,18 +13649,22 @@ def test_create_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_create_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_create_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_create_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_create_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_create_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_create_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13707,8 +13721,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13817,18 +13832,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13885,8 +13902,9 @@ def test_delete_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14081,18 +14099,22 @@ def test_delete_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_delete_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_delete_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_delete_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_delete_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_delete_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_delete_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14149,8 +14171,9 @@ def test_delete_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14346,20 +14369,22 @@ def test_delete_per_instance_configs_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_delete_per_instance_configs", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_delete_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_delete_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_delete_per_instance_configs", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_delete_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_delete_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14418,8 +14443,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14531,17 +14557,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14596,8 +14625,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14921,18 +14951,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14985,8 +15017,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15055,17 +15088,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15127,8 +15163,9 @@ def test_list_errors_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15197,18 +15234,20 @@ def test_list_errors_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_list_errors" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_list_errors_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_list_errors" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_list_errors" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_list_errors_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_list_errors" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15270,8 +15309,9 @@ def test_list_managed_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15340,20 +15380,22 @@ def test_list_managed_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_list_managed_instances", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_list_managed_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_list_managed_instances", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_list_managed_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_list_managed_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_list_managed_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15415,8 +15457,9 @@ def test_list_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15485,20 +15528,22 @@ def test_list_per_instance_configs_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_list_per_instance_configs", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_list_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_list_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_list_per_instance_configs", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_list_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_list_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15564,8 +15609,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15893,18 +15939,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15961,8 +16009,9 @@ def test_patch_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16170,20 +16219,22 @@ def test_patch_per_instance_configs_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_patch_per_instance_configs", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_patch_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_patch_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_patch_per_instance_configs", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_patch_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_patch_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16242,8 +16293,9 @@ def test_recreate_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16437,18 +16489,22 @@ def test_recreate_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_recreate_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_recreate_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_recreate_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_recreate_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_recreate_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_recreate_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16505,8 +16561,9 @@ def test_resize_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16615,18 +16672,20 @@ def test_resize_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_resize" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_resize_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_resize" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_resize" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_resize_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_resize" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16683,8 +16742,9 @@ def test_resize_advanced_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16879,18 +16939,21 @@ def test_resize_advanced_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_resize_advanced" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_resize_advanced_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_resize_advanced" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_resize_advanced", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_resize_advanced_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_resize_advanced" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16947,8 +17010,9 @@ def test_resume_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17142,18 +17206,22 @@ def test_resume_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_resume_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_resume_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_resume_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_resume_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_resume_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_resume_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17210,8 +17278,9 @@ def test_set_auto_healing_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17409,20 +17478,22 @@ def test_set_auto_healing_policies_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_set_auto_healing_policies", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_set_auto_healing_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_set_auto_healing_policies", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_set_auto_healing_policies", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_set_auto_healing_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_set_auto_healing_policies", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17479,8 +17550,9 @@ def test_set_instance_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17676,20 +17748,22 @@ def test_set_instance_template_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_set_instance_template", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_set_instance_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_set_instance_template", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_set_instance_template", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_set_instance_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_set_instance_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17746,8 +17820,9 @@ def test_set_target_pools_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17942,18 +18017,22 @@ def test_set_target_pools_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_set_target_pools" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_set_target_pools_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_set_target_pools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_set_target_pools", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_set_target_pools_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_set_target_pools", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18010,8 +18089,9 @@ def test_start_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18205,18 +18285,21 @@ def test_start_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_start_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_start_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_start_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_start_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_start_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_start_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18273,8 +18356,9 @@ def test_stop_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18469,18 +18553,20 @@ def test_stop_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_stop_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_stop_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_stop_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_stop_instances" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_stop_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_stop_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18537,8 +18623,9 @@ def test_suspend_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18732,18 +18819,22 @@ def test_suspend_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_suspend_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_suspend_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_suspend_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_suspend_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_suspend_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_suspend_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18796,8 +18887,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18940,20 +19032,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_test_iam_permissions", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_test_iam_permissions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19012,8 +19106,9 @@ def test_update_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19341,18 +19436,20 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_update_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_update_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19409,8 +19506,9 @@ def test_update_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19620,20 +19718,22 @@ def test_update_per_instance_configs_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_update_per_instance_configs", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_update_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_update_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_update_per_instance_configs", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_update_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_update_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20341,11 +20441,14 @@ def test_region_instance_group_managers_base_transport(): def test_region_instance_group_managers_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_instance_group_managers.transports.RegionInstanceGroupManagersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_instance_group_managers.transports.RegionInstanceGroupManagersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceGroupManagersTransport( @@ -20365,9 +20468,12 @@ def test_region_instance_group_managers_base_transport_with_credentials_file(): def test_region_instance_group_managers_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_instance_group_managers.transports.RegionInstanceGroupManagersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_instance_group_managers.transports.RegionInstanceGroupManagersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceGroupManagersTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_groups.py index cac9a678f5c2..1a6928ad0a8b 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_region_instance_groups_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_region_instance_groups_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_region_instance_groups_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1946,10 +1943,10 @@ def test_list_instances_rest_pager(transport: str = "rest"): "region": "sample2", "instance_group": "sample3", } - sample_request[ - "region_instance_groups_list_instances_request_resource" - ] = compute.RegionInstanceGroupsListInstancesRequest( - instance_state="instance_state_value" + sample_request["region_instance_groups_list_instances_request_resource"] = ( + compute.RegionInstanceGroupsListInstancesRequest( + instance_state="instance_state_value" + ) ) pager = client.list_instances(request=sample_request) @@ -2420,9 +2417,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2707,8 +2704,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionInstanceGroupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2797,17 +2795,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupsClient(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.RegionInstanceGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2858,8 +2858,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionInstanceGroupsRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2928,17 +2929,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupsClient(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.RegionInstanceGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2997,8 +3000,9 @@ def test_list_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3157,18 +3161,20 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupsClient(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.RegionInstanceGroupsRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, - "post_list_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, + "post_list_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3230,8 +3236,9 @@ def test_set_named_ports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3426,18 +3433,20 @@ def test_set_named_ports_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupsClient(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.RegionInstanceGroupsRestInterceptor, "post_set_named_ports" - ) as post, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, - "post_set_named_ports_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "pre_set_named_ports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_set_named_ports" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, + "post_set_named_ports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "pre_set_named_ports" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3490,8 +3499,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3632,18 +3642,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupsClient(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.RegionInstanceGroupsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3842,11 +3854,14 @@ def test_region_instance_groups_base_transport(): def test_region_instance_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_instance_groups.transports.RegionInstanceGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_instance_groups.transports.RegionInstanceGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceGroupsTransport( @@ -3866,9 +3881,12 @@ def test_region_instance_groups_base_transport_with_credentials_file(): def test_region_instance_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_instance_groups.transports.RegionInstanceGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_instance_groups.transports.RegionInstanceGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceGroupsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_templates.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_templates.py index 3d2d900597ab..4439a5e1d73a 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_templates.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instance_templates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,22 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.cloud.compute_v1beta.services.region_instance_templates import ( RegionInstanceTemplatesClient, @@ -942,10 +942,9 @@ def test_region_instance_templates_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +989,9 @@ def test_region_instance_templates_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1029,10 +1027,9 @@ def test_region_instance_templates_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2602,8 +2599,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2712,17 +2710,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionInstanceTemplatesClient(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.RegionInstanceTemplatesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2777,8 +2778,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionInstanceTemplateRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2859,17 +2861,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionInstanceTemplatesClient(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.RegionInstanceTemplatesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2922,8 +2926,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3323,17 +3328,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionInstanceTemplatesClient(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.RegionInstanceTemplatesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3384,8 +3392,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionInstanceTemplatesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3454,17 +3463,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionInstanceTemplatesClient(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.RegionInstanceTemplatesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3640,11 +3651,14 @@ def test_region_instance_templates_base_transport(): def test_region_instance_templates_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_instance_templates.transports.RegionInstanceTemplatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_instance_templates.transports.RegionInstanceTemplatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceTemplatesTransport( @@ -3664,9 +3678,12 @@ def test_region_instance_templates_base_transport_with_credentials_file(): def test_region_instance_templates_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_instance_templates.transports.RegionInstanceTemplatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_instance_templates.transports.RegionInstanceTemplatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceTemplatesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instances.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instances.py index 62a5f43aab55..cfb6469cfaff 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instances.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,22 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.cloud.compute_v1beta.services.region_instances import ( RegionInstancesClient, @@ -916,10 +916,9 @@ def test_region_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_region_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_region_instances_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1667,8 +1664,9 @@ def test_bulk_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2061,17 +2059,19 @@ def test_bulk_insert_rest_interceptors(null_interceptor): ) client = RegionInstancesClient(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.RegionInstancesRestInterceptor, "post_bulk_insert" - ) as post, mock.patch.object( - transports.RegionInstancesRestInterceptor, "post_bulk_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstancesRestInterceptor, "pre_bulk_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstancesRestInterceptor, "post_bulk_insert" + ) as post, + mock.patch.object( + transports.RegionInstancesRestInterceptor, "post_bulk_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstancesRestInterceptor, "pre_bulk_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2180,11 +2180,14 @@ def test_region_instances_base_transport(): def test_region_instances_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_instances.transports.RegionInstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_instances.transports.RegionInstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstancesTransport( @@ -2204,9 +2207,12 @@ def test_region_instances_base_transport_with_credentials_file(): def test_region_instances_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_instances.transports.RegionInstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_instances.transports.RegionInstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstancesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instant_snapshots.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instant_snapshots.py index 369a93a77042..f0d1e85dbb6d 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instant_snapshots.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_instant_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_instant_snapshots_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_instant_snapshots_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_instant_snapshots_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3371,9 +3368,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3660,8 +3657,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3770,17 +3768,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3835,8 +3836,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionInstantSnapshotReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3935,17 +3937,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3998,8 +4002,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4066,18 +4071,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4130,8 +4137,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4330,17 +4338,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4391,8 +4402,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionInstantSnapshotsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4461,17 +4473,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4526,8 +4540,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4710,18 +4725,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4774,8 +4791,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4959,18 +4977,20 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, - "post_set_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_set_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5023,8 +5043,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5165,18 +5186,21 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5438,11 +5462,14 @@ def test_region_instant_snapshots_base_transport(): def test_region_instant_snapshots_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_instant_snapshots.transports.RegionInstantSnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_instant_snapshots.transports.RegionInstantSnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstantSnapshotsTransport( @@ -5462,9 +5489,12 @@ def test_region_instant_snapshots_base_transport_with_credentials_file(): def test_region_instant_snapshots_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_instant_snapshots.transports.RegionInstantSnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_instant_snapshots.transports.RegionInstantSnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstantSnapshotsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_mig_members.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_mig_members.py index 46ac736eb9a5..7555a72997e3 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_mig_members.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_mig_members.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -932,10 +937,9 @@ def test_region_multi_mig_members_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +984,9 @@ def test_region_multi_mig_members_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1022,9 @@ def test_region_multi_mig_members_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1778,8 +1780,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionMultiMigMemberReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1857,17 +1860,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionMultiMigMembersClient(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.RegionMultiMigMembersRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionMultiMigMembersRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionMultiMigMembersRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionMultiMigMembersRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionMultiMigMembersRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionMultiMigMembersRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1918,8 +1923,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionMultiMigMembersReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1988,17 +1994,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionMultiMigMembersClient(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.RegionMultiMigMembersRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionMultiMigMembersRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionMultiMigMembersRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionMultiMigMembersRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionMultiMigMembersRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionMultiMigMembersRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2130,11 +2138,14 @@ def test_region_multi_mig_members_base_transport(): def test_region_multi_mig_members_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_multi_mig_members.transports.RegionMultiMigMembersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_multi_mig_members.transports.RegionMultiMigMembersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionMultiMigMembersTransport( @@ -2155,9 +2166,12 @@ def test_region_multi_mig_members_base_transport_with_credentials_file(): def test_region_multi_mig_members_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_multi_mig_members.transports.RegionMultiMigMembersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_multi_mig_members.transports.RegionMultiMigMembersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionMultiMigMembersTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_migs.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_migs.py index 34e5d9e6b0f7..a7b602a6b292 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_migs.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_multi_migs.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_region_multi_migs_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_region_multi_migs_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_region_multi_migs_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2549,8 +2546,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionMultiMigReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2655,17 +2653,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionMultiMigsClient(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.RegionMultiMigsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionMultiMigsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionMultiMigsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionMultiMigsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionMultiMigsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionMultiMigsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2716,8 +2716,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionMultiMigRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2792,17 +2793,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionMultiMigsClient(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.RegionMultiMigsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionMultiMigsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionMultiMigsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionMultiMigsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionMultiMigsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionMultiMigsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2853,8 +2854,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionMultiMigReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3086,17 +3088,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionMultiMigsClient(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.RegionMultiMigsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionMultiMigsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionMultiMigsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionMultiMigsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionMultiMigsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionMultiMigsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3147,8 +3151,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionMultiMigsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3221,17 +3226,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionMultiMigsClient(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.RegionMultiMigsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionMultiMigsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionMultiMigsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionMultiMigsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionMultiMigsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionMultiMigsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3405,11 +3410,14 @@ def test_region_multi_migs_base_transport(): def test_region_multi_migs_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_multi_migs.transports.RegionMultiMigsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_multi_migs.transports.RegionMultiMigsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionMultiMigsTransport( @@ -3429,9 +3437,12 @@ def test_region_multi_migs_base_transport_with_credentials_file(): def test_region_multi_migs_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_multi_migs.transports.RegionMultiMigsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_multi_migs.transports.RegionMultiMigsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionMultiMigsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_endpoint_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_endpoint_groups.py index 114ed33e09c2..87a9c64d8ac8 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_endpoint_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_endpoint_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3463,9 +3460,9 @@ def test_list_network_endpoints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_endpoints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_endpoints] = ( + mock_rpc + ) request = {} client.list_network_endpoints(request) @@ -3836,8 +3833,9 @@ def test_attach_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4043,20 +4041,22 @@ def test_attach_network_endpoints_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, - "post_attach_network_endpoints", - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "post_attach_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "pre_attach_network_endpoints", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_attach_network_endpoints", + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_attach_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "pre_attach_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4113,8 +4113,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4223,18 +4224,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4291,8 +4294,9 @@ def test_detach_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4498,20 +4502,22 @@ def test_detach_network_endpoints_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, - "post_detach_network_endpoints", - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "post_detach_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "pre_detach_network_endpoints", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_detach_network_endpoints", + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_detach_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "pre_detach_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4568,8 +4574,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4662,17 +4669,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4727,8 +4737,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4954,18 +4965,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5018,8 +5031,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5088,17 +5102,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5157,8 +5174,9 @@ def test_list_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5231,20 +5249,22 @@ def test_list_network_endpoints_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, - "post_list_network_endpoints", - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "post_list_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "pre_list_network_endpoints", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_list_network_endpoints", + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_list_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "pre_list_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5492,11 +5512,14 @@ def test_region_network_endpoint_groups_base_transport(): def test_region_network_endpoint_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_network_endpoint_groups.transports.RegionNetworkEndpointGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_network_endpoint_groups.transports.RegionNetworkEndpointGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNetworkEndpointGroupsTransport( @@ -5516,9 +5539,12 @@ def test_region_network_endpoint_groups_base_transport_with_credentials_file(): def test_region_network_endpoint_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_network_endpoint_groups.transports.RegionNetworkEndpointGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_network_endpoint_groups.transports.RegionNetworkEndpointGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNetworkEndpointGroupsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_firewall_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_firewall_policies.py index f736ff3e0881..2848a8719985 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_firewall_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_firewall_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -987,10 +987,9 @@ def test_region_network_firewall_policies_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1034,9 @@ def test_region_network_firewall_policies_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1072,9 @@ def test_region_network_firewall_policies_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -5230,9 +5227,9 @@ def test_patch_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_association] = ( + mock_rpc + ) request = {} client.patch_association(request) @@ -5449,9 +5446,9 @@ def test_patch_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_association] = ( + mock_rpc + ) request = {} client.patch_association_unary(request) @@ -6124,9 +6121,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -6347,9 +6344,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -7219,9 +7216,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -7508,8 +7505,9 @@ def test_add_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7703,18 +7701,22 @@ def test_add_association_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_add_association" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_add_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_add_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_add_association", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_add_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_add_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7771,8 +7773,9 @@ def test_add_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8021,18 +8024,20 @@ def test_add_rule_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_add_rule" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_add_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_add_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_add_rule" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_add_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_add_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8089,8 +8094,9 @@ def test_clone_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8199,18 +8205,20 @@ def test_clone_rules_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_clone_rules" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_clone_rules_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_clone_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_clone_rules" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_clone_rules_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_clone_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8267,8 +8275,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8377,18 +8386,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8445,8 +8456,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8541,18 +8553,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_get_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8609,8 +8623,9 @@ def test_get_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8687,18 +8702,22 @@ def test_get_association_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_get_association" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_get_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_get_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_association", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_get_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8753,8 +8772,9 @@ def test_get_effective_firewalls_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8822,20 +8842,22 @@ def test_get_effective_firewalls_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, - "post_get_effective_firewalls", - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_get_effective_firewalls_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "pre_get_effective_firewalls", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_effective_firewalls", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_effective_firewalls_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_get_effective_firewalls", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8897,8 +8919,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8965,18 +8988,22 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_iam_policy", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_get_iam_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9033,8 +9060,9 @@ def test_get_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9129,18 +9157,20 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_get_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9193,8 +9223,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9474,18 +9505,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9538,8 +9571,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9606,18 +9640,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9674,8 +9710,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9959,18 +9996,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10027,8 +10066,9 @@ def test_patch_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10222,19 +10262,22 @@ def test_patch_association_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, - "post_patch_association", - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_patch_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_patch_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_patch_association", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_patch_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_patch_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10291,8 +10334,9 @@ def test_patch_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10541,18 +10585,20 @@ def test_patch_rule_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_patch_rule" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_patch_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_patch_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_patch_rule" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_patch_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_patch_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10609,8 +10655,9 @@ def test_remove_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10719,20 +10766,22 @@ def test_remove_association_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, - "post_remove_association", - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_remove_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "pre_remove_association", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_remove_association", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_remove_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_remove_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10789,8 +10838,9 @@ def test_remove_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10899,18 +10949,20 @@ def test_remove_rule_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_remove_rule" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_remove_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_remove_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_remove_rule" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_remove_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_remove_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10963,8 +11015,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11147,18 +11200,22 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_set_iam_policy", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_set_iam_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11211,8 +11268,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11355,20 +11413,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, - "post_test_iam_permissions", - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "pre_test_iam_permissions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11846,11 +11906,14 @@ def test_region_network_firewall_policies_base_transport(): def test_region_network_firewall_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_network_firewall_policies.transports.RegionNetworkFirewallPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_network_firewall_policies.transports.RegionNetworkFirewallPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNetworkFirewallPoliciesTransport( @@ -11870,9 +11933,12 @@ def test_region_network_firewall_policies_base_transport_with_credentials_file() def test_region_network_firewall_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_network_firewall_policies.transports.RegionNetworkFirewallPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_network_firewall_policies.transports.RegionNetworkFirewallPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNetworkFirewallPoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_policies.py index 9ac060e9f981..5b9e7c39e228 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_network_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_region_network_policies_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_region_network_policies_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_region_network_policies_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -5052,9 +5049,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -5275,9 +5272,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -6028,8 +6025,9 @@ def test_add_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6217,18 +6215,20 @@ def test_add_association_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, "post_add_association" - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, - "post_add_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "pre_add_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_add_association" + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "post_add_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "pre_add_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6285,8 +6285,9 @@ def test_add_traffic_classification_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6508,20 +6509,22 @@ def test_add_traffic_classification_rule_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, - "post_add_traffic_classification_rule", - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, - "post_add_traffic_classification_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, - "pre_add_traffic_classification_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "post_add_traffic_classification_rule", + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "post_add_traffic_classification_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "pre_add_traffic_classification_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6574,8 +6577,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6646,18 +6650,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6717,8 +6723,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionNetworkPolicyR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6827,17 +6834,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6892,8 +6901,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionNetworkPolicyRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6976,17 +6986,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7043,8 +7055,9 @@ def test_get_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7113,18 +7126,20 @@ def test_get_association_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, "post_get_association" - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, - "post_get_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "pre_get_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_get_association" + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "post_get_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "pre_get_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7183,8 +7198,9 @@ def test_get_traffic_classification_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7263,20 +7279,22 @@ def test_get_traffic_classification_rule_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, - "post_get_traffic_classification_rule", - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, - "post_get_traffic_classification_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, - "pre_get_traffic_classification_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "post_get_traffic_classification_rule", + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "post_get_traffic_classification_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "pre_get_traffic_classification_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7332,8 +7350,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionNetworkPolicyR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7557,17 +7576,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7618,8 +7639,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionNetworkPoliciesReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7686,17 +7708,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7751,8 +7775,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionNetworkPolicyReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7980,17 +8005,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8047,8 +8074,9 @@ def test_patch_traffic_classification_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8270,20 +8298,22 @@ def test_patch_traffic_classification_rule_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, - "post_patch_traffic_classification_rule", - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, - "post_patch_traffic_classification_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, - "pre_patch_traffic_classification_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "post_patch_traffic_classification_rule", + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "post_patch_traffic_classification_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "pre_patch_traffic_classification_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8342,8 +8372,9 @@ def test_remove_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8452,18 +8483,20 @@ def test_remove_association_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, "post_remove_association" - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, - "post_remove_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, "pre_remove_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "post_remove_association" + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "post_remove_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, "pre_remove_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8520,8 +8553,9 @@ def test_remove_traffic_classification_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8630,20 +8664,22 @@ def test_remove_traffic_classification_rule_rest_interceptors(null_interceptor): ) client = RegionNetworkPoliciesClient(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.RegionNetworkPoliciesRestInterceptor, - "post_remove_traffic_classification_rule", - ) as post, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, - "post_remove_traffic_classification_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkPoliciesRestInterceptor, - "pre_remove_traffic_classification_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "post_remove_traffic_classification_rule", + ) as post, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "post_remove_traffic_classification_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkPoliciesRestInterceptor, + "pre_remove_traffic_classification_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9020,11 +9056,14 @@ def test_region_network_policies_base_transport(): def test_region_network_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_network_policies.transports.RegionNetworkPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_network_policies.transports.RegionNetworkPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNetworkPoliciesTransport( @@ -9044,9 +9083,12 @@ def test_region_network_policies_base_transport_with_credentials_file(): def test_region_network_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_network_policies.transports.RegionNetworkPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_network_policies.transports.RegionNetworkPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNetworkPoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_notification_endpoints.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_notification_endpoints.py index 0602b7368127..49f523461331 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_notification_endpoints.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_notification_endpoints.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_notification_endpoints_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_notification_endpoints_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_notification_endpoints_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2558,9 +2555,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2847,8 +2844,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2957,18 +2955,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionNotificationEndpointsClient(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.RegionNotificationEndpointsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3025,8 +3025,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3105,17 +3106,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionNotificationEndpointsClient(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.RegionNotificationEndpointsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3170,8 +3174,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3367,18 +3372,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionNotificationEndpointsClient(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.RegionNotificationEndpointsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3431,8 +3438,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3501,17 +3509,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionNotificationEndpointsClient(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.RegionNotificationEndpointsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3566,8 +3577,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3710,20 +3722,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionNotificationEndpointsClient(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.RegionNotificationEndpointsRestInterceptor, - "post_test_iam_permissions", - ) as post, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, - "pre_test_iam_permissions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3922,11 +3936,14 @@ def test_region_notification_endpoints_base_transport(): def test_region_notification_endpoints_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_notification_endpoints.transports.RegionNotificationEndpointsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_notification_endpoints.transports.RegionNotificationEndpointsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNotificationEndpointsTransport( @@ -3946,9 +3963,12 @@ def test_region_notification_endpoints_base_transport_with_credentials_file(): def test_region_notification_endpoints_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_notification_endpoints.transports.RegionNotificationEndpointsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_notification_endpoints.transports.RegionNotificationEndpointsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNotificationEndpointsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_operations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_operations.py index 8c9a8012e5bb..1b76eb62098a 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_operations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_region_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_region_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_region_operations_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2124,8 +2126,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionOperationReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2185,17 +2188,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionOperationsClient(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.RegionOperationsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionOperationsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionOperationsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2251,8 +2256,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionOperationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2357,17 +2363,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionOperationsClient(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.RegionOperationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionOperationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionOperationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionOperationsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2418,8 +2424,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionOperationsRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2488,17 +2495,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionOperationsClient(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.RegionOperationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionOperationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionOperationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2549,8 +2558,9 @@ def test_wait_rest_bad_request(request_type=compute.WaitRegionOperationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2655,17 +2665,19 @@ def test_wait_rest_interceptors(null_interceptor): ) client = RegionOperationsClient(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.RegionOperationsRestInterceptor, "post_wait" - ) as post, mock.patch.object( - transports.RegionOperationsRestInterceptor, "post_wait_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionOperationsRestInterceptor, "pre_wait" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_wait" + ) as post, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_wait_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "pre_wait" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2839,11 +2851,14 @@ def test_region_operations_base_transport(): def test_region_operations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_operations.transports.RegionOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_operations.transports.RegionOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionOperationsTransport( @@ -2863,9 +2878,12 @@ def test_region_operations_base_transport_with_credentials_file(): def test_region_operations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_operations.transports.RegionOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_operations.transports.RegionOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionOperationsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_security_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_security_policies.py index ba96d37756c1..7d816c857711 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_security_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_security_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_security_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_security_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_security_policies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -5050,8 +5047,9 @@ def test_add_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5340,17 +5338,20 @@ def test_add_rule_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_add_rule" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_add_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_add_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_add_rule" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_add_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_add_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5407,8 +5408,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5517,17 +5519,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5582,8 +5587,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionSecurityPolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5678,17 +5684,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5745,8 +5753,9 @@ def test_get_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5833,17 +5842,20 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_get_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_get_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5896,8 +5908,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6291,17 +6304,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6352,8 +6368,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionSecurityPoliciesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6420,17 +6437,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6485,8 +6504,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionSecurityPolicyRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6884,17 +6904,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6951,8 +6973,9 @@ def test_patch_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7241,18 +7264,20 @@ def test_patch_rule_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_patch_rule" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, - "post_patch_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_patch_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_patch_rule" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_patch_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_patch_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7309,8 +7334,9 @@ def test_remove_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7419,18 +7445,20 @@ def test_remove_rule_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_remove_rule" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, - "post_remove_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_remove_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_remove_rule" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_remove_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_remove_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7483,8 +7511,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7668,18 +7697,20 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, - "post_set_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_set_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7979,11 +8010,14 @@ def test_region_security_policies_base_transport(): def test_region_security_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_security_policies.transports.RegionSecurityPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_security_policies.transports.RegionSecurityPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSecurityPoliciesTransport( @@ -8003,9 +8037,12 @@ def test_region_security_policies_base_transport_with_credentials_file(): def test_region_security_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_security_policies.transports.RegionSecurityPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_security_policies.transports.RegionSecurityPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSecurityPoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshot_settings.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshot_settings.py index 8e53dc05358f..d4dd935f294c 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshot_settings.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshot_settings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -940,10 +940,9 @@ def test_region_snapshot_settings_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_region_snapshot_settings_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_region_snapshot_settings_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1932,8 +1929,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionSnapshotSettingReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1993,17 +1991,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionSnapshotSettingsClient(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.RegionSnapshotSettingsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionSnapshotSettingsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSnapshotSettingsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSnapshotSettingsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionSnapshotSettingsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSnapshotSettingsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2054,8 +2054,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionSnapshotSettingR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2237,17 +2238,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionSnapshotSettingsClient(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.RegionSnapshotSettingsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionSnapshotSettingsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSnapshotSettingsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSnapshotSettingsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionSnapshotSettingsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSnapshotSettingsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2379,11 +2382,14 @@ def test_region_snapshot_settings_base_transport(): def test_region_snapshot_settings_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_snapshot_settings.transports.RegionSnapshotSettingsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_snapshot_settings.transports.RegionSnapshotSettingsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSnapshotSettingsTransport( @@ -2403,9 +2409,12 @@ def test_region_snapshot_settings_base_transport_with_credentials_file(): def test_region_snapshot_settings_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_snapshot_settings.transports.RegionSnapshotSettingsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_snapshot_settings.transports.RegionSnapshotSettingsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSnapshotSettingsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshots.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshots.py index fd2b41e0de43..5e4d3ff438a2 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshots.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_region_snapshots_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_region_snapshots_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_region_snapshots_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3323,9 +3320,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3606,8 +3603,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionSnapshotReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3712,17 +3710,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionSnapshotsClient(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.RegionSnapshotsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3773,8 +3773,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionSnapshotRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3912,17 +3913,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionSnapshotsClient(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.RegionSnapshotsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionSnapshotsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3975,8 +3976,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4043,17 +4045,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = RegionSnapshotsClient(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.RegionSnapshotsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4104,8 +4109,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionSnapshotReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4325,17 +4331,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionSnapshotsClient(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.RegionSnapshotsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4386,8 +4394,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionSnapshotsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4456,17 +4465,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionSnapshotsClient(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.RegionSnapshotsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionSnapshotsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4519,8 +4528,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4703,17 +4713,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = RegionSnapshotsClient(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.RegionSnapshotsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4766,8 +4779,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4951,17 +4965,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = RegionSnapshotsClient(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.RegionSnapshotsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5014,8 +5030,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5156,18 +5173,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionSnapshotsClient(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.RegionSnapshotsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionSnapshotsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSnapshotsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5429,11 +5448,14 @@ def test_region_snapshots_base_transport(): def test_region_snapshots_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_snapshots.transports.RegionSnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_snapshots.transports.RegionSnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSnapshotsTransport( @@ -5453,9 +5475,12 @@ def test_region_snapshots_base_transport_with_credentials_file(): def test_region_snapshots_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_snapshots.transports.RegionSnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_snapshots.transports.RegionSnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSnapshotsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_certificates.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_certificates.py index 38f60d58b941..dba1097d20af 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_certificates.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_certificates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_region_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_region_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_region_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2517,9 +2514,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2806,8 +2803,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2916,17 +2914,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionSslCertificatesClient(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.RegionSslCertificatesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2981,8 +2981,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionSslCertificateReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3071,17 +3072,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionSslCertificatesClient(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.RegionSslCertificatesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3134,8 +3137,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3337,17 +3341,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionSslCertificatesClient(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.RegionSslCertificatesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3398,8 +3404,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionSslCertificatesReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3468,17 +3475,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionSslCertificatesClient(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.RegionSslCertificatesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3531,8 +3540,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3673,18 +3683,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionSslCertificatesClient(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.RegionSslCertificatesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3883,11 +3895,14 @@ def test_region_ssl_certificates_base_transport(): def test_region_ssl_certificates_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_ssl_certificates.transports.RegionSslCertificatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_ssl_certificates.transports.RegionSslCertificatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSslCertificatesTransport( @@ -3907,9 +3922,12 @@ def test_region_ssl_certificates_base_transport_with_credentials_file(): def test_region_ssl_certificates_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_ssl_certificates.transports.RegionSslCertificatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_ssl_certificates.transports.RegionSslCertificatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSslCertificatesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_policies.py index 5d80dabe80c4..122903588135 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_ssl_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_region_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_region_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_region_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3144,9 +3141,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3427,8 +3424,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionSslPolicyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3533,17 +3531,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3594,8 +3594,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionSslPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3680,17 +3681,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3741,8 +3744,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionSslPolicyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3935,17 +3939,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3996,8 +4002,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionSslPoliciesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4066,17 +4073,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4129,8 +4138,9 @@ def test_list_available_features_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4193,18 +4203,20 @@ def test_list_available_features_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_list_available_features" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, - "post_list_available_features_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_list_available_features" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_list_available_features" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, + "post_list_available_features_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_list_available_features" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4260,8 +4272,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionSslPolicyRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4454,17 +4467,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4517,8 +4532,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4659,18 +4675,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4913,11 +4931,14 @@ def test_region_ssl_policies_base_transport(): def test_region_ssl_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_ssl_policies.transports.RegionSslPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_ssl_policies.transports.RegionSslPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSslPoliciesTransport( @@ -4937,9 +4958,12 @@ def test_region_ssl_policies_base_transport_with_credentials_file(): def test_region_ssl_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_ssl_policies.transports.RegionSslPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_ssl_policies.transports.RegionSslPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSslPoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_http_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_http_proxies.py index 1ed35ad6f450..aed9fe05ef02 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_http_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_http_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_target_http_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_target_http_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_target_http_proxies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2947,9 +2944,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3236,8 +3233,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3346,17 +3344,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionTargetHttpProxiesClient(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.RegionTargetHttpProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3411,8 +3412,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionTargetHttpProxyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3501,17 +3503,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionTargetHttpProxiesClient(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.RegionTargetHttpProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3564,8 +3568,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3757,17 +3762,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionTargetHttpProxiesClient(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.RegionTargetHttpProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3818,8 +3826,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionTargetHttpProxiesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3888,17 +3897,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionTargetHttpProxiesClient(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.RegionTargetHttpProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3957,8 +3968,9 @@ def test_set_url_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4141,18 +4153,20 @@ def test_set_url_map_rest_interceptors(null_interceptor): ) client = RegionTargetHttpProxiesClient(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.RegionTargetHttpProxiesRestInterceptor, "post_set_url_map" - ) as post, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, - "post_set_url_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "pre_set_url_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_set_url_map" + ) as post, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, + "post_set_url_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "pre_set_url_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4205,8 +4219,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4347,18 +4362,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionTargetHttpProxiesClient(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.RegionTargetHttpProxiesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4578,11 +4597,14 @@ def test_region_target_http_proxies_base_transport(): def test_region_target_http_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_target_http_proxies.transports.RegionTargetHttpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_target_http_proxies.transports.RegionTargetHttpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionTargetHttpProxiesTransport( @@ -4602,9 +4624,12 @@ def test_region_target_http_proxies_base_transport_with_credentials_file(): def test_region_target_http_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_target_http_proxies.transports.RegionTargetHttpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_target_http_proxies.transports.RegionTargetHttpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionTargetHttpProxiesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_https_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_https_proxies.py index 926f8ace095c..5f443d1f9ac0 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_https_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_https_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -945,10 +945,9 @@ def test_region_target_https_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +992,9 @@ def test_region_target_https_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1030,9 @@ def test_region_target_https_proxies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2961,9 +2958,9 @@ def test_set_ssl_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates(request) @@ -3182,9 +3179,9 @@ def test_set_ssl_certificates_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates_unary(request) @@ -3829,9 +3826,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4118,8 +4115,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4228,17 +4226,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4293,8 +4294,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionTargetHttpsProxyRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4401,17 +4403,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4464,8 +4468,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4666,17 +4671,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4729,8 +4737,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4799,17 +4808,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4868,8 +4880,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5074,17 +5087,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5141,8 +5157,9 @@ def test_set_ssl_certificates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5336,18 +5353,22 @@ def test_set_ssl_certificates_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_set_ssl_certificates" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, - "post_set_ssl_certificates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_set_ssl_certificates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_set_ssl_certificates", + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_set_ssl_certificates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "pre_set_ssl_certificates", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5404,8 +5425,9 @@ def test_set_url_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5588,18 +5610,20 @@ def test_set_url_map_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_set_url_map" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, - "post_set_url_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_set_url_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_set_url_map" + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_set_url_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "pre_set_url_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5652,8 +5676,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5794,18 +5819,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6069,11 +6098,14 @@ def test_region_target_https_proxies_base_transport(): def test_region_target_https_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_target_https_proxies.transports.RegionTargetHttpsProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_target_https_proxies.transports.RegionTargetHttpsProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionTargetHttpsProxiesTransport( @@ -6093,9 +6125,12 @@ def test_region_target_https_proxies_base_transport_with_credentials_file(): def test_region_target_https_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_target_https_proxies.transports.RegionTargetHttpsProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_target_https_proxies.transports.RegionTargetHttpsProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionTargetHttpsProxiesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_tcp_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_tcp_proxies.py index 5abf7dcd4726..55bc4f7f6d5e 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_tcp_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_target_tcp_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2521,9 +2518,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2810,8 +2807,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2920,17 +2918,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionTargetTcpProxiesClient(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.RegionTargetTcpProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2985,8 +2986,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionTargetTcpProxyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3073,17 +3075,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionTargetTcpProxiesClient(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.RegionTargetTcpProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3136,8 +3140,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3328,17 +3333,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionTargetTcpProxiesClient(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.RegionTargetTcpProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3389,8 +3397,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionTargetTcpProxiesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3459,17 +3468,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionTargetTcpProxiesClient(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.RegionTargetTcpProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3522,8 +3533,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3664,18 +3676,21 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionTargetTcpProxiesClient(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.RegionTargetTcpProxiesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3874,11 +3889,14 @@ def test_region_target_tcp_proxies_base_transport(): def test_region_target_tcp_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_target_tcp_proxies.transports.RegionTargetTcpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_target_tcp_proxies.transports.RegionTargetTcpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionTargetTcpProxiesTransport( @@ -3898,9 +3916,12 @@ def test_region_target_tcp_proxies_base_transport_with_credentials_file(): def test_region_target_tcp_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_target_tcp_proxies.transports.RegionTargetTcpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_target_tcp_proxies.transports.RegionTargetTcpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionTargetTcpProxiesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_url_maps.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_url_maps.py index 97d471226e24..e7ee3454bce9 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_url_maps.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_url_maps.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_region_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_region_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_region_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2192,9 +2189,9 @@ def test_invalidate_cache_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.invalidate_cache - ] = mock_rpc + client._transport._wrapped_methods[client._transport.invalidate_cache] = ( + mock_rpc + ) request = {} client.invalidate_cache(request) @@ -2411,9 +2408,9 @@ def test_invalidate_cache_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.invalidate_cache - ] = mock_rpc + client._transport._wrapped_methods[client._transport.invalidate_cache] = ( + mock_rpc + ) request = {} client.invalidate_cache_unary(request) @@ -3333,9 +3330,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4259,8 +4256,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionUrlMapRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4365,17 +4363,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4426,8 +4424,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4506,17 +4505,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4565,8 +4562,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionUrlMapRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4936,17 +4934,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4999,8 +4997,9 @@ def test_invalidate_cache_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5185,17 +5184,20 @@ def test_invalidate_cache_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_invalidate_cache" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_invalidate_cache_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_invalidate_cache" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_invalidate_cache" + ) as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, + "post_invalidate_cache_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "pre_invalidate_cache" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5246,8 +5248,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionUrlMapsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5316,17 +5319,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5377,8 +5378,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5748,17 +5750,17 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5811,8 +5813,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5953,18 +5956,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6017,8 +6022,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateRegionUrlMapRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6388,17 +6394,17 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6449,8 +6455,9 @@ def test_validate_rest_bad_request(request_type=compute.ValidateRegionUrlMapRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6793,17 +6800,19 @@ def test_validate_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_validate" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_validate_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_validate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_validate" + ) as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_validate_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "pre_validate" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7086,11 +7095,14 @@ def test_region_url_maps_base_transport(): def test_region_url_maps_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_url_maps.transports.RegionUrlMapsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_url_maps.transports.RegionUrlMapsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionUrlMapsTransport( @@ -7110,9 +7122,12 @@ def test_region_url_maps_base_transport_with_credentials_file(): def test_region_url_maps_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_url_maps.transports.RegionUrlMapsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_url_maps.transports.RegionUrlMapsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionUrlMapsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_zones.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_zones.py index 2b8526d1c005..04e5f5047d15 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_zones.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_region_zones.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -874,10 +879,9 @@ def test_region_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -922,10 +926,9 @@ def test_region_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -961,10 +964,9 @@ def test_region_zones_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1480,8 +1482,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionZonesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1550,17 +1553,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionZonesClient(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.RegionZonesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionZonesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionZonesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionZonesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RegionZonesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionZonesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1667,11 +1668,14 @@ def test_region_zones_base_transport(): def test_region_zones_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.region_zones.transports.RegionZonesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.region_zones.transports.RegionZonesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionZonesTransport( @@ -1692,9 +1696,12 @@ def test_region_zones_base_transport_with_credentials_file(): def test_region_zones_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.region_zones.transports.RegionZonesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.region_zones.transports.RegionZonesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionZonesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_regions.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_regions.py index 81585b6204fb..ec7ebf83da26 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_regions.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_regions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -854,10 +859,9 @@ def test_regions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -902,10 +906,9 @@ def test_regions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -941,10 +944,9 @@ def test_regions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1638,8 +1640,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1716,17 +1719,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionsClient(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.RegionsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.RegionsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1775,8 +1776,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1843,17 +1845,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionsClient(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.RegionsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RegionsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1983,11 +1983,14 @@ def test_regions_base_transport(): def test_regions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.regions.transports.RegionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.regions.transports.RegionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionsTransport( @@ -2008,9 +2011,12 @@ def test_regions_base_transport_with_credentials_file(): def test_regions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.regions.transports.RegionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.regions.transports.RegionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_blocks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_blocks.py index 8568c60fd984..59c9df173409 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_blocks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_blocks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_reservation_blocks_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_reservation_blocks_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_reservation_blocks_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1909,9 +1906,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -2138,9 +2135,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -2586,9 +2583,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2882,8 +2879,9 @@ def test_get_rest_bad_request(request_type=compute.GetReservationBlockRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2948,17 +2946,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = ReservationBlocksClient(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.ReservationBlocksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3021,8 +3021,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3094,17 +3095,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationBlocksClient(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.ReservationBlocksRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3155,8 +3159,9 @@ def test_list_rest_bad_request(request_type=compute.ListReservationBlocksRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3225,17 +3230,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = ReservationBlocksClient(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.ReservationBlocksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3298,8 +3305,9 @@ def test_perform_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3494,18 +3502,20 @@ def test_perform_maintenance_rest_interceptors(null_interceptor): ) client = ReservationBlocksClient(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.ReservationBlocksRestInterceptor, "post_perform_maintenance" - ) as post, mock.patch.object( - transports.ReservationBlocksRestInterceptor, - "post_perform_maintenance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "pre_perform_maintenance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_perform_maintenance" + ) as post, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, + "post_perform_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "pre_perform_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3563,8 +3573,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3755,17 +3766,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationBlocksClient(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.ReservationBlocksRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3823,8 +3837,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3970,18 +3985,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ReservationBlocksClient(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.ReservationBlocksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ReservationBlocksRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4203,11 +4220,14 @@ def test_reservation_blocks_base_transport(): def test_reservation_blocks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.reservation_blocks.transports.ReservationBlocksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.reservation_blocks.transports.ReservationBlocksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationBlocksTransport( @@ -4227,9 +4247,12 @@ def test_reservation_blocks_base_transport_with_credentials_file(): def test_reservation_blocks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.reservation_blocks.transports.ReservationBlocksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.reservation_blocks.transports.ReservationBlocksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationBlocksTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_sub_blocks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_sub_blocks.py index dd38f9d6f88e..3cb7a5aac168 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_sub_blocks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservation_sub_blocks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_reservation_sub_blocks_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_reservation_sub_blocks_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_reservation_sub_blocks_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1925,9 +1922,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -2146,9 +2143,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -3036,9 +3033,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3332,8 +3329,9 @@ def test_get_rest_bad_request(request_type=compute.GetReservationSubBlockRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3398,17 +3396,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3471,8 +3471,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3544,18 +3545,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3606,8 +3609,9 @@ def test_list_rest_bad_request(request_type=compute.ListReservationSubBlocksRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3676,17 +3680,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3749,8 +3755,9 @@ def test_perform_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3860,18 +3867,20 @@ def test_perform_maintenance_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_perform_maintenance" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, - "post_perform_maintenance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_perform_maintenance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_perform_maintenance" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, + "post_perform_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_perform_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3929,8 +3938,9 @@ def test_report_faulty_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4129,18 +4139,20 @@ def test_report_faulty_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_report_faulty" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, - "post_report_faulty_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_report_faulty" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_report_faulty" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, + "post_report_faulty_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_report_faulty" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4198,8 +4210,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4390,18 +4403,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4459,8 +4474,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4606,18 +4622,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4860,11 +4878,14 @@ def test_reservation_sub_blocks_base_transport(): def test_reservation_sub_blocks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.reservation_sub_blocks.transports.ReservationSubBlocksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.reservation_sub_blocks.transports.ReservationSubBlocksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationSubBlocksTransport( @@ -4884,9 +4905,12 @@ def test_reservation_sub_blocks_base_transport_with_credentials_file(): def test_reservation_sub_blocks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.reservation_sub_blocks.transports.ReservationSubBlocksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.reservation_sub_blocks.transports.ReservationSubBlocksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationSubBlocksTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservations.py index 7272ae7cb8fb..f4ee8e56ad7a 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_reservations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_reservations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_reservations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_reservations_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2939,9 +2936,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -3160,9 +3157,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -4024,9 +4021,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4773,8 +4770,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4845,17 +4843,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4908,8 +4908,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteReservationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5014,17 +5015,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ReservationsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5075,8 +5076,9 @@ def test_get_rest_bad_request(request_type=compute.GetReservationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5173,17 +5175,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ReservationsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ReservationsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5234,8 +5234,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5302,17 +5303,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5363,8 +5366,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertReservationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5644,17 +5648,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ReservationsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5705,8 +5709,9 @@ def test_list_rest_bad_request(request_type=compute.ListReservationsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5775,17 +5780,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ReservationsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ReservationsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5838,8 +5841,9 @@ def test_perform_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6029,17 +6033,20 @@ def test_perform_maintenance_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_perform_maintenance" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_perform_maintenance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_perform_maintenance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_perform_maintenance" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, + "post_perform_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationsRestInterceptor, "pre_perform_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6090,8 +6097,9 @@ def test_resize_rest_bad_request(request_type=compute.ResizeReservationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6274,17 +6282,17 @@ def test_resize_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_resize" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_resize_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_resize" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_resize" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_resize_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ReservationsRestInterceptor, "pre_resize") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6337,8 +6345,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6521,17 +6530,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6584,8 +6595,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6726,18 +6738,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6790,8 +6804,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateReservationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7071,17 +7086,17 @@ def test_update_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ReservationsRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7406,11 +7421,14 @@ def test_reservations_base_transport(): def test_reservations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.reservations.transports.ReservationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.reservations.transports.ReservationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationsTransport( @@ -7430,9 +7448,12 @@ def test_reservations_base_transport_with_credentials_file(): def test_reservations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.reservations.transports.ReservationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.reservations.transports.ReservationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_resource_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_resource_policies.py index 89e3d6929491..c0b6f9d6d1e2 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_resource_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_resource_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_resource_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_resource_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_resource_policies_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3633,9 +3630,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3918,8 +3915,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3992,17 +3990,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4062,8 +4063,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteResourcePolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4172,17 +4174,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4237,8 +4241,9 @@ def test_get_rest_bad_request(request_type=compute.GetResourcePolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4319,17 +4324,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ResourcePoliciesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4382,8 +4387,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4450,17 +4456,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4511,8 +4520,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertResourcePolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4765,17 +4775,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4826,8 +4838,9 @@ def test_list_rest_bad_request(request_type=compute.ListResourcePoliciesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4898,17 +4911,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4963,8 +4978,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchResourcePolicyRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5221,17 +5237,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5284,8 +5302,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5468,17 +5487,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5531,8 +5553,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5673,18 +5696,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5967,11 +5992,14 @@ def test_resource_policies_base_transport(): def test_resource_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.resource_policies.transports.ResourcePoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.resource_policies.transports.ResourcePoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ResourcePoliciesTransport( @@ -5991,9 +6019,12 @@ def test_resource_policies_base_transport_with_credentials_file(): def test_resource_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.resource_policies.transports.ResourcePoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.resource_policies.transports.ResourcePoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ResourcePoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollout_plans.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollout_plans.py index 859ba867f704..65f46b78f8a7 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollout_plans.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollout_plans.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_rollout_plans_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_rollout_plans_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_rollout_plans_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2460,8 +2457,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRolloutPlanRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2566,17 +2564,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RolloutPlansClient(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.RolloutPlansRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RolloutPlansRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RolloutPlansRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RolloutPlansRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RolloutPlansRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RolloutPlansRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2627,8 +2625,9 @@ def test_get_rest_bad_request(request_type=compute.GetRolloutPlanRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2705,17 +2704,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = RolloutPlansClient(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.RolloutPlansRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RolloutPlansRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RolloutPlansRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RolloutPlansRestInterceptor, "post_get") as post, + mock.patch.object( + transports.RolloutPlansRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RolloutPlansRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2764,8 +2761,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRolloutPlanRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2996,17 +2994,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RolloutPlansClient(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.RolloutPlansRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RolloutPlansRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RolloutPlansRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RolloutPlansRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RolloutPlansRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RolloutPlansRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3057,8 +3055,9 @@ def test_list_rest_bad_request(request_type=compute.ListRolloutPlansRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3129,17 +3128,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RolloutPlansClient(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.RolloutPlansRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RolloutPlansRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RolloutPlansRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RolloutPlansRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RolloutPlansRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RolloutPlansRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3315,11 +3312,14 @@ def test_rollout_plans_base_transport(): def test_rollout_plans_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.rollout_plans.transports.RolloutPlansTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.rollout_plans.transports.RolloutPlansTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RolloutPlansTransport( @@ -3339,9 +3339,12 @@ def test_rollout_plans_base_transport_with_credentials_file(): def test_rollout_plans_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.rollout_plans.transports.RolloutPlansTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.rollout_plans.transports.RolloutPlansTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RolloutPlansTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollouts.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollouts.py index 79be769a469e..17b40290090a 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollouts.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_rollouts.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -870,10 +870,9 @@ def test_rollouts_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -918,10 +917,9 @@ def test_rollouts_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +955,9 @@ def test_rollouts_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2459,8 +2456,9 @@ def test_cancel_rest_bad_request(request_type=compute.CancelRolloutRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2563,17 +2561,15 @@ def test_cancel_rest_interceptors(null_interceptor): ) client = RolloutsClient(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.RolloutsRestInterceptor, "post_cancel" - ) as post, mock.patch.object( - transports.RolloutsRestInterceptor, "post_cancel_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RolloutsRestInterceptor, "pre_cancel" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RolloutsRestInterceptor, "post_cancel") as post, + mock.patch.object( + transports.RolloutsRestInterceptor, "post_cancel_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RolloutsRestInterceptor, "pre_cancel") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2622,8 +2618,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRolloutRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2726,17 +2723,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RolloutsClient(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.RolloutsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RolloutsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RolloutsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RolloutsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.RolloutsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RolloutsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2785,8 +2780,9 @@ def test_get_rest_bad_request(request_type=compute.GetRolloutRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2871,17 +2867,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = RolloutsClient(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.RolloutsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RolloutsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RolloutsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RolloutsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.RolloutsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RolloutsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2930,8 +2924,9 @@ def test_list_rest_bad_request(request_type=compute.ListRolloutsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3000,17 +2995,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RolloutsClient(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.RolloutsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RolloutsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RolloutsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RolloutsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RolloutsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RolloutsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3184,11 +3177,14 @@ def test_rollouts_base_transport(): def test_rollouts_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.rollouts.transports.RolloutsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.rollouts.transports.RolloutsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RolloutsTransport( @@ -3208,9 +3204,12 @@ def test_rollouts_base_transport_with_credentials_file(): def test_rollouts_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.rollouts.transports.RolloutsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.rollouts.transports.RolloutsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RolloutsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routers.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routers.py index fe696b939a47..0ad62c7f8300 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routers.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -861,10 +861,9 @@ def test_routers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -909,10 +908,9 @@ def test_routers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -948,10 +946,9 @@ def test_routers_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1817,9 +1814,9 @@ def test_delete_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_route_policy] = ( + mock_rpc + ) request = {} client.delete_route_policy(request) @@ -2040,9 +2037,9 @@ def test_delete_route_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_route_policy] = ( + mock_rpc + ) request = {} client.delete_route_policy_unary(request) @@ -2669,9 +2666,9 @@ def test_get_nat_mapping_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_nat_mapping_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_nat_mapping_info] = ( + mock_rpc + ) request = {} client.get_nat_mapping_info(request) @@ -2959,9 +2956,9 @@ def test_get_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_route_policy] = ( + mock_rpc + ) request = {} client.get_route_policy(request) @@ -3166,9 +3163,9 @@ def test_get_router_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_router_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_router_status] = ( + mock_rpc + ) request = {} client.get_router_status(request) @@ -4346,9 +4343,9 @@ def test_list_route_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_route_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_route_policies] = ( + mock_rpc + ) request = {} client.list_route_policies(request) @@ -5066,9 +5063,9 @@ def test_patch_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_route_policy] = ( + mock_rpc + ) request = {} client.patch_route_policy(request) @@ -5283,9 +5280,9 @@ def test_patch_route_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_route_policy] = ( + mock_rpc + ) request = {} client.patch_route_policy_unary(request) @@ -5709,9 +5706,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6354,9 +6351,9 @@ def test_update_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_route_policy] = ( + mock_rpc + ) request = {} client.update_route_policy(request) @@ -6571,9 +6568,9 @@ def test_update_route_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_route_policy] = ( + mock_rpc + ) request = {} client.update_route_policy_unary(request) @@ -6858,8 +6855,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6928,17 +6926,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6991,8 +6991,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7095,17 +7096,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7156,8 +7155,9 @@ def test_delete_route_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7260,17 +7260,19 @@ def test_delete_route_policy_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_delete_route_policy" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_delete_route_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_delete_route_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_delete_route_policy" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_delete_route_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_delete_route_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7321,8 +7323,9 @@ def test_get_rest_bad_request(request_type=compute.GetRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7401,17 +7404,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_get") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7462,8 +7463,9 @@ def test_get_nat_ip_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7521,17 +7523,19 @@ def test_get_nat_ip_info_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_get_nat_ip_info" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_get_nat_ip_info_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_get_nat_ip_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_nat_ip_info" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_nat_ip_info_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_get_nat_ip_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7584,8 +7588,9 @@ def test_get_nat_mapping_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7652,17 +7657,19 @@ def test_get_nat_mapping_info_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_get_nat_mapping_info" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_get_nat_mapping_info_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_get_nat_mapping_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_nat_mapping_info" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_nat_mapping_info_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_get_nat_mapping_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7717,8 +7724,9 @@ def test_get_route_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7776,17 +7784,19 @@ def test_get_route_policy_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_get_route_policy" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_get_route_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_get_route_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_route_policy" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_route_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_get_route_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7844,8 +7854,9 @@ def test_get_router_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7906,17 +7917,19 @@ def test_get_router_status_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_get_router_status" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_get_router_status_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_get_router_status" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_router_status" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_router_status_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_get_router_status" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7969,8 +7982,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8278,17 +8292,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8337,8 +8349,9 @@ def test_list_rest_bad_request(request_type=compute.ListRoutersRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8405,17 +8418,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8466,8 +8477,9 @@ def test_list_bgp_routes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8538,17 +8550,19 @@ def test_list_bgp_routes_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_list_bgp_routes" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_list_bgp_routes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_list_bgp_routes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_list_bgp_routes" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_list_bgp_routes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_list_bgp_routes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8603,8 +8617,9 @@ def test_list_route_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8675,17 +8690,19 @@ def test_list_route_policies_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_list_route_policies" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_list_route_policies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_list_route_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_list_route_policies" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_list_route_policies_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_list_route_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8738,8 +8755,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9047,17 +9065,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9108,8 +9124,9 @@ def test_patch_route_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9303,17 +9320,19 @@ def test_patch_route_policy_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_patch_route_policy" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_patch_route_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_patch_route_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_patch_route_policy" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_patch_route_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_patch_route_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9364,8 +9383,9 @@ def test_preview_rest_bad_request(request_type=compute.PreviewRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9628,17 +9648,15 @@ def test_preview_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_preview" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_preview_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_preview" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_preview") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_preview_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_preview") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9691,8 +9709,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9831,17 +9850,19 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_test_iam_permissions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9894,8 +9915,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10203,17 +10225,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_update") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10264,8 +10284,9 @@ def test_update_route_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10459,17 +10480,19 @@ def test_update_route_policy_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_update_route_policy" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_update_route_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_update_route_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_update_route_policy" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_update_route_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_update_route_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10951,11 +10974,14 @@ def test_routers_base_transport(): def test_routers_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.routers.transports.RoutersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.routers.transports.RoutersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RoutersTransport( @@ -10975,9 +11001,12 @@ def test_routers_base_transport_with_credentials_file(): def test_routers_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.routers.transports.RoutersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.routers.transports.RoutersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RoutersTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routes.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routes.py index faffbc55534f..286f574679ac 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routes.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_routes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -856,10 +856,9 @@ def test_routes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -904,10 +903,9 @@ def test_routes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -943,10 +941,9 @@ def test_routes_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2356,9 +2353,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2628,8 +2625,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRouteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2732,17 +2730,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RoutesClient(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.RoutesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RoutesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutesRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.RoutesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2791,8 +2787,9 @@ def test_get_rest_bad_request(request_type=compute.GetRouteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2902,17 +2899,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = RoutesClient(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.RoutesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RoutesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.RoutesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2961,8 +2956,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRouteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3169,17 +3165,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RoutesClient(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.RoutesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RoutesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutesRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.RoutesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3228,8 +3222,9 @@ def test_list_rest_bad_request(request_type=compute.ListRoutesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3296,17 +3291,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RoutesClient(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.RoutesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RoutesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RoutesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3357,8 +3350,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3497,17 +3491,19 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RoutesClient(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.RoutesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RoutesRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RoutesRestInterceptor, "post_test_iam_permissions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3706,11 +3702,14 @@ def test_routes_base_transport(): def test_routes_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.routes.transports.RoutesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.routes.transports.RoutesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RoutesTransport( @@ -3730,9 +3729,12 @@ def test_routes_base_transport_with_credentials_file(): def test_routes_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.routes.transports.RoutesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.routes.transports.RoutesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RoutesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_security_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_security_policies.py index 014b559d0e8f..52b6d40eba20 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_security_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_security_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_security_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_security_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_security_policies_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -5251,9 +5248,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5523,8 +5520,9 @@ def test_add_rule_rest_bad_request(request_type=compute.AddRuleSecurityPolicyReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5809,17 +5807,19 @@ def test_add_rule_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_add_rule" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_add_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_add_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_add_rule" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_add_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_add_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5872,8 +5872,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5946,17 +5947,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6012,8 +6016,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteSecurityPolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6118,17 +6123,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6179,8 +6186,9 @@ def test_get_rest_bad_request(request_type=compute.GetSecurityPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6271,17 +6279,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SecurityPoliciesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6332,8 +6340,9 @@ def test_get_rule_rest_bad_request(request_type=compute.GetRuleSecurityPolicyReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6416,17 +6425,19 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_get_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_get_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6477,8 +6488,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertSecurityPolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6872,17 +6884,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6933,8 +6947,9 @@ def test_list_rest_bad_request(request_type=compute.ListSecurityPoliciesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7001,17 +7016,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7064,8 +7081,9 @@ def test_list_preconfigured_expression_sets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7131,20 +7149,22 @@ def test_list_preconfigured_expression_sets_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, - "post_list_preconfigured_expression_sets", - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, - "post_list_preconfigured_expression_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, - "pre_list_preconfigured_expression_sets", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, + "post_list_preconfigured_expression_sets", + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, + "post_list_preconfigured_expression_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, + "pre_list_preconfigured_expression_sets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7204,8 +7224,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchSecurityPolicyRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7599,17 +7620,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7662,8 +7685,9 @@ def test_patch_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7948,17 +7972,19 @@ def test_patch_rule_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_patch_rule" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_patch_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_patch_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_patch_rule" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_patch_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_patch_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8011,8 +8037,9 @@ def test_remove_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8117,17 +8144,19 @@ def test_remove_rule_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_remove_rule" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_remove_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_remove_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_remove_rule" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_remove_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_remove_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8180,8 +8209,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8365,17 +8395,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8428,8 +8460,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8570,18 +8603,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8950,11 +8985,14 @@ def test_security_policies_base_transport(): def test_security_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.security_policies.transports.SecurityPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.security_policies.transports.SecurityPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SecurityPoliciesTransport( @@ -8974,9 +9012,12 @@ def test_security_policies_base_transport_with_credentials_file(): def test_security_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.security_policies.transports.SecurityPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.security_policies.transports.SecurityPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SecurityPoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_service_attachments.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_service_attachments.py index 4c86cd98694a..552cc43c4d5b 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_service_attachments.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_service_attachments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_service_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_service_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_service_attachments_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3663,9 +3660,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3948,8 +3945,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4020,18 +4018,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4091,8 +4091,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteServiceAttachmentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4201,17 +4202,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4266,8 +4269,9 @@ def test_get_rest_bad_request(request_type=compute.GetServiceAttachmentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4366,17 +4370,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4429,8 +4435,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4497,18 +4504,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4559,8 +4568,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertServiceAttachmentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4785,17 +4795,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4846,8 +4858,9 @@ def test_list_rest_bad_request(request_type=compute.ListServiceAttachmentsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4916,17 +4929,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4983,8 +4998,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchServiceAttachmentReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5213,17 +5229,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5276,8 +5294,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5460,18 +5479,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5524,8 +5545,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5666,18 +5688,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5960,11 +5984,14 @@ def test_service_attachments_base_transport(): def test_service_attachments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.service_attachments.transports.ServiceAttachmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.service_attachments.transports.ServiceAttachmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServiceAttachmentsTransport( @@ -5984,9 +6011,12 @@ def test_service_attachments_base_transport_with_credentials_file(): def test_service_attachments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.service_attachments.transports.ServiceAttachmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.service_attachments.transports.ServiceAttachmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServiceAttachmentsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshot_settings_service.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshot_settings_service.py index 455fc398757c..48f655e1bb9f 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshot_settings_service.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshot_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -940,10 +940,9 @@ def test_snapshot_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_snapshot_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_snapshot_settings_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1902,8 +1899,9 @@ def test_get_rest_bad_request(request_type=compute.GetSnapshotSettingRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1963,17 +1961,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = SnapshotSettingsServiceClient(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.SnapshotSettingsServiceRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.SnapshotSettingsServiceRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotSettingsServiceRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotSettingsServiceRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.SnapshotSettingsServiceRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotSettingsServiceRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2024,8 +2024,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchSnapshotSettingRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2207,17 +2208,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = SnapshotSettingsServiceClient(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.SnapshotSettingsServiceRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.SnapshotSettingsServiceRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotSettingsServiceRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotSettingsServiceRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.SnapshotSettingsServiceRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotSettingsServiceRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2349,11 +2353,14 @@ def test_snapshot_settings_service_base_transport(): def test_snapshot_settings_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.snapshot_settings_service.transports.SnapshotSettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.snapshot_settings_service.transports.SnapshotSettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SnapshotSettingsServiceTransport( @@ -2373,9 +2380,12 @@ def test_snapshot_settings_service_base_transport_with_credentials_file(): def test_snapshot_settings_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.snapshot_settings_service.transports.SnapshotSettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.snapshot_settings_service.transports.SnapshotSettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SnapshotSettingsServiceTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshots.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshots.py index 408176fab279..67f0ed35bb60 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshots.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_snapshots_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_snapshots_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_snapshots_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3441,9 +3438,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3715,8 +3712,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3787,17 +3785,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3850,8 +3850,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteSnapshotRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3954,17 +3955,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SnapshotsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SnapshotsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4013,8 +4012,9 @@ def test_get_rest_bad_request(request_type=compute.GetSnapshotRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4150,17 +4150,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SnapshotsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SnapshotsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4211,8 +4209,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4277,17 +4276,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4338,8 +4339,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertSnapshotRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4557,17 +4559,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SnapshotsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SnapshotsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4616,8 +4616,9 @@ def test_list_rest_bad_request(request_type=compute.ListSnapshotsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4684,17 +4685,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SnapshotsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SnapshotsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4745,8 +4744,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4927,17 +4927,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4988,8 +4990,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsSnapshotReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5171,17 +5174,17 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SnapshotsRestInterceptor, "pre_set_labels") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5234,8 +5237,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5374,17 +5378,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5667,11 +5674,14 @@ def test_snapshots_base_transport(): def test_snapshots_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.snapshots.transports.SnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.snapshots.transports.SnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SnapshotsTransport( @@ -5691,9 +5701,12 @@ def test_snapshots_base_transport_with_credentials_file(): def test_snapshots_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.snapshots.transports.SnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.snapshots.transports.SnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SnapshotsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_certificates.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_certificates.py index 0dc49b42f2f4..0f3fdf01016f 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_certificates.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_certificates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2701,9 +2698,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2975,8 +2972,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3047,17 +3045,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = SslCertificatesClient(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.SslCertificatesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.SslCertificatesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslCertificatesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.SslCertificatesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3113,8 +3114,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteSslCertificateReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3219,17 +3221,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = SslCertificatesClient(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.SslCertificatesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.SslCertificatesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslCertificatesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3280,8 +3284,9 @@ def test_get_rest_bad_request(request_type=compute.GetSslCertificateRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3366,17 +3371,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = SslCertificatesClient(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.SslCertificatesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.SslCertificatesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslCertificatesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslCertificatesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3427,8 +3432,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertSslCertificateReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3630,17 +3636,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = SslCertificatesClient(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.SslCertificatesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.SslCertificatesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslCertificatesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3691,8 +3699,9 @@ def test_list_rest_bad_request(request_type=compute.ListSslCertificatesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3761,17 +3770,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = SslCertificatesClient(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.SslCertificatesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.SslCertificatesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslCertificatesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslCertificatesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3824,8 +3833,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3966,18 +3976,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = SslCertificatesClient(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.SslCertificatesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.SslCertificatesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SslCertificatesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.SslCertificatesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4197,11 +4209,14 @@ def test_ssl_certificates_base_transport(): def test_ssl_certificates_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.ssl_certificates.transports.SslCertificatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.ssl_certificates.transports.SslCertificatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SslCertificatesTransport( @@ -4221,9 +4236,12 @@ def test_ssl_certificates_base_transport_with_credentials_file(): def test_ssl_certificates_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.ssl_certificates.transports.SslCertificatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.ssl_certificates.transports.SslCertificatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SslCertificatesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_policies.py index d8d7d13bce53..5fa326f6b895 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_ssl_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3274,9 +3271,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3548,8 +3545,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3622,17 +3620,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3685,8 +3685,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteSslPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3791,17 +3792,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SslPoliciesRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslPoliciesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3850,8 +3849,9 @@ def test_get_rest_bad_request(request_type=compute.GetSslPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3936,17 +3936,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SslPoliciesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslPoliciesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3995,8 +3993,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertSslPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4189,17 +4188,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SslPoliciesRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslPoliciesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4248,8 +4245,9 @@ def test_list_rest_bad_request(request_type=compute.ListSslPoliciesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4318,17 +4316,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SslPoliciesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslPoliciesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4379,8 +4375,9 @@ def test_list_available_features_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4443,18 +4440,20 @@ def test_list_available_features_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_list_available_features" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, - "post_list_available_features_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_list_available_features" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_list_available_features" + ) as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, + "post_list_available_features_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "pre_list_available_features" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4510,8 +4509,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchSslPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4704,17 +4704,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SslPoliciesRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslPoliciesRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4765,8 +4763,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4907,17 +4906,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5181,11 +5183,14 @@ def test_ssl_policies_base_transport(): def test_ssl_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.ssl_policies.transports.SslPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.ssl_policies.transports.SslPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SslPoliciesTransport( @@ -5205,9 +5210,12 @@ def test_ssl_policies_base_transport_with_credentials_file(): def test_ssl_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.ssl_policies.transports.SslPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.ssl_policies.transports.SslPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SslPoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pool_types.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pool_types.py index dec7ae916fac..021545d688f5 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pool_types.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pool_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_storage_pool_types_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_storage_pool_types_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_storage_pool_types_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2002,8 +2004,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2072,17 +2075,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = StoragePoolTypesClient(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.StoragePoolTypesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.StoragePoolTypesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolTypesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2142,8 +2148,9 @@ def test_get_rest_bad_request(request_type=compute.GetStoragePoolTypeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2240,17 +2247,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = StoragePoolTypesClient(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.StoragePoolTypesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.StoragePoolTypesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolTypesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.StoragePoolTypesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2301,8 +2308,9 @@ def test_list_rest_bad_request(request_type=compute.ListStoragePoolTypesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2371,17 +2379,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = StoragePoolTypesClient(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.StoragePoolTypesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.StoragePoolTypesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolTypesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2536,11 +2546,14 @@ def test_storage_pool_types_base_transport(): def test_storage_pool_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.storage_pool_types.transports.StoragePoolTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.storage_pool_types.transports.StoragePoolTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.StoragePoolTypesTransport( @@ -2561,9 +2574,12 @@ def test_storage_pool_types_base_transport_with_credentials_file(): def test_storage_pool_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.storage_pool_types.transports.StoragePoolTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.storage_pool_types.transports.StoragePoolTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.StoragePoolTypesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pools.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pools.py index 4c609fbad541..1dad71b6b27b 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pools.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_storage_pools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_storage_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_storage_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_storage_pools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3428,9 +3425,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4165,8 +4162,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4239,17 +4237,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4302,8 +4302,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteStoragePoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4408,17 +4409,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.StoragePoolsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4469,8 +4470,9 @@ def test_get_rest_bad_request(request_type=compute.GetStoragePoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4565,17 +4567,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.StoragePoolsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.StoragePoolsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4626,8 +4626,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4694,17 +4695,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4755,8 +4758,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertStoragePoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4972,17 +4976,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.StoragePoolsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5033,8 +5037,9 @@ def test_list_rest_bad_request(request_type=compute.ListStoragePoolsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5107,17 +5112,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.StoragePoolsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.StoragePoolsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5168,8 +5171,9 @@ def test_list_disks_rest_bad_request(request_type=compute.ListDisksStoragePoolsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5242,17 +5246,19 @@ def test_list_disks_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_list_disks" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_list_disks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_list_disks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_list_disks" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_list_disks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "pre_list_disks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5307,8 +5313,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5491,17 +5498,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5554,8 +5563,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5696,18 +5706,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5760,8 +5772,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateStoragePoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5977,17 +5990,17 @@ def test_update_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.StoragePoolsRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6289,11 +6302,14 @@ def test_storage_pools_base_transport(): def test_storage_pools_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.storage_pools.transports.StoragePoolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.storage_pools.transports.StoragePoolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.StoragePoolsTransport( @@ -6313,9 +6329,12 @@ def test_storage_pools_base_transport_with_credentials_file(): def test_storage_pools_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.storage_pools.transports.StoragePoolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.storage_pools.transports.StoragePoolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.StoragePoolsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_subnetworks.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_subnetworks.py index 2f099c7776db..51111b3cc85a 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_subnetworks.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_subnetworks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_subnetworks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_subnetworks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_subnetworks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1844,9 +1841,9 @@ def test_expand_ip_cidr_range_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.expand_ip_cidr_range - ] = mock_rpc + client._transport._wrapped_methods[client._transport.expand_ip_cidr_range] = ( + mock_rpc + ) request = {} client.expand_ip_cidr_range(request) @@ -2065,9 +2062,9 @@ def test_expand_ip_cidr_range_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.expand_ip_cidr_range - ] = mock_rpc + client._transport._wrapped_methods[client._transport.expand_ip_cidr_range] = ( + mock_rpc + ) request = {} client.expand_ip_cidr_range_unary(request) @@ -4746,9 +4743,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5031,8 +5028,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5103,17 +5101,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5166,8 +5166,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteSubnetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5272,17 +5273,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SubnetworksRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SubnetworksRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5335,8 +5334,9 @@ def test_expand_ip_cidr_range_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5526,17 +5526,20 @@ def test_expand_ip_cidr_range_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_expand_ip_cidr_range" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_expand_ip_cidr_range_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_expand_ip_cidr_range" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_expand_ip_cidr_range" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, + "post_expand_ip_cidr_range_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_expand_ip_cidr_range" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5587,8 +5590,9 @@ def test_get_rest_bad_request(request_type=compute.GetSubnetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5715,17 +5719,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SubnetworksRestInterceptor, "post_get") as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SubnetworksRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5776,8 +5778,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5844,17 +5847,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5905,8 +5910,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertSubnetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6146,17 +6152,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SubnetworksRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SubnetworksRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6207,8 +6211,9 @@ def test_list_rest_bad_request(request_type=compute.ListSubnetworksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6277,17 +6282,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SubnetworksRestInterceptor, "post_list") as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SubnetworksRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6338,8 +6341,9 @@ def test_list_usable_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6410,17 +6414,19 @@ def test_list_usable_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_list_usable" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_list_usable_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_list_usable" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_list_usable" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_list_usable_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_list_usable" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6476,8 +6482,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchSubnetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6717,17 +6724,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SubnetworksRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SubnetworksRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6778,8 +6783,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6962,17 +6968,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7025,8 +7033,9 @@ def test_set_private_ip_google_access_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7216,18 +7225,20 @@ def test_set_private_ip_google_access_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_set_private_ip_google_access" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, - "post_set_private_ip_google_access_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_set_private_ip_google_access" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_set_private_ip_google_access" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, + "post_set_private_ip_google_access_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_set_private_ip_google_access" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7280,8 +7291,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7422,17 +7434,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7782,11 +7797,14 @@ def test_subnetworks_base_transport(): def test_subnetworks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.subnetworks.transports.SubnetworksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.subnetworks.transports.SubnetworksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SubnetworksTransport( @@ -7806,9 +7824,12 @@ def test_subnetworks_base_transport_with_credentials_file(): def test_subnetworks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.subnetworks.transports.SubnetworksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.subnetworks.transports.SubnetworksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SubnetworksTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_grpc_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_grpc_proxies.py index 2ee666926e90..612e4abeccd9 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_grpc_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_grpc_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_target_grpc_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_target_grpc_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_target_grpc_proxies_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2847,9 +2844,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3119,8 +3116,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetGrpcProxyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3225,17 +3223,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetGrpcProxiesClient(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.TargetGrpcProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3286,8 +3286,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetGrpcProxyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3368,17 +3369,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetGrpcProxiesClient(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.TargetGrpcProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3429,8 +3432,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetGrpcProxyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3620,17 +3624,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetGrpcProxiesClient(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.TargetGrpcProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3681,8 +3687,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetGrpcProxiesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3751,17 +3758,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetGrpcProxiesClient(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.TargetGrpcProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3814,8 +3823,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchTargetGrpcProxyRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4005,17 +4015,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = TargetGrpcProxiesClient(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.TargetGrpcProxiesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4068,8 +4080,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4210,18 +4223,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = TargetGrpcProxiesClient(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.TargetGrpcProxiesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4441,11 +4456,14 @@ def test_target_grpc_proxies_base_transport(): def test_target_grpc_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.target_grpc_proxies.transports.TargetGrpcProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.target_grpc_proxies.transports.TargetGrpcProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetGrpcProxiesTransport( @@ -4465,9 +4483,12 @@ def test_target_grpc_proxies_base_transport_with_credentials_file(): def test_target_grpc_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.target_grpc_proxies.transports.TargetGrpcProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.target_grpc_proxies.transports.TargetGrpcProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetGrpcProxiesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_http_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_http_proxies.py index 05f0677d2849..1b147bbf1ddb 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_http_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_http_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_target_http_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_target_http_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_target_http_proxies_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3529,9 +3526,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3803,8 +3800,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3875,18 +3873,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3942,8 +3942,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetHttpProxyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4048,17 +4049,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4109,8 +4112,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetHttpProxyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4195,17 +4199,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4256,8 +4262,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetHttpProxyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4449,17 +4456,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4510,8 +4519,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetHttpProxiesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4580,17 +4590,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4643,8 +4655,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchTargetHttpProxyRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4836,17 +4849,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4899,8 +4914,9 @@ def test_set_url_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5079,17 +5095,20 @@ def test_set_url_map_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_set_url_map" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "post_set_url_map_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_set_url_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_set_url_map" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, + "post_set_url_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_set_url_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5142,8 +5161,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5284,18 +5304,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5557,11 +5579,14 @@ def test_target_http_proxies_base_transport(): def test_target_http_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.target_http_proxies.transports.TargetHttpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.target_http_proxies.transports.TargetHttpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetHttpProxiesTransport( @@ -5581,9 +5606,12 @@ def test_target_http_proxies_base_transport_with_credentials_file(): def test_target_http_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.target_http_proxies.transports.TargetHttpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.target_http_proxies.transports.TargetHttpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetHttpProxiesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_https_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_https_proxies.py index 7607d2387fe3..f54b585690c9 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_https_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_https_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_target_https_proxies_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_target_https_proxies_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_target_https_proxies_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3133,9 +3130,9 @@ def test_set_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map(request) @@ -3343,9 +3340,9 @@ def test_set_certificate_map_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map_unary(request) @@ -3551,9 +3548,9 @@ def test_set_quic_override_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_quic_override - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_quic_override] = ( + mock_rpc + ) request = {} client.set_quic_override(request) @@ -3759,9 +3756,9 @@ def test_set_quic_override_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_quic_override - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_quic_override] = ( + mock_rpc + ) request = {} client.set_quic_override_unary(request) @@ -3969,9 +3966,9 @@ def test_set_ssl_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates(request) @@ -4179,9 +4176,9 @@ def test_set_ssl_certificates_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates_unary(request) @@ -5205,9 +5202,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5479,8 +5476,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5551,18 +5549,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5618,8 +5618,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetHttpsProxyRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5724,17 +5725,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5785,8 +5788,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetHttpsProxyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5889,17 +5893,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5950,8 +5956,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetHttpsProxyRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6152,17 +6159,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6213,8 +6222,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetHttpsProxiesReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6283,17 +6293,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6346,8 +6358,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchTargetHttpsProxyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6548,17 +6561,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6611,8 +6626,9 @@ def test_set_certificate_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6802,18 +6818,20 @@ def test_set_certificate_map_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_set_certificate_map" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, - "post_set_certificate_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_set_certificate_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_set_certificate_map" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_set_certificate_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_set_certificate_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6866,8 +6884,9 @@ def test_set_quic_override_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7057,18 +7076,20 @@ def test_set_quic_override_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_set_quic_override" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, - "post_set_quic_override_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_set_quic_override" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_set_quic_override" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_set_quic_override_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_set_quic_override" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7121,8 +7142,9 @@ def test_set_ssl_certificates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7312,18 +7334,20 @@ def test_set_ssl_certificates_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_set_ssl_certificates" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, - "post_set_ssl_certificates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_set_ssl_certificates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_set_ssl_certificates" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_set_ssl_certificates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_set_ssl_certificates" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7376,8 +7400,9 @@ def test_set_ssl_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7558,18 +7583,20 @@ def test_set_ssl_policy_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_set_ssl_policy" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, - "post_set_ssl_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_set_ssl_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_set_ssl_policy" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_set_ssl_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_set_ssl_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7622,8 +7649,9 @@ def test_set_url_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7802,17 +7830,20 @@ def test_set_url_map_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_set_url_map" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "post_set_url_map_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_set_url_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_set_url_map" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_set_url_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_set_url_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7865,8 +7896,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8007,18 +8039,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8370,11 +8404,14 @@ def test_target_https_proxies_base_transport(): def test_target_https_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.target_https_proxies.transports.TargetHttpsProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.target_https_proxies.transports.TargetHttpsProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetHttpsProxiesTransport( @@ -8394,9 +8431,12 @@ def test_target_https_proxies_base_transport_with_credentials_file(): def test_target_https_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.target_https_proxies.transports.TargetHttpsProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.target_https_proxies.transports.TargetHttpsProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetHttpsProxiesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_instances.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_instances.py index 0df6ed43df39..e014f43e1f09 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_instances.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_target_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_target_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_target_instances_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2759,9 +2756,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -2980,9 +2977,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -3201,9 +3198,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3486,8 +3483,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3558,17 +3556,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3628,8 +3629,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetInstanceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3738,17 +3740,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3803,8 +3807,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3891,17 +3896,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetInstancesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3952,8 +3957,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetInstanceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4142,17 +4148,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4203,8 +4211,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetInstancesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4273,17 +4282,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetInstancesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4340,8 +4349,9 @@ def test_set_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4528,18 +4538,20 @@ def test_set_security_policy_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_set_security_policy" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, - "post_set_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_set_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_set_security_policy" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, + "post_set_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "pre_set_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4592,8 +4604,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4734,18 +4747,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4988,11 +5003,14 @@ def test_target_instances_base_transport(): def test_target_instances_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.target_instances.transports.TargetInstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.target_instances.transports.TargetInstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetInstancesTransport( @@ -5012,9 +5030,12 @@ def test_target_instances_base_transport_with_credentials_file(): def test_target_instances_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.target_instances.transports.TargetInstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.target_instances.transports.TargetInstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetInstancesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_pools.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_pools.py index 9263ee129e3c..2a4f1ff4a1b3 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_pools.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_pools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_target_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_target_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_target_pools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1148,9 +1145,9 @@ def test_add_health_check_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_health_check] = ( + mock_rpc + ) request = {} client.add_health_check(request) @@ -1371,9 +1368,9 @@ def test_add_health_check_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_health_check] = ( + mock_rpc + ) request = {} client.add_health_check_unary(request) @@ -3805,9 +3802,9 @@ def test_remove_health_check_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_health_check] = ( + mock_rpc + ) request = {} client.remove_health_check(request) @@ -4030,9 +4027,9 @@ def test_remove_health_check_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_health_check] = ( + mock_rpc + ) request = {} client.remove_health_check_unary(request) @@ -5135,9 +5132,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -5356,9 +5353,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -5577,9 +5574,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5862,8 +5859,9 @@ def test_add_health_check_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6053,17 +6051,19 @@ def test_add_health_check_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_add_health_check" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_add_health_check_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_add_health_check" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_add_health_check" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_add_health_check_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_add_health_check" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6116,8 +6116,9 @@ def test_add_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6307,17 +6308,19 @@ def test_add_instance_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_add_instance" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_add_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_add_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_add_instance" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_add_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_add_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6370,8 +6373,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6442,17 +6446,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6505,8 +6511,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetPoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6611,17 +6618,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.TargetPoolsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetPoolsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6672,8 +6677,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetPoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6760,17 +6766,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.TargetPoolsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetPoolsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6819,8 +6823,9 @@ def test_get_health_rest_bad_request(request_type=compute.GetHealthTargetPoolReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6957,17 +6962,19 @@ def test_get_health_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_get_health" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_get_health_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_get_health" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_get_health" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_get_health_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_get_health" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7020,8 +7027,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetPoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7210,17 +7218,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.TargetPoolsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetPoolsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7271,8 +7277,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetPoolsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7341,17 +7348,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.TargetPoolsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetPoolsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7402,8 +7407,9 @@ def test_remove_health_check_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7593,17 +7599,20 @@ def test_remove_health_check_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_remove_health_check" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_remove_health_check_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_remove_health_check" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_remove_health_check" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, + "post_remove_health_check_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_remove_health_check" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7656,8 +7665,9 @@ def test_remove_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7847,17 +7857,19 @@ def test_remove_instance_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_remove_instance" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_remove_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_remove_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_remove_instance" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_remove_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_remove_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7908,8 +7920,9 @@ def test_set_backup_rest_bad_request(request_type=compute.SetBackupTargetPoolReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8088,17 +8101,19 @@ def test_set_backup_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_set_backup" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_set_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_set_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_set_backup" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_set_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_set_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8151,8 +8166,9 @@ def test_set_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8335,17 +8351,20 @@ def test_set_security_policy_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_set_security_policy" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_set_security_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_set_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_set_security_policy" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, + "post_set_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_set_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8398,8 +8417,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8540,17 +8560,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8921,11 +8944,14 @@ def test_target_pools_base_transport(): def test_target_pools_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.target_pools.transports.TargetPoolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.target_pools.transports.TargetPoolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetPoolsTransport( @@ -8945,9 +8971,12 @@ def test_target_pools_base_transport_with_credentials_file(): def test_target_pools_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.target_pools.transports.TargetPoolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.target_pools.transports.TargetPoolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetPoolsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_ssl_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_ssl_proxies.py index b289cea30c1f..54f2440f3a6e 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_ssl_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_ssl_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_target_ssl_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_target_ssl_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_target_ssl_proxies_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2429,9 +2426,9 @@ def test_set_backend_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service(request) @@ -2639,9 +2636,9 @@ def test_set_backend_service_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service_unary(request) @@ -2849,9 +2846,9 @@ def test_set_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map(request) @@ -3059,9 +3056,9 @@ def test_set_certificate_map_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map_unary(request) @@ -3267,9 +3264,9 @@ def test_set_proxy_header_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header(request) @@ -3475,9 +3472,9 @@ def test_set_proxy_header_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header_unary(request) @@ -3685,9 +3682,9 @@ def test_set_ssl_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates(request) @@ -3895,9 +3892,9 @@ def test_set_ssl_certificates_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates_unary(request) @@ -4517,9 +4514,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4789,8 +4786,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetSslProxyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4895,17 +4893,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4956,8 +4956,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetSslProxyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5040,17 +5041,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetSslProxiesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5101,8 +5102,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetSslProxyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5293,17 +5295,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5354,8 +5358,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetSslProxiesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5424,17 +5429,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5487,8 +5494,9 @@ def test_set_backend_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5678,18 +5686,20 @@ def test_set_backend_service_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_set_backend_service" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, - "post_set_backend_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_set_backend_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_set_backend_service" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, + "post_set_backend_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_set_backend_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5742,8 +5752,9 @@ def test_set_certificate_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5933,18 +5944,20 @@ def test_set_certificate_map_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_set_certificate_map" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, - "post_set_certificate_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_set_certificate_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_set_certificate_map" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, + "post_set_certificate_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_set_certificate_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5997,8 +6010,9 @@ def test_set_proxy_header_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6188,18 +6202,20 @@ def test_set_proxy_header_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_set_proxy_header" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, - "post_set_proxy_header_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_set_proxy_header" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_set_proxy_header" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, + "post_set_proxy_header_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_set_proxy_header" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6252,8 +6268,9 @@ def test_set_ssl_certificates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6443,18 +6460,20 @@ def test_set_ssl_certificates_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_set_ssl_certificates" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, - "post_set_ssl_certificates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_set_ssl_certificates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_set_ssl_certificates" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, + "post_set_ssl_certificates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_set_ssl_certificates" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6507,8 +6526,9 @@ def test_set_ssl_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6689,17 +6709,20 @@ def test_set_ssl_policy_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_set_ssl_policy" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "post_set_ssl_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_set_ssl_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_set_ssl_policy" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, + "post_set_ssl_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_set_ssl_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6752,8 +6775,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6894,18 +6918,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7215,11 +7241,14 @@ def test_target_ssl_proxies_base_transport(): def test_target_ssl_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.target_ssl_proxies.transports.TargetSslProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.target_ssl_proxies.transports.TargetSslProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetSslProxiesTransport( @@ -7239,9 +7268,12 @@ def test_target_ssl_proxies_base_transport_with_credentials_file(): def test_target_ssl_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.target_ssl_proxies.transports.TargetSslProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.target_ssl_proxies.transports.TargetSslProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetSslProxiesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_tcp_proxies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_tcp_proxies.py index 97a21e357fcc..c47e1844f078 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_tcp_proxies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_tcp_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2707,9 +2704,9 @@ def test_set_backend_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service(request) @@ -2917,9 +2914,9 @@ def test_set_backend_service_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service_unary(request) @@ -3125,9 +3122,9 @@ def test_set_proxy_header_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header(request) @@ -3333,9 +3330,9 @@ def test_set_proxy_header_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header_unary(request) @@ -3543,9 +3540,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3817,8 +3814,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3889,17 +3887,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3955,8 +3956,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetTcpProxyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4061,17 +4063,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4122,8 +4126,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetTcpProxyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4206,17 +4211,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetTcpProxiesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4267,8 +4272,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetTcpProxyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4459,17 +4465,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4520,8 +4528,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetTcpProxiesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4590,17 +4599,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4653,8 +4664,9 @@ def test_set_backend_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4844,18 +4856,20 @@ def test_set_backend_service_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_set_backend_service" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, - "post_set_backend_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_set_backend_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_set_backend_service" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, + "post_set_backend_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_set_backend_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4908,8 +4922,9 @@ def test_set_proxy_header_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5099,18 +5114,20 @@ def test_set_proxy_header_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_set_proxy_header" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, - "post_set_proxy_header_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_set_proxy_header" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_set_proxy_header" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, + "post_set_proxy_header_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_set_proxy_header" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5163,8 +5180,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5305,18 +5323,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5580,11 +5600,14 @@ def test_target_tcp_proxies_base_transport(): def test_target_tcp_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.target_tcp_proxies.transports.TargetTcpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.target_tcp_proxies.transports.TargetTcpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetTcpProxiesTransport( @@ -5604,9 +5627,12 @@ def test_target_tcp_proxies_base_transport_with_credentials_file(): def test_target_tcp_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.target_tcp_proxies.transports.TargetTcpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.target_tcp_proxies.transports.TargetTcpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetTcpProxiesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_vpn_gateways.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_vpn_gateways.py index 77d4adc86804..54ba7f9d04d2 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_vpn_gateways.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_target_vpn_gateways.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_target_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_target_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_target_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3211,9 +3208,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3496,8 +3493,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3568,18 +3566,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3639,8 +3639,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetVpnGatewayRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3749,17 +3750,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3814,8 +3817,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetVpnGatewayRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3904,17 +3908,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3965,8 +3971,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetVpnGatewayRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4159,17 +4166,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4220,8 +4229,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetVpnGatewaysRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4290,17 +4300,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4355,8 +4367,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4540,17 +4553,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4603,8 +4618,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4745,18 +4761,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4997,11 +5015,14 @@ def test_target_vpn_gateways_base_transport(): def test_target_vpn_gateways_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.target_vpn_gateways.transports.TargetVpnGatewaysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.target_vpn_gateways.transports.TargetVpnGatewaysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetVpnGatewaysTransport( @@ -5021,9 +5042,12 @@ def test_target_vpn_gateways_base_transport_with_credentials_file(): def test_target_vpn_gateways_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.target_vpn_gateways.transports.TargetVpnGatewaysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.target_vpn_gateways.transports.TargetVpnGatewaysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetVpnGatewaysTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_url_maps.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_url_maps.py index 1861c6530562..33042f8da670 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_url_maps.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_url_maps.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -863,10 +863,9 @@ def test_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -911,10 +910,9 @@ def test_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +948,9 @@ def test_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2379,9 +2376,9 @@ def test_invalidate_cache_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.invalidate_cache - ] = mock_rpc + client._transport._wrapped_methods[client._transport.invalidate_cache] = ( + mock_rpc + ) request = {} client.invalidate_cache(request) @@ -2587,9 +2584,9 @@ def test_invalidate_cache_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.invalidate_cache - ] = mock_rpc + client._transport._wrapped_methods[client._transport.invalidate_cache] = ( + mock_rpc + ) request = {} client.invalidate_cache_unary(request) @@ -3463,9 +3460,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4343,8 +4340,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4413,17 +4411,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.UrlMapsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4476,8 +4476,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4580,17 +4581,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4639,8 +4638,9 @@ def test_get_rest_bad_request(request_type=compute.GetUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4717,17 +4717,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4776,8 +4774,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5145,17 +5144,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5206,8 +5203,9 @@ def test_invalidate_cache_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5390,17 +5388,19 @@ def test_invalidate_cache_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_invalidate_cache" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_invalidate_cache_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_invalidate_cache" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_invalidate_cache" + ) as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_invalidate_cache_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.UrlMapsRestInterceptor, "pre_invalidate_cache" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5451,8 +5451,9 @@ def test_list_rest_bad_request(request_type=compute.ListUrlMapsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5519,17 +5520,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5578,8 +5577,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5947,17 +5947,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6008,8 +6006,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6148,17 +6147,19 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_test_iam_permissions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.UrlMapsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6211,8 +6212,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6580,17 +6582,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_update") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6639,8 +6639,9 @@ def test_validate_rest_bad_request(request_type=compute.ValidateUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6980,17 +6981,15 @@ def test_validate_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_validate" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_validate_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_validate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_validate") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_validate_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_validate") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7292,11 +7291,14 @@ def test_url_maps_base_transport(): def test_url_maps_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.url_maps.transports.UrlMapsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.url_maps.transports.UrlMapsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UrlMapsTransport( @@ -7316,9 +7318,12 @@ def test_url_maps_base_transport_with_credentials_file(): def test_url_maps_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.url_maps.transports.UrlMapsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.url_maps.transports.UrlMapsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UrlMapsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_gateways.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_gateways.py index 7be59b601a60..b3f26b1931f3 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_gateways.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_gateways.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3359,9 +3356,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3644,8 +3641,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3716,17 +3714,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3779,8 +3779,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteVpnGatewayRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3885,17 +3886,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3946,8 +3945,9 @@ def test_get_rest_bad_request(request_type=compute.GetVpnGatewayRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4030,17 +4030,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "post_get") as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4089,8 +4087,9 @@ def test_get_status_rest_bad_request(request_type=compute.GetStatusVpnGatewayReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4150,17 +4149,19 @@ def test_get_status_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_get_status" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_get_status_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_get_status" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_get_status" + ) as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_get_status_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "pre_get_status" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4216,8 +4217,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertVpnGatewayRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4413,17 +4415,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4474,8 +4474,9 @@ def test_list_rest_bad_request(request_type=compute.ListVpnGatewaysRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4544,17 +4545,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "post_list") as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4603,8 +4602,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsVpnGatewayReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4788,17 +4788,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4851,8 +4853,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4993,17 +4996,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5265,11 +5271,14 @@ def test_vpn_gateways_base_transport(): def test_vpn_gateways_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.vpn_gateways.transports.VpnGatewaysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.vpn_gateways.transports.VpnGatewaysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VpnGatewaysTransport( @@ -5289,9 +5298,12 @@ def test_vpn_gateways_base_transport_with_credentials_file(): def test_vpn_gateways_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.vpn_gateways.transports.VpnGatewaysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.vpn_gateways.transports.VpnGatewaysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VpnGatewaysTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_tunnels.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_tunnels.py index e73f4847c189..41662b2b2723 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_tunnels.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_vpn_tunnels.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +877,9 @@ def test_vpn_tunnels_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +924,9 @@ def test_vpn_tunnels_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +962,9 @@ def test_vpn_tunnels_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3137,9 +3134,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3422,8 +3419,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3494,17 +3492,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3557,8 +3557,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteVpnTunnelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3663,17 +3664,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3722,8 +3721,9 @@ def test_get_rest_bad_request(request_type=compute.GetVpnTunnelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3832,17 +3832,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3891,8 +3889,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertVpnTunnelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4110,17 +4109,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4169,8 +4166,9 @@ def test_list_rest_bad_request(request_type=compute.ListVpnTunnelsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4239,17 +4237,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4298,8 +4294,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsVpnTunnelRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4483,17 +4480,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4546,8 +4545,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4688,17 +4688,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4939,11 +4942,14 @@ def test_vpn_tunnels_base_transport(): def test_vpn_tunnels_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.vpn_tunnels.transports.VpnTunnelsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.vpn_tunnels.transports.VpnTunnelsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VpnTunnelsTransport( @@ -4963,9 +4969,12 @@ def test_vpn_tunnels_base_transport_with_credentials_file(): def test_vpn_tunnels_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.vpn_tunnels.transports.VpnTunnelsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.vpn_tunnels.transports.VpnTunnelsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VpnTunnelsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_wire_groups.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_wire_groups.py index 6d2dffa6b862..601bd6a08ed6 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_wire_groups.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_wire_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +877,9 @@ def test_wire_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +924,9 @@ def test_wire_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +962,9 @@ def test_wire_groups_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2968,8 +2965,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteWireGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3078,17 +3076,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = WireGroupsClient(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.WireGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.WireGroupsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WireGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.WireGroupsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.WireGroupsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.WireGroupsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3141,8 +3137,9 @@ def test_get_rest_bad_request(request_type=compute.GetWireGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3223,17 +3220,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = WireGroupsClient(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.WireGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.WireGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WireGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.WireGroupsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.WireGroupsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.WireGroupsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3282,8 +3277,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertWireGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3481,17 +3477,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = WireGroupsClient(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.WireGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.WireGroupsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WireGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.WireGroupsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.WireGroupsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.WireGroupsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3540,8 +3534,9 @@ def test_list_rest_bad_request(request_type=compute.ListWireGroupsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3614,17 +3609,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = WireGroupsClient(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.WireGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.WireGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WireGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.WireGroupsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.WireGroupsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.WireGroupsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3677,8 +3670,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchWireGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3880,17 +3874,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = WireGroupsClient(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.WireGroupsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.WireGroupsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WireGroupsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.WireGroupsRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.WireGroupsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.WireGroupsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4083,11 +4075,14 @@ def test_wire_groups_base_transport(): def test_wire_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.wire_groups.transports.WireGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.wire_groups.transports.WireGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.WireGroupsTransport( @@ -4107,9 +4102,12 @@ def test_wire_groups_base_transport_with_credentials_file(): def test_wire_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.wire_groups.transports.WireGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.wire_groups.transports.WireGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.WireGroupsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_operations.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_operations.py index 69f2befe803b..731d68107b51 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_operations.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -895,10 +900,9 @@ def test_zone_operations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -943,10 +947,9 @@ def test_zone_operations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +985,9 @@ def test_zone_operations_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2104,8 +2106,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteZoneOperationRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2165,17 +2168,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ZoneOperationsClient(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.ZoneOperationsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2231,8 +2236,9 @@ def test_get_rest_bad_request(request_type=compute.GetZoneOperationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2337,17 +2343,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = ZoneOperationsClient(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.ZoneOperationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ZoneOperationsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ZoneOperationsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2398,8 +2402,9 @@ def test_list_rest_bad_request(request_type=compute.ListZoneOperationsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2468,17 +2473,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = ZoneOperationsClient(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.ZoneOperationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ZoneOperationsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2529,8 +2534,9 @@ def test_wait_rest_bad_request(request_type=compute.WaitZoneOperationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2635,17 +2641,17 @@ def test_wait_rest_interceptors(null_interceptor): ) client = ZoneOperationsClient(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.ZoneOperationsRestInterceptor, "post_wait" - ) as post, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "post_wait_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "pre_wait" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_wait" + ) as post, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_wait_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ZoneOperationsRestInterceptor, "pre_wait") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2819,11 +2825,14 @@ def test_zone_operations_base_transport(): def test_zone_operations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.zone_operations.transports.ZoneOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.zone_operations.transports.ZoneOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ZoneOperationsTransport( @@ -2843,9 +2852,12 @@ def test_zone_operations_base_transport_with_credentials_file(): def test_zone_operations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.zone_operations.transports.ZoneOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.zone_operations.transports.ZoneOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ZoneOperationsTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_vm_extension_policies.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_vm_extension_policies.py index 7e15997ecea1..7fbccdef8f75 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_vm_extension_policies.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zone_vm_extension_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_zone_vm_extension_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_zone_vm_extension_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_zone_vm_extension_policies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3029,8 +3026,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3139,17 +3137,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ZoneVmExtensionPoliciesClient(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.ZoneVmExtensionPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ZoneVmExtensionPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneVmExtensionPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3204,8 +3205,9 @@ def test_get_rest_bad_request(request_type=compute.GetZoneVmExtensionPolicyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3294,17 +3296,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = ZoneVmExtensionPoliciesClient(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.ZoneVmExtensionPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ZoneVmExtensionPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneVmExtensionPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3357,8 +3361,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3552,17 +3557,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ZoneVmExtensionPoliciesClient(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.ZoneVmExtensionPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ZoneVmExtensionPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneVmExtensionPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3613,8 +3621,9 @@ def test_list_rest_bad_request(request_type=compute.ListZoneVmExtensionPoliciesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3687,17 +3696,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = ZoneVmExtensionPoliciesClient(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.ZoneVmExtensionPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ZoneVmExtensionPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneVmExtensionPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3756,8 +3767,9 @@ def test_update_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3955,17 +3967,20 @@ def test_update_rest_interceptors(null_interceptor): ) client = ZoneVmExtensionPoliciesClient(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.ZoneVmExtensionPoliciesRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.ZoneVmExtensionPoliciesRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneVmExtensionPoliciesRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, + "post_update_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ZoneVmExtensionPoliciesRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4160,11 +4175,14 @@ def test_zone_vm_extension_policies_base_transport(): def test_zone_vm_extension_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.zone_vm_extension_policies.transports.ZoneVmExtensionPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.zone_vm_extension_policies.transports.ZoneVmExtensionPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ZoneVmExtensionPoliciesTransport( @@ -4184,9 +4202,12 @@ def test_zone_vm_extension_policies_base_transport_with_credentials_file(): def test_zone_vm_extension_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.zone_vm_extension_policies.transports.ZoneVmExtensionPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.zone_vm_extension_policies.transports.ZoneVmExtensionPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ZoneVmExtensionPoliciesTransport() diff --git a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zones.py b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zones.py index 67a74224e27d..ae2785810ffd 100644 --- a/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zones.py +++ b/packages/google-cloud-compute-v1beta/tests/unit/gapic/compute_v1beta/test_zones.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -845,10 +850,9 @@ def test_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -893,10 +897,9 @@ def test_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -932,10 +935,9 @@ def test_zones_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1627,8 +1629,9 @@ def test_get_rest_bad_request(request_type=compute.GetZoneRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1707,17 +1710,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = ZonesClient(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.ZonesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ZonesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZonesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ZonesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.ZonesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ZonesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1766,8 +1767,9 @@ def test_list_rest_bad_request(request_type=compute.ListZonesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1834,17 +1836,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = ZonesClient(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.ZonesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ZonesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZonesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ZonesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.ZonesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ZonesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1974,11 +1974,14 @@ def test_zones_base_transport(): def test_zones_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1beta.services.zones.transports.ZonesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1beta.services.zones.transports.ZonesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ZonesTransport( @@ -1999,9 +2002,12 @@ def test_zones_base_transport_with_credentials_file(): def test_zones_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1beta.services.zones.transports.ZonesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1beta.services.zones.transports.ZonesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ZonesTransport() diff --git a/packages/google-cloud-compute/docs/conf.py b/packages/google-cloud-compute/docs/conf.py index bf0b03a465ba..f3c5fb3c23aa 100644 --- a/packages/google-cloud-compute/docs/conf.py +++ b/packages/google-cloud-compute/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-compute documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/__init__.py index f36bd1b3720e..053330a21760 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.accelerator_types import AcceleratorTypesClient from .services.addresses import AddressesClient from .services.advice import AdviceClient diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/client.py index 4efc79fa6b32..2693fa6aadd5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class AcceleratorTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AcceleratorTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AcceleratorTypesTransport]] _transport_registry["rest"] = AcceleratorTypesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AcceleratorTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AcceleratorTypesClient._read_environment_variables() + ) self._client_cert_source = AcceleratorTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AcceleratorTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/pagers.py index bdce91a4cd77..22ed1805e24c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/base.py index f6d0bff66ad5..5a237533c71f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/rest.py index 9fde99b99837..d4116ddd5c35 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/accelerator_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -397,9 +397,7 @@ def __call__( """ - http_options = ( - _BaseAcceleratorTypesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseAcceleratorTypesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseAcceleratorTypesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/client.py index a5a6689b2e34..2a3434ae32ba 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.addresses import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AddressesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AddressesClient._read_environment_variables() + ) self._client_cert_source = AddressesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AddressesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/pagers.py index 912b26e31dcd..dc05f47bb312 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/base.py index 198be0e9b075..656b6a975d70 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/rest.py index 2bd1d7a002f1..7fcc08029e68 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/addresses/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/client.py index 7a241de31a5b..0477f4fba81c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -594,11 +594,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AdviceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AdviceClient._read_environment_variables() + ) self._client_cert_source = AdviceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -633,8 +631,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AdviceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/base.py index 47a4ce059f41..305db5503fd5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/rest.py index a1735b379fb7..a4259b154351 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/advice/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/client.py index b55f2437ce57..dd8ddfef7bc1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.autoscalers import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutoscalersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutoscalersClient._read_environment_variables() + ) self._client_cert_source = AutoscalersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutoscalersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/pagers.py index 5b0dac4c351c..e1b36ad16334 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/base.py index 63f707f8a6a8..cebae1db8825 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/rest.py index 4d7685d4095b..9f9fd8d01124 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/autoscalers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1652,9 +1652,7 @@ def __call__( """ - http_options = ( - _BaseAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/client.py index 4e9eecca807c..826f2d618f20 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.backend_buckets import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class BackendBucketsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BackendBucketsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BackendBucketsTransport]] _transport_registry["rest"] = BackendBucketsRestTransport def get_transport_class( @@ -600,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackendBucketsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackendBucketsClient._read_environment_variables() + ) self._client_cert_source = BackendBucketsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackendBucketsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/pagers.py index 18c3f8e9591e..8b5f62591182 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/base.py index b15ec48f04a8..e70ad86cd15d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/rest.py index 6fb5f867f740..a831f4a9445a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_buckets/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -919,9 +919,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseAddSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseAddSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_add_signed_url_key( request, metadata @@ -1276,9 +1274,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseDeleteSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseDeleteSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_delete_signed_url_key( request, metadata @@ -2336,9 +2332,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_edge_security_policy( request, metadata @@ -2716,9 +2710,7 @@ def __call__( """ - http_options = ( - _BaseBackendBucketsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBackendBucketsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/client.py index 67f2884bf8f1..02a162df0a42 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.backend_services import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class BackendServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BackendServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BackendServicesTransport]] _transport_registry["rest"] = BackendServicesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackendServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackendServicesClient._read_environment_variables() + ) self._client_cert_source = BackendServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackendServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/pagers.py index 2ac4f9c3798b..8251a1d17d34 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/base.py index 33a9a77d3f5e..f72b1ae45be9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/rest.py index f2983ded1503..60d2c63f2df6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/backend_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1212,9 +1212,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseAddSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseAddSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_add_signed_url_key( request, metadata @@ -1367,9 +1365,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseBackendServicesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1722,9 +1718,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseDeleteSignedUrlKey._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseDeleteSignedUrlKey._get_http_options() request, metadata = self._interceptor.pre_delete_signed_url_key( request, metadata @@ -2040,9 +2034,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseGetEffectiveSecurityPolicies._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseGetEffectiveSecurityPolicies._get_http_options() request, metadata = self._interceptor.pre_get_effective_security_policies( request, metadata @@ -2108,11 +2100,10 @@ def __call__( resp = self._interceptor.post_get_effective_security_policies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_effective_security_policies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_effective_security_policies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3267,9 +3258,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseSetEdgeSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_edge_security_policy( request, metadata @@ -3678,9 +3667,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_security_policy( request, metadata @@ -3833,9 +3820,7 @@ def __call__( """ - http_options = ( - _BaseBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -4166,7 +4151,9 @@ def get_effective_security_policies( ]: # 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._GetEffectiveSecurityPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._GetEffectiveSecurityPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_health( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/client.py index ea96a48f371f..73d44749454b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.cross_site_networks import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class CrossSiteNetworksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CrossSiteNetworksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CrossSiteNetworksTransport]] _transport_registry["rest"] = CrossSiteNetworksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CrossSiteNetworksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CrossSiteNetworksClient._read_environment_variables() + ) self._client_cert_source = CrossSiteNetworksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CrossSiteNetworksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/pagers.py index 7cd02370a015..2a348324df6e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/base.py index f591e25213e5..301c6ba7c1a9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/rest.py index 5c9ba7df4cf6..90a050711d82 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/cross_site_networks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/client.py index 2375d136a601..d3133253acda 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DiskTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DiskTypesClient._read_environment_variables() + ) self._client_cert_source = DiskTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DiskTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/pagers.py index d18374dccb1b..70ce6acc1cb7 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/base.py index 7936e2b4cf29..7929a00d5c6c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/rest.py index 06650c0f9611..84d5809031a1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disk_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/client.py index bc9f6943830c..eb91a41652c2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.disks import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DisksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DisksClient._read_environment_variables() + ) self._client_cert_source = DisksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DisksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/pagers.py index 9e4fa70e1484..421cb6f79618 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/base.py index e19c01b26681..80ee7c27b3c7 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/rest.py index 9b9cec1d87ae..016b26cbee57 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/disks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -4152,9 +4152,7 @@ def __call__( """ - http_options = ( - _BaseDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() - ) + http_options = _BaseDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_stop_group_async_replication( request, metadata @@ -4664,7 +4662,9 @@ def remove_resource_policies( ) -> Callable[[compute.RemoveResourcePoliciesDiskRequest], compute.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._RemoveResourcePolicies(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveResourcePolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def resize(self) -> Callable[[compute.ResizeDiskRequest], compute.Operation]: @@ -4708,7 +4708,9 @@ def stop_group_async_replication( ) -> Callable[[compute.StopGroupAsyncReplicationDiskRequest], compute.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._StopGroupAsyncReplication(self._session, self._host, self._interceptor) # type: ignore + return self._StopGroupAsyncReplication( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/client.py index c167923ab0f3..35bdbed63343 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.external_vpn_gateways import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class ExternalVpnGatewaysClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ExternalVpnGatewaysTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ExternalVpnGatewaysTransport]] _transport_registry["rest"] = ExternalVpnGatewaysRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ExternalVpnGatewaysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ExternalVpnGatewaysClient._read_environment_variables() + ) self._client_cert_source = ExternalVpnGatewaysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ExternalVpnGatewaysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/pagers.py index 9741d377178c..b2ab547473bf 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/__init__.py index 9300bfbc4bb0..0fe624e4ec94 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ExternalVpnGatewaysRestInterceptor, ExternalVpnGatewaysRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ExternalVpnGatewaysTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ExternalVpnGatewaysTransport]] _transport_registry["rest"] = ExternalVpnGatewaysRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/base.py index 5694ff46ca73..c7e32fb5c0b6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/rest.py index ff9e29fdde16..ad4b36265c9d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/external_vpn_gateways/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1413,9 +1413,7 @@ def __call__( """ - http_options = ( - _BaseExternalVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseExternalVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/client.py index 3e86a911ae40..9092004305fa 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.firewall_policies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class FirewallPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FirewallPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FirewallPoliciesTransport]] _transport_registry["rest"] = FirewallPoliciesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FirewallPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FirewallPoliciesClient._read_environment_variables() + ) self._client_cert_source = FirewallPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FirewallPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/pagers.py index f9b1b546bc80..f56624d74261 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/base.py index c44ed8c8fc4f..22dd71a5f0c3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_organization_operations @@ -430,9 +430,9 @@ def _global_organization_operations_client( transport=self.kind, ) ) - self._extended_operations_services[ - "global_organization_operations" - ] = ex_op_service + self._extended_operations_services["global_organization_operations"] = ( + ex_op_service + ) return ex_op_service diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/rest.py index 3737dcf89019..e506049ed9b5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewall_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1251,9 +1251,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseFirewallPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -2088,9 +2086,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseFirewallPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2943,9 +2939,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseListAssociations._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseListAssociations._get_http_options() request, metadata = self._interceptor.pre_list_associations( request, metadata @@ -3662,9 +3656,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -4212,9 +4204,7 @@ def __call__( """ - http_options = ( - _BaseFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/client.py index 88d08a66042c..13f8ccaa05b8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.firewalls import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FirewallsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FirewallsClient._read_environment_variables() + ) self._client_cert_source = FirewallsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FirewallsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/pagers.py index eacfbc3492b2..6103d21c9d5f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/base.py index 24d9a9888b86..fa325f22000b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/rest.py index d2d5e01f1274..6a5b5842a9d3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/firewalls/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/client.py index 0a56b4818329..ab63696b0966 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.forwarding_rules import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class ForwardingRulesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ForwardingRulesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ForwardingRulesTransport]] _transport_registry["rest"] = ForwardingRulesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ForwardingRulesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ForwardingRulesClient._read_environment_variables() + ) self._client_cert_source = ForwardingRulesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ForwardingRulesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/pagers.py index 36a1023f0329..0454878eb5b9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/base.py index ecec596ffd38..429cedec9c76 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/rest.py index a3921a320e82..b48d42da923f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/forwarding_rules/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -665,9 +665,7 @@ def __call__( """ - http_options = ( - _BaseForwardingRulesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseForwardingRulesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseForwardingRulesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/client.py index a704f365a2e5..5fb00c1df7d2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.future_reservations import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class FutureReservationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FutureReservationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FutureReservationsTransport]] _transport_registry["rest"] = FutureReservationsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FutureReservationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FutureReservationsClient._read_environment_variables() + ) self._client_cert_source = FutureReservationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FutureReservationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/pagers.py index 0d67f0dbd095..a5bca68fca43 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/__init__.py index 17942ee90dd8..619aabbfdb22 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import FutureReservationsRestInterceptor, FutureReservationsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[FutureReservationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[FutureReservationsTransport]] _transport_registry["rest"] = FutureReservationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/base.py index 4c3f78d1d5bc..a8ad7bf155d5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/rest.py index 54ee5157f77b..8e2368460985 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/future_reservations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -619,9 +619,7 @@ def __call__( """ - http_options = ( - _BaseFutureReservationsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseFutureReservationsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseFutureReservationsRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/client.py index 2316cef53ffa..51926816216d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.global_addresses import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class GlobalAddressesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalAddressesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalAddressesTransport]] _transport_registry["rest"] = GlobalAddressesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalAddressesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalAddressesClient._read_environment_variables() + ) self._client_cert_source = GlobalAddressesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalAddressesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/pagers.py index 3d6598395d1f..79d95f806d7f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/base.py index e9d3e956ce5c..eaeb3f037ab4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/rest.py index 5882212eb4f3..7691473488e4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_addresses/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1640,9 +1640,7 @@ def __call__( """ - http_options = ( - _BaseGlobalAddressesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseGlobalAddressesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/client.py index a553abe357ac..91eeaa3c5b2a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.global_forwarding_rules import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class GlobalForwardingRulesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalForwardingRulesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalForwardingRulesTransport]] _transport_registry["rest"] = GlobalForwardingRulesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalForwardingRulesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalForwardingRulesClient._read_environment_variables() + ) self._client_cert_source = GlobalForwardingRulesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalForwardingRulesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/pagers.py index d92eaf416bfc..a3e194295fa6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/__init__.py index 3854f4dcea54..fc066edab114 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalForwardingRulesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalForwardingRulesTransport]] _transport_registry["rest"] = GlobalForwardingRulesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/base.py index cdb2ac26ba9a..5765e75e8dd4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/rest.py index eda07d88ac71..f735e60db1bc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_forwarding_rules/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1487,9 +1487,7 @@ def __call__( """ - http_options = ( - _BaseGlobalForwardingRulesRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseGlobalForwardingRulesRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseGlobalForwardingRulesRestTransport._BaseSetLabels._get_transcoded_request( @@ -1668,9 +1666,7 @@ def __call__( """ - http_options = ( - _BaseGlobalForwardingRulesRestTransport._BaseSetTarget._get_http_options() - ) + http_options = _BaseGlobalForwardingRulesRestTransport._BaseSetTarget._get_http_options() request, metadata = self._interceptor.pre_set_target(request, metadata) transcoded_request = _BaseGlobalForwardingRulesRestTransport._BaseSetTarget._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/client.py index bc83f93add72..46f7c8b39b2b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.global_network_endpoint_groups import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class GlobalNetworkEndpointGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] _transport_registry["rest"] = GlobalNetworkEndpointGroupsRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalNetworkEndpointGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalNetworkEndpointGroupsClient._read_environment_variables() + ) self._client_cert_source = ( GlobalNetworkEndpointGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalNetworkEndpointGroupsTransport, transport) self._api_endpoint = self._transport.host @@ -839,9 +834,7 @@ def sample_attach_network_endpoints(): global_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_attach_endpoints_request_resource = ( - global_network_endpoint_groups_attach_endpoints_request_resource - ) + request.global_network_endpoint_groups_attach_endpoints_request_resource = global_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -990,9 +983,7 @@ def sample_attach_network_endpoints(): global_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_attach_endpoints_request_resource = ( - global_network_endpoint_groups_attach_endpoints_request_resource - ) + request.global_network_endpoint_groups_attach_endpoints_request_resource = global_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1445,9 +1436,7 @@ def sample_detach_network_endpoints(): global_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_detach_endpoints_request_resource = ( - global_network_endpoint_groups_detach_endpoints_request_resource - ) + request.global_network_endpoint_groups_detach_endpoints_request_resource = global_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1596,9 +1585,7 @@ def sample_detach_network_endpoints(): global_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.global_network_endpoint_groups_detach_endpoints_request_resource = ( - global_network_endpoint_groups_detach_endpoints_request_resource - ) + request.global_network_endpoint_groups_detach_endpoints_request_resource = global_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/pagers.py index 299fc99577f8..b92056d86bed 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/__init__.py index 99b13497ddba..cefb9a8a2787 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalNetworkEndpointGroupsTransport]] _transport_registry["rest"] = GlobalNetworkEndpointGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/base.py index f22fba3f940b..06dc088fa11a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/rest.py index 887a85c4452f..2c54683d3c70 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_network_endpoint_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -660,9 +660,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_attach_network_endpoints( request, metadata @@ -842,9 +840,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDelete._get_transcoded_request( @@ -1020,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_detach_network_endpoints( request, metadata @@ -1183,9 +1177,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseGet._get_transcoded_request( @@ -1357,9 +1349,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseInsert._get_transcoded_request( @@ -1509,9 +1499,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseList._get_transcoded_request( @@ -1656,9 +1644,7 @@ def __call__( """ - http_options = ( - _BaseGlobalNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() - ) + http_options = _BaseGlobalNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_network_endpoints( request, metadata @@ -1761,7 +1747,9 @@ def attach_network_endpoints( ]: # 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._AttachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._AttachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete( @@ -1780,7 +1768,9 @@ def detach_network_endpoints( ]: # 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._DetachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._DetachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/client.py index 739685a85f9c..7484a8c4c8a8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class GlobalOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalOperationsTransport]] _transport_registry["rest"] = GlobalOperationsRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalOperationsClient._read_environment_variables() + ) self._client_cert_source = GlobalOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/pagers.py index 957ce6fb43de..de5bd1bc0054 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/base.py index f8fee31318b0..c2b6ec289041 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/rest.py index 84b5806d1161..46c3317b179c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -505,9 +505,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOperationsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseGlobalOperationsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseGlobalOperationsRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/client.py index 7fd9e487f1c0..56a6462bd1e8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class GlobalOrganizationOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] _transport_registry["rest"] = GlobalOrganizationOperationsRestTransport def get_transport_class( @@ -609,11 +607,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalOrganizationOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalOrganizationOperationsClient._read_environment_variables() + ) self._client_cert_source = ( GlobalOrganizationOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -652,8 +648,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalOrganizationOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/pagers.py index 5e65399b5dc3..44fbd215a0d5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/__init__.py index 2a15d17dfe0e..b015c2aa78f3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalOrganizationOperationsTransport]] _transport_registry["rest"] = GlobalOrganizationOperationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/base.py index 847cf6b43006..f60e158bf125 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/rest.py index e345f0a1dd29..42bfcad1a76c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_organization_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -402,9 +402,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOrganizationOperationsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalOrganizationOperationsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalOrganizationOperationsRestTransport._BaseDelete._get_transcoded_request( @@ -581,9 +579,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOrganizationOperationsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseGlobalOrganizationOperationsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseGlobalOrganizationOperationsRestTransport._BaseGet._get_transcoded_request( @@ -728,9 +724,7 @@ def __call__( """ - http_options = ( - _BaseGlobalOrganizationOperationsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalOrganizationOperationsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalOrganizationOperationsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/client.py index 2db2fa9f2348..2211d3abf809 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.global_public_delegated_prefixes import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class GlobalPublicDelegatedPrefixesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] _transport_registry["rest"] = GlobalPublicDelegatedPrefixesRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GlobalPublicDelegatedPrefixesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GlobalPublicDelegatedPrefixesClient._read_environment_variables() + ) self._client_cert_source = ( GlobalPublicDelegatedPrefixesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GlobalPublicDelegatedPrefixesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/pagers.py index b944c1685e0f..5b8ad3e13fbb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/__init__.py index c9b6bd28dec3..f096c6964246 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GlobalPublicDelegatedPrefixesTransport]] _transport_registry["rest"] = GlobalPublicDelegatedPrefixesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/base.py index ab5c867c3b7e..c1f827e77b9a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/rest.py index 7fca32032c00..789dbb33205a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/global_public_delegated_prefixes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -540,9 +540,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseDelete._get_transcoded_request( @@ -696,9 +694,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseGet._get_transcoded_request( @@ -870,9 +866,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseInsert._get_transcoded_request( @@ -1022,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BaseList._get_transcoded_request( @@ -1198,9 +1190,7 @@ def __call__( """ - http_options = ( - _BaseGlobalPublicDelegatedPrefixesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseGlobalPublicDelegatedPrefixesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseGlobalPublicDelegatedPrefixesRestTransport._BasePatch._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/client.py index 85876bd3bd60..f1eb9fc4a6c1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.health_checks import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = HealthChecksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + HealthChecksClient._read_environment_variables() + ) self._client_cert_source = HealthChecksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(HealthChecksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/pagers.py index 5e5defd255c0..277fd1e1bbcd 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/base.py index 11024b353923..ebdcd1b339a2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/rest.py index 380802062805..82fdbcc8c562 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/health_checks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1670,9 +1670,7 @@ def __call__( """ - http_options = ( - _BaseHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/client.py index dc2e276cc692..235af04fdce8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -75,9 +75,7 @@ class ImageFamilyViewsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ImageFamilyViewsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ImageFamilyViewsTransport]] _transport_registry["rest"] = ImageFamilyViewsRestTransport def get_transport_class( @@ -598,11 +596,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ImageFamilyViewsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ImageFamilyViewsClient._read_environment_variables() + ) self._client_cert_source = ImageFamilyViewsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +633,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ImageFamilyViewsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/base.py index 1d26cbf9229b..c90c4774be5e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/rest.py index 445dac58645a..e73b0ab62eb4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/image_family_views/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/client.py index 2e82792a743f..82b297d79eed 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.images import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ImagesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ImagesClient._read_environment_variables() + ) self._client_cert_source = ImagesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ImagesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/pagers.py index d635cb3f28f2..e496be3eca79 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/base.py index b96b1d294e67..b286307402e3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/rest.py index b893107a4ad0..aaaa71892cd4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/images/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/client.py index fa040c3afbd9..70f9edd3615e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.instance_group_manager_resize_requests import ( pagers, @@ -84,9 +84,7 @@ class InstanceGroupManagerResizeRequestsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] _transport_registry["rest"] = InstanceGroupManagerResizeRequestsRestTransport def get_transport_class( @@ -619,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceGroupManagerResizeRequestsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceGroupManagerResizeRequestsClient._read_environment_variables() + ) self._client_cert_source = ( InstanceGroupManagerResizeRequestsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -664,8 +660,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast( InstanceGroupManagerResizeRequestsTransport, transport diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/pagers.py index 1880e0352a7e..ebfc55756b42 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/__init__.py index 909be688fd9c..f8e449424b53 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagerResizeRequestsTransport]] _transport_registry["rest"] = InstanceGroupManagerResizeRequestsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/base.py index 2f1eef1b3952..0abc67600b3a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/rest.py index a06e714b687f..55dbff6e2e9c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_manager_resize_requests/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -544,9 +544,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_http_options() request, metadata = self._interceptor.pre_cancel(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseCancel._get_transcoded_request( @@ -721,9 +719,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseDelete._get_transcoded_request( @@ -878,9 +874,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseGet._get_transcoded_request( @@ -1056,9 +1050,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseInsert._get_transcoded_request( @@ -1210,9 +1202,7 @@ def __call__( [Output Only] A list of resize requests. """ - http_options = ( - _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseInstanceGroupManagerResizeRequestsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/client.py index 78c42f1e4ceb..9d7c540c59e2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.instance_group_managers import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class InstanceGroupManagersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceGroupManagersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagersTransport]] _transport_registry["rest"] = InstanceGroupManagersRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceGroupManagersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceGroupManagersClient._read_environment_variables() + ) self._client_cert_source = InstanceGroupManagersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceGroupManagersTransport, transport) self._api_endpoint = self._transport.host @@ -2716,9 +2711,7 @@ def sample_delete_per_instance_configs(): instance_group_managers_delete_per_instance_configs_req_resource is not None ): - request.instance_group_managers_delete_per_instance_configs_req_resource = ( - instance_group_managers_delete_per_instance_configs_req_resource - ) + request.instance_group_managers_delete_per_instance_configs_req_resource = instance_group_managers_delete_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2882,9 +2875,7 @@ def sample_delete_per_instance_configs(): instance_group_managers_delete_per_instance_configs_req_resource is not None ): - request.instance_group_managers_delete_per_instance_configs_req_resource = ( - instance_group_managers_delete_per_instance_configs_req_resource - ) + request.instance_group_managers_delete_per_instance_configs_req_resource = instance_group_managers_delete_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4512,9 +4503,7 @@ def sample_patch_per_instance_configs(): instance_group_managers_patch_per_instance_configs_req_resource is not None ): - request.instance_group_managers_patch_per_instance_configs_req_resource = ( - instance_group_managers_patch_per_instance_configs_req_resource - ) + request.instance_group_managers_patch_per_instance_configs_req_resource = instance_group_managers_patch_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4679,9 +4668,7 @@ def sample_patch_per_instance_configs(): instance_group_managers_patch_per_instance_configs_req_resource is not None ): - request.instance_group_managers_patch_per_instance_configs_req_resource = ( - instance_group_managers_patch_per_instance_configs_req_resource - ) + request.instance_group_managers_patch_per_instance_configs_req_resource = instance_group_managers_patch_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -5998,9 +5985,7 @@ def sample_set_instance_template(): instance_group_managers_set_instance_template_request_resource is not None ): - request.instance_group_managers_set_instance_template_request_resource = ( - instance_group_managers_set_instance_template_request_resource - ) + request.instance_group_managers_set_instance_template_request_resource = instance_group_managers_set_instance_template_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6161,9 +6146,7 @@ def sample_set_instance_template(): instance_group_managers_set_instance_template_request_resource is not None ): - request.instance_group_managers_set_instance_template_request_resource = ( - instance_group_managers_set_instance_template_request_resource - ) + request.instance_group_managers_set_instance_template_request_resource = instance_group_managers_set_instance_template_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7865,9 +7848,7 @@ def sample_update_per_instance_configs(): instance_group_managers_update_per_instance_configs_req_resource is not None ): - request.instance_group_managers_update_per_instance_configs_req_resource = ( - instance_group_managers_update_per_instance_configs_req_resource - ) + request.instance_group_managers_update_per_instance_configs_req_resource = instance_group_managers_update_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -8032,9 +8013,7 @@ def sample_update_per_instance_configs(): instance_group_managers_update_per_instance_configs_req_resource is not None ): - request.instance_group_managers_update_per_instance_configs_req_resource = ( - instance_group_managers_update_per_instance_configs_req_resource - ) + request.instance_group_managers_update_per_instance_configs_req_resource = instance_group_managers_update_per_instance_configs_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/pagers.py index 8ca1f7c60215..19de5b87e191 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -300,7 +300,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -380,7 +380,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/__init__.py index f219aff6d960..11971291fcaf 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InstanceGroupManagersTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupManagersTransport]] _transport_registry["rest"] = InstanceGroupManagersRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/base.py index 11461af5c28b..3d92b17de019 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/rest.py index bede0b9e54ed..a46bd57ed3e0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_group_managers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1611,9 +1611,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() request, metadata = self._interceptor.pre_abandon_instances( request, metadata @@ -1767,9 +1765,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1946,9 +1942,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() request, metadata = self._interceptor.pre_apply_updates_to_instances( request, metadata @@ -2129,9 +2123,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() request, metadata = self._interceptor.pre_create_instances( request, metadata @@ -2489,9 +2481,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() request, metadata = self._interceptor.pre_delete_instances( request, metadata @@ -2675,9 +2665,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_delete_per_instance_configs( request, metadata @@ -3314,9 +3302,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() request, metadata = self._interceptor.pre_list_errors(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseListErrors._get_transcoded_request( @@ -3465,9 +3451,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() request, metadata = self._interceptor.pre_list_managed_instances( request, metadata @@ -3618,9 +3602,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_list_per_instance_configs( request, metadata @@ -3982,9 +3964,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_patch_per_instance_configs( request, metadata @@ -4165,9 +4145,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() request, metadata = self._interceptor.pre_recreate_instances( request, metadata @@ -4525,9 +4503,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() request, metadata = self._interceptor.pre_resume_instances( request, metadata @@ -4710,9 +4686,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() request, metadata = self._interceptor.pre_set_instance_template( request, metadata @@ -4895,9 +4869,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() request, metadata = self._interceptor.pre_set_target_pools( request, metadata @@ -5078,9 +5050,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() request, metadata = self._interceptor.pre_start_instances(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseStartInstances._get_transcoded_request( @@ -5259,9 +5229,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() request, metadata = self._interceptor.pre_stop_instances(request, metadata) transcoded_request = _BaseInstanceGroupManagersRestTransport._BaseStopInstances._get_transcoded_request( @@ -5440,9 +5408,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() request, metadata = self._interceptor.pre_suspend_instances( request, metadata @@ -5626,9 +5592,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() - ) + http_options = _BaseInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_update_per_instance_configs( request, metadata @@ -5752,7 +5716,9 @@ def apply_updates_to_instances( ]: # 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._ApplyUpdatesToInstances(self._session, self._host, self._interceptor) # type: ignore + return self._ApplyUpdatesToInstances( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_instances( @@ -5790,7 +5756,9 @@ def delete_per_instance_configs( ]: # 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._DeletePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( @@ -5851,7 +5819,9 @@ def list_per_instance_configs( ]: # 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._ListPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch( @@ -5869,7 +5839,9 @@ def patch_per_instance_configs( ]: # 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._PatchPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def recreate_instances( @@ -5957,7 +5929,9 @@ def update_per_instance_configs( ]: # 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._UpdatePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/client.py index bc2ea4182863..03ac668cc162 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.instance_groups import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class InstanceGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceGroupsTransport]] _transport_registry["rest"] = InstanceGroupsRestTransport def get_transport_class( @@ -600,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceGroupsClient._read_environment_variables() + ) self._client_cert_source = InstanceGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/pagers.py index 6b85ae56fd30..5fcbb5513c52 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/base.py index 2250ee515c9b..077e0a360a26 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/rest.py index 4012f6eef8e5..4db32694dd9c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1968,9 +1968,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupsRestTransport._BaseRemoveInstances._get_http_options() - ) + http_options = _BaseInstanceGroupsRestTransport._BaseRemoveInstances._get_http_options() request, metadata = self._interceptor.pre_remove_instances( request, metadata @@ -2302,9 +2300,7 @@ def __call__( """ - http_options = ( - _BaseInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/client.py index d381de6b66d8..0fd487ffb9f8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.types import compute @@ -78,9 +78,7 @@ class InstanceSettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceSettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceSettingsServiceTransport]] _transport_registry["rest"] = InstanceSettingsServiceRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceSettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceSettingsServiceClient._read_environment_variables() + ) self._client_cert_source = ( InstanceSettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceSettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/__init__.py index 5e289b9ebf70..a7869d6637f2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InstanceSettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InstanceSettingsServiceTransport]] _transport_registry["rest"] = InstanceSettingsServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/base.py index efcb1c35f195..b5b46f083136 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/rest.py index b2e028d307cf..ca0ac26ff451 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_settings_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/client.py index 3897d644f03b..355592a27173 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.instance_templates import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class InstanceTemplatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstanceTemplatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstanceTemplatesTransport]] _transport_registry["rest"] = InstanceTemplatesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstanceTemplatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstanceTemplatesClient._read_environment_variables() + ) self._client_cert_source = InstanceTemplatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstanceTemplatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/pagers.py index ec06519e2f9f..6d659e1e84dc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/base.py index f1a48dd342b8..596a6cf492bf 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/rest.py index d38e2f2409e7..00824c7cecf2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instance_templates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -675,9 +675,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInstanceTemplatesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1240,9 +1238,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseInstanceTemplatesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1795,9 +1791,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseInstanceTemplatesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1948,9 +1942,7 @@ def __call__( """ - http_options = ( - _BaseInstanceTemplatesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstanceTemplatesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/client.py index 7c0d5e20e928..311d7584205a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.instances import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstancesClient._read_environment_variables() + ) self._client_cert_source = InstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/pagers.py index a3686de7ebef..883239083afa 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/base.py index be4bff9e6dd4..9ca55c3563f0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/rest.py index 43a9c474af51..3a514d5700b2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instances/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -4490,9 +4490,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseDeleteNetworkInterface._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseDeleteNetworkInterface._get_http_options() request, metadata = self._interceptor.pre_delete_network_interface( request, metadata @@ -4961,9 +4959,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseGetEffectiveFirewalls._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseGetEffectiveFirewalls._get_http_options() request, metadata = self._interceptor.pre_get_effective_firewalls( request, metadata @@ -5782,9 +5778,7 @@ def __call__( A Shielded Instance Identity. """ - http_options = ( - _BaseInstancesRestTransport._BaseGetShieldedInstanceIdentity._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseGetShieldedInstanceIdentity._get_http_options() request, metadata = self._interceptor.pre_get_shielded_instance_identity( request, metadata @@ -5850,11 +5844,10 @@ def __call__( resp = self._interceptor.post_get_shielded_instance_identity(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_shielded_instance_identity_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_shielded_instance_identity_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6615,9 +6608,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseRemoveResourcePolicies._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseRemoveResourcePolicies._get_http_options() request, metadata = self._interceptor.pre_remove_resource_policies( request, metadata @@ -7301,9 +7292,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSendDiagnosticInterrupt._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSendDiagnosticInterrupt._get_http_options() request, metadata = self._interceptor.pre_send_diagnostic_interrupt( request, metadata @@ -7481,9 +7470,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSetDeletionProtection._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSetDeletionProtection._get_http_options() request, metadata = self._interceptor.pre_set_deletion_protection( request, metadata @@ -9712,15 +9699,12 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSetShieldedInstanceIntegrityPolicy._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSetShieldedInstanceIntegrityPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_set_shielded_instance_integrity_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_set_shielded_instance_integrity_policy( + request, metadata + ) ) transcoded_request = _BaseInstancesRestTransport._BaseSetShieldedInstanceIntegrityPolicy._get_transcoded_request( http_options, request @@ -9786,11 +9770,10 @@ def __call__( resp = self._interceptor.post_set_shielded_instance_integrity_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_shielded_instance_integrity_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_shielded_instance_integrity_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -10080,9 +10063,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseSimulateMaintenanceEvent._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseSimulateMaintenanceEvent._get_http_options() request, metadata = self._interceptor.pre_simulate_maintenance_event( request, metadata @@ -10431,9 +10412,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseStartWithEncryptionKey._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseStartWithEncryptionKey._get_http_options() request, metadata = self._interceptor.pre_start_with_encryption_key( request, metadata @@ -11654,9 +11633,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseUpdateNetworkInterface._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseUpdateNetworkInterface._get_http_options() request, metadata = self._interceptor.pre_update_network_interface( request, metadata @@ -11837,9 +11814,7 @@ def __call__( """ - http_options = ( - _BaseInstancesRestTransport._BaseUpdateShieldedInstanceConfig._get_http_options() - ) + http_options = _BaseInstancesRestTransport._BaseUpdateShieldedInstanceConfig._get_http_options() request, metadata = self._interceptor.pre_update_shielded_instance_config( request, metadata @@ -11910,11 +11885,10 @@ def __call__( resp = self._interceptor.post_update_shielded_instance_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_shielded_instance_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_shielded_instance_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -12009,7 +11983,9 @@ def delete_network_interface( ) -> Callable[[compute.DeleteNetworkInterfaceInstanceRequest], compute.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._DeleteNetworkInterface(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteNetworkInterface( + self._session, self._host, self._interceptor + ) # type: ignore @property def detach_disk( @@ -12079,7 +12055,9 @@ def get_shielded_instance_identity( ]: # 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._GetShieldedInstanceIdentity(self._session, self._host, self._interceptor) # type: ignore + return self._GetShieldedInstanceIdentity( + self._session, self._host, self._interceptor + ) # type: ignore @property def insert(self) -> Callable[[compute.InsertInstanceRequest], compute.Operation]: @@ -12117,7 +12095,9 @@ def remove_resource_policies( ) -> Callable[[compute.RemoveResourcePoliciesInstanceRequest], compute.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._RemoveResourcePolicies(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveResourcePolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def report_host_as_faulty( @@ -12148,7 +12128,9 @@ def send_diagnostic_interrupt( ]: # 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._SendDiagnosticInterrupt(self._session, self._host, self._interceptor) # type: ignore + return self._SendDiagnosticInterrupt( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_deletion_protection( @@ -12252,7 +12234,9 @@ def set_shielded_instance_integrity_policy( ]: # 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._SetShieldedInstanceIntegrityPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._SetShieldedInstanceIntegrityPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_tags(self) -> Callable[[compute.SetTagsInstanceRequest], compute.Operation]: @@ -12266,7 +12250,9 @@ def simulate_maintenance_event( ) -> Callable[[compute.SimulateMaintenanceEventInstanceRequest], compute.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._SimulateMaintenanceEvent(self._session, self._host, self._interceptor) # type: ignore + return self._SimulateMaintenanceEvent( + self._session, self._host, self._interceptor + ) # type: ignore @property def start(self) -> Callable[[compute.StartInstanceRequest], compute.Operation]: @@ -12280,7 +12266,9 @@ def start_with_encryption_key( ) -> Callable[[compute.StartWithEncryptionKeyInstanceRequest], compute.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._StartWithEncryptionKey(self._session, self._host, self._interceptor) # type: ignore + return self._StartWithEncryptionKey( + self._session, self._host, self._interceptor + ) # type: ignore @property def stop(self) -> Callable[[compute.StopInstanceRequest], compute.Operation]: @@ -12332,7 +12320,9 @@ def update_network_interface( ) -> Callable[[compute.UpdateNetworkInterfaceInstanceRequest], compute.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._UpdateNetworkInterface(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateNetworkInterface( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_shielded_instance_config( @@ -12342,7 +12332,9 @@ def update_shielded_instance_config( ]: # 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._UpdateShieldedInstanceConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateShieldedInstanceConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/client.py index 20d1544b71cc..7c143c6ec6e9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.instant_snapshots import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class InstantSnapshotsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InstantSnapshotsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InstantSnapshotsTransport]] _transport_registry["rest"] = InstantSnapshotsRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InstantSnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InstantSnapshotsClient._read_environment_variables() + ) self._client_cert_source = InstantSnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InstantSnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/pagers.py index c21f279cda23..a0eed70119c6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/base.py index e3394bbb3e0c..b337d03a3235 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/rest.py index ae4dafa78ca6..32f4edb619e5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/instant_snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -726,9 +726,7 @@ def __call__( """ - http_options = ( - _BaseInstantSnapshotsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInstantSnapshotsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInstantSnapshotsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2164,9 +2162,7 @@ def __call__( """ - http_options = ( - _BaseInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/client.py index f1e341722170..f07b30d1f1ec 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.interconnect_attachment_groups import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class InterconnectAttachmentGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] _transport_registry["rest"] = InterconnectAttachmentGroupsRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectAttachmentGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectAttachmentGroupsClient._read_environment_variables() + ) self._client_cert_source = ( InterconnectAttachmentGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -655,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectAttachmentGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/pagers.py index f66621cf7cb9..e9cb4d413b8a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/__init__.py index 3961ad9d29df..71f91b690f4b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentGroupsTransport]] _transport_registry["rest"] = InterconnectAttachmentGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/base.py index dee533f73b92..eaa016d4eb2a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/rest.py index 3c9ee15df0f4..68af67808106 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachment_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -770,9 +770,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseDelete._get_transcoded_request( @@ -921,9 +919,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseGet._get_transcoded_request( @@ -1142,9 +1138,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1295,9 +1289,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseGetOperationalStatus._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseGetOperationalStatus._get_http_options() request, metadata = self._interceptor.pre_get_operational_status( request, metadata @@ -1479,9 +1471,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseInsert._get_transcoded_request( @@ -1631,9 +1621,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseList._get_transcoded_request( @@ -1809,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BasePatch._get_transcoded_request( @@ -2036,9 +2022,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseInterconnectAttachmentGroupsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2191,9 +2175,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInterconnectAttachmentGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/client.py index 70f04bef558f..890482d2a570 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.interconnect_attachments import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class InterconnectAttachmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectAttachmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentsTransport]] _transport_registry["rest"] = InterconnectAttachmentsRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectAttachmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectAttachmentsClient._read_environment_variables() + ) self._client_cert_source = ( InterconnectAttachmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectAttachmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/pagers.py index 5b493c4bd1cd..323bd0ad61ad 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/__init__.py index 04ffd6c58a57..d59fde76191f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectAttachmentsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectAttachmentsTransport]] _transport_registry["rest"] = InterconnectAttachmentsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/base.py index 126db3c2a073..2d25a88a2815 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/rest.py index 0f963806e893..5cab81081c98 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_attachments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -623,9 +623,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -802,9 +800,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseDelete._get_transcoded_request( @@ -1131,9 +1127,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseInsert._get_transcoded_request( @@ -1643,9 +1637,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectAttachmentsRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseInterconnectAttachmentsRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseInterconnectAttachmentsRestTransport._BaseSetLabels._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/client.py index 398229feb932..cddfd2ff5a28 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.interconnect_groups import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class InterconnectGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectGroupsTransport]] _transport_registry["rest"] = InterconnectGroupsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectGroupsClient._read_environment_variables() + ) self._client_cert_source = InterconnectGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/pagers.py index f5a2659d8487..cd94516bdcef 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/__init__.py index c12b274fcacb..efbcb9c02950 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import InterconnectGroupsRestInterceptor, InterconnectGroupsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectGroupsTransport]] _transport_registry["rest"] = InterconnectGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/base.py index 3f506b351169..29bbd37a0ca8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/rest.py index 4ca365e9fb81..89a584f9f8d8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -816,9 +816,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseCreateMembers._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseCreateMembers._get_http_options() request, metadata = self._interceptor.pre_create_members(request, metadata) transcoded_request = _BaseInterconnectGroupsRestTransport._BaseCreateMembers._get_transcoded_request( @@ -1369,9 +1367,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseInterconnectGroupsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1518,9 +1514,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseGetOperationalStatus._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseGetOperationalStatus._get_http_options() request, metadata = self._interceptor.pre_get_operational_status( request, metadata @@ -2268,9 +2262,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseInterconnectGroupsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2421,9 +2413,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseInterconnectGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/client.py index da64a0e7891f..92fbda162c5e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class InterconnectLocationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectLocationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectLocationsTransport]] _transport_registry["rest"] = InterconnectLocationsRestTransport def get_transport_class( @@ -603,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectLocationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectLocationsClient._read_environment_variables() + ) self._client_cert_source = InterconnectLocationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -642,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectLocationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/pagers.py index a10af595d853..c525f93a8e5e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/__init__.py index 990c40f05d00..fe298fae537f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectLocationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectLocationsTransport]] _transport_registry["rest"] = InterconnectLocationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/base.py index 339942668ec4..b10a10168f92 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/rest.py index e6f73a9f2ae1..cd986e6e7006 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_locations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/client.py index dba3ede04dae..ccf7e754aa04 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class InterconnectRemoteLocationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] _transport_registry["rest"] = InterconnectRemoteLocationsRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectRemoteLocationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectRemoteLocationsClient._read_environment_variables() + ) self._client_cert_source = ( InterconnectRemoteLocationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectRemoteLocationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/pagers.py index 05da88967834..57a6274c40e8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/__init__.py index 7ed7479ad72f..5f3a153d40d6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InterconnectRemoteLocationsTransport]] _transport_registry["rest"] = InterconnectRemoteLocationsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/base.py index f2863717358c..4afc5fb59291 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/rest.py index d2e0a3141990..8514cbcb034b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnect_remote_locations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -352,9 +352,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectRemoteLocationsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseInterconnectRemoteLocationsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseInterconnectRemoteLocationsRestTransport._BaseGet._get_transcoded_request( @@ -502,9 +500,7 @@ def __call__( """ - http_options = ( - _BaseInterconnectRemoteLocationsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseInterconnectRemoteLocationsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseInterconnectRemoteLocationsRestTransport._BaseList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/client.py index 9239677a8d97..956320500f3c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.interconnects import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterconnectsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterconnectsClient._read_environment_variables() + ) self._client_cert_source = InterconnectsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterconnectsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/pagers.py index 9fc0cf0f4444..9c446b446771 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/base.py index c54fbc631852..36e7b8b34c69 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/rest.py index f4505be23e02..8bdaf62caa90 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/interconnects/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/client.py index 53ec7f59f680..f1b8a7a505a4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -594,11 +594,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LicenseCodesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LicenseCodesClient._read_environment_variables() + ) self._client_cert_source = LicenseCodesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -633,8 +631,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LicenseCodesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/base.py index 2917b78629ed..17346157633e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/rest.py index e6ade2e4ad8d..d896ec38fe2c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/license_codes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -488,9 +488,7 @@ def __call__( """ - http_options = ( - _BaseLicenseCodesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseLicenseCodesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/client.py index 6a832bc1aaa0..cdb773478ed5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.licenses import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LicensesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LicensesClient._read_environment_variables() + ) self._client_cert_source = LicensesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LicensesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/pagers.py index 0a7df04ab8fe..57f453e9932e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/base.py index 57d927e932e1..b3850c608562 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/rest.py index d07233e247a2..fb204fd26d60 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/licenses/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/client.py index 10c61f27ac2f..72aae241e848 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.machine_images import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MachineImagesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MachineImagesClient._read_environment_variables() + ) self._client_cert_source = MachineImagesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MachineImagesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/pagers.py index 337079d82a54..35637ff5a1ce 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/base.py index fad1442a7876..e2fc8f86debc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/rest.py index 1b796f517b3c..48bc2a4fc809 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_images/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1949,9 +1949,7 @@ def __call__( """ - http_options = ( - _BaseMachineImagesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseMachineImagesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/client.py index 275ad02ac120..2a286821c81d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MachineTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MachineTypesClient._read_environment_variables() + ) self._client_cert_source = MachineTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MachineTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/pagers.py index 19c33fbbf82e..3045c9dac232 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/base.py index dc3bf502b8f4..5cde134cac2e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/rest.py index 88055953b940..e783a2252245 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/machine_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/client.py index cbffb9f4183a..ee40177ef7d1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.network_attachments import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class NetworkAttachmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkAttachmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkAttachmentsTransport]] _transport_registry["rest"] = NetworkAttachmentsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkAttachmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkAttachmentsClient._read_environment_variables() + ) self._client_cert_source = NetworkAttachmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkAttachmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/pagers.py index f1d59b0b11b1..6c4d21ae2b05 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/__init__.py index f0a1ddd862ed..2920a592dd40 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import NetworkAttachmentsRestInterceptor, NetworkAttachmentsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkAttachmentsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkAttachmentsTransport]] _transport_registry["rest"] = NetworkAttachmentsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/base.py index 6cdea0083b33..e35dd89d0393 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/rest.py index fb9d2267dc1f..b45c7b17db5f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_attachments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -731,9 +731,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkAttachmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1280,9 +1278,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseNetworkAttachmentsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2020,9 +2016,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseNetworkAttachmentsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2173,9 +2167,7 @@ def __call__( """ - http_options = ( - _BaseNetworkAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/client.py index d1d07400b505..ac01eb90cd17 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.network_edge_security_services import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class NetworkEdgeSecurityServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] _transport_registry["rest"] = NetworkEdgeSecurityServicesRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkEdgeSecurityServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkEdgeSecurityServicesClient._read_environment_variables() + ) self._client_cert_source = ( NetworkEdgeSecurityServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkEdgeSecurityServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/pagers.py index 45fcae09cac5..7fa416f267ba 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/__init__.py index 7eaed7b9e349..80d8b0a32470 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEdgeSecurityServicesTransport]] _transport_registry["rest"] = NetworkEdgeSecurityServicesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/base.py index 8d016dbf67ee..d8abcbde9730 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/rest.py index 5675ba26ad32..663f5848ad26 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_edge_security_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -513,9 +513,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -694,9 +692,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseDelete._get_transcoded_request( @@ -843,9 +839,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseGet._get_transcoded_request( @@ -1019,9 +1013,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BaseInsert._get_transcoded_request( @@ -1200,9 +1192,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEdgeSecurityServicesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseNetworkEdgeSecurityServicesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseNetworkEdgeSecurityServicesRestTransport._BasePatch._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/client.py index 9d3f5a8b349d..f7ecbc40167e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.network_endpoint_groups import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class NetworkEndpointGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkEndpointGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEndpointGroupsTransport]] _transport_registry["rest"] = NetworkEndpointGroupsRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkEndpointGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkEndpointGroupsClient._read_environment_variables() + ) self._client_cert_source = NetworkEndpointGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkEndpointGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/pagers.py index de1af13f829c..106af03c1c4f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/__init__.py index cd78182e83fb..1b70862e7803 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkEndpointGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkEndpointGroupsTransport]] _transport_registry["rest"] = NetworkEndpointGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/base.py index f32328d43c54..919c86420275 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/rest.py index 8fc56944e810..b138a84da062 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_endpoint_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -745,9 +745,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkEndpointGroupsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -923,9 +921,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_attach_network_endpoints( request, metadata @@ -1281,9 +1277,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_detach_network_endpoints( request, metadata @@ -1918,9 +1912,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_network_endpoints( request, metadata @@ -2079,9 +2071,7 @@ def __call__( """ - http_options = ( - _BaseNetworkEndpointGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkEndpointGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2197,7 +2187,9 @@ def attach_network_endpoints( ]: # 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._AttachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._AttachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete( @@ -2215,7 +2207,9 @@ def detach_network_endpoints( ]: # 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._DetachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._DetachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/client.py index f3c4265b0d76..90e6054eb935 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.network_firewall_policies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class NetworkFirewallPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] _transport_registry["rest"] = NetworkFirewallPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkFirewallPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkFirewallPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( NetworkFirewallPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkFirewallPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/pagers.py index 3d54f361f9b8..9e8d1620bd1c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/__init__.py index 40078d68ba97..71ed19bf349c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NetworkFirewallPoliciesTransport]] _transport_registry["rest"] = NetworkFirewallPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/base.py index 6f0d2ed074dd..53e29bd9bdea 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/rest.py index 02bbda943eeb..dde0e8916d23 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_firewall_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1435,9 +1435,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1618,9 +1616,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAddPacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAddPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_add_packet_mirroring_rule( request, metadata @@ -1801,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1953,9 +1947,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2132,9 +2124,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() request, metadata = self._interceptor.pre_clone_rules(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_transcoded_request( @@ -2307,9 +2297,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -2601,9 +2589,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2826,9 +2812,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2977,9 +2961,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetPacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_get_packet_mirroring_rule( request, metadata @@ -3130,9 +3112,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -3306,9 +3286,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -3814,9 +3792,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BasePatchPacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BasePatchPacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_patch_packet_mirroring_rule( request, metadata @@ -3997,9 +3973,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -4177,9 +4151,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -4359,9 +4331,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseRemovePacketMirroringRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseRemovePacketMirroringRule._get_http_options() request, metadata = self._interceptor.pre_remove_packet_mirroring_rule( request, metadata @@ -4536,9 +4506,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -4758,9 +4726,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -4911,9 +4877,7 @@ def __call__( """ - http_options = ( - _BaseNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5028,7 +4992,9 @@ def add_packet_mirroring_rule( ]: # 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._AddPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._AddPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def add_rule( @@ -5101,7 +5067,9 @@ def get_packet_mirroring_rule( ]: # 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._GetPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._GetPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_rule( @@ -5148,7 +5116,9 @@ def patch_packet_mirroring_rule( ]: # 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._PatchPacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch_rule( @@ -5177,7 +5147,9 @@ def remove_packet_mirroring_rule( ]: # 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._RemovePacketMirroringRule(self._session, self._host, self._interceptor) # type: ignore + return self._RemovePacketMirroringRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def remove_rule( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/client.py index 63b21e3dc319..fa2b0ee68cfc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class NetworkProfilesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkProfilesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkProfilesTransport]] _transport_registry["rest"] = NetworkProfilesRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkProfilesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkProfilesClient._read_environment_variables() + ) self._client_cert_source = NetworkProfilesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkProfilesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/pagers.py index 5443d52797ec..d1cfd141caf9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/base.py index 281788a559bd..e92b02924fac 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/rest.py index b30f1d802d38..bb7414e394fe 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/network_profiles/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/client.py index feb91836b17f..d9eb8be45fb9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.networks import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworksClient._read_environment_variables() + ) self._client_cert_source = NetworksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/pagers.py index 117addf15e49..f9c41ecc7abb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/base.py index 58279e74fb65..7f1181589b3e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/rest.py index af1cd5f29ead..53962e8e4dde 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/networks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1384,9 +1384,7 @@ def __call__( """ - http_options = ( - _BaseNetworksRestTransport._BaseGetEffectiveFirewalls._get_http_options() - ) + http_options = _BaseNetworksRestTransport._BaseGetEffectiveFirewalls._get_http_options() request, metadata = self._interceptor.pre_get_effective_firewalls( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/client.py index c06470f3e7d8..85f6c2061e7a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.node_groups import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeGroupsClient._read_environment_variables() + ) self._client_cert_source = NodeGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/pagers.py index 533cdb9c1192..71f2928bcf50 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/base.py index f47e8995fccf..f4bfe977afa9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/rest.py index c680f42daf61..32d2418c73e3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -3385,9 +3385,7 @@ def __call__( """ - http_options = ( - _BaseNodeGroupsRestTransport._BaseSimulateMaintenanceEvent._get_http_options() - ) + http_options = _BaseNodeGroupsRestTransport._BaseSimulateMaintenanceEvent._get_http_options() request, metadata = self._interceptor.pre_simulate_maintenance_event( request, metadata @@ -3740,7 +3738,9 @@ def simulate_maintenance_event( ]: # 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._SimulateMaintenanceEvent(self._session, self._host, self._interceptor) # type: ignore + return self._SimulateMaintenanceEvent( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/client.py index b8f0c98093b3..0602b32a630d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.node_templates import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeTemplatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeTemplatesClient._read_environment_variables() + ) self._client_cert_source = NodeTemplatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeTemplatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/pagers.py index a7f7df36f44a..3c212ea781fe 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/base.py index 761c16aeb714..3b32f1f20732 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/rest.py index 6913e42acc21..f2dd42deafc4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_templates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1913,9 +1913,7 @@ def __call__( """ - http_options = ( - _BaseNodeTemplatesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNodeTemplatesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/client.py index 86903c9e28e6..4cd8345b4f89 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeTypesClient._read_environment_variables() + ) self._client_cert_source = NodeTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/pagers.py index dd52a721bbcf..f29f332ba27d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/base.py index 17ab62439119..183f7ec7c506 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/rest.py index 19d659aff24f..7a69a6139e97 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/node_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/client.py index a11f5e5c7b4b..43199bde4a8d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.organization_security_policies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class OrganizationSecurityPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] _transport_registry["rest"] = OrganizationSecurityPoliciesRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OrganizationSecurityPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OrganizationSecurityPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( OrganizationSecurityPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -655,8 +651,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OrganizationSecurityPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/pagers.py index f888dbb5e196..5d15fb4725bb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/__init__.py index 4ea5804aaf22..9e6f8d312955 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationSecurityPoliciesTransport]] _transport_registry["rest"] = OrganizationSecurityPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/base.py index 0d919b7d0c20..e6a3ee116f03 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_organization_operations @@ -403,9 +403,9 @@ def _global_organization_operations_client( transport=self.kind, ) ) - self._extended_operations_services[ - "global_organization_operations" - ] = ex_op_service + self._extended_operations_services["global_organization_operations"] = ( + ex_op_service + ) return ex_op_service diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/rest.py index 308d207f4083..30d3e41f6a6c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/organization_security_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1156,9 +1156,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1339,9 +1337,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1519,9 +1515,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseCopyRules._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseCopyRules._get_http_options() request, metadata = self._interceptor.pre_copy_rules(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseCopyRules._get_transcoded_request( @@ -1696,9 +1690,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -1849,9 +1841,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseGet._get_transcoded_request( @@ -1994,9 +1984,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2149,9 +2137,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -2325,9 +2311,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -2477,9 +2461,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseList._get_transcoded_request( @@ -2622,9 +2604,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseListAssociations._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseListAssociations._get_http_options() request, metadata = self._interceptor.pre_list_associations( request, metadata @@ -2778,15 +2758,12 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_preconfigured_expression_sets( - request, metadata + request, metadata = ( + self._interceptor.pre_list_preconfigured_expression_sets( + request, metadata + ) ) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_transcoded_request( http_options, request @@ -2849,11 +2826,10 @@ def __call__( resp = self._interceptor.post_list_preconfigured_expression_sets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_preconfigured_expression_sets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_preconfigured_expression_sets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2965,9 +2941,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseMove._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseMove._get_http_options() request, metadata = self._interceptor.pre_move(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseMove._get_transcoded_request( @@ -3139,9 +3113,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BasePatch._get_transcoded_request( @@ -3320,9 +3292,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -3502,9 +3472,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -3679,9 +3647,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseOrganizationSecurityPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -3878,7 +3844,9 @@ def list_preconfigured_expression_sets( ]: # 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._ListPreconfiguredExpressionSets(self._session, self._host, self._interceptor) # type: ignore + return self._ListPreconfiguredExpressionSets( + self._session, self._host, self._interceptor + ) # type: ignore @property def move( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/client.py index 0c566e21be00..a94e3a2d8a40 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.packet_mirrorings import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class PacketMirroringsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PacketMirroringsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PacketMirroringsTransport]] _transport_registry["rest"] = PacketMirroringsRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PacketMirroringsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PacketMirroringsClient._read_environment_variables() + ) self._client_cert_source = PacketMirroringsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PacketMirroringsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/pagers.py index 183e52aa7b2e..27cbf7d79490 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/base.py index 8cc1eba72d72..9c2bb6f06e26 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/rest.py index c268b01bd91b..b0f85704b2fb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/packet_mirrorings/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -616,9 +616,7 @@ def __call__( Contains a list of packetMirrorings. """ - http_options = ( - _BasePacketMirroringsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BasePacketMirroringsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BasePacketMirroringsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1620,9 +1618,7 @@ def __call__( """ - http_options = ( - _BasePacketMirroringsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BasePacketMirroringsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/client.py index 8d09432c5d79..f0334d564339 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.preview_features import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class PreviewFeaturesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PreviewFeaturesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PreviewFeaturesTransport]] _transport_registry["rest"] = PreviewFeaturesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PreviewFeaturesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PreviewFeaturesClient._read_environment_variables() + ) self._client_cert_source = PreviewFeaturesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PreviewFeaturesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/pagers.py index 223a9062a12d..6280ff967843 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/base.py index 99b269d83c90..18ad38607029 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/rest.py index 8d0359f5550c..daf3a212d253 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/preview_features/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/client.py index 0a7d31098aee..e42ad8b2f50b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.projects import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectsClient._read_environment_variables() + ) self._client_cert_source = ProjectsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/pagers.py index fd09fc37cf7a..9694bf416803 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/base.py index 38887bf1720a..592f7b9e6637 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/rest.py index 60809737b138..49fc5cbed18a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/projects/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2901,9 +2901,7 @@ def __call__( """ - http_options = ( - _BaseProjectsRestTransport._BaseSetCommonInstanceMetadata._get_http_options() - ) + http_options = _BaseProjectsRestTransport._BaseSetCommonInstanceMetadata._get_http_options() request, metadata = self._interceptor.pre_set_common_instance_metadata( request, metadata @@ -3083,9 +3081,7 @@ def __call__( """ - http_options = ( - _BaseProjectsRestTransport._BaseSetDefaultNetworkTier._get_http_options() - ) + http_options = _BaseProjectsRestTransport._BaseSetDefaultNetworkTier._get_http_options() request, metadata = self._interceptor.pre_set_default_network_tier( request, metadata @@ -3456,7 +3452,9 @@ def set_common_instance_metadata( ) -> Callable[[compute.SetCommonInstanceMetadataProjectRequest], compute.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._SetCommonInstanceMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._SetCommonInstanceMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_default_network_tier( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/client.py index a04e0ad48c8a..0546252fe4d4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.public_advertised_prefixes import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class PublicAdvertisedPrefixesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] _transport_registry["rest"] = PublicAdvertisedPrefixesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PublicAdvertisedPrefixesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PublicAdvertisedPrefixesClient._read_environment_variables() + ) self._client_cert_source = ( PublicAdvertisedPrefixesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PublicAdvertisedPrefixesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/pagers.py index 5b2d51565d8a..e9a6d5e97770 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/__init__.py index 650a8a373eb5..02e1ed39d336 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PublicAdvertisedPrefixesTransport]] _transport_registry["rest"] = PublicAdvertisedPrefixesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/base.py index 47d6e4f69df5..4acab28a02d1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/rest.py index c1a9f6c7002a..4df2c46f39ba 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_advertised_prefixes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -646,9 +646,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseAnnounce._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseAnnounce._get_http_options() request, metadata = self._interceptor.pre_announce(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseAnnounce._get_transcoded_request( @@ -821,9 +819,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseDelete._get_transcoded_request( @@ -1148,9 +1144,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseInsert._get_transcoded_request( @@ -1476,9 +1470,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BasePatch._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BasePatch._get_transcoded_request( @@ -1656,9 +1648,7 @@ def __call__( """ - http_options = ( - _BasePublicAdvertisedPrefixesRestTransport._BaseWithdraw._get_http_options() - ) + http_options = _BasePublicAdvertisedPrefixesRestTransport._BaseWithdraw._get_http_options() request, metadata = self._interceptor.pre_withdraw(request, metadata) transcoded_request = _BasePublicAdvertisedPrefixesRestTransport._BaseWithdraw._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/client.py index aea5034a70a3..7d90ecc28fc8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.public_delegated_prefixes import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class PublicDelegatedPrefixesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] _transport_registry["rest"] = PublicDelegatedPrefixesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PublicDelegatedPrefixesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PublicDelegatedPrefixesClient._read_environment_variables() + ) self._client_cert_source = ( PublicDelegatedPrefixesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PublicDelegatedPrefixesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/pagers.py index 76cdadb02295..2ec990e7b47f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/__init__.py index d648523dc57a..0f7bd60f78b7 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PublicDelegatedPrefixesTransport]] _transport_registry["rest"] = PublicDelegatedPrefixesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/base.py index ff5490938f63..dec613504237 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/rest.py index ee12638a5112..317d09eeef4d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/public_delegated_prefixes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -678,9 +678,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -857,9 +855,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseAnnounce._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseAnnounce._get_http_options() request, metadata = self._interceptor.pre_announce(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseAnnounce._get_transcoded_request( @@ -1032,9 +1028,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseDelete._get_transcoded_request( @@ -1362,9 +1356,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseInsert._get_transcoded_request( @@ -1870,9 +1862,7 @@ def __call__( """ - http_options = ( - _BasePublicDelegatedPrefixesRestTransport._BaseWithdraw._get_http_options() - ) + http_options = _BasePublicDelegatedPrefixesRestTransport._BaseWithdraw._get_http_options() request, metadata = self._interceptor.pre_withdraw(request, metadata) transcoded_request = _BasePublicDelegatedPrefixesRestTransport._BaseWithdraw._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/client.py index ed2a0c8410be..512de0cb4be8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_autoscalers import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionAutoscalersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionAutoscalersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionAutoscalersTransport]] _transport_registry["rest"] = RegionAutoscalersRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionAutoscalersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionAutoscalersClient._read_environment_variables() + ) self._client_cert_source = RegionAutoscalersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionAutoscalersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/pagers.py index b9e9f6ce05d2..193a7acb6589 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/base.py index 418a5e6fe0e6..dce51c5fb751 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/rest.py index d48437680210..ef2a2d6bd28e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_autoscalers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1474,9 +1474,7 @@ def __call__( """ - http_options = ( - _BaseRegionAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionAutoscalersRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/client.py index 0b3ff037c726..5eb8a9a01ef4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_backend_services import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionBackendServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionBackendServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionBackendServicesTransport]] _transport_registry["rest"] = RegionBackendServicesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionBackendServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionBackendServicesClient._read_environment_variables() + ) self._client_cert_source = RegionBackendServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionBackendServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/pagers.py index 63c70c1330e1..32bf6d9e37a9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/__init__.py index 9168387b112f..9b9ab96e44da 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionBackendServicesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionBackendServicesTransport]] _transport_registry["rest"] = RegionBackendServicesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/base.py index ee5b9d3e9ae7..7f92f8875625 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/rest.py index 054ea2ca25b9..a991b28c0bfd 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_backend_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1243,9 +1243,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseGetHealth._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseGetHealth._get_http_options() request, metadata = self._interceptor.pre_get_health(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseGetHealth._get_transcoded_request( @@ -1471,9 +1469,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1947,9 +1943,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseListUsable._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseListUsable._get_http_options() request, metadata = self._interceptor.pre_list_usable(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseListUsable._get_transcoded_request( @@ -2352,9 +2346,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionBackendServicesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2533,9 +2525,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseSetSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_security_policy( request, metadata @@ -2690,9 +2680,7 @@ def __call__( """ - http_options = ( - _BaseRegionBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionBackendServicesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/client.py index 06deb3390765..0e50a5393976 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_commitments import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionCommitmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionCommitmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionCommitmentsTransport]] _transport_registry["rest"] = RegionCommitmentsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionCommitmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionCommitmentsClient._read_environment_variables() + ) self._client_cert_source = RegionCommitmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionCommitmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/pagers.py index c143103d2d7f..fd7d4676b5d1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/base.py index 1568b0e4d1d8..8a486ee4207c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/rest.py index e445668e0479..a3aee94bacd1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_commitments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -502,9 +502,7 @@ def __call__( """ - http_options = ( - _BaseRegionCommitmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseRegionCommitmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseRegionCommitmentsRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/client.py index 55e9e52c57fa..c6f9d498dfe5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class RegionDiskTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionDiskTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionDiskTypesTransport]] _transport_registry["rest"] = RegionDiskTypesRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionDiskTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionDiskTypesClient._read_environment_variables() + ) self._client_cert_source = RegionDiskTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionDiskTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/pagers.py index 37b78ffc2f25..7ac04e0b2460 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/base.py index 5a7c65d2566f..53886a050599 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/rest.py index c3daf654d79e..15c5996b528d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disk_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/client.py index 59f895720493..91f474141730 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_disks import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionDisksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionDisksClient._read_environment_variables() + ) self._client_cert_source = RegionDisksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionDisksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/pagers.py index af90823a9e20..efc1e6597e0d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/base.py index d6ec81579f95..748305dd2c7e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/rest.py index 768d80c1916f..b8e70ab8ca00 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_disks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1187,9 +1187,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseAddResourcePolicies._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseAddResourcePolicies._get_http_options() request, metadata = self._interceptor.pre_add_resource_policies( request, metadata @@ -2617,9 +2615,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseRemoveResourcePolicies._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseRemoveResourcePolicies._get_http_options() request, metadata = self._interceptor.pre_remove_resource_policies( request, metadata @@ -3393,9 +3389,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseStartAsyncReplication._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseStartAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_start_async_replication( request, metadata @@ -3574,9 +3568,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseStopAsyncReplication._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseStopAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_stop_async_replication( request, metadata @@ -3753,9 +3745,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseStopGroupAsyncReplication._get_http_options() request, metadata = self._interceptor.pre_stop_group_async_replication( request, metadata @@ -3909,9 +3899,7 @@ def __call__( """ - http_options = ( - _BaseRegionDisksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionDisksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -4248,7 +4236,9 @@ def remove_resource_policies( ) -> Callable[[compute.RemoveResourcePoliciesRegionDiskRequest], compute.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._RemoveResourcePolicies(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveResourcePolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def resize(self) -> Callable[[compute.ResizeRegionDiskRequest], compute.Operation]: @@ -4296,7 +4286,9 @@ def stop_group_async_replication( ]: # 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._StopGroupAsyncReplication(self._session, self._host, self._interceptor) # type: ignore + return self._StopGroupAsyncReplication( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/client.py index 9517b53f33c4..4608c9d763dd 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_health_check_services import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionHealthCheckServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionHealthCheckServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthCheckServicesTransport]] _transport_registry["rest"] = RegionHealthCheckServicesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionHealthCheckServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionHealthCheckServicesClient._read_environment_variables() + ) self._client_cert_source = ( RegionHealthCheckServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionHealthCheckServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/pagers.py index 16ec50d9eaed..ad1e1ebacbeb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/__init__.py index 251cbe2cc4da..d75676f50849 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionHealthCheckServicesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthCheckServicesTransport]] _transport_registry["rest"] = RegionHealthCheckServicesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/base.py index 206635101588..69162fd8fdbb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/rest.py index adeb2a30c0f5..0bca550f6ba3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_check_services/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -538,9 +538,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BaseDelete._get_transcoded_request( @@ -861,9 +859,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BaseInsert._get_transcoded_request( @@ -1013,9 +1009,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BaseList._get_transcoded_request( @@ -1187,9 +1181,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthCheckServicesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionHealthCheckServicesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionHealthCheckServicesRestTransport._BasePatch._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/client.py index 682268ea3c43..e9cd50cb1846 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_health_checks import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionHealthChecksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionHealthChecksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthChecksTransport]] _transport_registry["rest"] = RegionHealthChecksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionHealthChecksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionHealthChecksClient._read_environment_variables() + ) self._client_cert_source = RegionHealthChecksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionHealthChecksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/pagers.py index 6a6339875e1c..db89e274e38d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/__init__.py index 4cf5cc2f2dee..b5068a49f468 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionHealthChecksRestInterceptor, RegionHealthChecksRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionHealthChecksTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionHealthChecksTransport]] _transport_registry["rest"] = RegionHealthChecksRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/base.py index 56b4f0f48d8d..73be4bfdc0e1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/rest.py index c7e4e0ffc14f..fc0add36eabc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_health_checks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1482,9 +1482,7 @@ def __call__( """ - http_options = ( - _BaseRegionHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionHealthChecksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/client.py index 11257ebc809b..f0d839e994c4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_instance_group_managers import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionInstanceGroupManagersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] _transport_registry["rest"] = RegionInstanceGroupManagersRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceGroupManagersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceGroupManagersClient._read_environment_variables() + ) self._client_cert_source = ( RegionInstanceGroupManagersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstanceGroupManagersTransport, transport) self._api_endpoint = self._transport.host @@ -863,9 +858,7 @@ def sample_abandon_instances(): region_instance_group_managers_abandon_instances_request_resource is not None ): - request.region_instance_group_managers_abandon_instances_request_resource = ( - region_instance_group_managers_abandon_instances_request_resource - ) + request.region_instance_group_managers_abandon_instances_request_resource = region_instance_group_managers_abandon_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1039,9 +1032,7 @@ def sample_abandon_instances(): region_instance_group_managers_abandon_instances_request_resource is not None ): - request.region_instance_group_managers_abandon_instances_request_resource = ( - region_instance_group_managers_abandon_instances_request_resource - ) + request.region_instance_group_managers_abandon_instances_request_resource = region_instance_group_managers_abandon_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1228,9 +1219,7 @@ def sample_apply_updates_to_instances(): region_instance_group_managers_apply_updates_request_resource is not None ): - request.region_instance_group_managers_apply_updates_request_resource = ( - region_instance_group_managers_apply_updates_request_resource - ) + request.region_instance_group_managers_apply_updates_request_resource = region_instance_group_managers_apply_updates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1394,9 +1383,7 @@ def sample_apply_updates_to_instances(): region_instance_group_managers_apply_updates_request_resource is not None ): - request.region_instance_group_managers_apply_updates_request_resource = ( - region_instance_group_managers_apply_updates_request_resource - ) + request.region_instance_group_managers_apply_updates_request_resource = region_instance_group_managers_apply_updates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1588,9 +1575,7 @@ def sample_create_instances(): region_instance_group_managers_create_instances_request_resource is not None ): - request.region_instance_group_managers_create_instances_request_resource = ( - region_instance_group_managers_create_instances_request_resource - ) + request.region_instance_group_managers_create_instances_request_resource = region_instance_group_managers_create_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1755,9 +1740,7 @@ def sample_create_instances(): region_instance_group_managers_create_instances_request_resource is not None ): - request.region_instance_group_managers_create_instances_request_resource = ( - region_instance_group_managers_create_instances_request_resource - ) + request.region_instance_group_managers_create_instances_request_resource = region_instance_group_managers_create_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2257,9 +2240,7 @@ def sample_delete_instances(): region_instance_group_managers_delete_instances_request_resource is not None ): - request.region_instance_group_managers_delete_instances_request_resource = ( - region_instance_group_managers_delete_instances_request_resource - ) + request.region_instance_group_managers_delete_instances_request_resource = region_instance_group_managers_delete_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2433,9 +2414,7 @@ def sample_delete_instances(): region_instance_group_managers_delete_instances_request_resource is not None ): - request.region_instance_group_managers_delete_instances_request_resource = ( - region_instance_group_managers_delete_instances_request_resource - ) + request.region_instance_group_managers_delete_instances_request_resource = region_instance_group_managers_delete_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2622,9 +2601,7 @@ def sample_delete_per_instance_configs(): region_instance_group_manager_delete_instance_config_req_resource is not None ): - request.region_instance_group_manager_delete_instance_config_req_resource = ( - region_instance_group_manager_delete_instance_config_req_resource - ) + request.region_instance_group_manager_delete_instance_config_req_resource = region_instance_group_manager_delete_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2788,9 +2765,7 @@ def sample_delete_per_instance_configs(): region_instance_group_manager_delete_instance_config_req_resource is not None ): - request.region_instance_group_manager_delete_instance_config_req_resource = ( - region_instance_group_manager_delete_instance_config_req_resource - ) + request.region_instance_group_manager_delete_instance_config_req_resource = region_instance_group_manager_delete_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4423,9 +4398,7 @@ def sample_patch_per_instance_configs(): region_instance_group_manager_patch_instance_config_req_resource is not None ): - request.region_instance_group_manager_patch_instance_config_req_resource = ( - region_instance_group_manager_patch_instance_config_req_resource - ) + request.region_instance_group_manager_patch_instance_config_req_resource = region_instance_group_manager_patch_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -4591,9 +4564,7 @@ def sample_patch_per_instance_configs(): region_instance_group_manager_patch_instance_config_req_resource is not None ): - request.region_instance_group_manager_patch_instance_config_req_resource = ( - region_instance_group_manager_patch_instance_config_req_resource - ) + request.region_instance_group_manager_patch_instance_config_req_resource = region_instance_group_manager_patch_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -5515,9 +5486,7 @@ def sample_resume_instances(): region_instance_group_managers_resume_instances_request_resource is not None ): - request.region_instance_group_managers_resume_instances_request_resource = ( - region_instance_group_managers_resume_instances_request_resource - ) + request.region_instance_group_managers_resume_instances_request_resource = region_instance_group_managers_resume_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -5692,9 +5661,7 @@ def sample_resume_instances(): region_instance_group_managers_resume_instances_request_resource is not None ): - request.region_instance_group_managers_resume_instances_request_resource = ( - region_instance_group_managers_resume_instances_request_resource - ) + request.region_instance_group_managers_resume_instances_request_resource = region_instance_group_managers_resume_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6221,9 +6188,7 @@ def sample_set_target_pools(): region_instance_group_managers_set_target_pools_request_resource is not None ): - request.region_instance_group_managers_set_target_pools_request_resource = ( - region_instance_group_managers_set_target_pools_request_resource - ) + request.region_instance_group_managers_set_target_pools_request_resource = region_instance_group_managers_set_target_pools_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6380,9 +6345,7 @@ def sample_set_target_pools(): region_instance_group_managers_set_target_pools_request_resource is not None ): - request.region_instance_group_managers_set_target_pools_request_resource = ( - region_instance_group_managers_set_target_pools_request_resource - ) + request.region_instance_group_managers_set_target_pools_request_resource = region_instance_group_managers_set_target_pools_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6582,9 +6545,7 @@ def sample_start_instances(): region_instance_group_managers_start_instances_request_resource is not None ): - request.region_instance_group_managers_start_instances_request_resource = ( - region_instance_group_managers_start_instances_request_resource - ) + request.region_instance_group_managers_start_instances_request_resource = region_instance_group_managers_start_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6759,9 +6720,7 @@ def sample_start_instances(): region_instance_group_managers_start_instances_request_resource is not None ): - request.region_instance_group_managers_start_instances_request_resource = ( - region_instance_group_managers_start_instances_request_resource - ) + request.region_instance_group_managers_start_instances_request_resource = region_instance_group_managers_start_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -6975,9 +6934,7 @@ def sample_stop_instances(): region_instance_group_managers_stop_instances_request_resource is not None ): - request.region_instance_group_managers_stop_instances_request_resource = ( - region_instance_group_managers_stop_instances_request_resource - ) + request.region_instance_group_managers_stop_instances_request_resource = region_instance_group_managers_stop_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7166,9 +7123,7 @@ def sample_stop_instances(): region_instance_group_managers_stop_instances_request_resource is not None ): - request.region_instance_group_managers_stop_instances_request_resource = ( - region_instance_group_managers_stop_instances_request_resource - ) + request.region_instance_group_managers_stop_instances_request_resource = region_instance_group_managers_stop_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7380,9 +7335,7 @@ def sample_suspend_instances(): region_instance_group_managers_suspend_instances_request_resource is not None ): - request.region_instance_group_managers_suspend_instances_request_resource = ( - region_instance_group_managers_suspend_instances_request_resource - ) + request.region_instance_group_managers_suspend_instances_request_resource = region_instance_group_managers_suspend_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7569,9 +7522,7 @@ def sample_suspend_instances(): region_instance_group_managers_suspend_instances_request_resource is not None ): - request.region_instance_group_managers_suspend_instances_request_resource = ( - region_instance_group_managers_suspend_instances_request_resource - ) + request.region_instance_group_managers_suspend_instances_request_resource = region_instance_group_managers_suspend_instances_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7760,9 +7711,7 @@ def sample_update_per_instance_configs(): region_instance_group_manager_update_instance_config_req_resource is not None ): - request.region_instance_group_manager_update_instance_config_req_resource = ( - region_instance_group_manager_update_instance_config_req_resource - ) + request.region_instance_group_manager_update_instance_config_req_resource = region_instance_group_manager_update_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -7928,9 +7877,7 @@ def sample_update_per_instance_configs(): region_instance_group_manager_update_instance_config_req_resource is not None ): - request.region_instance_group_manager_update_instance_config_req_resource = ( - region_instance_group_manager_update_instance_config_req_resource - ) + request.region_instance_group_manager_update_instance_config_req_resource = region_instance_group_manager_update_instance_config_req_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/pagers.py index d4ff61e1cf64..9a1ee09aba30 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -219,7 +219,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/__init__.py index 893f6c69a453..9beb4c2b5cab 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupManagersTransport]] _transport_registry["rest"] = RegionInstanceGroupManagersRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/base.py index 4a870b9abd00..e2e1e0fb8a11 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/rest.py index 9962ca11e50e..114b3c219bd2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_group_managers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1554,9 +1554,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseAbandonInstances._get_http_options() request, metadata = self._interceptor.pre_abandon_instances( request, metadata @@ -1740,9 +1738,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseApplyUpdatesToInstances._get_http_options() request, metadata = self._interceptor.pre_apply_updates_to_instances( request, metadata @@ -1923,9 +1919,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseCreateInstances._get_http_options() request, metadata = self._interceptor.pre_create_instances( request, metadata @@ -2107,9 +2101,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseDelete._get_transcoded_request( @@ -2283,9 +2275,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseDeleteInstances._get_http_options() request, metadata = self._interceptor.pre_delete_instances( request, metadata @@ -2471,9 +2461,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseDeletePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_delete_per_instance_configs( request, metadata @@ -2637,9 +2625,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseGet._get_transcoded_request( @@ -2811,9 +2797,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseInsert._get_transcoded_request( @@ -2965,9 +2949,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseList._get_transcoded_request( @@ -3112,9 +3094,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseListErrors._get_http_options() request, metadata = self._interceptor.pre_list_errors(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseListErrors._get_transcoded_request( @@ -3265,9 +3245,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseListManagedInstances._get_http_options() request, metadata = self._interceptor.pre_list_managed_instances( request, metadata @@ -3418,9 +3396,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseListPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_list_per_instance_configs( request, metadata @@ -3600,9 +3576,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BasePatch._get_transcoded_request( @@ -3784,9 +3758,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BasePatchPerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_patch_per_instance_configs( request, metadata @@ -3967,9 +3939,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseRecreateInstances._get_http_options() request, metadata = self._interceptor.pre_recreate_instances( request, metadata @@ -4149,9 +4119,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseResize._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseResize._get_http_options() request, metadata = self._interceptor.pre_resize(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseResize._get_transcoded_request( @@ -4325,9 +4293,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseResumeInstances._get_http_options() request, metadata = self._interceptor.pre_resume_instances( request, metadata @@ -4510,9 +4476,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSetInstanceTemplate._get_http_options() request, metadata = self._interceptor.pre_set_instance_template( request, metadata @@ -4693,9 +4657,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSetTargetPools._get_http_options() request, metadata = self._interceptor.pre_set_target_pools( request, metadata @@ -4878,9 +4840,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseStartInstances._get_http_options() request, metadata = self._interceptor.pre_start_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseStartInstances._get_transcoded_request( @@ -5061,9 +5021,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseStopInstances._get_http_options() request, metadata = self._interceptor.pre_stop_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupManagersRestTransport._BaseStopInstances._get_transcoded_request( @@ -5244,9 +5202,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseSuspendInstances._get_http_options() request, metadata = self._interceptor.pre_suspend_instances( request, metadata @@ -5430,9 +5386,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() - ) + http_options = _BaseRegionInstanceGroupManagersRestTransport._BaseUpdatePerInstanceConfigs._get_http_options() request, metadata = self._interceptor.pre_update_per_instance_configs( request, metadata @@ -5546,7 +5500,9 @@ def apply_updates_to_instances( ]: # 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._ApplyUpdatesToInstances(self._session, self._host, self._interceptor) # type: ignore + return self._ApplyUpdatesToInstances( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_instances( @@ -5585,7 +5541,9 @@ def delete_per_instance_configs( ]: # 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._DeletePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( @@ -5647,7 +5605,9 @@ def list_per_instance_configs( ]: # 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._ListPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch( @@ -5666,7 +5626,9 @@ def patch_per_instance_configs( ]: # 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._PatchPerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._PatchPerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def recreate_instances( @@ -5756,7 +5718,9 @@ def update_per_instance_configs( ]: # 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._UpdatePerInstanceConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePerInstanceConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/client.py index 5f40d8281a4b..be1628d70822 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_instance_groups import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionInstanceGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupsTransport]] _transport_registry["rest"] = RegionInstanceGroupsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceGroupsClient._read_environment_variables() + ) self._client_cert_source = RegionInstanceGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstanceGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/pagers.py index 151fcec5dba2..dc502a646693 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/__init__.py index 64ee5dcb38b2..4e1ced171a44 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import RegionInstanceGroupsRestInterceptor, RegionInstanceGroupsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceGroupsTransport]] _transport_registry["rest"] = RegionInstanceGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/base.py index 58dff5f1b175..d73fa4905b24 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/rest.py index 056228578d63..33a63e626c50 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -833,9 +833,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupsRestTransport._BaseListInstances._get_http_options() - ) + http_options = _BaseRegionInstanceGroupsRestTransport._BaseListInstances._get_http_options() request, metadata = self._interceptor.pre_list_instances(request, metadata) transcoded_request = _BaseRegionInstanceGroupsRestTransport._BaseListInstances._get_transcoded_request( @@ -1016,9 +1014,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupsRestTransport._BaseSetNamedPorts._get_http_options() - ) + http_options = _BaseRegionInstanceGroupsRestTransport._BaseSetNamedPorts._get_http_options() request, metadata = self._interceptor.pre_set_named_ports(request, metadata) transcoded_request = _BaseRegionInstanceGroupsRestTransport._BaseSetNamedPorts._get_transcoded_request( @@ -1169,9 +1165,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionInstanceGroupsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/client.py index 0da04b62f8c0..1e9189b176e4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_instance_templates import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionInstanceTemplatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstanceTemplatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceTemplatesTransport]] _transport_registry["rest"] = RegionInstanceTemplatesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstanceTemplatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstanceTemplatesClient._read_environment_variables() + ) self._client_cert_source = ( RegionInstanceTemplatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstanceTemplatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/pagers.py index ecb70cba9969..7354b04f320d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/__init__.py index 37ac6b1ce0d9..91c96fdb74c4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstanceTemplatesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstanceTemplatesTransport]] _transport_registry["rest"] = RegionInstanceTemplatesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/base.py index 2b10210d1855..413b8178744d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/rest.py index 11332026425d..99504433dc74 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instance_templates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -477,9 +477,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceTemplatesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionInstanceTemplatesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionInstanceTemplatesRestTransport._BaseDelete._get_transcoded_request( @@ -817,9 +815,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstanceTemplatesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionInstanceTemplatesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionInstanceTemplatesRestTransport._BaseInsert._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/client.py index 74382be2823a..224befc8e091 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.types import compute @@ -78,9 +78,7 @@ class RegionInstancesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstancesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstancesTransport]] _transport_registry["rest"] = RegionInstancesRestTransport def get_transport_class( @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstancesClient._read_environment_variables() + ) self._client_cert_source = RegionInstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/base.py index 792163eee6fd..fff7432e5e2b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/rest.py index 60e22f78b88e..13afa1f720b6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instances/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/client.py index 4a64b9f72707..db528fda871f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_instant_snapshots import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionInstantSnapshotsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionInstantSnapshotsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstantSnapshotsTransport]] _transport_registry["rest"] = RegionInstantSnapshotsRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionInstantSnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionInstantSnapshotsClient._read_environment_variables() + ) self._client_cert_source = RegionInstantSnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionInstantSnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/pagers.py index 7a7a8741065a..62bc67c2fbf3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/__init__.py index c79504fba846..d67a8b7e1a0e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionInstantSnapshotsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionInstantSnapshotsTransport]] _transport_registry["rest"] = RegionInstantSnapshotsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/base.py index 57b10c6aea68..56c00cb5d5c3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/rest.py index 98615420c4f9..b349302f4464 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_instant_snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1070,9 +1070,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionInstantSnapshotsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1620,9 +1618,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionInstantSnapshotsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1801,9 +1797,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseRegionInstantSnapshotsRestTransport._BaseSetLabels._get_transcoded_request( @@ -1954,9 +1948,7 @@ def __call__( """ - http_options = ( - _BaseRegionInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionInstantSnapshotsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/client.py index 7511cdd0780f..1fb20869c6bd 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_network_endpoint_groups import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionNetworkEndpointGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] _transport_registry["rest"] = RegionNetworkEndpointGroupsRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNetworkEndpointGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNetworkEndpointGroupsClient._read_environment_variables() + ) self._client_cert_source = ( RegionNetworkEndpointGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNetworkEndpointGroupsTransport, transport) self._api_endpoint = self._transport.host @@ -852,9 +847,7 @@ def sample_attach_network_endpoints(): region_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_attach_endpoints_request_resource = ( - region_network_endpoint_groups_attach_endpoints_request_resource - ) + request.region_network_endpoint_groups_attach_endpoints_request_resource = region_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1017,9 +1010,7 @@ def sample_attach_network_endpoints(): region_network_endpoint_groups_attach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_attach_endpoints_request_resource = ( - region_network_endpoint_groups_attach_endpoints_request_resource - ) + request.region_network_endpoint_groups_attach_endpoints_request_resource = region_network_endpoint_groups_attach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1514,9 +1505,7 @@ def sample_detach_network_endpoints(): region_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_detach_endpoints_request_resource = ( - region_network_endpoint_groups_detach_endpoints_request_resource - ) + request.region_network_endpoint_groups_detach_endpoints_request_resource = region_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1679,9 +1668,7 @@ def sample_detach_network_endpoints(): region_network_endpoint_groups_detach_endpoints_request_resource is not None ): - request.region_network_endpoint_groups_detach_endpoints_request_resource = ( - region_network_endpoint_groups_detach_endpoints_request_resource - ) + request.region_network_endpoint_groups_detach_endpoints_request_resource = region_network_endpoint_groups_detach_endpoints_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/pagers.py index 8479c24fe1be..0b559fcae08f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/__init__.py index 3dd7945713af..da8323cc3026 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkEndpointGroupsTransport]] _transport_registry["rest"] = RegionNetworkEndpointGroupsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/base.py index 871b66233ef1..a06e4919e183 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/rest.py index 5212cc1fa7fa..b0592b69b53a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_endpoint_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -660,9 +660,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseAttachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_attach_network_endpoints( request, metadata @@ -842,9 +840,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseDelete._get_transcoded_request( @@ -1020,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseDetachNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_detach_network_endpoints( request, metadata @@ -1183,9 +1177,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseGet._get_transcoded_request( @@ -1357,9 +1349,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseInsert._get_transcoded_request( @@ -1509,9 +1499,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionNetworkEndpointGroupsRestTransport._BaseList._get_transcoded_request( @@ -1656,9 +1644,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() - ) + http_options = _BaseRegionNetworkEndpointGroupsRestTransport._BaseListNetworkEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_network_endpoints( request, metadata @@ -1761,7 +1747,9 @@ def attach_network_endpoints( ]: # 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._AttachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._AttachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete( @@ -1780,7 +1768,9 @@ def detach_network_endpoints( ]: # 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._DetachNetworkEndpoints(self._session, self._host, self._interceptor) # type: ignore + return self._DetachNetworkEndpoints( + self._session, self._host, self._interceptor + ) # type: ignore @property def get( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/client.py index f1a938a763a4..373ed6d7bc55 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_network_firewall_policies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionNetworkFirewallPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] _transport_registry["rest"] = RegionNetworkFirewallPoliciesRestTransport def get_transport_class( @@ -612,11 +610,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNetworkFirewallPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNetworkFirewallPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( RegionNetworkFirewallPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -657,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNetworkFirewallPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/pagers.py index 7ac10d47350c..d4be9d992c5b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/__init__.py index 433f662fc5c8..f3263c79b48b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNetworkFirewallPoliciesTransport]] _transport_registry["rest"] = RegionNetworkFirewallPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/base.py index 76b51738e4f6..d69fc0227aa7 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/rest.py index 6ffbaadb69e6..0413a0e8396d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_network_firewall_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1213,9 +1213,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_http_options() request, metadata = self._interceptor.pre_add_association(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddAssociation._get_transcoded_request( @@ -1394,9 +1392,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1576,9 +1572,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_http_options() request, metadata = self._interceptor.pre_clone_rules(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseCloneRules._get_transcoded_request( @@ -1753,9 +1747,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseDelete._get_transcoded_request( @@ -1902,9 +1894,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGet._get_transcoded_request( @@ -2047,9 +2037,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_http_options() request, metadata = self._interceptor.pre_get_association(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetAssociation._get_transcoded_request( @@ -2198,9 +2186,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetEffectiveFirewalls._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetEffectiveFirewalls._get_http_options() request, metadata = self._interceptor.pre_get_effective_firewalls( request, metadata @@ -2427,9 +2413,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2580,9 +2564,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -2758,9 +2740,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseInsert._get_transcoded_request( @@ -2910,9 +2890,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseList._get_transcoded_request( @@ -3084,9 +3062,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatch._get_transcoded_request( @@ -3265,9 +3241,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -3447,9 +3421,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveAssociation._get_http_options() request, metadata = self._interceptor.pre_remove_association( request, metadata @@ -3624,9 +3596,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -3848,9 +3818,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -4003,9 +3971,7 @@ def __call__( """ - http_options = ( - _BaseRegionNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionNetworkFirewallPoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/client.py index c75c07fb0b2f..0750afbf744e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_notification_endpoints import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionNotificationEndpointsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionNotificationEndpointsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionNotificationEndpointsTransport]] _transport_registry["rest"] = RegionNotificationEndpointsRestTransport def get_transport_class( @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionNotificationEndpointsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionNotificationEndpointsClient._read_environment_variables() + ) self._client_cert_source = ( RegionNotificationEndpointsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionNotificationEndpointsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/pagers.py index 044dd68270f6..5c8d06e6679a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/__init__.py index 5439dcd7a1f4..520eb9a6de76 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionNotificationEndpointsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionNotificationEndpointsTransport]] _transport_registry["rest"] = RegionNotificationEndpointsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/base.py index 520fd29d9d95..680613860e23 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/rest.py index 6239cd43d44f..0802285e9899 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_notification_endpoints/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -542,9 +542,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseDelete._get_transcoded_request( @@ -698,9 +696,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseGet._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseGet._get_http_options() request, metadata = self._interceptor.pre_get(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseGet._get_transcoded_request( @@ -872,9 +868,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseInsert._get_transcoded_request( @@ -1024,9 +1018,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseList._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseList._get_http_options() request, metadata = self._interceptor.pre_list(request, metadata) transcoded_request = _BaseRegionNotificationEndpointsRestTransport._BaseList._get_transcoded_request( @@ -1172,9 +1164,7 @@ def __call__( """ - http_options = ( - _BaseRegionNotificationEndpointsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseRegionNotificationEndpointsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/client.py index d94ebeb4ac50..9dd89cfeefe9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class RegionOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionOperationsTransport]] _transport_registry["rest"] = RegionOperationsRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionOperationsClient._read_environment_variables() + ) self._client_cert_source = RegionOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/pagers.py index 5ca57a3eea60..2477b8a08991 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/base.py index 6d891168c017..86a408835699 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/rest.py index 2016d5f77b32..920e47a5524b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/client.py index 19ea7db4dcd0..91002b072567 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_security_policies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionSecurityPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSecurityPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSecurityPoliciesTransport]] _transport_registry["rest"] = RegionSecurityPoliciesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSecurityPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSecurityPoliciesClient._read_environment_variables() + ) self._client_cert_source = RegionSecurityPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSecurityPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/pagers.py index a8e4c58fead0..202f103fab36 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/__init__.py index 974b3530fac6..05c2647ccc95 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionSecurityPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionSecurityPoliciesTransport]] _transport_registry["rest"] = RegionSecurityPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/base.py index 4e27b07dd338..67d0123b9b7e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/rest.py index b514c44042e7..3dc9ee912da5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_security_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -809,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseAddRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseAddRule._get_http_options() request, metadata = self._interceptor.pre_add_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseAddRule._get_transcoded_request( @@ -1291,9 +1289,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseGetRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseGetRule._get_http_options() request, metadata = self._interceptor.pre_get_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseGetRule._get_transcoded_request( @@ -1974,9 +1970,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BasePatchRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BasePatchRule._get_http_options() request, metadata = self._interceptor.pre_patch_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BasePatchRule._get_transcoded_request( @@ -2154,9 +2148,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseRemoveRule._get_http_options() request, metadata = self._interceptor.pre_remove_rule(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseRemoveRule._get_transcoded_request( @@ -2330,9 +2322,7 @@ def __call__( """ - http_options = ( - _BaseRegionSecurityPoliciesRestTransport._BaseSetLabels._get_http_options() - ) + http_options = _BaseRegionSecurityPoliciesRestTransport._BaseSetLabels._get_http_options() request, metadata = self._interceptor.pre_set_labels(request, metadata) transcoded_request = _BaseRegionSecurityPoliciesRestTransport._BaseSetLabels._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/client.py index 095cde2b29f9..080afa420889 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_ssl_certificates import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionSslCertificatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSslCertificatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSslCertificatesTransport]] _transport_registry["rest"] = RegionSslCertificatesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSslCertificatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSslCertificatesClient._read_environment_variables() + ) self._client_cert_source = RegionSslCertificatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSslCertificatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/pagers.py index e4f35d605b0a..0f2df4aabba7 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/__init__.py index 060c7906a8ce..34a9a093486c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionSslCertificatesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionSslCertificatesTransport]] _transport_registry["rest"] = RegionSslCertificatesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/base.py index 3e476f905044..0d255e2cef7d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/rest.py index 9209691cceaa..dc64159686b9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_certificates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/client.py index 95ae8d08a402..574a4a5c7bdb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_ssl_policies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionSslPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionSslPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionSslPoliciesTransport]] _transport_registry["rest"] = RegionSslPoliciesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionSslPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionSslPoliciesClient._read_environment_variables() + ) self._client_cert_source = RegionSslPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionSslPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/pagers.py index 5faf73e28c19..3dcd37c5480f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/base.py index 7008cf5cb2fa..1427e4f38a24 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/rest.py index 8619877489dd..d1a513149467 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_ssl_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1223,9 +1223,7 @@ def __call__( """ - http_options = ( - _BaseRegionSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() - ) + http_options = _BaseRegionSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() request, metadata = self._interceptor.pre_list_available_features( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/client.py index 2056f218531b..046235518bf6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_target_http_proxies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionTargetHttpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpProxiesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionTargetHttpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionTargetHttpProxiesClient._read_environment_variables() + ) self._client_cert_source = ( RegionTargetHttpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionTargetHttpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/pagers.py index 4bc98abc93e1..493218a84350 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/__init__.py index d1f663d11aae..b1007083364a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/base.py index 85f184ef6366..2c4227e60b1a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/rest.py index 61d66bdf46fe..2ec8aae55e17 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_http_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -531,9 +531,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionTargetHttpProxiesRestTransport._BaseDelete._get_transcoded_request( @@ -875,9 +873,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionTargetHttpProxiesRestTransport._BaseInsert._get_transcoded_request( @@ -1201,9 +1197,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpProxiesRestTransport._BaseSetUrlMap._get_http_options() - ) + http_options = _BaseRegionTargetHttpProxiesRestTransport._BaseSetUrlMap._get_http_options() request, metadata = self._interceptor.pre_set_url_map(request, metadata) transcoded_request = _BaseRegionTargetHttpProxiesRestTransport._BaseSetUrlMap._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/client.py index 3369a48f8ac5..c6e049e80c5b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_target_https_proxies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionTargetHttpsProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpsProxiesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionTargetHttpsProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionTargetHttpsProxiesClient._read_environment_variables() + ) self._client_cert_source = ( RegionTargetHttpsProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionTargetHttpsProxiesTransport, transport) self._api_endpoint = self._transport.host @@ -2062,9 +2057,7 @@ def sample_set_ssl_certificates(): region_target_https_proxies_set_ssl_certificates_request_resource is not None ): - request.region_target_https_proxies_set_ssl_certificates_request_resource = ( - region_target_https_proxies_set_ssl_certificates_request_resource - ) + request.region_target_https_proxies_set_ssl_certificates_request_resource = region_target_https_proxies_set_ssl_certificates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -2221,9 +2214,7 @@ def sample_set_ssl_certificates(): region_target_https_proxies_set_ssl_certificates_request_resource is not None ): - request.region_target_https_proxies_set_ssl_certificates_request_resource = ( - region_target_https_proxies_set_ssl_certificates_request_resource - ) + request.region_target_https_proxies_set_ssl_certificates_request_resource = region_target_https_proxies_set_ssl_certificates_request_resource # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/pagers.py index 22c6a8bdb537..c871eeb52b55 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/__init__.py index 56fd11aaf8f8..10e93cde04da 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetHttpsProxiesTransport]] _transport_registry["rest"] = RegionTargetHttpsProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/base.py index 35bef62cae94..75485c624006 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/rest.py index 7605c9f1e804..c98b51f90c78 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_https_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -644,9 +644,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseDelete._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseDelete._get_http_options() request, metadata = self._interceptor.pre_delete(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BaseDelete._get_transcoded_request( @@ -988,9 +986,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseInsert._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseInsert._get_http_options() request, metadata = self._interceptor.pre_insert(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BaseInsert._get_transcoded_request( @@ -1316,9 +1312,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BasePatch._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BasePatch._get_http_options() request, metadata = self._interceptor.pre_patch(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BasePatch._get_transcoded_request( @@ -1497,9 +1491,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() request, metadata = self._interceptor.pre_set_ssl_certificates( request, metadata @@ -1682,9 +1674,7 @@ def __call__( """ - http_options = ( - _BaseRegionTargetHttpsProxiesRestTransport._BaseSetUrlMap._get_http_options() - ) + http_options = _BaseRegionTargetHttpsProxiesRestTransport._BaseSetUrlMap._get_http_options() request, metadata = self._interceptor.pre_set_url_map(request, metadata) transcoded_request = _BaseRegionTargetHttpsProxiesRestTransport._BaseSetUrlMap._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/client.py index b141221efdae..0d681742e7c5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_target_tcp_proxies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class RegionTargetTcpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] _transport_registry["rest"] = RegionTargetTcpProxiesRestTransport def get_transport_class( @@ -606,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionTargetTcpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionTargetTcpProxiesClient._read_environment_variables() + ) self._client_cert_source = RegionTargetTcpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -645,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionTargetTcpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/pagers.py index 14e8861bd2a3..cb7ef0257f37 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/__init__.py index 72e8e2cb3dfa..d3ec0d868b0d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RegionTargetTcpProxiesTransport]] _transport_registry["rest"] = RegionTargetTcpProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/base.py index 716af4da3da4..497f9573bc02 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/rest.py index a18c1089f502..e03428f5c7c3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_target_tcp_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/client.py index 423d6e03c6ae..46e14bce6530 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.region_url_maps import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionUrlMapsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionUrlMapsClient._read_environment_variables() + ) self._client_cert_source = RegionUrlMapsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionUrlMapsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/pagers.py index cb2a2a320bc6..fa5a2a4bb266 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/base.py index 2b93162c60ec..45d10229680c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/rest.py index b58510f0b1c9..c4a6e93f2a72 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_url_maps/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/client.py index 1f55d1e08ac8..66d6594cf5c7 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionZonesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionZonesClient._read_environment_variables() + ) self._client_cert_source = RegionZonesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionZonesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/pagers.py index ec134fa48f1b..a89148cf342b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/base.py index 61a3e59f5f49..c9c993fe9c20 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/rest.py index ecb2f216e790..bfb37becadcf 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/region_zones/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/client.py index 9556a35522b1..f4c601793bb9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RegionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RegionsClient._read_environment_variables() + ) self._client_cert_source = RegionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RegionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/pagers.py index 3f35969c1aa3..eb76b4bb6f1e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/base.py index 6f8615e80896..eaf4bd6add04 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/rest.py index 8e486e75f569..6552dfee79e6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/regions/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/client.py index fcf404d5bdef..9335da665867 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.reservation_blocks import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class ReservationBlocksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReservationBlocksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReservationBlocksTransport]] _transport_registry["rest"] = ReservationBlocksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationBlocksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationBlocksClient._read_environment_variables() + ) self._client_cert_source = ReservationBlocksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationBlocksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/pagers.py index 6b51006f1730..8392a22dae1c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/base.py index 08306d238503..a490b66ea7ef 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/rest.py index 9926f6f94017..ce6d27e01c56 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_blocks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -790,9 +790,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseReservationBlocksRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1118,9 +1116,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BasePerformMaintenance._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BasePerformMaintenance._get_http_options() request, metadata = self._interceptor.pre_perform_maintenance( request, metadata @@ -1346,9 +1342,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseReservationBlocksRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1499,9 +1493,7 @@ def __call__( """ - http_options = ( - _BaseReservationBlocksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationBlocksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/client.py index 397a6bb6be17..b2fa005f9a2d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.reservation_sub_blocks import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class ReservationSubBlocksClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReservationSubBlocksTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReservationSubBlocksTransport]] _transport_registry["rest"] = ReservationSubBlocksRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationSubBlocksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationSubBlocksClient._read_environment_variables() + ) self._client_cert_source = ReservationSubBlocksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationSubBlocksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/pagers.py index 26b2474f58f0..ab8933cbb969 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/__init__.py index b1aa0cc62777..3cc2955ac69c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ReservationSubBlocksRestInterceptor, ReservationSubBlocksRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ReservationSubBlocksTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ReservationSubBlocksTransport]] _transport_registry["rest"] = ReservationSubBlocksRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/base.py index 68f6072be77c..79b722e5de1a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/rest.py index 93fa3ce61150..0c17a4d3f767 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservation_sub_blocks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -849,9 +849,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseReservationSubBlocksRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1174,9 +1172,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BasePerformMaintenance._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BasePerformMaintenance._get_http_options() request, metadata = self._interceptor.pre_perform_maintenance( request, metadata @@ -1354,9 +1350,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseReportFaulty._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseReportFaulty._get_http_options() request, metadata = self._interceptor.pre_report_faulty(request, metadata) transcoded_request = _BaseReservationSubBlocksRestTransport._BaseReportFaulty._get_transcoded_request( @@ -1581,9 +1575,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseReservationSubBlocksRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1734,9 +1726,7 @@ def __call__( """ - http_options = ( - _BaseReservationSubBlocksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationSubBlocksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/client.py index 17736806a22a..bd5b010f7d64 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.reservations import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReservationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReservationsClient._read_environment_variables() + ) self._client_cert_source = ReservationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReservationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/pagers.py index 49f8531c87b8..56ff83d0134c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/base.py index 07848dcc211e..9333f91ee33a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/rest.py index 9893c2b128a2..d833f6f669c6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/reservations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1882,9 +1882,7 @@ def __call__( """ - http_options = ( - _BaseReservationsRestTransport._BasePerformMaintenance._get_http_options() - ) + http_options = _BaseReservationsRestTransport._BasePerformMaintenance._get_http_options() request, metadata = self._interceptor.pre_perform_maintenance( request, metadata @@ -2448,9 +2446,7 @@ def __call__( """ - http_options = ( - _BaseReservationsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReservationsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/client.py index 6235563fef9e..ce704151e64a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.resource_policies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class ResourcePoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ResourcePoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ResourcePoliciesTransport]] _transport_registry["rest"] = ResourcePoliciesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ResourcePoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ResourcePoliciesClient._read_environment_variables() + ) self._client_cert_source = ResourcePoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ResourcePoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/pagers.py index c3edc8773997..e4182f457a01 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/base.py index 320d67ca1e22..c4ee6f39cbd0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/rest.py index bf616cd66dda..b02bb91e3d2f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/resource_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -726,9 +726,7 @@ def __call__( Contains a list of resourcePolicies. """ - http_options = ( - _BaseResourcePoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseResourcePoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseResourcePoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2168,9 +2166,7 @@ def __call__( """ - http_options = ( - _BaseResourcePoliciesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseResourcePoliciesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/client.py index 83df11124516..fd133111be9d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.routers import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RoutersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RoutersClient._read_environment_variables() + ) self._client_cert_source = RoutersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RoutersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/pagers.py index 3a1f4b19235e..3ff53a413d0b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -298,7 +298,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -374,7 +374,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/base.py index 49de36f89e42..6ac0a02949fc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/rest.py index 04225e37df70..595d501f7ead 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routers/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/client.py index 2cfbd1e3deb8..c76f307bf572 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.routes import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RoutesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RoutesClient._read_environment_variables() + ) self._client_cert_source = RoutesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RoutesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/pagers.py index 2241ea1668f5..50a01ffc7658 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/base.py index 7773a31bcfea..74b44c34336c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/rest.py index 01472920e695..e06ca72f3695 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/routes/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/client.py index dc0aa861d7b1..66ac255af6a5 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.security_policies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class SecurityPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SecurityPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SecurityPoliciesTransport]] _transport_registry["rest"] = SecurityPoliciesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SecurityPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SecurityPoliciesClient._read_environment_variables() + ) self._client_cert_source = SecurityPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SecurityPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/pagers.py index 1cd5f58ab432..68548577ac05 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/base.py index 634f2406a6f9..d50fed195dc1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/rest.py index b8453c719529..1d6ef34505b3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/security_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1075,9 +1075,7 @@ def __call__( """ - http_options = ( - _BaseSecurityPoliciesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseSecurityPoliciesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseSecurityPoliciesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -2041,15 +2039,12 @@ def __call__( """ - http_options = ( - _BaseSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ) + http_options = _BaseSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_preconfigured_expression_sets( - request, metadata + request, metadata = ( + self._interceptor.pre_list_preconfigured_expression_sets( + request, metadata + ) ) transcoded_request = _BaseSecurityPoliciesRestTransport._BaseListPreconfiguredExpressionSets._get_transcoded_request( http_options, request @@ -2112,11 +2107,10 @@ def __call__( resp = self._interceptor.post_list_preconfigured_expression_sets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_preconfigured_expression_sets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_preconfigured_expression_sets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2929,7 +2923,9 @@ def list_preconfigured_expression_sets( ]: # 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._ListPreconfiguredExpressionSets(self._session, self._host, self._interceptor) # type: ignore + return self._ListPreconfiguredExpressionSets( + self._session, self._host, self._interceptor + ) # type: ignore @property def patch( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/client.py index 6bb9dd08bfe7..ba23f823098e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.service_attachments import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class ServiceAttachmentsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServiceAttachmentsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServiceAttachmentsTransport]] _transport_registry["rest"] = ServiceAttachmentsRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServiceAttachmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServiceAttachmentsClient._read_environment_variables() + ) self._client_cert_source = ServiceAttachmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServiceAttachmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/pagers.py index d6609012f48d..c00f14096bff 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/__init__.py index 636b3cbe6749..e75723ac4a42 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import ServiceAttachmentsRestInterceptor, ServiceAttachmentsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServiceAttachmentsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServiceAttachmentsTransport]] _transport_registry["rest"] = ServiceAttachmentsRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/base.py index 9fe265bcad06..df2a5ec597f9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/rest.py index 6896ad801898..e3f8fbc6a49d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/service_attachments/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -731,9 +731,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseServiceAttachmentsRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1287,9 +1285,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseServiceAttachmentsRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2027,9 +2023,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseServiceAttachmentsRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2180,9 +2174,7 @@ def __call__( """ - http_options = ( - _BaseServiceAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseServiceAttachmentsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/client.py index c91b2fb3ee6d..63a89a46643b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.types import compute @@ -78,9 +78,7 @@ class SnapshotSettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SnapshotSettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SnapshotSettingsServiceTransport]] _transport_registry["rest"] = SnapshotSettingsServiceRestTransport def get_transport_class( @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SnapshotSettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SnapshotSettingsServiceClient._read_environment_variables() + ) self._client_cert_source = ( SnapshotSettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SnapshotSettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/__init__.py index 83b20168d6c6..a3107dbdce8d 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/__init__.py @@ -23,9 +23,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SnapshotSettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SnapshotSettingsServiceTransport]] _transport_registry["rest"] = SnapshotSettingsServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/base.py index 523ebb1fb4d9..49be42ce4452 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/rest.py index 2124043b9a85..9d4b27c86fd8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshot_settings_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/client.py index aeff9f1b0f7e..5ad2a4bafe43 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.snapshots import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SnapshotsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SnapshotsClient._read_environment_variables() + ) self._client_cert_source = SnapshotsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SnapshotsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/pagers.py index 045e3b89a4ca..d6820ab3c3b9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/base.py index 727323587797..acf7da137284 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/rest.py index 728b02c445ec..ec1792a67989 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/snapshots/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/client.py index 5449bfc634b7..30b03bdb311c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.ssl_certificates import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class SslCertificatesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SslCertificatesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SslCertificatesTransport]] _transport_registry["rest"] = SslCertificatesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SslCertificatesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SslCertificatesClient._read_environment_variables() + ) self._client_cert_source = SslCertificatesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SslCertificatesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/pagers.py index 382fe3f452cc..ad54f9da985e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/base.py index 7428f0d7a40b..d84b5339478b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/rest.py index fde3fa92eabe..4e3f3fb32cd4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_certificates/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -503,9 +503,7 @@ def __call__( """ - http_options = ( - _BaseSslCertificatesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseSslCertificatesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseSslCertificatesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/client.py index 05ef09eebb11..53a73f2fe598 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.ssl_policies import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SslPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SslPoliciesClient._read_environment_variables() + ) self._client_cert_source = SslPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SslPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/pagers.py index 696f6ba9bf5c..718a3d568a90 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/base.py index 2e8e2bc96aa3..9d9e52c29f10 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/rest.py index c03e022bef21..158c35462ee0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/ssl_policies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1403,9 +1403,7 @@ def __call__( """ - http_options = ( - _BaseSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() - ) + http_options = _BaseSslPoliciesRestTransport._BaseListAvailableFeatures._get_http_options() request, metadata = self._interceptor.pre_list_available_features( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/client.py index 7eb714abe5ec..5251193ccfe1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class StoragePoolTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[StoragePoolTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[StoragePoolTypesTransport]] _transport_registry["rest"] = StoragePoolTypesRestTransport def get_transport_class( @@ -599,11 +597,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = StoragePoolTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + StoragePoolTypesClient._read_environment_variables() + ) self._client_cert_source = StoragePoolTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +634,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(StoragePoolTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/pagers.py index 65757b446192..95cd3a9ce073 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/base.py index a7cf3ce6dcee..99345ae052fb 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/rest.py index 6f16c09fd587..46eb1d60bdef 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pool_types/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -395,9 +395,7 @@ def __call__( """ - http_options = ( - _BaseStoragePoolTypesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseStoragePoolTypesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseStoragePoolTypesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/client.py index 2d8a7b26b9c6..9e9eea8e6aa9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.storage_pools import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = StoragePoolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + StoragePoolsClient._read_environment_variables() + ) self._client_cert_source = StoragePoolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(StoragePoolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/pagers.py index c64bde03e79f..bfde7f6bece8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/base.py index 5ffcd009a974..6a959892da1f 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/rest.py index c7c1cbb6f2a5..6a04daa55581 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/storage_pools/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2175,9 +2175,7 @@ def __call__( """ - http_options = ( - _BaseStoragePoolsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseStoragePoolsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/client.py index d75a800f5080..27eb1ab43044 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.subnetworks import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SubnetworksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SubnetworksClient._read_environment_variables() + ) self._client_cert_source = SubnetworksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SubnetworksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/pagers.py index 86d784c5d0e9..fb1edf7cc95b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -222,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/base.py index 326c909b4149..306ecc828969 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/rest.py index e646703c6987..9aa810d40132 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/subnetworks/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2688,9 +2688,7 @@ def __call__( """ - http_options = ( - _BaseSubnetworksRestTransport._BaseSetPrivateIpGoogleAccess._get_http_options() - ) + http_options = _BaseSubnetworksRestTransport._BaseSetPrivateIpGoogleAccess._get_http_options() request, metadata = self._interceptor.pre_set_private_ip_google_access( request, metadata @@ -2842,9 +2840,7 @@ def __call__( """ - http_options = ( - _BaseSubnetworksRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSubnetworksRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3023,7 +3019,9 @@ def set_private_ip_google_access( ]: # 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._SetPrivateIpGoogleAccess(self._session, self._host, self._interceptor) # type: ignore + return self._SetPrivateIpGoogleAccess( + self._session, self._host, self._interceptor + ) # type: ignore @property def test_iam_permissions( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/client.py index 3cb5e9379321..6741fe9af107 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.target_grpc_proxies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class TargetGrpcProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetGrpcProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetGrpcProxiesTransport]] _transport_registry["rest"] = TargetGrpcProxiesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetGrpcProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetGrpcProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetGrpcProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetGrpcProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/pagers.py index 59a40175c87e..5ade28fa849b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/base.py index 6805b9cd46dc..3ac0cac1b64b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/rest.py index 5b3568838ea1..72b5392fac40 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_grpc_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/client.py index b2b1f5b5fce9..969aa46d8963 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.target_http_proxies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class TargetHttpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetHttpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetHttpProxiesTransport]] _transport_registry["rest"] = TargetHttpProxiesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetHttpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetHttpProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetHttpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetHttpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/pagers.py index da9f1f53bfb5..482edc7a1be6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/base.py index 2a139e3913be..09e0e587ef46 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/rest.py index eeec1766acb4..b9d50d3930e8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_http_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -612,9 +612,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpProxiesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetHttpProxiesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetHttpProxiesRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/client.py index f1048d8a65dc..0eb9acf8bedc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.target_https_proxies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class TargetHttpsProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetHttpsProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetHttpsProxiesTransport]] _transport_registry["rest"] = TargetHttpsProxiesRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetHttpsProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetHttpsProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetHttpsProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetHttpsProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/pagers.py index 550a0c9e0688..e78ec51d0d36 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/__init__.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/__init__.py index b590b838910b..5aaf31dbadf8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/__init__.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/__init__.py @@ -20,9 +20,7 @@ from .rest import TargetHttpsProxiesRestInterceptor, TargetHttpsProxiesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[TargetHttpsProxiesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[TargetHttpsProxiesTransport]] _transport_registry["rest"] = TargetHttpsProxiesRestTransport __all__ = ( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/base.py index e356ced53bee..f280f5fa602c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/rest.py index 0044bf9203be..d3ca9f2b0845 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_https_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -837,9 +837,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetHttpsProxiesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1882,9 +1880,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetCertificateMap._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetCertificateMap._get_http_options() request, metadata = self._interceptor.pre_set_certificate_map( request, metadata @@ -2065,9 +2061,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetQuicOverride._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetQuicOverride._get_http_options() request, metadata = self._interceptor.pre_set_quic_override( request, metadata @@ -2248,9 +2242,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetSslCertificates._get_http_options() request, metadata = self._interceptor.pre_set_ssl_certificates( request, metadata @@ -2433,9 +2425,7 @@ def __call__( """ - http_options = ( - _BaseTargetHttpsProxiesRestTransport._BaseSetSslPolicy._get_http_options() - ) + http_options = _BaseTargetHttpsProxiesRestTransport._BaseSetSslPolicy._get_http_options() request, metadata = self._interceptor.pre_set_ssl_policy(request, metadata) transcoded_request = _BaseTargetHttpsProxiesRestTransport._BaseSetSslPolicy._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/client.py index da57babf49c5..f03f5f97885c 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.target_instances import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class TargetInstancesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetInstancesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetInstancesTransport]] _transport_registry["rest"] = TargetInstancesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetInstancesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetInstancesClient._read_environment_variables() + ) self._client_cert_source = TargetInstancesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetInstancesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/pagers.py index ab03cb70ce5a..ba1123500b8b 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/base.py index 69ff17fe2d3d..97c21f24cdf1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import zone_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/rest.py index 1ab1884569ce..956c74cfa222 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_instances/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -619,9 +619,7 @@ def __call__( """ - http_options = ( - _BaseTargetInstancesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetInstancesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetInstancesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1463,9 +1461,7 @@ def __call__( """ - http_options = ( - _BaseTargetInstancesRestTransport._BaseSetSecurityPolicy._get_http_options() - ) + http_options = _BaseTargetInstancesRestTransport._BaseSetSecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_set_security_policy( request, metadata @@ -1618,9 +1614,7 @@ def __call__( """ - http_options = ( - _BaseTargetInstancesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetInstancesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/client.py index 616b77a3654f..d7cc7b392810 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.target_pools import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetPoolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetPoolsClient._read_environment_variables() + ) self._client_cert_source = TargetPoolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetPoolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/pagers.py index 758ecbcead71..9ed7ccba3bf6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/base.py index d47dba4a25c2..97cac8586530 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/rest.py index e330e6705aba..d09add05306a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_pools/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2996,9 +2996,7 @@ def __call__( """ - http_options = ( - _BaseTargetPoolsRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetPoolsRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/client.py index c17b95ad5783..be8561d63bd0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.target_ssl_proxies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class TargetSslProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetSslProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetSslProxiesTransport]] _transport_registry["rest"] = TargetSslProxiesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetSslProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetSslProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetSslProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetSslProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/pagers.py index 8dcac2c33648..36630e5ae0f0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/base.py index e811c0833a42..922dd832957e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/rest.py index 649fcad5c4f4..a60f611ccc45 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_ssl_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1481,9 +1481,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetBackendService._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetBackendService._get_http_options() request, metadata = self._interceptor.pre_set_backend_service( request, metadata @@ -1664,9 +1662,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetCertificateMap._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetCertificateMap._get_http_options() request, metadata = self._interceptor.pre_set_certificate_map( request, metadata @@ -1846,9 +1842,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetProxyHeader._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetProxyHeader._get_http_options() request, metadata = self._interceptor.pre_set_proxy_header( request, metadata @@ -2029,9 +2023,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseSetSslCertificates._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseSetSslCertificates._get_http_options() request, metadata = self._interceptor.pre_set_ssl_certificates( request, metadata @@ -2364,9 +2356,7 @@ def __call__( """ - http_options = ( - _BaseTargetSslProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetSslProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/client.py index 1344de3086d2..71c1d8009e71 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.target_tcp_proxies import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class TargetTcpProxiesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetTcpProxiesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetTcpProxiesTransport]] _transport_registry["rest"] = TargetTcpProxiesRestTransport def get_transport_class( @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetTcpProxiesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetTcpProxiesClient._read_environment_variables() + ) self._client_cert_source = TargetTcpProxiesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetTcpProxiesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/pagers.py index 410a80d1a90f..ae122b822dd1 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/base.py index 075fad91cd29..bac20c3ec033 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/rest.py index 49162fed56bc..688476078e26 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_tcp_proxies/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -674,9 +674,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetTcpProxiesRestTransport._BaseAggregatedList._get_transcoded_request( @@ -1519,9 +1517,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseSetBackendService._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseSetBackendService._get_http_options() request, metadata = self._interceptor.pre_set_backend_service( request, metadata @@ -1701,9 +1697,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseSetProxyHeader._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseSetProxyHeader._get_http_options() request, metadata = self._interceptor.pre_set_proxy_header( request, metadata @@ -1856,9 +1850,7 @@ def __call__( """ - http_options = ( - _BaseTargetTcpProxiesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseTargetTcpProxiesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/client.py index 3a885185004f..1f10bd1e58c4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.target_vpn_gateways import pagers from google.cloud.compute_v1.types import compute @@ -79,9 +79,7 @@ class TargetVpnGatewaysClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TargetVpnGatewaysTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TargetVpnGatewaysTransport]] _transport_registry["rest"] = TargetVpnGatewaysRestTransport def get_transport_class( @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TargetVpnGatewaysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TargetVpnGatewaysClient._read_environment_variables() + ) self._client_cert_source = TargetVpnGatewaysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TargetVpnGatewaysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/pagers.py index 3b4adee698ab..6dfc5d6939f4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/base.py index 9c37e25f23ec..a7e85e6c4f03 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/rest.py index 08d2f3974305..f7c630802340 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/target_vpn_gateways/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -559,9 +559,7 @@ def __call__( """ - http_options = ( - _BaseTargetVpnGatewaysRestTransport._BaseAggregatedList._get_http_options() - ) + http_options = _BaseTargetVpnGatewaysRestTransport._BaseAggregatedList._get_http_options() request, metadata = self._interceptor.pre_aggregated_list(request, metadata) transcoded_request = _BaseTargetVpnGatewaysRestTransport._BaseAggregatedList._get_transcoded_request( diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/client.py index d5f31d158f1b..36406d9b32dc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.url_maps import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UrlMapsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UrlMapsClient._read_environment_variables() + ) self._client_cert_source = UrlMapsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UrlMapsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/pagers.py index fbcb8fc69c76..fa7c7b8b2ac6 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/base.py index e0ae6ca2adb1..4ea8af1d6b2a 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/rest.py index 8687843d40fd..68e1e5889801 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/url_maps/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/client.py index 3d3811288cb3..7615250629f0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.vpn_gateways import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VpnGatewaysClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VpnGatewaysClient._read_environment_variables() + ) self._client_cert_source = VpnGatewaysClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VpnGatewaysTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/pagers.py index db7f0f883f45..539288f839d2 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/base.py index a223acb75ab4..20002bbe7670 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/rest.py index fac4feec5c22..d13bc734e1d4 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_gateways/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1803,9 +1803,7 @@ def __call__( """ - http_options = ( - _BaseVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseVpnGatewaysRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/client.py index 976cad30c6c8..329c90ca9a88 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.vpn_tunnels import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VpnTunnelsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VpnTunnelsClient._read_environment_variables() + ) self._client_cert_source = VpnTunnelsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VpnTunnelsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/pagers.py index a06aac7fd515..63c09bdda159 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/base.py index d2f3aa9a5806..8db4da007ddc 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import region_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/rest.py index 23208dc74866..85a3afda5454 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/vpn_tunnels/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/client.py index 1be714020bd4..f1c58fdbae24 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/client.py @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import functools -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import extended_operation, gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -62,7 +62,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import extended_operation # type: ignore +import google.api_core.extended_operation as extended_operation # type: ignore from google.cloud.compute_v1.services.wire_groups import pagers from google.cloud.compute_v1.types import compute @@ -598,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = WireGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + WireGroupsClient._read_environment_variables() + ) self._client_cert_source = WireGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -637,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(WireGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/pagers.py index c16f3df4f6b6..d35bdff316f3 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/base.py index 91340e95c813..590939a74b32 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/base.py @@ -17,13 +17,13 @@ from typing import Any, Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.services import global_operations diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/rest.py index fd0aef83e038..4856566087e9 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/wire_groups/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/client.py index 990a64d94a18..9fa6761b1149 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -76,9 +76,7 @@ class ZoneOperationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ZoneOperationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ZoneOperationsTransport]] _transport_registry["rest"] = ZoneOperationsRestTransport def get_transport_class( @@ -597,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ZoneOperationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ZoneOperationsClient._read_environment_variables() + ) self._client_cert_source = ZoneOperationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -636,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ZoneOperationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/pagers.py index e8b1d84754d3..dd227b7d6bc8 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/base.py index 80965b5546ee..90891e2672c0 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/rest.py index a98b11036cbf..baf01a2c1442 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zone_operations/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/client.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/client.py index 7284ce0f3003..cddbeb60bdce 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/client.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version @@ -595,11 +595,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ZonesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ZonesClient._read_environment_variables() + ) self._client_cert_source = ZonesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -634,8 +632,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ZonesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/pagers.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/pagers.py index c1391841b51e..f5cb243fe1df 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/pagers.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/base.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/base.py index 064c98dc2d99..4fa33e5f4737 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/base.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.compute_v1 import gapic_version as package_version from google.cloud.compute_v1.types import compute diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/rest.py b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/rest.py index 200bbef99bfc..bc3a0725be75 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/rest.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/services/zones/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-compute/google/cloud/compute_v1/types/compute.py b/packages/google-cloud-compute/google/cloud/compute_v1/types/compute.py index f5c635ba56f2..16980e7e9f8e 100644 --- a/packages/google-cloud-compute/google/cloud/compute_v1/types/compute.py +++ b/packages/google-cloud-compute/google/cloud/compute_v1/types/compute.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -2146,6 +2146,7 @@ class State(proto.Enum): This value has been deprecated and is no longer used. """ + UNDEFINED_STATE = 0 AVAILABLE = 442079913 DEGRADED = 396890926 @@ -2622,6 +2623,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -2642,6 +2644,7 @@ class Type(proto.Enum): ONE_TO_ONE_NAT (84090205): No description available. """ + UNDEFINED_TYPE = 0 DIRECT_IPV6 = 4397213 ONE_TO_ONE_NAT = 84090205 @@ -4418,6 +4421,7 @@ class AddressType(proto.Enum): UNSPECIFIED_TYPE (53933922): No description available. """ + UNDEFINED_ADDRESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -4438,6 +4442,7 @@ class IpVersion(proto.Enum): UNSPECIFIED_VERSION (21850000): No description available. """ + UNDEFINED_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -4458,6 +4463,7 @@ class Ipv6EndpointType(proto.Enum): VM (2743): Reserved IPv6 address can be used on VM. """ + UNDEFINED_IPV6_ENDPOINT_TYPE = 0 NETLB = 74173363 VM = 2743 @@ -4487,6 +4493,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -4560,6 +4567,7 @@ class Purpose(proto.Enum): VPC_PEERING (400800170): IP range for peer networks. """ + UNDEFINED_PURPOSE = 0 DNS_RESOLVER = 476114556 GCE_ENDPOINT = 230515243 @@ -4589,6 +4597,7 @@ class Status(proto.Enum): RESERVING (514587225): Address is being reserved. """ + UNDEFINED_STATUS = 0 IN_USE = 17393485 RESERVED = 432241448 @@ -4960,6 +4969,7 @@ class PerformanceMonitoringUnit(proto.Enum): STANDARD (484642493): Most documented core/L2 events. """ + UNDEFINED_PERFORMANCE_MONITORING_UNIT = 0 ARCHITECTURAL = 155113693 ENHANCED = 476873590 @@ -11870,6 +11880,7 @@ class Views(proto.Enum): WITH_UTILIZATION (504090633): Utilization data is included in the response. """ + UNDEFINED_VIEWS = 0 DEFAULT = 115302945 WITH_UTILIZATION = 504090633 @@ -13690,6 +13701,7 @@ class VmFamily(proto.Enum): VM_FAMILY_CLOUD_TPU_POD_SLICE_TPU7X (485271888): No description available. """ + UNDEFINED_VM_FAMILY = 0 VM_FAMILY_CLOUD_TPU_DEVICE_CT3 = 42845948 VM_FAMILY_CLOUD_TPU_LITE_DEVICE_CT5L = 108020067 @@ -13717,6 +13729,7 @@ class WorkloadType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_WORKLOAD_TYPE = 0 BATCH = 62971674 SERVING = 17781740 @@ -13829,6 +13842,7 @@ class ServiceShareType(proto.Enum): SERVICE_SHARE_TYPE_UNSPECIFIED (279057148): No description available. """ + UNDEFINED_SERVICE_SHARE_TYPE = 0 ALLOW_ALL = 475536235 DISALLOW_ALL = 277786301 @@ -13932,6 +13946,7 @@ class HealthStatus(proto.Enum): The health status of the reservation is unspecified. """ + UNDEFINED_HEALTH_STATUS = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -14020,6 +14035,7 @@ class Interface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -14865,6 +14881,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -14887,6 +14904,7 @@ class Interface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -14909,6 +14927,7 @@ class Mode(proto.Enum): virtual machine at a time can be attached to a disk in read-write mode. """ + UNDEFINED_MODE = 0 READ_ONLY = 91950261 READ_WRITE = 173607894 @@ -14928,6 +14947,7 @@ class SavedState(proto.Enum): PRESERVED (254159736): Disk state has been preserved. """ + UNDEFINED_SAVED_STATE = 0 DISK_SAVED_STATE_UNSPECIFIED = 391290831 PRESERVED = 254159736 @@ -14945,6 +14965,7 @@ class Type(proto.Enum): SCRATCH (496778970): No description available. """ + UNDEFINED_TYPE = 0 PERSISTENT = 460683927 SCRATCH = 496778970 @@ -15279,6 +15300,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -15302,6 +15324,7 @@ class OnUpdateAction(proto.Enum): Use the existing disk, this is the default behaviour. """ + UNDEFINED_ON_UPDATE_ACTION = 0 RECREATE_DISK = 494767853 RECREATE_DISK_IF_SOURCE_CHANGED = 398099712 @@ -15551,6 +15574,7 @@ class LogType(proto.Enum): LOG_TYPE_UNSPECIFIED (154527053): Default case. Should never be this. """ + UNDEFINED_LOG_TYPE = 0 ADMIN_READ = 128951462 DATA_READ = 305224971 @@ -15735,6 +15759,7 @@ class Status(proto.Enum): Autoscaler backend hasn't read new/updated configuration """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 DELETING = 528602024 @@ -15782,13 +15807,13 @@ class Status(proto.Enum): number=138946292, optional=True, ) - scaling_schedule_status: MutableMapping[ - str, "ScalingScheduleStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=465950178, - message="ScalingScheduleStatus", + scaling_schedule_status: MutableMapping[str, "ScalingScheduleStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=465950178, + message="ScalingScheduleStatus", + ) ) self_link: str = proto.Field( proto.STRING, @@ -16181,6 +16206,7 @@ class Type(proto.Enum): autoscalers: in at least one of the zones you're using there is a resource stockout. """ + UNDEFINED_TYPE = 0 ALL_INSTANCES_UNHEALTHY = 404965477 BACKEND_SERVICE_DOES_NOT_EXIST = 191417626 @@ -16360,6 +16386,7 @@ class Mode(proto.Enum): Automatically create VMs according to the policy, but do not scale the MIG in. """ + UNDEFINED_MODE = 0 OFF = 78159 ON = 2527 @@ -16413,13 +16440,13 @@ class Mode(proto.Enum): optional=True, message="AutoscalingPolicyScaleInControl", ) - scaling_schedules: MutableMapping[ - str, "AutoscalingPolicyScalingSchedule" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=355416580, - message="AutoscalingPolicyScalingSchedule", + scaling_schedules: MutableMapping[str, "AutoscalingPolicyScalingSchedule"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=355416580, + message="AutoscalingPolicyScalingSchedule", + ) ) @@ -16485,6 +16512,7 @@ class PredictiveMethod(proto.Enum): by monitoring daily and weekly load patterns and scaling out ahead of anticipated demand. """ + UNDEFINED_PREDICTIVE_METHOD = 0 NONE = 2402104 OPTIMIZE_AVAILABILITY = 11629437 @@ -16624,6 +16652,7 @@ class UtilizationTargetType(proto.Enum): the utilization target value to perform autoscaling. """ + UNDEFINED_UTILIZATION_TARGET_TYPE = 0 DELTA_PER_MINUTE = 87432861 DELTA_PER_SECOND = 255180029 @@ -16996,6 +17025,7 @@ class BalancingMode(proto.Enum): UTILIZATION (157008386): Balance based on the backend utilization. """ + UNDEFINED_BALANCING_MODE = 0 CONNECTION = 246311646 CUSTOM_METRICS = 331575765 @@ -17026,6 +17056,7 @@ class Preference(proto.Enum): PREFERRED (418847841): Traffic will be sent to this backend first. """ + UNDEFINED_PREFERENCE = 0 DEFAULT = 115302945 PREFERENCE_UNSPECIFIED = 496219571 @@ -17215,6 +17246,7 @@ class CompressionMode(proto.Enum): responses cached by Cloud CDN will not be served to clients. """ + UNDEFINED_COMPRESSION_MODE = 0 AUTOMATIC = 165298699 DISABLED = 516696700 @@ -17235,6 +17267,7 @@ class LoadBalancingScheme(proto.Enum): Signifies that this will be used for internal Application Load Balancers. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 INTERNAL_MANAGED = 37350397 @@ -17519,6 +17552,7 @@ class CacheMode(proto.Enum): performance and increasing load on the origin server. """ + UNDEFINED_CACHE_MODE = 0 CACHE_ALL_STATIC = 355027945 FORCE_CACHE_ALL = 486026928 @@ -18485,6 +18519,7 @@ class CompressionMode(proto.Enum): responses cached by Cloud CDN will not be served to clients. """ + UNDEFINED_COMPRESSION_MODE = 0 AUTOMATIC = 165298699 DISABLED = 516696700 @@ -18518,6 +18553,7 @@ class ExternalManagedMigrationState(proto.Enum): TEST_BY_PERCENTAGE (513738389): No description available. """ + UNDEFINED_EXTERNAL_MANAGED_MIGRATION_STATE = 0 PREPARE = 399612135 TEST_ALL_TRAFFIC = 79728882 @@ -18585,6 +18621,7 @@ class IpAddressSelectionPolicy(proto.Enum): IPv6 address over its IPv4 address (provided there is a healthy IPv6 address). """ + UNDEFINED_IP_ADDRESS_SELECTION_POLICY = 0 IPV4_ONLY = 22373798 IPV6_ONLY = 79632100 @@ -18623,6 +18660,7 @@ class LoadBalancingScheme(proto.Enum): INVALID_LOAD_BALANCING_SCHEME (275352060): No description available. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -18754,6 +18792,7 @@ class LocalityLbPolicy(proto.Enum): to use for computing the weights are specified via the customMetrics fields. """ + UNDEFINED_LOCALITY_LB_POLICY = 0 INVALID_LB_POLICY = 323318707 LEAST_REQUEST = 46604921 @@ -18803,6 +18842,7 @@ class Protocol(proto.Enum): protocol, it can be used with any L3/L4 Forwarding Rules. """ + UNDEFINED_PROTOCOL = 0 GRPC = 2196510 H2C = 70809 @@ -18880,6 +18920,7 @@ class SessionAffinity(proto.Enum): same backend VM while that VM remains healthy, as long as the cookie has not expired. """ + UNDEFINED_SESSION_AFFINITY = 0 CLIENT_IP = 345665051 CLIENT_IP_NO_DESTINATION = 106122516 @@ -19448,6 +19489,7 @@ class CacheMode(proto.Enum): performance and increasing load on the origin server. """ + UNDEFINED_CACHE_MODE = 0 CACHE_ALL_STATIC = 355027945 FORCE_CACHE_ALL = 486026928 @@ -19697,6 +19739,7 @@ class ConnectionPersistenceOnUnhealthyBackends(proto.Enum): NEVER_PERSIST (138646241): No description available. """ + UNDEFINED_CONNECTION_PERSISTENCE_ON_UNHEALTHY_BACKENDS = 0 ALWAYS_PERSIST = 38400900 DEFAULT_FOR_PROTOCOL = 145265356 @@ -19731,6 +19774,7 @@ class TrackingMode(proto.Enum): PER_SESSION (182099252): No description available. """ + UNDEFINED_TRACKING_MODE = 0 INVALID_TRACKING_MODE = 49234371 PER_CONNECTION = 85162848 @@ -20100,6 +20144,7 @@ class FastIPMove(proto.Enum): GARP_RA (527352630): No description available. """ + UNDEFINED_FAST_I_P_MOVE = 0 DISABLED = 516696700 GARP_RA = 527352630 @@ -20608,6 +20653,7 @@ class Name(proto.Enum): to use for computing the weights are specified via the customMetrics fields. """ + UNDEFINED_NAME = 0 INVALID_LB_POLICY = 323318707 LEAST_REQUEST = 46604921 @@ -20688,6 +20734,7 @@ class OptionalMode(proto.Enum): INCLUDE_ALL_OPTIONAL (535606965): All optional fields. """ + UNDEFINED_OPTIONAL_MODE = 0 CUSTOM = 388595569 EXCLUDE_ALL_OPTIONAL = 168636099 @@ -20814,6 +20861,7 @@ class Spillover(proto.Enum): ZONAL_AFFINITY_STAY_WITHIN_ZONE (12177782): No description available. """ + UNDEFINED_SPILLOVER = 0 ZONAL_AFFINITY_DISABLED = 230207960 ZONAL_AFFINITY_SPILL_CROSS_ZONE = 251048410 @@ -20928,12 +20976,12 @@ class BackendServiceTlsSettings(proto.Message): number=114030, optional=True, ) - subject_alt_names: MutableSequence[ - "BackendServiceTlsSettingsSubjectAltName" - ] = proto.RepeatedField( - proto.MESSAGE, - number=330029535, - message="BackendServiceTlsSettingsSubjectAltName", + subject_alt_names: MutableSequence["BackendServiceTlsSettingsSubjectAltName"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=330029535, + message="BackendServiceTlsSettingsSubjectAltName", + ) ) @@ -21155,6 +21203,7 @@ class Diagnostic(proto.Enum): REVERSE_CONCATENATED_PATH_DOWN (479337129): No description available. """ + UNDEFINED_DIAGNOSTIC = 0 ADMINISTRATIVELY_DOWN = 121685798 CONCATENATED_PATH_DOWN = 26186892 @@ -21186,6 +21235,7 @@ class State(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATE = 0 ADMIN_DOWN = 128544690 DOWN = 2104482 @@ -21364,6 +21414,7 @@ class BfdSessionInitializationMode(proto.Enum): PASSIVE (462813959): No description available. """ + UNDEFINED_BFD_SESSION_INITIALIZATION_MODE = 0 ACTIVE = 314733318 DISABLED = 516696700 @@ -21401,6 +21452,7 @@ class LocalDiagnostic(proto.Enum): REVERSE_CONCATENATED_PATH_DOWN (479337129): No description available. """ + UNDEFINED_LOCAL_DIAGNOSTIC = 0 ADMINISTRATIVELY_DOWN = 121685798 CONCATENATED_PATH_DOWN = 26186892 @@ -21432,6 +21484,7 @@ class LocalState(proto.Enum): UP (2715): No description available. """ + UNDEFINED_LOCAL_STATE = 0 ADMIN_DOWN = 128544690 DOWN = 2104482 @@ -21588,6 +21641,7 @@ class Origin(proto.Enum): BGP_ORIGIN_INCOMPLETE (452839811): No description available. """ + UNDEFINED_ORIGIN = 0 BGP_ORIGIN_EGP = 378906473 BGP_ORIGIN_IGP = 378910317 @@ -21653,6 +21707,7 @@ class Type(proto.Enum): AS_PATH_TYPE_SET (302584650): No description available. """ + UNDEFINED_TYPE = 0 AS_PATH_TYPE_SEQUENCE = 362887609 AS_PATH_TYPE_SET = 302584650 @@ -22201,6 +22256,7 @@ class Status(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DONE = 2104194 @@ -22627,12 +22683,12 @@ class CalendarModeAdviceResponse(proto.Message): their obtainability and minimize cost. """ - recommendations: MutableSequence[ - "CalendarModeRecommendation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=324515802, - message="CalendarModeRecommendation", + recommendations: MutableSequence["CalendarModeRecommendation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=324515802, + message="CalendarModeRecommendation", + ) ) @@ -22677,13 +22733,13 @@ class CalendarModeRecommendation(proto.Message): correspond to keys specified in the request. """ - recommendations_per_spec: MutableMapping[ - str, "FutureResourcesRecommendation" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=61331554, - message="FutureResourcesRecommendation", + recommendations_per_spec: MutableMapping[str, "FutureResourcesRecommendation"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=61331554, + message="FutureResourcesRecommendation", + ) ) @@ -23302,6 +23358,7 @@ class Category(proto.Enum): MACHINE (469553191): No description available. """ + UNDEFINED_CATEGORY = 0 CATEGORY_UNSPECIFIED = 509189462 LICENSE = 347869217 @@ -23327,6 +23384,7 @@ class Plan(proto.Enum): TWELVE_MONTH (173083962): No description available. """ + UNDEFINED_PLAN = 0 INVALID = 530283991 THIRTY_SIX_MONTH = 266295942 @@ -23355,6 +23413,7 @@ class Status(proto.Enum): NOT_YET_ACTIVE (20607337): No description available. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 CANCELLED = 41957681 @@ -23472,6 +23531,7 @@ class Type(proto.Enum): ``optional Type type`` definition. This ensures that the public documentation displays the new enum Type. """ + UNDEFINED_TYPE = 0 ACCELERATOR_OPTIMIZED = 280848403 ACCELERATOR_OPTIMIZED_A3 = 158574526 @@ -23876,6 +23936,7 @@ class ConfidentialInstanceType(proto.Enum): TDX (82920): Intel Trust Domain eXtension. """ + UNDEFINED_CONFIDENTIAL_INSTANCE_TYPE = 0 CONFIDENTIAL_INSTANCE_TYPE_UNSPECIFIED = 115021829 SEV = 81988 @@ -30335,6 +30396,7 @@ class State(proto.Enum): OBSOLETE (66532761): No description available. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DELETED = 120962041 @@ -31213,6 +31275,7 @@ class AccessMode(proto.Enum): The default AccessMode, means the disk can be attached to single instance in RW mode. """ + UNDEFINED_ACCESS_MODE = 0 READ_ONLY_MANY = 63460265 READ_WRITE_MANY = 488743208 @@ -31233,6 +31296,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -31268,6 +31332,7 @@ class Status(proto.Enum): Disk is currently unavailable and cannot be accessed, attached or detached. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -31292,13 +31357,13 @@ class Status(proto.Enum): optional=True, message="DiskAsyncReplication", ) - async_secondary_disks: MutableMapping[ - str, "DiskAsyncReplicationList" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=322925608, - message="DiskAsyncReplicationList", + async_secondary_disks: MutableMapping[str, "DiskAsyncReplicationList"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=322925608, + message="DiskAsyncReplicationList", + ) ) creation_timestamp: str = proto.Field( proto.STRING, @@ -31818,6 +31883,7 @@ class InstantiateFrom(proto.Enum): boot disk, additional read-write disks. """ + UNDEFINED_INSTANTIATE_FROM = 0 ATTACH_READ_ONLY = 513775419 BLANK = 63281460 @@ -32053,6 +32119,7 @@ class State(proto.Enum): STOPPING (350791796): Replication is stopping. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 CREATED = 135924424 @@ -32623,6 +32690,7 @@ class TargetShape(proto.Enum): between any two zones. Recommended for highly available serving workloads. """ + UNDEFINED_TARGET_SHAPE = 0 ANY = 64972 ANY_SINGLE_ZONE = 61100880 @@ -33048,6 +33116,7 @@ class Type(proto.Enum): The peering route corresponding to subnetwork range. """ + UNDEFINED_TYPE = 0 DYNAMIC_PEERING_ROUTE = 469794858 STATIC_PEERING_ROUTE = 473407545 @@ -33451,6 +33520,7 @@ class RedundancyType(proto.Enum): addresses that are redundant with eatch other. """ + UNDEFINED_REDUNDANCY_TYPE = 0 FOUR_IPS_REDUNDANCY = 520087913 SINGLE_IP_INTERNALLY_REDUNDANT = 133914873 @@ -33684,6 +33754,7 @@ class FileType(proto.Enum): X509 (2674086): No description available. """ + UNDEFINED_FILE_TYPE = 0 BIN = 65767 UNDEFINED = 137851184 @@ -33905,6 +33976,7 @@ class Direction(proto.Enum): Indicates that firewall should apply to incoming traffic. """ + UNDEFINED_DIRECTION = 0 EGRESS = 432880501 INGRESS = 516931221 @@ -34118,6 +34190,7 @@ class Metadata(proto.Enum): INCLUDE_ALL_METADATA (164619908): No description available. """ + UNDEFINED_METADATA = 0 EXCLUDE_ALL_METADATA = 334519954 INCLUDE_ALL_METADATA = 164619908 @@ -34362,6 +34435,7 @@ class PolicyType(proto.Enum): VPC_POLICY (74319208): No description available. """ + UNDEFINED_POLICY_TYPE = 0 RDMA_ROCE_POLICY = 148757145 VPC_POLICY = 74319208 @@ -34703,6 +34777,7 @@ class Direction(proto.Enum): INGRESS (516931221): No description available. """ + UNDEFINED_DIRECTION = 0 EGRESS = 432880501 INGRESS = 516931221 @@ -34767,12 +34842,12 @@ class Direction(proto.Enum): proto.STRING, number=528230647, ) - target_secure_tags: MutableSequence[ - "FirewallPolicyRuleSecureTag" - ] = proto.RepeatedField( - proto.MESSAGE, - number=468132403, - message="FirewallPolicyRuleSecureTag", + target_secure_tags: MutableSequence["FirewallPolicyRuleSecureTag"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=468132403, + message="FirewallPolicyRuleSecureTag", + ) ) target_service_accounts: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -34930,6 +35005,7 @@ class DestNetworkContext(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_DEST_NETWORK_CONTEXT = 0 class DestNetworkType(proto.Enum): @@ -34950,6 +35026,7 @@ class DestNetworkType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_DEST_NETWORK_TYPE = 0 class SrcNetworkContext(proto.Enum): @@ -34972,6 +35049,7 @@ class SrcNetworkContext(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_SRC_NETWORK_CONTEXT = 0 class SrcNetworkType(proto.Enum): @@ -34994,6 +35072,7 @@ class SrcNetworkType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_SRC_NETWORK_TYPE = 0 dest_address_groups: MutableSequence[str] = proto.RepeatedField( @@ -35026,12 +35105,12 @@ class SrcNetworkType(proto.Enum): proto.STRING, number=119896492, ) - layer4_configs: MutableSequence[ - "FirewallPolicyRuleMatcherLayer4Config" - ] = proto.RepeatedField( - proto.MESSAGE, - number=373534261, - message="FirewallPolicyRuleMatcherLayer4Config", + layer4_configs: MutableSequence["FirewallPolicyRuleMatcherLayer4Config"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=373534261, + message="FirewallPolicyRuleMatcherLayer4Config", + ) ) src_address_groups: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -35063,12 +35142,12 @@ class SrcNetworkType(proto.Enum): proto.STRING, number=99086742, ) - src_secure_tags: MutableSequence[ - "FirewallPolicyRuleSecureTag" - ] = proto.RepeatedField( - proto.MESSAGE, - number=508791302, - message="FirewallPolicyRuleSecureTag", + src_secure_tags: MutableSequence["FirewallPolicyRuleSecureTag"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=508791302, + message="FirewallPolicyRuleSecureTag", + ) ) src_threat_intelligences: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -35147,6 +35226,7 @@ class State(proto.Enum): INEFFECTIVE (304458242): No description available. """ + UNDEFINED_STATE = 0 EFFECTIVE = 244201863 INEFFECTIVE = 304458242 @@ -35804,6 +35884,7 @@ class ExternalManagedBackendBucketMigrationState(proto.Enum): TEST_BY_PERCENTAGE (513738389): No description available. """ + UNDEFINED_EXTERNAL_MANAGED_BACKEND_BUCKET_MIGRATION_STATE = 0 PREPARE = 399612135 TEST_ALL_TRAFFIC = 79728882 @@ -35838,6 +35919,7 @@ class IPProtocolEnum(proto.Enum): UDP (83873): No description available. """ + UNDEFINED_I_P_PROTOCOL_ENUM = 0 AH = 2087 ESP = 68962 @@ -35862,6 +35944,7 @@ class IpVersion(proto.Enum): UNSPECIFIED_VERSION (21850000): No description available. """ + UNDEFINED_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -35890,6 +35973,7 @@ class LoadBalancingScheme(proto.Enum): INVALID (530283991): No description available. """ + UNDEFINED_LOAD_BALANCING_SCHEME = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -35927,6 +36011,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -35961,6 +36046,7 @@ class PscConnectionStatus(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_PSC_CONNECTION_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -36592,6 +36678,7 @@ class DeploymentType(proto.Enum): DEPLOYMENT_TYPE_UNSPECIFIED (234847180): No description available. """ + UNDEFINED_DEPLOYMENT_TYPE = 0 DENSE = 64932607 DEPLOYMENT_TYPE_UNSPECIFIED = 234847180 @@ -36611,6 +36698,7 @@ class PlanningStatus(proto.Enum): Future Reservation has been submitted for evaluation by GCP. """ + UNDEFINED_PLANNING_STATUS = 0 DRAFT = 65307009 PLANNING_STATUS_UNSPECIFIED = 252728940 @@ -36636,6 +36724,7 @@ class ReservationMode(proto.Enum): RESERVATION_MODE_UNSPECIFIED (233810606): No description available. """ + UNDEFINED_RESERVATION_MODE = 0 CALENDAR = 67431230 DEFAULT = 115302945 @@ -36658,6 +36747,7 @@ class SchedulingType(proto.Enum): reservation. Instead, each instance has its own maintenance window. """ + UNDEFINED_SCHEDULING_TYPE = 0 GROUPED = 474540862 GROUP_MAINTENANCE_TYPE_UNSPECIFIED = 447183678 @@ -36843,6 +36933,7 @@ class CommitmentPlan(proto.Enum): TWELVE_MONTH (173083962): No description available. """ + UNDEFINED_COMMITMENT_PLAN = 0 INVALID = 530283991 THIRTY_SIX_MONTH = 266295942 @@ -36866,6 +36957,7 @@ class PreviousCommitmentTerms(proto.Enum): No changes to associated parents Committed Used Discount(s) terms. """ + UNDEFINED_PREVIOUS_COMMITMENT_TERMS = 0 EXTEND = 448639770 PREVIOUSCOMMITMENTTERM_UNSPECIFIED = 98482448 @@ -37009,6 +37101,7 @@ class AmendmentStatus(proto.Enum): AMENDMENT_STATUS_UNSPECIFIED (412250332): No description available. """ + UNDEFINED_AMENDMENT_STATUS = 0 AMENDMENT_APPROVED = 150573001 AMENDMENT_DECLINED = 70395200 @@ -37064,6 +37157,7 @@ class ProcurementStatus(proto.Enum): being created to provide total_count reserved instance slots. This state will not persist past start_time + 24h. """ + UNDEFINED_PROCUREMENT_STATUS = 0 APPROVED = 357258935 CANCELLED = 41957681 @@ -37248,6 +37342,7 @@ class ProcurementStatus(proto.Enum): being created to provide total_count reserved instance slots. This state will not persist past start_time + 24h. """ + UNDEFINED_PROCUREMENT_STATUS = 0 APPROVED = 357258935 CANCELLED = 41957681 @@ -37663,6 +37758,7 @@ class RecommendationType(proto.Enum): RECOMMENDATION_TYPE_UNSPECIFIED (140641624): Default value, unused. """ + UNDEFINED_RECOMMENDATION_TYPE = 0 FUTURE_RESERVATION = 41036592 RECOMMENDATION_TYPE_UNSPECIFIED = 140641624 @@ -37753,6 +37849,7 @@ class Status(proto.Enum): However, another location was better and was recommended. """ + UNDEFINED_STATUS = 0 CONDITIONS_NOT_MET = 363628457 NOT_SUPPORTED = 317950466 @@ -37822,6 +37919,7 @@ class DeploymentType(proto.Enum): DEPLOYMENT_TYPE_UNSPECIFIED (234847180): No description available. """ + UNDEFINED_DEPLOYMENT_TYPE = 0 DENSE = 64932607 DEPLOYMENT_TYPE_UNSPECIFIED = 234847180 @@ -37902,6 +38000,7 @@ class VmFamily(proto.Enum): VM_FAMILY_CLOUD_TPU_POD_SLICE_TPU7X (485271888): No description available. """ + UNDEFINED_VM_FAMILY = 0 VM_FAMILY_CLOUD_TPU_DEVICE_CT3 = 42845948 VM_FAMILY_CLOUD_TPU_LITE_DEVICE_CT5L = 108020067 @@ -37928,6 +38027,7 @@ class WorkloadType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_WORKLOAD_TYPE = 0 BATCH = 62971674 SERVING = 17781740 @@ -37980,6 +38080,7 @@ class DiskInterface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_DISK_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -38009,13 +38110,13 @@ class FutureResourcesSpecLocationPolicy(proto.Message): ALLOWed. """ - locations: MutableMapping[ - str, "FutureResourcesSpecLocationPolicyLocation" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=413423454, - message="FutureResourcesSpecLocationPolicyLocation", + locations: MutableMapping[str, "FutureResourcesSpecLocationPolicyLocation"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=413423454, + message="FutureResourcesSpecLocationPolicyLocation", + ) ) @@ -38047,6 +38148,7 @@ class Preference(proto.Enum): PREFERENCE_UNSPECIFIED (496219571): Default value, unused. """ + UNDEFINED_PREFERENCE = 0 ALLOW = 62368553 DENY = 2094604 @@ -38090,12 +38192,12 @@ class FutureResourcesSpecSpecificSKUResources(proto.Message): number=77317349, optional=True, ) - local_ssd_partitions: MutableSequence[ - "FutureResourcesSpecLocalSsdPartition" - ] = proto.RepeatedField( - proto.MESSAGE, - number=470688568, - message="FutureResourcesSpecLocalSsdPartition", + local_ssd_partitions: MutableSequence["FutureResourcesSpecLocalSsdPartition"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=470688568, + message="FutureResourcesSpecLocalSsdPartition", + ) ) machine_type: str = proto.Field( proto.STRING, @@ -38236,6 +38338,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -38363,6 +38466,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -42168,6 +42272,7 @@ class View(proto.Enum): FULL (2169487): Includes detailed topology view. """ + UNDEFINED_VIEW = 0 BASIC = 62970894 BLOCK_VIEW_UNSPECIFIED = 275070479 @@ -42268,6 +42373,7 @@ class View(proto.Enum): The default / unset value. The API will default to the BASIC view. """ + UNDEFINED_VIEW = 0 SUB_BLOCK_VIEW_BASIC = 236009797 SUB_BLOCK_VIEW_FULL = 440711800 @@ -43043,6 +43149,7 @@ class Views(proto.Enum): WITH_UTILIZATION (504090633): Utilization data is included in the response. """ + UNDEFINED_VIEWS = 0 DEFAULT = 115302945 WITH_UTILIZATION = 504090633 @@ -43855,6 +43962,7 @@ class SchedulingType(proto.Enum): reservation. Instead, each instance has its own maintenance window. """ + UNDEFINED_SCHEDULING_TYPE = 0 GROUPED = 474540862 GROUP_MAINTENANCE_TYPE_UNSPECIFIED = 447183678 @@ -44115,6 +44223,7 @@ class Type(proto.Enum): WINDOWS (456863331): No description available. """ + UNDEFINED_TYPE = 0 BARE_METAL_LINUX_COMPATIBLE = 354232740 FEATURE_TYPE_UNSPECIFIED = 531767259 @@ -44265,6 +44374,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -44283,6 +44393,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -44450,6 +44561,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -44468,6 +44580,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -44635,6 +44748,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -44653,6 +44767,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -44872,6 +44987,7 @@ class Type(proto.Enum): TCP (82881): No description available. """ + UNDEFINED_TYPE = 0 GRPC = 2196510 GRPC_WITH_TLS = 268089571 @@ -45261,6 +45377,7 @@ class HealthStatusAggregationPolicy(proto.Enum): An EndpointHealth message is returned for each backend in the health check service. """ + UNDEFINED_HEALTH_STATUS_AGGREGATION_POLICY = 0 AND = 64951 NO_AGGREGATION = 426445124 @@ -45615,6 +45732,7 @@ class HealthState(proto.Enum): UNHEALTHY (462118084): No description available. """ + UNDEFINED_HEALTH_STATE = 0 HEALTHY = 439801213 UNHEALTHY = 462118084 @@ -45632,6 +45750,7 @@ class Ipv6HealthState(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_IPV6_HEALTH_STATE = 0 class WeightError(proto.Enum): @@ -45668,6 +45787,7 @@ class WeightError(proto.Enum): updated to ENABLE or DRY_RUN and there has not been sufficient time to parse and report the backend weight. """ + UNDEFINED_WEIGHT_ERROR = 0 INVALID_WEIGHT = 383698400 MISSING_WEIGHT = 384027537 @@ -45797,6 +45917,7 @@ class HealthState(proto.Enum): UNKNOWN (433141802): No description available. """ + UNDEFINED_HEALTH_STATE = 0 DRAINING = 480455402 HEALTHY = 439801213 @@ -45819,6 +45940,7 @@ class Ipv6HealthState(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_IPV6_HEALTH_STATE = 0 backend_service: "BackendServiceReference" = proto.Field( @@ -46510,6 +46632,7 @@ class RedirectResponseCode(proto.Enum): Http Status Code 307 - Temporary Redirect maintaining HTTP method. """ + UNDEFINED_REDIRECT_RESPONSE_CODE = 0 FOUND = 67084130 MOVED_PERMANENTLY_DEFAULT = 386698449 @@ -46797,12 +46920,12 @@ class HttpRouteAction(proto.Message): optional=True, message="UrlRewrite", ) - weighted_backend_services: MutableSequence[ - "WeightedBackendService" - ] = proto.RepeatedField( - proto.MESSAGE, - number=337028049, - message="WeightedBackendService", + weighted_backend_services: MutableSequence["WeightedBackendService"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=337028049, + message="WeightedBackendService", + ) ) @@ -47156,12 +47279,12 @@ class HttpRouteRuleMatch(proto.Message): number=257898968, optional=True, ) - query_parameter_matches: MutableSequence[ - "HttpQueryParameterMatch" - ] = proto.RepeatedField( - proto.MESSAGE, - number=286231270, - message="HttpQueryParameterMatch", + query_parameter_matches: MutableSequence["HttpQueryParameterMatch"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=286231270, + message="HttpQueryParameterMatch", + ) ) regex_match: str = proto.Field( proto.STRING, @@ -47467,6 +47590,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -47483,6 +47607,7 @@ class SourceType(proto.Enum): RAW (80904): No description available. """ + UNDEFINED_SOURCE_TYPE = 0 RAW = 80904 @@ -47505,6 +47630,7 @@ class Status(proto.Enum): READY (77848963): Image has been successfully created. """ + UNDEFINED_STATUS = 0 DELETING = 528602024 FAILED = 455706685 @@ -52888,6 +53014,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_KEY_REVOCATION_ACTION_TYPE = 0 KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 467110106 NONE = 2402104 @@ -52917,6 +53044,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): Each network interface inherits PrivateIpv6GoogleAccess from its subnetwork. """ + UNDEFINED_PRIVATE_IPV6_GOOGLE_ACCESS = 0 ENABLE_BIDIRECTIONAL_ACCESS_TO_GOOGLE = 427975994 ENABLE_OUTBOUND_VM_ACCESS_TO_GOOGLE = 288210263 @@ -52963,6 +53091,7 @@ class Status(proto.Enum): The instance has stopped (either by explicit action or underlying failure). """ + UNDEFINED_STATUS = 0 DEPROVISIONING = 428935662 PENDING = 35394935 @@ -53966,6 +54095,7 @@ class ListManagedInstancesResults(proto.Enum): listManagedInstances API method. maxResults and pageToken query parameters are respected. """ + UNDEFINED_LIST_MANAGED_INSTANCES_RESULTS = 0 PAGELESS = 32183464 PAGINATED = 40190637 @@ -53976,12 +54106,12 @@ class ListManagedInstancesResults(proto.Enum): optional=True, message="InstanceGroupManagerAllInstancesConfig", ) - auto_healing_policies: MutableSequence[ - "InstanceGroupManagerAutoHealingPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=456799109, - message="InstanceGroupManagerAutoHealingPolicy", + auto_healing_policies: MutableSequence["InstanceGroupManagerAutoHealingPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=456799109, + message="InstanceGroupManagerAutoHealingPolicy", + ) ) base_instance_name: str = proto.Field( proto.STRING, @@ -54591,6 +54721,7 @@ class DefaultActionOnFailure(proto.Enum): or an unhealthy VM by recreating it. For more information, see About repairing VMs in a MIG. """ + UNDEFINED_DEFAULT_ACTION_ON_FAILURE = 0 DO_NOTHING = 451307513 REPAIR = 266277773 @@ -54618,6 +54749,7 @@ class ForceUpdateOnRepair(proto.Enum): YES (87751): No description available. """ + UNDEFINED_FORCE_UPDATE_ON_REPAIR = 0 NO = 2497 YES = 87751 @@ -54815,6 +54947,7 @@ class State(proto.Enum): SUCCEEDED (511103553): The request succeeded. """ + UNDEFINED_STATE = 0 ACCEPTED = 246714279 CANCELLED = 41957681 @@ -55100,6 +55233,7 @@ class Mode(proto.Enum): the standby pool when the group scales out, and replenishes the standby pool afterwards. """ + UNDEFINED_MODE = 0 MANUAL = 119397318 SCALE_OUT_POOL = 635394 @@ -55447,6 +55581,7 @@ class InstanceRedistributionType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_INSTANCE_REDISTRIBUTION_TYPE = 0 class MinimalAction(proto.Enum): @@ -55478,6 +55613,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -55503,6 +55639,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 class ReplacementMethod(proto.Enum): @@ -55520,6 +55657,7 @@ class ReplacementMethod(proto.Enum): Default option: instances will be deleted and created (with a new name) """ + UNDEFINED_REPLACEMENT_METHOD = 0 RECREATE = 522644719 SUBSTITUTE = 280924314 @@ -55544,6 +55682,7 @@ class Type(proto.Enum): to existing VMs only when you selectively target specific or all VMs to be updated. """ + UNDEFINED_TYPE = 0 OPPORTUNISTIC = 429530089 @@ -55759,6 +55898,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -55789,6 +55929,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 all_instances: bool = proto.Field( @@ -56061,12 +56202,12 @@ class InstanceGroupManagersScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - instance_group_managers: MutableSequence[ - "InstanceGroupManager" - ] = proto.RepeatedField( - proto.MESSAGE, - number=214072592, - message="InstanceGroupManager", + instance_group_managers: MutableSequence["InstanceGroupManager"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=214072592, + message="InstanceGroupManager", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -56356,6 +56497,7 @@ class InstanceState(proto.Enum): Includes instances in the generated list only if they have a RUNNING state. """ + UNDEFINED_INSTANCE_STATE = 0 ALL = 64897 RUNNING = 121282975 @@ -56741,6 +56883,7 @@ class Action(proto.Enum): performed as post-instance creation (subject to future extensions). """ + UNDEFINED_ACTION = 0 ABANDONING = 388244813 CREATING = 455564985 @@ -57042,6 +57185,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_KEY_REVOCATION_ACTION_TYPE = 0 KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 467110106 NONE = 2402104 @@ -57072,6 +57216,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): Each network interface inherits PrivateIpv6GoogleAccess from its subnetwork. """ + UNDEFINED_PRIVATE_IPV6_GOOGLE_ACCESS = 0 ENABLE_BIDIRECTIONAL_ACCESS_TO_GOOGLE = 427975994 ENABLE_OUTBOUND_VM_ACCESS_TO_GOOGLE = 288210263 @@ -57719,6 +57864,7 @@ class Status(proto.Enum): The instance has stopped (either by explicit action or underlying failure). """ + UNDEFINED_STATUS = 0 DEPROVISIONING = 428935662 PENDING = 35394935 @@ -57773,13 +57919,13 @@ class InstancesBulkInsertOperationMetadata(proto.Message): name is key). Example key: zones/us-central1-a """ - per_location_status: MutableMapping[ - str, "BulkInsertOperationStatus" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=167851162, - message="BulkInsertOperationStatus", + per_location_status: MutableMapping[str, "BulkInsertOperationStatus"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=167851162, + message="BulkInsertOperationStatus", + ) ) @@ -57871,6 +58017,7 @@ class Type(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TYPE = 0 HIERARCHY = 69902869 NETWORK = 413984270 @@ -57964,6 +58111,7 @@ class DisruptionSchedule(proto.Enum): IMMEDIATE (152881041): Default value. Disrupt the VM immediately. """ + UNDEFINED_DISRUPTION_SCHEDULE = 0 DISRUPTION_SCHEDULE_UNSPECIFIED = 332543835 FUTURE = 474513859 @@ -57974,12 +58122,12 @@ class DisruptionSchedule(proto.Enum): number=95871619, optional=True, ) - fault_reasons: MutableSequence[ - "InstancesReportHostAsFaultyRequestFaultReason" - ] = proto.RepeatedField( - proto.MESSAGE, - number=168056210, - message="InstancesReportHostAsFaultyRequestFaultReason", + fault_reasons: MutableSequence["InstancesReportHostAsFaultyRequestFaultReason"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=168056210, + message="InstancesReportHostAsFaultyRequestFaultReason", + ) ) @@ -58015,6 +58163,7 @@ class Behavior(proto.Enum): UNRECOVERABLE_GPU_ERROR (363710747): No description available. """ + UNDEFINED_BEHAVIOR = 0 BEHAVIOR_UNSPECIFIED = 85734570 PERFORMANCE = 135701520 @@ -58430,6 +58579,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -58456,6 +58606,7 @@ class Status(proto.Enum): InstantSnapshot is currently unavailable and cannot be used for Disk restoration """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -59108,6 +59259,7 @@ class AvailableFeatures(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_AVAILABLE_FEATURES = 0 class InterconnectType(proto.Enum): @@ -59137,6 +59289,7 @@ class InterconnectType(proto.Enum): A partner-managed interconnection shared between customers via partner. """ + UNDEFINED_INTERCONNECT_TYPE = 0 DEDICATED = 258411983 IT_PRIVATE = 335677007 @@ -59165,6 +59318,7 @@ class LinkType(proto.Enum): LINK_TYPE_ETHERNET_400G_LR4 (127023690): 400G Ethernet, LR4 Optics. """ + UNDEFINED_LINK_TYPE = 0 LINK_TYPE_ETHERNET_100G_LR = 337672551 LINK_TYPE_ETHERNET_10G_LR = 236739749 @@ -59198,6 +59352,7 @@ class OperationalStatus(proto.Enum): attachments may be provisioned on this interconnect. """ + UNDEFINED_OPERATIONAL_STATUS = 0 OS_ACTIVE = 55721409 OS_UNPROVISIONED = 239771840 @@ -59212,6 +59367,7 @@ class RequestedFeatures(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_REQUESTED_FEATURES = 0 class State(proto.Enum): @@ -59241,6 +59397,7 @@ class State(proto.Enum): attachments may be provisioned on this interconnect. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 UNPROVISIONED = 517333979 @@ -59258,6 +59415,7 @@ class Subzone(proto.Enum): SUBZONE_B (291575439): Subzone B. """ + UNDEFINED_SUBZONE = 0 SUBZONE_A = 291575438 SUBZONE_B = 291575439 @@ -59304,12 +59462,12 @@ class Subzone(proto.Enum): number=422937596, optional=True, ) - expected_outages: MutableSequence[ - "InterconnectOutageNotification" - ] = proto.RepeatedField( - proto.MESSAGE, - number=264484123, - message="InterconnectOutageNotification", + expected_outages: MutableSequence["InterconnectOutageNotification"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=264484123, + message="InterconnectOutageNotification", + ) ) google_ip_address: str = proto.Field( proto.STRING, @@ -59546,6 +59704,7 @@ class TrafficClass(proto.Enum): Traffic Class 6, corresponding to DSCP ranges (48-63) 11xxxx. """ + UNDEFINED_TRAFFIC_CLASS = 0 TC1 = 82850 TC2 = 82851 @@ -60111,6 +60270,7 @@ class Bandwidth(proto.Enum): BPS_5G (355358572): 5 Gbit/s """ + UNDEFINED_BANDWIDTH = 0 BPS_100G = 49547952 BPS_100M = 49547958 @@ -60154,6 +60314,7 @@ class EdgeAvailabilityDomain(proto.Enum): AVAILABILITY_DOMAIN_ANY (375256373): No description available. """ + UNDEFINED_EDGE_AVAILABILITY_DOMAIN = 0 AVAILABILITY_DOMAIN_1 = 349552090 AVAILABILITY_DOMAIN_2 = 349552091 @@ -60196,6 +60357,7 @@ class Encryption(proto.Enum): receive traffic from such interconnect attachment. """ + UNDEFINED_ENCRYPTION = 0 IPSEC = 69882282 NONE = 2402104 @@ -60223,6 +60385,7 @@ class OperationalStatus(proto.Enum): Indicates that attachment is not ready to use yet, because turnup is not complete. """ + UNDEFINED_OPERATIONAL_STATUS = 0 OS_ACTIVE = 55721409 OS_UNPROVISIONED = 239771840 @@ -60246,6 +60409,7 @@ class StackType(proto.Enum): The interconnect attachment will only be assigned IPv4 addresses. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -60305,6 +60469,7 @@ class State(proto.Enum): Indicates that attachment is not ready to use yet, because turnup is not complete. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DEFUNCT = 115891759 @@ -60344,6 +60509,7 @@ class Type(proto.Enum): Attachment to a partner interconnect, created by the partner. """ + UNDEFINED_TYPE = 0 DEDICATED = 258411983 L2_DEDICATED = 336595510 @@ -60736,6 +60902,7 @@ class BgpMd5(proto.Enum): MD5_UNSUPPORTED: BGP MD5 authentication must not be configured """ + UNDEFINED_BGP_MD5 = 0 MD5_OPTIONAL = 532156673 MD5_REQUIRED = 218034496 @@ -60863,13 +61030,13 @@ class InterconnectAttachmentGroup(proto.Message): This field is a member of `oneof`_ ``_self_link``. """ - attachments: MutableMapping[ - str, "InterconnectAttachmentGroupAttachment" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=334744496, - message="InterconnectAttachmentGroupAttachment", + attachments: MutableMapping[str, "InterconnectAttachmentGroupAttachment"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=334744496, + message="InterconnectAttachmentGroupAttachment", + ) ) configured: "InterconnectAttachmentGroupConfigured" = proto.Field( proto.MESSAGE, @@ -61006,6 +61173,7 @@ class EffectiveSla(proto.Enum): PRODUCTION_NON_CRITICAL (117399223): No description available. """ + UNDEFINED_EFFECTIVE_SLA = 0 EFFECTIVE_SLA_UNSPECIFIED = 491000744 NO_SLA = 161460618 @@ -61097,6 +61265,7 @@ class BlockerType(proto.Enum): OTHER (75532016): No description available. """ + UNDEFINED_BLOCKER_TYPE = 0 BLOCKER_TYPE_UNSPECIFIED = 429793623 INCOMPATIBLE_METROS = 290410432 @@ -61171,6 +61340,7 @@ class AvailabilitySla(proto.Enum): PRODUCTION_NON_CRITICAL (117399223): No description available. """ + UNDEFINED_AVAILABILITY_SLA = 0 AVAILABILITY_SLA_UNSPECIFIED = 11186044 NO_SLA = 161460618 @@ -61194,12 +61364,12 @@ class InterconnectAttachmentGroupLogicalStructure(proto.Message): """ - regions: MutableSequence[ - "InterconnectAttachmentGroupLogicalStructureRegion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=12367871, - message="InterconnectAttachmentGroupLogicalStructureRegion", + regions: MutableSequence["InterconnectAttachmentGroupLogicalStructureRegion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12367871, + message="InterconnectAttachmentGroupLogicalStructureRegion", + ) ) @@ -61487,6 +61657,7 @@ class GroupStatus(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_GROUP_STATUS = 0 DEGRADED = 396890926 FULLY_DOWN = 255514647 @@ -61578,6 +61749,7 @@ class IsActive(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_IS_ACTIVE = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -61622,6 +61794,7 @@ class Status(proto.Enum): UNPROVISIONED (517333979): No description available. """ + UNDEFINED_STATUS = 0 ATTACHMENT_STATUS_UNKNOWN = 472477561 CONNECTION_DISABLED = 432687805 @@ -62051,12 +62224,12 @@ class InterconnectAttachmentsScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - interconnect_attachments: MutableSequence[ - "InterconnectAttachment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=425388415, - message="InterconnectAttachment", + interconnect_attachments: MutableSequence["InterconnectAttachment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=425388415, + message="InterconnectAttachment", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -62160,6 +62333,7 @@ class BundleAggregationType(proto.Enum): BUNDLE_AGGREGATION_TYPE_STATIC (50678873): LACP is disabled. """ + UNDEFINED_BUNDLE_AGGREGATION_TYPE = 0 BUNDLE_AGGREGATION_TYPE_LACP = 27758925 BUNDLE_AGGREGATION_TYPE_STATIC = 50678873 @@ -62185,16 +62359,17 @@ class BundleOperationalStatus(proto.Enum): the bundle (typically just one) have UP operational status. """ + UNDEFINED_BUNDLE_OPERATIONAL_STATUS = 0 BUNDLE_OPERATIONAL_STATUS_DOWN = 453842693 BUNDLE_OPERATIONAL_STATUS_UP = 161366462 - arp_caches: MutableSequence[ - "InterconnectDiagnosticsARPEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=414591761, - message="InterconnectDiagnosticsARPEntry", + arp_caches: MutableSequence["InterconnectDiagnosticsARPEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=414591761, + message="InterconnectDiagnosticsARPEntry", + ) ) bundle_aggregation_type: str = proto.Field( proto.STRING, @@ -62297,6 +62472,7 @@ class State(proto.Enum): this means the rest of the object should be empty. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DETACHED = 216562546 @@ -62392,6 +62568,7 @@ class State(proto.Enum): The value of the current optical power has not crossed a warning threshold. """ + UNDEFINED_STATE = 0 HIGH_ALARM = 305363284 HIGH_WARNING = 220984799 @@ -62474,16 +62651,17 @@ class OperationalStatus(proto.Enum): The interface has low level communication with the remote end. """ + UNDEFINED_OPERATIONAL_STATUS = 0 LINK_OPERATIONAL_STATUS_DOWN = 281653885 LINK_OPERATIONAL_STATUS_UP = 305879862 - arp_caches: MutableSequence[ - "InterconnectDiagnosticsARPEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=414591761, - message="InterconnectDiagnosticsARPEntry", + arp_caches: MutableSequence["InterconnectDiagnosticsARPEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=414591761, + message="InterconnectDiagnosticsARPEntry", + ) ) circuit_id: str = proto.Field( proto.STRING, @@ -62664,13 +62842,13 @@ class InterconnectGroup(proto.Message): optional=True, message="InterconnectGroupIntent", ) - interconnects: MutableMapping[ - str, "InterconnectGroupInterconnect" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=520187301, - message="InterconnectGroupInterconnect", + interconnects: MutableMapping[str, "InterconnectGroupInterconnect"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=520187301, + message="InterconnectGroupInterconnect", + ) ) kind: str = proto.Field( proto.STRING, @@ -62752,6 +62930,7 @@ class SupportedSla(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_SUPPORTED_SLA = 0 NO_SLA = 161460618 PRODUCTION_CRITICAL = 470416485 @@ -62839,6 +63018,7 @@ class BlockerType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_BLOCKER_TYPE = 0 INCOMPATIBLE_METROS = 290410432 NOT_AVAILABLE = 140722205 @@ -62911,6 +63091,7 @@ class TopologyCapability(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TOPOLOGY_CAPABILITY = 0 NO_SLA = 161460618 PRODUCTION_CRITICAL = 470416485 @@ -62954,12 +63135,12 @@ class InterconnectGroupPhysicalStructure(proto.Message): """ - metros: MutableSequence[ - "InterconnectGroupPhysicalStructureMetros" - ] = proto.RepeatedField( - proto.MESSAGE, - number=533067386, - message="InterconnectGroupPhysicalStructureMetros", + metros: MutableSequence["InterconnectGroupPhysicalStructureMetros"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=533067386, + message="InterconnectGroupPhysicalStructureMetros", + ) ) @@ -63092,6 +63273,7 @@ class IntentMismatchBehavior(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_INTENT_MISMATCH_BEHAVIOR = 0 CREATE = 385389820 REJECT = 266102687 @@ -63264,6 +63446,7 @@ class InterconnectType(proto.Enum): A partner-managed interconnection shared between customers via partner. """ + UNDEFINED_INTERCONNECT_TYPE = 0 DEDICATED = 258411983 IT_PRIVATE = 335677007 @@ -63293,6 +63476,7 @@ class LinkType(proto.Enum): LINK_TYPE_ETHERNET_400G_LR4 (127023690): 400G Ethernet, LR4 Optics. """ + UNDEFINED_LINK_TYPE = 0 LINK_TYPE_ETHERNET_100G_LR = 337672551 LINK_TYPE_ETHERNET_10G_LR = 236739749 @@ -63312,6 +63496,7 @@ class RequestedFeatures(proto.Enum): IF_MACSEC (396279300): Media Access Control security (MACsec) """ + UNDEFINED_REQUESTED_FEATURES = 0 IF_CROSS_SITE_NETWORK = 469111095 IF_L2_FORWARDING = 125563860 @@ -63557,6 +63742,7 @@ class GroupStatus(proto.Enum): GROUPS_STATUS_UNSPECIFIED (261932693): No description available. """ + UNDEFINED_GROUP_STATUS = 0 DEGRADED = 396890926 FULLY_DOWN = 255514647 @@ -63643,6 +63829,7 @@ class IsActive(proto.Enum): IS_ACTIVE_UNSPECIFIED (274948243): No description available. """ + UNDEFINED_IS_ACTIVE = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -63914,6 +64101,7 @@ class AvailableFeatures(proto.Enum): IF_MACSEC (396279300): Media Access Control security (MACsec) """ + UNDEFINED_AVAILABLE_FEATURES = 0 IF_CROSS_SITE_NETWORK = 469111095 IF_L2_FORWARDING = 125563860 @@ -63933,6 +64121,7 @@ class AvailableLinkTypes(proto.Enum): LINK_TYPE_ETHERNET_400G_LR4 (127023690): 400G Ethernet, LR4 Optics. """ + UNDEFINED_AVAILABLE_LINK_TYPES = 0 LINK_TYPE_ETHERNET_100G_LR = 337672551 LINK_TYPE_ETHERNET_10G_LR = 236739749 @@ -63975,6 +64164,7 @@ class Continent(proto.Enum): SOUTH_AMERICA (32597340): No description available. """ + UNDEFINED_CONTINENT = 0 AFRICA = 317443706 ASIA_PAC = 119782269 @@ -64009,6 +64199,7 @@ class Status(proto.Enum): The InterconnectLocation is closed for provisioning new Interconnects. """ + UNDEFINED_STATUS = 0 AVAILABLE = 442079913 CLOSED = 380163436 @@ -64088,23 +64279,23 @@ class Status(proto.Enum): number=536567094, optional=True, ) - region_infos: MutableSequence[ - "InterconnectLocationRegionInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=312194170, - message="InterconnectLocationRegionInfo", + region_infos: MutableSequence["InterconnectLocationRegionInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=312194170, + message="InterconnectLocationRegionInfo", + ) ) self_link: str = proto.Field( proto.STRING, number=456214797, optional=True, ) - single_region_production_critical_peer_locations: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=439537103, + single_region_production_critical_peer_locations: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=439537103, + ) ) status: str = proto.Field( proto.STRING, @@ -64278,6 +64469,7 @@ class LocationPresence(proto.Enum): [Deprecated] This region shares the same regional network presence as this InterconnectLocation. """ + UNDEFINED_LOCATION_PRESENCE = 0 GLOBAL = 494663587 LOCAL_REGION = 403535464 @@ -64342,12 +64534,12 @@ class InterconnectMacsec(proto.Message): number=532597451, optional=True, ) - pre_shared_keys: MutableSequence[ - "InterconnectMacsecPreSharedKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=420308466, - message="InterconnectMacsecPreSharedKey", + pre_shared_keys: MutableSequence["InterconnectMacsecPreSharedKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=420308466, + message="InterconnectMacsecPreSharedKey", + ) ) @@ -64367,12 +64559,12 @@ class InterconnectMacsecConfig(proto.Message): link. """ - pre_shared_keys: MutableSequence[ - "InterconnectMacsecConfigPreSharedKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=420308466, - message="InterconnectMacsecConfigPreSharedKey", + pre_shared_keys: MutableSequence["InterconnectMacsecConfigPreSharedKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=420308466, + message="InterconnectMacsecConfigPreSharedKey", + ) ) @@ -64583,6 +64775,7 @@ class IssueType(proto.Enum): window. The interconnect as a whole should remain up, albeit with reduced bandwidth. """ + UNDEFINED_ISSUE_TYPE = 0 IT_OUTAGE = 175779973 IT_PARTIAL_OUTAGE = 92103971 @@ -64609,6 +64802,7 @@ class Source(proto.Enum): NSRC_GOOGLE (510574562): [Deprecated] This notification was generated by Google. """ + UNDEFINED_SOURCE = 0 GOOGLE = 497439289 NSRC_GOOGLE = 510574562 @@ -64652,6 +64846,7 @@ class State(proto.Enum): [Deprecated] The outage associated with this notification was canceled before the outage was due to start. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 CANCELLED = 41957681 @@ -64906,6 +65101,7 @@ class Continent(proto.Enum): SOUTH_AMERICA (32597340): No description available. """ + UNDEFINED_CONTINENT = 0 AFRICA = 317443706 ASIA_PAC = 119782269 @@ -64931,6 +65127,7 @@ class Lacp(proto.Enum): bundleAggregationType as "static". GCP does not support LAGs without LACP, so requestedLinkCount must be 1. """ + UNDEFINED_LACP = 0 LACP_SUPPORTED = 339576113 LACP_UNSUPPORTED = 203930104 @@ -64959,6 +65156,7 @@ class Status(proto.Enum): The InterconnectRemoteLocation is closed for provisioning new Cross-Cloud Interconnects. """ + UNDEFINED_STATUS = 0 AVAILABLE = 442079913 CLOSED = 380163436 @@ -65151,6 +65349,7 @@ class PortPairRemoteLocation(proto.Enum): to provision a redundant pair of Cross-Cloud Interconnects using two different remote locations in the same city. """ + UNDEFINED_PORT_PAIR_REMOTE_LOCATION = 0 PORT_PAIR_MATCHING_REMOTE_LOCATION = 207291859 PORT_PAIR_UNCONSTRAINED_REMOTE_LOCATION = 60609829 @@ -65175,6 +65374,7 @@ class PortPairVlan(proto.Enum): PORT_PAIR_UNCONSTRAINED_VLAN (175227948): PORT_PAIR_UNCONSTRAINED_VLAN means there is no constraint. """ + UNDEFINED_PORT_PAIR_VLAN = 0 PORT_PAIR_MATCHING_VLAN = 250295358 PORT_PAIR_UNCONSTRAINED_VLAN = 175227948 @@ -65787,6 +65987,7 @@ class State(proto.Enum): TERMINATED (250018339): Reserved state. """ + UNDEFINED_STATE = 0 DISABLED = 516696700 ENABLED = 182130465 @@ -67368,6 +67569,7 @@ class AddressFamily(proto.Enum): UNSPECIFIED_IP_VERSION (72938440): No description available. """ + UNDEFINED_ADDRESS_FAMILY = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -67388,6 +67590,7 @@ class RouteType(proto.Enum): UNSPECIFIED_ROUTE_TYPE (248064440): No description available. """ + UNDEFINED_ROUTE_TYPE = 0 ADVERTISED = 20302109 LEARNED = 231892419 @@ -76086,6 +76289,7 @@ class Direction(proto.Enum): OUTGOING (307438444): For routes exported from local network. """ + UNDEFINED_DIRECTION = 0 INCOMING = 338552870 OUTGOING = 307438444 @@ -83795,6 +83999,7 @@ class Views(proto.Enum): WITH_UTILIZATION (504090633): Utilization data is included in the response. """ + UNDEFINED_VIEWS = 0 DEFAULT = 115302945 WITH_UTILIZATION = 504090633 @@ -86863,6 +87068,7 @@ class TargetShape(proto.Enum): impact of zonal failure. Recommended for highly available serving workloads. """ + UNDEFINED_TARGET_SHAPE = 0 ANY = 64972 ANY_SINGLE_ZONE = 61100880 @@ -86914,6 +87120,7 @@ class Preference(proto.Enum): PREFERENCE_UNSPECIFIED (496219571): Default value, unused. """ + UNDEFINED_PREFERENCE = 0 ALLOW = 62368553 DENY = 2094604 @@ -87124,6 +87331,7 @@ class Status(proto.Enum): UPLOADING (267603489): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -87203,12 +87411,12 @@ class Status(proto.Enum): number=456214797, optional=True, ) - source_disk_encryption_keys: MutableSequence[ - "SourceDiskEncryptionKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=370408498, - message="SourceDiskEncryptionKey", + source_disk_encryption_keys: MutableSequence["SourceDiskEncryptionKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=370408498, + message="SourceDiskEncryptionKey", + ) ) source_instance: str = proto.Field( proto.STRING, @@ -87416,6 +87624,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -87876,6 +88085,7 @@ class CurrentAction(proto.Enum): performed as post-instance creation (subject to future extensions). """ + UNDEFINED_CURRENT_ACTION = 0 ABANDONING = 388244813 CREATING = 455564985 @@ -87929,6 +88139,7 @@ class InstanceStatus(proto.Enum): The instance has stopped (either by explicit action or underlying failure). """ + UNDEFINED_INSTANCE_STATUS = 0 DEPROVISIONING = 428935662 PENDING = 35394935 @@ -87957,12 +88168,12 @@ class InstanceStatus(proto.Enum): number=18257045, optional=True, ) - instance_health: MutableSequence[ - "ManagedInstanceInstanceHealth" - ] = proto.RepeatedField( - proto.MESSAGE, - number=382667078, - message="ManagedInstanceInstanceHealth", + instance_health: MutableSequence["ManagedInstanceInstanceHealth"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=382667078, + message="ManagedInstanceInstanceHealth", + ) ) instance_status: str = proto.Field( proto.STRING, @@ -88056,6 +88267,7 @@ class DetailedHealthState(proto.Enum): instance but its health is not known at the moment. """ + UNDEFINED_DETAILED_HEALTH_STATE = 0 DRAINING = 480455402 HEALTHY = 439801213 @@ -88291,6 +88503,7 @@ class FilterMatchCriteria(proto.Enum): set. AmetadataFilter must never be created with this value. """ + UNDEFINED_FILTER_MATCH_CRITERIA = 0 MATCH_ALL = 180663271 MATCH_ANY = 180663346 @@ -88731,12 +88944,12 @@ class NatIpInfo(proto.Message): This field is a member of `oneof`_ ``_nat_name``. """ - nat_ip_info_mappings: MutableSequence[ - "NatIpInfoNatIpInfoMapping" - ] = proto.RepeatedField( - proto.MESSAGE, - number=241401884, - message="NatIpInfoNatIpInfoMapping", + nat_ip_info_mappings: MutableSequence["NatIpInfoNatIpInfoMapping"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=241401884, + message="NatIpInfoNatIpInfoMapping", + ) ) nat_name: str = proto.Field( proto.STRING, @@ -88783,6 +88996,7 @@ class Mode(proto.Enum): MANUAL (119397318): No description available. """ + UNDEFINED_MODE = 0 AUTO = 2020783 MANUAL = 119397318 @@ -88800,6 +89014,7 @@ class Usage(proto.Enum): UNUSED (360643030): No description available. """ + UNDEFINED_USAGE = 0 IN_USE = 17393485 UNUSED = 360643030 @@ -89004,6 +89219,7 @@ class NetworkFirewallPolicyEnforcementOrder(proto.Enum): BEFORE_CLASSIC_FIREWALL (338458349): No description available. """ + UNDEFINED_NETWORK_FIREWALL_POLICY_ENFORCEMENT_ORDER = 0 AFTER_CLASSIC_FIREWALL = 154582608 BEFORE_CLASSIC_FIREWALL = 338458349 @@ -89221,17 +89437,18 @@ class ConnectionPreference(proto.Enum): INVALID (530283991): No description available. """ + UNDEFINED_CONNECTION_PREFERENCE = 0 ACCEPT_AUTOMATIC = 75250580 ACCEPT_MANUAL = 373061341 INVALID = 530283991 - connection_endpoints: MutableSequence[ - "NetworkAttachmentConnectedEndpoint" - ] = proto.RepeatedField( - proto.MESSAGE, - number=326078813, - message="NetworkAttachmentConnectedEndpoint", + connection_endpoints: MutableSequence["NetworkAttachmentConnectedEndpoint"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=326078813, + message="NetworkAttachmentConnectedEndpoint", + ) ) connection_preference: str = proto.Field( proto.STRING, @@ -89446,6 +89663,7 @@ class Status(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -89783,13 +90001,13 @@ def raw_page(self): number=3355, optional=True, ) - items: MutableMapping[ - str, "NetworkEdgeSecurityServicesScopedList" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=100526016, - message="NetworkEdgeSecurityServicesScopedList", + items: MutableMapping[str, "NetworkEdgeSecurityServicesScopedList"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=100526016, + message="NetworkEdgeSecurityServicesScopedList", + ) ) kind: str = proto.Field( proto.STRING, @@ -89834,12 +90052,12 @@ class NetworkEdgeSecurityServicesScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - network_edge_security_services: MutableSequence[ - "NetworkEdgeSecurityService" - ] = proto.RepeatedField( - proto.MESSAGE, - number=35530156, - message="NetworkEdgeSecurityService", + network_edge_security_services: MutableSequence["NetworkEdgeSecurityService"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=35530156, + message="NetworkEdgeSecurityService", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -90127,6 +90345,7 @@ class NetworkEndpointType(proto.Enum): The network endpoint is handled by specified serverless infrastructure. """ + UNDEFINED_NETWORK_ENDPOINT_TYPE = 0 GCE_VM_IP = 401880793 GCE_VM_IP_PORT = 501838375 @@ -90657,6 +90876,7 @@ class PscConnectionStatus(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_PSC_CONNECTION_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -90752,6 +90972,7 @@ class HealthStatus(proto.Enum): Health status for network endpoints will not be provided. """ + UNDEFINED_HEALTH_STATUS = 0 SHOW = 2544381 SKIP = 2547071 @@ -90848,12 +91069,12 @@ class NetworkEndpointGroupsScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - network_endpoint_groups: MutableSequence[ - "NetworkEndpointGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29346733, - message="NetworkEndpointGroup", + network_endpoint_groups: MutableSequence["NetworkEndpointGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29346733, + message="NetworkEndpointGroup", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -91160,6 +91381,7 @@ class IgmpQuery(proto.Enum): The network interface has enabled IGMP query - v2. """ + UNDEFINED_IGMP_QUERY = 0 IGMP_QUERY_DISABLED = 28285169 IGMP_QUERY_V2 = 333493457 @@ -91184,6 +91406,7 @@ class Ipv6AccessType(proto.Enum): UNSPECIFIED_IPV6_ACCESS_TYPE (313080613): No description available. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -91210,6 +91433,7 @@ class NicType(proto.Enum): VIRTIO_NET (452123481): VIRTIO """ + UNDEFINED_NIC_TYPE = 0 GVNIC = 68209305 IDPF = 2242641 @@ -91242,6 +91466,7 @@ class StackType(proto.Enum): UNSPECIFIED_STACK_TYPE (298084569): No description available. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -91580,6 +91805,7 @@ class StackType(proto.Enum): This Peering will only allow IPv4 traffic and routes to be exchanged, even if the matching peering is IPV4_IPV6. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -91600,6 +91826,7 @@ class State(proto.Enum): peer, including the case when peer does not exist. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -91630,6 +91857,7 @@ class UpdateStrategy(proto.Enum): Peerings with update strategy UNSPECIFIED are created with update strategy INDEPENDENT. """ + UNDEFINED_UPDATE_STRATEGY = 0 CONSENSUS = 203373655 INDEPENDENT = 127011674 @@ -91765,6 +91993,7 @@ class UpdateStrategy(proto.Enum): Peerings with update strategy UNSPECIFIED are created with update strategy INDEPENDENT. """ + UNDEFINED_UPDATE_STRATEGY = 0 CONSENSUS = 203373655 INDEPENDENT = 127011674 @@ -91833,6 +92062,7 @@ class DeleteStatus(proto.Enum): The peer network admin has requested deletion of this peering connection. """ + UNDEFINED_DELETE_STATUS = 0 DELETE_ACKNOWLEDGED = 325293916 DELETE_STATUS_UNSPECIFIED = 395396446 @@ -91861,6 +92091,7 @@ class UpdateStatus(proto.Enum): UPDATE_STATUS_UNSPECIFIED (120836480): No description available. """ + UNDEFINED_UPDATE_STATUS = 0 IN_SYNC = 2273653 PENDING_LOCAL_ACKNOWLEDMENT = 229926592 @@ -91931,6 +92162,7 @@ class StackType(proto.Enum): This Peering will only allow IPv4 traffic and routes to be exchanged, even if the matching peering is IPV4_IPV6. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -91987,6 +92219,7 @@ class TotalEgressBandwidthTier(proto.Enum): TIER_1 (326919444): No description available. """ + UNDEFINED_TOTAL_EGRESS_BANDWIDTH_TIER = 0 DEFAULT = 115302945 TIER_1 = 326919444 @@ -92147,6 +92380,7 @@ class Scope(proto.Enum): ZONE (2759596): No description available. """ + UNDEFINED_SCOPE = 0 REGION = 266017524 ZONE = 2759596 @@ -92431,6 +92665,7 @@ class AddressPurposes(proto.Enum): VPC_PEERING (400800170): IP range for peer networks. """ + UNDEFINED_ADDRESS_PURPOSES = 0 DNS_RESOLVER = 476114556 GCE_ENDPOINT = 230515243 @@ -92453,6 +92688,7 @@ class AllowAddressCreation(proto.Enum): ADDRESS_CREATION_BLOCKED (534937975): No description available. """ + UNDEFINED_ALLOW_ADDRESS_CREATION = 0 ADDRESS_CREATION_ALLOWED = 181903667 ADDRESS_CREATION_BLOCKED = 534937975 @@ -92470,6 +92706,7 @@ class AllowAliasIpRanges(proto.Enum): ALIAS_IP_RANGES_BLOCKED (281030444): No description available. """ + UNDEFINED_ALLOW_ALIAS_IP_RANGES = 0 ALIAS_IP_RANGES_ALLOWED = 464867048 ALIAS_IP_RANGES_BLOCKED = 281030444 @@ -92486,6 +92723,7 @@ class AllowAutoModeSubnet(proto.Enum): AUTO_MODE_SUBNET_BLOCKED (207206006): No description available. """ + UNDEFINED_ALLOW_AUTO_MODE_SUBNET = 0 AUTO_MODE_SUBNET_ALLOWED = 391042610 AUTO_MODE_SUBNET_BLOCKED = 207206006 @@ -92503,6 +92741,7 @@ class AllowClassDFirewalls(proto.Enum): CLASS_D_FIREWALLS_BLOCKED (164382782): No description available. """ + UNDEFINED_ALLOW_CLASS_D_FIREWALLS = 0 CLASS_D_FIREWALLS_ALLOWED = 348219386 CLASS_D_FIREWALLS_BLOCKED = 164382782 @@ -92519,6 +92758,7 @@ class AllowCloudNat(proto.Enum): CLOUD_NAT_BLOCKED (62094692): No description available. """ + UNDEFINED_ALLOW_CLOUD_NAT = 0 CLOUD_NAT_ALLOWED = 245931296 CLOUD_NAT_BLOCKED = 62094692 @@ -92535,6 +92775,7 @@ class AllowCloudRouter(proto.Enum): CLOUD_ROUTER_BLOCKED (181551680): No description available. """ + UNDEFINED_ALLOW_CLOUD_ROUTER = 0 CLOUD_ROUTER_ALLOWED = 365388284 CLOUD_ROUTER_BLOCKED = 181551680 @@ -92551,6 +92792,7 @@ class AllowDefaultNicAttachment(proto.Enum): DEFAULT_NIC_ATTACHMENT_BLOCKED (364604997): No description available. """ + UNDEFINED_ALLOW_DEFAULT_NIC_ATTACHMENT = 0 DEFAULT_NIC_ATTACHMENT_ALLOWED = 11570689 DEFAULT_NIC_ATTACHMENT_BLOCKED = 364604997 @@ -92568,6 +92810,7 @@ class AllowExternalIpAccess(proto.Enum): EXTERNAL_IP_ACCESS_BLOCKED (462564501): No description available. """ + UNDEFINED_ALLOW_EXTERNAL_IP_ACCESS = 0 EXTERNAL_IP_ACCESS_ALLOWED = 109530193 EXTERNAL_IP_ACCESS_BLOCKED = 462564501 @@ -92585,6 +92828,7 @@ class AllowFirewallPolicy(proto.Enum): FIREWALL_POLICY_BLOCKED (204651742): No description available. """ + UNDEFINED_ALLOW_FIREWALL_POLICY = 0 FIREWALL_POLICY_ALLOWED = 388488346 FIREWALL_POLICY_BLOCKED = 204651742 @@ -92601,6 +92845,7 @@ class AllowInterconnect(proto.Enum): INTERCONNECT_BLOCKED (515879707): No description available. """ + UNDEFINED_ALLOW_INTERCONNECT = 0 INTERCONNECT_ALLOWED = 162845399 INTERCONNECT_BLOCKED = 515879707 @@ -92617,6 +92862,7 @@ class AllowIpForwarding(proto.Enum): IP_FORWARDING_BLOCKED (505629858): No description available. """ + UNDEFINED_ALLOW_IP_FORWARDING = 0 IP_FORWARDING_ALLOWED = 152595550 IP_FORWARDING_BLOCKED = 505629858 @@ -92633,6 +92879,7 @@ class AllowLoadBalancing(proto.Enum): LOAD_BALANCING_BLOCKED (381442285): No description available. """ + UNDEFINED_ALLOW_LOAD_BALANCING = 0 LOAD_BALANCING_ALLOWED = 28407977 LOAD_BALANCING_BLOCKED = 381442285 @@ -92649,6 +92896,7 @@ class AllowMultiNicInSameNetwork(proto.Enum): MULTI_NIC_IN_SAME_NETWORK_BLOCKED (273718815): No description available. """ + UNDEFINED_ALLOW_MULTI_NIC_IN_SAME_NETWORK = 0 MULTI_NIC_IN_SAME_NETWORK_ALLOWED = 457555419 MULTI_NIC_IN_SAME_NETWORK_BLOCKED = 273718815 @@ -92666,6 +92914,7 @@ class AllowMultiNicInSameSubnetwork(proto.Enum): MULTI_NIC_IN_SAME_SUBNETWORK_BLOCKED (104207991): No description available. """ + UNDEFINED_ALLOW_MULTI_NIC_IN_SAME_SUBNETWORK = 0 MULTI_NIC_IN_SAME_SUBNETWORK_ALLOWED = 288044595 MULTI_NIC_IN_SAME_SUBNETWORK_BLOCKED = 104207991 @@ -92682,6 +92931,7 @@ class AllowMulticast(proto.Enum): MULTICAST_BLOCKED (397727845): No description available. """ + UNDEFINED_ALLOW_MULTICAST = 0 MULTICAST_ALLOWED = 44693537 MULTICAST_BLOCKED = 397727845 @@ -92698,6 +92948,7 @@ class AllowNcc(proto.Enum): NCC_BLOCKED (283390907): No description available. """ + UNDEFINED_ALLOW_NCC = 0 NCC_ALLOWED = 467227511 NCC_BLOCKED = 283390907 @@ -92714,6 +92965,7 @@ class AllowNetworkMigration(proto.Enum): NETWORK_MIGRATION_BLOCKED (367424074): No description available. """ + UNDEFINED_ALLOW_NETWORK_MIGRATION = 0 NETWORK_MIGRATION_ALLOWED = 14389766 NETWORK_MIGRATION_BLOCKED = 367424074 @@ -92730,6 +92982,7 @@ class AllowPacketMirroring(proto.Enum): PACKET_MIRRORING_BLOCKED (445450553): No description available. """ + UNDEFINED_ALLOW_PACKET_MIRRORING = 0 PACKET_MIRRORING_ALLOWED = 92416245 PACKET_MIRRORING_BLOCKED = 445450553 @@ -92746,6 +92999,7 @@ class AllowPrivateGoogleAccess(proto.Enum): PRIVATE_GOOGLE_ACCESS_BLOCKED (36950747): No description available. """ + UNDEFINED_ALLOW_PRIVATE_GOOGLE_ACCESS = 0 PRIVATE_GOOGLE_ACCESS_ALLOWED = 220787351 PRIVATE_GOOGLE_ACCESS_BLOCKED = 36950747 @@ -92762,6 +93016,7 @@ class AllowPsc(proto.Enum): PSC_BLOCKED (524593965): No description available. """ + UNDEFINED_ALLOW_PSC = 0 PSC_ALLOWED = 171559657 PSC_BLOCKED = 524593965 @@ -92778,6 +93033,7 @@ class AllowSameNetworkUnicast(proto.Enum): SAME_NETWORK_UNICAST_BLOCKED (512767122): No description available. """ + UNDEFINED_ALLOW_SAME_NETWORK_UNICAST = 0 SAME_NETWORK_UNICAST_ALLOWED = 159732814 SAME_NETWORK_UNICAST_BLOCKED = 512767122 @@ -92794,6 +93050,7 @@ class AllowStaticRoutes(proto.Enum): STATIC_ROUTES_BLOCKED (225212360): No description available. """ + UNDEFINED_ALLOW_STATIC_ROUTES = 0 STATIC_ROUTES_ALLOWED = 409048964 STATIC_ROUTES_BLOCKED = 225212360 @@ -92810,6 +93067,7 @@ class AllowSubInterfaces(proto.Enum): SUBINTERFACES_BLOCKED (511720199): No description available. """ + UNDEFINED_ALLOW_SUB_INTERFACES = 0 SUBINTERFACES_ALLOWED = 158685891 SUBINTERFACES_BLOCKED = 511720199 @@ -92826,6 +93084,7 @@ class AllowSubnetworkCreation(proto.Enum): SUBNETWORK_CREATION_BLOCKED (511615133): No description available. """ + UNDEFINED_ALLOW_SUBNETWORK_CREATION = 0 SUBNETWORK_CREATION_ALLOWED = 158580825 SUBNETWORK_CREATION_BLOCKED = 511615133 @@ -92843,6 +93102,7 @@ class AllowVpcFirewallRules(proto.Enum): VPC_FIREWALL_RULES_BLOCKED (305749403): No description available. """ + UNDEFINED_ALLOW_VPC_FIREWALL_RULES = 0 VPC_FIREWALL_RULES_ALLOWED = 489586007 VPC_FIREWALL_RULES_BLOCKED = 305749403 @@ -92859,6 +93119,7 @@ class AllowVpcPeering(proto.Enum): VPC_PEERING_BLOCKED (77628471): No description available. """ + UNDEFINED_ALLOW_VPC_PEERING = 0 VPC_PEERING_ALLOWED = 261465075 VPC_PEERING_BLOCKED = 77628471 @@ -92875,6 +93136,7 @@ class AllowVpn(proto.Enum): VPN_BLOCKED (515198305): No description available. """ + UNDEFINED_ALLOW_VPN = 0 VPN_ALLOWED = 162163997 VPN_BLOCKED = 515198305 @@ -92891,6 +93153,7 @@ class FirewallPolicyTypes(proto.Enum): VPC_POLICY (74319208): No description available. """ + UNDEFINED_FIREWALL_POLICY_TYPES = 0 RDMA_ROCE_POLICY = 148757145 VPC_POLICY = 74319208 @@ -92915,6 +93178,7 @@ class InterfaceTypes(proto.Enum): VIRTIO_NET (452123481): VIRTIO """ + UNDEFINED_INTERFACE_TYPES = 0 GVNIC = 68209305 IDPF = 2242641 @@ -92935,6 +93199,7 @@ class Multicast(proto.Enum): MULTICAST_ULL (532211630): No description available. """ + UNDEFINED_MULTICAST = 0 MULTICAST_SDN = 532209462 MULTICAST_ULL = 532211630 @@ -92951,6 +93216,7 @@ class SubnetPurposes(proto.Enum): SUBNET_PURPOSE_PRIVATE (404371008): No description available. """ + UNDEFINED_SUBNET_PURPOSES = 0 SUBNET_PURPOSE_CUSTOM_HARDWARE = 283160275 SUBNET_PURPOSE_PRIVATE = 404371008 @@ -92969,6 +93235,7 @@ class SubnetStackTypes(proto.Enum): SUBNET_STACK_TYPE_IPV6_ONLY (98889336): No description available. """ + UNDEFINED_SUBNET_STACK_TYPES = 0 SUBNET_STACK_TYPE_IPV4_IPV6 = 41454485 SUBNET_STACK_TYPE_IPV4_ONLY = 41631034 @@ -93006,6 +93273,7 @@ class SubnetworkPurposes(proto.Enum): Subnetwork used for Regional Envoy-based Load Balancing. """ + UNDEFINED_SUBNETWORK_PURPOSES = 0 GLOBAL_MANAGED_PROXY = 236463602 INTERNAL_HTTPS_LOAD_BALANCER = 248748889 @@ -93032,6 +93300,7 @@ class SubnetworkStackTypes(proto.Enum): New VMs in this subnet will only be assigned IPv6 addresses. """ + UNDEFINED_SUBNETWORK_STACK_TYPES = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -93049,6 +93318,7 @@ class Unicast(proto.Enum): UNICAST_ULL (379956325): No description available. """ + UNDEFINED_UNICAST = 0 UNICAST_SDN = 379954157 UNICAST_ULL = 379956325 @@ -93311,6 +93581,7 @@ class NetworkType(proto.Enum): VPC (85193): VPC network. """ + UNDEFINED_NETWORK_TYPE = 0 RDMA = 2510662 ULL = 84117 @@ -93331,6 +93602,7 @@ class RdmaSubtype(proto.Enum): RDMA over Converged Ethernet (RoCE) for Bare Metal. """ + UNDEFINED_RDMA_SUBTYPE = 0 FALCON = 455787729 ROCE = 2520927 @@ -93348,6 +93620,7 @@ class UllSubtype(proto.Enum): PARTICIPANT (236028691): Exchange participant. """ + UNDEFINED_ULL_SUBTYPE = 0 OPERATOR = 282073252 PARTICIPANT = 236028691 @@ -93362,6 +93635,7 @@ class VpcSubtype(proto.Enum): REGIONAL (92288543): Regionally bound VPC network. """ + UNDEFINED_VPC_SUBTYPE = 0 REGIONAL = 92288543 @@ -93550,6 +93824,7 @@ class BgpBestPathSelectionMode(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_BGP_BEST_PATH_SELECTION_MODE = 0 LEGACY = 94234569 STANDARD = 484642493 @@ -93570,6 +93845,7 @@ class BgpInterRegionCost(proto.Enum): DEFAULT (115302945): No description available. """ + UNDEFINED_BGP_INTER_REGION_COST = 0 ADD_COST_TO_MED = 490583004 DEFAULT = 115302945 @@ -93585,6 +93861,7 @@ class EffectiveBgpInterRegionCost(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_EFFECTIVE_BGP_INTER_REGION_COST = 0 class RoutingMode(proto.Enum): @@ -93603,6 +93880,7 @@ class RoutingMode(proto.Enum): REGIONAL (92288543): No description available. """ + UNDEFINED_ROUTING_MODE = 0 GLOBAL = 494663587 REGIONAL = 92288543 @@ -93784,6 +94062,7 @@ class Type(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TYPE = 0 HIERARCHY = 69902869 NETWORK = 413984270 @@ -94021,6 +94300,7 @@ class MaintenanceInterval(proto.Enum): available. RECURRENT is used for GEN3 and Slice of Hardware VMs. """ + UNDEFINED_MAINTENANCE_INTERVAL = 0 AS_NEEDED = 500724834 RECURRENT = 194244550 @@ -94056,6 +94336,7 @@ class MaintenancePolicy(proto.Enum): TERMINATE, and they will only restart if automaticRestart = true. """ + UNDEFINED_MAINTENANCE_POLICY = 0 DEFAULT = 115302945 MAINTENANCE_POLICY_UNSPECIFIED = 72964182 @@ -94078,6 +94359,7 @@ class Status(proto.Enum): READY (77848963): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -94300,6 +94582,7 @@ class Mode(proto.Enum): Autoscaling will only scale out and will not remove nodes. """ + UNDEFINED_MODE = 0 MODE_UNSPECIFIED = 371348091 OFF = 78159 @@ -94511,6 +94794,7 @@ class CpuOvercommitType(proto.Enum): NONE (2402104): No description available. """ + UNDEFINED_CPU_OVERCOMMIT_TYPE = 0 CPU_OVERCOMMIT_TYPE_UNSPECIFIED = 520665615 ENABLED = 182130465 @@ -94534,6 +94818,7 @@ class Status(proto.Enum): REPAIRING (413483285): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -94562,12 +94847,12 @@ class Status(proto.Enum): number=95594102, message="LocalDisk", ) - instance_consumption_data: MutableSequence[ - "InstanceConsumptionData" - ] = proto.RepeatedField( - proto.MESSAGE, - number=84715576, - message="InstanceConsumptionData", + instance_consumption_data: MutableSequence["InstanceConsumptionData"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=84715576, + message="InstanceConsumptionData", + ) ) instances: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -94934,6 +95219,7 @@ class CpuOvercommitType(proto.Enum): NONE (2402104): No description available. """ + UNDEFINED_CPU_OVERCOMMIT_TYPE = 0 CPU_OVERCOMMIT_TYPE_UNSPECIFIED = 520665615 ENABLED = 182130465 @@ -94956,6 +95242,7 @@ class Status(proto.Enum): READY (77848963): The node template is ready. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -96041,6 +96328,7 @@ class Status(proto.Enum): RUNNING (121282975): No description available. """ + UNDEFINED_STATUS = 0 DONE = 2104194 PENDING = 35394935 @@ -96643,6 +96931,7 @@ class Duration(proto.Enum): MINUTE (126786068): No description available. """ + UNDEFINED_DURATION = 0 DURATION_UNSPECIFIED = 529071340 HOUR = 2223588 @@ -96668,6 +96957,7 @@ class Type(proto.Enum): TYPE_UNSPECIFIED (437714322): No description available. """ + UNDEFINED_TYPE = 0 LOOPBACK = 356174219 RECEIVE = 189660867 @@ -96832,6 +97122,7 @@ class Enable(proto.Enum): TRUE (2583950): No description available. """ + UNDEFINED_ENABLE = 0 FALSE = 66658563 TRUE = 2583950 @@ -97035,6 +97326,7 @@ class Direction(proto.Enum): INGRESS (516931221): Only ingress traffic is mirrored. """ + UNDEFINED_DIRECTION = 0 BOTH = 2044801 EGRESS = 432880501 @@ -97190,19 +97482,19 @@ class PacketMirroringMirroredResourceInfo(proto.Message): will be mirrored. """ - instances: MutableSequence[ - "PacketMirroringMirroredResourceInfoInstanceInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29097598, - message="PacketMirroringMirroredResourceInfoInstanceInfo", + instances: MutableSequence["PacketMirroringMirroredResourceInfoInstanceInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29097598, + message="PacketMirroringMirroredResourceInfoInstanceInfo", + ) ) - subnetworks: MutableSequence[ - "PacketMirroringMirroredResourceInfoSubnetInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=415853125, - message="PacketMirroringMirroredResourceInfoSubnetInfo", + subnetworks: MutableSequence["PacketMirroringMirroredResourceInfoSubnetInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=415853125, + message="PacketMirroringMirroredResourceInfoSubnetInfo", + ) ) tags: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -101457,6 +101749,7 @@ class Status(proto.Enum): The per-instance configuration has been deleted, but the deletion is not yet applied. """ + UNDEFINED_STATUS = 0 APPLYING = 352003508 DELETING = 528602024 @@ -102037,21 +102330,21 @@ class PreservedState(proto.Message): number=95594102, message="PreservedStatePreservedDisk", ) - external_i_ps: MutableMapping[ - str, "PreservedStatePreservedNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=532687245, - message="PreservedStatePreservedNetworkIp", + external_i_ps: MutableMapping[str, "PreservedStatePreservedNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=532687245, + message="PreservedStatePreservedNetworkIp", + ) ) - internal_i_ps: MutableMapping[ - str, "PreservedStatePreservedNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=215731675, - message="PreservedStatePreservedNetworkIp", + internal_i_ps: MutableMapping[str, "PreservedStatePreservedNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=215731675, + message="PreservedStatePreservedNetworkIp", + ) ) metadata: MutableMapping[str, str] = proto.MapField( proto.STRING, @@ -102106,6 +102399,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -102127,6 +102421,7 @@ class Mode(proto.Enum): VM instance at a time can be attached to a disk inREAD_WRITE mode. """ + UNDEFINED_MODE = 0 READ_ONLY = 91950261 READ_WRITE = 173607894 @@ -102188,6 +102483,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -102299,6 +102595,7 @@ class ActivationStatus(proto.Enum): ENABLED (182130465): No description available. """ + UNDEFINED_ACTIVATION_STATUS = 0 ACTIVATION_STATE_UNSPECIFIED = 632160 DISABLED = 516696700 @@ -102492,6 +102789,7 @@ class PredefinedRolloutPlan(proto.Enum): ROLLOUT_PLAN_UNSPECIFIED (144511983): No description available. """ + UNDEFINED_PREDEFINED_ROLLOUT_PLAN = 0 ROLLOUT_PLAN_FAST_ROLLOUT = 167808726 ROLLOUT_PLAN_TWO_DAY_ROLLOUT = 349866771 @@ -102581,6 +102879,7 @@ class Stage(proto.Enum): STAGE_UNSPECIFIED (63695670): No description available. """ + UNDEFINED_STAGE = 0 DEPRECATED = 463360435 GA = 2266 @@ -102751,6 +103050,7 @@ class CloudArmorTier(proto.Enum): CA_STANDARD (13156734): Standard protection. """ + UNDEFINED_CLOUD_ARMOR_TIER = 0 CA_ENTERPRISE_ANNUAL = 219921116 CA_ENTERPRISE_PAYGO = 453530323 @@ -102778,6 +103078,7 @@ class DefaultNetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_DEFAULT_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -102801,6 +103102,7 @@ class VmDnsSetting(proto.Enum): ZONAL_ONLY (521198951): No description available. """ + UNDEFINED_VM_DNS_SETTING = 0 GLOBAL_DEFAULT = 345419141 UNSPECIFIED_VM_DNS_SETTING = 35691930 @@ -102821,6 +103123,7 @@ class XpnProjectStatus(proto.Enum): UNSPECIFIED_XPN_PROJECT_STATUS (340393257): No description available. """ + UNDEFINED_XPN_PROJECT_STATUS = 0 HOST = 2223528 UNSPECIFIED_XPN_PROJECT_STATUS = 340393257 @@ -103041,6 +103344,7 @@ class CloudArmorTier(proto.Enum): CA_STANDARD (13156734): Standard protection. """ + UNDEFINED_CLOUD_ARMOR_TIER = 0 CA_ENTERPRISE_ANNUAL = 219921116 CA_ENTERPRISE_PAYGO = 453530323 @@ -103086,6 +103390,7 @@ class NetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -103247,6 +103552,7 @@ class ByoipApiVersion(proto.Enum): deletion takes minutes and the BGP status can be modified. """ + UNDEFINED_BYOIP_API_VERSION = 0 V1 = 2715 V2 = 2716 @@ -103269,6 +103575,7 @@ class Ipv6AccessType(proto.Enum): Cloud. All children Public Delegated Prefixes will have IPv6 access type as INTERNAL. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -103302,6 +103609,7 @@ class PdpScope(proto.Enum): The public delegated prefix is regional only. The provisioning will take a few minutes. """ + UNDEFINED_PDP_SCOPE = 0 GLOBAL = 494663587 GLOBAL_AND_REGIONAL = 318053059 @@ -103345,6 +103653,7 @@ class Status(proto.Enum): VALIDATED (66197998): Reverse DNS lookup is successful. """ + UNDEFINED_STATUS = 0 ANNOUNCED_TO_INTERNET = 177880897 INITIAL = 518841124 @@ -103732,6 +104041,7 @@ class ByoipApiVersion(proto.Enum): delete. Announce and Withdraw APIs can be used on this prefix to change the BGP status. """ + UNDEFINED_BYOIP_API_VERSION = 0 V1 = 2715 V2 = 2716 @@ -103756,6 +104066,7 @@ class Ipv6AccessType(proto.Enum): delegated prefixes will have IPv6 access type as INTERNAL. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -103791,6 +104102,7 @@ class Mode(proto.Enum): allocatablePrefixLength. Parent public delegated prefix must have IPv6 access type as INTERNAL. """ + UNDEFINED_MODE = 0 DELEGATION = 264149288 EXTERNAL_IPV6_FORWARDING_RULE_CREATION = 398684356 @@ -103837,6 +104149,7 @@ class Status(proto.Enum): The public delegated prefix is currently withdrawn but ready to be announced. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 ANNOUNCED = 365103355 @@ -104186,6 +104499,7 @@ class Ipv6AccessType(proto.Enum): delegated prefixes will have IPv6 access type as INTERNAL. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -104221,6 +104535,7 @@ class Mode(proto.Enum): allocatablePrefixLength. Parent public delegated prefix must have IPv6 access type as INTERNAL. """ + UNDEFINED_MODE = 0 DELEGATION = 264149288 EXTERNAL_IPV6_FORWARDING_RULE_CREATION = 398684356 @@ -104240,6 +104555,7 @@ class Status(proto.Enum): INACTIVE (270421099): No description available. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 INACTIVE = 270421099 @@ -104317,12 +104633,12 @@ class PublicDelegatedPrefixesScopedList(proto.Message): This field is a member of `oneof`_ ``_warning``. """ - public_delegated_prefixes: MutableSequence[ - "PublicDelegatedPrefix" - ] = proto.RepeatedField( - proto.MESSAGE, - number=315261206, - message="PublicDelegatedPrefix", + public_delegated_prefixes: MutableSequence["PublicDelegatedPrefix"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=315261206, + message="PublicDelegatedPrefix", + ) ) warning: "Warning" = proto.Field( proto.MESSAGE, @@ -104695,6 +105011,7 @@ class Metric(proto.Enum): XPN_SERVICE_PROJECTS (95191981): No description available. """ + UNDEFINED_METRIC = 0 A2_CPUS = 153206585 AFFINITY_GROUPS = 108303563 @@ -104934,6 +105251,7 @@ class RolloutStatus(proto.Enum): ROLLOUT_STATUS_UNSPECIFIED - Rollout status is not specified. The default value. """ + UNDEFINED_ROLLOUT_STATUS = 0 IN_PROGRESS = 469193735 ROLLOUT_STATUS_UNSPECIFIED = 26864568 @@ -105098,6 +105416,7 @@ class Code(proto.Enum): UNREACHABLE (13328052): A given scope cannot be reached. """ + UNDEFINED_CODE = 0 CLEANUP_FAILED = 150308440 DEPRECATED_RESOURCE_USED = 391835586 @@ -105203,6 +105522,7 @@ class ContainerType(proto.Enum): TAR (82821): No description available. """ + UNDEFINED_CONTAINER_TYPE = 0 TAR = 82821 @@ -105484,6 +105804,7 @@ class Status(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATUS = 0 DOWN = 2104482 UP = 2715 @@ -106139,6 +106460,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -106169,6 +106491,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 all_instances: bool = proto.Field( @@ -106627,6 +106950,7 @@ class InstanceState(proto.Enum): Instance is in RUNNING state if it is running. """ + UNDEFINED_INSTANCE_STATE = 0 ALL = 64897 RUNNING = 121282975 @@ -106870,6 +107194,7 @@ class Type(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_TYPE = 0 HIERARCHY = 69902869 NETWORK = 413984270 @@ -108510,6 +108835,7 @@ class DeploymentType(proto.Enum): DEPLOYMENT_TYPE_UNSPECIFIED (234847180): No description available. """ + UNDEFINED_DEPLOYMENT_TYPE = 0 DENSE = 64932607 DEPLOYMENT_TYPE_UNSPECIFIED = 234847180 @@ -108541,6 +108867,7 @@ class ProtectionTier(proto.Enum): expected to continue as normal using the redundancies. """ + UNDEFINED_PROTECTION_TIER = 0 CAPACITY_OPTIMIZED = 17430466 PROTECTION_TIER_UNSPECIFIED = 262261984 @@ -108563,6 +108890,7 @@ class SchedulingType(proto.Enum): reservation. Instead, each instance has its own maintenance window. """ + UNDEFINED_SCHEDULING_TYPE = 0 GROUPED = 474540862 GROUP_MAINTENANCE_TYPE_UNSPECIFIED = 447183678 @@ -108596,6 +108924,7 @@ class Status(proto.Enum): UPDATING (494614342): Reservation update is in progress. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -108771,6 +109100,7 @@ class ReservationOperationalMode(proto.Enum): RESERVATION_OPERATIONAL_MODE_UNSPECIFIED (194296603): No description available. """ + UNDEFINED_RESERVATION_OPERATIONAL_MODE = 0 ALL_CAPACITY = 500029880 HIGHLY_AVAILABLE_CAPACITY = 110861600 @@ -108835,6 +109165,7 @@ class ConsumeReservationType(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_CONSUME_RESERVATION_TYPE = 0 ANY_RESERVATION = 200008121 NO_RESERVATION = 169322030 @@ -109049,6 +109380,7 @@ class Status(proto.Enum): Reservation block has allocated all its resources. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -109177,6 +109509,7 @@ class HealthStatus(proto.Enum): The health status of the reservation block is unspecified. """ + UNDEFINED_HEALTH_STATUS = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -109229,12 +109562,12 @@ class ReservationBlockPhysicalTopology(proto.Message): number=335221242, optional=True, ) - instances: MutableSequence[ - "ReservationBlockPhysicalTopologyInstance" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29097598, - message="ReservationBlockPhysicalTopologyInstance", + instances: MutableSequence["ReservationBlockPhysicalTopologyInstance"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29097598, + message="ReservationBlockPhysicalTopologyInstance", + ) ) @@ -109583,6 +109916,7 @@ class Status(proto.Enum): Reservation subBlock has allocated all its resources. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -109719,6 +110053,7 @@ class HealthStatus(proto.Enum): The health status of the reservation subBlock is unspecified. """ + UNDEFINED_HEALTH_STATUS = 0 DEGRADED = 396890926 HEALTHY = 439801213 @@ -109920,6 +110255,7 @@ class DisruptionSchedule(proto.Enum): IMMEDIATE (152881041): All VMs will be disrupted immediately. """ + UNDEFINED_DISRUPTION_SCHEDULE = 0 DISRUPTION_SCHEDULE_UNSPECIFIED = 332543835 IMMEDIATE = 152881041 @@ -109938,6 +110274,7 @@ class FailureComponent(proto.Enum): NVLINK_SWITCH (239107153): The NVLink switch experienced the fault. """ + UNDEFINED_FAILURE_COMPONENT = 0 FAILURE_COMPONENT_UNSPECIFIED = 332003744 MULTIPLE_FAULTY_HOSTS = 423545298 @@ -110000,6 +110337,7 @@ class Behavior(proto.Enum): SWITCH_FAILURE (254909279): The subBlock experienced a switch failure. """ + UNDEFINED_BEHAVIOR = 0 FAULT_BEHAVIOR_UNSPECIFIED = 447660743 GPU_ERROR = 198817909 @@ -110058,6 +110396,7 @@ class MaintenanceScope(proto.Enum): any VMs running on them. This is not allowed for Standard ExR """ + UNDEFINED_MAINTENANCE_SCOPE = 0 ALL = 64897 MAINTENANCE_SCOPE_UNSPECIFIED = 78827328 @@ -110110,6 +110449,7 @@ class MaintenanceScope(proto.Enum): any VMs running on them. This is not allowed for Standard ExR """ + UNDEFINED_MAINTENANCE_SCOPE = 0 ALL = 64897 MAINTENANCE_SCOPE_UNSPECIFIED = 78827328 @@ -110632,6 +110972,7 @@ class Type(proto.Enum): VCPU (2628978): No description available. """ + UNDEFINED_TYPE = 0 ACCELERATOR = 429815371 LOCAL_SSD = 508934896 @@ -110809,6 +111150,7 @@ class Status(proto.Enum): READY (77848963): Resource policy is ready to be used. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -111081,6 +111423,7 @@ class Collocation(proto.Enum): UNSPECIFIED_COLLOCATION (464308205): No description available. """ + UNDEFINED_COLLOCATION = 0 COLLOCATED = 103257554 UNSPECIFIED_COLLOCATION = 464308205 @@ -111466,6 +111809,7 @@ class OnSourceDiskDelete(proto.Enum): UNSPECIFIED_ON_SOURCE_DISK_DELETE (239140769): No description available. """ + UNDEFINED_ON_SOURCE_DISK_DELETE = 0 APPLY_RETENTION_POLICY = 535071332 KEEP_AUTO_SNAPSHOTS = 258925689 @@ -111578,12 +111922,12 @@ class ResourcePolicyWeeklyCycle(proto.Message): of the week. """ - day_of_weeks: MutableSequence[ - "ResourcePolicyWeeklyCycleDayOfWeek" - ] = proto.RepeatedField( - proto.MESSAGE, - number=257871834, - message="ResourcePolicyWeeklyCycleDayOfWeek", + day_of_weeks: MutableSequence["ResourcePolicyWeeklyCycleDayOfWeek"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=257871834, + message="ResourcePolicyWeeklyCycleDayOfWeek", + ) ) @@ -111643,6 +111987,7 @@ class Day(proto.Enum): WEDNESDAY (422029110): No description available. """ + UNDEFINED_DAY = 0 FRIDAY = 471398751 INVALID = 530283991 @@ -111709,6 +112054,7 @@ class MaxTopologyDistance(proto.Enum): SUBBLOCK (316202573): VMs must be provisioned in the same subblock. """ + UNDEFINED_MAX_TOPOLOGY_DISTANCE = 0 BLOCK = 63294573 CLUSTER = 516333018 @@ -111728,6 +112074,7 @@ class Type(proto.Enum): MIG provisions instances as close to each other as possible for high throughput. """ + UNDEFINED_TYPE = 0 HIGH_AVAILABILITY = 409487576 HIGH_THROUGHPUT = 146499815 @@ -112443,6 +112790,7 @@ class NextHopOrigin(proto.Enum): INCOMPLETE (11941214): No description available. """ + UNDEFINED_NEXT_HOP_ORIGIN = 0 EGP = 68590 IGP = 72434 @@ -112471,6 +112819,7 @@ class RouteStatus(proto.Enum): This route is being processed internally. The status will change once processed. """ + UNDEFINED_ROUTE_STATUS = 0 ACTIVE = 314733318 DROPPED = 496235424 @@ -112500,6 +112849,7 @@ class RouteType(proto.Enum): TRANSIT (187793843): No description available. """ + UNDEFINED_ROUTE_TYPE = 0 BGP = 65707 STATIC = 308331118 @@ -112696,6 +113046,7 @@ class PathSegmentType(proto.Enum): AS_SET (329846453): No description available. """ + UNDEFINED_PATH_SEGMENT_TYPE = 0 AS_CONFED_SEQUENCE = 222152624 AS_CONFED_SET = 374040307 @@ -112870,6 +113221,7 @@ class Type(proto.Enum): ROUTE_POLICY_TYPE_IMPORT (397444755): The Route Policy is an Import Policy. """ + UNDEFINED_TYPE = 0 ROUTE_POLICY_TYPE_EXPORT = 293086882 ROUTE_POLICY_TYPE_IMPORT = 397444755 @@ -113081,12 +113433,12 @@ class Router(proto.Message): number=3292052, optional=True, ) - md5_authentication_keys: MutableSequence[ - "RouterMd5AuthenticationKey" - ] = proto.RepeatedField( - proto.MESSAGE, - number=71063322, - message="RouterMd5AuthenticationKey", + md5_authentication_keys: MutableSequence["RouterMd5AuthenticationKey"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=71063322, + message="RouterMd5AuthenticationKey", + ) ) name: str = proto.Field( proto.STRING, @@ -113312,6 +113664,7 @@ class AdvertiseMode(proto.Enum): DEFAULT (115302945): No description available. """ + UNDEFINED_ADVERTISE_MODE = 0 CUSTOM = 388595569 DEFAULT = 115302945 @@ -113327,6 +113680,7 @@ class AdvertisedGroups(proto.Enum): Advertise all available subnets (including peer VPC subnets). """ + UNDEFINED_ADVERTISED_GROUPS = 0 ALL_SUBNETS = 3622872 @@ -113339,12 +113693,12 @@ class AdvertisedGroups(proto.Enum): proto.STRING, number=21065526, ) - advertised_ip_ranges: MutableSequence[ - "RouterAdvertisedIpRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=35449932, - message="RouterAdvertisedIpRange", + advertised_ip_ranges: MutableSequence["RouterAdvertisedIpRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=35449932, + message="RouterAdvertisedIpRange", + ) ) asn: int = proto.Field( proto.UINT32, @@ -113553,6 +113907,7 @@ class AdvertiseMode(proto.Enum): DEFAULT (115302945): No description available. """ + UNDEFINED_ADVERTISE_MODE = 0 CUSTOM = 388595569 DEFAULT = 115302945 @@ -113568,6 +113923,7 @@ class AdvertisedGroups(proto.Enum): Advertise all available subnets (including peer VPC subnets). """ + UNDEFINED_ADVERTISED_GROUPS = 0 ALL_SUBNETS = 3622872 @@ -113588,6 +113944,7 @@ class Enable(proto.Enum): TRUE (2583950): No description available. """ + UNDEFINED_ENABLE = 0 FALSE = 66658563 TRUE = 2583950 @@ -113625,6 +113982,7 @@ class ManagementType(proto.Enum): Default value, the BGP peer is manually created and managed by user. """ + UNDEFINED_MANAGEMENT_TYPE = 0 MANAGED_BY_ATTACHMENT = 458926411 MANAGED_BY_USER = 317294067 @@ -113638,12 +113996,12 @@ class ManagementType(proto.Enum): proto.STRING, number=21065526, ) - advertised_ip_ranges: MutableSequence[ - "RouterAdvertisedIpRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=35449932, - message="RouterAdvertisedIpRange", + advertised_ip_ranges: MutableSequence["RouterAdvertisedIpRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=35449932, + message="RouterAdvertisedIpRange", + ) ) advertised_route_priority: int = proto.Field( proto.UINT32, @@ -113656,12 +114014,12 @@ class ManagementType(proto.Enum): optional=True, message="RouterBgpPeerBfd", ) - custom_learned_ip_ranges: MutableSequence[ - "RouterBgpPeerCustomLearnedIpRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=481363012, - message="RouterBgpPeerCustomLearnedIpRange", + custom_learned_ip_ranges: MutableSequence["RouterBgpPeerCustomLearnedIpRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=481363012, + message="RouterBgpPeerCustomLearnedIpRange", + ) ) custom_learned_route_priority: int = proto.Field( proto.INT32, @@ -113834,6 +114192,7 @@ class SessionInitializationMode(proto.Enum): PASSIVE (462813959): No description available. """ + UNDEFINED_SESSION_INITIALIZATION_MODE = 0 ACTIVE = 314733318 DISABLED = 516696700 @@ -114008,6 +114367,7 @@ class IpVersion(proto.Enum): IPV6 (2254343): No description available. """ + UNDEFINED_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -114043,6 +114403,7 @@ class ManagementType(proto.Enum): Default value, the interface is manually created and managed by user. """ + UNDEFINED_MANAGEMENT_TYPE = 0 MANAGED_BY_ATTACHMENT = 458926411 MANAGED_BY_USER = 317294067 @@ -114430,6 +114791,7 @@ class AutoNetworkTier(proto.Enum): (Output only) Temporary tier for FIXED_STANDARD when fixed standard tier is expired or not configured. """ + UNDEFINED_AUTO_NETWORK_TIER = 0 FIXED_STANDARD = 310464328 PREMIUM = 399530551 @@ -114454,6 +114816,7 @@ class EndpointTypes(proto.Enum): ENDPOINT_TYPE_VM (57095474): This is the default. """ + UNDEFINED_ENDPOINT_TYPES = 0 ENDPOINT_TYPE_MANAGED_PROXY_LB = 439196930 ENDPOINT_TYPE_SWG = 159344456 @@ -114484,6 +114847,7 @@ class NatIpAllocateOption(proto.Enum): specified Nat IPs are not enough then the Nat service fails for new VMs. """ + UNDEFINED_NAT_IP_ALLOCATE_OPTION = 0 AUTO_ONLY = 182333500 MANUAL_ONLY = 261251205 @@ -114519,6 +114883,7 @@ class SourceSubnetworkIpRangesToNat(proto.Enum): A list of Subnetworks are allowed to Nat (specified in the field subnetwork below) """ + UNDEFINED_SOURCE_SUBNETWORK_IP_RANGES_TO_NAT = 0 ALL_SUBNETWORKS_ALL_IP_RANGES = 179964376 ALL_SUBNETWORKS_ALL_PRIMARY_IP_RANGES = 185573819 @@ -114555,6 +114920,7 @@ class SourceSubnetworkIpRangesToNat64(proto.Enum): If this option is used, the nat64_subnetworks field must be specified. """ + UNDEFINED_SOURCE_SUBNETWORK_IP_RANGES_TO_NAT64 = 0 ALL_IPV6_SUBNETWORKS = 341632747 LIST_OF_IPV6_SUBNETWORKS = 521079860 @@ -114573,6 +114939,7 @@ class Type(proto.Enum): NAT used for public IP translation. This is the default. """ + UNDEFINED_TYPE = 0 PRIVATE = 403485027 PUBLIC = 223389289 @@ -114626,12 +114993,12 @@ class Type(proto.Enum): number=3373707, optional=True, ) - nat64_subnetworks: MutableSequence[ - "RouterNatSubnetworkToNat64" - ] = proto.RepeatedField( - proto.MESSAGE, - number=63585701, - message="RouterNatSubnetworkToNat64", + nat64_subnetworks: MutableSequence["RouterNatSubnetworkToNat64"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=63585701, + message="RouterNatSubnetworkToNat64", + ) ) nat_ip_allocate_option: str = proto.Field( proto.STRING, @@ -114744,6 +115111,7 @@ class Filter(proto.Enum): TRANSLATIONS_ONLY (357212649): Export logs for successful connections only. """ + UNDEFINED_FILTER = 0 ALL = 64897 ERRORS_ONLY = 307484672 @@ -114915,6 +115283,7 @@ class SourceIpRangesToNat(proto.Enum): PRIMARY_IP_RANGE (297109954): The primary range is allowed to Nat. """ + UNDEFINED_SOURCE_IP_RANGES_TO_NAT = 0 ALL_IP_RANGES = 35608496 LIST_OF_SECONDARY_IP_RANGES = 192289308 @@ -115179,6 +115548,7 @@ class Status(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATUS = 0 DOWN = 2104482 UNKNOWN = 433141802 @@ -115205,6 +115575,7 @@ class StatusReason(proto.Enum): STATUS_REASON_UNSPECIFIED (394331913): No description available. """ + UNDEFINED_STATUS_REASON = 0 IPV4_PEER_ON_IPV6_ONLY_CONNECTION = 435936662 IPV6_PEER_ON_IPV4_ONLY_CONNECTION = 436304082 @@ -115384,12 +115755,12 @@ class RouterStatusNatStatus(proto.Message): number=512367468, optional=True, ) - rule_status: MutableSequence[ - "RouterStatusNatStatusNatRuleStatus" - ] = proto.RepeatedField( - proto.MESSAGE, - number=140223125, - message="RouterStatusNatStatusNatRuleStatus", + rule_status: MutableSequence["RouterStatusNatStatusNatRuleStatus"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=140223125, + message="RouterStatusNatStatusNatRuleStatus", + ) ) user_allocated_nat_ip_resources: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -115845,6 +116216,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -115863,6 +116235,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -116013,6 +116386,7 @@ class Interface(proto.Enum): SCSI (2539686): No description available. """ + UNDEFINED_INTERFACE = 0 NVME = 2408800 SCSI = 2539686 @@ -116034,6 +116408,7 @@ class Mode(proto.Enum): virtual machine at a time can be attached to a disk in read-write mode. """ + UNDEFINED_MODE = 0 READ_ONLY = 91950261 READ_WRITE = 173607894 @@ -116054,6 +116429,7 @@ class StorageBytesStatus(proto.Enum): UP_TO_DATE (101306702): No description available. """ + UNDEFINED_STORAGE_BYTES_STATUS = 0 UPDATING = 494614342 UP_TO_DATE = 101306702 @@ -116071,6 +116447,7 @@ class Type(proto.Enum): SCRATCH (496778970): No description available. """ + UNDEFINED_TYPE = 0 PERSISTENT = 460683927 SCRATCH = 496778970 @@ -116211,6 +116588,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -116232,6 +116610,7 @@ class StorageBytesStatus(proto.Enum): UP_TO_DATE (101306702): No description available. """ + UNDEFINED_STORAGE_BYTES_STATUS = 0 UPDATING = 494614342 UP_TO_DATE = 101306702 @@ -116310,6 +116689,7 @@ class State(proto.Enum): The current autoscaling recommendation is not influenced by this scaling schedule. """ + UNDEFINED_STATE = 0 ACTIVE = 314733318 DISABLED = 516696700 @@ -116466,6 +116846,7 @@ class InstanceTerminationAction(proto.Enum): Stop the VM without storing in-memory content. default action. """ + UNDEFINED_INSTANCE_TERMINATION_ACTION = 0 DELETE = 402225579 INSTANCE_TERMINATION_ACTION_UNSPECIFIED = 92954803 @@ -116496,6 +116877,7 @@ class OnHostMaintenance(proto.Enum): restarted outside the window of maintenance events. """ + UNDEFINED_ON_HOST_MAINTENANCE = 0 MIGRATE = 165699979 TERMINATE = 527617601 @@ -116519,6 +116901,7 @@ class ProvisioningModel(proto.Enum): Standard provisioning with user controlled runtime, no discounts. """ + UNDEFINED_PROVISIONING_MODEL = 0 FLEX_START = 101746812 RESERVATION_BOUND = 293538571 @@ -116646,6 +117029,7 @@ class Operator(proto.Enum): OPERATOR_UNSPECIFIED (128892924): No description available. """ + UNDEFINED_OPERATOR = 0 IN = 2341 NOT_IN = 161144369 @@ -117091,6 +117475,7 @@ class Type(proto.Enum): CLOUD_ARMOR_NETWORK (488527428): No description available. """ + UNDEFINED_TYPE = 0 CLOUD_ARMOR = 260640373 CLOUD_ARMOR_EDGE = 250728775 @@ -117195,12 +117580,12 @@ class Type(proto.Enum): number=3575610, optional=True, ) - user_defined_fields: MutableSequence[ - "SecurityPolicyUserDefinedField" - ] = proto.RepeatedField( - proto.MESSAGE, - number=28312739, - message="SecurityPolicyUserDefinedField", + user_defined_fields: MutableSequence["SecurityPolicyUserDefinedField"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=28312739, + message="SecurityPolicyUserDefinedField", + ) ) @@ -117268,6 +117653,7 @@ class RuleVisibility(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_RULE_VISIBILITY = 0 PREMIUM = 399530551 STANDARD = 484642493 @@ -117424,6 +117810,7 @@ class Type(proto.Enum): UNSPECIFIED_TYPE (53933922): No description available. """ + UNDEFINED_TYPE = 0 HTTP_HEADER_HOST = 374321891 HTTP_PATH = 311503228 @@ -117494,6 +117881,7 @@ class JsonParsing(proto.Enum): STANDARD_WITH_GRAPHQL (106979218): No description available. """ + UNDEFINED_JSON_PARSING = 0 DISABLED = 516696700 STANDARD = 484642493 @@ -117511,6 +117899,7 @@ class LogLevel(proto.Enum): VERBOSE (532219234): No description available. """ + UNDEFINED_LOG_LEVEL = 0 NORMAL = 161067239 VERBOSE = 532219234 @@ -117668,6 +118057,7 @@ class DdosProtection(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_DDOS_PROTECTION = 0 ADVANCED = 63789090 ADVANCED_PREVIEW = 40905867 @@ -118098,6 +118488,7 @@ class VersionedExpr(proto.Enum): Matches the source IP address of a request to the IP ranges supplied in config. """ + UNDEFINED_VERSIONED_EXPR = 0 SRC_IPS_V1 = 70925961 @@ -118306,12 +118697,12 @@ class SecurityPolicyRulePreconfiguredWafConfig(proto.Message): preconfigured WAF evaluation. """ - exclusions: MutableSequence[ - "SecurityPolicyRulePreconfiguredWafConfigExclusion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=208665701, - message="SecurityPolicyRulePreconfiguredWafConfigExclusion", + exclusions: MutableSequence["SecurityPolicyRulePreconfiguredWafConfigExclusion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=208665701, + message="SecurityPolicyRulePreconfiguredWafConfigExclusion", + ) ) @@ -118433,6 +118824,7 @@ class Op(proto.Enum): The operator matches if the field value starts with the specified value. """ + UNDEFINED_OP = 0 CONTAINS = 215180831 ENDS_WITH = 490402221 @@ -118639,6 +119031,7 @@ class EnforceOnKey(proto.Enum): XFF_IP (438707118): No description available. """ + UNDEFINED_ENFORCE_ON_KEY = 0 ALL = 64897 HTTP_COOKIE = 494981627 @@ -118836,6 +119229,7 @@ class EnforceOnKeyType(proto.Enum): XFF_IP (438707118): No description available. """ + UNDEFINED_ENFORCE_ON_KEY_TYPE = 0 ALL = 64897 HTTP_COOKIE = 494981627 @@ -118937,6 +119331,7 @@ class Type(proto.Enum): GOOGLE_RECAPTCHA (518803009): No description available. """ + UNDEFINED_TYPE = 0 EXTERNAL_302 = 395733761 GOOGLE_RECAPTCHA = 518803009 @@ -119035,6 +119430,7 @@ class Base(proto.Enum): UDP (83873): No description available. """ + UNDEFINED_BASE = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -119261,6 +119657,7 @@ class Type(proto.Enum): SERVER_BINDING_TYPE_UNSPECIFIED (180825512): No description available. """ + UNDEFINED_TYPE = 0 RESTART_NODE_ON_ANY_SERVER = 502950985 RESTART_NODE_ON_MINIMAL_SERVERS = 204166495 @@ -119498,29 +119895,30 @@ class ConnectionPreference(proto.Enum): CONNECTION_PREFERENCE_UNSPECIFIED (34590772): No description available. """ + UNDEFINED_CONNECTION_PREFERENCE = 0 ACCEPT_AUTOMATIC = 75250580 ACCEPT_MANUAL = 373061341 CONNECTION_PREFERENCE_UNSPECIFIED = 34590772 - connected_endpoints: MutableSequence[ - "ServiceAttachmentConnectedEndpoint" - ] = proto.RepeatedField( - proto.MESSAGE, - number=72223688, - message="ServiceAttachmentConnectedEndpoint", + connected_endpoints: MutableSequence["ServiceAttachmentConnectedEndpoint"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=72223688, + message="ServiceAttachmentConnectedEndpoint", + ) ) connection_preference: str = proto.Field( proto.STRING, number=285818076, optional=True, ) - consumer_accept_lists: MutableSequence[ - "ServiceAttachmentConsumerProjectLimit" - ] = proto.RepeatedField( - proto.MESSAGE, - number=402725703, - message="ServiceAttachmentConsumerProjectLimit", + consumer_accept_lists: MutableSequence["ServiceAttachmentConsumerProjectLimit"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=402725703, + message="ServiceAttachmentConsumerProjectLimit", + ) ) consumer_reject_lists: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -119758,6 +120156,7 @@ class Status(proto.Enum): STATUS_UNSPECIFIED (42133066): No description available. """ + UNDEFINED_STATUS = 0 ACCEPTED = 246714279 CLOSED = 380163436 @@ -120378,6 +120777,7 @@ class State(proto.Enum): UNSPECIFIED (526786327): No description available. """ + UNDEFINED_STATE = 0 ABANDONED = 81797556 DONE = 2104194 @@ -125020,6 +125420,7 @@ class ShareType(proto.Enum): Shared-reservation is open to specific projects """ + UNDEFINED_SHARE_TYPE = 0 LOCAL = 72607563 ORGANIZATION = 274978099 @@ -125674,6 +126075,7 @@ class Architecture(proto.Enum): X86_64 (425300551): Machines with architecture X86_64 """ + UNDEFINED_ARCHITECTURE = 0 ARCHITECTURE_UNSPECIFIED = 394750507 ARM64 = 62547450 @@ -125691,6 +126093,7 @@ class SnapshotType(proto.Enum): STANDARD (484642493): No description available. """ + UNDEFINED_SNAPSHOT_TYPE = 0 ARCHIVE = 506752162 STANDARD = 484642493 @@ -125714,6 +126117,7 @@ class Status(proto.Enum): UPLOADING (267603489): Snapshot is being uploaded. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -125737,6 +126141,7 @@ class StorageBytesStatus(proto.Enum): UP_TO_DATE (101306702): No description available. """ + UNDEFINED_STORAGE_BYTES_STATUS = 0 UPDATING = 494614342 UP_TO_DATE = 101306702 @@ -126095,6 +126500,7 @@ class Policy(proto.Enum): STORAGE_LOCATION_POLICY_UNSPECIFIED (250644592): No description available. """ + UNDEFINED_POLICY = 0 LOCAL_REGION = 403535464 NEAREST_MULTI_REGION = 212467515 @@ -126323,6 +126729,7 @@ class KeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_KEY_REVOCATION_ACTION_TYPE = 0 KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 467110106 NONE = 2402104 @@ -126343,6 +126750,7 @@ class PostKeyRevocationActionType(proto.Enum): Indicates user chose to opt for VM shutdown on key revocation. """ + UNDEFINED_POST_KEY_REVOCATION_ACTION_TYPE = 0 NOOP = 2402146 POST_KEY_REVOCATION_ACTION_TYPE_UNSPECIFIED = 228738393 @@ -126563,6 +126971,7 @@ class Type(proto.Enum): TYPE_UNSPECIFIED (437714322): No description available. """ + UNDEFINED_TYPE = 0 MANAGED = 479501183 SELF_MANAGED = 434437516 @@ -126855,6 +127264,7 @@ class Status(proto.Enum): managed SslCertificate resource. For details on which domain failed, consult domain_status field. """ + UNDEFINED_STATUS = 0 ACTIVE = 314733318 MANAGED_CERTIFICATE_STATUS_UNSPECIFIED = 474800850 @@ -127270,6 +127680,7 @@ class MinTlsVersion(proto.Enum): TLS_1_3 (33116737): TLS 1.3 """ + UNDEFINED_MIN_TLS_VERSION = 0 TLS_1_0 = 33116734 TLS_1_1 = 33116735 @@ -127309,6 +127720,7 @@ class Profile(proto.Enum): SSL features, intended to meet stricter compliance requirements. """ + UNDEFINED_PROFILE = 0 COMPATIBLE = 179357396 CUSTOM = 388595569 @@ -127820,29 +128232,29 @@ class StatefulPolicyPreservedState(proto.Message): network interface name. """ - disks: MutableMapping[ - str, "StatefulPolicyPreservedStateDiskDevice" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=95594102, - message="StatefulPolicyPreservedStateDiskDevice", + disks: MutableMapping[str, "StatefulPolicyPreservedStateDiskDevice"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=95594102, + message="StatefulPolicyPreservedStateDiskDevice", + ) ) - external_i_ps: MutableMapping[ - str, "StatefulPolicyPreservedStateNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=532687245, - message="StatefulPolicyPreservedStateNetworkIp", + external_i_ps: MutableMapping[str, "StatefulPolicyPreservedStateNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=532687245, + message="StatefulPolicyPreservedStateNetworkIp", + ) ) - internal_i_ps: MutableMapping[ - str, "StatefulPolicyPreservedStateNetworkIp" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=215731675, - message="StatefulPolicyPreservedStateNetworkIp", + internal_i_ps: MutableMapping[str, "StatefulPolicyPreservedStateNetworkIp"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=215731675, + message="StatefulPolicyPreservedStateNetworkIp", + ) ) @@ -127881,6 +128293,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -127928,6 +128341,7 @@ class AutoDelete(proto.Enum): ON_PERMANENT_INSTANCE_DELETION (95727719): No description available. """ + UNDEFINED_AUTO_DELETE = 0 NEVER = 74175084 ON_PERMANENT_INSTANCE_DELETION = 95727719 @@ -128584,6 +128998,7 @@ class CapacityProvisioningType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_CAPACITY_PROVISIONING_TYPE = 0 class PerformanceProvisioningType(proto.Enum): @@ -128601,6 +129016,7 @@ class PerformanceProvisioningType(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_PERFORMANCE_PROVISIONING_TYPE = 0 class State(proto.Enum): @@ -128627,6 +129043,7 @@ class State(proto.Enum): READY (77848963): StoragePool is ready for use. """ + UNDEFINED_STATE = 0 CREATING = 455564985 DELETING = 528602024 @@ -128912,6 +129329,7 @@ class Status(proto.Enum): Disk is currently unavailable and cannot be accessed, attached or detached. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -130060,6 +130478,7 @@ class Ipv6AccessType(proto.Enum): UNSPECIFIED_IPV6_ACCESS_TYPE (313080613): No description available. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -130088,6 +130507,7 @@ class Ipv6GceEndpoint(proto.Enum): VM_ONLY (236773428): No description available. """ + UNDEFINED_IPV6_GCE_ENDPOINT = 0 VM_AND_FR = 41830108 VM_ONLY = 236773428 @@ -130112,6 +130532,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): Outbound private IPv6 access from VMs in this subnet to Google services. """ + UNDEFINED_PRIVATE_IPV6_GOOGLE_ACCESS = 0 DISABLE_GOOGLE_ACCESS = 450958579 ENABLE_BIDIRECTIONAL_ACCESS_TO_GOOGLE = 427975994 @@ -130151,6 +130572,7 @@ class Purpose(proto.Enum): Subnetwork used for Regional Envoy-based Load Balancing. """ + UNDEFINED_PURPOSE = 0 GLOBAL_MANAGED_PROXY = 236463602 INTERNAL_HTTPS_LOAD_BALANCER = 248748889 @@ -130180,6 +130602,7 @@ class Role(proto.Enum): The BACKUP subnet that could be promoted to ACTIVE. """ + UNDEFINED_ROLE = 0 ACTIVE = 314733318 BACKUP = 341010882 @@ -130209,6 +130632,7 @@ class StackType(proto.Enum): UNSPECIFIED_STACK_TYPE (298084569): No description available. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -130233,6 +130657,7 @@ class State(proto.Enum): READY (77848963): Subnetwork is ready for use. """ + UNDEFINED_STATE = 0 DRAINING = 480455402 READY = 77848963 @@ -130364,12 +130789,12 @@ class State(proto.Enum): number=3506294, optional=True, ) - secondary_ip_ranges: MutableSequence[ - "SubnetworkSecondaryRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=136658915, - message="SubnetworkSecondaryRange", + secondary_ip_ranges: MutableSequence["SubnetworkSecondaryRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=136658915, + message="SubnetworkSecondaryRange", + ) ) self_link: str = proto.Field( proto.STRING, @@ -130640,6 +131065,7 @@ class AggregationInterval(proto.Enum): INTERVAL_5_SEC (72752429): No description available. """ + UNDEFINED_AGGREGATION_INTERVAL = 0 INTERVAL_10_MIN = 487155916 INTERVAL_15_MIN = 491773521 @@ -130665,6 +131091,7 @@ class Metadata(proto.Enum): INCLUDE_ALL_METADATA (164619908): No description available. """ + UNDEFINED_METADATA = 0 CUSTOM_METADATA = 62450749 EXCLUDE_ALL_METADATA = 334519954 @@ -131051,6 +131478,7 @@ class Policy(proto.Enum): substantial imbalance in the count of clients and backends. """ + UNDEFINED_POLICY = 0 CONSISTENT_HASH_SUBSETTING = 108989492 NONE = 2402104 @@ -131427,6 +131855,7 @@ class PortSpecification(proto.Enum): service's named port defined in the instance group's named ports. """ + UNDEFINED_PORT_SPECIFICATION = 0 USE_FIXED_PORT = 190235748 USE_NAMED_PORT = 349300671 @@ -131445,6 +131874,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -132174,6 +132604,7 @@ class QuicOverride(proto.Enum): option is implicit if no QUIC override has been specified in the request. """ + UNDEFINED_QUIC_OVERRIDE = 0 DISABLE = 241807048 ENABLE = 438835587 @@ -132496,6 +132927,7 @@ class QuicOverride(proto.Enum): option is implicit if no QUIC override has been specified in the request. """ + UNDEFINED_QUIC_OVERRIDE = 0 DISABLE = 241807048 ENABLE = 438835587 @@ -132560,6 +132992,7 @@ class TlsEarlyData(proto.Enum): security stance and mitigated the risk of replay attacks using other mechanisms. """ + UNDEFINED_TLS_EARLY_DATA = 0 DISABLED = 516696700 PERMISSIVE = 504345247 @@ -132922,6 +133355,7 @@ class NatPolicy(proto.Enum): NO_NAT (161455491): No NAT performed. """ + UNDEFINED_NAT_POLICY = 0 NO_NAT = 161455491 @@ -133352,6 +133786,7 @@ class SessionAffinity(proto.Enum): same backend VM while that VM remains healthy, as long as the cookie has not expired. """ + UNDEFINED_SESSION_AFFINITY = 0 CLIENT_IP = 345665051 CLIENT_IP_NO_DESTINATION = 106122516 @@ -133809,6 +134244,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -133936,6 +134372,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -134146,6 +134583,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -134253,6 +134691,7 @@ class ProxyHeader(proto.Enum): PROXY_V1 (334352940): No description available. """ + UNDEFINED_PROXY_HEADER = 0 NONE = 2402104 PROXY_V1 = 334352940 @@ -134581,6 +135020,7 @@ class Status(proto.Enum): READY (77848963): No description available. """ + UNDEFINED_STATUS = 0 CREATING = 455564985 DELETING = 528602024 @@ -136653,6 +137093,7 @@ class MaintenanceReasons(proto.Enum): Maintenance due to planned update to the instance. """ + UNDEFINED_MAINTENANCE_REASONS = 0 FAILURE_DISK = 8573778 FAILURE_GPU = 467876919 @@ -136687,6 +137128,7 @@ class MaintenanceStatus(proto.Enum): Unknown maintenance status. Do not use this value. """ + UNDEFINED_MAINTENANCE_STATUS = 0 ONGOING = 473158491 PENDING = 35394935 @@ -136711,6 +137153,7 @@ class Type(proto.Enum): Unscheduled maintenance (e.g. emergency maintenance during uptime guarantee). """ + UNDEFINED_TYPE = 0 MULTIPLE = 362714640 SCHEDULED = 478400653 @@ -137424,6 +137867,7 @@ class MinimalAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MINIMAL_ACTION = 0 class MostDisruptiveAllowedAction(proto.Enum): @@ -137440,6 +137884,7 @@ class MostDisruptiveAllowedAction(proto.Enum): A value indicating that the enum field is not set. """ + UNDEFINED_MOST_DISRUPTIVE_ALLOWED_ACTION = 0 instance: str = proto.Field( @@ -139425,6 +139870,7 @@ class LoadBalancingSchemes(proto.Enum): inference is not possible, EXTERNAL will be used as the default type. """ + UNDEFINED_LOAD_BALANCING_SCHEMES = 0 EXTERNAL = 35607499 EXTERNAL_MANAGED = 512006923 @@ -139623,6 +140069,7 @@ class Ipv6AccessType(proto.Enum): addresses that are only accessible over the VPC network. """ + UNDEFINED_IPV6_ACCESS_TYPE = 0 EXTERNAL = 35607499 INTERNAL = 279295677 @@ -139661,6 +140108,7 @@ class Purpose(proto.Enum): Subnetwork used for Regional Envoy-based Load Balancing. """ + UNDEFINED_PURPOSE = 0 GLOBAL_MANAGED_PROXY = 236463602 INTERNAL_HTTPS_LOAD_BALANCER = 248748889 @@ -139690,6 +140138,7 @@ class Role(proto.Enum): The BACKUP subnet that could be promoted to ACTIVE. """ + UNDEFINED_ROLE = 0 ACTIVE = 314733318 BACKUP = 341010882 @@ -139717,6 +140166,7 @@ class StackType(proto.Enum): New VMs in this subnet will only be assigned IPv6 addresses. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -139757,12 +140207,12 @@ class StackType(proto.Enum): number=3506294, optional=True, ) - secondary_ip_ranges: MutableSequence[ - "UsableSubnetworkSecondaryRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=136658915, - message="UsableSubnetworkSecondaryRange", + secondary_ip_ranges: MutableSequence["UsableSubnetworkSecondaryRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=136658915, + message="UsableSubnetworkSecondaryRange", + ) ) stack_type: str = proto.Field( proto.STRING, @@ -140380,6 +140830,7 @@ class GatewayIpVersion(proto.Enum): Every HA-VPN gateway interface is configured with an IPv6 address. """ + UNDEFINED_GATEWAY_IP_VERSION = 0 IPV4 = 2254341 IPV6 = 2254343 @@ -140402,6 +140853,7 @@ class StackType(proto.Enum): IPV6_ONLY (79632100): Enable VPN gateway with only IPv6 protocol. """ + UNDEFINED_STACK_TYPE = 0 IPV4_IPV6 = 22197249 IPV4_ONLY = 22373798 @@ -140467,12 +140919,12 @@ class StackType(proto.Enum): number=425908881, optional=True, ) - vpn_interfaces: MutableSequence[ - "VpnGatewayVpnGatewayInterface" - ] = proto.RepeatedField( - proto.MESSAGE, - number=91842181, - message="VpnGatewayVpnGatewayInterface", + vpn_interfaces: MutableSequence["VpnGatewayVpnGatewayInterface"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=91842181, + message="VpnGatewayVpnGatewayInterface", + ) ) @@ -140642,12 +141094,12 @@ class VpnGatewayStatus(proto.Message): VpnGateway. """ - vpn_connections: MutableSequence[ - "VpnGatewayStatusVpnConnection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=439334538, - message="VpnGatewayStatusVpnConnection", + vpn_connections: MutableSequence["VpnGatewayStatusVpnConnection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=439334538, + message="VpnGatewayStatusVpnConnection", + ) ) @@ -140699,6 +141151,7 @@ class State(proto.Enum): redundancy from the Cloud VPN gateway to the peer gateway """ + UNDEFINED_STATE = 0 CONNECTION_REDUNDANCY_MET = 505242907 CONNECTION_REDUNDANCY_NOT_MET = 511863311 @@ -140715,6 +141168,7 @@ class UnsatisfiedReason(proto.Enum): INCOMPLETE_TUNNELS_COVERAGE (55917437): No description available. """ + UNDEFINED_UNSATISFIED_REASON = 0 INCOMPLETE_TUNNELS_COVERAGE = 55917437 @@ -141232,6 +141686,7 @@ class Status(proto.Enum): ForwardingRule and Route resources are needed to setup VPN tunnel. """ + UNDEFINED_STATUS = 0 ALLOCATING_RESOURCES = 320922816 AUTHORIZATION_ERROR = 23580290 @@ -141931,6 +142386,7 @@ class Code(proto.Enum): UNREACHABLE (13328052): A given scope cannot be reached. """ + UNDEFINED_CODE = 0 CLEANUP_FAILED = 150308440 DEPRECATED_RESOURCE_USED = 391835586 @@ -142104,6 +142560,7 @@ class Code(proto.Enum): UNREACHABLE (13328052): A given scope cannot be reached. """ + UNDEFINED_CODE = 0 CLEANUP_FAILED = 150308440 DEPRECATED_RESOURCE_USED = 391835586 @@ -142472,13 +142929,13 @@ class WireGroupEndpoint(proto.Message): - Value: an Interconnect object. """ - interconnects: MutableMapping[ - str, "WireGroupEndpointInterconnect" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=520187301, - message="WireGroupEndpointInterconnect", + interconnects: MutableMapping[str, "WireGroupEndpointInterconnect"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=520187301, + message="WireGroupEndpointInterconnect", + ) ) @@ -142750,6 +143207,7 @@ class BandwidthAllocation(proto.Enum): bandwidth from unused or underused wires to other wires in the group. """ + UNDEFINED_BANDWIDTH_ALLOCATION = 0 ALLOCATE_PER_WIRE = 358730057 SHARED_WITH_WIRE_GROUP = 286454628 @@ -142775,6 +143233,7 @@ class FaultResponse(proto.Enum): NONE (2402104): Default. """ + UNDEFINED_FAULT_RESPONSE = 0 DISABLE_PORT = 287086488 NONE = 2402104 @@ -143016,6 +143475,7 @@ class Type(proto.Enum): XPN_RESOURCE_TYPE_UNSPECIFIED (151607034): No description available. """ + UNDEFINED_TYPE = 0 PROJECT = 408671993 XPN_RESOURCE_TYPE_UNSPECIFIED = 151607034 @@ -143105,6 +143565,7 @@ class Status(proto.Enum): UP (2715): No description available. """ + UNDEFINED_STATUS = 0 DOWN = 2104482 UP = 2715 diff --git a/packages/google-cloud-compute/noxfile.py b/packages/google-cloud-compute/noxfile.py index 7b4b863a8656..4879adc62282 100644 --- a/packages/google-cloud-compute/noxfile.py +++ b/packages/google-cloud-compute/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_accelerator_types.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_accelerator_types.py index bd219304763d..56265295ef14 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_accelerator_types.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_accelerator_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_accelerator_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_accelerator_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_accelerator_types_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2002,8 +2004,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2074,17 +2077,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = AcceleratorTypesClient(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.AcceleratorTypesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.AcceleratorTypesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AcceleratorTypesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2144,8 +2150,9 @@ def test_get_rest_bad_request(request_type=compute.GetAcceleratorTypeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2226,17 +2233,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = AcceleratorTypesClient(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.AcceleratorTypesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.AcceleratorTypesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AcceleratorTypesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AcceleratorTypesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2287,8 +2294,9 @@ def test_list_rest_bad_request(request_type=compute.ListAcceleratorTypesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2357,17 +2365,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = AcceleratorTypesClient(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.AcceleratorTypesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.AcceleratorTypesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AcceleratorTypesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AcceleratorTypesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2522,11 +2532,14 @@ def test_accelerator_types_base_transport(): def test_accelerator_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.accelerator_types.transports.AcceleratorTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.accelerator_types.transports.AcceleratorTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AcceleratorTypesTransport( @@ -2547,9 +2560,12 @@ def test_accelerator_types_base_transport_with_credentials_file(): def test_accelerator_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.accelerator_types.transports.AcceleratorTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.accelerator_types.transports.AcceleratorTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AcceleratorTypesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_addresses.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_addresses.py index ecb4049f5ecf..af598a8cdc80 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_addresses.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_addresses.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_addresses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_addresses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_addresses_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3561,9 +3558,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3846,8 +3843,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3916,17 +3914,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AddressesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AddressesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3979,8 +3979,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteAddressRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4083,17 +4084,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AddressesRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AddressesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4142,8 +4141,9 @@ def test_get_rest_bad_request(request_type=compute.GetAddressRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4242,17 +4242,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AddressesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AddressesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4301,8 +4299,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertAddressRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4495,17 +4494,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AddressesRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AddressesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4554,8 +4551,9 @@ def test_list_rest_bad_request(request_type=compute.ListAddressesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4622,17 +4620,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AddressesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AddressesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4681,8 +4677,9 @@ def test_move_rest_bad_request(request_type=compute.MoveAddressRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4867,17 +4864,15 @@ def test_move_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_move" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_move_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_move" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AddressesRestInterceptor, "post_move") as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_move_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AddressesRestInterceptor, "pre_move") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4926,8 +4921,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsAddressReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5109,17 +5105,17 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AddressesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.AddressesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AddressesRestInterceptor, "pre_set_labels") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5172,8 +5168,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5312,17 +5309,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = AddressesClient(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.AddressesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.AddressesRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AddressesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AddressesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.AddressesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AddressesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5584,11 +5584,14 @@ def test_addresses_base_transport(): def test_addresses_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.addresses.transports.AddressesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.addresses.transports.AddressesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AddressesTransport( @@ -5608,9 +5611,12 @@ def test_addresses_base_transport_with_credentials_file(): def test_addresses_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.addresses.transports.AddressesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.addresses.transports.AddressesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AddressesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_advice.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_advice.py index 8a127b1fcb12..794ae3ff1363 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_advice.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_advice.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -849,10 +854,9 @@ def test_advice_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -897,10 +901,9 @@ def test_advice_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -936,10 +939,9 @@ def test_advice_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1396,8 +1398,9 @@ def test_calendar_mode_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1535,17 +1538,17 @@ def test_calendar_mode_rest_interceptors(null_interceptor): ) client = AdviceClient(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.AdviceRestInterceptor, "post_calendar_mode" - ) as post, mock.patch.object( - transports.AdviceRestInterceptor, "post_calendar_mode_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AdviceRestInterceptor, "pre_calendar_mode" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AdviceRestInterceptor, "post_calendar_mode" + ) as post, + mock.patch.object( + transports.AdviceRestInterceptor, "post_calendar_mode_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AdviceRestInterceptor, "pre_calendar_mode") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1656,11 +1659,14 @@ def test_advice_base_transport(): def test_advice_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.advice.transports.AdviceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.advice.transports.AdviceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AdviceTransport( @@ -1680,9 +1686,12 @@ def test_advice_base_transport_with_credentials_file(): def test_advice_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.advice.transports.AdviceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.advice.transports.AdviceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AdviceTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_autoscalers.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_autoscalers.py index 9c7a66d2ba9f..bda4d4001ee9 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_autoscalers.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_autoscalers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_autoscalers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_autoscalers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_autoscalers_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3150,9 +3147,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3865,8 +3862,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3937,17 +3935,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutoscalersRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4000,8 +4000,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteAutoscalerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4106,17 +4107,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoscalersRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoscalersRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4167,8 +4166,9 @@ def test_get_rest_bad_request(request_type=compute.GetAutoscalerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4251,17 +4251,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoscalersRestInterceptor, "post_get") as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoscalersRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4310,8 +4308,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertAutoscalerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4527,17 +4526,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoscalersRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoscalersRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4588,8 +4585,9 @@ def test_list_rest_bad_request(request_type=compute.ListAutoscalersRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4658,17 +4656,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoscalersRestInterceptor, "post_list") as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoscalersRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4717,8 +4713,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchAutoscalerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4934,17 +4931,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoscalersRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoscalersRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4995,8 +4990,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5137,17 +5133,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutoscalersRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5200,8 +5199,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateAutoscalerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5417,17 +5417,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = AutoscalersClient(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.AutoscalersRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.AutoscalersRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutoscalersRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AutoscalersRestInterceptor, "post_update") as post, + mock.patch.object( + transports.AutoscalersRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AutoscalersRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5687,11 +5685,14 @@ def test_autoscalers_base_transport(): def test_autoscalers_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.autoscalers.transports.AutoscalersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.autoscalers.transports.AutoscalersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutoscalersTransport( @@ -5711,9 +5712,12 @@ def test_autoscalers_base_transport_with_credentials_file(): def test_autoscalers_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.autoscalers.transports.AutoscalersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.autoscalers.transports.AutoscalersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutoscalersTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_buckets.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_buckets.py index efeadf747516..1211347a0ce5 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_buckets.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_buckets.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -902,10 +902,9 @@ def test_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +949,9 @@ def test_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +987,9 @@ def test_backend_buckets_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1171,9 +1168,9 @@ def test_add_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key(request) @@ -1377,9 +1374,9 @@ def test_add_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key_unary(request) @@ -1978,9 +1975,9 @@ def test_delete_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key(request) @@ -2206,9 +2203,9 @@ def test_delete_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key_unary(request) @@ -4503,9 +4500,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5187,8 +5184,9 @@ def test_add_signed_url_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5368,18 +5366,20 @@ def test_add_signed_url_key_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_add_signed_url_key" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, - "post_add_signed_url_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_add_signed_url_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_add_signed_url_key" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_add_signed_url_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_add_signed_url_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5430,8 +5430,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteBackendBucketRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5536,17 +5537,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5599,8 +5602,9 @@ def test_delete_signed_url_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5705,18 +5709,20 @@ def test_delete_signed_url_key_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_delete_signed_url_key" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, - "post_delete_signed_url_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_delete_signed_url_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_delete_signed_url_key" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_delete_signed_url_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_delete_signed_url_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5767,8 +5773,9 @@ def test_get_rest_bad_request(request_type=compute.GetBackendBucketRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5853,17 +5860,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.BackendBucketsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BackendBucketsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5916,8 +5921,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5984,17 +5990,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6045,8 +6054,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertBackendBucketRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6267,17 +6277,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6328,8 +6340,9 @@ def test_list_rest_bad_request(request_type=compute.ListBackendBucketsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6398,17 +6411,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BackendBucketsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6459,8 +6472,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchBackendBucketRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6681,17 +6695,17 @@ def test_patch_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BackendBucketsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6744,8 +6758,9 @@ def test_set_edge_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6928,18 +6943,20 @@ def test_set_edge_security_policy_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_set_edge_security_policy" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, - "post_set_edge_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_set_edge_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_set_edge_security_policy" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_set_edge_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_set_edge_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6992,8 +7009,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7176,17 +7194,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7239,8 +7260,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7381,18 +7403,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7445,8 +7469,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateBackendBucketRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7667,17 +7692,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = BackendBucketsClient(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.BackendBucketsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.BackendBucketsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendBucketsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendBucketsRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8027,11 +8054,14 @@ def test_backend_buckets_base_transport(): def test_backend_buckets_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.backend_buckets.transports.BackendBucketsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.backend_buckets.transports.BackendBucketsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackendBucketsTransport( @@ -8051,9 +8081,12 @@ def test_backend_buckets_base_transport_with_credentials_file(): def test_backend_buckets_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.backend_buckets.transports.BackendBucketsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.backend_buckets.transports.BackendBucketsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackendBucketsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_services.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_services.py index 216b324425dc..5f21cf6e67af 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_services.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_backend_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_backend_services_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_backend_services_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_backend_services_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1185,9 +1182,9 @@ def test_add_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key(request) @@ -1391,9 +1388,9 @@ def test_add_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_signed_url_key] = ( + mock_rpc + ) request = {} client.add_signed_url_key_unary(request) @@ -2270,9 +2267,9 @@ def test_delete_signed_url_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key(request) @@ -2498,9 +2495,9 @@ def test_delete_signed_url_key_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_signed_url_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_signed_url_key] = ( + mock_rpc + ) request = {} client.delete_signed_url_key_unary(request) @@ -5460,9 +5457,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -5670,9 +5667,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -5880,9 +5877,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6564,8 +6561,9 @@ def test_add_signed_url_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6745,18 +6743,20 @@ def test_add_signed_url_key_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_add_signed_url_key" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, - "post_add_signed_url_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_add_signed_url_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_add_signed_url_key" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_add_signed_url_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_add_signed_url_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6809,8 +6809,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6881,17 +6882,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6947,8 +6951,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteBackendServiceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7053,17 +7058,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7116,8 +7123,9 @@ def test_delete_signed_url_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7222,18 +7230,20 @@ def test_delete_signed_url_key_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_delete_signed_url_key" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, - "post_delete_signed_url_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_delete_signed_url_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_delete_signed_url_key" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_delete_signed_url_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_delete_signed_url_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7284,8 +7294,9 @@ def test_get_rest_bad_request(request_type=compute.GetBackendServiceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7411,17 +7422,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BackendServicesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7474,8 +7485,9 @@ def test_get_effective_security_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7539,19 +7551,22 @@ def test_get_effective_security_policies_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, - "post_get_effective_security_policies", - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, - "post_get_effective_security_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_get_effective_security_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_get_effective_security_policies", + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_get_effective_security_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "pre_get_effective_security_policies", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7611,8 +7626,9 @@ def test_get_health_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7751,17 +7767,19 @@ def test_get_health_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_get_health" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_get_health_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_get_health" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_get_health" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_get_health_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_get_health" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7816,8 +7834,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7884,17 +7903,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7945,8 +7967,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertBackendServiceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8319,17 +8342,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8380,8 +8405,9 @@ def test_list_rest_bad_request(request_type=compute.ListBackendServicesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8450,17 +8476,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.BackendServicesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8513,8 +8539,9 @@ def test_list_usable_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8583,17 +8610,19 @@ def test_list_usable_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_list_usable" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_list_usable_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_list_usable" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_list_usable" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_list_usable_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_list_usable" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8646,8 +8675,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchBackendServiceRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9020,17 +9050,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9083,8 +9115,9 @@ def test_set_edge_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9267,18 +9300,20 @@ def test_set_edge_security_policy_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_set_edge_security_policy" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, - "post_set_edge_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_set_edge_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_set_edge_security_policy" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_set_edge_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_set_edge_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9331,8 +9366,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9515,17 +9551,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9578,8 +9617,9 @@ def test_set_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9762,18 +9802,20 @@ def test_set_security_policy_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_set_security_policy" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, - "post_set_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_set_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_set_security_policy" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_set_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_set_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9826,8 +9868,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9968,18 +10011,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10032,8 +10077,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateBackendServiceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10406,17 +10452,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = BackendServicesClient(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.BackendServicesRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.BackendServicesRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackendServicesRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.BackendServicesRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackendServicesRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10875,11 +10923,14 @@ def test_backend_services_base_transport(): def test_backend_services_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.backend_services.transports.BackendServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.backend_services.transports.BackendServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackendServicesTransport( @@ -10899,9 +10950,12 @@ def test_backend_services_base_transport_with_credentials_file(): def test_backend_services_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.backend_services.transports.BackendServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.backend_services.transports.BackendServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackendServicesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_cross_site_networks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_cross_site_networks.py index 5a791a2e2a0e..475b4bc212e5 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_cross_site_networks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_cross_site_networks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_cross_site_networks_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_cross_site_networks_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_cross_site_networks_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2963,8 +2960,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteCrossSiteNetworkRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3069,17 +3067,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = CrossSiteNetworksClient(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.CrossSiteNetworksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3130,8 +3130,9 @@ def test_get_rest_bad_request(request_type=compute.GetCrossSiteNetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3204,17 +3205,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = CrossSiteNetworksClient(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.CrossSiteNetworksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3265,8 +3268,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertCrossSiteNetworkRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3452,17 +3456,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = CrossSiteNetworksClient(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.CrossSiteNetworksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3513,8 +3519,9 @@ def test_list_rest_bad_request(request_type=compute.ListCrossSiteNetworksRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3587,17 +3594,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = CrossSiteNetworksClient(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.CrossSiteNetworksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3650,8 +3659,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchCrossSiteNetworkReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3837,17 +3847,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = CrossSiteNetworksClient(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.CrossSiteNetworksRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CrossSiteNetworksRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CrossSiteNetworksRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4042,11 +4054,14 @@ def test_cross_site_networks_base_transport(): def test_cross_site_networks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.cross_site_networks.transports.CrossSiteNetworksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.cross_site_networks.transports.CrossSiteNetworksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CrossSiteNetworksTransport( @@ -4066,9 +4081,12 @@ def test_cross_site_networks_base_transport_with_credentials_file(): def test_cross_site_networks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.cross_site_networks.transports.CrossSiteNetworksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.cross_site_networks.transports.CrossSiteNetworksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CrossSiteNetworksTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disk_types.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disk_types.py index 8a4120080063..9dcdcbf8a171 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disk_types.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disk_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -868,10 +873,9 @@ def test_disk_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -916,10 +920,9 @@ def test_disk_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +958,9 @@ def test_disk_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1950,8 +1952,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2020,17 +2023,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = DiskTypesClient(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.DiskTypesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.DiskTypesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DiskTypesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DiskTypesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.DiskTypesRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DiskTypesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2083,8 +2088,9 @@ def test_get_rest_bad_request(request_type=compute.GetDiskTypeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2163,17 +2169,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = DiskTypesClient(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.DiskTypesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.DiskTypesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DiskTypesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DiskTypesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.DiskTypesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DiskTypesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2222,8 +2226,9 @@ def test_list_rest_bad_request(request_type=compute.ListDiskTypesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2290,17 +2295,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = DiskTypesClient(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.DiskTypesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.DiskTypesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DiskTypesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DiskTypesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.DiskTypesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DiskTypesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2451,11 +2454,14 @@ def test_disk_types_base_transport(): def test_disk_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.disk_types.transports.DiskTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.disk_types.transports.DiskTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiskTypesTransport( @@ -2476,9 +2482,12 @@ def test_disk_types_base_transport_with_credentials_file(): def test_disk_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.disk_types.transports.DiskTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.disk_types.transports.DiskTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DiskTypesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disks.py index 4f0275770242..51f3b6b31840 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_disks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -852,10 +852,9 @@ def test_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -900,10 +899,9 @@ def test_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -939,10 +937,9 @@ def test_disks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1122,9 +1119,9 @@ def test_add_resource_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies(request) @@ -1340,9 +1337,9 @@ def test_add_resource_policies_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies_unary(request) @@ -6553,9 +6550,9 @@ def test_stop_async_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication(request) @@ -6763,9 +6760,9 @@ def test_stop_async_replication_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication_unary(request) @@ -7396,9 +7393,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -8119,8 +8116,9 @@ def test_add_resource_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8308,17 +8306,19 @@ def test_add_resource_policies_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_add_resource_policies" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_add_resource_policies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_add_resource_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_add_resource_policies" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_add_resource_policies_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_add_resource_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8371,8 +8371,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8441,17 +8442,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8502,8 +8505,9 @@ def test_bulk_insert_rest_bad_request(request_type=compute.BulkInsertDiskRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8684,17 +8688,15 @@ def test_bulk_insert_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_bulk_insert" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_bulk_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_bulk_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_bulk_insert") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_bulk_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_bulk_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8745,8 +8747,9 @@ def test_bulk_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8929,17 +8932,19 @@ def test_bulk_set_labels_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_bulk_set_labels" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_bulk_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_bulk_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_bulk_set_labels" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_bulk_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_bulk_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8992,8 +8997,9 @@ def test_create_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9209,17 +9215,19 @@ def test_create_snapshot_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_create_snapshot" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_create_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_create_snapshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_create_snapshot" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_create_snapshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_create_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9270,8 +9278,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9374,17 +9383,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9433,8 +9440,9 @@ def test_get_rest_bad_request(request_type=compute.GetDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9581,17 +9589,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_get") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9640,8 +9646,9 @@ def test_get_iam_policy_rest_bad_request(request_type=compute.GetIamPolicyDiskRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9706,17 +9713,17 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_get_iam_policy") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9767,8 +9774,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10004,17 +10012,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10063,8 +10069,9 @@ def test_list_rest_bad_request(request_type=compute.ListDisksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10131,17 +10138,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_list") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10192,8 +10197,9 @@ def test_remove_resource_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10381,17 +10387,20 @@ def test_remove_resource_policies_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_remove_resource_policies" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_remove_resource_policies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_remove_resource_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_remove_resource_policies" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, + "post_remove_resource_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_remove_resource_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10442,8 +10451,9 @@ def test_resize_rest_bad_request(request_type=compute.ResizeDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10620,17 +10630,15 @@ def test_resize_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_resize" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_resize_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_resize" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_resize") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_resize_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_resize") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10679,8 +10687,9 @@ def test_set_iam_policy_rest_bad_request(request_type=compute.SetIamPolicyDiskRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10861,17 +10870,17 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_set_iam_policy") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10922,8 +10931,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11105,17 +11115,15 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_set_labels") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_set_labels") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11166,8 +11174,9 @@ def test_start_async_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11355,17 +11364,20 @@ def test_start_async_replication_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_start_async_replication" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_start_async_replication_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_start_async_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_start_async_replication" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, + "post_start_async_replication_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_start_async_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11418,8 +11430,9 @@ def test_stop_async_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11522,17 +11535,19 @@ def test_stop_async_replication_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_stop_async_replication" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_stop_async_replication_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_stop_async_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_stop_async_replication" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_stop_async_replication_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_stop_async_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11585,8 +11600,9 @@ def test_stop_group_async_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11774,18 +11790,20 @@ def test_stop_group_async_replication_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_stop_group_async_replication" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, - "post_stop_group_async_replication_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_stop_group_async_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_stop_group_async_replication" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, + "post_stop_group_async_replication_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_stop_group_async_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11838,8 +11856,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11978,17 +11997,19 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DisksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_test_iam_permissions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DisksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12041,8 +12062,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12278,17 +12300,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = DisksClient(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.DisksRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.DisksRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DisksRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DisksRestInterceptor, "post_update") as post, + mock.patch.object( + transports.DisksRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DisksRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12787,11 +12807,14 @@ def test_disks_base_transport(): def test_disks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.disks.transports.DisksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.disks.transports.DisksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DisksTransport( @@ -12811,9 +12834,12 @@ def test_disks_base_transport_with_credentials_file(): def test_disks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.disks.transports.DisksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.disks.transports.DisksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DisksTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_external_vpn_gateways.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_external_vpn_gateways.py index 4a9cc3c9e818..24e832bd23da 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_external_vpn_gateways.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_external_vpn_gateways.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_external_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_external_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_external_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2863,9 +2860,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3135,8 +3132,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteExternalVpnGatewayRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3241,17 +3239,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ExternalVpnGatewaysClient(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.ExternalVpnGatewaysRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3302,8 +3302,9 @@ def test_get_rest_bad_request(request_type=compute.GetExternalVpnGatewayRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3380,17 +3381,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = ExternalVpnGatewaysClient(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.ExternalVpnGatewaysRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3441,8 +3444,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertExternalVpnGatewayRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3640,17 +3644,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ExternalVpnGatewaysClient(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.ExternalVpnGatewaysRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3701,8 +3707,9 @@ def test_list_rest_bad_request(request_type=compute.ListExternalVpnGatewaysReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3773,17 +3780,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = ExternalVpnGatewaysClient(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.ExternalVpnGatewaysRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3838,8 +3847,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4023,17 +4033,20 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = ExternalVpnGatewaysClient(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.ExternalVpnGatewaysRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, + "post_set_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4086,8 +4099,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4228,18 +4242,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ExternalVpnGatewaysClient(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.ExternalVpnGatewaysRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ExternalVpnGatewaysRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ExternalVpnGatewaysRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4459,11 +4475,14 @@ def test_external_vpn_gateways_base_transport(): def test_external_vpn_gateways_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.external_vpn_gateways.transports.ExternalVpnGatewaysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.external_vpn_gateways.transports.ExternalVpnGatewaysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ExternalVpnGatewaysTransport( @@ -4483,9 +4502,12 @@ def test_external_vpn_gateways_base_transport_with_credentials_file(): def test_external_vpn_gateways_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.external_vpn_gateways.transports.ExternalVpnGatewaysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.external_vpn_gateways.transports.ExternalVpnGatewaysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ExternalVpnGatewaysTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewall_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewall_policies.py index 2fe8181e370a..124a46c07de3 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewall_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewall_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_firewall_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_firewall_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_firewall_policies_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4026,9 +4023,9 @@ def test_list_associations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_associations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_associations] = ( + mock_rpc + ) request = {} client.list_associations(request) @@ -5326,9 +5323,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -5527,9 +5524,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -6315,9 +6312,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6582,8 +6579,9 @@ def test_add_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6772,17 +6770,20 @@ def test_add_association_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_add_association" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_add_association_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_add_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_add_association" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_add_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_add_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6833,8 +6834,9 @@ def test_add_rule_rest_bad_request(request_type=compute.AddRuleFirewallPolicyReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7072,17 +7074,19 @@ def test_add_rule_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_add_rule" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_add_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_add_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_add_rule" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_add_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_add_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7135,8 +7139,9 @@ def test_clone_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7241,17 +7246,19 @@ def test_clone_rules_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_clone_rules" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_clone_rules_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_clone_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_clone_rules" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_clone_rules_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_clone_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7302,8 +7309,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteFirewallPolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7408,17 +7416,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7469,8 +7479,9 @@ def test_get_rest_bad_request(request_type=compute.GetFirewallPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7559,17 +7570,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallPoliciesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7622,8 +7633,9 @@ def test_get_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7694,17 +7706,20 @@ def test_get_association_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_get_association" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_get_association_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_get_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get_association" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_get_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_get_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7759,8 +7774,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7827,17 +7843,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7888,8 +7907,9 @@ def test_get_rule_rest_bad_request(request_type=compute.GetRuleFirewallPolicyReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7976,17 +7996,19 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_get_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_get_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8037,8 +8059,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertFirewallPolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8309,17 +8332,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8370,8 +8395,9 @@ def test_list_rest_bad_request(request_type=compute.ListFirewallPoliciesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8438,17 +8464,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8501,8 +8529,9 @@ def test_list_associations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8565,18 +8594,20 @@ def test_list_associations_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_list_associations" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, - "post_list_associations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_list_associations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_list_associations" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_list_associations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_list_associations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8632,8 +8663,9 @@ def test_move_rest_bad_request(request_type=compute.MoveFirewallPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8738,17 +8770,19 @@ def test_move_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_move" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_move_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_move" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_move" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_move_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_move" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8799,8 +8833,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchFirewallPolicyRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9071,17 +9106,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9134,8 +9171,9 @@ def test_patch_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9373,17 +9411,19 @@ def test_patch_rule_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_patch_rule" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_patch_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_patch_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_patch_rule" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_patch_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_patch_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9436,8 +9476,9 @@ def test_remove_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9542,18 +9583,20 @@ def test_remove_association_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_remove_association" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, - "post_remove_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_remove_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_remove_association" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_remove_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_remove_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9606,8 +9649,9 @@ def test_remove_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9712,17 +9756,19 @@ def test_remove_rule_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_remove_rule" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_remove_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_remove_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_remove_rule" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_remove_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_remove_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9775,8 +9821,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9966,17 +10013,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10029,8 +10079,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10171,18 +10222,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = FirewallPoliciesClient(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.FirewallPoliciesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallPoliciesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallPoliciesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10658,11 +10711,14 @@ def test_firewall_policies_base_transport(): def test_firewall_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.firewall_policies.transports.FirewallPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.firewall_policies.transports.FirewallPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FirewallPoliciesTransport( @@ -10682,9 +10738,12 @@ def test_firewall_policies_base_transport_with_credentials_file(): def test_firewall_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.firewall_policies.transports.FirewallPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.firewall_policies.transports.FirewallPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FirewallPoliciesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewalls.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewalls.py index 2bc5ea502da8..7aa4aab49edf 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewalls.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_firewalls.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_firewalls_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_firewalls_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_firewalls_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2784,9 +2781,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3464,8 +3461,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteFirewallRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3568,17 +3566,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FirewallsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3627,8 +3623,9 @@ def test_get_rest_bad_request(request_type=compute.GetFirewallRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3719,17 +3716,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FirewallsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3778,8 +3773,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertFirewallRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3990,17 +3986,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FirewallsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4049,8 +4043,9 @@ def test_list_rest_bad_request(request_type=compute.ListFirewallsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4117,17 +4112,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FirewallsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4176,8 +4169,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchFirewallRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4388,17 +4382,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FirewallsRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4449,8 +4441,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4589,17 +4582,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.FirewallsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4652,8 +4648,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateFirewallRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4864,17 +4861,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = FirewallsClient(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.FirewallsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.FirewallsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FirewallsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FirewallsRestInterceptor, "post_update") as post, + mock.patch.object( + transports.FirewallsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FirewallsRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5111,11 +5106,14 @@ def test_firewalls_base_transport(): def test_firewalls_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.firewalls.transports.FirewallsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.firewalls.transports.FirewallsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FirewallsTransport( @@ -5135,9 +5133,12 @@ def test_firewalls_base_transport_with_credentials_file(): def test_firewalls_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.firewalls.transports.FirewallsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.firewalls.transports.FirewallsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FirewallsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_forwarding_rules.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_forwarding_rules.py index 927fa295e904..27276cedd108 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_forwarding_rules.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_forwarding_rules.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4121,8 +4118,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4193,17 +4191,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4263,8 +4264,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteForwardingRuleReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4373,17 +4375,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4438,8 +4442,9 @@ def test_get_rest_bad_request(request_type=compute.GetForwardingRuleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4581,17 +4586,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ForwardingRulesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4642,8 +4647,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertForwardingRuleReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4870,17 +4876,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4931,8 +4939,9 @@ def test_list_rest_bad_request(request_type=compute.ListForwardingRulesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5001,17 +5010,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ForwardingRulesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5066,8 +5075,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchForwardingRuleRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5298,17 +5308,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5361,8 +5373,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5546,17 +5559,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5613,8 +5628,9 @@ def test_set_target_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5797,17 +5813,19 @@ def test_set_target_rest_interceptors(null_interceptor): ) client = ForwardingRulesClient(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.ForwardingRulesRestInterceptor, "post_set_target" - ) as post, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "post_set_target_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ForwardingRulesRestInterceptor, "pre_set_target" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_set_target" + ) as post, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "post_set_target_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ForwardingRulesRestInterceptor, "pre_set_target" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6065,11 +6083,14 @@ def test_forwarding_rules_base_transport(): def test_forwarding_rules_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.forwarding_rules.transports.ForwardingRulesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.forwarding_rules.transports.ForwardingRulesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ForwardingRulesTransport( @@ -6089,9 +6110,12 @@ def test_forwarding_rules_base_transport_with_credentials_file(): def test_forwarding_rules_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.forwarding_rules.transports.ForwardingRulesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.forwarding_rules.transports.ForwardingRulesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ForwardingRulesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_future_reservations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_future_reservations.py index 39ea7695c595..27d4de8117d9 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_future_reservations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_future_reservations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_future_reservations_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_future_reservations_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_future_reservations_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3792,8 +3789,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3866,18 +3864,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3937,8 +3937,9 @@ def test_cancel_rest_bad_request(request_type=compute.CancelFutureReservationReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4047,17 +4048,19 @@ def test_cancel_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_cancel" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, "post_cancel_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_cancel" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_cancel" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_cancel_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_cancel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4112,8 +4115,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteFutureReservationReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4222,17 +4226,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4287,8 +4293,9 @@ def test_get_rest_bad_request(request_type=compute.GetFutureReservationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4392,17 +4399,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4453,8 +4462,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertFutureReservationReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4722,17 +4732,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4783,8 +4795,9 @@ def test_list_rest_bad_request(request_type=compute.ListFutureReservationsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4857,17 +4870,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4927,8 +4942,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateFutureReservationReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5200,17 +5216,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = FutureReservationsClient(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.FutureReservationsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.FutureReservationsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FutureReservationsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FutureReservationsRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5447,11 +5465,14 @@ def test_future_reservations_base_transport(): def test_future_reservations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.future_reservations.transports.FutureReservationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.future_reservations.transports.FutureReservationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FutureReservationsTransport( @@ -5471,9 +5492,12 @@ def test_future_reservations_base_transport_with_credentials_file(): def test_future_reservations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.future_reservations.transports.FutureReservationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.future_reservations.transports.FutureReservationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FutureReservationsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_addresses.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_addresses.py index 774f65a259ff..95da1a1f35ba 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_addresses.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_addresses.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_global_addresses_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_global_addresses_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_global_addresses_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3231,9 +3228,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3503,8 +3500,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteGlobalAddressRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3609,17 +3607,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3670,8 +3670,9 @@ def test_get_rest_bad_request(request_type=compute.GetGlobalAddressRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3772,17 +3773,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.GlobalAddressesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3833,8 +3834,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertGlobalAddressRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4029,17 +4031,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4090,8 +4094,9 @@ def test_list_rest_bad_request(request_type=compute.ListGlobalAddressesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4160,17 +4165,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.GlobalAddressesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4221,8 +4226,9 @@ def test_move_rest_bad_request(request_type=compute.MoveGlobalAddressRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4409,17 +4415,17 @@ def test_move_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_move" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "post_move_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_move" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_move" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_move_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.GlobalAddressesRestInterceptor, "pre_move") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4472,8 +4478,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4657,17 +4664,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4720,8 +4729,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4862,18 +4872,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = GlobalAddressesClient(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.GlobalAddressesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.GlobalAddressesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalAddressesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalAddressesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5114,11 +5126,14 @@ def test_global_addresses_base_transport(): def test_global_addresses_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.global_addresses.transports.GlobalAddressesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.global_addresses.transports.GlobalAddressesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalAddressesTransport( @@ -5138,9 +5153,12 @@ def test_global_addresses_base_transport_with_credentials_file(): def test_global_addresses_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.global_addresses.transports.GlobalAddressesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.global_addresses.transports.GlobalAddressesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalAddressesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_forwarding_rules.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_forwarding_rules.py index 3c3f5ed1211f..35e95246b078 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_forwarding_rules.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_forwarding_rules.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_global_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_global_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_global_forwarding_rules_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3753,8 +3750,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3859,17 +3857,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3920,8 +3920,9 @@ def test_get_rest_bad_request(request_type=compute.GetGlobalForwardingRuleReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4059,17 +4060,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4122,8 +4125,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4350,17 +4354,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4411,8 +4417,9 @@ def test_list_rest_bad_request(request_type=compute.ListGlobalForwardingRulesReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4481,17 +4488,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4542,8 +4551,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchGlobalForwardingRuleRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4770,17 +4780,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4833,8 +4845,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5018,17 +5031,20 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, + "post_set_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5081,8 +5097,9 @@ def test_set_target_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5261,17 +5278,20 @@ def test_set_target_rest_interceptors(null_interceptor): ) client = GlobalForwardingRulesClient(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.GlobalForwardingRulesRestInterceptor, "post_set_target" - ) as post, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "post_set_target_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalForwardingRulesRestInterceptor, "pre_set_target" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "post_set_target" + ) as post, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, + "post_set_target_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalForwardingRulesRestInterceptor, "pre_set_target" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5508,11 +5528,14 @@ def test_global_forwarding_rules_base_transport(): def test_global_forwarding_rules_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.global_forwarding_rules.transports.GlobalForwardingRulesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.global_forwarding_rules.transports.GlobalForwardingRulesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalForwardingRulesTransport( @@ -5532,9 +5555,12 @@ def test_global_forwarding_rules_base_transport_with_credentials_file(): def test_global_forwarding_rules_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.global_forwarding_rules.transports.GlobalForwardingRulesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.global_forwarding_rules.transports.GlobalForwardingRulesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalForwardingRulesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_network_endpoint_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_network_endpoint_groups.py index d01429a29526..0a50d21652ef 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_network_endpoint_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_network_endpoint_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_global_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_global_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_global_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3361,9 +3358,9 @@ def test_list_network_endpoints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_endpoints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_endpoints] = ( + mock_rpc + ) request = {} client.list_network_endpoints(request) @@ -3715,8 +3712,9 @@ def test_attach_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3918,20 +3916,22 @@ def test_attach_network_endpoints_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, - "post_attach_network_endpoints", - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "post_attach_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "pre_attach_network_endpoints", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_attach_network_endpoints", + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_attach_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "pre_attach_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3984,8 +3984,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4090,18 +4091,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4154,8 +4157,9 @@ def test_detach_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4357,20 +4361,22 @@ def test_detach_network_endpoints_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, - "post_detach_network_endpoints", - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "post_detach_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "pre_detach_network_endpoints", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_detach_network_endpoints", + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_detach_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "pre_detach_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4423,8 +4429,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4513,17 +4520,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4578,8 +4588,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4793,18 +4804,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4857,8 +4870,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4927,17 +4941,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4992,8 +5009,9 @@ def test_list_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5062,20 +5080,22 @@ def test_list_network_endpoints_rest_interceptors(null_interceptor): ) client = GlobalNetworkEndpointGroupsClient(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.GlobalNetworkEndpointGroupsRestInterceptor, - "post_list_network_endpoints", - ) as post, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "post_list_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalNetworkEndpointGroupsRestInterceptor, - "pre_list_network_endpoints", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_list_network_endpoints", + ) as post, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "post_list_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalNetworkEndpointGroupsRestInterceptor, + "pre_list_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5323,11 +5343,14 @@ def test_global_network_endpoint_groups_base_transport(): def test_global_network_endpoint_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.global_network_endpoint_groups.transports.GlobalNetworkEndpointGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.global_network_endpoint_groups.transports.GlobalNetworkEndpointGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalNetworkEndpointGroupsTransport( @@ -5347,9 +5370,12 @@ def test_global_network_endpoint_groups_base_transport_with_credentials_file(): def test_global_network_endpoint_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.global_network_endpoint_groups.transports.GlobalNetworkEndpointGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.global_network_endpoint_groups.transports.GlobalNetworkEndpointGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalNetworkEndpointGroupsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_operations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_operations.py index 973759c9a642..b22ed90dec6c 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_operations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_global_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_global_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_global_operations_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2355,8 +2357,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2427,17 +2430,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = GlobalOperationsClient(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.GlobalOperationsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2490,8 +2496,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteGlobalOperationReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2551,17 +2558,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalOperationsClient(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.GlobalOperationsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2617,8 +2626,9 @@ def test_get_rest_bad_request(request_type=compute.GetGlobalOperationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2723,17 +2733,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalOperationsClient(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.GlobalOperationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.GlobalOperationsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2784,8 +2794,9 @@ def test_list_rest_bad_request(request_type=compute.ListGlobalOperationsRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2854,17 +2865,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalOperationsClient(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.GlobalOperationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2915,8 +2928,9 @@ def test_wait_rest_bad_request(request_type=compute.WaitGlobalOperationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3021,17 +3035,19 @@ def test_wait_rest_interceptors(null_interceptor): ) client = GlobalOperationsClient(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.GlobalOperationsRestInterceptor, "post_wait" - ) as post, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "post_wait_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalOperationsRestInterceptor, "pre_wait" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_wait" + ) as post, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "post_wait_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOperationsRestInterceptor, "pre_wait" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3226,11 +3242,14 @@ def test_global_operations_base_transport(): def test_global_operations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.global_operations.transports.GlobalOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.global_operations.transports.GlobalOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalOperationsTransport( @@ -3250,9 +3269,12 @@ def test_global_operations_base_transport_with_credentials_file(): def test_global_operations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.global_operations.transports.GlobalOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.global_operations.transports.GlobalOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalOperationsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_organization_operations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_organization_operations.py index 7de76a4c6c32..7c2f23c004ba 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_organization_operations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_organization_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -969,10 +974,9 @@ def test_global_organization_operations_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1021,9 @@ def test_global_organization_operations_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1056,10 +1059,9 @@ def test_global_organization_operations_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1782,8 +1784,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1845,18 +1848,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalOrganizationOperationsClient(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.GlobalOrganizationOperationsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalOrganizationOperationsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalOrganizationOperationsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1914,8 +1919,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2020,17 +2026,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalOrganizationOperationsClient(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.GlobalOrganizationOperationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalOrganizationOperationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GlobalOrganizationOperationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2083,8 +2092,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2153,18 +2163,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalOrganizationOperationsClient(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.GlobalOrganizationOperationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalOrganizationOperationsRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalOrganizationOperationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalOrganizationOperationsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2317,11 +2329,14 @@ def test_global_organization_operations_base_transport(): def test_global_organization_operations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.global_organization_operations.transports.GlobalOrganizationOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.global_organization_operations.transports.GlobalOrganizationOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalOrganizationOperationsTransport( @@ -2341,9 +2356,12 @@ def test_global_organization_operations_base_transport_with_credentials_file(): def test_global_organization_operations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.global_organization_operations.transports.GlobalOrganizationOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.global_organization_operations.transports.GlobalOrganizationOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalOrganizationOperationsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_public_delegated_prefixes.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_public_delegated_prefixes.py index 93f8dafe46c6..e741f272f2c2 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_public_delegated_prefixes.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_global_public_delegated_prefixes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -987,10 +987,9 @@ def test_global_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1034,9 @@ def test_global_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1072,9 @@ def test_global_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2997,8 +2994,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3103,18 +3101,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = GlobalPublicDelegatedPrefixesClient(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.GlobalPublicDelegatedPrefixesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3167,8 +3167,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3263,18 +3264,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = GlobalPublicDelegatedPrefixesClient(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.GlobalPublicDelegatedPrefixesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, - "post_get_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3329,8 +3332,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3544,18 +3548,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = GlobalPublicDelegatedPrefixesClient(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.GlobalPublicDelegatedPrefixesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3608,8 +3614,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3678,18 +3685,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = GlobalPublicDelegatedPrefixesClient(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.GlobalPublicDelegatedPrefixesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3744,8 +3753,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3959,18 +3969,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = GlobalPublicDelegatedPrefixesClient(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.GlobalPublicDelegatedPrefixesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GlobalPublicDelegatedPrefixesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4165,11 +4177,14 @@ def test_global_public_delegated_prefixes_base_transport(): def test_global_public_delegated_prefixes_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.global_public_delegated_prefixes.transports.GlobalPublicDelegatedPrefixesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.global_public_delegated_prefixes.transports.GlobalPublicDelegatedPrefixesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalPublicDelegatedPrefixesTransport( @@ -4189,9 +4204,12 @@ def test_global_public_delegated_prefixes_base_transport_with_credentials_file() def test_global_public_delegated_prefixes_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.global_public_delegated_prefixes.transports.GlobalPublicDelegatedPrefixesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.global_public_delegated_prefixes.transports.GlobalPublicDelegatedPrefixesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GlobalPublicDelegatedPrefixesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_health_checks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_health_checks.py index caa2e1d6fedb..d4ef61b1c8bb 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_health_checks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_health_checks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_health_checks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_health_checks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_health_checks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3062,9 +3059,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3738,8 +3735,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3810,17 +3808,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.HealthChecksRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3873,8 +3873,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteHealthCheckRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3979,17 +3980,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.HealthChecksRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4040,8 +4041,9 @@ def test_get_rest_bad_request(request_type=compute.GetHealthCheckRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4128,17 +4130,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.HealthChecksRestInterceptor, "post_get") as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.HealthChecksRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4187,8 +4187,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertHealthCheckRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4432,17 +4433,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.HealthChecksRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4493,8 +4494,9 @@ def test_list_rest_bad_request(request_type=compute.ListHealthChecksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4563,17 +4565,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.HealthChecksRestInterceptor, "post_list") as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.HealthChecksRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4624,8 +4624,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchHealthCheckRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4869,17 +4870,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.HealthChecksRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.HealthChecksRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4932,8 +4931,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5074,18 +5074,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HealthChecksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5138,8 +5140,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateHealthCheckRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5383,17 +5386,17 @@ def test_update_rest_interceptors(null_interceptor): ) client = HealthChecksClient(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.HealthChecksRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.HealthChecksRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HealthChecksRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.HealthChecksRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.HealthChecksRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5653,11 +5656,14 @@ def test_health_checks_base_transport(): def test_health_checks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.health_checks.transports.HealthChecksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.health_checks.transports.HealthChecksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HealthChecksTransport( @@ -5677,9 +5683,12 @@ def test_health_checks_base_transport_with_credentials_file(): def test_health_checks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.health_checks.transports.HealthChecksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.health_checks.transports.HealthChecksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HealthChecksTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_image_family_views.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_image_family_views.py index 2d6ab096afdb..33edeeeaca24 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_image_family_views.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_image_family_views.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -909,10 +914,9 @@ def test_image_family_views_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +961,9 @@ def test_image_family_views_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +999,9 @@ def test_image_family_views_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1448,8 +1450,9 @@ def test_get_rest_bad_request(request_type=compute.GetImageFamilyViewRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1509,17 +1512,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = ImageFamilyViewsClient(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.ImageFamilyViewsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ImageFamilyViewsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImageFamilyViewsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ImageFamilyViewsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ImageFamilyViewsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImageFamilyViewsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1628,11 +1631,14 @@ def test_image_family_views_base_transport(): def test_image_family_views_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.image_family_views.transports.ImageFamilyViewsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.image_family_views.transports.ImageFamilyViewsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ImageFamilyViewsTransport( @@ -1653,9 +1659,12 @@ def test_image_family_views_base_transport_with_credentials_file(): def test_image_family_views_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.image_family_views.transports.ImageFamilyViewsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.image_family_views.transports.ImageFamilyViewsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ImageFamilyViewsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_images.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_images.py index 438b608673bc..2a92b315499e 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_images.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_images.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -856,10 +856,9 @@ def test_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -904,10 +903,9 @@ def test_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -943,10 +941,9 @@ def test_images_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4170,9 +4167,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4442,8 +4439,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4546,17 +4544,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4605,8 +4601,9 @@ def test_deprecate_rest_bad_request(request_type=compute.DeprecateImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4789,17 +4786,15 @@ def test_deprecate_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_deprecate" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_deprecate_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_deprecate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_deprecate") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_deprecate_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_deprecate") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4848,8 +4843,9 @@ def test_get_rest_bad_request(request_type=compute.GetImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4958,17 +4954,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5019,8 +5013,9 @@ def test_get_from_family_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5129,17 +5124,19 @@ def test_get_from_family_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_get_from_family" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_get_from_family_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_get_from_family" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ImagesRestInterceptor, "post_get_from_family" + ) as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_get_from_family_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ImagesRestInterceptor, "pre_get_from_family" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5190,8 +5187,9 @@ def test_get_iam_policy_rest_bad_request(request_type=compute.GetIamPolicyImageR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5256,17 +5254,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ImagesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ImagesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5317,8 +5317,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5546,17 +5547,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5605,8 +5604,9 @@ def test_list_rest_bad_request(request_type=compute.ListImagesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5673,17 +5673,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5732,8 +5730,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5961,17 +5960,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6020,8 +6017,9 @@ def test_set_iam_policy_rest_bad_request(request_type=compute.SetIamPolicyImageR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6202,17 +6200,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ImagesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ImagesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6263,8 +6263,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsImageRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6446,17 +6447,15 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ImagesRestInterceptor, "post_set_labels") as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ImagesRestInterceptor, "pre_set_labels") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6507,8 +6506,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6647,17 +6647,19 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ImagesClient(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.ImagesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ImagesRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ImagesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ImagesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ImagesRestInterceptor, "post_test_iam_permissions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ImagesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6982,11 +6984,14 @@ def test_images_base_transport(): def test_images_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.images.transports.ImagesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.images.transports.ImagesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ImagesTransport( @@ -7006,9 +7011,12 @@ def test_images_base_transport_with_credentials_file(): def test_images_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.images.transports.ImagesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.images.transports.ImagesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ImagesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_manager_resize_requests.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_manager_resize_requests.py index a87257940d6a..69d6354dcfe2 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_manager_resize_requests.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_manager_resize_requests.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -997,10 +997,9 @@ def test_instance_group_manager_resize_requests_client_get_mtls_endpoint_and_cer client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1044,9 @@ def test_instance_group_manager_resize_requests_client_get_mtls_endpoint_and_cer client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1084,10 +1082,9 @@ def test_instance_group_manager_resize_requests_client_get_mtls_endpoint_and_cer "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3164,8 +3161,9 @@ def test_cancel_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3275,18 +3273,20 @@ def test_cancel_rest_interceptors(null_interceptor): ) client = InstanceGroupManagerResizeRequestsClient(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.InstanceGroupManagerResizeRequestsRestInterceptor, "post_cancel" - ) as post, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, - "post_cancel_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_cancel" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "post_cancel" + ) as post, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, + "post_cancel_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_cancel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3344,8 +3344,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3455,18 +3456,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InstanceGroupManagerResizeRequestsClient(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.InstanceGroupManagerResizeRequestsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3524,8 +3527,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3611,18 +3615,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstanceGroupManagerResizeRequestsClient(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.InstanceGroupManagerResizeRequestsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, - "post_get_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3684,8 +3690,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3930,18 +3937,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InstanceGroupManagerResizeRequestsClient(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.InstanceGroupManagerResizeRequestsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3998,8 +4007,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4074,18 +4084,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = InstanceGroupManagerResizeRequestsClient(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.InstanceGroupManagerResizeRequestsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagerResizeRequestsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4285,11 +4297,14 @@ def test_instance_group_manager_resize_requests_base_transport(): def test_instance_group_manager_resize_requests_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.instance_group_manager_resize_requests.transports.InstanceGroupManagerResizeRequestsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.instance_group_manager_resize_requests.transports.InstanceGroupManagerResizeRequestsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceGroupManagerResizeRequestsTransport( @@ -4309,9 +4324,12 @@ def test_instance_group_manager_resize_requests_base_transport_with_credentials_ def test_instance_group_manager_resize_requests_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.instance_group_manager_resize_requests.transports.InstanceGroupManagerResizeRequestsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.instance_group_manager_resize_requests.transports.InstanceGroupManagerResizeRequestsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceGroupManagerResizeRequestsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_managers.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_managers.py index ffef08bb4515..61565e517ddf 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_managers.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_group_managers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_instance_group_managers_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_instance_group_managers_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_instance_group_managers_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1213,9 +1210,9 @@ def test_abandon_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances(request) @@ -1432,9 +1429,9 @@ def test_abandon_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances_unary(request) @@ -2369,9 +2366,9 @@ def test_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances(request) @@ -2588,9 +2585,9 @@ def test_create_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances_unary(request) @@ -3225,9 +3222,9 @@ def test_delete_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances(request) @@ -3444,9 +3441,9 @@ def test_delete_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances_unary(request) @@ -5298,9 +5295,9 @@ def test_list_managed_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_managed_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_managed_instances] = ( + mock_rpc + ) request = {} client.list_managed_instances(request) @@ -6795,9 +6792,9 @@ def test_recreate_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances(request) @@ -7016,9 +7013,9 @@ def test_recreate_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances_unary(request) @@ -7703,9 +7700,9 @@ def test_resume_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances(request) @@ -7922,9 +7919,9 @@ def test_resume_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances_unary(request) @@ -8144,9 +8141,9 @@ def test_set_instance_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template(request) @@ -8366,9 +8363,9 @@ def test_set_instance_template_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template_unary(request) @@ -8585,9 +8582,9 @@ def test_set_target_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools(request) @@ -8804,9 +8801,9 @@ def test_set_target_pools_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools_unary(request) @@ -9891,9 +9888,9 @@ def test_suspend_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances(request) @@ -10110,9 +10107,9 @@ def test_suspend_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances_unary(request) @@ -10859,8 +10856,9 @@ def test_abandon_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11054,18 +11052,20 @@ def test_abandon_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_abandon_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_abandon_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_abandon_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_abandon_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_abandon_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_abandon_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11118,8 +11118,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11190,18 +11191,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11263,8 +11266,9 @@ def test_apply_updates_to_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11461,20 +11465,22 @@ def test_apply_updates_to_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, - "post_apply_updates_to_instances", - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_apply_updates_to_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "pre_apply_updates_to_instances", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_apply_updates_to_instances", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_apply_updates_to_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_apply_updates_to_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11531,8 +11537,9 @@ def test_create_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11738,18 +11745,20 @@ def test_create_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_create_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_create_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_create_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_create_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_create_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_create_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11806,8 +11815,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11916,17 +11926,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11983,8 +11995,9 @@ def test_delete_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12179,18 +12192,20 @@ def test_delete_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_delete_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_delete_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_delete_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_delete_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_delete_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_delete_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12247,8 +12262,9 @@ def test_delete_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12444,20 +12460,22 @@ def test_delete_per_instance_configs_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, - "post_delete_per_instance_configs", - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_delete_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "pre_delete_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_delete_per_instance_configs", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_delete_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_delete_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12512,8 +12530,9 @@ def test_get_rest_bad_request(request_type=compute.GetInstanceGroupManagerReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12619,17 +12638,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12684,8 +12705,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12949,17 +12971,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13010,8 +13034,9 @@ def test_list_rest_bad_request(request_type=compute.ListInstanceGroupManagersReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13080,17 +13105,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13149,8 +13176,9 @@ def test_list_errors_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13217,18 +13245,20 @@ def test_list_errors_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_list_errors" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_list_errors_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_list_errors" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_list_errors" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_list_errors_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_list_errors" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13290,8 +13320,9 @@ def test_list_managed_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13360,18 +13391,22 @@ def test_list_managed_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_list_managed_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_list_managed_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_list_managed_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_list_managed_instances", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_list_managed_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_list_managed_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13435,8 +13470,9 @@ def test_list_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13505,19 +13541,22 @@ def test_list_per_instance_configs_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, - "post_list_per_instance_configs", - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_list_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_list_per_instance_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_list_per_instance_configs", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_list_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_list_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13577,8 +13616,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchInstanceGroupManagerRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13846,17 +13886,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13913,8 +13955,9 @@ def test_patch_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14120,20 +14163,22 @@ def test_patch_per_instance_configs_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, - "post_patch_per_instance_configs", - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_patch_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "pre_patch_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_patch_per_instance_configs", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_patch_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_patch_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14190,8 +14235,9 @@ def test_recreate_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14385,18 +14431,20 @@ def test_recreate_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_recreate_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_recreate_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_recreate_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_recreate_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_recreate_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_recreate_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14453,8 +14501,9 @@ def test_resize_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14563,17 +14612,19 @@ def test_resize_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_resize" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "post_resize_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_resize" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_resize" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_resize_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_resize" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14630,8 +14681,9 @@ def test_resume_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14825,18 +14877,20 @@ def test_resume_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_resume_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_resume_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_resume_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_resume_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_resume_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_resume_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14893,8 +14947,9 @@ def test_set_instance_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15088,18 +15143,21 @@ def test_set_instance_template_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_set_instance_template" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_set_instance_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_set_instance_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_set_instance_template", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_set_instance_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_set_instance_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15156,8 +15214,9 @@ def test_set_target_pools_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15352,18 +15411,20 @@ def test_set_target_pools_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_set_target_pools" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_set_target_pools_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_set_target_pools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_set_target_pools" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_set_target_pools_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_set_target_pools" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15420,8 +15481,9 @@ def test_start_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15615,18 +15677,20 @@ def test_start_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_start_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_start_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_start_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_start_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_start_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_start_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15683,8 +15747,9 @@ def test_stop_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15879,18 +15944,20 @@ def test_stop_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_stop_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_stop_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_stop_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_stop_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_stop_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_stop_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15947,8 +16014,9 @@ def test_suspend_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16143,18 +16211,20 @@ def test_suspend_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, "post_suspend_instances" - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_suspend_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, "pre_suspend_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "post_suspend_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_suspend_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, "pre_suspend_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16211,8 +16281,9 @@ def test_update_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16420,20 +16491,22 @@ def test_update_per_instance_configs_rest_interceptors(null_interceptor): ) client = InstanceGroupManagersClient(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.InstanceGroupManagersRestInterceptor, - "post_update_per_instance_configs", - ) as post, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "post_update_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupManagersRestInterceptor, - "pre_update_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_update_per_instance_configs", + ) as post, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "post_update_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupManagersRestInterceptor, + "pre_update_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17047,11 +17120,14 @@ def test_instance_group_managers_base_transport(): def test_instance_group_managers_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.instance_group_managers.transports.InstanceGroupManagersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.instance_group_managers.transports.InstanceGroupManagersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceGroupManagersTransport( @@ -17071,9 +17147,12 @@ def test_instance_group_managers_base_transport_with_credentials_file(): def test_instance_group_managers_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.instance_group_managers.transports.InstanceGroupManagersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.instance_group_managers.transports.InstanceGroupManagersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceGroupManagersTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_groups.py index 2633dcc718a0..738de7d0fcf4 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -902,10 +902,9 @@ def test_instance_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +949,9 @@ def test_instance_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +987,9 @@ def test_instance_groups_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3440,10 +3437,10 @@ def test_list_instances_rest_pager(transport: str = "rest"): "zone": "sample2", "instance_group": "sample3", } - sample_request[ - "instance_groups_list_instances_request_resource" - ] = compute.InstanceGroupsListInstancesRequest( - instance_state="instance_state_value" + sample_request["instance_groups_list_instances_request_resource"] = ( + compute.InstanceGroupsListInstancesRequest( + instance_state="instance_state_value" + ) ) pager = client.list_instances(request=sample_request) @@ -3478,9 +3475,9 @@ def test_remove_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_instances] = ( + mock_rpc + ) request = {} client.remove_instances(request) @@ -3697,9 +3694,9 @@ def test_remove_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_instances] = ( + mock_rpc + ) request = {} client.remove_instances_unary(request) @@ -4352,9 +4349,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4641,8 +4638,9 @@ def test_add_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4836,17 +4834,19 @@ def test_add_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_add_instances" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_add_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_add_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_add_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_add_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_add_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4899,8 +4899,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4971,17 +4972,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5041,8 +5045,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteInstanceGroupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5151,17 +5156,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5216,8 +5223,9 @@ def test_get_rest_bad_request(request_type=compute.GetInstanceGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5306,17 +5314,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstanceGroupsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstanceGroupsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5367,8 +5373,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertInstanceGroupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5559,17 +5566,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5620,8 +5629,9 @@ def test_list_rest_bad_request(request_type=compute.ListInstanceGroupsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5690,17 +5700,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstanceGroupsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5757,8 +5767,9 @@ def test_list_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5916,17 +5927,20 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, + "post_list_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5988,8 +6002,9 @@ def test_remove_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6183,17 +6198,20 @@ def test_remove_instances_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_remove_instances" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_remove_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_remove_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_remove_instances" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, + "post_remove_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_remove_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6250,8 +6268,9 @@ def test_set_named_ports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6446,17 +6465,20 @@ def test_set_named_ports_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_set_named_ports" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "post_set_named_ports_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_set_named_ports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_set_named_ports" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, + "post_set_named_ports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_set_named_ports" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6509,8 +6531,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6651,18 +6674,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InstanceGroupsClient(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.InstanceGroupsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InstanceGroupsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceGroupsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceGroupsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6966,11 +6991,14 @@ def test_instance_groups_base_transport(): def test_instance_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.instance_groups.transports.InstanceGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.instance_groups.transports.InstanceGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceGroupsTransport( @@ -6990,9 +7018,12 @@ def test_instance_groups_base_transport_with_credentials_file(): def test_instance_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.instance_groups.transports.InstanceGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.instance_groups.transports.InstanceGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceGroupsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_settings_service.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_settings_service.py index ec5c8d580578..a81ba7bb2f0a 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_settings_service.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -940,10 +940,9 @@ def test_instance_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_instance_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_instance_settings_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1906,8 +1903,9 @@ def test_get_rest_bad_request(request_type=compute.GetInstanceSettingRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1974,17 +1972,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstanceSettingsServiceClient(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.InstanceSettingsServiceRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstanceSettingsServiceRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceSettingsServiceRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceSettingsServiceRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InstanceSettingsServiceRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceSettingsServiceRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2035,8 +2035,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchInstanceSettingRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2220,17 +2221,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = InstanceSettingsServiceClient(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.InstanceSettingsServiceRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.InstanceSettingsServiceRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceSettingsServiceRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceSettingsServiceRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.InstanceSettingsServiceRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceSettingsServiceRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2362,11 +2366,14 @@ def test_instance_settings_service_base_transport(): def test_instance_settings_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.instance_settings_service.transports.InstanceSettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.instance_settings_service.transports.InstanceSettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceSettingsServiceTransport( @@ -2386,9 +2393,12 @@ def test_instance_settings_service_base_transport_with_credentials_file(): def test_instance_settings_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.instance_settings_service.transports.InstanceSettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.instance_settings_service.transports.InstanceSettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceSettingsServiceTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_templates.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_templates.py index c6ad6f854aad..6543b786fc32 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_templates.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instance_templates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_instance_templates_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_instance_templates_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_instance_templates_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3113,9 +3110,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3387,8 +3384,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3457,18 +3455,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3524,8 +3524,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteInstanceTemplateRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3630,17 +3631,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3691,8 +3694,9 @@ def test_get_rest_bad_request(request_type=compute.GetInstanceTemplateRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3769,17 +3773,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3832,8 +3838,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3900,17 +3907,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3961,8 +3971,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertInstanceTemplateRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4342,17 +4353,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4403,8 +4416,9 @@ def test_list_rest_bad_request(request_type=compute.ListInstanceTemplatesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4473,17 +4487,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4538,8 +4554,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4722,17 +4739,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4785,8 +4805,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4927,18 +4948,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InstanceTemplatesClient(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.InstanceTemplatesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstanceTemplatesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstanceTemplatesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5200,11 +5223,14 @@ def test_instance_templates_base_transport(): def test_instance_templates_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.instance_templates.transports.InstanceTemplatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.instance_templates.transports.InstanceTemplatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceTemplatesTransport( @@ -5224,9 +5250,12 @@ def test_instance_templates_base_transport_with_credentials_file(): def test_instance_templates_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.instance_templates.transports.InstanceTemplatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.instance_templates.transports.InstanceTemplatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceTemplatesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instances.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instances.py index 30377479e594..c5d9e7dbd0ae 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instances.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_instances_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1140,9 +1137,9 @@ def test_add_access_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_access_config] = ( + mock_rpc + ) request = {} client.add_access_config(request) @@ -1384,9 +1381,9 @@ def test_add_access_config_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_access_config] = ( + mock_rpc + ) request = {} client.add_access_config_unary(request) @@ -1631,9 +1628,9 @@ def test_add_network_interface_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_network_interface - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_network_interface] = ( + mock_rpc + ) request = {} client.add_network_interface(request) @@ -1857,9 +1854,9 @@ def test_add_network_interface_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_network_interface - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_network_interface] = ( + mock_rpc + ) request = {} client.add_network_interface_unary(request) @@ -2083,9 +2080,9 @@ def test_add_resource_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies(request) @@ -2305,9 +2302,9 @@ def test_add_resource_policies_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies_unary(request) @@ -4079,9 +4076,9 @@ def test_delete_access_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_access_config] = ( + mock_rpc + ) request = {} client.delete_access_config(request) @@ -4333,9 +4330,9 @@ def test_delete_access_config_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_access_config] = ( + mock_rpc + ) request = {} client.delete_access_config_unary(request) @@ -5967,9 +5964,9 @@ def test_get_guest_attributes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_guest_attributes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_guest_attributes] = ( + mock_rpc + ) request = {} client.get_guest_attributes(request) @@ -6595,9 +6592,9 @@ def test_get_serial_port_output_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serial_port_output - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serial_port_output] = ( + mock_rpc + ) request = {} client.get_serial_port_output(request) @@ -8019,9 +8016,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -8232,9 +8229,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -8890,9 +8887,9 @@ def test_report_host_as_faulty_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_host_as_faulty - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_host_as_faulty] = ( + mock_rpc + ) request = {} client.report_host_as_faulty(request) @@ -9112,9 +9109,9 @@ def test_report_host_as_faulty_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_host_as_faulty - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_host_as_faulty] = ( + mock_rpc + ) request = {} client.report_host_as_faulty_unary(request) @@ -10819,9 +10816,9 @@ def test_set_disk_auto_delete_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_disk_auto_delete - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_disk_auto_delete] = ( + mock_rpc + ) request = {} client.set_disk_auto_delete(request) @@ -11073,9 +11070,9 @@ def test_set_disk_auto_delete_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_disk_auto_delete - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_disk_auto_delete] = ( + mock_rpc + ) request = {} client.set_disk_auto_delete_unary(request) @@ -11971,9 +11968,9 @@ def test_set_machine_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_resources] = ( + mock_rpc + ) request = {} client.set_machine_resources(request) @@ -12193,9 +12190,9 @@ def test_set_machine_resources_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_resources] = ( + mock_rpc + ) request = {} client.set_machine_resources_unary(request) @@ -12412,9 +12409,9 @@ def test_set_machine_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_type] = ( + mock_rpc + ) request = {} client.set_machine_type(request) @@ -12631,9 +12628,9 @@ def test_set_machine_type_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_machine_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_machine_type] = ( + mock_rpc + ) request = {} client.set_machine_type_unary(request) @@ -13278,9 +13275,9 @@ def test_set_min_cpu_platform_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_min_cpu_platform - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_min_cpu_platform] = ( + mock_rpc + ) request = {} client.set_min_cpu_platform(request) @@ -13499,9 +13496,9 @@ def test_set_min_cpu_platform_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_min_cpu_platform - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_min_cpu_platform] = ( + mock_rpc + ) request = {} client.set_min_cpu_platform_unary(request) @@ -14578,9 +14575,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -14799,9 +14796,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -15020,9 +15017,9 @@ def test_set_service_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_service_account] = ( + mock_rpc + ) request = {} client.set_service_account(request) @@ -15241,9 +15238,9 @@ def test_set_service_account_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_service_account] = ( + mock_rpc + ) request = {} client.set_service_account_unary(request) @@ -18546,9 +18543,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -19223,9 +19220,9 @@ def test_update_access_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_access_config] = ( + mock_rpc + ) request = {} client.update_access_config(request) @@ -19469,9 +19466,9 @@ def test_update_access_config_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_access_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_access_config] = ( + mock_rpc + ) request = {} client.update_access_config_unary(request) @@ -19716,9 +19713,9 @@ def test_update_display_device_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_display_device - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_display_device] = ( + mock_rpc + ) request = {} client.update_display_device(request) @@ -19934,9 +19931,9 @@ def test_update_display_device_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_display_device - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_display_device] = ( + mock_rpc + ) request = {} client.update_display_device_unary(request) @@ -21173,8 +21170,9 @@ def test_add_access_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21360,17 +21358,19 @@ def test_add_access_config_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_add_access_config" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_add_access_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_add_access_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_add_access_config" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_add_access_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_add_access_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21423,8 +21423,9 @@ def test_add_network_interface_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21639,17 +21640,20 @@ def test_add_network_interface_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_add_network_interface" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_add_network_interface_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_add_network_interface" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_add_network_interface" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_add_network_interface_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_add_network_interface" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21702,8 +21706,9 @@ def test_add_resource_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21891,17 +21896,20 @@ def test_add_resource_policies_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_add_resource_policies" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_add_resource_policies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_add_resource_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_add_resource_policies" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_add_resource_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_add_resource_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21954,8 +21962,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22024,17 +22033,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22087,8 +22098,9 @@ def test_attach_disk_rest_bad_request(request_type=compute.AttachDiskInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22314,17 +22326,19 @@ def test_attach_disk_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_attach_disk" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_attach_disk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_attach_disk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_attach_disk" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_attach_disk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_attach_disk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22375,8 +22389,9 @@ def test_bulk_insert_rest_bad_request(request_type=compute.BulkInsertInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22747,17 +22762,19 @@ def test_bulk_insert_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_bulk_insert" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_bulk_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_bulk_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_bulk_insert" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_bulk_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_bulk_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22808,8 +22825,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22912,17 +22930,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22973,8 +22989,9 @@ def test_delete_access_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23077,17 +23094,20 @@ def test_delete_access_config_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_delete_access_config" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_delete_access_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_delete_access_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_delete_access_config" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_delete_access_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_delete_access_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23140,8 +23160,9 @@ def test_delete_network_interface_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23244,18 +23265,20 @@ def test_delete_network_interface_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_delete_network_interface" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_delete_network_interface_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_delete_network_interface" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_delete_network_interface" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_delete_network_interface_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_delete_network_interface" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23306,8 +23329,9 @@ def test_detach_disk_rest_bad_request(request_type=compute.DetachDiskInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23410,17 +23434,19 @@ def test_detach_disk_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_detach_disk" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_detach_disk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_detach_disk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_detach_disk" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_detach_disk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_detach_disk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23471,8 +23497,9 @@ def test_get_rest_bad_request(request_type=compute.GetInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23585,17 +23612,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23646,8 +23671,9 @@ def test_get_effective_firewalls_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23705,18 +23731,20 @@ def test_get_effective_firewalls_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_effective_firewalls" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_get_effective_firewalls_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_effective_firewalls" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_effective_firewalls" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_get_effective_firewalls_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_effective_firewalls" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23774,8 +23802,9 @@ def test_get_guest_attributes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23844,17 +23873,20 @@ def test_get_guest_attributes_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_guest_attributes" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_get_guest_attributes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_guest_attributes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_guest_attributes" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_get_guest_attributes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_guest_attributes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23907,8 +23939,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23973,17 +24006,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24036,8 +24071,9 @@ def test_get_screenshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24100,17 +24136,19 @@ def test_get_screenshot_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_screenshot" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_get_screenshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_screenshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_screenshot" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_screenshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_screenshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24163,8 +24201,9 @@ def test_get_serial_port_output_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24233,17 +24272,20 @@ def test_get_serial_port_output_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_serial_port_output" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_get_serial_port_output_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_serial_port_output" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_serial_port_output" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_get_serial_port_output_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_serial_port_output" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24296,8 +24338,9 @@ def test_get_shielded_instance_identity_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24358,18 +24401,20 @@ def test_get_shielded_instance_identity_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_get_shielded_instance_identity" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_get_shielded_instance_identity_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_get_shielded_instance_identity" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_get_shielded_instance_identity" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_get_shielded_instance_identity_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_get_shielded_instance_identity" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24422,8 +24467,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24829,17 +24875,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24888,8 +24932,9 @@ def test_list_rest_bad_request(request_type=compute.ListInstancesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24956,17 +25001,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25017,8 +25060,9 @@ def test_list_referrers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25085,17 +25129,19 @@ def test_list_referrers_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_list_referrers" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_list_referrers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_list_referrers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_list_referrers" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_list_referrers_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_list_referrers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25150,8 +25196,9 @@ def test_perform_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25254,17 +25301,20 @@ def test_perform_maintenance_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_perform_maintenance" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_perform_maintenance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_perform_maintenance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_perform_maintenance" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_perform_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_perform_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25317,8 +25367,9 @@ def test_remove_resource_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25506,18 +25557,20 @@ def test_remove_resource_policies_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_remove_resource_policies" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_remove_resource_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_remove_resource_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_remove_resource_policies" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_remove_resource_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_remove_resource_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25570,8 +25623,9 @@ def test_report_host_as_faulty_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25762,17 +25816,20 @@ def test_report_host_as_faulty_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_report_host_as_faulty" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_report_host_as_faulty_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_report_host_as_faulty" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_report_host_as_faulty" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_report_host_as_faulty_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_report_host_as_faulty" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25823,8 +25880,9 @@ def test_reset_rest_bad_request(request_type=compute.ResetInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25927,17 +25985,15 @@ def test_reset_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_reset" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_reset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_reset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_reset") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_reset_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_reset") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25986,8 +26042,9 @@ def test_resume_rest_bad_request(request_type=compute.ResumeInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26090,17 +26147,15 @@ def test_resume_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_resume" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_resume_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_resume" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_resume") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_resume_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_resume") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26151,8 +26206,9 @@ def test_send_diagnostic_interrupt_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26210,18 +26266,20 @@ def test_send_diagnostic_interrupt_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_send_diagnostic_interrupt" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_send_diagnostic_interrupt_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_send_diagnostic_interrupt" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_send_diagnostic_interrupt" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_send_diagnostic_interrupt_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_send_diagnostic_interrupt" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26279,8 +26337,9 @@ def test_set_deletion_protection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26383,18 +26442,20 @@ def test_set_deletion_protection_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_deletion_protection" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_set_deletion_protection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_deletion_protection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_deletion_protection" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_deletion_protection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_deletion_protection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26447,8 +26508,9 @@ def test_set_disk_auto_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26551,17 +26613,20 @@ def test_set_disk_auto_delete_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_disk_auto_delete" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_disk_auto_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_disk_auto_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_disk_auto_delete" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_disk_auto_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_disk_auto_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26614,8 +26679,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26796,17 +26862,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26857,8 +26925,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsInstanceReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27042,17 +27111,17 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_set_labels") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27105,8 +27174,9 @@ def test_set_machine_resources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27296,17 +27366,20 @@ def test_set_machine_resources_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_machine_resources" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_machine_resources_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_machine_resources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_machine_resources" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_machine_resources_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_machine_resources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27359,8 +27432,9 @@ def test_set_machine_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27548,17 +27622,19 @@ def test_set_machine_type_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_machine_type" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_machine_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_machine_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_machine_type" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_machine_type_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_machine_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27609,8 +27685,9 @@ def test_set_metadata_rest_bad_request(request_type=compute.SetMetadataInstanceR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27785,17 +27862,19 @@ def test_set_metadata_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_metadata" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_metadata_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_metadata" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_metadata_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27848,8 +27927,9 @@ def test_set_min_cpu_platform_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28037,17 +28117,20 @@ def test_set_min_cpu_platform_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_min_cpu_platform" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_min_cpu_platform_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_min_cpu_platform" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_min_cpu_platform" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_min_cpu_platform_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_min_cpu_platform" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28098,8 +28181,9 @@ def test_set_name_rest_bad_request(request_type=compute.SetNameInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28281,17 +28365,15 @@ def test_set_name_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_name" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_name_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_name" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_set_name") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_name_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_set_name") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28342,8 +28424,9 @@ def test_set_scheduling_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28536,17 +28619,19 @@ def test_set_scheduling_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_scheduling" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_scheduling_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_scheduling" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_scheduling" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_scheduling_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_scheduling" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28599,8 +28684,9 @@ def test_set_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28792,17 +28878,20 @@ def test_set_security_policy_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_security_policy" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_security_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_security_policy" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28855,8 +28944,9 @@ def test_set_service_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29045,17 +29135,20 @@ def test_set_service_account_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_service_account" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_service_account_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_service_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_service_account" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_service_account_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_set_service_account" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29108,8 +29201,9 @@ def test_set_shielded_instance_integrity_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29297,20 +29391,22 @@ def test_set_shielded_instance_integrity_policy_rest_interceptors(null_intercept ) client = InstancesClient(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.InstancesRestInterceptor, - "post_set_shielded_instance_integrity_policy", - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_set_shielded_instance_integrity_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, - "pre_set_shielded_instance_integrity_policy", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_shielded_instance_integrity_policy", + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_set_shielded_instance_integrity_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, + "pre_set_shielded_instance_integrity_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29361,8 +29457,9 @@ def test_set_tags_rest_bad_request(request_type=compute.SetTagsInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29536,17 +29633,15 @@ def test_set_tags_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_set_tags" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_set_tags_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_set_tags" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_set_tags") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_set_tags_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_set_tags") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29597,8 +29692,9 @@ def test_simulate_maintenance_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29701,18 +29797,20 @@ def test_simulate_maintenance_event_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_simulate_maintenance_event" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_simulate_maintenance_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_simulate_maintenance_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_simulate_maintenance_event" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_simulate_maintenance_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_simulate_maintenance_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29763,8 +29861,9 @@ def test_start_rest_bad_request(request_type=compute.StartInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29867,17 +29966,15 @@ def test_start_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_start" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_start_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_start" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_start") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_start_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_start") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29928,8 +30025,9 @@ def test_start_with_encryption_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30128,18 +30226,20 @@ def test_start_with_encryption_key_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_start_with_encryption_key" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_start_with_encryption_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_start_with_encryption_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_start_with_encryption_key" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_start_with_encryption_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_start_with_encryption_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30190,8 +30290,9 @@ def test_stop_rest_bad_request(request_type=compute.StopInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30294,17 +30395,15 @@ def test_stop_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_stop" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_stop_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_stop" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_stop") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_stop_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_stop") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30353,8 +30452,9 @@ def test_suspend_rest_bad_request(request_type=compute.SuspendInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30457,17 +30557,15 @@ def test_suspend_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_suspend" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_suspend_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_suspend" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_suspend") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_suspend_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_suspend") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30518,8 +30616,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30658,17 +30757,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30721,8 +30823,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31128,17 +31231,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InstancesRestInterceptor, "post_update") as post, + mock.patch.object( + transports.InstancesRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstancesRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31189,8 +31290,9 @@ def test_update_access_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31376,17 +31478,20 @@ def test_update_access_config_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_update_access_config" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_update_access_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_update_access_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_update_access_config" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_update_access_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_update_access_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31439,8 +31544,9 @@ def test_update_display_device_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31615,17 +31721,20 @@ def test_update_display_device_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_update_display_device" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, "post_update_display_device_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_update_display_device" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_update_display_device" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_update_display_device_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_update_display_device" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31678,8 +31787,9 @@ def test_update_network_interface_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31894,18 +32004,20 @@ def test_update_network_interface_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_update_network_interface" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_update_network_interface_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_update_network_interface" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_update_network_interface" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_update_network_interface_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_update_network_interface" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31958,8 +32070,9 @@ def test_update_shielded_instance_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32142,18 +32255,20 @@ def test_update_shielded_instance_config_rest_interceptors(null_interceptor): ) client = InstancesClient(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.InstancesRestInterceptor, "post_update_shielded_instance_config" - ) as post, mock.patch.object( - transports.InstancesRestInterceptor, - "post_update_shielded_instance_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstancesRestInterceptor, "pre_update_shielded_instance_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstancesRestInterceptor, "post_update_shielded_instance_config" + ) as post, + mock.patch.object( + transports.InstancesRestInterceptor, + "post_update_shielded_instance_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstancesRestInterceptor, "pre_update_shielded_instance_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33368,11 +33483,14 @@ def test_instances_base_transport(): def test_instances_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.instances.transports.InstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.instances.transports.InstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstancesTransport( @@ -33392,9 +33510,12 @@ def test_instances_base_transport_with_credentials_file(): def test_instances_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.instances.transports.InstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.instances.transports.InstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstancesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instant_snapshots.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instant_snapshots.py index 60b38e4e3981..33a81184e35b 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instant_snapshots.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_instant_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_instant_snapshots_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_instant_snapshots_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_instant_snapshots_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3615,9 +3612,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3900,8 +3897,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3972,17 +3970,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4042,8 +4043,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteInstantSnapshotReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4152,17 +4154,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4217,8 +4221,9 @@ def test_get_rest_bad_request(request_type=compute.GetInstantSnapshotRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4317,17 +4322,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InstantSnapshotsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4380,8 +4385,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4448,17 +4454,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4509,8 +4518,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertInstantSnapshotReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4709,17 +4719,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4770,8 +4782,9 @@ def test_list_rest_bad_request(request_type=compute.ListInstantSnapshotsRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4840,17 +4853,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4905,8 +4920,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5089,17 +5105,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5152,8 +5171,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5337,17 +5357,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5400,8 +5422,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5542,18 +5565,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InstantSnapshotsClient(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.InstantSnapshotsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InstantSnapshotsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InstantSnapshotsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5836,11 +5861,14 @@ def test_instant_snapshots_base_transport(): def test_instant_snapshots_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.instant_snapshots.transports.InstantSnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.instant_snapshots.transports.InstantSnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstantSnapshotsTransport( @@ -5860,9 +5888,12 @@ def test_instant_snapshots_base_transport_with_credentials_file(): def test_instant_snapshots_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.instant_snapshots.transports.InstantSnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.instant_snapshots.transports.InstantSnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstantSnapshotsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachment_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachment_groups.py index 54145dad284b..cc2a8ccd85dc 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachment_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachment_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -976,10 +976,9 @@ def test_interconnect_attachment_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1023,9 @@ def test_interconnect_attachment_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1061,9 @@ def test_interconnect_attachment_groups_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1298,9 +1295,9 @@ def test_delete_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -1504,9 +1501,9 @@ def test_delete_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -1706,9 +1703,9 @@ def test_get_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -2065,9 +2062,9 @@ def test_get_operational_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_operational_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_operational_status] = ( + mock_rpc + ) request = {} client.get_operational_status(request) @@ -2105,9 +2102,9 @@ def test_get_operational_status_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -2998,9 +2995,9 @@ def test_patch_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -3230,9 +3227,9 @@ def test_patch_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectAttachmentGroup" - ] = "interconnect_attachment_group_value" + jsonified_request["interconnectAttachmentGroup"] = ( + "interconnect_attachment_group_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -3622,9 +3619,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3896,8 +3893,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4002,18 +4000,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4066,8 +4066,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4144,17 +4145,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4212,8 +4216,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4280,18 +4285,21 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_get_iam_policy", + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4344,8 +4352,9 @@ def test_get_operational_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4414,20 +4423,22 @@ def test_get_operational_status_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, - "post_get_operational_status", - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_get_operational_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "pre_get_operational_status", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_get_operational_status", + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_get_operational_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "pre_get_operational_status", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4489,8 +4500,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4727,18 +4739,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4791,8 +4805,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4865,18 +4880,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4934,8 +4951,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5172,18 +5190,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5236,8 +5256,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5420,18 +5441,21 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_set_iam_policy", + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5484,8 +5508,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5628,20 +5653,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentGroupsClient(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.InterconnectAttachmentGroupsRestInterceptor, - "post_test_iam_permissions", - ) as post, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentGroupsRestInterceptor, - "pre_test_iam_permissions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentGroupsRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5926,11 +5953,14 @@ def test_interconnect_attachment_groups_base_transport(): def test_interconnect_attachment_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.interconnect_attachment_groups.transports.InterconnectAttachmentGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.interconnect_attachment_groups.transports.InterconnectAttachmentGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectAttachmentGroupsTransport( @@ -5950,9 +5980,12 @@ def test_interconnect_attachment_groups_base_transport_with_credentials_file(): def test_interconnect_attachment_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.interconnect_attachment_groups.transports.InterconnectAttachmentGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.interconnect_attachment_groups.transports.InterconnectAttachmentGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectAttachmentGroupsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachments.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachments.py index b8effbaa5698..028ee198d48d 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachments.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_attachments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_interconnect_attachments_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_interconnect_attachments_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_interconnect_attachments_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3771,8 +3768,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3843,18 +3841,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3916,8 +3916,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4026,17 +4027,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4091,8 +4095,9 @@ def test_get_rest_bad_request(request_type=compute.GetInterconnectAttachmentRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4257,17 +4262,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4322,8 +4329,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4571,17 +4579,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4632,8 +4643,9 @@ def test_list_rest_bad_request(request_type=compute.ListInterconnectAttachmentsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4702,17 +4714,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4771,8 +4785,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5024,17 +5039,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5087,8 +5105,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5272,18 +5291,20 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = InterconnectAttachmentsClient(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.InterconnectAttachmentsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, - "post_set_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectAttachmentsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, + "post_set_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectAttachmentsRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5520,11 +5541,14 @@ def test_interconnect_attachments_base_transport(): def test_interconnect_attachments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.interconnect_attachments.transports.InterconnectAttachmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.interconnect_attachments.transports.InterconnectAttachmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectAttachmentsTransport( @@ -5544,9 +5568,12 @@ def test_interconnect_attachments_base_transport_with_credentials_file(): def test_interconnect_attachments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.interconnect_attachments.transports.InterconnectAttachmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.interconnect_attachments.transports.InterconnectAttachmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectAttachmentsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_groups.py index 56941bd3965c..2c075e277b1c 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_interconnect_groups_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_interconnect_groups_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_interconnect_groups_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2400,9 +2397,9 @@ def test_get_operational_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_operational_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_operational_status] = ( + mock_rpc + ) request = {} client.get_operational_status(request) @@ -3952,9 +3949,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4226,8 +4223,9 @@ def test_create_members_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4438,18 +4436,20 @@ def test_create_members_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_create_members" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, - "post_create_members_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_create_members" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_create_members" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, + "post_create_members_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_create_members" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4500,8 +4500,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteInterconnectGroupReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4606,17 +4607,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4667,8 +4670,9 @@ def test_get_rest_bad_request(request_type=compute.GetInterconnectGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4743,17 +4747,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4806,8 +4812,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4874,18 +4881,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4938,8 +4947,9 @@ def test_get_operational_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5004,18 +5014,20 @@ def test_get_operational_status_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_get_operational_status" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, - "post_get_operational_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_get_operational_status" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_get_operational_status" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, + "post_get_operational_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_get_operational_status" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5071,8 +5083,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertInterconnectGroupReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5301,17 +5314,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5362,8 +5377,9 @@ def test_list_rest_bad_request(request_type=compute.ListInterconnectGroupsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5436,17 +5452,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5502,8 +5520,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchInterconnectGroupReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5732,17 +5751,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5795,8 +5816,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5979,18 +6001,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6043,8 +6067,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6185,18 +6210,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = InterconnectGroupsClient(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.InterconnectGroupsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterconnectGroupsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectGroupsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6502,11 +6529,14 @@ def test_interconnect_groups_base_transport(): def test_interconnect_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.interconnect_groups.transports.InterconnectGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.interconnect_groups.transports.InterconnectGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectGroupsTransport( @@ -6526,9 +6556,12 @@ def test_interconnect_groups_base_transport_with_credentials_file(): def test_interconnect_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.interconnect_groups.transports.InterconnectGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.interconnect_groups.transports.InterconnectGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectGroupsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_locations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_locations.py index d72bea2dafa8..8de58c738459 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_locations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_locations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -930,10 +935,9 @@ def test_interconnect_locations_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +982,9 @@ def test_interconnect_locations_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1020,9 @@ def test_interconnect_locations_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1726,8 +1728,9 @@ def test_get_rest_bad_request(request_type=compute.GetInterconnectLocationReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1830,17 +1833,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = InterconnectLocationsClient(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.InterconnectLocationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InterconnectLocationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectLocationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectLocationsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InterconnectLocationsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectLocationsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1893,8 +1898,9 @@ def test_list_rest_bad_request(request_type=compute.ListInterconnectLocationsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1963,17 +1969,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = InterconnectLocationsClient(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.InterconnectLocationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InterconnectLocationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectLocationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectLocationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InterconnectLocationsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectLocationsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2107,11 +2115,14 @@ def test_interconnect_locations_base_transport(): def test_interconnect_locations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.interconnect_locations.transports.InterconnectLocationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.interconnect_locations.transports.InterconnectLocationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectLocationsTransport( @@ -2132,9 +2143,12 @@ def test_interconnect_locations_base_transport_with_credentials_file(): def test_interconnect_locations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.interconnect_locations.transports.InterconnectLocationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.interconnect_locations.transports.InterconnectLocationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectLocationsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_remote_locations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_remote_locations.py index 382f6afc619b..0ae40d51d03a 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_remote_locations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnect_remote_locations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -967,10 +972,9 @@ def test_interconnect_remote_locations_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1019,9 @@ def test_interconnect_remote_locations_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1054,10 +1057,9 @@ def test_interconnect_remote_locations_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1283,9 +1285,9 @@ def test_get_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "interconnectRemoteLocation" - ] = "interconnect_remote_location_value" + jsonified_request["interconnectRemoteLocation"] = ( + "interconnect_remote_location_value" + ) jsonified_request["project"] = "project_value" unset_fields = transport_class( @@ -1779,8 +1781,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1879,17 +1882,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = InterconnectRemoteLocationsClient(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.InterconnectRemoteLocationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InterconnectRemoteLocationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectRemoteLocationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectRemoteLocationsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.InterconnectRemoteLocationsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectRemoteLocationsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1944,8 +1950,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2014,17 +2021,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = InterconnectRemoteLocationsClient(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.InterconnectRemoteLocationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InterconnectRemoteLocationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectRemoteLocationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectRemoteLocationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.InterconnectRemoteLocationsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectRemoteLocationsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2161,11 +2171,14 @@ def test_interconnect_remote_locations_base_transport(): def test_interconnect_remote_locations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.interconnect_remote_locations.transports.InterconnectRemoteLocationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.interconnect_remote_locations.transports.InterconnectRemoteLocationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectRemoteLocationsTransport( @@ -2186,9 +2199,12 @@ def test_interconnect_remote_locations_base_transport_with_credentials_file(): def test_interconnect_remote_locations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.interconnect_remote_locations.transports.InterconnectRemoteLocationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.interconnect_remote_locations.transports.InterconnectRemoteLocationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectRemoteLocationsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnects.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnects.py index 8b9b2318212c..f5dbbe76c2b2 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnects.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_interconnects.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_interconnects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_interconnects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_interconnects_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1941,9 +1938,9 @@ def test_get_macsec_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_macsec_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_macsec_config] = ( + mock_rpc + ) request = {} client.get_macsec_config(request) @@ -3661,8 +3658,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteInterconnectRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3767,17 +3765,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InterconnectsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3828,8 +3826,9 @@ def test_get_rest_bad_request(request_type=compute.GetInterconnectRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3950,17 +3949,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InterconnectsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InterconnectsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4011,8 +4008,9 @@ def test_get_diagnostics_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4072,17 +4070,20 @@ def test_get_diagnostics_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_get_diagnostics" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_get_diagnostics_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_get_diagnostics" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_get_diagnostics" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, + "post_get_diagnostics_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectsRestInterceptor, "pre_get_diagnostics" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4140,8 +4141,9 @@ def test_get_macsec_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4204,17 +4206,20 @@ def test_get_macsec_config_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_get_macsec_config" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_get_macsec_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_get_macsec_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_get_macsec_config" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, + "post_get_macsec_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectsRestInterceptor, "pre_get_macsec_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4270,8 +4275,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertInterconnectRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4529,17 +4535,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InterconnectsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4590,8 +4596,9 @@ def test_list_rest_bad_request(request_type=compute.ListInterconnectsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4660,17 +4667,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.InterconnectsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InterconnectsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4721,8 +4726,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchInterconnectRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4980,17 +4986,17 @@ def test_patch_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.InterconnectsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5041,8 +5047,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsInterconnectR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5226,17 +5233,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = InterconnectsClient(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.InterconnectsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.InterconnectsRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.InterconnectsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.InterconnectsRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.InterconnectsRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5496,11 +5505,14 @@ def test_interconnects_base_transport(): def test_interconnects_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.interconnects.transports.InterconnectsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.interconnects.transports.InterconnectsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectsTransport( @@ -5520,9 +5532,12 @@ def test_interconnects_base_transport_with_credentials_file(): def test_interconnects_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.interconnects.transports.InterconnectsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.interconnects.transports.InterconnectsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterconnectsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_license_codes.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_license_codes.py index 723e7f4d8b26..46f7796eb8a6 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_license_codes.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_license_codes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +882,9 @@ def test_license_codes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +929,9 @@ def test_license_codes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +967,9 @@ def test_license_codes_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,9 +1338,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -1608,8 +1610,9 @@ def test_get_rest_bad_request(request_type=compute.GetLicenseCodeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1686,17 +1689,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = LicenseCodesClient(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.LicenseCodesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.LicenseCodesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicenseCodesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LicenseCodesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.LicenseCodesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LicenseCodesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1747,8 +1748,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1889,18 +1891,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = LicenseCodesClient(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.LicenseCodesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.LicenseCodesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseCodesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseCodesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.LicenseCodesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseCodesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2036,11 +2040,14 @@ def test_license_codes_base_transport(): def test_license_codes_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.license_codes.transports.LicenseCodesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.license_codes.transports.LicenseCodesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LicenseCodesTransport( @@ -2061,9 +2068,12 @@ def test_license_codes_base_transport_with_credentials_file(): def test_license_codes_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.license_codes.transports.LicenseCodesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.license_codes.transports.LicenseCodesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LicenseCodesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_licenses.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_licenses.py index 80fd8762da73..6619b48313ee 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_licenses.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_licenses.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -866,10 +866,9 @@ def test_licenses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -914,10 +913,9 @@ def test_licenses_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -953,10 +951,9 @@ def test_licenses_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2806,9 +2803,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3526,8 +3523,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteLicenseRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3630,17 +3628,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LicensesRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LicensesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3689,8 +3685,9 @@ def test_get_rest_bad_request(request_type=compute.GetLicenseRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3791,17 +3788,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LicensesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LicensesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3852,8 +3847,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3918,17 +3914,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicensesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LicensesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3979,8 +3977,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertLicenseRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4183,17 +4182,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LicensesRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LicensesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4242,8 +4239,9 @@ def test_list_rest_bad_request(request_type=compute.ListLicensesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4308,17 +4306,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LicensesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LicensesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4371,8 +4367,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4553,17 +4550,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicensesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LicensesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4616,8 +4615,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4756,17 +4756,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicensesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.LicensesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicensesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4819,8 +4822,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateLicenseRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5023,17 +5027,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = LicensesClient(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.LicensesRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.LicensesRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicensesRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LicensesRestInterceptor, "post_update") as post, + mock.patch.object( + transports.LicensesRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LicensesRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5291,11 +5293,14 @@ def test_licenses_base_transport(): def test_licenses_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.licenses.transports.LicensesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.licenses.transports.LicensesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LicensesTransport( @@ -5315,9 +5320,12 @@ def test_licenses_base_transport_with_credentials_file(): def test_licenses_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.licenses.transports.LicensesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.licenses.transports.LicensesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LicensesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_images.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_images.py index 631adff450c1..c51c9ec99617 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_images.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_images.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_machine_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_machine_images_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_machine_images_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3227,9 +3224,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3499,8 +3496,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteMachineImageRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3605,17 +3603,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.MachineImagesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3666,8 +3664,9 @@ def test_get_rest_bad_request(request_type=compute.GetMachineImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3756,17 +3755,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.MachineImagesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.MachineImagesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3817,8 +3814,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3885,17 +3883,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MachineImagesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3946,8 +3946,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertMachineImageRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4369,17 +4370,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.MachineImagesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4430,8 +4431,9 @@ def test_list_rest_bad_request(request_type=compute.ListMachineImagesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4500,17 +4502,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.MachineImagesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.MachineImagesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4563,8 +4563,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4747,17 +4748,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MachineImagesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4808,8 +4811,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsMachineImageR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4993,17 +4997,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MachineImagesRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5056,8 +5062,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5198,18 +5205,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = MachineImagesClient(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.MachineImagesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.MachineImagesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MachineImagesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineImagesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.MachineImagesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MachineImagesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5471,11 +5480,14 @@ def test_machine_images_base_transport(): def test_machine_images_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.machine_images.transports.MachineImagesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.machine_images.transports.MachineImagesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MachineImagesTransport( @@ -5495,9 +5507,12 @@ def test_machine_images_base_transport_with_credentials_file(): def test_machine_images_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.machine_images.transports.MachineImagesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.machine_images.transports.MachineImagesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MachineImagesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_types.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_types.py index f81865f3f315..287dda022458 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_types.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_machine_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -878,10 +883,9 @@ def test_machine_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -926,10 +930,9 @@ def test_machine_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +968,9 @@ def test_machine_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1963,8 +1965,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2035,17 +2038,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = MachineTypesClient(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.MachineTypesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.MachineTypesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineTypesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MachineTypesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.MachineTypesRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MachineTypesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2098,8 +2103,9 @@ def test_get_rest_bad_request(request_type=compute.GetMachineTypeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2188,17 +2194,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = MachineTypesClient(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.MachineTypesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.MachineTypesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineTypesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.MachineTypesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.MachineTypesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.MachineTypesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2247,8 +2251,9 @@ def test_list_rest_bad_request(request_type=compute.ListMachineTypesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2317,17 +2322,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = MachineTypesClient(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.MachineTypesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.MachineTypesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MachineTypesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.MachineTypesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.MachineTypesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.MachineTypesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2480,11 +2483,14 @@ def test_machine_types_base_transport(): def test_machine_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.machine_types.transports.MachineTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.machine_types.transports.MachineTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MachineTypesTransport( @@ -2505,9 +2511,12 @@ def test_machine_types_base_transport_with_credentials_file(): def test_machine_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.machine_types.transports.MachineTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.machine_types.transports.MachineTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MachineTypesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_attachments.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_attachments.py index 358c209d89a8..8250f85eeb4f 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_attachments.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_attachments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_network_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_network_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_network_attachments_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3661,9 +3658,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3946,8 +3943,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4016,18 +4014,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4087,8 +4087,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteNetworkAttachmentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4197,17 +4198,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4262,8 +4265,9 @@ def test_get_rest_bad_request(request_type=compute.GetNetworkAttachmentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4356,17 +4360,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4419,8 +4425,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4487,18 +4494,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4549,8 +4558,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertNetworkAttachmentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4764,17 +4774,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4825,8 +4837,9 @@ def test_list_rest_bad_request(request_type=compute.ListNetworkAttachmentsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4895,17 +4908,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4962,8 +4977,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchNetworkAttachmentReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5181,17 +5197,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5244,8 +5262,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5428,18 +5447,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5492,8 +5513,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5634,18 +5656,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = NetworkAttachmentsClient(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.NetworkAttachmentsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkAttachmentsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkAttachmentsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5928,11 +5952,14 @@ def test_network_attachments_base_transport(): def test_network_attachments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.network_attachments.transports.NetworkAttachmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.network_attachments.transports.NetworkAttachmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkAttachmentsTransport( @@ -5952,9 +5979,12 @@ def test_network_attachments_base_transport_with_credentials_file(): def test_network_attachments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.network_attachments.transports.NetworkAttachmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.network_attachments.transports.NetworkAttachmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkAttachmentsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_edge_security_services.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_edge_security_services.py index a954fdd178a4..c4479c4865d3 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_edge_security_services.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_edge_security_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_network_edge_security_services_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_network_edge_security_services_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_network_edge_security_services_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1576,9 +1573,9 @@ def test_delete_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -1790,9 +1787,9 @@ def test_delete_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -2000,9 +1997,9 @@ def test_get_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -2644,9 +2641,9 @@ def test_patch_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -2878,9 +2875,9 @@ def test_patch_unary_rest_required_fields( # verify required fields with default values are now present - jsonified_request[ - "networkEdgeSecurityService" - ] = "network_edge_security_service_value" + jsonified_request["networkEdgeSecurityService"] = ( + "network_edge_security_service_value" + ) jsonified_request["project"] = "project_value" jsonified_request["region"] = "region_value" @@ -3141,8 +3138,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3215,18 +3213,21 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NetworkEdgeSecurityServicesClient(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.NetworkEdgeSecurityServicesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, + "post_aggregated_list", + ) as post, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3288,8 +3289,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3398,18 +3400,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NetworkEdgeSecurityServicesClient(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.NetworkEdgeSecurityServicesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3466,8 +3470,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3552,17 +3557,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = NetworkEdgeSecurityServicesClient(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.NetworkEdgeSecurityServicesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3617,8 +3625,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3813,18 +3822,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NetworkEdgeSecurityServicesClient(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.NetworkEdgeSecurityServicesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3881,8 +3892,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4081,18 +4093,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = NetworkEdgeSecurityServicesClient(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.NetworkEdgeSecurityServicesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEdgeSecurityServicesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4287,11 +4301,14 @@ def test_network_edge_security_services_base_transport(): def test_network_edge_security_services_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.network_edge_security_services.transports.NetworkEdgeSecurityServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.network_edge_security_services.transports.NetworkEdgeSecurityServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkEdgeSecurityServicesTransport( @@ -4311,9 +4328,12 @@ def test_network_edge_security_services_base_transport_with_credentials_file(): def test_network_edge_security_services_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.network_edge_security_services.transports.NetworkEdgeSecurityServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.network_edge_security_services.transports.NetworkEdgeSecurityServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkEdgeSecurityServicesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_endpoint_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_endpoint_groups.py index d5263725b994..f0a3f3ccecc6 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_endpoint_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_endpoint_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3700,9 +3697,9 @@ def test_list_network_endpoints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_endpoints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_endpoints] = ( + mock_rpc + ) request = {} client.list_network_endpoints(request) @@ -3970,10 +3967,10 @@ def test_list_network_endpoints_rest_pager(transport: str = "rest"): "zone": "sample2", "network_endpoint_group": "sample3", } - sample_request[ - "network_endpoint_groups_list_endpoints_request_resource" - ] = compute.NetworkEndpointGroupsListEndpointsRequest( - health_status="health_status_value" + sample_request["network_endpoint_groups_list_endpoints_request_resource"] = ( + compute.NetworkEndpointGroupsListEndpointsRequest( + health_status="health_status_value" + ) ) pager = client.list_network_endpoints(request=sample_request) @@ -4012,9 +4009,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4297,8 +4294,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4369,18 +4367,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4442,8 +4442,9 @@ def test_attach_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4647,18 +4648,22 @@ def test_attach_network_endpoints_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_attach_network_endpoints" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, - "post_attach_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_attach_network_endpoints" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_attach_network_endpoints", + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_attach_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "pre_attach_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4715,8 +4720,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4825,17 +4831,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4892,8 +4900,9 @@ def test_detach_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5097,18 +5106,22 @@ def test_detach_network_endpoints_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_detach_network_endpoints" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, - "post_detach_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_detach_network_endpoints" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_detach_network_endpoints", + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_detach_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "pre_detach_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5163,8 +5176,9 @@ def test_get_rest_bad_request(request_type=compute.GetNetworkEndpointGroupReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5257,17 +5271,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5322,8 +5338,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5537,17 +5554,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5598,8 +5617,9 @@ def test_list_rest_bad_request(request_type=compute.ListNetworkEndpointGroupsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5668,17 +5688,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5737,8 +5759,9 @@ def test_list_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5896,18 +5919,22 @@ def test_list_network_endpoints_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_list_network_endpoints" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, - "post_list_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_list_network_endpoints" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_list_network_endpoints", + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_list_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "pre_list_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5965,8 +5992,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6107,18 +6135,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = NetworkEndpointGroupsClient(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.NetworkEndpointGroupsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkEndpointGroupsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkEndpointGroupsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6407,11 +6437,14 @@ def test_network_endpoint_groups_base_transport(): def test_network_endpoint_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.network_endpoint_groups.transports.NetworkEndpointGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.network_endpoint_groups.transports.NetworkEndpointGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkEndpointGroupsTransport( @@ -6431,9 +6464,12 @@ def test_network_endpoint_groups_base_transport_with_credentials_file(): def test_network_endpoint_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.network_endpoint_groups.transports.NetworkEndpointGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.network_endpoint_groups.transports.NetworkEndpointGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkEndpointGroupsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_firewall_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_firewall_policies.py index a341ab59be0b..917d330d36d8 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_firewall_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_firewall_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_network_firewall_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_network_firewall_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_network_firewall_policies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -6572,9 +6569,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -6784,9 +6781,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -8040,9 +8037,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -8314,8 +8311,9 @@ def test_add_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8504,18 +8502,20 @@ def test_add_association_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_add_association" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_add_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_add_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_add_association" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_add_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_add_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8568,8 +8568,9 @@ def test_add_packet_mirroring_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8807,20 +8808,22 @@ def test_add_packet_mirroring_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, - "post_add_packet_mirroring_rule", - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_add_packet_mirroring_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "pre_add_packet_mirroring_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_add_packet_mirroring_rule", + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_add_packet_mirroring_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "pre_add_packet_mirroring_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8873,8 +8876,9 @@ def test_add_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9112,17 +9116,20 @@ def test_add_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_add_rule" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_add_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_add_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_add_rule" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_add_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_add_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9175,8 +9182,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9247,18 +9255,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9316,8 +9326,9 @@ def test_clone_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9422,18 +9433,20 @@ def test_clone_rules_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_clone_rules" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_clone_rules_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_clone_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_clone_rules" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_clone_rules_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_clone_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9486,8 +9499,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9592,17 +9606,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9653,8 +9670,9 @@ def test_get_rest_bad_request(request_type=compute.GetNetworkFirewallPolicyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9743,17 +9761,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9806,8 +9826,9 @@ def test_get_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9878,18 +9899,20 @@ def test_get_association_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_get_association" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_get_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_get_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_get_association" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_get_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_get_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9944,8 +9967,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10012,18 +10036,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10076,8 +10102,9 @@ def test_get_packet_mirroring_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10164,20 +10191,22 @@ def test_get_packet_mirroring_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, - "post_get_packet_mirroring_rule", - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_get_packet_mirroring_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "pre_get_packet_mirroring_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_get_packet_mirroring_rule", + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_get_packet_mirroring_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "pre_get_packet_mirroring_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10230,8 +10259,9 @@ def test_get_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10318,17 +10348,20 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_get_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_get_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10381,8 +10414,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10653,17 +10687,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10714,8 +10751,9 @@ def test_list_rest_bad_request(request_type=compute.ListNetworkFirewallPoliciesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10782,17 +10820,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10843,8 +10883,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchNetworkFirewallPolicyR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11115,17 +11156,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11178,8 +11222,9 @@ def test_patch_packet_mirroring_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11419,20 +11464,22 @@ def test_patch_packet_mirroring_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, - "post_patch_packet_mirroring_rule", - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_patch_packet_mirroring_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "pre_patch_packet_mirroring_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_patch_packet_mirroring_rule", + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_patch_packet_mirroring_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "pre_patch_packet_mirroring_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11485,8 +11532,9 @@ def test_patch_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11724,18 +11772,20 @@ def test_patch_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_patch_rule" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_patch_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_patch_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_patch_rule" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_patch_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_patch_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11788,8 +11838,9 @@ def test_remove_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11894,18 +11945,20 @@ def test_remove_association_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_remove_association" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_remove_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_remove_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_remove_association" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_remove_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_remove_association" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11958,8 +12011,9 @@ def test_remove_packet_mirroring_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12064,20 +12118,22 @@ def test_remove_packet_mirroring_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, - "post_remove_packet_mirroring_rule", - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_remove_packet_mirroring_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "pre_remove_packet_mirroring_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_remove_packet_mirroring_rule", + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_remove_packet_mirroring_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "pre_remove_packet_mirroring_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12130,8 +12186,9 @@ def test_remove_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12236,18 +12293,20 @@ def test_remove_rule_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_remove_rule" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_remove_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_remove_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_remove_rule" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_remove_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_remove_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12300,8 +12359,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12484,18 +12544,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12548,8 +12610,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12690,18 +12753,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = NetworkFirewallPoliciesClient(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.NetworkFirewallPoliciesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkFirewallPoliciesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkFirewallPoliciesRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13246,11 +13313,14 @@ def test_network_firewall_policies_base_transport(): def test_network_firewall_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.network_firewall_policies.transports.NetworkFirewallPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.network_firewall_policies.transports.NetworkFirewallPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkFirewallPoliciesTransport( @@ -13270,9 +13340,12 @@ def test_network_firewall_policies_base_transport_with_credentials_file(): def test_network_firewall_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.network_firewall_policies.transports.NetworkFirewallPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.network_firewall_policies.transports.NetworkFirewallPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkFirewallPoliciesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_profiles.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_profiles.py index c275a25c6e7c..01add6b26a73 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_profiles.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_network_profiles.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -909,10 +914,9 @@ def test_network_profiles_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +961,9 @@ def test_network_profiles_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +999,9 @@ def test_network_profiles_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1696,8 +1698,9 @@ def test_get_rest_bad_request(request_type=compute.GetNetworkProfileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1774,17 +1777,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = NetworkProfilesClient(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.NetworkProfilesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NetworkProfilesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkProfilesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkProfilesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.NetworkProfilesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworkProfilesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1835,8 +1838,9 @@ def test_list_rest_bad_request(request_type=compute.ListNetworkProfilesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1909,17 +1913,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = NetworkProfilesClient(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.NetworkProfilesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NetworkProfilesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkProfilesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkProfilesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.NetworkProfilesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworkProfilesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2056,11 +2060,14 @@ def test_network_profiles_base_transport(): def test_network_profiles_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.network_profiles.transports.NetworkProfilesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.network_profiles.transports.NetworkProfilesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkProfilesTransport( @@ -2081,9 +2088,12 @@ def test_network_profiles_base_transport_with_credentials_file(): def test_network_profiles_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.network_profiles.transports.NetworkProfilesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.network_profiles.transports.NetworkProfilesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkProfilesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_networks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_networks.py index 8af52371e52e..55fbec1cddbb 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_networks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_networks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -866,10 +866,9 @@ def test_networks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -914,10 +913,9 @@ def test_networks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -953,10 +951,9 @@ def test_networks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2969,9 +2966,9 @@ def test_list_peering_routes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_peering_routes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_peering_routes] = ( + mock_rpc + ) request = {} client.list_peering_routes(request) @@ -4065,9 +4062,9 @@ def test_request_remove_peering_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.request_remove_peering - ] = mock_rpc + client._transport._wrapped_methods[client._transport.request_remove_peering] = ( + mock_rpc + ) request = {} client.request_remove_peering(request) @@ -4276,9 +4273,9 @@ def test_request_remove_peering_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.request_remove_peering - ] = mock_rpc + client._transport._wrapped_methods[client._transport.request_remove_peering] = ( + mock_rpc + ) request = {} client.request_remove_peering_unary(request) @@ -4487,9 +4484,9 @@ def test_switch_to_custom_mode_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switch_to_custom_mode - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switch_to_custom_mode] = ( + mock_rpc + ) request = {} client.switch_to_custom_mode(request) @@ -4690,9 +4687,9 @@ def test_switch_to_custom_mode_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.switch_to_custom_mode - ] = mock_rpc + client._transport._wrapped_methods[client._transport.switch_to_custom_mode] = ( + mock_rpc + ) request = {} client.switch_to_custom_mode_unary(request) @@ -5372,8 +5369,9 @@ def test_add_peering_rest_bad_request(request_type=compute.AddPeeringNetworkRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5587,17 +5585,17 @@ def test_add_peering_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_add_peering" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_add_peering_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_add_peering" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_add_peering" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_add_peering_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworksRestInterceptor, "pre_add_peering") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5648,8 +5646,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteNetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5752,17 +5751,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NetworksRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworksRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5811,8 +5808,9 @@ def test_get_rest_bad_request(request_type=compute.GetNetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5908,17 +5906,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NetworksRestInterceptor, "post_get") as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworksRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5969,8 +5965,9 @@ def test_get_effective_firewalls_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6028,17 +6025,20 @@ def test_get_effective_firewalls_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_get_effective_firewalls" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_get_effective_firewalls_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_get_effective_firewalls" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_get_effective_firewalls" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, + "post_get_effective_firewalls_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_get_effective_firewalls" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6094,8 +6094,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertNetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6324,17 +6325,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NetworksRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworksRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6383,8 +6382,9 @@ def test_list_rest_bad_request(request_type=compute.ListNetworksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6451,17 +6451,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NetworksRestInterceptor, "post_list") as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworksRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6512,8 +6510,9 @@ def test_list_peering_routes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6580,17 +6579,19 @@ def test_list_peering_routes_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_list_peering_routes" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_list_peering_routes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_list_peering_routes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_list_peering_routes" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_list_peering_routes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_list_peering_routes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6643,8 +6644,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchNetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6873,17 +6875,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NetworksRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetworksRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6934,8 +6934,9 @@ def test_remove_peering_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7119,17 +7120,19 @@ def test_remove_peering_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_remove_peering" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_remove_peering_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_remove_peering" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_remove_peering" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_remove_peering_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_remove_peering" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7182,8 +7185,9 @@ def test_request_remove_peering_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7371,17 +7375,20 @@ def test_request_remove_peering_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_request_remove_peering" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_request_remove_peering_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_request_remove_peering" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_request_remove_peering" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, + "post_request_remove_peering_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_request_remove_peering" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7434,8 +7441,9 @@ def test_switch_to_custom_mode_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7538,17 +7546,20 @@ def test_switch_to_custom_mode_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_switch_to_custom_mode" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_switch_to_custom_mode_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_switch_to_custom_mode" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_switch_to_custom_mode" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, + "post_switch_to_custom_mode_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_switch_to_custom_mode" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7601,8 +7612,9 @@ def test_update_peering_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7816,17 +7828,19 @@ def test_update_peering_rest_interceptors(null_interceptor): ) client = NetworksClient(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.NetworksRestInterceptor, "post_update_peering" - ) as post, mock.patch.object( - transports.NetworksRestInterceptor, "post_update_peering_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworksRestInterceptor, "pre_update_peering" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworksRestInterceptor, "post_update_peering" + ) as post, + mock.patch.object( + transports.NetworksRestInterceptor, "post_update_peering_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworksRestInterceptor, "pre_update_peering" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8176,11 +8190,14 @@ def test_networks_base_transport(): def test_networks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.networks.transports.NetworksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.networks.transports.NetworksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworksTransport( @@ -8200,9 +8217,12 @@ def test_networks_base_transport_with_credentials_file(): def test_networks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.networks.transports.NetworksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.networks.transports.NetworksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworksTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_groups.py index fe274f773961..c69735f1ef87 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +877,9 @@ def test_node_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +924,9 @@ def test_node_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +962,9 @@ def test_node_groups_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4548,9 +4545,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -4769,9 +4766,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -5199,9 +5196,9 @@ def test_set_node_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_template] = ( + mock_rpc + ) request = {} client.set_node_template(request) @@ -5418,9 +5415,9 @@ def test_set_node_template_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_template] = ( + mock_rpc + ) request = {} client.set_node_template_unary(request) @@ -6083,9 +6080,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6366,8 +6363,9 @@ def test_add_nodes_rest_bad_request(request_type=compute.AddNodesNodeGroupReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6553,17 +6551,17 @@ def test_add_nodes_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_add_nodes" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_add_nodes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_add_nodes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_add_nodes" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_add_nodes_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeGroupsRestInterceptor, "pre_add_nodes") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6616,8 +6614,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6688,17 +6687,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6751,8 +6752,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteNodeGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6857,17 +6859,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeGroupsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeGroupsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6918,8 +6918,9 @@ def test_delete_nodes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7107,17 +7108,19 @@ def test_delete_nodes_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_delete_nodes" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_delete_nodes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_delete_nodes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_delete_nodes" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_delete_nodes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_delete_nodes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7168,8 +7171,9 @@ def test_get_rest_bad_request(request_type=compute.GetNodeGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7258,17 +7262,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeGroupsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeGroupsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7319,8 +7321,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7387,17 +7390,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7448,8 +7453,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertNodeGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7647,17 +7653,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeGroupsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeGroupsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7706,8 +7710,9 @@ def test_list_rest_bad_request(request_type=compute.ListNodeGroupsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7776,17 +7781,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeGroupsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeGroupsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7835,8 +7838,9 @@ def test_list_nodes_rest_bad_request(request_type=compute.ListNodesNodeGroupsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7905,17 +7909,19 @@ def test_list_nodes_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_list_nodes" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_list_nodes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_list_nodes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_list_nodes" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_list_nodes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_list_nodes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7968,8 +7974,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchNodeGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8167,17 +8174,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeGroupsRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeGroupsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8228,8 +8233,9 @@ def test_perform_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8420,17 +8426,20 @@ def test_perform_maintenance_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_perform_maintenance" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_perform_maintenance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_perform_maintenance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_perform_maintenance" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, + "post_perform_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_perform_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8483,8 +8492,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8667,17 +8677,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8730,8 +8742,9 @@ def test_set_node_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8921,17 +8934,19 @@ def test_set_node_template_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_set_node_template" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_set_node_template_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_set_node_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_set_node_template" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_set_node_template_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_set_node_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8984,8 +8999,9 @@ def test_simulate_maintenance_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9175,18 +9191,20 @@ def test_simulate_maintenance_event_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_simulate_maintenance_event" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, - "post_simulate_maintenance_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_simulate_maintenance_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_simulate_maintenance_event" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, + "post_simulate_maintenance_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_simulate_maintenance_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9239,8 +9257,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9381,17 +9400,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = NodeGroupsClient(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.NodeGroupsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.NodeGroupsRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.NodeGroupsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9806,11 +9828,14 @@ def test_node_groups_base_transport(): def test_node_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.node_groups.transports.NodeGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.node_groups.transports.NodeGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeGroupsTransport( @@ -9830,9 +9855,12 @@ def test_node_groups_base_transport_with_credentials_file(): def test_node_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.node_groups.transports.NodeGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.node_groups.transports.NodeGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeGroupsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_templates.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_templates.py index 953bf8fe8512..7bdd165df584 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_templates.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_templates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_node_templates_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_node_templates_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_node_templates_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3157,9 +3154,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3442,8 +3439,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3514,17 +3512,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3581,8 +3582,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteNodeTemplateRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3691,17 +3693,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeTemplatesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3756,8 +3758,9 @@ def test_get_rest_bad_request(request_type=compute.GetNodeTemplateRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3844,17 +3847,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeTemplatesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeTemplatesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3905,8 +3906,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3973,17 +3975,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4034,8 +4038,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertNodeTemplateRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4235,17 +4240,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeTemplatesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4296,8 +4301,9 @@ def test_list_rest_bad_request(request_type=compute.ListNodeTemplatesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4366,17 +4372,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeTemplatesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeTemplatesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4429,8 +4433,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4613,17 +4618,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4676,8 +4683,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4818,18 +4826,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = NodeTemplatesClient(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.NodeTemplatesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.NodeTemplatesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NodeTemplatesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeTemplatesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5091,11 +5101,14 @@ def test_node_templates_base_transport(): def test_node_templates_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.node_templates.transports.NodeTemplatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.node_templates.transports.NodeTemplatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeTemplatesTransport( @@ -5115,9 +5128,12 @@ def test_node_templates_base_transport_with_credentials_file(): def test_node_templates_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.node_templates.transports.NodeTemplatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.node_templates.transports.NodeTemplatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeTemplatesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_types.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_types.py index 3570a1b427be..5681eb0d330d 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_types.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_node_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -868,10 +873,9 @@ def test_node_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -916,10 +920,9 @@ def test_node_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +958,9 @@ def test_node_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1950,8 +1952,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2020,17 +2023,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = NodeTypesClient(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.NodeTypesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.NodeTypesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTypesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeTypesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.NodeTypesRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NodeTypesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2083,8 +2088,9 @@ def test_get_rest_bad_request(request_type=compute.GetNodeTypeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2167,17 +2173,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = NodeTypesClient(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.NodeTypesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.NodeTypesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTypesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeTypesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.NodeTypesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeTypesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2226,8 +2230,9 @@ def test_list_rest_bad_request(request_type=compute.ListNodeTypesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2294,17 +2299,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = NodeTypesClient(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.NodeTypesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.NodeTypesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NodeTypesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NodeTypesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.NodeTypesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NodeTypesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2455,11 +2458,14 @@ def test_node_types_base_transport(): def test_node_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.node_types.transports.NodeTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.node_types.transports.NodeTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeTypesTransport( @@ -2480,9 +2486,12 @@ def test_node_types_base_transport_with_credentials_file(): def test_node_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.node_types.transports.NodeTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.node_types.transports.NodeTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeTypesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_organization_security_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_organization_security_policies.py index c9807bb68632..7b66a8d365d3 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_organization_security_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_organization_security_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -976,10 +976,9 @@ def test_organization_security_policies_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1023,9 @@ def test_organization_security_policies_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1061,9 @@ def test_organization_security_policies_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3877,9 +3874,9 @@ def test_list_associations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_associations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_associations] = ( + mock_rpc + ) request = {} client.list_associations(request) @@ -5184,9 +5181,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -5385,9 +5382,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -6050,8 +6047,9 @@ def test_add_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6242,18 +6240,22 @@ def test_add_association_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_add_association" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_add_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_add_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_add_association", + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_add_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "pre_add_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6306,8 +6308,9 @@ def test_add_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6575,18 +6578,20 @@ def test_add_rule_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_add_rule" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_add_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_add_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_add_rule" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_add_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_add_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6639,8 +6644,9 @@ def test_copy_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6745,18 +6751,20 @@ def test_copy_rules_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_copy_rules" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_copy_rules_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_copy_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_copy_rules" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_copy_rules_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_copy_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6809,8 +6817,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6915,18 +6924,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6979,8 +6990,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7065,17 +7077,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7128,8 +7143,9 @@ def test_get_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7204,18 +7220,22 @@ def test_get_association_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_get_association" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_get_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_get_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_get_association", + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_get_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "pre_get_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7270,8 +7290,9 @@ def test_get_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7342,18 +7363,20 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_get_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_get_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7406,8 +7429,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7765,18 +7789,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7829,8 +7855,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7897,18 +7924,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7961,8 +7990,9 @@ def test_list_associations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8029,18 +8059,22 @@ def test_list_associations_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_list_associations" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_list_associations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_list_associations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_list_associations", + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_list_associations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "pre_list_associations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8102,8 +8136,9 @@ def test_list_preconfigured_expression_sets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8169,20 +8204,22 @@ def test_list_preconfigured_expression_sets_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, - "post_list_preconfigured_expression_sets", - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_list_preconfigured_expression_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "pre_list_preconfigured_expression_sets", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_list_preconfigured_expression_sets", + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_list_preconfigured_expression_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "pre_list_preconfigured_expression_sets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8246,8 +8283,9 @@ def test_move_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8352,18 +8390,20 @@ def test_move_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_move" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_move_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_move" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_move" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_move_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_move" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8416,8 +8456,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8775,18 +8816,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8839,8 +8882,9 @@ def test_patch_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9108,18 +9152,20 @@ def test_patch_rule_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_patch_rule" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_patch_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_patch_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_patch_rule" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_patch_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_patch_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9172,8 +9218,9 @@ def test_remove_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9278,19 +9325,22 @@ def test_remove_association_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, - "post_remove_association", - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_remove_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_remove_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_remove_association", + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_remove_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "pre_remove_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9343,8 +9393,9 @@ def test_remove_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9449,18 +9500,20 @@ def test_remove_rule_rest_interceptors(null_interceptor): ) client = OrganizationSecurityPoliciesClient(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.OrganizationSecurityPoliciesRestInterceptor, "post_remove_rule" - ) as post, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, - "post_remove_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityPoliciesRestInterceptor, "pre_remove_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "post_remove_rule" + ) as post, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, + "post_remove_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityPoliciesRestInterceptor, "pre_remove_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9894,11 +9947,14 @@ def test_organization_security_policies_base_transport(): def test_organization_security_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.organization_security_policies.transports.OrganizationSecurityPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.organization_security_policies.transports.OrganizationSecurityPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrganizationSecurityPoliciesTransport( @@ -9918,9 +9974,12 @@ def test_organization_security_policies_base_transport_with_credentials_file(): def test_organization_security_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.organization_security_policies.transports.OrganizationSecurityPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.organization_security_policies.transports.OrganizationSecurityPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrganizationSecurityPoliciesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_packet_mirrorings.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_packet_mirrorings.py index 18ebd1512bfa..0f7c6b2b47ff 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_packet_mirrorings.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_packet_mirrorings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_packet_mirrorings_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_packet_mirrorings_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_packet_mirrorings_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3213,9 +3210,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3498,8 +3495,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3570,17 +3568,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3640,8 +3641,9 @@ def test_delete_rest_bad_request(request_type=compute.DeletePacketMirroringReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3750,17 +3752,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3815,8 +3819,9 @@ def test_get_rest_bad_request(request_type=compute.GetPacketMirroringRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3899,17 +3904,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PacketMirroringsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3960,8 +3965,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertPacketMirroringReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4164,17 +4170,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4225,8 +4233,9 @@ def test_list_rest_bad_request(request_type=compute.ListPacketMirroringsRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4295,17 +4304,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4362,8 +4373,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchPacketMirroringRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4570,17 +4582,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4633,8 +4647,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4775,18 +4790,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = PacketMirroringsClient(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.PacketMirroringsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.PacketMirroringsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PacketMirroringsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PacketMirroringsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5027,11 +5044,14 @@ def test_packet_mirrorings_base_transport(): def test_packet_mirrorings_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.packet_mirrorings.transports.PacketMirroringsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.packet_mirrorings.transports.PacketMirroringsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PacketMirroringsTransport( @@ -5051,9 +5071,12 @@ def test_packet_mirrorings_base_transport_with_credentials_file(): def test_packet_mirrorings_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.packet_mirrorings.transports.PacketMirroringsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.packet_mirrorings.transports.PacketMirroringsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PacketMirroringsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_preview_features.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_preview_features.py index 35af77aeb99e..68f5954f6717 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_preview_features.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_preview_features.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_preview_features_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_preview_features_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_preview_features_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2111,8 +2108,9 @@ def test_get_rest_bad_request(request_type=compute.GetPreviewFeatureRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2187,17 +2185,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = PreviewFeaturesClient(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.PreviewFeaturesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.PreviewFeaturesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PreviewFeaturesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PreviewFeaturesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2248,8 +2246,9 @@ def test_list_rest_bad_request(request_type=compute.ListPreviewFeaturesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2320,17 +2319,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = PreviewFeaturesClient(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.PreviewFeaturesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.PreviewFeaturesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PreviewFeaturesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PreviewFeaturesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2381,8 +2380,9 @@ def test_update_rest_bad_request(request_type=compute.UpdatePreviewFeatureReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2581,17 +2581,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = PreviewFeaturesClient(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.PreviewFeaturesRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.PreviewFeaturesRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PreviewFeaturesRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PreviewFeaturesRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2744,11 +2746,14 @@ def test_preview_features_base_transport(): def test_preview_features_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.preview_features.transports.PreviewFeaturesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.preview_features.transports.PreviewFeaturesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PreviewFeaturesTransport( @@ -2768,9 +2773,12 @@ def test_preview_features_base_transport_with_credentials_file(): def test_preview_features_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.preview_features.transports.PreviewFeaturesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.preview_features.transports.PreviewFeaturesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PreviewFeaturesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_projects.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_projects.py index 30fc8da45373..56c07a64e5b4 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_projects.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_projects.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -866,10 +866,9 @@ def test_projects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -914,10 +913,9 @@ def test_projects_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -953,10 +951,9 @@ def test_projects_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1133,9 +1130,9 @@ def test_disable_xpn_host_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_host - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_host] = ( + mock_rpc + ) request = {} client.disable_xpn_host(request) @@ -1318,9 +1315,9 @@ def test_disable_xpn_host_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_host - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_host] = ( + mock_rpc + ) request = {} client.disable_xpn_host_unary(request) @@ -1505,9 +1502,9 @@ def test_disable_xpn_resource_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_resource] = ( + mock_rpc + ) request = {} client.disable_xpn_resource(request) @@ -1708,9 +1705,9 @@ def test_disable_xpn_resource_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_xpn_resource] = ( + mock_rpc + ) request = {} client.disable_xpn_resource_unary(request) @@ -2277,9 +2274,9 @@ def test_enable_xpn_resource_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_xpn_resource] = ( + mock_rpc + ) request = {} client.enable_xpn_resource(request) @@ -2480,9 +2477,9 @@ def test_enable_xpn_resource_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_xpn_resource - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_xpn_resource] = ( + mock_rpc + ) request = {} client.enable_xpn_resource_unary(request) @@ -3032,9 +3029,9 @@ def test_get_xpn_resources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_xpn_resources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_xpn_resources] = ( + mock_rpc + ) request = {} client.get_xpn_resources(request) @@ -3531,9 +3528,9 @@ def test_list_xpn_hosts_rest_pager(transport: str = "rest"): req.side_effect = return_values sample_request = {"project": "sample1"} - sample_request[ - "projects_list_xpn_hosts_request_resource" - ] = compute.ProjectsListXpnHostsRequest(organization="organization_value") + sample_request["projects_list_xpn_hosts_request_resource"] = ( + compute.ProjectsListXpnHostsRequest(organization="organization_value") + ) pager = client.list_xpn_hosts(request=sample_request) @@ -4359,9 +4356,9 @@ def test_set_cloud_armor_tier_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_cloud_armor_tier - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_cloud_armor_tier] = ( + mock_rpc + ) request = {} client.set_cloud_armor_tier(request) @@ -4562,9 +4559,9 @@ def test_set_cloud_armor_tier_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_cloud_armor_tier - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_cloud_armor_tier] = ( + mock_rpc + ) request = {} client.set_cloud_armor_tier_unary(request) @@ -6053,8 +6050,9 @@ def test_disable_xpn_host_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6157,17 +6155,19 @@ def test_disable_xpn_host_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_disable_xpn_host" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_disable_xpn_host_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_disable_xpn_host" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_disable_xpn_host" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_disable_xpn_host_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_disable_xpn_host" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6220,8 +6220,9 @@ def test_disable_xpn_resource_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6409,17 +6410,20 @@ def test_disable_xpn_resource_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_disable_xpn_resource" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_disable_xpn_resource_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_disable_xpn_resource" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_disable_xpn_resource" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, + "post_disable_xpn_resource_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_disable_xpn_resource" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6472,8 +6476,9 @@ def test_enable_xpn_host_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6576,17 +6581,19 @@ def test_enable_xpn_host_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_enable_xpn_host" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_enable_xpn_host_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_enable_xpn_host" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_enable_xpn_host" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_enable_xpn_host_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_enable_xpn_host" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6639,8 +6646,9 @@ def test_enable_xpn_resource_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6828,17 +6836,19 @@ def test_enable_xpn_resource_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_enable_xpn_resource" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_enable_xpn_resource_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_enable_xpn_resource" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_enable_xpn_resource" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_enable_xpn_resource_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_enable_xpn_resource" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6889,8 +6899,9 @@ def test_get_rest_bad_request(request_type=compute.GetProjectRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6973,17 +6984,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ProjectsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ProjectsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7032,8 +7041,9 @@ def test_get_xpn_host_rest_bad_request(request_type=compute.GetXpnHostProjectReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7116,17 +7126,19 @@ def test_get_xpn_host_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_get_xpn_host" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_get_xpn_host_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_get_xpn_host" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_get_xpn_host" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_get_xpn_host_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_get_xpn_host" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7179,8 +7191,9 @@ def test_get_xpn_resources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7243,17 +7256,19 @@ def test_get_xpn_resources_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_get_xpn_resources" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_get_xpn_resources_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_get_xpn_resources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_get_xpn_resources" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_get_xpn_resources_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_get_xpn_resources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7308,8 +7323,9 @@ def test_list_xpn_hosts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7459,17 +7475,19 @@ def test_list_xpn_hosts_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_list_xpn_hosts" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_list_xpn_hosts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_list_xpn_hosts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_list_xpn_hosts" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_list_xpn_hosts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_list_xpn_hosts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7520,8 +7538,9 @@ def test_move_disk_rest_bad_request(request_type=compute.MoveDiskProjectRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7701,17 +7720,15 @@ def test_move_disk_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_move_disk" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_move_disk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_move_disk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ProjectsRestInterceptor, "post_move_disk") as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_move_disk_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ProjectsRestInterceptor, "pre_move_disk") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7762,8 +7779,9 @@ def test_move_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7945,17 +7963,19 @@ def test_move_instance_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_move_instance" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_move_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_move_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_move_instance" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_move_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_move_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8008,8 +8028,9 @@ def test_set_cloud_armor_tier_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8197,17 +8218,20 @@ def test_set_cloud_armor_tier_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_set_cloud_armor_tier" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_set_cloud_armor_tier_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_set_cloud_armor_tier" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_set_cloud_armor_tier" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, + "post_set_cloud_armor_tier_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_set_cloud_armor_tier" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8260,8 +8284,9 @@ def test_set_common_instance_metadata_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8438,18 +8463,20 @@ def test_set_common_instance_metadata_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_set_common_instance_metadata" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, - "post_set_common_instance_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_set_common_instance_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_set_common_instance_metadata" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, + "post_set_common_instance_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_set_common_instance_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8502,8 +8529,9 @@ def test_set_default_network_tier_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8691,18 +8719,20 @@ def test_set_default_network_tier_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_set_default_network_tier" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, - "post_set_default_network_tier_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_set_default_network_tier" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_set_default_network_tier" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, + "post_set_default_network_tier_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_set_default_network_tier" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8755,8 +8785,9 @@ def test_set_usage_export_bucket_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8938,17 +8969,20 @@ def test_set_usage_export_bucket_rest_interceptors(null_interceptor): ) client = ProjectsClient(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.ProjectsRestInterceptor, "post_set_usage_export_bucket" - ) as post, mock.patch.object( - transports.ProjectsRestInterceptor, "post_set_usage_export_bucket_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectsRestInterceptor, "pre_set_usage_export_bucket" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectsRestInterceptor, "post_set_usage_export_bucket" + ) as post, + mock.patch.object( + transports.ProjectsRestInterceptor, + "post_set_usage_export_bucket_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectsRestInterceptor, "pre_set_usage_export_bucket" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9346,11 +9380,14 @@ def test_projects_base_transport(): def test_projects_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.projects.transports.ProjectsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.projects.transports.ProjectsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectsTransport( @@ -9370,9 +9407,12 @@ def test_projects_base_transport_with_credentials_file(): def test_projects_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.projects.transports.ProjectsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.projects.transports.ProjectsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_advertised_prefixes.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_advertised_prefixes.py index 237369971096..6a1771345137 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_advertised_prefixes.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_advertised_prefixes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -945,10 +945,9 @@ def test_public_advertised_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +992,9 @@ def test_public_advertised_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1030,9 @@ def test_public_advertised_prefixes_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3763,8 +3760,9 @@ def test_announce_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3869,18 +3867,20 @@ def test_announce_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_announce" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, - "post_announce_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_announce" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_announce" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, + "post_announce_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_announce" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3933,8 +3933,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4039,17 +4040,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4100,8 +4104,9 @@ def test_get_rest_bad_request(request_type=compute.GetPublicAdvertisedPrefixeReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4190,17 +4195,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4255,8 +4262,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4461,17 +4469,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4524,8 +4535,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4594,17 +4606,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4659,8 +4674,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4865,17 +4881,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4928,8 +4947,9 @@ def test_withdraw_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5034,18 +5054,20 @@ def test_withdraw_rest_interceptors(null_interceptor): ) client = PublicAdvertisedPrefixesClient(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.PublicAdvertisedPrefixesRestInterceptor, "post_withdraw" - ) as post, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, - "post_withdraw_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PublicAdvertisedPrefixesRestInterceptor, "pre_withdraw" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "post_withdraw" + ) as post, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, + "post_withdraw_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicAdvertisedPrefixesRestInterceptor, "pre_withdraw" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5282,11 +5304,14 @@ def test_public_advertised_prefixes_base_transport(): def test_public_advertised_prefixes_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.public_advertised_prefixes.transports.PublicAdvertisedPrefixesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.public_advertised_prefixes.transports.PublicAdvertisedPrefixesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PublicAdvertisedPrefixesTransport( @@ -5306,9 +5331,12 @@ def test_public_advertised_prefixes_base_transport_with_credentials_file(): def test_public_advertised_prefixes_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.public_advertised_prefixes.transports.PublicAdvertisedPrefixesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.public_advertised_prefixes.transports.PublicAdvertisedPrefixesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PublicAdvertisedPrefixesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_delegated_prefixes.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_delegated_prefixes.py index a00f4fb7685d..1b0a08ffee60 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_delegated_prefixes.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_public_delegated_prefixes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_public_delegated_prefixes_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -4141,8 +4138,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4213,18 +4211,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4286,8 +4286,9 @@ def test_announce_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4396,17 +4397,20 @@ def test_announce_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_announce" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_announce_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_announce" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_announce" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, + "post_announce_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_announce" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4463,8 +4467,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4573,17 +4578,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4638,8 +4646,9 @@ def test_get_rest_bad_request(request_type=compute.GetPublicDelegatedPrefixeRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4738,17 +4747,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4803,8 +4814,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5018,17 +5030,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5079,8 +5094,9 @@ def test_list_rest_bad_request(request_type=compute.ListPublicDelegatedPrefixesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5149,17 +5165,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5218,8 +5236,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5437,17 +5456,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5504,8 +5526,9 @@ def test_withdraw_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5614,17 +5637,20 @@ def test_withdraw_rest_interceptors(null_interceptor): ) client = PublicDelegatedPrefixesClient(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.PublicDelegatedPrefixesRestInterceptor, "post_withdraw" - ) as post, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "post_withdraw_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublicDelegatedPrefixesRestInterceptor, "pre_withdraw" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "post_withdraw" + ) as post, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, + "post_withdraw_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublicDelegatedPrefixesRestInterceptor, "pre_withdraw" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5882,11 +5908,14 @@ def test_public_delegated_prefixes_base_transport(): def test_public_delegated_prefixes_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.public_delegated_prefixes.transports.PublicDelegatedPrefixesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.public_delegated_prefixes.transports.PublicDelegatedPrefixesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PublicDelegatedPrefixesTransport( @@ -5906,9 +5935,12 @@ def test_public_delegated_prefixes_base_transport_with_credentials_file(): def test_public_delegated_prefixes_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.public_delegated_prefixes.transports.PublicDelegatedPrefixesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.public_delegated_prefixes.transports.PublicDelegatedPrefixesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PublicDelegatedPrefixesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_autoscalers.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_autoscalers.py index a35683adf8fa..298cd02de9d0 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_autoscalers.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_autoscalers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_region_autoscalers_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_region_autoscalers_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_region_autoscalers_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2929,9 +2926,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3644,8 +3641,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionAutoscalerRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3750,17 +3748,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3811,8 +3811,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionAutoscalerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3895,17 +3896,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3956,8 +3959,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionAutoscalerRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4175,17 +4179,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4236,8 +4242,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionAutoscalersRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4306,17 +4313,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4369,8 +4378,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionAutoscalerReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4586,17 +4596,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4649,8 +4661,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4791,18 +4804,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4855,8 +4870,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateRegionAutoscalerRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5074,17 +5090,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionAutoscalersClient(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.RegionAutoscalersRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionAutoscalersRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionAutoscalersRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5323,11 +5341,14 @@ def test_region_autoscalers_base_transport(): def test_region_autoscalers_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_autoscalers.transports.RegionAutoscalersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_autoscalers.transports.RegionAutoscalersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionAutoscalersTransport( @@ -5347,9 +5368,12 @@ def test_region_autoscalers_base_transport_with_credentials_file(): def test_region_autoscalers_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_autoscalers.transports.RegionAutoscalersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_autoscalers.transports.RegionAutoscalersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionAutoscalersTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_backend_services.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_backend_services.py index 6717f144c804..0ca75846797a 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_backend_services.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_backend_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_region_backend_services_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_region_backend_services_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_region_backend_services_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3849,9 +3846,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -4070,9 +4067,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -4291,9 +4288,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5014,8 +5011,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5124,17 +5122,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5189,8 +5189,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionBackendServiceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5320,17 +5321,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5387,8 +5390,9 @@ def test_get_health_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5531,17 +5535,20 @@ def test_get_health_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_get_health" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_get_health_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_get_health" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_get_health" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, + "post_get_health_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_get_health" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5596,8 +5603,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5664,18 +5672,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5728,8 +5738,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6102,17 +6113,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6163,8 +6176,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionBackendServicesReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6233,17 +6247,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6296,8 +6312,9 @@ def test_list_usable_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6366,18 +6383,20 @@ def test_list_usable_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_list_usable" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, - "post_list_usable_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_list_usable" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_list_usable" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, + "post_list_usable_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_list_usable" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6434,8 +6453,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionBackendServiceRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6812,17 +6832,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6875,8 +6897,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7059,18 +7082,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7127,8 +7152,9 @@ def test_set_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7315,18 +7341,20 @@ def test_set_security_policy_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_set_security_policy" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, - "post_set_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_set_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_set_security_policy" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, + "post_set_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_set_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7379,8 +7407,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7521,18 +7550,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7591,8 +7622,9 @@ def test_update_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7969,17 +8001,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionBackendServicesClient(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.RegionBackendServicesRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionBackendServicesRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionBackendServicesRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8325,11 +8359,14 @@ def test_region_backend_services_base_transport(): def test_region_backend_services_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_backend_services.transports.RegionBackendServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_backend_services.transports.RegionBackendServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionBackendServicesTransport( @@ -8349,9 +8386,12 @@ def test_region_backend_services_base_transport_with_credentials_file(): def test_region_backend_services_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_backend_services.transports.RegionBackendServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_backend_services.transports.RegionBackendServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionBackendServicesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_commitments.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_commitments.py index 23741f36f192..1a709c17106a 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_commitments.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_commitments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_region_commitments_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_region_commitments_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_region_commitments_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2869,8 +2866,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2941,18 +2939,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = RegionCommitmentsClient(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.RegionCommitmentsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3005,8 +3005,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionCommitmentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3105,17 +3106,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionCommitmentsClient(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.RegionCommitmentsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3166,8 +3169,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionCommitmentRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3483,17 +3487,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionCommitmentsClient(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.RegionCommitmentsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3544,8 +3550,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionCommitmentsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3614,17 +3621,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionCommitmentsClient(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.RegionCommitmentsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3675,8 +3684,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateRegionCommitmentRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3992,17 +4002,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionCommitmentsClient(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.RegionCommitmentsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionCommitmentsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionCommitmentsRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4197,11 +4209,14 @@ def test_region_commitments_base_transport(): def test_region_commitments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_commitments.transports.RegionCommitmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_commitments.transports.RegionCommitmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionCommitmentsTransport( @@ -4221,9 +4236,12 @@ def test_region_commitments_base_transport_with_credentials_file(): def test_region_commitments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_commitments.transports.RegionCommitmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_commitments.transports.RegionCommitmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionCommitmentsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disk_types.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disk_types.py index cf4826994ffc..f864f9f45003 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disk_types.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disk_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -909,10 +914,9 @@ def test_region_disk_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -957,10 +961,9 @@ def test_region_disk_types_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +999,9 @@ def test_region_disk_types_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1716,8 +1718,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionDiskTypeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1798,17 +1801,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionDiskTypesClient(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.RegionDiskTypesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionDiskTypesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDiskTypesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDiskTypesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionDiskTypesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDiskTypesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1859,8 +1862,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionDiskTypesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1929,17 +1933,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionDiskTypesClient(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.RegionDiskTypesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionDiskTypesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDiskTypesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDiskTypesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionDiskTypesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDiskTypesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2071,11 +2075,14 @@ def test_region_disk_types_base_transport(): def test_region_disk_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_disk_types.transports.RegionDiskTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_disk_types.transports.RegionDiskTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionDiskTypesTransport( @@ -2096,9 +2103,12 @@ def test_region_disk_types_base_transport_with_credentials_file(): def test_region_disk_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_disk_types.transports.RegionDiskTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_disk_types.transports.RegionDiskTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionDiskTypesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disks.py index 4f563064d9fc..87b9a97a52a1 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_disks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_region_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_region_disks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_region_disks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1151,9 +1148,9 @@ def test_add_resource_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies(request) @@ -1369,9 +1366,9 @@ def test_add_resource_policies_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_resource_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_resource_policies] = ( + mock_rpc + ) request = {} client.add_resource_policies_unary(request) @@ -5859,9 +5856,9 @@ def test_stop_async_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication(request) @@ -6069,9 +6066,9 @@ def test_stop_async_replication_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_async_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_async_replication] = ( + mock_rpc + ) request = {} client.stop_async_replication_unary(request) @@ -6702,9 +6699,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -7427,8 +7424,9 @@ def test_add_resource_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7618,18 +7616,20 @@ def test_add_resource_policies_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_add_resource_policies" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, - "post_add_resource_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_add_resource_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_add_resource_policies" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, + "post_add_resource_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_add_resource_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7680,8 +7680,9 @@ def test_bulk_insert_rest_bad_request(request_type=compute.BulkInsertRegionDiskR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7864,17 +7865,19 @@ def test_bulk_insert_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_bulk_insert" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_bulk_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_bulk_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_bulk_insert" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_bulk_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_bulk_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7927,8 +7930,9 @@ def test_create_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8148,17 +8152,19 @@ def test_create_snapshot_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_create_snapshot" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_create_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_create_snapshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_create_snapshot" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_create_snapshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_create_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8209,8 +8215,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8315,17 +8322,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionDisksRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDisksRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8376,8 +8381,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8526,17 +8532,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionDisksRestInterceptor, "post_get") as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDisksRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8587,8 +8591,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8655,17 +8660,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8716,8 +8723,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8955,17 +8963,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionDisksRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDisksRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9016,8 +9022,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionDisksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9086,17 +9093,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionDisksRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDisksRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9147,8 +9152,9 @@ def test_remove_resource_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9338,18 +9344,20 @@ def test_remove_resource_policies_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_remove_resource_policies" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, - "post_remove_resource_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_remove_resource_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_remove_resource_policies" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, + "post_remove_resource_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_remove_resource_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9400,8 +9408,9 @@ def test_resize_rest_bad_request(request_type=compute.ResizeRegionDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9584,17 +9593,15 @@ def test_resize_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_resize" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_resize_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_resize" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionDisksRestInterceptor, "post_resize") as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_resize_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDisksRestInterceptor, "pre_resize") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9647,8 +9654,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9831,17 +9839,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9892,8 +9902,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsRegionDiskReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10077,17 +10088,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10140,8 +10153,9 @@ def test_start_async_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10331,18 +10345,20 @@ def test_start_async_replication_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_start_async_replication" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, - "post_start_async_replication_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_start_async_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_start_async_replication" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, + "post_start_async_replication_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_start_async_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10395,8 +10411,9 @@ def test_stop_async_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10501,18 +10518,20 @@ def test_stop_async_replication_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_stop_async_replication" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, - "post_stop_async_replication_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_stop_async_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_stop_async_replication" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, + "post_stop_async_replication_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_stop_async_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10565,8 +10584,9 @@ def test_stop_group_async_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10756,18 +10776,20 @@ def test_stop_group_async_replication_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_stop_group_async_replication" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, - "post_stop_group_async_replication_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_stop_group_async_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_stop_group_async_replication" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, + "post_stop_group_async_replication_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_stop_group_async_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10820,8 +10842,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10962,17 +10985,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionDisksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11025,8 +11051,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateRegionDiskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11264,17 +11291,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionDisksClient(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.RegionDisksRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionDisksRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionDisksRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionDisksRestInterceptor, "post_update") as post, + mock.patch.object( + transports.RegionDisksRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionDisksRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11733,11 +11758,14 @@ def test_region_disks_base_transport(): def test_region_disks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_disks.transports.RegionDisksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_disks.transports.RegionDisksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionDisksTransport( @@ -11757,9 +11785,12 @@ def test_region_disks_base_transport_with_credentials_file(): def test_region_disks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_disks.transports.RegionDisksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_disks.transports.RegionDisksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionDisksTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_check_services.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_check_services.py index 6daae1bab07d..73a426dc0042 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_check_services.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_check_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -950,10 +950,9 @@ def test_region_health_check_services_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +997,9 @@ def test_region_health_check_services_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1035,9 @@ def test_region_health_check_services_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3042,8 +3039,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3152,17 +3150,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionHealthCheckServicesClient(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.RegionHealthCheckServicesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3217,8 +3218,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionHealthCheckServiceRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3310,17 +3312,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionHealthCheckServicesClient(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.RegionHealthCheckServicesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3373,8 +3378,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3574,17 +3580,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionHealthCheckServicesClient(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.RegionHealthCheckServicesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3637,8 +3646,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3707,17 +3717,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionHealthCheckServicesClient(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.RegionHealthCheckServicesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3776,8 +3789,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3981,17 +3995,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionHealthCheckServicesClient(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.RegionHealthCheckServicesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthCheckServicesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthCheckServicesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4186,11 +4203,14 @@ def test_region_health_check_services_base_transport(): def test_region_health_check_services_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_health_check_services.transports.RegionHealthCheckServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_health_check_services.transports.RegionHealthCheckServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionHealthCheckServicesTransport( @@ -4210,9 +4230,12 @@ def test_region_health_check_services_base_transport_with_credentials_file(): def test_region_health_check_services_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_health_check_services.transports.RegionHealthCheckServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_health_check_services.transports.RegionHealthCheckServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionHealthCheckServicesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_checks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_checks.py index 2756031b7140..af13155ee48e 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_checks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_health_checks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_region_health_checks_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_region_health_checks_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_region_health_checks_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2919,9 +2916,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3632,8 +3629,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionHealthCheckReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3742,17 +3740,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3807,8 +3807,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionHealthCheckRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3899,17 +3900,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3960,8 +3963,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionHealthCheckReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4207,17 +4211,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4268,8 +4274,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionHealthChecksReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4338,17 +4345,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4403,8 +4412,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionHealthCheckReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4654,17 +4664,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4717,8 +4729,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4859,18 +4872,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4927,8 +4942,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateRegionHealthCheckReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5178,17 +5194,19 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionHealthChecksClient(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.RegionHealthChecksRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionHealthChecksRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionHealthChecksRestInterceptor, "pre_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5427,11 +5445,14 @@ def test_region_health_checks_base_transport(): def test_region_health_checks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_health_checks.transports.RegionHealthChecksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_health_checks.transports.RegionHealthChecksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionHealthChecksTransport( @@ -5451,9 +5472,12 @@ def test_region_health_checks_base_transport_with_credentials_file(): def test_region_health_checks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_health_checks.transports.RegionHealthChecksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_health_checks.transports.RegionHealthChecksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionHealthChecksTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_group_managers.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_group_managers.py index a34e37c6ee23..53bad3f7d3fa 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_group_managers.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_group_managers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_instance_group_managers_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_instance_group_managers_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_instance_group_managers_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1252,9 +1249,9 @@ def test_abandon_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances(request) @@ -1471,9 +1468,9 @@ def test_abandon_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.abandon_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.abandon_instances] = ( + mock_rpc + ) request = {} client.abandon_instances_unary(request) @@ -2130,9 +2127,9 @@ def test_create_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances(request) @@ -2349,9 +2346,9 @@ def test_create_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instances] = ( + mock_rpc + ) request = {} client.create_instances_unary(request) @@ -2986,9 +2983,9 @@ def test_delete_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances(request) @@ -3205,9 +3202,9 @@ def test_delete_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instances] = ( + mock_rpc + ) request = {} client.delete_instances_unary(request) @@ -5066,9 +5063,9 @@ def test_list_managed_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_managed_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_managed_instances] = ( + mock_rpc + ) request = {} client.list_managed_instances(request) @@ -6565,9 +6562,9 @@ def test_recreate_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances(request) @@ -6786,9 +6783,9 @@ def test_recreate_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.recreate_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.recreate_instances] = ( + mock_rpc + ) request = {} client.recreate_instances_unary(request) @@ -7473,9 +7470,9 @@ def test_resume_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances(request) @@ -7692,9 +7689,9 @@ def test_resume_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_instances] = ( + mock_rpc + ) request = {} client.resume_instances_unary(request) @@ -7914,9 +7911,9 @@ def test_set_instance_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template(request) @@ -8136,9 +8133,9 @@ def test_set_instance_template_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_template] = ( + mock_rpc + ) request = {} client.set_instance_template_unary(request) @@ -8355,9 +8352,9 @@ def test_set_target_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools(request) @@ -8574,9 +8571,9 @@ def test_set_target_pools_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_target_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_target_pools] = ( + mock_rpc + ) request = {} client.set_target_pools_unary(request) @@ -9661,9 +9658,9 @@ def test_suspend_instances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances(request) @@ -9880,9 +9877,9 @@ def test_suspend_instances_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suspend_instances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suspend_instances] = ( + mock_rpc + ) request = {} client.suspend_instances_unary(request) @@ -10629,8 +10626,9 @@ def test_abandon_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10824,18 +10822,22 @@ def test_abandon_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_abandon_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_abandon_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_abandon_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_abandon_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_abandon_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_abandon_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10892,8 +10894,9 @@ def test_apply_updates_to_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11092,20 +11095,22 @@ def test_apply_updates_to_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_apply_updates_to_instances", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_apply_updates_to_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_apply_updates_to_instances", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_apply_updates_to_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_apply_updates_to_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_apply_updates_to_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11164,8 +11169,9 @@ def test_create_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11371,18 +11377,22 @@ def test_create_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_create_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_create_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_create_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_create_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_create_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_create_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11439,8 +11449,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11549,18 +11560,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11617,8 +11630,9 @@ def test_delete_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11813,18 +11827,22 @@ def test_delete_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_delete_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_delete_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_delete_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_delete_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_delete_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_delete_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11881,8 +11899,9 @@ def test_delete_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12078,20 +12097,22 @@ def test_delete_per_instance_configs_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_delete_per_instance_configs", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_delete_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_delete_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_delete_per_instance_configs", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_delete_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_delete_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12150,8 +12171,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12257,17 +12279,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12322,8 +12347,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12587,18 +12613,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12651,8 +12679,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12721,17 +12750,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12793,8 +12825,9 @@ def test_list_errors_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12863,18 +12896,20 @@ def test_list_errors_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_list_errors" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_list_errors_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_list_errors" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_list_errors" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_list_errors_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_list_errors" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12936,8 +12971,9 @@ def test_list_managed_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13006,20 +13042,22 @@ def test_list_managed_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_list_managed_instances", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_list_managed_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_list_managed_instances", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_list_managed_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_list_managed_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_list_managed_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13081,8 +13119,9 @@ def test_list_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13151,20 +13190,22 @@ def test_list_per_instance_configs_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_list_per_instance_configs", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_list_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_list_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_list_per_instance_configs", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_list_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_list_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13230,8 +13271,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13499,18 +13541,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13567,8 +13611,9 @@ def test_patch_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13776,20 +13821,22 @@ def test_patch_per_instance_configs_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_patch_per_instance_configs", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_patch_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_patch_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_patch_per_instance_configs", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_patch_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_patch_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13848,8 +13895,9 @@ def test_recreate_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14043,18 +14091,22 @@ def test_recreate_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_recreate_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_recreate_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_recreate_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_recreate_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_recreate_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_recreate_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14111,8 +14163,9 @@ def test_resize_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14221,18 +14274,20 @@ def test_resize_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_resize" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_resize_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_resize" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_resize" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_resize_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_resize" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14289,8 +14344,9 @@ def test_resume_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14484,18 +14540,22 @@ def test_resume_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_resume_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_resume_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_resume_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_resume_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_resume_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_resume_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14552,8 +14612,9 @@ def test_set_instance_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14749,20 +14810,22 @@ def test_set_instance_template_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_set_instance_template", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_set_instance_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_set_instance_template", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_set_instance_template", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_set_instance_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_set_instance_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14819,8 +14882,9 @@ def test_set_target_pools_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15015,18 +15079,22 @@ def test_set_target_pools_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_set_target_pools" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_set_target_pools_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_set_target_pools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_set_target_pools", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_set_target_pools_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_set_target_pools", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15083,8 +15151,9 @@ def test_start_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15278,18 +15347,21 @@ def test_start_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_start_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_start_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_start_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_start_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_start_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_start_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15346,8 +15418,9 @@ def test_stop_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15542,18 +15615,20 @@ def test_stop_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_stop_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_stop_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_stop_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "post_stop_instances" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_stop_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, "pre_stop_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15610,8 +15685,9 @@ def test_suspend_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15805,18 +15881,22 @@ def test_suspend_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, "post_suspend_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_suspend_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, "pre_suspend_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_suspend_instances", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_suspend_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_suspend_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15873,8 +15953,9 @@ def test_update_per_instance_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16084,20 +16165,22 @@ def test_update_per_instance_configs_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupManagersClient(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.RegionInstanceGroupManagersRestInterceptor, - "post_update_per_instance_configs", - ) as post, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "post_update_per_instance_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupManagersRestInterceptor, - "pre_update_per_instance_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_update_per_instance_configs", + ) as post, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "post_update_per_instance_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupManagersRestInterceptor, + "pre_update_per_instance_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16696,11 +16779,14 @@ def test_region_instance_group_managers_base_transport(): def test_region_instance_group_managers_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_instance_group_managers.transports.RegionInstanceGroupManagersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_instance_group_managers.transports.RegionInstanceGroupManagersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceGroupManagersTransport( @@ -16720,9 +16806,12 @@ def test_region_instance_group_managers_base_transport_with_credentials_file(): def test_region_instance_group_managers_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_instance_group_managers.transports.RegionInstanceGroupManagersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_instance_group_managers.transports.RegionInstanceGroupManagersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceGroupManagersTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_groups.py index a0981c1d1a99..96eb4fc9c1fe 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_region_instance_groups_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_region_instance_groups_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_region_instance_groups_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1946,10 +1943,10 @@ def test_list_instances_rest_pager(transport: str = "rest"): "region": "sample2", "instance_group": "sample3", } - sample_request[ - "region_instance_groups_list_instances_request_resource" - ] = compute.RegionInstanceGroupsListInstancesRequest( - instance_state="instance_state_value" + sample_request["region_instance_groups_list_instances_request_resource"] = ( + compute.RegionInstanceGroupsListInstancesRequest( + instance_state="instance_state_value" + ) ) pager = client.list_instances(request=sample_request) @@ -2420,9 +2417,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2707,8 +2704,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionInstanceGroupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2797,17 +2795,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupsClient(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.RegionInstanceGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2858,8 +2858,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionInstanceGroupsRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2928,17 +2929,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupsClient(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.RegionInstanceGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2997,8 +3000,9 @@ def test_list_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3157,18 +3161,20 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupsClient(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.RegionInstanceGroupsRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, - "post_list_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, + "post_list_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3230,8 +3236,9 @@ def test_set_named_ports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3426,18 +3433,20 @@ def test_set_named_ports_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupsClient(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.RegionInstanceGroupsRestInterceptor, "post_set_named_ports" - ) as post, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, - "post_set_named_ports_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "pre_set_named_ports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_set_named_ports" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, + "post_set_named_ports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "pre_set_named_ports" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3490,8 +3499,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3632,18 +3642,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionInstanceGroupsClient(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.RegionInstanceGroupsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceGroupsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceGroupsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3842,11 +3854,14 @@ def test_region_instance_groups_base_transport(): def test_region_instance_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_instance_groups.transports.RegionInstanceGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_instance_groups.transports.RegionInstanceGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceGroupsTransport( @@ -3866,9 +3881,12 @@ def test_region_instance_groups_base_transport_with_credentials_file(): def test_region_instance_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_instance_groups.transports.RegionInstanceGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_instance_groups.transports.RegionInstanceGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceGroupsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_templates.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_templates.py index 83ed8ba6b218..c6c030a51b61 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_templates.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instance_templates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_instance_templates_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_instance_templates_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_instance_templates_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2597,8 +2594,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2707,17 +2705,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionInstanceTemplatesClient(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.RegionInstanceTemplatesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2772,8 +2773,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionInstanceTemplateRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2854,17 +2856,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionInstanceTemplatesClient(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.RegionInstanceTemplatesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2917,8 +2921,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3298,17 +3303,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionInstanceTemplatesClient(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.RegionInstanceTemplatesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3359,8 +3367,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionInstanceTemplatesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3429,17 +3438,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionInstanceTemplatesClient(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.RegionInstanceTemplatesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstanceTemplatesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstanceTemplatesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3615,11 +3626,14 @@ def test_region_instance_templates_base_transport(): def test_region_instance_templates_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_instance_templates.transports.RegionInstanceTemplatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_instance_templates.transports.RegionInstanceTemplatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceTemplatesTransport( @@ -3639,9 +3653,12 @@ def test_region_instance_templates_base_transport_with_credentials_file(): def test_region_instance_templates_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_instance_templates.transports.RegionInstanceTemplatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_instance_templates.transports.RegionInstanceTemplatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstanceTemplatesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instances.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instances.py index 96772c8f89db..57461577df9a 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instances.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -915,10 +915,9 @@ def test_region_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -963,10 +962,9 @@ def test_region_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1002,10 +1000,9 @@ def test_region_instances_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1666,8 +1663,9 @@ def test_bulk_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2040,17 +2038,19 @@ def test_bulk_insert_rest_interceptors(null_interceptor): ) client = RegionInstancesClient(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.RegionInstancesRestInterceptor, "post_bulk_insert" - ) as post, mock.patch.object( - transports.RegionInstancesRestInterceptor, "post_bulk_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstancesRestInterceptor, "pre_bulk_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstancesRestInterceptor, "post_bulk_insert" + ) as post, + mock.patch.object( + transports.RegionInstancesRestInterceptor, "post_bulk_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstancesRestInterceptor, "pre_bulk_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2159,11 +2159,14 @@ def test_region_instances_base_transport(): def test_region_instances_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_instances.transports.RegionInstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_instances.transports.RegionInstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstancesTransport( @@ -2183,9 +2186,12 @@ def test_region_instances_base_transport_with_credentials_file(): def test_region_instances_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_instances.transports.RegionInstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_instances.transports.RegionInstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstancesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instant_snapshots.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instant_snapshots.py index 2f0a5b1e22f1..d455fb7ea641 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instant_snapshots.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_instant_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_instant_snapshots_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_instant_snapshots_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_instant_snapshots_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3371,9 +3368,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3660,8 +3657,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3770,17 +3768,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3835,8 +3836,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionInstantSnapshotReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3935,17 +3937,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3998,8 +4002,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4066,18 +4071,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4130,8 +4137,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4330,17 +4338,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4391,8 +4402,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionInstantSnapshotsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4461,17 +4473,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4526,8 +4540,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4710,18 +4725,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4774,8 +4791,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4959,18 +4977,20 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, - "post_set_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_set_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5023,8 +5043,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5165,18 +5186,21 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionInstantSnapshotsClient(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.RegionInstantSnapshotsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionInstantSnapshotsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionInstantSnapshotsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5438,11 +5462,14 @@ def test_region_instant_snapshots_base_transport(): def test_region_instant_snapshots_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_instant_snapshots.transports.RegionInstantSnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_instant_snapshots.transports.RegionInstantSnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstantSnapshotsTransport( @@ -5462,9 +5489,12 @@ def test_region_instant_snapshots_base_transport_with_credentials_file(): def test_region_instant_snapshots_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_instant_snapshots.transports.RegionInstantSnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_instant_snapshots.transports.RegionInstantSnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionInstantSnapshotsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_endpoint_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_endpoint_groups.py index d2fb94d940ba..d05a94191383 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_endpoint_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_endpoint_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_network_endpoint_groups_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3463,9 +3460,9 @@ def test_list_network_endpoints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_network_endpoints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_network_endpoints] = ( + mock_rpc + ) request = {} client.list_network_endpoints(request) @@ -3836,8 +3833,9 @@ def test_attach_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4043,20 +4041,22 @@ def test_attach_network_endpoints_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, - "post_attach_network_endpoints", - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "post_attach_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "pre_attach_network_endpoints", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_attach_network_endpoints", + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_attach_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "pre_attach_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4113,8 +4113,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4223,18 +4224,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4291,8 +4294,9 @@ def test_detach_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4498,20 +4502,22 @@ def test_detach_network_endpoints_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, - "post_detach_network_endpoints", - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "post_detach_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "pre_detach_network_endpoints", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_detach_network_endpoints", + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_detach_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "pre_detach_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4568,8 +4574,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4662,17 +4669,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4727,8 +4737,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4942,18 +4953,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5006,8 +5019,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5076,17 +5090,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5145,8 +5162,9 @@ def test_list_network_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5219,20 +5237,22 @@ def test_list_network_endpoints_rest_interceptors(null_interceptor): ) client = RegionNetworkEndpointGroupsClient(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.RegionNetworkEndpointGroupsRestInterceptor, - "post_list_network_endpoints", - ) as post, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "post_list_network_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkEndpointGroupsRestInterceptor, - "pre_list_network_endpoints", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_list_network_endpoints", + ) as post, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "post_list_network_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkEndpointGroupsRestInterceptor, + "pre_list_network_endpoints", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5480,11 +5500,14 @@ def test_region_network_endpoint_groups_base_transport(): def test_region_network_endpoint_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_network_endpoint_groups.transports.RegionNetworkEndpointGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_network_endpoint_groups.transports.RegionNetworkEndpointGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNetworkEndpointGroupsTransport( @@ -5504,9 +5527,12 @@ def test_region_network_endpoint_groups_base_transport_with_credentials_file(): def test_region_network_endpoint_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_network_endpoint_groups.transports.RegionNetworkEndpointGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_network_endpoint_groups.transports.RegionNetworkEndpointGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNetworkEndpointGroupsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_firewall_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_firewall_policies.py index 64824dbfcff5..067399498e83 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_firewall_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_network_firewall_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -987,10 +987,9 @@ def test_region_network_firewall_policies_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1034,9 @@ def test_region_network_firewall_policies_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1072,9 @@ def test_region_network_firewall_policies_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -5682,9 +5679,9 @@ def test_remove_association_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association(request) @@ -5905,9 +5902,9 @@ def test_remove_association_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_association - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_association] = ( + mock_rpc + ) request = {} client.remove_association_unary(request) @@ -6777,9 +6774,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -7066,8 +7063,9 @@ def test_add_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7260,18 +7258,22 @@ def test_add_association_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_add_association" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_add_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_add_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_add_association", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_add_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_add_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7328,8 +7330,9 @@ def test_add_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7571,18 +7574,20 @@ def test_add_rule_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_add_rule" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_add_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_add_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_add_rule" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_add_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_add_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7639,8 +7644,9 @@ def test_clone_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7749,18 +7755,20 @@ def test_clone_rules_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_clone_rules" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_clone_rules_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_clone_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_clone_rules" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_clone_rules_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_clone_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7817,8 +7825,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7927,18 +7936,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7995,8 +8006,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8089,18 +8101,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_get_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8157,8 +8171,9 @@ def test_get_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8233,18 +8248,22 @@ def test_get_association_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_get_association" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_get_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_get_association" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_association", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_get_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8299,8 +8318,9 @@ def test_get_effective_firewalls_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8368,20 +8388,22 @@ def test_get_effective_firewalls_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, - "post_get_effective_firewalls", - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_get_effective_firewalls_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "pre_get_effective_firewalls", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_effective_firewalls", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_effective_firewalls_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_get_effective_firewalls", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8443,8 +8465,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8511,18 +8534,22 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_iam_policy", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_get_iam_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8579,8 +8606,9 @@ def test_get_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8671,18 +8699,20 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_get_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_get_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8735,8 +8765,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9007,18 +9038,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9071,8 +9104,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9139,18 +9173,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9207,8 +9243,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9483,18 +9520,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_patch_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9551,8 +9590,9 @@ def test_patch_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9794,18 +9834,20 @@ def test_patch_rule_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_patch_rule" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_patch_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_patch_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_patch_rule" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_patch_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_patch_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9862,8 +9904,9 @@ def test_remove_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9972,20 +10015,22 @@ def test_remove_association_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, - "post_remove_association", - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_remove_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "pre_remove_association", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_remove_association", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_remove_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_remove_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10042,8 +10087,9 @@ def test_remove_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10152,18 +10198,20 @@ def test_remove_rule_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_remove_rule" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_remove_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_remove_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "post_remove_rule" + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_remove_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_remove_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10216,8 +10264,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10400,18 +10449,22 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_set_iam_policy", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_set_iam_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10464,8 +10517,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10608,20 +10662,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionNetworkFirewallPoliciesClient(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.RegionNetworkFirewallPoliciesRestInterceptor, - "post_test_iam_permissions", - ) as post, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNetworkFirewallPoliciesRestInterceptor, - "pre_test_iam_permissions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNetworkFirewallPoliciesRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11076,11 +11132,14 @@ def test_region_network_firewall_policies_base_transport(): def test_region_network_firewall_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_network_firewall_policies.transports.RegionNetworkFirewallPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_network_firewall_policies.transports.RegionNetworkFirewallPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNetworkFirewallPoliciesTransport( @@ -11100,9 +11159,12 @@ def test_region_network_firewall_policies_base_transport_with_credentials_file() def test_region_network_firewall_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_network_firewall_policies.transports.RegionNetworkFirewallPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_network_firewall_policies.transports.RegionNetworkFirewallPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNetworkFirewallPoliciesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_notification_endpoints.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_notification_endpoints.py index 0e6b9f904583..ea3125c0f575 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_notification_endpoints.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_notification_endpoints.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -974,10 +974,9 @@ def test_region_notification_endpoints_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1021,9 @@ def test_region_notification_endpoints_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_region_notification_endpoints_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2558,9 +2555,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2847,8 +2844,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2957,18 +2955,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionNotificationEndpointsClient(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.RegionNotificationEndpointsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, - "post_delete_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3025,8 +3025,9 @@ def test_get_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3105,17 +3106,20 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionNotificationEndpointsClient(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.RegionNotificationEndpointsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "post_get_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3170,8 +3174,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3367,18 +3372,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionNotificationEndpointsClient(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.RegionNotificationEndpointsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, - "post_insert_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3431,8 +3438,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3501,17 +3509,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionNotificationEndpointsClient(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.RegionNotificationEndpointsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3566,8 +3577,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3710,20 +3722,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RegionNotificationEndpointsClient(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.RegionNotificationEndpointsRestInterceptor, - "post_test_iam_permissions", - ) as post, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionNotificationEndpointsRestInterceptor, - "pre_test_iam_permissions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionNotificationEndpointsRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3922,11 +3936,14 @@ def test_region_notification_endpoints_base_transport(): def test_region_notification_endpoints_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_notification_endpoints.transports.RegionNotificationEndpointsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_notification_endpoints.transports.RegionNotificationEndpointsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNotificationEndpointsTransport( @@ -3946,9 +3963,12 @@ def test_region_notification_endpoints_base_transport_with_credentials_file(): def test_region_notification_endpoints_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_notification_endpoints.transports.RegionNotificationEndpointsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_notification_endpoints.transports.RegionNotificationEndpointsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionNotificationEndpointsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_operations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_operations.py index 05c72d41ddc7..63cf0b60ed10 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_operations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_region_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_region_operations_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_region_operations_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2124,8 +2126,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionOperationReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2185,17 +2188,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionOperationsClient(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.RegionOperationsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionOperationsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionOperationsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2251,8 +2256,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionOperationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2357,17 +2363,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionOperationsClient(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.RegionOperationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionOperationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionOperationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionOperationsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2418,8 +2424,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionOperationsRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2488,17 +2495,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionOperationsClient(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.RegionOperationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionOperationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionOperationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2549,8 +2558,9 @@ def test_wait_rest_bad_request(request_type=compute.WaitRegionOperationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2655,17 +2665,19 @@ def test_wait_rest_interceptors(null_interceptor): ) client = RegionOperationsClient(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.RegionOperationsRestInterceptor, "post_wait" - ) as post, mock.patch.object( - transports.RegionOperationsRestInterceptor, "post_wait_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionOperationsRestInterceptor, "pre_wait" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_wait" + ) as post, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "post_wait_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionOperationsRestInterceptor, "pre_wait" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2839,11 +2851,14 @@ def test_region_operations_base_transport(): def test_region_operations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_operations.transports.RegionOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_operations.transports.RegionOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionOperationsTransport( @@ -2863,9 +2878,12 @@ def test_region_operations_base_transport_with_credentials_file(): def test_region_operations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_operations.transports.RegionOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_operations.transports.RegionOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionOperationsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_security_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_security_policies.py index 0559c3ba56a9..34f9cea92212 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_security_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_security_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_security_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_security_policies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_security_policies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -5050,8 +5047,9 @@ def test_add_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5323,17 +5321,20 @@ def test_add_rule_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_add_rule" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_add_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_add_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_add_rule" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_add_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_add_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5390,8 +5391,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5500,17 +5502,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5565,8 +5570,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionSecurityPolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5655,17 +5661,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5722,8 +5730,9 @@ def test_get_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5798,17 +5807,20 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_get_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_get_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5861,8 +5873,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6220,17 +6233,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6281,8 +6297,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionSecurityPoliciesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6349,17 +6366,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6414,8 +6433,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionSecurityPolicyRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6777,17 +6797,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6844,8 +6866,9 @@ def test_patch_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7117,18 +7140,20 @@ def test_patch_rule_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_patch_rule" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, - "post_patch_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_patch_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_patch_rule" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_patch_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_patch_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7185,8 +7210,9 @@ def test_remove_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7295,18 +7321,20 @@ def test_remove_rule_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_remove_rule" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, - "post_remove_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_remove_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_remove_rule" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_remove_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_remove_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7359,8 +7387,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7544,18 +7573,20 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = RegionSecurityPoliciesClient(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.RegionSecurityPoliciesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, - "post_set_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionSecurityPoliciesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, + "post_set_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSecurityPoliciesRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7855,11 +7886,14 @@ def test_region_security_policies_base_transport(): def test_region_security_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_security_policies.transports.RegionSecurityPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_security_policies.transports.RegionSecurityPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSecurityPoliciesTransport( @@ -7879,9 +7913,12 @@ def test_region_security_policies_base_transport_with_credentials_file(): def test_region_security_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_security_policies.transports.RegionSecurityPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_security_policies.transports.RegionSecurityPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSecurityPoliciesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_certificates.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_certificates.py index 2a20f1727ee0..8af344edd1a2 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_certificates.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_certificates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -937,10 +937,9 @@ def test_region_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_region_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_region_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2591,8 +2588,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2701,17 +2699,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionSslCertificatesClient(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.RegionSslCertificatesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2766,8 +2766,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionSslCertificateReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2856,17 +2857,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionSslCertificatesClient(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.RegionSslCertificatesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2919,8 +2922,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3122,17 +3126,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionSslCertificatesClient(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.RegionSslCertificatesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3183,8 +3189,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionSslCertificatesReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3253,17 +3260,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionSslCertificatesClient(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.RegionSslCertificatesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslCertificatesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslCertificatesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3437,11 +3446,14 @@ def test_region_ssl_certificates_base_transport(): def test_region_ssl_certificates_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_ssl_certificates.transports.RegionSslCertificatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_ssl_certificates.transports.RegionSslCertificatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSslCertificatesTransport( @@ -3461,9 +3473,12 @@ def test_region_ssl_certificates_base_transport_with_credentials_file(): def test_region_ssl_certificates_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_ssl_certificates.transports.RegionSslCertificatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_ssl_certificates.transports.RegionSslCertificatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSslCertificatesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_policies.py index 126b451265b4..32b2f8e30a0c 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_ssl_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_region_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_region_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_region_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3212,8 +3209,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionSslPolicyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3318,17 +3316,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3379,8 +3379,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionSslPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3465,17 +3466,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3526,8 +3529,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionSslPolicyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3720,17 +3724,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3781,8 +3787,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionSslPoliciesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3851,17 +3858,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3914,8 +3923,9 @@ def test_list_available_features_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3978,18 +3988,20 @@ def test_list_available_features_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_list_available_features" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, - "post_list_available_features_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_list_available_features" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_list_available_features" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, + "post_list_available_features_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_list_available_features" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4045,8 +4057,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionSslPolicyRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4239,17 +4252,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionSslPoliciesClient(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.RegionSslPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionSslPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionSslPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4467,11 +4482,14 @@ def test_region_ssl_policies_base_transport(): def test_region_ssl_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_ssl_policies.transports.RegionSslPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_ssl_policies.transports.RegionSslPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSslPoliciesTransport( @@ -4491,9 +4509,12 @@ def test_region_ssl_policies_base_transport_with_credentials_file(): def test_region_ssl_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_ssl_policies.transports.RegionSslPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_ssl_policies.transports.RegionSslPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionSslPoliciesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_http_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_http_proxies.py index bf32647635d9..4ad728cf87d4 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_http_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_http_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_target_http_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_target_http_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_target_http_proxies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3021,8 +3018,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3131,17 +3129,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionTargetHttpProxiesClient(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.RegionTargetHttpProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3196,8 +3197,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionTargetHttpProxyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3284,17 +3286,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionTargetHttpProxiesClient(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.RegionTargetHttpProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3347,8 +3351,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3539,17 +3544,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionTargetHttpProxiesClient(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.RegionTargetHttpProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3600,8 +3608,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionTargetHttpProxiesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3670,17 +3679,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionTargetHttpProxiesClient(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.RegionTargetHttpProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3739,8 +3750,9 @@ def test_set_url_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3923,18 +3935,20 @@ def test_set_url_map_rest_interceptors(null_interceptor): ) client = RegionTargetHttpProxiesClient(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.RegionTargetHttpProxiesRestInterceptor, "post_set_url_map" - ) as post, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, - "post_set_url_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpProxiesRestInterceptor, "pre_set_url_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "post_set_url_map" + ) as post, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, + "post_set_url_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpProxiesRestInterceptor, "pre_set_url_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4129,11 +4143,14 @@ def test_region_target_http_proxies_base_transport(): def test_region_target_http_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_target_http_proxies.transports.RegionTargetHttpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_target_http_proxies.transports.RegionTargetHttpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionTargetHttpProxiesTransport( @@ -4153,9 +4170,12 @@ def test_region_target_http_proxies_base_transport_with_credentials_file(): def test_region_target_http_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_target_http_proxies.transports.RegionTargetHttpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_target_http_proxies.transports.RegionTargetHttpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionTargetHttpProxiesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_https_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_https_proxies.py index d4735ca5d2bd..25d5f120f491 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_https_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_https_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -945,10 +945,9 @@ def test_region_target_https_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +992,9 @@ def test_region_target_https_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1030,9 @@ def test_region_target_https_proxies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2961,9 +2958,9 @@ def test_set_ssl_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates(request) @@ -3182,9 +3179,9 @@ def test_set_ssl_certificates_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates_unary(request) @@ -3903,8 +3900,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4013,17 +4011,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4078,8 +4079,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionTargetHttpsProxyRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4180,17 +4182,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4243,8 +4247,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4442,17 +4447,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4505,8 +4513,9 @@ def test_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4575,17 +4584,20 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4644,8 +4656,9 @@ def test_patch_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4847,17 +4860,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4914,8 +4930,9 @@ def test_set_ssl_certificates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5109,18 +5126,22 @@ def test_set_ssl_certificates_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_set_ssl_certificates" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, - "post_set_ssl_certificates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_set_ssl_certificates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_set_ssl_certificates", + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_set_ssl_certificates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "pre_set_ssl_certificates", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5177,8 +5198,9 @@ def test_set_url_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5361,18 +5383,20 @@ def test_set_url_map_rest_interceptors(null_interceptor): ) client = RegionTargetHttpsProxiesClient(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.RegionTargetHttpsProxiesRestInterceptor, "post_set_url_map" - ) as post, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, - "post_set_url_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetHttpsProxiesRestInterceptor, "pre_set_url_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "post_set_url_map" + ) as post, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, + "post_set_url_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetHttpsProxiesRestInterceptor, "pre_set_url_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5611,11 +5635,14 @@ def test_region_target_https_proxies_base_transport(): def test_region_target_https_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_target_https_proxies.transports.RegionTargetHttpsProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_target_https_proxies.transports.RegionTargetHttpsProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionTargetHttpsProxiesTransport( @@ -5635,9 +5662,12 @@ def test_region_target_https_proxies_base_transport_with_credentials_file(): def test_region_target_https_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_target_https_proxies.transports.RegionTargetHttpsProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_target_https_proxies.transports.RegionTargetHttpsProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionTargetHttpsProxiesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_tcp_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_tcp_proxies.py index b2b64e8e3666..5f8f77a98346 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_tcp_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_target_tcp_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -941,10 +941,9 @@ def test_region_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +988,9 @@ def test_region_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1026,9 @@ def test_region_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2595,8 +2592,9 @@ def test_delete_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2705,17 +2703,20 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionTargetTcpProxiesClient(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.RegionTargetTcpProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, + "post_delete_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2770,8 +2771,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionTargetTcpProxyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2856,17 +2858,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionTargetTcpProxiesClient(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.RegionTargetTcpProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2919,8 +2923,9 @@ def test_insert_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3110,17 +3115,20 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionTargetTcpProxiesClient(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.RegionTargetTcpProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, + "post_insert_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3171,8 +3179,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionTargetTcpProxiesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3241,17 +3250,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionTargetTcpProxiesClient(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.RegionTargetTcpProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionTargetTcpProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionTargetTcpProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3425,11 +3436,14 @@ def test_region_target_tcp_proxies_base_transport(): def test_region_target_tcp_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_target_tcp_proxies.transports.RegionTargetTcpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_target_tcp_proxies.transports.RegionTargetTcpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionTargetTcpProxiesTransport( @@ -3449,9 +3463,12 @@ def test_region_target_tcp_proxies_base_transport_with_credentials_file(): def test_region_target_tcp_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_target_tcp_proxies.transports.RegionTargetTcpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_target_tcp_proxies.transports.RegionTargetTcpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionTargetTcpProxiesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_url_maps.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_url_maps.py index 9cf7973b2824..196860aaed80 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_url_maps.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_url_maps.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -898,10 +898,9 @@ def test_region_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +945,9 @@ def test_region_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +983,9 @@ def test_region_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3606,8 +3603,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRegionUrlMapRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3712,17 +3710,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3773,8 +3771,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3853,17 +3852,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3912,8 +3909,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRegionUrlMapRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4275,17 +4273,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4336,8 +4334,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionUrlMapsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4406,17 +4405,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4467,8 +4464,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRegionUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4830,17 +4828,17 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4891,8 +4889,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateRegionUrlMapRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5254,17 +5253,17 @@ def test_update_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionUrlMapsRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5315,8 +5314,9 @@ def test_validate_rest_bad_request(request_type=compute.ValidateRegionUrlMapRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5651,17 +5651,19 @@ def test_validate_rest_interceptors(null_interceptor): ) client = RegionUrlMapsClient(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.RegionUrlMapsRestInterceptor, "post_validate" - ) as post, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "post_validate_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionUrlMapsRestInterceptor, "pre_validate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_validate" + ) as post, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "post_validate_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RegionUrlMapsRestInterceptor, "pre_validate" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5900,11 +5902,14 @@ def test_region_url_maps_base_transport(): def test_region_url_maps_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_url_maps.transports.RegionUrlMapsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_url_maps.transports.RegionUrlMapsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionUrlMapsTransport( @@ -5924,9 +5929,12 @@ def test_region_url_maps_base_transport_with_credentials_file(): def test_region_url_maps_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_url_maps.transports.RegionUrlMapsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_url_maps.transports.RegionUrlMapsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionUrlMapsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_zones.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_zones.py index 8268b0044b4c..731e96b18440 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_zones.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_region_zones.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -874,10 +879,9 @@ def test_region_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -922,10 +926,9 @@ def test_region_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -961,10 +964,9 @@ def test_region_zones_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1480,8 +1482,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionZonesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1550,17 +1553,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionZonesClient(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.RegionZonesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionZonesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionZonesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionZonesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RegionZonesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionZonesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1667,11 +1668,14 @@ def test_region_zones_base_transport(): def test_region_zones_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.region_zones.transports.RegionZonesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.region_zones.transports.RegionZonesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionZonesTransport( @@ -1692,9 +1696,12 @@ def test_region_zones_base_transport_with_credentials_file(): def test_region_zones_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.region_zones.transports.RegionZonesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.region_zones.transports.RegionZonesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionZonesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_regions.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_regions.py index 6849a04f5274..283a05ded326 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_regions.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_regions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -850,10 +855,9 @@ def test_regions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -898,10 +902,9 @@ def test_regions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -937,10 +940,9 @@ def test_regions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1633,8 +1635,9 @@ def test_get_rest_bad_request(request_type=compute.GetRegionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1711,17 +1714,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = RegionsClient(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.RegionsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RegionsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.RegionsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1770,8 +1771,9 @@ def test_list_rest_bad_request(request_type=compute.ListRegionsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1838,17 +1840,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RegionsClient(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.RegionsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RegionsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RegionsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RegionsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RegionsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RegionsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1978,11 +1978,14 @@ def test_regions_base_transport(): def test_regions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.regions.transports.RegionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.regions.transports.RegionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionsTransport( @@ -2003,9 +2006,12 @@ def test_regions_base_transport_with_credentials_file(): def test_regions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.regions.transports.RegionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.regions.transports.RegionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RegionsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_blocks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_blocks.py index 566ed21923db..4d473fcf13b0 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_blocks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_blocks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_reservation_blocks_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_reservation_blocks_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_reservation_blocks_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1909,9 +1906,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -2138,9 +2135,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -2586,9 +2583,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2882,8 +2879,9 @@ def test_get_rest_bad_request(request_type=compute.GetReservationBlockRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2948,17 +2946,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = ReservationBlocksClient(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.ReservationBlocksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3021,8 +3021,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3094,17 +3095,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationBlocksClient(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.ReservationBlocksRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3155,8 +3159,9 @@ def test_list_rest_bad_request(request_type=compute.ListReservationBlocksRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3225,17 +3230,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = ReservationBlocksClient(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.ReservationBlocksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3298,8 +3305,9 @@ def test_perform_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3494,18 +3502,20 @@ def test_perform_maintenance_rest_interceptors(null_interceptor): ) client = ReservationBlocksClient(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.ReservationBlocksRestInterceptor, "post_perform_maintenance" - ) as post, mock.patch.object( - transports.ReservationBlocksRestInterceptor, - "post_perform_maintenance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "pre_perform_maintenance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_perform_maintenance" + ) as post, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, + "post_perform_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "pre_perform_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3563,8 +3573,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3755,17 +3766,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationBlocksClient(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.ReservationBlocksRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3823,8 +3837,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3970,18 +3985,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ReservationBlocksClient(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.ReservationBlocksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ReservationBlocksRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationBlocksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationBlocksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4203,11 +4220,14 @@ def test_reservation_blocks_base_transport(): def test_reservation_blocks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.reservation_blocks.transports.ReservationBlocksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.reservation_blocks.transports.ReservationBlocksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationBlocksTransport( @@ -4227,9 +4247,12 @@ def test_reservation_blocks_base_transport_with_credentials_file(): def test_reservation_blocks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.reservation_blocks.transports.ReservationBlocksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.reservation_blocks.transports.ReservationBlocksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationBlocksTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_sub_blocks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_sub_blocks.py index 11fa7c380335..4c2e77f7fa3f 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_sub_blocks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservation_sub_blocks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -935,10 +935,9 @@ def test_reservation_sub_blocks_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +982,9 @@ def test_reservation_sub_blocks_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1020,9 @@ def test_reservation_sub_blocks_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1925,9 +1922,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -2146,9 +2143,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -3036,9 +3033,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3332,8 +3329,9 @@ def test_get_rest_bad_request(request_type=compute.GetReservationSubBlockRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3398,17 +3396,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3471,8 +3471,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3544,18 +3545,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3606,8 +3609,9 @@ def test_list_rest_bad_request(request_type=compute.ListReservationSubBlocksRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3676,17 +3680,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3749,8 +3755,9 @@ def test_perform_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3860,18 +3867,20 @@ def test_perform_maintenance_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_perform_maintenance" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, - "post_perform_maintenance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_perform_maintenance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_perform_maintenance" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, + "post_perform_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_perform_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3929,8 +3938,9 @@ def test_report_faulty_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4129,18 +4139,20 @@ def test_report_faulty_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_report_faulty" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, - "post_report_faulty_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_report_faulty" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_report_faulty" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, + "post_report_faulty_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_report_faulty" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4198,8 +4210,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4390,18 +4403,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4459,8 +4474,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4606,18 +4622,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ReservationSubBlocksClient(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.ReservationSubBlocksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationSubBlocksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationSubBlocksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4860,11 +4878,14 @@ def test_reservation_sub_blocks_base_transport(): def test_reservation_sub_blocks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.reservation_sub_blocks.transports.ReservationSubBlocksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.reservation_sub_blocks.transports.ReservationSubBlocksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationSubBlocksTransport( @@ -4884,9 +4905,12 @@ def test_reservation_sub_blocks_base_transport_with_credentials_file(): def test_reservation_sub_blocks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.reservation_sub_blocks.transports.ReservationSubBlocksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.reservation_sub_blocks.transports.ReservationSubBlocksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationSubBlocksTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservations.py index efcb6247ee19..5988713ab686 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_reservations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_reservations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_reservations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_reservations_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2939,9 +2936,9 @@ def test_perform_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance(request) @@ -3160,9 +3157,9 @@ def test_perform_maintenance_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.perform_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.perform_maintenance] = ( + mock_rpc + ) request = {} client.perform_maintenance_unary(request) @@ -4024,9 +4021,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4773,8 +4770,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4845,17 +4843,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4908,8 +4908,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteReservationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5014,17 +5015,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ReservationsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5075,8 +5076,9 @@ def test_get_rest_bad_request(request_type=compute.GetReservationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5171,17 +5173,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ReservationsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ReservationsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5232,8 +5232,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5300,17 +5301,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5361,8 +5364,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertReservationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5632,17 +5636,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ReservationsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5693,8 +5697,9 @@ def test_list_rest_bad_request(request_type=compute.ListReservationsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5763,17 +5768,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ReservationsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ReservationsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5826,8 +5829,9 @@ def test_perform_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6017,17 +6021,20 @@ def test_perform_maintenance_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_perform_maintenance" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_perform_maintenance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_perform_maintenance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_perform_maintenance" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, + "post_perform_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationsRestInterceptor, "pre_perform_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6078,8 +6085,9 @@ def test_resize_rest_bad_request(request_type=compute.ResizeReservationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6262,17 +6270,17 @@ def test_resize_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_resize" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_resize_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_resize" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_resize" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_resize_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ReservationsRestInterceptor, "pre_resize") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6325,8 +6333,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6509,17 +6518,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ReservationsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6572,8 +6583,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6714,18 +6726,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReservationsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6778,8 +6792,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateReservationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7049,17 +7064,17 @@ def test_update_rest_interceptors(null_interceptor): ) client = ReservationsClient(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.ReservationsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.ReservationsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ReservationsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.ReservationsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ReservationsRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7384,11 +7399,14 @@ def test_reservations_base_transport(): def test_reservations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.reservations.transports.ReservationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.reservations.transports.ReservationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationsTransport( @@ -7408,9 +7426,12 @@ def test_reservations_base_transport_with_credentials_file(): def test_reservations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.reservations.transports.ReservationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.reservations.transports.ReservationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReservationsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_resource_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_resource_policies.py index f0c46c2d9bf6..a79ff35128e2 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_resource_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_resource_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_resource_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_resource_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_resource_policies_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3633,9 +3630,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3918,8 +3915,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3992,17 +3990,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4062,8 +4063,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteResourcePolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4172,17 +4174,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4237,8 +4241,9 @@ def test_get_rest_bad_request(request_type=compute.GetResourcePolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4319,17 +4324,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ResourcePoliciesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4382,8 +4387,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4450,17 +4456,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4511,8 +4520,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertResourcePolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4759,17 +4769,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4820,8 +4832,9 @@ def test_list_rest_bad_request(request_type=compute.ListResourcePoliciesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4892,17 +4905,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4957,8 +4972,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchResourcePolicyRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5209,17 +5225,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5272,8 +5290,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5456,17 +5475,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5519,8 +5541,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5661,18 +5684,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ResourcePoliciesClient(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.ResourcePoliciesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ResourcePoliciesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ResourcePoliciesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5955,11 +5980,14 @@ def test_resource_policies_base_transport(): def test_resource_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.resource_policies.transports.ResourcePoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.resource_policies.transports.ResourcePoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ResourcePoliciesTransport( @@ -5979,9 +6007,12 @@ def test_resource_policies_base_transport_with_credentials_file(): def test_resource_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.resource_policies.transports.ResourcePoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.resource_policies.transports.ResourcePoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ResourcePoliciesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routers.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routers.py index 7aa8ceb22a7b..d8b0ce5c40a1 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routers.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -857,10 +857,9 @@ def test_routers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -905,10 +904,9 @@ def test_routers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -944,10 +942,9 @@ def test_routers_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1813,9 +1810,9 @@ def test_delete_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_route_policy] = ( + mock_rpc + ) request = {} client.delete_route_policy(request) @@ -2036,9 +2033,9 @@ def test_delete_route_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_route_policy] = ( + mock_rpc + ) request = {} client.delete_route_policy_unary(request) @@ -2665,9 +2662,9 @@ def test_get_nat_mapping_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_nat_mapping_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_nat_mapping_info] = ( + mock_rpc + ) request = {} client.get_nat_mapping_info(request) @@ -2955,9 +2952,9 @@ def test_get_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_route_policy] = ( + mock_rpc + ) request = {} client.get_route_policy(request) @@ -3162,9 +3159,9 @@ def test_get_router_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_router_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_router_status] = ( + mock_rpc + ) request = {} client.get_router_status(request) @@ -4342,9 +4339,9 @@ def test_list_route_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_route_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_route_policies] = ( + mock_rpc + ) request = {} client.list_route_policies(request) @@ -5062,9 +5059,9 @@ def test_patch_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_route_policy] = ( + mock_rpc + ) request = {} client.patch_route_policy(request) @@ -5279,9 +5276,9 @@ def test_patch_route_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_route_policy] = ( + mock_rpc + ) request = {} client.patch_route_policy_unary(request) @@ -6135,9 +6132,9 @@ def test_update_route_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_route_policy] = ( + mock_rpc + ) request = {} client.update_route_policy(request) @@ -6352,9 +6349,9 @@ def test_update_route_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_route_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_route_policy] = ( + mock_rpc + ) request = {} client.update_route_policy_unary(request) @@ -6639,8 +6636,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6709,17 +6707,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6772,8 +6772,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6876,17 +6877,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6937,8 +6936,9 @@ def test_delete_route_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7041,17 +7041,19 @@ def test_delete_route_policy_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_delete_route_policy" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_delete_route_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_delete_route_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_delete_route_policy" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_delete_route_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_delete_route_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7102,8 +7104,9 @@ def test_get_rest_bad_request(request_type=compute.GetRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7180,17 +7183,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_get") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7241,8 +7242,9 @@ def test_get_nat_ip_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7300,17 +7302,19 @@ def test_get_nat_ip_info_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_get_nat_ip_info" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_get_nat_ip_info_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_get_nat_ip_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_nat_ip_info" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_nat_ip_info_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_get_nat_ip_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7363,8 +7367,9 @@ def test_get_nat_mapping_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7431,17 +7436,19 @@ def test_get_nat_mapping_info_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_get_nat_mapping_info" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_get_nat_mapping_info_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_get_nat_mapping_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_nat_mapping_info" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_nat_mapping_info_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_get_nat_mapping_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7496,8 +7503,9 @@ def test_get_route_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7555,17 +7563,19 @@ def test_get_route_policy_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_get_route_policy" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_get_route_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_get_route_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_route_policy" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_route_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_get_route_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7623,8 +7633,9 @@ def test_get_router_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7685,17 +7696,19 @@ def test_get_router_status_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_get_router_status" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_get_router_status_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_get_router_status" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_router_status" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_get_router_status_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_get_router_status" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7748,8 +7761,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8056,17 +8070,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8115,8 +8127,9 @@ def test_list_rest_bad_request(request_type=compute.ListRoutersRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8183,17 +8196,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8244,8 +8255,9 @@ def test_list_bgp_routes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8316,17 +8328,19 @@ def test_list_bgp_routes_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_list_bgp_routes" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_list_bgp_routes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_list_bgp_routes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_list_bgp_routes" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_list_bgp_routes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_list_bgp_routes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8381,8 +8395,9 @@ def test_list_route_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8453,17 +8468,19 @@ def test_list_route_policies_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_list_route_policies" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_list_route_policies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_list_route_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_list_route_policies" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_list_route_policies_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_list_route_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8516,8 +8533,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8824,17 +8842,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8885,8 +8901,9 @@ def test_patch_route_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9080,17 +9097,19 @@ def test_patch_route_policy_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_patch_route_policy" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_patch_route_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_patch_route_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_patch_route_policy" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_patch_route_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_patch_route_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9141,8 +9160,9 @@ def test_preview_rest_bad_request(request_type=compute.PreviewRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9404,17 +9424,15 @@ def test_preview_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_preview" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_preview_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_preview" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_preview") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_preview_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_preview") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9465,8 +9483,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9773,17 +9792,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutersRestInterceptor, "post_update") as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutersRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9834,8 +9851,9 @@ def test_update_route_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10029,17 +10047,19 @@ def test_update_route_policy_rest_interceptors(null_interceptor): ) client = RoutersClient(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.RoutersRestInterceptor, "post_update_route_policy" - ) as post, mock.patch.object( - transports.RoutersRestInterceptor, "post_update_route_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutersRestInterceptor, "pre_update_route_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutersRestInterceptor, "post_update_route_policy" + ) as post, + mock.patch.object( + transports.RoutersRestInterceptor, "post_update_route_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutersRestInterceptor, "pre_update_route_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10498,11 +10518,14 @@ def test_routers_base_transport(): def test_routers_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.routers.transports.RoutersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.routers.transports.RoutersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RoutersTransport( @@ -10522,9 +10545,12 @@ def test_routers_base_transport_with_credentials_file(): def test_routers_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.routers.transports.RoutersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.routers.transports.RoutersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RoutersTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routes.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routes.py index 72a49e061741..9cdaa6feeab7 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routes.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_routes.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -856,10 +856,9 @@ def test_routes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -904,10 +903,9 @@ def test_routes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -943,10 +941,9 @@ def test_routes_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2356,9 +2353,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2628,8 +2625,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteRouteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2732,17 +2730,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = RoutesClient(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.RoutesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.RoutesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutesRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.RoutesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2791,8 +2787,9 @@ def test_get_rest_bad_request(request_type=compute.GetRouteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2902,17 +2899,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = RoutesClient(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.RoutesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.RoutesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.RoutesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2961,8 +2956,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertRouteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3169,17 +3165,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = RoutesClient(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.RoutesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.RoutesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutesRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.RoutesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3228,8 +3222,9 @@ def test_list_rest_bad_request(request_type=compute.ListRoutesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3296,17 +3291,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = RoutesClient(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.RoutesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.RoutesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RoutesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.RoutesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RoutesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3357,8 +3350,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3497,17 +3491,19 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = RoutesClient(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.RoutesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.RoutesRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RoutesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RoutesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.RoutesRestInterceptor, "post_test_iam_permissions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RoutesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3706,11 +3702,14 @@ def test_routes_base_transport(): def test_routes_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.routes.transports.RoutesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.routes.transports.RoutesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RoutesTransport( @@ -3730,9 +3729,12 @@ def test_routes_base_transport_with_credentials_file(): def test_routes_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.routes.transports.RoutesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.routes.transports.RoutesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RoutesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_security_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_security_policies.py index fef094659885..eb4c45678ead 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_security_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_security_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_security_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_security_policies_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_security_policies_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -5319,8 +5316,9 @@ def test_add_rule_rest_bad_request(request_type=compute.AddRuleSecurityPolicyReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5588,17 +5586,19 @@ def test_add_rule_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_add_rule" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_add_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_add_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_add_rule" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_add_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_add_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5651,8 +5651,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5725,17 +5726,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5791,8 +5795,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteSecurityPolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5897,17 +5902,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5958,8 +5965,9 @@ def test_get_rest_bad_request(request_type=compute.GetSecurityPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6044,17 +6052,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SecurityPoliciesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6105,8 +6113,9 @@ def test_get_rule_rest_bad_request(request_type=compute.GetRuleSecurityPolicyReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6177,17 +6186,19 @@ def test_get_rule_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_get_rule" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_get_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_get_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_get_rule" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_get_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_get_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6238,8 +6249,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertSecurityPolicyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6597,17 +6609,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6658,8 +6672,9 @@ def test_list_rest_bad_request(request_type=compute.ListSecurityPoliciesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6726,17 +6741,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6789,8 +6806,9 @@ def test_list_preconfigured_expression_sets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6856,20 +6874,22 @@ def test_list_preconfigured_expression_sets_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, - "post_list_preconfigured_expression_sets", - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, - "post_list_preconfigured_expression_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, - "pre_list_preconfigured_expression_sets", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, + "post_list_preconfigured_expression_sets", + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, + "post_list_preconfigured_expression_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, + "pre_list_preconfigured_expression_sets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6929,8 +6949,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchSecurityPolicyRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7288,17 +7309,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7351,8 +7374,9 @@ def test_patch_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7620,17 +7644,19 @@ def test_patch_rule_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_patch_rule" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_patch_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_patch_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_patch_rule" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_patch_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_patch_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7683,8 +7709,9 @@ def test_remove_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7789,17 +7816,19 @@ def test_remove_rule_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_remove_rule" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_remove_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_remove_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_remove_rule" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_remove_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_remove_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7852,8 +7881,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8037,17 +8067,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = SecurityPoliciesClient(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.SecurityPoliciesRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SecurityPoliciesRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SecurityPoliciesRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8391,11 +8423,14 @@ def test_security_policies_base_transport(): def test_security_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.security_policies.transports.SecurityPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.security_policies.transports.SecurityPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SecurityPoliciesTransport( @@ -8415,9 +8450,12 @@ def test_security_policies_base_transport_with_credentials_file(): def test_security_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.security_policies.transports.SecurityPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.security_policies.transports.SecurityPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SecurityPoliciesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_service_attachments.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_service_attachments.py index e04b04974579..82d490d87de1 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_service_attachments.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_service_attachments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_service_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_service_attachments_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_service_attachments_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3663,9 +3660,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3948,8 +3945,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4020,18 +4018,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4091,8 +4091,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteServiceAttachmentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4201,17 +4202,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4266,8 +4269,9 @@ def test_get_rest_bad_request(request_type=compute.GetServiceAttachmentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4366,17 +4370,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4429,8 +4435,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4497,18 +4504,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4559,8 +4568,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertServiceAttachmentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4779,17 +4789,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4840,8 +4852,9 @@ def test_list_rest_bad_request(request_type=compute.ListServiceAttachmentsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4910,17 +4923,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4977,8 +4992,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchServiceAttachmentReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5201,17 +5217,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5264,8 +5282,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5448,18 +5467,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5512,8 +5533,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5654,18 +5676,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ServiceAttachmentsClient(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.ServiceAttachmentsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServiceAttachmentsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServiceAttachmentsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5948,11 +5972,14 @@ def test_service_attachments_base_transport(): def test_service_attachments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.service_attachments.transports.ServiceAttachmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.service_attachments.transports.ServiceAttachmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServiceAttachmentsTransport( @@ -5972,9 +5999,12 @@ def test_service_attachments_base_transport_with_credentials_file(): def test_service_attachments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.service_attachments.transports.ServiceAttachmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.service_attachments.transports.ServiceAttachmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServiceAttachmentsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshot_settings_service.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshot_settings_service.py index 529b776d0eb8..428696b9af3c 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshot_settings_service.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshot_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -940,10 +940,9 @@ def test_snapshot_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_snapshot_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_snapshot_settings_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1902,8 +1899,9 @@ def test_get_rest_bad_request(request_type=compute.GetSnapshotSettingRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1963,17 +1961,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = SnapshotSettingsServiceClient(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.SnapshotSettingsServiceRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.SnapshotSettingsServiceRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotSettingsServiceRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotSettingsServiceRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.SnapshotSettingsServiceRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotSettingsServiceRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2024,8 +2024,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchSnapshotSettingRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2206,17 +2207,20 @@ def test_patch_rest_interceptors(null_interceptor): ) client = SnapshotSettingsServiceClient(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.SnapshotSettingsServiceRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.SnapshotSettingsServiceRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotSettingsServiceRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotSettingsServiceRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.SnapshotSettingsServiceRestInterceptor, + "post_patch_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotSettingsServiceRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2348,11 +2352,14 @@ def test_snapshot_settings_service_base_transport(): def test_snapshot_settings_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.snapshot_settings_service.transports.SnapshotSettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.snapshot_settings_service.transports.SnapshotSettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SnapshotSettingsServiceTransport( @@ -2372,9 +2379,12 @@ def test_snapshot_settings_service_base_transport_with_credentials_file(): def test_snapshot_settings_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.snapshot_settings_service.transports.SnapshotSettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.snapshot_settings_service.transports.SnapshotSettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SnapshotSettingsServiceTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshots.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshots.py index feac177428a6..758564e48de2 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshots.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_snapshots.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -873,10 +873,9 @@ def test_snapshots_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -921,10 +920,9 @@ def test_snapshots_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_snapshots_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3168,9 +3165,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3440,8 +3437,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteSnapshotRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3544,17 +3542,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SnapshotsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SnapshotsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3603,8 +3599,9 @@ def test_get_rest_bad_request(request_type=compute.GetSnapshotRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3736,17 +3733,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SnapshotsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SnapshotsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3797,8 +3792,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3863,17 +3859,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3924,8 +3922,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertSnapshotRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4141,17 +4140,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SnapshotsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SnapshotsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4200,8 +4197,9 @@ def test_list_rest_bad_request(request_type=compute.ListSnapshotsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4268,17 +4266,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SnapshotsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SnapshotsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4329,8 +4325,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4511,17 +4508,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4572,8 +4571,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsSnapshotReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4755,17 +4755,17 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SnapshotsRestInterceptor, "pre_set_labels") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4818,8 +4818,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4958,17 +4959,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = SnapshotsClient(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.SnapshotsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.SnapshotsRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.SnapshotsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5230,11 +5234,14 @@ def test_snapshots_base_transport(): def test_snapshots_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.snapshots.transports.SnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.snapshots.transports.SnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SnapshotsTransport( @@ -5254,9 +5261,12 @@ def test_snapshots_base_transport_with_credentials_file(): def test_snapshots_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.snapshots.transports.SnapshotsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.snapshots.transports.SnapshotsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SnapshotsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_certificates.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_certificates.py index 1dbc09d364c8..afc3353bdccc 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_certificates.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_certificates.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_ssl_certificates_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2771,8 +2768,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2843,17 +2841,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = SslCertificatesClient(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.SslCertificatesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.SslCertificatesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslCertificatesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.SslCertificatesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2909,8 +2910,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteSslCertificateReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3015,17 +3017,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = SslCertificatesClient(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.SslCertificatesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.SslCertificatesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslCertificatesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3076,8 +3080,9 @@ def test_get_rest_bad_request(request_type=compute.GetSslCertificateRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3162,17 +3167,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = SslCertificatesClient(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.SslCertificatesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.SslCertificatesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslCertificatesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslCertificatesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3223,8 +3228,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertSslCertificateReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3426,17 +3432,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = SslCertificatesClient(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.SslCertificatesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.SslCertificatesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslCertificatesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3487,8 +3495,9 @@ def test_list_rest_bad_request(request_type=compute.ListSslCertificatesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3557,17 +3566,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = SslCertificatesClient(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.SslCertificatesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.SslCertificatesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslCertificatesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.SslCertificatesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslCertificatesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3762,11 +3771,14 @@ def test_ssl_certificates_base_transport(): def test_ssl_certificates_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.ssl_certificates.transports.SslCertificatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.ssl_certificates.transports.SslCertificatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SslCertificatesTransport( @@ -3786,9 +3798,12 @@ def test_ssl_certificates_base_transport_with_credentials_file(): def test_ssl_certificates_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.ssl_certificates.transports.SslCertificatesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.ssl_certificates.transports.SslCertificatesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SslCertificatesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_policies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_policies.py index 2b928516babc..7385425feef7 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_policies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_ssl_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_ssl_policies_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3344,8 +3341,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3418,17 +3416,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3481,8 +3481,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteSslPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3587,17 +3588,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SslPoliciesRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslPoliciesRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3646,8 +3645,9 @@ def test_get_rest_bad_request(request_type=compute.GetSslPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3732,17 +3732,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SslPoliciesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslPoliciesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3791,8 +3789,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertSslPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3985,17 +3984,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SslPoliciesRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslPoliciesRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4044,8 +4041,9 @@ def test_list_rest_bad_request(request_type=compute.ListSslPoliciesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4114,17 +4112,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SslPoliciesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslPoliciesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4175,8 +4171,9 @@ def test_list_available_features_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4239,18 +4236,20 @@ def test_list_available_features_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_list_available_features" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, - "post_list_available_features_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_list_available_features" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_list_available_features" + ) as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, + "post_list_available_features_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "pre_list_available_features" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4306,8 +4305,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchSslPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4500,17 +4500,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = SslPoliciesClient(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.SslPoliciesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.SslPoliciesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SslPoliciesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SslPoliciesRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.SslPoliciesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SslPoliciesRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4747,11 +4745,14 @@ def test_ssl_policies_base_transport(): def test_ssl_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.ssl_policies.transports.SslPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.ssl_policies.transports.SslPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SslPoliciesTransport( @@ -4771,9 +4772,12 @@ def test_ssl_policies_base_transport_with_credentials_file(): def test_ssl_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.ssl_policies.transports.SslPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.ssl_policies.transports.SslPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SslPoliciesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pool_types.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pool_types.py index bceba470b5b7..f200e5032cc5 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pool_types.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pool_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -910,10 +915,9 @@ def test_storage_pool_types_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +962,9 @@ def test_storage_pool_types_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1000,9 @@ def test_storage_pool_types_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2002,8 +2004,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2072,17 +2075,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = StoragePoolTypesClient(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.StoragePoolTypesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.StoragePoolTypesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolTypesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2142,8 +2148,9 @@ def test_get_rest_bad_request(request_type=compute.GetStoragePoolTypeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2240,17 +2247,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = StoragePoolTypesClient(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.StoragePoolTypesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.StoragePoolTypesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolTypesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.StoragePoolTypesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2301,8 +2308,9 @@ def test_list_rest_bad_request(request_type=compute.ListStoragePoolTypesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2371,17 +2379,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = StoragePoolTypesClient(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.StoragePoolTypesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.StoragePoolTypesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolTypesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolTypesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2536,11 +2546,14 @@ def test_storage_pool_types_base_transport(): def test_storage_pool_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.storage_pool_types.transports.StoragePoolTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.storage_pool_types.transports.StoragePoolTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.StoragePoolTypesTransport( @@ -2561,9 +2574,12 @@ def test_storage_pool_types_base_transport_with_credentials_file(): def test_storage_pool_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.storage_pool_types.transports.StoragePoolTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.storage_pool_types.transports.StoragePoolTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.StoragePoolTypesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pools.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pools.py index b0c2ef7e550e..12ed80ce57fc 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pools.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_storage_pools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -885,10 +885,9 @@ def test_storage_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -933,10 +932,9 @@ def test_storage_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_storage_pools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3428,9 +3425,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4165,8 +4162,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4239,17 +4237,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4302,8 +4302,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteStoragePoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4408,17 +4409,17 @@ def test_delete_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.StoragePoolsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4469,8 +4470,9 @@ def test_get_rest_bad_request(request_type=compute.GetStoragePoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4565,17 +4567,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.StoragePoolsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.StoragePoolsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4626,8 +4626,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4694,17 +4695,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4755,8 +4758,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertStoragePoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4972,17 +4976,17 @@ def test_insert_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.StoragePoolsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5033,8 +5037,9 @@ def test_list_rest_bad_request(request_type=compute.ListStoragePoolsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5107,17 +5112,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.StoragePoolsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.StoragePoolsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5168,8 +5171,9 @@ def test_list_disks_rest_bad_request(request_type=compute.ListDisksStoragePoolsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5242,17 +5246,19 @@ def test_list_disks_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_list_disks" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_list_disks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_list_disks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_list_disks" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_list_disks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "pre_list_disks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5307,8 +5313,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5491,17 +5498,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5554,8 +5563,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5696,18 +5706,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5760,8 +5772,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateStoragePoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5977,17 +5990,17 @@ def test_update_rest_interceptors(null_interceptor): ) client = StoragePoolsClient(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.StoragePoolsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.StoragePoolsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.StoragePoolsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_update" + ) as post, + mock.patch.object( + transports.StoragePoolsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.StoragePoolsRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6289,11 +6302,14 @@ def test_storage_pools_base_transport(): def test_storage_pools_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.storage_pools.transports.StoragePoolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.storage_pools.transports.StoragePoolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.StoragePoolsTransport( @@ -6313,9 +6329,12 @@ def test_storage_pools_base_transport_with_credentials_file(): def test_storage_pools_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.storage_pools.transports.StoragePoolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.storage_pools.transports.StoragePoolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.StoragePoolsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_subnetworks.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_subnetworks.py index 726ae4b50c4b..cc7b80c000c2 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_subnetworks.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_subnetworks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_subnetworks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_subnetworks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_subnetworks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1844,9 +1841,9 @@ def test_expand_ip_cidr_range_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.expand_ip_cidr_range - ] = mock_rpc + client._transport._wrapped_methods[client._transport.expand_ip_cidr_range] = ( + mock_rpc + ) request = {} client.expand_ip_cidr_range(request) @@ -2065,9 +2062,9 @@ def test_expand_ip_cidr_range_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.expand_ip_cidr_range - ] = mock_rpc + client._transport._wrapped_methods[client._transport.expand_ip_cidr_range] = ( + mock_rpc + ) request = {} client.expand_ip_cidr_range_unary(request) @@ -4746,9 +4743,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5031,8 +5028,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5103,17 +5101,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5166,8 +5166,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteSubnetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5272,17 +5273,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SubnetworksRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SubnetworksRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5335,8 +5334,9 @@ def test_expand_ip_cidr_range_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5526,17 +5526,20 @@ def test_expand_ip_cidr_range_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_expand_ip_cidr_range" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_expand_ip_cidr_range_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_expand_ip_cidr_range" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_expand_ip_cidr_range" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, + "post_expand_ip_cidr_range_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_expand_ip_cidr_range" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5587,8 +5590,9 @@ def test_get_rest_bad_request(request_type=compute.GetSubnetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5713,17 +5717,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SubnetworksRestInterceptor, "post_get") as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SubnetworksRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5774,8 +5776,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5842,17 +5845,19 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_get_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5903,8 +5908,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertSubnetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6143,17 +6149,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SubnetworksRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SubnetworksRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6204,8 +6208,9 @@ def test_list_rest_bad_request(request_type=compute.ListSubnetworksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6274,17 +6279,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SubnetworksRestInterceptor, "post_list") as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SubnetworksRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6335,8 +6338,9 @@ def test_list_usable_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6407,17 +6411,19 @@ def test_list_usable_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_list_usable" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_list_usable_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_list_usable" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_list_usable" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_list_usable_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_list_usable" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6473,8 +6479,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchSubnetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6713,17 +6720,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.SubnetworksRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SubnetworksRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6774,8 +6779,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6958,17 +6964,19 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_set_iam_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7021,8 +7029,9 @@ def test_set_private_ip_google_access_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7212,18 +7221,20 @@ def test_set_private_ip_google_access_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_set_private_ip_google_access" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, - "post_set_private_ip_google_access_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_set_private_ip_google_access" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_set_private_ip_google_access" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, + "post_set_private_ip_google_access_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_set_private_ip_google_access" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7276,8 +7287,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7418,17 +7430,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = SubnetworksClient(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.SubnetworksRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.SubnetworksRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SubnetworksRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SubnetworksRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.SubnetworksRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SubnetworksRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7778,11 +7793,14 @@ def test_subnetworks_base_transport(): def test_subnetworks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.subnetworks.transports.SubnetworksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.subnetworks.transports.SubnetworksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SubnetworksTransport( @@ -7802,9 +7820,12 @@ def test_subnetworks_base_transport_with_credentials_file(): def test_subnetworks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.subnetworks.transports.SubnetworksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.subnetworks.transports.SubnetworksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SubnetworksTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_grpc_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_grpc_proxies.py index b65278f723e7..3ece4843f392 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_grpc_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_grpc_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_target_grpc_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_target_grpc_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_target_grpc_proxies_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2915,8 +2912,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetGrpcProxyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3021,17 +3019,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetGrpcProxiesClient(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.TargetGrpcProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3082,8 +3082,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetGrpcProxyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3164,17 +3165,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetGrpcProxiesClient(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.TargetGrpcProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3225,8 +3228,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetGrpcProxyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3416,17 +3420,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetGrpcProxiesClient(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.TargetGrpcProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3477,8 +3483,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetGrpcProxiesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3547,17 +3554,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetGrpcProxiesClient(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.TargetGrpcProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3610,8 +3619,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchTargetGrpcProxyRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3801,17 +3811,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = TargetGrpcProxiesClient(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.TargetGrpcProxiesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetGrpcProxiesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetGrpcProxiesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4006,11 +4018,14 @@ def test_target_grpc_proxies_base_transport(): def test_target_grpc_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.target_grpc_proxies.transports.TargetGrpcProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.target_grpc_proxies.transports.TargetGrpcProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetGrpcProxiesTransport( @@ -4030,9 +4045,12 @@ def test_target_grpc_proxies_base_transport_with_credentials_file(): def test_target_grpc_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.target_grpc_proxies.transports.TargetGrpcProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.target_grpc_proxies.transports.TargetGrpcProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetGrpcProxiesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_http_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_http_proxies.py index 8219eae4fa98..3c9bc5f964f5 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_http_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_http_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_target_http_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_target_http_proxies_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_target_http_proxies_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3599,8 +3596,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3671,18 +3669,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3738,8 +3738,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetHttpProxyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3844,17 +3845,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3905,8 +3908,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetHttpProxyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3989,17 +3993,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4050,8 +4056,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetHttpProxyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4242,17 +4249,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4303,8 +4312,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetHttpProxiesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4373,17 +4383,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4436,8 +4448,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchTargetHttpProxyRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4628,17 +4641,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4691,8 +4706,9 @@ def test_set_url_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4871,17 +4887,20 @@ def test_set_url_map_rest_interceptors(null_interceptor): ) client = TargetHttpProxiesClient(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.TargetHttpProxiesRestInterceptor, "post_set_url_map" - ) as post, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "post_set_url_map_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpProxiesRestInterceptor, "pre_set_url_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "post_set_url_map" + ) as post, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, + "post_set_url_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpProxiesRestInterceptor, "pre_set_url_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5118,11 +5137,14 @@ def test_target_http_proxies_base_transport(): def test_target_http_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.target_http_proxies.transports.TargetHttpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.target_http_proxies.transports.TargetHttpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetHttpProxiesTransport( @@ -5142,9 +5164,12 @@ def test_target_http_proxies_base_transport_with_credentials_file(): def test_target_http_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.target_http_proxies.transports.TargetHttpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.target_http_proxies.transports.TargetHttpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetHttpProxiesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_https_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_https_proxies.py index 2fc459c9a312..812045dfe8c3 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_https_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_https_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -929,10 +929,9 @@ def test_target_https_proxies_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +976,9 @@ def test_target_https_proxies_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1014,9 @@ def test_target_https_proxies_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3133,9 +3130,9 @@ def test_set_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map(request) @@ -3343,9 +3340,9 @@ def test_set_certificate_map_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map_unary(request) @@ -3551,9 +3548,9 @@ def test_set_quic_override_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_quic_override - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_quic_override] = ( + mock_rpc + ) request = {} client.set_quic_override(request) @@ -3759,9 +3756,9 @@ def test_set_quic_override_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_quic_override - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_quic_override] = ( + mock_rpc + ) request = {} client.set_quic_override_unary(request) @@ -3969,9 +3966,9 @@ def test_set_ssl_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates(request) @@ -4179,9 +4176,9 @@ def test_set_ssl_certificates_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates_unary(request) @@ -5275,8 +5272,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5347,18 +5345,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5414,8 +5414,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetHttpsProxyRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5520,17 +5521,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5581,8 +5584,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetHttpsProxyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5679,17 +5683,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5740,8 +5746,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetHttpsProxyRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5939,17 +5946,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6000,8 +6009,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetHttpsProxiesReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6070,17 +6080,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6133,8 +6145,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchTargetHttpsProxyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6332,17 +6345,19 @@ def test_patch_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_patch" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_patch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6395,8 +6410,9 @@ def test_set_certificate_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6586,18 +6602,20 @@ def test_set_certificate_map_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_set_certificate_map" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, - "post_set_certificate_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_set_certificate_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_set_certificate_map" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_set_certificate_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_set_certificate_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6650,8 +6668,9 @@ def test_set_quic_override_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6841,18 +6860,20 @@ def test_set_quic_override_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_set_quic_override" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, - "post_set_quic_override_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_set_quic_override" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_set_quic_override" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_set_quic_override_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_set_quic_override" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6905,8 +6926,9 @@ def test_set_ssl_certificates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7096,18 +7118,20 @@ def test_set_ssl_certificates_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_set_ssl_certificates" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, - "post_set_ssl_certificates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_set_ssl_certificates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_set_ssl_certificates" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_set_ssl_certificates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_set_ssl_certificates" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7160,8 +7184,9 @@ def test_set_ssl_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7342,18 +7367,20 @@ def test_set_ssl_policy_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_set_ssl_policy" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, - "post_set_ssl_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_set_ssl_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_set_ssl_policy" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_set_ssl_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_set_ssl_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7406,8 +7433,9 @@ def test_set_url_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7586,17 +7614,20 @@ def test_set_url_map_rest_interceptors(null_interceptor): ) client = TargetHttpsProxiesClient(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.TargetHttpsProxiesRestInterceptor, "post_set_url_map" - ) as post, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "post_set_url_map_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetHttpsProxiesRestInterceptor, "pre_set_url_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "post_set_url_map" + ) as post, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, + "post_set_url_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetHttpsProxiesRestInterceptor, "pre_set_url_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7923,11 +7954,14 @@ def test_target_https_proxies_base_transport(): def test_target_https_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.target_https_proxies.transports.TargetHttpsProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.target_https_proxies.transports.TargetHttpsProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetHttpsProxiesTransport( @@ -7947,9 +7981,12 @@ def test_target_https_proxies_base_transport_with_credentials_file(): def test_target_https_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.target_https_proxies.transports.TargetHttpsProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.target_https_proxies.transports.TargetHttpsProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetHttpsProxiesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_instances.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_instances.py index 15da42c1f225..26ce21f1b468 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_instances.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_instances.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -916,10 +916,9 @@ def test_target_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +963,9 @@ def test_target_instances_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1001,9 @@ def test_target_instances_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2759,9 +2756,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -2980,9 +2977,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -3201,9 +3198,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3486,8 +3483,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3558,17 +3556,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3628,8 +3629,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetInstanceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3738,17 +3740,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3803,8 +3807,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3891,17 +3896,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetInstancesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3952,8 +3957,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetInstanceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4142,17 +4148,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4203,8 +4211,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetInstancesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4273,17 +4282,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetInstancesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4340,8 +4349,9 @@ def test_set_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4528,18 +4538,20 @@ def test_set_security_policy_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_set_security_policy" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, - "post_set_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_set_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_set_security_policy" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, + "post_set_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "pre_set_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4592,8 +4604,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4734,18 +4747,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = TargetInstancesClient(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.TargetInstancesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.TargetInstancesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetInstancesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.TargetInstancesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetInstancesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4988,11 +5003,14 @@ def test_target_instances_base_transport(): def test_target_instances_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.target_instances.transports.TargetInstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.target_instances.transports.TargetInstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetInstancesTransport( @@ -5012,9 +5030,12 @@ def test_target_instances_base_transport_with_credentials_file(): def test_target_instances_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.target_instances.transports.TargetInstancesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.target_instances.transports.TargetInstancesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetInstancesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_pools.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_pools.py index b56f476254dd..291632e0615b 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_pools.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_pools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_target_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_target_pools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_target_pools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1148,9 +1145,9 @@ def test_add_health_check_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_health_check] = ( + mock_rpc + ) request = {} client.add_health_check(request) @@ -1371,9 +1368,9 @@ def test_add_health_check_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_health_check] = ( + mock_rpc + ) request = {} client.add_health_check_unary(request) @@ -3805,9 +3802,9 @@ def test_remove_health_check_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_health_check] = ( + mock_rpc + ) request = {} client.remove_health_check(request) @@ -4030,9 +4027,9 @@ def test_remove_health_check_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_health_check - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_health_check] = ( + mock_rpc + ) request = {} client.remove_health_check_unary(request) @@ -5135,9 +5132,9 @@ def test_set_security_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy(request) @@ -5356,9 +5353,9 @@ def test_set_security_policy_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_security_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_security_policy] = ( + mock_rpc + ) request = {} client.set_security_policy_unary(request) @@ -5577,9 +5574,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5862,8 +5859,9 @@ def test_add_health_check_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6053,17 +6051,19 @@ def test_add_health_check_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_add_health_check" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_add_health_check_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_add_health_check" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_add_health_check" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_add_health_check_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_add_health_check" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6116,8 +6116,9 @@ def test_add_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6307,17 +6308,19 @@ def test_add_instance_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_add_instance" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_add_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_add_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_add_instance" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_add_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_add_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6370,8 +6373,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6442,17 +6446,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6505,8 +6511,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetPoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6611,17 +6618,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.TargetPoolsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetPoolsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6672,8 +6677,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetPoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6760,17 +6766,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.TargetPoolsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetPoolsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6819,8 +6823,9 @@ def test_get_health_rest_bad_request(request_type=compute.GetHealthTargetPoolReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6957,17 +6962,19 @@ def test_get_health_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_get_health" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_get_health_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_get_health" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_get_health" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_get_health_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_get_health" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7020,8 +7027,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetPoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7210,17 +7218,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.TargetPoolsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetPoolsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7271,8 +7277,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetPoolsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7341,17 +7348,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.TargetPoolsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetPoolsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7402,8 +7407,9 @@ def test_remove_health_check_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7593,17 +7599,20 @@ def test_remove_health_check_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_remove_health_check" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_remove_health_check_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_remove_health_check" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_remove_health_check" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, + "post_remove_health_check_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_remove_health_check" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7656,8 +7665,9 @@ def test_remove_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7847,17 +7857,19 @@ def test_remove_instance_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_remove_instance" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_remove_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_remove_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_remove_instance" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_remove_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_remove_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7908,8 +7920,9 @@ def test_set_backup_rest_bad_request(request_type=compute.SetBackupTargetPoolReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8088,17 +8101,19 @@ def test_set_backup_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_set_backup" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_set_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_set_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_set_backup" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_set_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_set_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8151,8 +8166,9 @@ def test_set_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8335,17 +8351,20 @@ def test_set_security_policy_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_set_security_policy" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_set_security_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_set_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_set_security_policy" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, + "post_set_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_set_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8398,8 +8417,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8540,17 +8560,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = TargetPoolsClient(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.TargetPoolsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.TargetPoolsRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetPoolsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.TargetPoolsRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetPoolsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8921,11 +8944,14 @@ def test_target_pools_base_transport(): def test_target_pools_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.target_pools.transports.TargetPoolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.target_pools.transports.TargetPoolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetPoolsTransport( @@ -8945,9 +8971,12 @@ def test_target_pools_base_transport_with_credentials_file(): def test_target_pools_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.target_pools.transports.TargetPoolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.target_pools.transports.TargetPoolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetPoolsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_ssl_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_ssl_proxies.py index 92a2d7e5552e..2be304c6d7e3 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_ssl_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_ssl_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_target_ssl_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_target_ssl_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_target_ssl_proxies_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2429,9 +2426,9 @@ def test_set_backend_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service(request) @@ -2639,9 +2636,9 @@ def test_set_backend_service_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service_unary(request) @@ -2849,9 +2846,9 @@ def test_set_certificate_map_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map(request) @@ -3059,9 +3056,9 @@ def test_set_certificate_map_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_certificate_map - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_certificate_map] = ( + mock_rpc + ) request = {} client.set_certificate_map_unary(request) @@ -3267,9 +3264,9 @@ def test_set_proxy_header_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header(request) @@ -3475,9 +3472,9 @@ def test_set_proxy_header_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header_unary(request) @@ -3685,9 +3682,9 @@ def test_set_ssl_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates(request) @@ -3895,9 +3892,9 @@ def test_set_ssl_certificates_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_ssl_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_ssl_certificates] = ( + mock_rpc + ) request = {} client.set_ssl_certificates_unary(request) @@ -4517,9 +4514,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4789,8 +4786,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetSslProxyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4895,17 +4893,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4956,8 +4956,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetSslProxyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5040,17 +5041,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetSslProxiesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5101,8 +5102,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetSslProxyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5293,17 +5295,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5354,8 +5358,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetSslProxiesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5424,17 +5429,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5487,8 +5494,9 @@ def test_set_backend_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5678,18 +5686,20 @@ def test_set_backend_service_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_set_backend_service" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, - "post_set_backend_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_set_backend_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_set_backend_service" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, + "post_set_backend_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_set_backend_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5742,8 +5752,9 @@ def test_set_certificate_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5933,18 +5944,20 @@ def test_set_certificate_map_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_set_certificate_map" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, - "post_set_certificate_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_set_certificate_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_set_certificate_map" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, + "post_set_certificate_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_set_certificate_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5997,8 +6010,9 @@ def test_set_proxy_header_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6188,18 +6202,20 @@ def test_set_proxy_header_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_set_proxy_header" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, - "post_set_proxy_header_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_set_proxy_header" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_set_proxy_header" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, + "post_set_proxy_header_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_set_proxy_header" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6252,8 +6268,9 @@ def test_set_ssl_certificates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6443,18 +6460,20 @@ def test_set_ssl_certificates_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_set_ssl_certificates" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, - "post_set_ssl_certificates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_set_ssl_certificates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_set_ssl_certificates" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, + "post_set_ssl_certificates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_set_ssl_certificates" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6507,8 +6526,9 @@ def test_set_ssl_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6689,17 +6709,20 @@ def test_set_ssl_policy_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_set_ssl_policy" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "post_set_ssl_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_set_ssl_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_set_ssl_policy" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, + "post_set_ssl_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_set_ssl_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6752,8 +6775,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6894,18 +6918,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = TargetSslProxiesClient(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.TargetSslProxiesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetSslProxiesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetSslProxiesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7215,11 +7241,14 @@ def test_target_ssl_proxies_base_transport(): def test_target_ssl_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.target_ssl_proxies.transports.TargetSslProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.target_ssl_proxies.transports.TargetSslProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetSslProxiesTransport( @@ -7239,9 +7268,12 @@ def test_target_ssl_proxies_base_transport_with_credentials_file(): def test_target_ssl_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.target_ssl_proxies.transports.TargetSslProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.target_ssl_proxies.transports.TargetSslProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetSslProxiesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_tcp_proxies.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_tcp_proxies.py index a84d70bdd35b..0054eead7679 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_tcp_proxies.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_tcp_proxies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -917,10 +917,9 @@ def test_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -965,10 +964,9 @@ def test_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_target_tcp_proxies_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2707,9 +2704,9 @@ def test_set_backend_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service(request) @@ -2917,9 +2914,9 @@ def test_set_backend_service_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_backend_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_backend_service] = ( + mock_rpc + ) request = {} client.set_backend_service_unary(request) @@ -3125,9 +3122,9 @@ def test_set_proxy_header_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header(request) @@ -3333,9 +3330,9 @@ def test_set_proxy_header_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_proxy_header - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_proxy_header] = ( + mock_rpc + ) request = {} client.set_proxy_header_unary(request) @@ -3543,9 +3540,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3817,8 +3814,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3889,17 +3887,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3955,8 +3956,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetTcpProxyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4061,17 +4063,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4122,8 +4126,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetTcpProxyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4204,17 +4209,17 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.TargetTcpProxiesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4265,8 +4270,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetTcpProxyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4456,17 +4462,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4517,8 +4525,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetTcpProxiesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4587,17 +4596,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4650,8 +4661,9 @@ def test_set_backend_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4841,18 +4853,20 @@ def test_set_backend_service_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_set_backend_service" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, - "post_set_backend_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_set_backend_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_set_backend_service" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, + "post_set_backend_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_set_backend_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4905,8 +4919,9 @@ def test_set_proxy_header_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5096,18 +5111,20 @@ def test_set_proxy_header_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_set_proxy_header" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, - "post_set_proxy_header_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_set_proxy_header" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_set_proxy_header" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, + "post_set_proxy_header_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_set_proxy_header" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5160,8 +5177,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5302,18 +5320,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = TargetTcpProxiesClient(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.TargetTcpProxiesRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetTcpProxiesRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetTcpProxiesRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5577,11 +5597,14 @@ def test_target_tcp_proxies_base_transport(): def test_target_tcp_proxies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.target_tcp_proxies.transports.TargetTcpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.target_tcp_proxies.transports.TargetTcpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetTcpProxiesTransport( @@ -5601,9 +5624,12 @@ def test_target_tcp_proxies_base_transport_with_credentials_file(): def test_target_tcp_proxies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.target_tcp_proxies.transports.TargetTcpProxiesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.target_tcp_proxies.transports.TargetTcpProxiesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetTcpProxiesTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_vpn_gateways.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_vpn_gateways.py index b59e053a4654..2b7a4f488921 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_vpn_gateways.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_target_vpn_gateways.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -925,10 +925,9 @@ def test_target_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +972,9 @@ def test_target_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1010,9 @@ def test_target_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3281,8 +3278,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3353,18 +3351,20 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, - "post_aggregated_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, + "post_aggregated_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3424,8 +3424,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteTargetVpnGatewayRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3534,17 +3535,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3599,8 +3602,9 @@ def test_get_rest_bad_request(request_type=compute.GetTargetVpnGatewayRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3689,17 +3693,19 @@ def test_get_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_get" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_get" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3750,8 +3756,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertTargetVpnGatewayRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3944,17 +3951,19 @@ def test_insert_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_insert" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_insert" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4005,8 +4014,9 @@ def test_list_rest_bad_request(request_type=compute.ListTargetVpnGatewaysRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4075,17 +4085,19 @@ def test_list_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4140,8 +4152,9 @@ def test_set_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4325,17 +4338,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = TargetVpnGatewaysClient(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.TargetVpnGatewaysRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TargetVpnGatewaysRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TargetVpnGatewaysRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4551,11 +4566,14 @@ def test_target_vpn_gateways_base_transport(): def test_target_vpn_gateways_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.target_vpn_gateways.transports.TargetVpnGatewaysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.target_vpn_gateways.transports.TargetVpnGatewaysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetVpnGatewaysTransport( @@ -4575,9 +4593,12 @@ def test_target_vpn_gateways_base_transport_with_credentials_file(): def test_target_vpn_gateways_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.target_vpn_gateways.transports.TargetVpnGatewaysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.target_vpn_gateways.transports.TargetVpnGatewaysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TargetVpnGatewaysTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_url_maps.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_url_maps.py index 243e4b9a81cf..6a2e0cd4a044 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_url_maps.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_url_maps.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -859,10 +859,9 @@ def test_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -907,10 +906,9 @@ def test_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +944,9 @@ def test_url_maps_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2373,9 +2370,9 @@ def test_invalidate_cache_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.invalidate_cache - ] = mock_rpc + client._transport._wrapped_methods[client._transport.invalidate_cache] = ( + mock_rpc + ) request = {} client.invalidate_cache(request) @@ -2581,9 +2578,9 @@ def test_invalidate_cache_unary_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.invalidate_cache - ] = mock_rpc + client._transport._wrapped_methods[client._transport.invalidate_cache] = ( + mock_rpc + ) request = {} client.invalidate_cache_unary(request) @@ -3456,9 +3453,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -4336,8 +4333,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4406,17 +4404,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.UrlMapsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4469,8 +4469,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4573,17 +4574,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4632,8 +4631,9 @@ def test_get_rest_bad_request(request_type=compute.GetUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4710,17 +4710,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4769,8 +4767,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5130,17 +5129,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5191,8 +5188,9 @@ def test_invalidate_cache_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5375,17 +5373,19 @@ def test_invalidate_cache_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_invalidate_cache" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_invalidate_cache_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_invalidate_cache" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_invalidate_cache" + ) as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_invalidate_cache_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.UrlMapsRestInterceptor, "pre_invalidate_cache" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5436,8 +5436,9 @@ def test_list_rest_bad_request(request_type=compute.ListUrlMapsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5504,17 +5505,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5563,8 +5562,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5924,17 +5924,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5985,8 +5983,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6125,17 +6124,19 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_test_iam_permissions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.UrlMapsRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6188,8 +6189,9 @@ def test_update_rest_bad_request(request_type=compute.UpdateUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6549,17 +6551,15 @@ def test_update_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_update" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_update_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_update" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_update") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_update_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_update") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6608,8 +6608,9 @@ def test_validate_rest_bad_request(request_type=compute.ValidateUrlMapRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6941,17 +6942,15 @@ def test_validate_rest_interceptors(null_interceptor): ) client = UrlMapsClient(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.UrlMapsRestInterceptor, "post_validate" - ) as post, mock.patch.object( - transports.UrlMapsRestInterceptor, "post_validate_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.UrlMapsRestInterceptor, "pre_validate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.UrlMapsRestInterceptor, "post_validate") as post, + mock.patch.object( + transports.UrlMapsRestInterceptor, "post_validate_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.UrlMapsRestInterceptor, "pre_validate") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7253,11 +7252,14 @@ def test_url_maps_base_transport(): def test_url_maps_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.url_maps.transports.UrlMapsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.url_maps.transports.UrlMapsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UrlMapsTransport( @@ -7277,9 +7279,12 @@ def test_url_maps_base_transport_with_credentials_file(): def test_url_maps_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.url_maps.transports.UrlMapsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.url_maps.transports.UrlMapsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UrlMapsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_gateways.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_gateways.py index 7351d3affd5c..a1bb186a45f3 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_gateways.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_gateways.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -881,10 +881,9 @@ def test_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_vpn_gateways_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3359,9 +3356,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -3644,8 +3641,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3716,17 +3714,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3779,8 +3779,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteVpnGatewayRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3885,17 +3886,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3946,8 +3945,9 @@ def test_get_rest_bad_request(request_type=compute.GetVpnGatewayRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4030,17 +4030,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "post_get") as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4089,8 +4087,9 @@ def test_get_status_rest_bad_request(request_type=compute.GetStatusVpnGatewayReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4150,17 +4149,19 @@ def test_get_status_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_get_status" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_get_status_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_get_status" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_get_status" + ) as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_get_status_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "pre_get_status" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4216,8 +4217,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertVpnGatewayRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4413,17 +4415,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4474,8 +4474,9 @@ def test_list_rest_bad_request(request_type=compute.ListVpnGatewaysRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4544,17 +4545,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "post_list") as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnGatewaysRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4603,8 +4602,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsVpnGatewayReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4788,17 +4788,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4851,8 +4853,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4993,17 +4996,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = VpnGatewaysClient(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.VpnGatewaysRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "post_test_iam_permissions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnGatewaysRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.VpnGatewaysRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5265,11 +5271,14 @@ def test_vpn_gateways_base_transport(): def test_vpn_gateways_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.vpn_gateways.transports.VpnGatewaysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.vpn_gateways.transports.VpnGatewaysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VpnGatewaysTransport( @@ -5289,9 +5298,12 @@ def test_vpn_gateways_base_transport_with_credentials_file(): def test_vpn_gateways_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.vpn_gateways.transports.VpnGatewaysTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.vpn_gateways.transports.VpnGatewaysTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VpnGatewaysTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_tunnels.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_tunnels.py index 6aa37b8e31c0..5bc79c6ca4ad 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_tunnels.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_vpn_tunnels.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +877,9 @@ def test_vpn_tunnels_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +924,9 @@ def test_vpn_tunnels_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +962,9 @@ def test_vpn_tunnels_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -3223,8 +3220,9 @@ def test_aggregated_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3295,17 +3293,19 @@ def test_aggregated_list_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_aggregated_list" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_aggregated_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_aggregated_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_aggregated_list" + ) as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_aggregated_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "pre_aggregated_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3358,8 +3358,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteVpnTunnelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3464,17 +3465,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3523,8 +3522,9 @@ def test_get_rest_bad_request(request_type=compute.GetVpnTunnelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3631,17 +3631,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3690,8 +3688,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertVpnTunnelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3908,17 +3907,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3967,8 +3964,9 @@ def test_list_rest_bad_request(request_type=compute.ListVpnTunnelsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4037,17 +4035,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VpnTunnelsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4096,8 +4092,9 @@ def test_set_labels_rest_bad_request(request_type=compute.SetLabelsVpnTunnelRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4281,17 +4278,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = VpnTunnelsClient(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.VpnTunnelsRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VpnTunnelsRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VpnTunnelsRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4507,11 +4506,14 @@ def test_vpn_tunnels_base_transport(): def test_vpn_tunnels_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.vpn_tunnels.transports.VpnTunnelsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.vpn_tunnels.transports.VpnTunnelsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VpnTunnelsTransport( @@ -4531,9 +4533,12 @@ def test_vpn_tunnels_base_transport_with_credentials_file(): def test_vpn_tunnels_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.vpn_tunnels.transports.VpnTunnelsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.vpn_tunnels.transports.VpnTunnelsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VpnTunnelsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_wire_groups.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_wire_groups.py index a415410faa3a..90bcfec27e6a 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_wire_groups.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_wire_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.extended_operation as extended_operation # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, grpc_helpers_async, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import extended_operation # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -877,10 +877,9 @@ def test_wire_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -925,10 +924,9 @@ def test_wire_groups_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +962,9 @@ def test_wire_groups_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2968,8 +2965,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteWireGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3078,17 +3076,15 @@ def test_delete_rest_interceptors(null_interceptor): ) client = WireGroupsClient(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.WireGroupsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.WireGroupsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WireGroupsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.WireGroupsRestInterceptor, "post_delete") as post, + mock.patch.object( + transports.WireGroupsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.WireGroupsRestInterceptor, "pre_delete") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3141,8 +3137,9 @@ def test_get_rest_bad_request(request_type=compute.GetWireGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3223,17 +3220,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = WireGroupsClient(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.WireGroupsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.WireGroupsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WireGroupsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.WireGroupsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.WireGroupsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.WireGroupsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3282,8 +3277,9 @@ def test_insert_rest_bad_request(request_type=compute.InsertWireGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3480,17 +3476,15 @@ def test_insert_rest_interceptors(null_interceptor): ) client = WireGroupsClient(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.WireGroupsRestInterceptor, "post_insert" - ) as post, mock.patch.object( - transports.WireGroupsRestInterceptor, "post_insert_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WireGroupsRestInterceptor, "pre_insert" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.WireGroupsRestInterceptor, "post_insert") as post, + mock.patch.object( + transports.WireGroupsRestInterceptor, "post_insert_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.WireGroupsRestInterceptor, "pre_insert") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3539,8 +3533,9 @@ def test_list_rest_bad_request(request_type=compute.ListWireGroupsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3613,17 +3608,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = WireGroupsClient(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.WireGroupsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.WireGroupsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WireGroupsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.WireGroupsRestInterceptor, "post_list") as post, + mock.patch.object( + transports.WireGroupsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.WireGroupsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3676,8 +3669,9 @@ def test_patch_rest_bad_request(request_type=compute.PatchWireGroupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3878,17 +3872,15 @@ def test_patch_rest_interceptors(null_interceptor): ) client = WireGroupsClient(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.WireGroupsRestInterceptor, "post_patch" - ) as post, mock.patch.object( - transports.WireGroupsRestInterceptor, "post_patch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WireGroupsRestInterceptor, "pre_patch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.WireGroupsRestInterceptor, "post_patch") as post, + mock.patch.object( + transports.WireGroupsRestInterceptor, "post_patch_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.WireGroupsRestInterceptor, "pre_patch") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4081,11 +4073,14 @@ def test_wire_groups_base_transport(): def test_wire_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.wire_groups.transports.WireGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.wire_groups.transports.WireGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.WireGroupsTransport( @@ -4105,9 +4100,12 @@ def test_wire_groups_base_transport_with_credentials_file(): def test_wire_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.wire_groups.transports.WireGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.wire_groups.transports.WireGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.WireGroupsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zone_operations.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zone_operations.py index d15880fd7aad..a9613182b88a 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zone_operations.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zone_operations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -895,10 +900,9 @@ def test_zone_operations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -943,10 +947,9 @@ def test_zone_operations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +985,9 @@ def test_zone_operations_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2104,8 +2106,9 @@ def test_delete_rest_bad_request(request_type=compute.DeleteZoneOperationRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2165,17 +2168,19 @@ def test_delete_rest_interceptors(null_interceptor): ) client = ZoneOperationsClient(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.ZoneOperationsRestInterceptor, "post_delete" - ) as post, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "post_delete_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "pre_delete" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_delete" + ) as post, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_delete_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "pre_delete" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2231,8 +2236,9 @@ def test_get_rest_bad_request(request_type=compute.GetZoneOperationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2337,17 +2343,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = ZoneOperationsClient(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.ZoneOperationsRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ZoneOperationsRestInterceptor, "post_get") as post, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ZoneOperationsRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2398,8 +2402,9 @@ def test_list_rest_bad_request(request_type=compute.ListZoneOperationsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2468,17 +2473,17 @@ def test_list_rest_interceptors(null_interceptor): ) client = ZoneOperationsClient(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.ZoneOperationsRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_list" + ) as post, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ZoneOperationsRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2529,8 +2534,9 @@ def test_wait_rest_bad_request(request_type=compute.WaitZoneOperationRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2635,17 +2641,17 @@ def test_wait_rest_interceptors(null_interceptor): ) client = ZoneOperationsClient(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.ZoneOperationsRestInterceptor, "post_wait" - ) as post, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "post_wait_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZoneOperationsRestInterceptor, "pre_wait" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_wait" + ) as post, + mock.patch.object( + transports.ZoneOperationsRestInterceptor, "post_wait_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ZoneOperationsRestInterceptor, "pre_wait") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2819,11 +2825,14 @@ def test_zone_operations_base_transport(): def test_zone_operations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.zone_operations.transports.ZoneOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.zone_operations.transports.ZoneOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ZoneOperationsTransport( @@ -2843,9 +2852,12 @@ def test_zone_operations_base_transport_with_credentials_file(): def test_zone_operations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.zone_operations.transports.ZoneOperationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.zone_operations.transports.ZoneOperationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ZoneOperationsTransport() diff --git a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zones.py b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zones.py index 08f4d0b60036..52320b01a270 100644 --- a/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zones.py +++ b/packages/google-cloud-compute/tests/unit/gapic/compute_v1/test_zones.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -845,10 +850,9 @@ def test_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -893,10 +897,9 @@ def test_zones_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -932,10 +935,9 @@ def test_zones_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1627,8 +1629,9 @@ def test_get_rest_bad_request(request_type=compute.GetZoneRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1707,17 +1710,15 @@ def test_get_rest_interceptors(null_interceptor): ) client = ZonesClient(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.ZonesRestInterceptor, "post_get" - ) as post, mock.patch.object( - transports.ZonesRestInterceptor, "post_get_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZonesRestInterceptor, "pre_get" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ZonesRestInterceptor, "post_get") as post, + mock.patch.object( + transports.ZonesRestInterceptor, "post_get_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ZonesRestInterceptor, "pre_get") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1766,8 +1767,9 @@ def test_list_rest_bad_request(request_type=compute.ListZonesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1834,17 +1836,15 @@ def test_list_rest_interceptors(null_interceptor): ) client = ZonesClient(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.ZonesRestInterceptor, "post_list" - ) as post, mock.patch.object( - transports.ZonesRestInterceptor, "post_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ZonesRestInterceptor, "pre_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ZonesRestInterceptor, "post_list") as post, + mock.patch.object( + transports.ZonesRestInterceptor, "post_list_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ZonesRestInterceptor, "pre_list") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1974,11 +1974,14 @@ def test_zones_base_transport(): def test_zones_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.compute_v1.services.zones.transports.ZonesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.compute_v1.services.zones.transports.ZonesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ZonesTransport( @@ -1999,9 +2002,12 @@ def test_zones_base_transport_with_credentials_file(): def test_zones_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.compute_v1.services.zones.transports.ZonesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.compute_v1.services.zones.transports.ZonesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ZonesTransport() diff --git a/packages/google-cloud-confidentialcomputing/docs/conf.py b/packages/google-cloud-confidentialcomputing/docs/conf.py index ddb781d3b48f..a42ab066a82a 100644 --- a/packages/google-cloud-confidentialcomputing/docs/conf.py +++ b/packages/google-cloud-confidentialcomputing/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-confidentialcomputing documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/__init__.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/__init__.py index e2dfb9fb140e..1f4e253bb355 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/__init__.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.confidential_computing import ( ConfidentialComputingAsyncClient, ConfidentialComputingClient, diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/async_client.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/async_client.py index 8e048194152f..ceb9e3e840d1 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/async_client.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.confidentialcomputing_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.confidentialcomputing_v1.types import service @@ -120,7 +120,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConfidentialComputingAsyncClient: The constructed client. """ - return ConfidentialComputingClient.from_service_account_info.__func__(ConfidentialComputingAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConfidentialComputingClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConfidentialComputingAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +137,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConfidentialComputingAsyncClient: The constructed client. """ - return ConfidentialComputingClient.from_service_account_file.__func__(ConfidentialComputingAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConfidentialComputingClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConfidentialComputingAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -174,7 +176,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConfidentialComputingClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConfidentialComputingClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConfidentialComputingTransport: diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/client.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/client.py index a0cf3f3bbbfd..588035880f6a 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/client.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.confidentialcomputing_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.confidentialcomputing_v1.types import service @@ -81,9 +81,7 @@ class ConfidentialComputingClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConfidentialComputingTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConfidentialComputingTransport]] _transport_registry["grpc"] = ConfidentialComputingGrpcTransport _transport_registry["grpc_asyncio"] = ConfidentialComputingGrpcAsyncIOTransport _transport_registry["rest"] = ConfidentialComputingRestTransport @@ -629,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConfidentialComputingClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConfidentialComputingClient._read_environment_variables() + ) self._client_cert_source = ConfidentialComputingClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -668,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConfidentialComputingTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/__init__.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/__init__.py index ab3a745f9f42..22e614b5d1df 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/__init__.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConfidentialComputingTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConfidentialComputingTransport]] _transport_registry["grpc"] = ConfidentialComputingGrpcTransport _transport_registry["grpc_asyncio"] = ConfidentialComputingGrpcAsyncIOTransport _transport_registry["rest"] = ConfidentialComputingRestTransport diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/base.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/base.py index 0b745310cff2..801b5016064c 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/base.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.confidentialcomputing_v1 import gapic_version as package_version from google.cloud.confidentialcomputing_v1.types import service diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc.py index 41a518ee7dac..52ca1891686c 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.confidentialcomputing_v1.types import service diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc_asyncio.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc_asyncio.py index 97b23ad941b4..bf6972d07cfc 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc_asyncio.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.confidentialcomputing_v1.types import service diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/rest.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/rest.py index 3c15c5d3bc4a..672d037c7ca7 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/rest.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/services/confidential_computing/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -501,9 +501,7 @@ def __call__( """ - http_options = ( - _BaseConfidentialComputingRestTransport._BaseCreateChallenge._get_http_options() - ) + http_options = _BaseConfidentialComputingRestTransport._BaseCreateChallenge._get_http_options() request, metadata = self._interceptor.pre_create_challenge( request, metadata @@ -662,9 +660,7 @@ def __call__( """ - http_options = ( - _BaseConfidentialComputingRestTransport._BaseVerifyAttestation._get_http_options() - ) + http_options = _BaseConfidentialComputingRestTransport._BaseVerifyAttestation._get_http_options() request, metadata = self._interceptor.pre_verify_attestation( request, metadata @@ -828,9 +824,7 @@ def __call__( """ - http_options = ( - _BaseConfidentialComputingRestTransport._BaseVerifyConfidentialGke._get_http_options() - ) + http_options = _BaseConfidentialComputingRestTransport._BaseVerifyConfidentialGke._get_http_options() request, metadata = self._interceptor.pre_verify_confidential_gke( request, metadata @@ -992,9 +986,7 @@ def __call__( """ - http_options = ( - _BaseConfidentialComputingRestTransport._BaseVerifyConfidentialSpace._get_http_options() - ) + http_options = _BaseConfidentialComputingRestTransport._BaseVerifyConfidentialSpace._get_http_options() request, metadata = self._interceptor.pre_verify_confidential_space( request, metadata @@ -1128,7 +1120,9 @@ def verify_confidential_space( ]: # 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._VerifyConfidentialSpace(self._session, self._host, self._interceptor) # type: ignore + return self._VerifyConfidentialSpace( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1188,9 +1182,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseConfidentialComputingRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseConfidentialComputingRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseConfidentialComputingRestTransport._BaseGetLocation._get_transcoded_request( @@ -1329,9 +1321,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseConfidentialComputingRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseConfidentialComputingRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseConfidentialComputingRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/types/service.py b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/types/service.py index 7193a179f4ec..c9b674ced5da 100644 --- a/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/types/service.py +++ b/packages/google-cloud-confidentialcomputing/google/cloud/confidentialcomputing_v1/types/service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -65,6 +65,7 @@ class SigningAlgorithm(proto.Enum): ECDSA on the P-256 Curve with a SHA256 digest. """ + SIGNING_ALGORITHM_UNSPECIFIED = 0 RSASSA_PSS_SHA256 = 1 RSASSA_PKCS1V15_SHA256 = 2 @@ -87,6 +88,7 @@ class TokenType(proto.Enum): TOKEN_TYPE_AWS_PRINCIPALTAGS (4): Principal-tag-based token for AWS integration """ + TOKEN_TYPE_UNSPECIFIED = 0 TOKEN_TYPE_OIDC = 1 TOKEN_TYPE_PKI = 2 @@ -106,6 +108,7 @@ class SignatureType(proto.Enum): SIGNATURE_TYPE_PKI (2): Public Key Infrastructure (PKI) signature. """ + SIGNATURE_TYPE_UNSPECIFIED = 0 SIGNATURE_TYPE_OIDC = 1 SIGNATURE_TYPE_PKI = 2 @@ -122,6 +125,7 @@ class TokenProfile(proto.Enum): TOKEN_PROFILE_AWS (2): AWS Principal Tags claims. """ + TOKEN_PROFILE_UNSPECIFIED = 0 TOKEN_PROFILE_DEFAULT_EAT = 1 TOKEN_PROFILE_AWS = 2 @@ -607,12 +611,12 @@ class SignedEntity(proto.Message): signatures attached to an OCI image object. """ - container_image_signatures: MutableSequence[ - "ContainerImageSignature" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ContainerImageSignature", + container_image_signatures: MutableSequence["ContainerImageSignature"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ContainerImageSignature", + ) ) diff --git a/packages/google-cloud-confidentialcomputing/noxfile.py b/packages/google-cloud-confidentialcomputing/noxfile.py index ea883d9223b7..80f0255f8a89 100644 --- a/packages/google-cloud-confidentialcomputing/noxfile.py +++ b/packages/google-cloud-confidentialcomputing/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-confidentialcomputing/tests/unit/gapic/confidentialcomputing_v1/test_confidential_computing.py b/packages/google-cloud-confidentialcomputing/tests/unit/gapic/confidentialcomputing_v1/test_confidential_computing.py index 18faa38a8bc3..930be115fa73 100644 --- a/packages/google-cloud-confidentialcomputing/tests/unit/gapic/confidentialcomputing_v1/test_confidential_computing.py +++ b/packages/google-cloud-confidentialcomputing/tests/unit/gapic/confidentialcomputing_v1/test_confidential_computing.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.confidentialcomputing_v1.services.confidential_computing import ( ConfidentialComputingAsyncClient, @@ -996,10 +1001,9 @@ def test_confidential_computing_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1048,9 @@ def test_confidential_computing_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1086,9 @@ def test_confidential_computing_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1342,13 +1344,13 @@ def test_confidential_computing_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1459,9 +1461,9 @@ def test_create_challenge_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_challenge - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_challenge] = ( + mock_rpc + ) request = {} client.create_challenge(request) @@ -1802,9 +1804,9 @@ def test_verify_attestation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.verify_attestation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.verify_attestation] = ( + mock_rpc + ) request = {} client.verify_attestation(request) @@ -2499,9 +2501,9 @@ def test_create_challenge_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_challenge - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_challenge] = ( + mock_rpc + ) request = {} client.create_challenge(request) @@ -2691,9 +2693,9 @@ def test_verify_attestation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.verify_attestation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.verify_attestation] = ( + mock_rpc + ) request = {} client.verify_attestation(request) @@ -3395,8 +3397,9 @@ def test_create_challenge_rest_bad_request(request_type=service.CreateChallengeR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3537,18 +3540,20 @@ def test_create_challenge_rest_interceptors(null_interceptor): ) client = ConfidentialComputingClient(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.ConfidentialComputingRestInterceptor, "post_create_challenge" - ) as post, mock.patch.object( - transports.ConfidentialComputingRestInterceptor, - "post_create_challenge_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfidentialComputingRestInterceptor, "pre_create_challenge" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfidentialComputingRestInterceptor, "post_create_challenge" + ) as post, + mock.patch.object( + transports.ConfidentialComputingRestInterceptor, + "post_create_challenge_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfidentialComputingRestInterceptor, "pre_create_challenge" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3601,8 +3606,9 @@ def test_verify_attestation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3667,18 +3673,20 @@ def test_verify_attestation_rest_interceptors(null_interceptor): ) client = ConfidentialComputingClient(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.ConfidentialComputingRestInterceptor, "post_verify_attestation" - ) as post, mock.patch.object( - transports.ConfidentialComputingRestInterceptor, - "post_verify_attestation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfidentialComputingRestInterceptor, "pre_verify_attestation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfidentialComputingRestInterceptor, "post_verify_attestation" + ) as post, + mock.patch.object( + transports.ConfidentialComputingRestInterceptor, + "post_verify_attestation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfidentialComputingRestInterceptor, "pre_verify_attestation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3735,8 +3743,9 @@ def test_verify_confidential_space_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3801,19 +3810,22 @@ def test_verify_confidential_space_rest_interceptors(null_interceptor): ) client = ConfidentialComputingClient(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.ConfidentialComputingRestInterceptor, - "post_verify_confidential_space", - ) as post, mock.patch.object( - transports.ConfidentialComputingRestInterceptor, - "post_verify_confidential_space_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfidentialComputingRestInterceptor, "pre_verify_confidential_space" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfidentialComputingRestInterceptor, + "post_verify_confidential_space", + ) as post, + mock.patch.object( + transports.ConfidentialComputingRestInterceptor, + "post_verify_confidential_space_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfidentialComputingRestInterceptor, + "pre_verify_confidential_space", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3873,8 +3885,9 @@ def test_verify_confidential_gke_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3939,18 +3952,22 @@ def test_verify_confidential_gke_rest_interceptors(null_interceptor): ) client = ConfidentialComputingClient(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.ConfidentialComputingRestInterceptor, "post_verify_confidential_gke" - ) as post, mock.patch.object( - transports.ConfidentialComputingRestInterceptor, - "post_verify_confidential_gke_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfidentialComputingRestInterceptor, "pre_verify_confidential_gke" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfidentialComputingRestInterceptor, + "post_verify_confidential_gke", + ) as post, + mock.patch.object( + transports.ConfidentialComputingRestInterceptor, + "post_verify_confidential_gke_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfidentialComputingRestInterceptor, + "pre_verify_confidential_gke", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4008,8 +4025,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4068,8 +4086,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4268,11 +4287,14 @@ def test_confidential_computing_base_transport(): def test_confidential_computing_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.confidentialcomputing_v1.services.confidential_computing.transports.ConfidentialComputingTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.confidentialcomputing_v1.services.confidential_computing.transports.ConfidentialComputingTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConfidentialComputingTransport( @@ -4289,9 +4311,12 @@ def test_confidential_computing_base_transport_with_credentials_file(): def test_confidential_computing_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.confidentialcomputing_v1.services.confidential_computing.transports.ConfidentialComputingTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.confidentialcomputing_v1.services.confidential_computing.transports.ConfidentialComputingTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConfidentialComputingTransport() @@ -4363,11 +4388,12 @@ def test_confidential_computing_transport_auth_gdch_credentials(transport_class) def test_confidential_computing_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-config/docs/conf.py b/packages/google-cloud-config/docs/conf.py index abf20ad7bdf0..15e82c4b85cb 100644 --- a/packages/google-cloud-config/docs/conf.py +++ b/packages/google-cloud-config/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-config documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-config/google/cloud/config_v1/__init__.py b/packages/google-cloud-config/google/cloud/config_v1/__init__.py index 70a54ee1fe28..ba61f7e34884 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/__init__.py +++ b/packages/google-cloud-config/google/cloud/config_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.config import ConfigAsyncClient, ConfigClient from .types.config import ( ApplyResults, diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/async_client.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/async_client.py index 799e2a9596ee..3a6d60f5bbdd 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/async_client.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.config_v1 import gapic_version as package_version @@ -45,15 +45,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.config_v1.services.config import pagers from google.cloud.config_v1.types import config @@ -139,7 +141,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConfigAsyncClient: The constructed client. """ - return ConfigClient.from_service_account_info.__func__(ConfigAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConfigClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConfigAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +158,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConfigAsyncClient: The constructed client. """ - return ConfigClient.from_service_account_file.__func__(ConfigAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConfigClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConfigAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/client.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/client.py index a05a7cbc1368..b123f02fdb4c 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/client.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.config_v1 import gapic_version as package_version @@ -62,15 +62,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.config_v1.services.config import pagers from google.cloud.config_v1.types import config @@ -840,11 +842,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConfigClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConfigClient._read_environment_variables() + ) self._client_cert_source = ConfigClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -879,8 +879,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConfigTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/pagers.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/pagers.py index bc92b28aa74e..06aaa046b659 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/pagers.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/base.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/base.py index fecd496638a0..d22f48979335 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/base.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.config_v1 import gapic_version as package_version from google.cloud.config_v1.types import config @@ -643,13 +645,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc.py index f36f6f00f994..e7295ca94886 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.config_v1.types import config @@ -600,12 +602,12 @@ def export_deployment_statefile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_deployment_statefile" not in self._stubs: - self._stubs[ - "export_deployment_statefile" - ] = self._logged_channel.unary_unary( - "/google.cloud.config.v1.Config/ExportDeploymentStatefile", - request_serializer=config.ExportDeploymentStatefileRequest.serialize, - response_deserializer=config.Statefile.deserialize, + self._stubs["export_deployment_statefile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.config.v1.Config/ExportDeploymentStatefile", + request_serializer=config.ExportDeploymentStatefileRequest.serialize, + response_deserializer=config.Statefile.deserialize, + ) ) return self._stubs["export_deployment_statefile"] @@ -1110,12 +1112,12 @@ def update_auto_migration_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_auto_migration_config" not in self._stubs: - self._stubs[ - "update_auto_migration_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.config.v1.Config/UpdateAutoMigrationConfig", - request_serializer=config.UpdateAutoMigrationConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_auto_migration_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.config.v1.Config/UpdateAutoMigrationConfig", + request_serializer=config.UpdateAutoMigrationConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_auto_migration_config"] diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc_asyncio.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc_asyncio.py index 5c46dbe7b254..7943d5927c24 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc_asyncio.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.config_v1.types import config @@ -626,12 +628,12 @@ def export_deployment_statefile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_deployment_statefile" not in self._stubs: - self._stubs[ - "export_deployment_statefile" - ] = self._logged_channel.unary_unary( - "/google.cloud.config.v1.Config/ExportDeploymentStatefile", - request_serializer=config.ExportDeploymentStatefileRequest.serialize, - response_deserializer=config.Statefile.deserialize, + self._stubs["export_deployment_statefile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.config.v1.Config/ExportDeploymentStatefile", + request_serializer=config.ExportDeploymentStatefileRequest.serialize, + response_deserializer=config.Statefile.deserialize, + ) ) return self._stubs["export_deployment_statefile"] @@ -1149,12 +1151,12 @@ def update_auto_migration_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_auto_migration_config" not in self._stubs: - self._stubs[ - "update_auto_migration_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.config.v1.Config/UpdateAutoMigrationConfig", - request_serializer=config.UpdateAutoMigrationConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_auto_migration_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.config.v1.Config/UpdateAutoMigrationConfig", + request_serializer=config.UpdateAutoMigrationConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_auto_migration_config"] diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest.py index d163555b639a..4f4353d88c48 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -2081,7 +2083,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2234,7 +2236,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2386,7 +2388,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2533,7 +2535,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2683,7 +2685,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2778,9 +2780,7 @@ def __call__( """ - http_options = ( - _BaseConfigRestTransport._BaseExportDeploymentStatefile._get_http_options() - ) + http_options = _BaseConfigRestTransport._BaseExportDeploymentStatefile._get_http_options() request, metadata = self._interceptor.pre_export_deployment_statefile( request, metadata @@ -3241,9 +3241,7 @@ def __call__( """ - http_options = ( - _BaseConfigRestTransport._BaseExportRevisionStatefile._get_http_options() - ) + http_options = _BaseConfigRestTransport._BaseExportRevisionStatefile._get_http_options() request, metadata = self._interceptor.pre_export_revision_statefile( request, metadata @@ -5840,7 +5838,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6000,7 +5998,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6127,9 +6125,7 @@ def __call__( """ - http_options = ( - _BaseConfigRestTransport._BaseUpdateAutoMigrationConfig._get_http_options() - ) + http_options = _BaseConfigRestTransport._BaseUpdateAutoMigrationConfig._get_http_options() request, metadata = self._interceptor.pre_update_auto_migration_config( request, metadata @@ -6155,7 +6151,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6314,7 +6310,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6427,7 +6423,9 @@ def export_deployment_statefile( ) -> Callable[[config.ExportDeploymentStatefileRequest], config.Statefile]: # 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._ExportDeploymentStatefile(self._session, self._host, self._interceptor) # type: ignore + return self._ExportDeploymentStatefile( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_lock_info( @@ -6453,7 +6451,9 @@ def export_revision_statefile( ) -> Callable[[config.ExportRevisionStatefileRequest], config.Statefile]: # 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._ExportRevisionStatefile(self._session, self._host, self._interceptor) # type: ignore + return self._ExportRevisionStatefile( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_auto_migration_config( @@ -6461,7 +6461,9 @@ def get_auto_migration_config( ) -> Callable[[config.GetAutoMigrationConfigRequest], config.AutoMigrationConfig]: # 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._GetAutoMigrationConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetAutoMigrationConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_deployment( @@ -6605,7 +6607,9 @@ def update_auto_migration_config( ) -> Callable[[config.UpdateAutoMigrationConfigRequest], 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._UpdateAutoMigrationConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAutoMigrationConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_deployment( diff --git a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest_base.py b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest_base.py index b97d6c05063d..0dc1774eae33 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest_base.py +++ b/packages/google-cloud-config/google/cloud/config_v1/services/config/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.config_v1.types import config diff --git a/packages/google-cloud-config/google/cloud/config_v1/types/config.py b/packages/google-cloud-config/google/cloud/config_v1/types/config.py index 319cdc5790ec..6e7b92dfcd28 100644 --- a/packages/google-cloud-config/google/cloud/config_v1/types/config.py +++ b/packages/google-cloud-config/google/cloud/config_v1/types/config.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -115,6 +115,7 @@ class QuotaValidation(proto.Enum): deploy resources in terraform configuration files. """ + QUOTA_VALIDATION_UNSPECIFIED = 0 ENABLED = 1 ENFORCED = 2 @@ -272,6 +273,7 @@ class State(proto.Enum): DELETED (7): The deployment has been deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -308,6 +310,7 @@ class ErrorCode(proto.Enum): Failed to import values from an external source. """ + ERROR_CODE_UNSPECIFIED = 0 REVISION_FAILED = 1 CLOUD_BUILD_PERMISSION_DENIED = 3 @@ -337,6 +340,7 @@ class LockState(proto.Enum): UNLOCK_FAILED (6): The deployment has failed to unlock. """ + LOCK_STATE_UNSPECIFIED = 0 LOCKED = 1 UNLOCKED = 2 @@ -971,6 +975,7 @@ class DeletePolicy(proto.Enum): Abandons resources and only deletes the deployment and its metadata. """ + DELETE_POLICY_UNSPECIFIED = 0 DELETE = 1 ABANDON = 2 @@ -1198,6 +1203,7 @@ class Action(proto.Enum): DELETE (3): The revision was deleted. """ + ACTION_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 @@ -1218,6 +1224,7 @@ class State(proto.Enum): The revision could not be applied successfully. """ + STATE_UNSPECIFIED = 0 APPLYING = 1 APPLIED = 2 @@ -1245,6 +1252,7 @@ class ErrorCode(proto.Enum): Failed to import values from an external source. """ + ERROR_CODE_UNSPECIFIED = 0 CLOUD_BUILD_PERMISSION_DENIED = 1 APPLY_BUILD_API_FAILED = 4 @@ -1483,6 +1491,7 @@ class DeploymentStep(proto.Enum): RUNNING_QUOTA_VALIDATION (12): Running quota validation """ + DEPLOYMENT_STEP_UNSPECIFIED = 0 PREPARING_STORAGE_BUCKET = 1 DOWNLOADING_BLUEPRINT = 2 @@ -1559,6 +1568,7 @@ class Intent(proto.Enum): Infra Manager will leave this Resource untouched. """ + INTENT_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 @@ -1583,6 +1593,7 @@ class State(proto.Enum): FAILED (4): Resource failed to reconcile. """ + STATE_UNSPECIFIED = 0 PLANNED = 1 IN_PROGRESS = 2 @@ -2112,6 +2123,7 @@ class State(proto.Enum): DELETED (7): The preview has been deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 SUCCEEDED = 2 @@ -2137,6 +2149,7 @@ class PreviewMode(proto.Enum): DELETE mode generates as execution plan for destroying current resources. """ + PREVIEW_MODE_UNSPECIFIED = 0 DEFAULT = 1 DELETE = 2 @@ -2169,6 +2182,7 @@ class ErrorCode(proto.Enum): Failed to import values from an external source. """ + ERROR_CODE_UNSPECIFIED = 0 CLOUD_BUILD_PERMISSION_DENIED = 1 BUCKET_CREATION_PERMISSION_DENIED = 2 @@ -2327,6 +2341,7 @@ class PreviewStep(proto.Enum): VALIDATING_REPOSITORY (10): Validating the provided repository. """ + PREVIEW_STEP_UNSPECIFIED = 0 PREPARING_STORAGE_BUCKET = 1 DOWNLOADING_BLUEPRINT = 2 @@ -2784,6 +2799,7 @@ class State(proto.Enum): OBSOLETE (3): The version is obsolete. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 DEPRECATED = 2 @@ -2892,6 +2908,7 @@ class Intent(proto.Enum): UNCHANGED (5): The resource will be untouched. """ + INTENT_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 @@ -3318,6 +3335,7 @@ class ProviderSource(proto.Enum): SERVICE_MAINTAINED (1): Service maintained provider source type. """ + PROVIDER_SOURCE_UNSPECIFIED = 0 SERVICE_MAINTAINED = 1 diff --git a/packages/google-cloud-config/noxfile.py b/packages/google-cloud-config/noxfile.py index c3904d4ce8fb..a4b3f5f876ed 100644 --- a/packages/google-cloud-config/noxfile.py +++ b/packages/google-cloud-config/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-config/tests/unit/gapic/config_v1/test_config.py b/packages/google-cloud-config/tests/unit/gapic/config_v1/test_config.py index 2bc00850fb8c..1bd1268cc929 100644 --- a/packages/google-cloud-config/tests/unit/gapic/config_v1/test_config.py +++ b/packages/google-cloud-config/tests/unit/gapic/config_v1/test_config.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,24 +61,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.config_v1.services.config import ( ConfigAsyncClient, @@ -915,10 +917,9 @@ def test_config_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -963,10 +964,9 @@ def test_config_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1002,10 +1002,9 @@ def test_config_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1230,13 +1229,13 @@ def test_config_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1351,9 +1350,9 @@ def test_list_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -2256,9 +2255,9 @@ def test_create_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deployment] = ( + mock_rpc + ) request = {} client.create_deployment(request) @@ -2639,9 +2638,9 @@ def test_update_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_deployment] = ( + mock_rpc + ) request = {} client.update_deployment(request) @@ -3014,9 +3013,9 @@ def test_delete_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deployment] = ( + mock_rpc + ) request = {} client.delete_deployment(request) @@ -5625,9 +5624,9 @@ def test_import_statefile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_statefile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_statefile] = ( + mock_rpc + ) request = {} client.import_statefile(request) @@ -5953,9 +5952,9 @@ def test_delete_statefile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_statefile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_statefile] = ( + mock_rpc + ) request = {} client.delete_statefile(request) @@ -6597,9 +6596,9 @@ def test_unlock_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.unlock_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.unlock_deployment] = ( + mock_rpc + ) request = {} client.unlock_deployment(request) @@ -6957,9 +6956,9 @@ def test_export_lock_info_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_lock_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_lock_info] = ( + mock_rpc + ) request = {} client.export_lock_info(request) @@ -8870,9 +8869,9 @@ def test_export_preview_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_preview_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_preview_result] = ( + mock_rpc + ) request = {} client.export_preview_result(request) @@ -9679,9 +9678,9 @@ def test_get_terraform_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_terraform_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_terraform_version] = ( + mock_rpc + ) request = {} client.get_terraform_version(request) @@ -10031,9 +10030,9 @@ def test_list_resource_changes_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_changes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_changes] = ( + mock_rpc + ) request = {} client.list_resource_changes(request) @@ -10578,9 +10577,9 @@ def test_get_resource_change_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_change - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_change] = ( + mock_rpc + ) request = {} client.get_resource_change(request) @@ -10929,9 +10928,9 @@ def test_list_resource_drifts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_drifts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_drifts] = ( + mock_rpc + ) request = {} client.list_resource_drifts(request) @@ -11474,9 +11473,9 @@ def test_get_resource_drift_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_drift - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_drift] = ( + mock_rpc + ) request = {} client.get_resource_drift(request) @@ -12444,9 +12443,9 @@ def test_list_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -12882,9 +12881,9 @@ def test_create_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deployment] = ( + mock_rpc + ) request = {} client.create_deployment(request) @@ -13108,9 +13107,9 @@ def test_update_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_deployment] = ( + mock_rpc + ) request = {} client.update_deployment(request) @@ -13312,9 +13311,9 @@ def test_delete_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deployment] = ( + mock_rpc + ) request = {} client.delete_deployment(request) @@ -14638,9 +14637,9 @@ def test_import_statefile_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_statefile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_statefile] = ( + mock_rpc + ) request = {} client.import_statefile(request) @@ -14835,9 +14834,9 @@ def test_delete_statefile_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_statefile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_statefile] = ( + mock_rpc + ) request = {} client.delete_statefile(request) @@ -15205,9 +15204,9 @@ def test_unlock_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.unlock_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.unlock_deployment] = ( + mock_rpc + ) request = {} client.unlock_deployment(request) @@ -15401,9 +15400,9 @@ def test_export_lock_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_lock_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_lock_info] = ( + mock_rpc + ) request = {} client.export_lock_info(request) @@ -16397,9 +16396,9 @@ def test_export_preview_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_preview_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_preview_result] = ( + mock_rpc + ) request = {} client.export_preview_result(request) @@ -16788,9 +16787,9 @@ def test_get_terraform_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_terraform_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_terraform_version] = ( + mock_rpc + ) request = {} client.get_terraform_version(request) @@ -16973,9 +16972,9 @@ def test_list_resource_changes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_changes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_changes] = ( + mock_rpc + ) request = {} client.list_resource_changes(request) @@ -17241,9 +17240,9 @@ def test_get_resource_change_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_change - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_change] = ( + mock_rpc + ) request = {} client.get_resource_change(request) @@ -17425,9 +17424,9 @@ def test_list_resource_drifts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_drifts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_drifts] = ( + mock_rpc + ) request = {} client.list_resource_drifts(request) @@ -17691,9 +17690,9 @@ def test_get_resource_drift_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_drift - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_drift] = ( + mock_rpc + ) request = {} client.get_resource_drift(request) @@ -19846,8 +19845,9 @@ def test_list_deployments_rest_bad_request(request_type=config.ListDeploymentsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19910,17 +19910,19 @@ def test_list_deployments_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_list_deployments" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_list_deployments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_list_deployments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_deployments" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_deployments_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_list_deployments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19971,8 +19973,9 @@ def test_get_deployment_rest_bad_request(request_type=config.GetDeploymentReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20063,17 +20066,19 @@ def test_get_deployment_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_get_deployment" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_get_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_get_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_deployment" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_get_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20124,8 +20129,9 @@ def test_create_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20301,19 +20307,20 @@ def test_create_deployment_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_create_deployment" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_create_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_create_deployment" - ) as pre: + 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.ConfigRestInterceptor, "post_create_deployment" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_create_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_create_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20366,8 +20373,9 @@ def test_update_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20545,19 +20553,20 @@ def test_update_deployment_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_update_deployment" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_update_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_update_deployment" - ) as pre: + 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.ConfigRestInterceptor, "post_update_deployment" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_update_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_update_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20608,8 +20617,9 @@ def test_delete_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20664,19 +20674,20 @@ def test_delete_deployment_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_delete_deployment" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_delete_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_delete_deployment" - ) as pre: + 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.ConfigRestInterceptor, "post_delete_deployment" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_delete_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_delete_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20725,8 +20736,9 @@ def test_list_revisions_rest_bad_request(request_type=config.ListRevisionsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20789,17 +20801,19 @@ def test_list_revisions_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_list_revisions" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_list_revisions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_list_revisions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_revisions" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_revisions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_list_revisions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20852,8 +20866,9 @@ def test_get_revision_rest_bad_request(request_type=config.GetRevisionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20946,17 +20961,17 @@ def test_get_revision_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_get_revision" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_get_revision_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_get_revision" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_revision" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_revision_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ConfigRestInterceptor, "pre_get_revision") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21007,8 +21022,9 @@ def test_get_resource_rest_bad_request(request_type=config.GetResourceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21075,17 +21091,17 @@ def test_get_resource_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_get_resource" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_get_resource_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_get_resource" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_resource" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_resource_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ConfigRestInterceptor, "pre_get_resource") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21136,8 +21152,9 @@ def test_list_resources_rest_bad_request(request_type=config.ListResourcesReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21202,17 +21219,19 @@ def test_list_resources_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_list_resources" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_list_resources_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_list_resources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_resources" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_resources_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_list_resources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21265,8 +21284,9 @@ def test_export_deployment_statefile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21327,18 +21347,20 @@ def test_export_deployment_statefile_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_export_deployment_statefile" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, - "post_export_deployment_statefile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_export_deployment_statefile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_export_deployment_statefile" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, + "post_export_deployment_statefile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_export_deployment_statefile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21393,8 +21415,9 @@ def test_export_revision_statefile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21457,17 +21480,20 @@ def test_export_revision_statefile_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_export_revision_statefile" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_export_revision_statefile_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_export_revision_statefile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_export_revision_statefile" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, + "post_export_revision_statefile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_export_revision_statefile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21518,8 +21544,9 @@ def test_import_statefile_rest_bad_request(request_type=config.ImportStatefileRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21580,17 +21607,19 @@ def test_import_statefile_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_import_statefile" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_import_statefile_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_import_statefile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_import_statefile" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_import_statefile_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_import_statefile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21639,8 +21668,9 @@ def test_delete_statefile_rest_bad_request(request_type=config.DeleteStatefileRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21695,13 +21725,13 @@ def test_delete_statefile_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "pre_delete_statefile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_delete_statefile" + ) as pre, + ): pre.assert_not_called() pb_message = config.DeleteStatefileRequest.pb(config.DeleteStatefileRequest()) transcode.return_value = { @@ -21742,8 +21772,9 @@ def test_lock_deployment_rest_bad_request(request_type=config.LockDeploymentRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21798,19 +21829,20 @@ def test_lock_deployment_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_lock_deployment" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_lock_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_lock_deployment" - ) as pre: + 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.ConfigRestInterceptor, "post_lock_deployment" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_lock_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_lock_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21861,8 +21893,9 @@ def test_unlock_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21917,19 +21950,20 @@ def test_unlock_deployment_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_unlock_deployment" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_unlock_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_unlock_deployment" - ) as pre: + 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.ConfigRestInterceptor, "post_unlock_deployment" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_unlock_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_unlock_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21978,8 +22012,9 @@ def test_export_lock_info_rest_bad_request(request_type=config.ExportLockInfoReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22048,17 +22083,19 @@ def test_export_lock_info_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_export_lock_info" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_export_lock_info_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_export_lock_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_export_lock_info" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_export_lock_info_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_export_lock_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22107,8 +22144,9 @@ def test_create_preview_rest_bad_request(request_type=config.CreatePreviewReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22280,19 +22318,20 @@ def test_create_preview_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_create_preview" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_create_preview_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_create_preview" - ) as pre: + 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.ConfigRestInterceptor, "post_create_preview" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_create_preview_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_create_preview" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22341,8 +22380,9 @@ def test_get_preview_rest_bad_request(request_type=config.GetPreviewRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22427,17 +22467,15 @@ def test_get_preview_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_get_preview" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_get_preview_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_get_preview" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ConfigRestInterceptor, "post_get_preview") as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_preview_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ConfigRestInterceptor, "pre_get_preview") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22486,8 +22524,9 @@ def test_list_previews_rest_bad_request(request_type=config.ListPreviewsRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22550,17 +22589,17 @@ def test_list_previews_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_list_previews" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_list_previews_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_list_previews" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_previews" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_previews_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ConfigRestInterceptor, "pre_list_previews") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22611,8 +22650,9 @@ def test_delete_preview_rest_bad_request(request_type=config.DeletePreviewReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22667,19 +22707,20 @@ def test_delete_preview_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_delete_preview" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_delete_preview_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_delete_preview" - ) as pre: + 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.ConfigRestInterceptor, "post_delete_preview" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_delete_preview_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_delete_preview" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22730,8 +22771,9 @@ def test_export_preview_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22789,17 +22831,19 @@ def test_export_preview_result_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_export_preview_result" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_export_preview_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_export_preview_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_export_preview_result" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_export_preview_result_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_export_preview_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22854,8 +22898,9 @@ def test_list_terraform_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22918,17 +22963,20 @@ def test_list_terraform_versions_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_list_terraform_versions" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_list_terraform_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_list_terraform_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_terraform_versions" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, + "post_list_terraform_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_list_terraform_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22988,8 +23036,9 @@ def test_get_terraform_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23054,17 +23103,19 @@ def test_get_terraform_version_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_get_terraform_version" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_get_terraform_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_get_terraform_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_terraform_version" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_terraform_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_get_terraform_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23117,8 +23168,9 @@ def test_list_resource_changes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23181,17 +23233,19 @@ def test_list_resource_changes_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_list_resource_changes" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_list_resource_changes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_list_resource_changes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_resource_changes" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_resource_changes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_list_resource_changes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23248,8 +23302,9 @@ def test_get_resource_change_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23314,17 +23369,19 @@ def test_get_resource_change_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_get_resource_change" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_get_resource_change_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_get_resource_change" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_resource_change" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_resource_change_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_get_resource_change" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23377,8 +23434,9 @@ def test_list_resource_drifts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23441,17 +23499,19 @@ def test_list_resource_drifts_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_list_resource_drifts" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_list_resource_drifts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_list_resource_drifts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_resource_drifts" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_list_resource_drifts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_list_resource_drifts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23508,8 +23568,9 @@ def test_get_resource_drift_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23572,17 +23633,19 @@ def test_get_resource_drift_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_get_resource_drift" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_get_resource_drift_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_get_resource_drift" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_resource_drift" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_resource_drift_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_get_resource_drift" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23633,8 +23696,9 @@ def test_get_auto_migration_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23697,17 +23761,20 @@ def test_get_auto_migration_config_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_get_auto_migration_config" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, "post_get_auto_migration_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_get_auto_migration_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigRestInterceptor, "post_get_auto_migration_config" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, + "post_get_auto_migration_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_get_auto_migration_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23764,8 +23831,9 @@ def test_update_auto_migration_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23900,20 +23968,21 @@ def test_update_auto_migration_config_rest_interceptors(null_interceptor): ) client = ConfigClient(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.ConfigRestInterceptor, "post_update_auto_migration_config" - ) as post, mock.patch.object( - transports.ConfigRestInterceptor, - "post_update_auto_migration_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigRestInterceptor, "pre_update_auto_migration_config" - ) as pre: + 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.ConfigRestInterceptor, "post_update_auto_migration_config" + ) as post, + mock.patch.object( + transports.ConfigRestInterceptor, + "post_update_auto_migration_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigRestInterceptor, "pre_update_auto_migration_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23966,8 +24035,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24026,8 +24096,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24088,8 +24159,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24152,8 +24224,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24216,8 +24289,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24280,8 +24354,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24342,8 +24417,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24404,8 +24480,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24466,8 +24543,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -25244,11 +25322,14 @@ def test_config_base_transport(): def test_config_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.config_v1.services.config.transports.ConfigTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.config_v1.services.config.transports.ConfigTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConfigTransport( @@ -25265,9 +25346,12 @@ def test_config_base_transport_with_credentials_file(): def test_config_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.config_v1.services.config.transports.ConfigTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.config_v1.services.config.transports.ConfigTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConfigTransport() @@ -25339,11 +25423,12 @@ def test_config_transport_auth_gdch_credentials(transport_class): def test_config_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-configdelivery/docs/conf.py b/packages/google-cloud-configdelivery/docs/conf.py index db4091b33814..6788bd6e0b0b 100644 --- a/packages/google-cloud-configdelivery/docs/conf.py +++ b/packages/google-cloud-configdelivery/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-configdelivery documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/__init__.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/__init__.py index 139dd87d6063..2a4349183414 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/__init__.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.config_delivery import ConfigDeliveryAsyncClient, ConfigDeliveryClient from .types.config_delivery import ( AbortRolloutRequest, diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/async_client.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/async_client.py index 03883c2b58ad..d8a996a1f82b 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/async_client.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.configdelivery_v1.services.config_delivery import pagers from google.cloud.configdelivery_v1.types import config_delivery @@ -139,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConfigDeliveryAsyncClient: The constructed client. """ - return ConfigDeliveryClient.from_service_account_info.__func__(ConfigDeliveryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConfigDeliveryClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConfigDeliveryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +156,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConfigDeliveryAsyncClient: The constructed client. """ - return ConfigDeliveryClient.from_service_account_file.__func__(ConfigDeliveryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConfigDeliveryClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConfigDeliveryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/client.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/client.py index 54844b6c7b70..fa30280f649c 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/client.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.configdelivery_v1.services.config_delivery import pagers from google.cloud.configdelivery_v1.types import config_delivery @@ -86,9 +86,7 @@ class ConfigDeliveryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConfigDeliveryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConfigDeliveryTransport]] _transport_registry["grpc"] = ConfigDeliveryGrpcTransport _transport_registry["grpc_asyncio"] = ConfigDeliveryGrpcAsyncIOTransport _transport_registry["rest"] = ConfigDeliveryRestTransport @@ -774,11 +772,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConfigDeliveryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConfigDeliveryClient._read_environment_variables() + ) self._client_cert_source = ConfigDeliveryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -813,8 +809,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConfigDeliveryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/pagers.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/pagers.py index f65ae65fd824..2d9f71b98966 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/pagers.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/base.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/base.py index 56f760462272..054233059180 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/base.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1 import gapic_version as package_version from google.cloud.configdelivery_v1.types import config_delivery @@ -665,13 +665,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc.py index 3c0e8311884b..8bf58ca4619e 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.configdelivery_v1.types import config_delivery diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc_asyncio.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc_asyncio.py index 7d2d2bdf2e54..cc448e0708c7 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc_asyncio.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.configdelivery_v1.types import config_delivery diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/rest.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/rest.py index 94fe4e6e2293..7bbaa970a983 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/rest.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/services/config_delivery/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1874,7 +1874,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1999,9 +1999,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCreateFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCreateFleetPackage._get_http_options() request, metadata = self._interceptor.pre_create_fleet_package( request, metadata @@ -2027,7 +2025,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2178,7 +2176,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2305,9 +2303,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCreateResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCreateResourceBundle._get_http_options() request, metadata = self._interceptor.pre_create_resource_bundle( request, metadata @@ -2333,7 +2329,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2484,7 +2480,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2608,9 +2604,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteFleetPackage._get_http_options() request, metadata = self._interceptor.pre_delete_fleet_package( request, metadata @@ -2632,7 +2626,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2777,7 +2771,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2901,9 +2895,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteResourceBundle._get_http_options() request, metadata = self._interceptor.pre_delete_resource_bundle( request, metadata @@ -2925,7 +2917,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3070,7 +3062,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3195,9 +3187,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseGetFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseGetFleetPackage._get_http_options() request, metadata = self._interceptor.pre_get_fleet_package( request, metadata @@ -3491,9 +3481,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseGetResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseGetResourceBundle._get_http_options() request, metadata = self._interceptor.pre_get_resource_bundle( request, metadata @@ -3940,9 +3928,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseListFleetPackages._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseListFleetPackages._get_http_options() request, metadata = self._interceptor.pre_list_fleet_packages( request, metadata @@ -4241,9 +4227,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseListResourceBundles._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseListResourceBundles._get_http_options() request, metadata = self._interceptor.pre_list_resource_bundles( request, metadata @@ -4717,7 +4701,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4868,7 +4852,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4993,9 +4977,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseUpdateFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseUpdateFleetPackage._get_http_options() request, metadata = self._interceptor.pre_update_fleet_package( request, metadata @@ -5021,7 +5003,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5172,7 +5154,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5298,9 +5280,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseUpdateResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseUpdateResourceBundle._get_http_options() request, metadata = self._interceptor.pre_update_resource_bundle( request, metadata @@ -5326,7 +5306,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5477,7 +5457,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6107,9 +6087,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -6226,9 +6204,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/types/config_delivery.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/types/config_delivery.py index 1eeb86c1c260..8753011a4699 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/types/config_delivery.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1/types/config_delivery.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -96,6 +96,7 @@ class DeletionPropagationPolicy(proto.Enum): resources synced to the cluster will be abandoned. """ + DELETION_PROPAGATION_POLICY_UNSPECIFIED = 0 FOREGROUND = 1 ORPHAN = 2 @@ -456,6 +457,7 @@ class State(proto.Enum): SUSPENDED (2): ``FleetPackage`` is intended to be suspended. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -716,6 +718,7 @@ class State(proto.Enum): DELETING (4): ``FleetPackage`` is being deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -814,6 +817,7 @@ class State(proto.Enum): SKIPPED (9): Skipped state. """ + STATE_UNSPECIFIED = 0 WAITING = 1 IN_PROGRESS = 2 @@ -912,6 +916,7 @@ class SyncState(proto.Enum): DELETED (8): Deleted state. """ + SYNC_STATE_UNSPECIFIED = 0 RECONCILING = 1 STALLED = 2 @@ -1472,6 +1477,7 @@ class Lifecycle(proto.Enum): indicates that the ``Release`` is now published (or released) and immutable. """ + LIFECYCLE_UNSPECIFIED = 0 DRAFT = 1 PUBLISHED = 2 @@ -2187,6 +2193,7 @@ class State(proto.Enum): ABORTING (8): Rollout aborting. """ + STATE_UNSPECIFIED = 0 COMPLETED = 1 SUSPENDED = 2 diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/__init__.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/__init__.py index 04ccb750bef3..1bb81badce88 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/__init__.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.config_delivery import ConfigDeliveryAsyncClient, ConfigDeliveryClient from .types.config_delivery import ( AbortRolloutRequest, diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/async_client.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/async_client.py index 180106256819..44f3b38b6171 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/async_client.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1alpha import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.configdelivery_v1alpha.services.config_delivery import pagers from google.cloud.configdelivery_v1alpha.types import config_delivery @@ -139,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConfigDeliveryAsyncClient: The constructed client. """ - return ConfigDeliveryClient.from_service_account_info.__func__(ConfigDeliveryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConfigDeliveryClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConfigDeliveryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +156,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConfigDeliveryAsyncClient: The constructed client. """ - return ConfigDeliveryClient.from_service_account_file.__func__(ConfigDeliveryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConfigDeliveryClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConfigDeliveryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/client.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/client.py index 90e22c1add6a..d70edaefc585 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/client.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1alpha import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.configdelivery_v1alpha.services.config_delivery import pagers from google.cloud.configdelivery_v1alpha.types import config_delivery @@ -86,9 +86,7 @@ class ConfigDeliveryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConfigDeliveryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConfigDeliveryTransport]] _transport_registry["grpc"] = ConfigDeliveryGrpcTransport _transport_registry["grpc_asyncio"] = ConfigDeliveryGrpcAsyncIOTransport _transport_registry["rest"] = ConfigDeliveryRestTransport @@ -774,11 +772,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConfigDeliveryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConfigDeliveryClient._read_environment_variables() + ) self._client_cert_source = ConfigDeliveryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -813,8 +809,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConfigDeliveryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/pagers.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/pagers.py index 2eb28b37dbea..ab10080ac98e 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/pagers.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/base.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/base.py index e36c6f7c58f6..45b9c0e82f11 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/base.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1alpha import gapic_version as package_version from google.cloud.configdelivery_v1alpha.types import config_delivery @@ -665,13 +665,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc.py index 377c75543f95..e9498262b2f9 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.configdelivery_v1alpha.types import config_delivery diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc_asyncio.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc_asyncio.py index 7cd43c2359bc..8135a228cdf7 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc_asyncio.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.configdelivery_v1alpha.types import config_delivery diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/rest.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/rest.py index 7603b012dcc4..ac538514b040 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/rest.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/services/config_delivery/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1874,7 +1874,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1999,9 +1999,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCreateFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCreateFleetPackage._get_http_options() request, metadata = self._interceptor.pre_create_fleet_package( request, metadata @@ -2027,7 +2025,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2178,7 +2176,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2305,9 +2303,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCreateResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCreateResourceBundle._get_http_options() request, metadata = self._interceptor.pre_create_resource_bundle( request, metadata @@ -2333,7 +2329,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2484,7 +2480,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2608,9 +2604,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteFleetPackage._get_http_options() request, metadata = self._interceptor.pre_delete_fleet_package( request, metadata @@ -2632,7 +2626,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2777,7 +2771,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2901,9 +2895,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteResourceBundle._get_http_options() request, metadata = self._interceptor.pre_delete_resource_bundle( request, metadata @@ -2925,7 +2917,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3070,7 +3062,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3195,9 +3187,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseGetFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseGetFleetPackage._get_http_options() request, metadata = self._interceptor.pre_get_fleet_package( request, metadata @@ -3491,9 +3481,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseGetResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseGetResourceBundle._get_http_options() request, metadata = self._interceptor.pre_get_resource_bundle( request, metadata @@ -3940,9 +3928,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseListFleetPackages._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseListFleetPackages._get_http_options() request, metadata = self._interceptor.pre_list_fleet_packages( request, metadata @@ -4241,9 +4227,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseListResourceBundles._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseListResourceBundles._get_http_options() request, metadata = self._interceptor.pre_list_resource_bundles( request, metadata @@ -4717,7 +4701,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4868,7 +4852,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4993,9 +4977,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseUpdateFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseUpdateFleetPackage._get_http_options() request, metadata = self._interceptor.pre_update_fleet_package( request, metadata @@ -5021,7 +5003,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5172,7 +5154,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5298,9 +5280,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseUpdateResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseUpdateResourceBundle._get_http_options() request, metadata = self._interceptor.pre_update_resource_bundle( request, metadata @@ -5326,7 +5306,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5477,7 +5457,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6107,9 +6087,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -6226,9 +6204,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/types/config_delivery.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/types/config_delivery.py index ef26e60d9c4b..dfe713f5f6fc 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/types/config_delivery.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1alpha/types/config_delivery.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -96,6 +96,7 @@ class DeletionPropagationPolicy(proto.Enum): resources synced to the cluster will be abandoned. """ + DELETION_PROPAGATION_POLICY_UNSPECIFIED = 0 FOREGROUND = 1 ORPHAN = 2 @@ -456,6 +457,7 @@ class State(proto.Enum): SUSPENDED (2): ``FleetPackage`` is intended to be suspended. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -716,6 +718,7 @@ class State(proto.Enum): DELETING (4): ``FleetPackage`` is being deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -814,6 +817,7 @@ class State(proto.Enum): SKIPPED (9): Skipped state. """ + STATE_UNSPECIFIED = 0 WAITING = 1 IN_PROGRESS = 2 @@ -912,6 +916,7 @@ class SyncState(proto.Enum): DELETED (8): Deleted state. """ + SYNC_STATE_UNSPECIFIED = 0 RECONCILING = 1 STALLED = 2 @@ -1472,6 +1477,7 @@ class Lifecycle(proto.Enum): indicates that the ``Release`` is now published (or released) and immutable. """ + LIFECYCLE_UNSPECIFIED = 0 DRAFT = 1 PUBLISHED = 2 @@ -2188,6 +2194,7 @@ class State(proto.Enum): ABORTING (8): Rollout aborting. """ + STATE_UNSPECIFIED = 0 COMPLETED = 1 SUSPENDED = 2 diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/__init__.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/__init__.py index b360d7adac3e..91de4604abe5 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/__init__.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.config_delivery import ConfigDeliveryAsyncClient, ConfigDeliveryClient from .types.config_delivery import ( AbortRolloutRequest, diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/async_client.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/async_client.py index 057ccf70f060..2ee81b290200 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/async_client.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1beta import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.configdelivery_v1beta.services.config_delivery import pagers from google.cloud.configdelivery_v1beta.types import config_delivery @@ -139,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConfigDeliveryAsyncClient: The constructed client. """ - return ConfigDeliveryClient.from_service_account_info.__func__(ConfigDeliveryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConfigDeliveryClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConfigDeliveryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +156,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConfigDeliveryAsyncClient: The constructed client. """ - return ConfigDeliveryClient.from_service_account_file.__func__(ConfigDeliveryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConfigDeliveryClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConfigDeliveryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/client.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/client.py index b65c529e599e..47383c193e6f 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/client.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1beta import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.configdelivery_v1beta.services.config_delivery import pagers from google.cloud.configdelivery_v1beta.types import config_delivery @@ -86,9 +86,7 @@ class ConfigDeliveryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConfigDeliveryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConfigDeliveryTransport]] _transport_registry["grpc"] = ConfigDeliveryGrpcTransport _transport_registry["grpc_asyncio"] = ConfigDeliveryGrpcAsyncIOTransport _transport_registry["rest"] = ConfigDeliveryRestTransport @@ -774,11 +772,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConfigDeliveryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConfigDeliveryClient._read_environment_variables() + ) self._client_cert_source = ConfigDeliveryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -813,8 +809,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConfigDeliveryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/pagers.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/pagers.py index 1211b059f53c..2f21561e46a7 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/pagers.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/base.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/base.py index 2594d0b630a8..3e5c33990a0f 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/base.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.configdelivery_v1beta import gapic_version as package_version from google.cloud.configdelivery_v1beta.types import config_delivery @@ -665,13 +665,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc.py index 79b56697466e..e3838c903a10 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.configdelivery_v1beta.types import config_delivery diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc_asyncio.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc_asyncio.py index 3bd83ee4d3ee..d326931bf8e0 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc_asyncio.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.configdelivery_v1beta.types import config_delivery diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/rest.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/rest.py index bd8b36363405..393a0e5dcb6b 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/rest.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/services/config_delivery/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1874,7 +1874,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1999,9 +1999,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCreateFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCreateFleetPackage._get_http_options() request, metadata = self._interceptor.pre_create_fleet_package( request, metadata @@ -2027,7 +2025,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2178,7 +2176,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2305,9 +2303,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCreateResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCreateResourceBundle._get_http_options() request, metadata = self._interceptor.pre_create_resource_bundle( request, metadata @@ -2333,7 +2329,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2484,7 +2480,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2608,9 +2604,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteFleetPackage._get_http_options() request, metadata = self._interceptor.pre_delete_fleet_package( request, metadata @@ -2632,7 +2626,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2777,7 +2771,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2901,9 +2895,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteResourceBundle._get_http_options() request, metadata = self._interceptor.pre_delete_resource_bundle( request, metadata @@ -2925,7 +2917,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3070,7 +3062,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3195,9 +3187,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseGetFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseGetFleetPackage._get_http_options() request, metadata = self._interceptor.pre_get_fleet_package( request, metadata @@ -3491,9 +3481,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseGetResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseGetResourceBundle._get_http_options() request, metadata = self._interceptor.pre_get_resource_bundle( request, metadata @@ -3940,9 +3928,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseListFleetPackages._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseListFleetPackages._get_http_options() request, metadata = self._interceptor.pre_list_fleet_packages( request, metadata @@ -4241,9 +4227,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseListResourceBundles._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseListResourceBundles._get_http_options() request, metadata = self._interceptor.pre_list_resource_bundles( request, metadata @@ -4717,7 +4701,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4868,7 +4852,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4993,9 +4977,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseUpdateFleetPackage._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseUpdateFleetPackage._get_http_options() request, metadata = self._interceptor.pre_update_fleet_package( request, metadata @@ -5021,7 +5003,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5172,7 +5154,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5298,9 +5280,7 @@ def __call__( """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseUpdateResourceBundle._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseUpdateResourceBundle._get_http_options() request, metadata = self._interceptor.pre_update_resource_bundle( request, metadata @@ -5326,7 +5306,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5477,7 +5457,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6107,9 +6087,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -6226,9 +6204,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConfigDeliveryRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseConfigDeliveryRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/types/config_delivery.py b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/types/config_delivery.py index 033a062d5da8..7aa794649730 100644 --- a/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/types/config_delivery.py +++ b/packages/google-cloud-configdelivery/google/cloud/configdelivery_v1beta/types/config_delivery.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -96,6 +96,7 @@ class DeletionPropagationPolicy(proto.Enum): resources synced to the cluster will be abandoned. """ + DELETION_PROPAGATION_POLICY_UNSPECIFIED = 0 FOREGROUND = 1 ORPHAN = 2 @@ -456,6 +457,7 @@ class State(proto.Enum): SUSPENDED (2): ``FleetPackage`` is intended to be suspended. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -716,6 +718,7 @@ class State(proto.Enum): DELETING (4): ``FleetPackage`` is being deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUSPENDED = 2 @@ -814,6 +817,7 @@ class State(proto.Enum): SKIPPED (9): Skipped state. """ + STATE_UNSPECIFIED = 0 WAITING = 1 IN_PROGRESS = 2 @@ -912,6 +916,7 @@ class SyncState(proto.Enum): DELETED (8): Deleted state. """ + SYNC_STATE_UNSPECIFIED = 0 RECONCILING = 1 STALLED = 2 @@ -1472,6 +1477,7 @@ class Lifecycle(proto.Enum): indicates that the ``Release`` is now published (or released) and immutable. """ + LIFECYCLE_UNSPECIFIED = 0 DRAFT = 1 PUBLISHED = 2 @@ -2188,6 +2194,7 @@ class State(proto.Enum): ABORTING (8): Rollout aborting. """ + STATE_UNSPECIFIED = 0 COMPLETED = 1 SUSPENDED = 2 diff --git a/packages/google-cloud-configdelivery/noxfile.py b/packages/google-cloud-configdelivery/noxfile.py index 2b4fb7abe9df..ed44e49be536 100644 --- a/packages/google-cloud-configdelivery/noxfile.py +++ b/packages/google-cloud-configdelivery/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1/test_config_delivery.py b/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1/test_config_delivery.py index 59d6f5b16147..12d7221731cf 100644 --- a/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1/test_config_delivery.py +++ b/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1/test_config_delivery.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.configdelivery_v1.services.config_delivery import ( ConfigDeliveryAsyncClient, @@ -959,10 +959,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1007,10 +1006,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1044,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1292,13 +1289,13 @@ def test_config_delivery_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1420,9 +1417,9 @@ def test_list_resource_bundles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_bundles] = ( + mock_rpc + ) request = {} client.list_resource_bundles(request) @@ -1968,9 +1965,9 @@ def test_get_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_bundle] = ( + mock_rpc + ) request = {} client.get_resource_bundle(request) @@ -2312,9 +2309,9 @@ def test_create_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_resource_bundle] = ( + mock_rpc + ) request = {} client.create_resource_bundle(request) @@ -2675,9 +2672,9 @@ def test_update_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_resource_bundle] = ( + mock_rpc + ) request = {} client.update_resource_bundle(request) @@ -3032,9 +3029,9 @@ def test_delete_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_resource_bundle] = ( + mock_rpc + ) request = {} client.delete_resource_bundle(request) @@ -3389,9 +3386,9 @@ def test_list_fleet_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_fleet_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_fleet_packages] = ( + mock_rpc + ) request = {} client.list_fleet_packages(request) @@ -3940,9 +3937,9 @@ def test_get_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_fleet_package] = ( + mock_rpc + ) request = {} client.get_fleet_package(request) @@ -4287,9 +4284,9 @@ def test_create_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_fleet_package] = ( + mock_rpc + ) request = {} client.create_fleet_package(request) @@ -4649,9 +4646,9 @@ def test_update_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fleet_package] = ( + mock_rpc + ) request = {} client.update_fleet_package(request) @@ -5005,9 +5002,9 @@ def test_delete_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_fleet_package] = ( + mock_rpc + ) request = {} client.delete_fleet_package(request) @@ -10868,9 +10865,9 @@ def test_list_resource_bundles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_bundles] = ( + mock_rpc + ) request = {} client.list_resource_bundles(request) @@ -11132,9 +11129,9 @@ def test_get_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_bundle] = ( + mock_rpc + ) request = {} client.get_resource_bundle(request) @@ -11317,9 +11314,9 @@ def test_create_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_resource_bundle] = ( + mock_rpc + ) request = {} client.create_resource_bundle(request) @@ -11538,9 +11535,9 @@ def test_update_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_resource_bundle] = ( + mock_rpc + ) request = {} client.update_resource_bundle(request) @@ -11742,9 +11739,9 @@ def test_delete_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_resource_bundle] = ( + mock_rpc + ) request = {} client.delete_resource_bundle(request) @@ -11940,9 +11937,9 @@ def test_list_fleet_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_fleet_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_fleet_packages] = ( + mock_rpc + ) request = {} client.list_fleet_packages(request) @@ -12202,9 +12199,9 @@ def test_get_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_fleet_package] = ( + mock_rpc + ) request = {} client.get_fleet_package(request) @@ -12386,9 +12383,9 @@ def test_create_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_fleet_package] = ( + mock_rpc + ) request = {} client.create_fleet_package(request) @@ -12606,9 +12603,9 @@ def test_update_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fleet_package] = ( + mock_rpc + ) request = {} client.update_fleet_package(request) @@ -12809,9 +12806,9 @@ def test_delete_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_fleet_package] = ( + mock_rpc + ) request = {} client.delete_fleet_package(request) @@ -17423,8 +17420,9 @@ def test_list_resource_bundles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17489,18 +17487,20 @@ def test_list_resource_bundles_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_resource_bundles" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_list_resource_bundles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_resource_bundles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_resource_bundles" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_list_resource_bundles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_resource_bundles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17560,8 +17560,9 @@ def test_get_resource_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17628,18 +17629,20 @@ def test_get_resource_bundle_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_resource_bundle" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_get_resource_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_resource_bundle" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_resource_bundle" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_get_resource_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_resource_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17694,8 +17697,9 @@ def test_create_resource_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17828,20 +17832,21 @@ def test_create_resource_bundle_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_create_resource_bundle" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_create_resource_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_create_resource_bundle" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_create_resource_bundle" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_create_resource_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_create_resource_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17898,8 +17903,9 @@ def test_update_resource_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18036,20 +18042,21 @@ def test_update_resource_bundle_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_update_resource_bundle" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_update_resource_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_update_resource_bundle" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_update_resource_bundle" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_update_resource_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_update_resource_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18104,8 +18111,9 @@ def test_delete_resource_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18164,20 +18172,21 @@ def test_delete_resource_bundle_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_delete_resource_bundle" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_delete_resource_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_delete_resource_bundle" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_delete_resource_bundle" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_delete_resource_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_delete_resource_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18230,8 +18239,9 @@ def test_list_fleet_packages_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18296,18 +18306,20 @@ def test_list_fleet_packages_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_fleet_packages" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_list_fleet_packages_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_fleet_packages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_fleet_packages" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_list_fleet_packages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_fleet_packages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18365,8 +18377,9 @@ def test_get_fleet_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18436,17 +18449,20 @@ def test_get_fleet_package_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_fleet_package" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_get_fleet_package_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_fleet_package" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_fleet_package" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_get_fleet_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_fleet_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18501,8 +18517,9 @@ def test_create_fleet_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18655,20 +18672,21 @@ def test_create_fleet_package_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_create_fleet_package" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_create_fleet_package_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_create_fleet_package" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_create_fleet_package" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_create_fleet_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_create_fleet_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18725,8 +18743,9 @@ def test_update_fleet_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18883,20 +18902,21 @@ def test_update_fleet_package_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_update_fleet_package" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_update_fleet_package_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_update_fleet_package" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_update_fleet_package" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_update_fleet_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_update_fleet_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18949,8 +18969,9 @@ def test_delete_fleet_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19007,20 +19028,21 @@ def test_delete_fleet_package_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_delete_fleet_package" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_delete_fleet_package_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_delete_fleet_package" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_delete_fleet_package" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_delete_fleet_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_delete_fleet_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19075,8 +19097,9 @@ def test_list_releases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19143,17 +19166,19 @@ def test_list_releases_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_releases" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_list_releases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_releases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_releases" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_releases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_releases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19211,8 +19236,9 @@ def test_get_release_rest_bad_request(request_type=config_delivery.GetReleaseReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19281,17 +19307,19 @@ def test_get_release_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_release" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_get_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_release" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_release" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_release_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19346,8 +19374,9 @@ def test_create_release_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19486,19 +19515,21 @@ def test_create_release_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_create_release" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_create_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_create_release" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_create_release" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_create_release_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_create_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19555,8 +19586,9 @@ def test_update_release_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19697,19 +19729,21 @@ def test_update_release_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_update_release" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_update_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_update_release" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_update_release" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_update_release_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_update_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19764,8 +19798,9 @@ def test_delete_release_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19824,19 +19859,21 @@ def test_delete_release_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_delete_release" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_delete_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_delete_release" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_delete_release" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_delete_release_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_delete_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19891,8 +19928,9 @@ def test_list_variants_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19959,17 +19997,19 @@ def test_list_variants_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_variants" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_list_variants_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_variants" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_variants" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_variants_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_variants" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20027,8 +20067,9 @@ def test_get_variant_rest_bad_request(request_type=config_delivery.GetVariantReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20095,17 +20136,19 @@ def test_get_variant_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_variant" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_get_variant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_variant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_variant" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_variant_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_variant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20160,8 +20203,9 @@ def test_create_variant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20294,19 +20338,21 @@ def test_create_variant_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_create_variant" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_create_variant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_create_variant" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_create_variant" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_create_variant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_create_variant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20363,8 +20409,9 @@ def test_update_variant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20499,19 +20546,21 @@ def test_update_variant_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_update_variant" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_update_variant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_update_variant" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_update_variant" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_update_variant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_update_variant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20566,8 +20615,9 @@ def test_delete_variant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20626,19 +20676,21 @@ def test_delete_variant_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_delete_variant" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_delete_variant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_delete_variant" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_delete_variant" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_delete_variant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_delete_variant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20693,8 +20745,9 @@ def test_list_rollouts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20761,17 +20814,19 @@ def test_list_rollouts_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_rollouts" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_list_rollouts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_rollouts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_rollouts" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_rollouts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_rollouts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20829,8 +20884,9 @@ def test_get_rollout_rest_bad_request(request_type=config_delivery.GetRolloutReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20902,17 +20958,19 @@ def test_get_rollout_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_rollout" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_get_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_rollout" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_rollout" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_rollout_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20967,8 +21025,9 @@ def test_suspend_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21027,19 +21086,21 @@ def test_suspend_rollout_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_suspend_rollout" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_suspend_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_suspend_rollout" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_suspend_rollout" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_suspend_rollout_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_suspend_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21094,8 +21155,9 @@ def test_resume_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21154,19 +21216,21 @@ def test_resume_rollout_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_resume_rollout" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_resume_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_resume_rollout" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_resume_rollout" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_resume_rollout_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_resume_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21221,8 +21285,9 @@ def test_abort_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21281,19 +21346,20 @@ def test_abort_rollout_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_abort_rollout" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_abort_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_abort_rollout" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_abort_rollout" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_abort_rollout_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_abort_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21346,8 +21412,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21406,8 +21473,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21468,8 +21536,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21530,8 +21599,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21592,8 +21662,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21654,8 +21725,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22335,11 +22407,14 @@ def test_config_delivery_base_transport(): def test_config_delivery_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.configdelivery_v1.services.config_delivery.transports.ConfigDeliveryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.configdelivery_v1.services.config_delivery.transports.ConfigDeliveryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConfigDeliveryTransport( @@ -22356,9 +22431,12 @@ def test_config_delivery_base_transport_with_credentials_file(): def test_config_delivery_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.configdelivery_v1.services.config_delivery.transports.ConfigDeliveryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.configdelivery_v1.services.config_delivery.transports.ConfigDeliveryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConfigDeliveryTransport() @@ -22430,11 +22508,12 @@ def test_config_delivery_transport_auth_gdch_credentials(transport_class): def test_config_delivery_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1alpha/test_config_delivery.py b/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1alpha/test_config_delivery.py index df382e9a9321..abb1ca51d28d 100644 --- a/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1alpha/test_config_delivery.py +++ b/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1alpha/test_config_delivery.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.configdelivery_v1alpha.services.config_delivery import ( ConfigDeliveryAsyncClient, @@ -959,10 +959,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1007,10 +1006,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1044,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1292,13 +1289,13 @@ def test_config_delivery_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1420,9 +1417,9 @@ def test_list_resource_bundles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_bundles] = ( + mock_rpc + ) request = {} client.list_resource_bundles(request) @@ -1968,9 +1965,9 @@ def test_get_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_bundle] = ( + mock_rpc + ) request = {} client.get_resource_bundle(request) @@ -2312,9 +2309,9 @@ def test_create_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_resource_bundle] = ( + mock_rpc + ) request = {} client.create_resource_bundle(request) @@ -2675,9 +2672,9 @@ def test_update_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_resource_bundle] = ( + mock_rpc + ) request = {} client.update_resource_bundle(request) @@ -3032,9 +3029,9 @@ def test_delete_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_resource_bundle] = ( + mock_rpc + ) request = {} client.delete_resource_bundle(request) @@ -3389,9 +3386,9 @@ def test_list_fleet_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_fleet_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_fleet_packages] = ( + mock_rpc + ) request = {} client.list_fleet_packages(request) @@ -3940,9 +3937,9 @@ def test_get_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_fleet_package] = ( + mock_rpc + ) request = {} client.get_fleet_package(request) @@ -4287,9 +4284,9 @@ def test_create_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_fleet_package] = ( + mock_rpc + ) request = {} client.create_fleet_package(request) @@ -4649,9 +4646,9 @@ def test_update_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fleet_package] = ( + mock_rpc + ) request = {} client.update_fleet_package(request) @@ -5005,9 +5002,9 @@ def test_delete_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_fleet_package] = ( + mock_rpc + ) request = {} client.delete_fleet_package(request) @@ -10868,9 +10865,9 @@ def test_list_resource_bundles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_bundles] = ( + mock_rpc + ) request = {} client.list_resource_bundles(request) @@ -11132,9 +11129,9 @@ def test_get_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_bundle] = ( + mock_rpc + ) request = {} client.get_resource_bundle(request) @@ -11317,9 +11314,9 @@ def test_create_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_resource_bundle] = ( + mock_rpc + ) request = {} client.create_resource_bundle(request) @@ -11538,9 +11535,9 @@ def test_update_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_resource_bundle] = ( + mock_rpc + ) request = {} client.update_resource_bundle(request) @@ -11742,9 +11739,9 @@ def test_delete_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_resource_bundle] = ( + mock_rpc + ) request = {} client.delete_resource_bundle(request) @@ -11940,9 +11937,9 @@ def test_list_fleet_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_fleet_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_fleet_packages] = ( + mock_rpc + ) request = {} client.list_fleet_packages(request) @@ -12202,9 +12199,9 @@ def test_get_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_fleet_package] = ( + mock_rpc + ) request = {} client.get_fleet_package(request) @@ -12386,9 +12383,9 @@ def test_create_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_fleet_package] = ( + mock_rpc + ) request = {} client.create_fleet_package(request) @@ -12606,9 +12603,9 @@ def test_update_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fleet_package] = ( + mock_rpc + ) request = {} client.update_fleet_package(request) @@ -12809,9 +12806,9 @@ def test_delete_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_fleet_package] = ( + mock_rpc + ) request = {} client.delete_fleet_package(request) @@ -17423,8 +17420,9 @@ def test_list_resource_bundles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17489,18 +17487,20 @@ def test_list_resource_bundles_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_resource_bundles" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_list_resource_bundles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_resource_bundles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_resource_bundles" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_list_resource_bundles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_resource_bundles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17560,8 +17560,9 @@ def test_get_resource_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17628,18 +17629,20 @@ def test_get_resource_bundle_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_resource_bundle" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_get_resource_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_resource_bundle" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_resource_bundle" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_get_resource_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_resource_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17694,8 +17697,9 @@ def test_create_resource_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17828,20 +17832,21 @@ def test_create_resource_bundle_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_create_resource_bundle" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_create_resource_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_create_resource_bundle" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_create_resource_bundle" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_create_resource_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_create_resource_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17898,8 +17903,9 @@ def test_update_resource_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18036,20 +18042,21 @@ def test_update_resource_bundle_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_update_resource_bundle" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_update_resource_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_update_resource_bundle" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_update_resource_bundle" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_update_resource_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_update_resource_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18104,8 +18111,9 @@ def test_delete_resource_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18164,20 +18172,21 @@ def test_delete_resource_bundle_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_delete_resource_bundle" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_delete_resource_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_delete_resource_bundle" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_delete_resource_bundle" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_delete_resource_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_delete_resource_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18230,8 +18239,9 @@ def test_list_fleet_packages_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18296,18 +18306,20 @@ def test_list_fleet_packages_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_fleet_packages" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_list_fleet_packages_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_fleet_packages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_fleet_packages" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_list_fleet_packages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_fleet_packages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18365,8 +18377,9 @@ def test_get_fleet_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18436,17 +18449,20 @@ def test_get_fleet_package_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_fleet_package" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_get_fleet_package_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_fleet_package" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_fleet_package" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_get_fleet_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_fleet_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18501,8 +18517,9 @@ def test_create_fleet_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18655,20 +18672,21 @@ def test_create_fleet_package_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_create_fleet_package" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_create_fleet_package_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_create_fleet_package" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_create_fleet_package" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_create_fleet_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_create_fleet_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18725,8 +18743,9 @@ def test_update_fleet_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18883,20 +18902,21 @@ def test_update_fleet_package_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_update_fleet_package" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_update_fleet_package_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_update_fleet_package" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_update_fleet_package" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_update_fleet_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_update_fleet_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18949,8 +18969,9 @@ def test_delete_fleet_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19007,20 +19028,21 @@ def test_delete_fleet_package_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_delete_fleet_package" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_delete_fleet_package_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_delete_fleet_package" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_delete_fleet_package" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_delete_fleet_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_delete_fleet_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19075,8 +19097,9 @@ def test_list_releases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19143,17 +19166,19 @@ def test_list_releases_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_releases" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_list_releases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_releases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_releases" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_releases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_releases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19211,8 +19236,9 @@ def test_get_release_rest_bad_request(request_type=config_delivery.GetReleaseReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19281,17 +19307,19 @@ def test_get_release_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_release" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_get_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_release" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_release" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_release_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19346,8 +19374,9 @@ def test_create_release_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19486,19 +19515,21 @@ def test_create_release_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_create_release" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_create_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_create_release" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_create_release" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_create_release_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_create_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19555,8 +19586,9 @@ def test_update_release_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19697,19 +19729,21 @@ def test_update_release_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_update_release" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_update_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_update_release" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_update_release" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_update_release_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_update_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19764,8 +19798,9 @@ def test_delete_release_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19824,19 +19859,21 @@ def test_delete_release_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_delete_release" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_delete_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_delete_release" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_delete_release" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_delete_release_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_delete_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19891,8 +19928,9 @@ def test_list_variants_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19959,17 +19997,19 @@ def test_list_variants_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_variants" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_list_variants_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_variants" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_variants" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_variants_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_variants" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20027,8 +20067,9 @@ def test_get_variant_rest_bad_request(request_type=config_delivery.GetVariantReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20095,17 +20136,19 @@ def test_get_variant_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_variant" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_get_variant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_variant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_variant" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_variant_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_variant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20160,8 +20203,9 @@ def test_create_variant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20294,19 +20338,21 @@ def test_create_variant_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_create_variant" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_create_variant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_create_variant" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_create_variant" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_create_variant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_create_variant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20363,8 +20409,9 @@ def test_update_variant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20499,19 +20546,21 @@ def test_update_variant_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_update_variant" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_update_variant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_update_variant" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_update_variant" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_update_variant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_update_variant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20566,8 +20615,9 @@ def test_delete_variant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20626,19 +20676,21 @@ def test_delete_variant_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_delete_variant" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_delete_variant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_delete_variant" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_delete_variant" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_delete_variant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_delete_variant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20693,8 +20745,9 @@ def test_list_rollouts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20761,17 +20814,19 @@ def test_list_rollouts_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_rollouts" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_list_rollouts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_rollouts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_rollouts" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_rollouts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_rollouts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20829,8 +20884,9 @@ def test_get_rollout_rest_bad_request(request_type=config_delivery.GetRolloutReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20902,17 +20958,19 @@ def test_get_rollout_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_rollout" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_get_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_rollout" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_rollout" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_rollout_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20967,8 +21025,9 @@ def test_suspend_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21027,19 +21086,21 @@ def test_suspend_rollout_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_suspend_rollout" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_suspend_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_suspend_rollout" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_suspend_rollout" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_suspend_rollout_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_suspend_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21094,8 +21155,9 @@ def test_resume_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21154,19 +21216,21 @@ def test_resume_rollout_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_resume_rollout" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_resume_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_resume_rollout" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_resume_rollout" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_resume_rollout_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_resume_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21221,8 +21285,9 @@ def test_abort_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21281,19 +21346,20 @@ def test_abort_rollout_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_abort_rollout" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_abort_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_abort_rollout" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_abort_rollout" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_abort_rollout_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_abort_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21346,8 +21412,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21406,8 +21473,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21468,8 +21536,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21530,8 +21599,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21592,8 +21662,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21654,8 +21725,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22335,11 +22407,14 @@ def test_config_delivery_base_transport(): def test_config_delivery_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.configdelivery_v1alpha.services.config_delivery.transports.ConfigDeliveryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.configdelivery_v1alpha.services.config_delivery.transports.ConfigDeliveryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConfigDeliveryTransport( @@ -22356,9 +22431,12 @@ def test_config_delivery_base_transport_with_credentials_file(): def test_config_delivery_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.configdelivery_v1alpha.services.config_delivery.transports.ConfigDeliveryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.configdelivery_v1alpha.services.config_delivery.transports.ConfigDeliveryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConfigDeliveryTransport() @@ -22430,11 +22508,12 @@ def test_config_delivery_transport_auth_gdch_credentials(transport_class): def test_config_delivery_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1beta/test_config_delivery.py b/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1beta/test_config_delivery.py index 46a0992c5731..7fa068d2bdc0 100644 --- a/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1beta/test_config_delivery.py +++ b/packages/google-cloud-configdelivery/tests/unit/gapic/configdelivery_v1beta/test_config_delivery.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.configdelivery_v1beta.services.config_delivery import ( ConfigDeliveryAsyncClient, @@ -959,10 +959,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1007,10 +1006,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1044,9 @@ def test_config_delivery_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1292,13 +1289,13 @@ def test_config_delivery_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1420,9 +1417,9 @@ def test_list_resource_bundles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_bundles] = ( + mock_rpc + ) request = {} client.list_resource_bundles(request) @@ -1968,9 +1965,9 @@ def test_get_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_bundle] = ( + mock_rpc + ) request = {} client.get_resource_bundle(request) @@ -2312,9 +2309,9 @@ def test_create_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_resource_bundle] = ( + mock_rpc + ) request = {} client.create_resource_bundle(request) @@ -2675,9 +2672,9 @@ def test_update_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_resource_bundle] = ( + mock_rpc + ) request = {} client.update_resource_bundle(request) @@ -3032,9 +3029,9 @@ def test_delete_resource_bundle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_resource_bundle] = ( + mock_rpc + ) request = {} client.delete_resource_bundle(request) @@ -3389,9 +3386,9 @@ def test_list_fleet_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_fleet_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_fleet_packages] = ( + mock_rpc + ) request = {} client.list_fleet_packages(request) @@ -3940,9 +3937,9 @@ def test_get_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_fleet_package] = ( + mock_rpc + ) request = {} client.get_fleet_package(request) @@ -4287,9 +4284,9 @@ def test_create_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_fleet_package] = ( + mock_rpc + ) request = {} client.create_fleet_package(request) @@ -4649,9 +4646,9 @@ def test_update_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fleet_package] = ( + mock_rpc + ) request = {} client.update_fleet_package(request) @@ -5005,9 +5002,9 @@ def test_delete_fleet_package_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_fleet_package] = ( + mock_rpc + ) request = {} client.delete_fleet_package(request) @@ -10868,9 +10865,9 @@ def test_list_resource_bundles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_resource_bundles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_resource_bundles] = ( + mock_rpc + ) request = {} client.list_resource_bundles(request) @@ -11132,9 +11129,9 @@ def test_get_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_resource_bundle] = ( + mock_rpc + ) request = {} client.get_resource_bundle(request) @@ -11317,9 +11314,9 @@ def test_create_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_resource_bundle] = ( + mock_rpc + ) request = {} client.create_resource_bundle(request) @@ -11538,9 +11535,9 @@ def test_update_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_resource_bundle] = ( + mock_rpc + ) request = {} client.update_resource_bundle(request) @@ -11742,9 +11739,9 @@ def test_delete_resource_bundle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_resource_bundle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_resource_bundle] = ( + mock_rpc + ) request = {} client.delete_resource_bundle(request) @@ -11940,9 +11937,9 @@ def test_list_fleet_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_fleet_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_fleet_packages] = ( + mock_rpc + ) request = {} client.list_fleet_packages(request) @@ -12202,9 +12199,9 @@ def test_get_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_fleet_package] = ( + mock_rpc + ) request = {} client.get_fleet_package(request) @@ -12386,9 +12383,9 @@ def test_create_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_fleet_package] = ( + mock_rpc + ) request = {} client.create_fleet_package(request) @@ -12606,9 +12603,9 @@ def test_update_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fleet_package] = ( + mock_rpc + ) request = {} client.update_fleet_package(request) @@ -12809,9 +12806,9 @@ def test_delete_fleet_package_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_fleet_package - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_fleet_package] = ( + mock_rpc + ) request = {} client.delete_fleet_package(request) @@ -17423,8 +17420,9 @@ def test_list_resource_bundles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17489,18 +17487,20 @@ def test_list_resource_bundles_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_resource_bundles" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_list_resource_bundles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_resource_bundles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_resource_bundles" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_list_resource_bundles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_resource_bundles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17560,8 +17560,9 @@ def test_get_resource_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17628,18 +17629,20 @@ def test_get_resource_bundle_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_resource_bundle" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_get_resource_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_resource_bundle" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_resource_bundle" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_get_resource_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_resource_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17694,8 +17697,9 @@ def test_create_resource_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17828,20 +17832,21 @@ def test_create_resource_bundle_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_create_resource_bundle" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_create_resource_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_create_resource_bundle" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_create_resource_bundle" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_create_resource_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_create_resource_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17898,8 +17903,9 @@ def test_update_resource_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18036,20 +18042,21 @@ def test_update_resource_bundle_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_update_resource_bundle" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_update_resource_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_update_resource_bundle" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_update_resource_bundle" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_update_resource_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_update_resource_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18104,8 +18111,9 @@ def test_delete_resource_bundle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18164,20 +18172,21 @@ def test_delete_resource_bundle_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_delete_resource_bundle" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_delete_resource_bundle_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_delete_resource_bundle" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_delete_resource_bundle" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_delete_resource_bundle_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_delete_resource_bundle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18230,8 +18239,9 @@ def test_list_fleet_packages_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18296,18 +18306,20 @@ def test_list_fleet_packages_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_fleet_packages" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_list_fleet_packages_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_fleet_packages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_fleet_packages" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_list_fleet_packages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_fleet_packages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18365,8 +18377,9 @@ def test_get_fleet_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18436,17 +18449,20 @@ def test_get_fleet_package_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_fleet_package" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_get_fleet_package_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_fleet_package" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_fleet_package" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_get_fleet_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_fleet_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18501,8 +18517,9 @@ def test_create_fleet_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18655,20 +18672,21 @@ def test_create_fleet_package_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_create_fleet_package" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_create_fleet_package_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_create_fleet_package" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_create_fleet_package" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_create_fleet_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_create_fleet_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18725,8 +18743,9 @@ def test_update_fleet_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18883,20 +18902,21 @@ def test_update_fleet_package_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_update_fleet_package" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_update_fleet_package_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_update_fleet_package" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_update_fleet_package" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_update_fleet_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_update_fleet_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18949,8 +18969,9 @@ def test_delete_fleet_package_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19007,20 +19028,21 @@ def test_delete_fleet_package_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_delete_fleet_package" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, - "post_delete_fleet_package_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_delete_fleet_package" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_delete_fleet_package" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_delete_fleet_package_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_delete_fleet_package" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19075,8 +19097,9 @@ def test_list_releases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19143,17 +19166,19 @@ def test_list_releases_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_releases" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_list_releases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_releases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_releases" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_releases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_releases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19211,8 +19236,9 @@ def test_get_release_rest_bad_request(request_type=config_delivery.GetReleaseReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19281,17 +19307,19 @@ def test_get_release_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_release" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_get_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_release" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_release" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_release_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19346,8 +19374,9 @@ def test_create_release_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19486,19 +19515,21 @@ def test_create_release_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_create_release" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_create_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_create_release" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_create_release" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_create_release_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_create_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19555,8 +19586,9 @@ def test_update_release_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19697,19 +19729,21 @@ def test_update_release_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_update_release" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_update_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_update_release" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_update_release" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_update_release_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_update_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19764,8 +19798,9 @@ def test_delete_release_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19824,19 +19859,21 @@ def test_delete_release_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_delete_release" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_delete_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_delete_release" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_delete_release" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_delete_release_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_delete_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19891,8 +19928,9 @@ def test_list_variants_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19959,17 +19997,19 @@ def test_list_variants_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_variants" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_list_variants_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_variants" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_variants" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_variants_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_variants" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20027,8 +20067,9 @@ def test_get_variant_rest_bad_request(request_type=config_delivery.GetVariantReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20095,17 +20136,19 @@ def test_get_variant_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_variant" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_get_variant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_variant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_variant" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_variant_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_variant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20160,8 +20203,9 @@ def test_create_variant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20294,19 +20338,21 @@ def test_create_variant_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_create_variant" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_create_variant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_create_variant" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_create_variant" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_create_variant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_create_variant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20363,8 +20409,9 @@ def test_update_variant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20499,19 +20546,21 @@ def test_update_variant_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_update_variant" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_update_variant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_update_variant" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_update_variant" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_update_variant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_update_variant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20566,8 +20615,9 @@ def test_delete_variant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20626,19 +20676,21 @@ def test_delete_variant_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_delete_variant" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_delete_variant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_delete_variant" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_delete_variant" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_delete_variant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_delete_variant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20693,8 +20745,9 @@ def test_list_rollouts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20761,17 +20814,19 @@ def test_list_rollouts_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_list_rollouts" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_list_rollouts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_list_rollouts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_rollouts" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_list_rollouts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_list_rollouts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20829,8 +20884,9 @@ def test_get_rollout_rest_bad_request(request_type=config_delivery.GetRolloutReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20902,17 +20958,19 @@ def test_get_rollout_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_get_rollout" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_get_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_get_rollout" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_rollout" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_get_rollout_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_get_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20967,8 +21025,9 @@ def test_suspend_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21027,19 +21086,21 @@ def test_suspend_rollout_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_suspend_rollout" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_suspend_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_suspend_rollout" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_suspend_rollout" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_suspend_rollout_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_suspend_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21094,8 +21155,9 @@ def test_resume_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21154,19 +21216,21 @@ def test_resume_rollout_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_resume_rollout" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_resume_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_resume_rollout" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_resume_rollout" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, + "post_resume_rollout_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_resume_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21221,8 +21285,9 @@ def test_abort_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21281,19 +21346,20 @@ def test_abort_rollout_rest_interceptors(null_interceptor): ) client = ConfigDeliveryClient(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.ConfigDeliveryRestInterceptor, "post_abort_rollout" - ) as post, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "post_abort_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConfigDeliveryRestInterceptor, "pre_abort_rollout" - ) as pre: + 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.ConfigDeliveryRestInterceptor, "post_abort_rollout" + ) as post, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "post_abort_rollout_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConfigDeliveryRestInterceptor, "pre_abort_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21346,8 +21412,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21406,8 +21473,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21468,8 +21536,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21530,8 +21599,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21592,8 +21662,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21654,8 +21725,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22335,11 +22407,14 @@ def test_config_delivery_base_transport(): def test_config_delivery_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.configdelivery_v1beta.services.config_delivery.transports.ConfigDeliveryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.configdelivery_v1beta.services.config_delivery.transports.ConfigDeliveryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConfigDeliveryTransport( @@ -22356,9 +22431,12 @@ def test_config_delivery_base_transport_with_credentials_file(): def test_config_delivery_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.configdelivery_v1beta.services.config_delivery.transports.ConfigDeliveryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.configdelivery_v1beta.services.config_delivery.transports.ConfigDeliveryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConfigDeliveryTransport() @@ -22430,11 +22508,12 @@ def test_config_delivery_transport_auth_gdch_credentials(transport_class): def test_config_delivery_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-contact-center-insights/docs/conf.py b/packages/google-cloud-contact-center-insights/docs/conf.py index f080d676a0e8..8c981706860d 100644 --- a/packages/google-cloud-contact-center-insights/docs/conf.py +++ b/packages/google-cloud-contact-center-insights/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-contact-center-insights documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/__init__.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/__init__.py index 583ac39af92f..10bf73bdc44d 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/__init__.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.contact_center_insights import ( ContactCenterInsightsAsyncClient, ContactCenterInsightsClient, diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/async_client.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/async_client.py index 83114bed94db..53c2319b4035 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/async_client.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contact_center_insights_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.contact_center_insights_v1.services.contact_center_insights import ( pagers, @@ -198,7 +200,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ContactCenterInsightsAsyncClient: The constructed client. """ - return ContactCenterInsightsClient.from_service_account_info.__func__(ContactCenterInsightsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ContactCenterInsightsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ContactCenterInsightsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -214,7 +217,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ContactCenterInsightsAsyncClient: The constructed client. """ - return ContactCenterInsightsClient.from_service_account_file.__func__(ContactCenterInsightsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ContactCenterInsightsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ContactCenterInsightsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -252,7 +256,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ContactCenterInsightsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ContactCenterInsightsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ContactCenterInsightsTransport: diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/client.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/client.py index 0de270b8f60e..6c77219b006a 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/client.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contact_center_insights_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.contact_center_insights_v1.services.contact_center_insights import ( pagers, @@ -93,9 +95,7 @@ class ContactCenterInsightsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContactCenterInsightsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContactCenterInsightsTransport]] _transport_registry["grpc"] = ContactCenterInsightsGrpcTransport _transport_registry["grpc_asyncio"] = ContactCenterInsightsGrpcAsyncIOTransport _transport_registry["rest"] = ContactCenterInsightsRestTransport @@ -1006,11 +1006,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContactCenterInsightsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContactCenterInsightsClient._read_environment_variables() + ) self._client_cert_source = ContactCenterInsightsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1045,8 +1043,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContactCenterInsightsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/pagers.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/pagers.py index 2540639d272d..c6f94458d9d4 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/pagers.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -230,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -306,7 +306,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -388,7 +388,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -466,7 +466,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -548,7 +548,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -626,7 +626,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -708,7 +708,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -784,7 +784,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -864,7 +864,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -942,7 +942,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1024,7 +1024,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1102,7 +1102,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1184,7 +1184,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1264,7 +1264,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1346,7 +1346,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1424,7 +1424,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1506,7 +1506,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1584,7 +1584,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/__init__.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/__init__.py index 8ecedf09447d..737ede7f459f 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/__init__.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ContactCenterInsightsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ContactCenterInsightsTransport]] _transport_registry["grpc"] = ContactCenterInsightsGrpcTransport _transport_registry["grpc_asyncio"] = ContactCenterInsightsGrpcAsyncIOTransport _transport_registry["rest"] = ContactCenterInsightsRestTransport diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/base.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/base.py index 7aa1f73bd270..708f1611d68a 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/base.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.contact_center_insights_v1 import gapic_version as package_version from google.cloud.contact_center_insights_v1.types import ( @@ -1276,7 +1278,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc.py index 370d5b265fc3..71aff517b1fa 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.contact_center_insights_v1.types import ( contact_center_insights, @@ -649,12 +651,12 @@ def bulk_analyze_conversations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bulk_analyze_conversations" not in self._stubs: - self._stubs[ - "bulk_analyze_conversations" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkAnalyzeConversations", - request_serializer=contact_center_insights.BulkAnalyzeConversationsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["bulk_analyze_conversations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkAnalyzeConversations", + request_serializer=contact_center_insights.BulkAnalyzeConversationsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["bulk_analyze_conversations"] @@ -1129,12 +1131,12 @@ def calculate_issue_model_stats( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "calculate_issue_model_stats" not in self._stubs: - self._stubs[ - "calculate_issue_model_stats" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CalculateIssueModelStats", - request_serializer=contact_center_insights.CalculateIssueModelStatsRequest.serialize, - response_deserializer=contact_center_insights.CalculateIssueModelStatsResponse.deserialize, + self._stubs["calculate_issue_model_stats"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CalculateIssueModelStats", + request_serializer=contact_center_insights.CalculateIssueModelStatsRequest.serialize, + response_deserializer=contact_center_insights.CalculateIssueModelStatsResponse.deserialize, + ) ) return self._stubs["calculate_issue_model_stats"] @@ -1555,12 +1557,12 @@ def initialize_encryption_spec( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "initialize_encryption_spec" not in self._stubs: - self._stubs[ - "initialize_encryption_spec" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/InitializeEncryptionSpec", - request_serializer=contact_center_insights.InitializeEncryptionSpecRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["initialize_encryption_spec"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/InitializeEncryptionSpec", + request_serializer=contact_center_insights.InitializeEncryptionSpecRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["initialize_encryption_spec"] @@ -2023,12 +2025,12 @@ def create_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "create_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CreateQaScorecardRevision", - request_serializer=contact_center_insights.CreateQaScorecardRevisionRequest.serialize, - response_deserializer=resources.QaScorecardRevision.deserialize, + self._stubs["create_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CreateQaScorecardRevision", + request_serializer=contact_center_insights.CreateQaScorecardRevisionRequest.serialize, + response_deserializer=resources.QaScorecardRevision.deserialize, + ) ) return self._stubs["create_qa_scorecard_revision"] @@ -2083,12 +2085,12 @@ def tune_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "tune_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "tune_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/TuneQaScorecardRevision", - request_serializer=contact_center_insights.TuneQaScorecardRevisionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["tune_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/TuneQaScorecardRevision", + request_serializer=contact_center_insights.TuneQaScorecardRevisionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["tune_qa_scorecard_revision"] @@ -2114,12 +2116,12 @@ def deploy_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "deploy_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "deploy_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeployQaScorecardRevision", - request_serializer=contact_center_insights.DeployQaScorecardRevisionRequest.serialize, - response_deserializer=resources.QaScorecardRevision.deserialize, + self._stubs["deploy_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeployQaScorecardRevision", + request_serializer=contact_center_insights.DeployQaScorecardRevisionRequest.serialize, + response_deserializer=resources.QaScorecardRevision.deserialize, + ) ) return self._stubs["deploy_qa_scorecard_revision"] @@ -2145,12 +2147,12 @@ def undeploy_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "undeploy_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/UndeployQaScorecardRevision", - request_serializer=contact_center_insights.UndeployQaScorecardRevisionRequest.serialize, - response_deserializer=resources.QaScorecardRevision.deserialize, + self._stubs["undeploy_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/UndeployQaScorecardRevision", + request_serializer=contact_center_insights.UndeployQaScorecardRevisionRequest.serialize, + response_deserializer=resources.QaScorecardRevision.deserialize, + ) ) return self._stubs["undeploy_qa_scorecard_revision"] @@ -2175,12 +2177,12 @@ def delete_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "delete_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeleteQaScorecardRevision", - request_serializer=contact_center_insights.DeleteQaScorecardRevisionRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeleteQaScorecardRevision", + request_serializer=contact_center_insights.DeleteQaScorecardRevisionRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_qa_scorecard_revision"] @@ -2206,12 +2208,12 @@ def list_qa_scorecard_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_qa_scorecard_revisions" not in self._stubs: - self._stubs[ - "list_qa_scorecard_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/ListQaScorecardRevisions", - request_serializer=contact_center_insights.ListQaScorecardRevisionsRequest.serialize, - response_deserializer=contact_center_insights.ListQaScorecardRevisionsResponse.deserialize, + self._stubs["list_qa_scorecard_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/ListQaScorecardRevisions", + request_serializer=contact_center_insights.ListQaScorecardRevisionsRequest.serialize, + response_deserializer=contact_center_insights.ListQaScorecardRevisionsResponse.deserialize, + ) ) return self._stubs["list_qa_scorecard_revisions"] @@ -2407,12 +2409,12 @@ def bulk_upload_feedback_labels( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bulk_upload_feedback_labels" not in self._stubs: - self._stubs[ - "bulk_upload_feedback_labels" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkUploadFeedbackLabels", - request_serializer=contact_center_insights.BulkUploadFeedbackLabelsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["bulk_upload_feedback_labels"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkUploadFeedbackLabels", + request_serializer=contact_center_insights.BulkUploadFeedbackLabelsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["bulk_upload_feedback_labels"] @@ -2438,12 +2440,12 @@ def bulk_download_feedback_labels( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bulk_download_feedback_labels" not in self._stubs: - self._stubs[ - "bulk_download_feedback_labels" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkDownloadFeedbackLabels", - request_serializer=contact_center_insights.BulkDownloadFeedbackLabelsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["bulk_download_feedback_labels"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkDownloadFeedbackLabels", + request_serializer=contact_center_insights.BulkDownloadFeedbackLabelsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["bulk_download_feedback_labels"] diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc_asyncio.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc_asyncio.py index 0a0a77eee4ae..ef6eb284d6e1 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc_asyncio.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.contact_center_insights_v1.types import ( contact_center_insights, @@ -668,12 +670,12 @@ def bulk_analyze_conversations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bulk_analyze_conversations" not in self._stubs: - self._stubs[ - "bulk_analyze_conversations" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkAnalyzeConversations", - request_serializer=contact_center_insights.BulkAnalyzeConversationsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["bulk_analyze_conversations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkAnalyzeConversations", + request_serializer=contact_center_insights.BulkAnalyzeConversationsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["bulk_analyze_conversations"] @@ -1165,12 +1167,12 @@ def calculate_issue_model_stats( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "calculate_issue_model_stats" not in self._stubs: - self._stubs[ - "calculate_issue_model_stats" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CalculateIssueModelStats", - request_serializer=contact_center_insights.CalculateIssueModelStatsRequest.serialize, - response_deserializer=contact_center_insights.CalculateIssueModelStatsResponse.deserialize, + self._stubs["calculate_issue_model_stats"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CalculateIssueModelStats", + request_serializer=contact_center_insights.CalculateIssueModelStatsRequest.serialize, + response_deserializer=contact_center_insights.CalculateIssueModelStatsResponse.deserialize, + ) ) return self._stubs["calculate_issue_model_stats"] @@ -1604,12 +1606,12 @@ def initialize_encryption_spec( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "initialize_encryption_spec" not in self._stubs: - self._stubs[ - "initialize_encryption_spec" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/InitializeEncryptionSpec", - request_serializer=contact_center_insights.InitializeEncryptionSpecRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["initialize_encryption_spec"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/InitializeEncryptionSpec", + request_serializer=contact_center_insights.InitializeEncryptionSpecRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["initialize_encryption_spec"] @@ -2090,12 +2092,12 @@ def create_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "create_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CreateQaScorecardRevision", - request_serializer=contact_center_insights.CreateQaScorecardRevisionRequest.serialize, - response_deserializer=resources.QaScorecardRevision.deserialize, + self._stubs["create_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/CreateQaScorecardRevision", + request_serializer=contact_center_insights.CreateQaScorecardRevisionRequest.serialize, + response_deserializer=resources.QaScorecardRevision.deserialize, + ) ) return self._stubs["create_qa_scorecard_revision"] @@ -2150,12 +2152,12 @@ def tune_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "tune_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "tune_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/TuneQaScorecardRevision", - request_serializer=contact_center_insights.TuneQaScorecardRevisionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["tune_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/TuneQaScorecardRevision", + request_serializer=contact_center_insights.TuneQaScorecardRevisionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["tune_qa_scorecard_revision"] @@ -2181,12 +2183,12 @@ def deploy_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "deploy_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "deploy_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeployQaScorecardRevision", - request_serializer=contact_center_insights.DeployQaScorecardRevisionRequest.serialize, - response_deserializer=resources.QaScorecardRevision.deserialize, + self._stubs["deploy_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeployQaScorecardRevision", + request_serializer=contact_center_insights.DeployQaScorecardRevisionRequest.serialize, + response_deserializer=resources.QaScorecardRevision.deserialize, + ) ) return self._stubs["deploy_qa_scorecard_revision"] @@ -2212,12 +2214,12 @@ def undeploy_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "undeploy_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/UndeployQaScorecardRevision", - request_serializer=contact_center_insights.UndeployQaScorecardRevisionRequest.serialize, - response_deserializer=resources.QaScorecardRevision.deserialize, + self._stubs["undeploy_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/UndeployQaScorecardRevision", + request_serializer=contact_center_insights.UndeployQaScorecardRevisionRequest.serialize, + response_deserializer=resources.QaScorecardRevision.deserialize, + ) ) return self._stubs["undeploy_qa_scorecard_revision"] @@ -2243,12 +2245,12 @@ def delete_qa_scorecard_revision( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_qa_scorecard_revision" not in self._stubs: - self._stubs[ - "delete_qa_scorecard_revision" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeleteQaScorecardRevision", - request_serializer=contact_center_insights.DeleteQaScorecardRevisionRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_qa_scorecard_revision"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeleteQaScorecardRevision", + request_serializer=contact_center_insights.DeleteQaScorecardRevisionRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_qa_scorecard_revision"] @@ -2274,12 +2276,12 @@ def list_qa_scorecard_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_qa_scorecard_revisions" not in self._stubs: - self._stubs[ - "list_qa_scorecard_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/ListQaScorecardRevisions", - request_serializer=contact_center_insights.ListQaScorecardRevisionsRequest.serialize, - response_deserializer=contact_center_insights.ListQaScorecardRevisionsResponse.deserialize, + self._stubs["list_qa_scorecard_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/ListQaScorecardRevisions", + request_serializer=contact_center_insights.ListQaScorecardRevisionsRequest.serialize, + response_deserializer=contact_center_insights.ListQaScorecardRevisionsResponse.deserialize, + ) ) return self._stubs["list_qa_scorecard_revisions"] @@ -2478,12 +2480,12 @@ def bulk_upload_feedback_labels( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bulk_upload_feedback_labels" not in self._stubs: - self._stubs[ - "bulk_upload_feedback_labels" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkUploadFeedbackLabels", - request_serializer=contact_center_insights.BulkUploadFeedbackLabelsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["bulk_upload_feedback_labels"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkUploadFeedbackLabels", + request_serializer=contact_center_insights.BulkUploadFeedbackLabelsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["bulk_upload_feedback_labels"] @@ -2509,12 +2511,12 @@ def bulk_download_feedback_labels( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bulk_download_feedback_labels" not in self._stubs: - self._stubs[ - "bulk_download_feedback_labels" - ] = self._logged_channel.unary_unary( - "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkDownloadFeedbackLabels", - request_serializer=contact_center_insights.BulkDownloadFeedbackLabelsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["bulk_download_feedback_labels"] = ( + self._logged_channel.unary_unary( + "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/BulkDownloadFeedbackLabels", + request_serializer=contact_center_insights.BulkDownloadFeedbackLabelsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["bulk_download_feedback_labels"] diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest.py index 40e6f1c87273..6ddce1539427 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -4217,9 +4219,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseBulkAnalyzeConversations._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseBulkAnalyzeConversations._get_http_options() request, metadata = self._interceptor.pre_bulk_analyze_conversations( request, metadata @@ -4245,7 +4245,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4372,9 +4372,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseBulkDeleteConversations._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseBulkDeleteConversations._get_http_options() request, metadata = self._interceptor.pre_bulk_delete_conversations( request, metadata @@ -4400,7 +4398,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4528,9 +4526,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseBulkDownloadFeedbackLabels._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseBulkDownloadFeedbackLabels._get_http_options() request, metadata = self._interceptor.pre_bulk_download_feedback_labels( request, metadata @@ -4556,7 +4552,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4597,11 +4593,10 @@ def __call__( resp = self._interceptor.post_bulk_download_feedback_labels(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_bulk_download_feedback_labels_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_bulk_download_feedback_labels_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4687,9 +4682,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseBulkUploadFeedbackLabels._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseBulkUploadFeedbackLabels._get_http_options() request, metadata = self._interceptor.pre_bulk_upload_feedback_labels( request, metadata @@ -4715,7 +4708,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4841,9 +4834,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCalculateIssueModelStats._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCalculateIssueModelStats._get_http_options() request, metadata = self._interceptor.pre_calculate_issue_model_stats( request, metadata @@ -4993,9 +4984,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCalculateStats._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCalculateStats._get_http_options() request, metadata = self._interceptor.pre_calculate_stats(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseCalculateStats._get_transcoded_request( @@ -5144,9 +5133,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateAnalysis._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateAnalysis._get_http_options() request, metadata = self._interceptor.pre_create_analysis(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseCreateAnalysis._get_transcoded_request( @@ -5170,7 +5157,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5304,9 +5291,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateAnalysisRule._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateAnalysisRule._get_http_options() request, metadata = self._interceptor.pre_create_analysis_rule( request, metadata @@ -5459,9 +5444,7 @@ def __call__( The conversation resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -5617,9 +5600,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateFeedbackLabel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateFeedbackLabel._get_http_options() request, metadata = self._interceptor.pre_create_feedback_label( request, metadata @@ -5775,9 +5756,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateIssueModel._get_http_options() request, metadata = self._interceptor.pre_create_issue_model( request, metadata @@ -5803,7 +5782,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5928,9 +5907,7 @@ def __call__( The phrase matcher resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreatePhraseMatcher._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreatePhraseMatcher._get_http_options() request, metadata = self._interceptor.pre_create_phrase_matcher( request, metadata @@ -6086,9 +6063,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateQaQuestion._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateQaQuestion._get_http_options() request, metadata = self._interceptor.pre_create_qa_question( request, metadata @@ -6245,9 +6220,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateQaScorecard._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateQaScorecard._get_http_options() request, metadata = self._interceptor.pre_create_qa_scorecard( request, metadata @@ -6412,9 +6385,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateQaScorecardRevision._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateQaScorecardRevision._get_http_options() request, metadata = self._interceptor.pre_create_qa_scorecard_revision( request, metadata @@ -6565,9 +6536,7 @@ def __call__( The View resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCreateView._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCreateView._get_http_options() request, metadata = self._interceptor.pre_create_view(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseCreateView._get_transcoded_request( @@ -6711,9 +6680,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteAnalysis._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteAnalysis._get_http_options() request, metadata = self._interceptor.pre_delete_analysis(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseDeleteAnalysis._get_transcoded_request( @@ -6733,7 +6700,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6819,9 +6786,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteAnalysisRule._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteAnalysisRule._get_http_options() request, metadata = self._interceptor.pre_delete_analysis_rule( request, metadata @@ -6843,7 +6808,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6930,9 +6895,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -6954,7 +6917,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7042,9 +7005,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteFeedbackLabel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteFeedbackLabel._get_http_options() request, metadata = self._interceptor.pre_delete_feedback_label( request, metadata @@ -7066,7 +7027,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7153,9 +7114,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteIssue._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteIssue._get_http_options() request, metadata = self._interceptor.pre_delete_issue(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseDeleteIssue._get_transcoded_request( @@ -7175,7 +7134,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7267,9 +7226,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteIssueModel._get_http_options() request, metadata = self._interceptor.pre_delete_issue_model( request, metadata @@ -7291,7 +7248,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7411,9 +7368,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeletePhraseMatcher._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeletePhraseMatcher._get_http_options() request, metadata = self._interceptor.pre_delete_phrase_matcher( request, metadata @@ -7435,7 +7390,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7523,9 +7478,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteQaQuestion._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteQaQuestion._get_http_options() request, metadata = self._interceptor.pre_delete_qa_question( request, metadata @@ -7547,7 +7500,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7635,9 +7588,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteQaScorecard._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteQaScorecard._get_http_options() request, metadata = self._interceptor.pre_delete_qa_scorecard( request, metadata @@ -7659,7 +7610,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7748,9 +7699,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteQaScorecardRevision._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteQaScorecardRevision._get_http_options() request, metadata = self._interceptor.pre_delete_qa_scorecard_revision( request, metadata @@ -7772,7 +7721,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7857,9 +7806,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeleteView._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeleteView._get_http_options() request, metadata = self._interceptor.pre_delete_view(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseDeleteView._get_transcoded_request( @@ -7879,7 +7826,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7972,9 +7919,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeployIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeployIssueModel._get_http_options() request, metadata = self._interceptor.pre_deploy_issue_model( request, metadata @@ -8000,7 +7945,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8137,9 +8082,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseDeployQaScorecardRevision._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseDeployQaScorecardRevision._get_http_options() request, metadata = self._interceptor.pre_deploy_qa_scorecard_revision( request, metadata @@ -8293,9 +8236,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseExportInsightsData._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseExportInsightsData._get_http_options() request, metadata = self._interceptor.pre_export_insights_data( request, metadata @@ -8321,7 +8262,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8449,9 +8390,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseExportIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseExportIssueModel._get_http_options() request, metadata = self._interceptor.pre_export_issue_model( request, metadata @@ -8477,7 +8416,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8601,9 +8540,7 @@ def __call__( The analysis resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetAnalysis._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetAnalysis._get_http_options() request, metadata = self._interceptor.pre_get_analysis(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseGetAnalysis._get_transcoded_request( @@ -8757,9 +8694,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetAnalysisRule._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetAnalysisRule._get_http_options() request, metadata = self._interceptor.pre_get_analysis_rule( request, metadata @@ -8906,9 +8841,7 @@ def __call__( The conversation resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -9059,9 +8992,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetEncryptionSpec._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetEncryptionSpec._get_http_options() request, metadata = self._interceptor.pre_get_encryption_spec( request, metadata @@ -9211,9 +9142,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetFeedbackLabel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetFeedbackLabel._get_http_options() request, metadata = self._interceptor.pre_get_feedback_label( request, metadata @@ -9360,9 +9289,7 @@ def __call__( The issue resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetIssue._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetIssue._get_http_options() request, metadata = self._interceptor.pre_get_issue(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseGetIssue._get_transcoded_request( @@ -9505,9 +9432,7 @@ def __call__( The issue model resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetIssueModel._get_http_options() request, metadata = self._interceptor.pre_get_issue_model(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseGetIssueModel._get_transcoded_request( @@ -9651,9 +9576,7 @@ def __call__( The phrase matcher resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetPhraseMatcher._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetPhraseMatcher._get_http_options() request, metadata = self._interceptor.pre_get_phrase_matcher( request, metadata @@ -9802,9 +9725,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetQaQuestion._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetQaQuestion._get_http_options() request, metadata = self._interceptor.pre_get_qa_question(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseGetQaQuestion._get_transcoded_request( @@ -9951,9 +9872,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetQaScorecard._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetQaScorecard._get_http_options() request, metadata = self._interceptor.pre_get_qa_scorecard( request, metadata @@ -10109,9 +10028,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetQaScorecardRevision._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetQaScorecardRevision._get_http_options() request, metadata = self._interceptor.pre_get_qa_scorecard_revision( request, metadata @@ -10263,9 +10180,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetSettings._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetSettings._get_http_options() request, metadata = self._interceptor.pre_get_settings(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseGetSettings._get_transcoded_request( @@ -10557,9 +10472,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseImportIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseImportIssueModel._get_http_options() request, metadata = self._interceptor.pre_import_issue_model( request, metadata @@ -10585,7 +10498,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -10713,9 +10626,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseIngestConversations._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseIngestConversations._get_http_options() request, metadata = self._interceptor.pre_ingest_conversations( request, metadata @@ -10741,7 +10652,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -10871,9 +10782,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseInitializeEncryptionSpec._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseInitializeEncryptionSpec._get_http_options() request, metadata = self._interceptor.pre_initialize_encryption_spec( request, metadata @@ -10899,7 +10808,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11024,9 +10933,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListAllFeedbackLabels._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListAllFeedbackLabels._get_http_options() request, metadata = self._interceptor.pre_list_all_feedback_labels( request, metadata @@ -11177,9 +11084,7 @@ def __call__( The response to list analyses. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListAnalyses._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListAnalyses._get_http_options() request, metadata = self._interceptor.pre_list_analyses(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseListAnalyses._get_transcoded_request( @@ -11324,9 +11229,7 @@ def __call__( The response of listing views. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListAnalysisRules._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListAnalysisRules._get_http_options() request, metadata = self._interceptor.pre_list_analysis_rules( request, metadata @@ -11479,9 +11382,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -11635,9 +11536,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListFeedbackLabels._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListFeedbackLabels._get_http_options() request, metadata = self._interceptor.pre_list_feedback_labels( request, metadata @@ -11788,9 +11687,7 @@ def __call__( The response of listing issue models. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListIssueModels._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListIssueModels._get_http_options() request, metadata = self._interceptor.pre_list_issue_models( request, metadata @@ -11941,9 +11838,7 @@ def __call__( The response of listing issues. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListIssues._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListIssues._get_http_options() request, metadata = self._interceptor.pre_list_issues(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseListIssues._get_transcoded_request( @@ -12090,9 +11985,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListPhraseMatchers._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListPhraseMatchers._get_http_options() request, metadata = self._interceptor.pre_list_phrase_matchers( request, metadata @@ -12245,9 +12138,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListQaQuestions._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListQaQuestions._get_http_options() request, metadata = self._interceptor.pre_list_qa_questions( request, metadata @@ -12401,9 +12292,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListQaScorecardRevisions._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListQaScorecardRevisions._get_http_options() request, metadata = self._interceptor.pre_list_qa_scorecard_revisions( request, metadata @@ -12552,9 +12441,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListQaScorecards._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListQaScorecards._get_http_options() request, metadata = self._interceptor.pre_list_qa_scorecards( request, metadata @@ -12705,9 +12592,7 @@ def __call__( The response of listing views. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListViews._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListViews._get_http_options() request, metadata = self._interceptor.pre_list_views(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseListViews._get_transcoded_request( @@ -12856,9 +12741,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseQueryMetrics._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseQueryMetrics._get_http_options() request, metadata = self._interceptor.pre_query_metrics(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseQueryMetrics._get_transcoded_request( @@ -12882,7 +12765,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -13010,9 +12893,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseTuneQaScorecardRevision._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseTuneQaScorecardRevision._get_http_options() request, metadata = self._interceptor.pre_tune_qa_scorecard_revision( request, metadata @@ -13038,7 +12919,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -13165,9 +13046,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUndeployIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUndeployIssueModel._get_http_options() request, metadata = self._interceptor.pre_undeploy_issue_model( request, metadata @@ -13193,7 +13072,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -13332,9 +13211,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUndeployQaScorecardRevision._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUndeployQaScorecardRevision._get_http_options() request, metadata = self._interceptor.pre_undeploy_qa_scorecard_revision( request, metadata @@ -13403,11 +13280,10 @@ def __call__( resp = self._interceptor.post_undeploy_qa_scorecard_revision(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_undeploy_qa_scorecard_revision_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_undeploy_qa_scorecard_revision_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -13499,9 +13375,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateAnalysisRule._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateAnalysisRule._get_http_options() request, metadata = self._interceptor.pre_update_analysis_rule( request, metadata @@ -13654,9 +13528,7 @@ def __call__( The conversation resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateConversation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateConversation._get_http_options() request, metadata = self._interceptor.pre_update_conversation( request, metadata @@ -13812,9 +13684,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateFeedbackLabel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateFeedbackLabel._get_http_options() request, metadata = self._interceptor.pre_update_feedback_label( request, metadata @@ -13967,9 +13837,7 @@ def __call__( The issue resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateIssue._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateIssue._get_http_options() request, metadata = self._interceptor.pre_update_issue(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseUpdateIssue._get_transcoded_request( @@ -14118,9 +13986,7 @@ def __call__( The issue model resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateIssueModel._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateIssueModel._get_http_options() request, metadata = self._interceptor.pre_update_issue_model( request, metadata @@ -14274,9 +14140,7 @@ def __call__( The phrase matcher resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdatePhraseMatcher._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdatePhraseMatcher._get_http_options() request, metadata = self._interceptor.pre_update_phrase_matcher( request, metadata @@ -14432,9 +14296,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateQaQuestion._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateQaQuestion._get_http_options() request, metadata = self._interceptor.pre_update_qa_question( request, metadata @@ -14591,9 +14453,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateQaScorecard._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateQaScorecard._get_http_options() request, metadata = self._interceptor.pre_update_qa_scorecard( request, metadata @@ -14753,9 +14613,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateSettings._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateSettings._get_http_options() request, metadata = self._interceptor.pre_update_settings(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseUpdateSettings._get_transcoded_request( @@ -14904,9 +14762,7 @@ def __call__( The View resource. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUpdateView._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUpdateView._get_http_options() request, metadata = self._interceptor.pre_update_view(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseUpdateView._get_transcoded_request( @@ -15058,9 +14914,7 @@ def __call__( """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseUploadConversation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseUploadConversation._get_http_options() request, metadata = self._interceptor.pre_upload_conversation( request, metadata @@ -15086,7 +14940,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -15164,7 +15018,9 @@ def bulk_analyze_conversations( ]: # 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._BulkAnalyzeConversations(self._session, self._host, self._interceptor) # type: ignore + return self._BulkAnalyzeConversations( + self._session, self._host, self._interceptor + ) # type: ignore @property def bulk_delete_conversations( @@ -15175,7 +15031,9 @@ def bulk_delete_conversations( ]: # 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._BulkDeleteConversations(self._session, self._host, self._interceptor) # type: ignore + return self._BulkDeleteConversations( + self._session, self._host, self._interceptor + ) # type: ignore @property def bulk_download_feedback_labels( @@ -15186,7 +15044,9 @@ def bulk_download_feedback_labels( ]: # 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._BulkDownloadFeedbackLabels(self._session, self._host, self._interceptor) # type: ignore + return self._BulkDownloadFeedbackLabels( + self._session, self._host, self._interceptor + ) # type: ignore @property def bulk_upload_feedback_labels( @@ -15197,7 +15057,9 @@ def bulk_upload_feedback_labels( ]: # 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._BulkUploadFeedbackLabels(self._session, self._host, self._interceptor) # type: ignore + return self._BulkUploadFeedbackLabels( + self._session, self._host, self._interceptor + ) # type: ignore @property def calculate_issue_model_stats( @@ -15208,7 +15070,9 @@ def calculate_issue_model_stats( ]: # 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._CalculateIssueModelStats(self._session, self._host, self._interceptor) # type: ignore + return self._CalculateIssueModelStats( + self._session, self._host, self._interceptor + ) # type: ignore @property def calculate_stats( @@ -15310,7 +15174,9 @@ def create_qa_scorecard_revision( ]: # 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._CreateQaScorecardRevision(self._session, self._host, self._interceptor) # type: ignore + return self._CreateQaScorecardRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_view( @@ -15406,7 +15272,9 @@ def delete_qa_scorecard_revision( ]: # 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._DeleteQaScorecardRevision(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteQaScorecardRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_view( @@ -15435,7 +15303,9 @@ def deploy_qa_scorecard_revision( ]: # 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._DeployQaScorecardRevision(self._session, self._host, self._interceptor) # type: ignore + return self._DeployQaScorecardRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_insights_data( @@ -15558,7 +15428,9 @@ def get_qa_scorecard_revision( ]: # 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._GetQaScorecardRevision(self._session, self._host, self._interceptor) # type: ignore + return self._GetQaScorecardRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_settings( @@ -15605,7 +15477,9 @@ def initialize_encryption_spec( ]: # 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._InitializeEncryptionSpec(self._session, self._host, self._interceptor) # type: ignore + return self._InitializeEncryptionSpec( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_all_feedback_labels( @@ -15715,7 +15589,9 @@ def list_qa_scorecard_revisions( ]: # 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._ListQaScorecardRevisions(self._session, self._host, self._interceptor) # type: ignore + return self._ListQaScorecardRevisions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_qa_scorecards( @@ -15758,7 +15634,9 @@ def tune_qa_scorecard_revision( ]: # 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._TuneQaScorecardRevision(self._session, self._host, self._interceptor) # type: ignore + return self._TuneQaScorecardRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def undeploy_issue_model( @@ -15779,7 +15657,9 @@ def undeploy_qa_scorecard_revision( ]: # 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._UndeployQaScorecardRevision(self._session, self._host, self._interceptor) # type: ignore + return self._UndeployQaScorecardRevision( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_analysis_rule( @@ -15940,9 +15820,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -16060,9 +15938,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseGetOperation._get_transcoded_request( @@ -16201,9 +16077,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseContactCenterInsightsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseContactCenterInsightsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseContactCenterInsightsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest_base.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest_base.py index e4ed6282a172..0f8028853e2f 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest_base.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/services/contact_center_insights/transports/rest_base.py @@ -17,11 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.contact_center_insights_v1.types import ( diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/contact_center_insights.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/contact_center_insights.py index 6e78c06c6e79..906f73f1dba1 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/contact_center_insights.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/contact_center_insights.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore from google.cloud.contact_center_insights_v1.types import resources @@ -168,6 +168,7 @@ class ConversationView(proto.Enum): Populates all fields in the conversation except the transcript. """ + CONVERSATION_VIEW_UNSPECIFIED = 0 FULL = 2 BASIC = 1 @@ -272,12 +273,12 @@ class Interval(proto.Message): number=1, message=duration_pb2.Duration, ) - points: MutableSequence[ - "CalculateStatsResponse.TimeSeries.Interval" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="CalculateStatsResponse.TimeSeries.Interval", + points: MutableSequence["CalculateStatsResponse.TimeSeries.Interval"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="CalculateStatsResponse.TimeSeries.Interval", + ) ) average_duration: duration_pb2.Duration = proto.Field( @@ -763,6 +764,7 @@ class BucketObjectType(proto.Enum): AUDIO (2): The object is an audio file. """ + BUCKET_OBJECT_TYPE_UNSPECIFIED = 0 TRANSCRIPT = 1 AUDIO = 2 @@ -1325,6 +1327,7 @@ class WriteDisposition(proto.Enum): If the table already exists, BigQuery will append data to the table. """ + WRITE_DISPOSITION_UNSPECIFIED = 0 WRITE_TRUNCATE = 1 WRITE_APPEND = 2 @@ -2574,6 +2577,7 @@ class DimensionKey(proto.Enum): The dimension is keyed by the conversation profile ID. """ + DIMENSION_KEY_UNSPECIFIED = 0 ISSUE = 1 AGENT = 2 @@ -2792,6 +2796,7 @@ class TimeGranularity(proto.Enum): granularity. 1 MONTH means [01st of the month to 1st of the next month). """ + TIME_GRANULARITY_UNSPECIFIED = 0 NONE = 1 DAILY = 2 @@ -3043,12 +3048,12 @@ class TimeSeries(proto.Message): . """ - data_points: MutableSequence[ - "QueryMetricsResponse.Slice.DataPoint" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="QueryMetricsResponse.Slice.DataPoint", + data_points: MutableSequence["QueryMetricsResponse.Slice.DataPoint"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="QueryMetricsResponse.Slice.DataPoint", + ) ) dimensions: MutableSequence["Dimension"] = proto.RepeatedField( @@ -3746,12 +3751,12 @@ class ListQaScorecardRevisionsResponse(proto.Message): def raw_page(self): return self - qa_scorecard_revisions: MutableSequence[ - resources.QaScorecardRevision - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.QaScorecardRevision, + qa_scorecard_revisions: MutableSequence[resources.QaScorecardRevision] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.QaScorecardRevision, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -4048,6 +4053,7 @@ class Format(proto.Enum): JSON (2): JSON format. """ + FORMAT_UNSPECIFIED = 0 CSV = 1 JSON = 2 @@ -4219,6 +4225,7 @@ class FeedbackLabelType(proto.Enum): Downloaded file will contain only Topic Modeling labels. """ + FEEDBACK_LABEL_TYPE_UNSPECIFIED = 0 QUALITY_AI = 1 TOPIC_MODELING = 2 @@ -4267,6 +4274,7 @@ class Format(proto.Enum): JSON format. 1 label stored per JSON file by default. """ + FORMAT_UNSPECIFIED = 0 CSV = 1 JSON = 2 diff --git a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/resources.py b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/resources.py index 09cd360b38ef..99803de2762e 100644 --- a/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/resources.py +++ b/packages/google-cloud-contact-center-insights/google/cloud/contact_center_insights_v1/types/resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -103,6 +103,7 @@ class DatasetValidationWarning(proto.Enum): All the labels in the dataset come from a single answer choice. """ + DATASET_VALIDATION_WARNING_UNSPECIFIED = 0 TOO_MANY_INVALID_FEEDBACK_LABELS = 1 INSUFFICIENT_FEEDBACK_LABELS = 2 @@ -217,6 +218,7 @@ class Medium(proto.Enum): The format for conversations that took place over chat. """ + MEDIUM_UNSPECIFIED = 0 PHONE_CALL = 1 CHAT = 2 @@ -312,12 +314,12 @@ class AgentInfo(proto.Message): proto.STRING, number=3, ) - agent_info: MutableSequence[ - "Conversation.QualityMetadata.AgentInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Conversation.QualityMetadata.AgentInfo", + agent_info: MutableSequence["Conversation.QualityMetadata.AgentInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Conversation.QualityMetadata.AgentInfo", + ) ) class Transcript(proto.Message): @@ -797,12 +799,12 @@ class CallAnalysisMetadata(proto.Message): number=8, message="IssueModelResult", ) - qa_scorecard_results: MutableSequence[ - "QaScorecardResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message="QaScorecardResult", + qa_scorecard_results: MutableSequence["QaScorecardResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message="QaScorecardResult", + ) ) call_analysis_metadata: CallAnalysisMetadata = proto.Field( @@ -1225,6 +1227,7 @@ class Type(proto.Enum): The metadata identifies the ``value`` and ``currency``. """ + TYPE_UNSPECIFIED = 0 PERSON = 1 LOCATION = 2 @@ -1363,6 +1366,7 @@ class MentionType(proto.Enum): COMMON (2): Common noun (or noun compound). """ + MENTION_TYPE_UNSPECIFIED = 0 PROPER = 1 COMMON = 2 @@ -1491,6 +1495,7 @@ class State(proto.Enum): DELETING (5): Model is being deleted. """ + STATE_UNSPECIFIED = 0 UNDEPLOYED = 1 DEPLOYING = 2 @@ -1509,6 +1514,7 @@ class ModelType(proto.Enum): TYPE_V2 (2): Type V2. """ + MODEL_TYPE_UNSPECIFIED = 0 TYPE_V1 = 1 TYPE_V2 = 2 @@ -1759,6 +1765,7 @@ class PhraseMatcherType(proto.Enum): If any of the phrase match rule groups are met, there is a match. """ + PHRASE_MATCHER_TYPE_UNSPECIFIED = 0 ALL_OF = 1 ANY_OF = 2 @@ -1793,12 +1800,12 @@ class PhraseMatcherType(proto.Enum): proto.BOOL, number=7, ) - phrase_match_rule_groups: MutableSequence[ - "PhraseMatchRuleGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="PhraseMatchRuleGroup", + phrase_match_rule_groups: MutableSequence["PhraseMatchRuleGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="PhraseMatchRuleGroup", + ) ) activation_update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, @@ -1843,6 +1850,7 @@ class PhraseMatchRuleGroupType(proto.Enum): If any of the phrase match rules are met, there is a match. """ + PHRASE_MATCH_RULE_GROUP_TYPE_UNSPECIFIED = 0 ALL_OF = 1 ANY_OF = 2 @@ -2319,6 +2327,7 @@ class QuerySource(proto.Enum): suggestions, e.g. from a preceding SuggestKnowledgeAssist response. """ + QUERY_SOURCE_UNSPECIFIED = 0 AGENT_QUERY = 1 SUGGESTED_QUERY = 2 @@ -2435,6 +2444,7 @@ class CorrectnessLevel(proto.Enum): FULLY_CORRECT (3): Answer is fully correct. """ + CORRECTNESS_LEVEL_UNSPECIFIED = 0 NOT_CORRECT = 1 PARTIALLY_CORRECT = 2 @@ -2764,6 +2774,7 @@ class Role(proto.Enum): Participant is either a human or automated agent. """ + ROLE_UNSPECIFIED = 0 HUMAN_AGENT = 1 AUTOMATED_AGENT = 2 @@ -2922,6 +2933,7 @@ class SummarizationModel(proto.Enum): BASELINE_MODEL_V2_0 (2): The CCAI baseline model, V2.0. """ + SUMMARIZATION_MODEL_UNSPECIFIED = 0 BASELINE_MODEL = 1 BASELINE_MODEL_V2_0 = 2 @@ -3180,12 +3192,12 @@ class TuningMetadata(proto.Message): proto.INT64, number=1, ) - dataset_validation_warnings: MutableSequence[ - "DatasetValidationWarning" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="DatasetValidationWarning", + dataset_validation_warnings: MutableSequence["DatasetValidationWarning"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="DatasetValidationWarning", + ) ) tuning_error: str = proto.Field( proto.STRING, @@ -3338,6 +3350,7 @@ class State(proto.Enum): Scorecard model training was explicitly cancelled by the user. """ + STATE_UNSPECIFIED = 0 EDITABLE = 12 TRAINING = 2 @@ -3511,6 +3524,7 @@ class SourceType(proto.Enum): Answer was created by a human via manual edit. """ + SOURCE_TYPE_UNSPECIFIED = 0 SYSTEM_GENERATED = 1 MANUAL_EDIT = 2 @@ -3688,6 +3702,7 @@ class SourceType(proto.Enum): answers, and includes any manual edits if they exist. """ + SOURCE_TYPE_UNSPECIFIED = 0 SYSTEM_GENERATED_ONLY = 1 INCLUDES_MANUAL_EDITS = 2 @@ -3712,12 +3727,12 @@ class SourceType(proto.Enum): number=4, optional=True, ) - qa_tag_results: MutableSequence[ - "QaScorecardResult.QaTagResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="QaScorecardResult.QaTagResult", + qa_tag_results: MutableSequence["QaScorecardResult.QaTagResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="QaScorecardResult.QaTagResult", + ) ) name: str = proto.Field( diff --git a/packages/google-cloud-contact-center-insights/noxfile.py b/packages/google-cloud-contact-center-insights/noxfile.py index 996511a44cef..5b7a7a7afbd8 100644 --- a/packages/google-cloud-contact-center-insights/noxfile.py +++ b/packages/google-cloud-contact-center-insights/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-contact-center-insights/tests/unit/gapic/contact_center_insights_v1/test_contact_center_insights.py b/packages/google-cloud-contact-center-insights/tests/unit/gapic/contact_center_insights_v1/test_contact_center_insights.py index 796745099651..7c72eb00098e 100644 --- a/packages/google-cloud-contact-center-insights/tests/unit/gapic/contact_center_insights_v1/test_contact_center_insights.py +++ b/packages/google-cloud-contact-center-insights/tests/unit/gapic/contact_center_insights_v1/test_contact_center_insights.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +59,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.contact_center_insights_v1.services.contact_center_insights import ( ContactCenterInsightsAsyncClient, @@ -1014,10 +1016,9 @@ def test_contact_center_insights_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1063,9 @@ def test_contact_center_insights_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1101,10 +1101,9 @@ def test_contact_center_insights_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,13 +1359,13 @@ def test_contact_center_insights_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1493,9 +1492,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -1878,9 +1877,9 @@ def test_upload_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upload_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upload_conversation] = ( + mock_rpc + ) request = {} client.upload_conversation(request) @@ -2149,9 +2148,9 @@ def test_update_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -2531,9 +2530,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -2881,9 +2880,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -3422,9 +3421,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -5972,9 +5971,9 @@ def test_ingest_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.ingest_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.ingest_conversations] = ( + mock_rpc + ) request = {} client.ingest_conversations(request) @@ -6322,9 +6321,9 @@ def test_export_insights_data_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_insights_data - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_insights_data] = ( + mock_rpc + ) request = {} client.export_insights_data(request) @@ -6668,9 +6667,9 @@ def test_create_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_issue_model] = ( + mock_rpc + ) request = {} client.create_issue_model(request) @@ -7033,9 +7032,9 @@ def test_update_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_issue_model] = ( + mock_rpc + ) request = {} client.update_issue_model(request) @@ -7734,9 +7733,9 @@ def test_list_issue_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_issue_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_issue_models] = ( + mock_rpc + ) request = {} client.list_issue_models(request) @@ -8070,9 +8069,9 @@ def test_delete_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_issue_model] = ( + mock_rpc + ) request = {} client.delete_issue_model(request) @@ -8416,9 +8415,9 @@ def test_deploy_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.deploy_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.deploy_issue_model] = ( + mock_rpc + ) request = {} client.deploy_issue_model(request) @@ -8762,9 +8761,9 @@ def test_undeploy_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.undeploy_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.undeploy_issue_model] = ( + mock_rpc + ) request = {} client.undeploy_issue_model(request) @@ -9108,9 +9107,9 @@ def test_export_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_issue_model] = ( + mock_rpc + ) request = {} client.export_issue_model(request) @@ -9454,9 +9453,9 @@ def test_import_issue_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_issue_model] = ( + mock_rpc + ) request = {} client.import_issue_model(request) @@ -11455,9 +11454,9 @@ def test_create_phrase_matcher_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_phrase_matcher] = ( + mock_rpc + ) request = {} client.create_phrase_matcher(request) @@ -11831,9 +11830,9 @@ def test_get_phrase_matcher_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_phrase_matcher] = ( + mock_rpc + ) request = {} client.get_phrase_matcher(request) @@ -12189,9 +12188,9 @@ def test_list_phrase_matchers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_phrase_matchers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_phrase_matchers] = ( + mock_rpc + ) request = {} client.list_phrase_matchers(request) @@ -12731,9 +12730,9 @@ def test_delete_phrase_matcher_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_phrase_matcher] = ( + mock_rpc + ) request = {} client.delete_phrase_matcher(request) @@ -13073,9 +13072,9 @@ def test_update_phrase_matcher_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_phrase_matcher] = ( + mock_rpc + ) request = {} client.update_phrase_matcher(request) @@ -14429,9 +14428,9 @@ def test_create_analysis_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_analysis_rule] = ( + mock_rpc + ) request = {} client.create_analysis_rule(request) @@ -14795,9 +14794,9 @@ def test_get_analysis_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_analysis_rule] = ( + mock_rpc + ) request = {} client.get_analysis_rule(request) @@ -15147,9 +15146,9 @@ def test_list_analysis_rules_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_analysis_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_analysis_rules] = ( + mock_rpc + ) request = {} client.list_analysis_rules(request) @@ -15695,9 +15694,9 @@ def test_update_analysis_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_analysis_rule] = ( + mock_rpc + ) request = {} client.update_analysis_rule(request) @@ -16052,9 +16051,9 @@ def test_delete_analysis_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_analysis_rule] = ( + mock_rpc + ) request = {} client.delete_analysis_rule(request) @@ -16387,9 +16386,9 @@ def test_get_encryption_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_spec] = ( + mock_rpc + ) request = {} client.get_encryption_spec(request) @@ -19161,9 +19160,9 @@ def test_create_qa_question_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_qa_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_qa_question] = ( + mock_rpc + ) request = {} client.create_qa_question(request) @@ -19883,9 +19882,9 @@ def test_update_qa_question_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_qa_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_qa_question] = ( + mock_rpc + ) request = {} client.update_qa_question(request) @@ -20242,9 +20241,9 @@ def test_delete_qa_question_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_qa_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_qa_question] = ( + mock_rpc + ) request = {} client.delete_qa_question(request) @@ -20575,9 +20574,9 @@ def test_list_qa_questions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_qa_questions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_qa_questions] = ( + mock_rpc + ) request = {} client.list_qa_questions(request) @@ -21125,9 +21124,9 @@ def test_create_qa_scorecard_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_qa_scorecard] = ( + mock_rpc + ) request = {} client.create_qa_scorecard(request) @@ -21489,9 +21488,9 @@ def test_get_qa_scorecard_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_qa_scorecard] = ( + mock_rpc + ) request = {} client.get_qa_scorecard(request) @@ -21825,9 +21824,9 @@ def test_update_qa_scorecard_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_qa_scorecard] = ( + mock_rpc + ) request = {} client.update_qa_scorecard(request) @@ -22178,9 +22177,9 @@ def test_delete_qa_scorecard_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_qa_scorecard] = ( + mock_rpc + ) request = {} client.delete_qa_scorecard(request) @@ -22513,9 +22512,9 @@ def test_list_qa_scorecards_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_qa_scorecards - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_qa_scorecards] = ( + mock_rpc + ) request = {} client.list_qa_scorecards(request) @@ -25568,9 +25567,9 @@ def test_create_feedback_label_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_feedback_label] = ( + mock_rpc + ) request = {} client.create_feedback_label(request) @@ -25936,9 +25935,9 @@ def test_list_feedback_labels_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_feedback_labels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_feedback_labels] = ( + mock_rpc + ) request = {} client.list_feedback_labels(request) @@ -26483,9 +26482,9 @@ def test_get_feedback_label_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_feedback_label] = ( + mock_rpc + ) request = {} client.get_feedback_label(request) @@ -26827,9 +26826,9 @@ def test_update_feedback_label_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_feedback_label] = ( + mock_rpc + ) request = {} client.update_feedback_label(request) @@ -27179,9 +27178,9 @@ def test_delete_feedback_label_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_feedback_label] = ( + mock_rpc + ) request = {} client.delete_feedback_label(request) @@ -28693,9 +28692,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -28894,9 +28893,9 @@ def test_upload_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upload_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upload_conversation] = ( + mock_rpc + ) request = {} client.upload_conversation(request) @@ -29028,9 +29027,9 @@ def test_update_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -29216,9 +29215,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -29402,9 +29401,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -29673,9 +29672,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -31050,9 +31049,9 @@ def test_ingest_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.ingest_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.ingest_conversations] = ( + mock_rpc + ) request = {} client.ingest_conversations(request) @@ -31232,9 +31231,9 @@ def test_export_insights_data_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_insights_data - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_insights_data] = ( + mock_rpc + ) request = {} client.export_insights_data(request) @@ -31414,9 +31413,9 @@ def test_create_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_issue_model] = ( + mock_rpc + ) request = {} client.create_issue_model(request) @@ -31606,9 +31605,9 @@ def test_update_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_issue_model] = ( + mock_rpc + ) request = {} client.update_issue_model(request) @@ -31970,9 +31969,9 @@ def test_list_issue_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_issue_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_issue_models] = ( + mock_rpc + ) request = {} client.list_issue_models(request) @@ -32154,9 +32153,9 @@ def test_delete_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_issue_model] = ( + mock_rpc + ) request = {} client.delete_issue_model(request) @@ -32337,9 +32336,9 @@ def test_deploy_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.deploy_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.deploy_issue_model] = ( + mock_rpc + ) request = {} client.deploy_issue_model(request) @@ -32521,9 +32520,9 @@ def test_undeploy_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.undeploy_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.undeploy_issue_model] = ( + mock_rpc + ) request = {} client.undeploy_issue_model(request) @@ -32705,9 +32704,9 @@ def test_export_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_issue_model] = ( + mock_rpc + ) request = {} client.export_issue_model(request) @@ -32889,9 +32888,9 @@ def test_import_issue_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_issue_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_issue_model] = ( + mock_rpc + ) request = {} client.import_issue_model(request) @@ -33978,9 +33977,9 @@ def test_create_phrase_matcher_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_phrase_matcher] = ( + mock_rpc + ) request = {} client.create_phrase_matcher(request) @@ -34171,9 +34170,9 @@ def test_get_phrase_matcher_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_phrase_matcher] = ( + mock_rpc + ) request = {} client.get_phrase_matcher(request) @@ -34355,9 +34354,9 @@ def test_list_phrase_matchers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_phrase_matchers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_phrase_matchers] = ( + mock_rpc + ) request = {} client.list_phrase_matchers(request) @@ -34623,9 +34622,9 @@ def test_delete_phrase_matcher_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_phrase_matcher] = ( + mock_rpc + ) request = {} client.delete_phrase_matcher(request) @@ -34803,9 +34802,9 @@ def test_update_phrase_matcher_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_phrase_matcher - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_phrase_matcher] = ( + mock_rpc + ) request = {} client.update_phrase_matcher(request) @@ -35536,9 +35535,9 @@ def test_create_analysis_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_analysis_rule] = ( + mock_rpc + ) request = {} client.create_analysis_rule(request) @@ -35727,9 +35726,9 @@ def test_get_analysis_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_analysis_rule] = ( + mock_rpc + ) request = {} client.get_analysis_rule(request) @@ -35911,9 +35910,9 @@ def test_list_analysis_rules_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_analysis_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_analysis_rules] = ( + mock_rpc + ) request = {} client.list_analysis_rules(request) @@ -36176,9 +36175,9 @@ def test_update_analysis_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_analysis_rule] = ( + mock_rpc + ) request = {} client.update_analysis_rule(request) @@ -36362,9 +36361,9 @@ def test_delete_analysis_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_analysis_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_analysis_rule] = ( + mock_rpc + ) request = {} client.delete_analysis_rule(request) @@ -36541,9 +36540,9 @@ def test_get_encryption_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_spec] = ( + mock_rpc + ) request = {} client.get_encryption_spec(request) @@ -38010,9 +38009,9 @@ def test_create_qa_question_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_qa_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_qa_question] = ( + mock_rpc + ) request = {} client.create_qa_question(request) @@ -38389,9 +38388,9 @@ def test_update_qa_question_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_qa_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_qa_question] = ( + mock_rpc + ) request = {} client.update_qa_question(request) @@ -38583,9 +38582,9 @@ def test_delete_qa_question_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_qa_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_qa_question] = ( + mock_rpc + ) request = {} client.delete_qa_question(request) @@ -38760,9 +38759,9 @@ def test_list_qa_questions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_qa_questions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_qa_questions] = ( + mock_rpc + ) request = {} client.list_qa_questions(request) @@ -39026,9 +39025,9 @@ def test_create_qa_scorecard_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_qa_scorecard] = ( + mock_rpc + ) request = {} client.create_qa_scorecard(request) @@ -39221,9 +39220,9 @@ def test_get_qa_scorecard_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_qa_scorecard] = ( + mock_rpc + ) request = {} client.get_qa_scorecard(request) @@ -39405,9 +39404,9 @@ def test_update_qa_scorecard_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_qa_scorecard] = ( + mock_rpc + ) request = {} client.update_qa_scorecard(request) @@ -39599,9 +39598,9 @@ def test_delete_qa_scorecard_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_qa_scorecard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_qa_scorecard] = ( + mock_rpc + ) request = {} client.delete_qa_scorecard(request) @@ -39780,9 +39779,9 @@ def test_list_qa_scorecards_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_qa_scorecards - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_qa_scorecards] = ( + mock_rpc + ) request = {} client.list_qa_scorecards(request) @@ -41338,9 +41337,9 @@ def test_create_feedback_label_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_feedback_label] = ( + mock_rpc + ) request = {} client.create_feedback_label(request) @@ -41537,9 +41536,9 @@ def test_list_feedback_labels_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_feedback_labels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_feedback_labels] = ( + mock_rpc + ) request = {} client.list_feedback_labels(request) @@ -41808,9 +41807,9 @@ def test_get_feedback_label_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_feedback_label] = ( + mock_rpc + ) request = {} client.get_feedback_label(request) @@ -41993,9 +41992,9 @@ def test_update_feedback_label_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_feedback_label] = ( + mock_rpc + ) request = {} client.update_feedback_label(request) @@ -42188,9 +42187,9 @@ def test_delete_feedback_label_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_feedback_label - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_feedback_label] = ( + mock_rpc + ) request = {} client.delete_feedback_label(request) @@ -46908,8 +46907,9 @@ def test_create_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47311,18 +47311,20 @@ def test_create_conversation_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_create_conversation" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_create_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_create_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_create_conversation" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_create_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47375,8 +47377,9 @@ def test_upload_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47433,20 +47436,21 @@ def test_upload_conversation_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_upload_conversation" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_upload_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_upload_conversation" - ) as pre: + 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.ContactCenterInsightsRestInterceptor, "post_upload_conversation" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_upload_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_upload_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47503,8 +47507,9 @@ def test_update_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47910,18 +47915,20 @@ def test_update_conversation_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_update_conversation" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_update_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_update_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_update_conversation" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_update_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_update_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47974,8 +47981,9 @@ def test_get_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48050,18 +48058,20 @@ def test_get_conversation_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_get_conversation" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_get_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_get_conversation" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_get_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48114,8 +48124,9 @@ def test_list_conversations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48180,18 +48191,20 @@ def test_list_conversations_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_list_conversations" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_list_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_list_conversations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_list_conversations" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_list_conversations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48249,8 +48262,9 @@ def test_delete_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48307,13 +48321,13 @@ def test_delete_conversation_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "pre_delete_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_delete_conversation" + ) as pre, + ): pre.assert_not_called() pb_message = contact_center_insights.DeleteConversationRequest.pb( contact_center_insights.DeleteConversationRequest() @@ -48360,8 +48374,9 @@ def test_create_analysis_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48620,20 +48635,21 @@ def test_create_analysis_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_create_analysis" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_create_analysis_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_create_analysis" - ) as pre: + 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.ContactCenterInsightsRestInterceptor, "post_create_analysis" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_analysis_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_create_analysis" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48688,8 +48704,9 @@ def test_get_analysis_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48754,18 +48771,20 @@ def test_get_analysis_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_get_analysis" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_get_analysis_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_analysis" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_get_analysis" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_analysis_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_get_analysis" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48820,8 +48839,9 @@ def test_list_analyses_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48886,18 +48906,20 @@ def test_list_analyses_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_list_analyses" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_list_analyses_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_list_analyses" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_list_analyses" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_analyses_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_list_analyses" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48957,8 +48979,9 @@ def test_delete_analysis_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49017,13 +49040,13 @@ def test_delete_analysis_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "pre_delete_analysis" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_delete_analysis" + ) as pre, + ): pre.assert_not_called() pb_message = contact_center_insights.DeleteAnalysisRequest.pb( contact_center_insights.DeleteAnalysisRequest() @@ -49068,8 +49091,9 @@ def test_bulk_analyze_conversations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49126,22 +49150,23 @@ def test_bulk_analyze_conversations_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "post_bulk_analyze_conversations", - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_bulk_analyze_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "pre_bulk_analyze_conversations", - ) as pre: + 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.ContactCenterInsightsRestInterceptor, + "post_bulk_analyze_conversations", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_bulk_analyze_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_bulk_analyze_conversations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49194,8 +49219,9 @@ def test_bulk_delete_conversations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49252,21 +49278,23 @@ def test_bulk_delete_conversations_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "post_bulk_delete_conversations", - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_bulk_delete_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_bulk_delete_conversations" - ) as pre: + 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.ContactCenterInsightsRestInterceptor, + "post_bulk_delete_conversations", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_bulk_delete_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_bulk_delete_conversations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49319,8 +49347,9 @@ def test_ingest_conversations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49377,20 +49406,21 @@ def test_ingest_conversations_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_ingest_conversations" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_ingest_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_ingest_conversations" - ) as pre: + 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.ContactCenterInsightsRestInterceptor, "post_ingest_conversations" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_ingest_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_ingest_conversations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49443,8 +49473,9 @@ def test_export_insights_data_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49501,20 +49532,21 @@ def test_export_insights_data_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_export_insights_data" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_export_insights_data_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_export_insights_data" - ) as pre: + 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.ContactCenterInsightsRestInterceptor, "post_export_insights_data" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_export_insights_data_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_export_insights_data" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49567,8 +49599,9 @@ def test_create_issue_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49714,20 +49747,21 @@ def test_create_issue_model_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_create_issue_model" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_create_issue_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_create_issue_model" - ) as pre: + 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.ContactCenterInsightsRestInterceptor, "post_create_issue_model" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_issue_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_create_issue_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49784,8 +49818,9 @@ def test_update_issue_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49951,18 +49986,20 @@ def test_update_issue_model_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_update_issue_model" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_update_issue_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_update_issue_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_update_issue_model" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_update_issue_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_update_issue_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50015,8 +50052,9 @@ def test_get_issue_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50089,18 +50127,20 @@ def test_get_issue_model_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_get_issue_model" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_get_issue_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_issue_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_get_issue_model" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_issue_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_get_issue_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50153,8 +50193,9 @@ def test_list_issue_models_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50214,18 +50255,20 @@ def test_list_issue_models_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_list_issue_models" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_list_issue_models_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_list_issue_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_list_issue_models" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_issue_models_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_list_issue_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50283,8 +50326,9 @@ def test_delete_issue_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50341,20 +50385,21 @@ def test_delete_issue_model_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_delete_issue_model" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_delete_issue_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_delete_issue_model" - ) as pre: + 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.ContactCenterInsightsRestInterceptor, "post_delete_issue_model" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_delete_issue_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_delete_issue_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50407,8 +50452,9 @@ def test_deploy_issue_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50465,20 +50511,21 @@ def test_deploy_issue_model_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_deploy_issue_model" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_deploy_issue_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_deploy_issue_model" - ) as pre: + 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.ContactCenterInsightsRestInterceptor, "post_deploy_issue_model" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_deploy_issue_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_deploy_issue_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50531,8 +50578,9 @@ def test_undeploy_issue_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50589,20 +50637,21 @@ def test_undeploy_issue_model_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_undeploy_issue_model" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_undeploy_issue_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_undeploy_issue_model" - ) as pre: + 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.ContactCenterInsightsRestInterceptor, "post_undeploy_issue_model" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_undeploy_issue_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_undeploy_issue_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50655,8 +50704,9 @@ def test_export_issue_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50713,20 +50763,21 @@ def test_export_issue_model_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_export_issue_model" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_export_issue_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_export_issue_model" - ) as pre: + 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.ContactCenterInsightsRestInterceptor, "post_export_issue_model" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_export_issue_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_export_issue_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50779,8 +50830,9 @@ def test_import_issue_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50837,20 +50889,21 @@ def test_import_issue_model_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_import_issue_model" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_import_issue_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_import_issue_model" - ) as pre: + 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.ContactCenterInsightsRestInterceptor, "post_import_issue_model" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_import_issue_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_import_issue_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50905,8 +50958,9 @@ def test_get_issue_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50977,17 +51031,20 @@ def test_get_issue_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_get_issue" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "post_get_issue_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_issue" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_get_issue" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_issue_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_get_issue" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51040,8 +51097,9 @@ def test_list_issues_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51101,18 +51159,20 @@ def test_list_issues_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_list_issues" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_list_issues_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_list_issues" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_list_issues" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_issues_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_list_issues" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51174,8 +51234,9 @@ def test_update_issue_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51323,18 +51384,20 @@ def test_update_issue_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_update_issue" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_update_issue_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_update_issue" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_update_issue" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_update_issue_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_update_issue" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51389,8 +51452,9 @@ def test_delete_issue_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51449,13 +51513,13 @@ def test_delete_issue_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "pre_delete_issue" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_delete_issue" + ) as pre, + ): pre.assert_not_called() pb_message = contact_center_insights.DeleteIssueRequest.pb( contact_center_insights.DeleteIssueRequest() @@ -51502,8 +51566,9 @@ def test_calculate_issue_model_stats_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51569,20 +51634,22 @@ def test_calculate_issue_model_stats_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "post_calculate_issue_model_stats", - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_calculate_issue_model_stats_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "pre_calculate_issue_model_stats", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_calculate_issue_model_stats", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_calculate_issue_model_stats_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_calculate_issue_model_stats", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51640,8 +51707,9 @@ def test_create_phrase_matcher_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51809,18 +51877,21 @@ def test_create_phrase_matcher_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_create_phrase_matcher" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_create_phrase_matcher_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_create_phrase_matcher" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_phrase_matcher", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_phrase_matcher_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_create_phrase_matcher" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51873,8 +51944,9 @@ def test_get_phrase_matcher_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51949,18 +52021,20 @@ def test_get_phrase_matcher_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_get_phrase_matcher" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_get_phrase_matcher_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_phrase_matcher" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_get_phrase_matcher" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_phrase_matcher_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_get_phrase_matcher" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -52013,8 +52087,9 @@ def test_list_phrase_matchers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -52079,18 +52154,20 @@ def test_list_phrase_matchers_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_list_phrase_matchers" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_list_phrase_matchers_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_list_phrase_matchers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_list_phrase_matchers" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_phrase_matchers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_list_phrase_matchers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -52148,8 +52225,9 @@ def test_delete_phrase_matcher_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -52206,13 +52284,13 @@ def test_delete_phrase_matcher_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "pre_delete_phrase_matcher" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_delete_phrase_matcher" + ) as pre, + ): pre.assert_not_called() pb_message = contact_center_insights.DeletePhraseMatcherRequest.pb( contact_center_insights.DeletePhraseMatcherRequest() @@ -52261,8 +52339,9 @@ def test_update_phrase_matcher_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -52434,18 +52513,21 @@ def test_update_phrase_matcher_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_update_phrase_matcher" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_update_phrase_matcher_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_update_phrase_matcher" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_update_phrase_matcher", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_update_phrase_matcher_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_update_phrase_matcher" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -52498,8 +52580,9 @@ def test_calculate_stats_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -52564,18 +52647,20 @@ def test_calculate_stats_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_calculate_stats" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_calculate_stats_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_calculate_stats" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_calculate_stats" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_calculate_stats_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_calculate_stats" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -52633,8 +52718,9 @@ def test_get_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -52699,18 +52785,20 @@ def test_get_settings_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_get_settings" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_get_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_get_settings" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_get_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -52763,8 +52851,9 @@ def test_update_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -52938,18 +53027,20 @@ def test_update_settings_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_update_settings" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_update_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_update_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_update_settings" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_update_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_update_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -53002,8 +53093,9 @@ def test_create_analysis_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -53177,18 +53269,20 @@ def test_create_analysis_rule_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_create_analysis_rule" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_create_analysis_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_create_analysis_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_create_analysis_rule" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_analysis_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_create_analysis_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -53241,8 +53335,9 @@ def test_get_analysis_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -53313,18 +53408,20 @@ def test_get_analysis_rule_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_get_analysis_rule" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_get_analysis_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_analysis_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_get_analysis_rule" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_analysis_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_get_analysis_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -53377,8 +53474,9 @@ def test_list_analysis_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -53443,18 +53541,20 @@ def test_list_analysis_rules_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_list_analysis_rules" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_list_analysis_rules_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_list_analysis_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_list_analysis_rules" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_analysis_rules_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_list_analysis_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -53516,8 +53616,9 @@ def test_update_analysis_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -53695,18 +53796,20 @@ def test_update_analysis_rule_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_update_analysis_rule" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_update_analysis_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_update_analysis_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_update_analysis_rule" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_update_analysis_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_update_analysis_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -53759,8 +53862,9 @@ def test_delete_analysis_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -53817,13 +53921,13 @@ def test_delete_analysis_rule_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "pre_delete_analysis_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_delete_analysis_rule" + ) as pre, + ): pre.assert_not_called() pb_message = contact_center_insights.DeleteAnalysisRuleRequest.pb( contact_center_insights.DeleteAnalysisRuleRequest() @@ -53868,8 +53972,9 @@ def test_get_encryption_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -53934,18 +54039,20 @@ def test_get_encryption_spec_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_get_encryption_spec" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_get_encryption_spec_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_encryption_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_get_encryption_spec" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_encryption_spec_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_get_encryption_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -54000,8 +54107,9 @@ def test_initialize_encryption_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -54060,22 +54168,23 @@ def test_initialize_encryption_spec_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "post_initialize_encryption_spec", - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_initialize_encryption_spec_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "pre_initialize_encryption_spec", - ) as pre: + 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.ContactCenterInsightsRestInterceptor, + "post_initialize_encryption_spec", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_initialize_encryption_spec_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_initialize_encryption_spec", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -54128,8 +54237,9 @@ def test_create_view_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -54270,18 +54380,20 @@ def test_create_view_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_create_view" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_create_view_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_create_view" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_create_view" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_view_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_create_view" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -54332,8 +54444,9 @@ def test_get_view_rest_bad_request(request_type=contact_center_insights.GetViewR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -54400,17 +54513,20 @@ def test_get_view_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_get_view" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "post_get_view_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_view" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_get_view" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_view_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_get_view" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -54463,8 +54579,9 @@ def test_list_views_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -54527,17 +54644,20 @@ def test_list_views_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_list_views" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "post_list_views_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_list_views" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_list_views" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_views_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_list_views" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -54597,8 +54717,9 @@ def test_update_view_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -54741,18 +54862,20 @@ def test_update_view_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_update_view" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_update_view_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_update_view" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_update_view" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_update_view_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_update_view" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -54805,8 +54928,9 @@ def test_delete_view_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -54863,13 +54987,13 @@ def test_delete_view_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "pre_delete_view" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_delete_view" + ) as pre, + ): pre.assert_not_called() pb_message = contact_center_insights.DeleteViewRequest.pb( contact_center_insights.DeleteViewRequest() @@ -54914,8 +55038,9 @@ def test_query_metrics_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -54972,20 +55097,21 @@ def test_query_metrics_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_query_metrics" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_query_metrics_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_query_metrics" - ) as pre: + 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.ContactCenterInsightsRestInterceptor, "post_query_metrics" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_query_metrics_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_query_metrics" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -55040,8 +55166,9 @@ def test_create_qa_question_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -55211,18 +55338,20 @@ def test_create_qa_question_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_create_qa_question" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_create_qa_question_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_create_qa_question" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_create_qa_question" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_qa_question_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_create_qa_question" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -55277,8 +55406,9 @@ def test_get_qa_question_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -55353,18 +55483,20 @@ def test_get_qa_question_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_get_qa_question" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_get_qa_question_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_qa_question" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_get_qa_question" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_qa_question_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_get_qa_question" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -55421,8 +55553,9 @@ def test_update_qa_question_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -55594,18 +55727,20 @@ def test_update_qa_question_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_update_qa_question" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_update_qa_question_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_update_qa_question" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_update_qa_question" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_update_qa_question_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_update_qa_question" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -55660,8 +55795,9 @@ def test_delete_qa_question_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -55720,13 +55856,13 @@ def test_delete_qa_question_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "pre_delete_qa_question" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_delete_qa_question" + ) as pre, + ): pre.assert_not_called() pb_message = contact_center_insights.DeleteQaQuestionRequest.pb( contact_center_insights.DeleteQaQuestionRequest() @@ -55773,8 +55909,9 @@ def test_list_qa_questions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -55839,18 +55976,20 @@ def test_list_qa_questions_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_list_qa_questions" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_list_qa_questions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_list_qa_questions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_list_qa_questions" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_qa_questions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_list_qa_questions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -55908,8 +56047,9 @@ def test_create_qa_scorecard_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -56052,18 +56192,20 @@ def test_create_qa_scorecard_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_create_qa_scorecard" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_create_qa_scorecard_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_create_qa_scorecard" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_create_qa_scorecard" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_qa_scorecard_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_create_qa_scorecard" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -56116,8 +56258,9 @@ def test_get_qa_scorecard_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -56184,18 +56327,20 @@ def test_get_qa_scorecard_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_get_qa_scorecard" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_get_qa_scorecard_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_qa_scorecard" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_get_qa_scorecard" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_qa_scorecard_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_get_qa_scorecard" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -56252,8 +56397,9 @@ def test_update_qa_scorecard_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -56400,18 +56546,20 @@ def test_update_qa_scorecard_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_update_qa_scorecard" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_update_qa_scorecard_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_update_qa_scorecard" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_update_qa_scorecard" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_update_qa_scorecard_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_update_qa_scorecard" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -56464,8 +56612,9 @@ def test_delete_qa_scorecard_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -56522,13 +56671,13 @@ def test_delete_qa_scorecard_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "pre_delete_qa_scorecard" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_delete_qa_scorecard" + ) as pre, + ): pre.assert_not_called() pb_message = contact_center_insights.DeleteQaScorecardRequest.pb( contact_center_insights.DeleteQaScorecardRequest() @@ -56573,8 +56722,9 @@ def test_list_qa_scorecards_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -56637,18 +56787,20 @@ def test_list_qa_scorecards_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_list_qa_scorecards" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_list_qa_scorecards_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_list_qa_scorecards" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_list_qa_scorecards" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_qa_scorecards_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_list_qa_scorecards" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -56706,8 +56858,9 @@ def test_create_qa_scorecard_revision_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -56858,20 +57011,22 @@ def test_create_qa_scorecard_revision_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "post_create_qa_scorecard_revision", - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_create_qa_scorecard_revision_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "pre_create_qa_scorecard_revision", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_qa_scorecard_revision", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_qa_scorecard_revision_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_create_qa_scorecard_revision", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -56928,8 +57083,9 @@ def test_get_qa_scorecard_revision_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -56998,19 +57154,22 @@ def test_get_qa_scorecard_revision_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "post_get_qa_scorecard_revision", - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_get_qa_scorecard_revision_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_qa_scorecard_revision" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_qa_scorecard_revision", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_qa_scorecard_revision_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_get_qa_scorecard_revision", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -57067,8 +57226,9 @@ def test_tune_qa_scorecard_revision_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -57127,22 +57287,23 @@ def test_tune_qa_scorecard_revision_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "post_tune_qa_scorecard_revision", - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_tune_qa_scorecard_revision_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "pre_tune_qa_scorecard_revision", - ) as pre: + 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.ContactCenterInsightsRestInterceptor, + "post_tune_qa_scorecard_revision", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_tune_qa_scorecard_revision_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_tune_qa_scorecard_revision", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -57197,8 +57358,9 @@ def test_deploy_qa_scorecard_revision_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -57267,20 +57429,22 @@ def test_deploy_qa_scorecard_revision_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "post_deploy_qa_scorecard_revision", - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_deploy_qa_scorecard_revision_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "pre_deploy_qa_scorecard_revision", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_deploy_qa_scorecard_revision", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_deploy_qa_scorecard_revision_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_deploy_qa_scorecard_revision", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -57337,8 +57501,9 @@ def test_undeploy_qa_scorecard_revision_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -57407,20 +57572,22 @@ def test_undeploy_qa_scorecard_revision_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "post_undeploy_qa_scorecard_revision", - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_undeploy_qa_scorecard_revision_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "pre_undeploy_qa_scorecard_revision", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_undeploy_qa_scorecard_revision", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_undeploy_qa_scorecard_revision_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_undeploy_qa_scorecard_revision", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -57477,8 +57644,9 @@ def test_delete_qa_scorecard_revision_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -57537,14 +57705,14 @@ def test_delete_qa_scorecard_revision_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "pre_delete_qa_scorecard_revision", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_delete_qa_scorecard_revision", + ) as pre, + ): pre.assert_not_called() pb_message = contact_center_insights.DeleteQaScorecardRevisionRequest.pb( contact_center_insights.DeleteQaScorecardRevisionRequest() @@ -57589,8 +57757,9 @@ def test_list_qa_scorecard_revisions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -57655,20 +57824,22 @@ def test_list_qa_scorecard_revisions_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "post_list_qa_scorecard_revisions", - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_list_qa_scorecard_revisions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "pre_list_qa_scorecard_revisions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_qa_scorecard_revisions", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_qa_scorecard_revisions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_list_qa_scorecard_revisions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -57728,8 +57899,9 @@ def test_create_feedback_label_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -57883,18 +58055,21 @@ def test_create_feedback_label_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_create_feedback_label" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_create_feedback_label_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_create_feedback_label" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_feedback_label", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_create_feedback_label_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_create_feedback_label" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -57949,8 +58124,9 @@ def test_list_feedback_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -58017,18 +58193,20 @@ def test_list_feedback_labels_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_list_feedback_labels" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_list_feedback_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_list_feedback_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_list_feedback_labels" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_feedback_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_list_feedback_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -58088,8 +58266,9 @@ def test_get_feedback_label_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -58157,18 +58336,20 @@ def test_get_feedback_label_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_get_feedback_label" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_get_feedback_label_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_get_feedback_label" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "post_get_feedback_label" + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_get_feedback_label_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_get_feedback_label" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -58225,8 +58406,9 @@ def test_update_feedback_label_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -58382,18 +58564,21 @@ def test_update_feedback_label_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_update_feedback_label" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_update_feedback_label_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_update_feedback_label" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_update_feedback_label", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_update_feedback_label_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_update_feedback_label" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -58448,8 +58633,9 @@ def test_delete_feedback_label_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -58508,13 +58694,13 @@ def test_delete_feedback_label_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "pre_delete_feedback_label" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, "pre_delete_feedback_label" + ) as pre, + ): pre.assert_not_called() pb_message = contact_center_insights.DeleteFeedbackLabelRequest.pb( contact_center_insights.DeleteFeedbackLabelRequest() @@ -58559,8 +58745,9 @@ def test_list_all_feedback_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -58625,18 +58812,22 @@ def test_list_all_feedback_labels_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, "post_list_all_feedback_labels" - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_list_all_feedback_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, "pre_list_all_feedback_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_all_feedback_labels", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_list_all_feedback_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_list_all_feedback_labels", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -58694,8 +58885,9 @@ def test_bulk_upload_feedback_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -58752,22 +58944,23 @@ def test_bulk_upload_feedback_labels_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "post_bulk_upload_feedback_labels", - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_bulk_upload_feedback_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "pre_bulk_upload_feedback_labels", - ) as pre: + 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.ContactCenterInsightsRestInterceptor, + "post_bulk_upload_feedback_labels", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_bulk_upload_feedback_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_bulk_upload_feedback_labels", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -58820,8 +59013,9 @@ def test_bulk_download_feedback_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -58878,22 +59072,23 @@ def test_bulk_download_feedback_labels_rest_interceptors(null_interceptor): ) client = ContactCenterInsightsClient(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.ContactCenterInsightsRestInterceptor, - "post_bulk_download_feedback_labels", - ) as post, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "post_bulk_download_feedback_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContactCenterInsightsRestInterceptor, - "pre_bulk_download_feedback_labels", - ) as pre: + 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.ContactCenterInsightsRestInterceptor, + "post_bulk_download_feedback_labels", + ) as post, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "post_bulk_download_feedback_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContactCenterInsightsRestInterceptor, + "pre_bulk_download_feedback_labels", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -58948,8 +59143,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -59010,8 +59206,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -59072,8 +59269,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -60865,11 +61063,14 @@ def test_contact_center_insights_base_transport(): def test_contact_center_insights_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.contact_center_insights_v1.services.contact_center_insights.transports.ContactCenterInsightsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.contact_center_insights_v1.services.contact_center_insights.transports.ContactCenterInsightsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContactCenterInsightsTransport( @@ -60886,9 +61087,12 @@ def test_contact_center_insights_base_transport_with_credentials_file(): def test_contact_center_insights_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.contact_center_insights_v1.services.contact_center_insights.transports.ContactCenterInsightsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.contact_center_insights_v1.services.contact_center_insights.transports.ContactCenterInsightsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContactCenterInsightsTransport() @@ -60962,11 +61166,12 @@ def test_contact_center_insights_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-container/docs/conf.py b/packages/google-cloud-container/docs/conf.py index 4975a9ee3b66..4c45015e2b0b 100644 --- a/packages/google-cloud-container/docs/conf.py +++ b/packages/google-cloud-container/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-container documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-container/google/cloud/container_v1/__init__.py b/packages/google-cloud-container/google/cloud/container_v1/__init__.py index cdc49adeca87..63f0a6c8510f 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/__init__.py +++ b/packages/google-cloud-container/google/cloud/container_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cluster_manager import ClusterManagerAsyncClient, ClusterManagerClient from .types.cluster_service import ( AcceleratorConfig, diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/async_client.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/async_client.py index 8ae1d5439905..6ae0d687443d 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/async_client.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.container_v1 import gapic_version as package_version @@ -45,7 +45,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.container_v1.services.cluster_manager import pagers from google.cloud.container_v1.types import cluster_service @@ -124,7 +124,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ClusterManagerAsyncClient: The constructed client. """ - return ClusterManagerClient.from_service_account_info.__func__(ClusterManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ClusterManagerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ClusterManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +141,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ClusterManagerAsyncClient: The constructed client. """ - return ClusterManagerClient.from_service_account_file.__func__(ClusterManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ClusterManagerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ClusterManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/client.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/client.py index 6a7da589f980..73e6493415ea 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/client.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.container_v1 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.container_v1.services.cluster_manager import pagers from google.cloud.container_v1.types import cluster_service @@ -80,9 +80,7 @@ class ClusterManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ClusterManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ClusterManagerTransport]] _transport_registry["grpc"] = ClusterManagerGrpcTransport _transport_registry["grpc_asyncio"] = ClusterManagerGrpcAsyncIOTransport _transport_registry["rest"] = ClusterManagerRestTransport @@ -687,11 +685,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ClusterManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ClusterManagerClient._read_environment_variables() + ) self._client_cert_source = ClusterManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -726,8 +722,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ClusterManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/pagers.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/pagers.py index 074a56dd8ab9..4d7c5d169d12 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/pagers.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/base.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/base.py index 22b1f4498a7f..16201009e18f 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/base.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.container_v1 import gapic_version as package_version from google.cloud.container_v1.types import cluster_service diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc.py index 927062d90b9c..f25e3046a2b0 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.container_v1.types import cluster_service @@ -962,12 +962,12 @@ def complete_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "complete_node_pool_upgrade" not in self._stubs: - self._stubs[ - "complete_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/CompleteNodePoolUpgrade", - request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["complete_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/CompleteNodePoolUpgrade", + request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["complete_node_pool_upgrade"] @@ -994,12 +994,12 @@ def rollback_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_node_pool_upgrade" not in self._stubs: - self._stubs[ - "rollback_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", - request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, - response_deserializer=cluster_service.Operation.deserialize, + self._stubs["rollback_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", + request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, + response_deserializer=cluster_service.Operation.deserialize, + ) ) return self._stubs["rollback_node_pool_upgrade"] @@ -1274,12 +1274,12 @@ def check_autopilot_compatibility( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_autopilot_compatibility" not in self._stubs: - self._stubs[ - "check_autopilot_compatibility" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/CheckAutopilotCompatibility", - request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, - response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + self._stubs["check_autopilot_compatibility"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/CheckAutopilotCompatibility", + request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, + response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + ) ) return self._stubs["check_autopilot_compatibility"] @@ -1305,12 +1305,12 @@ def fetch_cluster_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_cluster_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_cluster_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/FetchClusterUpgradeInfo", - request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + self._stubs["fetch_cluster_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/FetchClusterUpgradeInfo", + request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_cluster_upgrade_info"] @@ -1336,12 +1336,12 @@ def fetch_node_pool_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_node_pool_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_node_pool_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/FetchNodePoolUpgradeInfo", - request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + self._stubs["fetch_node_pool_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/FetchNodePoolUpgradeInfo", + request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_node_pool_upgrade_info"] diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py index a15306e102a4..60d3d78e1644 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.container_v1.types import cluster_service @@ -1005,12 +1005,12 @@ def complete_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "complete_node_pool_upgrade" not in self._stubs: - self._stubs[ - "complete_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/CompleteNodePoolUpgrade", - request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["complete_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/CompleteNodePoolUpgrade", + request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["complete_node_pool_upgrade"] @@ -1038,12 +1038,12 @@ def rollback_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_node_pool_upgrade" not in self._stubs: - self._stubs[ - "rollback_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", - request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, - response_deserializer=cluster_service.Operation.deserialize, + self._stubs["rollback_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/RollbackNodePoolUpgrade", + request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, + response_deserializer=cluster_service.Operation.deserialize, + ) ) return self._stubs["rollback_node_pool_upgrade"] @@ -1331,12 +1331,12 @@ def check_autopilot_compatibility( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_autopilot_compatibility" not in self._stubs: - self._stubs[ - "check_autopilot_compatibility" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/CheckAutopilotCompatibility", - request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, - response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + self._stubs["check_autopilot_compatibility"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/CheckAutopilotCompatibility", + request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, + response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + ) ) return self._stubs["check_autopilot_compatibility"] @@ -1362,12 +1362,12 @@ def fetch_cluster_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_cluster_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_cluster_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/FetchClusterUpgradeInfo", - request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + self._stubs["fetch_cluster_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/FetchClusterUpgradeInfo", + request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_cluster_upgrade_info"] @@ -1393,12 +1393,12 @@ def fetch_node_pool_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_node_pool_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_node_pool_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1.ClusterManager/FetchNodePoolUpgradeInfo", - request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + self._stubs["fetch_node_pool_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1.ClusterManager/FetchNodePoolUpgradeInfo", + request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_node_pool_upgrade_info"] diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest.py index d924cc13b53a..d026a2c5cb4e 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -2189,9 +2189,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClusterManagerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2217,7 +2215,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2312,9 +2310,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseCheckAutopilotCompatibility._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseCheckAutopilotCompatibility._get_http_options() request, metadata = self._interceptor.pre_check_autopilot_compatibility( request, metadata @@ -2380,11 +2376,10 @@ def __call__( resp = self._interceptor.post_check_autopilot_compatibility(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_check_autopilot_compatibility_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_check_autopilot_compatibility_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2473,9 +2468,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseCompleteIPRotation._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseCompleteIPRotation._get_http_options() request, metadata = self._interceptor.pre_complete_ip_rotation( request, metadata @@ -2625,9 +2618,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClusterManagerRestTransport._BaseCompleteNodePoolUpgrade._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseCompleteNodePoolUpgrade._get_http_options() request, metadata = self._interceptor.pre_complete_node_pool_upgrade( request, metadata @@ -2653,7 +2644,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3362,9 +3353,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseFetchClusterUpgradeInfo._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseFetchClusterUpgradeInfo._get_http_options() request, metadata = self._interceptor.pre_fetch_cluster_upgrade_info( request, metadata @@ -3518,9 +3507,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseFetchNodePoolUpgradeInfo._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseFetchNodePoolUpgradeInfo._get_http_options() request, metadata = self._interceptor.pre_fetch_node_pool_upgrade_info( request, metadata @@ -4277,9 +4264,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseGetServerConfig._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseGetServerConfig._get_http_options() request, metadata = self._interceptor.pre_get_server_config( request, metadata @@ -4875,9 +4860,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseListUsableSubnetworks._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseListUsableSubnetworks._get_http_options() request, metadata = self._interceptor.pre_list_usable_subnetworks( request, metadata @@ -5034,9 +5017,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseRollbackNodePoolUpgrade._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseRollbackNodePoolUpgrade._get_http_options() request, metadata = self._interceptor.pre_rollback_node_pool_upgrade( request, metadata @@ -5193,9 +5174,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetAddonsConfig._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetAddonsConfig._get_http_options() request, metadata = self._interceptor.pre_set_addons_config( request, metadata @@ -5825,9 +5804,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetLoggingService._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetLoggingService._get_http_options() request, metadata = self._interceptor.pre_set_logging_service( request, metadata @@ -5983,9 +5960,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetMaintenancePolicy._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetMaintenancePolicy._get_http_options() request, metadata = self._interceptor.pre_set_maintenance_policy( request, metadata @@ -6296,9 +6271,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetMonitoringService._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetMonitoringService._get_http_options() request, metadata = self._interceptor.pre_set_monitoring_service( request, metadata @@ -6454,9 +6427,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetNetworkPolicy._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetNetworkPolicy._get_http_options() request, metadata = self._interceptor.pre_set_network_policy( request, metadata @@ -6612,9 +6583,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetNodePoolAutoscaling._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetNodePoolAutoscaling._get_http_options() request, metadata = self._interceptor.pre_set_node_pool_autoscaling( request, metadata @@ -6773,9 +6742,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetNodePoolManagement._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetNodePoolManagement._get_http_options() request, metadata = self._interceptor.pre_set_node_pool_management( request, metadata @@ -6930,9 +6897,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseSetNodePoolSize._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseSetNodePoolSize._get_http_options() request, metadata = self._interceptor.pre_set_node_pool_size( request, metadata @@ -7089,9 +7054,7 @@ def __call__( """ - http_options = ( - _BaseClusterManagerRestTransport._BaseStartIPRotation._get_http_options() - ) + http_options = _BaseClusterManagerRestTransport._BaseStartIPRotation._get_http_options() request, metadata = self._interceptor.pre_start_ip_rotation( request, metadata @@ -7670,7 +7633,9 @@ def check_autopilot_compatibility( ]: # 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._CheckAutopilotCompatibility(self._session, self._host, self._interceptor) # type: ignore + return self._CheckAutopilotCompatibility( + self._session, self._host, self._interceptor + ) # type: ignore @property def complete_ip_rotation( @@ -7688,7 +7653,9 @@ def complete_node_pool_upgrade( ) -> Callable[[cluster_service.CompleteNodePoolUpgradeRequest], empty_pb2.Empty]: # 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._CompleteNodePoolUpgrade(self._session, self._host, self._interceptor) # type: ignore + return self._CompleteNodePoolUpgrade( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_cluster( @@ -7731,7 +7698,9 @@ def fetch_cluster_upgrade_info( ]: # 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._FetchClusterUpgradeInfo(self._session, self._host, self._interceptor) # type: ignore + return self._FetchClusterUpgradeInfo( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_node_pool_upgrade_info( @@ -7742,7 +7711,9 @@ def fetch_node_pool_upgrade_info( ]: # 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._FetchNodePoolUpgradeInfo(self._session, self._host, self._interceptor) # type: ignore + return self._FetchNodePoolUpgradeInfo( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_cluster( @@ -7837,7 +7808,9 @@ def rollback_node_pool_upgrade( ]: # 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._RollbackNodePoolUpgrade(self._session, self._host, self._interceptor) # type: ignore + return self._RollbackNodePoolUpgrade( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_addons_config( @@ -7925,7 +7898,9 @@ def set_node_pool_autoscaling( ]: # 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._SetNodePoolAutoscaling(self._session, self._host, self._interceptor) # type: ignore + return self._SetNodePoolAutoscaling( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_node_pool_management( diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest_base.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest_base.py index 2057e5af22f3..b4ef70227e0c 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest_base.py +++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.container_v1.types import cluster_service diff --git a/packages/google-cloud-container/google/cloud/container_v1/types/cluster_service.py b/packages/google-cloud-container/google/cloud/container_v1/types/cluster_service.py index 8ea6058b55f0..ceab4b01dd7b 100644 --- a/packages/google-cloud-container/google/cloud/container_v1/types/cluster_service.py +++ b/packages/google-cloud-container/google/cloud/container_v1/types/cluster_service.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import code_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -254,6 +254,7 @@ class PrivateIPv6GoogleAccess(proto.Enum): Enables private IPv6 access to and from Google Services """ + PRIVATE_IPV6_GOOGLE_ACCESS_UNSPECIFIED = 0 PRIVATE_IPV6_GOOGLE_ACCESS_DISABLED = 1 PRIVATE_IPV6_GOOGLE_ACCESS_TO_GOOGLE = 2 @@ -272,6 +273,7 @@ class UpgradeResourceType(proto.Enum): NODE_POOL (2): Node pool """ + UPGRADE_RESOURCE_TYPE_UNSPECIFIED = 0 MASTER = 1 NODE_POOL = 2 @@ -294,6 +296,7 @@ class DatapathProvider(proto.Enum): documentation `__ for more. """ + DATAPATH_PROVIDER_UNSPECIFIED = 0 LEGACY_DATAPATH = 1 ADVANCED_DATAPATH = 2 @@ -318,6 +321,7 @@ class NodePoolUpdateStrategy(proto.Enum): QueuedProvisioning and flex start nodepools scaled up only by enqueueing to the Dynamic Workload Scheduler (DWS). """ + NODE_POOL_UPDATE_STRATEGY_UNSPECIFIED = 0 BLUE_GREEN = 2 SURGE = 3 @@ -335,6 +339,7 @@ class StackType(proto.Enum): IPV4_IPV6 (2): Cluster can use both IPv4 and IPv6 """ + STACK_TYPE_UNSPECIFIED = 0 IPV4 = 1 IPV4_IPV6 = 2 @@ -354,6 +359,7 @@ class IPv6AccessType(proto.Enum): Access type external (all v6 addresses are external IPs) """ + IPV6_ACCESS_TYPE_UNSPECIFIED = 0 INTERNAL = 1 EXTERNAL = 2 @@ -372,6 +378,7 @@ class InTransitEncryptionConfig(proto.Enum): Data in-transit is encrypted using inter-node transparent encryption. """ + IN_TRANSIT_ENCRYPTION_CONFIG_UNSPECIFIED = 0 IN_TRANSIT_ENCRYPTION_DISABLED = 1 IN_TRANSIT_ENCRYPTION_INTER_NODE_TRANSPARENT = 2 @@ -468,6 +475,7 @@ class CgroupMode(proto.Enum): CGROUP_MODE_V2 specifies to use cgroupv2 for the cgroup configuration on the node image. """ + CGROUP_MODE_UNSPECIFIED = 0 CGROUP_MODE_V1 = 1 CGROUP_MODE_V2 = 2 @@ -490,6 +498,7 @@ class TransparentHugepageEnabled(proto.Enum): Transparent hugepage support for anonymous memory is disabled. """ + TRANSPARENT_HUGEPAGE_ENABLED_UNSPECIFIED = 0 TRANSPARENT_HUGEPAGE_ENABLED_ALWAYS = 1 TRANSPARENT_HUGEPAGE_ENABLED_MADVISE = 2 @@ -529,6 +538,7 @@ class TransparentHugepageDefrag(proto.Enum): It means that an application will never enter direct reclaim or compaction. """ + TRANSPARENT_HUGEPAGE_DEFRAG_UNSPECIFIED = 0 TRANSPARENT_HUGEPAGE_DEFRAG_ALWAYS = 1 TRANSPARENT_HUGEPAGE_DEFRAG_DEFER = 2 @@ -766,6 +776,7 @@ class Policy(proto.Enum): For GPU nodes, the image will allow loading any module, whether it is signed or not. """ + POLICY_UNSPECIFIED = 0 ENFORCE_SIGNED_MODULES = 1 DO_NOT_ENFORCE_SIGNED_MODULES = 2 @@ -839,6 +850,7 @@ class OSVersion(proto.Enum): LTSC2022 specifies to use LTSC2022 as the Windows Servercore Base Image. """ + OS_VERSION_UNSPECIFIED = 0 OS_VERSION_LTSC2019 = 1 OS_VERSION_LTSC2022 = 2 @@ -1755,6 +1767,7 @@ class LocalSsdEncryptionMode(proto.Enum): The Local SSDs will not be able to recover data in case of node crash. """ + LOCAL_SSD_ENCRYPTION_MODE_UNSPECIFIED = 0 STANDARD_ENCRYPTION = 1 EPHEMERAL_KEY_ENCRYPTION = 2 @@ -1774,6 +1787,7 @@ class EffectiveCgroupMode(proto.Enum): CGROUP_MODE_V2 means the node pool is configured to use cgroupv2 for the cgroup configuration. """ + EFFECTIVE_CGROUP_MODE_UNSPECIFIED = 0 EFFECTIVE_CGROUP_MODE_V1 = 1 EFFECTIVE_CGROUP_MODE_V2 = 2 @@ -2046,6 +2060,7 @@ class PerformanceMonitoringUnit(proto.Enum): ENHANCED (3): Most documented core/L2 and LLC events. """ + PERFORMANCE_MONITORING_UNIT_UNSPECIFIED = 0 ARCHITECTURAL = 1 STANDARD = 2 @@ -2204,6 +2219,7 @@ class Tier(proto.Enum): Higher bandwidth, actual values based on VM size. """ + TIER_UNSPECIFIED = 0 TIER_1 = 1 @@ -2242,19 +2258,19 @@ class Tier(proto.Enum): number=13, message="PodCIDROverprovisionConfig", ) - additional_node_network_configs: MutableSequence[ - "AdditionalNodeNetworkConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=14, - message="AdditionalNodeNetworkConfig", + additional_node_network_configs: MutableSequence["AdditionalNodeNetworkConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=14, + message="AdditionalNodeNetworkConfig", + ) ) - additional_pod_network_configs: MutableSequence[ - "AdditionalPodNetworkConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=15, - message="AdditionalPodNetworkConfig", + additional_pod_network_configs: MutableSequence["AdditionalPodNetworkConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=15, + message="AdditionalPodNetworkConfig", + ) ) pod_ipv4_range_utilization: float = proto.Field( proto.DOUBLE, @@ -2382,6 +2398,7 @@ class Type(proto.Enum): GVISOR (1): Run sandbox using gvisor. """ + UNSPECIFIED = 0 GVISOR = 1 @@ -2442,6 +2459,7 @@ class Type(proto.Enum): Must specify key value fields for specifying the reservations. """ + UNSPECIFIED = 0 NO_RESERVATION = 1 ANY_RESERVATION = 2 @@ -2509,6 +2527,7 @@ class Operator(proto.Enum): NOT_IN (2): Anti-affinity operator. """ + OPERATOR_UNSPECIFIED = 0 IN = 1 NOT_IN = 2 @@ -2686,6 +2705,7 @@ class HostCapability(proto.Enum): Push represents the capability to push blobs and manifests. """ + HOST_CAPABILITY_UNSPECIFIED = 0 HOST_CAPABILITY_PULL = 1 HOST_CAPABILITY_RESOLVE = 2 @@ -2847,12 +2867,12 @@ class HostConfig(proto.Message): proto.STRING, number=1, ) - hosts: MutableSequence[ - "ContainerdConfig.RegistryHostConfig.HostConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ContainerdConfig.RegistryHostConfig.HostConfig", + hosts: MutableSequence["ContainerdConfig.RegistryHostConfig.HostConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ContainerdConfig.RegistryHostConfig.HostConfig", + ) ) private_registry_access_config: PrivateRegistryAccessConfig = proto.Field( @@ -2903,6 +2923,7 @@ class Effect(proto.Enum): NO_EXECUTE (3): NoExecute """ + EFFECT_UNSPECIFIED = 0 NO_SCHEDULE = 1 PREFER_NO_SCHEDULE = 2 @@ -3484,6 +3505,7 @@ class LoadBalancerType(proto.Enum): LOAD_BALANCER_TYPE_INTERNAL (2): Install internal load balancer for Cloud Run. """ + LOAD_BALANCER_TYPE_UNSPECIFIED = 0 LOAD_BALANCER_TYPE_EXTERNAL = 1 LOAD_BALANCER_TYPE_INTERNAL = 2 @@ -3807,6 +3829,7 @@ class Provider(proto.Enum): CALICO (1): Tigera (Calico Felix). """ + PROVIDER_UNSPECIFIED = 0 CALICO = 1 @@ -3850,6 +3873,7 @@ class EvaluationMode(proto.Enum): singleton policy. This is equivalent to setting the enabled boolean to true. """ + EVALUATION_MODE_UNSPECIFIED = 0 DISABLED = 1 PROJECT_SINGLETON_POLICY_ENFORCE = 2 @@ -4140,12 +4164,12 @@ class IPAllocationPolicy(proto.Message): proto.DOUBLE, number=25, ) - additional_ip_ranges_configs: MutableSequence[ - "AdditionalIPRangesConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29, - message="AdditionalIPRangesConfig", + additional_ip_ranges_configs: MutableSequence["AdditionalIPRangesConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29, + message="AdditionalIPRangesConfig", + ) ) auto_ipam_config: "AutoIpamConfig" = proto.Field( proto.MESSAGE, @@ -4568,6 +4592,7 @@ class Status(proto.Enum): action to restore full functionality. Details can be found in the ``statusMessage`` field. """ + STATUS_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -5053,11 +5078,11 @@ class UserManagedKeysConfig(proto.Message): proto.STRING, number=16, ) - control_plane_disk_encryption_key_versions: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=18, + control_plane_disk_encryption_key_versions: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=18, + ) ) gkeops_etcd_backup_encryption_key: str = proto.Field( proto.STRING, @@ -5089,6 +5114,7 @@ class Mode(proto.Enum): Anonymous authentication is allowed for only health check endpoints. """ + MODE_UNSPECIFIED = 0 ENABLED = 1 LIMITED = 2 @@ -5130,6 +5156,7 @@ class Mode(proto.Enum): Enables Compliance Posture features on the cluster. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -5216,6 +5243,7 @@ class Mode(proto.Enum): Applies the Security Posture off cluster Enterprise level features. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 BASIC = 2 @@ -5238,6 +5266,7 @@ class VulnerabilityMode(proto.Enum): Applies the Security Posture's vulnerability on cluster Enterprise level features. """ + VULNERABILITY_MODE_UNSPECIFIED = 0 VULNERABILITY_DISABLED = 1 VULNERABILITY_BASIC = 2 @@ -6141,6 +6170,7 @@ class Status(proto.Enum): DRAINING status indicates that the subnet is not used for new node pool creation. """ + STATUS_UNSPECIFIED = 0 ACTIVE = 1 DRAINING = 2 @@ -6172,12 +6202,12 @@ class DesiredAdditionalIPRangesConfig(proto.Message): subnetwork's IP ranges """ - additional_ip_ranges_configs: MutableSequence[ - "AdditionalIPRangesConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AdditionalIPRangesConfig", + additional_ip_ranges_configs: MutableSequence["AdditionalIPRangesConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AdditionalIPRangesConfig", + ) ) @@ -6330,6 +6360,7 @@ class Status(proto.Enum): ABORTING (4): The operation is aborting. """ + STATUS_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 @@ -6459,6 +6490,7 @@ class Type(proto.Enum): blocked for other upgrades until the operation finishes. """ + TYPE_UNSPECIFIED = 0 CREATE_CLUSTER = 1 DELETE_CLUSTER = 2 @@ -7535,6 +7567,7 @@ class Action(proto.Enum): provided, basic authentication is enabled, with either a provided password or a generated one. """ + UNKNOWN = 0 SET_PASSWORD = 1 GENERATE_PASSWORD = 2 @@ -8364,6 +8397,7 @@ class Status(proto.Enum): The ERROR state indicates the node pool may be unusable. Details can be found in the ``statusMessage`` field. """ + STATUS_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -8525,6 +8559,7 @@ class Phase(proto.Enum): ROLLBACK_STARTED (7): Rollback has been initiated. """ + PHASE_UNSPECIFIED = 0 UPDATE_STARTED = 1 CREATING_GREEN_POOL = 2 @@ -8592,6 +8627,7 @@ class Type(proto.Enum): availability domain to ensure low communication latency. """ + TYPE_UNSPECIFIED = 0 COMPACT = 1 @@ -8986,6 +9022,7 @@ class Scope(proto.Enum): the cluster, and also exclude all node pool upgrades. Only control plane patches are allowed. """ + NO_UPGRADES = 0 NO_MINOR_UPGRADES = 1 NO_MINOR_OR_NODE_UPGRADES = 2 @@ -9003,6 +9040,7 @@ class EndTimeBehavior(proto.Enum): until the end of the support of the cluster's current version. """ + END_TIME_BEHAVIOR_UNSPECIFIED = 0 UNTIL_END_OF_SUPPORT = 1 @@ -9356,6 +9394,7 @@ class AutoscalingProfile(proto.Enum): Use default (balanced) autoscaling configuration. """ + PROFILE_UNSPECIFIED = 0 OPTIMIZE_UTILIZATION = 1 BALANCED = 2 @@ -9369,6 +9408,7 @@ class AutopilotGeneralProfile(proto.Enum): NO_PERFORMANCE (1): Avoid extra IP consumption. """ + AUTOPILOT_GENERAL_PROFILE_UNSPECIFIED = 0 NO_PERFORMANCE = 1 @@ -9619,6 +9659,7 @@ class LocationPolicy(proto.Enum): ANY policy picks zones that have the highest capacity available. """ + LOCATION_POLICY_UNSPECIFIED = 0 BALANCED = 1 ANY = 2 @@ -9949,6 +9990,7 @@ class GPUSharingStrategy(proto.Enum): GPUs are shared between containers with NVIDIA MPS. """ + GPU_SHARING_STRATEGY_UNSPECIFIED = 0 TIME_SHARING = 1 MPS = 2 @@ -9994,6 +10036,7 @@ class GPUDriverVersion(proto.Enum): LATEST (3): "Latest" GPU driver in COS. """ + GPU_DRIVER_VERSION_UNSPECIFIED = 0 INSTALLATION_DISABLED = 1 DEFAULT = 2 @@ -10035,6 +10078,7 @@ class Mode(proto.Enum): only be enabled if Workload Identity is enabled at the cluster level. """ + MODE_UNSPECIFIED = 0 GCE_METADATA = 1 GKE_METADATA = 2 @@ -10191,6 +10235,7 @@ class Code(proto.Enum): encryption has been destroyed. This is a permanent error. """ + UNKNOWN = 0 GCE_STOCKOUT = 1 GKE_SERVICE_ACCOUNT_DELETED = 2 @@ -10325,6 +10370,7 @@ class Tier(proto.Enum): Higher bandwidth, actual values based on VM size. """ + TIER_UNSPECIFIED = 0 TIER_1 = 1 @@ -10444,6 +10490,7 @@ class Channel(proto.Enum): Gateway API support is enabled, standard CRDs are installed """ + CHANNEL_UNSPECIFIED = 0 CHANNEL_DISABLED = 1 CHANNEL_EXPERIMENTAL = 3 @@ -10696,6 +10743,7 @@ class IssueType(proto.Enum): business logic, there is a potential that they won't work on Autopilot. """ + UNSPECIFIED = 0 INCOMPATIBILITY = 1 ADDITIONAL_CONFIG_REQUIRED = 2 @@ -10796,6 +10844,7 @@ class Channel(proto.Enum): which are known to be stable and reliable in production. """ + UNSPECIFIED = 0 RAPID = 1 REGULAR = 2 @@ -10887,6 +10936,7 @@ class Provider(proto.Enum): KUBE_DNS (3): Use KubeDNS for DNS resolution. """ + PROVIDER_UNSPECIFIED = 0 PLATFORM_DEFAULT = 1 CLOUD_DNS = 2 @@ -10907,6 +10957,7 @@ class DNSScope(proto.Enum): DNS records are accessible from within the VPC. """ + DNS_SCOPE_UNSPECIFIED = 0 CLUSTER_SCOPE = 1 VPC_SCOPE = 2 @@ -11045,6 +11096,7 @@ class State(proto.Enum): etcd level) - this is unrelated to Compute Engine level full disk encryption. """ + UNKNOWN = 0 ENCRYPTED = 1 DECRYPTED = 2 @@ -11075,6 +11127,7 @@ class CurrentState(proto.Enum): De-crypting Secrets to plain text in etcd encountered an error. """ + CURRENT_STATE_UNSPECIFIED = 0 CURRENT_STATE_ENCRYPTED = 7 CURRENT_STATE_DECRYPTED = 2 @@ -11251,6 +11304,7 @@ class Status(proto.Enum): IN_USE_MANAGED_POD denotes this range was created by GKE and is claimed for pods. It cannot be used for other clusters. """ + UNKNOWN = 0 UNUSED = 1 IN_USE_SERVICE = 2 @@ -11310,12 +11364,12 @@ class UsableSubnetwork(proto.Message): proto.STRING, number=3, ) - secondary_ip_ranges: MutableSequence[ - "UsableSubnetworkSecondaryRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="UsableSubnetworkSecondaryRange", + secondary_ip_ranges: MutableSequence["UsableSubnetworkSecondaryRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="UsableSubnetworkSecondaryRange", + ) ) status_message: str = proto.Field( proto.STRING, @@ -11488,6 +11542,7 @@ class GPUDirectStrategy(proto.Enum): GPUDirect-RDMA on A3 Ultra, and A4 machine types """ + GPU_DIRECT_STRATEGY_UNSPECIFIED = 0 RDMA = 2 @@ -11523,6 +11578,7 @@ class EventType(proto.Enum): UPGRADE_INFO_EVENT (4): Corresponds with UpgradeInfoEvent. """ + EVENT_TYPE_UNSPECIFIED = 0 UPGRADE_AVAILABLE_EVENT = 1 UPGRADE_EVENT = 2 @@ -11572,12 +11628,12 @@ class Filter(proto.Message): Event types to allowlist. """ - event_type: MutableSequence[ - "NotificationConfig.EventType" - ] = proto.RepeatedField( - proto.ENUM, - number=1, - enum="NotificationConfig.EventType", + event_type: MutableSequence["NotificationConfig.EventType"] = ( + proto.RepeatedField( + proto.ENUM, + number=1, + enum="NotificationConfig.EventType", + ) ) pubsub: PubSub = proto.Field( @@ -11614,6 +11670,7 @@ class ConfidentialInstanceType(proto.Enum): TDX (3): Intel Trust Domain eXtension. """ + CONFIDENTIAL_INSTANCE_TYPE_UNSPECIFIED = 0 SEV = 1 SEV_SNP = 2 @@ -11741,6 +11798,7 @@ class State(proto.Enum): CANCELED (6): CANCELED indicates the upgrade has canceled. """ + STATE_UNSPECIFIED = 0 STARTED = 3 SUCCEEDED = 4 @@ -11769,6 +11827,7 @@ class EventType(proto.Enum): DISRUPTION_EVENT indicates the event is about the disruption. """ + EVENT_TYPE_UNSPECIFIED = 0 END_OF_SUPPORT = 1 COS_MILESTONE_VERSION_UPDATE = 2 @@ -11880,6 +11939,7 @@ class DisruptionType(proto.Enum): POD_PDB_VIOLATION indicates that there are force pod evictions during node drain which violate the PDB. """ + DISRUPTION_TYPE_UNSPECIFIED = 0 POD_NOT_ENOUGH_PDB = 1 POD_PDB_VIOLATION = 2 @@ -12196,6 +12256,7 @@ class Component(proto.Enum): KCP_HPA (9): horizontal pod autoscaler decision logs """ + COMPONENT_UNSPECIFIED = 0 SYSTEM_COMPONENTS = 1 WORKLOADS = 2 @@ -12292,6 +12353,7 @@ class RelayMode(proto.Enum): EXTERNAL_LB (4): exposed via external load balancer """ + RELAY_MODE_UNSPECIFIED = 0 DISABLED = 1 INTERNAL_VPC_LB = 3 @@ -12364,6 +12426,7 @@ class Variant(proto.Enum): MAX_THROUGHPUT (2): maximum logging throughput variant. """ + VARIANT_UNSPECIFIED = 0 DEFAULT = 1 MAX_THROUGHPUT = 2 @@ -12420,6 +12483,7 @@ class Component(proto.Enum): JOBSET (16): JobSet """ + COMPONENT_UNSPECIFIED = 0 SYSTEM_COMPONENTS = 1 APISERVER = 3 @@ -12486,6 +12550,7 @@ class Scope(proto.Enum): NONE (2): Disable Auto-Monitoring. """ + SCOPE_UNSPECIFIED = 0 ALL = 1 NONE = 2 @@ -12527,6 +12592,7 @@ class HPAProfile(proto.Enum): faster metrics collection for workload autoscaling. """ + HPA_PROFILE_UNSPECIFIED = 0 NONE = 1 PERFORMANCE = 2 @@ -12570,6 +12636,7 @@ class MembershipType(proto.Enum): The membership supports only lightweight compatible features. """ + MEMBERSHIP_TYPE_UNSPECIFIED = 0 LIGHTWEIGHT = 1 @@ -12877,6 +12944,7 @@ class ClusterTier(proto.Enum): ENTERPRISE indicates a GKE Enterprise cluster. """ + _pb_options = {"deprecated": True} CLUSTER_TIER_UNSPECIFIED = 0 STANDARD = 1 @@ -13011,6 +13079,7 @@ class Mode(proto.Enum): CONTAINER_IMAGE_CACHE is for using the secondary boot disk as a container image cache. """ + MODE_UNSPECIFIED = 0 CONTAINER_IMAGE_CACHE = 1 @@ -13108,6 +13177,7 @@ class AutoUpgradeStatus(proto.Enum): UPGRADE_PAUSED (5): UPGRADE_PAUSED indicates the upgrade is paused. """ + UNKNOWN = 0 ACTIVE = 1 MINOR_UPGRADE_PAUSED = 4 @@ -13142,6 +13212,7 @@ class AutoUpgradePausedReason(proto.Enum): SYSTEM_CONFIG indicates the cluster upgrade is paused by system config. """ + AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED = 0 MAINTENANCE_WINDOW = 1 MAINTENANCE_EXCLUSION_NO_UPGRADES = 5 @@ -13228,6 +13299,7 @@ class State(proto.Enum): RUNNING (4): Upgrade is running. """ + UNKNOWN = 0 FAILED = 1 SUCCEEDED = 2 @@ -13245,6 +13317,7 @@ class StartType(proto.Enum): MANUAL (2): Upgrade started manually. """ + START_TYPE_UNSPECIFIED = 0 AUTOMATIC = 1 MANUAL = 2 @@ -13356,6 +13429,7 @@ class AutoUpgradeStatus(proto.Enum): UPGRADE_PAUSED (3): UPGRADE_PAUSED indicates the upgrade is paused. """ + UNKNOWN = 0 ACTIVE = 1 MINOR_UPGRADE_PAUSED = 2 @@ -13383,6 +13457,7 @@ class AutoUpgradePausedReason(proto.Enum): SYSTEM_CONFIG indicates the cluster upgrade is paused by system config. """ + AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED = 0 MAINTENANCE_WINDOW = 1 MAINTENANCE_EXCLUSION_NO_UPGRADES = 2 @@ -13450,6 +13525,7 @@ class PatchMode(proto.Enum): build in the channel should be used as the upgrade target for the version. """ + PATCH_MODE_UNSPECIFIED = 0 ACCELERATED = 1 @@ -13490,6 +13566,7 @@ class NetworkTier(proto.Enum): NETWORK_TIER_STANDARD (3): Standard network tier. """ + NETWORK_TIER_UNSPECIFIED = 0 NETWORK_TIER_DEFAULT = 1 NETWORK_TIER_PREMIUM = 2 @@ -13530,6 +13607,7 @@ class Scope(proto.Enum): the Managed OpenTelemetry pipeline for collection and instrumentation components. """ + SCOPE_UNSPECIFIED = 0 NONE = 1 COLLECTION_AND_INSTRUMENTATION_COMPONENTS = 2 diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/__init__.py b/packages/google-cloud-container/google/cloud/container_v1beta1/__init__.py index ff75a09f8565..fdd94e441867 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/__init__.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cluster_manager import ClusterManagerAsyncClient, ClusterManagerClient from .types.cluster_service import ( AcceleratorConfig, diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/async_client.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/async_client.py index b4d2690fde21..88bef5803355 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/async_client.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.container_v1beta1 import gapic_version as package_version @@ -45,7 +45,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.container_v1beta1.services.cluster_manager import pagers from google.cloud.container_v1beta1.types import cluster_service @@ -124,7 +124,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ClusterManagerAsyncClient: The constructed client. """ - return ClusterManagerClient.from_service_account_info.__func__(ClusterManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ClusterManagerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ClusterManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +141,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ClusterManagerAsyncClient: The constructed client. """ - return ClusterManagerClient.from_service_account_file.__func__(ClusterManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ClusterManagerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ClusterManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/client.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/client.py index a76002f7c4b9..366430f47bfe 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/client.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.container_v1beta1 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.container_v1beta1.services.cluster_manager import pagers from google.cloud.container_v1beta1.types import cluster_service @@ -79,9 +79,7 @@ class ClusterManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ClusterManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ClusterManagerTransport]] _transport_registry["grpc"] = ClusterManagerGrpcTransport _transport_registry["grpc_asyncio"] = ClusterManagerGrpcAsyncIOTransport @@ -685,11 +683,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ClusterManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ClusterManagerClient._read_environment_variables() + ) self._client_cert_source = ClusterManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -724,8 +720,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ClusterManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/pagers.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/pagers.py index 993adf3ad4ca..c68dc9663e87 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/pagers.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/base.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/base.py index 96315e0b44d1..2ed6c696ecd1 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/base.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.container_v1beta1 import gapic_version as package_version from google.cloud.container_v1beta1.types import cluster_service diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py index 804dd89b2df0..a238762b9918 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.container_v1beta1.types import cluster_service @@ -962,12 +962,12 @@ def complete_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "complete_node_pool_upgrade" not in self._stubs: - self._stubs[ - "complete_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/CompleteNodePoolUpgrade", - request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["complete_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/CompleteNodePoolUpgrade", + request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["complete_node_pool_upgrade"] @@ -994,12 +994,12 @@ def rollback_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_node_pool_upgrade" not in self._stubs: - self._stubs[ - "rollback_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade", - request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, - response_deserializer=cluster_service.Operation.deserialize, + self._stubs["rollback_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade", + request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, + response_deserializer=cluster_service.Operation.deserialize, + ) ) return self._stubs["rollback_node_pool_upgrade"] @@ -1274,12 +1274,12 @@ def check_autopilot_compatibility( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_autopilot_compatibility" not in self._stubs: - self._stubs[ - "check_autopilot_compatibility" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/CheckAutopilotCompatibility", - request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, - response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + self._stubs["check_autopilot_compatibility"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/CheckAutopilotCompatibility", + request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, + response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + ) ) return self._stubs["check_autopilot_compatibility"] @@ -1334,12 +1334,12 @@ def fetch_cluster_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_cluster_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_cluster_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/FetchClusterUpgradeInfo", - request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + self._stubs["fetch_cluster_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/FetchClusterUpgradeInfo", + request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_cluster_upgrade_info"] @@ -1365,12 +1365,12 @@ def fetch_node_pool_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_node_pool_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_node_pool_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/FetchNodePoolUpgradeInfo", - request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + self._stubs["fetch_node_pool_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/FetchNodePoolUpgradeInfo", + request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_node_pool_upgrade_info"] @@ -1397,12 +1397,12 @@ def complete_control_plane_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "complete_control_plane_upgrade" not in self._stubs: - self._stubs[ - "complete_control_plane_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/CompleteControlPlaneUpgrade", - request_serializer=cluster_service.CompleteControlPlaneUpgradeRequest.serialize, - response_deserializer=cluster_service.Operation.deserialize, + self._stubs["complete_control_plane_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/CompleteControlPlaneUpgrade", + request_serializer=cluster_service.CompleteControlPlaneUpgradeRequest.serialize, + response_deserializer=cluster_service.Operation.deserialize, + ) ) return self._stubs["complete_control_plane_upgrade"] diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py index 419ac8289290..5b95c1723c06 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.container_v1beta1.types import cluster_service @@ -1005,12 +1005,12 @@ def complete_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "complete_node_pool_upgrade" not in self._stubs: - self._stubs[ - "complete_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/CompleteNodePoolUpgrade", - request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["complete_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/CompleteNodePoolUpgrade", + request_serializer=cluster_service.CompleteNodePoolUpgradeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["complete_node_pool_upgrade"] @@ -1038,12 +1038,12 @@ def rollback_node_pool_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_node_pool_upgrade" not in self._stubs: - self._stubs[ - "rollback_node_pool_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade", - request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, - response_deserializer=cluster_service.Operation.deserialize, + self._stubs["rollback_node_pool_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/RollbackNodePoolUpgrade", + request_serializer=cluster_service.RollbackNodePoolUpgradeRequest.serialize, + response_deserializer=cluster_service.Operation.deserialize, + ) ) return self._stubs["rollback_node_pool_upgrade"] @@ -1331,12 +1331,12 @@ def check_autopilot_compatibility( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_autopilot_compatibility" not in self._stubs: - self._stubs[ - "check_autopilot_compatibility" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/CheckAutopilotCompatibility", - request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, - response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + self._stubs["check_autopilot_compatibility"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/CheckAutopilotCompatibility", + request_serializer=cluster_service.CheckAutopilotCompatibilityRequest.serialize, + response_deserializer=cluster_service.CheckAutopilotCompatibilityResponse.deserialize, + ) ) return self._stubs["check_autopilot_compatibility"] @@ -1392,12 +1392,12 @@ def fetch_cluster_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_cluster_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_cluster_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/FetchClusterUpgradeInfo", - request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + self._stubs["fetch_cluster_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/FetchClusterUpgradeInfo", + request_serializer=cluster_service.FetchClusterUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.ClusterUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_cluster_upgrade_info"] @@ -1423,12 +1423,12 @@ def fetch_node_pool_upgrade_info( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_node_pool_upgrade_info" not in self._stubs: - self._stubs[ - "fetch_node_pool_upgrade_info" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/FetchNodePoolUpgradeInfo", - request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, - response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + self._stubs["fetch_node_pool_upgrade_info"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/FetchNodePoolUpgradeInfo", + request_serializer=cluster_service.FetchNodePoolUpgradeInfoRequest.serialize, + response_deserializer=cluster_service.NodePoolUpgradeInfo.deserialize, + ) ) return self._stubs["fetch_node_pool_upgrade_info"] @@ -1456,12 +1456,12 @@ def complete_control_plane_upgrade( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "complete_control_plane_upgrade" not in self._stubs: - self._stubs[ - "complete_control_plane_upgrade" - ] = self._logged_channel.unary_unary( - "/google.container.v1beta1.ClusterManager/CompleteControlPlaneUpgrade", - request_serializer=cluster_service.CompleteControlPlaneUpgradeRequest.serialize, - response_deserializer=cluster_service.Operation.deserialize, + self._stubs["complete_control_plane_upgrade"] = ( + self._logged_channel.unary_unary( + "/google.container.v1beta1.ClusterManager/CompleteControlPlaneUpgrade", + request_serializer=cluster_service.CompleteControlPlaneUpgradeRequest.serialize, + response_deserializer=cluster_service.Operation.deserialize, + ) ) return self._stubs["complete_control_plane_upgrade"] diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/types/cluster_service.py b/packages/google-cloud-container/google/cloud/container_v1beta1/types/cluster_service.py index dec0107aad97..0afef074aa6c 100644 --- a/packages/google-cloud-container/google/cloud/container_v1beta1/types/cluster_service.py +++ b/packages/google-cloud-container/google/cloud/container_v1beta1/types/cluster_service.py @@ -17,12 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import code_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -277,6 +277,7 @@ class PrivateIPv6GoogleAccess(proto.Enum): Enables private IPv6 access to and from Google Services """ + PRIVATE_IPV6_GOOGLE_ACCESS_UNSPECIFIED = 0 PRIVATE_IPV6_GOOGLE_ACCESS_DISABLED = 1 PRIVATE_IPV6_GOOGLE_ACCESS_TO_GOOGLE = 2 @@ -295,6 +296,7 @@ class UpgradeResourceType(proto.Enum): NODE_POOL (2): Node pool """ + UPGRADE_RESOURCE_TYPE_UNSPECIFIED = 0 MASTER = 1 NODE_POOL = 2 @@ -319,6 +321,7 @@ class NodePoolUpdateStrategy(proto.Enum): QueuedProvisioning and flex start nodepools scaled up only by enqueueing to the Dynamic Workload Scheduler (DWS). """ + NODE_POOL_UPDATE_STRATEGY_UNSPECIFIED = 0 BLUE_GREEN = 2 SURGE = 3 @@ -342,6 +345,7 @@ class DatapathProvider(proto.Enum): documentation `__ for more. """ + DATAPATH_PROVIDER_UNSPECIFIED = 0 LEGACY_DATAPATH = 1 ADVANCED_DATAPATH = 2 @@ -359,6 +363,7 @@ class StackType(proto.Enum): The value used if the cluster is a dual stack cluster """ + STACK_TYPE_UNSPECIFIED = 0 IPV4 = 1 IPV4_IPV6 = 2 @@ -377,6 +382,7 @@ class InTransitEncryptionConfig(proto.Enum): Data in-transit is encrypted using inter-node transparent encryption. """ + IN_TRANSIT_ENCRYPTION_CONFIG_UNSPECIFIED = 0 IN_TRANSIT_ENCRYPTION_DISABLED = 1 IN_TRANSIT_ENCRYPTION_INTER_NODE_TRANSPARENT = 2 @@ -497,6 +503,7 @@ class CgroupMode(proto.Enum): CGROUP_MODE_V2 specifies to use cgroupv2 for the cgroup configuration on the node image. """ + CGROUP_MODE_UNSPECIFIED = 0 CGROUP_MODE_V1 = 1 CGROUP_MODE_V2 = 2 @@ -519,6 +526,7 @@ class TransparentHugepageEnabled(proto.Enum): Transparent hugepage support for anonymous memory is disabled. """ + TRANSPARENT_HUGEPAGE_ENABLED_UNSPECIFIED = 0 TRANSPARENT_HUGEPAGE_ENABLED_ALWAYS = 1 TRANSPARENT_HUGEPAGE_ENABLED_MADVISE = 2 @@ -558,6 +566,7 @@ class TransparentHugepageDefrag(proto.Enum): It means that an application will never enter direct reclaim or compaction. """ + TRANSPARENT_HUGEPAGE_DEFRAG_UNSPECIFIED = 0 TRANSPARENT_HUGEPAGE_DEFRAG_ALWAYS = 1 TRANSPARENT_HUGEPAGE_DEFRAG_DEFER = 2 @@ -795,6 +804,7 @@ class Policy(proto.Enum): For GPU nodes, the image will allow loading any module, whether it is signed or not. """ + POLICY_UNSPECIFIED = 0 ENFORCE_SIGNED_MODULES = 1 DO_NOT_ENFORCE_SIGNED_MODULES = 2 @@ -868,6 +878,7 @@ class OSVersion(proto.Enum): LTSC2022 specifies to use LTSC2022 as the Windows Servercore Base Image. """ + OS_VERSION_UNSPECIFIED = 0 OS_VERSION_LTSC2019 = 1 OS_VERSION_LTSC2022 = 2 @@ -1784,6 +1795,7 @@ class LocalSsdEncryptionMode(proto.Enum): The Local SSDs will not be able to recover data in case of node crash. """ + LOCAL_SSD_ENCRYPTION_MODE_UNSPECIFIED = 0 STANDARD_ENCRYPTION = 1 EPHEMERAL_KEY_ENCRYPTION = 2 @@ -1803,6 +1815,7 @@ class EffectiveCgroupMode(proto.Enum): CGROUP_MODE_V2 means the node pool is configured to use cgroupv2 for the cgroup configuration. """ + EFFECTIVE_CGROUP_MODE_UNSPECIFIED = 0 EFFECTIVE_CGROUP_MODE_V1 = 1 EFFECTIVE_CGROUP_MODE_V2 = 2 @@ -2085,6 +2098,7 @@ class PerformanceMonitoringUnit(proto.Enum): ENHANCED (3): Most documented core/L2 and LLC events. """ + PERFORMANCE_MONITORING_UNIT_UNSPECIFIED = 0 ARCHITECTURAL = 1 STANDARD = 2 @@ -2256,6 +2270,7 @@ class Tier(proto.Enum): Higher bandwidth, actual values based on VM size. """ + TIER_UNSPECIFIED = 0 TIER_1 = 1 @@ -2300,19 +2315,19 @@ class Tier(proto.Enum): number=13, message="PodCIDROverprovisionConfig", ) - additional_node_network_configs: MutableSequence[ - "AdditionalNodeNetworkConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=14, - message="AdditionalNodeNetworkConfig", + additional_node_network_configs: MutableSequence["AdditionalNodeNetworkConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=14, + message="AdditionalNodeNetworkConfig", + ) ) - additional_pod_network_configs: MutableSequence[ - "AdditionalPodNetworkConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=15, - message="AdditionalPodNetworkConfig", + additional_pod_network_configs: MutableSequence["AdditionalPodNetworkConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=15, + message="AdditionalPodNetworkConfig", + ) ) pod_ipv4_range_utilization: float = proto.Field( proto.DOUBLE, @@ -2447,6 +2462,7 @@ class Type(proto.Enum): GVISOR (1): Run sandbox using gvisor. """ + UNSPECIFIED = 0 GVISOR = 1 @@ -2621,6 +2637,7 @@ class Type(proto.Enum): Must specify key value fields for specifying the reservations. """ + UNSPECIFIED = 0 NO_RESERVATION = 1 ANY_RESERVATION = 2 @@ -2688,6 +2705,7 @@ class Operator(proto.Enum): NOT_IN (2): Anti-affinity operator. """ + OPERATOR_UNSPECIFIED = 0 IN = 1 NOT_IN = 2 @@ -2865,6 +2883,7 @@ class HostCapability(proto.Enum): Push represents the capability to push blobs and manifests. """ + HOST_CAPABILITY_UNSPECIFIED = 0 HOST_CAPABILITY_PULL = 1 HOST_CAPABILITY_RESOLVE = 2 @@ -3026,12 +3045,12 @@ class HostConfig(proto.Message): proto.STRING, number=1, ) - hosts: MutableSequence[ - "ContainerdConfig.RegistryHostConfig.HostConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ContainerdConfig.RegistryHostConfig.HostConfig", + hosts: MutableSequence["ContainerdConfig.RegistryHostConfig.HostConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ContainerdConfig.RegistryHostConfig.HostConfig", + ) ) private_registry_access_config: PrivateRegistryAccessConfig = proto.Field( @@ -3094,6 +3113,7 @@ class MaintenanceInterval(proto.Enum): AS_NEEDED. Security updates will still be applied as soon as they are available. """ + MAINTENANCE_INTERVAL_UNSPECIFIED = 0 AS_NEEDED = 1 PERIODIC = 2 @@ -3193,6 +3213,7 @@ class Effect(proto.Enum): NO_EXECUTE (3): NoExecute """ + EFFECT_UNSPECIFIED = 0 NO_SCHEDULE = 1 PREFER_NO_SCHEDULE = 2 @@ -3980,6 +4001,7 @@ class IstioAuthMode(proto.Enum): AUTH_MUTUAL_TLS (1): auth mutual TLS enabled """ + AUTH_NONE = 0 AUTH_MUTUAL_TLS = 1 @@ -4018,6 +4040,7 @@ class LoadBalancerType(proto.Enum): LOAD_BALANCER_TYPE_INTERNAL (2): Install internal load balancer for Cloud Run. """ + LOAD_BALANCER_TYPE_UNSPECIFIED = 0 LOAD_BALANCER_TYPE_EXTERNAL = 1 LOAD_BALANCER_TYPE_INTERNAL = 2 @@ -4144,6 +4167,7 @@ class Provider(proto.Enum): CALICO (1): Tigera (Calico Felix). """ + PROVIDER_UNSPECIFIED = 0 CALICO = 1 @@ -4377,6 +4401,7 @@ class StackType(proto.Enum): The value used if the cluster is a dual stack cluster """ + STACK_TYPE_UNSPECIFIED = 0 IPV4 = 1 IPV4_IPV6 = 2 @@ -4395,6 +4420,7 @@ class IPv6AccessType(proto.Enum): Access type external (all v6 addresses are external IPs) """ + IPV6_ACCESS_TYPE_UNSPECIFIED = 0 INTERNAL = 1 EXTERNAL = 2 @@ -4487,12 +4513,12 @@ class IPv6AccessType(proto.Enum): proto.DOUBLE, number=25, ) - additional_ip_ranges_configs: MutableSequence[ - "AdditionalIPRangesConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=29, - message="AdditionalIPRangesConfig", + additional_ip_ranges_configs: MutableSequence["AdditionalIPRangesConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=29, + message="AdditionalIPRangesConfig", + ) ) auto_ipam_config: "AutoIpamConfig" = proto.Field( proto.MESSAGE, @@ -4546,6 +4572,7 @@ class EvaluationMode(proto.Enum): admission requests with Binary Authorization using the project's singleton policy. """ + EVALUATION_MODE_UNSPECIFIED = 0 DISABLED = 1 PROJECT_SINGLETON_POLICY_ENFORCE = 2 @@ -4651,6 +4678,7 @@ class Type(proto.Enum): Only system components are monitored and logged. """ + UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -5125,6 +5153,7 @@ class Status(proto.Enum): action to restore full functionality. Details can be found in the ``statusMessage`` field. """ + STATUS_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -5668,11 +5697,11 @@ class UserManagedKeysConfig(proto.Message): proto.STRING, number=16, ) - control_plane_disk_encryption_key_versions: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=18, + control_plane_disk_encryption_key_versions: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=18, + ) ) gkeops_etcd_backup_encryption_key: str = proto.Field( proto.STRING, @@ -5704,6 +5733,7 @@ class Mode(proto.Enum): Anonymous authentication is allowed for only health check endpoints. """ + MODE_UNSPECIFIED = 0 ENABLED = 1 LIMITED = 2 @@ -5745,6 +5775,7 @@ class Mode(proto.Enum): Enables Compliance Posture features on the cluster. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -5832,6 +5863,7 @@ class Mode(proto.Enum): with the Pod Security Standard Restricted policy. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 BASIC = 4 @@ -5880,6 +5912,7 @@ class WorkloadVulnerabilityMode(proto.Enum): Applies basic vulnerability scanning settings for cluster workloads. """ + WORKLOAD_VULNERABILITY_MODE_UNSPECIFIED = 0 DISABLED = 1 BASIC = 2 @@ -5935,6 +5968,7 @@ class Mode(proto.Enum): Applies the Security Posture off cluster Enterprise level features. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 BASIC = 2 @@ -5957,6 +5991,7 @@ class VulnerabilityMode(proto.Enum): Applies the Security Posture's vulnerability on cluster Enterprise level features. """ + VULNERABILITY_MODE_UNSPECIFIED = 0 VULNERABILITY_DISABLED = 1 VULNERABILITY_BASIC = 2 @@ -6971,6 +7006,7 @@ class Status(proto.Enum): DRAINING status indicates that the subnet is not used for new node pool creation. """ + STATUS_UNSPECIFIED = 0 ACTIVE = 1 DRAINING = 2 @@ -7002,12 +7038,12 @@ class DesiredAdditionalIPRangesConfig(proto.Message): subnetwork's IP ranges """ - additional_ip_ranges_configs: MutableSequence[ - "AdditionalIPRangesConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AdditionalIPRangesConfig", + additional_ip_ranges_configs: MutableSequence["AdditionalIPRangesConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AdditionalIPRangesConfig", + ) ) @@ -7160,6 +7196,7 @@ class Status(proto.Enum): ABORTING (4): The operation is aborting. """ + STATUS_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 @@ -7287,6 +7324,7 @@ class Type(proto.Enum): blocked for other upgrades until the operation finishes. """ + TYPE_UNSPECIFIED = 0 CREATE_CLUSTER = 1 DELETE_CLUSTER = 2 @@ -8357,6 +8395,7 @@ class Action(proto.Enum): provided, basic authentication is enabled, with either a provided password or a generated one. """ + UNKNOWN = 0 SET_PASSWORD = 1 GENERATE_PASSWORD = 2 @@ -9293,6 +9332,7 @@ class Status(proto.Enum): The ERROR state indicates the node pool may be unusable. Details can be found in the ``statusMessage`` field. """ + STATUS_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -9457,6 +9497,7 @@ class Phase(proto.Enum): ROLLBACK_STARTED (7): Rollback has been initiated. """ + PHASE_UNSPECIFIED = 0 UPDATE_STARTED = 1 CREATING_GREEN_POOL = 2 @@ -9525,6 +9566,7 @@ class Type(proto.Enum): availability domain to ensure low communication latency. """ + TYPE_UNSPECIFIED = 0 COMPACT = 1 @@ -9884,6 +9926,7 @@ class Scope(proto.Enum): the cluster, and also exclude all node pool upgrades. Only control plane patches are allowed. """ + NO_UPGRADES = 0 NO_MINOR_UPGRADES = 1 NO_MINOR_OR_NODE_UPGRADES = 2 @@ -9901,6 +9944,7 @@ class EndTimeBehavior(proto.Enum): until the end of the support of the cluster's current version. """ + END_TIME_BEHAVIOR_UNSPECIFIED = 0 UNTIL_END_OF_SUPPORT = 1 @@ -10251,6 +10295,7 @@ class AutoscalingProfile(proto.Enum): Use default (balanced) autoscaling configuration. """ + PROFILE_UNSPECIFIED = 0 OPTIMIZE_UTILIZATION = 1 BALANCED = 2 @@ -10264,6 +10309,7 @@ class AutopilotGeneralProfile(proto.Enum): NO_PERFORMANCE (1): Avoid extra IP consumption. """ + AUTOPILOT_GENERAL_PROFILE_UNSPECIFIED = 0 NO_PERFORMANCE = 1 @@ -10531,6 +10577,7 @@ class LocationPolicy(proto.Enum): ANY policy picks zones that have the highest capacity available. """ + LOCATION_POLICY_UNSPECIFIED = 0 BALANCED = 1 ANY = 2 @@ -10868,6 +10915,7 @@ class GPUSharingStrategy(proto.Enum): GPUs are shared between containers with NVIDIA MPS. """ + GPU_SHARING_STRATEGY_UNSPECIFIED = 0 TIME_SHARING = 1 MPS = 2 @@ -10913,6 +10961,7 @@ class GPUDriverVersion(proto.Enum): LATEST (3): "Latest" GPU driver in COS. """ + GPU_DRIVER_VERSION_UNSPECIFIED = 0 INSTALLATION_DISABLED = 1 DEFAULT = 2 @@ -10969,6 +11018,7 @@ class Scope(proto.Enum): NONE (2): Disable Auto-Monitoring. """ + SCOPE_UNSPECIFIED = 0 ALL = 1 NONE = 2 @@ -11024,6 +11074,7 @@ class NodeMetadata(proto.Enum): only be enabled if Workload Identity is enabled at the cluster level. """ + UNSPECIFIED = 0 SECURE = 1 EXPOSE = 2 @@ -11047,6 +11098,7 @@ class Mode(proto.Enum): only be enabled if Workload Identity is enabled at the cluster level. """ + MODE_UNSPECIFIED = 0 GCE_METADATA = 1 GKE_METADATA = 2 @@ -11239,6 +11291,7 @@ class LocationType(proto.Enum): A GKE Location where Regional clusters can be created. """ + LOCATION_TYPE_UNSPECIFIED = 0 ZONE = 1 REGION = 2 @@ -11303,6 +11356,7 @@ class Code(proto.Enum): encryption has been destroyed. This is a permanent error. """ + _pb_options = {"deprecated": True} UNKNOWN = 0 GCE_STOCKOUT = 1 @@ -11437,6 +11491,7 @@ class Tier(proto.Enum): Higher bandwidth, actual values based on VM size. """ + TIER_UNSPECIFIED = 0 TIER_1 = 1 @@ -11556,6 +11611,7 @@ class Channel(proto.Enum): Gateway API support is enabled, standard CRDs are installed """ + CHANNEL_UNSPECIFIED = 0 CHANNEL_DISABLED = 1 CHANNEL_EXPERIMENTAL = 3 @@ -11696,6 +11752,7 @@ class Status(proto.Enum): IN_USE_MANAGED_POD denotes this range was created by GKE and is claimed for pods. It cannot be used for other clusters. """ + UNKNOWN = 0 UNUSED = 1 IN_USE_SERVICE = 2 @@ -11755,12 +11812,12 @@ class UsableSubnetwork(proto.Message): proto.STRING, number=3, ) - secondary_ip_ranges: MutableSequence[ - "UsableSubnetworkSecondaryRange" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="UsableSubnetworkSecondaryRange", + secondary_ip_ranges: MutableSequence["UsableSubnetworkSecondaryRange"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="UsableSubnetworkSecondaryRange", + ) ) status_message: str = proto.Field( proto.STRING, @@ -11863,6 +11920,7 @@ class Provider(proto.Enum): KUBE_DNS (3): Use KubeDNS for DNS resolution. """ + PROVIDER_UNSPECIFIED = 0 PLATFORM_DEFAULT = 1 CLOUD_DNS = 2 @@ -11883,6 +11941,7 @@ class DNSScope(proto.Enum): DNS records are accessible from within the VPC. """ + DNS_SCOPE_UNSPECIFIED = 0 CLUSTER_SCOPE = 1 VPC_SCOPE = 2 @@ -12066,6 +12125,7 @@ class State(proto.Enum): etcd level) - this is unrelated to Compute Engine level full disk encryption. """ + UNKNOWN = 0 ENCRYPTED = 1 DECRYPTED = 2 @@ -12096,6 +12156,7 @@ class CurrentState(proto.Enum): De-crypting Secrets to plain text in etcd encountered an error. """ + CURRENT_STATE_UNSPECIFIED = 0 CURRENT_STATE_ENCRYPTED = 7 CURRENT_STATE_DECRYPTED = 2 @@ -12292,6 +12353,7 @@ class GPUDirectStrategy(proto.Enum): GPUDirect-RDMA on A3 Ultra, and A4 machine types """ + GPU_DIRECT_STRATEGY_UNSPECIFIED = 0 RDMA = 2 @@ -12528,6 +12590,7 @@ class IssueType(proto.Enum): business logic, there is a potential that they won't work on Autopilot. """ + UNSPECIFIED = 0 INCOMPATIBILITY = 1 ADDITIONAL_CONFIG_REQUIRED = 2 @@ -12628,6 +12691,7 @@ class Channel(proto.Enum): which are known to be stable and reliable in production. """ + UNSPECIFIED = 0 RAPID = 1 REGULAR = 2 @@ -12770,6 +12834,7 @@ class State(proto.Enum): completed. Old node pools will continue being deleted in the background. """ + STATE_UNSPECIFIED = 0 DONE = 5 @@ -12903,6 +12968,7 @@ class EventType(proto.Enum): UPGRADE_INFO_EVENT (4): Corresponds with UpgradeInfoEvent. """ + EVENT_TYPE_UNSPECIFIED = 0 UPGRADE_AVAILABLE_EVENT = 1 UPGRADE_EVENT = 2 @@ -12952,12 +13018,12 @@ class Filter(proto.Message): Event types to allowlist. """ - event_type: MutableSequence[ - "NotificationConfig.EventType" - ] = proto.RepeatedField( - proto.ENUM, - number=1, - enum="NotificationConfig.EventType", + event_type: MutableSequence["NotificationConfig.EventType"] = ( + proto.RepeatedField( + proto.ENUM, + number=1, + enum="NotificationConfig.EventType", + ) ) pubsub: PubSub = proto.Field( @@ -12994,6 +13060,7 @@ class ConfidentialInstanceType(proto.Enum): TDX (3): Intel Trust Domain eXtension. """ + CONFIDENTIAL_INSTANCE_TYPE_UNSPECIFIED = 0 SEV = 1 SEV_SNP = 2 @@ -13139,6 +13206,7 @@ class State(proto.Enum): CANCELED (6): CANCELED indicates the upgrade has canceled. """ + STATE_UNSPECIFIED = 0 STARTED = 3 SUCCEEDED = 4 @@ -13167,6 +13235,7 @@ class EventType(proto.Enum): DISRUPTION_EVENT indicates the event is about the disruption. """ + EVENT_TYPE_UNSPECIFIED = 0 END_OF_SUPPORT = 1 COS_MILESTONE_VERSION_UPDATE = 2 @@ -13286,6 +13355,7 @@ class DisruptionType(proto.Enum): POD_PDB_VIOLATION indicates that there are force pod evictions during node drain which violate the PDB. """ + DISRUPTION_TYPE_UNSPECIFIED = 0 POD_NOT_ENOUGH_PDB = 1 POD_PDB_VIOLATION = 2 @@ -13535,6 +13605,7 @@ class Component(proto.Enum): KCP_HPA (9): horizontal pod autoscaler decision logs """ + COMPONENT_UNSPECIFIED = 0 SYSTEM_COMPONENTS = 1 WORKLOADS = 2 @@ -13631,6 +13702,7 @@ class RelayMode(proto.Enum): EXTERNAL_LB (4): exposed via external load balancer """ + RELAY_MODE_UNSPECIFIED = 0 DISABLED = 1 INTERNAL_VPC_LB = 3 @@ -13703,6 +13775,7 @@ class Variant(proto.Enum): MAX_THROUGHPUT (2): maximum logging throughput variant. """ + VARIANT_UNSPECIFIED = 0 DEFAULT = 1 MAX_THROUGHPUT = 2 @@ -13762,6 +13835,7 @@ class Component(proto.Enum): JOBSET (16): JobSet """ + COMPONENT_UNSPECIFIED = 0 SYSTEM_COMPONENTS = 1 WORKLOADS = 2 @@ -13816,6 +13890,7 @@ class HPAProfile(proto.Enum): faster metrics collection for workload autoscaling. """ + HPA_PROFILE_UNSPECIFIED = 0 NONE = 1 PERFORMANCE = 2 @@ -13859,6 +13934,7 @@ class MembershipType(proto.Enum): The membership supports only lightweight compatible features. """ + MEMBERSHIP_TYPE_UNSPECIFIED = 0 LIGHTWEIGHT = 1 @@ -14089,6 +14165,7 @@ class ClusterTier(proto.Enum): ENTERPRISE indicates a GKE Enterprise cluster. """ + _pb_options = {"deprecated": True} CLUSTER_TIER_UNSPECIFIED = 0 STANDARD = 1 @@ -14223,6 +14300,7 @@ class Mode(proto.Enum): CONTAINER_IMAGE_CACHE is for using the secondary boot disk as a container image cache. """ + MODE_UNSPECIFIED = 0 CONTAINER_IMAGE_CACHE = 1 @@ -14322,6 +14400,7 @@ class AutoUpgradeStatus(proto.Enum): UPGRADE_PAUSED (5): UPGRADE_PAUSED indicates the upgrade is paused. """ + UNKNOWN = 0 ACTIVE = 1 MINOR_UPGRADE_PAUSED = 4 @@ -14356,6 +14435,7 @@ class AutoUpgradePausedReason(proto.Enum): SYSTEM_CONFIG indicates the cluster upgrade is paused by system config. """ + AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED = 0 MAINTENANCE_WINDOW = 1 MAINTENANCE_EXCLUSION_NO_UPGRADES = 5 @@ -14431,6 +14511,7 @@ class Mode(proto.Enum): rollback-safe mode after a KCP minor version step-one upgrade. """ + MODE_UNSPECIFIED = 0 KCP_MINOR_UPGRADE_ROLLBACK_SAFE_MODE = 1 @@ -14495,6 +14576,7 @@ class State(proto.Enum): RUNNING (4): Upgrade is running. """ + UNKNOWN = 0 FAILED = 1 SUCCEEDED = 2 @@ -14512,6 +14594,7 @@ class StartType(proto.Enum): MANUAL (2): Upgrade started manually. """ + START_TYPE_UNSPECIFIED = 0 AUTOMATIC = 1 MANUAL = 2 @@ -14631,6 +14714,7 @@ class AutoUpgradeStatus(proto.Enum): UPGRADE_PAUSED (3): UPGRADE_PAUSED indicates the upgrade is paused. """ + UNKNOWN = 0 ACTIVE = 1 MINOR_UPGRADE_PAUSED = 2 @@ -14658,6 +14742,7 @@ class AutoUpgradePausedReason(proto.Enum): SYSTEM_CONFIG indicates the cluster upgrade is paused by system config. """ + AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED = 0 MAINTENANCE_WINDOW = 1 MAINTENANCE_EXCLUSION_NO_UPGRADES = 2 @@ -14725,6 +14810,7 @@ class PatchMode(proto.Enum): build in the channel should be used as the upgrade target for the version. """ + PATCH_MODE_UNSPECIFIED = 0 ACCELERATED = 1 @@ -14765,6 +14851,7 @@ class NetworkTier(proto.Enum): NETWORK_TIER_STANDARD (3): Standard network tier. """ + NETWORK_TIER_UNSPECIFIED = 0 NETWORK_TIER_DEFAULT = 1 NETWORK_TIER_PREMIUM = 2 @@ -14866,6 +14953,7 @@ class Scope(proto.Enum): the Managed OpenTelemetry pipeline for collection and instrumentation components. """ + SCOPE_UNSPECIFIED = 0 NONE = 1 COLLECTION_AND_INSTRUMENTATION_COMPONENTS = 2 diff --git a/packages/google-cloud-container/noxfile.py b/packages/google-cloud-container/noxfile.py index 3da6a3519c04..1bb0a6a5b5c9 100644 --- a/packages/google-cloud-container/noxfile.py +++ b/packages/google-cloud-container/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-container/tests/unit/gapic/container_v1/test_cluster_manager.py b/packages/google-cloud-container/tests/unit/gapic/container_v1/test_cluster_manager.py index 5759061fd164..70567435e2cd 100644 --- a/packages/google-cloud-container/tests/unit/gapic/container_v1/test_cluster_manager.py +++ b/packages/google-cloud-container/tests/unit/gapic/container_v1/test_cluster_manager.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import code_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.container_v1.services.cluster_manager import ( ClusterManagerAsyncClient, @@ -950,10 +955,9 @@ def test_cluster_manager_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +1002,9 @@ def test_cluster_manager_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_cluster_manager_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1283,13 +1285,13 @@ def test_cluster_manager_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3086,9 +3088,9 @@ def test_update_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_node_pool] = ( + mock_rpc + ) request = {} client.update_node_pool(request) @@ -3688,9 +3690,9 @@ def test_set_logging_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_logging_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_logging_service] = ( + mock_rpc + ) request = {} client.set_logging_service(request) @@ -4119,9 +4121,9 @@ def test_set_monitoring_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_monitoring_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_monitoring_service] = ( + mock_rpc + ) request = {} client.set_monitoring_service(request) @@ -4545,9 +4547,9 @@ def test_set_addons_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_addons_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_addons_config] = ( + mock_rpc + ) request = {} client.set_addons_config(request) @@ -7207,9 +7209,9 @@ def test_cancel_operation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_operation] = ( + mock_rpc + ) request = {} client.cancel_operation(request) @@ -7569,9 +7571,9 @@ def test_get_server_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_config] = ( + mock_rpc + ) request = {} client.get_server_config(request) @@ -7933,9 +7935,9 @@ def test_get_json_web_keys_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_json_web_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_json_web_keys] = ( + mock_rpc + ) request = {} client.get_json_web_keys(request) @@ -8965,9 +8967,9 @@ def test_create_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_pool] = ( + mock_rpc + ) request = {} client.create_node_pool(request) @@ -9378,9 +9380,9 @@ def test_delete_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_node_pool] = ( + mock_rpc + ) request = {} client.delete_node_pool(request) @@ -11472,9 +11474,9 @@ def test_start_ip_rotation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_ip_rotation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_ip_rotation] = ( + mock_rpc + ) request = {} client.start_ip_rotation(request) @@ -11889,9 +11891,9 @@ def test_complete_ip_rotation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_ip_rotation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_ip_rotation] = ( + mock_rpc + ) request = {} client.complete_ip_rotation(request) @@ -12309,9 +12311,9 @@ def test_set_node_pool_size_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_pool_size - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_pool_size] = ( + mock_rpc + ) request = {} client.set_node_pool_size(request) @@ -12610,9 +12612,9 @@ def test_set_network_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_network_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_network_policy] = ( + mock_rpc + ) request = {} client.set_network_policy(request) @@ -13051,9 +13053,9 @@ def test_set_maintenance_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_maintenance_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_maintenance_policy] = ( + mock_rpc + ) request = {} client.set_maintenance_policy(request) @@ -15485,9 +15487,9 @@ def test_update_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_node_pool] = ( + mock_rpc + ) request = {} client.update_node_pool(request) @@ -15743,9 +15745,9 @@ def test_set_logging_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_logging_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_logging_service] = ( + mock_rpc + ) request = {} client.set_logging_service(request) @@ -15935,9 +15937,9 @@ def test_set_monitoring_service_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_monitoring_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_monitoring_service] = ( + mock_rpc + ) request = {} client.set_monitoring_service(request) @@ -16124,9 +16126,9 @@ def test_set_addons_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_addons_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_addons_config] = ( + mock_rpc + ) request = {} client.set_addons_config(request) @@ -17107,9 +17109,9 @@ def test_cancel_operation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_operation] = ( + mock_rpc + ) request = {} client.cancel_operation(request) @@ -17209,9 +17211,9 @@ def test_get_server_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_config] = ( + mock_rpc + ) request = {} client.get_server_config(request) @@ -17308,9 +17310,9 @@ def test_get_json_web_keys_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_json_web_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_json_web_keys] = ( + mock_rpc + ) request = {} client.get_json_web_keys(request) @@ -17552,9 +17554,9 @@ def test_create_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_pool] = ( + mock_rpc + ) request = {} client.create_node_pool(request) @@ -17738,9 +17740,9 @@ def test_delete_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_node_pool] = ( + mock_rpc + ) request = {} client.delete_node_pool(request) @@ -18429,9 +18431,9 @@ def test_start_ip_rotation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_ip_rotation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_ip_rotation] = ( + mock_rpc + ) request = {} client.start_ip_rotation(request) @@ -18533,9 +18535,9 @@ def test_complete_ip_rotation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_ip_rotation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_ip_rotation] = ( + mock_rpc + ) request = {} client.complete_ip_rotation(request) @@ -18637,9 +18639,9 @@ def test_set_node_pool_size_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_pool_size - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_pool_size] = ( + mock_rpc + ) request = {} client.set_node_pool_size(request) @@ -18762,9 +18764,9 @@ def test_set_network_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_network_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_network_policy] = ( + mock_rpc + ) request = {} client.set_network_policy(request) @@ -18953,9 +18955,9 @@ def test_set_maintenance_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_maintenance_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_maintenance_policy] = ( + mock_rpc + ) request = {} client.set_maintenance_policy(request) @@ -21887,8 +21889,9 @@ def test_list_clusters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21951,17 +21954,19 @@ def test_list_clusters_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_list_clusters" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_list_clusters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_list_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_list_clusters" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_list_clusters_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_list_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22017,8 +22022,9 @@ def test_get_cluster_rest_bad_request(request_type=cluster_service.GetClusterReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22145,17 +22151,19 @@ def test_get_cluster_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_get_cluster" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_get_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_get_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_get_cluster" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_get_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_get_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22208,8 +22216,9 @@ def test_create_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22292,17 +22301,20 @@ def test_create_cluster_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_create_cluster" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_create_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_create_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_create_cluster" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_create_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_create_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22355,8 +22367,9 @@ def test_update_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22439,17 +22452,20 @@ def test_update_cluster_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_update_cluster" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_update_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_update_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_update_cluster" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_update_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_update_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22504,8 +22520,9 @@ def test_update_node_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22590,17 +22607,20 @@ def test_update_node_pool_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_update_node_pool" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_update_node_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_update_node_pool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_update_node_pool" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_update_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_update_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22655,8 +22675,9 @@ def test_set_node_pool_autoscaling_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22741,18 +22762,20 @@ def test_set_node_pool_autoscaling_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_set_node_pool_autoscaling" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_set_node_pool_autoscaling_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_set_node_pool_autoscaling" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_node_pool_autoscaling" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_set_node_pool_autoscaling_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_set_node_pool_autoscaling" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22805,8 +22828,9 @@ def test_set_logging_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22889,18 +22913,20 @@ def test_set_logging_service_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_set_logging_service" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_set_logging_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_set_logging_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_logging_service" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_set_logging_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_set_logging_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22953,8 +22979,9 @@ def test_set_monitoring_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23037,18 +23064,20 @@ def test_set_monitoring_service_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_set_monitoring_service" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_set_monitoring_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_set_monitoring_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_monitoring_service" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_set_monitoring_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_set_monitoring_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23101,8 +23130,9 @@ def test_set_addons_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23185,17 +23215,20 @@ def test_set_addons_config_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_set_addons_config" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_set_addons_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_set_addons_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_addons_config" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_set_addons_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_set_addons_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23248,8 +23281,9 @@ def test_set_locations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23332,17 +23366,19 @@ def test_set_locations_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_set_locations" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_set_locations_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_set_locations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_locations" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_locations_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_set_locations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23395,8 +23431,9 @@ def test_update_master_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23479,17 +23516,19 @@ def test_update_master_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_update_master" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_update_master_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_update_master" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_update_master" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_update_master_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_update_master" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23542,8 +23581,9 @@ def test_set_master_auth_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23626,17 +23666,20 @@ def test_set_master_auth_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_set_master_auth" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_set_master_auth_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_set_master_auth" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_master_auth" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_set_master_auth_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_set_master_auth" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23689,8 +23732,9 @@ def test_delete_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23773,17 +23817,20 @@ def test_delete_cluster_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_delete_cluster" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_delete_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_delete_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_delete_cluster" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_delete_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_delete_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23836,8 +23883,9 @@ def test_list_operations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23900,17 +23948,20 @@ def test_list_operations_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_list_operations" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_list_operations_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_list_operations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_list_operations" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_list_operations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_list_operations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23968,8 +24019,9 @@ def test_get_operation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24052,17 +24104,19 @@ def test_get_operation_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_get_operation" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_get_operation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_get_operation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_get_operation" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_get_operation_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_get_operation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24115,8 +24169,9 @@ def test_cancel_operation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24173,13 +24228,13 @@ def test_cancel_operation_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "pre_cancel_operation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_cancel_operation" + ) as pre, + ): pre.assert_not_called() pb_message = cluster_service.CancelOperationRequest.pb( cluster_service.CancelOperationRequest() @@ -24224,8 +24279,9 @@ def test_get_server_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24296,17 +24352,20 @@ def test_get_server_config_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_get_server_config" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_get_server_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_get_server_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_get_server_config" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_get_server_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_get_server_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24361,8 +24420,9 @@ def test_get_json_web_keys_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24422,17 +24482,20 @@ def test_get_json_web_keys_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_get_json_web_keys" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_get_json_web_keys_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_get_json_web_keys" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_get_json_web_keys" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_get_json_web_keys_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_get_json_web_keys" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24490,8 +24553,9 @@ def test_list_node_pools_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24551,17 +24615,20 @@ def test_list_node_pools_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_list_node_pools" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_list_node_pools_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_list_node_pools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_list_node_pools" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_list_node_pools_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_list_node_pools" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24621,8 +24688,9 @@ def test_get_node_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24705,17 +24773,19 @@ def test_get_node_pool_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_get_node_pool" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_get_node_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_get_node_pool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_get_node_pool" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_get_node_pool_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_get_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24768,8 +24838,9 @@ def test_create_node_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24852,17 +24923,20 @@ def test_create_node_pool_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_create_node_pool" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_create_node_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_create_node_pool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_create_node_pool" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_create_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_create_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24917,8 +24991,9 @@ def test_delete_node_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25003,17 +25078,20 @@ def test_delete_node_pool_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_delete_node_pool" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_delete_node_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_delete_node_pool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_delete_node_pool" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_delete_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_delete_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25068,8 +25146,9 @@ def test_complete_node_pool_upgrade_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25128,13 +25207,13 @@ def test_complete_node_pool_upgrade_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "pre_complete_node_pool_upgrade" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_complete_node_pool_upgrade" + ) as pre, + ): pre.assert_not_called() pb_message = cluster_service.CompleteNodePoolUpgradeRequest.pb( cluster_service.CompleteNodePoolUpgradeRequest() @@ -25181,8 +25260,9 @@ def test_rollback_node_pool_upgrade_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25267,18 +25347,20 @@ def test_rollback_node_pool_upgrade_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_rollback_node_pool_upgrade" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_rollback_node_pool_upgrade_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_rollback_node_pool_upgrade" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_rollback_node_pool_upgrade" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_rollback_node_pool_upgrade_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_rollback_node_pool_upgrade" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25333,8 +25415,9 @@ def test_set_node_pool_management_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25419,18 +25502,20 @@ def test_set_node_pool_management_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_set_node_pool_management" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_set_node_pool_management_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_set_node_pool_management" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_node_pool_management" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_set_node_pool_management_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_set_node_pool_management" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25481,8 +25566,9 @@ def test_set_labels_rest_bad_request(request_type=cluster_service.SetLabelsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25565,17 +25651,19 @@ def test_set_labels_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_set_labels" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_set_labels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_set_labels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_labels" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_labels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_set_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25628,8 +25716,9 @@ def test_set_legacy_abac_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25712,17 +25801,20 @@ def test_set_legacy_abac_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_set_legacy_abac" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_set_legacy_abac_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_set_legacy_abac" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_legacy_abac" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_set_legacy_abac_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_set_legacy_abac" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25775,8 +25867,9 @@ def test_start_ip_rotation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25859,17 +25952,20 @@ def test_start_ip_rotation_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_start_ip_rotation" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, "post_start_ip_rotation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_start_ip_rotation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_start_ip_rotation" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_start_ip_rotation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_start_ip_rotation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25922,8 +26018,9 @@ def test_complete_ip_rotation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26006,18 +26103,20 @@ def test_complete_ip_rotation_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_complete_ip_rotation" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_complete_ip_rotation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_complete_ip_rotation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_complete_ip_rotation" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_complete_ip_rotation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_complete_ip_rotation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26072,8 +26171,9 @@ def test_set_node_pool_size_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26158,18 +26258,20 @@ def test_set_node_pool_size_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_set_node_pool_size" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_set_node_pool_size_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_set_node_pool_size" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_node_pool_size" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_set_node_pool_size_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_set_node_pool_size" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26222,8 +26324,9 @@ def test_set_network_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26306,18 +26409,20 @@ def test_set_network_policy_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_set_network_policy" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_set_network_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_set_network_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_network_policy" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_set_network_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_set_network_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26370,8 +26475,9 @@ def test_set_maintenance_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26454,18 +26560,20 @@ def test_set_maintenance_policy_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_set_maintenance_policy" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_set_maintenance_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_set_maintenance_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_set_maintenance_policy" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_set_maintenance_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_set_maintenance_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26518,8 +26626,9 @@ def test_list_usable_subnetworks_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26582,18 +26691,20 @@ def test_list_usable_subnetworks_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_list_usable_subnetworks" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_list_usable_subnetworks_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_list_usable_subnetworks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_list_usable_subnetworks" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_list_usable_subnetworks_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_list_usable_subnetworks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26651,8 +26762,9 @@ def test_check_autopilot_compatibility_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26717,18 +26829,22 @@ def test_check_autopilot_compatibility_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_check_autopilot_compatibility" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_check_autopilot_compatibility_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_check_autopilot_compatibility" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_check_autopilot_compatibility", + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_check_autopilot_compatibility_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "pre_check_autopilot_compatibility", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26786,8 +26902,9 @@ def test_fetch_cluster_upgrade_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26874,18 +26991,20 @@ def test_fetch_cluster_upgrade_info_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_fetch_cluster_upgrade_info" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_fetch_cluster_upgrade_info_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_fetch_cluster_upgrade_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "post_fetch_cluster_upgrade_info" + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_fetch_cluster_upgrade_info_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_fetch_cluster_upgrade_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26942,8 +27061,9 @@ def test_fetch_node_pool_upgrade_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27032,18 +27152,21 @@ def test_fetch_node_pool_upgrade_info_rest_interceptors(null_interceptor): ) client = ClusterManagerClient(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.ClusterManagerRestInterceptor, "post_fetch_node_pool_upgrade_info" - ) as post, mock.patch.object( - transports.ClusterManagerRestInterceptor, - "post_fetch_node_pool_upgrade_info_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterManagerRestInterceptor, "pre_fetch_node_pool_upgrade_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_fetch_node_pool_upgrade_info", + ) as post, + mock.patch.object( + transports.ClusterManagerRestInterceptor, + "post_fetch_node_pool_upgrade_info_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterManagerRestInterceptor, "pre_fetch_node_pool_upgrade_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27941,11 +28064,14 @@ def test_cluster_manager_base_transport(): def test_cluster_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.container_v1.services.cluster_manager.transports.ClusterManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.container_v1.services.cluster_manager.transports.ClusterManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ClusterManagerTransport( @@ -27962,9 +28088,12 @@ def test_cluster_manager_base_transport_with_credentials_file(): def test_cluster_manager_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.container_v1.services.cluster_manager.transports.ClusterManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.container_v1.services.cluster_manager.transports.ClusterManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ClusterManagerTransport() @@ -28036,11 +28165,12 @@ def test_cluster_manager_transport_auth_gdch_credentials(transport_class): def test_cluster_manager_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-container/tests/unit/gapic/container_v1beta1/test_cluster_manager.py b/packages/google-cloud-container/tests/unit/gapic/container_v1beta1/test_cluster_manager.py index af7274b576b4..c081c52fedc8 100644 --- a/packages/google-cloud-container/tests/unit/gapic/container_v1beta1/test_cluster_manager.py +++ b/packages/google-cloud-container/tests/unit/gapic/container_v1beta1/test_cluster_manager.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,19 +39,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import code_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.container_v1beta1.services.cluster_manager import ( ClusterManagerAsyncClient, @@ -931,10 +936,9 @@ def test_cluster_manager_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +983,9 @@ def test_cluster_manager_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1021,9 @@ def test_cluster_manager_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1262,13 +1264,13 @@ def test_cluster_manager_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3037,9 +3039,9 @@ def test_update_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_node_pool] = ( + mock_rpc + ) request = {} client.update_node_pool(request) @@ -3639,9 +3641,9 @@ def test_set_logging_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_logging_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_logging_service] = ( + mock_rpc + ) request = {} client.set_logging_service(request) @@ -4060,9 +4062,9 @@ def test_set_monitoring_service_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_monitoring_service - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_monitoring_service] = ( + mock_rpc + ) request = {} client.set_monitoring_service(request) @@ -4476,9 +4478,9 @@ def test_set_addons_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_addons_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_addons_config] = ( + mock_rpc + ) request = {} client.set_addons_config(request) @@ -7078,9 +7080,9 @@ def test_cancel_operation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_operation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_operation] = ( + mock_rpc + ) request = {} client.cancel_operation(request) @@ -7430,9 +7432,9 @@ def test_get_server_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_config] = ( + mock_rpc + ) request = {} client.get_server_config(request) @@ -7784,9 +7786,9 @@ def test_get_json_web_keys_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_json_web_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_json_web_keys] = ( + mock_rpc + ) request = {} client.get_json_web_keys(request) @@ -8796,9 +8798,9 @@ def test_create_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_pool] = ( + mock_rpc + ) request = {} client.create_node_pool(request) @@ -9199,9 +9201,9 @@ def test_delete_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_node_pool] = ( + mock_rpc + ) request = {} client.delete_node_pool(request) @@ -11511,9 +11513,9 @@ def test_start_ip_rotation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_ip_rotation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_ip_rotation] = ( + mock_rpc + ) request = {} client.start_ip_rotation(request) @@ -11918,9 +11920,9 @@ def test_complete_ip_rotation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_ip_rotation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_ip_rotation] = ( + mock_rpc + ) request = {} client.complete_ip_rotation(request) @@ -12328,9 +12330,9 @@ def test_set_node_pool_size_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_node_pool_size - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_node_pool_size] = ( + mock_rpc + ) request = {} client.set_node_pool_size(request) @@ -12629,9 +12631,9 @@ def test_set_network_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_network_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_network_policy] = ( + mock_rpc + ) request = {} client.set_network_policy(request) @@ -13060,9 +13062,9 @@ def test_set_maintenance_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_maintenance_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_maintenance_policy] = ( + mock_rpc + ) request = {} client.set_maintenance_policy(request) @@ -18015,11 +18017,14 @@ def test_cluster_manager_base_transport(): def test_cluster_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.container_v1beta1.services.cluster_manager.transports.ClusterManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.container_v1beta1.services.cluster_manager.transports.ClusterManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ClusterManagerTransport( @@ -18036,9 +18041,12 @@ def test_cluster_manager_base_transport_with_credentials_file(): def test_cluster_manager_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.container_v1beta1.services.cluster_manager.transports.ClusterManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.container_v1beta1.services.cluster_manager.transports.ClusterManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ClusterManagerTransport() @@ -18109,11 +18117,12 @@ def test_cluster_manager_transport_auth_gdch_credentials(transport_class): def test_cluster_manager_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/types/containeranalysis.py b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/types/containeranalysis.py index f53c64b6f818..6d4324aa4448 100644 --- a/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/types/containeranalysis.py +++ b/packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/types/containeranalysis.py @@ -73,8 +73,9 @@ class ExportSBOMResponse(proto.Message): Attributes: discovery_occurrence (str): The name of the discovery occurrence in the form - "projects/{project_id}/occurrences/{OCCURRENCE_ID} It can be - used to track the progress of the SBOM export. + "projects/{project_id}/occurrences/{OCCURRENCE_ID} + It can be used to track the progress of the SBOM + export. """ discovery_occurrence: str = proto.Field( @@ -123,8 +124,9 @@ class FixableTotalByDigest(proto.Message): resource_uri (str): The affected resource. severity (grafeas.v1.grafeas.grafeas_v1.Severity): - The severity for this count. SEVERITY_UNSPECIFIED indicates - total across all severities. + The severity for this count. + SEVERITY_UNSPECIFIED indicates total across all + severities. fixable_count (int): The number of fixable vulnerabilities associated with this resource. diff --git a/packages/google-cloud-contentwarehouse/docs/conf.py b/packages/google-cloud-contentwarehouse/docs/conf.py index 584ed627ed25..674f75981834 100644 --- a/packages/google-cloud-contentwarehouse/docs/conf.py +++ b/packages/google-cloud-contentwarehouse/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-contentwarehouse documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/__init__.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/__init__.py index 690543b602ed..8f9f775a872d 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/__init__.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.document_link_service import ( DocumentLinkServiceAsyncClient, DocumentLinkServiceClient, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/async_client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/async_client.py index cfe73b4ac2f8..346ede71d371 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/async_client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_link_service import pagers from google.cloud.contentwarehouse_v1.types import document, document_link_service @@ -123,7 +123,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentLinkServiceAsyncClient: The constructed client. """ - return DocumentLinkServiceClient.from_service_account_info.__func__(DocumentLinkServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DocumentLinkServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DocumentLinkServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +140,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentLinkServiceAsyncClient: The constructed client. """ - return DocumentLinkServiceClient.from_service_account_file.__func__(DocumentLinkServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DocumentLinkServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DocumentLinkServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -177,7 +179,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DocumentLinkServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DocumentLinkServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DocumentLinkServiceTransport: diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/client.py index ae9f45ed31d4..425755509bc6 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_link_service import pagers from google.cloud.contentwarehouse_v1.types import document, document_link_service @@ -81,9 +81,7 @@ class DocumentLinkServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentLinkServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentLinkServiceTransport]] _transport_registry["grpc"] = DocumentLinkServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentLinkServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentLinkServiceRestTransport @@ -654,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentLinkServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentLinkServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentLinkServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -693,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentLinkServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/pagers.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/pagers.py index c442ead15864..bfcfc9c3cbaf 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/pagers.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/__init__.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/__init__.py index 8085809d4baf..02a3487ae3da 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/__init__.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import DocumentLinkServiceRestInterceptor, DocumentLinkServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DocumentLinkServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DocumentLinkServiceTransport]] _transport_registry["grpc"] = DocumentLinkServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentLinkServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentLinkServiceRestTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/base.py index b719a79923c6..85020638704d 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1 import gapic_version as package_version from google.cloud.contentwarehouse_v1.types import document_link_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc.py index 85dba617bb4b..062d8c50c93c 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import document_link_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc_asyncio.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc_asyncio.py index 8a9f95ed0758..3d3d0156853b 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import document_link_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest.py index 5b9abf694691..91499a2b98e1 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -452,9 +452,7 @@ def __call__( """ - http_options = ( - _BaseDocumentLinkServiceRestTransport._BaseCreateDocumentLink._get_http_options() - ) + http_options = _BaseDocumentLinkServiceRestTransport._BaseCreateDocumentLink._get_http_options() request, metadata = self._interceptor.pre_create_document_link( request, metadata @@ -606,9 +604,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentLinkServiceRestTransport._BaseDeleteDocumentLink._get_http_options() - ) + http_options = _BaseDocumentLinkServiceRestTransport._BaseDeleteDocumentLink._get_http_options() request, metadata = self._interceptor.pre_delete_document_link( request, metadata @@ -634,7 +630,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -730,9 +726,7 @@ def __call__( """ - http_options = ( - _BaseDocumentLinkServiceRestTransport._BaseListLinkedSources._get_http_options() - ) + http_options = _BaseDocumentLinkServiceRestTransport._BaseListLinkedSources._get_http_options() request, metadata = self._interceptor.pre_list_linked_sources( request, metadata @@ -892,9 +886,7 @@ def __call__( """ - http_options = ( - _BaseDocumentLinkServiceRestTransport._BaseListLinkedTargets._get_http_options() - ) + http_options = _BaseDocumentLinkServiceRestTransport._BaseListLinkedTargets._get_http_options() request, metadata = self._interceptor.pre_list_linked_targets( request, metadata @@ -1094,9 +1086,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDocumentLinkServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDocumentLinkServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDocumentLinkServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest_base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest_base.py index 9f50053a0445..e34a64aca40d 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest_base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_link_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.contentwarehouse_v1.types import document_link_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/async_client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/async_client.py index 94775aa80f70..c16669dde140 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/async_client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_schema_service import pagers +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service from .client import DocumentSchemaServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DocumentSchemaServiceTransport @@ -128,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentSchemaServiceAsyncClient: The constructed client. """ - return DocumentSchemaServiceClient.from_service_account_info.__func__(DocumentSchemaServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DocumentSchemaServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DocumentSchemaServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentSchemaServiceAsyncClient: The constructed client. """ - return DocumentSchemaServiceClient.from_service_account_file.__func__(DocumentSchemaServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DocumentSchemaServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DocumentSchemaServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -182,7 +186,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DocumentSchemaServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DocumentSchemaServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DocumentSchemaServiceTransport: diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/client.py index 6fcec0335448..706149da6cc6 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_schema_service import pagers +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service from .transports.base import DEFAULT_CLIENT_INFO, DocumentSchemaServiceTransport from .transports.grpc import DocumentSchemaServiceGrpcTransport @@ -85,9 +87,7 @@ class DocumentSchemaServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentSchemaServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentSchemaServiceTransport]] _transport_registry["grpc"] = DocumentSchemaServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentSchemaServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentSchemaServiceRestTransport @@ -650,11 +650,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentSchemaServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentSchemaServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentSchemaServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -689,8 +687,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentSchemaServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/pagers.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/pagers.py index 2c4b85551d75..a313073423dd 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/pagers.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/__init__.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/__init__.py index faba0b94fb1a..46a623ac01d2 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/__init__.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DocumentSchemaServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DocumentSchemaServiceTransport]] _transport_registry["grpc"] = DocumentSchemaServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentSchemaServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentSchemaServiceRestTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/base.py index daddf9b0c4ec..1409b5deed56 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1 import gapic_version as package_version +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc.py index c512dfa7150c..c4b285be66b6 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service from .base import DEFAULT_CLIENT_INFO, DocumentSchemaServiceTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc_asyncio.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc_asyncio.py index 5656dfe286b6..8f555bbf3928 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/grpc_asyncio.py @@ -17,27 +17,29 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service from .base import DEFAULT_CLIENT_INFO, DocumentSchemaServiceTransport from .grpc import DocumentSchemaServiceGrpcTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest.py index 115ccb66875b..f74c8433b2b3 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest.py @@ -16,25 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentSchemaServiceRestTransport @@ -510,9 +512,7 @@ def __call__( """ - http_options = ( - _BaseDocumentSchemaServiceRestTransport._BaseCreateDocumentSchema._get_http_options() - ) + http_options = _BaseDocumentSchemaServiceRestTransport._BaseCreateDocumentSchema._get_http_options() request, metadata = self._interceptor.pre_create_document_schema( request, metadata @@ -663,9 +663,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentSchemaServiceRestTransport._BaseDeleteDocumentSchema._get_http_options() - ) + http_options = _BaseDocumentSchemaServiceRestTransport._BaseDeleteDocumentSchema._get_http_options() request, metadata = self._interceptor.pre_delete_document_schema( request, metadata @@ -687,7 +685,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -781,9 +779,7 @@ def __call__( """ - http_options = ( - _BaseDocumentSchemaServiceRestTransport._BaseGetDocumentSchema._get_http_options() - ) + http_options = _BaseDocumentSchemaServiceRestTransport._BaseGetDocumentSchema._get_http_options() request, metadata = self._interceptor.pre_get_document_schema( request, metadata @@ -933,9 +929,7 @@ def __call__( """ - http_options = ( - _BaseDocumentSchemaServiceRestTransport._BaseListDocumentSchemas._get_http_options() - ) + http_options = _BaseDocumentSchemaServiceRestTransport._BaseListDocumentSchemas._get_http_options() request, metadata = self._interceptor.pre_list_document_schemas( request, metadata @@ -1090,9 +1084,7 @@ def __call__( """ - http_options = ( - _BaseDocumentSchemaServiceRestTransport._BaseUpdateDocumentSchema._get_http_options() - ) + http_options = _BaseDocumentSchemaServiceRestTransport._BaseUpdateDocumentSchema._get_http_options() request, metadata = self._interceptor.pre_update_document_schema( request, metadata @@ -1303,9 +1295,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDocumentSchemaServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDocumentSchemaServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDocumentSchemaServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest_base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest_base.py index 9f16d0aa6b6d..781632097c25 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest_base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_schema_service/transports/rest_base.py @@ -17,16 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service from .base import DEFAULT_CLIENT_INFO, DocumentSchemaServiceTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/async_client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/async_client.py index cdfee7533c32..7caa24cadfd9 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/async_client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -44,18 +44,19 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.longrunning.operations_pb2 as operations_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.documentai_v1.types import document as gcd_document -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_service import pagers from google.cloud.contentwarehouse_v1.types import ( + common, document_service, document_service_request, rule_engine, ) -from google.cloud.contentwarehouse_v1.types import common from google.cloud.contentwarehouse_v1.types import document as gcc_document from .client import DocumentServiceClient @@ -130,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DocumentServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DocumentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DocumentServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DocumentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/client.py index 7a780c4b3c42..65ab77fb8633 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -61,18 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.longrunning.operations_pb2 as operations_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.documentai_v1.types import document as gcd_document -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_service import pagers from google.cloud.contentwarehouse_v1.types import ( + common, document_service, document_service_request, rule_engine, ) -from google.cloud.contentwarehouse_v1.types import common from google.cloud.contentwarehouse_v1.types import document as gcc_document from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -89,9 +90,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -672,11 +671,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -711,8 +708,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/pagers.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/pagers.py index 691a7e1c7f73..b9ac1a290081 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/pagers.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/base.py index da57f6f50c7e..735a27928b7d 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1 import gapic_version as package_version +from google.cloud.contentwarehouse_v1.types import document as gcc_document from google.cloud.contentwarehouse_v1.types import ( document_service, document_service_request, ) -from google.cloud.contentwarehouse_v1.types import document as gcc_document DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc.py index 022c89766995..fcd89b2a25f1 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.contentwarehouse_v1.types import document as gcc_document from google.cloud.contentwarehouse_v1.types import ( document_service, document_service_request, ) -from google.cloud.contentwarehouse_v1.types import document as gcc_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc_asyncio.py index 936af6b50277..4859ac9a2562 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/grpc_asyncio.py @@ -17,27 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.contentwarehouse_v1.types import document as gcc_document from google.cloud.contentwarehouse_v1.types import ( document_service, document_service_request, ) -from google.cloud.contentwarehouse_v1.types import document as gcc_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport from .grpc import DocumentServiceGrpcTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest.py index afde5a063bd8..f592a3b3f934 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest.py @@ -16,25 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.contentwarehouse_v1.types import document as gcc_document from google.cloud.contentwarehouse_v1.types import ( document_service, document_service_request, ) -from google.cloud.contentwarehouse_v1.types import document as gcc_document from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentServiceRestTransport @@ -683,9 +683,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -832,9 +830,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -858,7 +854,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1418,9 +1414,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseSearchDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseSearchDocuments._get_http_options() request, metadata = self._interceptor.pre_search_documents( request, metadata @@ -1732,9 +1726,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_transcoded_request( diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest_base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest_base.py index 86ccd3e7a653..f13c17d604c3 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest_base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/document_service/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.contentwarehouse_v1.types import document as gcc_document from google.cloud.contentwarehouse_v1.types import ( document_service, document_service_request, ) -from google.cloud.contentwarehouse_v1.types import document as gcc_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/async_client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/async_client.py index 8264599dfdc5..8137b661b749 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/async_client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.cloud.contentwarehouse_v1.types import pipeline_service, pipelines @@ -120,7 +120,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PipelineServiceAsyncClient: The constructed client. """ - return PipelineServiceClient.from_service_account_info.__func__(PipelineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PipelineServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PipelineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +137,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PipelineServiceAsyncClient: The constructed client. """ - return PipelineServiceClient.from_service_account_file.__func__(PipelineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PipelineServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PipelineServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/client.py index 635b2926f5bf..b766c59cb78c 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.cloud.contentwarehouse_v1.types import pipeline_service, pipelines @@ -81,9 +81,7 @@ class PipelineServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PipelineServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PipelineServiceTransport]] _transport_registry["grpc"] = PipelineServiceGrpcTransport _transport_registry["grpc_asyncio"] = PipelineServiceGrpcAsyncIOTransport _transport_registry["rest"] = PipelineServiceRestTransport @@ -642,11 +640,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PipelineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PipelineServiceClient._read_environment_variables() + ) self._client_cert_source = PipelineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -681,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PipelineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/base.py index e3e45db84ade..1fab48ac4a0c 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version from google.cloud.contentwarehouse_v1.types import pipeline_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc.py index a09e62326674..fdc362786873 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import pipeline_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc_asyncio.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc_asyncio.py index 309e04181b60..fb31a8e09dcf 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import pipeline_service diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/rest.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/rest.py index 6715fb1fde17..8cf1c3a024d4 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/rest.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/pipeline_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -368,7 +368,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/async_client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/async_client.py index e4485b976fd9..19a8836e704e 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/async_client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RuleSetServiceAsyncClient: The constructed client. """ - return RuleSetServiceClient.from_service_account_info.__func__(RuleSetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = RuleSetServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(RuleSetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RuleSetServiceAsyncClient: The constructed client. """ - return RuleSetServiceClient.from_service_account_file.__func__(RuleSetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = RuleSetServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(RuleSetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/client.py index 66321f61f2bd..1e3f98b76fbe 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class RuleSetServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RuleSetServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RuleSetServiceTransport]] _transport_registry["grpc"] = RuleSetServiceGrpcTransport _transport_registry["grpc_asyncio"] = RuleSetServiceGrpcAsyncIOTransport _transport_registry["rest"] = RuleSetServiceRestTransport @@ -661,11 +659,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RuleSetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RuleSetServiceClient._read_environment_variables() + ) self._client_cert_source = RuleSetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -700,8 +696,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RuleSetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/pagers.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/pagers.py index 8206096f76af..bcec4908c73d 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/pagers.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/base.py index 1f9db6ad0361..a1f032810132 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1 import gapic_version as package_version from google.cloud.contentwarehouse_v1.types import rule_engine, ruleset_service_request diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc.py index 935df0f8bf68..15397de8c191 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import rule_engine, ruleset_service_request diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc_asyncio.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc_asyncio.py index 8c7b854d42fb..3f318a28deab 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import rule_engine, ruleset_service_request diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest.py index f200830557c8..7389dac1e660 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -667,7 +667,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest_base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest_base.py index b2bce441f8a6..49445f46a302 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest_base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/rule_set_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.contentwarehouse_v1.types import rule_engine, ruleset_service_request diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/async_client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/async_client.py index 8f1131f1cdf6..8b81018f2e32 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/async_client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -122,7 +122,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SynonymSetServiceAsyncClient: The constructed client. """ - return SynonymSetServiceClient.from_service_account_info.__func__(SynonymSetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SynonymSetServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SynonymSetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +139,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SynonymSetServiceAsyncClient: The constructed client. """ - return SynonymSetServiceClient.from_service_account_file.__func__(SynonymSetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SynonymSetServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SynonymSetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/client.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/client.py index 982c42ae5834..37eb13b8c3bd 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/client.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.contentwarehouse_v1 import gapic_version as package_version @@ -83,9 +83,7 @@ class SynonymSetServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SynonymSetServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SynonymSetServiceTransport]] _transport_registry["grpc"] = SynonymSetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SynonymSetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SynonymSetServiceRestTransport @@ -646,11 +644,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SynonymSetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SynonymSetServiceClient._read_environment_variables() + ) self._client_cert_source = SynonymSetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -685,8 +681,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SynonymSetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/pagers.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/pagers.py index 2b3383c7f1ac..31e089200945 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/pagers.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/base.py index 635f74fcba46..0ffa74f0831c 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.contentwarehouse_v1 import gapic_version as package_version from google.cloud.contentwarehouse_v1.types import ( diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc.py index cba180837760..8d1bb01fb6f0 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import ( synonymset, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc_asyncio.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc_asyncio.py index 973caa7cce9c..9e7068f63034 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.contentwarehouse_v1.types import ( synonymset, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest.py index 6e1c61318287..05411c68ca75 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -512,9 +512,7 @@ def __call__( """ - http_options = ( - _BaseSynonymSetServiceRestTransport._BaseCreateSynonymSet._get_http_options() - ) + http_options = _BaseSynonymSetServiceRestTransport._BaseCreateSynonymSet._get_http_options() request, metadata = self._interceptor.pre_create_synonym_set( request, metadata @@ -661,9 +659,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSynonymSetServiceRestTransport._BaseDeleteSynonymSet._get_http_options() - ) + http_options = _BaseSynonymSetServiceRestTransport._BaseDeleteSynonymSet._get_http_options() request, metadata = self._interceptor.pre_delete_synonym_set( request, metadata @@ -685,7 +681,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -785,9 +781,7 @@ def __call__( """ - http_options = ( - _BaseSynonymSetServiceRestTransport._BaseGetSynonymSet._get_http_options() - ) + http_options = _BaseSynonymSetServiceRestTransport._BaseGetSynonymSet._get_http_options() request, metadata = self._interceptor.pre_get_synonym_set(request, metadata) transcoded_request = _BaseSynonymSetServiceRestTransport._BaseGetSynonymSet._get_transcoded_request( @@ -935,9 +929,7 @@ def __call__( """ - http_options = ( - _BaseSynonymSetServiceRestTransport._BaseListSynonymSets._get_http_options() - ) + http_options = _BaseSynonymSetServiceRestTransport._BaseListSynonymSets._get_http_options() request, metadata = self._interceptor.pre_list_synonym_sets( request, metadata @@ -1100,9 +1092,7 @@ def __call__( """ - http_options = ( - _BaseSynonymSetServiceRestTransport._BaseUpdateSynonymSet._get_http_options() - ) + http_options = _BaseSynonymSetServiceRestTransport._BaseUpdateSynonymSet._get_http_options() request, metadata = self._interceptor.pre_update_synonym_set( request, metadata @@ -1305,9 +1295,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSynonymSetServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSynonymSetServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSynonymSetServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest_base.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest_base.py index ea4900eb4bb4..e921cf8c599f 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest_base.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/services/synonym_set_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.contentwarehouse_v1.types import ( diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/__init__.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/__init__.py index 0dd9c6180b2e..9f2935bb99e0 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/__init__.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/__init__.py @@ -107,7 +107,9 @@ HistogramQueryPropertyNameFilter, HistogramQueryResult, ) -from .pipeline_service import RunPipelineRequest +from .pipeline_service import ( + RunPipelineRequest, +) from .pipelines import ( ExportToCdwPipeline, GcsIngestPipeline, @@ -144,7 +146,9 @@ ListRuleSetsResponse, UpdateRuleSetRequest, ) -from .synonymset import SynonymSet +from .synonymset import ( + SynonymSet, +) from .synonymset_service_request import ( CreateSynonymSetRequest, DeleteSynonymSetRequest, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/common.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/common.py index 5202e7f1f8cc..2b8bb64645c9 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/common.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/common.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -61,6 +61,7 @@ class UpdateType(proto.Enum): merge them based on update mask and merge fields options. """ + UPDATE_TYPE_UNSPECIFIED = 0 UPDATE_TYPE_REPLACE = 1 UPDATE_TYPE_MERGE = 2 @@ -82,6 +83,7 @@ class DatabaseType(proto.Enum): DB_CLOUD_SQL_POSTGRES (2): Cloud Sql with a Postgres Sql instance """ + DB_UNKNOWN = 0 DB_INFRA_SPANNER = 1 DB_CLOUD_SQL_POSTGRES = 2 @@ -104,6 +106,7 @@ class AccessControlMode(proto.Enum): Document level access control using Google Cloud Identity. """ + ACL_MODE_UNKNOWN = 0 ACL_MODE_UNIVERSAL_ACCESS = 1 ACL_MODE_DOCUMENT_LEVEL_ACCESS_CONTROL_BYOID = 2 @@ -127,6 +130,7 @@ class DocumentCreatorDefaultRole(proto.Enum): Document Viewer, same as contentwarehouse.googleapis.com/documentViewer. """ + DOCUMENT_CREATOR_DEFAULT_ROLE_UNSPECIFIED = 0 DOCUMENT_ADMIN = 1 DOCUMENT_EDITOR = 2 diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document.py index 49d00fe320d6..9a3d4011d711 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.cloud.documentai_v1.types import document as gcd_document -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore import proto # type: ignore +from google.cloud.documentai_v1.types import document as gcd_document __protobuf__ = proto.module( package="google.cloud.contentwarehouse.v1", @@ -66,6 +66,7 @@ class RawDocumentFileType(proto.Enum): RAW_DOCUMENT_FILE_TYPE_TIFF (6): TIFF or TIF image file format """ + RAW_DOCUMENT_FILE_TYPE_UNSPECIFIED = 0 RAW_DOCUMENT_FILE_TYPE_PDF = 1 RAW_DOCUMENT_FILE_TYPE_DOCX = 2 @@ -89,6 +90,7 @@ class ContentCategory(proto.Enum): CONTENT_CATEGORY_VIDEO (3): Content is of video type. """ + CONTENT_CATEGORY_UNSPECIFIED = 0 CONTENT_CATEGORY_IMAGE = 1 CONTENT_CATEGORY_AUDIO = 2 diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_link_service.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_link_service.py index b8443e83d868..887bad2b2c97 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_link_service.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_link_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.contentwarehouse_v1.types import common, document @@ -205,6 +205,7 @@ class State(proto.Enum): Target document is deleted, and mark the documentlink as soft-deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SOFT_DELETED = 2 diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema.py index 5ee597bbb7a0..c7725bc9776a 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -201,6 +201,7 @@ class RetrievalImportance(proto.Enum): LOWEST (6): Lowest importance (negative). """ + RETRIEVAL_IMPORTANCE_UNSPECIFIED = 0 HIGHEST = 1 HIGHER = 2 diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema_service.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema_service.py index af1c1f2c867a..583bc8aa587c 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema_service.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_schema_service.py @@ -169,12 +169,12 @@ class ListDocumentSchemasResponse(proto.Message): def raw_page(self): return self - document_schemas: MutableSequence[ - gcc_document_schema.DocumentSchema - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcc_document_schema.DocumentSchema, + document_schemas: MutableSequence[gcc_document_schema.DocumentSchema] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcc_document_schema.DocumentSchema, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service.py index 01b9b229e71b..7f512aff595b 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service.py @@ -17,13 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.longrunning.operations_pb2 as operations_pb2 # type: ignore import proto # type: ignore -from google.cloud.contentwarehouse_v1.types import common +from google.cloud.contentwarehouse_v1.types import common, histogram, rule_engine from google.cloud.contentwarehouse_v1.types import document as gcc_document -from google.cloud.contentwarehouse_v1.types import histogram, rule_engine __protobuf__ = proto.module( package="google.cloud.contentwarehouse.v1", @@ -73,12 +72,12 @@ class CreateDocumentResponse(proto.Message): number=3, message=common.ResponseMetadata, ) - long_running_operations: MutableSequence[ - operations_pb2.Operation - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=operations_pb2.Operation, + long_running_operations: MutableSequence[operations_pb2.Operation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=operations_pb2.Operation, + ) ) @@ -266,12 +265,12 @@ def raw_page(self): number=4, message=common.ResponseMetadata, ) - histogram_query_results: MutableSequence[ - histogram.HistogramQueryResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=histogram.HistogramQueryResult, + histogram_query_results: MutableSequence[histogram.HistogramQueryResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=histogram.HistogramQueryResult, + ) ) question_answer: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service_request.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service_request.py index e5b0f4c62ac5..4fcbbfdf43dc 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service_request.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/document_service_request.py @@ -17,13 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.contentwarehouse_v1.types import common +from google.cloud.contentwarehouse_v1.types import common, filters, histogram from google.cloud.contentwarehouse_v1.types import document as gcc_document -from google.cloud.contentwarehouse_v1.types import filters, histogram __protobuf__ = proto.module( package="google.cloud.contentwarehouse.v1", @@ -58,12 +57,12 @@ class CloudAIDocumentOption(proto.Message): proto.BOOL, number=1, ) - customized_entities_properties_conversions: MutableMapping[ - str, str - ] = proto.MapField( - proto.STRING, - proto.STRING, - number=2, + customized_entities_properties_conversions: MutableMapping[str, str] = ( + proto.MapField( + proto.STRING, + proto.STRING, + number=2, + ) ) @@ -363,6 +362,7 @@ class TotalResultSize(proto.Enum): It may adversely impact performance. The limit is 1000,000. """ + TOTAL_RESULT_SIZE_UNSPECIFIED = 0 ESTIMATED_SIZE = 1 ACTUAL_SIZE = 2 diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/filters.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/filters.py index 63b485b8f556..bc0f2c14db8b 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/filters.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/filters.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.type import interval_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -261,6 +261,7 @@ class TimeField(proto.Enum): DISPOSITION_TIME (3): Time when document becomes mutable again. """ + TIME_FIELD_UNSPECIFIED = 0 CREATE_TIME = 1 UPDATE_TIME = 2 @@ -370,6 +371,7 @@ class FileType(proto.Enum): ROOT_FOLDER (4): Returns only root folders """ + FILE_TYPE_UNSPECIFIED = 0 ALL = 1 FOLDER = 2 @@ -393,12 +395,12 @@ class CustomWeightsMetadata(proto.Message): relevance boosting. """ - weighted_schema_properties: MutableSequence[ - "WeightedSchemaProperty" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="WeightedSchemaProperty", + weighted_schema_properties: MutableSequence["WeightedSchemaProperty"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="WeightedSchemaProperty", + ) ) diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/histogram.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/histogram.py index 050a84c33719..ae9e63da1473 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/histogram.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/histogram.py @@ -109,6 +109,7 @@ class HistogramYAxis(proto.Enum): HISTOGRAM_YAXIS_PROPERTY (1): Count the properties per property name. """ + HISTOGRAM_YAXIS_DOCUMENT = 0 HISTOGRAM_YAXIS_PROPERTY = 1 diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/pipelines.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/pipelines.py index a9e117f5dedb..55a1d8db7abb 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/pipelines.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/pipelines.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.iam.v1 import policy_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.contentwarehouse_v1.types import common @@ -197,12 +197,12 @@ class IndividualDocumentStatus(proto.Message): message=ProcessWithDocAiPipelineMetadata, ) ) - individual_document_statuses: MutableSequence[ - IndividualDocumentStatus - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=IndividualDocumentStatus, + individual_document_statuses: MutableSequence[IndividualDocumentStatus] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=IndividualDocumentStatus, + ) ) diff --git a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/rule_engine.py b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/rule_engine.py index 05f334f39a99..c44e833b9fe8 100644 --- a/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/rule_engine.py +++ b/packages/google-cloud-contentwarehouse/google/cloud/contentwarehouse_v1/types/rule_engine.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.iam.v1 import policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -118,6 +118,7 @@ class TriggerType(proto.Enum): ON_DELETE_LINK (8): Trigger for delete link action. """ + UNKNOWN = 0 ON_CREATE = 1 ON_UPDATE = 4 @@ -271,6 +272,7 @@ class OperationType(proto.Enum): Replaces existing policy bindings with the given policy binding list """ + UNKNOWN = 0 ADD_POLICY_BINDING = 1 REMOVE_POLICY_BINDING = 2 @@ -561,6 +563,7 @@ class State(proto.Enum): ACTION_PENDING (4): State indicating action is pending. """ + UNKNOWN = 0 ACTION_SUCCEEDED = 1 ACTION_FAILED = 2 diff --git a/packages/google-cloud-contentwarehouse/noxfile.py b/packages/google-cloud-contentwarehouse/noxfile.py index 9e436274e63b..ba6ff9b41f4b 100644 --- a/packages/google-cloud-contentwarehouse/noxfile.py +++ b/packages/google-cloud-contentwarehouse/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_link_service.py b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_link_service.py index ab20d7044dcc..f7ab51c0d3e7 100644 --- a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_link_service.py +++ b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_link_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_link_service import ( DocumentLinkServiceAsyncClient, @@ -998,10 +1003,9 @@ def test_document_link_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1050,9 @@ def test_document_link_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1088,9 @@ def test_document_link_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1344,13 +1346,13 @@ def test_document_link_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1464,9 +1466,9 @@ def test_list_linked_targets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_linked_targets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_linked_targets] = ( + mock_rpc + ) request = {} client.list_linked_targets(request) @@ -1808,9 +1810,9 @@ def test_list_linked_sources_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_linked_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_linked_sources] = ( + mock_rpc + ) request = {} client.list_linked_sources(request) @@ -2356,9 +2358,9 @@ def test_create_document_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_document_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_document_link] = ( + mock_rpc + ) request = {} client.create_document_link(request) @@ -2709,9 +2711,9 @@ def test_delete_document_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_document_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_document_link] = ( + mock_rpc + ) request = {} client.delete_document_link(request) @@ -2974,9 +2976,9 @@ def test_list_linked_targets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_linked_targets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_linked_targets] = ( + mock_rpc + ) request = {} client.list_linked_targets(request) @@ -3161,9 +3163,9 @@ def test_list_linked_sources_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_linked_sources - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_linked_sources] = ( + mock_rpc + ) request = {} client.list_linked_sources(request) @@ -3413,9 +3415,9 @@ def test_create_document_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_document_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_document_link] = ( + mock_rpc + ) request = {} client.create_document_link(request) @@ -3608,9 +3610,9 @@ def test_delete_document_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_document_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_document_link] = ( + mock_rpc + ) request = {} client.delete_document_link(request) @@ -4109,8 +4111,9 @@ def test_list_linked_targets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4175,18 +4178,20 @@ def test_list_linked_targets_rest_interceptors(null_interceptor): ) client = DocumentLinkServiceClient(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.DocumentLinkServiceRestInterceptor, "post_list_linked_targets" - ) as post, mock.patch.object( - transports.DocumentLinkServiceRestInterceptor, - "post_list_linked_targets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentLinkServiceRestInterceptor, "pre_list_linked_targets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentLinkServiceRestInterceptor, "post_list_linked_targets" + ) as post, + mock.patch.object( + transports.DocumentLinkServiceRestInterceptor, + "post_list_linked_targets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentLinkServiceRestInterceptor, "pre_list_linked_targets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4244,8 +4249,9 @@ def test_list_linked_sources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4308,18 +4314,20 @@ def test_list_linked_sources_rest_interceptors(null_interceptor): ) client = DocumentLinkServiceClient(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.DocumentLinkServiceRestInterceptor, "post_list_linked_sources" - ) as post, mock.patch.object( - transports.DocumentLinkServiceRestInterceptor, - "post_list_linked_sources_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentLinkServiceRestInterceptor, "pre_list_linked_sources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentLinkServiceRestInterceptor, "post_list_linked_sources" + ) as post, + mock.patch.object( + transports.DocumentLinkServiceRestInterceptor, + "post_list_linked_sources_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentLinkServiceRestInterceptor, "pre_list_linked_sources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4377,8 +4385,9 @@ def test_create_document_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4445,18 +4454,20 @@ def test_create_document_link_rest_interceptors(null_interceptor): ) client = DocumentLinkServiceClient(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.DocumentLinkServiceRestInterceptor, "post_create_document_link" - ) as post, mock.patch.object( - transports.DocumentLinkServiceRestInterceptor, - "post_create_document_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentLinkServiceRestInterceptor, "pre_create_document_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentLinkServiceRestInterceptor, "post_create_document_link" + ) as post, + mock.patch.object( + transports.DocumentLinkServiceRestInterceptor, + "post_create_document_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentLinkServiceRestInterceptor, "pre_create_document_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4513,8 +4524,9 @@ def test_delete_document_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4573,13 +4585,13 @@ def test_delete_document_link_rest_interceptors(null_interceptor): ) client = DocumentLinkServiceClient(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.DocumentLinkServiceRestInterceptor, "pre_delete_document_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentLinkServiceRestInterceptor, "pre_delete_document_link" + ) as pre, + ): pre.assert_not_called() pb_message = document_link_service.DeleteDocumentLinkRequest.pb( document_link_service.DeleteDocumentLinkRequest() @@ -4626,8 +4638,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4827,11 +4840,14 @@ def test_document_link_service_base_transport(): def test_document_link_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.contentwarehouse_v1.services.document_link_service.transports.DocumentLinkServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.contentwarehouse_v1.services.document_link_service.transports.DocumentLinkServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentLinkServiceTransport( @@ -4848,9 +4864,12 @@ def test_document_link_service_base_transport_with_credentials_file(): def test_document_link_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.contentwarehouse_v1.services.document_link_service.transports.DocumentLinkServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.contentwarehouse_v1.services.document_link_service.transports.DocumentLinkServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentLinkServiceTransport() @@ -4922,11 +4941,12 @@ def test_document_link_service_transport_auth_gdch_credentials(transport_class): def test_document_link_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_schema_service.py b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_schema_service.py index 6c838622ee39..86930177469c 100644 --- a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_schema_service.py +++ b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_schema_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_schema_service import ( DocumentSchemaServiceAsyncClient, @@ -60,11 +65,13 @@ pagers, transports, ) +from google.cloud.contentwarehouse_v1.types import ( + document_schema, + document_schema_service, +) from google.cloud.contentwarehouse_v1.types import ( document_schema as gcc_document_schema, ) -from google.cloud.contentwarehouse_v1.types import document_schema -from google.cloud.contentwarehouse_v1.types import document_schema_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1000,10 +1007,9 @@ def test_document_schema_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1048,10 +1054,9 @@ def test_document_schema_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1087,10 +1092,9 @@ def test_document_schema_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1346,13 +1350,13 @@ def test_document_schema_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1472,9 +1476,9 @@ def test_create_document_schema_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_document_schema] = ( + mock_rpc + ) request = {} client.create_document_schema(request) @@ -1837,9 +1841,9 @@ def test_update_document_schema_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_document_schema] = ( + mock_rpc + ) request = {} client.update_document_schema(request) @@ -2201,9 +2205,9 @@ def test_get_document_schema_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_document_schema] = ( + mock_rpc + ) request = {} client.get_document_schema(request) @@ -2547,9 +2551,9 @@ def test_delete_document_schema_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_document_schema] = ( + mock_rpc + ) request = {} client.delete_document_schema(request) @@ -2883,9 +2887,9 @@ def test_list_document_schemas_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_document_schemas - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_document_schemas] = ( + mock_rpc + ) request = {} client.list_document_schemas(request) @@ -3360,9 +3364,9 @@ def test_create_document_schema_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_document_schema] = ( + mock_rpc + ) request = {} client.create_document_schema(request) @@ -3554,9 +3558,9 @@ def test_update_document_schema_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_document_schema] = ( + mock_rpc + ) request = {} client.update_document_schema(request) @@ -3749,9 +3753,9 @@ def test_get_document_schema_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_document_schema] = ( + mock_rpc + ) request = {} client.get_document_schema(request) @@ -3934,9 +3938,9 @@ def test_delete_document_schema_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_document_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_document_schema] = ( + mock_rpc + ) request = {} client.delete_document_schema(request) @@ -4114,9 +4118,9 @@ def test_list_document_schemas_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_document_schemas - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_document_schemas] = ( + mock_rpc + ) request = {} client.list_document_schemas(request) @@ -4759,8 +4763,9 @@ def test_create_document_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4935,18 +4940,22 @@ def test_create_document_schema_rest_interceptors(null_interceptor): ) client = DocumentSchemaServiceClient(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.DocumentSchemaServiceRestInterceptor, "post_create_document_schema" - ) as post, mock.patch.object( - transports.DocumentSchemaServiceRestInterceptor, - "post_create_document_schema_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentSchemaServiceRestInterceptor, "pre_create_document_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, + "post_create_document_schema", + ) as post, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, + "post_create_document_schema_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, + "pre_create_document_schema", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5003,8 +5012,9 @@ def test_update_document_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5075,18 +5085,22 @@ def test_update_document_schema_rest_interceptors(null_interceptor): ) client = DocumentSchemaServiceClient(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.DocumentSchemaServiceRestInterceptor, "post_update_document_schema" - ) as post, mock.patch.object( - transports.DocumentSchemaServiceRestInterceptor, - "post_update_document_schema_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentSchemaServiceRestInterceptor, "pre_update_document_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, + "post_update_document_schema", + ) as post, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, + "post_update_document_schema_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, + "pre_update_document_schema", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5143,8 +5157,9 @@ def test_get_document_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5215,18 +5230,20 @@ def test_get_document_schema_rest_interceptors(null_interceptor): ) client = DocumentSchemaServiceClient(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.DocumentSchemaServiceRestInterceptor, "post_get_document_schema" - ) as post, mock.patch.object( - transports.DocumentSchemaServiceRestInterceptor, - "post_get_document_schema_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentSchemaServiceRestInterceptor, "pre_get_document_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, "post_get_document_schema" + ) as post, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, + "post_get_document_schema_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, "pre_get_document_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5283,8 +5300,9 @@ def test_delete_document_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5343,13 +5361,14 @@ def test_delete_document_schema_rest_interceptors(null_interceptor): ) client = DocumentSchemaServiceClient(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.DocumentSchemaServiceRestInterceptor, "pre_delete_document_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, + "pre_delete_document_schema", + ) as pre, + ): pre.assert_not_called() pb_message = document_schema_service.DeleteDocumentSchemaRequest.pb( document_schema_service.DeleteDocumentSchemaRequest() @@ -5394,8 +5413,9 @@ def test_list_document_schemas_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5460,18 +5480,21 @@ def test_list_document_schemas_rest_interceptors(null_interceptor): ) client = DocumentSchemaServiceClient(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.DocumentSchemaServiceRestInterceptor, "post_list_document_schemas" - ) as post, mock.patch.object( - transports.DocumentSchemaServiceRestInterceptor, - "post_list_document_schemas_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentSchemaServiceRestInterceptor, "pre_list_document_schemas" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, + "post_list_document_schemas", + ) as post, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, + "post_list_document_schemas_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentSchemaServiceRestInterceptor, "pre_list_document_schemas" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5531,8 +5554,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5755,11 +5779,14 @@ def test_document_schema_service_base_transport(): def test_document_schema_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.contentwarehouse_v1.services.document_schema_service.transports.DocumentSchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.contentwarehouse_v1.services.document_schema_service.transports.DocumentSchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentSchemaServiceTransport( @@ -5776,9 +5803,12 @@ def test_document_schema_service_base_transport_with_credentials_file(): def test_document_schema_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.contentwarehouse_v1.services.document_schema_service.transports.DocumentSchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.contentwarehouse_v1.services.document_schema_service.transports.DocumentSchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentSchemaServiceTransport() @@ -5852,11 +5882,12 @@ def test_document_schema_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_service.py b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_service.py index 3875e8e6aab8..a58768baebc3 100644 --- a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_service.py +++ b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_document_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,32 +43,37 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.longrunning.operations_pb2 as operations_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.color_pb2 as color_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.documentai_v1.types import barcode +from google.cloud.documentai_v1.types import barcode, document, geometry from google.cloud.documentai_v1.types import document as gcd_document -from google.cloud.documentai_v1.types import geometry -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import color_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore -from google.type import money_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.document_service import ( DocumentServiceAsyncClient, @@ -77,13 +82,13 @@ transports, ) from google.cloud.contentwarehouse_v1.types import ( + common, document_service, document_service_request, filters, histogram, rule_engine, ) -from google.cloud.contentwarehouse_v1.types import common from google.cloud.contentwarehouse_v1.types import document as gcc_document CRED_INFO_JSON = { @@ -995,10 +1000,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1047,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1085,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1328,13 +1330,13 @@ def test_document_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2809,9 +2811,9 @@ def test_search_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_documents] = ( + mock_rpc + ) request = {} client.search_documents(request) @@ -5045,9 +5047,9 @@ def test_search_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_documents] = ( + mock_rpc + ) request = {} client.search_documents(request) @@ -6364,8 +6366,9 @@ def test_create_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6425,17 +6428,20 @@ def test_create_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_create_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_create_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_create_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_create_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_create_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_create_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6493,8 +6499,9 @@ def test_get_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6592,17 +6599,19 @@ def test_get_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_get_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_get_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_get_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6655,8 +6664,9 @@ def test_update_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6716,17 +6726,20 @@ def test_update_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_update_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_update_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_update_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_update_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_update_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_update_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6784,8 +6797,9 @@ def test_delete_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6842,13 +6856,13 @@ def test_delete_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "pre_delete_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_delete_document" + ) as pre, + ): pre.assert_not_called() pb_message = document_service_request.DeleteDocumentRequest.pb( document_service_request.DeleteDocumentRequest() @@ -6893,8 +6907,9 @@ def test_search_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6961,17 +6976,20 @@ def test_search_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_search_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_search_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_search_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_search_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_search_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_search_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7029,8 +7047,9 @@ def test_lock_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7128,17 +7147,20 @@ def test_lock_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_lock_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_lock_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_lock_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_lock_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_lock_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_lock_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7191,8 +7213,9 @@ def test_fetch_acl_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7252,17 +7275,19 @@ def test_fetch_acl_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_fetch_acl" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_fetch_acl_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_fetch_acl" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_fetch_acl" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_fetch_acl_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_fetch_acl" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7315,8 +7340,9 @@ def test_set_acl_rest_bad_request(request_type=document_service_request.SetAclRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7376,17 +7402,19 @@ def test_set_acl_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_set_acl" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_set_acl_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_set_acl" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_set_acl" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_set_acl_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_set_acl" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7443,8 +7471,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7720,11 +7749,14 @@ def test_document_service_base_transport(): def test_document_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.contentwarehouse_v1.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.contentwarehouse_v1.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport( @@ -7741,9 +7773,12 @@ def test_document_service_base_transport_with_credentials_file(): def test_document_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.contentwarehouse_v1.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.contentwarehouse_v1.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport() @@ -7815,11 +7850,12 @@ def test_document_service_transport_auth_gdch_credentials(transport_class): def test_document_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_pipeline_service.py b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_pipeline_service.py index d32810869e24..565d3ef2555a 100644 --- a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_pipeline_service.py +++ b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_pipeline_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.type import expr_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.pipeline_service import ( PipelineServiceAsyncClient, @@ -980,10 +980,9 @@ def test_pipeline_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1027,9 @@ def test_pipeline_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1067,10 +1065,9 @@ def test_pipeline_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1313,13 +1310,13 @@ def test_pipeline_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2029,8 +2026,9 @@ def test_run_pipeline_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2087,19 +2085,20 @@ def test_run_pipeline_rest_interceptors(null_interceptor): ) client = PipelineServiceClient(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.PipelineServiceRestInterceptor, "post_run_pipeline" - ) as post, mock.patch.object( - transports.PipelineServiceRestInterceptor, "post_run_pipeline_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PipelineServiceRestInterceptor, "pre_run_pipeline" - ) as pre: + 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.PipelineServiceRestInterceptor, "post_run_pipeline" + ) as post, + mock.patch.object( + transports.PipelineServiceRestInterceptor, "post_run_pipeline_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PipelineServiceRestInterceptor, "pre_run_pipeline" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2154,8 +2153,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2306,11 +2306,14 @@ def test_pipeline_service_base_transport(): def test_pipeline_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.contentwarehouse_v1.services.pipeline_service.transports.PipelineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.contentwarehouse_v1.services.pipeline_service.transports.PipelineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PipelineServiceTransport( @@ -2327,9 +2330,12 @@ def test_pipeline_service_base_transport_with_credentials_file(): def test_pipeline_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.contentwarehouse_v1.services.pipeline_service.transports.PipelineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.contentwarehouse_v1.services.pipeline_service.transports.PipelineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PipelineServiceTransport() @@ -2401,11 +2407,12 @@ def test_pipeline_service_transport_auth_gdch_credentials(transport_class): def test_pipeline_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_rule_set_service.py b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_rule_set_service.py index 8b4a8f92efa6..5ae8c537a98c 100644 --- a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_rule_set_service.py +++ b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_rule_set_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.type import expr_pb2 # type: ignore from google.cloud.contentwarehouse_v1.services.rule_set_service import ( RuleSetServiceAsyncClient, @@ -952,10 +957,9 @@ def test_rule_set_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +1004,9 @@ def test_rule_set_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1042,9 @@ def test_rule_set_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1285,13 +1287,13 @@ def test_rule_set_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4509,8 +4511,9 @@ def test_create_rule_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4709,17 +4712,20 @@ def test_create_rule_set_rest_interceptors(null_interceptor): ) client = RuleSetServiceClient(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.RuleSetServiceRestInterceptor, "post_create_rule_set" - ) as post, mock.patch.object( - transports.RuleSetServiceRestInterceptor, "post_create_rule_set_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleSetServiceRestInterceptor, "pre_create_rule_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, "post_create_rule_set" + ) as post, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, + "post_create_rule_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, "pre_create_rule_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4772,8 +4778,9 @@ def test_get_rule_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4840,17 +4847,19 @@ def test_get_rule_set_rest_interceptors(null_interceptor): ) client = RuleSetServiceClient(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.RuleSetServiceRestInterceptor, "post_get_rule_set" - ) as post, mock.patch.object( - transports.RuleSetServiceRestInterceptor, "post_get_rule_set_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleSetServiceRestInterceptor, "pre_get_rule_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, "post_get_rule_set" + ) as post, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, "post_get_rule_set_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, "pre_get_rule_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4903,8 +4912,9 @@ def test_update_rule_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4971,17 +4981,20 @@ def test_update_rule_set_rest_interceptors(null_interceptor): ) client = RuleSetServiceClient(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.RuleSetServiceRestInterceptor, "post_update_rule_set" - ) as post, mock.patch.object( - transports.RuleSetServiceRestInterceptor, "post_update_rule_set_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleSetServiceRestInterceptor, "pre_update_rule_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, "post_update_rule_set" + ) as post, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, + "post_update_rule_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, "pre_update_rule_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5034,8 +5047,9 @@ def test_delete_rule_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5092,13 +5106,13 @@ def test_delete_rule_set_rest_interceptors(null_interceptor): ) client = RuleSetServiceClient(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.RuleSetServiceRestInterceptor, "pre_delete_rule_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, "pre_delete_rule_set" + ) as pre, + ): pre.assert_not_called() pb_message = ruleset_service_request.DeleteRuleSetRequest.pb( ruleset_service_request.DeleteRuleSetRequest() @@ -5143,8 +5157,9 @@ def test_list_rule_sets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5207,17 +5222,20 @@ def test_list_rule_sets_rest_interceptors(null_interceptor): ) client = RuleSetServiceClient(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.RuleSetServiceRestInterceptor, "post_list_rule_sets" - ) as post, mock.patch.object( - transports.RuleSetServiceRestInterceptor, "post_list_rule_sets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RuleSetServiceRestInterceptor, "pre_list_rule_sets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, "post_list_rule_sets" + ) as post, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, + "post_list_rule_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RuleSetServiceRestInterceptor, "pre_list_rule_sets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5277,8 +5295,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5491,11 +5510,14 @@ def test_rule_set_service_base_transport(): def test_rule_set_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.contentwarehouse_v1.services.rule_set_service.transports.RuleSetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.contentwarehouse_v1.services.rule_set_service.transports.RuleSetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RuleSetServiceTransport( @@ -5512,9 +5534,12 @@ def test_rule_set_service_base_transport_with_credentials_file(): def test_rule_set_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.contentwarehouse_v1.services.rule_set_service.transports.RuleSetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.contentwarehouse_v1.services.rule_set_service.transports.RuleSetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RuleSetServiceTransport() @@ -5586,11 +5611,12 @@ def test_rule_set_service_transport_auth_gdch_credentials(transport_class): def test_rule_set_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_synonym_set_service.py b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_synonym_set_service.py index 879f13df704a..e517fb4d1a41 100644 --- a/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_synonym_set_service.py +++ b/packages/google-cloud-contentwarehouse/tests/unit/gapic/contentwarehouse_v1/test_synonym_set_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -982,10 +987,9 @@ def test_synonym_set_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1034,9 @@ def test_synonym_set_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1072,9 @@ def test_synonym_set_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1320,13 +1322,13 @@ def test_synonym_set_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1441,9 +1443,9 @@ def test_create_synonym_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_synonym_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_synonym_set] = ( + mock_rpc + ) request = {} client.create_synonym_set(request) @@ -2125,9 +2127,9 @@ def test_update_synonym_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_synonym_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_synonym_set] = ( + mock_rpc + ) request = {} client.update_synonym_set(request) @@ -2476,9 +2478,9 @@ def test_delete_synonym_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_synonym_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_synonym_set] = ( + mock_rpc + ) request = {} client.delete_synonym_set(request) @@ -2809,9 +2811,9 @@ def test_list_synonym_sets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_synonym_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_synonym_sets] = ( + mock_rpc + ) request = {} client.list_synonym_sets(request) @@ -3285,9 +3287,9 @@ def test_create_synonym_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_synonym_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_synonym_set] = ( + mock_rpc + ) request = {} client.create_synonym_set(request) @@ -3658,9 +3660,9 @@ def test_update_synonym_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_synonym_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_synonym_set] = ( + mock_rpc + ) request = {} client.update_synonym_set(request) @@ -3853,9 +3855,9 @@ def test_delete_synonym_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_synonym_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_synonym_set] = ( + mock_rpc + ) request = {} client.delete_synonym_set(request) @@ -4030,9 +4032,9 @@ def test_list_synonym_sets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_synonym_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_synonym_sets] = ( + mock_rpc + ) request = {} client.list_synonym_sets(request) @@ -4665,8 +4667,9 @@ def test_create_synonym_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4805,18 +4808,20 @@ def test_create_synonym_set_rest_interceptors(null_interceptor): ) client = SynonymSetServiceClient(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.SynonymSetServiceRestInterceptor, "post_create_synonym_set" - ) as post, mock.patch.object( - transports.SynonymSetServiceRestInterceptor, - "post_create_synonym_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SynonymSetServiceRestInterceptor, "pre_create_synonym_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, "post_create_synonym_set" + ) as post, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, + "post_create_synonym_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, "pre_create_synonym_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4869,8 +4874,9 @@ def test_get_synonym_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4935,18 +4941,20 @@ def test_get_synonym_set_rest_interceptors(null_interceptor): ) client = SynonymSetServiceClient(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.SynonymSetServiceRestInterceptor, "post_get_synonym_set" - ) as post, mock.patch.object( - transports.SynonymSetServiceRestInterceptor, - "post_get_synonym_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SynonymSetServiceRestInterceptor, "pre_get_synonym_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, "post_get_synonym_set" + ) as post, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, + "post_get_synonym_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, "pre_get_synonym_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4999,8 +5007,9 @@ def test_update_synonym_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5139,18 +5148,20 @@ def test_update_synonym_set_rest_interceptors(null_interceptor): ) client = SynonymSetServiceClient(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.SynonymSetServiceRestInterceptor, "post_update_synonym_set" - ) as post, mock.patch.object( - transports.SynonymSetServiceRestInterceptor, - "post_update_synonym_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SynonymSetServiceRestInterceptor, "pre_update_synonym_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, "post_update_synonym_set" + ) as post, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, + "post_update_synonym_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, "pre_update_synonym_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5203,8 +5214,9 @@ def test_delete_synonym_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5261,13 +5273,13 @@ def test_delete_synonym_set_rest_interceptors(null_interceptor): ) client = SynonymSetServiceClient(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.SynonymSetServiceRestInterceptor, "pre_delete_synonym_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, "pre_delete_synonym_set" + ) as pre, + ): pre.assert_not_called() pb_message = synonymset_service_request.DeleteSynonymSetRequest.pb( synonymset_service_request.DeleteSynonymSetRequest() @@ -5312,8 +5324,9 @@ def test_list_synonym_sets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5378,18 +5391,20 @@ def test_list_synonym_sets_rest_interceptors(null_interceptor): ) client = SynonymSetServiceClient(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.SynonymSetServiceRestInterceptor, "post_list_synonym_sets" - ) as post, mock.patch.object( - transports.SynonymSetServiceRestInterceptor, - "post_list_synonym_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SynonymSetServiceRestInterceptor, "pre_list_synonym_sets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, "post_list_synonym_sets" + ) as post, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, + "post_list_synonym_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SynonymSetServiceRestInterceptor, "pre_list_synonym_sets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5449,8 +5464,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5671,11 +5687,14 @@ def test_synonym_set_service_base_transport(): def test_synonym_set_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.contentwarehouse_v1.services.synonym_set_service.transports.SynonymSetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.contentwarehouse_v1.services.synonym_set_service.transports.SynonymSetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SynonymSetServiceTransport( @@ -5692,9 +5711,12 @@ def test_synonym_set_service_base_transport_with_credentials_file(): def test_synonym_set_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.contentwarehouse_v1.services.synonym_set_service.transports.SynonymSetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.contentwarehouse_v1.services.synonym_set_service.transports.SynonymSetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SynonymSetServiceTransport() @@ -5766,11 +5788,12 @@ def test_synonym_set_service_transport_auth_gdch_credentials(transport_class): def test_synonym_set_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-data-fusion/docs/conf.py b/packages/google-cloud-data-fusion/docs/conf.py index a85a42e535f2..1eefa4a4bb39 100644 --- a/packages/google-cloud-data-fusion/docs/conf.py +++ b/packages/google-cloud-data-fusion/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-data-fusion documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/__init__.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/__init__.py index 2b048c229179..e49e3ed4823b 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/__init__.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_fusion import DataFusionAsyncClient, DataFusionClient from .types.datafusion import ( Accelerator, diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/async_client.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/async_client.py index 076a03282786..8587f54592b3 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/async_client.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.data_fusion_v1 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.data_fusion_v1.services.data_fusion import pagers from google.cloud.data_fusion_v1.types import datafusion @@ -118,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataFusionAsyncClient: The constructed client. """ - return DataFusionClient.from_service_account_info.__func__(DataFusionAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataFusionClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataFusionAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +135,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataFusionAsyncClient: The constructed client. """ - return DataFusionClient.from_service_account_file.__func__(DataFusionAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataFusionClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataFusionAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/client.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/client.py index c37504337f6f..8add7c61eded 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/client.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.data_fusion_v1 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.data_fusion_v1.services.data_fusion import pagers from google.cloud.data_fusion_v1.types import datafusion @@ -651,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataFusionClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataFusionClient._read_environment_variables() + ) self._client_cert_source = DataFusionClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -690,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataFusionTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/pagers.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/pagers.py index 8630f2395c7e..e2039b696673 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/pagers.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py index b1c3607e7c1b..1fd204cf3e15 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.data_fusion_v1 import gapic_version as package_version from google.cloud.data_fusion_v1.types import datafusion diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py index d37775293fd7..3a281ce3e74d 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.data_fusion_v1.types import datafusion diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py index bca45e95e51c..313603d506ab 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.data_fusion_v1.types import datafusion diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/rest.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/rest.py index cfdf2ccf8d9d..a25aa3df9635 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/rest.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -705,7 +705,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -854,7 +854,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1126,9 +1126,7 @@ def __call__( """ - http_options = ( - _BaseDataFusionRestTransport._BaseListAvailableVersions._get_http_options() - ) + http_options = _BaseDataFusionRestTransport._BaseListAvailableVersions._get_http_options() request, metadata = self._interceptor.pre_list_available_versions( request, metadata @@ -1460,7 +1458,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1619,7 +1617,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/types/datafusion.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/types/datafusion.py index 9ecf753f2c8c..f29b334daa5c 100644 --- a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/types/datafusion.py +++ b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/types/datafusion.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -111,6 +111,7 @@ class Type(proto.Enum): TYPE_GENERAL_AVAILABILITY (2): Version is available for public use """ + TYPE_UNSPECIFIED = 0 TYPE_PREVIEW = 1 TYPE_GENERAL_AVAILABILITY = 2 @@ -164,6 +165,7 @@ class AcceleratorType(proto.Enum): export pipelines custom built to streamline CCAI Insights processing. """ + ACCELERATOR_TYPE_UNSPECIFIED = 0 CDC = 1 HEALTHCARE = 2 @@ -186,6 +188,7 @@ class State(proto.Enum): unknown. Requests for enable, disable could be retried while in this state """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -347,6 +350,7 @@ class Type(proto.Enum): help enterprises design and develop their data ingestion and integration pipelines at low cost. """ + TYPE_UNSPECIFIED = 0 BASIC = 1 ENTERPRISE = 2 @@ -381,6 +385,7 @@ class State(proto.Enum): DISABLED (10): Instance is disabled """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -404,6 +409,7 @@ class DisabledReason(proto.Enum): The KMS key used by the instance is either revoked or denied access to """ + DISABLED_REASON_UNSPECIFIED = 0 KMS_KEY_ISSUE = 1 diff --git a/packages/google-cloud-data-fusion/noxfile.py b/packages/google-cloud-data-fusion/noxfile.py index f14d82990c52..c7f7e7dd87f9 100644 --- a/packages/google-cloud-data-fusion/noxfile.py +++ b/packages/google-cloud-data-fusion/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-data-fusion/tests/unit/gapic/data_fusion_v1/test_data_fusion.py b/packages/google-cloud-data-fusion/tests/unit/gapic/data_fusion_v1/test_data_fusion.py index 24d8d6b9e772..998c4619a142 100644 --- a/packages/google-cloud-data-fusion/tests/unit/gapic/data_fusion_v1/test_data_fusion.py +++ b/packages/google-cloud-data-fusion/tests/unit/gapic/data_fusion_v1/test_data_fusion.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.data_fusion_v1.services.data_fusion import ( DataFusionAsyncClient, @@ -931,10 +931,9 @@ def test_data_fusion_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +978,9 @@ def test_data_fusion_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1016,9 @@ def test_data_fusion_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1250,13 +1247,13 @@ def test_data_fusion_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3680,9 +3677,9 @@ def test_restart_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -5007,9 +5004,9 @@ def test_restart_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_instance] = ( + mock_rpc + ) request = {} client.restart_instance(request) @@ -5600,8 +5597,9 @@ def test_list_available_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5664,18 +5662,20 @@ def test_list_available_versions_rest_interceptors(null_interceptor): ) client = DataFusionClient(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.DataFusionRestInterceptor, "post_list_available_versions" - ) as post, mock.patch.object( - transports.DataFusionRestInterceptor, - "post_list_available_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataFusionRestInterceptor, "pre_list_available_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataFusionRestInterceptor, "post_list_available_versions" + ) as post, + mock.patch.object( + transports.DataFusionRestInterceptor, + "post_list_available_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataFusionRestInterceptor, "pre_list_available_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5731,8 +5731,9 @@ def test_list_instances_rest_bad_request(request_type=datafusion.ListInstancesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5797,17 +5798,19 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = DataFusionClient(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.DataFusionRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.DataFusionRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataFusionRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataFusionRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.DataFusionRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataFusionRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5860,8 +5863,9 @@ def test_get_instance_rest_bad_request(request_type=datafusion.GetInstanceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5964,17 +5968,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = DataFusionClient(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.DataFusionRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.DataFusionRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataFusionRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataFusionRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.DataFusionRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataFusionRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6025,8 +6031,9 @@ def test_create_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6193,19 +6200,20 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = DataFusionClient(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.DataFusionRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.DataFusionRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataFusionRestInterceptor, "pre_create_instance" - ) as pre: + 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.DataFusionRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.DataFusionRestInterceptor, "post_create_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataFusionRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6258,8 +6266,9 @@ def test_delete_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6316,19 +6325,20 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = DataFusionClient(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.DataFusionRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.DataFusionRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataFusionRestInterceptor, "pre_delete_instance" - ) as pre: + 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.DataFusionRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.DataFusionRestInterceptor, "post_delete_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataFusionRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6383,8 +6393,9 @@ def test_update_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6553,19 +6564,20 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = DataFusionClient(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.DataFusionRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.DataFusionRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataFusionRestInterceptor, "pre_update_instance" - ) as pre: + 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.DataFusionRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.DataFusionRestInterceptor, "post_update_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataFusionRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6618,8 +6630,9 @@ def test_restart_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6676,19 +6689,20 @@ def test_restart_instance_rest_interceptors(null_interceptor): ) client = DataFusionClient(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.DataFusionRestInterceptor, "post_restart_instance" - ) as post, mock.patch.object( - transports.DataFusionRestInterceptor, "post_restart_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataFusionRestInterceptor, "pre_restart_instance" - ) as pre: + 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.DataFusionRestInterceptor, "post_restart_instance" + ) as post, + mock.patch.object( + transports.DataFusionRestInterceptor, "post_restart_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataFusionRestInterceptor, "pre_restart_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6960,11 +6974,14 @@ def test_data_fusion_base_transport(): def test_data_fusion_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.data_fusion_v1.services.data_fusion.transports.DataFusionTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.data_fusion_v1.services.data_fusion.transports.DataFusionTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataFusionTransport( @@ -6981,9 +6998,12 @@ def test_data_fusion_base_transport_with_credentials_file(): def test_data_fusion_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.data_fusion_v1.services.data_fusion.transports.DataFusionTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.data_fusion_v1.services.data_fusion.transports.DataFusionTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataFusionTransport() @@ -7055,11 +7075,12 @@ def test_data_fusion_transport_auth_gdch_credentials(transport_class): def test_data_fusion_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-data-qna/docs/conf.py b/packages/google-cloud-data-qna/docs/conf.py index 96e1bf7e37f4..63c39b856bd7 100644 --- a/packages/google-cloud-data-qna/docs/conf.py +++ b/packages/google-cloud-data-qna/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-data-qna documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/__init__.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/__init__.py index 5da0fd1ededf..c50a1d4b0b19 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/__init__.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.auto_suggestion_service import ( AutoSuggestionServiceAsyncClient, AutoSuggestionServiceClient, diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py index 23766b184736..565231535d92 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataqna_v1alpha import gapic_version as package_version @@ -183,7 +183,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AutoSuggestionServiceAsyncClient: The constructed client. """ - return AutoSuggestionServiceClient.from_service_account_info.__func__(AutoSuggestionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AutoSuggestionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AutoSuggestionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -199,7 +200,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AutoSuggestionServiceAsyncClient: The constructed client. """ - return AutoSuggestionServiceClient.from_service_account_file.__func__(AutoSuggestionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AutoSuggestionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AutoSuggestionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -237,7 +239,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AutoSuggestionServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AutoSuggestionServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AutoSuggestionServiceTransport: diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py index 011d0d9be8ff..8e4c822fa793 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataqna_v1alpha import gapic_version as package_version @@ -77,9 +77,7 @@ class AutoSuggestionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AutoSuggestionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AutoSuggestionServiceTransport]] _transport_registry["grpc"] = AutoSuggestionServiceGrpcTransport _transport_registry["grpc_asyncio"] = AutoSuggestionServiceGrpcAsyncIOTransport _transport_registry["rest"] = AutoSuggestionServiceRestTransport @@ -677,11 +675,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutoSuggestionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutoSuggestionServiceClient._read_environment_variables() + ) self._client_cert_source = AutoSuggestionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -716,8 +712,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutoSuggestionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/__init__.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/__init__.py index aa1b8a2340cf..1d4f163027e7 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/__init__.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AutoSuggestionServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AutoSuggestionServiceTransport]] _transport_registry["grpc"] = AutoSuggestionServiceGrpcTransport _transport_registry["grpc_asyncio"] = AutoSuggestionServiceGrpcAsyncIOTransport _transport_registry["rest"] = AutoSuggestionServiceRestTransport diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/base.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/base.py index 3384fe0331d9..005668481edb 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/base.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataqna_v1alpha import gapic_version as package_version from google.cloud.dataqna_v1alpha.types import auto_suggestion_service diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc.py index dbf95c540193..1cc0449e7792 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataqna_v1alpha.types import auto_suggestion_service diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc_asyncio.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc_asyncio.py index 173fdc074d9d..2ae7173d3cb9 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataqna_v1alpha.types import auto_suggestion_service diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/rest.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/rest.py index 06eba9e4e933..66e85fa23767 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/rest.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -356,9 +356,7 @@ def __call__( Response to SuggestQueries. """ - http_options = ( - _BaseAutoSuggestionServiceRestTransport._BaseSuggestQueries._get_http_options() - ) + http_options = _BaseAutoSuggestionServiceRestTransport._BaseSuggestQueries._get_http_options() request, metadata = self._interceptor.pre_suggest_queries(request, metadata) transcoded_request = _BaseAutoSuggestionServiceRestTransport._BaseSuggestQueries._get_transcoded_request( diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/async_client.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/async_client.py index 15c76a951818..ab777118053b 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/async_client.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataqna_v1alpha import gapic_version as package_version @@ -44,15 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from .client import QuestionServiceClient from .transports.base import DEFAULT_CLIENT_INFO, QuestionServiceTransport @@ -141,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: QuestionServiceAsyncClient: The constructed client. """ - return QuestionServiceClient.from_service_account_info.__func__(QuestionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = QuestionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(QuestionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +156,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: QuestionServiceAsyncClient: The constructed client. """ - return QuestionServiceClient.from_service_account_file.__func__(QuestionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = QuestionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(QuestionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/client.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/client.py index ea20f7543a9b..b3ad137f2fda 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/client.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataqna_v1alpha import gapic_version as package_version @@ -61,15 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from .transports.base import DEFAULT_CLIENT_INFO, QuestionServiceTransport from .transports.grpc import QuestionServiceGrpcTransport @@ -85,9 +83,7 @@ class QuestionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[QuestionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[QuestionServiceTransport]] _transport_registry["grpc"] = QuestionServiceGrpcTransport _transport_registry["grpc_asyncio"] = QuestionServiceGrpcAsyncIOTransport _transport_registry["rest"] = QuestionServiceRestTransport @@ -671,11 +667,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = QuestionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + QuestionServiceClient._read_environment_variables() + ) self._client_cert_source = QuestionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -710,8 +704,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(QuestionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/base.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/base.py index c0d09dc2cc2f..6e2bb8e8783d 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/base.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/base.py @@ -17,20 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataqna_v1alpha import gapic_version as package_version -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc.py index a220a5cd65f2..8c40bee0dfb2 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc.py @@ -16,23 +16,21 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from .base import DEFAULT_CLIENT_INFO, QuestionServiceTransport diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc_asyncio.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc_asyncio.py index 3fae7d0f9c2f..b342353bd45c 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/grpc_asyncio.py @@ -17,25 +17,23 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from .base import DEFAULT_CLIENT_INFO, QuestionServiceTransport from .grpc import QuestionServiceGrpcTransport diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest.py index a0f7afb46eea..6e15c7087d31 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest.py @@ -16,23 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseQuestionServiceRestTransport @@ -528,9 +526,7 @@ def __call__( """ - http_options = ( - _BaseQuestionServiceRestTransport._BaseCreateQuestion._get_http_options() - ) + http_options = _BaseQuestionServiceRestTransport._BaseCreateQuestion._get_http_options() request, metadata = self._interceptor.pre_create_question(request, metadata) transcoded_request = _BaseQuestionServiceRestTransport._BaseCreateQuestion._get_transcoded_request( @@ -683,9 +679,7 @@ def __call__( """ - http_options = ( - _BaseQuestionServiceRestTransport._BaseExecuteQuestion._get_http_options() - ) + http_options = _BaseQuestionServiceRestTransport._BaseExecuteQuestion._get_http_options() request, metadata = self._interceptor.pre_execute_question( request, metadata @@ -984,9 +978,7 @@ def __call__( Feedback provided by a user. """ - http_options = ( - _BaseQuestionServiceRestTransport._BaseGetUserFeedback._get_http_options() - ) + http_options = _BaseQuestionServiceRestTransport._BaseGetUserFeedback._get_http_options() request, metadata = self._interceptor.pre_get_user_feedback( request, metadata @@ -1132,9 +1124,7 @@ def __call__( Feedback provided by a user. """ - http_options = ( - _BaseQuestionServiceRestTransport._BaseUpdateUserFeedback._get_http_options() - ) + http_options = _BaseQuestionServiceRestTransport._BaseUpdateUserFeedback._get_http_options() request, metadata = self._interceptor.pre_update_user_feedback( request, metadata diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest_base.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest_base.py index d68aff1fb291..1a86301ed8de 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest_base.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/services/question_service/transports/rest_base.py @@ -20,11 +20,9 @@ from google.api_core import gapic_v1, path_template from google.protobuf import json_format -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question, question_service, user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from .base import DEFAULT_CLIENT_INFO, QuestionServiceTransport diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/__init__.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/__init__.py index 09f1e57b9bb0..0aaa6654e0a3 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/__init__.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .annotated_string import AnnotatedString +from .annotated_string import ( + AnnotatedString, +) from .auto_suggestion_service import ( Suggestion, SuggestionInfo, @@ -40,7 +42,9 @@ GetUserFeedbackRequest, UpdateUserFeedbackRequest, ) -from .user_feedback import UserFeedback +from .user_feedback import ( + UserFeedback, +) __all__ = ( "AnnotatedString", diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/annotated_string.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/annotated_string.py index a1299cb37ca0..2d5b0a775ae8 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/annotated_string.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/annotated_string.py @@ -89,6 +89,7 @@ class SemanticMarkupType(proto.Enum): Markup for a substring that contains terms for row. """ + MARKUP_TYPE_UNSPECIFIED = 0 METRIC = 1 DIMENSION = 2 diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/auto_suggestion_service.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/auto_suggestion_service.py index df52385b6699..d5e758844a8b 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/auto_suggestion_service.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/auto_suggestion_service.py @@ -46,6 +46,7 @@ class SuggestionType(proto.Enum): Template suggestion type. Suggestions are for full sentences. """ + SUGGESTION_TYPE_UNSPECIFIED = 0 ENTITY = 1 TEMPLATE = 2 diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question.py index 010a4f8b076d..a5d2496e3da9 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.dataqna_v1alpha.types import annotated_string @@ -52,6 +52,7 @@ class InterpretEntity(proto.Enum): METRIC (2): A metric entity. """ + INTERPRET_ENTITY_UNSPECIFIED = 0 DIMENSION = 1 METRIC = 2 @@ -195,6 +196,7 @@ class InterpretErrorCode(proto.Enum): answer. For example, because a requested operation is not supported. """ + INTERPRET_ERROR_CODE_UNSPECIFIED = 0 INVALID_QUERY = 1 FAILED_TO_UNDERSTAND = 2 @@ -321,6 +323,7 @@ class JobExecutionState(proto.Enum): FAILED (4): The job completed unsuccessfully. """ + JOB_EXECUTION_STATE_UNSPECIFIED = 0 NOT_EXECUTED = 1 RUNNING = 2 @@ -550,6 +553,7 @@ class VisualizationType(proto.Enum): may give a hint to the user that the requested type was not understood. """ + VISUALIZATION_TYPE_UNSPECIFIED = 0 TABLE = 1 BAR_CHART = 2 diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question_service.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question_service.py index 251b7c19861d..2ec8d2148c43 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question_service.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/question_service.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback from google.cloud.dataqna_v1alpha.types import question as gcd_question +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback __protobuf__ = proto.module( package="google.cloud.dataqna.v1alpha", diff --git a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/user_feedback.py b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/user_feedback.py index 2be397a8c9ff..53499bb90a00 100644 --- a/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/user_feedback.py +++ b/packages/google-cloud-data-qna/google/cloud/dataqna_v1alpha/types/user_feedback.py @@ -52,6 +52,7 @@ class UserFeedbackRating(proto.Enum): NEGATIVE (2): The user provided negative feedback. """ + USER_FEEDBACK_RATING_UNSPECIFIED = 0 POSITIVE = 1 NEGATIVE = 2 diff --git a/packages/google-cloud-data-qna/noxfile.py b/packages/google-cloud-data-qna/noxfile.py index 116b3d22e474..474451d26625 100644 --- a/packages/google-cloud-data-qna/noxfile.py +++ b/packages/google-cloud-data-qna/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py b/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py index 81cd89d4824e..6a08db34ddee 100644 --- a/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py +++ b/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -993,10 +998,9 @@ def test_auto_suggestion_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1045,9 @@ def test_auto_suggestion_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1083,9 @@ def test_auto_suggestion_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1339,13 +1341,13 @@ def test_auto_suggestion_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1912,8 +1914,9 @@ def test_suggest_queries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1973,18 +1976,20 @@ def test_suggest_queries_rest_interceptors(null_interceptor): ) client = AutoSuggestionServiceClient(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.AutoSuggestionServiceRestInterceptor, "post_suggest_queries" - ) as post, mock.patch.object( - transports.AutoSuggestionServiceRestInterceptor, - "post_suggest_queries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AutoSuggestionServiceRestInterceptor, "pre_suggest_queries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoSuggestionServiceRestInterceptor, "post_suggest_queries" + ) as post, + mock.patch.object( + transports.AutoSuggestionServiceRestInterceptor, + "post_suggest_queries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutoSuggestionServiceRestInterceptor, "pre_suggest_queries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2109,11 +2114,14 @@ def test_auto_suggestion_service_base_transport(): def test_auto_suggestion_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataqna_v1alpha.services.auto_suggestion_service.transports.AutoSuggestionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataqna_v1alpha.services.auto_suggestion_service.transports.AutoSuggestionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutoSuggestionServiceTransport( @@ -2130,9 +2138,12 @@ def test_auto_suggestion_service_base_transport_with_credentials_file(): def test_auto_suggestion_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataqna_v1alpha.services.auto_suggestion_service.transports.AutoSuggestionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataqna_v1alpha.services.auto_suggestion_service.transports.AutoSuggestionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutoSuggestionServiceTransport() @@ -2206,11 +2217,12 @@ def test_auto_suggestion_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_question_service.py b/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_question_service.py index b614d11186a3..2fee3f0e4e06 100644 --- a/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_question_service.py +++ b/packages/google-cloud-data-qna/tests/unit/gapic/dataqna_v1alpha/test_question_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,30 +43,37 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.dataqna_v1alpha.services.question_service import ( QuestionServiceAsyncClient, QuestionServiceClient, transports, ) -from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback -from google.cloud.dataqna_v1alpha.types import annotated_string -from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import ( + annotated_string, + question, + question_service, + user_feedback, +) from google.cloud.dataqna_v1alpha.types import question as gcd_question -from google.cloud.dataqna_v1alpha.types import question_service -from google.cloud.dataqna_v1alpha.types import user_feedback +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -977,10 +984,9 @@ def test_question_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1025,10 +1031,9 @@ def test_question_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1064,10 +1069,9 @@ def test_question_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1310,13 +1314,13 @@ def test_question_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2115,9 +2119,9 @@ def test_execute_question_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.execute_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.execute_question] = ( + mock_rpc + ) request = {} client.execute_question(request) @@ -2463,9 +2467,9 @@ def test_get_user_feedback_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_user_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_user_feedback] = ( + mock_rpc + ) request = {} client.get_user_feedback(request) @@ -2809,9 +2813,9 @@ def test_update_user_feedback_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_user_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_user_feedback] = ( + mock_rpc + ) request = {} client.update_user_feedback(request) @@ -3466,9 +3470,9 @@ def test_execute_question_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.execute_question - ] = mock_rpc + client._transport._wrapped_methods[client._transport.execute_question] = ( + mock_rpc + ) request = {} client.execute_question(request) @@ -3663,9 +3667,9 @@ def test_get_user_feedback_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_user_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_user_feedback] = ( + mock_rpc + ) request = {} client.get_user_feedback(request) @@ -3847,9 +3851,9 @@ def test_update_user_feedback_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_user_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_user_feedback] = ( + mock_rpc + ) request = {} client.update_user_feedback(request) @@ -4412,8 +4416,9 @@ def test_get_question_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4484,17 +4489,19 @@ def test_get_question_rest_interceptors(null_interceptor): ) client = QuestionServiceClient(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.QuestionServiceRestInterceptor, "post_get_question" - ) as post, mock.patch.object( - transports.QuestionServiceRestInterceptor, "post_get_question_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.QuestionServiceRestInterceptor, "pre_get_question" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.QuestionServiceRestInterceptor, "post_get_question" + ) as post, + mock.patch.object( + transports.QuestionServiceRestInterceptor, "post_get_question_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.QuestionServiceRestInterceptor, "pre_get_question" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4547,8 +4554,9 @@ def test_create_question_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4770,17 +4778,20 @@ def test_create_question_rest_interceptors(null_interceptor): ) client = QuestionServiceClient(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.QuestionServiceRestInterceptor, "post_create_question" - ) as post, mock.patch.object( - transports.QuestionServiceRestInterceptor, "post_create_question_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.QuestionServiceRestInterceptor, "pre_create_question" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.QuestionServiceRestInterceptor, "post_create_question" + ) as post, + mock.patch.object( + transports.QuestionServiceRestInterceptor, + "post_create_question_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.QuestionServiceRestInterceptor, "pre_create_question" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4833,8 +4844,9 @@ def test_execute_question_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4905,17 +4917,20 @@ def test_execute_question_rest_interceptors(null_interceptor): ) client = QuestionServiceClient(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.QuestionServiceRestInterceptor, "post_execute_question" - ) as post, mock.patch.object( - transports.QuestionServiceRestInterceptor, "post_execute_question_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.QuestionServiceRestInterceptor, "pre_execute_question" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.QuestionServiceRestInterceptor, "post_execute_question" + ) as post, + mock.patch.object( + transports.QuestionServiceRestInterceptor, + "post_execute_question_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.QuestionServiceRestInterceptor, "pre_execute_question" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4970,8 +4985,9 @@ def test_get_user_feedback_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5040,18 +5056,20 @@ def test_get_user_feedback_rest_interceptors(null_interceptor): ) client = QuestionServiceClient(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.QuestionServiceRestInterceptor, "post_get_user_feedback" - ) as post, mock.patch.object( - transports.QuestionServiceRestInterceptor, - "post_get_user_feedback_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.QuestionServiceRestInterceptor, "pre_get_user_feedback" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.QuestionServiceRestInterceptor, "post_get_user_feedback" + ) as post, + mock.patch.object( + transports.QuestionServiceRestInterceptor, + "post_get_user_feedback_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.QuestionServiceRestInterceptor, "pre_get_user_feedback" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5108,8 +5126,9 @@ def test_update_user_feedback_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5252,18 +5271,20 @@ def test_update_user_feedback_rest_interceptors(null_interceptor): ) client = QuestionServiceClient(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.QuestionServiceRestInterceptor, "post_update_user_feedback" - ) as post, mock.patch.object( - transports.QuestionServiceRestInterceptor, - "post_update_user_feedback_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.QuestionServiceRestInterceptor, "pre_update_user_feedback" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.QuestionServiceRestInterceptor, "post_update_user_feedback" + ) as post, + mock.patch.object( + transports.QuestionServiceRestInterceptor, + "post_update_user_feedback_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.QuestionServiceRestInterceptor, "pre_update_user_feedback" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5475,11 +5496,14 @@ def test_question_service_base_transport(): def test_question_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataqna_v1alpha.services.question_service.transports.QuestionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataqna_v1alpha.services.question_service.transports.QuestionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.QuestionServiceTransport( @@ -5496,9 +5520,12 @@ def test_question_service_base_transport_with_credentials_file(): def test_question_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataqna_v1alpha.services.question_service.transports.QuestionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataqna_v1alpha.services.question_service.transports.QuestionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.QuestionServiceTransport() @@ -5570,11 +5597,12 @@ def test_question_service_transport_auth_gdch_credentials(transport_class): def test_question_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-databasecenter/docs/conf.py b/packages/google-cloud-databasecenter/docs/conf.py index 6098ed327d40..9b67b0fd396e 100644 --- a/packages/google-cloud-databasecenter/docs/conf.py +++ b/packages/google-cloud-databasecenter/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-databasecenter documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/__init__.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/__init__.py index bcbcff00f362..ea57c18c4b69 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/__init__.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.database_center import DatabaseCenterAsyncClient, DatabaseCenterClient from .types.machine_config import MachineConfig from .types.maintenance import ( diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/async_client.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/async_client.py index 53fd9b15050c..051dfb1b396f 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/async_client.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.databasecenter_v1beta import gapic_version as package_version @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DatabaseCenterAsyncClient: The constructed client. """ - return DatabaseCenterClient.from_service_account_info.__func__(DatabaseCenterAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DatabaseCenterClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DatabaseCenterAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DatabaseCenterAsyncClient: The constructed client. """ - return DatabaseCenterClient.from_service_account_file.__func__(DatabaseCenterAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DatabaseCenterClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DatabaseCenterAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/client.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/client.py index 44c83e0a2e7b..8d8f9fa3f436 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/client.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.databasecenter_v1beta import gapic_version as package_version @@ -78,9 +78,7 @@ class DatabaseCenterClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DatabaseCenterTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DatabaseCenterTransport]] _transport_registry["grpc"] = DatabaseCenterGrpcTransport _transport_registry["grpc_asyncio"] = DatabaseCenterGrpcAsyncIOTransport _transport_registry["rest"] = DatabaseCenterRestTransport @@ -600,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DatabaseCenterClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DatabaseCenterClient._read_environment_variables() + ) self._client_cert_source = DatabaseCenterClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DatabaseCenterTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/pagers.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/pagers.py index cbf5725278cc..94b5debb0a42 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/pagers.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/base.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/base.py index af8b9902a5f2..97058c740a72 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/base.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.databasecenter_v1beta import gapic_version as package_version from google.cloud.databasecenter_v1beta.types import service diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc.py index a19159d5d49f..b9609402ec85 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.databasecenter_v1beta.types import service @@ -399,12 +399,12 @@ def query_database_resource_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_database_resource_groups" not in self._stubs: - self._stubs[ - "query_database_resource_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.databasecenter.v1beta.DatabaseCenter/QueryDatabaseResourceGroups", - request_serializer=service.QueryDatabaseResourceGroupsRequest.serialize, - response_deserializer=service.QueryDatabaseResourceGroupsResponse.deserialize, + self._stubs["query_database_resource_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.databasecenter.v1beta.DatabaseCenter/QueryDatabaseResourceGroups", + request_serializer=service.QueryDatabaseResourceGroupsRequest.serialize, + response_deserializer=service.QueryDatabaseResourceGroupsResponse.deserialize, + ) ) return self._stubs["query_database_resource_groups"] diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc_asyncio.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc_asyncio.py index 8051818e3a2d..4bd9465043c2 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc_asyncio.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.databasecenter_v1beta.types import service @@ -411,12 +411,12 @@ def query_database_resource_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_database_resource_groups" not in self._stubs: - self._stubs[ - "query_database_resource_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.databasecenter.v1beta.DatabaseCenter/QueryDatabaseResourceGroups", - request_serializer=service.QueryDatabaseResourceGroupsRequest.serialize, - response_deserializer=service.QueryDatabaseResourceGroupsResponse.deserialize, + self._stubs["query_database_resource_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.databasecenter.v1beta.DatabaseCenter/QueryDatabaseResourceGroups", + request_serializer=service.QueryDatabaseResourceGroupsRequest.serialize, + response_deserializer=service.QueryDatabaseResourceGroupsResponse.deserialize, + ) ) return self._stubs["query_database_resource_groups"] diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/rest.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/rest.py index 36260f8f8b84..1b742bfef385 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/rest.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/services/database_center/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -601,9 +601,7 @@ def __call__( """ - http_options = ( - _BaseDatabaseCenterRestTransport._BaseAggregateIssueStats._get_http_options() - ) + http_options = _BaseDatabaseCenterRestTransport._BaseAggregateIssueStats._get_http_options() request, metadata = self._interceptor.pre_aggregate_issue_stats( request, metadata @@ -762,9 +760,7 @@ def __call__( """ - http_options = ( - _BaseDatabaseCenterRestTransport._BaseQueryDatabaseResourceGroups._get_http_options() - ) + http_options = _BaseDatabaseCenterRestTransport._BaseQueryDatabaseResourceGroups._get_http_options() request, metadata = self._interceptor.pre_query_database_resource_groups( request, metadata @@ -835,11 +831,10 @@ def __call__( resp = self._interceptor.post_query_database_resource_groups(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_database_resource_groups_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_database_resource_groups_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1040,7 +1035,9 @@ def query_database_resource_groups( ]: # 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._QueryDatabaseResourceGroups(self._session, self._host, self._interceptor) # type: ignore + return self._QueryDatabaseResourceGroups( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_products( diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/__init__.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/__init__.py index 632dda18bbe0..792acbe107a8 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/__init__.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/__init__.py @@ -13,16 +13,28 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .machine_config import MachineConfig +from .machine_config import ( + MachineConfig, +) from .maintenance import ( MaintenanceInfo, Phase, ResourceMaintenanceDenySchedule, ResourceMaintenanceSchedule, ) -from .metric_data import MetricData, Metrics, TypedValue -from .operation_error_type import OperationErrorType -from .product import Engine, Product, ProductType +from .metric_data import ( + MetricData, + Metrics, + TypedValue, +) +from .operation_error_type import ( + OperationErrorType, +) +from .product import ( + Engine, + Product, + ProductType, +) from .service import ( AggregateFleetRequest, AggregateFleetResponse, @@ -72,7 +84,9 @@ SignalTypeGroup, SubResource, ) -from .suspension_reason import SuspensionReason +from .suspension_reason import ( + SuspensionReason, +) __all__ = ( "MachineConfig", diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/maintenance.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/maintenance.py index 50c325022d10..be9f73bacb1e 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/maintenance.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/maintenance.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -52,6 +52,7 @@ class Phase(proto.Enum): PHASE_ANY (4): Any phase. """ + PHASE_UNSPECIFIED = 0 PHASE_WEEK1 = 1 PHASE_WEEK2 = 2 @@ -153,12 +154,12 @@ class MaintenanceInfo(proto.Message): number=1, message="ResourceMaintenanceSchedule", ) - deny_maintenance_schedules: MutableSequence[ - "ResourceMaintenanceDenySchedule" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ResourceMaintenanceDenySchedule", + deny_maintenance_schedules: MutableSequence["ResourceMaintenanceDenySchedule"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ResourceMaintenanceDenySchedule", + ) ) maintenance_version: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/metric_data.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/metric_data.py index eee26ba0325c..742ff724e564 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/metric_data.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/metric_data.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/operation_error_type.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/operation_error_type.py index f09b98c6fb4e..4e51eca75dcf 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/operation_error_type.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/operation_error_type.py @@ -52,6 +52,7 @@ class OperationErrorType(proto.Enum): INTERNAL_ERROR (6): Any other internal error. """ + OPERATION_ERROR_TYPE_UNSPECIFIED = 0 KMS_KEY_ERROR = 1 DATABASE_ERROR = 2 diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/product.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/product.py index 048dc6db8a5e..04c74bb2144d 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/product.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/product.py @@ -68,6 +68,7 @@ class Engine(proto.Enum): engine. This is to be when engine is known, but it is not present in this enum. """ + ENGINE_UNSPECIFIED = 0 ENGINE_MYSQL = 1 ENGINE_POSTGRES = 2 @@ -115,6 +116,7 @@ class ProductType(proto.Enum): This is to be when product type is known, but it is not present in this enum. """ + PRODUCT_TYPE_UNSPECIFIED = 0 PRODUCT_TYPE_CLOUD_SQL = 1 PRODUCT_TYPE_ALLOYDB = 2 diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/service.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/service.py index 1317eb5c032b..49fda81e09c0 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/service.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/service.py @@ -17,15 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.type import date_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore from google.cloud.databasecenter_v1beta.types import ( machine_config as gcd_machine_config, ) -from google.cloud.databasecenter_v1beta.types import maintenance, metric_data +from google.cloud.databasecenter_v1beta.types import maintenance, metric_data, signals from google.cloud.databasecenter_v1beta.types import product as gcd_product -from google.cloud.databasecenter_v1beta.types import signals __protobuf__ = proto.module( package="google.cloud.databasecenter.v1beta", @@ -71,6 +70,7 @@ class ResourceCategory(proto.Enum): DATABASE (3): A resource that is a Database. """ + RESOURCE_CATEGORY_UNSPECIFIED = 0 INSTANCE = 1 CLUSTER = 2 @@ -92,6 +92,7 @@ class Edition(proto.Enum): EDITION_STANDARD (3): Represents the standard edition. """ + EDITION_UNSPECIFIED = 0 EDITION_ENTERPRISE = 1 EDITION_ENTERPRISE_PLUS = 2 @@ -115,6 +116,7 @@ class SubResourceType(proto.Enum): SUB_RESOURCE_TYPE_OTHER (4): For the rest of the categories. """ + SUB_RESOURCE_TYPE_UNSPECIFIED = 0 SUB_RESOURCE_TYPE_PRIMARY = 1 SUB_RESOURCE_TYPE_SECONDARY = 2 @@ -134,6 +136,7 @@ class ManagementType(proto.Enum): MANAGEMENT_TYPE_SELF_MANAGED (2): Self-managed resource. """ + MANAGEMENT_TYPE_UNSPECIFIED = 0 MANAGEMENT_TYPE_GCP_MANAGED = 1 MANAGEMENT_TYPE_SELF_MANAGED = 2 diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/signals.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/signals.py index d75e89b479f4..5aae7e8294af 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/signals.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/signals.py @@ -17,19 +17,19 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore +from google.cloud.databasecenter_v1beta.types import maintenance from google.cloud.databasecenter_v1beta.types import ( operation_error_type as gcd_operation_error_type, ) +from google.cloud.databasecenter_v1beta.types import product as gcd_product from google.cloud.databasecenter_v1beta.types import ( suspension_reason as gcd_suspension_reason, ) -from google.cloud.databasecenter_v1beta.types import maintenance -from google.cloud.databasecenter_v1beta.types import product as gcd_product __protobuf__ = proto.module( package="google.cloud.databasecenter.v1beta", @@ -76,6 +76,7 @@ class SignalStatus(proto.Enum): SIGNAL_STATUS_NOT_ENABLED (4): Signal is not enabled for the resource. """ + SIGNAL_STATUS_UNSPECIFIED = 0 SIGNAL_STATUS_NOT_APPLICABLE = 1 SIGNAL_STATUS_OK = 2 @@ -100,6 +101,7 @@ class SignalSource(proto.Enum): Signal comes from modern observability platform. """ + SIGNAL_SOURCE_UNSPECIFIED = 0 SIGNAL_SOURCE_RESOURCE_METADATA = 1 SIGNAL_SOURCE_SECURITY_FINDINGS = 2 @@ -125,6 +127,7 @@ class IssueSeverity(proto.Enum): Irrelevant severity. This means the issue should not be surfaced at all. """ + ISSUE_SEVERITY_UNSPECIFIED = 0 ISSUE_SEVERITY_LOW = 1 ISSUE_SEVERITY_MEDIUM = 2 @@ -436,6 +439,7 @@ class SignalType(proto.Enum): SIGNAL_TYPE_EXTENDED_SUPPORT (102): Resource version is in extended support. """ + SIGNAL_TYPE_UNSPECIFIED = 0 SIGNAL_TYPE_RESOURCE_FAILOVER_PROTECTED = 1 SIGNAL_TYPE_GROUP_MULTIREGIONAL = 2 @@ -1020,6 +1024,7 @@ class State(proto.Enum): FAILED (2): The backup was unsuccessful. """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 diff --git a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/suspension_reason.py b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/suspension_reason.py index 30bfc76cfa56..ef1be766a62c 100644 --- a/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/suspension_reason.py +++ b/packages/google-cloud-databasecenter/google/cloud/databasecenter_v1beta/types/suspension_reason.py @@ -47,6 +47,7 @@ class SuspensionReason(proto.Enum): Replicated cluster encryption key inaccessible. """ + SUSPENSION_REASON_UNSPECIFIED = 0 WIPEOUT_HIDE_EVENT = 1 WIPEOUT_PURGE_EVENT = 2 diff --git a/packages/google-cloud-databasecenter/noxfile.py b/packages/google-cloud-databasecenter/noxfile.py index 1f83e324e9dd..ec1d7f94322e 100644 --- a/packages/google-cloud-databasecenter/noxfile.py +++ b/packages/google-cloud-databasecenter/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-databasecenter/tests/unit/gapic/databasecenter_v1beta/test_database_center.py b/packages/google-cloud-databasecenter/tests/unit/gapic/databasecenter_v1beta/test_database_center.py index 55d66d69dbf9..d1d6811d3ae0 100644 --- a/packages/google-cloud-databasecenter/tests/unit/gapic/databasecenter_v1beta/test_database_center.py +++ b/packages/google-cloud-databasecenter/tests/unit/gapic/databasecenter_v1beta/test_database_center.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.type.date_pb2 as date_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.type import date_pb2 # type: ignore from google.cloud.databasecenter_v1beta.services.database_center import ( DatabaseCenterAsyncClient, @@ -946,10 +951,9 @@ def test_database_center_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +998,9 @@ def test_database_center_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1036,9 @@ def test_database_center_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1279,13 +1281,13 @@ def test_database_center_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2576,9 +2578,9 @@ def test_aggregate_issue_stats_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.aggregate_issue_stats - ] = mock_rpc + client._transport._wrapped_methods[client._transport.aggregate_issue_stats] = ( + mock_rpc + ) request = {} client.aggregate_issue_stats(request) @@ -3316,9 +3318,9 @@ def test_aggregate_issue_stats_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.aggregate_issue_stats - ] = mock_rpc + client._transport._wrapped_methods[client._transport.aggregate_issue_stats] = ( + mock_rpc + ) request = {} client.aggregate_issue_stats(request) @@ -3761,8 +3763,9 @@ def test_query_products_rest_bad_request(request_type=service.QueryProductsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3827,17 +3830,20 @@ def test_query_products_rest_interceptors(null_interceptor): ) client = DatabaseCenterClient(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.DatabaseCenterRestInterceptor, "post_query_products" - ) as post, mock.patch.object( - transports.DatabaseCenterRestInterceptor, "post_query_products_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatabaseCenterRestInterceptor, "pre_query_products" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatabaseCenterRestInterceptor, "post_query_products" + ) as post, + mock.patch.object( + transports.DatabaseCenterRestInterceptor, + "post_query_products_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatabaseCenterRestInterceptor, "pre_query_products" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3888,8 +3894,9 @@ def test_aggregate_fleet_rest_bad_request(request_type=service.AggregateFleetReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3958,17 +3965,20 @@ def test_aggregate_fleet_rest_interceptors(null_interceptor): ) client = DatabaseCenterClient(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.DatabaseCenterRestInterceptor, "post_aggregate_fleet" - ) as post, mock.patch.object( - transports.DatabaseCenterRestInterceptor, "post_aggregate_fleet_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatabaseCenterRestInterceptor, "pre_aggregate_fleet" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatabaseCenterRestInterceptor, "post_aggregate_fleet" + ) as post, + mock.patch.object( + transports.DatabaseCenterRestInterceptor, + "post_aggregate_fleet_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatabaseCenterRestInterceptor, "pre_aggregate_fleet" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4021,8 +4031,9 @@ def test_query_database_resource_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4087,18 +4098,22 @@ def test_query_database_resource_groups_rest_interceptors(null_interceptor): ) client = DatabaseCenterClient(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.DatabaseCenterRestInterceptor, "post_query_database_resource_groups" - ) as post, mock.patch.object( - transports.DatabaseCenterRestInterceptor, - "post_query_database_resource_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatabaseCenterRestInterceptor, "pre_query_database_resource_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatabaseCenterRestInterceptor, + "post_query_database_resource_groups", + ) as post, + mock.patch.object( + transports.DatabaseCenterRestInterceptor, + "post_query_database_resource_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatabaseCenterRestInterceptor, + "pre_query_database_resource_groups", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4156,8 +4171,9 @@ def test_aggregate_issue_stats_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4224,18 +4240,20 @@ def test_aggregate_issue_stats_rest_interceptors(null_interceptor): ) client = DatabaseCenterClient(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.DatabaseCenterRestInterceptor, "post_aggregate_issue_stats" - ) as post, mock.patch.object( - transports.DatabaseCenterRestInterceptor, - "post_aggregate_issue_stats_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatabaseCenterRestInterceptor, "pre_aggregate_issue_stats" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatabaseCenterRestInterceptor, "post_aggregate_issue_stats" + ) as post, + mock.patch.object( + transports.DatabaseCenterRestInterceptor, + "post_aggregate_issue_stats_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatabaseCenterRestInterceptor, "pre_aggregate_issue_stats" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4429,11 +4447,14 @@ def test_database_center_base_transport(): def test_database_center_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.databasecenter_v1beta.services.database_center.transports.DatabaseCenterTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.databasecenter_v1beta.services.database_center.transports.DatabaseCenterTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DatabaseCenterTransport( @@ -4450,9 +4471,12 @@ def test_database_center_base_transport_with_credentials_file(): def test_database_center_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.databasecenter_v1beta.services.database_center.transports.DatabaseCenterTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.databasecenter_v1beta.services.database_center.transports.DatabaseCenterTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DatabaseCenterTransport() @@ -4524,11 +4548,12 @@ def test_database_center_transport_auth_gdch_credentials(transport_class): def test_database_center_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-datacatalog-lineage/docs/conf.py b/packages/google-cloud-datacatalog-lineage/docs/conf.py index d38362448686..af506b60bef9 100644 --- a/packages/google-cloud-datacatalog-lineage/docs/conf.py +++ b/packages/google-cloud-datacatalog-lineage/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-datacatalog-lineage documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/__init__.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/__init__.py index d38c332dd341..d805d31185ab 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/__init__.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.lineage import LineageAsyncClient, LineageClient from .types.lineage import ( BatchSearchLinkProcessesRequest, diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/async_client.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/async_client.py index d031c1329c0b..78db1e7a540a 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/async_client.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_lineage_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.datacatalog_lineage_v1.services.lineage import pagers from google.cloud.datacatalog_lineage_v1.types import lineage @@ -122,7 +122,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LineageAsyncClient: The constructed client. """ - return LineageClient.from_service_account_info.__func__(LineageAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = LineageClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(LineageAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +139,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LineageAsyncClient: The constructed client. """ - return LineageClient.from_service_account_file.__func__(LineageAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = LineageClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(LineageAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/client.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/client.py index f14b67fc56e1..501eafd2add4 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/client.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_lineage_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.datacatalog_lineage_v1.services.lineage import pagers from google.cloud.datacatalog_lineage_v1.types import lineage @@ -681,11 +681,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LineageClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LineageClient._read_environment_variables() + ) self._client_cert_source = LineageClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -720,8 +718,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LineageTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/pagers.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/pagers.py index 54320fbc2b96..ad88d0c761ce 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/pagers.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/base.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/base.py index d7ddc7e69b77..a04716fdf230 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/base.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.datacatalog_lineage_v1 import gapic_version as package_version from google.cloud.datacatalog_lineage_v1.types import lineage @@ -439,13 +439,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc.py index b4a9542f1c0a..7600bd83a57b 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datacatalog_lineage_v1.types import lineage @@ -371,12 +371,12 @@ def process_open_lineage_run_event( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "process_open_lineage_run_event" not in self._stubs: - self._stubs[ - "process_open_lineage_run_event" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.lineage.v1.Lineage/ProcessOpenLineageRunEvent", - request_serializer=lineage.ProcessOpenLineageRunEventRequest.serialize, - response_deserializer=lineage.ProcessOpenLineageRunEventResponse.deserialize, + self._stubs["process_open_lineage_run_event"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.lineage.v1.Lineage/ProcessOpenLineageRunEvent", + request_serializer=lineage.ProcessOpenLineageRunEventRequest.serialize, + response_deserializer=lineage.ProcessOpenLineageRunEventResponse.deserialize, + ) ) return self._stubs["process_open_lineage_run_event"] @@ -810,12 +810,12 @@ def batch_search_link_processes( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_search_link_processes" not in self._stubs: - self._stubs[ - "batch_search_link_processes" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.lineage.v1.Lineage/BatchSearchLinkProcesses", - request_serializer=lineage.BatchSearchLinkProcessesRequest.serialize, - response_deserializer=lineage.BatchSearchLinkProcessesResponse.deserialize, + self._stubs["batch_search_link_processes"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.lineage.v1.Lineage/BatchSearchLinkProcesses", + request_serializer=lineage.BatchSearchLinkProcessesRequest.serialize, + response_deserializer=lineage.BatchSearchLinkProcessesResponse.deserialize, + ) ) return self._stubs["batch_search_link_processes"] diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc_asyncio.py index 3ffdfb7fc5b8..fd1890014625 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_lineage_v1.types import lineage @@ -379,12 +379,12 @@ def process_open_lineage_run_event( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "process_open_lineage_run_event" not in self._stubs: - self._stubs[ - "process_open_lineage_run_event" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.lineage.v1.Lineage/ProcessOpenLineageRunEvent", - request_serializer=lineage.ProcessOpenLineageRunEventRequest.serialize, - response_deserializer=lineage.ProcessOpenLineageRunEventResponse.deserialize, + self._stubs["process_open_lineage_run_event"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.lineage.v1.Lineage/ProcessOpenLineageRunEvent", + request_serializer=lineage.ProcessOpenLineageRunEventRequest.serialize, + response_deserializer=lineage.ProcessOpenLineageRunEventResponse.deserialize, + ) ) return self._stubs["process_open_lineage_run_event"] @@ -826,12 +826,12 @@ def batch_search_link_processes( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_search_link_processes" not in self._stubs: - self._stubs[ - "batch_search_link_processes" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.lineage.v1.Lineage/BatchSearchLinkProcesses", - request_serializer=lineage.BatchSearchLinkProcessesRequest.serialize, - response_deserializer=lineage.BatchSearchLinkProcessesResponse.deserialize, + self._stubs["batch_search_link_processes"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.lineage.v1.Lineage/BatchSearchLinkProcesses", + request_serializer=lineage.BatchSearchLinkProcessesRequest.serialize, + response_deserializer=lineage.BatchSearchLinkProcessesResponse.deserialize, + ) ) return self._stubs["batch_search_link_processes"] diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest.py index 90c2b8bf61de..6e6127f4810e 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1262,9 +1262,7 @@ def __call__( """ - http_options = ( - _BaseLineageRestTransport._BaseBatchSearchLinkProcesses._get_http_options() - ) + http_options = _BaseLineageRestTransport._BaseBatchSearchLinkProcesses._get_http_options() request, metadata = self._interceptor.pre_batch_search_link_processes( request, metadata @@ -1903,7 +1901,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2019,7 +2017,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2165,7 +2163,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3188,9 +3186,7 @@ def __call__( """ - http_options = ( - _BaseLineageRestTransport._BaseProcessOpenLineageRunEvent._get_http_options() - ) + http_options = _BaseLineageRestTransport._BaseProcessOpenLineageRunEvent._get_http_options() request, metadata = self._interceptor.pre_process_open_lineage_run_event( request, metadata @@ -3259,11 +3255,10 @@ def __call__( resp = self._interceptor.post_process_open_lineage_run_event(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_process_open_lineage_run_event_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_process_open_lineage_run_event_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3763,7 +3758,9 @@ def batch_search_link_processes( ]: # 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._BatchSearchLinkProcesses(self._session, self._host, self._interceptor) # type: ignore + return self._BatchSearchLinkProcesses( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_lineage_event( @@ -3866,7 +3863,9 @@ def process_open_lineage_run_event( ]: # 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._ProcessOpenLineageRunEvent(self._session, self._host, self._interceptor) # type: ignore + return self._ProcessOpenLineageRunEvent( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_links( diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest_base.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest_base.py index d3039c184b08..28b53b72c942 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest_base.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/services/lineage/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.datacatalog_lineage_v1.types import lineage diff --git a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/types/lineage.py b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/types/lineage.py index 43cf1d72dcda..11267870ac60 100644 --- a/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/types/lineage.py +++ b/packages/google-cloud-datacatalog-lineage/google/cloud/datacatalog_lineage_v1/types/lineage.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -161,6 +161,7 @@ class State(proto.Enum): ABORTED (4): The run aborted. """ + UNKNOWN = 0 STARTED = 1 COMPLETED = 2 @@ -329,6 +330,7 @@ class State(proto.Enum): The operation is no longer running and did not succeed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 @@ -346,6 +348,7 @@ class Type(proto.Enum): CREATE (2): The resource creation operation. """ + TYPE_UNSPECIFIED = 0 DELETE = 1 CREATE = 2 @@ -1253,6 +1256,7 @@ class SourceType(proto.Enum): DATAPROC (6): Dataproc """ + SOURCE_TYPE_UNSPECIFIED = 0 CUSTOM = 1 BIGQUERY = 2 diff --git a/packages/google-cloud-datacatalog-lineage/noxfile.py b/packages/google-cloud-datacatalog-lineage/noxfile.py index f66ad44f1c5d..dbffb539fa70 100644 --- a/packages/google-cloud-datacatalog-lineage/noxfile.py +++ b/packages/google-cloud-datacatalog-lineage/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-datacatalog-lineage/tests/unit/gapic/datacatalog_lineage_v1/test_lineage.py b/packages/google-cloud-datacatalog-lineage/tests/unit/gapic/datacatalog_lineage_v1/test_lineage.py index 08ec0c14f419..6379c749349b 100644 --- a/packages/google-cloud-datacatalog-lineage/tests/unit/gapic/datacatalog_lineage_v1/test_lineage.py +++ b/packages/google-cloud-datacatalog-lineage/tests/unit/gapic/datacatalog_lineage_v1/test_lineage.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.datacatalog_lineage_v1.services.lineage import ( LineageAsyncClient, @@ -910,10 +910,9 @@ def test_lineage_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +957,9 @@ def test_lineage_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +995,9 @@ def test_lineage_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1225,13 +1222,13 @@ def test_lineage_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5413,9 +5410,9 @@ def test_create_lineage_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_lineage_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_lineage_event] = ( + mock_rpc + ) request = {} client.create_lineage_event(request) @@ -5762,9 +5759,9 @@ def test_get_lineage_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_lineage_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_lineage_event] = ( + mock_rpc + ) request = {} client.get_lineage_event(request) @@ -6105,9 +6102,9 @@ def test_list_lineage_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_lineage_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_lineage_events] = ( + mock_rpc + ) request = {} client.list_lineage_events(request) @@ -6645,9 +6642,9 @@ def test_delete_lineage_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_lineage_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_lineage_event] = ( + mock_rpc + ) request = {} client.delete_lineage_event(request) @@ -10001,9 +9998,9 @@ def test_create_lineage_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_lineage_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_lineage_event] = ( + mock_rpc + ) request = {} client.create_lineage_event(request) @@ -10196,9 +10193,9 @@ def test_get_lineage_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_lineage_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_lineage_event] = ( + mock_rpc + ) request = {} client.get_lineage_event(request) @@ -10380,9 +10377,9 @@ def test_list_lineage_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_lineage_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_lineage_events] = ( + mock_rpc + ) request = {} client.list_lineage_events(request) @@ -10642,9 +10639,9 @@ def test_delete_lineage_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_lineage_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_lineage_event] = ( + mock_rpc + ) request = {} client.delete_lineage_event(request) @@ -12162,8 +12159,9 @@ def test_process_open_lineage_run_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12296,18 +12294,20 @@ def test_process_open_lineage_run_event_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_process_open_lineage_run_event" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, - "post_process_open_lineage_run_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_process_open_lineage_run_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineageRestInterceptor, "post_process_open_lineage_run_event" + ) as post, + mock.patch.object( + transports.LineageRestInterceptor, + "post_process_open_lineage_run_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LineageRestInterceptor, "pre_process_open_lineage_run_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12363,8 +12363,9 @@ def test_create_process_rest_bad_request(request_type=lineage.CreateProcessReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12500,17 +12501,19 @@ def test_create_process_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_create_process" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_create_process_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_create_process" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineageRestInterceptor, "post_create_process" + ) as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_create_process_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LineageRestInterceptor, "pre_create_process" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12561,8 +12564,9 @@ def test_update_process_rest_bad_request(request_type=lineage.UpdateProcessReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12700,17 +12704,19 @@ def test_update_process_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_update_process" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_update_process_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_update_process" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineageRestInterceptor, "post_update_process" + ) as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_update_process_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LineageRestInterceptor, "pre_update_process" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12759,8 +12765,9 @@ def test_get_process_rest_bad_request(request_type=lineage.GetProcessRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12823,17 +12830,17 @@ def test_get_process_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_get_process" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_get_process_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_get_process" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineageRestInterceptor, "post_get_process" + ) as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_get_process_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LineageRestInterceptor, "pre_get_process") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12882,8 +12889,9 @@ def test_list_processes_rest_bad_request(request_type=lineage.ListProcessesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12944,17 +12952,19 @@ def test_list_processes_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_list_processes" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_list_processes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_list_processes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineageRestInterceptor, "post_list_processes" + ) as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_list_processes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LineageRestInterceptor, "pre_list_processes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13005,8 +13015,9 @@ def test_delete_process_rest_bad_request(request_type=lineage.DeleteProcessReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13061,19 +13072,20 @@ def test_delete_process_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_delete_process" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_delete_process_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_delete_process" - ) as pre: + 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.LineageRestInterceptor, "post_delete_process" + ) as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_delete_process_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LineageRestInterceptor, "pre_delete_process" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13122,8 +13134,9 @@ def test_create_run_rest_bad_request(request_type=lineage.CreateRunRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13263,17 +13276,15 @@ def test_create_run_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_create_run" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_create_run_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_create_run" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LineageRestInterceptor, "post_create_run") as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_create_run_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LineageRestInterceptor, "pre_create_run") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13326,8 +13337,9 @@ def test_update_run_rest_bad_request(request_type=lineage.UpdateRunRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13471,17 +13483,15 @@ def test_update_run_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_update_run" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_update_run_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_update_run" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LineageRestInterceptor, "post_update_run") as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_update_run_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LineageRestInterceptor, "pre_update_run") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13532,8 +13542,9 @@ def test_get_run_rest_bad_request(request_type=lineage.GetRunRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13600,17 +13611,15 @@ def test_get_run_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_get_run" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_get_run_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_get_run" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LineageRestInterceptor, "post_get_run") as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_get_run_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LineageRestInterceptor, "pre_get_run") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13659,8 +13668,9 @@ def test_list_runs_rest_bad_request(request_type=lineage.ListRunsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13721,17 +13731,15 @@ def test_list_runs_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_list_runs" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_list_runs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_list_runs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.LineageRestInterceptor, "post_list_runs") as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_list_runs_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LineageRestInterceptor, "pre_list_runs") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13782,8 +13790,9 @@ def test_delete_run_rest_bad_request(request_type=lineage.DeleteRunRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13840,19 +13849,16 @@ def test_delete_run_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_delete_run" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_delete_run_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_delete_run" - ) as pre: + 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.LineageRestInterceptor, "post_delete_run") as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_delete_run_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LineageRestInterceptor, "pre_delete_run") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13905,8 +13911,9 @@ def test_create_lineage_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14047,17 +14054,19 @@ def test_create_lineage_event_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_create_lineage_event" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_create_lineage_event_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_create_lineage_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineageRestInterceptor, "post_create_lineage_event" + ) as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_create_lineage_event_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LineageRestInterceptor, "pre_create_lineage_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14112,8 +14121,9 @@ def test_get_lineage_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14176,17 +14186,19 @@ def test_get_lineage_event_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_get_lineage_event" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_get_lineage_event_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_get_lineage_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineageRestInterceptor, "post_get_lineage_event" + ) as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_get_lineage_event_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LineageRestInterceptor, "pre_get_lineage_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14239,8 +14251,9 @@ def test_list_lineage_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14303,17 +14316,19 @@ def test_list_lineage_events_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_list_lineage_events" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_list_lineage_events_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_list_lineage_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineageRestInterceptor, "post_list_lineage_events" + ) as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_list_lineage_events_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LineageRestInterceptor, "pre_list_lineage_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14370,8 +14385,9 @@ def test_delete_lineage_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14428,13 +14444,13 @@ def test_delete_lineage_event_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "pre_delete_lineage_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineageRestInterceptor, "pre_delete_lineage_event" + ) as pre, + ): pre.assert_not_called() pb_message = lineage.DeleteLineageEventRequest.pb( lineage.DeleteLineageEventRequest() @@ -14477,8 +14493,9 @@ def test_search_links_rest_bad_request(request_type=lineage.SearchLinksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14539,17 +14556,17 @@ def test_search_links_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_search_links" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, "post_search_links_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_search_links" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineageRestInterceptor, "post_search_links" + ) as post, + mock.patch.object( + transports.LineageRestInterceptor, "post_search_links_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LineageRestInterceptor, "pre_search_links") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14602,8 +14619,9 @@ def test_batch_search_link_processes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14664,18 +14682,20 @@ def test_batch_search_link_processes_rest_interceptors(null_interceptor): ) client = LineageClient(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.LineageRestInterceptor, "post_batch_search_link_processes" - ) as post, mock.patch.object( - transports.LineageRestInterceptor, - "post_batch_search_link_processes_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LineageRestInterceptor, "pre_batch_search_link_processes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LineageRestInterceptor, "post_batch_search_link_processes" + ) as post, + mock.patch.object( + transports.LineageRestInterceptor, + "post_batch_search_link_processes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LineageRestInterceptor, "pre_batch_search_link_processes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14735,8 +14755,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14797,8 +14818,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14859,8 +14881,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14921,8 +14944,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15424,11 +15448,14 @@ def test_lineage_base_transport(): def test_lineage_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_lineage_v1.services.lineage.transports.LineageTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.datacatalog_lineage_v1.services.lineage.transports.LineageTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LineageTransport( @@ -15445,9 +15472,12 @@ def test_lineage_base_transport_with_credentials_file(): def test_lineage_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.datacatalog_lineage_v1.services.lineage.transports.LineageTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.datacatalog_lineage_v1.services.lineage.transports.LineageTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LineageTransport() @@ -15519,11 +15549,12 @@ def test_lineage_transport_auth_gdch_credentials(transport_class): def test_lineage_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-datacatalog/docs/conf.py b/packages/google-cloud-datacatalog/docs/conf.py index d50cad66ff09..87eb6a3882fb 100644 --- a/packages/google-cloud-datacatalog/docs/conf.py +++ b/packages/google-cloud-datacatalog/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-datacatalog documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/__init__.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/__init__.py index dd312ae20a13..b5c27a187a54 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/__init__.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_catalog import DataCatalogAsyncClient, DataCatalogClient from .services.policy_tag_manager import ( PolicyTagManagerAsyncClient, diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/async_client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/async_client.py index 8b6f5bba7d42..ba62736b7a16 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/async_client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version @@ -45,13 +45,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.datacatalog_v1.services.data_catalog import pagers from google.cloud.datacatalog_v1.types import ( @@ -149,7 +153,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataCatalogAsyncClient: The constructed client. """ - return DataCatalogClient.from_service_account_info.__func__(DataCatalogAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataCatalogClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataCatalogAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +170,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataCatalogAsyncClient: The constructed client. """ - return DataCatalogClient.from_service_account_file.__func__(DataCatalogAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataCatalogClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataCatalogAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -4366,7 +4372,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -4531,7 +4537,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -4688,7 +4694,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/client.py index 0f609fdc6bcd..095a1bb96a2d 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version @@ -61,13 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.datacatalog_v1.services.data_catalog import pagers from google.cloud.datacatalog_v1.types import ( @@ -763,11 +767,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataCatalogClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataCatalogClient._read_environment_variables() + ) self._client_cert_source = DataCatalogClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -802,8 +804,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataCatalogTransport, transport) self._api_endpoint = self._transport.host @@ -4815,7 +4816,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -4981,7 +4982,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -5139,7 +5140,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/pagers.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/pagers.py index ab446b376d94..665d47030b37 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/pagers.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py index d38f693cf85c..c89b2e2e8911 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py @@ -17,17 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.datacatalog_v1 import gapic_version as package_version from google.cloud.datacatalog_v1.types import datacatalog, tags @@ -727,13 +731,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc.py index c4266d3af044..c12a1d3be238 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc.py @@ -16,21 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1.types import datacatalog, tags @@ -1050,12 +1054,12 @@ def rename_tag_template_field_enum_value( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rename_tag_template_field_enum_value" not in self._stubs: - self._stubs[ - "rename_tag_template_field_enum_value" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.v1.DataCatalog/RenameTagTemplateFieldEnumValue", - request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, - response_deserializer=tags.TagTemplateField.deserialize, + self._stubs["rename_tag_template_field_enum_value"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.v1.DataCatalog/RenameTagTemplateFieldEnumValue", + request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, + response_deserializer=tags.TagTemplateField.deserialize, + ) ) return self._stubs["rename_tag_template_field_enum_value"] diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py index b71633d60b63..8ec5238a8ae3 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/grpc_asyncio.py @@ -17,23 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1.types import datacatalog, tags @@ -1080,12 +1084,12 @@ def rename_tag_template_field_enum_value( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rename_tag_template_field_enum_value" not in self._stubs: - self._stubs[ - "rename_tag_template_field_enum_value" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.v1.DataCatalog/RenameTagTemplateFieldEnumValue", - request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, - response_deserializer=tags.TagTemplateField.deserialize, + self._stubs["rename_tag_template_field_enum_value"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.v1.DataCatalog/RenameTagTemplateFieldEnumValue", + request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, + response_deserializer=tags.TagTemplateField.deserialize, + ) ) return self._stubs["rename_tag_template_field_enum_value"] diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/async_client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/async_client.py index 493608a54cfe..3bdad1630b9d 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/async_client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version @@ -44,8 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1.services.policy_tag_manager import pagers @@ -125,7 +129,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyTagManagerAsyncClient: The constructed client. """ - return PolicyTagManagerClient.from_service_account_info.__func__(PolicyTagManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PolicyTagManagerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PolicyTagManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +146,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyTagManagerAsyncClient: The constructed client. """ - return PolicyTagManagerClient.from_service_account_file.__func__(PolicyTagManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PolicyTagManagerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PolicyTagManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -1527,7 +1533,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -1643,7 +1649,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -1760,7 +1766,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/client.py index bef122b0ce92..0758554089f8 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version @@ -61,8 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1.services.policy_tag_manager import pagers @@ -81,9 +85,7 @@ class PolicyTagManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyTagManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyTagManagerTransport]] _transport_registry["grpc"] = PolicyTagManagerGrpcTransport _transport_registry["grpc_asyncio"] = PolicyTagManagerGrpcAsyncIOTransport @@ -654,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyTagManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyTagManagerClient._read_environment_variables() + ) self._client_cert_source = PolicyTagManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -693,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyTagManagerTransport, transport) self._api_endpoint = self._transport.host @@ -1959,7 +1958,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -2074,7 +2073,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -2190,7 +2189,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/pagers.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/pagers.py index 4ad804e6132d..07fcd7d97010 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/pagers.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py index 8c470a0e4208..f1b35581b45c 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py @@ -17,17 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.datacatalog_v1 import gapic_version as package_version from google.cloud.datacatalog_v1.types import policytagmanager @@ -386,13 +390,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc.py index 7383e3ee388f..602cc85730cf 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc.py @@ -16,21 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1.types import policytagmanager diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc_asyncio.py index 6f39c800ed32..bc6d031113e9 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/grpc_asyncio.py @@ -17,23 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1.types import policytagmanager diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/async_client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/async_client.py index 50cdebdd8057..e7390ec3bf13 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/async_client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version @@ -44,8 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1.types import ( @@ -135,7 +137,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyTagManagerSerializationAsyncClient: The constructed client. """ - return PolicyTagManagerSerializationClient.from_service_account_info.__func__(PolicyTagManagerSerializationAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PolicyTagManagerSerializationClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + PolicyTagManagerSerializationAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -151,7 +158,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyTagManagerSerializationAsyncClient: The constructed client. """ - return PolicyTagManagerSerializationClient.from_service_account_file.__func__(PolicyTagManagerSerializationAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PolicyTagManagerSerializationClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + PolicyTagManagerSerializationAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -189,7 +201,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return PolicyTagManagerSerializationClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return PolicyTagManagerSerializationClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> PolicyTagManagerSerializationTransport: diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/client.py index 44c84ef64d3d..9fcee8849987 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version @@ -61,8 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1.types import ( @@ -84,13 +86,11 @@ class PolicyTagManagerSerializationClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] _transport_registry["grpc"] = PolicyTagManagerSerializationGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = PolicyTagManagerSerializationGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + PolicyTagManagerSerializationGrpcAsyncIOTransport + ) def get_transport_class( cls, @@ -644,11 +644,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyTagManagerSerializationClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyTagManagerSerializationClient._read_environment_variables() + ) self._client_cert_source = ( PolicyTagManagerSerializationClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -689,8 +687,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyTagManagerSerializationTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/__init__.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/__init__.py index 587c2d663ee0..92ec2d92667d 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/__init__.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import PolicyTagManagerSerializationGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] _transport_registry["grpc"] = PolicyTagManagerSerializationGrpcTransport _transport_registry["grpc_asyncio"] = PolicyTagManagerSerializationGrpcAsyncIOTransport diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py index 35c8d1db6b56..ec541df1d5a0 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py @@ -17,16 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1 import gapic_version as package_version from google.cloud.datacatalog_v1.types import ( @@ -245,13 +247,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc.py index 4778dff54f76..959b09df4ed8 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc.py @@ -16,20 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1.types import ( policytagmanager, diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py index da011a72edbb..296ccbe05df3 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py @@ -17,22 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1.types import ( policytagmanager, diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/__init__.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/__init__.py index 756f1454c91d..5e02cec14e54 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/__init__.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/__init__.py @@ -18,8 +18,15 @@ BigQueryRoutineSpec, CloudSqlBigQueryConnectionSpec, ) -from .common import IntegratedSystem, ManagingSystem, PersonalDetails -from .data_source import DataSource, StorageProperties +from .common import ( + IntegratedSystem, + ManagingSystem, + PersonalDetails, +) +from .data_source import ( + DataSource, + StorageProperties, +) from .datacatalog import ( BusinessContext, CatalogUIExperience, @@ -97,9 +104,17 @@ DataplexSpec, DataplexTableSpec, ) -from .dump_content import DumpItem, TaggedEntry -from .gcs_fileset_spec import GcsFilesetSpec, GcsFileSpec -from .physical_schema import PhysicalSchema +from .dump_content import ( + DumpItem, + TaggedEntry, +) +from .gcs_fileset_spec import ( + GcsFilesetSpec, + GcsFileSpec, +) +from .physical_schema import ( + PhysicalSchema, +) from .policytagmanager import ( CreatePolicyTagRequest, CreateTaxonomyRequest, @@ -127,8 +142,14 @@ SerializedPolicyTag, SerializedTaxonomy, ) -from .schema import ColumnSchema, Schema -from .search import SearchCatalogResult, SearchResultType +from .schema import ( + ColumnSchema, + Schema, +) +from .search import ( + SearchCatalogResult, + SearchResultType, +) from .table_spec import ( BigQueryDateShardedSpec, BigQueryTableSpec, @@ -136,9 +157,21 @@ TableSpec, ViewSpec, ) -from .tags import FieldType, Tag, TagField, TagTemplate, TagTemplateField -from .timestamps import SystemTimestamps -from .usage import CommonUsageStats, UsageSignal, UsageStats +from .tags import ( + FieldType, + Tag, + TagField, + TagTemplate, + TagTemplateField, +) +from .timestamps import ( + SystemTimestamps, +) +from .usage import ( + CommonUsageStats, + UsageSignal, + UsageStats, +) __all__ = ( "BigQueryConnectionSpec", diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/bigquery.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/bigquery.py index bdd4d5987a2f..6094dccc06ba 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/bigquery.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/bigquery.py @@ -56,6 +56,7 @@ class ConnectionType(proto.Enum): CLOUD_SQL (1): Cloud SQL connection. """ + CONNECTION_TYPE_UNSPECIFIED = 0 CLOUD_SQL = 1 @@ -101,6 +102,7 @@ class DatabaseType(proto.Enum): MYSQL (2): Cloud SQL for MySQL. """ + DATABASE_TYPE_UNSPECIFIED = 0 POSTGRES = 1 MYSQL = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/common.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/common.py index 2d67193d7547..240ee7e7345f 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/common.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/common.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -56,6 +56,7 @@ class IntegratedSystem(proto.Enum): VERTEX_AI (10): Vertex AI """ + INTEGRATED_SYSTEM_UNSPECIFIED = 0 BIGQUERY = 1 CLOUD_PUBSUB = 2 @@ -80,6 +81,7 @@ class ManagingSystem(proto.Enum): MANAGING_SYSTEM_OTHER (2): Other """ + MANAGING_SYSTEM_UNSPECIFIED = 0 MANAGING_SYSTEM_DATAPLEX = 1 MANAGING_SYSTEM_OTHER = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/data_source.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/data_source.py index 472907524d8f..762407176a8b 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/data_source.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/data_source.py @@ -62,6 +62,7 @@ class Service(proto.Enum): BIGQUERY (2): BigQuery service. """ + SERVICE_UNSPECIFIED = 0 CLOUD_STORAGE = 1 BIGQUERY = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/datacatalog.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/datacatalog.py index 724de0a3f464..500568dc07f8 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/datacatalog.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/datacatalog.py @@ -17,19 +17,24 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore -from google.cloud.datacatalog_v1.types import gcs_fileset_spec as gcd_gcs_fileset_spec -from google.cloud.datacatalog_v1.types import bigquery, common +from google.cloud.datacatalog_v1.types import ( + bigquery, + common, + dataplex_spec, + search, + table_spec, + timestamps, + usage, +) from google.cloud.datacatalog_v1.types import data_source as gcd_data_source -from google.cloud.datacatalog_v1.types import dataplex_spec +from google.cloud.datacatalog_v1.types import gcs_fileset_spec as gcd_gcs_fileset_spec from google.cloud.datacatalog_v1.types import schema as gcd_schema -from google.cloud.datacatalog_v1.types import search, table_spec from google.cloud.datacatalog_v1.types import tags as gcd_tags -from google.cloud.datacatalog_v1.types import timestamps, usage __protobuf__ = proto.module( package="google.cloud.datacatalog.v1", @@ -180,6 +185,7 @@ class EntryType(proto.Enum): Feature Group resource in Vertex AI Feature Store. """ + ENTRY_TYPE_UNSPECIFIED = 0 TABLE = 2 MODEL = 5 @@ -216,6 +222,7 @@ class TagTemplateMigration(proto.Enum): Migration of Tag Templates from Data Catalog to Dataplex is disabled. """ + TAG_TEMPLATE_MIGRATION_UNSPECIFIED = 0 TAG_TEMPLATE_MIGRATION_ENABLED = 1 TAG_TEMPLATE_MIGRATION_DISABLED = 2 @@ -233,6 +240,7 @@ class CatalogUIExperience(proto.Enum): CATALOG_UI_EXPERIENCE_DISABLED (2): The UI is Data Catalog. """ + CATALOG_UI_EXPERIENCE_UNSPECIFIED = 0 CATALOG_UI_EXPERIENCE_ENABLED = 1 CATALOG_UI_EXPERIENCE_DISABLED = 2 @@ -1254,6 +1262,7 @@ class TableType(proto.Enum): EXTERNAL (2): External table. """ + TABLE_TYPE_UNSPECIFIED = 0 NATIVE = 1 EXTERNAL = 2 @@ -1293,6 +1302,7 @@ class ViewType(proto.Enum): MATERIALIZED_VIEW (2): Materialized view. """ + VIEW_TYPE_UNSPECIFIED = 0 STANDARD_VIEW = 1 MATERIALIZED_VIEW = 2 @@ -1406,6 +1416,7 @@ class RoutineType(proto.Enum): PROCEDURE (2): Stored procedure. """ + ROUTINE_TYPE_UNSPECIFIED = 0 SCALAR_FUNCTION = 1 PROCEDURE = 2 @@ -1438,6 +1449,7 @@ class Mode(proto.Enum): INOUT (3): The argument is both an input and an output. """ + MODE_UNSPECIFIED = 0 IN = 1 OUT = 2 @@ -1651,12 +1663,12 @@ class CloudBigtableClusterSpec(proto.Message): number=4, ) - cloud_bigtable_cluster_specs: MutableSequence[ - CloudBigtableClusterSpec - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=CloudBigtableClusterSpec, + cloud_bigtable_cluster_specs: MutableSequence[CloudBigtableClusterSpec] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=CloudBigtableClusterSpec, + ) ) @@ -1722,6 +1734,7 @@ class ModelSourceType(proto.Enum): MARKETPLACE (7): The Model is saved or tuned from Marketplace. """ + MODEL_SOURCE_TYPE_UNSPECIFIED = 0 AUTOML = 1 CUSTOM = 2 @@ -1838,6 +1851,7 @@ class DataType(proto.Enum): Text prompt dataset which supports Large Language Models. """ + DATA_TYPE_UNSPECIFIED = 0 TABLE = 1 IMAGE = 2 @@ -1907,6 +1921,7 @@ class StorageType(proto.Enum): Underlying is optimized online server (Lightning). """ + STORAGE_TYPE_UNSPECIFIED = 0 BIGTABLE = 1 OPTIMIZED = 2 @@ -2549,6 +2564,7 @@ class ReconciliationState(proto.Enum): RECONCILIATION_DONE (3): The reconciliation has been finished. """ + RECONCILIATION_STATE_UNSPECIFIED = 0 RECONCILIATION_QUEUED = 1 RECONCILIATION_IN_PROGRESS = 2 @@ -2789,6 +2805,7 @@ class ImportState(proto.Enum): The import of entries has been abandoned in favor of a newer request. """ + IMPORT_STATE_UNSPECIFIED = 0 IMPORT_QUEUED = 1 IMPORT_IN_PROGRESS = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanager.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanager.py index 6f44057b6775..f30f710e9621 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanager.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanager.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.datacatalog_v1.types import common, timestamps @@ -119,6 +119,7 @@ class PolicyType(proto.Enum): Fine-grained access control policy that enables access control on tagged sub-resources. """ + POLICY_TYPE_UNSPECIFIED = 0 FINE_GRAINED_ACCESS_CONTROL = 1 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanagerserialization.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanagerserialization.py index 4d9607923f75..aee739649624 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanagerserialization.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/policytagmanagerserialization.py @@ -71,12 +71,12 @@ class SerializedTaxonomy(proto.Message): number=3, message="SerializedPolicyTag", ) - activated_policy_types: MutableSequence[ - policytagmanager.Taxonomy.PolicyType - ] = proto.RepeatedField( - proto.ENUM, - number=4, - enum=policytagmanager.Taxonomy.PolicyType, + activated_policy_types: MutableSequence[policytagmanager.Taxonomy.PolicyType] = ( + proto.RepeatedField( + proto.ENUM, + number=4, + enum=policytagmanager.Taxonomy.PolicyType, + ) ) diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/schema.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/schema.py index f413df73d198..44716e4a956a 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/schema.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/schema.py @@ -121,6 +121,7 @@ class IndexingType(proto.Enum): INDEXING_TYPE_PRIMARY_KEY (4): Column part of the primary key. """ + INDEXING_TYPE_UNSPECIFIED = 0 INDEXING_TYPE_NONE = 1 INDEXING_TYPE_NON_UNIQUE = 2 @@ -152,6 +153,7 @@ class LookerColumnType(proto.Enum): PARAMETER (5): Parameter. """ + LOOKER_COLUMN_TYPE_UNSPECIFIED = 0 DIMENSION = 1 DIMENSION_GROUP = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/search.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/search.py index c4c41d787514..35fd8ac3f381 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/search.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/search.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.datacatalog_v1.types import common @@ -44,6 +44,7 @@ class SearchResultType(proto.Enum): ENTRY_GROUP (3): An [EntryGroup][google.cloud.datacatalog.v1.EntryGroup]. """ + SEARCH_RESULT_TYPE_UNSPECIFIED = 0 ENTRY = 1 TAG_TEMPLATE = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/table_spec.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/table_spec.py index a79c8dbe3d5d..c25a35b0fcda 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/table_spec.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/table_spec.py @@ -44,6 +44,7 @@ class TableSourceType(proto.Enum): BIGQUERY_MATERIALIZED_VIEW (7): BigQuery materialized view. """ + TABLE_SOURCE_TYPE_UNSPECIFIED = 0 BIGQUERY_VIEW = 2 BIGQUERY_TABLE = 5 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/tags.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/tags.py index e95bdabbf278..8ca4021262c6 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/tags.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/tags.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -302,6 +302,7 @@ class DataplexTransferStatus(proto.Enum): Dataplex service. Visible in both services. Editable in Dataplex, read-only in DataCatalog. """ + DATAPLEX_TRANSFER_STATUS_UNSPECIFIED = 0 MIGRATED = 1 TRANSFERRED = 2 @@ -440,6 +441,7 @@ class PrimitiveType(proto.Enum): RICHTEXT (5): A Richtext description. """ + PRIMITIVE_TYPE_UNSPECIFIED = 0 DOUBLE = 1 STRING = 2 @@ -483,12 +485,12 @@ class EnumValue(proto.Message): number=1, ) - allowed_values: MutableSequence[ - "FieldType.EnumType.EnumValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="FieldType.EnumType.EnumValue", + allowed_values: MutableSequence["FieldType.EnumType.EnumValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="FieldType.EnumType.EnumValue", + ) ) primitive_type: PrimitiveType = proto.Field( diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/timestamps.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/timestamps.py index a8e5416fab69..6b503c53118e 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/timestamps.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/timestamps.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/usage.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/usage.py index 54a5fe55f129..a23eefd18b01 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/usage.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/types/usage.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -138,13 +138,13 @@ class UsageSignal(proto.Message): number=2, message="UsageStats", ) - common_usage_within_time_range: MutableMapping[ - str, "CommonUsageStats" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=3, - message="CommonUsageStats", + common_usage_within_time_range: MutableMapping[str, "CommonUsageStats"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=3, + message="CommonUsageStats", + ) ) favorite_count: int = proto.Field( proto.INT64, diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/__init__.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/__init__.py index f2999ce74684..4a398cd35844 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/__init__.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_catalog import DataCatalogAsyncClient, DataCatalogClient from .services.policy_tag_manager import ( PolicyTagManagerAsyncClient, diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/async_client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/async_client.py index 92d923efb87c..eb481aa8f750 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/async_client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version @@ -45,10 +45,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.services.data_catalog import pagers from google.cloud.datacatalog_v1beta1.types import ( @@ -145,7 +149,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataCatalogAsyncClient: The constructed client. """ - return DataCatalogClient.from_service_account_info.__func__(DataCatalogAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataCatalogClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataCatalogAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -161,7 +166,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataCatalogAsyncClient: The constructed client. """ - return DataCatalogClient.from_service_account_file.__func__(DataCatalogAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataCatalogClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataCatalogAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -3777,7 +3783,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -3939,7 +3945,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -4093,7 +4099,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/client.py index bc99b8fbe4ad..8b403441e329 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version @@ -61,10 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.services.data_catalog import pagers from google.cloud.datacatalog_v1beta1.types import ( @@ -759,11 +763,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataCatalogClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataCatalogClient._read_environment_variables() + ) self._client_cert_source = DataCatalogClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -798,8 +800,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataCatalogTransport, transport) self._api_endpoint = self._transport.host @@ -4242,7 +4243,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -4405,7 +4406,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -4560,7 +4561,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/pagers.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/pagers.py index 498659e6e696..742522ba86dc 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/pagers.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py index bf98b94cc235..cb9b02489621 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py @@ -17,17 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.datacatalog_v1beta1 import gapic_version as package_version from google.cloud.datacatalog_v1beta1.types import datacatalog, tags diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc.py index bfa06ab5b076..c36c6aff036f 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc.py @@ -16,21 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1beta1.types import datacatalog, tags @@ -932,12 +936,12 @@ def rename_tag_template_field_enum_value( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rename_tag_template_field_enum_value" not in self._stubs: - self._stubs[ - "rename_tag_template_field_enum_value" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.v1beta1.DataCatalog/RenameTagTemplateFieldEnumValue", - request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, - response_deserializer=tags.TagTemplateField.deserialize, + self._stubs["rename_tag_template_field_enum_value"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.v1beta1.DataCatalog/RenameTagTemplateFieldEnumValue", + request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, + response_deserializer=tags.TagTemplateField.deserialize, + ) ) return self._stubs["rename_tag_template_field_enum_value"] diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc_asyncio.py index 8d6ba874000e..1c2802909238 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/grpc_asyncio.py @@ -17,23 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1beta1.types import datacatalog, tags @@ -958,12 +962,12 @@ def rename_tag_template_field_enum_value( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rename_tag_template_field_enum_value" not in self._stubs: - self._stubs[ - "rename_tag_template_field_enum_value" - ] = self._logged_channel.unary_unary( - "/google.cloud.datacatalog.v1beta1.DataCatalog/RenameTagTemplateFieldEnumValue", - request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, - response_deserializer=tags.TagTemplateField.deserialize, + self._stubs["rename_tag_template_field_enum_value"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datacatalog.v1beta1.DataCatalog/RenameTagTemplateFieldEnumValue", + request_serializer=datacatalog.RenameTagTemplateFieldEnumValueRequest.serialize, + response_deserializer=tags.TagTemplateField.deserialize, + ) ) return self._stubs["rename_tag_template_field_enum_value"] diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/async_client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/async_client.py index a2c251489f5d..617a8565e57c 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/async_client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version @@ -44,8 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.services.policy_tag_manager import pagers @@ -121,7 +125,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyTagManagerAsyncClient: The constructed client. """ - return PolicyTagManagerClient.from_service_account_info.__func__(PolicyTagManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PolicyTagManagerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PolicyTagManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +142,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyTagManagerAsyncClient: The constructed client. """ - return PolicyTagManagerClient.from_service_account_file.__func__(PolicyTagManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PolicyTagManagerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PolicyTagManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -1493,7 +1499,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -1609,7 +1615,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -1726,7 +1732,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/client.py index 90703cee3f4d..37c508d440d2 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version @@ -61,8 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.services.policy_tag_manager import pagers @@ -81,9 +85,7 @@ class PolicyTagManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyTagManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyTagManagerTransport]] _transport_registry["grpc"] = PolicyTagManagerGrpcTransport _transport_registry["grpc_asyncio"] = PolicyTagManagerGrpcAsyncIOTransport @@ -650,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyTagManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyTagManagerClient._read_environment_variables() + ) self._client_cert_source = PolicyTagManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -689,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyTagManagerTransport, transport) self._api_endpoint = self._transport.host @@ -1925,7 +1924,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -2040,7 +2039,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -2156,7 +2155,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import datacatalog_v1beta1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/pagers.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/pagers.py index 113421ba5493..f7c919bb8d2f 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/pagers.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py index 9f49398560cf..2f2230bbecf3 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py @@ -17,17 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.datacatalog_v1beta1 import gapic_version as package_version from google.cloud.datacatalog_v1beta1.types import policytagmanager diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc.py index 5de31cc2e07b..7ab021ce03a9 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc.py @@ -16,21 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1beta1.types import policytagmanager diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc_asyncio.py index 204e74786b0e..ad875c05b72b 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/grpc_asyncio.py @@ -17,23 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1beta1.types import policytagmanager diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/async_client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/async_client.py index 804c12a478cd..2b5a84007559 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/async_client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version @@ -44,8 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.types import ( @@ -132,7 +134,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyTagManagerSerializationAsyncClient: The constructed client. """ - return PolicyTagManagerSerializationClient.from_service_account_info.__func__(PolicyTagManagerSerializationAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PolicyTagManagerSerializationClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + PolicyTagManagerSerializationAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +155,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyTagManagerSerializationAsyncClient: The constructed client. """ - return PolicyTagManagerSerializationClient.from_service_account_file.__func__(PolicyTagManagerSerializationAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PolicyTagManagerSerializationClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + PolicyTagManagerSerializationAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -186,7 +198,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return PolicyTagManagerSerializationClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return PolicyTagManagerSerializationClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> PolicyTagManagerSerializationTransport: diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/client.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/client.py index 1151df269d39..c5aefb9f07fa 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/client.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version @@ -61,8 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.types import ( @@ -83,13 +85,11 @@ class PolicyTagManagerSerializationClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] _transport_registry["grpc"] = PolicyTagManagerSerializationGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = PolicyTagManagerSerializationGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + PolicyTagManagerSerializationGrpcAsyncIOTransport + ) def get_transport_class( cls, @@ -641,11 +641,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyTagManagerSerializationClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyTagManagerSerializationClient._read_environment_variables() + ) self._client_cert_source = ( PolicyTagManagerSerializationClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -686,8 +684,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyTagManagerSerializationTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/__init__.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/__init__.py index 587c2d663ee0..92ec2d92667d 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/__init__.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import PolicyTagManagerSerializationGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PolicyTagManagerSerializationTransport]] _transport_registry["grpc"] = PolicyTagManagerSerializationGrpcTransport _transport_registry["grpc_asyncio"] = PolicyTagManagerSerializationGrpcAsyncIOTransport diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py index ee6ab1b0a76a..e715a6a4dde9 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py @@ -17,16 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datacatalog_v1beta1 import gapic_version as package_version from google.cloud.datacatalog_v1beta1.types import policytagmanagerserialization diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc.py index 37fb905af2c3..90c5ddcaa3a4 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc.py @@ -16,20 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1beta1.types import policytagmanagerserialization diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py index a677d3bdd22e..73de14a40b1c 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/grpc_asyncio.py @@ -17,22 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datacatalog_v1beta1.types import policytagmanagerserialization diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/__init__.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/__init__.py index 1a2919ac33a6..42a932a8399a 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/__init__.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .common import IntegratedSystem, ManagingSystem +from .common import ( + IntegratedSystem, + ManagingSystem, +) from .datacatalog import ( CreateEntryGroupRequest, CreateEntryRequest, @@ -48,7 +51,10 @@ UpdateTagTemplateFieldRequest, UpdateTagTemplateRequest, ) -from .gcs_fileset_spec import GcsFilesetSpec, GcsFileSpec +from .gcs_fileset_spec import ( + GcsFilesetSpec, + GcsFileSpec, +) from .policytagmanager import ( CreatePolicyTagRequest, CreateTaxonomyRequest, @@ -74,8 +80,14 @@ SerializedPolicyTag, SerializedTaxonomy, ) -from .schema import ColumnSchema, Schema -from .search import SearchCatalogResult, SearchResultType +from .schema import ( + ColumnSchema, + Schema, +) +from .search import ( + SearchCatalogResult, + SearchResultType, +) from .table_spec import ( BigQueryDateShardedSpec, BigQueryTableSpec, @@ -83,9 +95,20 @@ TableSpec, ViewSpec, ) -from .tags import FieldType, Tag, TagField, TagTemplate, TagTemplateField -from .timestamps import SystemTimestamps -from .usage import UsageSignal, UsageStats +from .tags import ( + FieldType, + Tag, + TagField, + TagTemplate, + TagTemplateField, +) +from .timestamps import ( + SystemTimestamps, +) +from .usage import ( + UsageSignal, + UsageStats, +) __all__ = ( "IntegratedSystem", diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/common.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/common.py index 4176d8ec60a5..d2df7c5c3f91 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/common.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/common.py @@ -40,6 +40,7 @@ class IntegratedSystem(proto.Enum): CLOUD_PUBSUB (2): Cloud Pub/Sub. """ + INTEGRATED_SYSTEM_UNSPECIFIED = 0 BIGQUERY = 1 CLOUD_PUBSUB = 2 @@ -57,6 +58,7 @@ class ManagingSystem(proto.Enum): MANAGING_SYSTEM_OTHER (2): Other """ + MANAGING_SYSTEM_UNSPECIFIED = 0 MANAGING_SYSTEM_DATAPLEX = 1 MANAGING_SYSTEM_OTHER = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/datacatalog.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/datacatalog.py index e353946de2f0..fe3c18e2c03e 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/datacatalog.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/datacatalog.py @@ -17,17 +17,21 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore +from google.cloud.datacatalog_v1beta1.types import ( + common, + search, + table_spec, + timestamps, + usage, +) from google.cloud.datacatalog_v1beta1.types import ( gcs_fileset_spec as gcd_gcs_fileset_spec, ) -from google.cloud.datacatalog_v1beta1.types import common from google.cloud.datacatalog_v1beta1.types import schema as gcd_schema -from google.cloud.datacatalog_v1beta1.types import search, table_spec from google.cloud.datacatalog_v1beta1.types import tags as gcd_tags -from google.cloud.datacatalog_v1beta1.types import timestamps, usage __protobuf__ = proto.module( package="google.cloud.datacatalog.v1beta1", @@ -89,6 +93,7 @@ class EntryType(proto.Enum): An entry type which is a set of files or objects. Example: Cloud Storage fileset. """ + ENTRY_TYPE_UNSPECIFIED = 0 TABLE = 2 MODEL = 5 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanager.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanager.py index a9cca861671c..fd892707ec34 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanager.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanager.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.datacatalog_v1beta1.types import common, timestamps @@ -97,6 +97,7 @@ class PolicyType(proto.Enum): Fine grained access control policy, which enables access control on tagged resources. """ + POLICY_TYPE_UNSPECIFIED = 0 FINE_GRAINED_ACCESS_CONTROL = 1 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanagerserialization.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanagerserialization.py index c166d56a320f..0fbb1096f710 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanagerserialization.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/policytagmanagerserialization.py @@ -69,12 +69,12 @@ class SerializedTaxonomy(proto.Message): number=3, message="SerializedPolicyTag", ) - activated_policy_types: MutableSequence[ - policytagmanager.Taxonomy.PolicyType - ] = proto.RepeatedField( - proto.ENUM, - number=4, - enum=policytagmanager.Taxonomy.PolicyType, + activated_policy_types: MutableSequence[policytagmanager.Taxonomy.PolicyType] = ( + proto.RepeatedField( + proto.ENUM, + number=4, + enum=policytagmanager.Taxonomy.PolicyType, + ) ) diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/search.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/search.py index 57ff615c8ebf..10c8c1d33851 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/search.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/search.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -45,6 +45,7 @@ class SearchResultType(proto.Enum): An [EntryGroup][google.cloud.datacatalog.v1beta1.EntryGroup]. """ + SEARCH_RESULT_TYPE_UNSPECIFIED = 0 ENTRY = 1 TAG_TEMPLATE = 2 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/table_spec.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/table_spec.py index ebbfb6e03be2..fa7f58118f0f 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/table_spec.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/table_spec.py @@ -44,6 +44,7 @@ class TableSourceType(proto.Enum): BIGQUERY_MATERIALIZED_VIEW (7): BigQuery materialized view. """ + TABLE_SOURCE_TYPE_UNSPECIFIED = 0 BIGQUERY_VIEW = 2 BIGQUERY_TABLE = 5 diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/tags.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/tags.py index 5daa5f137e14..750f744c90bd 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/tags.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/tags.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -262,6 +262,7 @@ class DataplexTransferStatus(proto.Enum): deprecated in favor of organization or project wide TagTemplate migration opt-in. """ + DATAPLEX_TRANSFER_STATUS_UNSPECIFIED = 0 MIGRATED = 1 @@ -383,6 +384,7 @@ class PrimitiveType(proto.Enum): TIMESTAMP (4): A timestamp. """ + PRIMITIVE_TYPE_UNSPECIFIED = 0 DOUBLE = 1 STRING = 2 @@ -411,12 +413,12 @@ class EnumValue(proto.Message): number=1, ) - allowed_values: MutableSequence[ - "FieldType.EnumType.EnumValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="FieldType.EnumType.EnumValue", + allowed_values: MutableSequence["FieldType.EnumType.EnumValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="FieldType.EnumType.EnumValue", + ) ) primitive_type: PrimitiveType = proto.Field( diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/timestamps.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/timestamps.py index 291236f290e5..48f4f12f97e4 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/timestamps.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/timestamps.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/usage.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/usage.py index 05ed633df9a8..305e6a912058 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/usage.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/types/usage.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-datacatalog/noxfile.py b/packages/google-cloud-datacatalog/noxfile.py index cacbb9c028b7..0d16c726a7e5 100644 --- a/packages/google-cloud-datacatalog/noxfile.py +++ b/packages/google-cloud-datacatalog/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_async.py index ed77ccd8ffce..1731be276961 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_DataCatalog_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_sync.py index b710b5ac3d4c..bc38d3b842a9 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_DataCatalog_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_async.py index 9fb23641ecc4..522f7e4f026c 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_DataCatalog_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_sync.py index ca7bf9e8c6d7..bd84f21fd501 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_DataCatalog_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_async.py index f5bf0b9909c4..8051262fa841 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_DataCatalog_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_sync.py index fa5792207edb..649e1ab8b7b2 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_data_catalog_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_DataCatalog_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_async.py index 9b19bd3a8c53..c74bc957a039 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_PolicyTagManager_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_sync.py index f980adc2478d..791841661695 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_PolicyTagManager_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_async.py index f9524cd1489f..a704ec81c502 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_PolicyTagManager_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_sync.py index 2085ed013a84..de1936617c55 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_PolicyTagManager_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_async.py index 0ca7c74e743d..5eb4824cb2fe 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_PolicyTagManager_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_sync.py index 5aa6fbee6482..45880225cb03 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1_generated_policy_tag_manager_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1_generated_PolicyTagManager_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_async.py index 02408dc4b624..38b7cbe332b6 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_DataCatalog_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_sync.py index 35652c0ccc53..24601dcfacc0 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_DataCatalog_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_async.py index 1f6f0b5a4e44..82847d688f90 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_DataCatalog_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_sync.py index 8539dfbf26b3..69c15c0f5721 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_DataCatalog_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_async.py index bf2c8064c2b0..357042ade4a4 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_DataCatalog_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_sync.py index b370c30e0232..1bc9c3aab662 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_data_catalog_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_DataCatalog_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_async.py index cbc8c86f9d6e..03f37a3151c5 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_PolicyTagManager_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_sync.py index bf7697248076..7b4b85c5817f 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_PolicyTagManager_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_async.py index c528cda2ae0d..886c71281410 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_PolicyTagManager_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_sync.py index 75087ea881bc..f6cece9e3f9c 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_PolicyTagManager_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_async.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_async.py index 19920f5646bd..aa5fc217f4b9 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_async.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_PolicyTagManager_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_sync.py b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_sync.py index 34e62949a195..5a749a71a2c7 100644 --- a/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_sync.py +++ b/packages/google-cloud-datacatalog/samples/generated_samples/datacatalog_v1beta1_generated_policy_tag_manager_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-datacatalog -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START datacatalog_v1beta1_generated_PolicyTagManager_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import datacatalog_v1beta1 diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_data_catalog.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_data_catalog.py index 7e9b1ddb3464..8a592df4367a 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_data_catalog.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_data_catalog.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,21 +57,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.datacatalog_v1.services.data_catalog import ( DataCatalogAsyncClient, @@ -933,10 +938,9 @@ def test_data_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -981,10 +985,9 @@ def test_data_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1020,10 +1023,9 @@ def test_data_catalog_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1250,13 +1252,13 @@ def test_data_catalog_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1864,9 +1866,9 @@ def test_create_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_group] = ( + mock_rpc + ) request = {} client.create_entry_group(request) @@ -2578,9 +2580,9 @@ def test_update_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entry_group] = ( + mock_rpc + ) request = {} client.update_entry_group(request) @@ -2932,9 +2934,9 @@ def test_delete_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_group] = ( + mock_rpc + ) request = {} client.delete_entry_group(request) @@ -3264,9 +3266,9 @@ def test_list_entry_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entry_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entry_groups] = ( + mock_rpc + ) request = {} client.list_entry_groups(request) @@ -5881,9 +5883,9 @@ def test_modify_entry_overview_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.modify_entry_overview - ] = mock_rpc + client._transport._wrapped_methods[client._transport.modify_entry_overview] = ( + mock_rpc + ) request = {} client.modify_entry_overview(request) @@ -6134,9 +6136,9 @@ def test_modify_entry_contacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.modify_entry_contacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.modify_entry_contacts] = ( + mock_rpc + ) request = {} client.modify_entry_contacts(request) @@ -6397,9 +6399,9 @@ def test_create_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tag_template] = ( + mock_rpc + ) request = {} client.create_tag_template(request) @@ -6766,9 +6768,9 @@ def test_get_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tag_template] = ( + mock_rpc + ) request = {} client.get_tag_template(request) @@ -7107,9 +7109,9 @@ def test_update_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tag_template] = ( + mock_rpc + ) request = {} client.update_tag_template(request) @@ -7460,9 +7462,9 @@ def test_delete_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tag_template] = ( + mock_rpc + ) request = {} client.delete_tag_template(request) @@ -12719,9 +12721,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -16002,11 +16004,14 @@ def test_data_catalog_base_transport(): def test_data_catalog_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_v1.services.data_catalog.transports.DataCatalogTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.datacatalog_v1.services.data_catalog.transports.DataCatalogTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataCatalogTransport( @@ -16023,9 +16028,12 @@ def test_data_catalog_base_transport_with_credentials_file(): def test_data_catalog_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.datacatalog_v1.services.data_catalog.transports.DataCatalogTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.datacatalog_v1.services.data_catalog.transports.DataCatalogTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataCatalogTransport() @@ -16096,11 +16104,12 @@ def test_data_catalog_transport_auth_gdch_credentials(transport_class): def test_data_catalog_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py index dd8b98a1ddac..c3da79ba2073 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,21 +39,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.datacatalog_v1.services.policy_tag_manager import ( PolicyTagManagerAsyncClient, @@ -948,10 +958,9 @@ def test_policy_tag_manager_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +1005,9 @@ def test_policy_tag_manager_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1043,9 @@ def test_policy_tag_manager_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1279,13 +1286,13 @@ def test_policy_tag_manager_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3283,9 +3290,9 @@ def test_create_policy_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_policy_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_policy_tag] = ( + mock_rpc + ) request = {} client.create_policy_tag(request) @@ -3638,9 +3645,9 @@ def test_delete_policy_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_policy_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_policy_tag] = ( + mock_rpc + ) request = {} client.delete_policy_tag(request) @@ -3973,9 +3980,9 @@ def test_update_policy_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_policy_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_policy_tag] = ( + mock_rpc + ) request = {} client.update_policy_tag(request) @@ -4319,9 +4326,9 @@ def test_list_policy_tags_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_policy_tags - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_policy_tags] = ( + mock_rpc + ) request = {} client.list_policy_tags(request) @@ -5704,9 +5711,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6740,11 +6747,14 @@ def test_policy_tag_manager_base_transport(): def test_policy_tag_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_v1.services.policy_tag_manager.transports.PolicyTagManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.datacatalog_v1.services.policy_tag_manager.transports.PolicyTagManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyTagManagerTransport( @@ -6761,9 +6771,12 @@ def test_policy_tag_manager_base_transport_with_credentials_file(): def test_policy_tag_manager_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.datacatalog_v1.services.policy_tag_manager.transports.PolicyTagManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.datacatalog_v1.services.policy_tag_manager.transports.PolicyTagManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyTagManagerTransport() @@ -6834,11 +6847,12 @@ def test_policy_tag_manager_transport_auth_gdch_credentials(transport_class): def test_policy_tag_manager_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py index b2e3fd6eb01a..c073f361bf64 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,16 +39,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -1019,10 +1026,9 @@ def test_policy_tag_manager_serialization_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1067,10 +1073,9 @@ def test_policy_tag_manager_serialization_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1106,10 +1111,9 @@ def test_policy_tag_manager_serialization_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,13 +1363,13 @@ def test_policy_tag_manager_serialization_client_create_channel_credentials_file ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1484,9 +1488,9 @@ def test_replace_taxonomy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.replace_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.replace_taxonomy] = ( + mock_rpc + ) request = {} client.replace_taxonomy(request) @@ -1741,9 +1745,9 @@ def test_import_taxonomies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_taxonomies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_taxonomies] = ( + mock_rpc + ) request = {} client.import_taxonomies(request) @@ -1989,9 +1993,9 @@ def test_export_taxonomies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_taxonomies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_taxonomies] = ( + mock_rpc + ) request = {} client.export_taxonomies(request) @@ -2483,11 +2487,14 @@ def test_policy_tag_manager_serialization_base_transport(): def test_policy_tag_manager_serialization_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_v1.services.policy_tag_manager_serialization.transports.PolicyTagManagerSerializationTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.datacatalog_v1.services.policy_tag_manager_serialization.transports.PolicyTagManagerSerializationTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyTagManagerSerializationTransport( @@ -2504,9 +2511,12 @@ def test_policy_tag_manager_serialization_base_transport_with_credentials_file() def test_policy_tag_manager_serialization_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.datacatalog_v1.services.policy_tag_manager_serialization.transports.PolicyTagManagerSerializationTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.datacatalog_v1.services.policy_tag_manager_serialization.transports.PolicyTagManagerSerializationTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyTagManagerSerializationTransport() @@ -2584,11 +2594,12 @@ def test_policy_tag_manager_serialization_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py index 300e1af46a01..9fa8d34f5200 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,21 +39,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.services.data_catalog import ( DataCatalogAsyncClient, @@ -920,10 +930,9 @@ def test_data_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +977,9 @@ def test_data_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1007,10 +1015,9 @@ def test_data_catalog_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1237,13 +1244,13 @@ def test_data_catalog_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1849,9 +1856,9 @@ def test_create_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_group] = ( + mock_rpc + ) request = {} client.create_entry_group(request) @@ -2214,9 +2221,9 @@ def test_update_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entry_group] = ( + mock_rpc + ) request = {} client.update_entry_group(request) @@ -2907,9 +2914,9 @@ def test_delete_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_group] = ( + mock_rpc + ) request = {} client.delete_entry_group(request) @@ -3239,9 +3246,9 @@ def test_list_entry_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entry_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entry_groups] = ( + mock_rpc + ) request = {} client.list_entry_groups(request) @@ -5842,9 +5849,9 @@ def test_create_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tag_template] = ( + mock_rpc + ) request = {} client.create_tag_template(request) @@ -6207,9 +6214,9 @@ def test_get_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tag_template] = ( + mock_rpc + ) request = {} client.get_tag_template(request) @@ -6544,9 +6551,9 @@ def test_update_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tag_template] = ( + mock_rpc + ) request = {} client.update_tag_template(request) @@ -6895,9 +6902,9 @@ def test_delete_tag_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tag_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tag_template] = ( + mock_rpc + ) request = {} client.delete_tag_template(request) @@ -11255,9 +11262,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -13062,11 +13069,14 @@ def test_data_catalog_base_transport(): def test_data_catalog_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_v1beta1.services.data_catalog.transports.DataCatalogTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.datacatalog_v1beta1.services.data_catalog.transports.DataCatalogTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataCatalogTransport( @@ -13083,9 +13093,12 @@ def test_data_catalog_base_transport_with_credentials_file(): def test_data_catalog_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.datacatalog_v1beta1.services.data_catalog.transports.DataCatalogTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.datacatalog_v1beta1.services.data_catalog.transports.DataCatalogTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataCatalogTransport() @@ -13156,11 +13169,12 @@ def test_data_catalog_transport_auth_gdch_credentials(transport_class): def test_data_catalog_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py index 5cea894ebcb8..7318c9105de3 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,21 +39,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.datacatalog_v1beta1.services.policy_tag_manager import ( PolicyTagManagerAsyncClient, @@ -948,10 +958,9 @@ def test_policy_tag_manager_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -996,10 +1005,9 @@ def test_policy_tag_manager_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1043,9 @@ def test_policy_tag_manager_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1279,13 +1286,13 @@ def test_policy_tag_manager_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3283,9 +3290,9 @@ def test_create_policy_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_policy_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_policy_tag] = ( + mock_rpc + ) request = {} client.create_policy_tag(request) @@ -3638,9 +3645,9 @@ def test_delete_policy_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_policy_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_policy_tag] = ( + mock_rpc + ) request = {} client.delete_policy_tag(request) @@ -3973,9 +3980,9 @@ def test_update_policy_tag_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_policy_tag - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_policy_tag] = ( + mock_rpc + ) request = {} client.update_policy_tag(request) @@ -4319,9 +4326,9 @@ def test_list_policy_tags_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_policy_tags - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_policy_tags] = ( + mock_rpc + ) request = {} client.list_policy_tags(request) @@ -5704,9 +5711,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6736,11 +6743,14 @@ def test_policy_tag_manager_base_transport(): def test_policy_tag_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_v1beta1.services.policy_tag_manager.transports.PolicyTagManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.datacatalog_v1beta1.services.policy_tag_manager.transports.PolicyTagManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyTagManagerTransport( @@ -6757,9 +6767,12 @@ def test_policy_tag_manager_base_transport_with_credentials_file(): def test_policy_tag_manager_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.datacatalog_v1beta1.services.policy_tag_manager.transports.PolicyTagManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.datacatalog_v1beta1.services.policy_tag_manager.transports.PolicyTagManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyTagManagerTransport() @@ -6830,11 +6843,12 @@ def test_policy_tag_manager_transport_auth_gdch_credentials(transport_class): def test_policy_tag_manager_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py index 5d61d60abf52..7aa5682328da 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,16 +39,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -1018,10 +1025,9 @@ def test_policy_tag_manager_serialization_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1066,10 +1072,9 @@ def test_policy_tag_manager_serialization_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1105,10 +1110,9 @@ def test_policy_tag_manager_serialization_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1358,13 +1362,13 @@ def test_policy_tag_manager_serialization_client_create_channel_credentials_file ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1472,9 +1476,9 @@ def test_import_taxonomies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_taxonomies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_taxonomies] = ( + mock_rpc + ) request = {} client.import_taxonomies(request) @@ -1720,9 +1724,9 @@ def test_export_taxonomies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_taxonomies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_taxonomies] = ( + mock_rpc + ) request = {} client.export_taxonomies(request) @@ -2155,11 +2159,14 @@ def test_policy_tag_manager_serialization_base_transport(): def test_policy_tag_manager_serialization_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datacatalog_v1beta1.services.policy_tag_manager_serialization.transports.PolicyTagManagerSerializationTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.datacatalog_v1beta1.services.policy_tag_manager_serialization.transports.PolicyTagManagerSerializationTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyTagManagerSerializationTransport( @@ -2176,9 +2183,12 @@ def test_policy_tag_manager_serialization_base_transport_with_credentials_file() def test_policy_tag_manager_serialization_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.datacatalog_v1beta1.services.policy_tag_manager_serialization.transports.PolicyTagManagerSerializationTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.datacatalog_v1beta1.services.policy_tag_manager_serialization.transports.PolicyTagManagerSerializationTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyTagManagerSerializationTransport() @@ -2256,11 +2266,12 @@ def test_policy_tag_manager_serialization_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataflow-client/docs/conf.py b/packages/google-cloud-dataflow-client/docs/conf.py index 2c2615370f4f..f99aa148d1fc 100644 --- a/packages/google-cloud-dataflow-client/docs/conf.py +++ b/packages/google-cloud-dataflow-client/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-dataflow-client documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/__init__.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/__init__.py index 7f5cf5e9bdfc..9158fce77d99 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/__init__.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.flex_templates_service import ( FlexTemplatesServiceAsyncClient, FlexTemplatesServiceClient, diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/async_client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/async_client.py index 959ab0ff0428..7dbe032e2c17 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/async_client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -110,7 +110,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FlexTemplatesServiceAsyncClient: The constructed client. """ - return FlexTemplatesServiceClient.from_service_account_info.__func__(FlexTemplatesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = FlexTemplatesServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(FlexTemplatesServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -126,7 +127,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FlexTemplatesServiceAsyncClient: The constructed client. """ - return FlexTemplatesServiceClient.from_service_account_file.__func__(FlexTemplatesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = FlexTemplatesServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(FlexTemplatesServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -164,7 +166,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return FlexTemplatesServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return FlexTemplatesServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> FlexTemplatesServiceTransport: diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/client.py index 983aaccc11d5..aad5ad945f49 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -77,9 +77,7 @@ class FlexTemplatesServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FlexTemplatesServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FlexTemplatesServiceTransport]] _transport_registry["grpc"] = FlexTemplatesServiceGrpcTransport _transport_registry["grpc_asyncio"] = FlexTemplatesServiceGrpcAsyncIOTransport _transport_registry["rest"] = FlexTemplatesServiceRestTransport @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FlexTemplatesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FlexTemplatesServiceClient._read_environment_variables() + ) self._client_cert_source = FlexTemplatesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FlexTemplatesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/__init__.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/__init__.py index 3c7f952eac00..c99d112b0631 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/__init__.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import FlexTemplatesServiceRestInterceptor, FlexTemplatesServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[FlexTemplatesServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[FlexTemplatesServiceTransport]] _transport_registry["grpc"] = FlexTemplatesServiceGrpcTransport _transport_registry["grpc_asyncio"] = FlexTemplatesServiceGrpcAsyncIOTransport _transport_registry["rest"] = FlexTemplatesServiceRestTransport diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/base.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/base.py index a56baff4d6e2..05dc6b65a854 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/base.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version from google.cloud.dataflow_v1beta3.types import templates diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc.py index d189e3e015f6..964262e87d16 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataflow_v1beta3.types import templates diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc_asyncio.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc_asyncio.py index e402dd050ee2..91b3405f61f5 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataflow_v1beta3.types import templates diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/rest.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/rest.py index 47b5d4a2f687..2d7f5a28f3a6 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/rest.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -283,9 +283,7 @@ def __call__( """ - http_options = ( - _BaseFlexTemplatesServiceRestTransport._BaseLaunchFlexTemplate._get_http_options() - ) + http_options = _BaseFlexTemplatesServiceRestTransport._BaseLaunchFlexTemplate._get_http_options() request, metadata = self._interceptor.pre_launch_flex_template( request, metadata diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/async_client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/async_client.py index 8dbbc5af3353..6b79d13484fe 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/async_client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.jobs_v1_beta3 import pagers from google.cloud.dataflow_v1beta3.types import environment, jobs, snapshots @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: JobsV1Beta3AsyncClient: The constructed client. """ - return JobsV1Beta3Client.from_service_account_info.__func__(JobsV1Beta3AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = JobsV1Beta3Client.from_service_account_info.__func__ # type: ignore + return sa_info_func(JobsV1Beta3AsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: JobsV1Beta3AsyncClient: The constructed client. """ - return JobsV1Beta3Client.from_service_account_file.__func__(JobsV1Beta3AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = JobsV1Beta3Client.from_service_account_file.__func__ # type: ignore + return sa_file_func(JobsV1Beta3AsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/client.py index 8b855be41b14..214322989b64 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.jobs_v1_beta3 import pagers from google.cloud.dataflow_v1beta3.types import environment, jobs, snapshots @@ -602,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = JobsV1Beta3Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + JobsV1Beta3Client._read_environment_variables() + ) self._client_cert_source = JobsV1Beta3Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(JobsV1Beta3Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/pagers.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/pagers.py index 2fd1593865ce..a05a3176a748 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/pagers.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/base.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/base.py index e6538359be61..4449ab7f7843 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/base.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version from google.cloud.dataflow_v1beta3.types import jobs, snapshots diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc.py index 95e231e1948f..fa050c3ef497 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataflow_v1beta3.types import jobs, snapshots diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc_asyncio.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc_asyncio.py index 38a382935974..882f96e637ff 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataflow_v1beta3.types import jobs, snapshots diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/rest.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/rest.py index a534a58b5e2f..3182dc290dbd 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/rest.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -546,9 +546,7 @@ def __call__( """ - http_options = ( - _BaseJobsV1Beta3RestTransport._BaseAggregatedListJobs._get_http_options() - ) + http_options = _BaseJobsV1Beta3RestTransport._BaseAggregatedListJobs._get_http_options() request, metadata = self._interceptor.pre_aggregated_list_jobs( request, metadata diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/async_client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/async_client.py index a6d080d5677a..5d794478e93a 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/async_client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MessagesV1Beta3AsyncClient: The constructed client. """ - return MessagesV1Beta3Client.from_service_account_info.__func__(MessagesV1Beta3AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MessagesV1Beta3Client.from_service_account_info.__func__ # type: ignore + return sa_info_func(MessagesV1Beta3AsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MessagesV1Beta3AsyncClient: The constructed client. """ - return MessagesV1Beta3Client.from_service_account_file.__func__(MessagesV1Beta3AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MessagesV1Beta3Client.from_service_account_file.__func__ # type: ignore + return sa_file_func(MessagesV1Beta3AsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/client.py index 01d11666c952..9ac1e76c719c 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -78,9 +78,7 @@ class MessagesV1Beta3ClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MessagesV1Beta3Transport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MessagesV1Beta3Transport]] _transport_registry["grpc"] = MessagesV1Beta3GrpcTransport _transport_registry["grpc_asyncio"] = MessagesV1Beta3GrpcAsyncIOTransport _transport_registry["rest"] = MessagesV1Beta3RestTransport @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MessagesV1Beta3Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MessagesV1Beta3Client._read_environment_variables() + ) self._client_cert_source = MessagesV1Beta3Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MessagesV1Beta3Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/pagers.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/pagers.py index 87c522025ea8..8e92eaef222e 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/pagers.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/base.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/base.py index bcc3f5be8216..80b51f5ad61a 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/base.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version from google.cloud.dataflow_v1beta3.types import messages diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc.py index 49ad5420e626..88e8dc1fdcd6 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataflow_v1beta3.types import messages diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc_asyncio.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc_asyncio.py index 1f1b7553b715..4bcd35c209a4 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataflow_v1beta3.types import messages diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/rest.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/rest.py index e59038f9b41e..3c4f5546456b 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/rest.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/messages_v1_beta3/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -285,9 +285,7 @@ def __call__( """ - http_options = ( - _BaseMessagesV1Beta3RestTransport._BaseListJobMessages._get_http_options() - ) + http_options = _BaseMessagesV1Beta3RestTransport._BaseListJobMessages._get_http_options() request, metadata = self._interceptor.pre_list_job_messages( request, metadata diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/async_client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/async_client.py index 182037accadc..b51d7a0df18c 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/async_client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.metrics_v1_beta3 import pagers from google.cloud.dataflow_v1beta3.types import metrics @@ -115,7 +115,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetricsV1Beta3AsyncClient: The constructed client. """ - return MetricsV1Beta3Client.from_service_account_info.__func__(MetricsV1Beta3AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MetricsV1Beta3Client.from_service_account_info.__func__ # type: ignore + return sa_info_func(MetricsV1Beta3AsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +132,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetricsV1Beta3AsyncClient: The constructed client. """ - return MetricsV1Beta3Client.from_service_account_file.__func__(MetricsV1Beta3AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MetricsV1Beta3Client.from_service_account_file.__func__ # type: ignore + return sa_file_func(MetricsV1Beta3AsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/client.py index e25d975ff7a4..543841a1cf18 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.metrics_v1_beta3 import pagers from google.cloud.dataflow_v1beta3.types import metrics @@ -80,9 +80,7 @@ class MetricsV1Beta3ClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MetricsV1Beta3Transport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MetricsV1Beta3Transport]] _transport_registry["grpc"] = MetricsV1Beta3GrpcTransport _transport_registry["grpc_asyncio"] = MetricsV1Beta3GrpcAsyncIOTransport _transport_registry["rest"] = MetricsV1Beta3RestTransport @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetricsV1Beta3Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetricsV1Beta3Client._read_environment_variables() + ) self._client_cert_source = MetricsV1Beta3Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetricsV1Beta3Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/pagers.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/pagers.py index 035b794fa369..43dd870add82 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/pagers.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/base.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/base.py index 5af7c26dd637..888af0a02fa9 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/base.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version from google.cloud.dataflow_v1beta3.types import metrics diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc.py index 7575d35d4599..90f8f3c174c6 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataflow_v1beta3.types import metrics @@ -410,12 +410,12 @@ def get_stage_execution_details( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_stage_execution_details" not in self._stubs: - self._stubs[ - "get_stage_execution_details" - ] = self._logged_channel.unary_unary( - "/google.dataflow.v1beta3.MetricsV1Beta3/GetStageExecutionDetails", - request_serializer=metrics.GetStageExecutionDetailsRequest.serialize, - response_deserializer=metrics.StageExecutionDetails.deserialize, + self._stubs["get_stage_execution_details"] = ( + self._logged_channel.unary_unary( + "/google.dataflow.v1beta3.MetricsV1Beta3/GetStageExecutionDetails", + request_serializer=metrics.GetStageExecutionDetailsRequest.serialize, + response_deserializer=metrics.StageExecutionDetails.deserialize, + ) ) return self._stubs["get_stage_execution_details"] diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc_asyncio.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc_asyncio.py index 592eb889b2ff..3b46b73fe2b7 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataflow_v1beta3.types import metrics @@ -421,12 +421,12 @@ def get_stage_execution_details( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_stage_execution_details" not in self._stubs: - self._stubs[ - "get_stage_execution_details" - ] = self._logged_channel.unary_unary( - "/google.dataflow.v1beta3.MetricsV1Beta3/GetStageExecutionDetails", - request_serializer=metrics.GetStageExecutionDetailsRequest.serialize, - response_deserializer=metrics.StageExecutionDetails.deserialize, + self._stubs["get_stage_execution_details"] = ( + self._logged_channel.unary_unary( + "/google.dataflow.v1beta3.MetricsV1Beta3/GetStageExecutionDetails", + request_serializer=metrics.GetStageExecutionDetailsRequest.serialize, + response_deserializer=metrics.StageExecutionDetails.deserialize, + ) ) return self._stubs["get_stage_execution_details"] diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/rest.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/rest.py index efd83ded4721..3bfa5024d694 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/rest.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/metrics_v1_beta3/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -388,9 +388,7 @@ def __call__( """ - http_options = ( - _BaseMetricsV1Beta3RestTransport._BaseGetJobExecutionDetails._get_http_options() - ) + http_options = _BaseMetricsV1Beta3RestTransport._BaseGetJobExecutionDetails._get_http_options() request, metadata = self._interceptor.pre_get_job_execution_details( request, metadata @@ -696,9 +694,7 @@ def __call__( """ - http_options = ( - _BaseMetricsV1Beta3RestTransport._BaseGetStageExecutionDetails._get_http_options() - ) + http_options = _BaseMetricsV1Beta3RestTransport._BaseGetStageExecutionDetails._get_http_options() request, metadata = self._interceptor.pre_get_stage_execution_details( request, metadata @@ -796,7 +792,9 @@ def get_job_execution_details( ) -> Callable[[metrics.GetJobExecutionDetailsRequest], metrics.JobExecutionDetails]: # 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._GetJobExecutionDetails(self._session, self._host, self._interceptor) # type: ignore + return self._GetJobExecutionDetails( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_job_metrics( @@ -814,7 +812,9 @@ def get_stage_execution_details( ]: # 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._GetStageExecutionDetails(self._session, self._host, self._interceptor) # type: ignore + return self._GetStageExecutionDetails( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/async_client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/async_client.py index 8e6278c163ae..4130095249d5 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/async_client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.types import snapshots @@ -115,7 +115,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SnapshotsV1Beta3AsyncClient: The constructed client. """ - return SnapshotsV1Beta3Client.from_service_account_info.__func__(SnapshotsV1Beta3AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SnapshotsV1Beta3Client.from_service_account_info.__func__ # type: ignore + return sa_info_func(SnapshotsV1Beta3AsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +132,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SnapshotsV1Beta3AsyncClient: The constructed client. """ - return SnapshotsV1Beta3Client.from_service_account_file.__func__(SnapshotsV1Beta3AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SnapshotsV1Beta3Client.from_service_account_file.__func__ # type: ignore + return sa_file_func(SnapshotsV1Beta3AsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/client.py index 23d029bf4c8c..fcf145e9b87b 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.types import snapshots @@ -80,9 +80,7 @@ class SnapshotsV1Beta3ClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SnapshotsV1Beta3Transport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SnapshotsV1Beta3Transport]] _transport_registry["grpc"] = SnapshotsV1Beta3GrpcTransport _transport_registry["grpc_asyncio"] = SnapshotsV1Beta3GrpcAsyncIOTransport _transport_registry["rest"] = SnapshotsV1Beta3RestTransport @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SnapshotsV1Beta3Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SnapshotsV1Beta3Client._read_environment_variables() + ) self._client_cert_source = SnapshotsV1Beta3Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SnapshotsV1Beta3Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/base.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/base.py index 2d1c1b0a4595..40f69af51e3b 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/base.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version from google.cloud.dataflow_v1beta3.types import snapshots diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc.py index 4c605bebe5ed..00db0d39d253 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataflow_v1beta3.types import snapshots diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc_asyncio.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc_asyncio.py index d71e78d515a7..73a03df1194e 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataflow_v1beta3.types import snapshots diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/rest.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/rest.py index 9eea7447278d..25d1a8036d97 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/rest.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/snapshots_v1_beta3/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -387,9 +387,7 @@ def __call__( Response from deleting a snapshot. """ - http_options = ( - _BaseSnapshotsV1Beta3RestTransport._BaseDeleteSnapshot._get_http_options() - ) + http_options = _BaseSnapshotsV1Beta3RestTransport._BaseDeleteSnapshot._get_http_options() request, metadata = self._interceptor.pre_delete_snapshot(request, metadata) transcoded_request = _BaseSnapshotsV1Beta3RestTransport._BaseDeleteSnapshot._get_transcoded_request( @@ -678,9 +676,7 @@ def __call__( List of snapshots. """ - http_options = ( - _BaseSnapshotsV1Beta3RestTransport._BaseListSnapshots._get_http_options() - ) + http_options = _BaseSnapshotsV1Beta3RestTransport._BaseListSnapshots._get_http_options() request, metadata = self._interceptor.pre_list_snapshots(request, metadata) transcoded_request = _BaseSnapshotsV1Beta3RestTransport._BaseListSnapshots._get_transcoded_request( diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/async_client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/async_client.py index 35eb461fb52e..5889815866c4 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/async_client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.dataflow_v1beta3.types import environment, jobs, templates @@ -115,7 +115,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TemplatesServiceAsyncClient: The constructed client. """ - return TemplatesServiceClient.from_service_account_info.__func__(TemplatesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = TemplatesServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(TemplatesServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +132,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TemplatesServiceAsyncClient: The constructed client. """ - return TemplatesServiceClient.from_service_account_file.__func__(TemplatesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = TemplatesServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(TemplatesServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/client.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/client.py index 2763b693ae3e..3d2bbc592c8e 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/client.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.dataflow_v1beta3.types import environment, jobs, templates @@ -80,9 +80,7 @@ class TemplatesServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TemplatesServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TemplatesServiceTransport]] _transport_registry["grpc"] = TemplatesServiceGrpcTransport _transport_registry["grpc_asyncio"] = TemplatesServiceGrpcAsyncIOTransport _transport_registry["rest"] = TemplatesServiceRestTransport @@ -604,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TemplatesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TemplatesServiceClient._read_environment_variables() + ) self._client_cert_source = TemplatesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TemplatesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/base.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/base.py index 251090cd8dbf..1a810c00bac4 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/base.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataflow_v1beta3 import gapic_version as package_version from google.cloud.dataflow_v1beta3.types import jobs, templates diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc.py index b92611e4913f..22e00007b60f 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.dataflow_v1beta3.types import jobs, templates diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc_asyncio.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc_asyncio.py index aceb0708e4d9..f20e0578890a 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataflow_v1beta3.types import jobs, templates diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/rest.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/rest.py index 7bb6d73ec9da..2ef723df7729 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/rest.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/services/templates_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -392,9 +392,7 @@ def __call__( """ - http_options = ( - _BaseTemplatesServiceRestTransport._BaseCreateJobFromTemplate._get_http_options() - ) + http_options = _BaseTemplatesServiceRestTransport._BaseCreateJobFromTemplate._get_http_options() request, metadata = self._interceptor.pre_create_job_from_template( request, metadata @@ -695,9 +693,7 @@ def __call__( """ - http_options = ( - _BaseTemplatesServiceRestTransport._BaseLaunchTemplate._get_http_options() - ) + http_options = _BaseTemplatesServiceRestTransport._BaseLaunchTemplate._get_http_options() request, metadata = self._interceptor.pre_launch_template(request, metadata) transcoded_request = _BaseTemplatesServiceRestTransport._BaseLaunchTemplate._get_transcoded_request( diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/environment.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/environment.py index 5f5e08a81649..cf92a64a8371 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/environment.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/environment.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -65,6 +65,7 @@ class JobType(proto.Enum): data is read, processed, and written continuously. """ + JOB_TYPE_UNKNOWN = 0 JOB_TYPE_BATCH = 1 JOB_TYPE_STREAMING = 2 @@ -82,6 +83,7 @@ class FlexResourceSchedulingGoal(proto.Enum): FLEXRS_COST_OPTIMIZED (2): Optimize for lower cost. """ + FLEXRS_UNSPECIFIED = 0 FLEXRS_SPEED_OPTIMIZED = 1 FLEXRS_COST_OPTIMIZED = 2 @@ -105,6 +107,7 @@ class TeardownPolicy(proto.Enum): Never teardown the resource. This is useful for debugging and development. """ + TEARDOWN_POLICY_UNKNOWN = 0 TEARDOWN_ALWAYS = 1 TEARDOWN_ON_SUCCESS = 2 @@ -130,6 +133,7 @@ class DefaultPackageSet(proto.Enum): Stage packages typically useful to workers written in Python. """ + DEFAULT_PACKAGE_SET_UNKNOWN = 0 DEFAULT_PACKAGE_SET_NONE = 1 DEFAULT_PACKAGE_SET_JAVA = 2 @@ -151,6 +155,7 @@ class AutoscalingAlgorithm(proto.Enum): Increase worker count over time to reduce job execution time. """ + AUTOSCALING_ALGORITHM_UNKNOWN = 0 AUTOSCALING_ALGORITHM_NONE = 1 AUTOSCALING_ALGORITHM_BASIC = 2 @@ -170,6 +175,7 @@ class WorkerIPAddressConfiguration(proto.Enum): WORKER_IP_PRIVATE (2): Workers should have private IP addresses. """ + WORKER_IP_UNSPECIFIED = 0 WORKER_IP_PUBLIC = 1 WORKER_IP_PRIVATE = 2 @@ -189,6 +195,7 @@ class ShuffleMode(proto.Enum): SERVICE_BASED (2): Shuffle is done on the service side. """ + SHUFFLE_MODE_UNSPECIFIED = 0 VM_BASED = 1 SERVICE_BASED = 2 @@ -218,6 +225,7 @@ class StreamingMode(proto.Enum): Setting this value also enables Streaming Engine and Streaming Engine resource-based billing. """ + STREAMING_MODE_UNSPECIFIED = 0 STREAMING_MODE_EXACTLY_ONCE = 1 STREAMING_MODE_AT_LEAST_ONCE = 2 @@ -999,12 +1007,12 @@ class WorkerPool(proto.Message): number=21, enum="WorkerIPAddressConfiguration", ) - sdk_harness_container_images: MutableSequence[ - "SdkHarnessContainerImage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=22, - message="SdkHarnessContainerImage", + sdk_harness_container_images: MutableSequence["SdkHarnessContainerImage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=22, + message="SdkHarnessContainerImage", + ) ) @@ -1043,6 +1051,7 @@ class DataSamplingBehavior(proto.Enum): When given, enables sampling input elements when a user-defined DoFn causes an exception. """ + DATA_SAMPLING_BEHAVIOR_UNSPECIFIED = 0 DISABLED = 1 ALWAYS_ON = 2 diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/jobs.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/jobs.py index 5a57b999ce80..5f7852425c25 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/jobs.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/jobs.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataflow_v1beta3.types import environment as gd_environment @@ -89,6 +89,7 @@ class KindType(proto.Enum): Opening or closing a shuffle session, often as part of a GroupByKey. """ + UNKNOWN_KIND = 0 PAR_DO_KIND = 1 GROUP_BY_KEY_KIND = 2 @@ -177,6 +178,7 @@ class JobState(proto.Enum): feature, please reach out to Cloud support team if you are interested. """ + JOB_STATE_UNKNOWN = 0 JOB_STATE_STOPPED = 1 JOB_STATE_RUNNING = 2 @@ -219,6 +221,7 @@ class JobView(proto.Enum): description data for steps, labels and environment. """ + JOB_VIEW_UNKNOWN = 0 JOB_VIEW_SUMMARY = 1 JOB_VIEW_ALL = 2 @@ -777,6 +780,7 @@ class SdkSupportStatus(proto.Enum): Support for this SDK version has ended and it should no longer be used. """ + UNKNOWN = 0 SUPPORTED = 1 STALE = 2 @@ -834,6 +838,7 @@ class Type(proto.Enum): Using this version of the SDK may cause data loss. """ + TYPE_UNSPECIFIED = 0 GENERAL = 1 PERFORMANCE = 2 @@ -860,6 +865,7 @@ class Severity(proto.Enum): severely degraded, and data loss may be very likely. """ + SEVERITY_UNSPECIFIED = 0 NOTICE = 1 WARNING = 2 @@ -1004,19 +1010,19 @@ class PipelineDescription(proto.Message): portable graph step names if exists. """ - original_pipeline_transform: MutableSequence[ - "TransformSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="TransformSummary", + original_pipeline_transform: MutableSequence["TransformSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="TransformSummary", + ) ) - execution_pipeline_stage: MutableSequence[ - "ExecutionStageSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ExecutionStageSummary", + execution_pipeline_stage: MutableSequence["ExecutionStageSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ExecutionStageSummary", + ) ) display_data: MutableSequence["DisplayData"] = proto.RepeatedField( proto.MESSAGE, @@ -1656,6 +1662,7 @@ class Filter(proto.Enum): Filters the jobs that are running ordered on the creation timestamp. """ + UNKNOWN = 0 ALL = 1 TERMINATED = 2 diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/messages.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/messages.py index f54e18399788..fb3515c1d3d1 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/messages.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/messages.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -77,6 +77,7 @@ class JobMessageImportance(proto.Enum): default, and these messages are displayed by default in the Dataflow monitoring UI. """ + JOB_MESSAGE_IMPORTANCE_UNKNOWN = 0 JOB_MESSAGE_DEBUG = 1 JOB_MESSAGE_DETAILED = 2 @@ -224,6 +225,7 @@ class AutoscalingEventType(proto.Enum): specify both target_num_workers, current_num_workers and a decision_message. """ + TYPE_UNKNOWN = 0 TARGET_NUM_WORKERS_CHANGED = 1 CURRENT_NUM_WORKERS_CHANGED = 2 diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/metrics.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/metrics.py index 02ba84d7e799..e6e60f3495c8 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/metrics.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/metrics.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -65,6 +65,7 @@ class ExecutionState(proto.Enum): EXECUTION_STATE_CANCELLED (5): Execution of the component was cancelled. """ + EXECUTION_STATE_UNKNOWN = 0 EXECUTION_STATE_NOT_STARTED = 1 EXECUTION_STATE_RUNNING = 2 diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/snapshots.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/snapshots.py index be7c0f964813..5a37000d664b 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/snapshots.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/snapshots.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -55,6 +55,7 @@ class SnapshotState(proto.Enum): DELETED (5): Snapshot has been deleted. """ + UNKNOWN_SNAPSHOT_STATE = 0 PENDING = 1 RUNNING = 2 diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/streaming.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/streaming.py index 64dd2224b92e..6b03d216d820 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/streaming.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/streaming.py @@ -477,12 +477,12 @@ class StreamingComputationRanges(proto.Message): proto.STRING, number=1, ) - range_assignments: MutableSequence[ - "KeyRangeDataDiskAssignment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="KeyRangeDataDiskAssignment", + range_assignments: MutableSequence["KeyRangeDataDiskAssignment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="KeyRangeDataDiskAssignment", + ) ) diff --git a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/templates.py b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/templates.py index 7b9f2f8731bd..009f0b23cf83 100644 --- a/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/templates.py +++ b/packages/google-cloud-dataflow-client/google/cloud/dataflow_v1beta3/types/templates.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.dataflow_v1beta3.types import environment as gd_environment @@ -118,6 +118,7 @@ class ParameterType(proto.Enum): for a new Google Managed Kafka topic, or an existing non-managed Kafka topic. """ + DEFAULT = 0 TEXT = 1 GCS_READ_BUCKET = 2 @@ -969,6 +970,7 @@ class Language(proto.Enum): GO (3): Go. """ + UNKNOWN = 0 JAVA = 1 PYTHON = 2 @@ -1096,6 +1098,7 @@ class TemplateView(proto.Enum): Template view that retrieves only the metadata associated with the template. """ + METADATA_ONLY = 0 project_id: str = proto.Field( @@ -1146,6 +1149,7 @@ class TemplateType(proto.Enum): FLEX (2): Flex Template. """ + UNKNOWN = 0 LEGACY = 1 FLEX = 2 diff --git a/packages/google-cloud-dataflow-client/noxfile.py b/packages/google-cloud-dataflow-client/noxfile.py index f824a783abed..0cc3c79ab269 100644 --- a/packages/google-cloud-dataflow-client/noxfile.py +++ b/packages/google-cloud-dataflow-client/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_flex_templates_service.py b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_flex_templates_service.py index b649df51988e..c3dcc271766d 100644 --- a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_flex_templates_service.py +++ b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_flex_templates_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -991,10 +996,9 @@ def test_flex_templates_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1043,9 @@ def test_flex_templates_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1081,9 @@ def test_flex_templates_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1337,13 +1339,13 @@ def test_flex_templates_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1458,9 +1460,9 @@ def test_launch_flex_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.launch_flex_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.launch_flex_template] = ( + mock_rpc + ) request = {} client.launch_flex_template(request) @@ -1644,9 +1646,9 @@ def test_launch_flex_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.launch_flex_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.launch_flex_template] = ( + mock_rpc + ) request = {} client.launch_flex_template(request) @@ -1849,8 +1851,9 @@ def test_launch_flex_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1910,18 +1913,20 @@ def test_launch_flex_template_rest_interceptors(null_interceptor): ) client = FlexTemplatesServiceClient(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.FlexTemplatesServiceRestInterceptor, "post_launch_flex_template" - ) as post, mock.patch.object( - transports.FlexTemplatesServiceRestInterceptor, - "post_launch_flex_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FlexTemplatesServiceRestInterceptor, "pre_launch_flex_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FlexTemplatesServiceRestInterceptor, "post_launch_flex_template" + ) as post, + mock.patch.object( + transports.FlexTemplatesServiceRestInterceptor, + "post_launch_flex_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FlexTemplatesServiceRestInterceptor, "pre_launch_flex_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2048,11 +2053,14 @@ def test_flex_templates_service_base_transport(): def test_flex_templates_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataflow_v1beta3.services.flex_templates_service.transports.FlexTemplatesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataflow_v1beta3.services.flex_templates_service.transports.FlexTemplatesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FlexTemplatesServiceTransport( @@ -2072,9 +2080,12 @@ def test_flex_templates_service_base_transport_with_credentials_file(): def test_flex_templates_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataflow_v1beta3.services.flex_templates_service.transports.FlexTemplatesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataflow_v1beta3.services.flex_templates_service.transports.FlexTemplatesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FlexTemplatesServiceTransport() @@ -2152,11 +2163,12 @@ def test_flex_templates_service_transport_auth_gdch_credentials(transport_class) def test_flex_templates_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_jobs_v1_beta3.py b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_jobs_v1_beta3.py index e8365f27f69e..ee84e6749448 100644 --- a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_jobs_v1_beta3.py +++ b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_jobs_v1_beta3.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.jobs_v1_beta3 import ( JobsV1Beta3AsyncClient, @@ -927,10 +932,9 @@ def test_jobs_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +979,9 @@ def test_jobs_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_jobs_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1246,13 +1248,13 @@ def test_jobs_v1_beta3_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2721,9 +2723,9 @@ def test_aggregated_list_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.aggregated_list_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.aggregated_list_jobs] = ( + mock_rpc + ) request = {} client.aggregated_list_jobs(request) @@ -3176,9 +3178,9 @@ def test_check_active_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.check_active_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.check_active_jobs] = ( + mock_rpc + ) request = {} client.check_active_jobs(request) @@ -3776,9 +3778,9 @@ def test_aggregated_list_jobs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.aggregated_list_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.aggregated_list_jobs] = ( + mock_rpc + ) request = {} client.aggregated_list_jobs(request) @@ -4441,8 +4443,9 @@ def test_create_job_rest_bad_request(request_type=jobs.CreateJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4839,17 +4842,19 @@ def test_create_job_rest_interceptors(null_interceptor): ) client = JobsV1Beta3Client(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.JobsV1Beta3RestInterceptor, "post_create_job" - ) as post, mock.patch.object( - transports.JobsV1Beta3RestInterceptor, "post_create_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.JobsV1Beta3RestInterceptor, "pre_create_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "post_create_job" + ) as post, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "post_create_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "pre_create_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4898,8 +4903,9 @@ def test_get_job_rest_bad_request(request_type=jobs.GetJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4990,17 +4996,17 @@ def test_get_job_rest_interceptors(null_interceptor): ) client = JobsV1Beta3Client(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.JobsV1Beta3RestInterceptor, "post_get_job" - ) as post, mock.patch.object( - transports.JobsV1Beta3RestInterceptor, "post_get_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.JobsV1Beta3RestInterceptor, "pre_get_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "post_get_job" + ) as post, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "post_get_job_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.JobsV1Beta3RestInterceptor, "pre_get_job") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5049,8 +5055,9 @@ def test_update_job_rest_bad_request(request_type=jobs.UpdateJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5447,17 +5454,19 @@ def test_update_job_rest_interceptors(null_interceptor): ) client = JobsV1Beta3Client(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.JobsV1Beta3RestInterceptor, "post_update_job" - ) as post, mock.patch.object( - transports.JobsV1Beta3RestInterceptor, "post_update_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.JobsV1Beta3RestInterceptor, "pre_update_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "post_update_job" + ) as post, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "post_update_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "pre_update_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5506,8 +5515,9 @@ def test_list_jobs_rest_bad_request(request_type=jobs.ListJobsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5570,17 +5580,19 @@ def test_list_jobs_rest_interceptors(null_interceptor): ) client = JobsV1Beta3Client(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.JobsV1Beta3RestInterceptor, "post_list_jobs" - ) as post, mock.patch.object( - transports.JobsV1Beta3RestInterceptor, "post_list_jobs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.JobsV1Beta3RestInterceptor, "pre_list_jobs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "post_list_jobs" + ) as post, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "post_list_jobs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "pre_list_jobs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5629,8 +5641,9 @@ def test_aggregated_list_jobs_rest_bad_request(request_type=jobs.ListJobsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5693,17 +5706,20 @@ def test_aggregated_list_jobs_rest_interceptors(null_interceptor): ) client = JobsV1Beta3Client(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.JobsV1Beta3RestInterceptor, "post_aggregated_list_jobs" - ) as post, mock.patch.object( - transports.JobsV1Beta3RestInterceptor, "post_aggregated_list_jobs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.JobsV1Beta3RestInterceptor, "pre_aggregated_list_jobs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "post_aggregated_list_jobs" + ) as post, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, + "post_aggregated_list_jobs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "pre_aggregated_list_jobs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5764,8 +5780,9 @@ def test_snapshot_job_rest_bad_request(request_type=jobs.SnapshotJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5840,17 +5857,19 @@ def test_snapshot_job_rest_interceptors(null_interceptor): ) client = JobsV1Beta3Client(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.JobsV1Beta3RestInterceptor, "post_snapshot_job" - ) as post, mock.patch.object( - transports.JobsV1Beta3RestInterceptor, "post_snapshot_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.JobsV1Beta3RestInterceptor, "pre_snapshot_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "post_snapshot_job" + ) as post, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "post_snapshot_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.JobsV1Beta3RestInterceptor, "pre_snapshot_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6100,11 +6119,14 @@ def test_jobs_v1_beta3_base_transport(): def test_jobs_v1_beta3_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataflow_v1beta3.services.jobs_v1_beta3.transports.JobsV1Beta3Transport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataflow_v1beta3.services.jobs_v1_beta3.transports.JobsV1Beta3Transport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.JobsV1Beta3Transport( @@ -6124,9 +6146,12 @@ def test_jobs_v1_beta3_base_transport_with_credentials_file(): def test_jobs_v1_beta3_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataflow_v1beta3.services.jobs_v1_beta3.transports.JobsV1Beta3Transport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataflow_v1beta3.services.jobs_v1_beta3.transports.JobsV1Beta3Transport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.JobsV1Beta3Transport() @@ -6204,11 +6229,12 @@ def test_jobs_v1_beta3_transport_auth_gdch_credentials(transport_class): def test_jobs_v1_beta3_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_messages_v1_beta3.py b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_messages_v1_beta3.py index 72d105883110..bd101006b1fd 100644 --- a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_messages_v1_beta3.py +++ b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_messages_v1_beta3.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.messages_v1_beta3 import ( MessagesV1Beta3AsyncClient, @@ -970,10 +975,9 @@ def test_messages_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1022,9 @@ def test_messages_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1060,9 @@ def test_messages_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1303,13 +1305,13 @@ def test_messages_v1_beta3_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1429,9 +1431,9 @@ def test_list_job_messages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_job_messages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_job_messages] = ( + mock_rpc + ) request = {} client.list_job_messages(request) @@ -1826,9 +1828,9 @@ def test_list_job_messages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_job_messages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_job_messages] = ( + mock_rpc + ) request = {} client.list_job_messages(request) @@ -2098,8 +2100,9 @@ def test_list_job_messages_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2162,18 +2165,20 @@ def test_list_job_messages_rest_interceptors(null_interceptor): ) client = MessagesV1Beta3Client(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.MessagesV1Beta3RestInterceptor, "post_list_job_messages" - ) as post, mock.patch.object( - transports.MessagesV1Beta3RestInterceptor, - "post_list_job_messages_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MessagesV1Beta3RestInterceptor, "pre_list_job_messages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MessagesV1Beta3RestInterceptor, "post_list_job_messages" + ) as post, + mock.patch.object( + transports.MessagesV1Beta3RestInterceptor, + "post_list_job_messages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MessagesV1Beta3RestInterceptor, "pre_list_job_messages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2297,11 +2302,14 @@ def test_messages_v1_beta3_base_transport(): def test_messages_v1_beta3_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataflow_v1beta3.services.messages_v1_beta3.transports.MessagesV1Beta3Transport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataflow_v1beta3.services.messages_v1_beta3.transports.MessagesV1Beta3Transport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MessagesV1Beta3Transport( @@ -2321,9 +2329,12 @@ def test_messages_v1_beta3_base_transport_with_credentials_file(): def test_messages_v1_beta3_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataflow_v1beta3.services.messages_v1_beta3.transports.MessagesV1Beta3Transport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataflow_v1beta3.services.messages_v1_beta3.transports.MessagesV1Beta3Transport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MessagesV1Beta3Transport() @@ -2401,11 +2412,12 @@ def test_messages_v1_beta3_transport_auth_gdch_credentials(transport_class): def test_messages_v1_beta3_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_metrics_v1_beta3.py b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_metrics_v1_beta3.py index 360098dd7772..7c8c510ca8cf 100644 --- a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_metrics_v1_beta3.py +++ b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_metrics_v1_beta3.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.metrics_v1_beta3 import ( MetricsV1Beta3AsyncClient, @@ -950,10 +955,9 @@ def test_metrics_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +1002,9 @@ def test_metrics_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_metrics_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1283,13 +1285,13 @@ def test_metrics_v1_beta3_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3044,8 +3046,9 @@ def test_get_job_metrics_rest_bad_request(request_type=metrics.GetJobMetricsRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3105,17 +3108,20 @@ def test_get_job_metrics_rest_interceptors(null_interceptor): ) client = MetricsV1Beta3Client(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.MetricsV1Beta3RestInterceptor, "post_get_job_metrics" - ) as post, mock.patch.object( - transports.MetricsV1Beta3RestInterceptor, "post_get_job_metrics_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetricsV1Beta3RestInterceptor, "pre_get_job_metrics" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetricsV1Beta3RestInterceptor, "post_get_job_metrics" + ) as post, + mock.patch.object( + transports.MetricsV1Beta3RestInterceptor, + "post_get_job_metrics_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetricsV1Beta3RestInterceptor, "pre_get_job_metrics" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3166,8 +3172,9 @@ def test_get_job_execution_details_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3230,18 +3237,20 @@ def test_get_job_execution_details_rest_interceptors(null_interceptor): ) client = MetricsV1Beta3Client(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.MetricsV1Beta3RestInterceptor, "post_get_job_execution_details" - ) as post, mock.patch.object( - transports.MetricsV1Beta3RestInterceptor, - "post_get_job_execution_details_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MetricsV1Beta3RestInterceptor, "pre_get_job_execution_details" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetricsV1Beta3RestInterceptor, "post_get_job_execution_details" + ) as post, + mock.patch.object( + transports.MetricsV1Beta3RestInterceptor, + "post_get_job_execution_details_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetricsV1Beta3RestInterceptor, "pre_get_job_execution_details" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3301,8 +3310,9 @@ def test_get_stage_execution_details_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3370,18 +3380,20 @@ def test_get_stage_execution_details_rest_interceptors(null_interceptor): ) client = MetricsV1Beta3Client(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.MetricsV1Beta3RestInterceptor, "post_get_stage_execution_details" - ) as post, mock.patch.object( - transports.MetricsV1Beta3RestInterceptor, - "post_get_stage_execution_details_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MetricsV1Beta3RestInterceptor, "pre_get_stage_execution_details" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetricsV1Beta3RestInterceptor, "post_get_stage_execution_details" + ) as post, + mock.patch.object( + transports.MetricsV1Beta3RestInterceptor, + "post_get_stage_execution_details_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetricsV1Beta3RestInterceptor, "pre_get_stage_execution_details" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3551,11 +3563,14 @@ def test_metrics_v1_beta3_base_transport(): def test_metrics_v1_beta3_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataflow_v1beta3.services.metrics_v1_beta3.transports.MetricsV1Beta3Transport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataflow_v1beta3.services.metrics_v1_beta3.transports.MetricsV1Beta3Transport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetricsV1Beta3Transport( @@ -3575,9 +3590,12 @@ def test_metrics_v1_beta3_base_transport_with_credentials_file(): def test_metrics_v1_beta3_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataflow_v1beta3.services.metrics_v1_beta3.transports.MetricsV1Beta3Transport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataflow_v1beta3.services.metrics_v1_beta3.transports.MetricsV1Beta3Transport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetricsV1Beta3Transport() @@ -3655,11 +3673,12 @@ def test_metrics_v1_beta3_transport_auth_gdch_credentials(transport_class): def test_metrics_v1_beta3_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_snapshots_v1_beta3.py b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_snapshots_v1_beta3.py index 08f7eb467afb..e10751f7001c 100644 --- a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_snapshots_v1_beta3.py +++ b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_snapshots_v1_beta3.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.snapshots_v1_beta3 import ( SnapshotsV1Beta3AsyncClient, @@ -971,10 +976,9 @@ def test_snapshots_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1023,9 @@ def test_snapshots_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1061,9 @@ def test_snapshots_v1_beta3_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1309,13 +1311,13 @@ def test_snapshots_v1_beta3_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2491,8 +2493,9 @@ def test_get_snapshot_rest_bad_request(request_type=snapshots.GetSnapshotRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2571,17 +2574,20 @@ def test_get_snapshot_rest_interceptors(null_interceptor): ) client = SnapshotsV1Beta3Client(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.SnapshotsV1Beta3RestInterceptor, "post_get_snapshot" - ) as post, mock.patch.object( - transports.SnapshotsV1Beta3RestInterceptor, "post_get_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsV1Beta3RestInterceptor, "pre_get_snapshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotsV1Beta3RestInterceptor, "post_get_snapshot" + ) as post, + mock.patch.object( + transports.SnapshotsV1Beta3RestInterceptor, + "post_get_snapshot_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotsV1Beta3RestInterceptor, "pre_get_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2634,8 +2640,9 @@ def test_delete_snapshot_rest_bad_request(request_type=snapshots.DeleteSnapshotR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2699,17 +2706,20 @@ def test_delete_snapshot_rest_interceptors(null_interceptor): ) client = SnapshotsV1Beta3Client(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.SnapshotsV1Beta3RestInterceptor, "post_delete_snapshot" - ) as post, mock.patch.object( - transports.SnapshotsV1Beta3RestInterceptor, "post_delete_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsV1Beta3RestInterceptor, "pre_delete_snapshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotsV1Beta3RestInterceptor, "post_delete_snapshot" + ) as post, + mock.patch.object( + transports.SnapshotsV1Beta3RestInterceptor, + "post_delete_snapshot_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotsV1Beta3RestInterceptor, "pre_delete_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2762,8 +2772,9 @@ def test_list_snapshots_rest_bad_request(request_type=snapshots.ListSnapshotsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2823,17 +2834,20 @@ def test_list_snapshots_rest_interceptors(null_interceptor): ) client = SnapshotsV1Beta3Client(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.SnapshotsV1Beta3RestInterceptor, "post_list_snapshots" - ) as post, mock.patch.object( - transports.SnapshotsV1Beta3RestInterceptor, "post_list_snapshots_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SnapshotsV1Beta3RestInterceptor, "pre_list_snapshots" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SnapshotsV1Beta3RestInterceptor, "post_list_snapshots" + ) as post, + mock.patch.object( + transports.SnapshotsV1Beta3RestInterceptor, + "post_list_snapshots_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SnapshotsV1Beta3RestInterceptor, "pre_list_snapshots" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2997,11 +3011,14 @@ def test_snapshots_v1_beta3_base_transport(): def test_snapshots_v1_beta3_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataflow_v1beta3.services.snapshots_v1_beta3.transports.SnapshotsV1Beta3Transport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataflow_v1beta3.services.snapshots_v1_beta3.transports.SnapshotsV1Beta3Transport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SnapshotsV1Beta3Transport( @@ -3021,9 +3038,12 @@ def test_snapshots_v1_beta3_base_transport_with_credentials_file(): def test_snapshots_v1_beta3_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataflow_v1beta3.services.snapshots_v1_beta3.transports.SnapshotsV1Beta3Transport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataflow_v1beta3.services.snapshots_v1_beta3.transports.SnapshotsV1Beta3Transport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SnapshotsV1Beta3Transport() @@ -3101,11 +3121,12 @@ def test_snapshots_v1_beta3_transport_auth_gdch_credentials(transport_class): def test_snapshots_v1_beta3_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_templates_service.py b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_templates_service.py index 60a1f943ec52..08a762918e76 100644 --- a/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_templates_service.py +++ b/packages/google-cloud-dataflow-client/tests/unit/gapic/dataflow_v1beta3/test_templates_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.dataflow_v1beta3.services.templates_service import ( TemplatesServiceAsyncClient, @@ -971,10 +976,9 @@ def test_templates_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1023,9 @@ def test_templates_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1061,9 @@ def test_templates_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1309,13 +1311,13 @@ def test_templates_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2557,8 +2559,9 @@ def test_create_job_from_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2649,18 +2652,20 @@ def test_create_job_from_template_rest_interceptors(null_interceptor): ) client = TemplatesServiceClient(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.TemplatesServiceRestInterceptor, "post_create_job_from_template" - ) as post, mock.patch.object( - transports.TemplatesServiceRestInterceptor, - "post_create_job_from_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TemplatesServiceRestInterceptor, "pre_create_job_from_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TemplatesServiceRestInterceptor, "post_create_job_from_template" + ) as post, + mock.patch.object( + transports.TemplatesServiceRestInterceptor, + "post_create_job_from_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TemplatesServiceRestInterceptor, "pre_create_job_from_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2711,8 +2716,9 @@ def test_launch_template_rest_bad_request(request_type=templates.LaunchTemplateR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2868,17 +2874,20 @@ def test_launch_template_rest_interceptors(null_interceptor): ) client = TemplatesServiceClient(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.TemplatesServiceRestInterceptor, "post_launch_template" - ) as post, mock.patch.object( - transports.TemplatesServiceRestInterceptor, "post_launch_template_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TemplatesServiceRestInterceptor, "pre_launch_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TemplatesServiceRestInterceptor, "post_launch_template" + ) as post, + mock.patch.object( + transports.TemplatesServiceRestInterceptor, + "post_launch_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TemplatesServiceRestInterceptor, "pre_launch_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2931,8 +2940,9 @@ def test_get_template_rest_bad_request(request_type=templates.GetTemplateRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2995,17 +3005,20 @@ def test_get_template_rest_interceptors(null_interceptor): ) client = TemplatesServiceClient(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.TemplatesServiceRestInterceptor, "post_get_template" - ) as post, mock.patch.object( - transports.TemplatesServiceRestInterceptor, "post_get_template_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TemplatesServiceRestInterceptor, "pre_get_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TemplatesServiceRestInterceptor, "post_get_template" + ) as post, + mock.patch.object( + transports.TemplatesServiceRestInterceptor, + "post_get_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TemplatesServiceRestInterceptor, "pre_get_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3171,11 +3184,14 @@ def test_templates_service_base_transport(): def test_templates_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataflow_v1beta3.services.templates_service.transports.TemplatesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataflow_v1beta3.services.templates_service.transports.TemplatesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TemplatesServiceTransport( @@ -3195,9 +3211,12 @@ def test_templates_service_base_transport_with_credentials_file(): def test_templates_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataflow_v1beta3.services.templates_service.transports.TemplatesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataflow_v1beta3.services.templates_service.transports.TemplatesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TemplatesServiceTransport() @@ -3275,11 +3294,12 @@ def test_templates_service_transport_auth_gdch_credentials(transport_class): def test_templates_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataform/docs/conf.py b/packages/google-cloud-dataform/docs/conf.py index 956345238f79..c825644402f9 100644 --- a/packages/google-cloud-dataform/docs/conf.py +++ b/packages/google-cloud-dataform/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-dataform documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/__init__.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/__init__.py index a926547681f6..313e6fe3f536 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/__init__.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dataform import DataformAsyncClient, DataformClient from .types.dataform import ( CancelWorkflowInvocationRequest, diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/async_client.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/async_client.py index c80d17e8c233..93af50e4e060 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/async_client.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataform_v1 import gapic_version as package_version @@ -44,12 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.cloud.dataform_v1.services.dataform import pagers from google.cloud.dataform_v1.types import dataform @@ -144,7 +146,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataformAsyncClient: The constructed client. """ - return DataformClient.from_service_account_info.__func__(DataformAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataformClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataformAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +163,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataformAsyncClient: The constructed client. """ - return DataformClient.from_service_account_file.__func__(DataformAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataformClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataformAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/client.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/client.py index ef554d892b2d..9a5e9bb987bd 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/client.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataform_v1 import gapic_version as package_version @@ -61,12 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.cloud.dataform_v1.services.dataform import pagers from google.cloud.dataform_v1.types import dataform @@ -862,11 +864,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataformClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataformClient._read_environment_variables() + ) self._client_cert_source = DataformClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -901,8 +901,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataformTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/pagers.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/pagers.py index 7954f11a3dd0..5d4f2afec369 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/pagers.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -459,7 +459,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -539,7 +539,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -615,7 +615,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -695,7 +695,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -771,7 +771,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -851,7 +851,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -927,7 +927,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1007,7 +1007,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1083,7 +1083,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1163,7 +1163,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1239,7 +1239,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1319,7 +1319,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1397,7 +1397,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1479,7 +1479,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1555,7 +1555,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1635,7 +1635,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1711,7 +1711,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1791,7 +1791,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1869,7 +1869,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/base.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/base.py index 281de349a0ed..5cdc9fdfb8cb 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/base.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataform_v1 import gapic_version as package_version from google.cloud.dataform_v1.types import dataform diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc.py index 5146298e1921..76f83464d7cc 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataform_v1.types import dataform @@ -554,12 +556,12 @@ def query_repository_directory_contents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_repository_directory_contents" not in self._stubs: - self._stubs[ - "query_repository_directory_contents" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/QueryRepositoryDirectoryContents", - request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, - response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + self._stubs["query_repository_directory_contents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/QueryRepositoryDirectoryContents", + request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, + response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + ) ) return self._stubs["query_repository_directory_contents"] @@ -616,12 +618,12 @@ def compute_repository_access_token_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "compute_repository_access_token_status" not in self._stubs: - self._stubs[ - "compute_repository_access_token_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/ComputeRepositoryAccessTokenStatus", - request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, - response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + self._stubs["compute_repository_access_token_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/ComputeRepositoryAccessTokenStatus", + request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, + response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + ) ) return self._stubs["compute_repository_access_token_status"] @@ -1468,12 +1470,12 @@ def query_compilation_result_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_compilation_result_actions" not in self._stubs: - self._stubs[ - "query_compilation_result_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/QueryCompilationResultActions", - request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, - response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + self._stubs["query_compilation_result_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/QueryCompilationResultActions", + request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, + response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + ) ) return self._stubs["query_compilation_result_actions"] @@ -1692,12 +1694,12 @@ def create_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_workflow_invocation" not in self._stubs: - self._stubs[ - "create_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/CreateWorkflowInvocation", - request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, - response_deserializer=dataform.WorkflowInvocation.deserialize, + self._stubs["create_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/CreateWorkflowInvocation", + request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, + response_deserializer=dataform.WorkflowInvocation.deserialize, + ) ) return self._stubs["create_workflow_invocation"] @@ -1720,12 +1722,12 @@ def delete_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_workflow_invocation" not in self._stubs: - self._stubs[ - "delete_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/DeleteWorkflowInvocation", - request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/DeleteWorkflowInvocation", + request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_workflow_invocation"] @@ -1752,12 +1754,12 @@ def cancel_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_workflow_invocation" not in self._stubs: - self._stubs[ - "cancel_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/CancelWorkflowInvocation", - request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, - response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + self._stubs["cancel_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/CancelWorkflowInvocation", + request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, + response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + ) ) return self._stubs["cancel_workflow_invocation"] @@ -1785,12 +1787,12 @@ def query_workflow_invocation_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_workflow_invocation_actions" not in self._stubs: - self._stubs[ - "query_workflow_invocation_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/QueryWorkflowInvocationActions", - request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, - response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + self._stubs["query_workflow_invocation_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/QueryWorkflowInvocationActions", + request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, + response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + ) ) return self._stubs["query_workflow_invocation_actions"] diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc_asyncio.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc_asyncio.py index 11cf67945bfc..ce738b857c31 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataform_v1.types import dataform @@ -563,12 +565,12 @@ def query_repository_directory_contents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_repository_directory_contents" not in self._stubs: - self._stubs[ - "query_repository_directory_contents" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/QueryRepositoryDirectoryContents", - request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, - response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + self._stubs["query_repository_directory_contents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/QueryRepositoryDirectoryContents", + request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, + response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + ) ) return self._stubs["query_repository_directory_contents"] @@ -625,12 +627,12 @@ def compute_repository_access_token_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "compute_repository_access_token_status" not in self._stubs: - self._stubs[ - "compute_repository_access_token_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/ComputeRepositoryAccessTokenStatus", - request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, - response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + self._stubs["compute_repository_access_token_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/ComputeRepositoryAccessTokenStatus", + request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, + response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + ) ) return self._stubs["compute_repository_access_token_status"] @@ -1507,12 +1509,12 @@ def query_compilation_result_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_compilation_result_actions" not in self._stubs: - self._stubs[ - "query_compilation_result_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/QueryCompilationResultActions", - request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, - response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + self._stubs["query_compilation_result_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/QueryCompilationResultActions", + request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, + response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + ) ) return self._stubs["query_compilation_result_actions"] @@ -1741,12 +1743,12 @@ def create_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_workflow_invocation" not in self._stubs: - self._stubs[ - "create_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/CreateWorkflowInvocation", - request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, - response_deserializer=dataform.WorkflowInvocation.deserialize, + self._stubs["create_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/CreateWorkflowInvocation", + request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, + response_deserializer=dataform.WorkflowInvocation.deserialize, + ) ) return self._stubs["create_workflow_invocation"] @@ -1771,12 +1773,12 @@ def delete_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_workflow_invocation" not in self._stubs: - self._stubs[ - "delete_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/DeleteWorkflowInvocation", - request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/DeleteWorkflowInvocation", + request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_workflow_invocation"] @@ -1803,12 +1805,12 @@ def cancel_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_workflow_invocation" not in self._stubs: - self._stubs[ - "cancel_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/CancelWorkflowInvocation", - request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, - response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + self._stubs["cancel_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/CancelWorkflowInvocation", + request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, + response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + ) ) return self._stubs["cancel_workflow_invocation"] @@ -1836,12 +1838,12 @@ def query_workflow_invocation_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_workflow_invocation_actions" not in self._stubs: - self._stubs[ - "query_workflow_invocation_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1.Dataform/QueryWorkflowInvocationActions", - request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, - response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + self._stubs["query_workflow_invocation_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1.Dataform/QueryWorkflowInvocationActions", + request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, + response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + ) ) return self._stubs["query_workflow_invocation_actions"] diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest.py index 08c6ca634fc2..977d3222d30c 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.protobuf import json_format from requests import __version__ as requests_version @@ -3205,9 +3207,7 @@ def __call__( ``CancelWorkflowInvocation`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseCancelWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCancelWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_cancel_workflow_invocation( request, metadata @@ -3359,9 +3359,7 @@ def __call__( ``CommitRepositoryChanges`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseCommitRepositoryChanges._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCommitRepositoryChanges._get_http_options() request, metadata = self._interceptor.pre_commit_repository_changes( request, metadata @@ -3513,9 +3511,7 @@ def __call__( ``CommitWorkspaceChanges`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseCommitWorkspaceChanges._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCommitWorkspaceChanges._get_http_options() request, metadata = self._interceptor.pre_commit_workspace_changes( request, metadata @@ -3668,15 +3664,12 @@ def __call__( ``ComputeRepositoryAccessTokenStatus`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseComputeRepositoryAccessTokenStatus._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseComputeRepositoryAccessTokenStatus._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_compute_repository_access_token_status( - request, metadata + request, metadata = ( + self._interceptor.pre_compute_repository_access_token_status( + request, metadata + ) ) transcoded_request = _BaseDataformRestTransport._BaseComputeRepositoryAccessTokenStatus._get_transcoded_request( http_options, request @@ -3739,11 +3732,10 @@ def __call__( resp = self._interceptor.post_compute_repository_access_token_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_compute_repository_access_token_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_compute_repository_access_token_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3829,9 +3821,7 @@ def __call__( """ - http_options = ( - _BaseDataformRestTransport._BaseCreateCompilationResult._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCreateCompilationResult._get_http_options() request, metadata = self._interceptor.pre_create_compilation_result( request, metadata @@ -4448,9 +4438,7 @@ def __call__( """ - http_options = ( - _BaseDataformRestTransport._BaseCreateWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCreateWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_create_workflow_invocation( request, metadata @@ -4777,7 +4765,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4887,7 +4875,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4995,7 +4983,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5080,9 +5068,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataformRestTransport._BaseDeleteWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseDeleteWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_delete_workflow_invocation( request, metadata @@ -5104,7 +5090,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5216,7 +5202,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5896,9 +5882,7 @@ def __call__( ``FetchRepositoryHistory`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseFetchRepositoryHistory._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseFetchRepositoryHistory._get_http_options() request, metadata = self._interceptor.pre_fetch_repository_history( request, metadata @@ -6786,9 +6770,7 @@ def __call__( """ - http_options = ( - _BaseDataformRestTransport._BaseGetWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseGetWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_get_workflow_invocation( request, metadata @@ -7232,9 +7214,7 @@ def __call__( ``ListCompilationResults`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseListCompilationResults._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseListCompilationResults._get_http_options() request, metadata = self._interceptor.pre_list_compilation_results( request, metadata @@ -7826,9 +7806,7 @@ def __call__( ``ListWorkflowInvocations`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseListWorkflowInvocations._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseListWorkflowInvocations._get_http_options() request, metadata = self._interceptor.pre_list_workflow_invocations( request, metadata @@ -8897,9 +8875,7 @@ def __call__( ``QueryCompilationResultActions`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryCompilationResultActions._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryCompilationResultActions._get_http_options() request, metadata = self._interceptor.pre_query_compilation_result_actions( request, metadata @@ -8965,11 +8941,10 @@ def __call__( resp = self._interceptor.post_query_compilation_result_actions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_compilation_result_actions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_compilation_result_actions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9050,9 +9025,7 @@ def __call__( ``QueryDirectoryContents`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryDirectoryContents._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryDirectoryContents._get_http_options() request, metadata = self._interceptor.pre_query_directory_contents( request, metadata @@ -9200,15 +9173,12 @@ def __call__( ``QueryRepositoryDirectoryContents`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryRepositoryDirectoryContents._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryRepositoryDirectoryContents._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_query_repository_directory_contents( - request, metadata + request, metadata = ( + self._interceptor.pre_query_repository_directory_contents( + request, metadata + ) ) transcoded_request = _BaseDataformRestTransport._BaseQueryRepositoryDirectoryContents._get_transcoded_request( http_options, request @@ -9271,11 +9241,10 @@ def __call__( resp = self._interceptor.post_query_repository_directory_contents(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_repository_directory_contents_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_repository_directory_contents_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9359,9 +9328,7 @@ def __call__( ``QueryWorkflowInvocationActions`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryWorkflowInvocationActions._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryWorkflowInvocationActions._get_http_options() request, metadata = self._interceptor.pre_query_workflow_invocation_actions( request, metadata @@ -9427,11 +9394,10 @@ def __call__( resp = self._interceptor.post_query_workflow_invocation_actions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_workflow_invocation_actions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_workflow_invocation_actions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -10119,9 +10085,7 @@ def __call__( ``ResetWorkspaceChanges`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseResetWorkspaceChanges._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseResetWorkspaceChanges._get_http_options() request, metadata = self._interceptor.pre_reset_workspace_changes( request, metadata @@ -11144,7 +11108,9 @@ def cancel_workflow_invocation( ]: # 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._CancelWorkflowInvocation(self._session, self._host, self._interceptor) # type: ignore + return self._CancelWorkflowInvocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def commit_repository_changes( @@ -11155,7 +11121,9 @@ def commit_repository_changes( ]: # 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._CommitRepositoryChanges(self._session, self._host, self._interceptor) # type: ignore + return self._CommitRepositoryChanges( + self._session, self._host, self._interceptor + ) # type: ignore @property def commit_workspace_changes( @@ -11166,7 +11134,9 @@ def commit_workspace_changes( ]: # 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._CommitWorkspaceChanges(self._session, self._host, self._interceptor) # type: ignore + return self._CommitWorkspaceChanges( + self._session, self._host, self._interceptor + ) # type: ignore @property def compute_repository_access_token_status( @@ -11177,7 +11147,9 @@ def compute_repository_access_token_status( ]: # 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._ComputeRepositoryAccessTokenStatus(self._session, self._host, self._interceptor) # type: ignore + return self._ComputeRepositoryAccessTokenStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_compilation_result( @@ -11187,7 +11159,9 @@ def create_compilation_result( ]: # 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._CreateCompilationResult(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCompilationResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_release_config( @@ -11221,7 +11195,9 @@ def create_workflow_invocation( ]: # 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._CreateWorkflowInvocation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateWorkflowInvocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_workspace( @@ -11261,7 +11237,9 @@ def delete_workflow_invocation( ) -> Callable[[dataform.DeleteWorkflowInvocationRequest], empty_pb2.Empty]: # 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._DeleteWorkflowInvocation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteWorkflowInvocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_workspace( @@ -11318,7 +11296,9 @@ def fetch_repository_history( ]: # 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._FetchRepositoryHistory(self._session, self._host, self._interceptor) # type: ignore + return self._FetchRepositoryHistory( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_compilation_result( @@ -11393,7 +11373,9 @@ def list_compilation_results( ]: # 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._ListCompilationResults(self._session, self._host, self._interceptor) # type: ignore + return self._ListCompilationResults( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_release_configs( @@ -11434,7 +11416,9 @@ def list_workflow_invocations( ]: # 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._ListWorkflowInvocations(self._session, self._host, self._interceptor) # type: ignore + return self._ListWorkflowInvocations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_workspaces( @@ -11493,7 +11477,9 @@ def query_compilation_result_actions( ]: # 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._QueryCompilationResultActions(self._session, self._host, self._interceptor) # type: ignore + return self._QueryCompilationResultActions( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_directory_contents( @@ -11504,7 +11490,9 @@ def query_directory_contents( ]: # 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._QueryDirectoryContents(self._session, self._host, self._interceptor) # type: ignore + return self._QueryDirectoryContents( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_repository_directory_contents( @@ -11515,7 +11503,9 @@ def query_repository_directory_contents( ]: # 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._QueryRepositoryDirectoryContents(self._session, self._host, self._interceptor) # type: ignore + return self._QueryRepositoryDirectoryContents( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_workflow_invocation_actions( @@ -11526,7 +11516,9 @@ def query_workflow_invocation_actions( ]: # 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._QueryWorkflowInvocationActions(self._session, self._host, self._interceptor) # type: ignore + return self._QueryWorkflowInvocationActions( + self._session, self._host, self._interceptor + ) # type: ignore @property def read_file( diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest_base.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest_base.py index 701cba948f2a..c10203759c0b 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest_base.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/services/dataform/transports/rest_base.py @@ -17,11 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.protobuf import json_format from google.cloud.dataform_v1.types import dataform diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1/types/dataform.py b/packages/google-cloud-dataform/google/cloud/dataform_v1/types/dataform.py index dfed1c6eac7d..c93c5bec1625 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1/types/dataform.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1/types/dataform.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -251,6 +251,7 @@ class TokenStatus(proto.Enum): The token was used successfully to authenticate against the Git remote. """ + TOKEN_STATUS_UNSPECIFIED = 0 NOT_FOUND = 1 INVALID = 2 @@ -951,6 +952,7 @@ class TokenStatus(proto.Enum): The token was used successfully to authenticate against the Git remote. """ + TOKEN_STATUS_UNSPECIFIED = 0 NOT_FOUND = 1 INVALID = 2 @@ -1313,6 +1315,7 @@ class State(proto.Enum): HAS_CONFLICTS (4): The file contains merge conflicts. """ + STATE_UNSPECIFIED = 0 ADDED = 1 DELETED = 2 @@ -1329,12 +1332,12 @@ class State(proto.Enum): enum="FetchFileGitStatusesResponse.UncommittedFileChange.State", ) - uncommitted_file_changes: MutableSequence[ - UncommittedFileChange - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=UncommittedFileChange, + uncommitted_file_changes: MutableSequence[UncommittedFileChange] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=UncommittedFileChange, + ) ) @@ -2084,12 +2087,12 @@ class ScheduledReleaseRecord(proto.Message): proto.STRING, number=7, ) - recent_scheduled_release_records: MutableSequence[ - ScheduledReleaseRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=ScheduledReleaseRecord, + recent_scheduled_release_records: MutableSequence[ScheduledReleaseRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=ScheduledReleaseRecord, + ) ) release_compilation_result: str = proto.Field( proto.STRING, @@ -2858,6 +2861,7 @@ class RelationType(proto.Enum): MATERIALIZED_VIEW (4): The relation is a materialized view. """ + RELATION_TYPE_UNSPECIFIED = 0 TABLE = 1 VIEW = 2 @@ -3435,12 +3439,12 @@ class QueryCompilationResultActionsResponse(proto.Message): def raw_page(self): return self - compilation_result_actions: MutableSequence[ - "CompilationResultAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CompilationResultAction", + compilation_result_actions: MutableSequence["CompilationResultAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CompilationResultAction", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -3563,12 +3567,12 @@ class ScheduledExecutionRecord(proto.Message): proto.STRING, number=7, ) - recent_scheduled_execution_records: MutableSequence[ - ScheduledExecutionRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=ScheduledExecutionRecord, + recent_scheduled_execution_records: MutableSequence[ScheduledExecutionRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=ScheduledExecutionRecord, + ) ) disabled: bool = proto.Field( proto.BOOL, @@ -3869,6 +3873,7 @@ class State(proto.Enum): The workflow invocation is being cancelled, but some actions are still running. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -4157,6 +4162,7 @@ class State(proto.Enum): FAILED (6): The action failed. A terminal state. """ + PENDING = 0 RUNNING = 1 SKIPPED = 2 @@ -4489,12 +4495,12 @@ class QueryWorkflowInvocationActionsResponse(proto.Message): def raw_page(self): return self - workflow_invocation_actions: MutableSequence[ - "WorkflowInvocationAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="WorkflowInvocationAction", + workflow_invocation_actions: MutableSequence["WorkflowInvocationAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="WorkflowInvocationAction", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/__init__.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/__init__.py index c6d7b5834af2..d73b1a710639 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/__init__.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dataform import DataformAsyncClient, DataformClient from .types.dataform import ( CancelWorkflowInvocationRequest, diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/async_client.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/async_client.py index 743638cdbc50..251191e34bf5 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/async_client.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataform_v1beta1 import gapic_version as package_version @@ -44,12 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.cloud.dataform_v1beta1.services.dataform import pagers from google.cloud.dataform_v1beta1.types import dataform @@ -144,7 +146,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataformAsyncClient: The constructed client. """ - return DataformClient.from_service_account_info.__func__(DataformAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataformClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataformAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +163,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataformAsyncClient: The constructed client. """ - return DataformClient.from_service_account_file.__func__(DataformAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataformClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataformAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/client.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/client.py index 850f3104b51b..5938fac679c9 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/client.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataform_v1beta1 import gapic_version as package_version @@ -61,12 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.cloud.dataform_v1beta1.services.dataform import pagers from google.cloud.dataform_v1beta1.types import dataform @@ -862,11 +864,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataformClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataformClient._read_environment_variables() + ) self._client_cert_source = DataformClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -901,8 +901,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataformTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/pagers.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/pagers.py index 944b220ef97a..853ec329381b 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/pagers.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -459,7 +459,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -539,7 +539,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -615,7 +615,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -695,7 +695,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -771,7 +771,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -851,7 +851,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -927,7 +927,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1007,7 +1007,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1083,7 +1083,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1163,7 +1163,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1239,7 +1239,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1319,7 +1319,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1397,7 +1397,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1479,7 +1479,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1555,7 +1555,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1635,7 +1635,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1711,7 +1711,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1791,7 +1791,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1869,7 +1869,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/base.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/base.py index b8ea907705ab..dc8f9a8584ce 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/base.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataform_v1beta1 import gapic_version as package_version from google.cloud.dataform_v1beta1.types import dataform diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc.py index d7d7531572e6..a396a1a4db1d 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataform_v1beta1.types import dataform @@ -554,12 +556,12 @@ def query_repository_directory_contents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_repository_directory_contents" not in self._stubs: - self._stubs[ - "query_repository_directory_contents" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryRepositoryDirectoryContents", - request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, - response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + self._stubs["query_repository_directory_contents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryRepositoryDirectoryContents", + request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, + response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + ) ) return self._stubs["query_repository_directory_contents"] @@ -616,12 +618,12 @@ def compute_repository_access_token_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "compute_repository_access_token_status" not in self._stubs: - self._stubs[ - "compute_repository_access_token_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/ComputeRepositoryAccessTokenStatus", - request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, - response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + self._stubs["compute_repository_access_token_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/ComputeRepositoryAccessTokenStatus", + request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, + response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + ) ) return self._stubs["compute_repository_access_token_status"] @@ -1468,12 +1470,12 @@ def query_compilation_result_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_compilation_result_actions" not in self._stubs: - self._stubs[ - "query_compilation_result_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryCompilationResultActions", - request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, - response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + self._stubs["query_compilation_result_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryCompilationResultActions", + request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, + response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + ) ) return self._stubs["query_compilation_result_actions"] @@ -1692,12 +1694,12 @@ def create_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_workflow_invocation" not in self._stubs: - self._stubs[ - "create_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/CreateWorkflowInvocation", - request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, - response_deserializer=dataform.WorkflowInvocation.deserialize, + self._stubs["create_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/CreateWorkflowInvocation", + request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, + response_deserializer=dataform.WorkflowInvocation.deserialize, + ) ) return self._stubs["create_workflow_invocation"] @@ -1720,12 +1722,12 @@ def delete_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_workflow_invocation" not in self._stubs: - self._stubs[ - "delete_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/DeleteWorkflowInvocation", - request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/DeleteWorkflowInvocation", + request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_workflow_invocation"] @@ -1752,12 +1754,12 @@ def cancel_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_workflow_invocation" not in self._stubs: - self._stubs[ - "cancel_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/CancelWorkflowInvocation", - request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, - response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + self._stubs["cancel_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/CancelWorkflowInvocation", + request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, + response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + ) ) return self._stubs["cancel_workflow_invocation"] @@ -1785,12 +1787,12 @@ def query_workflow_invocation_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_workflow_invocation_actions" not in self._stubs: - self._stubs[ - "query_workflow_invocation_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryWorkflowInvocationActions", - request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, - response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + self._stubs["query_workflow_invocation_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryWorkflowInvocationActions", + request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, + response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + ) ) return self._stubs["query_workflow_invocation_actions"] diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc_asyncio.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc_asyncio.py index 00e2b18e71c4..823ea49bce6f 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataform_v1beta1.types import dataform @@ -563,12 +565,12 @@ def query_repository_directory_contents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_repository_directory_contents" not in self._stubs: - self._stubs[ - "query_repository_directory_contents" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryRepositoryDirectoryContents", - request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, - response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + self._stubs["query_repository_directory_contents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryRepositoryDirectoryContents", + request_serializer=dataform.QueryRepositoryDirectoryContentsRequest.serialize, + response_deserializer=dataform.QueryRepositoryDirectoryContentsResponse.deserialize, + ) ) return self._stubs["query_repository_directory_contents"] @@ -625,12 +627,12 @@ def compute_repository_access_token_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "compute_repository_access_token_status" not in self._stubs: - self._stubs[ - "compute_repository_access_token_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/ComputeRepositoryAccessTokenStatus", - request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, - response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + self._stubs["compute_repository_access_token_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/ComputeRepositoryAccessTokenStatus", + request_serializer=dataform.ComputeRepositoryAccessTokenStatusRequest.serialize, + response_deserializer=dataform.ComputeRepositoryAccessTokenStatusResponse.deserialize, + ) ) return self._stubs["compute_repository_access_token_status"] @@ -1507,12 +1509,12 @@ def query_compilation_result_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_compilation_result_actions" not in self._stubs: - self._stubs[ - "query_compilation_result_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryCompilationResultActions", - request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, - response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + self._stubs["query_compilation_result_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryCompilationResultActions", + request_serializer=dataform.QueryCompilationResultActionsRequest.serialize, + response_deserializer=dataform.QueryCompilationResultActionsResponse.deserialize, + ) ) return self._stubs["query_compilation_result_actions"] @@ -1741,12 +1743,12 @@ def create_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_workflow_invocation" not in self._stubs: - self._stubs[ - "create_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/CreateWorkflowInvocation", - request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, - response_deserializer=dataform.WorkflowInvocation.deserialize, + self._stubs["create_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/CreateWorkflowInvocation", + request_serializer=dataform.CreateWorkflowInvocationRequest.serialize, + response_deserializer=dataform.WorkflowInvocation.deserialize, + ) ) return self._stubs["create_workflow_invocation"] @@ -1771,12 +1773,12 @@ def delete_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_workflow_invocation" not in self._stubs: - self._stubs[ - "delete_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/DeleteWorkflowInvocation", - request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/DeleteWorkflowInvocation", + request_serializer=dataform.DeleteWorkflowInvocationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_workflow_invocation"] @@ -1803,12 +1805,12 @@ def cancel_workflow_invocation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_workflow_invocation" not in self._stubs: - self._stubs[ - "cancel_workflow_invocation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/CancelWorkflowInvocation", - request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, - response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + self._stubs["cancel_workflow_invocation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/CancelWorkflowInvocation", + request_serializer=dataform.CancelWorkflowInvocationRequest.serialize, + response_deserializer=dataform.CancelWorkflowInvocationResponse.deserialize, + ) ) return self._stubs["cancel_workflow_invocation"] @@ -1836,12 +1838,12 @@ def query_workflow_invocation_actions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_workflow_invocation_actions" not in self._stubs: - self._stubs[ - "query_workflow_invocation_actions" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataform.v1beta1.Dataform/QueryWorkflowInvocationActions", - request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, - response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + self._stubs["query_workflow_invocation_actions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataform.v1beta1.Dataform/QueryWorkflowInvocationActions", + request_serializer=dataform.QueryWorkflowInvocationActionsRequest.serialize, + response_deserializer=dataform.QueryWorkflowInvocationActionsResponse.deserialize, + ) ) return self._stubs["query_workflow_invocation_actions"] diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest.py index 03d17ae3919e..31690fff6a37 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.protobuf import json_format from requests import __version__ as requests_version @@ -3205,9 +3207,7 @@ def __call__( ``CancelWorkflowInvocation`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseCancelWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCancelWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_cancel_workflow_invocation( request, metadata @@ -3359,9 +3359,7 @@ def __call__( ``CommitRepositoryChanges`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseCommitRepositoryChanges._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCommitRepositoryChanges._get_http_options() request, metadata = self._interceptor.pre_commit_repository_changes( request, metadata @@ -3513,9 +3511,7 @@ def __call__( ``CommitWorkspaceChanges`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseCommitWorkspaceChanges._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCommitWorkspaceChanges._get_http_options() request, metadata = self._interceptor.pre_commit_workspace_changes( request, metadata @@ -3668,15 +3664,12 @@ def __call__( ``ComputeRepositoryAccessTokenStatus`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseComputeRepositoryAccessTokenStatus._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseComputeRepositoryAccessTokenStatus._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_compute_repository_access_token_status( - request, metadata + request, metadata = ( + self._interceptor.pre_compute_repository_access_token_status( + request, metadata + ) ) transcoded_request = _BaseDataformRestTransport._BaseComputeRepositoryAccessTokenStatus._get_transcoded_request( http_options, request @@ -3739,11 +3732,10 @@ def __call__( resp = self._interceptor.post_compute_repository_access_token_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_compute_repository_access_token_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_compute_repository_access_token_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3829,9 +3821,7 @@ def __call__( """ - http_options = ( - _BaseDataformRestTransport._BaseCreateCompilationResult._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCreateCompilationResult._get_http_options() request, metadata = self._interceptor.pre_create_compilation_result( request, metadata @@ -4448,9 +4438,7 @@ def __call__( """ - http_options = ( - _BaseDataformRestTransport._BaseCreateWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseCreateWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_create_workflow_invocation( request, metadata @@ -4777,7 +4765,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4887,7 +4875,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4995,7 +4983,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5080,9 +5068,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataformRestTransport._BaseDeleteWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseDeleteWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_delete_workflow_invocation( request, metadata @@ -5104,7 +5090,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5216,7 +5202,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5896,9 +5882,7 @@ def __call__( ``FetchRepositoryHistory`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseFetchRepositoryHistory._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseFetchRepositoryHistory._get_http_options() request, metadata = self._interceptor.pre_fetch_repository_history( request, metadata @@ -6786,9 +6770,7 @@ def __call__( """ - http_options = ( - _BaseDataformRestTransport._BaseGetWorkflowInvocation._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseGetWorkflowInvocation._get_http_options() request, metadata = self._interceptor.pre_get_workflow_invocation( request, metadata @@ -7232,9 +7214,7 @@ def __call__( ``ListCompilationResults`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseListCompilationResults._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseListCompilationResults._get_http_options() request, metadata = self._interceptor.pre_list_compilation_results( request, metadata @@ -7826,9 +7806,7 @@ def __call__( ``ListWorkflowInvocations`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseListWorkflowInvocations._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseListWorkflowInvocations._get_http_options() request, metadata = self._interceptor.pre_list_workflow_invocations( request, metadata @@ -8897,9 +8875,7 @@ def __call__( ``QueryCompilationResultActions`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryCompilationResultActions._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryCompilationResultActions._get_http_options() request, metadata = self._interceptor.pre_query_compilation_result_actions( request, metadata @@ -8965,11 +8941,10 @@ def __call__( resp = self._interceptor.post_query_compilation_result_actions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_compilation_result_actions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_compilation_result_actions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9050,9 +9025,7 @@ def __call__( ``QueryDirectoryContents`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryDirectoryContents._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryDirectoryContents._get_http_options() request, metadata = self._interceptor.pre_query_directory_contents( request, metadata @@ -9200,15 +9173,12 @@ def __call__( ``QueryRepositoryDirectoryContents`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryRepositoryDirectoryContents._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryRepositoryDirectoryContents._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_query_repository_directory_contents( - request, metadata + request, metadata = ( + self._interceptor.pre_query_repository_directory_contents( + request, metadata + ) ) transcoded_request = _BaseDataformRestTransport._BaseQueryRepositoryDirectoryContents._get_transcoded_request( http_options, request @@ -9271,11 +9241,10 @@ def __call__( resp = self._interceptor.post_query_repository_directory_contents(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_repository_directory_contents_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_repository_directory_contents_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9359,9 +9328,7 @@ def __call__( ``QueryWorkflowInvocationActions`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseQueryWorkflowInvocationActions._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseQueryWorkflowInvocationActions._get_http_options() request, metadata = self._interceptor.pre_query_workflow_invocation_actions( request, metadata @@ -9427,11 +9394,10 @@ def __call__( resp = self._interceptor.post_query_workflow_invocation_actions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_workflow_invocation_actions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_workflow_invocation_actions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -10119,9 +10085,7 @@ def __call__( ``ResetWorkspaceChanges`` response message. """ - http_options = ( - _BaseDataformRestTransport._BaseResetWorkspaceChanges._get_http_options() - ) + http_options = _BaseDataformRestTransport._BaseResetWorkspaceChanges._get_http_options() request, metadata = self._interceptor.pre_reset_workspace_changes( request, metadata @@ -11144,7 +11108,9 @@ def cancel_workflow_invocation( ]: # 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._CancelWorkflowInvocation(self._session, self._host, self._interceptor) # type: ignore + return self._CancelWorkflowInvocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def commit_repository_changes( @@ -11155,7 +11121,9 @@ def commit_repository_changes( ]: # 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._CommitRepositoryChanges(self._session, self._host, self._interceptor) # type: ignore + return self._CommitRepositoryChanges( + self._session, self._host, self._interceptor + ) # type: ignore @property def commit_workspace_changes( @@ -11166,7 +11134,9 @@ def commit_workspace_changes( ]: # 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._CommitWorkspaceChanges(self._session, self._host, self._interceptor) # type: ignore + return self._CommitWorkspaceChanges( + self._session, self._host, self._interceptor + ) # type: ignore @property def compute_repository_access_token_status( @@ -11177,7 +11147,9 @@ def compute_repository_access_token_status( ]: # 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._ComputeRepositoryAccessTokenStatus(self._session, self._host, self._interceptor) # type: ignore + return self._ComputeRepositoryAccessTokenStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_compilation_result( @@ -11187,7 +11159,9 @@ def create_compilation_result( ]: # 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._CreateCompilationResult(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCompilationResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_release_config( @@ -11221,7 +11195,9 @@ def create_workflow_invocation( ]: # 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._CreateWorkflowInvocation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateWorkflowInvocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_workspace( @@ -11261,7 +11237,9 @@ def delete_workflow_invocation( ) -> Callable[[dataform.DeleteWorkflowInvocationRequest], empty_pb2.Empty]: # 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._DeleteWorkflowInvocation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteWorkflowInvocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_workspace( @@ -11318,7 +11296,9 @@ def fetch_repository_history( ]: # 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._FetchRepositoryHistory(self._session, self._host, self._interceptor) # type: ignore + return self._FetchRepositoryHistory( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_compilation_result( @@ -11393,7 +11373,9 @@ def list_compilation_results( ]: # 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._ListCompilationResults(self._session, self._host, self._interceptor) # type: ignore + return self._ListCompilationResults( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_release_configs( @@ -11434,7 +11416,9 @@ def list_workflow_invocations( ]: # 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._ListWorkflowInvocations(self._session, self._host, self._interceptor) # type: ignore + return self._ListWorkflowInvocations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_workspaces( @@ -11493,7 +11477,9 @@ def query_compilation_result_actions( ]: # 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._QueryCompilationResultActions(self._session, self._host, self._interceptor) # type: ignore + return self._QueryCompilationResultActions( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_directory_contents( @@ -11504,7 +11490,9 @@ def query_directory_contents( ]: # 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._QueryDirectoryContents(self._session, self._host, self._interceptor) # type: ignore + return self._QueryDirectoryContents( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_repository_directory_contents( @@ -11515,7 +11503,9 @@ def query_repository_directory_contents( ]: # 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._QueryRepositoryDirectoryContents(self._session, self._host, self._interceptor) # type: ignore + return self._QueryRepositoryDirectoryContents( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_workflow_invocation_actions( @@ -11526,7 +11516,9 @@ def query_workflow_invocation_actions( ]: # 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._QueryWorkflowInvocationActions(self._session, self._host, self._interceptor) # type: ignore + return self._QueryWorkflowInvocationActions( + self._session, self._host, self._interceptor + ) # type: ignore @property def read_file( diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest_base.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest_base.py index 1f974a13d79d..7f0d654d32c1 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest_base.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/services/dataform/transports/rest_base.py @@ -17,11 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.protobuf import json_format from google.cloud.dataform_v1beta1.types import dataform diff --git a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/types/dataform.py b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/types/dataform.py index e2cf830479c7..d38706d97332 100644 --- a/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/types/dataform.py +++ b/packages/google-cloud-dataform/google/cloud/dataform_v1beta1/types/dataform.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -255,6 +255,7 @@ class TokenStatus(proto.Enum): The token was used successfully to authenticate against the Git remote. """ + TOKEN_STATUS_UNSPECIFIED = 0 NOT_FOUND = 1 INVALID = 2 @@ -963,6 +964,7 @@ class TokenStatus(proto.Enum): The token was used successfully to authenticate against the Git remote. """ + TOKEN_STATUS_UNSPECIFIED = 0 NOT_FOUND = 1 INVALID = 2 @@ -1325,6 +1327,7 @@ class State(proto.Enum): HAS_CONFLICTS (4): The file contains merge conflicts. """ + STATE_UNSPECIFIED = 0 ADDED = 1 DELETED = 2 @@ -1341,12 +1344,12 @@ class State(proto.Enum): enum="FetchFileGitStatusesResponse.UncommittedFileChange.State", ) - uncommitted_file_changes: MutableSequence[ - UncommittedFileChange - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=UncommittedFileChange, + uncommitted_file_changes: MutableSequence[UncommittedFileChange] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=UncommittedFileChange, + ) ) @@ -2096,12 +2099,12 @@ class ScheduledReleaseRecord(proto.Message): proto.STRING, number=7, ) - recent_scheduled_release_records: MutableSequence[ - ScheduledReleaseRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=ScheduledReleaseRecord, + recent_scheduled_release_records: MutableSequence[ScheduledReleaseRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=ScheduledReleaseRecord, + ) ) release_compilation_result: str = proto.Field( proto.STRING, @@ -2870,6 +2873,7 @@ class RelationType(proto.Enum): MATERIALIZED_VIEW (4): The relation is a materialized view. """ + RELATION_TYPE_UNSPECIFIED = 0 TABLE = 1 VIEW = 2 @@ -3447,12 +3451,12 @@ class QueryCompilationResultActionsResponse(proto.Message): def raw_page(self): return self - compilation_result_actions: MutableSequence[ - "CompilationResultAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CompilationResultAction", + compilation_result_actions: MutableSequence["CompilationResultAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CompilationResultAction", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -3575,12 +3579,12 @@ class ScheduledExecutionRecord(proto.Message): proto.STRING, number=7, ) - recent_scheduled_execution_records: MutableSequence[ - ScheduledExecutionRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=ScheduledExecutionRecord, + recent_scheduled_execution_records: MutableSequence[ScheduledExecutionRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=ScheduledExecutionRecord, + ) ) disabled: bool = proto.Field( proto.BOOL, @@ -3881,6 +3885,7 @@ class State(proto.Enum): The workflow invocation is being cancelled, but some actions are still running. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -4169,6 +4174,7 @@ class State(proto.Enum): FAILED (6): The action failed. A terminal state. """ + PENDING = 0 RUNNING = 1 SKIPPED = 2 @@ -4501,12 +4507,12 @@ class QueryWorkflowInvocationActionsResponse(proto.Message): def raw_page(self): return self - workflow_invocation_actions: MutableSequence[ - "WorkflowInvocationAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="WorkflowInvocationAction", + workflow_invocation_actions: MutableSequence["WorkflowInvocationAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="WorkflowInvocationAction", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dataform/noxfile.py b/packages/google-cloud-dataform/noxfile.py index 93139dee1aec..dead4a648f2e 100644 --- a/packages/google-cloud-dataform/noxfile.py +++ b/packages/google-cloud-dataform/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1/test_dataform.py b/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1/test_dataform.py index ee9269f961c1..fb252b290a37 100644 --- a/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1/test_dataform.py +++ b/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1/test_dataform.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,23 +43,30 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.dataform_v1.services.dataform import ( DataformAsyncClient, @@ -916,10 +923,9 @@ def test_dataform_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +970,9 @@ def test_dataform_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1008,9 @@ def test_dataform_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1231,13 +1235,13 @@ def test_dataform_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1359,9 +1363,9 @@ def test_list_repositories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -2268,9 +2272,9 @@ def test_create_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -2649,9 +2653,9 @@ def test_update_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -3006,9 +3010,9 @@ def test_delete_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -3601,9 +3605,9 @@ def test_read_repository_file_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.read_repository_file - ] = mock_rpc + client._transport._wrapped_methods[client._transport.read_repository_file] = ( + mock_rpc + ) request = {} client.read_repository_file(request) @@ -5049,9 +5053,9 @@ def test_fetch_remote_branches_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_remote_branches - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_remote_branches] = ( + mock_rpc + ) request = {} client.fetch_remote_branches(request) @@ -6152,9 +6156,9 @@ def test_create_workspace_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workspace] = ( + mock_rpc + ) request = {} client.create_workspace(request) @@ -6492,9 +6496,9 @@ def test_delete_workspace_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workspace] = ( + mock_rpc + ) request = {} client.delete_workspace(request) @@ -6811,9 +6815,9 @@ def test_install_npm_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.install_npm_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.install_npm_packages] = ( + mock_rpc + ) request = {} client.install_npm_packages(request) @@ -7056,9 +7060,9 @@ def test_pull_git_commits_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.pull_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.pull_git_commits] = ( + mock_rpc + ) request = {} client.pull_git_commits(request) @@ -7295,9 +7299,9 @@ def test_push_git_commits_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.push_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.push_git_commits] = ( + mock_rpc + ) request = {} client.push_git_commits(request) @@ -7796,9 +7800,9 @@ def test_fetch_git_ahead_behind_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_git_ahead_behind - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_git_ahead_behind] = ( + mock_rpc + ) request = {} client.fetch_git_ahead_behind(request) @@ -9931,9 +9935,9 @@ def test_remove_directory_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_directory - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_directory] = ( + mock_rpc + ) request = {} client.remove_directory(request) @@ -11372,9 +11376,9 @@ def test_list_release_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_release_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_release_configs] = ( + mock_rpc + ) request = {} client.list_release_configs(request) @@ -11929,9 +11933,9 @@ def test_get_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_release_config] = ( + mock_rpc + ) request = {} client.get_release_config(request) @@ -12297,9 +12301,9 @@ def test_create_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_release_config] = ( + mock_rpc + ) request = {} client.create_release_config(request) @@ -12679,9 +12683,9 @@ def test_update_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_release_config] = ( + mock_rpc + ) request = {} client.update_release_config(request) @@ -13040,9 +13044,9 @@ def test_delete_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_release_config] = ( + mock_rpc + ) request = {} client.delete_release_config(request) @@ -13936,9 +13940,9 @@ def test_get_compilation_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_compilation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_compilation_result] = ( + mock_rpc + ) request = {} client.get_compilation_result(request) @@ -15127,9 +15131,9 @@ def test_list_workflow_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_workflow_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_workflow_configs] = ( + mock_rpc + ) request = {} client.list_workflow_configs(request) @@ -15682,9 +15686,9 @@ def test_get_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_workflow_config] = ( + mock_rpc + ) request = {} client.get_workflow_config(request) @@ -16046,9 +16050,9 @@ def test_create_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workflow_config] = ( + mock_rpc + ) request = {} client.create_workflow_config(request) @@ -16424,9 +16428,9 @@ def test_update_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_workflow_config] = ( + mock_rpc + ) request = {} client.update_workflow_config(request) @@ -16783,9 +16787,9 @@ def test_delete_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workflow_config] = ( + mock_rpc + ) request = {} client.delete_workflow_config(request) @@ -20030,9 +20034,9 @@ def test_list_repositories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -20470,9 +20474,9 @@ def test_create_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -20679,9 +20683,9 @@ def test_update_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -20863,9 +20867,9 @@ def test_delete_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -21178,9 +21182,9 @@ def test_read_repository_file_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.read_repository_file - ] = mock_rpc + client._transport._wrapped_methods[client._transport.read_repository_file] = ( + mock_rpc + ) request = {} client.read_repository_file(request) @@ -21890,9 +21894,9 @@ def test_fetch_remote_branches_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_remote_branches - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_remote_branches] = ( + mock_rpc + ) request = {} client.fetch_remote_branches(request) @@ -22452,9 +22456,9 @@ def test_create_workspace_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workspace] = ( + mock_rpc + ) request = {} client.create_workspace(request) @@ -22663,9 +22667,9 @@ def test_delete_workspace_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workspace] = ( + mock_rpc + ) request = {} client.delete_workspace(request) @@ -22842,9 +22846,9 @@ def test_install_npm_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.install_npm_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.install_npm_packages] = ( + mock_rpc + ) request = {} client.install_npm_packages(request) @@ -22965,9 +22969,9 @@ def test_pull_git_commits_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.pull_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.pull_git_commits] = ( + mock_rpc + ) request = {} client.pull_git_commits(request) @@ -23096,9 +23100,9 @@ def test_push_git_commits_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.push_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.push_git_commits] = ( + mock_rpc + ) request = {} client.push_git_commits(request) @@ -23347,9 +23351,9 @@ def test_fetch_git_ahead_behind_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_git_ahead_behind - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_git_ahead_behind] = ( + mock_rpc + ) request = {} client.fetch_git_ahead_behind(request) @@ -24412,9 +24416,9 @@ def test_remove_directory_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_directory - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_directory] = ( + mock_rpc + ) request = {} client.remove_directory(request) @@ -25241,9 +25245,9 @@ def test_list_release_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_release_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_release_configs] = ( + mock_rpc + ) request = {} client.list_release_configs(request) @@ -25505,9 +25509,9 @@ def test_get_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_release_config] = ( + mock_rpc + ) request = {} client.get_release_config(request) @@ -25690,9 +25694,9 @@ def test_create_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_release_config] = ( + mock_rpc + ) request = {} client.create_release_config(request) @@ -25904,9 +25908,9 @@ def test_update_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_release_config] = ( + mock_rpc + ) request = {} client.update_release_config(request) @@ -26091,9 +26095,9 @@ def test_delete_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_release_config] = ( + mock_rpc + ) request = {} client.delete_release_config(request) @@ -26540,9 +26544,9 @@ def test_get_compilation_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_compilation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_compilation_result] = ( + mock_rpc + ) request = {} client.get_compilation_result(request) @@ -27138,9 +27142,9 @@ def test_list_workflow_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_workflow_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_workflow_configs] = ( + mock_rpc + ) request = {} client.list_workflow_configs(request) @@ -27402,9 +27406,9 @@ def test_get_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_workflow_config] = ( + mock_rpc + ) request = {} client.get_workflow_config(request) @@ -27587,9 +27591,9 @@ def test_create_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workflow_config] = ( + mock_rpc + ) request = {} client.create_workflow_config(request) @@ -27801,9 +27805,9 @@ def test_update_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_workflow_config] = ( + mock_rpc + ) request = {} client.update_workflow_config(request) @@ -27988,9 +27992,9 @@ def test_delete_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workflow_config] = ( + mock_rpc + ) request = {} client.delete_workflow_config(request) @@ -32570,8 +32574,9 @@ def test_list_repositories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32634,17 +32639,19 @@ def test_list_repositories_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_list_repositories" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_list_repositories_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_list_repositories" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_repositories" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_repositories_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_list_repositories" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32697,8 +32704,9 @@ def test_get_repository_rest_bad_request(request_type=dataform.GetRepositoryRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32774,17 +32782,19 @@ def test_get_repository_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_repository" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_repository_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_repository" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_repository_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_get_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32835,8 +32845,9 @@ def test_create_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33006,17 +33017,19 @@ def test_create_repository_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_create_repository" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_create_repository_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_create_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_repository" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_repository_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_create_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33073,8 +33086,9 @@ def test_update_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33248,17 +33262,19 @@ def test_update_repository_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_update_repository" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_update_repository_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_update_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_update_repository" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_update_repository_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_update_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33311,8 +33327,9 @@ def test_delete_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33367,13 +33384,13 @@ def test_delete_repository_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "pre_delete_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "pre_delete_repository" + ) as pre, + ): pre.assert_not_called() pb_message = dataform.DeleteRepositoryRequest.pb( dataform.DeleteRepositoryRequest() @@ -33418,8 +33435,9 @@ def test_commit_repository_changes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33480,18 +33498,20 @@ def test_commit_repository_changes_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_commit_repository_changes" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_commit_repository_changes_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_commit_repository_changes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_commit_repository_changes" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_commit_repository_changes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_commit_repository_changes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33549,8 +33569,9 @@ def test_read_repository_file_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33611,17 +33632,20 @@ def test_read_repository_file_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_read_repository_file" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_read_repository_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_read_repository_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_read_repository_file" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_read_repository_file_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_read_repository_file" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33679,8 +33703,9 @@ def test_query_repository_directory_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33743,18 +33768,22 @@ def test_query_repository_directory_contents_rest_interceptors(null_interceptor) ) client = DataformClient(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.DataformRestInterceptor, "post_query_repository_directory_contents" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_query_repository_directory_contents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_query_repository_directory_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, + "post_query_repository_directory_contents", + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_query_repository_directory_contents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, + "pre_query_repository_directory_contents", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33812,8 +33841,9 @@ def test_fetch_repository_history_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33874,18 +33904,20 @@ def test_fetch_repository_history_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_fetch_repository_history" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_fetch_repository_history_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_fetch_repository_history" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_fetch_repository_history" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_fetch_repository_history_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_fetch_repository_history" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33943,8 +33975,9 @@ def test_compute_repository_access_token_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34010,19 +34043,22 @@ def test_compute_repository_access_token_status_rest_interceptors(null_intercept ) client = DataformClient(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.DataformRestInterceptor, - "post_compute_repository_access_token_status", - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_compute_repository_access_token_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_compute_repository_access_token_status" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, + "post_compute_repository_access_token_status", + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_compute_repository_access_token_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, + "pre_compute_repository_access_token_status", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34080,8 +34116,9 @@ def test_fetch_remote_branches_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34142,17 +34179,20 @@ def test_fetch_remote_branches_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_fetch_remote_branches" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_fetch_remote_branches_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_fetch_remote_branches" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_fetch_remote_branches" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_fetch_remote_branches_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_fetch_remote_branches" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34208,8 +34248,9 @@ def test_list_workspaces_rest_bad_request(request_type=dataform.ListWorkspacesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34272,17 +34313,19 @@ def test_list_workspaces_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_list_workspaces" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_list_workspaces_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_list_workspaces" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_workspaces" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_workspaces_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_list_workspaces" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34335,8 +34378,9 @@ def test_get_workspace_rest_bad_request(request_type=dataform.GetWorkspaceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34401,17 +34445,19 @@ def test_get_workspace_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_workspace" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_workspace_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_workspace" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_workspace" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_workspace_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_get_workspace" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34462,8 +34508,9 @@ def test_create_workspace_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34599,17 +34646,19 @@ def test_create_workspace_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_create_workspace" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_create_workspace_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_create_workspace" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_workspace" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_workspace_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_create_workspace" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34664,8 +34713,9 @@ def test_delete_workspace_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34722,13 +34772,13 @@ def test_delete_workspace_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "pre_delete_workspace" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "pre_delete_workspace" + ) as pre, + ): pre.assert_not_called() pb_message = dataform.DeleteWorkspaceRequest.pb( dataform.DeleteWorkspaceRequest() @@ -34775,8 +34825,9 @@ def test_install_npm_packages_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34836,17 +34887,20 @@ def test_install_npm_packages_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_install_npm_packages" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_install_npm_packages_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_install_npm_packages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_install_npm_packages" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_install_npm_packages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_install_npm_packages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34904,8 +34958,9 @@ def test_pull_git_commits_rest_bad_request(request_type=dataform.PullGitCommitsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34965,17 +35020,19 @@ def test_pull_git_commits_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_pull_git_commits" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_pull_git_commits_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_pull_git_commits" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_pull_git_commits" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_pull_git_commits_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_pull_git_commits" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35028,8 +35085,9 @@ def test_push_git_commits_rest_bad_request(request_type=dataform.PushGitCommitsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35089,17 +35147,19 @@ def test_push_git_commits_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_push_git_commits" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_push_git_commits_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_push_git_commits" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_push_git_commits" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_push_git_commits_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_push_git_commits" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35154,8 +35214,9 @@ def test_fetch_file_git_statuses_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35215,17 +35276,20 @@ def test_fetch_file_git_statuses_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_fetch_file_git_statuses" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_fetch_file_git_statuses_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_fetch_file_git_statuses" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_fetch_file_git_statuses" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_fetch_file_git_statuses_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_fetch_file_git_statuses" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35285,8 +35349,9 @@ def test_fetch_git_ahead_behind_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35351,17 +35416,20 @@ def test_fetch_git_ahead_behind_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_fetch_git_ahead_behind" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_fetch_git_ahead_behind_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_fetch_git_ahead_behind" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_fetch_git_ahead_behind" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_fetch_git_ahead_behind_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_fetch_git_ahead_behind" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35421,8 +35489,9 @@ def test_commit_workspace_changes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35482,18 +35551,20 @@ def test_commit_workspace_changes_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_commit_workspace_changes" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_commit_workspace_changes_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_commit_workspace_changes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_commit_workspace_changes" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_commit_workspace_changes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_commit_workspace_changes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35553,8 +35624,9 @@ def test_reset_workspace_changes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35614,17 +35686,20 @@ def test_reset_workspace_changes_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_reset_workspace_changes" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_reset_workspace_changes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_reset_workspace_changes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_reset_workspace_changes" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_reset_workspace_changes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_reset_workspace_changes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35682,8 +35757,9 @@ def test_fetch_file_diff_rest_bad_request(request_type=dataform.FetchFileDiffReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35746,17 +35822,19 @@ def test_fetch_file_diff_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_fetch_file_diff" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_fetch_file_diff_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_fetch_file_diff" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_fetch_file_diff" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_fetch_file_diff_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_fetch_file_diff" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35811,8 +35889,9 @@ def test_query_directory_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35875,18 +35954,20 @@ def test_query_directory_contents_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_query_directory_contents" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_query_directory_contents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_query_directory_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_query_directory_contents" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_query_directory_contents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_query_directory_contents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35944,8 +36025,9 @@ def test_search_files_rest_bad_request(request_type=dataform.SearchFilesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36008,17 +36090,19 @@ def test_search_files_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_search_files" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_search_files_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_search_files" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_search_files" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_search_files_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_search_files" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36071,8 +36155,9 @@ def test_make_directory_rest_bad_request(request_type=dataform.MakeDirectoryRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36132,17 +36217,19 @@ def test_make_directory_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_make_directory" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_make_directory_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_make_directory" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_make_directory" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_make_directory_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_make_directory" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36197,8 +36284,9 @@ def test_remove_directory_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36258,17 +36346,19 @@ def test_remove_directory_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_remove_directory" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_remove_directory_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_remove_directory" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_remove_directory" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_remove_directory_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_remove_directory" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36323,8 +36413,9 @@ def test_move_directory_rest_bad_request(request_type=dataform.MoveDirectoryRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36384,17 +36475,19 @@ def test_move_directory_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_move_directory" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_move_directory_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_move_directory" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_move_directory" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_move_directory_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_move_directory" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36447,8 +36540,9 @@ def test_read_file_rest_bad_request(request_type=dataform.ReadFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36511,17 +36605,15 @@ def test_read_file_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_read_file" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_read_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_read_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DataformRestInterceptor, "post_read_file") as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_read_file_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DataformRestInterceptor, "pre_read_file") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36572,8 +36664,9 @@ def test_remove_file_rest_bad_request(request_type=dataform.RemoveFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36633,17 +36726,17 @@ def test_remove_file_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_remove_file" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_remove_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_remove_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_remove_file" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_remove_file_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DataformRestInterceptor, "pre_remove_file") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36696,8 +36789,9 @@ def test_move_file_rest_bad_request(request_type=dataform.MoveFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36757,17 +36851,15 @@ def test_move_file_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_move_file" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_move_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_move_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DataformRestInterceptor, "post_move_file") as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_move_file_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DataformRestInterceptor, "pre_move_file") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36818,8 +36910,9 @@ def test_write_file_rest_bad_request(request_type=dataform.WriteFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36879,17 +36972,17 @@ def test_write_file_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_write_file" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_write_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_write_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_write_file" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_write_file_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DataformRestInterceptor, "pre_write_file") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36940,8 +37033,9 @@ def test_list_release_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37004,17 +37098,20 @@ def test_list_release_configs_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_list_release_configs" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_list_release_configs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_list_release_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_release_configs" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_list_release_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_list_release_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37074,8 +37171,9 @@ def test_get_release_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37150,17 +37248,19 @@ def test_get_release_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_release_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_release_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_release_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_release_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_release_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_get_release_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37213,8 +37313,9 @@ def test_create_release_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37394,17 +37495,20 @@ def test_create_release_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_create_release_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_create_release_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_create_release_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_release_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_create_release_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_create_release_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37461,8 +37565,9 @@ def test_update_release_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37646,17 +37751,20 @@ def test_update_release_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_update_release_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_update_release_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_update_release_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_update_release_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_update_release_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_update_release_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37711,8 +37819,9 @@ def test_delete_release_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37769,13 +37878,13 @@ def test_delete_release_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "pre_delete_release_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "pre_delete_release_config" + ) as pre, + ): pre.assert_not_called() pb_message = dataform.DeleteReleaseConfigRequest.pb( dataform.DeleteReleaseConfigRequest() @@ -37820,8 +37929,9 @@ def test_list_compilation_results_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37884,18 +37994,20 @@ def test_list_compilation_results_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_list_compilation_results" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_list_compilation_results_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_list_compilation_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_compilation_results" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_list_compilation_results_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_list_compilation_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37955,8 +38067,9 @@ def test_get_compilation_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38026,17 +38139,20 @@ def test_get_compilation_result_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_compilation_result" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_compilation_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_compilation_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_compilation_result" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_get_compilation_result_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_get_compilation_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38089,8 +38205,9 @@ def test_create_compilation_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38265,18 +38382,20 @@ def test_create_compilation_result_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_create_compilation_result" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_create_compilation_result_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_create_compilation_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_compilation_result" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_create_compilation_result_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_create_compilation_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38331,8 +38450,9 @@ def test_query_compilation_result_actions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38395,18 +38515,20 @@ def test_query_compilation_result_actions_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_query_compilation_result_actions" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_query_compilation_result_actions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_query_compilation_result_actions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_query_compilation_result_actions" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_query_compilation_result_actions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_query_compilation_result_actions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38464,8 +38586,9 @@ def test_list_workflow_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38528,17 +38651,20 @@ def test_list_workflow_configs_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_list_workflow_configs" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_list_workflow_configs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_list_workflow_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_workflow_configs" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_list_workflow_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_list_workflow_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38598,8 +38724,9 @@ def test_get_workflow_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38672,17 +38799,19 @@ def test_get_workflow_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_workflow_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_workflow_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_workflow_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_workflow_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_workflow_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_get_workflow_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38735,8 +38864,9 @@ def test_create_workflow_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38914,17 +39044,20 @@ def test_create_workflow_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_create_workflow_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_create_workflow_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_create_workflow_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_workflow_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_create_workflow_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_create_workflow_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38981,8 +39114,9 @@ def test_update_workflow_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39164,17 +39298,20 @@ def test_update_workflow_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_update_workflow_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_update_workflow_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_update_workflow_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_update_workflow_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_update_workflow_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_update_workflow_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39229,8 +39366,9 @@ def test_delete_workflow_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39287,13 +39425,13 @@ def test_delete_workflow_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "pre_delete_workflow_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "pre_delete_workflow_config" + ) as pre, + ): pre.assert_not_called() pb_message = dataform.DeleteWorkflowConfigRequest.pb( dataform.DeleteWorkflowConfigRequest() @@ -39338,8 +39476,9 @@ def test_list_workflow_invocations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39402,18 +39541,20 @@ def test_list_workflow_invocations_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_list_workflow_invocations" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_list_workflow_invocations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_list_workflow_invocations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_workflow_invocations" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_list_workflow_invocations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_list_workflow_invocations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39473,8 +39614,9 @@ def test_get_workflow_invocation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39544,17 +39686,20 @@ def test_get_workflow_invocation_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_workflow_invocation" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_workflow_invocation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_workflow_invocation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_workflow_invocation" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_get_workflow_invocation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_get_workflow_invocation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39609,8 +39754,9 @@ def test_create_workflow_invocation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39774,18 +39920,20 @@ def test_create_workflow_invocation_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_create_workflow_invocation" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_create_workflow_invocation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_create_workflow_invocation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_workflow_invocation" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_create_workflow_invocation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_create_workflow_invocation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39842,8 +39990,9 @@ def test_delete_workflow_invocation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39900,13 +40049,13 @@ def test_delete_workflow_invocation_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "pre_delete_workflow_invocation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "pre_delete_workflow_invocation" + ) as pre, + ): pre.assert_not_called() pb_message = dataform.DeleteWorkflowInvocationRequest.pb( dataform.DeleteWorkflowInvocationRequest() @@ -39953,8 +40102,9 @@ def test_cancel_workflow_invocation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40014,18 +40164,20 @@ def test_cancel_workflow_invocation_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_cancel_workflow_invocation" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_cancel_workflow_invocation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_cancel_workflow_invocation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_cancel_workflow_invocation" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_cancel_workflow_invocation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_cancel_workflow_invocation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40085,8 +40237,9 @@ def test_query_workflow_invocation_actions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40149,18 +40302,20 @@ def test_query_workflow_invocation_actions_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_query_workflow_invocation_actions" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_query_workflow_invocation_actions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_query_workflow_invocation_actions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_query_workflow_invocation_actions" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_query_workflow_invocation_actions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_query_workflow_invocation_actions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40216,8 +40371,9 @@ def test_get_config_rest_bad_request(request_type=dataform.GetConfigRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40280,17 +40436,17 @@ def test_get_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_config_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DataformRestInterceptor, "pre_get_config") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40339,8 +40495,9 @@ def test_update_config_rest_bad_request(request_type=dataform.UpdateConfigReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40474,17 +40631,19 @@ def test_update_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_update_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_update_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_update_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_update_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_update_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_update_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40535,8 +40694,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -40595,8 +40755,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -40657,8 +40818,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -40721,8 +40883,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -40785,8 +40948,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -42106,11 +42270,14 @@ def test_dataform_base_transport(): def test_dataform_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataform_v1.services.dataform.transports.DataformTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataform_v1.services.dataform.transports.DataformTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataformTransport( @@ -42130,9 +42297,12 @@ def test_dataform_base_transport_with_credentials_file(): def test_dataform_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataform_v1.services.dataform.transports.DataformTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataform_v1.services.dataform.transports.DataformTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataformTransport() @@ -42210,11 +42380,12 @@ def test_dataform_transport_auth_gdch_credentials(transport_class): def test_dataform_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1beta1/test_dataform.py b/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1beta1/test_dataform.py index e430c0a10b5d..17b47a6bed5c 100644 --- a/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1beta1/test_dataform.py +++ b/packages/google-cloud-dataform/tests/unit/gapic/dataform_v1beta1/test_dataform.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,23 +43,30 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.dataform_v1beta1.services.dataform import ( DataformAsyncClient, @@ -916,10 +923,9 @@ def test_dataform_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -964,10 +970,9 @@ def test_dataform_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1008,9 @@ def test_dataform_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1231,13 +1235,13 @@ def test_dataform_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1359,9 +1363,9 @@ def test_list_repositories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -2268,9 +2272,9 @@ def test_create_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -2649,9 +2653,9 @@ def test_update_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -3006,9 +3010,9 @@ def test_delete_repository_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -3601,9 +3605,9 @@ def test_read_repository_file_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.read_repository_file - ] = mock_rpc + client._transport._wrapped_methods[client._transport.read_repository_file] = ( + mock_rpc + ) request = {} client.read_repository_file(request) @@ -5049,9 +5053,9 @@ def test_fetch_remote_branches_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_remote_branches - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_remote_branches] = ( + mock_rpc + ) request = {} client.fetch_remote_branches(request) @@ -6152,9 +6156,9 @@ def test_create_workspace_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workspace] = ( + mock_rpc + ) request = {} client.create_workspace(request) @@ -6492,9 +6496,9 @@ def test_delete_workspace_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workspace] = ( + mock_rpc + ) request = {} client.delete_workspace(request) @@ -6811,9 +6815,9 @@ def test_install_npm_packages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.install_npm_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.install_npm_packages] = ( + mock_rpc + ) request = {} client.install_npm_packages(request) @@ -7056,9 +7060,9 @@ def test_pull_git_commits_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.pull_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.pull_git_commits] = ( + mock_rpc + ) request = {} client.pull_git_commits(request) @@ -7295,9 +7299,9 @@ def test_push_git_commits_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.push_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.push_git_commits] = ( + mock_rpc + ) request = {} client.push_git_commits(request) @@ -7796,9 +7800,9 @@ def test_fetch_git_ahead_behind_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_git_ahead_behind - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_git_ahead_behind] = ( + mock_rpc + ) request = {} client.fetch_git_ahead_behind(request) @@ -9931,9 +9935,9 @@ def test_remove_directory_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_directory - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_directory] = ( + mock_rpc + ) request = {} client.remove_directory(request) @@ -11372,9 +11376,9 @@ def test_list_release_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_release_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_release_configs] = ( + mock_rpc + ) request = {} client.list_release_configs(request) @@ -11929,9 +11933,9 @@ def test_get_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_release_config] = ( + mock_rpc + ) request = {} client.get_release_config(request) @@ -12297,9 +12301,9 @@ def test_create_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_release_config] = ( + mock_rpc + ) request = {} client.create_release_config(request) @@ -12679,9 +12683,9 @@ def test_update_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_release_config] = ( + mock_rpc + ) request = {} client.update_release_config(request) @@ -13040,9 +13044,9 @@ def test_delete_release_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_release_config] = ( + mock_rpc + ) request = {} client.delete_release_config(request) @@ -13936,9 +13940,9 @@ def test_get_compilation_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_compilation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_compilation_result] = ( + mock_rpc + ) request = {} client.get_compilation_result(request) @@ -15127,9 +15131,9 @@ def test_list_workflow_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_workflow_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_workflow_configs] = ( + mock_rpc + ) request = {} client.list_workflow_configs(request) @@ -15682,9 +15686,9 @@ def test_get_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_workflow_config] = ( + mock_rpc + ) request = {} client.get_workflow_config(request) @@ -16046,9 +16050,9 @@ def test_create_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workflow_config] = ( + mock_rpc + ) request = {} client.create_workflow_config(request) @@ -16424,9 +16428,9 @@ def test_update_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_workflow_config] = ( + mock_rpc + ) request = {} client.update_workflow_config(request) @@ -16783,9 +16787,9 @@ def test_delete_workflow_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workflow_config] = ( + mock_rpc + ) request = {} client.delete_workflow_config(request) @@ -20030,9 +20034,9 @@ def test_list_repositories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_repositories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_repositories] = ( + mock_rpc + ) request = {} client.list_repositories(request) @@ -20470,9 +20474,9 @@ def test_create_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_repository] = ( + mock_rpc + ) request = {} client.create_repository(request) @@ -20679,9 +20683,9 @@ def test_update_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_repository] = ( + mock_rpc + ) request = {} client.update_repository(request) @@ -20863,9 +20867,9 @@ def test_delete_repository_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_repository - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_repository] = ( + mock_rpc + ) request = {} client.delete_repository(request) @@ -21178,9 +21182,9 @@ def test_read_repository_file_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.read_repository_file - ] = mock_rpc + client._transport._wrapped_methods[client._transport.read_repository_file] = ( + mock_rpc + ) request = {} client.read_repository_file(request) @@ -21890,9 +21894,9 @@ def test_fetch_remote_branches_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_remote_branches - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_remote_branches] = ( + mock_rpc + ) request = {} client.fetch_remote_branches(request) @@ -22452,9 +22456,9 @@ def test_create_workspace_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workspace] = ( + mock_rpc + ) request = {} client.create_workspace(request) @@ -22663,9 +22667,9 @@ def test_delete_workspace_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workspace - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workspace] = ( + mock_rpc + ) request = {} client.delete_workspace(request) @@ -22842,9 +22846,9 @@ def test_install_npm_packages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.install_npm_packages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.install_npm_packages] = ( + mock_rpc + ) request = {} client.install_npm_packages(request) @@ -22965,9 +22969,9 @@ def test_pull_git_commits_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.pull_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.pull_git_commits] = ( + mock_rpc + ) request = {} client.pull_git_commits(request) @@ -23096,9 +23100,9 @@ def test_push_git_commits_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.push_git_commits - ] = mock_rpc + client._transport._wrapped_methods[client._transport.push_git_commits] = ( + mock_rpc + ) request = {} client.push_git_commits(request) @@ -23347,9 +23351,9 @@ def test_fetch_git_ahead_behind_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_git_ahead_behind - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_git_ahead_behind] = ( + mock_rpc + ) request = {} client.fetch_git_ahead_behind(request) @@ -24412,9 +24416,9 @@ def test_remove_directory_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_directory - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_directory] = ( + mock_rpc + ) request = {} client.remove_directory(request) @@ -25241,9 +25245,9 @@ def test_list_release_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_release_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_release_configs] = ( + mock_rpc + ) request = {} client.list_release_configs(request) @@ -25505,9 +25509,9 @@ def test_get_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_release_config] = ( + mock_rpc + ) request = {} client.get_release_config(request) @@ -25690,9 +25694,9 @@ def test_create_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_release_config] = ( + mock_rpc + ) request = {} client.create_release_config(request) @@ -25904,9 +25908,9 @@ def test_update_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_release_config] = ( + mock_rpc + ) request = {} client.update_release_config(request) @@ -26091,9 +26095,9 @@ def test_delete_release_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_release_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_release_config] = ( + mock_rpc + ) request = {} client.delete_release_config(request) @@ -26540,9 +26544,9 @@ def test_get_compilation_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_compilation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_compilation_result] = ( + mock_rpc + ) request = {} client.get_compilation_result(request) @@ -27138,9 +27142,9 @@ def test_list_workflow_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_workflow_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_workflow_configs] = ( + mock_rpc + ) request = {} client.list_workflow_configs(request) @@ -27402,9 +27406,9 @@ def test_get_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_workflow_config] = ( + mock_rpc + ) request = {} client.get_workflow_config(request) @@ -27587,9 +27591,9 @@ def test_create_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_workflow_config] = ( + mock_rpc + ) request = {} client.create_workflow_config(request) @@ -27801,9 +27805,9 @@ def test_update_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_workflow_config] = ( + mock_rpc + ) request = {} client.update_workflow_config(request) @@ -27988,9 +27992,9 @@ def test_delete_workflow_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_workflow_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_workflow_config] = ( + mock_rpc + ) request = {} client.delete_workflow_config(request) @@ -32570,8 +32574,9 @@ def test_list_repositories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32634,17 +32639,19 @@ def test_list_repositories_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_list_repositories" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_list_repositories_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_list_repositories" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_repositories" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_repositories_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_list_repositories" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32697,8 +32704,9 @@ def test_get_repository_rest_bad_request(request_type=dataform.GetRepositoryRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32774,17 +32782,19 @@ def test_get_repository_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_repository" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_repository_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_repository" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_repository_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_get_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32835,8 +32845,9 @@ def test_create_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33006,17 +33017,19 @@ def test_create_repository_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_create_repository" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_create_repository_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_create_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_repository" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_repository_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_create_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33073,8 +33086,9 @@ def test_update_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33248,17 +33262,19 @@ def test_update_repository_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_update_repository" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_update_repository_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_update_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_update_repository" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_update_repository_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_update_repository" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33311,8 +33327,9 @@ def test_delete_repository_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33367,13 +33384,13 @@ def test_delete_repository_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "pre_delete_repository" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "pre_delete_repository" + ) as pre, + ): pre.assert_not_called() pb_message = dataform.DeleteRepositoryRequest.pb( dataform.DeleteRepositoryRequest() @@ -33418,8 +33435,9 @@ def test_commit_repository_changes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33480,18 +33498,20 @@ def test_commit_repository_changes_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_commit_repository_changes" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_commit_repository_changes_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_commit_repository_changes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_commit_repository_changes" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_commit_repository_changes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_commit_repository_changes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33549,8 +33569,9 @@ def test_read_repository_file_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33611,17 +33632,20 @@ def test_read_repository_file_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_read_repository_file" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_read_repository_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_read_repository_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_read_repository_file" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_read_repository_file_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_read_repository_file" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33679,8 +33703,9 @@ def test_query_repository_directory_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33743,18 +33768,22 @@ def test_query_repository_directory_contents_rest_interceptors(null_interceptor) ) client = DataformClient(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.DataformRestInterceptor, "post_query_repository_directory_contents" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_query_repository_directory_contents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_query_repository_directory_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, + "post_query_repository_directory_contents", + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_query_repository_directory_contents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, + "pre_query_repository_directory_contents", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33812,8 +33841,9 @@ def test_fetch_repository_history_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33874,18 +33904,20 @@ def test_fetch_repository_history_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_fetch_repository_history" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_fetch_repository_history_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_fetch_repository_history" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_fetch_repository_history" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_fetch_repository_history_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_fetch_repository_history" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33943,8 +33975,9 @@ def test_compute_repository_access_token_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34010,19 +34043,22 @@ def test_compute_repository_access_token_status_rest_interceptors(null_intercept ) client = DataformClient(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.DataformRestInterceptor, - "post_compute_repository_access_token_status", - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_compute_repository_access_token_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_compute_repository_access_token_status" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, + "post_compute_repository_access_token_status", + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_compute_repository_access_token_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, + "pre_compute_repository_access_token_status", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34080,8 +34116,9 @@ def test_fetch_remote_branches_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34142,17 +34179,20 @@ def test_fetch_remote_branches_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_fetch_remote_branches" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_fetch_remote_branches_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_fetch_remote_branches" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_fetch_remote_branches" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_fetch_remote_branches_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_fetch_remote_branches" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34208,8 +34248,9 @@ def test_list_workspaces_rest_bad_request(request_type=dataform.ListWorkspacesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34272,17 +34313,19 @@ def test_list_workspaces_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_list_workspaces" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_list_workspaces_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_list_workspaces" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_workspaces" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_workspaces_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_list_workspaces" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34335,8 +34378,9 @@ def test_get_workspace_rest_bad_request(request_type=dataform.GetWorkspaceReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34401,17 +34445,19 @@ def test_get_workspace_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_workspace" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_workspace_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_workspace" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_workspace" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_workspace_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_get_workspace" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34462,8 +34508,9 @@ def test_create_workspace_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34599,17 +34646,19 @@ def test_create_workspace_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_create_workspace" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_create_workspace_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_create_workspace" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_workspace" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_workspace_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_create_workspace" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34664,8 +34713,9 @@ def test_delete_workspace_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34722,13 +34772,13 @@ def test_delete_workspace_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "pre_delete_workspace" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "pre_delete_workspace" + ) as pre, + ): pre.assert_not_called() pb_message = dataform.DeleteWorkspaceRequest.pb( dataform.DeleteWorkspaceRequest() @@ -34775,8 +34825,9 @@ def test_install_npm_packages_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34836,17 +34887,20 @@ def test_install_npm_packages_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_install_npm_packages" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_install_npm_packages_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_install_npm_packages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_install_npm_packages" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_install_npm_packages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_install_npm_packages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34904,8 +34958,9 @@ def test_pull_git_commits_rest_bad_request(request_type=dataform.PullGitCommitsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34965,17 +35020,19 @@ def test_pull_git_commits_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_pull_git_commits" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_pull_git_commits_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_pull_git_commits" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_pull_git_commits" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_pull_git_commits_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_pull_git_commits" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35028,8 +35085,9 @@ def test_push_git_commits_rest_bad_request(request_type=dataform.PushGitCommitsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35089,17 +35147,19 @@ def test_push_git_commits_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_push_git_commits" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_push_git_commits_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_push_git_commits" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_push_git_commits" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_push_git_commits_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_push_git_commits" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35154,8 +35214,9 @@ def test_fetch_file_git_statuses_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35215,17 +35276,20 @@ def test_fetch_file_git_statuses_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_fetch_file_git_statuses" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_fetch_file_git_statuses_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_fetch_file_git_statuses" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_fetch_file_git_statuses" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_fetch_file_git_statuses_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_fetch_file_git_statuses" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35285,8 +35349,9 @@ def test_fetch_git_ahead_behind_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35351,17 +35416,20 @@ def test_fetch_git_ahead_behind_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_fetch_git_ahead_behind" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_fetch_git_ahead_behind_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_fetch_git_ahead_behind" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_fetch_git_ahead_behind" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_fetch_git_ahead_behind_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_fetch_git_ahead_behind" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35421,8 +35489,9 @@ def test_commit_workspace_changes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35482,18 +35551,20 @@ def test_commit_workspace_changes_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_commit_workspace_changes" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_commit_workspace_changes_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_commit_workspace_changes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_commit_workspace_changes" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_commit_workspace_changes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_commit_workspace_changes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35553,8 +35624,9 @@ def test_reset_workspace_changes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35614,17 +35686,20 @@ def test_reset_workspace_changes_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_reset_workspace_changes" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_reset_workspace_changes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_reset_workspace_changes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_reset_workspace_changes" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_reset_workspace_changes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_reset_workspace_changes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35682,8 +35757,9 @@ def test_fetch_file_diff_rest_bad_request(request_type=dataform.FetchFileDiffReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35746,17 +35822,19 @@ def test_fetch_file_diff_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_fetch_file_diff" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_fetch_file_diff_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_fetch_file_diff" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_fetch_file_diff" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_fetch_file_diff_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_fetch_file_diff" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35811,8 +35889,9 @@ def test_query_directory_contents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35875,18 +35954,20 @@ def test_query_directory_contents_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_query_directory_contents" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_query_directory_contents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_query_directory_contents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_query_directory_contents" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_query_directory_contents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_query_directory_contents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35944,8 +36025,9 @@ def test_search_files_rest_bad_request(request_type=dataform.SearchFilesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36008,17 +36090,19 @@ def test_search_files_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_search_files" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_search_files_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_search_files" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_search_files" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_search_files_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_search_files" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36071,8 +36155,9 @@ def test_make_directory_rest_bad_request(request_type=dataform.MakeDirectoryRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36132,17 +36217,19 @@ def test_make_directory_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_make_directory" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_make_directory_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_make_directory" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_make_directory" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_make_directory_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_make_directory" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36197,8 +36284,9 @@ def test_remove_directory_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36258,17 +36346,19 @@ def test_remove_directory_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_remove_directory" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_remove_directory_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_remove_directory" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_remove_directory" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_remove_directory_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_remove_directory" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36323,8 +36413,9 @@ def test_move_directory_rest_bad_request(request_type=dataform.MoveDirectoryRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36384,17 +36475,19 @@ def test_move_directory_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_move_directory" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_move_directory_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_move_directory" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_move_directory" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_move_directory_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_move_directory" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36447,8 +36540,9 @@ def test_read_file_rest_bad_request(request_type=dataform.ReadFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36511,17 +36605,15 @@ def test_read_file_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_read_file" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_read_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_read_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DataformRestInterceptor, "post_read_file") as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_read_file_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DataformRestInterceptor, "pre_read_file") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36572,8 +36664,9 @@ def test_remove_file_rest_bad_request(request_type=dataform.RemoveFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36633,17 +36726,17 @@ def test_remove_file_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_remove_file" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_remove_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_remove_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_remove_file" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_remove_file_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DataformRestInterceptor, "pre_remove_file") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36696,8 +36789,9 @@ def test_move_file_rest_bad_request(request_type=dataform.MoveFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36757,17 +36851,15 @@ def test_move_file_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_move_file" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_move_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_move_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.DataformRestInterceptor, "post_move_file") as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_move_file_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DataformRestInterceptor, "pre_move_file") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36818,8 +36910,9 @@ def test_write_file_rest_bad_request(request_type=dataform.WriteFileRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36879,17 +36972,17 @@ def test_write_file_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_write_file" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_write_file_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_write_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_write_file" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_write_file_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DataformRestInterceptor, "pre_write_file") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36940,8 +37033,9 @@ def test_list_release_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37004,17 +37098,20 @@ def test_list_release_configs_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_list_release_configs" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_list_release_configs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_list_release_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_release_configs" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_list_release_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_list_release_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37074,8 +37171,9 @@ def test_get_release_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37150,17 +37248,19 @@ def test_get_release_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_release_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_release_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_release_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_release_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_release_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_get_release_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37213,8 +37313,9 @@ def test_create_release_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37394,17 +37495,20 @@ def test_create_release_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_create_release_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_create_release_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_create_release_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_release_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_create_release_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_create_release_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37461,8 +37565,9 @@ def test_update_release_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37646,17 +37751,20 @@ def test_update_release_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_update_release_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_update_release_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_update_release_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_update_release_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_update_release_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_update_release_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37711,8 +37819,9 @@ def test_delete_release_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37769,13 +37878,13 @@ def test_delete_release_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "pre_delete_release_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "pre_delete_release_config" + ) as pre, + ): pre.assert_not_called() pb_message = dataform.DeleteReleaseConfigRequest.pb( dataform.DeleteReleaseConfigRequest() @@ -37820,8 +37929,9 @@ def test_list_compilation_results_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37884,18 +37994,20 @@ def test_list_compilation_results_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_list_compilation_results" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_list_compilation_results_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_list_compilation_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_compilation_results" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_list_compilation_results_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_list_compilation_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37955,8 +38067,9 @@ def test_get_compilation_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38026,17 +38139,20 @@ def test_get_compilation_result_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_compilation_result" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_compilation_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_compilation_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_compilation_result" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_get_compilation_result_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_get_compilation_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38089,8 +38205,9 @@ def test_create_compilation_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38265,18 +38382,20 @@ def test_create_compilation_result_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_create_compilation_result" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_create_compilation_result_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_create_compilation_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_compilation_result" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_create_compilation_result_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_create_compilation_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38331,8 +38450,9 @@ def test_query_compilation_result_actions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38395,18 +38515,20 @@ def test_query_compilation_result_actions_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_query_compilation_result_actions" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_query_compilation_result_actions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_query_compilation_result_actions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_query_compilation_result_actions" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_query_compilation_result_actions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_query_compilation_result_actions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38464,8 +38586,9 @@ def test_list_workflow_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38528,17 +38651,20 @@ def test_list_workflow_configs_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_list_workflow_configs" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_list_workflow_configs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_list_workflow_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_workflow_configs" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_list_workflow_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_list_workflow_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38598,8 +38724,9 @@ def test_get_workflow_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38672,17 +38799,19 @@ def test_get_workflow_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_workflow_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_workflow_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_workflow_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_workflow_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_workflow_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_get_workflow_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38735,8 +38864,9 @@ def test_create_workflow_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38914,17 +39044,20 @@ def test_create_workflow_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_create_workflow_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_create_workflow_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_create_workflow_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_workflow_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_create_workflow_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_create_workflow_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38981,8 +39114,9 @@ def test_update_workflow_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39164,17 +39298,20 @@ def test_update_workflow_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_update_workflow_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_update_workflow_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_update_workflow_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_update_workflow_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_update_workflow_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_update_workflow_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39229,8 +39366,9 @@ def test_delete_workflow_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39287,13 +39425,13 @@ def test_delete_workflow_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "pre_delete_workflow_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "pre_delete_workflow_config" + ) as pre, + ): pre.assert_not_called() pb_message = dataform.DeleteWorkflowConfigRequest.pb( dataform.DeleteWorkflowConfigRequest() @@ -39338,8 +39476,9 @@ def test_list_workflow_invocations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39402,18 +39541,20 @@ def test_list_workflow_invocations_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_list_workflow_invocations" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_list_workflow_invocations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_list_workflow_invocations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_list_workflow_invocations" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_list_workflow_invocations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_list_workflow_invocations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39473,8 +39614,9 @@ def test_get_workflow_invocation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39544,17 +39686,20 @@ def test_get_workflow_invocation_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_workflow_invocation" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_workflow_invocation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_workflow_invocation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_workflow_invocation" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_get_workflow_invocation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_get_workflow_invocation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39609,8 +39754,9 @@ def test_create_workflow_invocation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39774,18 +39920,20 @@ def test_create_workflow_invocation_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_create_workflow_invocation" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_create_workflow_invocation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_create_workflow_invocation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_create_workflow_invocation" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_create_workflow_invocation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_create_workflow_invocation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39842,8 +39990,9 @@ def test_delete_workflow_invocation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39900,13 +40049,13 @@ def test_delete_workflow_invocation_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "pre_delete_workflow_invocation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "pre_delete_workflow_invocation" + ) as pre, + ): pre.assert_not_called() pb_message = dataform.DeleteWorkflowInvocationRequest.pb( dataform.DeleteWorkflowInvocationRequest() @@ -39953,8 +40102,9 @@ def test_cancel_workflow_invocation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40014,18 +40164,20 @@ def test_cancel_workflow_invocation_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_cancel_workflow_invocation" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_cancel_workflow_invocation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_cancel_workflow_invocation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_cancel_workflow_invocation" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_cancel_workflow_invocation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_cancel_workflow_invocation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40085,8 +40237,9 @@ def test_query_workflow_invocation_actions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40149,18 +40302,20 @@ def test_query_workflow_invocation_actions_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_query_workflow_invocation_actions" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, - "post_query_workflow_invocation_actions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_query_workflow_invocation_actions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_query_workflow_invocation_actions" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, + "post_query_workflow_invocation_actions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_query_workflow_invocation_actions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40216,8 +40371,9 @@ def test_get_config_rest_bad_request(request_type=dataform.GetConfigRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40280,17 +40436,17 @@ def test_get_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_get_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_get_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_get_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_get_config_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DataformRestInterceptor, "pre_get_config") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40339,8 +40495,9 @@ def test_update_config_rest_bad_request(request_type=dataform.UpdateConfigReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40474,17 +40631,19 @@ def test_update_config_rest_interceptors(null_interceptor): ) client = DataformClient(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.DataformRestInterceptor, "post_update_config" - ) as post, mock.patch.object( - transports.DataformRestInterceptor, "post_update_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataformRestInterceptor, "pre_update_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataformRestInterceptor, "post_update_config" + ) as post, + mock.patch.object( + transports.DataformRestInterceptor, "post_update_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataformRestInterceptor, "pre_update_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40535,8 +40694,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -40595,8 +40755,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -40657,8 +40818,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -40721,8 +40883,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -40785,8 +40948,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -42106,11 +42270,14 @@ def test_dataform_base_transport(): def test_dataform_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataform_v1beta1.services.dataform.transports.DataformTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataform_v1beta1.services.dataform.transports.DataformTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataformTransport( @@ -42130,9 +42297,12 @@ def test_dataform_base_transport_with_credentials_file(): def test_dataform_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataform_v1beta1.services.dataform.transports.DataformTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataform_v1beta1.services.dataform.transports.DataformTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataformTransport() @@ -42210,11 +42380,12 @@ def test_dataform_transport_auth_gdch_credentials(transport_class): def test_dataform_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-datalabeling/docs/conf.py b/packages/google-cloud-datalabeling/docs/conf.py index 95f85f77835e..2739fe7909bd 100644 --- a/packages/google-cloud-datalabeling/docs/conf.py +++ b/packages/google-cloud-datalabeling/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-datalabeling documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/__init__.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/__init__.py index be1c66719d7a..d68667af532f 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/__init__.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_labeling_service import ( DataLabelingServiceAsyncClient, DataLabelingServiceClient, diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/async_client.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/async_client.py index 4b2558f5d5e7..49db721f4590 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/async_client.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datalabeling_v1beta1 import gapic_version as package_version @@ -44,27 +44,30 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.datalabeling_v1beta1.services.data_labeling_service import pagers -from google.cloud.datalabeling_v1beta1.types import data_labeling_service, data_payloads +from google.cloud.datalabeling_v1beta1.types import ( + annotation, + annotation_spec_set, + data_labeling_service, + data_payloads, + dataset, + evaluation, + evaluation_job, + human_annotation_config, + instruction, + operations, +) from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) +from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job from google.cloud.datalabeling_v1beta1.types import instruction as gcd_instruction -from google.cloud.datalabeling_v1beta1.types import annotation -from google.cloud.datalabeling_v1beta1.types import annotation_spec_set -from google.cloud.datalabeling_v1beta1.types import dataset -from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import evaluation_job -from google.cloud.datalabeling_v1beta1.types import human_annotation_config -from google.cloud.datalabeling_v1beta1.types import instruction -from google.cloud.datalabeling_v1beta1.types import operations from .client import DataLabelingServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataLabelingServiceTransport @@ -160,7 +163,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataLabelingServiceAsyncClient: The constructed client. """ - return DataLabelingServiceClient.from_service_account_info.__func__(DataLabelingServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataLabelingServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataLabelingServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -176,7 +180,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataLabelingServiceAsyncClient: The constructed client. """ - return DataLabelingServiceClient.from_service_account_file.__func__(DataLabelingServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataLabelingServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataLabelingServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -214,7 +219,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataLabelingServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataLabelingServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataLabelingServiceTransport: diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/client.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/client.py index e9275610f2b7..770fef7ee18b 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/client.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datalabeling_v1beta1 import gapic_version as package_version @@ -61,27 +61,30 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.datalabeling_v1beta1.services.data_labeling_service import pagers -from google.cloud.datalabeling_v1beta1.types import data_labeling_service, data_payloads +from google.cloud.datalabeling_v1beta1.types import ( + annotation, + annotation_spec_set, + data_labeling_service, + data_payloads, + dataset, + evaluation, + evaluation_job, + human_annotation_config, + instruction, + operations, +) from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) +from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job from google.cloud.datalabeling_v1beta1.types import instruction as gcd_instruction -from google.cloud.datalabeling_v1beta1.types import annotation -from google.cloud.datalabeling_v1beta1.types import annotation_spec_set -from google.cloud.datalabeling_v1beta1.types import dataset -from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import evaluation_job -from google.cloud.datalabeling_v1beta1.types import human_annotation_config -from google.cloud.datalabeling_v1beta1.types import instruction -from google.cloud.datalabeling_v1beta1.types import operations from .transports.base import DEFAULT_CLIENT_INFO, DataLabelingServiceTransport from .transports.grpc import DataLabelingServiceGrpcTransport @@ -96,9 +99,7 @@ class DataLabelingServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataLabelingServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataLabelingServiceTransport]] _transport_registry["grpc"] = DataLabelingServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataLabelingServiceGrpcAsyncIOTransport @@ -784,11 +785,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataLabelingServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataLabelingServiceClient._read_environment_variables() + ) self._client_cert_source = DataLabelingServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -823,8 +822,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataLabelingServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/pagers.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/pagers.py index e0cffac23665..2074c65d7813 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/pagers.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/pagers.py @@ -74,7 +74,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -150,7 +150,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -230,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -306,7 +306,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -386,7 +386,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -464,7 +464,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -546,7 +546,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -622,7 +622,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -702,7 +702,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -780,7 +780,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -862,7 +862,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -940,7 +940,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1022,7 +1022,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1100,7 +1100,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1182,7 +1182,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1264,7 +1264,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1350,7 +1350,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1428,7 +1428,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/__init__.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/__init__.py index 4e50b66979e5..2c9e70273ddc 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/__init__.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import DataLabelingServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataLabelingServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataLabelingServiceTransport]] _transport_registry["grpc"] = DataLabelingServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataLabelingServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/base.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/base.py index 50061914f756..eba768caf61e 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/base.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/base.py @@ -17,28 +17,30 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.datalabeling_v1beta1 import gapic_version as package_version +from google.cloud.datalabeling_v1beta1.types import ( + annotation_spec_set, + data_labeling_service, + dataset, + evaluation, + evaluation_job, + instruction, +) from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) -from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job -from google.cloud.datalabeling_v1beta1.types import annotation_spec_set -from google.cloud.datalabeling_v1beta1.types import data_labeling_service -from google.cloud.datalabeling_v1beta1.types import dataset from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import evaluation_job -from google.cloud.datalabeling_v1beta1.types import instruction +from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc.py index 7885e0c3e4a6..1c0e49f0cfb1 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc.py @@ -16,31 +16,33 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.datalabeling_v1beta1.types import ( + annotation_spec_set, + data_labeling_service, + dataset, + evaluation, + evaluation_job, + instruction, +) from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) -from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job -from google.cloud.datalabeling_v1beta1.types import annotation_spec_set -from google.cloud.datalabeling_v1beta1.types import data_labeling_service -from google.cloud.datalabeling_v1beta1.types import dataset from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import evaluation_job -from google.cloud.datalabeling_v1beta1.types import instruction +from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job from .base import DEFAULT_CLIENT_INFO, DataLabelingServiceTransport @@ -821,12 +823,12 @@ def create_annotation_spec_set( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_annotation_spec_set" not in self._stubs: - self._stubs[ - "create_annotation_spec_set" - ] = self._logged_channel.unary_unary( - "/google.cloud.datalabeling.v1beta1.DataLabelingService/CreateAnnotationSpecSet", - request_serializer=data_labeling_service.CreateAnnotationSpecSetRequest.serialize, - response_deserializer=gcd_annotation_spec_set.AnnotationSpecSet.deserialize, + self._stubs["create_annotation_spec_set"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datalabeling.v1beta1.DataLabelingService/CreateAnnotationSpecSet", + request_serializer=data_labeling_service.CreateAnnotationSpecSetRequest.serialize, + response_deserializer=gcd_annotation_spec_set.AnnotationSpecSet.deserialize, + ) ) return self._stubs["create_annotation_spec_set"] @@ -910,12 +912,12 @@ def delete_annotation_spec_set( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_annotation_spec_set" not in self._stubs: - self._stubs[ - "delete_annotation_spec_set" - ] = self._logged_channel.unary_unary( - "/google.cloud.datalabeling.v1beta1.DataLabelingService/DeleteAnnotationSpecSet", - request_serializer=data_labeling_service.DeleteAnnotationSpecSetRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_annotation_spec_set"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datalabeling.v1beta1.DataLabelingService/DeleteAnnotationSpecSet", + request_serializer=data_labeling_service.DeleteAnnotationSpecSetRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_annotation_spec_set"] @@ -1115,12 +1117,12 @@ def search_example_comparisons( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_example_comparisons" not in self._stubs: - self._stubs[ - "search_example_comparisons" - ] = self._logged_channel.unary_unary( - "/google.cloud.datalabeling.v1beta1.DataLabelingService/SearchExampleComparisons", - request_serializer=data_labeling_service.SearchExampleComparisonsRequest.serialize, - response_deserializer=data_labeling_service.SearchExampleComparisonsResponse.deserialize, + self._stubs["search_example_comparisons"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datalabeling.v1beta1.DataLabelingService/SearchExampleComparisons", + request_serializer=data_labeling_service.SearchExampleComparisonsRequest.serialize, + response_deserializer=data_labeling_service.SearchExampleComparisonsResponse.deserialize, + ) ) return self._stubs["search_example_comparisons"] diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc_asyncio.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc_asyncio.py index fce47becf8d4..74e92932b47a 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc_asyncio.py @@ -17,33 +17,35 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.datalabeling_v1beta1.types import ( + annotation_spec_set, + data_labeling_service, + dataset, + evaluation, + evaluation_job, + instruction, +) from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) -from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job -from google.cloud.datalabeling_v1beta1.types import annotation_spec_set -from google.cloud.datalabeling_v1beta1.types import data_labeling_service -from google.cloud.datalabeling_v1beta1.types import dataset from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import evaluation_job -from google.cloud.datalabeling_v1beta1.types import instruction +from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job from .base import DEFAULT_CLIENT_INFO, DataLabelingServiceTransport from .grpc import DataLabelingServiceGrpcTransport @@ -851,12 +853,12 @@ def create_annotation_spec_set( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_annotation_spec_set" not in self._stubs: - self._stubs[ - "create_annotation_spec_set" - ] = self._logged_channel.unary_unary( - "/google.cloud.datalabeling.v1beta1.DataLabelingService/CreateAnnotationSpecSet", - request_serializer=data_labeling_service.CreateAnnotationSpecSetRequest.serialize, - response_deserializer=gcd_annotation_spec_set.AnnotationSpecSet.deserialize, + self._stubs["create_annotation_spec_set"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datalabeling.v1beta1.DataLabelingService/CreateAnnotationSpecSet", + request_serializer=data_labeling_service.CreateAnnotationSpecSetRequest.serialize, + response_deserializer=gcd_annotation_spec_set.AnnotationSpecSet.deserialize, + ) ) return self._stubs["create_annotation_spec_set"] @@ -941,12 +943,12 @@ def delete_annotation_spec_set( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_annotation_spec_set" not in self._stubs: - self._stubs[ - "delete_annotation_spec_set" - ] = self._logged_channel.unary_unary( - "/google.cloud.datalabeling.v1beta1.DataLabelingService/DeleteAnnotationSpecSet", - request_serializer=data_labeling_service.DeleteAnnotationSpecSetRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_annotation_spec_set"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datalabeling.v1beta1.DataLabelingService/DeleteAnnotationSpecSet", + request_serializer=data_labeling_service.DeleteAnnotationSpecSetRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_annotation_spec_set"] @@ -1152,12 +1154,12 @@ def search_example_comparisons( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_example_comparisons" not in self._stubs: - self._stubs[ - "search_example_comparisons" - ] = self._logged_channel.unary_unary( - "/google.cloud.datalabeling.v1beta1.DataLabelingService/SearchExampleComparisons", - request_serializer=data_labeling_service.SearchExampleComparisonsRequest.serialize, - response_deserializer=data_labeling_service.SearchExampleComparisonsResponse.deserialize, + self._stubs["search_example_comparisons"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datalabeling.v1beta1.DataLabelingService/SearchExampleComparisons", + request_serializer=data_labeling_service.SearchExampleComparisonsRequest.serialize, + response_deserializer=data_labeling_service.SearchExampleComparisonsResponse.deserialize, + ) ) return self._stubs["search_example_comparisons"] diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/__init__.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/__init__.py index 100ed6e5e9ed..6098750fbf2c 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/__init__.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/__init__.py @@ -40,7 +40,10 @@ VideoEventAnnotation, VideoObjectTrackingAnnotation, ) -from .annotation_spec_set import AnnotationSpec, AnnotationSpecSet +from .annotation_spec_set import ( + AnnotationSpec, + AnnotationSpecSet, +) from .data_labeling_service import ( CreateAnnotationSpecSetRequest, CreateDatasetRequest, @@ -86,7 +89,12 @@ SearchExampleComparisonsResponse, UpdateEvaluationJobRequest, ) -from .data_payloads import ImagePayload, TextPayload, VideoPayload, VideoThumbnail +from .data_payloads import ( + ImagePayload, + TextPayload, + VideoPayload, + VideoThumbnail, +) from .dataset import ( AnnotatedDataset, AnnotatedDatasetMetadata, @@ -135,7 +143,11 @@ TextEntityExtractionConfig, VideoClassificationConfig, ) -from .instruction import CsvInstruction, Instruction, PdfInstruction +from .instruction import ( + CsvInstruction, + Instruction, + PdfInstruction, +) from .operations import ( CreateInstructionMetadata, ExportDataOperationMetadata, diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/annotation.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/annotation.py index d9926d6d71c6..3e906540946b 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/annotation.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/annotation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore from google.cloud.datalabeling_v1beta1.types import annotation_spec_set @@ -64,6 +64,7 @@ class AnnotationSource(proto.Enum): OPERATOR (3): Answer is provided by a human contributor. """ + ANNOTATION_SOURCE_UNSPECIFIED = 0 OPERATOR = 3 @@ -81,6 +82,7 @@ class AnnotationSentiment(proto.Enum): This label describes positively about the data. """ + ANNOTATION_SENTIMENT_UNSPECIFIED = 0 NEGATIVE = 1 POSITIVE = 2 @@ -125,6 +127,7 @@ class AnnotationType(proto.Enum): General classification. Allowed for continuous evaluation. """ + ANNOTATION_TYPE_UNSPECIFIED = 0 IMAGE_CLASSIFICATION_ANNOTATION = 1 IMAGE_BOUNDING_BOX_ANNOTATION = 2 @@ -521,13 +524,13 @@ class ImageSegmentationAnnotation(proto.Message): A byte string of a full image's color map. """ - annotation_colors: MutableMapping[ - str, annotation_spec_set.AnnotationSpec - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=1, - message=annotation_spec_set.AnnotationSpec, + annotation_colors: MutableMapping[str, annotation_spec_set.AnnotationSpec] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=1, + message=annotation_spec_set.AnnotationSpec, + ) ) mime_type: str = proto.Field( proto.STRING, @@ -713,12 +716,12 @@ class VideoObjectTrackingAnnotation(proto.Message): number=2, message="TimeSegment", ) - object_tracking_frames: MutableSequence[ - "ObjectTrackingFrame" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="ObjectTrackingFrame", + object_tracking_frames: MutableSequence["ObjectTrackingFrame"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="ObjectTrackingFrame", + ) ) diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/data_labeling_service.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/data_labeling_service.py index 24e262f43c27..6522f250cb94 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/data_labeling_service.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/data_labeling_service.py @@ -17,17 +17,16 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) +from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset +from google.cloud.datalabeling_v1beta1.types import evaluation, human_annotation_config from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job from google.cloud.datalabeling_v1beta1.types import instruction as gcd_instruction -from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import human_annotation_config __protobuf__ = proto.module( package="google.cloud.datalabeling.v1beta1", @@ -424,12 +423,12 @@ class ListAnnotatedDatasetsResponse(proto.Message): def raw_page(self): return self - annotated_datasets: MutableSequence[ - gcd_dataset.AnnotatedDataset - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_dataset.AnnotatedDataset, + annotated_datasets: MutableSequence[gcd_dataset.AnnotatedDataset] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_dataset.AnnotatedDataset, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -524,6 +523,7 @@ class Feature(proto.Enum): is different from bounding poly since it is more fine-grained, pixel level annotation. """ + FEATURE_UNSPECIFIED = 0 CLASSIFICATION = 1 BOUNDING_BOX = 2 @@ -636,6 +636,7 @@ class Feature(proto.Enum): Label the range of video for the specified events. """ + FEATURE_UNSPECIFIED = 0 CLASSIFICATION = 1 OBJECT_DETECTION = 2 @@ -729,6 +730,7 @@ class Feature(proto.Enum): TEXT_ENTITY_EXTRACTION (2): Label entities and their span in text. """ + FEATURE_UNSPECIFIED = 0 TEXT_CLASSIFICATION = 1 TEXT_ENTITY_EXTRACTION = 2 @@ -946,12 +948,12 @@ class ListAnnotationSpecSetsResponse(proto.Message): def raw_page(self): return self - annotation_spec_sets: MutableSequence[ - gcd_annotation_spec_set.AnnotationSpecSet - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_annotation_spec_set.AnnotationSpecSet, + annotation_spec_sets: MutableSequence[gcd_annotation_spec_set.AnnotationSpecSet] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_annotation_spec_set.AnnotationSpecSet, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1269,12 +1271,12 @@ class ExampleComparison(proto.Message): number=1, message=gcd_dataset.Example, ) - model_created_examples: MutableSequence[ - gcd_dataset.Example - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=gcd_dataset.Example, + model_created_examples: MutableSequence[gcd_dataset.Example] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=gcd_dataset.Example, + ) ) @property @@ -1474,12 +1476,12 @@ class ListEvaluationJobsResponse(proto.Message): def raw_page(self): return self - evaluation_jobs: MutableSequence[ - gcd_evaluation_job.EvaluationJob - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_evaluation_job.EvaluationJob, + evaluation_jobs: MutableSequence[gcd_evaluation_job.EvaluationJob] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_evaluation_job.EvaluationJob, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/data_payloads.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/data_payloads.py index 162c48931693..76570cb64cfa 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/data_payloads.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/data_payloads.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/dataset.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/dataset.py index a4cd84718112..7375083264e4 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/dataset.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/dataset.py @@ -17,13 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.datalabeling_v1beta1.types import annotation, data_payloads from google.cloud.datalabeling_v1beta1.types import ( human_annotation_config as gcd_human_annotation_config, ) -from google.cloud.datalabeling_v1beta1.types import annotation, data_payloads __protobuf__ = proto.module( package="google.cloud.datalabeling.v1beta1", @@ -62,6 +62,7 @@ class DataType(proto.Enum): GENERAL_DATA (6): Allowed for continuous evaluation. """ + DATA_TYPE_UNSPECIFIED = 0 IMAGE = 1 VIDEO = 2 diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation.py index e16caaebaaa6..a4ddf0abad51 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.datalabeling_v1beta1.types import annotation, annotation_spec_set @@ -344,12 +344,12 @@ class ConfidenceMetricsEntry(proto.Message): proto.FLOAT, number=2, ) - confidence_metrics_entries: MutableSequence[ - ConfidenceMetricsEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=ConfidenceMetricsEntry, + confidence_metrics_entries: MutableSequence[ConfidenceMetricsEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=ConfidenceMetricsEntry, + ) ) mean_average_precision: float = proto.Field( proto.FLOAT, @@ -407,12 +407,12 @@ class Row(proto.Message): number=1, message=annotation_spec_set.AnnotationSpec, ) - entries: MutableSequence[ - "ConfusionMatrix.ConfusionMatrixEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ConfusionMatrix.ConfusionMatrixEntry", + entries: MutableSequence["ConfusionMatrix.ConfusionMatrixEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ConfusionMatrix.ConfusionMatrixEntry", + ) ) row: MutableSequence[Row] = proto.RepeatedField( diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation_job.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation_job.py index 89f64820b089..f54cf3d54156 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation_job.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/evaluation_job.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore +from google.cloud.datalabeling_v1beta1.types import dataset, evaluation from google.cloud.datalabeling_v1beta1.types import ( human_annotation_config as gcd_human_annotation_config, ) -from google.cloud.datalabeling_v1beta1.types import dataset, evaluation __protobuf__ = proto.module( package="google.cloud.datalabeling.v1beta1", @@ -167,6 +167,7 @@ class State(proto.Enum): The job has this state right before it is deleted. """ + STATE_UNSPECIFIED = 0 SCHEDULED = 1 RUNNING = 2 diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/human_annotation_config.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/human_annotation_config.py index 0753fdc46df3..d2c6bfa40d06 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/human_annotation_config.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/human_annotation_config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -53,6 +53,7 @@ class StringAggregationType(proto.Enum): NO_AGGREGATION (3): Preserve all answers by crowd compute. """ + STRING_AGGREGATION_TYPE_UNSPECIFIED = 0 MAJORITY_VOTE = 1 UNANIMOUS_VOTE = 2 @@ -284,12 +285,12 @@ class AnnotationSpecSetConfig(proto.Message): number=2, ) - annotation_spec_set_configs: MutableSequence[ - AnnotationSpecSetConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=AnnotationSpecSetConfig, + annotation_spec_set_configs: MutableSequence[AnnotationSpecSetConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=AnnotationSpecSetConfig, + ) ) apply_shot_detection: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/instruction.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/instruction.py index 15fb958bc64f..3fde077ec54f 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/instruction.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/instruction.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.datalabeling_v1beta1.types import dataset diff --git a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/operations.py b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/operations.py index ce542e9d5676..b8be5bc7875f 100644 --- a/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/operations.py +++ b/packages/google-cloud-datalabeling/google/cloud/datalabeling_v1beta1/types/operations.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset diff --git a/packages/google-cloud-datalabeling/noxfile.py b/packages/google-cloud-datalabeling/noxfile.py index 2b47c80bef53..c53c8d11a643 100644 --- a/packages/google-cloud-datalabeling/noxfile.py +++ b/packages/google-cloud-datalabeling/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-datalabeling/tests/unit/gapic/datalabeling_v1beta1/test_data_labeling_service.py b/packages/google-cloud-datalabeling/tests/unit/gapic/datalabeling_v1beta1/test_data_labeling_service.py index 9517d6c8c10a..9bcca910b8ae 100644 --- a/packages/google-cloud-datalabeling/tests/unit/gapic/datalabeling_v1beta1/test_data_labeling_service.py +++ b/packages/google-cloud-datalabeling/tests/unit/gapic/datalabeling_v1beta1/test_data_labeling_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,20 +56,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.datalabeling_v1beta1.services.data_labeling_service import ( DataLabelingServiceAsyncClient, @@ -69,21 +69,24 @@ pagers, transports, ) -from google.cloud.datalabeling_v1beta1.types import data_labeling_service, data_payloads +from google.cloud.datalabeling_v1beta1.types import ( + annotation, + annotation_spec_set, + data_labeling_service, + data_payloads, + dataset, + evaluation, + evaluation_job, + human_annotation_config, + instruction, + operations, +) from google.cloud.datalabeling_v1beta1.types import ( annotation_spec_set as gcd_annotation_spec_set, ) +from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset from google.cloud.datalabeling_v1beta1.types import evaluation_job as gcd_evaluation_job from google.cloud.datalabeling_v1beta1.types import instruction as gcd_instruction -from google.cloud.datalabeling_v1beta1.types import annotation -from google.cloud.datalabeling_v1beta1.types import annotation_spec_set -from google.cloud.datalabeling_v1beta1.types import dataset -from google.cloud.datalabeling_v1beta1.types import dataset as gcd_dataset -from google.cloud.datalabeling_v1beta1.types import evaluation -from google.cloud.datalabeling_v1beta1.types import evaluation_job -from google.cloud.datalabeling_v1beta1.types import human_annotation_config -from google.cloud.datalabeling_v1beta1.types import instruction -from google.cloud.datalabeling_v1beta1.types import operations CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -988,10 +991,9 @@ def test_data_labeling_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1038,9 @@ def test_data_labeling_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1075,10 +1076,9 @@ def test_data_labeling_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1323,13 +1323,13 @@ def test_data_labeling_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4566,9 +4566,9 @@ def test_get_annotated_dataset_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_annotated_dataset - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_annotated_dataset] = ( + mock_rpc + ) request = {} client.get_annotated_dataset(request) @@ -9293,9 +9293,9 @@ def test_create_instruction_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_instruction - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_instruction] = ( + mock_rpc + ) request = {} client.create_instruction(request) @@ -9994,9 +9994,9 @@ def test_list_instructions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_instructions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_instructions] = ( + mock_rpc + ) request = {} client.list_instructions(request) @@ -10545,9 +10545,9 @@ def test_delete_instruction_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_instruction - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_instruction] = ( + mock_rpc + ) request = {} client.delete_instruction(request) @@ -11220,9 +11220,9 @@ def test_search_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_evaluations] = ( + mock_rpc + ) request = {} client.search_evaluations(request) @@ -12348,9 +12348,9 @@ def test_create_evaluation_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation_job] = ( + mock_rpc + ) request = {} client.create_evaluation_job(request) @@ -12721,9 +12721,9 @@ def test_update_evaluation_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_evaluation_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_evaluation_job] = ( + mock_rpc + ) request = {} client.update_evaluation_job(request) @@ -13097,9 +13097,9 @@ def test_get_evaluation_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_evaluation_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_evaluation_job] = ( + mock_rpc + ) request = {} client.get_evaluation_job(request) @@ -13448,9 +13448,9 @@ def test_pause_evaluation_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.pause_evaluation_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.pause_evaluation_job] = ( + mock_rpc + ) request = {} client.pause_evaluation_job(request) @@ -13779,9 +13779,9 @@ def test_resume_evaluation_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_evaluation_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_evaluation_job] = ( + mock_rpc + ) request = {} client.resume_evaluation_job(request) @@ -14110,9 +14110,9 @@ def test_delete_evaluation_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_evaluation_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_evaluation_job] = ( + mock_rpc + ) request = {} client.delete_evaluation_job(request) @@ -14447,9 +14447,9 @@ def test_list_evaluation_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluation_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluation_jobs] = ( + mock_rpc + ) request = {} client.list_evaluation_jobs(request) @@ -16833,11 +16833,14 @@ def test_data_labeling_service_base_transport(): def test_data_labeling_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datalabeling_v1beta1.services.data_labeling_service.transports.DataLabelingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.datalabeling_v1beta1.services.data_labeling_service.transports.DataLabelingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataLabelingServiceTransport( @@ -16854,9 +16857,12 @@ def test_data_labeling_service_base_transport_with_credentials_file(): def test_data_labeling_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.datalabeling_v1beta1.services.data_labeling_service.transports.DataLabelingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.datalabeling_v1beta1.services.data_labeling_service.transports.DataLabelingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataLabelingServiceTransport() @@ -16927,11 +16933,12 @@ def test_data_labeling_service_transport_auth_gdch_credentials(transport_class): def test_data_labeling_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataplex/docs/conf.py b/packages/google-cloud-dataplex/docs/conf.py index ca1bcf773920..d717fc14df1b 100644 --- a/packages/google-cloud-dataplex/docs/conf.py +++ b/packages/google-cloud-dataplex/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-dataplex documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/__init__.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/__init__.py index cf1c570bf245..c6f72be3b627 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/__init__.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.business_glossary_service import ( BusinessGlossaryServiceAsyncClient, BusinessGlossaryServiceClient, diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/async_client.py index 31f7db5c5c13..aaaa6a42eb07 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.business_glossary_service import pagers from google.cloud.dataplex_v1.types import business_glossary, service @@ -148,7 +150,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BusinessGlossaryServiceAsyncClient: The constructed client. """ - return BusinessGlossaryServiceClient.from_service_account_info.__func__(BusinessGlossaryServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BusinessGlossaryServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BusinessGlossaryServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -164,7 +167,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BusinessGlossaryServiceAsyncClient: The constructed client. """ - return BusinessGlossaryServiceClient.from_service_account_file.__func__(BusinessGlossaryServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BusinessGlossaryServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + BusinessGlossaryServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -202,7 +208,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return BusinessGlossaryServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return BusinessGlossaryServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> BusinessGlossaryServiceTransport: diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/client.py index b2d5c972b5ad..baf54d3e1378 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.business_glossary_service import pagers from google.cloud.dataplex_v1.types import business_glossary, service @@ -88,9 +90,7 @@ class BusinessGlossaryServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BusinessGlossaryServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BusinessGlossaryServiceTransport]] _transport_registry["grpc"] = BusinessGlossaryServiceGrpcTransport _transport_registry["grpc_asyncio"] = BusinessGlossaryServiceGrpcAsyncIOTransport _transport_registry["rest"] = BusinessGlossaryServiceRestTransport @@ -691,11 +691,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BusinessGlossaryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BusinessGlossaryServiceClient._read_environment_variables() + ) self._client_cert_source = ( BusinessGlossaryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -732,8 +730,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BusinessGlossaryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/pagers.py index 96480e5393cd..feed3d84524b 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -459,7 +459,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/__init__.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/__init__.py index 62b48ea0365b..c4fffeb1d0f1 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/__init__.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[BusinessGlossaryServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[BusinessGlossaryServiceTransport]] _transport_registry["grpc"] = BusinessGlossaryServiceGrpcTransport _transport_registry["grpc_asyncio"] = BusinessGlossaryServiceGrpcAsyncIOTransport _transport_registry["rest"] = BusinessGlossaryServiceRestTransport diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/base.py index 307838449d7e..8b8aef7ceeb7 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import business_glossary @@ -445,13 +447,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc.py index bea6aa7f1f3f..22579f3da3d3 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import business_glossary diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc_asyncio.py index b4be08d878ec..641c11ca8d9c 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import business_glossary diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest.py index aef453e5ea21..728a97074555 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1242,9 +1244,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossary._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossary._get_http_options() request, metadata = self._interceptor.pre_create_glossary(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossary._get_transcoded_request( @@ -1268,7 +1268,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1398,9 +1398,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossaryCategory._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossaryCategory._get_http_options() request, metadata = self._interceptor.pre_create_glossary_category( request, metadata @@ -1559,9 +1557,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossaryTerm._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseCreateGlossaryTerm._get_http_options() request, metadata = self._interceptor.pre_create_glossary_term( request, metadata @@ -1716,9 +1712,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossary._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossary._get_http_options() request, metadata = self._interceptor.pre_delete_glossary(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossary._get_transcoded_request( @@ -1738,7 +1732,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1857,9 +1851,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossaryCategory._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossaryCategory._get_http_options() request, metadata = self._interceptor.pre_delete_glossary_category( request, metadata @@ -1881,7 +1873,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1966,9 +1958,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossaryTerm._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseDeleteGlossaryTerm._get_http_options() request, metadata = self._interceptor.pre_delete_glossary_term( request, metadata @@ -1990,7 +1980,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2088,9 +2078,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossary._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossary._get_http_options() request, metadata = self._interceptor.pre_get_glossary(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossary._get_transcoded_request( @@ -2237,9 +2225,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossaryCategory._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossaryCategory._get_http_options() request, metadata = self._interceptor.pre_get_glossary_category( request, metadata @@ -2393,9 +2379,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossaryTerm._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseGetGlossaryTerm._get_http_options() request, metadata = self._interceptor.pre_get_glossary_term( request, metadata @@ -2542,9 +2526,7 @@ def __call__( List Glossaries Response """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaries._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaries._get_http_options() request, metadata = self._interceptor.pre_list_glossaries(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaries._get_transcoded_request( @@ -2691,9 +2673,7 @@ def __call__( List GlossaryCategories Response """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaryCategories._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaryCategories._get_http_options() request, metadata = self._interceptor.pre_list_glossary_categories( request, metadata @@ -2842,9 +2822,7 @@ def __call__( List GlossaryTerms Response """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaryTerms._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseListGlossaryTerms._get_http_options() request, metadata = self._interceptor.pre_list_glossary_terms( request, metadata @@ -2997,9 +2975,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossary._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossary._get_http_options() request, metadata = self._interceptor.pre_update_glossary(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossary._get_transcoded_request( @@ -3023,7 +2999,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3152,9 +3128,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossaryCategory._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossaryCategory._get_http_options() request, metadata = self._interceptor.pre_update_glossary_category( request, metadata @@ -3312,9 +3286,7 @@ def __call__( """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossaryTerm._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseUpdateGlossaryTerm._get_http_options() request, metadata = self._interceptor.pre_update_glossary_term( request, metadata @@ -3428,7 +3400,9 @@ def create_glossary_category( ]: # 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._CreateGlossaryCategory(self._session, self._host, self._interceptor) # type: ignore + return self._CreateGlossaryCategory( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_glossary_term( @@ -3454,7 +3428,9 @@ def delete_glossary_category( ) -> Callable[[business_glossary.DeleteGlossaryCategoryRequest], empty_pb2.Empty]: # 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._DeleteGlossaryCategory(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteGlossaryCategory( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_glossary_term( @@ -3513,7 +3489,9 @@ def list_glossary_categories( ]: # 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._ListGlossaryCategories(self._session, self._host, self._interceptor) # type: ignore + return self._ListGlossaryCategories( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_glossary_terms( @@ -3543,7 +3521,9 @@ def update_glossary_category( ]: # 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._UpdateGlossaryCategory(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateGlossaryCategory( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_glossary_term( @@ -3613,9 +3593,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -3754,9 +3732,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -3895,9 +3871,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -4017,9 +3991,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -4137,9 +4109,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -4278,9 +4248,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseBusinessGlossaryServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseBusinessGlossaryServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseBusinessGlossaryServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest_base.py index 16c3ee1bdd58..94fab5c1af31 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/business_glossary_service/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dataplex_v1.types import business_glossary diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/async_client.py index 32773531b3f4..58a13cc7d541 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.catalog_service import pagers from google.cloud.dataplex_v1.types import catalog, service @@ -141,7 +143,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CatalogServiceAsyncClient: The constructed client. """ - return CatalogServiceClient.from_service_account_info.__func__(CatalogServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CatalogServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CatalogServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +160,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CatalogServiceAsyncClient: The constructed client. """ - return CatalogServiceClient.from_service_account_file.__func__(CatalogServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CatalogServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CatalogServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/client.py index 612426b07c01..c706274a5246 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.catalog_service import pagers from google.cloud.dataplex_v1.types import catalog, service @@ -88,9 +90,7 @@ class CatalogServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CatalogServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CatalogServiceTransport]] _transport_registry["grpc"] = CatalogServiceGrpcTransport _transport_registry["grpc_asyncio"] = CatalogServiceGrpcAsyncIOTransport _transport_registry["rest"] = CatalogServiceRestTransport @@ -778,11 +778,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CatalogServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CatalogServiceClient._read_environment_variables() + ) self._client_cert_source = CatalogServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -817,8 +815,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CatalogServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/pagers.py index 17a69c13cbcd..71d1c9fa520d 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/base.py index d7da2dcf2461..069c61a2420d 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import catalog @@ -731,13 +733,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc.py index cec2ceecae6f..9f5827ed69d6 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import catalog diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc_asyncio.py index 1b8104c464f2..0fdd54fe1c03 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import catalog diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest.py index af22d8ef3bca..778d5fc50dd2 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1964,9 +1966,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCancelMetadataJob._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCancelMetadataJob._get_http_options() request, metadata = self._interceptor.pre_cancel_metadata_job( request, metadata @@ -1992,7 +1992,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2085,9 +2085,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCreateAspectType._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCreateAspectType._get_http_options() request, metadata = self._interceptor.pre_create_aspect_type( request, metadata @@ -2113,7 +2111,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2391,9 +2389,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCreateEntryGroup._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCreateEntryGroup._get_http_options() request, metadata = self._interceptor.pre_create_entry_group( request, metadata @@ -2419,7 +2415,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2543,9 +2539,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCreateEntryLink._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCreateEntryLink._get_http_options() request, metadata = self._interceptor.pre_create_entry_link( request, metadata @@ -2698,9 +2692,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCreateEntryType._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCreateEntryType._get_http_options() request, metadata = self._interceptor.pre_create_entry_type( request, metadata @@ -2726,7 +2718,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2851,9 +2843,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCreateMetadataJob._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCreateMetadataJob._get_http_options() request, metadata = self._interceptor.pre_create_metadata_job( request, metadata @@ -2879,7 +2869,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3003,9 +2993,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseDeleteAspectType._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseDeleteAspectType._get_http_options() request, metadata = self._interceptor.pre_delete_aspect_type( request, metadata @@ -3027,7 +3015,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3297,9 +3285,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseDeleteEntryGroup._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseDeleteEntryGroup._get_http_options() request, metadata = self._interceptor.pre_delete_entry_group( request, metadata @@ -3321,7 +3307,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3443,9 +3429,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseDeleteEntryLink._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseDeleteEntryLink._get_http_options() request, metadata = self._interceptor.pre_delete_entry_link( request, metadata @@ -3592,9 +3576,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseDeleteEntryType._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseDeleteEntryType._get_http_options() request, metadata = self._interceptor.pre_delete_entry_type( request, metadata @@ -3616,7 +3598,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4619,9 +4601,7 @@ def __call__( List AspectTypes response. """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseListAspectTypes._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseListAspectTypes._get_http_options() request, metadata = self._interceptor.pre_list_aspect_types( request, metadata @@ -4909,9 +4889,7 @@ def __call__( List entry groups response. """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseListEntryGroups._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseListEntryGroups._get_http_options() request, metadata = self._interceptor.pre_list_entry_groups( request, metadata @@ -5201,9 +5179,7 @@ def __call__( List metadata jobs response. """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseListMetadataJobs._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseListMetadataJobs._get_http_options() request, metadata = self._interceptor.pre_list_metadata_jobs( request, metadata @@ -5645,9 +5621,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseUpdateAspectType._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseUpdateAspectType._get_http_options() request, metadata = self._interceptor.pre_update_aspect_type( request, metadata @@ -5673,7 +5647,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5951,9 +5925,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseUpdateEntryGroup._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseUpdateEntryGroup._get_http_options() request, metadata = self._interceptor.pre_update_entry_group( request, metadata @@ -5979,7 +5951,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6104,9 +6076,7 @@ def __call__( """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseUpdateEntryType._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseUpdateEntryType._get_http_options() request, metadata = self._interceptor.pre_update_entry_type( request, metadata @@ -6132,7 +6102,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6756,9 +6726,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -6875,9 +6843,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCatalogServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseCatalogServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest_base.py index 52abebb66f4a..4248f0b8e7f8 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/catalog_service/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dataplex_v1.types import catalog diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/async_client.py index 76c7d432686f..525d9e3f0abb 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.cmek_service import pagers from google.cloud.dataplex_v1.types import cmek, service @@ -129,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CmekServiceAsyncClient: The constructed client. """ - return CmekServiceClient.from_service_account_info.__func__(CmekServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CmekServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CmekServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CmekServiceAsyncClient: The constructed client. """ - return CmekServiceClient.from_service_account_file.__func__(CmekServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CmekServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CmekServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/client.py index b91e23d9a091..5d65cb7d283f 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.cmek_service import pagers from google.cloud.dataplex_v1.types import cmek, service @@ -649,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CmekServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CmekServiceClient._read_environment_variables() + ) self._client_cert_source = CmekServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -688,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CmekServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/pagers.py index 106bcdcea836..faeef89b67b3 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/base.py index 77d0ccf6891d..17a34d5ff705 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import cmek @@ -283,13 +285,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc.py index 5aaa0188a8fe..a5426e971748 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import cmek diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc_asyncio.py index c69b3430b7fe..447751908f27 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import cmek diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest.py index fac09d972ba7..487d695b15d1 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -728,9 +730,7 @@ def __call__( """ - http_options = ( - _BaseCmekServiceRestTransport._BaseCreateEncryptionConfig._get_http_options() - ) + http_options = _BaseCmekServiceRestTransport._BaseCreateEncryptionConfig._get_http_options() request, metadata = self._interceptor.pre_create_encryption_config( request, metadata @@ -756,7 +756,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -880,9 +880,7 @@ def __call__( """ - http_options = ( - _BaseCmekServiceRestTransport._BaseDeleteEncryptionConfig._get_http_options() - ) + http_options = _BaseCmekServiceRestTransport._BaseDeleteEncryptionConfig._get_http_options() request, metadata = self._interceptor.pre_delete_encryption_config( request, metadata @@ -904,7 +902,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1028,9 +1026,7 @@ def __call__( """ - http_options = ( - _BaseCmekServiceRestTransport._BaseGetEncryptionConfig._get_http_options() - ) + http_options = _BaseCmekServiceRestTransport._BaseGetEncryptionConfig._get_http_options() request, metadata = self._interceptor.pre_get_encryption_config( request, metadata @@ -1174,9 +1170,7 @@ def __call__( List EncryptionConfigs Response """ - http_options = ( - _BaseCmekServiceRestTransport._BaseListEncryptionConfigs._get_http_options() - ) + http_options = _BaseCmekServiceRestTransport._BaseListEncryptionConfigs._get_http_options() request, metadata = self._interceptor.pre_list_encryption_configs( request, metadata @@ -1326,9 +1320,7 @@ def __call__( """ - http_options = ( - _BaseCmekServiceRestTransport._BaseUpdateEncryptionConfig._get_http_options() - ) + http_options = _BaseCmekServiceRestTransport._BaseUpdateEncryptionConfig._get_http_options() request, metadata = self._interceptor.pre_update_encryption_config( request, metadata @@ -1354,7 +1346,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1427,7 +1419,9 @@ def create_encryption_config( ) -> Callable[[cmek.CreateEncryptionConfigRequest], 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._CreateEncryptionConfig(self._session, self._host, self._interceptor) # type: ignore + return self._CreateEncryptionConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_encryption_config( @@ -1435,7 +1429,9 @@ def delete_encryption_config( ) -> Callable[[cmek.DeleteEncryptionConfigRequest], 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._DeleteEncryptionConfig(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteEncryptionConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_encryption_config( @@ -1461,7 +1457,9 @@ def update_encryption_config( ) -> Callable[[cmek.UpdateEncryptionConfigRequest], 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._UpdateEncryptionConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateEncryptionConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest_base.py index 2e54082df7f3..5adc9fab6568 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/cmek_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/async_client.py index a7f0ccd1286b..78ca449f12b9 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -44,16 +44,19 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.content_service import pagers -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content from .client import ContentServiceClient @@ -126,7 +129,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ContentServiceAsyncClient: The constructed client. """ - return ContentServiceClient.from_service_account_info.__func__(ContentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ContentServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ContentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +146,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ContentServiceAsyncClient: The constructed client. """ - return ContentServiceClient.from_service_account_file.__func__(ContentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ContentServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ContentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -784,7 +789,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataplex_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -925,7 +930,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataplex_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -1051,7 +1056,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataplex_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/client.py index d5103f25c6ca..bf5516331df4 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -61,16 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.content_service import pagers -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content from .transports.base import DEFAULT_CLIENT_INFO, ContentServiceTransport @@ -87,9 +90,7 @@ class ContentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ContentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ContentServiceTransport]] _transport_registry["grpc"] = ContentServiceGrpcTransport _transport_registry["grpc_asyncio"] = ContentServiceGrpcAsyncIOTransport _transport_registry["rest"] = ContentServiceRestTransport @@ -655,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContentServiceClient._read_environment_variables() + ) self._client_cert_source = ContentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContentServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1235,7 +1233,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataplex_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -1377,7 +1375,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataplex_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -1502,7 +1500,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataplex_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/pagers.py index d1c5b0162b57..a82aab041cf9 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/base.py index 699c6467ec0f..0c2bb003288c 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/base.py @@ -17,22 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataplex_v1 import gapic_version as package_version -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -358,13 +361,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc.py index 3171e9ba1724..5732be0f6088 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc.py @@ -16,25 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content from .base import DEFAULT_CLIENT_INFO, ContentServiceTransport diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc_asyncio.py index 9e53b110692e..e9ab0f2067ba 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/grpc_asyncio.py @@ -17,27 +17,30 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content from .base import DEFAULT_CLIENT_INFO, ContentServiceTransport diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest.py index 0d3a4823b407..644b58bab2a7 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest.py @@ -16,25 +16,28 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -942,7 +945,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1768,9 +1771,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseContentServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseContentServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2417,9 +2418,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseContentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2536,9 +2535,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseContentServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseContentServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest_base.py index 7543a0fb9ae8..37aa093addc1 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/content_service/transports/rest_base.py @@ -17,16 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content from .base import DEFAULT_CLIENT_INFO, ContentServiceTransport diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/async_client.py index d20e9f7f2368..33e02c84a916 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.data_scan_service import pagers from google.cloud.dataplex_v1.types import ( @@ -146,7 +148,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataScanServiceAsyncClient: The constructed client. """ - return DataScanServiceClient.from_service_account_info.__func__(DataScanServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataScanServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataScanServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -162,7 +165,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataScanServiceAsyncClient: The constructed client. """ - return DataScanServiceClient.from_service_account_file.__func__(DataScanServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataScanServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataScanServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/client.py index 80d6236de14f..8c7b962bf90f 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.data_scan_service import pagers from google.cloud.dataplex_v1.types import ( @@ -97,9 +99,7 @@ class DataScanServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataScanServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataScanServiceTransport]] _transport_registry["grpc"] = DataScanServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataScanServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataScanServiceRestTransport @@ -736,11 +736,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataScanServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataScanServiceClient._read_environment_variables() + ) self._client_cert_source = DataScanServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -775,8 +773,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataScanServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/pagers.py index d15fb0986e3e..e35a0ae7fa6c 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/base.py index c33ddf1079f2..cdf8a5a245b8 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import datascans @@ -344,13 +346,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc.py index a409a6c4ae04..c84cfb816974 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import datascans @@ -581,12 +583,12 @@ def generate_data_quality_rules( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_data_quality_rules" not in self._stubs: - self._stubs[ - "generate_data_quality_rules" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataScanService/GenerateDataQualityRules", - request_serializer=datascans.GenerateDataQualityRulesRequest.serialize, - response_deserializer=datascans.GenerateDataQualityRulesResponse.deserialize, + self._stubs["generate_data_quality_rules"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataScanService/GenerateDataQualityRules", + request_serializer=datascans.GenerateDataQualityRulesRequest.serialize, + response_deserializer=datascans.GenerateDataQualityRulesResponse.deserialize, + ) ) return self._stubs["generate_data_quality_rules"] diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc_asyncio.py index 043be983efc2..790d15d0a9dc 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import datascans @@ -600,12 +602,12 @@ def generate_data_quality_rules( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_data_quality_rules" not in self._stubs: - self._stubs[ - "generate_data_quality_rules" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataScanService/GenerateDataQualityRules", - request_serializer=datascans.GenerateDataQualityRulesRequest.serialize, - response_deserializer=datascans.GenerateDataQualityRulesResponse.deserialize, + self._stubs["generate_data_quality_rules"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataScanService/GenerateDataQualityRules", + request_serializer=datascans.GenerateDataQualityRulesRequest.serialize, + response_deserializer=datascans.GenerateDataQualityRulesResponse.deserialize, + ) ) return self._stubs["generate_data_quality_rules"] diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest.py index 3cf5be664627..5fef49be9000 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -952,9 +954,7 @@ def __call__( """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseCreateDataScan._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseCreateDataScan._get_http_options() request, metadata = self._interceptor.pre_create_data_scan( request, metadata @@ -980,7 +980,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1104,9 +1104,7 @@ def __call__( """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseDeleteDataScan._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseDeleteDataScan._get_http_options() request, metadata = self._interceptor.pre_delete_data_scan( request, metadata @@ -1128,7 +1126,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1254,9 +1252,7 @@ def __call__( """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseGenerateDataQualityRules._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseGenerateDataQualityRules._get_http_options() request, metadata = self._interceptor.pre_generate_data_quality_rules( request, metadata @@ -1579,9 +1575,7 @@ def __call__( """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseGetDataScanJob._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseGetDataScanJob._get_http_options() request, metadata = self._interceptor.pre_get_data_scan_job( request, metadata @@ -1725,9 +1719,7 @@ def __call__( List DataScanJobs response. """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseListDataScanJobs._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseListDataScanJobs._get_http_options() request, metadata = self._interceptor.pre_list_data_scan_jobs( request, metadata @@ -2171,9 +2163,7 @@ def __call__( """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseUpdateDataScan._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseUpdateDataScan._get_http_options() request, metadata = self._interceptor.pre_update_data_scan( request, metadata @@ -2199,7 +2189,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2291,7 +2281,9 @@ def generate_data_quality_rules( ]: # 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._GenerateDataQualityRules(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateDataQualityRules( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_scan( @@ -2678,9 +2670,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2797,9 +2787,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3054,9 +3042,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataScanServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataScanServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataScanServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest_base.py index 96597b805754..905abb34e661 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_scan_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/async_client.py index 641733050837..3c1c59090006 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -45,20 +45,21 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.data_taxonomy_service import pagers -from google.cloud.dataplex_v1.types import data_taxonomy +from google.cloud.dataplex_v1.types import data_taxonomy, security, service from google.cloud.dataplex_v1.types import data_taxonomy as gcd_data_taxonomy -from google.cloud.dataplex_v1.types import security, service from .client import DataTaxonomyServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataTaxonomyServiceTransport @@ -141,7 +142,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataTaxonomyServiceAsyncClient: The constructed client. """ - return DataTaxonomyServiceClient.from_service_account_info.__func__(DataTaxonomyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataTaxonomyServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataTaxonomyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +159,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataTaxonomyServiceAsyncClient: The constructed client. """ - return DataTaxonomyServiceClient.from_service_account_file.__func__(DataTaxonomyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataTaxonomyServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataTaxonomyServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -195,7 +198,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataTaxonomyServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataTaxonomyServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataTaxonomyServiceTransport: diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/client.py index a9d517dc0d76..031d2c764fd1 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -61,20 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.data_taxonomy_service import pagers -from google.cloud.dataplex_v1.types import data_taxonomy +from google.cloud.dataplex_v1.types import data_taxonomy, security, service from google.cloud.dataplex_v1.types import data_taxonomy as gcd_data_taxonomy -from google.cloud.dataplex_v1.types import security, service from .transports.base import DEFAULT_CLIENT_INFO, DataTaxonomyServiceTransport from .transports.grpc import DataTaxonomyServiceGrpcTransport @@ -90,9 +91,7 @@ class DataTaxonomyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataTaxonomyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataTaxonomyServiceTransport]] _transport_registry["grpc"] = DataTaxonomyServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataTaxonomyServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataTaxonomyServiceRestTransport @@ -685,11 +684,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataTaxonomyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataTaxonomyServiceClient._read_environment_variables() + ) self._client_cert_source = DataTaxonomyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -724,8 +721,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataTaxonomyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/pagers.py index d00c18577cef..9f030092aa92 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -459,7 +459,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/__init__.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/__init__.py index cd50c7990eea..5130db638058 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/__init__.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import DataTaxonomyServiceRestInterceptor, DataTaxonomyServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataTaxonomyServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataTaxonomyServiceTransport]] _transport_registry["grpc"] = DataTaxonomyServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataTaxonomyServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataTaxonomyServiceRestTransport diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/base.py index 04928976255c..9044360f2dbc 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import data_taxonomy @@ -433,13 +435,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc.py index 7c0116431dd9..59ee565fb440 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import data_taxonomy from google.cloud.dataplex_v1.types import data_taxonomy as gcd_data_taxonomy @@ -506,12 +508,12 @@ def create_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_data_attribute_binding" not in self._stubs: - self._stubs[ - "create_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/CreateDataAttributeBinding", - request_serializer=data_taxonomy.CreateDataAttributeBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/CreateDataAttributeBinding", + request_serializer=data_taxonomy.CreateDataAttributeBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_data_attribute_binding"] @@ -536,12 +538,12 @@ def update_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_attribute_binding" not in self._stubs: - self._stubs[ - "update_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/UpdateDataAttributeBinding", - request_serializer=data_taxonomy.UpdateDataAttributeBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/UpdateDataAttributeBinding", + request_serializer=data_taxonomy.UpdateDataAttributeBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_data_attribute_binding"] @@ -568,12 +570,12 @@ def delete_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_data_attribute_binding" not in self._stubs: - self._stubs[ - "delete_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/DeleteDataAttributeBinding", - request_serializer=data_taxonomy.DeleteDataAttributeBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/DeleteDataAttributeBinding", + request_serializer=data_taxonomy.DeleteDataAttributeBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_data_attribute_binding"] @@ -600,12 +602,12 @@ def list_data_attribute_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_data_attribute_bindings" not in self._stubs: - self._stubs[ - "list_data_attribute_bindings" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/ListDataAttributeBindings", - request_serializer=data_taxonomy.ListDataAttributeBindingsRequest.serialize, - response_deserializer=data_taxonomy.ListDataAttributeBindingsResponse.deserialize, + self._stubs["list_data_attribute_bindings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/ListDataAttributeBindings", + request_serializer=data_taxonomy.ListDataAttributeBindingsRequest.serialize, + response_deserializer=data_taxonomy.ListDataAttributeBindingsResponse.deserialize, + ) ) return self._stubs["list_data_attribute_bindings"] @@ -631,12 +633,12 @@ def get_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_attribute_binding" not in self._stubs: - self._stubs[ - "get_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/GetDataAttributeBinding", - request_serializer=data_taxonomy.GetDataAttributeBindingRequest.serialize, - response_deserializer=data_taxonomy.DataAttributeBinding.deserialize, + self._stubs["get_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/GetDataAttributeBinding", + request_serializer=data_taxonomy.GetDataAttributeBindingRequest.serialize, + response_deserializer=data_taxonomy.DataAttributeBinding.deserialize, + ) ) return self._stubs["get_data_attribute_binding"] diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc_asyncio.py index ca06d71c3bc8..e7bcccf26cb8 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import data_taxonomy from google.cloud.dataplex_v1.types import data_taxonomy as gcd_data_taxonomy @@ -521,12 +523,12 @@ def create_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_data_attribute_binding" not in self._stubs: - self._stubs[ - "create_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/CreateDataAttributeBinding", - request_serializer=data_taxonomy.CreateDataAttributeBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/CreateDataAttributeBinding", + request_serializer=data_taxonomy.CreateDataAttributeBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_data_attribute_binding"] @@ -552,12 +554,12 @@ def update_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_data_attribute_binding" not in self._stubs: - self._stubs[ - "update_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/UpdateDataAttributeBinding", - request_serializer=data_taxonomy.UpdateDataAttributeBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/UpdateDataAttributeBinding", + request_serializer=data_taxonomy.UpdateDataAttributeBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_data_attribute_binding"] @@ -585,12 +587,12 @@ def delete_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_data_attribute_binding" not in self._stubs: - self._stubs[ - "delete_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/DeleteDataAttributeBinding", - request_serializer=data_taxonomy.DeleteDataAttributeBindingRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/DeleteDataAttributeBinding", + request_serializer=data_taxonomy.DeleteDataAttributeBindingRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_data_attribute_binding"] @@ -617,12 +619,12 @@ def list_data_attribute_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_data_attribute_bindings" not in self._stubs: - self._stubs[ - "list_data_attribute_bindings" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/ListDataAttributeBindings", - request_serializer=data_taxonomy.ListDataAttributeBindingsRequest.serialize, - response_deserializer=data_taxonomy.ListDataAttributeBindingsResponse.deserialize, + self._stubs["list_data_attribute_bindings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/ListDataAttributeBindings", + request_serializer=data_taxonomy.ListDataAttributeBindingsRequest.serialize, + response_deserializer=data_taxonomy.ListDataAttributeBindingsResponse.deserialize, + ) ) return self._stubs["list_data_attribute_bindings"] @@ -648,12 +650,12 @@ def get_data_attribute_binding( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_data_attribute_binding" not in self._stubs: - self._stubs[ - "get_data_attribute_binding" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataplex.v1.DataTaxonomyService/GetDataAttributeBinding", - request_serializer=data_taxonomy.GetDataAttributeBindingRequest.serialize, - response_deserializer=data_taxonomy.DataAttributeBinding.deserialize, + self._stubs["get_data_attribute_binding"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataplex.v1.DataTaxonomyService/GetDataAttributeBinding", + request_serializer=data_taxonomy.GetDataAttributeBindingRequest.serialize, + response_deserializer=data_taxonomy.DataAttributeBinding.deserialize, + ) ) return self._stubs["get_data_attribute_binding"] diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest.py index 1701e9156448..462f0849fe61 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1310,9 +1312,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseCreateDataAttribute._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseCreateDataAttribute._get_http_options() request, metadata = self._interceptor.pre_create_data_attribute( request, metadata @@ -1338,7 +1338,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1467,9 +1467,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseCreateDataAttributeBinding._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseCreateDataAttributeBinding._get_http_options() request, metadata = self._interceptor.pre_create_data_attribute_binding( request, metadata @@ -1495,7 +1493,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1536,11 +1534,10 @@ def __call__( resp = self._interceptor.post_create_data_attribute_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_data_attribute_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_data_attribute_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1624,9 +1621,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseCreateDataTaxonomy._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseCreateDataTaxonomy._get_http_options() request, metadata = self._interceptor.pre_create_data_taxonomy( request, metadata @@ -1652,7 +1647,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1779,9 +1774,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseDeleteDataAttribute._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseDeleteDataAttribute._get_http_options() request, metadata = self._interceptor.pre_delete_data_attribute( request, metadata @@ -1803,7 +1796,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1930,9 +1923,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseDeleteDataAttributeBinding._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseDeleteDataAttributeBinding._get_http_options() request, metadata = self._interceptor.pre_delete_data_attribute_binding( request, metadata @@ -1954,7 +1945,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1994,11 +1985,10 @@ def __call__( resp = self._interceptor.post_delete_data_attribute_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_data_attribute_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_data_attribute_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2081,9 +2071,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseDeleteDataTaxonomy._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseDeleteDataTaxonomy._get_http_options() request, metadata = self._interceptor.pre_delete_data_taxonomy( request, metadata @@ -2105,7 +2093,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2240,9 +2228,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseGetDataAttribute._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseGetDataAttribute._get_http_options() request, metadata = self._interceptor.pre_get_data_attribute( request, metadata @@ -2392,9 +2378,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseGetDataAttributeBinding._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseGetDataAttributeBinding._get_http_options() request, metadata = self._interceptor.pre_get_data_attribute_binding( request, metadata @@ -2549,9 +2533,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseGetDataTaxonomy._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseGetDataTaxonomy._get_http_options() request, metadata = self._interceptor.pre_get_data_taxonomy( request, metadata @@ -2697,9 +2679,7 @@ def __call__( List DataAttributeBindings response. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseListDataAttributeBindings._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseListDataAttributeBindings._get_http_options() request, metadata = self._interceptor.pre_list_data_attribute_bindings( request, metadata @@ -2848,9 +2828,7 @@ def __call__( List DataAttributes response. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseListDataAttributes._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseListDataAttributes._get_http_options() request, metadata = self._interceptor.pre_list_data_attributes( request, metadata @@ -2999,9 +2977,7 @@ def __call__( List DataTaxonomies response. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseListDataTaxonomies._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseListDataTaxonomies._get_http_options() request, metadata = self._interceptor.pre_list_data_taxonomies( request, metadata @@ -3154,9 +3130,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseUpdateDataAttribute._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseUpdateDataAttribute._get_http_options() request, metadata = self._interceptor.pre_update_data_attribute( request, metadata @@ -3182,7 +3156,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3311,9 +3285,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseUpdateDataAttributeBinding._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseUpdateDataAttributeBinding._get_http_options() request, metadata = self._interceptor.pre_update_data_attribute_binding( request, metadata @@ -3339,7 +3311,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3380,11 +3352,10 @@ def __call__( resp = self._interceptor.post_update_data_attribute_binding(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_data_attribute_binding_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_data_attribute_binding_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3468,9 +3439,7 @@ def __call__( """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseUpdateDataTaxonomy._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseUpdateDataTaxonomy._get_http_options() request, metadata = self._interceptor.pre_update_data_taxonomy( request, metadata @@ -3496,7 +3465,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3581,7 +3550,9 @@ def create_data_attribute_binding( ]: # 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._CreateDataAttributeBinding(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDataAttributeBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_data_taxonomy( @@ -3609,7 +3580,9 @@ def delete_data_attribute_binding( ]: # 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._DeleteDataAttributeBinding(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDataAttributeBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_data_taxonomy( @@ -3636,7 +3609,9 @@ def get_data_attribute_binding( ]: # 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._GetDataAttributeBinding(self._session, self._host, self._interceptor) # type: ignore + return self._GetDataAttributeBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_data_taxonomy( @@ -3655,7 +3630,9 @@ def list_data_attribute_bindings( ]: # 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._ListDataAttributeBindings(self._session, self._host, self._interceptor) # type: ignore + return self._ListDataAttributeBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_data_attributes( @@ -3695,7 +3672,9 @@ def update_data_attribute_binding( ]: # 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._UpdateDataAttributeBinding(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDataAttributeBinding( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_data_taxonomy( @@ -3765,9 +3744,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDataTaxonomyServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -3906,9 +3883,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataTaxonomyServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -4045,9 +4020,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -4165,9 +4138,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -4283,9 +4254,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataTaxonomyServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -4424,9 +4393,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataTaxonomyServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataTaxonomyServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataTaxonomyServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest_base.py index 423e13010b14..edc3a887b867 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/data_taxonomy_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/async_client.py index cd442b454512..dcfdcb8bff27 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.dataplex_service import pagers from google.cloud.dataplex_v1.types import analyze, resources, service, tasks @@ -143,7 +145,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataplexServiceAsyncClient: The constructed client. """ - return DataplexServiceClient.from_service_account_info.__func__(DataplexServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataplexServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataplexServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +162,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataplexServiceAsyncClient: The constructed client. """ - return DataplexServiceClient.from_service_account_file.__func__(DataplexServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataplexServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataplexServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/client.py index 8bf39ca67ea2..f6678d498fbc 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.dataplex_service import pagers from google.cloud.dataplex_v1.types import analyze, resources, service, tasks @@ -88,9 +90,7 @@ class DataplexServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataplexServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataplexServiceTransport]] _transport_registry["grpc"] = DataplexServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataplexServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataplexServiceRestTransport @@ -816,11 +816,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataplexServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataplexServiceClient._read_environment_variables() + ) self._client_cert_source = DataplexServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -855,8 +853,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataplexServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/pagers.py index 1b39defdce5f..3b80a62440ce 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1159,7 +1159,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1235,7 +1235,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1315,7 +1315,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1391,7 +1391,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1471,7 +1471,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1547,7 +1547,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/base.py index 486a41a48f0a..112dd943bb03 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import analyze, resources, service, tasks @@ -801,13 +803,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc.py index 1f89ce45b846..b00aca45496a 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import analyze, resources, service, tasks diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc_asyncio.py index c00ab1ec653c..eb9bc555138c 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import analyze, resources, service, tasks diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest.py index b19175f25d72..1c9ba98cca18 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -2216,7 +2218,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2335,7 +2337,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2461,9 +2463,7 @@ def __call__( """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -2489,7 +2489,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2640,7 +2640,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2791,7 +2791,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2942,7 +2942,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3088,7 +3088,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3212,9 +3212,7 @@ def __call__( """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -3236,7 +3234,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3381,7 +3379,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3526,7 +3524,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3671,7 +3669,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3945,9 +3943,7 @@ def __call__( """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseGetEnvironment._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseGetEnvironment._get_http_options() request, metadata = self._interceptor.pre_get_environment(request, metadata) transcoded_request = _BaseDataplexServiceRestTransport._BaseGetEnvironment._get_transcoded_request( @@ -4707,9 +4703,7 @@ def __call__( List actions response. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseListAssetActions._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseListAssetActions._get_http_options() request, metadata = self._interceptor.pre_list_asset_actions( request, metadata @@ -4997,9 +4991,7 @@ def __call__( List environments response. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseListEnvironments._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseListEnvironments._get_http_options() request, metadata = self._interceptor.pre_list_environments( request, metadata @@ -5293,9 +5285,7 @@ def __call__( List actions response. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseListLakeActions._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseListLakeActions._get_http_options() request, metadata = self._interceptor.pre_list_lake_actions( request, metadata @@ -5875,9 +5865,7 @@ def __call__( List actions response. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseListZoneActions._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseListZoneActions._get_http_options() request, metadata = self._interceptor.pre_list_zone_actions( request, metadata @@ -6353,7 +6341,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6479,9 +6467,7 @@ def __call__( """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseUpdateEnvironment._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseUpdateEnvironment._get_http_options() request, metadata = self._interceptor.pre_update_environment( request, metadata @@ -6507,7 +6493,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6658,7 +6644,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6809,7 +6795,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6960,7 +6946,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7612,9 +7598,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -7731,9 +7715,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -7988,9 +7970,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataplexServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataplexServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataplexServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest_base.py index 6839dc53bd63..856b256ac0f9 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/dataplex_service/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dataplex_v1.types import analyze, resources, service, tasks diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/async_client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/async_client.py index d41e638e9784..be038e459704 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/async_client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -44,11 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.metadata_service import pagers from google.cloud.dataplex_v1.types import metadata_ @@ -125,7 +127,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetadataServiceAsyncClient: The constructed client. """ - return MetadataServiceClient.from_service_account_info.__func__(MetadataServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MetadataServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(MetadataServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +144,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetadataServiceAsyncClient: The constructed client. """ - return MetadataServiceClient.from_service_account_file.__func__(MetadataServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MetadataServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(MetadataServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/client.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/client.py index 97bbf5724106..ae2c69b47801 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/client.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataplex_v1 import gapic_version as package_version @@ -61,11 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.metadata_service import pagers from google.cloud.dataplex_v1.types import metadata_ @@ -84,9 +86,7 @@ class MetadataServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MetadataServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MetadataServiceTransport]] _transport_registry["grpc"] = MetadataServiceGrpcTransport _transport_registry["grpc_asyncio"] = MetadataServiceGrpcAsyncIOTransport _transport_registry["rest"] = MetadataServiceRestTransport @@ -688,11 +688,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetadataServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetadataServiceClient._read_environment_variables() + ) self._client_cert_source = MetadataServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -727,8 +725,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetadataServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/pagers.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/pagers.py index d03813be582f..74b964c76291 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/pagers.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/base.py index 8a214610f278..65caf71e4f91 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataplex_v1 import gapic_version as package_version from google.cloud.dataplex_v1.types import metadata_ @@ -373,13 +375,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc.py index f0f53a416e0d..12fb99798187 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import metadata_ diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc_asyncio.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc_asyncio.py index 85024c91e56d..cf8c58cf95c1 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataplex_v1.types import metadata_ diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest.py index 4166ab4d2c1e..dfdf03150fd0 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -937,9 +939,7 @@ def __call__( """ - http_options = ( - _BaseMetadataServiceRestTransport._BaseCreatePartition._get_http_options() - ) + http_options = _BaseMetadataServiceRestTransport._BaseCreatePartition._get_http_options() request, metadata = self._interceptor.pre_create_partition( request, metadata @@ -1106,7 +1106,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1190,9 +1190,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseMetadataServiceRestTransport._BaseDeletePartition._get_http_options() - ) + http_options = _BaseMetadataServiceRestTransport._BaseDeletePartition._get_http_options() request, metadata = self._interceptor.pre_delete_partition( request, metadata @@ -1214,7 +1212,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1740,9 +1738,7 @@ def __call__( List metadata partitions response. """ - http_options = ( - _BaseMetadataServiceRestTransport._BaseListPartitions._get_http_options() - ) + http_options = _BaseMetadataServiceRestTransport._BaseListPartitions._get_http_options() request, metadata = self._interceptor.pre_list_partitions(request, metadata) transcoded_request = _BaseMetadataServiceRestTransport._BaseListPartitions._get_transcoded_request( @@ -2395,9 +2391,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseMetadataServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseMetadataServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2514,9 +2508,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseMetadataServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseMetadataServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2771,9 +2763,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseMetadataServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseMetadataServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseMetadataServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest_base.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest_base.py index 5850fd61fa1b..0ad1e3d3d480 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest_base.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/services/metadata_service/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dataplex_v1.types import metadata_ diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/__init__.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/__init__.py index e4594ef8f3e6..2f175b5e2543 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/__init__.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/__init__.py @@ -13,7 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .analyze import Content, Environment, Session +from .analyze import ( + Content, + Environment, + Session, +) from .business_glossary import ( CreateGlossaryCategoryRequest, CreateGlossaryRequest, @@ -104,9 +108,18 @@ ListContentResponse, UpdateContentRequest, ) -from .data_discovery import DataDiscoveryResult, DataDiscoverySpec -from .data_documentation import DataDocumentationResult, DataDocumentationSpec -from .data_profile import DataProfileResult, DataProfileSpec +from .data_discovery import ( + DataDiscoveryResult, + DataDiscoverySpec, +) +from .data_documentation import ( + DataDocumentationResult, + DataDocumentationSpec, +) +from .data_profile import ( + DataProfileResult, + DataProfileSpec, +) from .data_quality import ( DataQualityColumnResult, DataQualityDimension, @@ -157,7 +170,9 @@ RunDataScanResponse, UpdateDataScanRequest, ) -from .datascans_common import DataScanCatalogPublishingStatus +from .datascans_common import ( + DataScanCatalogPublishingStatus, +) from .logs import ( BusinessGlossaryEvent, DataQualityScanRuleResult, @@ -187,9 +202,23 @@ StorageSystem, UpdateEntityRequest, ) -from .processing import DataSource, ScannedData, Trigger -from .resources import Action, Asset, AssetStatus, Lake, State, Zone -from .security import DataAccessSpec, ResourceAccessSpec +from .processing import ( + DataSource, + ScannedData, + Trigger, +) +from .resources import ( + Action, + Asset, + AssetStatus, + Lake, + State, + Zone, +) +from .security import ( + DataAccessSpec, + ResourceAccessSpec, +) from .service import ( CancelJobRequest, CreateAssetRequest, @@ -235,7 +264,10 @@ UpdateTaskRequest, UpdateZoneRequest, ) -from .tasks import Job, Task +from .tasks import ( + Job, + Task, +) __all__ = ( "Content", diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/analyze.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/analyze.py index 540dffe6b381..d5fcda0cb57a 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/analyze.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/analyze.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataplex_v1.types import resources @@ -368,6 +368,7 @@ class QueryEngine(proto.Enum): SPARK (2): Spark SQL Query. """ + QUERY_ENGINE_UNSPECIFIED = 0 SPARK = 2 @@ -394,6 +395,7 @@ class KernelType(proto.Enum): PYTHON3 (1): Python 3 Kernel. """ + KERNEL_TYPE_UNSPECIFIED = 0 PYTHON3 = 1 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/business_glossary.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/business_glossary.py index 199eea0392af..ccc06fde17d8 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/business_glossary.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/business_glossary.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/catalog.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/catalog.py index accb14656b9a..867c22fc9103 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/catalog.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/catalog.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -96,6 +96,7 @@ class EntryView(proto.Enum): ALL (4): No description available. """ + ENTRY_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -122,6 +123,7 @@ class TransferStatus(proto.Enum): from Data Catalog service. The resource can only be updated from Dataplex API. """ + TRANSFER_STATUS_UNSPECIFIED = 0 TRANSFER_STATUS_MIGRATED = 1 TRANSFER_STATUS_TRANSFERRED = 2 @@ -184,6 +186,7 @@ class DataClassification(proto.Enum): METADATA_AND_DATA (1): Metadata and data classification. """ + DATA_CLASSIFICATION_UNSPECIFIED = 0 METADATA_AND_DATA = 1 @@ -391,19 +394,19 @@ class Annotations(proto.Message): proto.STRING, number=5, ) - record_fields: MutableSequence[ - "AspectType.MetadataTemplate" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="AspectType.MetadataTemplate", + record_fields: MutableSequence["AspectType.MetadataTemplate"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="AspectType.MetadataTemplate", + ) ) - enum_values: MutableSequence[ - "AspectType.MetadataTemplate.EnumValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="AspectType.MetadataTemplate.EnumValue", + enum_values: MutableSequence["AspectType.MetadataTemplate.EnumValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="AspectType.MetadataTemplate.EnumValue", + ) ) map_items: "AspectType.MetadataTemplate" = proto.Field( proto.MESSAGE, @@ -2350,6 +2353,7 @@ class Type(proto.Enum): EXPORT (2): Export job. """ + TYPE_UNSPECIFIED = 0 IMPORT = 1 EXPORT = 2 @@ -2539,6 +2543,7 @@ class SyncMode(proto.Enum): This sync mode is supported for entries. """ + SYNC_MODE_UNSPECIFIED = 0 FULL = 1 INCREMENTAL = 2 @@ -2569,6 +2574,7 @@ class LogLevel(proto.Enum): import items, but doesn't specify which import item has an error. """ + LOG_LEVEL_UNSPECIFIED = 0 DEBUG = 1 INFO = 2 @@ -2850,6 +2856,7 @@ class State(proto.Enum): SUCCEEDED_WITH_ERRORS (7): The job completed with some errors. """ + STATE_UNSPECIFIED = 0 QUEUED = 1 RUNNING = 2 @@ -3000,6 +3007,7 @@ class Type(proto.Enum): The Entry is referenced as the target of the directional Entry Link. """ + UNSPECIFIED = 0 SOURCE = 2 TARGET = 3 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/cmek.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/cmek.py index 208fb7fafb35..77fcf1b0a916 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/cmek.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/cmek.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -91,6 +91,7 @@ class EncryptionState(proto.Enum): fails due to reasons like permission issues, invalid key etc. """ + ENCRYPTION_STATE_UNSPECIFIED = 0 ENCRYPTING = 1 COMPLETED = 2 @@ -120,6 +121,7 @@ class ErrorCode(proto.Enum): REQUIRE_USER_ACTION (2): User action is required to resolve the error. """ + UNKNOWN = 0 INTERNAL_ERROR = 1 REQUIRE_USER_ACTION = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/content.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/content.py index 91c44ac1e1ef..2bb8197e9a14 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/content.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/content.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dataplex_v1.types import analyze @@ -209,6 +209,7 @@ class ContentView(proto.Enum): FULL (2): Returns the complete proto. """ + CONTENT_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_discovery.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_discovery.py index 0e571059f10d..20e0e36e74e8 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_discovery.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_discovery.py @@ -105,6 +105,7 @@ class TableType(proto.Enum): credentials of the associated BigQuery connection. """ + TABLE_TYPE_UNSPECIFIED = 0 EXTERNAL = 1 BIGLAKE = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_profile.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_profile.py index f70fb4d3a871..e2cc7e9a79a2 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_profile.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_profile.py @@ -472,12 +472,12 @@ class TopNValue(proto.Message): message="DataProfileResult.Profile.Field.ProfileInfo", ) - fields: MutableSequence[ - "DataProfileResult.Profile.Field" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="DataProfileResult.Profile.Field", + fields: MutableSequence["DataProfileResult.Profile.Field"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="DataProfileResult.Profile.Field", + ) ) class PostScanActionsResult(proto.Message): @@ -517,6 +517,7 @@ class State(proto.Enum): result to export (usually caused by scan failed). """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_quality.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_quality.py index 0a4dfae85e65..0ebcdc196127 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_quality.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_quality.py @@ -302,6 +302,7 @@ class State(proto.Enum): result to export (usually caused by scan failed). """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -788,6 +789,7 @@ class ColumnStatistic(proto.Enum): MAX (3): Evaluate the column max """ + STATISTIC_UNDEFINED = 0 MEAN = 1 MIN = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_taxonomy.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_taxonomy.py index 3e8e104b6a3a..bc51a2a00d4d 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_taxonomy.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/data_taxonomy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataplex_v1.types import security @@ -928,12 +928,12 @@ class ListDataAttributeBindingsResponse(proto.Message): def raw_page(self): return self - data_attribute_bindings: MutableSequence[ - "DataAttributeBinding" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="DataAttributeBinding", + data_attribute_bindings: MutableSequence["DataAttributeBinding"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="DataAttributeBinding", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans.py index be3020f4d10f..3c84682c5a60 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataplex_v1.types import ( @@ -68,6 +68,7 @@ class DataScanType(proto.Enum): DATA_DOCUMENTATION (4): Data documentation scan. """ + DATA_SCAN_TYPE_UNSPECIFIED = 0 DATA_QUALITY = 1 DATA_PROFILE = 2 @@ -202,6 +203,7 @@ class DataScanView(proto.Enum): FULL (10): Include everything. """ + DATA_SCAN_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 10 @@ -362,6 +364,7 @@ class DataScanJobView(proto.Enum): FULL (10): Include everything. """ + DATA_SCAN_JOB_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 10 @@ -888,6 +891,7 @@ class State(proto.Enum): The DataScanJob has been created but not started to run yet. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 CANCELING = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans_common.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans_common.py index 1a8ef46d0a0c..793d4353a8f1 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans_common.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/datascans_common.py @@ -48,6 +48,7 @@ class State(proto.Enum): FAILED (2): Publish to catalog failed. """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/logs.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/logs.py index 54f0851abf29..d43a27b46ac8 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/logs.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/logs.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataplex_v1.types import datascans_common @@ -129,6 +129,7 @@ class EventType(proto.Enum): TABLE_DELETED (13): An event representing a table being deleted. """ + EVENT_TYPE_UNSPECIFIED = 0 CONFIG = 1 ENTITY_CREATED = 2 @@ -153,6 +154,7 @@ class EntityType(proto.Enum): FILESET (2): Entities representing unstructured data. """ + ENTITY_TYPE_UNSPECIFIED = 0 TABLE = 1 FILESET = 2 @@ -170,6 +172,7 @@ class TableType(proto.Enum): OBJECT_TABLE (3): Object table type for unstructured data. """ + TABLE_TYPE_UNSPECIFIED = 0 EXTERNAL_TABLE = 1 BIGLAKE_TABLE = 2 @@ -391,6 +394,7 @@ class Type(proto.Enum): NOTEBOOK (2): Notebook jobs. """ + TYPE_UNSPECIFIED = 0 SPARK = 1 NOTEBOOK = 2 @@ -411,6 +415,7 @@ class State(proto.Enum): Job was cancelled or aborted via the service executing the job. """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -426,6 +431,7 @@ class Service(proto.Enum): DATAPROC (1): Cloud Dataproc. """ + SERVICE_UNSPECIFIED = 0 DATAPROC = 1 @@ -443,6 +449,7 @@ class ExecutionTrigger(proto.Enum): The job was triggered by the explicit call of Task API. """ + EXECUTION_TRIGGER_UNSPECIFIED = 0 TASK_CONFIG = 1 RUN_REQUEST = 2 @@ -545,6 +552,7 @@ class EventType(proto.Enum): yet assigned to a user. This comes before START in the sequence """ + EVENT_TYPE_UNSPECIFIED = 0 START = 1 STOP = 2 @@ -580,6 +588,7 @@ class Engine(proto.Enum): BIGQUERY (2): BigQuery engine is specified in Query. """ + ENGINE_UNSPECIFIED = 0 SPARK_SQL = 1 BIGQUERY = 2 @@ -706,6 +715,7 @@ class EventType(proto.Enum): GOVERNANCE_RULE_PROCESSING (18): Governance rule processing Event. """ + EVENT_TYPE_UNSPECIFIED = 0 RESOURCE_IAM_POLICY_UPDATE = 1 BIGQUERY_TABLE_CREATE = 2 @@ -748,6 +758,7 @@ class EntityType(proto.Enum): FILESET (2): Fileset entity type. """ + ENTITY_TYPE_UNSPECIFIED = 0 TABLE = 1 FILESET = 2 @@ -858,6 +869,7 @@ class ScanType(proto.Enum): DATA_DISCOVERY (4): Data scan for data discovery. """ + SCAN_TYPE_UNSPECIFIED = 0 DATA_PROFILE = 1 DATA_QUALITY = 2 @@ -880,6 +892,7 @@ class State(proto.Enum): CREATED (5): Data scan job was created. """ + STATE_UNSPECIFIED = 0 STARTED = 1 SUCCEEDED = 2 @@ -898,6 +911,7 @@ class Trigger(proto.Enum): SCHEDULE (2): Data scan triggers as per schedule. """ + TRIGGER_UNSPECIFIED = 0 ON_DEMAND = 1 SCHEDULE = 2 @@ -913,6 +927,7 @@ class Scope(proto.Enum): INCREMENTAL (2): Data scan runs on incremental data. """ + SCOPE_UNSPECIFIED = 0 FULL = 1 INCREMENTAL = 2 @@ -1085,6 +1100,7 @@ class State(proto.Enum): result to export (usually caused by scan failed). """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -1272,6 +1288,7 @@ class RuleType(proto.Enum): See [DataQualityRule.SqlAssertion][google.cloud.dataplex.v1.DataQualityRule.SqlAssertion]. """ + RULE_TYPE_UNSPECIFIED = 0 NON_NULL_EXPECTATION = 1 RANGE_EXPECTATION = 2 @@ -1295,6 +1312,7 @@ class EvaluationType(proto.Enum): The rule evaluation is done for an aggregate of rows. """ + EVALUATION_TYPE_UNSPECIFIED = 0 PER_ROW = 1 AGGREGATE = 2 @@ -1310,6 +1328,7 @@ class Result(proto.Enum): FAILED (2): The data quality rule failed. """ + RESULT_UNSPECIFIED = 0 PASSED = 1 FAILED = 2 @@ -1408,6 +1427,7 @@ class EventType(proto.Enum): GLOSSARY_TERM_DELETE (9): Glossary term delete event. """ + EVENT_TYPE_UNSPECIFIED = 0 GLOSSARY_CREATE = 1 GLOSSARY_UPDATE = 2 @@ -1457,6 +1477,7 @@ class EventType(proto.Enum): ENTRY_LINK_DELETE (2): EntryLink delete event. """ + EVENT_TYPE_UNSPECIFIED = 0 ENTRY_LINK_CREATE = 1 ENTRY_LINK_DELETE = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/metadata_.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/metadata_.py index bfd47aa4b8b8..e31031814f31 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/metadata_.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/metadata_.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -57,6 +57,7 @@ class StorageSystem(proto.Enum): The entity data is contained within a BigQuery dataset. """ + STORAGE_SYSTEM_UNSPECIFIED = 0 CLOUD_STORAGE = 1 BIGQUERY = 2 @@ -184,6 +185,7 @@ class EntityView(proto.Enum): FILESETS (2): Only list fileset entities. """ + ENTITY_VIEW_UNSPECIFIED = 0 TABLES = 1 FILESETS = 2 @@ -265,6 +267,7 @@ class EntityView(proto.Enum): Include everything. Currently, this is the same as the SCHEMA view. """ + ENTITY_VIEW_UNSPECIFIED = 0 BASIC = 1 SCHEMA = 2 @@ -535,6 +538,7 @@ class Type(proto.Enum): FILESET (2): Unstructured data. """ + TYPE_UNSPECIFIED = 0 TABLE = 1 FILESET = 2 @@ -786,6 +790,7 @@ class Type(proto.Enum): NULL (100): Null field that does not have values. """ + TYPE_UNSPECIFIED = 0 BOOLEAN = 1 BYTE = 2 @@ -818,6 +823,7 @@ class Mode(proto.Enum): The field has repeated (0 or more) semantics, and is a list of values. """ + MODE_UNSPECIFIED = 0 REQUIRED = 1 NULLABLE = 2 @@ -835,6 +841,7 @@ class PartitionStyle(proto.Enum): ``gs://bucket/path/to/table/dt=2019-10-31/lang=en``, ``gs://bucket/path/to/table/dt=2019-10-31/lang=en/late``. """ + PARTITION_STYLE_UNSPECIFIED = 0 HIVE_COMPATIBLE = 1 @@ -1015,6 +1022,7 @@ class Format(proto.Enum): UNKNOWN (1001): Data of an unknown format. """ + FORMAT_UNSPECIFIED = 0 PARQUET = 1 AVRO = 2 @@ -1041,6 +1049,7 @@ class CompressionFormat(proto.Enum): BZIP2 (3): BZip2 compressed set of files. """ + COMPRESSION_FORMAT_UNSPECIFIED = 0 GZIP = 2 BZIP2 = 3 @@ -1172,6 +1181,7 @@ class AccessMode(proto.Enum): Data is accessed through a managed interface using BigQuery APIs. """ + ACCESS_MODE_UNSPECIFIED = 0 DIRECT = 1 MANAGED = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/resources.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/resources.py index ba7599abcd27..31bd9e0a12b4 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/resources.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -50,6 +50,7 @@ class State(proto.Enum): Resource is active but has unresolved actions. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 CREATING = 2 @@ -161,6 +162,7 @@ class State(proto.Enum): Attach/detach could not be done due to errors. """ + STATE_UNSPECIFIED = 0 NONE = 1 READY = 2 @@ -334,6 +336,7 @@ class Type(proto.Enum): file formats (parquet, avro and orc) and organized in a hive-compatible directory layout. """ + TYPE_UNSPECIFIED = 0 RAW = 1 CURATED = 2 @@ -361,6 +364,7 @@ class LocationType(proto.Enum): Resources that are associated with a multi-region location. """ + LOCATION_TYPE_UNSPECIFIED = 0 SINGLE_REGION = 1 MULTI_REGION = 2 @@ -663,6 +667,7 @@ class Category(proto.Enum): DATA_DISCOVERY (3): Data and discovery related issues. """ + CATEGORY_UNSPECIFIED = 0 RESOURCE_MANAGEMENT = 1 SECURITY_POLICY = 2 @@ -768,6 +773,7 @@ class SchemaChange(proto.Enum): Newly discovered schema has changed from existing schema for data in a curated zone. """ + SCHEMA_CHANGE_UNSPECIFIED = 0 INCOMPATIBLE = 1 MODIFIED = 2 @@ -816,6 +822,7 @@ class PartitionStructure(proto.Enum): Hive style partition definition (curated zone only). """ + PARTITION_STRUCTURE_UNSPECIFIED = 0 CONSISTENT_KEYS = 1 HIVE_STYLE_KEYS = 2 @@ -997,6 +1004,7 @@ class State(proto.Enum): Security policy could not be applied to the attached resource due to errors. """ + STATE_UNSPECIFIED = 0 READY = 1 APPLYING = 2 @@ -1182,6 +1190,7 @@ class Type(proto.Enum): BIGQUERY_DATASET (2): BigQuery dataset. """ + TYPE_UNSPECIFIED = 0 STORAGE_BUCKET = 1 BIGQUERY_DATASET = 2 @@ -1200,6 +1209,7 @@ class AccessMode(proto.Enum): Data is accessed through a managed interface using BigQuery APIs. """ + ACCESS_MODE_UNSPECIFIED = 0 DIRECT = 1 MANAGED = 2 @@ -1246,6 +1256,7 @@ class State(proto.Enum): ERROR (2): Resource has errors. """ + STATE_UNSPECIFIED = 0 READY = 1 ERROR = 2 @@ -1306,6 +1317,7 @@ class State(proto.Enum): DISABLED (5): Discovery for the asset is disabled. """ + STATE_UNSPECIFIED = 0 SCHEDULED = 1 IN_PROGRESS = 2 diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/service.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/service.py index 009cf0e32bd1..0dd740dc99dd 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/service.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataplex_v1.types import analyze, resources diff --git a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/tasks.py b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/tasks.py index 7c0d9a249915..1c892cbfec85 100644 --- a/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/tasks.py +++ b/packages/google-cloud-dataplex/google/cloud/dataplex_v1/types/tasks.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataplex_v1.types import resources @@ -286,6 +286,7 @@ class Type(proto.Enum): RECURRING (2): The task is scheduled to run periodically. """ + TYPE_UNSPECIFIED = 0 ON_DEMAND = 1 RECURRING = 2 @@ -645,6 +646,7 @@ class Service(proto.Enum): DATAPROC (1): Dataproc service is used to run this job. """ + SERVICE_UNSPECIFIED = 0 DATAPROC = 1 @@ -668,6 +670,7 @@ class State(proto.Enum): The job was cancelled outside of Dataplex Universal Catalog. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 CANCELLING = 2 @@ -690,6 +693,7 @@ class Trigger(proto.Enum): The job was triggered by the explicit call of Task API. """ + TRIGGER_UNSPECIFIED = 0 TASK_CONFIG = 1 RUN_REQUEST = 2 diff --git a/packages/google-cloud-dataplex/noxfile.py b/packages/google-cloud-dataplex/noxfile.py index 53f1df180441..4837f17fe7df 100644 --- a/packages/google-cloud-dataplex/noxfile.py +++ b/packages/google-cloud-dataplex/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_async.py b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_async.py index 706a35c0748d..217163713c4f 100644 --- a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_async.py +++ b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataplex -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START dataplex_v1_generated_ContentService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataplex_v1 diff --git a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_sync.py b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_sync.py index 2e5056cac16a..828f57e9db28 100644 --- a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_sync.py +++ b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataplex -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START dataplex_v1_generated_ContentService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataplex_v1 diff --git a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_async.py b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_async.py index e95b29c8321f..c99c9ba5a188 100644 --- a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_async.py +++ b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataplex -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START dataplex_v1_generated_ContentService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataplex_v1 diff --git a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_sync.py b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_sync.py index ac9fd9be5167..5620f74130fe 100644 --- a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_sync.py +++ b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataplex -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START dataplex_v1_generated_ContentService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataplex_v1 diff --git a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_async.py b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_async.py index 14d82104ab2f..957fedb6ca33 100644 --- a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_async.py +++ b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataplex -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START dataplex_v1_generated_ContentService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataplex_v1 diff --git a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_sync.py b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_sync.py index 0f8652cbc271..8ff1df3c2231 100644 --- a/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-dataplex/samples/generated_samples/dataplex_v1_generated_content_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-dataplex -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START dataplex_v1_generated_ContentService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import dataplex_v1 diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_business_glossary_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_business_glossary_service.py index dc904d377444..d7006851b84f 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_business_glossary_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_business_glossary_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.business_glossary_service import ( BusinessGlossaryServiceAsyncClient, @@ -1015,10 +1017,9 @@ def test_business_glossary_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1064,9 @@ def test_business_glossary_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1102,10 +1102,9 @@ def test_business_glossary_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,13 +1360,13 @@ def test_business_glossary_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4455,9 +4454,9 @@ def test_get_glossary_category_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_glossary_category - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_glossary_category] = ( + mock_rpc + ) request = {} client.get_glossary_category(request) @@ -5372,9 +5371,9 @@ def test_create_glossary_term_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_glossary_term] = ( + mock_rpc + ) request = {} client.create_glossary_term(request) @@ -5746,9 +5745,9 @@ def test_update_glossary_term_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_glossary_term] = ( + mock_rpc + ) request = {} client.update_glossary_term(request) @@ -6103,9 +6102,9 @@ def test_delete_glossary_term_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_glossary_term] = ( + mock_rpc + ) request = {} client.delete_glossary_term(request) @@ -6442,9 +6441,9 @@ def test_get_glossary_term_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_glossary_term] = ( + mock_rpc + ) request = {} client.get_glossary_term(request) @@ -6800,9 +6799,9 @@ def test_list_glossary_terms_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_glossary_terms - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_glossary_terms] = ( + mock_rpc + ) request = {} client.list_glossary_terms(request) @@ -8900,9 +8899,9 @@ def test_get_glossary_category_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_glossary_category - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_glossary_category] = ( + mock_rpc + ) request = {} client.get_glossary_category(request) @@ -9356,9 +9355,9 @@ def test_create_glossary_term_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_glossary_term] = ( + mock_rpc + ) request = {} client.create_glossary_term(request) @@ -9569,9 +9568,9 @@ def test_update_glossary_term_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_glossary_term] = ( + mock_rpc + ) request = {} client.update_glossary_term(request) @@ -9763,9 +9762,9 @@ def test_delete_glossary_term_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_glossary_term] = ( + mock_rpc + ) request = {} client.delete_glossary_term(request) @@ -9940,9 +9939,9 @@ def test_get_glossary_term_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_glossary_term - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_glossary_term] = ( + mock_rpc + ) request = {} client.get_glossary_term(request) @@ -10124,9 +10123,9 @@ def test_list_glossary_terms_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_glossary_terms - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_glossary_terms] = ( + mock_rpc + ) request = {} client.list_glossary_terms(request) @@ -11286,8 +11285,9 @@ def test_create_glossary_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11423,20 +11423,21 @@ def test_create_glossary_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, "post_create_glossary" - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_create_glossary_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, "pre_create_glossary" - ) as pre: + 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.BusinessGlossaryServiceRestInterceptor, "post_create_glossary" + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_create_glossary_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, "pre_create_glossary" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11491,8 +11492,9 @@ def test_update_glossary_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11630,20 +11632,21 @@ def test_update_glossary_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, "post_update_glossary" - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_update_glossary_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, "pre_update_glossary" - ) as pre: + 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.BusinessGlossaryServiceRestInterceptor, "post_update_glossary" + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_update_glossary_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, "pre_update_glossary" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11696,8 +11699,9 @@ def test_delete_glossary_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11754,20 +11758,21 @@ def test_delete_glossary_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, "post_delete_glossary" - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_delete_glossary_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, "pre_delete_glossary" - ) as pre: + 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.BusinessGlossaryServiceRestInterceptor, "post_delete_glossary" + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_delete_glossary_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, "pre_delete_glossary" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11820,8 +11825,9 @@ def test_get_glossary_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11896,18 +11902,20 @@ def test_get_glossary_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, "post_get_glossary" - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_get_glossary_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, "pre_get_glossary" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, "post_get_glossary" + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_get_glossary_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, "pre_get_glossary" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11960,8 +11968,9 @@ def test_list_glossaries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12026,18 +12035,20 @@ def test_list_glossaries_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, "post_list_glossaries" - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_list_glossaries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, "pre_list_glossaries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, "post_list_glossaries" + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_list_glossaries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, "pre_list_glossaries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12095,8 +12106,9 @@ def test_create_glossary_category_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12244,20 +12256,22 @@ def test_create_glossary_category_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, - "post_create_glossary_category", - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_create_glossary_category_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "pre_create_glossary_category", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_create_glossary_category", + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_create_glossary_category_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "pre_create_glossary_category", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12316,8 +12330,9 @@ def test_update_glossary_category_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12469,20 +12484,22 @@ def test_update_glossary_category_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, - "post_update_glossary_category", - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_update_glossary_category_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "pre_update_glossary_category", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_update_glossary_category", + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_update_glossary_category_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "pre_update_glossary_category", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12539,8 +12556,9 @@ def test_delete_glossary_category_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12599,14 +12617,14 @@ def test_delete_glossary_category_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, - "pre_delete_glossary_category", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "pre_delete_glossary_category", + ) as pre, + ): pre.assert_not_called() pb_message = business_glossary.DeleteGlossaryCategoryRequest.pb( business_glossary.DeleteGlossaryCategoryRequest() @@ -12653,8 +12671,9 @@ def test_get_glossary_category_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12727,18 +12746,22 @@ def test_get_glossary_category_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, "post_get_glossary_category" - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_get_glossary_category_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, "pre_get_glossary_category" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_get_glossary_category", + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_get_glossary_category_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "pre_get_glossary_category", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12793,8 +12816,9 @@ def test_list_glossary_categories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12859,20 +12883,22 @@ def test_list_glossary_categories_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, - "post_list_glossary_categories", - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_list_glossary_categories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "pre_list_glossary_categories", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_list_glossary_categories", + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_list_glossary_categories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "pre_list_glossary_categories", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12930,8 +12956,9 @@ def test_create_glossary_term_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13079,18 +13106,22 @@ def test_create_glossary_term_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, "post_create_glossary_term" - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_create_glossary_term_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, "pre_create_glossary_term" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_create_glossary_term", + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_create_glossary_term_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "pre_create_glossary_term", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13149,8 +13180,9 @@ def test_update_glossary_term_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13302,18 +13334,22 @@ def test_update_glossary_term_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, "post_update_glossary_term" - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_update_glossary_term_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, "pre_update_glossary_term" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_update_glossary_term", + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_update_glossary_term_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "pre_update_glossary_term", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13370,8 +13406,9 @@ def test_delete_glossary_term_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13430,13 +13467,14 @@ def test_delete_glossary_term_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, "pre_delete_glossary_term" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "pre_delete_glossary_term", + ) as pre, + ): pre.assert_not_called() pb_message = business_glossary.DeleteGlossaryTermRequest.pb( business_glossary.DeleteGlossaryTermRequest() @@ -13483,8 +13521,9 @@ def test_get_glossary_term_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13557,18 +13596,20 @@ def test_get_glossary_term_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, "post_get_glossary_term" - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_get_glossary_term_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, "pre_get_glossary_term" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, "post_get_glossary_term" + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_get_glossary_term_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, "pre_get_glossary_term" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13623,8 +13664,9 @@ def test_list_glossary_terms_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13689,18 +13731,21 @@ def test_list_glossary_terms_rest_interceptors(null_interceptor): ) client = BusinessGlossaryServiceClient(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.BusinessGlossaryServiceRestInterceptor, "post_list_glossary_terms" - ) as post, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, - "post_list_glossary_terms_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BusinessGlossaryServiceRestInterceptor, "pre_list_glossary_terms" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_list_glossary_terms", + ) as post, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, + "post_list_glossary_terms_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BusinessGlossaryServiceRestInterceptor, "pre_list_glossary_terms" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13758,8 +13803,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13818,8 +13864,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13880,8 +13927,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13942,8 +13990,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14004,8 +14053,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14066,8 +14116,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14537,11 +14588,14 @@ def test_business_glossary_service_base_transport(): def test_business_glossary_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataplex_v1.services.business_glossary_service.transports.BusinessGlossaryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataplex_v1.services.business_glossary_service.transports.BusinessGlossaryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BusinessGlossaryServiceTransport( @@ -14558,9 +14612,12 @@ def test_business_glossary_service_base_transport_with_credentials_file(): def test_business_glossary_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataplex_v1.services.business_glossary_service.transports.BusinessGlossaryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataplex_v1.services.business_glossary_service.transports.BusinessGlossaryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BusinessGlossaryServiceTransport() @@ -14634,11 +14691,12 @@ def test_business_glossary_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_catalog_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_catalog_service.py index ab250f2b214d..0e88fad506d1 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_catalog_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_catalog_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.catalog_service import ( CatalogServiceAsyncClient, @@ -963,10 +965,9 @@ def test_catalog_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1011,10 +1012,9 @@ def test_catalog_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1050,10 +1050,9 @@ def test_catalog_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1296,13 +1295,13 @@ def test_catalog_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1412,9 +1411,9 @@ def test_create_entry_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_type] = ( + mock_rpc + ) request = {} client.create_entry_type(request) @@ -1771,9 +1770,9 @@ def test_update_entry_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entry_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entry_type] = ( + mock_rpc + ) request = {} client.update_entry_type(request) @@ -2126,9 +2125,9 @@ def test_delete_entry_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_type] = ( + mock_rpc + ) request = {} client.delete_entry_type(request) @@ -2476,9 +2475,9 @@ def test_list_entry_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entry_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entry_types] = ( + mock_rpc + ) request = {} client.list_entry_types(request) @@ -3349,9 +3348,9 @@ def test_create_aspect_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_aspect_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_aspect_type] = ( + mock_rpc + ) request = {} client.create_aspect_type(request) @@ -3710,9 +3709,9 @@ def test_update_aspect_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_aspect_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_aspect_type] = ( + mock_rpc + ) request = {} client.update_aspect_type(request) @@ -4067,9 +4066,9 @@ def test_delete_aspect_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_aspect_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_aspect_type] = ( + mock_rpc + ) request = {} client.delete_aspect_type(request) @@ -4421,9 +4420,9 @@ def test_list_aspect_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_aspect_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_aspect_types] = ( + mock_rpc + ) request = {} client.list_aspect_types(request) @@ -5314,9 +5313,9 @@ def test_create_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_group] = ( + mock_rpc + ) request = {} client.create_entry_group(request) @@ -5675,9 +5674,9 @@ def test_update_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entry_group] = ( + mock_rpc + ) request = {} client.update_entry_group(request) @@ -6032,9 +6031,9 @@ def test_delete_entry_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_group] = ( + mock_rpc + ) request = {} client.delete_entry_group(request) @@ -6386,9 +6385,9 @@ def test_list_entry_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entry_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entry_groups] = ( + mock_rpc + ) request = {} client.list_entry_groups(request) @@ -9936,9 +9935,9 @@ def test_create_metadata_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_job] = ( + mock_rpc + ) request = {} client.create_metadata_job(request) @@ -10302,9 +10301,9 @@ def test_get_metadata_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_job] = ( + mock_rpc + ) request = {} client.get_metadata_job(request) @@ -10641,9 +10640,9 @@ def test_list_metadata_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_jobs] = ( + mock_rpc + ) request = {} client.list_metadata_jobs(request) @@ -11183,9 +11182,9 @@ def test_cancel_metadata_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_metadata_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_metadata_job] = ( + mock_rpc + ) request = {} client.cancel_metadata_job(request) @@ -11517,9 +11516,9 @@ def test_create_entry_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_link] = ( + mock_rpc + ) request = {} client.create_entry_link(request) @@ -11876,9 +11875,9 @@ def test_delete_entry_link_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_link] = ( + mock_rpc + ) request = {} client.delete_entry_link(request) @@ -12468,9 +12467,9 @@ def test_create_entry_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_type] = ( + mock_rpc + ) request = {} client.create_entry_type(request) @@ -12685,9 +12684,9 @@ def test_update_entry_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entry_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entry_type] = ( + mock_rpc + ) request = {} client.update_entry_type(request) @@ -12886,9 +12885,9 @@ def test_delete_entry_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_type] = ( + mock_rpc + ) request = {} client.delete_entry_type(request) @@ -13068,9 +13067,9 @@ def test_list_entry_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entry_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entry_types] = ( + mock_rpc + ) request = {} client.list_entry_types(request) @@ -13506,9 +13505,9 @@ def test_create_aspect_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_aspect_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_aspect_type] = ( + mock_rpc + ) request = {} client.create_aspect_type(request) @@ -13726,9 +13725,9 @@ def test_update_aspect_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_aspect_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_aspect_type] = ( + mock_rpc + ) request = {} client.update_aspect_type(request) @@ -13929,9 +13928,9 @@ def test_delete_aspect_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_aspect_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_aspect_type] = ( + mock_rpc + ) request = {} client.delete_aspect_type(request) @@ -14112,9 +14111,9 @@ def test_list_aspect_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_aspect_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_aspect_types] = ( + mock_rpc + ) request = {} client.list_aspect_types(request) @@ -14554,9 +14553,9 @@ def test_create_entry_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_group] = ( + mock_rpc + ) request = {} client.create_entry_group(request) @@ -14774,9 +14773,9 @@ def test_update_entry_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entry_group] = ( + mock_rpc + ) request = {} client.update_entry_group(request) @@ -14977,9 +14976,9 @@ def test_delete_entry_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_group] = ( + mock_rpc + ) request = {} client.delete_entry_group(request) @@ -15160,9 +15159,9 @@ def test_list_entry_groups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entry_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entry_groups] = ( + mock_rpc + ) request = {} client.list_entry_groups(request) @@ -17072,9 +17071,9 @@ def test_create_metadata_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_job] = ( + mock_rpc + ) request = {} client.create_metadata_job(request) @@ -17276,9 +17275,9 @@ def test_get_metadata_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_job] = ( + mock_rpc + ) request = {} client.get_metadata_job(request) @@ -17460,9 +17459,9 @@ def test_list_metadata_jobs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_jobs] = ( + mock_rpc + ) request = {} client.list_metadata_jobs(request) @@ -17722,9 +17721,9 @@ def test_cancel_metadata_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_metadata_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_metadata_job] = ( + mock_rpc + ) request = {} client.cancel_metadata_job(request) @@ -17900,9 +17899,9 @@ def test_create_entry_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entry_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entry_link] = ( + mock_rpc + ) request = {} client.create_entry_link(request) @@ -18111,9 +18110,9 @@ def test_delete_entry_link_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entry_link - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entry_link] = ( + mock_rpc + ) request = {} client.delete_entry_link(request) @@ -20064,8 +20063,9 @@ def test_create_entry_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20204,19 +20204,21 @@ def test_create_entry_type_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_create_entry_type" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_create_entry_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_create_entry_type" - ) as pre: + 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.CatalogServiceRestInterceptor, "post_create_entry_type" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_create_entry_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_create_entry_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20269,8 +20271,9 @@ def test_update_entry_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20411,19 +20414,21 @@ def test_update_entry_type_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_update_entry_type" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_update_entry_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_update_entry_type" - ) as pre: + 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.CatalogServiceRestInterceptor, "post_update_entry_type" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_update_entry_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_update_entry_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20474,8 +20479,9 @@ def test_delete_entry_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20532,19 +20538,21 @@ def test_delete_entry_type_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_delete_entry_type" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_delete_entry_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_delete_entry_type" - ) as pre: + 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.CatalogServiceRestInterceptor, "post_delete_entry_type" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_delete_entry_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_delete_entry_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20593,8 +20601,9 @@ def test_list_entry_types_rest_bad_request(request_type=catalog.ListEntryTypesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20659,17 +20668,20 @@ def test_list_entry_types_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_list_entry_types" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_list_entry_types_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_list_entry_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_list_entry_types" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_list_entry_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_list_entry_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20720,8 +20732,9 @@ def test_get_entry_type_rest_bad_request(request_type=catalog.GetEntryTypeReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20798,17 +20811,20 @@ def test_get_entry_type_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_get_entry_type" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_get_entry_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_get_entry_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_get_entry_type" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_get_entry_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_get_entry_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20859,8 +20875,9 @@ def test_create_aspect_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21019,20 +21036,21 @@ def test_create_aspect_type_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_create_aspect_type" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, - "post_create_aspect_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_create_aspect_type" - ) as pre: + 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.CatalogServiceRestInterceptor, "post_create_aspect_type" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_create_aspect_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_create_aspect_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21089,8 +21107,9 @@ def test_update_aspect_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21253,20 +21272,21 @@ def test_update_aspect_type_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_update_aspect_type" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, - "post_update_aspect_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_update_aspect_type" - ) as pre: + 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.CatalogServiceRestInterceptor, "post_update_aspect_type" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_update_aspect_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_update_aspect_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21319,8 +21339,9 @@ def test_delete_aspect_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21377,20 +21398,21 @@ def test_delete_aspect_type_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_delete_aspect_type" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, - "post_delete_aspect_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_delete_aspect_type" - ) as pre: + 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.CatalogServiceRestInterceptor, "post_delete_aspect_type" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_delete_aspect_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_delete_aspect_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21443,8 +21465,9 @@ def test_list_aspect_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21509,17 +21532,20 @@ def test_list_aspect_types_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_list_aspect_types" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_list_aspect_types_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_list_aspect_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_list_aspect_types" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_list_aspect_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_list_aspect_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21570,8 +21596,9 @@ def test_get_aspect_type_rest_bad_request(request_type=catalog.GetAspectTypeRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21649,17 +21676,20 @@ def test_get_aspect_type_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_get_aspect_type" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_get_aspect_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_get_aspect_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_get_aspect_type" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_get_aspect_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_get_aspect_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21710,8 +21740,9 @@ def test_create_entry_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21846,20 +21877,21 @@ def test_create_entry_group_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_create_entry_group" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, - "post_create_entry_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_create_entry_group" - ) as pre: + 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.CatalogServiceRestInterceptor, "post_create_entry_group" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_create_entry_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_create_entry_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21916,8 +21948,9 @@ def test_update_entry_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22056,20 +22089,21 @@ def test_update_entry_group_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_update_entry_group" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, - "post_update_entry_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_update_entry_group" - ) as pre: + 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.CatalogServiceRestInterceptor, "post_update_entry_group" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_update_entry_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_update_entry_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22122,8 +22156,9 @@ def test_delete_entry_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22180,20 +22215,21 @@ def test_delete_entry_group_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_delete_entry_group" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, - "post_delete_entry_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_delete_entry_group" - ) as pre: + 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.CatalogServiceRestInterceptor, "post_delete_entry_group" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_delete_entry_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_delete_entry_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22246,8 +22282,9 @@ def test_list_entry_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22312,17 +22349,20 @@ def test_list_entry_groups_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_list_entry_groups" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_list_entry_groups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_list_entry_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_list_entry_groups" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_list_entry_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_list_entry_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22373,8 +22413,9 @@ def test_get_entry_group_rest_bad_request(request_type=catalog.GetEntryGroupRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22447,17 +22488,20 @@ def test_get_entry_group_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_get_entry_group" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_get_entry_group_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_get_entry_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_get_entry_group" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_get_entry_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_get_entry_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22506,8 +22550,9 @@ def test_create_entry_rest_bad_request(request_type=catalog.CreateEntryRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22664,17 +22709,19 @@ def test_create_entry_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_create_entry" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_create_entry_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_create_entry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_create_entry" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_create_entry_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_create_entry" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22727,8 +22774,9 @@ def test_update_entry_rest_bad_request(request_type=catalog.UpdateEntryRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22889,17 +22937,19 @@ def test_update_entry_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_update_entry" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_update_entry_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_update_entry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_update_entry" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_update_entry_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_update_entry" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22950,8 +23000,9 @@ def test_delete_entry_rest_bad_request(request_type=catalog.DeleteEntryRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23022,17 +23073,19 @@ def test_delete_entry_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_delete_entry" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_delete_entry_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_delete_entry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_delete_entry" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_delete_entry_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_delete_entry" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23081,8 +23134,9 @@ def test_list_entries_rest_bad_request(request_type=catalog.ListEntriesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23145,17 +23199,19 @@ def test_list_entries_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_list_entries" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_list_entries_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_list_entries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_list_entries" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_list_entries_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_list_entries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23208,8 +23264,9 @@ def test_get_entry_rest_bad_request(request_type=catalog.GetEntryRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23280,17 +23337,19 @@ def test_get_entry_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_get_entry" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_get_entry_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_get_entry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_get_entry" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_get_entry_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_get_entry" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23339,8 +23398,9 @@ def test_lookup_entry_rest_bad_request(request_type=catalog.LookupEntryRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23409,17 +23469,19 @@ def test_lookup_entry_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_lookup_entry" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_lookup_entry_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_lookup_entry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_lookup_entry" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_lookup_entry_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_lookup_entry" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23468,8 +23530,9 @@ def test_search_entries_rest_bad_request(request_type=catalog.SearchEntriesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23536,17 +23599,20 @@ def test_search_entries_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_search_entries" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_search_entries_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_search_entries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_search_entries" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_search_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_search_entries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23599,8 +23665,9 @@ def test_create_metadata_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23784,20 +23851,21 @@ def test_create_metadata_job_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_create_metadata_job" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, - "post_create_metadata_job_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_create_metadata_job" - ) as pre: + 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.CatalogServiceRestInterceptor, "post_create_metadata_job" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_create_metadata_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_create_metadata_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23848,8 +23916,9 @@ def test_get_metadata_job_rest_bad_request(request_type=catalog.GetMetadataJobRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23916,17 +23985,20 @@ def test_get_metadata_job_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_get_metadata_job" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_get_metadata_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_get_metadata_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_get_metadata_job" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_get_metadata_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_get_metadata_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23977,8 +24049,9 @@ def test_list_metadata_jobs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24043,18 +24116,20 @@ def test_list_metadata_jobs_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_list_metadata_jobs" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, - "post_list_metadata_jobs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_list_metadata_jobs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_list_metadata_jobs" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_list_metadata_jobs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_list_metadata_jobs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24109,8 +24184,9 @@ def test_cancel_metadata_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24167,13 +24243,13 @@ def test_cancel_metadata_job_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "pre_cancel_metadata_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_cancel_metadata_job" + ) as pre, + ): pre.assert_not_called() pb_message = catalog.CancelMetadataJobRequest.pb( catalog.CancelMetadataJobRequest() @@ -24218,8 +24294,9 @@ def test_create_entry_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24358,17 +24435,20 @@ def test_create_entry_link_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_create_entry_link" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_create_entry_link_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_create_entry_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_create_entry_link" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_create_entry_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_create_entry_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24421,8 +24501,9 @@ def test_delete_entry_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24489,17 +24570,20 @@ def test_delete_entry_link_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_delete_entry_link" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_delete_entry_link_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_delete_entry_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_delete_entry_link" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_delete_entry_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_delete_entry_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24550,8 +24634,9 @@ def test_get_entry_link_rest_bad_request(request_type=catalog.GetEntryLinkReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24618,17 +24703,20 @@ def test_get_entry_link_rest_interceptors(null_interceptor): ) client = CatalogServiceClient(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.CatalogServiceRestInterceptor, "post_get_entry_link" - ) as post, mock.patch.object( - transports.CatalogServiceRestInterceptor, "post_get_entry_link_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CatalogServiceRestInterceptor, "pre_get_entry_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "post_get_entry_link" + ) as post, + mock.patch.object( + transports.CatalogServiceRestInterceptor, + "post_get_entry_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CatalogServiceRestInterceptor, "pre_get_entry_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24679,8 +24767,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24739,8 +24828,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24801,8 +24891,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24863,8 +24954,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24925,8 +25017,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24987,8 +25080,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -25764,11 +25858,14 @@ def test_catalog_service_base_transport(): def test_catalog_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataplex_v1.services.catalog_service.transports.CatalogServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataplex_v1.services.catalog_service.transports.CatalogServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CatalogServiceTransport( @@ -25785,9 +25882,12 @@ def test_catalog_service_base_transport_with_credentials_file(): def test_catalog_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataplex_v1.services.catalog_service.transports.CatalogServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataplex_v1.services.catalog_service.transports.CatalogServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CatalogServiceTransport() @@ -25859,11 +25959,12 @@ def test_catalog_service_transport_auth_gdch_credentials(transport_class): def test_catalog_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_cmek_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_cmek_service.py index d84e75b186ab..467d251faf5b 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_cmek_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_cmek_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.cmek_service import ( CmekServiceAsyncClient, @@ -939,10 +941,9 @@ def test_cmek_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +988,9 @@ def test_cmek_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1026,9 @@ def test_cmek_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1258,13 +1257,13 @@ def test_cmek_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3008,9 +3007,9 @@ def test_get_encryption_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_config] = ( + mock_rpc + ) request = {} client.get_encryption_config(request) @@ -4140,9 +4139,9 @@ def test_get_encryption_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_config] = ( + mock_rpc + ) request = {} client.get_encryption_config(request) @@ -4698,8 +4697,9 @@ def test_create_encryption_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4833,20 +4833,21 @@ def test_create_encryption_config_rest_interceptors(null_interceptor): ) client = CmekServiceClient(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.CmekServiceRestInterceptor, "post_create_encryption_config" - ) as post, mock.patch.object( - transports.CmekServiceRestInterceptor, - "post_create_encryption_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekServiceRestInterceptor, "pre_create_encryption_config" - ) as pre: + 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.CmekServiceRestInterceptor, "post_create_encryption_config" + ) as post, + mock.patch.object( + transports.CmekServiceRestInterceptor, + "post_create_encryption_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekServiceRestInterceptor, "pre_create_encryption_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4903,8 +4904,9 @@ def test_update_encryption_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5042,20 +5044,21 @@ def test_update_encryption_config_rest_interceptors(null_interceptor): ) client = CmekServiceClient(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.CmekServiceRestInterceptor, "post_update_encryption_config" - ) as post, mock.patch.object( - transports.CmekServiceRestInterceptor, - "post_update_encryption_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekServiceRestInterceptor, "pre_update_encryption_config" - ) as pre: + 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.CmekServiceRestInterceptor, "post_update_encryption_config" + ) as post, + mock.patch.object( + transports.CmekServiceRestInterceptor, + "post_update_encryption_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekServiceRestInterceptor, "pre_update_encryption_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5110,8 +5113,9 @@ def test_delete_encryption_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5170,20 +5174,21 @@ def test_delete_encryption_config_rest_interceptors(null_interceptor): ) client = CmekServiceClient(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.CmekServiceRestInterceptor, "post_delete_encryption_config" - ) as post, mock.patch.object( - transports.CmekServiceRestInterceptor, - "post_delete_encryption_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekServiceRestInterceptor, "pre_delete_encryption_config" - ) as pre: + 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.CmekServiceRestInterceptor, "post_delete_encryption_config" + ) as post, + mock.patch.object( + transports.CmekServiceRestInterceptor, + "post_delete_encryption_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekServiceRestInterceptor, "pre_delete_encryption_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5236,8 +5241,9 @@ def test_list_encryption_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5302,18 +5308,20 @@ def test_list_encryption_configs_rest_interceptors(null_interceptor): ) client = CmekServiceClient(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.CmekServiceRestInterceptor, "post_list_encryption_configs" - ) as post, mock.patch.object( - transports.CmekServiceRestInterceptor, - "post_list_encryption_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekServiceRestInterceptor, "pre_list_encryption_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CmekServiceRestInterceptor, "post_list_encryption_configs" + ) as post, + mock.patch.object( + transports.CmekServiceRestInterceptor, + "post_list_encryption_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekServiceRestInterceptor, "pre_list_encryption_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5370,8 +5378,9 @@ def test_get_encryption_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5444,18 +5453,20 @@ def test_get_encryption_config_rest_interceptors(null_interceptor): ) client = CmekServiceClient(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.CmekServiceRestInterceptor, "post_get_encryption_config" - ) as post, mock.patch.object( - transports.CmekServiceRestInterceptor, - "post_get_encryption_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekServiceRestInterceptor, "pre_get_encryption_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CmekServiceRestInterceptor, "post_get_encryption_config" + ) as post, + mock.patch.object( + transports.CmekServiceRestInterceptor, + "post_get_encryption_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekServiceRestInterceptor, "pre_get_encryption_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5508,8 +5519,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5568,8 +5580,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5630,8 +5643,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5692,8 +5706,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5754,8 +5769,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5816,8 +5832,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6067,11 +6084,14 @@ def test_cmek_service_base_transport(): def test_cmek_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataplex_v1.services.cmek_service.transports.CmekServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataplex_v1.services.cmek_service.transports.CmekServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CmekServiceTransport( @@ -6088,9 +6108,12 @@ def test_cmek_service_base_transport_with_credentials_file(): def test_cmek_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataplex_v1.services.cmek_service.transports.CmekServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataplex_v1.services.cmek_service.transports.CmekServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CmekServiceTransport() @@ -6162,11 +6185,12 @@ def test_cmek_service_transport_auth_gdch_credentials(transport_class): def test_cmek_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_content_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_content_service.py index 026eecd65c03..67d8748e927d 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_content_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_content_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,22 +43,32 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.dataplex_v1.services.content_service import ( ContentServiceAsyncClient, @@ -66,8 +76,7 @@ pagers, transports, ) -from google.cloud.dataplex_v1.types import analyze -from google.cloud.dataplex_v1.types import content +from google.cloud.dataplex_v1.types import analyze, content from google.cloud.dataplex_v1.types import content as gcd_content CRED_INFO_JSON = { @@ -955,10 +964,9 @@ def test_content_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1011,9 @@ def test_content_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1049,9 @@ def test_content_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1288,13 +1294,13 @@ def test_content_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3331,9 +3337,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5108,9 +5114,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -6005,8 +6011,9 @@ def test_create_content_rest_bad_request(request_type=gcd_content.CreateContentR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6155,17 +6162,20 @@ def test_create_content_rest_interceptors(null_interceptor): ) client = ContentServiceClient(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.ContentServiceRestInterceptor, "post_create_content" - ) as post, mock.patch.object( - transports.ContentServiceRestInterceptor, "post_create_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContentServiceRestInterceptor, "pre_create_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_create_content" + ) as post, + mock.patch.object( + transports.ContentServiceRestInterceptor, + "post_create_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContentServiceRestInterceptor, "pre_create_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6220,8 +6230,9 @@ def test_update_content_rest_bad_request(request_type=gcd_content.UpdateContentR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6374,17 +6385,20 @@ def test_update_content_rest_interceptors(null_interceptor): ) client = ContentServiceClient(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.ContentServiceRestInterceptor, "post_update_content" - ) as post, mock.patch.object( - transports.ContentServiceRestInterceptor, "post_update_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContentServiceRestInterceptor, "pre_update_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_update_content" + ) as post, + mock.patch.object( + transports.ContentServiceRestInterceptor, + "post_update_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContentServiceRestInterceptor, "pre_update_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6437,8 +6451,9 @@ def test_delete_content_rest_bad_request(request_type=content.DeleteContentReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6497,13 +6512,13 @@ def test_delete_content_rest_interceptors(null_interceptor): ) client = ContentServiceClient(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.ContentServiceRestInterceptor, "pre_delete_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentServiceRestInterceptor, "pre_delete_content" + ) as pre, + ): pre.assert_not_called() pb_message = content.DeleteContentRequest.pb(content.DeleteContentRequest()) transcode.return_value = { @@ -6546,8 +6561,9 @@ def test_get_content_rest_bad_request(request_type=content.GetContentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6619,17 +6635,19 @@ def test_get_content_rest_interceptors(null_interceptor): ) client = ContentServiceClient(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.ContentServiceRestInterceptor, "post_get_content" - ) as post, mock.patch.object( - transports.ContentServiceRestInterceptor, "post_get_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContentServiceRestInterceptor, "pre_get_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_get_content" + ) as post, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_get_content_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ContentServiceRestInterceptor, "pre_get_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6682,8 +6700,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6747,17 +6766,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = ContentServiceClient(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.ContentServiceRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.ContentServiceRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContentServiceRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.ContentServiceRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContentServiceRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6810,8 +6832,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6875,17 +6898,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = ContentServiceClient(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.ContentServiceRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.ContentServiceRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContentServiceRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.ContentServiceRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContentServiceRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6938,8 +6964,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7001,18 +7028,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = ContentServiceClient(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.ContentServiceRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.ContentServiceRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ContentServiceRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.ContentServiceRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ContentServiceRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7066,8 +7095,9 @@ def test_list_content_rest_bad_request(request_type=content.ListContentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7130,17 +7160,19 @@ def test_list_content_rest_interceptors(null_interceptor): ) client = ContentServiceClient(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.ContentServiceRestInterceptor, "post_list_content" - ) as post, mock.patch.object( - transports.ContentServiceRestInterceptor, "post_list_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContentServiceRestInterceptor, "pre_list_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_list_content" + ) as post, + mock.patch.object( + transports.ContentServiceRestInterceptor, "post_list_content_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ContentServiceRestInterceptor, "pre_list_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7193,8 +7225,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7253,8 +7286,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7315,8 +7349,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7377,8 +7412,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7439,8 +7475,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7501,8 +7538,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7785,11 +7823,14 @@ def test_content_service_base_transport(): def test_content_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataplex_v1.services.content_service.transports.ContentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataplex_v1.services.content_service.transports.ContentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContentServiceTransport( @@ -7806,9 +7847,12 @@ def test_content_service_base_transport_with_credentials_file(): def test_content_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataplex_v1.services.content_service.transports.ContentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataplex_v1.services.content_service.transports.ContentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContentServiceTransport() @@ -7880,11 +7924,12 @@ def test_content_service_transport_auth_gdch_credentials(transport_class): def test_content_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_scan_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_scan_service.py index 105dcf30d81d..939f43eac4f5 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_scan_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_scan_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.data_scan_service import ( DataScanServiceAsyncClient, @@ -996,10 +998,9 @@ def test_data_scan_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1045,9 @@ def test_data_scan_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1083,9 @@ def test_data_scan_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1329,13 +1328,13 @@ def test_data_scan_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1441,9 +1440,9 @@ def test_create_data_scan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_scan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_scan] = ( + mock_rpc + ) request = {} client.create_data_scan(request) @@ -1786,9 +1785,9 @@ def test_update_data_scan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_scan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_scan] = ( + mock_rpc + ) request = {} client.update_data_scan(request) @@ -2125,9 +2124,9 @@ def test_delete_data_scan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_scan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_scan] = ( + mock_rpc + ) request = {} client.delete_data_scan(request) @@ -3652,9 +3651,9 @@ def test_get_data_scan_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_scan_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_scan_job] = ( + mock_rpc + ) request = {} client.get_data_scan_job(request) @@ -4005,9 +4004,9 @@ def test_list_data_scan_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_scan_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_scan_jobs] = ( + mock_rpc + ) request = {} client.list_data_scan_jobs(request) @@ -4815,9 +4814,9 @@ def test_create_data_scan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_scan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_scan] = ( + mock_rpc + ) request = {} client.create_data_scan(request) @@ -5032,9 +5031,9 @@ def test_update_data_scan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_scan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_scan] = ( + mock_rpc + ) request = {} client.update_data_scan(request) @@ -5228,9 +5227,9 @@ def test_delete_data_scan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_scan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_scan] = ( + mock_rpc + ) request = {} client.delete_data_scan(request) @@ -6025,9 +6024,9 @@ def test_get_data_scan_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_scan_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_scan_job] = ( + mock_rpc + ) request = {} client.get_data_scan_job(request) @@ -6211,9 +6210,9 @@ def test_list_data_scan_jobs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_scan_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_scan_jobs] = ( + mock_rpc + ) request = {} client.list_data_scan_jobs(request) @@ -7222,8 +7221,9 @@ def test_create_data_scan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7580,19 +7580,21 @@ def test_create_data_scan_rest_interceptors(null_interceptor): ) client = DataScanServiceClient(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.DataScanServiceRestInterceptor, "post_create_data_scan" - ) as post, mock.patch.object( - transports.DataScanServiceRestInterceptor, "post_create_data_scan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataScanServiceRestInterceptor, "pre_create_data_scan" - ) as pre: + 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.DataScanServiceRestInterceptor, "post_create_data_scan" + ) as post, + mock.patch.object( + transports.DataScanServiceRestInterceptor, + "post_create_data_scan_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "pre_create_data_scan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7647,8 +7649,9 @@ def test_update_data_scan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8007,19 +8010,21 @@ def test_update_data_scan_rest_interceptors(null_interceptor): ) client = DataScanServiceClient(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.DataScanServiceRestInterceptor, "post_update_data_scan" - ) as post, mock.patch.object( - transports.DataScanServiceRestInterceptor, "post_update_data_scan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataScanServiceRestInterceptor, "pre_update_data_scan" - ) as pre: + 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.DataScanServiceRestInterceptor, "post_update_data_scan" + ) as post, + mock.patch.object( + transports.DataScanServiceRestInterceptor, + "post_update_data_scan_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "pre_update_data_scan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8072,8 +8077,9 @@ def test_delete_data_scan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8130,19 +8136,21 @@ def test_delete_data_scan_rest_interceptors(null_interceptor): ) client = DataScanServiceClient(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.DataScanServiceRestInterceptor, "post_delete_data_scan" - ) as post, mock.patch.object( - transports.DataScanServiceRestInterceptor, "post_delete_data_scan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataScanServiceRestInterceptor, "pre_delete_data_scan" - ) as pre: + 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.DataScanServiceRestInterceptor, "post_delete_data_scan" + ) as post, + mock.patch.object( + transports.DataScanServiceRestInterceptor, + "post_delete_data_scan_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "pre_delete_data_scan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8193,8 +8201,9 @@ def test_get_data_scan_rest_bad_request(request_type=datascans.GetDataScanReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8267,17 +8276,20 @@ def test_get_data_scan_rest_interceptors(null_interceptor): ) client = DataScanServiceClient(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.DataScanServiceRestInterceptor, "post_get_data_scan" - ) as post, mock.patch.object( - transports.DataScanServiceRestInterceptor, "post_get_data_scan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataScanServiceRestInterceptor, "pre_get_data_scan" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "post_get_data_scan" + ) as post, + mock.patch.object( + transports.DataScanServiceRestInterceptor, + "post_get_data_scan_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "pre_get_data_scan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8326,8 +8338,9 @@ def test_list_data_scans_rest_bad_request(request_type=datascans.ListDataScansRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8392,17 +8405,20 @@ def test_list_data_scans_rest_interceptors(null_interceptor): ) client = DataScanServiceClient(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.DataScanServiceRestInterceptor, "post_list_data_scans" - ) as post, mock.patch.object( - transports.DataScanServiceRestInterceptor, "post_list_data_scans_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataScanServiceRestInterceptor, "pre_list_data_scans" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "post_list_data_scans" + ) as post, + mock.patch.object( + transports.DataScanServiceRestInterceptor, + "post_list_data_scans_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "pre_list_data_scans" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8453,8 +8469,9 @@ def test_run_data_scan_rest_bad_request(request_type=datascans.RunDataScanReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8514,17 +8531,20 @@ def test_run_data_scan_rest_interceptors(null_interceptor): ) client = DataScanServiceClient(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.DataScanServiceRestInterceptor, "post_run_data_scan" - ) as post, mock.patch.object( - transports.DataScanServiceRestInterceptor, "post_run_data_scan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataScanServiceRestInterceptor, "pre_run_data_scan" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "post_run_data_scan" + ) as post, + mock.patch.object( + transports.DataScanServiceRestInterceptor, + "post_run_data_scan_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "pre_run_data_scan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8579,8 +8599,9 @@ def test_get_data_scan_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8653,18 +8674,20 @@ def test_get_data_scan_job_rest_interceptors(null_interceptor): ) client = DataScanServiceClient(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.DataScanServiceRestInterceptor, "post_get_data_scan_job" - ) as post, mock.patch.object( - transports.DataScanServiceRestInterceptor, - "post_get_data_scan_job_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataScanServiceRestInterceptor, "pre_get_data_scan_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "post_get_data_scan_job" + ) as post, + mock.patch.object( + transports.DataScanServiceRestInterceptor, + "post_get_data_scan_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "pre_get_data_scan_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8717,8 +8740,9 @@ def test_list_data_scan_jobs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8781,18 +8805,20 @@ def test_list_data_scan_jobs_rest_interceptors(null_interceptor): ) client = DataScanServiceClient(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.DataScanServiceRestInterceptor, "post_list_data_scan_jobs" - ) as post, mock.patch.object( - transports.DataScanServiceRestInterceptor, - "post_list_data_scan_jobs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataScanServiceRestInterceptor, "pre_list_data_scan_jobs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "post_list_data_scan_jobs" + ) as post, + mock.patch.object( + transports.DataScanServiceRestInterceptor, + "post_list_data_scan_jobs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "pre_list_data_scan_jobs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8847,8 +8873,9 @@ def test_generate_data_quality_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8908,18 +8935,21 @@ def test_generate_data_quality_rules_rest_interceptors(null_interceptor): ) client = DataScanServiceClient(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.DataScanServiceRestInterceptor, "post_generate_data_quality_rules" - ) as post, mock.patch.object( - transports.DataScanServiceRestInterceptor, - "post_generate_data_quality_rules_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataScanServiceRestInterceptor, "pre_generate_data_quality_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataScanServiceRestInterceptor, + "post_generate_data_quality_rules", + ) as post, + mock.patch.object( + transports.DataScanServiceRestInterceptor, + "post_generate_data_quality_rules_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataScanServiceRestInterceptor, "pre_generate_data_quality_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8977,8 +9007,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9037,8 +9068,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9099,8 +9131,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9161,8 +9194,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9223,8 +9257,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9285,8 +9320,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9616,11 +9652,14 @@ def test_data_scan_service_base_transport(): def test_data_scan_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataplex_v1.services.data_scan_service.transports.DataScanServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataplex_v1.services.data_scan_service.transports.DataScanServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataScanServiceTransport( @@ -9637,9 +9676,12 @@ def test_data_scan_service_base_transport_with_credentials_file(): def test_data_scan_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataplex_v1.services.data_scan_service.transports.DataScanServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataplex_v1.services.data_scan_service.transports.DataScanServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataScanServiceTransport() @@ -9711,11 +9753,12 @@ def test_data_scan_service_transport_auth_gdch_credentials(transport_class): def test_data_scan_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_taxonomy_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_taxonomy_service.py index ae84cecd36fd..d727a84a6126 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_taxonomy_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_data_taxonomy_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.data_taxonomy_service import ( DataTaxonomyServiceAsyncClient, @@ -75,9 +77,8 @@ pagers, transports, ) -from google.cloud.dataplex_v1.types import data_taxonomy +from google.cloud.dataplex_v1.types import data_taxonomy, security, service from google.cloud.dataplex_v1.types import data_taxonomy as gcd_data_taxonomy -from google.cloud.dataplex_v1.types import security, service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1011,10 +1012,9 @@ def test_data_taxonomy_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1059,9 @@ def test_data_taxonomy_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1097,9 @@ def test_data_taxonomy_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1357,13 +1355,13 @@ def test_data_taxonomy_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1475,9 +1473,9 @@ def test_create_data_taxonomy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_taxonomy] = ( + mock_rpc + ) request = {} client.create_data_taxonomy(request) @@ -1837,9 +1835,9 @@ def test_update_data_taxonomy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_taxonomy] = ( + mock_rpc + ) request = {} client.update_data_taxonomy(request) @@ -2195,9 +2193,9 @@ def test_delete_data_taxonomy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_taxonomy] = ( + mock_rpc + ) request = {} client.delete_data_taxonomy(request) @@ -2552,9 +2550,9 @@ def test_list_data_taxonomies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_taxonomies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_taxonomies] = ( + mock_rpc + ) request = {} client.list_data_taxonomies(request) @@ -3108,9 +3106,9 @@ def test_get_data_taxonomy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_taxonomy] = ( + mock_rpc + ) request = {} client.get_data_taxonomy(request) @@ -5469,9 +5467,9 @@ def test_create_data_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_attribute] = ( + mock_rpc + ) request = {} client.create_data_attribute(request) @@ -5832,9 +5830,9 @@ def test_update_data_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_attribute] = ( + mock_rpc + ) request = {} client.update_data_attribute(request) @@ -6191,9 +6189,9 @@ def test_delete_data_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_attribute] = ( + mock_rpc + ) request = {} client.delete_data_attribute(request) @@ -6548,9 +6546,9 @@ def test_list_data_attributes_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_attributes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_attributes] = ( + mock_rpc + ) request = {} client.list_data_attributes(request) @@ -7106,9 +7104,9 @@ def test_get_data_attribute_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_attribute] = ( + mock_rpc + ) request = {} client.get_data_attribute(request) @@ -7391,9 +7389,9 @@ def test_create_data_taxonomy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_taxonomy] = ( + mock_rpc + ) request = {} client.create_data_taxonomy(request) @@ -7611,9 +7609,9 @@ def test_update_data_taxonomy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_taxonomy] = ( + mock_rpc + ) request = {} client.update_data_taxonomy(request) @@ -7814,9 +7812,9 @@ def test_delete_data_taxonomy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_taxonomy] = ( + mock_rpc + ) request = {} client.delete_data_taxonomy(request) @@ -7999,9 +7997,9 @@ def test_list_data_taxonomies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_taxonomies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_taxonomies] = ( + mock_rpc + ) request = {} client.list_data_taxonomies(request) @@ -8261,9 +8259,9 @@ def test_get_data_taxonomy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_taxonomy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_taxonomy] = ( + mock_rpc + ) request = {} client.get_data_taxonomy(request) @@ -9549,9 +9547,9 @@ def test_create_data_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_attribute] = ( + mock_rpc + ) request = {} client.create_data_attribute(request) @@ -9772,9 +9770,9 @@ def test_update_data_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_attribute] = ( + mock_rpc + ) request = {} client.update_data_attribute(request) @@ -9976,9 +9974,9 @@ def test_delete_data_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_attribute] = ( + mock_rpc + ) request = {} client.delete_data_attribute(request) @@ -10161,9 +10159,9 @@ def test_list_data_attributes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_attributes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_attributes] = ( + mock_rpc + ) request = {} client.list_data_attributes(request) @@ -10429,9 +10427,9 @@ def test_get_data_attribute_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_data_attribute - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_data_attribute] = ( + mock_rpc + ) request = {} client.get_data_attribute(request) @@ -11510,8 +11508,9 @@ def test_create_data_taxonomy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11649,20 +11648,21 @@ def test_create_data_taxonomy_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, "post_create_data_taxonomy" - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_create_data_taxonomy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, "pre_create_data_taxonomy" - ) as pre: + 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.DataTaxonomyServiceRestInterceptor, "post_create_data_taxonomy" + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_create_data_taxonomy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "pre_create_data_taxonomy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11719,8 +11719,9 @@ def test_update_data_taxonomy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11862,20 +11863,21 @@ def test_update_data_taxonomy_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, "post_update_data_taxonomy" - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_update_data_taxonomy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, "pre_update_data_taxonomy" - ) as pre: + 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.DataTaxonomyServiceRestInterceptor, "post_update_data_taxonomy" + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_update_data_taxonomy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "pre_update_data_taxonomy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11928,8 +11930,9 @@ def test_delete_data_taxonomy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11986,20 +11989,21 @@ def test_delete_data_taxonomy_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, "post_delete_data_taxonomy" - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_delete_data_taxonomy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, "pre_delete_data_taxonomy" - ) as pre: + 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.DataTaxonomyServiceRestInterceptor, "post_delete_data_taxonomy" + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_delete_data_taxonomy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "pre_delete_data_taxonomy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12052,8 +12056,9 @@ def test_list_data_taxonomies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12118,18 +12123,20 @@ def test_list_data_taxonomies_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, "post_list_data_taxonomies" - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_list_data_taxonomies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, "pre_list_data_taxonomies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "post_list_data_taxonomies" + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_list_data_taxonomies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "pre_list_data_taxonomies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12187,8 +12194,9 @@ def test_get_data_taxonomy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12263,18 +12271,20 @@ def test_get_data_taxonomy_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, "post_get_data_taxonomy" - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_get_data_taxonomy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, "pre_get_data_taxonomy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "post_get_data_taxonomy" + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_get_data_taxonomy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "pre_get_data_taxonomy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12327,8 +12337,9 @@ def test_create_data_attribute_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12474,22 +12485,23 @@ def test_create_data_attribute_binding_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, - "post_create_data_attribute_binding", - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_create_data_attribute_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "pre_create_data_attribute_binding", - ) as pre: + 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.DataTaxonomyServiceRestInterceptor, + "post_create_data_attribute_binding", + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_create_data_attribute_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "pre_create_data_attribute_binding", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12546,8 +12558,9 @@ def test_update_data_attribute_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12697,22 +12710,23 @@ def test_update_data_attribute_binding_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, - "post_update_data_attribute_binding", - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_update_data_attribute_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "pre_update_data_attribute_binding", - ) as pre: + 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.DataTaxonomyServiceRestInterceptor, + "post_update_data_attribute_binding", + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_update_data_attribute_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "pre_update_data_attribute_binding", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12767,8 +12781,9 @@ def test_delete_data_attribute_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12827,22 +12842,23 @@ def test_delete_data_attribute_binding_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, - "post_delete_data_attribute_binding", - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_delete_data_attribute_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "pre_delete_data_attribute_binding", - ) as pre: + 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.DataTaxonomyServiceRestInterceptor, + "post_delete_data_attribute_binding", + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_delete_data_attribute_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "pre_delete_data_attribute_binding", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12895,8 +12911,9 @@ def test_list_data_attribute_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12961,20 +12978,22 @@ def test_list_data_attribute_bindings_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, - "post_list_data_attribute_bindings", - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_list_data_attribute_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "pre_list_data_attribute_bindings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_list_data_attribute_bindings", + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_list_data_attribute_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "pre_list_data_attribute_bindings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13034,8 +13053,9 @@ def test_get_data_attribute_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13111,18 +13131,22 @@ def test_get_data_attribute_binding_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, "post_get_data_attribute_binding" - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_get_data_attribute_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, "pre_get_data_attribute_binding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_get_data_attribute_binding", + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_get_data_attribute_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "pre_get_data_attribute_binding", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13179,8 +13203,9 @@ def test_create_data_attribute_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13324,20 +13349,21 @@ def test_create_data_attribute_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, "post_create_data_attribute" - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_create_data_attribute_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, "pre_create_data_attribute" - ) as pre: + 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.DataTaxonomyServiceRestInterceptor, "post_create_data_attribute" + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_create_data_attribute_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "pre_create_data_attribute" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13394,8 +13420,9 @@ def test_update_data_attribute_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13541,20 +13568,21 @@ def test_update_data_attribute_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, "post_update_data_attribute" - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_update_data_attribute_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, "pre_update_data_attribute" - ) as pre: + 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.DataTaxonomyServiceRestInterceptor, "post_update_data_attribute" + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_update_data_attribute_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "pre_update_data_attribute" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13609,8 +13637,9 @@ def test_delete_data_attribute_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13669,20 +13698,21 @@ def test_delete_data_attribute_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, "post_delete_data_attribute" - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_delete_data_attribute_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, "pre_delete_data_attribute" - ) as pre: + 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.DataTaxonomyServiceRestInterceptor, "post_delete_data_attribute" + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_delete_data_attribute_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "pre_delete_data_attribute" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13737,8 +13767,9 @@ def test_list_data_attributes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13805,18 +13836,20 @@ def test_list_data_attributes_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, "post_list_data_attributes" - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_list_data_attributes_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, "pre_list_data_attributes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "post_list_data_attributes" + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_list_data_attributes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "pre_list_data_attributes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13876,8 +13909,9 @@ def test_get_data_attribute_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13954,18 +13988,20 @@ def test_get_data_attribute_rest_interceptors(null_interceptor): ) client = DataTaxonomyServiceClient(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.DataTaxonomyServiceRestInterceptor, "post_get_data_attribute" - ) as post, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, - "post_get_data_attribute_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataTaxonomyServiceRestInterceptor, "pre_get_data_attribute" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "post_get_data_attribute" + ) as post, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, + "post_get_data_attribute_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataTaxonomyServiceRestInterceptor, "pre_get_data_attribute" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14020,8 +14056,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14080,8 +14117,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14142,8 +14180,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14204,8 +14243,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14266,8 +14306,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14328,8 +14369,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14809,11 +14851,14 @@ def test_data_taxonomy_service_base_transport(): def test_data_taxonomy_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataplex_v1.services.data_taxonomy_service.transports.DataTaxonomyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataplex_v1.services.data_taxonomy_service.transports.DataTaxonomyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataTaxonomyServiceTransport( @@ -14830,9 +14875,12 @@ def test_data_taxonomy_service_base_transport_with_credentials_file(): def test_data_taxonomy_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataplex_v1.services.data_taxonomy_service.transports.DataTaxonomyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataplex_v1.services.data_taxonomy_service.transports.DataTaxonomyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataTaxonomyServiceTransport() @@ -14904,11 +14952,12 @@ def test_data_taxonomy_service_transport_auth_gdch_credentials(transport_class): def test_data_taxonomy_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_dataplex_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_dataplex_service.py index 694cf4132704..1bc66ce2d2d6 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_dataplex_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_dataplex_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.dataplex_service import ( DataplexServiceAsyncClient, @@ -987,10 +989,9 @@ def test_dataplex_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1036,9 @@ def test_dataplex_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1074,9 @@ def test_dataplex_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1320,13 +1319,13 @@ def test_dataplex_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3310,9 +3309,9 @@ def test_list_lake_actions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_lake_actions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_lake_actions] = ( + mock_rpc + ) request = {} client.list_lake_actions(request) @@ -5720,9 +5719,9 @@ def test_list_zone_actions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_zone_actions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_zone_actions] = ( + mock_rpc + ) request = {} client.list_zone_actions(request) @@ -8130,9 +8129,9 @@ def test_list_asset_actions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_asset_actions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_asset_actions] = ( + mock_rpc + ) request = {} client.list_asset_actions(request) @@ -12025,9 +12024,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -12386,9 +12385,9 @@ def test_update_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -12741,9 +12740,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -13093,9 +13092,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -15433,9 +15432,9 @@ def test_list_lake_actions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_lake_actions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_lake_actions] = ( + mock_rpc + ) request = {} client.list_lake_actions(request) @@ -16711,9 +16710,9 @@ def test_list_zone_actions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_zone_actions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_zone_actions] = ( + mock_rpc + ) request = {} client.list_zone_actions(request) @@ -18001,9 +18000,9 @@ def test_list_asset_actions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_asset_actions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_asset_actions] = ( + mock_rpc + ) request = {} client.list_asset_actions(request) @@ -20072,9 +20071,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -20292,9 +20291,9 @@ def test_update_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -20495,9 +20494,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -20676,9 +20675,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -23096,8 +23095,9 @@ def test_create_lake_rest_bad_request(request_type=service.CreateLakeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23244,19 +23244,20 @@ def test_create_lake_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_create_lake" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_create_lake_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_create_lake" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_create_lake" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_create_lake_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_create_lake" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23307,8 +23308,9 @@ def test_update_lake_rest_bad_request(request_type=service.UpdateLakeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23457,19 +23459,20 @@ def test_update_lake_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_update_lake" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_update_lake_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_update_lake" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_update_lake" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_update_lake_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_update_lake" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23518,8 +23521,9 @@ def test_delete_lake_rest_bad_request(request_type=service.DeleteLakeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23576,19 +23580,20 @@ def test_delete_lake_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_delete_lake" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_delete_lake_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_delete_lake" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_delete_lake" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_delete_lake_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_delete_lake" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23637,8 +23642,9 @@ def test_list_lakes_rest_bad_request(request_type=service.ListLakesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23703,17 +23709,19 @@ def test_list_lakes_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_list_lakes" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_list_lakes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_list_lakes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_lakes" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_lakes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_list_lakes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23762,8 +23770,9 @@ def test_get_lake_rest_bad_request(request_type=service.GetLakeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23836,17 +23845,19 @@ def test_get_lake_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_get_lake" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_get_lake_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_get_lake" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_get_lake" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_get_lake_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_get_lake" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23897,8 +23908,9 @@ def test_list_lake_actions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23961,18 +23973,20 @@ def test_list_lake_actions_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_list_lake_actions" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, - "post_list_lake_actions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_list_lake_actions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_lake_actions" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, + "post_list_lake_actions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_list_lake_actions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24023,8 +24037,9 @@ def test_create_zone_rest_bad_request(request_type=service.CreateZoneRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24181,19 +24196,20 @@ def test_create_zone_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_create_zone" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_create_zone_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_create_zone" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_create_zone" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_create_zone_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_create_zone" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24246,8 +24262,9 @@ def test_update_zone_rest_bad_request(request_type=service.UpdateZoneRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24408,19 +24425,20 @@ def test_update_zone_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_update_zone" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_update_zone_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_update_zone" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_update_zone" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_update_zone_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_update_zone" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24471,8 +24489,9 @@ def test_delete_zone_rest_bad_request(request_type=service.DeleteZoneRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24531,19 +24550,20 @@ def test_delete_zone_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_delete_zone" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_delete_zone_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_delete_zone" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_delete_zone" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_delete_zone_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_delete_zone" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24592,8 +24612,9 @@ def test_list_zones_rest_bad_request(request_type=service.ListZonesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24656,17 +24677,19 @@ def test_list_zones_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_list_zones" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_list_zones_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_list_zones" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_zones" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_zones_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_list_zones" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24717,8 +24740,9 @@ def test_get_zone_rest_bad_request(request_type=service.GetZoneRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24793,17 +24817,19 @@ def test_get_zone_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_get_zone" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_get_zone_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_get_zone" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_get_zone" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_get_zone_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_get_zone" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24856,8 +24882,9 @@ def test_list_zone_actions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24922,18 +24949,20 @@ def test_list_zone_actions_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_list_zone_actions" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, - "post_list_zone_actions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_list_zone_actions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_zone_actions" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, + "post_list_zone_actions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_list_zone_actions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24986,8 +25015,9 @@ def test_create_asset_rest_bad_request(request_type=service.CreateAssetRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25160,19 +25190,20 @@ def test_create_asset_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_create_asset" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_create_asset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_create_asset" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_create_asset" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_create_asset_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_create_asset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25225,8 +25256,9 @@ def test_update_asset_rest_bad_request(request_type=service.UpdateAssetRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25401,19 +25433,20 @@ def test_update_asset_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_update_asset" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_update_asset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_update_asset" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_update_asset" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_update_asset_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_update_asset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25464,8 +25497,9 @@ def test_delete_asset_rest_bad_request(request_type=service.DeleteAssetRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25524,19 +25558,20 @@ def test_delete_asset_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_delete_asset" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_delete_asset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_delete_asset" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_delete_asset" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_delete_asset_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_delete_asset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25587,8 +25622,9 @@ def test_list_assets_rest_bad_request(request_type=service.ListAssetsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25653,17 +25689,19 @@ def test_list_assets_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_list_assets" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_list_assets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_list_assets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_assets" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_assets_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_list_assets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25714,8 +25752,9 @@ def test_get_asset_rest_bad_request(request_type=service.GetAssetRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25788,17 +25827,19 @@ def test_get_asset_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_get_asset" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_get_asset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_get_asset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_get_asset" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_get_asset_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_get_asset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25851,8 +25892,9 @@ def test_list_asset_actions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25917,18 +25959,20 @@ def test_list_asset_actions_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_list_asset_actions" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, - "post_list_asset_actions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_list_asset_actions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_asset_actions" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, + "post_list_asset_actions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_list_asset_actions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25981,8 +26025,9 @@ def test_create_task_rest_bad_request(request_type=service.CreateTaskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26179,19 +26224,20 @@ def test_create_task_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_create_task" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_create_task_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_create_task" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_create_task" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_create_task_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_create_task" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26244,8 +26290,9 @@ def test_update_task_rest_bad_request(request_type=service.UpdateTaskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26446,19 +26493,20 @@ def test_update_task_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_update_task" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_update_task_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_update_task" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_update_task" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_update_task_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_update_task" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26509,8 +26557,9 @@ def test_delete_task_rest_bad_request(request_type=service.DeleteTaskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26569,19 +26618,20 @@ def test_delete_task_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_delete_task" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_delete_task_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_delete_task" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_delete_task" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_delete_task_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_delete_task" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26630,8 +26680,9 @@ def test_list_tasks_rest_bad_request(request_type=service.ListTasksRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26696,17 +26747,19 @@ def test_list_tasks_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_list_tasks" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_list_tasks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_list_tasks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_tasks" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_tasks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_list_tasks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26757,8 +26810,9 @@ def test_get_task_rest_bad_request(request_type=service.GetTaskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26831,17 +26885,19 @@ def test_get_task_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_get_task" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_get_task_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_get_task" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_get_task" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_get_task_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_get_task" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26892,8 +26948,9 @@ def test_list_jobs_rest_bad_request(request_type=service.ListJobsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26958,17 +27015,19 @@ def test_list_jobs_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_list_jobs" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_list_jobs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_list_jobs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_jobs" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_jobs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_list_jobs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27019,8 +27078,9 @@ def test_run_task_rest_bad_request(request_type=service.RunTaskRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27082,17 +27142,19 @@ def test_run_task_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_run_task" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_run_task_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_run_task" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_run_task" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_run_task_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_run_task" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27143,8 +27205,9 @@ def test_get_job_rest_bad_request(request_type=service.GetJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27223,17 +27286,19 @@ def test_get_job_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_get_job" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_get_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_get_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_get_job" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_get_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_get_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27284,8 +27349,9 @@ def test_cancel_job_rest_bad_request(request_type=service.CancelJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27344,13 +27410,13 @@ def test_cancel_job_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "pre_cancel_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_cancel_job" + ) as pre, + ): pre.assert_not_called() pb_message = service.CancelJobRequest.pb(service.CancelJobRequest()) transcode.return_value = { @@ -27393,8 +27459,9 @@ def test_create_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27547,20 +27614,21 @@ def test_create_environment_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_create_environment" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, - "post_create_environment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_create_environment" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_create_environment" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, + "post_create_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_create_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27617,8 +27685,9 @@ def test_update_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27775,20 +27844,21 @@ def test_update_environment_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_update_environment" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, - "post_update_environment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_update_environment" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_update_environment" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, + "post_update_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_update_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27843,8 +27913,9 @@ def test_delete_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27903,20 +27974,21 @@ def test_delete_environment_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_delete_environment" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, - "post_delete_environment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_delete_environment" - ) as pre: + 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.DataplexServiceRestInterceptor, "post_delete_environment" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, + "post_delete_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_delete_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27969,8 +28041,9 @@ def test_list_environments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28033,18 +28106,20 @@ def test_list_environments_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_list_environments" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, - "post_list_environments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_list_environments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_environments" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, + "post_list_environments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_list_environments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28099,8 +28174,9 @@ def test_get_environment_rest_bad_request(request_type=service.GetEnvironmentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28173,17 +28249,20 @@ def test_get_environment_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_get_environment" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_get_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_get_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_get_environment" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, + "post_get_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_get_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28234,8 +28313,9 @@ def test_list_sessions_rest_bad_request(request_type=service.ListSessionsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28300,17 +28380,20 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = DataplexServiceClient(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.DataplexServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.DataplexServiceRestInterceptor, "post_list_sessions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataplexServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.DataplexServiceRestInterceptor, + "post_list_sessions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataplexServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28363,8 +28446,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -28423,8 +28507,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -28485,8 +28570,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -28547,8 +28633,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -28609,8 +28696,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -28671,8 +28759,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -29514,11 +29603,14 @@ def test_dataplex_service_base_transport(): def test_dataplex_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataplex_v1.services.dataplex_service.transports.DataplexServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataplex_v1.services.dataplex_service.transports.DataplexServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataplexServiceTransport( @@ -29535,9 +29627,12 @@ def test_dataplex_service_base_transport_with_credentials_file(): def test_dataplex_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataplex_v1.services.dataplex_service.transports.DataplexServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataplex_v1.services.dataplex_service.transports.DataplexServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataplexServiceTransport() @@ -29609,11 +29704,12 @@ def test_dataplex_service_transport_auth_gdch_credentials(transport_class): def test_dataplex_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_metadata_service.py b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_metadata_service.py index 7baeee83ab26..c9da132fe168 100644 --- a/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_metadata_service.py +++ b/packages/google-cloud-dataplex/tests/unit/gapic/dataplex_v1/test_metadata_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,20 +43,27 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataplex_v1.services.metadata_service import ( MetadataServiceAsyncClient, @@ -975,10 +982,9 @@ def test_metadata_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1029,9 @@ def test_metadata_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1067,9 @@ def test_metadata_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1308,13 +1312,13 @@ def test_metadata_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3274,9 +3278,9 @@ def test_create_partition_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_partition - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_partition] = ( + mock_rpc + ) request = {} client.create_partition(request) @@ -3610,9 +3614,9 @@ def test_delete_partition_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_partition - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_partition] = ( + mock_rpc + ) request = {} client.delete_partition(request) @@ -5662,9 +5666,9 @@ def test_create_partition_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_partition - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_partition] = ( + mock_rpc + ) request = {} client.create_partition(request) @@ -5857,9 +5861,9 @@ def test_delete_partition_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_partition - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_partition] = ( + mock_rpc + ) request = {} client.delete_partition(request) @@ -7054,8 +7058,9 @@ def test_create_entity_rest_bad_request(request_type=metadata_.CreateEntityReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7257,17 +7262,20 @@ def test_create_entity_rest_interceptors(null_interceptor): ) client = MetadataServiceClient(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.MetadataServiceRestInterceptor, "post_create_entity" - ) as post, mock.patch.object( - transports.MetadataServiceRestInterceptor, "post_create_entity_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetadataServiceRestInterceptor, "pre_create_entity" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "post_create_entity" + ) as post, + mock.patch.object( + transports.MetadataServiceRestInterceptor, + "post_create_entity_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "pre_create_entity" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7320,8 +7328,9 @@ def test_update_entity_rest_bad_request(request_type=metadata_.UpdateEntityReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7525,17 +7534,20 @@ def test_update_entity_rest_interceptors(null_interceptor): ) client = MetadataServiceClient(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.MetadataServiceRestInterceptor, "post_update_entity" - ) as post, mock.patch.object( - transports.MetadataServiceRestInterceptor, "post_update_entity_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetadataServiceRestInterceptor, "pre_update_entity" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "post_update_entity" + ) as post, + mock.patch.object( + transports.MetadataServiceRestInterceptor, + "post_update_entity_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "pre_update_entity" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7586,8 +7598,9 @@ def test_delete_entity_rest_bad_request(request_type=metadata_.DeleteEntityReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7646,13 +7659,13 @@ def test_delete_entity_rest_interceptors(null_interceptor): ) client = MetadataServiceClient(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.MetadataServiceRestInterceptor, "pre_delete_entity" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "pre_delete_entity" + ) as pre, + ): pre.assert_not_called() pb_message = metadata_.DeleteEntityRequest.pb(metadata_.DeleteEntityRequest()) transcode.return_value = { @@ -7695,8 +7708,9 @@ def test_get_entity_rest_bad_request(request_type=metadata_.GetEntityRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7783,17 +7797,19 @@ def test_get_entity_rest_interceptors(null_interceptor): ) client = MetadataServiceClient(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.MetadataServiceRestInterceptor, "post_get_entity" - ) as post, mock.patch.object( - transports.MetadataServiceRestInterceptor, "post_get_entity_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetadataServiceRestInterceptor, "pre_get_entity" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "post_get_entity" + ) as post, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "post_get_entity_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "pre_get_entity" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7844,8 +7860,9 @@ def test_list_entities_rest_bad_request(request_type=metadata_.ListEntitiesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7910,17 +7927,20 @@ def test_list_entities_rest_interceptors(null_interceptor): ) client = MetadataServiceClient(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.MetadataServiceRestInterceptor, "post_list_entities" - ) as post, mock.patch.object( - transports.MetadataServiceRestInterceptor, "post_list_entities_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetadataServiceRestInterceptor, "pre_list_entities" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "post_list_entities" + ) as post, + mock.patch.object( + transports.MetadataServiceRestInterceptor, + "post_list_entities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "pre_list_entities" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7975,8 +7995,9 @@ def test_create_partition_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8120,17 +8141,20 @@ def test_create_partition_rest_interceptors(null_interceptor): ) client = MetadataServiceClient(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.MetadataServiceRestInterceptor, "post_create_partition" - ) as post, mock.patch.object( - transports.MetadataServiceRestInterceptor, "post_create_partition_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetadataServiceRestInterceptor, "pre_create_partition" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "post_create_partition" + ) as post, + mock.patch.object( + transports.MetadataServiceRestInterceptor, + "post_create_partition_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "pre_create_partition" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8185,8 +8209,9 @@ def test_delete_partition_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8245,13 +8270,13 @@ def test_delete_partition_rest_interceptors(null_interceptor): ) client = MetadataServiceClient(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.MetadataServiceRestInterceptor, "pre_delete_partition" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "pre_delete_partition" + ) as pre, + ): pre.assert_not_called() pb_message = metadata_.DeletePartitionRequest.pb( metadata_.DeletePartitionRequest() @@ -8296,8 +8321,9 @@ def test_get_partition_rest_bad_request(request_type=metadata_.GetPartitionReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8368,17 +8394,20 @@ def test_get_partition_rest_interceptors(null_interceptor): ) client = MetadataServiceClient(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.MetadataServiceRestInterceptor, "post_get_partition" - ) as post, mock.patch.object( - transports.MetadataServiceRestInterceptor, "post_get_partition_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetadataServiceRestInterceptor, "pre_get_partition" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "post_get_partition" + ) as post, + mock.patch.object( + transports.MetadataServiceRestInterceptor, + "post_get_partition_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "pre_get_partition" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8429,8 +8458,9 @@ def test_list_partitions_rest_bad_request(request_type=metadata_.ListPartitionsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8495,17 +8525,20 @@ def test_list_partitions_rest_interceptors(null_interceptor): ) client = MetadataServiceClient(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.MetadataServiceRestInterceptor, "post_list_partitions" - ) as post, mock.patch.object( - transports.MetadataServiceRestInterceptor, "post_list_partitions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MetadataServiceRestInterceptor, "pre_list_partitions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "post_list_partitions" + ) as post, + mock.patch.object( + transports.MetadataServiceRestInterceptor, + "post_list_partitions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MetadataServiceRestInterceptor, "pre_list_partitions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8560,8 +8593,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8620,8 +8654,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8682,8 +8717,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8744,8 +8780,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8806,8 +8843,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8868,8 +8906,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9171,11 +9210,14 @@ def test_metadata_service_base_transport(): def test_metadata_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataplex_v1.services.metadata_service.transports.MetadataServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataplex_v1.services.metadata_service.transports.MetadataServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetadataServiceTransport( @@ -9192,9 +9234,12 @@ def test_metadata_service_base_transport_with_credentials_file(): def test_metadata_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataplex_v1.services.metadata_service.transports.MetadataServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataplex_v1.services.metadata_service.transports.MetadataServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetadataServiceTransport() @@ -9266,11 +9311,12 @@ def test_metadata_service_transport_auth_gdch_credentials(transport_class): def test_metadata_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc-metastore/docs/conf.py b/packages/google-cloud-dataproc-metastore/docs/conf.py index 2a4d824bf260..631c83291885 100644 --- a/packages/google-cloud-dataproc-metastore/docs/conf.py +++ b/packages/google-cloud-dataproc-metastore/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-dataproc-metastore documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/__init__.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/__init__.py index 259cfe3dc03c..ec3c469b2a27 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/__init__.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dataproc_metastore import ( DataprocMetastoreAsyncClient, DataprocMetastoreClient, diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/async_client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/async_client.py index bd30c7ccab39..f8fbefaba63e 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/async_client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1 import gapic_version as package_version @@ -45,15 +45,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1.services.dataproc_metastore import pagers from google.cloud.metastore_v1.types import metastore @@ -155,7 +157,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataprocMetastoreAsyncClient: The constructed client. """ - return DataprocMetastoreClient.from_service_account_info.__func__(DataprocMetastoreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataprocMetastoreClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataprocMetastoreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +174,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataprocMetastoreAsyncClient: The constructed client. """ - return DataprocMetastoreClient.from_service_account_file.__func__(DataprocMetastoreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataprocMetastoreClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataprocMetastoreAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/client.py index 4e6e0517badc..ad573ac2f224 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1 import gapic_version as package_version @@ -62,15 +62,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1.services.dataproc_metastore import pagers from google.cloud.metastore_v1.types import metastore @@ -89,9 +91,7 @@ class DataprocMetastoreClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataprocMetastoreTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreTransport]] _transport_registry["grpc"] = DataprocMetastoreGrpcTransport _transport_registry["grpc_asyncio"] = DataprocMetastoreGrpcAsyncIOTransport _transport_registry["rest"] = DataprocMetastoreRestTransport @@ -745,11 +745,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataprocMetastoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataprocMetastoreClient._read_environment_variables() + ) self._client_cert_source = DataprocMetastoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -784,8 +782,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataprocMetastoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/pagers.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/pagers.py index dfa6259ec500..71aece1ae2b2 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/pagers.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/base.py index fc2c150ed6df..ec4040312c44 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1 import gapic_version as package_version from google.cloud.metastore_v1.types import metastore @@ -482,13 +484,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc.py index 768cd4d63448..e11ed360b33f 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.metastore_v1.types import metastore @@ -832,12 +834,12 @@ def alter_metadata_resource_location( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "alter_metadata_resource_location" not in self._stubs: - self._stubs[ - "alter_metadata_resource_location" - ] = self._logged_channel.unary_unary( - "/google.cloud.metastore.v1.DataprocMetastore/AlterMetadataResourceLocation", - request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["alter_metadata_resource_location"] = ( + self._logged_channel.unary_unary( + "/google.cloud.metastore.v1.DataprocMetastore/AlterMetadataResourceLocation", + request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["alter_metadata_resource_location"] diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py index ae10b2b9cf5b..469baa28fbb4 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.metastore_v1.types import metastore @@ -870,12 +872,12 @@ def alter_metadata_resource_location( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "alter_metadata_resource_location" not in self._stubs: - self._stubs[ - "alter_metadata_resource_location" - ] = self._logged_channel.unary_unary( - "/google.cloud.metastore.v1.DataprocMetastore/AlterMetadataResourceLocation", - request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["alter_metadata_resource_location"] = ( + self._logged_channel.unary_unary( + "/google.cloud.metastore.v1.DataprocMetastore/AlterMetadataResourceLocation", + request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["alter_metadata_resource_location"] diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest.py index 30588bef0682..058bd6179165 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1510,9 +1512,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseAlterMetadataResourceLocation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseAlterMetadataResourceLocation._get_http_options() request, metadata = self._interceptor.pre_alter_metadata_resource_location( request, metadata @@ -1538,7 +1538,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1579,11 +1579,10 @@ def __call__( resp = self._interceptor.post_alter_metadata_resource_location(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_alter_metadata_resource_location_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_alter_metadata_resource_location_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1667,9 +1666,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_http_options() request, metadata = self._interceptor.pre_create_backup(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_transcoded_request( @@ -1693,7 +1690,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1820,9 +1817,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateMetadataImport._get_http_options() request, metadata = self._interceptor.pre_create_metadata_import( request, metadata @@ -1848,7 +1843,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1977,9 +1972,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateService._get_http_options() request, metadata = self._interceptor.pre_create_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseCreateService._get_transcoded_request( @@ -2003,7 +1996,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2128,9 +2121,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_http_options() request, metadata = self._interceptor.pre_delete_backup(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_transcoded_request( @@ -2150,7 +2141,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2275,9 +2266,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_http_options() request, metadata = self._interceptor.pre_delete_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_transcoded_request( @@ -2297,7 +2286,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2423,9 +2412,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_http_options() request, metadata = self._interceptor.pre_export_metadata(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_transcoded_request( @@ -2449,7 +2436,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2719,9 +2706,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetMetadataImport._get_http_options() request, metadata = self._interceptor.pre_get_metadata_import( request, metadata @@ -3163,9 +3148,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListMetadataImports._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListMetadataImports._get_http_options() request, metadata = self._interceptor.pre_list_metadata_imports( request, metadata @@ -3316,9 +3299,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListServices._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListServices._get_http_options() request, metadata = self._interceptor.pre_list_services(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListServices._get_transcoded_request( @@ -3466,9 +3447,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseMoveTableToDatabase._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseMoveTableToDatabase._get_http_options() request, metadata = self._interceptor.pre_move_table_to_database( request, metadata @@ -3494,7 +3473,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3623,9 +3602,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_http_options() request, metadata = self._interceptor.pre_query_metadata(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_transcoded_request( @@ -3649,7 +3626,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3775,9 +3752,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_http_options() request, metadata = self._interceptor.pre_restore_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_transcoded_request( @@ -3801,7 +3776,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3928,9 +3903,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseUpdateMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseUpdateMetadataImport._get_http_options() request, metadata = self._interceptor.pre_update_metadata_import( request, metadata @@ -3956,7 +3929,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4085,9 +4058,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_http_options() request, metadata = self._interceptor.pre_update_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_transcoded_request( @@ -4111,7 +4082,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4186,7 +4157,9 @@ def alter_metadata_resource_location( ]: # 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._AlterMetadataResourceLocation(self._session, self._host, self._interceptor) # type: ignore + return self._AlterMetadataResourceLocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_backup( @@ -4520,9 +4493,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListLocations._get_transcoded_request( @@ -4660,9 +4631,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -4801,9 +4770,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -4948,9 +4915,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5094,9 +5059,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -5214,9 +5177,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -5331,9 +5292,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_transcoded_request( @@ -5472,9 +5431,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest_base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest_base.py index 7116c6a4b86c..03a69e9ca718 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest_base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/async_client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/async_client.py index efd2fb46e51d..2b5c2dfaf68f 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/async_client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1 import gapic_version as package_version @@ -45,15 +45,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1.services.dataproc_metastore_federation import pagers from google.cloud.metastore_v1.types import metastore, metastore_federation @@ -149,7 +151,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataprocMetastoreFederationAsyncClient: The constructed client. """ - return DataprocMetastoreFederationClient.from_service_account_info.__func__(DataprocMetastoreFederationAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataprocMetastoreFederationClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + DataprocMetastoreFederationAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +172,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataprocMetastoreFederationAsyncClient: The constructed client. """ - return DataprocMetastoreFederationClient.from_service_account_file.__func__(DataprocMetastoreFederationAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataprocMetastoreFederationClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + DataprocMetastoreFederationAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -203,7 +215,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataprocMetastoreFederationClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataprocMetastoreFederationClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataprocMetastoreFederationTransport: diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/client.py index af34fa8c53dd..1c8bf8948a7c 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1 import gapic_version as package_version @@ -62,15 +62,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1.services.dataproc_metastore_federation import pagers from google.cloud.metastore_v1.types import metastore, metastore_federation @@ -89,13 +91,11 @@ class DataprocMetastoreFederationClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataprocMetastoreFederationTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreFederationTransport]] _transport_registry["grpc"] = DataprocMetastoreFederationGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = DataprocMetastoreFederationGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + DataprocMetastoreFederationGrpcAsyncIOTransport + ) _transport_registry["rest"] = DataprocMetastoreFederationRestTransport def get_transport_class( @@ -658,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataprocMetastoreFederationClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataprocMetastoreFederationClient._read_environment_variables() + ) self._client_cert_source = ( DataprocMetastoreFederationClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -699,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataprocMetastoreFederationTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/pagers.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/pagers.py index da1bfdde4a59..aa542fe2f0c1 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/pagers.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/__init__.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/__init__.py index 7320002bfbbe..ee1d93bac827 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/__init__.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataprocMetastoreFederationTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreFederationTransport]] _transport_registry["grpc"] = DataprocMetastoreFederationGrpcTransport _transport_registry["grpc_asyncio"] = DataprocMetastoreFederationGrpcAsyncIOTransport _transport_registry["rest"] = DataprocMetastoreFederationRestTransport diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/base.py index 8d8cff97e650..8acf823c7ea4 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1 import gapic_version as package_version from google.cloud.metastore_v1.types import metastore_federation @@ -300,13 +302,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc.py index b1ba96e3e891..71c700946e24 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.metastore_v1.types import metastore_federation diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc_asyncio.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc_asyncio.py index af8eaee3808a..45dcc82eac70 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.metastore_v1.types import metastore_federation diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest.py index eeda5b544823..b205bd4c8e79 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -807,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseCreateFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseCreateFederation._get_http_options() request, metadata = self._interceptor.pre_create_federation( request, metadata @@ -835,7 +835,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -960,9 +960,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseDeleteFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseDeleteFederation._get_http_options() request, metadata = self._interceptor.pre_delete_federation( request, metadata @@ -984,7 +982,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1107,9 +1105,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_http_options() request, metadata = self._interceptor.pre_get_federation(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_transcoded_request( @@ -1254,9 +1250,7 @@ def __call__( Response message for ListFederations """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListFederations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListFederations._get_http_options() request, metadata = self._interceptor.pre_list_federations( request, metadata @@ -1409,9 +1403,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseUpdateFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseUpdateFederation._get_http_options() request, metadata = self._interceptor.pre_update_federation( request, metadata @@ -1437,7 +1429,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1613,9 +1605,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_transcoded_request( @@ -1756,9 +1746,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_transcoded_request( @@ -1899,9 +1887,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2043,9 +2029,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2192,9 +2176,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2338,9 +2320,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2460,9 +2440,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2580,9 +2558,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_transcoded_request( @@ -2723,9 +2699,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest_base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest_base.py index 48e601a68db5..98af96a63924 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest_base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore.py index 27ba08c46da9..7ded26d9604f 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -191,6 +191,7 @@ class State(proto.Enum): error and cannot be used. The metastore service should be deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -215,6 +216,7 @@ class Tier(proto.Enum): availability, and sufficient scalability for enterprise-level Dataproc Metastore workloads. """ + TIER_UNSPECIFIED = 0 DEVELOPER = 1 ENTERPRISE = 3 @@ -238,6 +240,7 @@ class ReleaseChannel(proto.Enum): considered stable and have been validated for production use. """ + RELEASE_CHANNEL_UNSPECIFIED = 0 CANARY = 1 STABLE = 2 @@ -254,6 +257,7 @@ class DatabaseType(proto.Enum): Spanner is used to persist the metastore data. """ + DATABASE_TYPE_UNSPECIFIED = 0 MYSQL = 1 SPANNER = 2 @@ -434,6 +438,7 @@ class EndpointProtocol(proto.Enum): Use the modernized gRPC protocol for the metastore service endpoint. """ + ENDPOINT_PROTOCOL_UNSPECIFIED = 0 THRIFT = 1 GRPC = 2 @@ -658,6 +663,7 @@ class LogFormat(proto.Enum): JSON (2): Logging output uses the ``jsonPayload`` format. """ + LOG_FORMAT_UNSPECIFIED = 0 LEGACY = 1 JSON = 2 @@ -741,6 +747,7 @@ class State(proto.Enum): The metadata import failed, and attempted metadata changes were rolled back. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -774,6 +781,7 @@ class DatabaseType(proto.Enum): MYSQL (1): The type of the source database is MySQL. """ + DATABASE_TYPE_UNSPECIFIED = 0 MYSQL = 1 @@ -871,6 +879,7 @@ class State(proto.Enum): CANCELLED (4): The metadata export is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -948,6 +957,7 @@ class State(proto.Enum): RESTORING (5): The backup is being restored. """ + STATE_UNSPECIFIED = 0 CREATING = 1 DELETING = 2 @@ -1029,6 +1039,7 @@ class State(proto.Enum): CANCELLED (4): The metadata restore is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -1047,6 +1058,7 @@ class RestoreType(proto.Enum): METADATA_ONLY (2): Only the service's metadata is restored. """ + RESTORE_TYPE_UNSPECIFIED = 0 FULL = 1 METADATA_ONLY = 2 @@ -1128,6 +1140,7 @@ class InstanceSize(proto.Enum): Extra large instance size, maps to a scaling factor of 6.0. """ + INSTANCE_SIZE_UNSPECIFIED = 0 EXTRA_SMALL = 1 SMALL = 2 @@ -2051,12 +2064,12 @@ class HiveMetastoreVersion(proto.Message): number=2, ) - supported_hive_metastore_versions: MutableSequence[ - HiveMetastoreVersion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=HiveMetastoreVersion, + supported_hive_metastore_versions: MutableSequence[HiveMetastoreVersion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=HiveMetastoreVersion, + ) ) @@ -2077,6 +2090,7 @@ class Type(proto.Enum): AVRO (2): Database dump contains Avro files. """ + TYPE_UNSPECIFIED = 0 MYSQL = 1 AVRO = 2 diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore_federation.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore_federation.py index 6d1f9f29e79b..b19f25091042 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore_federation.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore_federation.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -106,6 +106,7 @@ class State(proto.Enum): error and cannot be used. The metastore federation should be deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -192,6 +193,7 @@ class MetastoreType(proto.Enum): DATAPROC_METASTORE (3): The backend metastore is Dataproc Metastore. """ + METASTORE_TYPE_UNSPECIFIED = 0 BIGQUERY = 2 DATAPROC_METASTORE = 3 diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/__init__.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/__init__.py index fa661269384d..df707d8446d0 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/__init__.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dataproc_metastore import ( DataprocMetastoreAsyncClient, DataprocMetastoreClient, diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/async_client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/async_client.py index 1f6648a35752..b250d522d752 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/async_client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1alpha import gapic_version as package_version @@ -45,15 +45,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1alpha.services.dataproc_metastore import pagers from google.cloud.metastore_v1alpha.types import metastore @@ -157,7 +159,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataprocMetastoreAsyncClient: The constructed client. """ - return DataprocMetastoreClient.from_service_account_info.__func__(DataprocMetastoreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataprocMetastoreClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataprocMetastoreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +176,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataprocMetastoreAsyncClient: The constructed client. """ - return DataprocMetastoreClient.from_service_account_file.__func__(DataprocMetastoreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataprocMetastoreClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataprocMetastoreAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/client.py index fa4ba917ebd6..7f0c18145aaf 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1alpha import gapic_version as package_version @@ -62,15 +62,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1alpha.services.dataproc_metastore import pagers from google.cloud.metastore_v1alpha.types import metastore @@ -89,9 +91,7 @@ class DataprocMetastoreClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataprocMetastoreTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreTransport]] _transport_registry["grpc"] = DataprocMetastoreGrpcTransport _transport_registry["grpc_asyncio"] = DataprocMetastoreGrpcAsyncIOTransport _transport_registry["rest"] = DataprocMetastoreRestTransport @@ -767,11 +767,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataprocMetastoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataprocMetastoreClient._read_environment_variables() + ) self._client_cert_source = DataprocMetastoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -806,8 +804,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataprocMetastoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/pagers.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/pagers.py index c95dad8ce76b..aa58a572d16d 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/pagers.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/base.py index 39a9048193d6..32c9dfcf3ab0 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1alpha import gapic_version as package_version from google.cloud.metastore_v1alpha.types import metastore @@ -499,13 +501,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc.py index 32344f0521aa..3368cd2f40a9 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.metastore_v1alpha.types import metastore @@ -860,12 +862,12 @@ def alter_metadata_resource_location( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "alter_metadata_resource_location" not in self._stubs: - self._stubs[ - "alter_metadata_resource_location" - ] = self._logged_channel.unary_unary( - "/google.cloud.metastore.v1alpha.DataprocMetastore/AlterMetadataResourceLocation", - request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["alter_metadata_resource_location"] = ( + self._logged_channel.unary_unary( + "/google.cloud.metastore.v1alpha.DataprocMetastore/AlterMetadataResourceLocation", + request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["alter_metadata_resource_location"] diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc_asyncio.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc_asyncio.py index 15d819832d9f..7a0962a9e16a 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.metastore_v1alpha.types import metastore @@ -898,12 +900,12 @@ def alter_metadata_resource_location( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "alter_metadata_resource_location" not in self._stubs: - self._stubs[ - "alter_metadata_resource_location" - ] = self._logged_channel.unary_unary( - "/google.cloud.metastore.v1alpha.DataprocMetastore/AlterMetadataResourceLocation", - request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["alter_metadata_resource_location"] = ( + self._logged_channel.unary_unary( + "/google.cloud.metastore.v1alpha.DataprocMetastore/AlterMetadataResourceLocation", + request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["alter_metadata_resource_location"] diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest.py index fd1cc0b2fe6b..134dda44ebc4 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1568,9 +1570,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseAlterMetadataResourceLocation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseAlterMetadataResourceLocation._get_http_options() request, metadata = self._interceptor.pre_alter_metadata_resource_location( request, metadata @@ -1596,7 +1596,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1637,11 +1637,10 @@ def __call__( resp = self._interceptor.post_alter_metadata_resource_location(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_alter_metadata_resource_location_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_alter_metadata_resource_location_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1725,9 +1724,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_http_options() request, metadata = self._interceptor.pre_create_backup(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_transcoded_request( @@ -1751,7 +1748,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1878,9 +1875,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateMetadataImport._get_http_options() request, metadata = self._interceptor.pre_create_metadata_import( request, metadata @@ -1906,7 +1901,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2035,9 +2030,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateService._get_http_options() request, metadata = self._interceptor.pre_create_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseCreateService._get_transcoded_request( @@ -2061,7 +2054,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2186,9 +2179,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_http_options() request, metadata = self._interceptor.pre_delete_backup(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_transcoded_request( @@ -2208,7 +2199,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2333,9 +2324,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_http_options() request, metadata = self._interceptor.pre_delete_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_transcoded_request( @@ -2355,7 +2344,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2481,9 +2470,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_http_options() request, metadata = self._interceptor.pre_export_metadata(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_transcoded_request( @@ -2507,7 +2494,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2777,9 +2764,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetMetadataImport._get_http_options() request, metadata = self._interceptor.pre_get_metadata_import( request, metadata @@ -3221,9 +3206,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListMetadataImports._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListMetadataImports._get_http_options() request, metadata = self._interceptor.pre_list_metadata_imports( request, metadata @@ -3374,9 +3357,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListServices._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListServices._get_http_options() request, metadata = self._interceptor.pre_list_services(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListServices._get_transcoded_request( @@ -3524,9 +3505,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseMoveTableToDatabase._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseMoveTableToDatabase._get_http_options() request, metadata = self._interceptor.pre_move_table_to_database( request, metadata @@ -3552,7 +3531,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3681,9 +3660,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_http_options() request, metadata = self._interceptor.pre_query_metadata(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_transcoded_request( @@ -3707,7 +3684,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3833,9 +3810,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseRemoveIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseRemoveIamPolicy._get_http_options() request, metadata = self._interceptor.pre_remove_iam_policy( request, metadata @@ -3991,9 +3966,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_http_options() request, metadata = self._interceptor.pre_restore_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_transcoded_request( @@ -4017,7 +3990,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4144,9 +4117,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseUpdateMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseUpdateMetadataImport._get_http_options() request, metadata = self._interceptor.pre_update_metadata_import( request, metadata @@ -4172,7 +4143,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4301,9 +4272,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_http_options() request, metadata = self._interceptor.pre_update_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_transcoded_request( @@ -4327,7 +4296,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4402,7 +4371,9 @@ def alter_metadata_resource_location( ]: # 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._AlterMetadataResourceLocation(self._session, self._host, self._interceptor) # type: ignore + return self._AlterMetadataResourceLocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_backup( @@ -4746,9 +4717,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListLocations._get_transcoded_request( @@ -4886,9 +4855,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -5027,9 +4994,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -5174,9 +5139,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5320,9 +5283,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -5440,9 +5401,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -5557,9 +5516,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_transcoded_request( @@ -5698,9 +5655,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest_base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest_base.py index 62c76bd540ed..e84b393d9b5a 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest_base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/async_client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/async_client.py index a42565ad3b0d..5495b9307657 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/async_client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1alpha import gapic_version as package_version @@ -45,15 +45,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1alpha.services.dataproc_metastore_federation import pagers from google.cloud.metastore_v1alpha.types import metastore, metastore_federation @@ -149,7 +151,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataprocMetastoreFederationAsyncClient: The constructed client. """ - return DataprocMetastoreFederationClient.from_service_account_info.__func__(DataprocMetastoreFederationAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataprocMetastoreFederationClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + DataprocMetastoreFederationAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +172,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataprocMetastoreFederationAsyncClient: The constructed client. """ - return DataprocMetastoreFederationClient.from_service_account_file.__func__(DataprocMetastoreFederationAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataprocMetastoreFederationClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + DataprocMetastoreFederationAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -203,7 +215,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataprocMetastoreFederationClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataprocMetastoreFederationClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataprocMetastoreFederationTransport: diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/client.py index 24f561204b5f..40b6991c83b4 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1alpha import gapic_version as package_version @@ -62,15 +62,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1alpha.services.dataproc_metastore_federation import pagers from google.cloud.metastore_v1alpha.types import metastore, metastore_federation @@ -89,13 +91,11 @@ class DataprocMetastoreFederationClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataprocMetastoreFederationTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreFederationTransport]] _transport_registry["grpc"] = DataprocMetastoreFederationGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = DataprocMetastoreFederationGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + DataprocMetastoreFederationGrpcAsyncIOTransport + ) _transport_registry["rest"] = DataprocMetastoreFederationRestTransport def get_transport_class( @@ -658,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataprocMetastoreFederationClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataprocMetastoreFederationClient._read_environment_variables() + ) self._client_cert_source = ( DataprocMetastoreFederationClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -699,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataprocMetastoreFederationTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/pagers.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/pagers.py index 95f508f2cf67..b9958ea0b1d1 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/pagers.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/__init__.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/__init__.py index 7320002bfbbe..ee1d93bac827 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/__init__.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataprocMetastoreFederationTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreFederationTransport]] _transport_registry["grpc"] = DataprocMetastoreFederationGrpcTransport _transport_registry["grpc_asyncio"] = DataprocMetastoreFederationGrpcAsyncIOTransport _transport_registry["rest"] = DataprocMetastoreFederationRestTransport diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/base.py index 7a486a8e3179..e29a3dbb262a 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1alpha import gapic_version as package_version from google.cloud.metastore_v1alpha.types import metastore_federation @@ -300,13 +302,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc.py index c2c04656b706..29f61cb992fc 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.metastore_v1alpha.types import metastore_federation diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc_asyncio.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc_asyncio.py index f26efbcd95b9..788f2983ef59 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.metastore_v1alpha.types import metastore_federation diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest.py index 73ec6ab7dd08..36d9e1d163dd 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -807,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseCreateFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseCreateFederation._get_http_options() request, metadata = self._interceptor.pre_create_federation( request, metadata @@ -835,7 +835,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -960,9 +960,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseDeleteFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseDeleteFederation._get_http_options() request, metadata = self._interceptor.pre_delete_federation( request, metadata @@ -984,7 +982,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1107,9 +1105,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_http_options() request, metadata = self._interceptor.pre_get_federation(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_transcoded_request( @@ -1254,9 +1250,7 @@ def __call__( Response message for ListFederations """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListFederations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListFederations._get_http_options() request, metadata = self._interceptor.pre_list_federations( request, metadata @@ -1409,9 +1403,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseUpdateFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseUpdateFederation._get_http_options() request, metadata = self._interceptor.pre_update_federation( request, metadata @@ -1437,7 +1429,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1613,9 +1605,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_transcoded_request( @@ -1756,9 +1746,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_transcoded_request( @@ -1899,9 +1887,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2043,9 +2029,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2192,9 +2176,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2338,9 +2320,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2460,9 +2440,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2580,9 +2558,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_transcoded_request( @@ -2723,9 +2699,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest_base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest_base.py index f925514036e7..460bd53fddb3 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest_base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore_federation/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore.py index 4caa53b655fb..4f748a4396b2 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -201,6 +201,7 @@ class State(proto.Enum): error and cannot be used. The metastore service should be deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -225,6 +226,7 @@ class Tier(proto.Enum): availability, and sufficient scalability for enterprise-level Dataproc Metastore workloads. """ + TIER_UNSPECIFIED = 0 DEVELOPER = 1 ENTERPRISE = 3 @@ -248,6 +250,7 @@ class ReleaseChannel(proto.Enum): considered stable and have been validated for production use. """ + RELEASE_CHANNEL_UNSPECIFIED = 0 CANARY = 1 STABLE = 2 @@ -264,6 +267,7 @@ class DatabaseType(proto.Enum): Spanner is used to persist the metastore data. """ + DATABASE_TYPE_UNSPECIFIED = 0 MYSQL = 1 SPANNER = 2 @@ -527,6 +531,7 @@ class EndpointProtocol(proto.Enum): Use the modernized gRPC protocol for the metastore service endpoint. """ + ENDPOINT_PROTOCOL_UNSPECIFIED = 0 THRIFT = 1 GRPC = 2 @@ -759,6 +764,7 @@ class LogFormat(proto.Enum): JSON (2): Logging output uses the ``jsonPayload`` format. """ + LOG_FORMAT_UNSPECIFIED = 0 LEGACY = 1 JSON = 2 @@ -842,6 +848,7 @@ class State(proto.Enum): The metadata import failed, and attempted metadata changes were rolled back. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -875,6 +882,7 @@ class DatabaseType(proto.Enum): MYSQL (1): The type of the source database is MySQL. """ + DATABASE_TYPE_UNSPECIFIED = 0 MYSQL = 1 @@ -972,6 +980,7 @@ class State(proto.Enum): CANCELLED (4): The metadata export is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -1049,6 +1058,7 @@ class State(proto.Enum): RESTORING (5): The backup is being restored. """ + STATE_UNSPECIFIED = 0 CREATING = 1 DELETING = 2 @@ -1130,6 +1140,7 @@ class State(proto.Enum): CANCELLED (4): The metadata restore is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -1148,6 +1159,7 @@ class RestoreType(proto.Enum): METADATA_ONLY (2): Only the service's metadata is restored. """ + RESTORE_TYPE_UNSPECIFIED = 0 FULL = 1 METADATA_ONLY = 2 @@ -1229,6 +1241,7 @@ class InstanceSize(proto.Enum): Extra large instance size, maps to a scaling factor of 6.0. """ + INSTANCE_SIZE_UNSPECIFIED = 0 EXTRA_SMALL = 1 SMALL = 2 @@ -2152,12 +2165,12 @@ class HiveMetastoreVersion(proto.Message): number=2, ) - supported_hive_metastore_versions: MutableSequence[ - HiveMetastoreVersion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=HiveMetastoreVersion, + supported_hive_metastore_versions: MutableSequence[HiveMetastoreVersion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=HiveMetastoreVersion, + ) ) @@ -2178,6 +2191,7 @@ class Type(proto.Enum): AVRO (2): Database dump contains Avro files. """ + TYPE_UNSPECIFIED = 0 MYSQL = 1 AVRO = 2 diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore_federation.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore_federation.py index 8982d7f30cdf..9ed118dda882 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore_federation.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore_federation.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -106,6 +106,7 @@ class State(proto.Enum): error and cannot be used. The metastore federation should be deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -194,6 +195,7 @@ class MetastoreType(proto.Enum): DATAPROC_METASTORE (3): The backend metastore is Dataproc Metastore. """ + METASTORE_TYPE_UNSPECIFIED = 0 DATAPLEX = 1 BIGQUERY = 2 diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/__init__.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/__init__.py index 613d6bc5527a..fc6cb92422c2 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/__init__.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dataproc_metastore import ( DataprocMetastoreAsyncClient, DataprocMetastoreClient, diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/async_client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/async_client.py index 12f3f3a94127..79d42c5e89d6 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/async_client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1beta import gapic_version as package_version @@ -45,15 +45,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1beta.services.dataproc_metastore import pagers from google.cloud.metastore_v1beta.types import metastore @@ -157,7 +159,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataprocMetastoreAsyncClient: The constructed client. """ - return DataprocMetastoreClient.from_service_account_info.__func__(DataprocMetastoreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataprocMetastoreClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataprocMetastoreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +176,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataprocMetastoreAsyncClient: The constructed client. """ - return DataprocMetastoreClient.from_service_account_file.__func__(DataprocMetastoreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataprocMetastoreClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataprocMetastoreAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/client.py index 221db56fb036..aa629ac22e3d 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1beta import gapic_version as package_version @@ -62,15 +62,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1beta.services.dataproc_metastore import pagers from google.cloud.metastore_v1beta.types import metastore @@ -89,9 +91,7 @@ class DataprocMetastoreClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataprocMetastoreTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreTransport]] _transport_registry["grpc"] = DataprocMetastoreGrpcTransport _transport_registry["grpc_asyncio"] = DataprocMetastoreGrpcAsyncIOTransport _transport_registry["rest"] = DataprocMetastoreRestTransport @@ -767,11 +767,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataprocMetastoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataprocMetastoreClient._read_environment_variables() + ) self._client_cert_source = DataprocMetastoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -806,8 +804,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataprocMetastoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/pagers.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/pagers.py index cd56a8b122d3..60ae18252aba 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/pagers.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/base.py index 644f2150e627..a206821ff5c2 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1beta import gapic_version as package_version from google.cloud.metastore_v1beta.types import metastore @@ -499,13 +501,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc.py index 9ccf73427b79..379d926ae92b 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.metastore_v1beta.types import metastore @@ -860,12 +862,12 @@ def alter_metadata_resource_location( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "alter_metadata_resource_location" not in self._stubs: - self._stubs[ - "alter_metadata_resource_location" - ] = self._logged_channel.unary_unary( - "/google.cloud.metastore.v1beta.DataprocMetastore/AlterMetadataResourceLocation", - request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["alter_metadata_resource_location"] = ( + self._logged_channel.unary_unary( + "/google.cloud.metastore.v1beta.DataprocMetastore/AlterMetadataResourceLocation", + request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["alter_metadata_resource_location"] diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc_asyncio.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc_asyncio.py index 5fd81d09c522..1fb268343233 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.metastore_v1beta.types import metastore @@ -898,12 +900,12 @@ def alter_metadata_resource_location( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "alter_metadata_resource_location" not in self._stubs: - self._stubs[ - "alter_metadata_resource_location" - ] = self._logged_channel.unary_unary( - "/google.cloud.metastore.v1beta.DataprocMetastore/AlterMetadataResourceLocation", - request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["alter_metadata_resource_location"] = ( + self._logged_channel.unary_unary( + "/google.cloud.metastore.v1beta.DataprocMetastore/AlterMetadataResourceLocation", + request_serializer=metastore.AlterMetadataResourceLocationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["alter_metadata_resource_location"] diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest.py index cd75691a17d6..e900dfbb5a77 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1568,9 +1570,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseAlterMetadataResourceLocation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseAlterMetadataResourceLocation._get_http_options() request, metadata = self._interceptor.pre_alter_metadata_resource_location( request, metadata @@ -1596,7 +1596,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1637,11 +1637,10 @@ def __call__( resp = self._interceptor.post_alter_metadata_resource_location(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_alter_metadata_resource_location_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_alter_metadata_resource_location_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1725,9 +1724,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_http_options() request, metadata = self._interceptor.pre_create_backup(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseCreateBackup._get_transcoded_request( @@ -1751,7 +1748,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1878,9 +1875,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateMetadataImport._get_http_options() request, metadata = self._interceptor.pre_create_metadata_import( request, metadata @@ -1906,7 +1901,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2035,9 +2030,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCreateService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCreateService._get_http_options() request, metadata = self._interceptor.pre_create_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseCreateService._get_transcoded_request( @@ -2061,7 +2054,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2186,9 +2179,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_http_options() request, metadata = self._interceptor.pre_delete_backup(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseDeleteBackup._get_transcoded_request( @@ -2208,7 +2199,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2333,9 +2324,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_http_options() request, metadata = self._interceptor.pre_delete_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseDeleteService._get_transcoded_request( @@ -2355,7 +2344,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2481,9 +2470,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_http_options() request, metadata = self._interceptor.pre_export_metadata(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseExportMetadata._get_transcoded_request( @@ -2507,7 +2494,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2777,9 +2764,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetMetadataImport._get_http_options() request, metadata = self._interceptor.pre_get_metadata_import( request, metadata @@ -3221,9 +3206,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListMetadataImports._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListMetadataImports._get_http_options() request, metadata = self._interceptor.pre_list_metadata_imports( request, metadata @@ -3374,9 +3357,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListServices._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListServices._get_http_options() request, metadata = self._interceptor.pre_list_services(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListServices._get_transcoded_request( @@ -3524,9 +3505,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseMoveTableToDatabase._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseMoveTableToDatabase._get_http_options() request, metadata = self._interceptor.pre_move_table_to_database( request, metadata @@ -3552,7 +3531,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3681,9 +3660,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_http_options() request, metadata = self._interceptor.pre_query_metadata(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseQueryMetadata._get_transcoded_request( @@ -3707,7 +3684,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3833,9 +3810,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseRemoveIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseRemoveIamPolicy._get_http_options() request, metadata = self._interceptor.pre_remove_iam_policy( request, metadata @@ -3991,9 +3966,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_http_options() request, metadata = self._interceptor.pre_restore_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseRestoreService._get_transcoded_request( @@ -4017,7 +3990,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4144,9 +4117,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseUpdateMetadataImport._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseUpdateMetadataImport._get_http_options() request, metadata = self._interceptor.pre_update_metadata_import( request, metadata @@ -4172,7 +4143,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4301,9 +4272,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_http_options() request, metadata = self._interceptor.pre_update_service(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseUpdateService._get_transcoded_request( @@ -4327,7 +4296,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4402,7 +4371,9 @@ def alter_metadata_resource_location( ]: # 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._AlterMetadataResourceLocation(self._session, self._host, self._interceptor) # type: ignore + return self._AlterMetadataResourceLocation( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_backup( @@ -4746,9 +4717,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListLocations._get_transcoded_request( @@ -4886,9 +4855,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -5027,9 +4994,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -5174,9 +5139,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5320,9 +5283,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -5440,9 +5401,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -5557,9 +5516,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseGetOperation._get_transcoded_request( @@ -5698,9 +5655,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataprocMetastoreRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataprocMetastoreRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataprocMetastoreRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest_base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest_base.py index 6c19ee5562b3..0d9a505554b5 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest_base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/async_client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/async_client.py index d54debef42f5..fc8c70ea05d8 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/async_client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1beta import gapic_version as package_version @@ -45,15 +45,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1beta.services.dataproc_metastore_federation import pagers from google.cloud.metastore_v1beta.types import metastore, metastore_federation @@ -149,7 +151,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataprocMetastoreFederationAsyncClient: The constructed client. """ - return DataprocMetastoreFederationClient.from_service_account_info.__func__(DataprocMetastoreFederationAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + DataprocMetastoreFederationClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + DataprocMetastoreFederationAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +172,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataprocMetastoreFederationAsyncClient: The constructed client. """ - return DataprocMetastoreFederationClient.from_service_account_file.__func__(DataprocMetastoreFederationAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + DataprocMetastoreFederationClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + DataprocMetastoreFederationAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -203,7 +215,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataprocMetastoreFederationClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataprocMetastoreFederationClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataprocMetastoreFederationTransport: diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/client.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/client.py index c4c1f8c4abf4..7cb7620ef4fc 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/client.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1beta import gapic_version as package_version @@ -62,15 +62,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1beta.services.dataproc_metastore_federation import pagers from google.cloud.metastore_v1beta.types import metastore, metastore_federation @@ -89,13 +91,11 @@ class DataprocMetastoreFederationClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataprocMetastoreFederationTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreFederationTransport]] _transport_registry["grpc"] = DataprocMetastoreFederationGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = DataprocMetastoreFederationGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + DataprocMetastoreFederationGrpcAsyncIOTransport + ) _transport_registry["rest"] = DataprocMetastoreFederationRestTransport def get_transport_class( @@ -658,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataprocMetastoreFederationClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataprocMetastoreFederationClient._read_environment_variables() + ) self._client_cert_source = ( DataprocMetastoreFederationClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -699,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataprocMetastoreFederationTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/pagers.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/pagers.py index b37a29ec3318..2c3e66cfd5c0 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/pagers.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/__init__.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/__init__.py index 7320002bfbbe..ee1d93bac827 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/__init__.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataprocMetastoreFederationTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataprocMetastoreFederationTransport]] _transport_registry["grpc"] = DataprocMetastoreFederationGrpcTransport _transport_registry["grpc_asyncio"] = DataprocMetastoreFederationGrpcAsyncIOTransport _transport_registry["rest"] = DataprocMetastoreFederationRestTransport diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/base.py index f07c4acb9e98..36c51953666a 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.metastore_v1beta import gapic_version as package_version from google.cloud.metastore_v1beta.types import metastore_federation @@ -300,13 +302,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc.py index cbfa1274b927..7dbbc57367ff 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.metastore_v1beta.types import metastore_federation diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc_asyncio.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc_asyncio.py index 6e64ebde6efa..e9cc5edaba42 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.metastore_v1beta.types import metastore_federation diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest.py index aeae6b79dd27..6223af7e6dba 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -807,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseCreateFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseCreateFederation._get_http_options() request, metadata = self._interceptor.pre_create_federation( request, metadata @@ -835,7 +835,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -960,9 +960,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseDeleteFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseDeleteFederation._get_http_options() request, metadata = self._interceptor.pre_delete_federation( request, metadata @@ -984,7 +982,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1107,9 +1105,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_http_options() request, metadata = self._interceptor.pre_get_federation(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetFederation._get_transcoded_request( @@ -1254,9 +1250,7 @@ def __call__( Response message for ListFederations """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListFederations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListFederations._get_http_options() request, metadata = self._interceptor.pre_list_federations( request, metadata @@ -1409,9 +1403,7 @@ def __call__( """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseUpdateFederation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseUpdateFederation._get_http_options() request, metadata = self._interceptor.pre_update_federation( request, metadata @@ -1437,7 +1429,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1613,9 +1605,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetLocation._get_transcoded_request( @@ -1756,9 +1746,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseListLocations._get_transcoded_request( @@ -1899,9 +1887,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2043,9 +2029,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2192,9 +2176,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2338,9 +2320,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2460,9 +2440,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2580,9 +2558,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseGetOperation._get_transcoded_request( @@ -2723,9 +2699,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataprocMetastoreFederationRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest_base.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest_base.py index 63b7f09d6497..5fba14d1271d 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest_base.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/services/dataproc_metastore_federation/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore.py index bf3ecf1d53a8..66b3b6696ab4 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -201,6 +201,7 @@ class State(proto.Enum): error and cannot be used. The metastore service should be deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -225,6 +226,7 @@ class Tier(proto.Enum): availability, and sufficient scalability for enterprise-level Dataproc Metastore workloads. """ + TIER_UNSPECIFIED = 0 DEVELOPER = 1 ENTERPRISE = 3 @@ -248,6 +250,7 @@ class ReleaseChannel(proto.Enum): considered stable and have been validated for production use. """ + RELEASE_CHANNEL_UNSPECIFIED = 0 CANARY = 1 STABLE = 2 @@ -264,6 +267,7 @@ class DatabaseType(proto.Enum): Spanner is used to persist the metastore data. """ + DATABASE_TYPE_UNSPECIFIED = 0 MYSQL = 1 SPANNER = 2 @@ -527,6 +531,7 @@ class EndpointProtocol(proto.Enum): Use the modernized gRPC protocol for the metastore service endpoint. """ + ENDPOINT_PROTOCOL_UNSPECIFIED = 0 THRIFT = 1 GRPC = 2 @@ -759,6 +764,7 @@ class LogFormat(proto.Enum): JSON (2): Logging output uses the ``jsonPayload`` format. """ + LOG_FORMAT_UNSPECIFIED = 0 LEGACY = 1 JSON = 2 @@ -842,6 +848,7 @@ class State(proto.Enum): The metadata import failed, and attempted metadata changes were rolled back. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -875,6 +882,7 @@ class DatabaseType(proto.Enum): MYSQL (1): The type of the source database is MySQL. """ + DATABASE_TYPE_UNSPECIFIED = 0 MYSQL = 1 @@ -972,6 +980,7 @@ class State(proto.Enum): CANCELLED (4): The metadata export is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -1049,6 +1058,7 @@ class State(proto.Enum): RESTORING (5): The backup is being restored. """ + STATE_UNSPECIFIED = 0 CREATING = 1 DELETING = 2 @@ -1130,6 +1140,7 @@ class State(proto.Enum): CANCELLED (4): The metadata restore is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 @@ -1148,6 +1159,7 @@ class RestoreType(proto.Enum): METADATA_ONLY (2): Only the service's metadata is restored. """ + RESTORE_TYPE_UNSPECIFIED = 0 FULL = 1 METADATA_ONLY = 2 @@ -1229,6 +1241,7 @@ class InstanceSize(proto.Enum): Extra large instance size, maps to a scaling factor of 6.0. """ + INSTANCE_SIZE_UNSPECIFIED = 0 EXTRA_SMALL = 1 SMALL = 2 @@ -2152,12 +2165,12 @@ class HiveMetastoreVersion(proto.Message): number=2, ) - supported_hive_metastore_versions: MutableSequence[ - HiveMetastoreVersion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=HiveMetastoreVersion, + supported_hive_metastore_versions: MutableSequence[HiveMetastoreVersion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=HiveMetastoreVersion, + ) ) @@ -2178,6 +2191,7 @@ class Type(proto.Enum): AVRO (2): Database dump contains Avro files. """ + TYPE_UNSPECIFIED = 0 MYSQL = 1 AVRO = 2 diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore_federation.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore_federation.py index 3f7f28251216..e096b9024469 100644 --- a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore_federation.py +++ b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore_federation.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -106,6 +106,7 @@ class State(proto.Enum): error and cannot be used. The metastore federation should be deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -194,6 +195,7 @@ class MetastoreType(proto.Enum): DATAPROC_METASTORE (3): The backend metastore is Dataproc Metastore. """ + METASTORE_TYPE_UNSPECIFIED = 0 DATAPLEX = 1 BIGQUERY = 2 diff --git a/packages/google-cloud-dataproc-metastore/noxfile.py b/packages/google-cloud-dataproc-metastore/noxfile.py index b8562b8fc864..d6fe37221c14 100644 --- a/packages/google-cloud-dataproc-metastore/noxfile.py +++ b/packages/google-cloud-dataproc-metastore/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore.py b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore.py index 486dcdb663e1..6218d05767fe 100644 --- a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore.py +++ b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,24 +61,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore from google.cloud.metastore_v1.services.dataproc_metastore import ( DataprocMetastoreAsyncClient, @@ -998,10 +1000,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1047,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1085,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,13 +1335,13 @@ def test_dataproc_metastore_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3407,9 +3406,9 @@ def test_list_metadata_imports_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_imports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_imports] = ( + mock_rpc + ) request = {} client.list_metadata_imports(request) @@ -3956,9 +3955,9 @@ def test_get_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_import] = ( + mock_rpc + ) request = {} client.get_metadata_import(request) @@ -4303,9 +4302,9 @@ def test_create_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_import] = ( + mock_rpc + ) request = {} client.create_metadata_import(request) @@ -4693,9 +4692,9 @@ def test_update_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_metadata_import] = ( + mock_rpc + ) request = {} client.update_metadata_import(request) @@ -7452,9 +7451,9 @@ def test_move_table_to_database_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_table_to_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_table_to_database] = ( + mock_rpc + ) request = {} client.move_table_to_database(request) @@ -8948,9 +8947,9 @@ def test_list_metadata_imports_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_imports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_imports] = ( + mock_rpc + ) request = {} client.list_metadata_imports(request) @@ -9216,9 +9215,9 @@ def test_get_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_import] = ( + mock_rpc + ) request = {} client.get_metadata_import(request) @@ -9401,9 +9400,9 @@ def test_create_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_import] = ( + mock_rpc + ) request = {} client.create_metadata_import(request) @@ -9632,9 +9631,9 @@ def test_update_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_metadata_import] = ( + mock_rpc + ) request = {} client.update_metadata_import(request) @@ -11127,9 +11126,9 @@ def test_move_table_to_database_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_table_to_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_table_to_database] = ( + mock_rpc + ) request = {} client.move_table_to_database(request) @@ -12416,8 +12415,9 @@ def test_list_services_rest_bad_request(request_type=metastore.ListServicesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12482,17 +12482,20 @@ def test_list_services_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_list_services" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_list_services_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_list_services" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_list_services" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_list_services_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_list_services" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12543,8 +12546,9 @@ def test_get_service_rest_bad_request(request_type=metastore.GetServiceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12627,17 +12631,20 @@ def test_get_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_get_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_get_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_get_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_get_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_get_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_get_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12686,8 +12693,9 @@ def test_create_service_rest_bad_request(request_type=metastore.CreateServiceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12872,19 +12880,21 @@ def test_create_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_create_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_create_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_create_service" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_create_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_create_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_create_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12935,8 +12945,9 @@ def test_update_service_rest_bad_request(request_type=metastore.UpdateServiceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13123,19 +13134,21 @@ def test_update_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_update_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_update_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_update_service" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_update_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_update_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_update_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13184,8 +13197,9 @@ def test_delete_service_rest_bad_request(request_type=metastore.DeleteServiceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13242,19 +13256,21 @@ def test_delete_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_delete_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_delete_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_delete_service" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_delete_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_delete_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_delete_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13305,8 +13321,9 @@ def test_list_metadata_imports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13371,18 +13388,20 @@ def test_list_metadata_imports_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_list_metadata_imports" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_list_metadata_imports_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_list_metadata_imports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_list_metadata_imports" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_list_metadata_imports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_list_metadata_imports" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13442,8 +13461,9 @@ def test_get_metadata_import_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13512,18 +13532,20 @@ def test_get_metadata_import_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_get_metadata_import" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_get_metadata_import_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_get_metadata_import" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_get_metadata_import" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_get_metadata_import_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_get_metadata_import" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13576,8 +13598,9 @@ def test_create_metadata_import_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13715,20 +13738,21 @@ def test_create_metadata_import_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_create_metadata_import" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_create_metadata_import_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_create_metadata_import" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_create_metadata_import" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_create_metadata_import_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_create_metadata_import" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13785,8 +13809,9 @@ def test_update_metadata_import_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13928,20 +13953,21 @@ def test_update_metadata_import_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_update_metadata_import" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_update_metadata_import_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_update_metadata_import" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_update_metadata_import" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_update_metadata_import_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_update_metadata_import" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13992,8 +14018,9 @@ def test_export_metadata_rest_bad_request(request_type=metastore.ExportMetadataR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14050,20 +14077,21 @@ def test_export_metadata_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_export_metadata" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_export_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_export_metadata" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_export_metadata" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_export_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_export_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14114,8 +14142,9 @@ def test_restore_service_rest_bad_request(request_type=metastore.RestoreServiceR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14172,20 +14201,21 @@ def test_restore_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_restore_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_restore_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_restore_service" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_restore_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_restore_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_restore_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14236,8 +14266,9 @@ def test_list_backups_rest_bad_request(request_type=metastore.ListBackupsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14302,17 +14333,20 @@ def test_list_backups_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_list_backups" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_list_backups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_list_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_list_backups" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_list_backups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_list_backups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14365,8 +14399,9 @@ def test_get_backup_rest_bad_request(request_type=metastore.GetBackupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14437,17 +14472,19 @@ def test_get_backup_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_get_backup" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_get_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_get_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_get_backup" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_get_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_get_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14496,8 +14533,9 @@ def test_create_backup_rest_bad_request(request_type=metastore.CreateBackupReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14693,19 +14731,21 @@ def test_create_backup_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_create_backup" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_create_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_create_backup" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_create_backup" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_create_backup_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_create_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14756,8 +14796,9 @@ def test_delete_backup_rest_bad_request(request_type=metastore.DeleteBackupReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14816,19 +14857,21 @@ def test_delete_backup_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_delete_backup" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_delete_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_delete_backup" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_delete_backup" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_delete_backup_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_delete_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14877,8 +14920,9 @@ def test_query_metadata_rest_bad_request(request_type=metastore.QueryMetadataReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14935,19 +14979,21 @@ def test_query_metadata_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_query_metadata" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_query_metadata_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_query_metadata" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_query_metadata" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_query_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_query_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14998,8 +15044,9 @@ def test_move_table_to_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15056,20 +15103,21 @@ def test_move_table_to_database_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_move_table_to_database" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_move_table_to_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_move_table_to_database" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_move_table_to_database" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_move_table_to_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_move_table_to_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15122,8 +15170,9 @@ def test_alter_metadata_resource_location_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15180,22 +15229,23 @@ def test_alter_metadata_resource_location_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, - "post_alter_metadata_resource_location", - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_alter_metadata_resource_location_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "pre_alter_metadata_resource_location", - ) as pre: + 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.DataprocMetastoreRestInterceptor, + "post_alter_metadata_resource_location", + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_alter_metadata_resource_location_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "pre_alter_metadata_resource_location", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15248,8 +15298,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15308,8 +15359,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15370,8 +15422,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15432,8 +15485,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15494,8 +15548,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15556,8 +15611,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15618,8 +15674,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15680,8 +15737,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15742,8 +15800,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16271,11 +16330,14 @@ def test_dataproc_metastore_base_transport(): def test_dataproc_metastore_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.metastore_v1.services.dataproc_metastore.transports.DataprocMetastoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.metastore_v1.services.dataproc_metastore.transports.DataprocMetastoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataprocMetastoreTransport( @@ -16292,9 +16354,12 @@ def test_dataproc_metastore_base_transport_with_credentials_file(): def test_dataproc_metastore_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.metastore_v1.services.dataproc_metastore.transports.DataprocMetastoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.metastore_v1.services.dataproc_metastore.transports.DataprocMetastoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataprocMetastoreTransport() @@ -16366,11 +16431,12 @@ def test_dataproc_metastore_transport_auth_gdch_credentials(transport_class): def test_dataproc_metastore_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore_federation.py b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore_federation.py index d87edf3cbaa9..645c9ae122a3 100644 --- a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore_federation.py +++ b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore_federation.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,22 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1.services.dataproc_metastore_federation import ( DataprocMetastoreFederationAsyncClient, @@ -1050,10 +1052,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1099,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1137,10 +1137,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1399,13 +1398,13 @@ def test_dataproc_metastore_federation_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1520,9 +1519,9 @@ def test_list_federations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_federations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_federations] = ( + mock_rpc + ) request = {} client.list_federations(request) @@ -2391,9 +2390,9 @@ def test_create_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_federation] = ( + mock_rpc + ) request = {} client.create_federation(request) @@ -2755,9 +2754,9 @@ def test_update_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_federation] = ( + mock_rpc + ) request = {} client.update_federation(request) @@ -3111,9 +3110,9 @@ def test_delete_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_federation] = ( + mock_rpc + ) request = {} client.delete_federation(request) @@ -3390,9 +3389,9 @@ def test_list_federations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_federations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_federations] = ( + mock_rpc + ) request = {} client.list_federations(request) @@ -3832,9 +3831,9 @@ def test_create_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_federation] = ( + mock_rpc + ) request = {} client.create_federation(request) @@ -4050,9 +4049,9 @@ def test_update_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_federation] = ( + mock_rpc + ) request = {} client.update_federation(request) @@ -4251,9 +4250,9 @@ def test_delete_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_federation] = ( + mock_rpc + ) request = {} client.delete_federation(request) @@ -4803,8 +4802,9 @@ def test_list_federations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4869,18 +4869,22 @@ def test_list_federations_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_list_federations" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_list_federations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_list_federations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_list_federations", + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_list_federations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "pre_list_federations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4938,8 +4942,9 @@ def test_get_federation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5012,18 +5017,20 @@ def test_get_federation_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_get_federation" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_get_federation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_get_federation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, "post_get_federation" + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_get_federation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, "pre_get_federation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5078,8 +5085,9 @@ def test_create_federation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5215,20 +5223,23 @@ def test_create_federation_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_create_federation" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_create_federation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_create_federation" - ) as pre: + 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.DataprocMetastoreFederationRestInterceptor, + "post_create_federation", + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_create_federation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "pre_create_federation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5283,8 +5294,9 @@ def test_update_federation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5422,20 +5434,23 @@ def test_update_federation_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_update_federation" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_update_federation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_update_federation" - ) as pre: + 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.DataprocMetastoreFederationRestInterceptor, + "post_update_federation", + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_update_federation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "pre_update_federation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5488,8 +5503,9 @@ def test_delete_federation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5546,20 +5562,23 @@ def test_delete_federation_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_delete_federation" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_delete_federation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_delete_federation" - ) as pre: + 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.DataprocMetastoreFederationRestInterceptor, + "post_delete_federation", + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_delete_federation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "pre_delete_federation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5612,8 +5631,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5672,8 +5692,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5734,8 +5755,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5796,8 +5818,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5858,8 +5881,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5920,8 +5944,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5982,8 +6007,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6044,8 +6070,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6106,8 +6133,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6356,11 +6384,14 @@ def test_dataproc_metastore_federation_base_transport(): def test_dataproc_metastore_federation_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.metastore_v1.services.dataproc_metastore_federation.transports.DataprocMetastoreFederationTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.metastore_v1.services.dataproc_metastore_federation.transports.DataprocMetastoreFederationTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataprocMetastoreFederationTransport( @@ -6377,9 +6408,12 @@ def test_dataproc_metastore_federation_base_transport_with_credentials_file(): def test_dataproc_metastore_federation_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.metastore_v1.services.dataproc_metastore_federation.transports.DataprocMetastoreFederationTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.metastore_v1.services.dataproc_metastore_federation.transports.DataprocMetastoreFederationTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataprocMetastoreFederationTransport() @@ -6456,11 +6490,12 @@ def test_dataproc_metastore_federation_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore.py b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore.py index 7406d942e644..63e3a6f32185 100644 --- a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore.py +++ b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,24 +61,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore from google.cloud.metastore_v1alpha.services.dataproc_metastore import ( DataprocMetastoreAsyncClient, @@ -998,10 +1000,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1047,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1085,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,13 +1335,13 @@ def test_dataproc_metastore_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3407,9 +3406,9 @@ def test_list_metadata_imports_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_imports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_imports] = ( + mock_rpc + ) request = {} client.list_metadata_imports(request) @@ -3956,9 +3955,9 @@ def test_get_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_import] = ( + mock_rpc + ) request = {} client.get_metadata_import(request) @@ -4303,9 +4302,9 @@ def test_create_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_import] = ( + mock_rpc + ) request = {} client.create_metadata_import(request) @@ -4693,9 +4692,9 @@ def test_update_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_metadata_import] = ( + mock_rpc + ) request = {} client.update_metadata_import(request) @@ -7199,9 +7198,9 @@ def test_remove_iam_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_iam_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_iam_policy] = ( + mock_rpc + ) request = {} client.remove_iam_policy(request) @@ -7705,9 +7704,9 @@ def test_move_table_to_database_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_table_to_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_table_to_database] = ( + mock_rpc + ) request = {} client.move_table_to_database(request) @@ -9205,9 +9204,9 @@ def test_list_metadata_imports_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_imports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_imports] = ( + mock_rpc + ) request = {} client.list_metadata_imports(request) @@ -9473,9 +9472,9 @@ def test_get_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_import] = ( + mock_rpc + ) request = {} client.get_metadata_import(request) @@ -9658,9 +9657,9 @@ def test_create_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_import] = ( + mock_rpc + ) request = {} client.create_metadata_import(request) @@ -9889,9 +9888,9 @@ def test_update_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_metadata_import] = ( + mock_rpc + ) request = {} client.update_metadata_import(request) @@ -11247,9 +11246,9 @@ def test_remove_iam_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_iam_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_iam_policy] = ( + mock_rpc + ) request = {} client.remove_iam_policy(request) @@ -11507,9 +11506,9 @@ def test_move_table_to_database_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_table_to_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_table_to_database] = ( + mock_rpc + ) request = {} client.move_table_to_database(request) @@ -12848,8 +12847,9 @@ def test_list_services_rest_bad_request(request_type=metastore.ListServicesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12914,17 +12914,20 @@ def test_list_services_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_list_services" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_list_services_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_list_services" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_list_services" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_list_services_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_list_services" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12975,8 +12978,9 @@ def test_get_service_rest_bad_request(request_type=metastore.GetServiceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13059,17 +13063,20 @@ def test_get_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_get_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_get_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_get_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_get_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_get_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_get_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13118,8 +13125,9 @@ def test_create_service_rest_bad_request(request_type=metastore.CreateServiceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13309,19 +13317,21 @@ def test_create_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_create_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_create_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_create_service" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_create_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_create_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_create_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13372,8 +13382,9 @@ def test_update_service_rest_bad_request(request_type=metastore.UpdateServiceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13565,19 +13576,21 @@ def test_update_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_update_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_update_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_update_service" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_update_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_update_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_update_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13626,8 +13639,9 @@ def test_delete_service_rest_bad_request(request_type=metastore.DeleteServiceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13684,19 +13698,21 @@ def test_delete_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_delete_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_delete_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_delete_service" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_delete_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_delete_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_delete_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13747,8 +13763,9 @@ def test_list_metadata_imports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13813,18 +13830,20 @@ def test_list_metadata_imports_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_list_metadata_imports" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_list_metadata_imports_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_list_metadata_imports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_list_metadata_imports" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_list_metadata_imports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_list_metadata_imports" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13884,8 +13903,9 @@ def test_get_metadata_import_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13954,18 +13974,20 @@ def test_get_metadata_import_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_get_metadata_import" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_get_metadata_import_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_get_metadata_import" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_get_metadata_import" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_get_metadata_import_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_get_metadata_import" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14018,8 +14040,9 @@ def test_create_metadata_import_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14157,20 +14180,21 @@ def test_create_metadata_import_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_create_metadata_import" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_create_metadata_import_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_create_metadata_import" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_create_metadata_import" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_create_metadata_import_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_create_metadata_import" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14227,8 +14251,9 @@ def test_update_metadata_import_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14370,20 +14395,21 @@ def test_update_metadata_import_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_update_metadata_import" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_update_metadata_import_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_update_metadata_import" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_update_metadata_import" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_update_metadata_import_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_update_metadata_import" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14434,8 +14460,9 @@ def test_export_metadata_rest_bad_request(request_type=metastore.ExportMetadataR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14492,20 +14519,21 @@ def test_export_metadata_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_export_metadata" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_export_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_export_metadata" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_export_metadata" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_export_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_export_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14556,8 +14584,9 @@ def test_restore_service_rest_bad_request(request_type=metastore.RestoreServiceR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14614,20 +14643,21 @@ def test_restore_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_restore_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_restore_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_restore_service" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_restore_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_restore_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_restore_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14678,8 +14708,9 @@ def test_list_backups_rest_bad_request(request_type=metastore.ListBackupsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14744,17 +14775,20 @@ def test_list_backups_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_list_backups" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_list_backups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_list_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_list_backups" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_list_backups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_list_backups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14807,8 +14841,9 @@ def test_get_backup_rest_bad_request(request_type=metastore.GetBackupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14879,17 +14914,19 @@ def test_get_backup_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_get_backup" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_get_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_get_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_get_backup" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_get_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_get_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14938,8 +14975,9 @@ def test_create_backup_rest_bad_request(request_type=metastore.CreateBackupReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15140,19 +15178,21 @@ def test_create_backup_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_create_backup" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_create_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_create_backup" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_create_backup" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_create_backup_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_create_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15203,8 +15243,9 @@ def test_delete_backup_rest_bad_request(request_type=metastore.DeleteBackupReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15263,19 +15304,21 @@ def test_delete_backup_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_delete_backup" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_delete_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_delete_backup" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_delete_backup" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_delete_backup_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_delete_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15328,8 +15371,9 @@ def test_remove_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15394,18 +15438,20 @@ def test_remove_iam_policy_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_remove_iam_policy" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_remove_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_remove_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_remove_iam_policy" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_remove_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_remove_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15458,8 +15504,9 @@ def test_query_metadata_rest_bad_request(request_type=metastore.QueryMetadataReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15516,19 +15563,21 @@ def test_query_metadata_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_query_metadata" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_query_metadata_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_query_metadata" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_query_metadata" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_query_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_query_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15579,8 +15628,9 @@ def test_move_table_to_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15637,20 +15687,21 @@ def test_move_table_to_database_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_move_table_to_database" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_move_table_to_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_move_table_to_database" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_move_table_to_database" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_move_table_to_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_move_table_to_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15703,8 +15754,9 @@ def test_alter_metadata_resource_location_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15761,22 +15813,23 @@ def test_alter_metadata_resource_location_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, - "post_alter_metadata_resource_location", - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_alter_metadata_resource_location_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "pre_alter_metadata_resource_location", - ) as pre: + 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.DataprocMetastoreRestInterceptor, + "post_alter_metadata_resource_location", + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_alter_metadata_resource_location_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "pre_alter_metadata_resource_location", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15829,8 +15882,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15889,8 +15943,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15951,8 +16006,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16013,8 +16069,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16075,8 +16132,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16137,8 +16195,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16199,8 +16258,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16261,8 +16321,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16323,8 +16384,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16875,11 +16937,14 @@ def test_dataproc_metastore_base_transport(): def test_dataproc_metastore_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.metastore_v1alpha.services.dataproc_metastore.transports.DataprocMetastoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.metastore_v1alpha.services.dataproc_metastore.transports.DataprocMetastoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataprocMetastoreTransport( @@ -16896,9 +16961,12 @@ def test_dataproc_metastore_base_transport_with_credentials_file(): def test_dataproc_metastore_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.metastore_v1alpha.services.dataproc_metastore.transports.DataprocMetastoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.metastore_v1alpha.services.dataproc_metastore.transports.DataprocMetastoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataprocMetastoreTransport() @@ -16970,11 +17038,12 @@ def test_dataproc_metastore_transport_auth_gdch_credentials(transport_class): def test_dataproc_metastore_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore_federation.py b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore_federation.py index a3c93fa32a30..5d32335d1174 100644 --- a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore_federation.py +++ b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore_federation.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,22 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1alpha.services.dataproc_metastore_federation import ( DataprocMetastoreFederationAsyncClient, @@ -1050,10 +1052,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1099,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1137,10 +1137,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1399,13 +1398,13 @@ def test_dataproc_metastore_federation_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1520,9 +1519,9 @@ def test_list_federations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_federations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_federations] = ( + mock_rpc + ) request = {} client.list_federations(request) @@ -2391,9 +2390,9 @@ def test_create_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_federation] = ( + mock_rpc + ) request = {} client.create_federation(request) @@ -2755,9 +2754,9 @@ def test_update_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_federation] = ( + mock_rpc + ) request = {} client.update_federation(request) @@ -3111,9 +3110,9 @@ def test_delete_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_federation] = ( + mock_rpc + ) request = {} client.delete_federation(request) @@ -3390,9 +3389,9 @@ def test_list_federations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_federations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_federations] = ( + mock_rpc + ) request = {} client.list_federations(request) @@ -3832,9 +3831,9 @@ def test_create_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_federation] = ( + mock_rpc + ) request = {} client.create_federation(request) @@ -4050,9 +4049,9 @@ def test_update_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_federation] = ( + mock_rpc + ) request = {} client.update_federation(request) @@ -4251,9 +4250,9 @@ def test_delete_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_federation] = ( + mock_rpc + ) request = {} client.delete_federation(request) @@ -4803,8 +4802,9 @@ def test_list_federations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4869,18 +4869,22 @@ def test_list_federations_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_list_federations" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_list_federations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_list_federations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_list_federations", + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_list_federations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "pre_list_federations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4938,8 +4942,9 @@ def test_get_federation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5012,18 +5017,20 @@ def test_get_federation_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_get_federation" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_get_federation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_get_federation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, "post_get_federation" + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_get_federation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, "pre_get_federation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5078,8 +5085,9 @@ def test_create_federation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5215,20 +5223,23 @@ def test_create_federation_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_create_federation" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_create_federation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_create_federation" - ) as pre: + 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.DataprocMetastoreFederationRestInterceptor, + "post_create_federation", + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_create_federation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "pre_create_federation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5283,8 +5294,9 @@ def test_update_federation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5422,20 +5434,23 @@ def test_update_federation_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_update_federation" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_update_federation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_update_federation" - ) as pre: + 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.DataprocMetastoreFederationRestInterceptor, + "post_update_federation", + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_update_federation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "pre_update_federation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5488,8 +5503,9 @@ def test_delete_federation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5546,20 +5562,23 @@ def test_delete_federation_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_delete_federation" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_delete_federation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_delete_federation" - ) as pre: + 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.DataprocMetastoreFederationRestInterceptor, + "post_delete_federation", + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_delete_federation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "pre_delete_federation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5612,8 +5631,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5672,8 +5692,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5734,8 +5755,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5796,8 +5818,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5858,8 +5881,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5920,8 +5944,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5982,8 +6007,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6044,8 +6070,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6106,8 +6133,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6356,11 +6384,14 @@ def test_dataproc_metastore_federation_base_transport(): def test_dataproc_metastore_federation_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.metastore_v1alpha.services.dataproc_metastore_federation.transports.DataprocMetastoreFederationTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.metastore_v1alpha.services.dataproc_metastore_federation.transports.DataprocMetastoreFederationTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataprocMetastoreFederationTransport( @@ -6377,9 +6408,12 @@ def test_dataproc_metastore_federation_base_transport_with_credentials_file(): def test_dataproc_metastore_federation_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.metastore_v1alpha.services.dataproc_metastore_federation.transports.DataprocMetastoreFederationTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.metastore_v1alpha.services.dataproc_metastore_federation.transports.DataprocMetastoreFederationTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataprocMetastoreFederationTransport() @@ -6456,11 +6490,12 @@ def test_dataproc_metastore_federation_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore.py b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore.py index d3cf5458a788..fd8b4bba3a11 100644 --- a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore.py +++ b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,24 +61,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore from google.cloud.metastore_v1beta.services.dataproc_metastore import ( DataprocMetastoreAsyncClient, @@ -998,10 +1000,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1047,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1085,9 @@ def test_dataproc_metastore_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,13 +1335,13 @@ def test_dataproc_metastore_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3407,9 +3406,9 @@ def test_list_metadata_imports_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_imports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_imports] = ( + mock_rpc + ) request = {} client.list_metadata_imports(request) @@ -3956,9 +3955,9 @@ def test_get_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_import] = ( + mock_rpc + ) request = {} client.get_metadata_import(request) @@ -4303,9 +4302,9 @@ def test_create_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_import] = ( + mock_rpc + ) request = {} client.create_metadata_import(request) @@ -4693,9 +4692,9 @@ def test_update_metadata_import_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_metadata_import] = ( + mock_rpc + ) request = {} client.update_metadata_import(request) @@ -7199,9 +7198,9 @@ def test_remove_iam_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_iam_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_iam_policy] = ( + mock_rpc + ) request = {} client.remove_iam_policy(request) @@ -7705,9 +7704,9 @@ def test_move_table_to_database_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_table_to_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_table_to_database] = ( + mock_rpc + ) request = {} client.move_table_to_database(request) @@ -9205,9 +9204,9 @@ def test_list_metadata_imports_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_metadata_imports - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_metadata_imports] = ( + mock_rpc + ) request = {} client.list_metadata_imports(request) @@ -9473,9 +9472,9 @@ def test_get_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metadata_import] = ( + mock_rpc + ) request = {} client.get_metadata_import(request) @@ -9658,9 +9657,9 @@ def test_create_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_metadata_import] = ( + mock_rpc + ) request = {} client.create_metadata_import(request) @@ -9889,9 +9888,9 @@ def test_update_metadata_import_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_metadata_import - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_metadata_import] = ( + mock_rpc + ) request = {} client.update_metadata_import(request) @@ -11247,9 +11246,9 @@ def test_remove_iam_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_iam_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_iam_policy] = ( + mock_rpc + ) request = {} client.remove_iam_policy(request) @@ -11507,9 +11506,9 @@ def test_move_table_to_database_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.move_table_to_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.move_table_to_database] = ( + mock_rpc + ) request = {} client.move_table_to_database(request) @@ -12848,8 +12847,9 @@ def test_list_services_rest_bad_request(request_type=metastore.ListServicesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12914,17 +12914,20 @@ def test_list_services_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_list_services" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_list_services_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_list_services" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_list_services" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_list_services_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_list_services" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12975,8 +12978,9 @@ def test_get_service_rest_bad_request(request_type=metastore.GetServiceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13059,17 +13063,20 @@ def test_get_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_get_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_get_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_get_service" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_get_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_get_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_get_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13118,8 +13125,9 @@ def test_create_service_rest_bad_request(request_type=metastore.CreateServiceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13309,19 +13317,21 @@ def test_create_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_create_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_create_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_create_service" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_create_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_create_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_create_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13372,8 +13382,9 @@ def test_update_service_rest_bad_request(request_type=metastore.UpdateServiceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13565,19 +13576,21 @@ def test_update_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_update_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_update_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_update_service" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_update_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_update_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_update_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13626,8 +13639,9 @@ def test_delete_service_rest_bad_request(request_type=metastore.DeleteServiceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13684,19 +13698,21 @@ def test_delete_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_delete_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_delete_service_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_delete_service" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_delete_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_delete_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_delete_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13747,8 +13763,9 @@ def test_list_metadata_imports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13813,18 +13830,20 @@ def test_list_metadata_imports_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_list_metadata_imports" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_list_metadata_imports_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_list_metadata_imports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_list_metadata_imports" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_list_metadata_imports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_list_metadata_imports" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13884,8 +13903,9 @@ def test_get_metadata_import_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13954,18 +13974,20 @@ def test_get_metadata_import_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_get_metadata_import" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_get_metadata_import_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_get_metadata_import" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_get_metadata_import" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_get_metadata_import_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_get_metadata_import" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14018,8 +14040,9 @@ def test_create_metadata_import_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14157,20 +14180,21 @@ def test_create_metadata_import_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_create_metadata_import" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_create_metadata_import_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_create_metadata_import" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_create_metadata_import" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_create_metadata_import_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_create_metadata_import" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14227,8 +14251,9 @@ def test_update_metadata_import_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14370,20 +14395,21 @@ def test_update_metadata_import_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_update_metadata_import" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_update_metadata_import_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_update_metadata_import" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_update_metadata_import" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_update_metadata_import_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_update_metadata_import" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14434,8 +14460,9 @@ def test_export_metadata_rest_bad_request(request_type=metastore.ExportMetadataR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14492,20 +14519,21 @@ def test_export_metadata_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_export_metadata" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_export_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_export_metadata" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_export_metadata" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_export_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_export_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14556,8 +14584,9 @@ def test_restore_service_rest_bad_request(request_type=metastore.RestoreServiceR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14614,20 +14643,21 @@ def test_restore_service_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_restore_service" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_restore_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_restore_service" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_restore_service" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_restore_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_restore_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14678,8 +14708,9 @@ def test_list_backups_rest_bad_request(request_type=metastore.ListBackupsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14744,17 +14775,20 @@ def test_list_backups_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_list_backups" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_list_backups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_list_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_list_backups" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_list_backups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_list_backups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14807,8 +14841,9 @@ def test_get_backup_rest_bad_request(request_type=metastore.GetBackupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14879,17 +14914,19 @@ def test_get_backup_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_get_backup" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_get_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_get_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_get_backup" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_get_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_get_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14938,8 +14975,9 @@ def test_create_backup_rest_bad_request(request_type=metastore.CreateBackupReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15140,19 +15178,21 @@ def test_create_backup_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_create_backup" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_create_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_create_backup" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_create_backup" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_create_backup_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_create_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15203,8 +15243,9 @@ def test_delete_backup_rest_bad_request(request_type=metastore.DeleteBackupReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15263,19 +15304,21 @@ def test_delete_backup_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_delete_backup" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_delete_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_delete_backup" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_delete_backup" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_delete_backup_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_delete_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15328,8 +15371,9 @@ def test_remove_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15394,18 +15438,20 @@ def test_remove_iam_policy_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_remove_iam_policy" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_remove_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_remove_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "post_remove_iam_policy" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_remove_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_remove_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15458,8 +15504,9 @@ def test_query_metadata_rest_bad_request(request_type=metastore.QueryMetadataReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15516,19 +15563,21 @@ def test_query_metadata_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_query_metadata" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "post_query_metadata_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_query_metadata" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_query_metadata" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_query_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_query_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15579,8 +15628,9 @@ def test_move_table_to_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15637,20 +15687,21 @@ def test_move_table_to_database_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, "post_move_table_to_database" - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_move_table_to_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, "pre_move_table_to_database" - ) as pre: + 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.DataprocMetastoreRestInterceptor, "post_move_table_to_database" + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_move_table_to_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, "pre_move_table_to_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15703,8 +15754,9 @@ def test_alter_metadata_resource_location_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15761,22 +15813,23 @@ def test_alter_metadata_resource_location_rest_interceptors(null_interceptor): ) client = DataprocMetastoreClient(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.DataprocMetastoreRestInterceptor, - "post_alter_metadata_resource_location", - ) as post, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "post_alter_metadata_resource_location_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreRestInterceptor, - "pre_alter_metadata_resource_location", - ) as pre: + 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.DataprocMetastoreRestInterceptor, + "post_alter_metadata_resource_location", + ) as post, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "post_alter_metadata_resource_location_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreRestInterceptor, + "pre_alter_metadata_resource_location", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15829,8 +15882,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15889,8 +15943,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15951,8 +16006,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16013,8 +16069,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16075,8 +16132,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16137,8 +16195,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16199,8 +16258,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16261,8 +16321,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16323,8 +16384,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16875,11 +16937,14 @@ def test_dataproc_metastore_base_transport(): def test_dataproc_metastore_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.metastore_v1beta.services.dataproc_metastore.transports.DataprocMetastoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.metastore_v1beta.services.dataproc_metastore.transports.DataprocMetastoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataprocMetastoreTransport( @@ -16896,9 +16961,12 @@ def test_dataproc_metastore_base_transport_with_credentials_file(): def test_dataproc_metastore_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.metastore_v1beta.services.dataproc_metastore.transports.DataprocMetastoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.metastore_v1beta.services.dataproc_metastore.transports.DataprocMetastoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataprocMetastoreTransport() @@ -16970,11 +17038,12 @@ def test_dataproc_metastore_transport_auth_gdch_credentials(transport_class): def test_dataproc_metastore_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore_federation.py b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore_federation.py index 3e90e16dc3c4..67677bf4fd0c 100644 --- a/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore_federation.py +++ b/packages/google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1beta/test_dataproc_metastore_federation.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,22 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.metastore_v1beta.services.dataproc_metastore_federation import ( DataprocMetastoreFederationAsyncClient, @@ -1050,10 +1052,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1099,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1137,10 +1137,9 @@ def test_dataproc_metastore_federation_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1399,13 +1398,13 @@ def test_dataproc_metastore_federation_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1520,9 +1519,9 @@ def test_list_federations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_federations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_federations] = ( + mock_rpc + ) request = {} client.list_federations(request) @@ -2391,9 +2390,9 @@ def test_create_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_federation] = ( + mock_rpc + ) request = {} client.create_federation(request) @@ -2755,9 +2754,9 @@ def test_update_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_federation] = ( + mock_rpc + ) request = {} client.update_federation(request) @@ -3111,9 +3110,9 @@ def test_delete_federation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_federation] = ( + mock_rpc + ) request = {} client.delete_federation(request) @@ -3390,9 +3389,9 @@ def test_list_federations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_federations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_federations] = ( + mock_rpc + ) request = {} client.list_federations(request) @@ -3832,9 +3831,9 @@ def test_create_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_federation] = ( + mock_rpc + ) request = {} client.create_federation(request) @@ -4050,9 +4049,9 @@ def test_update_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_federation] = ( + mock_rpc + ) request = {} client.update_federation(request) @@ -4251,9 +4250,9 @@ def test_delete_federation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_federation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_federation] = ( + mock_rpc + ) request = {} client.delete_federation(request) @@ -4803,8 +4802,9 @@ def test_list_federations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4869,18 +4869,22 @@ def test_list_federations_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_list_federations" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_list_federations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_list_federations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_list_federations", + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_list_federations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "pre_list_federations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4938,8 +4942,9 @@ def test_get_federation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5012,18 +5017,20 @@ def test_get_federation_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_get_federation" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_get_federation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_get_federation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, "post_get_federation" + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_get_federation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, "pre_get_federation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5078,8 +5085,9 @@ def test_create_federation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5215,20 +5223,23 @@ def test_create_federation_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_create_federation" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_create_federation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_create_federation" - ) as pre: + 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.DataprocMetastoreFederationRestInterceptor, + "post_create_federation", + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_create_federation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "pre_create_federation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5283,8 +5294,9 @@ def test_update_federation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5422,20 +5434,23 @@ def test_update_federation_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_update_federation" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_update_federation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_update_federation" - ) as pre: + 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.DataprocMetastoreFederationRestInterceptor, + "post_update_federation", + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_update_federation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "pre_update_federation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5488,8 +5503,9 @@ def test_delete_federation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5546,20 +5562,23 @@ def test_delete_federation_rest_interceptors(null_interceptor): ) client = DataprocMetastoreFederationClient(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.DataprocMetastoreFederationRestInterceptor, "post_delete_federation" - ) as post, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, - "post_delete_federation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataprocMetastoreFederationRestInterceptor, "pre_delete_federation" - ) as pre: + 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.DataprocMetastoreFederationRestInterceptor, + "post_delete_federation", + ) as post, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "post_delete_federation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataprocMetastoreFederationRestInterceptor, + "pre_delete_federation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5612,8 +5631,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5672,8 +5692,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5734,8 +5755,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5796,8 +5818,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5858,8 +5881,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5920,8 +5944,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5982,8 +6007,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6044,8 +6070,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6106,8 +6133,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6356,11 +6384,14 @@ def test_dataproc_metastore_federation_base_transport(): def test_dataproc_metastore_federation_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.metastore_v1beta.services.dataproc_metastore_federation.transports.DataprocMetastoreFederationTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.metastore_v1beta.services.dataproc_metastore_federation.transports.DataprocMetastoreFederationTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataprocMetastoreFederationTransport( @@ -6377,9 +6408,12 @@ def test_dataproc_metastore_federation_base_transport_with_credentials_file(): def test_dataproc_metastore_federation_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.metastore_v1beta.services.dataproc_metastore_federation.transports.DataprocMetastoreFederationTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.metastore_v1beta.services.dataproc_metastore_federation.transports.DataprocMetastoreFederationTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataprocMetastoreFederationTransport() @@ -6456,11 +6490,12 @@ def test_dataproc_metastore_federation_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc/docs/conf.py b/packages/google-cloud-dataproc/docs/conf.py index 5108079581c0..a983c7d0b862 100644 --- a/packages/google-cloud-dataproc/docs/conf.py +++ b/packages/google-cloud-dataproc/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-dataproc documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/__init__.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/__init__.py index 626c0eb84df9..bfad2f05d701 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/__init__.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.autoscaling_policy_service import ( AutoscalingPolicyServiceAsyncClient, AutoscalingPolicyServiceClient, diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py index 533e04e4127c..5f1198ec6c6b 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -44,8 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.autoscaling_policy_service import pagers @@ -129,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AutoscalingPolicyServiceAsyncClient: The constructed client. """ - return AutoscalingPolicyServiceClient.from_service_account_info.__func__(AutoscalingPolicyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AutoscalingPolicyServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AutoscalingPolicyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +148,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AutoscalingPolicyServiceAsyncClient: The constructed client. """ - return AutoscalingPolicyServiceClient.from_service_account_file.__func__(AutoscalingPolicyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AutoscalingPolicyServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + AutoscalingPolicyServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -183,7 +189,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AutoscalingPolicyServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AutoscalingPolicyServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AutoscalingPolicyServiceTransport: diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py index f497e6463d55..97c91cd6c697 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -61,8 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.autoscaling_policy_service import pagers @@ -82,9 +84,7 @@ class AutoscalingPolicyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AutoscalingPolicyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AutoscalingPolicyServiceTransport]] _transport_registry["grpc"] = AutoscalingPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = AutoscalingPolicyServiceGrpcAsyncIOTransport _transport_registry["rest"] = AutoscalingPolicyServiceRestTransport @@ -632,11 +632,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutoscalingPolicyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutoscalingPolicyServiceClient._read_environment_variables() + ) self._client_cert_source = ( AutoscalingPolicyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -673,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutoscalingPolicyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/pagers.py index 7f9ba54df6c4..8728f50a059d 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/__init__.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/__init__.py index b2f97f6a7529..b611e7b112e6 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/__init__.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AutoscalingPolicyServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AutoscalingPolicyServiceTransport]] _transport_registry["grpc"] = AutoscalingPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = AutoscalingPolicyServiceGrpcAsyncIOTransport _transport_registry["rest"] = AutoscalingPolicyServiceRestTransport diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py index 8a82fdd4ead1..209a98a0c209 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import autoscaling_policies @@ -322,13 +324,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py index 599d6f2a543c..f64ce3ed126f 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import autoscaling_policies diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py index 572a6d8488c7..81c0a9a31789 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import autoscaling_policies diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py index bf2e4b5af8c5..c8a42fe6e30c 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -654,9 +656,7 @@ def __call__( """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseCreateAutoscalingPolicy._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseCreateAutoscalingPolicy._get_http_options() request, metadata = self._interceptor.pre_create_autoscaling_policy( request, metadata @@ -807,9 +807,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseDeleteAutoscalingPolicy._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseDeleteAutoscalingPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_autoscaling_policy( request, metadata @@ -831,7 +829,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -923,9 +921,7 @@ def __call__( """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseGetAutoscalingPolicy._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseGetAutoscalingPolicy._get_http_options() request, metadata = self._interceptor.pre_get_autoscaling_policy( request, metadata @@ -1075,9 +1071,7 @@ def __call__( """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseListAutoscalingPolicies._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseListAutoscalingPolicies._get_http_options() request, metadata = self._interceptor.pre_list_autoscaling_policies( request, metadata @@ -1230,9 +1224,7 @@ def __call__( """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseUpdateAutoscalingPolicy._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseUpdateAutoscalingPolicy._get_http_options() request, metadata = self._interceptor.pre_update_autoscaling_policy( request, metadata @@ -1338,7 +1330,9 @@ def create_autoscaling_policy( ]: # 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._CreateAutoscalingPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._CreateAutoscalingPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_autoscaling_policy( @@ -1348,7 +1342,9 @@ def delete_autoscaling_policy( ]: # 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._DeleteAutoscalingPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAutoscalingPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_autoscaling_policy( @@ -1370,7 +1366,9 @@ def list_autoscaling_policies( ]: # 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._ListAutoscalingPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._ListAutoscalingPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_autoscaling_policy( @@ -1381,7 +1379,9 @@ def update_autoscaling_policy( ]: # 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._UpdateAutoscalingPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAutoscalingPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_iam_policy(self): @@ -1442,9 +1442,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseAutoscalingPolicyServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1591,9 +1589,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseAutoscalingPolicyServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1740,9 +1736,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1887,9 +1881,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2004,9 +1996,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2124,9 +2114,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAutoscalingPolicyServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2267,9 +2255,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAutoscalingPolicyServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAutoscalingPolicyServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAutoscalingPolicyServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest_base.py index a9873de2cdde..981f53f76f7f 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest_base.py @@ -17,11 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dataproc_v1.types import autoscaling_policies diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/async_client.py index 1dc8827c3c5b..3a7d9ef237e9 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -44,12 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.batch_controller import pagers from google.cloud.dataproc_v1.types import batches, operations, shared @@ -124,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BatchControllerAsyncClient: The constructed client. """ - return BatchControllerClient.from_service_account_info.__func__(BatchControllerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BatchControllerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BatchControllerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BatchControllerAsyncClient: The constructed client. """ - return BatchControllerClient.from_service_account_file.__func__(BatchControllerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BatchControllerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BatchControllerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/client.py index 679aecf8e291..293f8dc2b2e1 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -61,12 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.batch_controller import pagers from google.cloud.dataproc_v1.types import batches, operations, shared @@ -85,9 +87,7 @@ class BatchControllerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[BatchControllerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[BatchControllerTransport]] _transport_registry["grpc"] = BatchControllerGrpcTransport _transport_registry["grpc_asyncio"] = BatchControllerGrpcAsyncIOTransport _transport_registry["rest"] = BatchControllerRestTransport @@ -653,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BatchControllerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BatchControllerClient._read_environment_variables() + ) self._client_cert_source = BatchControllerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -692,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BatchControllerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/pagers.py index 14dfc4621cb9..097cf3b5222f 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/base.py index cd1cc881d62b..bab0fe070ea6 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import batches @@ -269,13 +271,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py index 7006cd8d4b20..d46b0378ff4a 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import batches diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py index cf85e4a6c26e..4d4756ce21b7 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import batches diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py index ea4552f36729..3eb2db76c28f 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -666,7 +668,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -805,7 +807,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1514,9 +1516,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseBatchControllerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBatchControllerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1658,9 +1658,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBatchControllerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseBatchControllerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1772,9 +1770,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseBatchControllerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseBatchControllerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2029,9 +2025,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseBatchControllerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseBatchControllerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseBatchControllerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest_base.py index 82150d7322a0..a845640d1fc6 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/transports/rest_base.py @@ -17,11 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dataproc_v1.types import batches diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/async_client.py index 3caa28add2bb..23601b8ac88a 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -44,13 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dataproc_v1.services.cluster_controller import pagers from google.cloud.dataproc_v1.types import clusters, operations @@ -129,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ClusterControllerAsyncClient: The constructed client. """ - return ClusterControllerClient.from_service_account_info.__func__(ClusterControllerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ClusterControllerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ClusterControllerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ClusterControllerAsyncClient: The constructed client. """ - return ClusterControllerClient.from_service_account_file.__func__(ClusterControllerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ClusterControllerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ClusterControllerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/client.py index 0b6bb9f8d3a4..f00990a7ea7a 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -61,13 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dataproc_v1.services.cluster_controller import pagers from google.cloud.dataproc_v1.types import clusters, operations @@ -86,9 +88,7 @@ class ClusterControllerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ClusterControllerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ClusterControllerTransport]] _transport_registry["grpc"] = ClusterControllerGrpcTransport _transport_registry["grpc_asyncio"] = ClusterControllerGrpcAsyncIOTransport _transport_registry["rest"] = ClusterControllerRestTransport @@ -704,11 +704,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ClusterControllerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ClusterControllerClient._read_environment_variables() + ) self._client_cert_source = ClusterControllerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -743,8 +741,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ClusterControllerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/pagers.py index 152062a30190..d151cd21d5bc 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/base.py index 752a947678a6..ec03bad70895 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/base.py @@ -17,16 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import clusters @@ -384,13 +386,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc.py index d03e0036d3ae..64a30601a5f3 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc.py @@ -16,20 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import clusters diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc_asyncio.py index 027d194776f6..9e4733d575be 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc_asyncio.py @@ -17,22 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import clusters diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py index 911cfe612e4e..0c6834a10c58 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py @@ -16,18 +16,20 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -898,9 +900,7 @@ def __call__( """ - http_options = ( - _BaseClusterControllerRestTransport._BaseCreateCluster._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseCreateCluster._get_http_options() request, metadata = self._interceptor.pre_create_cluster(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseCreateCluster._get_transcoded_request( @@ -924,7 +924,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1049,9 +1049,7 @@ def __call__( """ - http_options = ( - _BaseClusterControllerRestTransport._BaseDeleteCluster._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseDeleteCluster._get_http_options() request, metadata = self._interceptor.pre_delete_cluster(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseDeleteCluster._get_transcoded_request( @@ -1071,7 +1069,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1197,9 +1195,7 @@ def __call__( """ - http_options = ( - _BaseClusterControllerRestTransport._BaseDiagnoseCluster._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseDiagnoseCluster._get_http_options() request, metadata = self._interceptor.pre_diagnose_cluster( request, metadata @@ -1225,7 +1221,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1498,9 +1494,7 @@ def __call__( """ - http_options = ( - _BaseClusterControllerRestTransport._BaseListClusters._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseListClusters._get_http_options() request, metadata = self._interceptor.pre_list_clusters(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseListClusters._get_transcoded_request( @@ -1646,9 +1640,7 @@ def __call__( """ - http_options = ( - _BaseClusterControllerRestTransport._BaseStartCluster._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseStartCluster._get_http_options() request, metadata = self._interceptor.pre_start_cluster(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseStartCluster._get_transcoded_request( @@ -1672,7 +1664,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1823,7 +1815,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1949,9 +1941,7 @@ def __call__( """ - http_options = ( - _BaseClusterControllerRestTransport._BaseUpdateCluster._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseUpdateCluster._get_http_options() request, metadata = self._interceptor.pre_update_cluster(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseUpdateCluster._get_transcoded_request( @@ -1975,7 +1965,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2162,9 +2152,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2308,9 +2296,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2455,9 +2441,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2600,9 +2584,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2715,9 +2697,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2832,9 +2812,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseGetOperation._get_transcoded_request( @@ -2973,9 +2951,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseClusterControllerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseClusterControllerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseClusterControllerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest_base.py index 884dc3cadb31..12662ca91e3d 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/transports/rest_base.py @@ -18,8 +18,10 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/async_client.py index bae09e62a626..70aad00148a4 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -44,10 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.job_controller import pagers @@ -117,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: JobControllerAsyncClient: The constructed client. """ - return JobControllerClient.from_service_account_info.__func__(JobControllerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = JobControllerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(JobControllerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: JobControllerAsyncClient: The constructed client. """ - return JobControllerClient.from_service_account_file.__func__(JobControllerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = JobControllerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(JobControllerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/client.py index 28e7a4c333f2..fd43ec386976 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -61,10 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.job_controller import pagers @@ -602,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = JobControllerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + JobControllerClient._read_environment_variables() + ) self._client_cert_source = JobControllerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(JobControllerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/pagers.py index 75ddd0cf7dcf..07d534c54631 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/base.py index f8544227a0a2..3ddcfb4850c2 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import jobs @@ -369,13 +371,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc.py index a875600923f2..bfac2b7c7f0d 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import jobs diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc_asyncio.py index f909c9b1b414..d2fe5a986122 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import jobs diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest.py index acbe371a372e..28837ad04cd3 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -961,7 +963,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1504,9 +1506,7 @@ def __call__( """ - http_options = ( - _BaseJobControllerRestTransport._BaseSubmitJobAsOperation._get_http_options() - ) + http_options = _BaseJobControllerRestTransport._BaseSubmitJobAsOperation._get_http_options() request, metadata = self._interceptor.pre_submit_job_as_operation( request, metadata @@ -1532,7 +1532,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2149,9 +2149,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseJobControllerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseJobControllerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest_base.py index 1868f366f5bd..a6eac65dc33a 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/transports/rest_base.py @@ -17,11 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dataproc_v1.types import jobs diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/async_client.py index 9186f44d756e..e96bfd4f0e5c 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -44,10 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.types import clusters, node_groups, operations @@ -122,7 +124,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: NodeGroupControllerAsyncClient: The constructed client. """ - return NodeGroupControllerClient.from_service_account_info.__func__(NodeGroupControllerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = NodeGroupControllerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(NodeGroupControllerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +141,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: NodeGroupControllerAsyncClient: The constructed client. """ - return NodeGroupControllerClient.from_service_account_file.__func__(NodeGroupControllerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = NodeGroupControllerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(NodeGroupControllerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -176,7 +180,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return NodeGroupControllerClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return NodeGroupControllerClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> NodeGroupControllerTransport: diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/client.py index 4f70e430e492..cd7d690d53bd 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -61,10 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.types import clusters, node_groups, operations @@ -83,9 +85,7 @@ class NodeGroupControllerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NodeGroupControllerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NodeGroupControllerTransport]] _transport_registry["grpc"] = NodeGroupControllerGrpcTransport _transport_registry["grpc_asyncio"] = NodeGroupControllerGrpcAsyncIOTransport _transport_registry["rest"] = NodeGroupControllerRestTransport @@ -633,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NodeGroupControllerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NodeGroupControllerClient._read_environment_variables() + ) self._client_cert_source = NodeGroupControllerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -672,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NodeGroupControllerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/__init__.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/__init__.py index 668c835913b7..d9ce5ab0a93f 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/__init__.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import NodeGroupControllerRestInterceptor, NodeGroupControllerRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NodeGroupControllerTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NodeGroupControllerTransport]] _transport_registry["grpc"] = NodeGroupControllerGrpcTransport _transport_registry["grpc_asyncio"] = NodeGroupControllerGrpcAsyncIOTransport _transport_registry["rest"] = NodeGroupControllerRestTransport diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/base.py index 0a6f165b4cd6..ba560f36221d 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/base.py @@ -17,16 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import clusters, node_groups @@ -256,13 +258,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc.py index 2693e8f932fc..5b735ef655df 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc.py @@ -16,20 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import clusters, node_groups diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc_asyncio.py index 7d22402bef53..4da891bcba64 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc_asyncio.py @@ -17,22 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import clusters, node_groups diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py index aa70352e3ac3..d24c7fdfe199 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py @@ -16,18 +16,20 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -632,9 +634,7 @@ def __call__( """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseCreateNodeGroup._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseCreateNodeGroup._get_http_options() request, metadata = self._interceptor.pre_create_node_group( request, metadata @@ -660,7 +660,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -786,9 +786,7 @@ def __call__( """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseGetNodeGroup._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseGetNodeGroup._get_http_options() request, metadata = self._interceptor.pre_get_node_group(request, metadata) transcoded_request = _BaseNodeGroupControllerRestTransport._BaseGetNodeGroup._get_transcoded_request( @@ -935,9 +933,7 @@ def __call__( """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseResizeNodeGroup._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseResizeNodeGroup._get_http_options() request, metadata = self._interceptor.pre_resize_node_group( request, metadata @@ -963,7 +959,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1113,9 +1109,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseNodeGroupControllerRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1260,9 +1254,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseNodeGroupControllerRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1407,9 +1399,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1554,9 +1544,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1669,9 +1657,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -1787,9 +1773,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseNodeGroupControllerRestTransport._BaseGetOperation._get_transcoded_request( @@ -1928,9 +1912,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseNodeGroupControllerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseNodeGroupControllerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseNodeGroupControllerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest_base.py index 6fbde39b63d6..9526a896c88e 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/transports/rest_base.py @@ -18,8 +18,10 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/async_client.py index 2de67cf8d3b2..167c9bbefbf7 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -44,12 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.session_controller import pagers from google.cloud.dataproc_v1.types import operations, sessions, shared @@ -128,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionControllerAsyncClient: The constructed client. """ - return SessionControllerClient.from_service_account_info.__func__(SessionControllerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SessionControllerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SessionControllerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionControllerAsyncClient: The constructed client. """ - return SessionControllerClient.from_service_account_file.__func__(SessionControllerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SessionControllerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SessionControllerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/client.py index 2127149711ce..114ba09c73f6 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -61,12 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.session_controller import pagers from google.cloud.dataproc_v1.types import operations, sessions, shared @@ -85,9 +87,7 @@ class SessionControllerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionControllerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionControllerTransport]] _transport_registry["grpc"] = SessionControllerGrpcTransport _transport_registry["grpc_asyncio"] = SessionControllerGrpcAsyncIOTransport _transport_registry["rest"] = SessionControllerRestTransport @@ -677,11 +677,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionControllerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionControllerClient._read_environment_variables() + ) self._client_cert_source = SessionControllerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -716,8 +714,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionControllerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/pagers.py index 6ba10ab1fcde..3678d853b56e 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/base.py index 73f626bd99ce..8464b2b0016c 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/base.py @@ -17,16 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import sessions @@ -284,13 +286,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc.py index b3e91243b9b1..19fa7481ad09 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc.py @@ -16,20 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import sessions diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc_asyncio.py index 4231296d80be..d91b1ad87df9 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/grpc_asyncio.py @@ -17,22 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import sessions diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest.py index bf7627b8e572..01acd2e02443 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest.py @@ -16,18 +16,20 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -736,9 +738,7 @@ def __call__( """ - http_options = ( - _BaseSessionControllerRestTransport._BaseCreateSession._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseCreateSession._get_http_options() request, metadata = self._interceptor.pre_create_session(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseCreateSession._get_transcoded_request( @@ -762,7 +762,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -887,9 +887,7 @@ def __call__( """ - http_options = ( - _BaseSessionControllerRestTransport._BaseDeleteSession._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseDeleteSession._get_http_options() request, metadata = self._interceptor.pre_delete_session(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseDeleteSession._get_transcoded_request( @@ -909,7 +907,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1175,9 +1173,7 @@ def __call__( A list of interactive sessions. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseListSessions._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseListSessions._get_http_options() request, metadata = self._interceptor.pre_list_sessions(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseListSessions._get_transcoded_request( @@ -1325,9 +1321,7 @@ def __call__( """ - http_options = ( - _BaseSessionControllerRestTransport._BaseTerminateSession._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseTerminateSession._get_http_options() request, metadata = self._interceptor.pre_terminate_session( request, metadata @@ -1353,7 +1347,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1516,9 +1510,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1662,9 +1654,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1809,9 +1799,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1954,9 +1942,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2069,9 +2055,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2186,9 +2170,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseGetOperation._get_transcoded_request( @@ -2327,9 +2309,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSessionControllerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSessionControllerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSessionControllerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest_base.py index ac286f79fadd..8861de8e1069 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_controller/transports/rest_base.py @@ -18,8 +18,10 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/async_client.py index dfdbf2638c7e..0062647a0b9b 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -44,10 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.session_template_controller import pagers from google.cloud.dataproc_v1.types import session_templates, sessions, shared @@ -136,7 +138,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionTemplateControllerAsyncClient: The constructed client. """ - return SessionTemplateControllerClient.from_service_account_info.__func__(SessionTemplateControllerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + SessionTemplateControllerClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func(SessionTemplateControllerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -152,7 +157,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionTemplateControllerAsyncClient: The constructed client. """ - return SessionTemplateControllerClient.from_service_account_file.__func__(SessionTemplateControllerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + SessionTemplateControllerClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + SessionTemplateControllerAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -190,7 +200,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SessionTemplateControllerClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SessionTemplateControllerClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SessionTemplateControllerTransport: diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/client.py index f71b5da0fa07..c65fad323248 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -61,10 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.session_template_controller import pagers from google.cloud.dataproc_v1.types import session_templates, sessions, shared @@ -83,9 +85,7 @@ class SessionTemplateControllerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionTemplateControllerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionTemplateControllerTransport]] _transport_registry["grpc"] = SessionTemplateControllerGrpcTransport _transport_registry["grpc_asyncio"] = SessionTemplateControllerGrpcAsyncIOTransport _transport_registry["rest"] = SessionTemplateControllerRestTransport @@ -655,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionTemplateControllerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionTemplateControllerClient._read_environment_variables() + ) self._client_cert_source = ( SessionTemplateControllerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -696,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionTemplateControllerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/pagers.py index 44944e815511..cabf2cfa1c1e 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/__init__.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/__init__.py index 352cc93dcae0..de3cae849455 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/__init__.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SessionTemplateControllerTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SessionTemplateControllerTransport]] _transport_registry["grpc"] = SessionTemplateControllerGrpcTransport _transport_registry["grpc_asyncio"] = SessionTemplateControllerGrpcAsyncIOTransport _transport_registry["rest"] = SessionTemplateControllerRestTransport diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/base.py index 4433100f22b0..be40468e8349 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import session_templates @@ -292,13 +294,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc.py index 3907b905ed83..dd732bc9c908 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import session_templates diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc_asyncio.py index 49fa9a32392d..b363c48ab3c9 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import session_templates diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest.py index b3be95a7be8d..0e6a9fc74019 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -656,9 +658,7 @@ def __call__( """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseCreateSessionTemplate._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseCreateSessionTemplate._get_http_options() request, metadata = self._interceptor.pre_create_session_template( request, metadata @@ -807,9 +807,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseDeleteSessionTemplate._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseDeleteSessionTemplate._get_http_options() request, metadata = self._interceptor.pre_delete_session_template( request, metadata @@ -831,7 +829,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -923,9 +921,7 @@ def __call__( """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseGetSessionTemplate._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseGetSessionTemplate._get_http_options() request, metadata = self._interceptor.pre_get_session_template( request, metadata @@ -1073,9 +1069,7 @@ def __call__( A list of session templates. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseListSessionTemplates._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseListSessionTemplates._get_http_options() request, metadata = self._interceptor.pre_list_session_templates( request, metadata @@ -1226,9 +1220,7 @@ def __call__( """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseUpdateSessionTemplate._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseUpdateSessionTemplate._get_http_options() request, metadata = self._interceptor.pre_update_session_template( request, metadata @@ -1435,9 +1427,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseSessionTemplateControllerRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1584,9 +1574,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseSessionTemplateControllerRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1733,9 +1721,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -1878,9 +1864,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1995,9 +1979,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2115,9 +2097,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSessionTemplateControllerRestTransport._BaseGetOperation._get_transcoded_request( @@ -2258,9 +2238,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSessionTemplateControllerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSessionTemplateControllerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSessionTemplateControllerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest_base.py index 498dfee4c2c5..6545a903041b 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/session_template_controller/transports/rest_base.py @@ -17,11 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dataproc_v1.types import session_templates diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py index fc28648e12ae..479c3469e3eb 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -44,14 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.workflow_template_service import pagers from google.cloud.dataproc_v1.types import workflow_templates @@ -144,7 +146,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: WorkflowTemplateServiceAsyncClient: The constructed client. """ - return WorkflowTemplateServiceClient.from_service_account_info.__func__(WorkflowTemplateServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = WorkflowTemplateServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(WorkflowTemplateServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +163,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: WorkflowTemplateServiceAsyncClient: The constructed client. """ - return WorkflowTemplateServiceClient.from_service_account_file.__func__(WorkflowTemplateServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = WorkflowTemplateServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + WorkflowTemplateServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -198,7 +204,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return WorkflowTemplateServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return WorkflowTemplateServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> WorkflowTemplateServiceTransport: diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/client.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/client.py index 92134b4bca57..61d5f6062145 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/client.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dataproc_v1 import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.workflow_template_service import pagers from google.cloud.dataproc_v1.types import workflow_templates @@ -87,9 +89,7 @@ class WorkflowTemplateServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[WorkflowTemplateServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[WorkflowTemplateServiceTransport]] _transport_registry["grpc"] = WorkflowTemplateServiceGrpcTransport _transport_registry["grpc_asyncio"] = WorkflowTemplateServiceGrpcAsyncIOTransport _transport_registry["rest"] = WorkflowTemplateServiceRestTransport @@ -707,11 +707,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = WorkflowTemplateServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + WorkflowTemplateServiceClient._read_environment_variables() + ) self._client_cert_source = ( WorkflowTemplateServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -748,8 +746,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(WorkflowTemplateServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/pagers.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/pagers.py index 7873fa6df519..40bede01c13c 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/pagers.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/__init__.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/__init__.py index 270744e94849..0bf9bc46d52c 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/__init__.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[WorkflowTemplateServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[WorkflowTemplateServiceTransport]] _transport_registry["grpc"] = WorkflowTemplateServiceGrpcTransport _transport_registry["grpc_asyncio"] = WorkflowTemplateServiceGrpcAsyncIOTransport _transport_registry["rest"] = WorkflowTemplateServiceRestTransport diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/base.py index 58de9d345ef2..97ff1f77dc54 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataproc_v1 import gapic_version as package_version from google.cloud.dataproc_v1.types import workflow_templates @@ -392,13 +394,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py index 1c5f9aef3395..ee7804ed1e23 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import workflow_templates @@ -446,12 +448,12 @@ def instantiate_workflow_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "instantiate_workflow_template" not in self._stubs: - self._stubs[ - "instantiate_workflow_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateWorkflowTemplate", - request_serializer=workflow_templates.InstantiateWorkflowTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["instantiate_workflow_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateWorkflowTemplate", + request_serializer=workflow_templates.InstantiateWorkflowTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["instantiate_workflow_template"] @@ -503,12 +505,12 @@ def instantiate_inline_workflow_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "instantiate_inline_workflow_template" not in self._stubs: - self._stubs[ - "instantiate_inline_workflow_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateInlineWorkflowTemplate", - request_serializer=workflow_templates.InstantiateInlineWorkflowTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["instantiate_inline_workflow_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateInlineWorkflowTemplate", + request_serializer=workflow_templates.InstantiateInlineWorkflowTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["instantiate_inline_workflow_template"] diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py index e2073df972e4..cc42e937965e 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dataproc_v1.types import workflow_templates @@ -454,12 +456,12 @@ def instantiate_workflow_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "instantiate_workflow_template" not in self._stubs: - self._stubs[ - "instantiate_workflow_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateWorkflowTemplate", - request_serializer=workflow_templates.InstantiateWorkflowTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["instantiate_workflow_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateWorkflowTemplate", + request_serializer=workflow_templates.InstantiateWorkflowTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["instantiate_workflow_template"] @@ -511,12 +513,12 @@ def instantiate_inline_workflow_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "instantiate_inline_workflow_template" not in self._stubs: - self._stubs[ - "instantiate_inline_workflow_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateInlineWorkflowTemplate", - request_serializer=workflow_templates.InstantiateInlineWorkflowTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["instantiate_inline_workflow_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dataproc.v1.WorkflowTemplateService/InstantiateInlineWorkflowTemplate", + request_serializer=workflow_templates.InstantiateInlineWorkflowTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["instantiate_inline_workflow_template"] diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py index faaa1a8596d4..d784c5f5c4ff 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -837,9 +839,7 @@ def __call__( """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseCreateWorkflowTemplate._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseCreateWorkflowTemplate._get_http_options() request, metadata = self._interceptor.pre_create_workflow_template( request, metadata @@ -990,9 +990,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseDeleteWorkflowTemplate._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseDeleteWorkflowTemplate._get_http_options() request, metadata = self._interceptor.pre_delete_workflow_template( request, metadata @@ -1014,7 +1012,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1106,9 +1104,7 @@ def __call__( """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseGetWorkflowTemplate._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseGetWorkflowTemplate._get_http_options() request, metadata = self._interceptor.pre_get_workflow_template( request, metadata @@ -1265,15 +1261,12 @@ def __call__( """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseInstantiateInlineWorkflowTemplate._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseInstantiateInlineWorkflowTemplate._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_instantiate_inline_workflow_template( - request, metadata + request, metadata = ( + self._interceptor.pre_instantiate_inline_workflow_template( + request, metadata + ) ) transcoded_request = _BaseWorkflowTemplateServiceRestTransport._BaseInstantiateInlineWorkflowTemplate._get_transcoded_request( http_options, request @@ -1296,7 +1289,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1337,11 +1330,10 @@ def __call__( resp = self._interceptor.post_instantiate_inline_workflow_template(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_instantiate_inline_workflow_template_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_instantiate_inline_workflow_template_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1429,9 +1421,7 @@ def __call__( """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseInstantiateWorkflowTemplate._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseInstantiateWorkflowTemplate._get_http_options() request, metadata = self._interceptor.pre_instantiate_workflow_template( request, metadata @@ -1457,7 +1447,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1498,11 +1488,10 @@ def __call__( resp = self._interceptor.post_instantiate_workflow_template(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_instantiate_workflow_template_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_instantiate_workflow_template_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1585,9 +1574,7 @@ def __call__( """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseListWorkflowTemplates._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseListWorkflowTemplates._get_http_options() request, metadata = self._interceptor.pre_list_workflow_templates( request, metadata @@ -1740,9 +1727,7 @@ def __call__( """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseUpdateWorkflowTemplate._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseUpdateWorkflowTemplate._get_http_options() request, metadata = self._interceptor.pre_update_workflow_template( request, metadata @@ -1848,7 +1833,9 @@ def create_workflow_template( ]: # 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._CreateWorkflowTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._CreateWorkflowTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_workflow_template( @@ -1856,7 +1843,9 @@ def delete_workflow_template( ) -> Callable[[workflow_templates.DeleteWorkflowTemplateRequest], empty_pb2.Empty]: # 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._DeleteWorkflowTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteWorkflowTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_workflow_template( @@ -1878,7 +1867,9 @@ def instantiate_inline_workflow_template( ]: # 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._InstantiateInlineWorkflowTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._InstantiateInlineWorkflowTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def instantiate_workflow_template( @@ -1889,7 +1880,9 @@ def instantiate_workflow_template( ]: # 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._InstantiateWorkflowTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._InstantiateWorkflowTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_workflow_templates( @@ -1911,7 +1904,9 @@ def update_workflow_template( ]: # 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._UpdateWorkflowTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateWorkflowTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_iam_policy(self): @@ -1972,9 +1967,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseWorkflowTemplateServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2119,9 +2112,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseWorkflowTemplateServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2266,9 +2257,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2413,9 +2402,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2530,9 +2517,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2650,9 +2635,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseWorkflowTemplateServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2791,9 +2774,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseWorkflowTemplateServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseWorkflowTemplateServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseWorkflowTemplateServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest_base.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest_base.py index 5c3863b2c94f..afc98c194726 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest_base.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest_base.py @@ -17,11 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dataproc_v1.types import workflow_templates diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/autoscaling_policies.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/autoscaling_policies.py index 55bcbb68f123..72977200d584 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/autoscaling_policies.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/autoscaling_policies.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/batches.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/batches.py index 8da2317aa553..01a1a227188c 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/batches.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/batches.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataproc_v1.types import shared @@ -317,6 +317,7 @@ class State(proto.Enum): The batch is no longer running due to an error. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/clusters.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/clusters.py index 601494758027..ad5211a073b2 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/clusters.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/clusters.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore from google.cloud.dataproc_v1.types import shared @@ -271,6 +271,7 @@ class ClusterTier(proto.Enum): CLUSTER_TIER_PREMIUM (2): Premium Dataproc cluster. """ + CLUSTER_TIER_UNSPECIFIED = 0 CLUSTER_TIER_STANDARD = 1 CLUSTER_TIER_PREMIUM = 2 @@ -313,12 +314,12 @@ class ClusterTier(proto.Enum): number=13, message="SoftwareConfig", ) - initialization_actions: MutableSequence[ - "NodeInitializationAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=11, - message="NodeInitializationAction", + initialization_actions: MutableSequence["NodeInitializationAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=11, + message="NodeInitializationAction", + ) ) encryption_config: "EncryptionConfig" = proto.Field( proto.MESSAGE, @@ -676,6 +677,7 @@ class PrivateIpv6GoogleAccess(proto.Enum): between Google Services and the Dataproc cluster. """ + PRIVATE_IPV6_GOOGLE_ACCESS_UNSPECIFIED = 0 INHERIT_FROM_SUBNETWORK = 1 OUTBOUND = 2 @@ -962,6 +964,7 @@ class Preemptibility(proto.Enum): (https://cloud.google.com/compute/docs/instances/preemptible), and provide additional features. """ + PREEMPTIBILITY_UNSPECIFIED = 0 NON_PREEMPTIBLE = 1 PREEMPTIBLE = 2 @@ -1256,12 +1259,12 @@ class InstanceSelectionResult(proto.Message): number=2, message=InstanceSelection, ) - instance_selection_results: MutableSequence[ - InstanceSelectionResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=InstanceSelectionResult, + instance_selection_results: MutableSequence[InstanceSelectionResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=InstanceSelectionResult, + ) ) @@ -1442,6 +1445,7 @@ class Role(proto.Enum): DRIVER (1): Job drivers run on the node pool. """ + ROLE_UNSPECIFIED = 0 DRIVER = 1 @@ -1557,6 +1561,7 @@ class State(proto.Enum): The cluster is being repaired. It is not ready for use. """ + UNKNOWN = 0 CREATING = 1 RUNNING = 2 @@ -1588,6 +1593,7 @@ class Substate(proto.Enum): Applies to RUNNING state. """ + UNSPECIFIED = 0 UNHEALTHY = 1 STALE_STATUS = 2 @@ -1987,6 +1993,7 @@ class MetricSource(proto.Enum): FLINK (8): flink metric source """ + METRIC_SOURCE_UNSPECIFIED = 0 MONITORING_AGENT_DEFAULTS = 1 HDFS = 2 @@ -2583,6 +2590,7 @@ class TarballAccess(proto.Enum): account has read access to the diagnostic tarball """ + TARBALL_ACCESS_UNSPECIFIED = 0 GOOGLE_CLOUD_SUPPORT = 1 GOOGLE_DATAPROC_DIAGNOSE = 2 @@ -2670,6 +2678,7 @@ class Type(proto.Enum): Must specify key value fields for specifying the reservations. """ + TYPE_UNSPECIFIED = 0 NO_RESERVATION = 1 ANY_RESERVATION = 2 diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/jobs.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/jobs.py index e6c94b6dfa79..f9da9dceb4c9 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/jobs.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/jobs.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -95,6 +95,7 @@ class Level(proto.Enum): OFF (8): Turn off log4j. """ + LEVEL_UNSPECIFIED = 0 ALL = 1 TRACE = 2 @@ -1021,6 +1022,7 @@ class State(proto.Enum): Applies to restartable jobs only. """ + STATE_UNSPECIFIED = 0 PENDING = 1 SETUP_DONE = 8 @@ -1058,6 +1060,7 @@ class Substate(proto.Enum): Applies to RUNNING state. """ + UNSPECIFIED = 0 SUBMITTED = 1 QUEUED = 2 @@ -1163,6 +1166,7 @@ class State(proto.Enum): KILLED (8): Status is KILLED. """ + STATE_UNSPECIFIED = 0 NEW = 1 NEW_SAVING = 2 @@ -1644,6 +1648,7 @@ class JobStateMatcher(proto.Enum): Only match jobs in terminal states: CANCELLED, DONE, or ERROR. """ + ALL = 0 ACTIVE = 1 NON_ACTIVE = 2 diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/node_groups.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/node_groups.py index 230fd75b15c2..d232d118cb5c 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/node_groups.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/node_groups.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore from google.cloud.dataproc_v1.types import clusters diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/operations.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/operations.py index 8eca9aa9bca0..01abf244c9d1 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/operations.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/operations.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -64,6 +64,7 @@ class BatchOperationType(proto.Enum): BATCH (1): Batch operation type. """ + BATCH_OPERATION_TYPE_UNSPECIFIED = 0 BATCH = 1 @@ -141,6 +142,7 @@ class SessionOperationType(proto.Enum): DELETE (3): Delete Session operation type. """ + SESSION_OPERATION_TYPE_UNSPECIFIED = 0 CREATE = 1 TERMINATE = 2 @@ -215,6 +217,7 @@ class State(proto.Enum): The operation is done; either cancelled or completed. """ + UNKNOWN = 0 PENDING = 1 RUNNING = 2 @@ -348,6 +351,7 @@ class NodeGroupOperationType(proto.Enum): RESIZE (4): Resize node group operation type. """ + NODE_GROUP_OPERATION_TYPE_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/session_templates.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/session_templates.py index 9f1e0f728404..8ac3bf54fc16 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/session_templates.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/session_templates.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataproc_v1.types import sessions, shared diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/sessions.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/sessions.py index 2b8d3d08a0f8..ad746c5ff02a 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/sessions.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/sessions.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataproc_v1.types import shared @@ -345,6 +345,7 @@ class State(proto.Enum): The session is no longer running due to an error. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -482,6 +483,7 @@ class Kernel(proto.Enum): SCALA (2): Scala kernel. """ + KERNEL_UNSPECIFIED = 0 PYTHON = 1 SCALA = 2 diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/shared.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/shared.py index 141e44343c8c..aa2aeabcdb4f 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/shared.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/shared.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -96,6 +96,7 @@ class Component(proto.Enum): ZOOKEEPER (8): The Zookeeper service. """ + COMPONENT_UNSPECIFIED = 0 ANACONDA = 5 DELTA = 20 @@ -131,6 +132,7 @@ class FailureAction(proto.Enum): DELETE (2): Delete the failed cluster resource. """ + FAILURE_ACTION_UNSPECIFIED = 0 NO_ACTION = 1 DELETE = 2 @@ -706,6 +708,7 @@ class Role(proto.Enum): Run work associated with a Spark executor of a job. """ + ROLE_UNSPECIFIED = 0 DEFAULT = 1 CONTROLLER = 2 @@ -942,6 +945,7 @@ class AuthenticationType(proto.Enum): workload creator/user for authenticating to other services. """ + AUTHENTICATION_TYPE_UNSPECIFIED = 0 SERVICE_ACCOUNT = 1 END_USER_CREDENTIALS = 2 @@ -982,6 +986,7 @@ class Scenario(proto.Enum): AUTO (6): Automatic selection of scenarios. """ + SCENARIO_UNSPECIFIED = 0 SCALING = 2 BROADCAST_HASH_JOIN = 3 diff --git a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/workflow_templates.py b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/workflow_templates.py index a51c5747384a..4c48b24fab8e 100644 --- a/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/workflow_templates.py +++ b/packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/workflow_templates.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataproc_v1.types import clusters @@ -737,6 +737,7 @@ class State(proto.Enum): The operation is done; either cancelled or completed. """ + UNKNOWN = 0 PENDING = 1 RUNNING = 2 @@ -887,6 +888,7 @@ class NodeState(proto.Enum): The node failed. A node can be marked FAILED because its ancestor or peer failed. """ + NODE_STATE_UNSPECIFIED = 0 BLOCKED = 1 RUNNABLE = 2 diff --git a/packages/google-cloud-dataproc/noxfile.py b/packages/google-cloud-dataproc/noxfile.py index 8d05c88b0cb3..e2ed80be4981 100644 --- a/packages/google-cloud-dataproc/noxfile.py +++ b/packages/google-cloud-dataproc/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py index a3e5b9431fb0..41cf00c2e42f 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore from google.cloud.dataproc_v1.services.autoscaling_policy_service import ( AutoscalingPolicyServiceAsyncClient, @@ -1008,10 +1015,9 @@ def test_autoscaling_policy_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1056,10 +1062,9 @@ def test_autoscaling_policy_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1095,10 +1100,9 @@ def test_autoscaling_policy_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1355,13 +1359,13 @@ def test_autoscaling_policy_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2177,9 +2181,9 @@ def test_get_autoscaling_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_autoscaling_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_autoscaling_policy] = ( + mock_rpc + ) request = {} client.get_autoscaling_policy(request) @@ -3715,9 +3719,9 @@ def test_get_autoscaling_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_autoscaling_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_autoscaling_policy] = ( + mock_rpc + ) request = {} client.get_autoscaling_policy(request) @@ -4721,8 +4725,9 @@ def test_create_autoscaling_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4873,20 +4878,22 @@ def test_create_autoscaling_policy_rest_interceptors(null_interceptor): ) client = AutoscalingPolicyServiceClient(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.AutoscalingPolicyServiceRestInterceptor, - "post_create_autoscaling_policy", - ) as post, mock.patch.object( - transports.AutoscalingPolicyServiceRestInterceptor, - "post_create_autoscaling_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AutoscalingPolicyServiceRestInterceptor, - "pre_create_autoscaling_policy", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "post_create_autoscaling_policy", + ) as post, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "post_create_autoscaling_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "pre_create_autoscaling_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4948,8 +4955,9 @@ def test_update_autoscaling_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5104,20 +5112,22 @@ def test_update_autoscaling_policy_rest_interceptors(null_interceptor): ) client = AutoscalingPolicyServiceClient(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.AutoscalingPolicyServiceRestInterceptor, - "post_update_autoscaling_policy", - ) as post, mock.patch.object( - transports.AutoscalingPolicyServiceRestInterceptor, - "post_update_autoscaling_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AutoscalingPolicyServiceRestInterceptor, - "pre_update_autoscaling_policy", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "post_update_autoscaling_policy", + ) as post, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "post_update_autoscaling_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "pre_update_autoscaling_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5177,8 +5187,9 @@ def test_get_autoscaling_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5245,19 +5256,22 @@ def test_get_autoscaling_policy_rest_interceptors(null_interceptor): ) client = AutoscalingPolicyServiceClient(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.AutoscalingPolicyServiceRestInterceptor, - "post_get_autoscaling_policy", - ) as post, mock.patch.object( - transports.AutoscalingPolicyServiceRestInterceptor, - "post_get_autoscaling_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AutoscalingPolicyServiceRestInterceptor, "pre_get_autoscaling_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "post_get_autoscaling_policy", + ) as post, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "post_get_autoscaling_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "pre_get_autoscaling_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5315,8 +5329,9 @@ def test_list_autoscaling_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5381,20 +5396,22 @@ def test_list_autoscaling_policies_rest_interceptors(null_interceptor): ) client = AutoscalingPolicyServiceClient(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.AutoscalingPolicyServiceRestInterceptor, - "post_list_autoscaling_policies", - ) as post, mock.patch.object( - transports.AutoscalingPolicyServiceRestInterceptor, - "post_list_autoscaling_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AutoscalingPolicyServiceRestInterceptor, - "pre_list_autoscaling_policies", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "post_list_autoscaling_policies", + ) as post, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "post_list_autoscaling_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "pre_list_autoscaling_policies", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5454,8 +5471,9 @@ def test_delete_autoscaling_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5514,14 +5532,14 @@ def test_delete_autoscaling_policy_rest_interceptors(null_interceptor): ) client = AutoscalingPolicyServiceClient(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.AutoscalingPolicyServiceRestInterceptor, - "pre_delete_autoscaling_policy", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutoscalingPolicyServiceRestInterceptor, + "pre_delete_autoscaling_policy", + ) as pre, + ): pre.assert_not_called() pb_message = autoscaling_policies.DeleteAutoscalingPolicyRequest.pb( autoscaling_policies.DeleteAutoscalingPolicyRequest() @@ -5568,8 +5586,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5630,8 +5649,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5692,8 +5712,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5754,8 +5775,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5816,8 +5838,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5878,8 +5901,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5940,8 +5964,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6170,11 +6195,14 @@ def test_autoscaling_policy_service_base_transport(): def test_autoscaling_policy_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataproc_v1.services.autoscaling_policy_service.transports.AutoscalingPolicyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataproc_v1.services.autoscaling_policy_service.transports.AutoscalingPolicyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutoscalingPolicyServiceTransport( @@ -6191,9 +6219,12 @@ def test_autoscaling_policy_service_base_transport_with_credentials_file(): def test_autoscaling_policy_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataproc_v1.services.autoscaling_policy_service.transports.AutoscalingPolicyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataproc_v1.services.autoscaling_policy_service.transports.AutoscalingPolicyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutoscalingPolicyServiceTransport() @@ -6267,11 +6298,12 @@ def test_autoscaling_policy_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_batch_controller.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_batch_controller.py index 87feb3458804..9d5a6aeaf5af 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_batch_controller.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_batch_controller.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +57,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.batch_controller import ( BatchControllerAsyncClient, @@ -984,10 +986,9 @@ def test_batch_controller_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1033,9 @@ def test_batch_controller_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1071,10 +1071,9 @@ def test_batch_controller_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1317,13 +1316,13 @@ def test_batch_controller_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3998,8 +3997,9 @@ def test_create_batch_rest_bad_request(request_type=batches.CreateBatchRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4213,19 +4213,20 @@ def test_create_batch_rest_interceptors(null_interceptor): ) client = BatchControllerClient(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.BatchControllerRestInterceptor, "post_create_batch" - ) as post, mock.patch.object( - transports.BatchControllerRestInterceptor, "post_create_batch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchControllerRestInterceptor, "pre_create_batch" - ) as pre: + 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.BatchControllerRestInterceptor, "post_create_batch" + ) as post, + mock.patch.object( + transports.BatchControllerRestInterceptor, "post_create_batch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchControllerRestInterceptor, "pre_create_batch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4274,8 +4275,9 @@ def test_get_batch_rest_bad_request(request_type=batches.GetBatchRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4348,17 +4350,19 @@ def test_get_batch_rest_interceptors(null_interceptor): ) client = BatchControllerClient(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.BatchControllerRestInterceptor, "post_get_batch" - ) as post, mock.patch.object( - transports.BatchControllerRestInterceptor, "post_get_batch_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchControllerRestInterceptor, "pre_get_batch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchControllerRestInterceptor, "post_get_batch" + ) as post, + mock.patch.object( + transports.BatchControllerRestInterceptor, "post_get_batch_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchControllerRestInterceptor, "pre_get_batch" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4407,8 +4411,9 @@ def test_list_batches_rest_bad_request(request_type=batches.ListBatchesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4473,17 +4478,19 @@ def test_list_batches_rest_interceptors(null_interceptor): ) client = BatchControllerClient(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.BatchControllerRestInterceptor, "post_list_batches" - ) as post, mock.patch.object( - transports.BatchControllerRestInterceptor, "post_list_batches_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BatchControllerRestInterceptor, "pre_list_batches" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchControllerRestInterceptor, "post_list_batches" + ) as post, + mock.patch.object( + transports.BatchControllerRestInterceptor, "post_list_batches_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BatchControllerRestInterceptor, "pre_list_batches" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4534,8 +4541,9 @@ def test_delete_batch_rest_bad_request(request_type=batches.DeleteBatchRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4592,13 +4600,13 @@ def test_delete_batch_rest_interceptors(null_interceptor): ) client = BatchControllerClient(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.BatchControllerRestInterceptor, "pre_delete_batch" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BatchControllerRestInterceptor, "pre_delete_batch" + ) as pre, + ): pre.assert_not_called() pb_message = batches.DeleteBatchRequest.pb(batches.DeleteBatchRequest()) transcode.return_value = { @@ -4643,8 +4651,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4705,8 +4714,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4767,8 +4777,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4829,8 +4840,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4891,8 +4903,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4953,8 +4966,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5015,8 +5029,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5236,11 +5251,14 @@ def test_batch_controller_base_transport(): def test_batch_controller_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataproc_v1.services.batch_controller.transports.BatchControllerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataproc_v1.services.batch_controller.transports.BatchControllerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BatchControllerTransport( @@ -5257,9 +5275,12 @@ def test_batch_controller_base_transport_with_credentials_file(): def test_batch_controller_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataproc_v1.services.batch_controller.transports.BatchControllerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataproc_v1.services.batch_controller.transports.BatchControllerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BatchControllerTransport() @@ -5331,11 +5352,12 @@ def test_batch_controller_transport_auth_gdch_credentials(transport_class): def test_batch_controller_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_cluster_controller.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_cluster_controller.py index 87034c8db7ab..174b31cfa535 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_cluster_controller.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_cluster_controller.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +60,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.dataproc_v1.services.cluster_controller import ( ClusterControllerAsyncClient, @@ -996,10 +998,9 @@ def test_cluster_controller_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1045,9 @@ def test_cluster_controller_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1083,9 @@ def test_cluster_controller_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1334,13 +1333,13 @@ def test_cluster_controller_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3958,9 +3957,9 @@ def test_diagnose_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_cluster] = ( + mock_rpc + ) request = {} client.diagnose_cluster(request) @@ -5636,9 +5635,9 @@ def test_diagnose_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_cluster] = ( + mock_rpc + ) request = {} client.diagnose_cluster(request) @@ -6330,8 +6329,9 @@ def test_create_cluster_rest_bad_request(request_type=clusters.CreateClusterRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6673,19 +6673,21 @@ def test_create_cluster_rest_interceptors(null_interceptor): ) client = ClusterControllerClient(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.ClusterControllerRestInterceptor, "post_create_cluster" - ) as post, mock.patch.object( - transports.ClusterControllerRestInterceptor, "post_create_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterControllerRestInterceptor, "pre_create_cluster" - ) as pre: + 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.ClusterControllerRestInterceptor, "post_create_cluster" + ) as post, + mock.patch.object( + transports.ClusterControllerRestInterceptor, + "post_create_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterControllerRestInterceptor, "pre_create_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6738,8 +6740,9 @@ def test_update_cluster_rest_bad_request(request_type=clusters.UpdateClusterRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7085,19 +7088,21 @@ def test_update_cluster_rest_interceptors(null_interceptor): ) client = ClusterControllerClient(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.ClusterControllerRestInterceptor, "post_update_cluster" - ) as post, mock.patch.object( - transports.ClusterControllerRestInterceptor, "post_update_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterControllerRestInterceptor, "pre_update_cluster" - ) as pre: + 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.ClusterControllerRestInterceptor, "post_update_cluster" + ) as post, + mock.patch.object( + transports.ClusterControllerRestInterceptor, + "post_update_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterControllerRestInterceptor, "pre_update_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7150,8 +7155,9 @@ def test_stop_cluster_rest_bad_request(request_type=clusters.StopClusterRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7212,19 +7218,21 @@ def test_stop_cluster_rest_interceptors(null_interceptor): ) client = ClusterControllerClient(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.ClusterControllerRestInterceptor, "post_stop_cluster" - ) as post, mock.patch.object( - transports.ClusterControllerRestInterceptor, "post_stop_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterControllerRestInterceptor, "pre_stop_cluster" - ) as pre: + 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.ClusterControllerRestInterceptor, "post_stop_cluster" + ) as post, + mock.patch.object( + transports.ClusterControllerRestInterceptor, + "post_stop_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterControllerRestInterceptor, "pre_stop_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7277,8 +7285,9 @@ def test_start_cluster_rest_bad_request(request_type=clusters.StartClusterReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7339,19 +7348,21 @@ def test_start_cluster_rest_interceptors(null_interceptor): ) client = ClusterControllerClient(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.ClusterControllerRestInterceptor, "post_start_cluster" - ) as post, mock.patch.object( - transports.ClusterControllerRestInterceptor, "post_start_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterControllerRestInterceptor, "pre_start_cluster" - ) as pre: + 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.ClusterControllerRestInterceptor, "post_start_cluster" + ) as post, + mock.patch.object( + transports.ClusterControllerRestInterceptor, + "post_start_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterControllerRestInterceptor, "pre_start_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7404,8 +7415,9 @@ def test_delete_cluster_rest_bad_request(request_type=clusters.DeleteClusterRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7466,19 +7478,21 @@ def test_delete_cluster_rest_interceptors(null_interceptor): ) client = ClusterControllerClient(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.ClusterControllerRestInterceptor, "post_delete_cluster" - ) as post, mock.patch.object( - transports.ClusterControllerRestInterceptor, "post_delete_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterControllerRestInterceptor, "pre_delete_cluster" - ) as pre: + 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.ClusterControllerRestInterceptor, "post_delete_cluster" + ) as post, + mock.patch.object( + transports.ClusterControllerRestInterceptor, + "post_delete_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterControllerRestInterceptor, "pre_delete_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7531,8 +7545,9 @@ def test_get_cluster_rest_bad_request(request_type=clusters.GetClusterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7603,17 +7618,20 @@ def test_get_cluster_rest_interceptors(null_interceptor): ) client = ClusterControllerClient(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.ClusterControllerRestInterceptor, "post_get_cluster" - ) as post, mock.patch.object( - transports.ClusterControllerRestInterceptor, "post_get_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterControllerRestInterceptor, "pre_get_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterControllerRestInterceptor, "post_get_cluster" + ) as post, + mock.patch.object( + transports.ClusterControllerRestInterceptor, + "post_get_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterControllerRestInterceptor, "pre_get_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7662,8 +7680,9 @@ def test_list_clusters_rest_bad_request(request_type=clusters.ListClustersReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7726,17 +7745,20 @@ def test_list_clusters_rest_interceptors(null_interceptor): ) client = ClusterControllerClient(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.ClusterControllerRestInterceptor, "post_list_clusters" - ) as post, mock.patch.object( - transports.ClusterControllerRestInterceptor, "post_list_clusters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ClusterControllerRestInterceptor, "pre_list_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ClusterControllerRestInterceptor, "post_list_clusters" + ) as post, + mock.patch.object( + transports.ClusterControllerRestInterceptor, + "post_list_clusters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterControllerRestInterceptor, "pre_list_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7793,8 +7815,9 @@ def test_diagnose_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7855,20 +7878,21 @@ def test_diagnose_cluster_rest_interceptors(null_interceptor): ) client = ClusterControllerClient(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.ClusterControllerRestInterceptor, "post_diagnose_cluster" - ) as post, mock.patch.object( - transports.ClusterControllerRestInterceptor, - "post_diagnose_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ClusterControllerRestInterceptor, "pre_diagnose_cluster" - ) as pre: + 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.ClusterControllerRestInterceptor, "post_diagnose_cluster" + ) as post, + mock.patch.object( + transports.ClusterControllerRestInterceptor, + "post_diagnose_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ClusterControllerRestInterceptor, "pre_diagnose_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7923,8 +7947,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7985,8 +8010,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8047,8 +8073,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8109,8 +8136,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8171,8 +8199,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8233,8 +8262,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8295,8 +8325,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8600,11 +8631,14 @@ def test_cluster_controller_base_transport(): def test_cluster_controller_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataproc_v1.services.cluster_controller.transports.ClusterControllerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataproc_v1.services.cluster_controller.transports.ClusterControllerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ClusterControllerTransport( @@ -8621,9 +8655,12 @@ def test_cluster_controller_base_transport_with_credentials_file(): def test_cluster_controller_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataproc_v1.services.cluster_controller.transports.ClusterControllerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataproc_v1.services.cluster_controller.transports.ClusterControllerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ClusterControllerTransport() @@ -8695,11 +8732,12 @@ def test_cluster_controller_transport_auth_gdch_credentials(transport_class): def test_cluster_controller_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_job_controller.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_job_controller.py index ab1eb3862c6d..1d7253daf3ff 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_job_controller.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_job_controller.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +57,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.job_controller import ( JobControllerAsyncClient, @@ -956,10 +958,9 @@ def test_job_controller_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1005,9 @@ def test_job_controller_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1043,9 @@ def test_job_controller_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,13 +1288,13 @@ def test_job_controller_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5793,8 +5792,9 @@ def test_submit_job_rest_bad_request(request_type=jobs.SubmitJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5863,17 +5863,19 @@ def test_submit_job_rest_interceptors(null_interceptor): ) client = JobControllerClient(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.JobControllerRestInterceptor, "post_submit_job" - ) as post, mock.patch.object( - transports.JobControllerRestInterceptor, "post_submit_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.JobControllerRestInterceptor, "pre_submit_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.JobControllerRestInterceptor, "post_submit_job" + ) as post, + mock.patch.object( + transports.JobControllerRestInterceptor, "post_submit_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.JobControllerRestInterceptor, "pre_submit_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5922,8 +5924,9 @@ def test_submit_job_as_operation_rest_bad_request(request_type=jobs.SubmitJobReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5980,20 +5983,21 @@ def test_submit_job_as_operation_rest_interceptors(null_interceptor): ) client = JobControllerClient(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.JobControllerRestInterceptor, "post_submit_job_as_operation" - ) as post, mock.patch.object( - transports.JobControllerRestInterceptor, - "post_submit_job_as_operation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.JobControllerRestInterceptor, "pre_submit_job_as_operation" - ) as pre: + 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.JobControllerRestInterceptor, "post_submit_job_as_operation" + ) as post, + mock.patch.object( + transports.JobControllerRestInterceptor, + "post_submit_job_as_operation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.JobControllerRestInterceptor, "pre_submit_job_as_operation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6042,8 +6046,9 @@ def test_get_job_rest_bad_request(request_type=jobs.GetJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6112,17 +6117,19 @@ def test_get_job_rest_interceptors(null_interceptor): ) client = JobControllerClient(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.JobControllerRestInterceptor, "post_get_job" - ) as post, mock.patch.object( - transports.JobControllerRestInterceptor, "post_get_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.JobControllerRestInterceptor, "pre_get_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.JobControllerRestInterceptor, "post_get_job" + ) as post, + mock.patch.object( + transports.JobControllerRestInterceptor, "post_get_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.JobControllerRestInterceptor, "pre_get_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6171,8 +6178,9 @@ def test_list_jobs_rest_bad_request(request_type=jobs.ListJobsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6237,17 +6245,19 @@ def test_list_jobs_rest_interceptors(null_interceptor): ) client = JobControllerClient(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.JobControllerRestInterceptor, "post_list_jobs" - ) as post, mock.patch.object( - transports.JobControllerRestInterceptor, "post_list_jobs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.JobControllerRestInterceptor, "pre_list_jobs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.JobControllerRestInterceptor, "post_list_jobs" + ) as post, + mock.patch.object( + transports.JobControllerRestInterceptor, "post_list_jobs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.JobControllerRestInterceptor, "pre_list_jobs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6296,8 +6306,9 @@ def test_update_job_rest_bad_request(request_type=jobs.UpdateJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6553,17 +6564,19 @@ def test_update_job_rest_interceptors(null_interceptor): ) client = JobControllerClient(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.JobControllerRestInterceptor, "post_update_job" - ) as post, mock.patch.object( - transports.JobControllerRestInterceptor, "post_update_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.JobControllerRestInterceptor, "pre_update_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.JobControllerRestInterceptor, "post_update_job" + ) as post, + mock.patch.object( + transports.JobControllerRestInterceptor, "post_update_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.JobControllerRestInterceptor, "pre_update_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6612,8 +6625,9 @@ def test_cancel_job_rest_bad_request(request_type=jobs.CancelJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6682,17 +6696,19 @@ def test_cancel_job_rest_interceptors(null_interceptor): ) client = JobControllerClient(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.JobControllerRestInterceptor, "post_cancel_job" - ) as post, mock.patch.object( - transports.JobControllerRestInterceptor, "post_cancel_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.JobControllerRestInterceptor, "pre_cancel_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.JobControllerRestInterceptor, "post_cancel_job" + ) as post, + mock.patch.object( + transports.JobControllerRestInterceptor, "post_cancel_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.JobControllerRestInterceptor, "pre_cancel_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6741,8 +6757,9 @@ def test_delete_job_rest_bad_request(request_type=jobs.DeleteJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6799,13 +6816,13 @@ def test_delete_job_rest_interceptors(null_interceptor): ) client = JobControllerClient(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.JobControllerRestInterceptor, "pre_delete_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.JobControllerRestInterceptor, "pre_delete_job" + ) as pre, + ): pre.assert_not_called() pb_message = jobs.DeleteJobRequest.pb(jobs.DeleteJobRequest()) transcode.return_value = { @@ -6850,8 +6867,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6912,8 +6930,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6974,8 +6993,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7036,8 +7056,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7098,8 +7119,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7160,8 +7182,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7222,8 +7245,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7508,11 +7532,14 @@ def test_job_controller_base_transport(): def test_job_controller_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataproc_v1.services.job_controller.transports.JobControllerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataproc_v1.services.job_controller.transports.JobControllerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.JobControllerTransport( @@ -7529,9 +7556,12 @@ def test_job_controller_base_transport_with_credentials_file(): def test_job_controller_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataproc_v1.services.job_controller.transports.JobControllerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataproc_v1.services.job_controller.transports.JobControllerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.JobControllerTransport() @@ -7603,11 +7633,12 @@ def test_job_controller_transport_auth_gdch_credentials(transport_class): def test_job_controller_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_node_group_controller.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_node_group_controller.py index 2d28f3b4f486..f0666d185545 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_node_group_controller.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_node_group_controller.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +56,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore from google.cloud.dataproc_v1.services.node_group_controller import ( NodeGroupControllerAsyncClient, @@ -1005,10 +1007,9 @@ def test_node_group_controller_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1053,10 +1054,9 @@ def test_node_group_controller_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1092,10 +1092,9 @@ def test_node_group_controller_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1351,13 +1350,13 @@ def test_node_group_controller_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1469,9 +1468,9 @@ def test_create_node_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_group] = ( + mock_rpc + ) request = {} client.create_node_group(request) @@ -1834,9 +1833,9 @@ def test_resize_node_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resize_node_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resize_node_group] = ( + mock_rpc + ) request = {} client.resize_node_group(request) @@ -2445,9 +2444,9 @@ def test_create_node_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_group] = ( + mock_rpc + ) request = {} client.create_node_group(request) @@ -2649,9 +2648,9 @@ def test_resize_node_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resize_node_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resize_node_group] = ( + mock_rpc + ) request = {} client.resize_node_group(request) @@ -3291,8 +3290,9 @@ def test_create_node_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3477,20 +3477,21 @@ def test_create_node_group_rest_interceptors(null_interceptor): ) client = NodeGroupControllerClient(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.NodeGroupControllerRestInterceptor, "post_create_node_group" - ) as post, mock.patch.object( - transports.NodeGroupControllerRestInterceptor, - "post_create_node_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupControllerRestInterceptor, "pre_create_node_group" - ) as pre: + 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.NodeGroupControllerRestInterceptor, "post_create_node_group" + ) as post, + mock.patch.object( + transports.NodeGroupControllerRestInterceptor, + "post_create_node_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupControllerRestInterceptor, "pre_create_node_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3545,8 +3546,9 @@ def test_resize_node_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3605,20 +3607,21 @@ def test_resize_node_group_rest_interceptors(null_interceptor): ) client = NodeGroupControllerClient(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.NodeGroupControllerRestInterceptor, "post_resize_node_group" - ) as post, mock.patch.object( - transports.NodeGroupControllerRestInterceptor, - "post_resize_node_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupControllerRestInterceptor, "pre_resize_node_group" - ) as pre: + 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.NodeGroupControllerRestInterceptor, "post_resize_node_group" + ) as post, + mock.patch.object( + transports.NodeGroupControllerRestInterceptor, + "post_resize_node_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupControllerRestInterceptor, "pre_resize_node_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3671,8 +3674,9 @@ def test_get_node_group_rest_bad_request(request_type=node_groups.GetNodeGroupRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3739,18 +3743,20 @@ def test_get_node_group_rest_interceptors(null_interceptor): ) client = NodeGroupControllerClient(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.NodeGroupControllerRestInterceptor, "post_get_node_group" - ) as post, mock.patch.object( - transports.NodeGroupControllerRestInterceptor, - "post_get_node_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NodeGroupControllerRestInterceptor, "pre_get_node_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NodeGroupControllerRestInterceptor, "post_get_node_group" + ) as post, + mock.patch.object( + transports.NodeGroupControllerRestInterceptor, + "post_get_node_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NodeGroupControllerRestInterceptor, "pre_get_node_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3805,8 +3811,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3867,8 +3874,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3929,8 +3937,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3991,8 +4000,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4053,8 +4063,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4115,8 +4126,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4177,8 +4189,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4381,11 +4394,14 @@ def test_node_group_controller_base_transport(): def test_node_group_controller_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataproc_v1.services.node_group_controller.transports.NodeGroupControllerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataproc_v1.services.node_group_controller.transports.NodeGroupControllerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeGroupControllerTransport( @@ -4402,9 +4418,12 @@ def test_node_group_controller_base_transport_with_credentials_file(): def test_node_group_controller_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataproc_v1.services.node_group_controller.transports.NodeGroupControllerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataproc_v1.services.node_group_controller.transports.NodeGroupControllerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NodeGroupControllerTransport() @@ -4476,11 +4495,12 @@ def test_node_group_controller_transport_auth_gdch_credentials(transport_class): def test_node_group_controller_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_controller.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_controller.py index aeabdd695c06..c6e9cecf9aac 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_controller.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_controller.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +57,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.session_controller import ( SessionControllerAsyncClient, @@ -993,10 +995,9 @@ def test_session_controller_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1042,9 @@ def test_session_controller_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1080,9 @@ def test_session_controller_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1331,13 +1330,13 @@ def test_session_controller_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2662,9 +2661,9 @@ def test_terminate_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.terminate_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.terminate_session] = ( + mock_rpc + ) request = {} client.terminate_session(request) @@ -3912,9 +3911,9 @@ def test_terminate_session_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.terminate_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.terminate_session] = ( + mock_rpc + ) request = {} client.terminate_session(request) @@ -4629,8 +4628,9 @@ def test_create_session_rest_bad_request(request_type=sessions.CreateSessionRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4820,19 +4820,21 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = SessionControllerClient(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.SessionControllerRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.SessionControllerRestInterceptor, "post_create_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionControllerRestInterceptor, "pre_create_session" - ) as pre: + 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.SessionControllerRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.SessionControllerRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionControllerRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4881,8 +4883,9 @@ def test_get_session_rest_bad_request(request_type=sessions.GetSessionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4957,17 +4960,20 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = SessionControllerClient(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.SessionControllerRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.SessionControllerRestInterceptor, "post_get_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionControllerRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionControllerRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.SessionControllerRestInterceptor, + "post_get_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionControllerRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5016,8 +5022,9 @@ def test_list_sessions_rest_bad_request(request_type=sessions.ListSessionsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5080,17 +5087,20 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = SessionControllerClient(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.SessionControllerRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.SessionControllerRestInterceptor, "post_list_sessions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionControllerRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionControllerRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.SessionControllerRestInterceptor, + "post_list_sessions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionControllerRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5143,8 +5153,9 @@ def test_terminate_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5201,20 +5212,21 @@ def test_terminate_session_rest_interceptors(null_interceptor): ) client = SessionControllerClient(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.SessionControllerRestInterceptor, "post_terminate_session" - ) as post, mock.patch.object( - transports.SessionControllerRestInterceptor, - "post_terminate_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionControllerRestInterceptor, "pre_terminate_session" - ) as pre: + 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.SessionControllerRestInterceptor, "post_terminate_session" + ) as post, + mock.patch.object( + transports.SessionControllerRestInterceptor, + "post_terminate_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionControllerRestInterceptor, "pre_terminate_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5265,8 +5277,9 @@ def test_delete_session_rest_bad_request(request_type=sessions.DeleteSessionRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5323,19 +5336,21 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = SessionControllerClient(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.SessionControllerRestInterceptor, "post_delete_session" - ) as post, mock.patch.object( - transports.SessionControllerRestInterceptor, "post_delete_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionControllerRestInterceptor, "pre_delete_session" - ) as pre: + 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.SessionControllerRestInterceptor, "post_delete_session" + ) as post, + mock.patch.object( + transports.SessionControllerRestInterceptor, + "post_delete_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionControllerRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5388,8 +5403,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5450,8 +5466,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5512,8 +5529,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5574,8 +5592,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5636,8 +5655,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5698,8 +5718,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5760,8 +5781,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6004,11 +6026,14 @@ def test_session_controller_base_transport(): def test_session_controller_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataproc_v1.services.session_controller.transports.SessionControllerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataproc_v1.services.session_controller.transports.SessionControllerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionControllerTransport( @@ -6025,9 +6050,12 @@ def test_session_controller_base_transport_with_credentials_file(): def test_session_controller_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataproc_v1.services.session_controller.transports.SessionControllerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataproc_v1.services.session_controller.transports.SessionControllerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionControllerTransport() @@ -6099,11 +6127,12 @@ def test_session_controller_transport_auth_gdch_credentials(transport_class): def test_session_controller_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_template_controller.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_template_controller.py index b272110a0a38..af75eed7cea5 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_template_controller.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_template_controller.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,20 +43,27 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.session_template_controller import ( SessionTemplateControllerAsyncClient, @@ -1014,10 +1021,9 @@ def test_session_template_controller_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1068,9 @@ def test_session_template_controller_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1101,10 +1106,9 @@ def test_session_template_controller_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1363,13 +1367,13 @@ def test_session_template_controller_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2204,9 +2208,9 @@ def test_get_session_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_session_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_session_template] = ( + mock_rpc + ) request = {} client.get_session_template(request) @@ -2557,9 +2561,9 @@ def test_list_session_templates_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_session_templates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_session_templates] = ( + mock_rpc + ) request = {} client.list_session_templates(request) @@ -3741,9 +3745,9 @@ def test_get_session_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_session_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_session_template] = ( + mock_rpc + ) request = {} client.get_session_template(request) @@ -3926,9 +3930,9 @@ def test_list_session_templates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_session_templates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_session_templates] = ( + mock_rpc + ) request = {} client.list_session_templates(request) @@ -4750,8 +4754,9 @@ def test_create_session_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4929,20 +4934,22 @@ def test_create_session_template_rest_interceptors(null_interceptor): ) client = SessionTemplateControllerClient(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.SessionTemplateControllerRestInterceptor, - "post_create_session_template", - ) as post, mock.patch.object( - transports.SessionTemplateControllerRestInterceptor, - "post_create_session_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionTemplateControllerRestInterceptor, - "pre_create_session_template", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "post_create_session_template", + ) as post, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "post_create_session_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "pre_create_session_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5001,8 +5008,9 @@ def test_update_session_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5184,20 +5192,22 @@ def test_update_session_template_rest_interceptors(null_interceptor): ) client = SessionTemplateControllerClient(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.SessionTemplateControllerRestInterceptor, - "post_update_session_template", - ) as post, mock.patch.object( - transports.SessionTemplateControllerRestInterceptor, - "post_update_session_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionTemplateControllerRestInterceptor, - "pre_update_session_template", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "post_update_session_template", + ) as post, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "post_update_session_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "pre_update_session_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5254,8 +5264,9 @@ def test_get_session_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5326,18 +5337,22 @@ def test_get_session_template_rest_interceptors(null_interceptor): ) client = SessionTemplateControllerClient(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.SessionTemplateControllerRestInterceptor, "post_get_session_template" - ) as post, mock.patch.object( - transports.SessionTemplateControllerRestInterceptor, - "post_get_session_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionTemplateControllerRestInterceptor, "pre_get_session_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "post_get_session_template", + ) as post, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "post_get_session_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "pre_get_session_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5392,8 +5407,9 @@ def test_list_session_templates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5456,20 +5472,22 @@ def test_list_session_templates_rest_interceptors(null_interceptor): ) client = SessionTemplateControllerClient(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.SessionTemplateControllerRestInterceptor, - "post_list_session_templates", - ) as post, mock.patch.object( - transports.SessionTemplateControllerRestInterceptor, - "post_list_session_templates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionTemplateControllerRestInterceptor, - "pre_list_session_templates", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "post_list_session_templates", + ) as post, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "post_list_session_templates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "pre_list_session_templates", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5529,8 +5547,9 @@ def test_delete_session_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5589,14 +5608,14 @@ def test_delete_session_template_rest_interceptors(null_interceptor): ) client = SessionTemplateControllerClient(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.SessionTemplateControllerRestInterceptor, - "pre_delete_session_template", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionTemplateControllerRestInterceptor, + "pre_delete_session_template", + ) as pre, + ): pre.assert_not_called() pb_message = session_templates.DeleteSessionTemplateRequest.pb( session_templates.DeleteSessionTemplateRequest() @@ -5643,8 +5662,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5705,8 +5725,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5767,8 +5788,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5829,8 +5851,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5891,8 +5914,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5953,8 +5977,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6015,8 +6040,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6245,11 +6271,14 @@ def test_session_template_controller_base_transport(): def test_session_template_controller_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataproc_v1.services.session_template_controller.transports.SessionTemplateControllerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataproc_v1.services.session_template_controller.transports.SessionTemplateControllerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionTemplateControllerTransport( @@ -6266,9 +6295,12 @@ def test_session_template_controller_base_transport_with_credentials_file(): def test_session_template_controller_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataproc_v1.services.session_template_controller.transports.SessionTemplateControllerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataproc_v1.services.session_template_controller.transports.SessionTemplateControllerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionTemplateControllerTransport() @@ -6342,11 +6374,12 @@ def test_session_template_controller_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py index 4fb06ef79584..c5fe9d712fb8 100644 --- a/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py +++ b/packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +58,17 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.workflow_template_service import ( WorkflowTemplateServiceAsyncClient, @@ -1014,10 +1016,9 @@ def test_workflow_template_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1063,9 @@ def test_workflow_template_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1101,10 +1101,9 @@ def test_workflow_template_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,13 +1359,13 @@ def test_workflow_template_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1845,9 +1844,9 @@ def test_get_workflow_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_workflow_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_workflow_template] = ( + mock_rpc + ) request = {} client.get_workflow_template(request) @@ -4267,9 +4266,9 @@ def test_get_workflow_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_workflow_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_workflow_template] = ( + mock_rpc + ) request = {} client.get_workflow_template(request) @@ -5948,8 +5947,9 @@ def test_create_workflow_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6387,20 +6387,22 @@ def test_create_workflow_template_rest_interceptors(null_interceptor): ) client = WorkflowTemplateServiceClient(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.WorkflowTemplateServiceRestInterceptor, - "post_create_workflow_template", - ) as post, mock.patch.object( - transports.WorkflowTemplateServiceRestInterceptor, - "post_create_workflow_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.WorkflowTemplateServiceRestInterceptor, - "pre_create_workflow_template", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "post_create_workflow_template", + ) as post, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "post_create_workflow_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "pre_create_workflow_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6460,8 +6462,9 @@ def test_get_workflow_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6530,18 +6533,22 @@ def test_get_workflow_template_rest_interceptors(null_interceptor): ) client = WorkflowTemplateServiceClient(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.WorkflowTemplateServiceRestInterceptor, "post_get_workflow_template" - ) as post, mock.patch.object( - transports.WorkflowTemplateServiceRestInterceptor, - "post_get_workflow_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.WorkflowTemplateServiceRestInterceptor, "pre_get_workflow_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "post_get_workflow_template", + ) as post, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "post_get_workflow_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "pre_get_workflow_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6601,8 +6608,9 @@ def test_instantiate_workflow_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6661,22 +6669,23 @@ def test_instantiate_workflow_template_rest_interceptors(null_interceptor): ) client = WorkflowTemplateServiceClient(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.WorkflowTemplateServiceRestInterceptor, - "post_instantiate_workflow_template", - ) as post, mock.patch.object( - transports.WorkflowTemplateServiceRestInterceptor, - "post_instantiate_workflow_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.WorkflowTemplateServiceRestInterceptor, - "pre_instantiate_workflow_template", - ) as pre: + 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.WorkflowTemplateServiceRestInterceptor, + "post_instantiate_workflow_template", + ) as post, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "post_instantiate_workflow_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "pre_instantiate_workflow_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6729,8 +6738,9 @@ def test_instantiate_inline_workflow_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7160,22 +7170,23 @@ def test_instantiate_inline_workflow_template_rest_interceptors(null_interceptor ) client = WorkflowTemplateServiceClient(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.WorkflowTemplateServiceRestInterceptor, - "post_instantiate_inline_workflow_template", - ) as post, mock.patch.object( - transports.WorkflowTemplateServiceRestInterceptor, - "post_instantiate_inline_workflow_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.WorkflowTemplateServiceRestInterceptor, - "pre_instantiate_inline_workflow_template", - ) as pre: + 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.WorkflowTemplateServiceRestInterceptor, + "post_instantiate_inline_workflow_template", + ) as post, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "post_instantiate_inline_workflow_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "pre_instantiate_inline_workflow_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7232,8 +7243,9 @@ def test_update_workflow_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7675,20 +7687,22 @@ def test_update_workflow_template_rest_interceptors(null_interceptor): ) client = WorkflowTemplateServiceClient(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.WorkflowTemplateServiceRestInterceptor, - "post_update_workflow_template", - ) as post, mock.patch.object( - transports.WorkflowTemplateServiceRestInterceptor, - "post_update_workflow_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.WorkflowTemplateServiceRestInterceptor, - "pre_update_workflow_template", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "post_update_workflow_template", + ) as post, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "post_update_workflow_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "pre_update_workflow_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7746,8 +7760,9 @@ def test_list_workflow_templates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7812,19 +7827,22 @@ def test_list_workflow_templates_rest_interceptors(null_interceptor): ) client = WorkflowTemplateServiceClient(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.WorkflowTemplateServiceRestInterceptor, - "post_list_workflow_templates", - ) as post, mock.patch.object( - transports.WorkflowTemplateServiceRestInterceptor, - "post_list_workflow_templates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.WorkflowTemplateServiceRestInterceptor, "pre_list_workflow_templates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "post_list_workflow_templates", + ) as post, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "post_list_workflow_templates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "pre_list_workflow_templates", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7884,8 +7902,9 @@ def test_delete_workflow_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7944,14 +7963,14 @@ def test_delete_workflow_template_rest_interceptors(null_interceptor): ) client = WorkflowTemplateServiceClient(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.WorkflowTemplateServiceRestInterceptor, - "pre_delete_workflow_template", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WorkflowTemplateServiceRestInterceptor, + "pre_delete_workflow_template", + ) as pre, + ): pre.assert_not_called() pb_message = workflow_templates.DeleteWorkflowTemplateRequest.pb( workflow_templates.DeleteWorkflowTemplateRequest() @@ -7998,8 +8017,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8060,8 +8080,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8122,8 +8143,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8184,8 +8206,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8246,8 +8269,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8308,8 +8332,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8370,8 +8395,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8668,11 +8694,14 @@ def test_workflow_template_service_base_transport(): def test_workflow_template_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataproc_v1.services.workflow_template_service.transports.WorkflowTemplateServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dataproc_v1.services.workflow_template_service.transports.WorkflowTemplateServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.WorkflowTemplateServiceTransport( @@ -8689,9 +8718,12 @@ def test_workflow_template_service_base_transport_with_credentials_file(): def test_workflow_template_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dataproc_v1.services.workflow_template_service.transports.WorkflowTemplateServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dataproc_v1.services.workflow_template_service.transports.WorkflowTemplateServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.WorkflowTemplateServiceTransport() @@ -8765,11 +8797,12 @@ def test_workflow_template_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-datastream/docs/conf.py b/packages/google-cloud-datastream/docs/conf.py index c52440fb8ce2..c47b6930775d 100644 --- a/packages/google-cloud-datastream/docs/conf.py +++ b/packages/google-cloud-datastream/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-datastream documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/__init__.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/__init__.py index 4ba52d2e0e58..84f536f3add3 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/__init__.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.datastream import DatastreamAsyncClient, DatastreamClient from .types.datastream import ( CreateConnectionProfileRequest, diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/async_client.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/async_client.py index b949c327172f..a25ece9b4343 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/async_client.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datastream_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.datastream_v1.services.datastream import pagers from google.cloud.datastream_v1.types import datastream, datastream_resources @@ -135,7 +137,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DatastreamAsyncClient: The constructed client. """ - return DatastreamClient.from_service_account_info.__func__(DatastreamAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DatastreamClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DatastreamAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -151,7 +154,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DatastreamAsyncClient: The constructed client. """ - return DatastreamClient.from_service_account_file.__func__(DatastreamAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DatastreamClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DatastreamAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/client.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/client.py index 8746f9e7ad5a..638b7a7337a4 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/client.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datastream_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.datastream_v1.services.datastream import pagers from google.cloud.datastream_v1.types import datastream, datastream_resources @@ -761,11 +763,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DatastreamClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DatastreamClient._read_environment_variables() + ) self._client_cert_source = DatastreamClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -800,8 +800,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DatastreamTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/pagers.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/pagers.py index 21546a7a3a9d..46b844c0b8f7 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/pagers.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/base.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/base.py index 9f64d55e81a2..13e4b1f6bb53 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/base.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datastream_v1 import gapic_version as package_version from google.cloud.datastream_v1.types import datastream, datastream_resources @@ -609,13 +611,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc.py index 349c2b65f9e1..490c5a211c09 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datastream_v1.types import datastream, datastream_resources @@ -513,12 +515,12 @@ def discover_connection_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "discover_connection_profile" not in self._stubs: - self._stubs[ - "discover_connection_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.datastream.v1.Datastream/DiscoverConnectionProfile", - request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, - response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + self._stubs["discover_connection_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datastream.v1.Datastream/DiscoverConnectionProfile", + request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, + response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + ) ) return self._stubs["discover_connection_profile"] diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc_asyncio.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc_asyncio.py index d318228bd405..f0be7c19bb40 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc_asyncio.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datastream_v1.types import datastream, datastream_resources @@ -522,12 +524,12 @@ def discover_connection_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "discover_connection_profile" not in self._stubs: - self._stubs[ - "discover_connection_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.datastream.v1.Datastream/DiscoverConnectionProfile", - request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, - response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + self._stubs["discover_connection_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datastream.v1.Datastream/DiscoverConnectionProfile", + request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, + response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + ) ) return self._stubs["discover_connection_profile"] diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest.py index 18290ef3a0fc..40fc992c999f 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1898,9 +1900,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseCreateConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseCreateConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_create_connection_profile( request, metadata @@ -1926,7 +1926,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2052,9 +2052,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseCreatePrivateConnection._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseCreatePrivateConnection._get_http_options() request, metadata = self._interceptor.pre_create_private_connection( request, metadata @@ -2080,7 +2078,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2235,7 +2233,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2393,7 +2391,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2518,9 +2516,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseDeleteConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseDeleteConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_delete_connection_profile( request, metadata @@ -2542,7 +2538,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2666,9 +2662,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseDeletePrivateConnection._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseDeletePrivateConnection._get_http_options() request, metadata = self._interceptor.pre_delete_private_connection( request, metadata @@ -2690,7 +2684,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2839,7 +2833,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2989,7 +2983,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3112,9 +3106,7 @@ def __call__( Response from a discover request. """ - http_options = ( - _BaseDatastreamRestTransport._BaseDiscoverConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseDiscoverConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_discover_connection_profile( request, metadata @@ -3422,9 +3414,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseGetConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseGetConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_get_connection_profile( request, metadata @@ -3575,9 +3565,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseGetPrivateConnection._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseGetPrivateConnection._get_http_options() request, metadata = self._interceptor.pre_get_private_connection( request, metadata @@ -4175,9 +4163,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseListConnectionProfiles._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseListConnectionProfiles._get_http_options() request, metadata = self._interceptor.pre_list_connection_profiles( request, metadata @@ -4326,9 +4312,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseListPrivateConnections._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseListPrivateConnections._get_http_options() request, metadata = self._interceptor.pre_list_private_connections( request, metadata @@ -5109,7 +5093,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5551,9 +5535,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseUpdateConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseUpdateConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_update_connection_profile( request, metadata @@ -5579,7 +5561,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5737,7 +5719,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5812,7 +5794,9 @@ def create_connection_profile( ]: # 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._CreateConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_private_connection( @@ -5822,7 +5806,9 @@ def create_private_connection( ]: # 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._CreatePrivateConnection(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePrivateConnection( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_route( @@ -5848,7 +5834,9 @@ def delete_connection_profile( ]: # 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._DeleteConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_private_connection( @@ -5858,7 +5846,9 @@ def delete_private_connection( ]: # 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._DeletePrivateConnection(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePrivateConnection( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_route( @@ -5885,7 +5875,9 @@ def discover_connection_profile( ]: # 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._DiscoverConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DiscoverConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_static_ips( @@ -5952,7 +5944,9 @@ def list_connection_profiles( ]: # 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._ListConnectionProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListConnectionProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_private_connections( @@ -5963,7 +5957,9 @@ def list_private_connections( ]: # 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._ListPrivateConnections(self._session, self._host, self._interceptor) # type: ignore + return self._ListPrivateConnections( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_routes( @@ -6037,7 +6033,9 @@ def update_connection_profile( ]: # 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._UpdateConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_stream( diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest_base.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest_base.py index 106b14ec1008..eafba359b369 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest_base.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/services/datastream/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream.py index fdba3258b096..a6e7a4b2f27d 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.datastream_v1.types import datastream_resources @@ -392,12 +392,12 @@ class ListConnectionProfilesResponse(proto.Message): def raw_page(self): return self - connection_profiles: MutableSequence[ - datastream_resources.ConnectionProfile - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=datastream_resources.ConnectionProfile, + connection_profiles: MutableSequence[datastream_resources.ConnectionProfile] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=datastream_resources.ConnectionProfile, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1050,12 +1050,12 @@ class ListStreamObjectsResponse(proto.Message): def raw_page(self): return self - stream_objects: MutableSequence[ - datastream_resources.StreamObject - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=datastream_resources.StreamObject, + stream_objects: MutableSequence[datastream_resources.StreamObject] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=datastream_resources.StreamObject, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1273,12 +1273,12 @@ class ListPrivateConnectionsResponse(proto.Message): def raw_page(self): return self - private_connections: MutableSequence[ - datastream_resources.PrivateConnection - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=datastream_resources.PrivateConnection, + private_connections: MutableSequence[datastream_resources.PrivateConnection] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=datastream_resources.PrivateConnection, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream_resources.py b/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream_resources.py index cc878e0c2a94..5f9cdb861060 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream_resources.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1/types/datastream_resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -830,6 +830,7 @@ class State(proto.Enum): Delete request has failed, resource is in invalid state. """ + STATE_UNSPECIFIED = 0 CREATING = 1 CREATED = 2 @@ -2550,6 +2551,7 @@ class SchemaFileFormat(proto.Enum): AVRO_SCHEMA_FILE (2): Avro schema format. """ + SCHEMA_FILE_FORMAT_UNSPECIFIED = 0 NO_SCHEMA_FILE = 1 AVRO_SCHEMA_FILE = 2 @@ -2565,6 +2567,7 @@ class JsonCompression(proto.Enum): GZIP (2): Gzip compression. """ + JSON_COMPRESSION_UNSPECIFIED = 0 NO_COMPRESSION = 1 GZIP = 2 @@ -2790,6 +2793,7 @@ class FileFormat(proto.Enum): PARQUET (1): Parquet file format. """ + FILE_FORMAT_UNSPECIFIED = 0 PARQUET = 1 @@ -2802,6 +2806,7 @@ class TableFormat(proto.Enum): ICEBERG (1): Iceberg table format. """ + TABLE_FORMAT_UNSPECIFIED = 0 ICEBERG = 1 @@ -3014,6 +3019,7 @@ class State(proto.Enum): The Stream is no longer reading new events, but still writing events in the buffer. """ + STATE_UNSPECIFIED = 0 NOT_STARTED = 1 RUNNING = 2 @@ -3473,6 +3479,7 @@ class State(proto.Enum): Backfill job failed since the table structure is currently unsupported for backfill. """ + STATE_UNSPECIFIED = 0 NOT_STARTED = 1 PENDING = 2 @@ -3496,6 +3503,7 @@ class Trigger(proto.Enum): Object backfill job was triggered manually using the dedicated API. """ + TRIGGER_UNSPECIFIED = 0 AUTOMATIC = 1 MANUAL = 2 @@ -3616,6 +3624,7 @@ class State(proto.Enum): WARNING (4): Validation executed with warnings. """ + STATE_UNSPECIFIED = 0 NOT_EXECUTED = 1 FAILED = 2 @@ -3668,6 +3677,7 @@ class Level(proto.Enum): ERROR (2): Definitely cause issues with the Stream. """ + LEVEL_UNSPECIFIED = 0 WARNING = 1 ERROR = 2 diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/__init__.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/__init__.py index d0a9de627a03..470d57560d1b 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/__init__.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.datastream import DatastreamAsyncClient, DatastreamClient from .types.datastream import ( CreateConnectionProfileRequest, diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/async_client.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/async_client.py index 6635ddf9736b..ba1c8a6bfaba 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/async_client.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datastream_v1alpha1 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.datastream_v1alpha1.services.datastream import pagers from google.cloud.datastream_v1alpha1.types import datastream, datastream_resources @@ -123,7 +123,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DatastreamAsyncClient: The constructed client. """ - return DatastreamClient.from_service_account_info.__func__(DatastreamAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DatastreamClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DatastreamAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +140,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DatastreamAsyncClient: The constructed client. """ - return DatastreamClient.from_service_account_file.__func__(DatastreamAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DatastreamClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DatastreamAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/client.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/client.py index f8df03e6d37f..98bc40cd152e 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/client.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datastream_v1alpha1 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.datastream_v1alpha1.services.datastream import pagers from google.cloud.datastream_v1alpha1.types import datastream, datastream_resources @@ -692,11 +692,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DatastreamClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DatastreamClient._read_environment_variables() + ) self._client_cert_source = DatastreamClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -731,8 +729,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DatastreamTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/pagers.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/pagers.py index 15dc282f4781..3f04e59796d6 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/pagers.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/base.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/base.py index 0820ced52ebc..cb5280b434c0 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/base.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.datastream_v1alpha1 import gapic_version as package_version from google.cloud.datastream_v1alpha1.types import datastream, datastream_resources diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc.py index b214b6a7222c..1e4263b3c5cd 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.datastream_v1alpha1.types import datastream, datastream_resources @@ -510,12 +510,12 @@ def discover_connection_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "discover_connection_profile" not in self._stubs: - self._stubs[ - "discover_connection_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.datastream.v1alpha1.Datastream/DiscoverConnectionProfile", - request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, - response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + self._stubs["discover_connection_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datastream.v1alpha1.Datastream/DiscoverConnectionProfile", + request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, + response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + ) ) return self._stubs["discover_connection_profile"] diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc_asyncio.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc_asyncio.py index bcee409d6ffc..79fbe2b8a46b 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc_asyncio.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.datastream_v1alpha1.types import datastream, datastream_resources @@ -519,12 +519,12 @@ def discover_connection_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "discover_connection_profile" not in self._stubs: - self._stubs[ - "discover_connection_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.datastream.v1alpha1.Datastream/DiscoverConnectionProfile", - request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, - response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + self._stubs["discover_connection_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.datastream.v1alpha1.Datastream/DiscoverConnectionProfile", + request_serializer=datastream.DiscoverConnectionProfileRequest.serialize, + response_deserializer=datastream.DiscoverConnectionProfileResponse.deserialize, + ) ) return self._stubs["discover_connection_profile"] diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/rest.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/rest.py index f10c0bddce70..fca0fb0776cb 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/rest.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/services/datastream/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1458,9 +1458,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseCreateConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseCreateConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_create_connection_profile( request, metadata @@ -1486,7 +1484,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1611,9 +1609,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseCreatePrivateConnection._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseCreatePrivateConnection._get_http_options() request, metadata = self._interceptor.pre_create_private_connection( request, metadata @@ -1639,7 +1635,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1794,7 +1790,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1951,7 +1947,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2075,9 +2071,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseDeleteConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseDeleteConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_delete_connection_profile( request, metadata @@ -2099,7 +2093,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2222,9 +2216,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseDeletePrivateConnection._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseDeletePrivateConnection._get_http_options() request, metadata = self._interceptor.pre_delete_private_connection( request, metadata @@ -2246,7 +2238,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2395,7 +2387,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2544,7 +2536,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2667,9 +2659,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseDiscoverConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseDiscoverConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_discover_connection_profile( request, metadata @@ -2855,7 +2845,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3129,9 +3119,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseGetConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseGetConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_get_connection_profile( request, metadata @@ -3281,9 +3269,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseGetPrivateConnection._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseGetPrivateConnection._get_http_options() request, metadata = self._interceptor.pre_get_private_connection( request, metadata @@ -3725,9 +3711,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseListConnectionProfiles._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseListConnectionProfiles._get_http_options() request, metadata = self._interceptor.pre_list_connection_profiles( request, metadata @@ -3873,9 +3857,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseListPrivateConnections._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseListPrivateConnections._get_http_options() request, metadata = self._interceptor.pre_list_private_connections( request, metadata @@ -4319,9 +4301,7 @@ def __call__( """ - http_options = ( - _BaseDatastreamRestTransport._BaseUpdateConnectionProfile._get_http_options() - ) + http_options = _BaseDatastreamRestTransport._BaseUpdateConnectionProfile._get_http_options() request, metadata = self._interceptor.pre_update_connection_profile( request, metadata @@ -4347,7 +4327,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4504,7 +4484,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4579,7 +4559,9 @@ def create_connection_profile( ]: # 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._CreateConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_private_connection( @@ -4589,7 +4571,9 @@ def create_private_connection( ]: # 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._CreatePrivateConnection(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePrivateConnection( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_route( @@ -4615,7 +4599,9 @@ def delete_connection_profile( ]: # 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._DeleteConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_private_connection( @@ -4625,7 +4611,9 @@ def delete_private_connection( ]: # 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._DeletePrivateConnection(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePrivateConnection( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_route( @@ -4652,7 +4640,9 @@ def discover_connection_profile( ]: # 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._DiscoverConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DiscoverConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_errors( @@ -4717,7 +4707,9 @@ def list_connection_profiles( ]: # 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._ListConnectionProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListConnectionProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_private_connections( @@ -4728,7 +4720,9 @@ def list_private_connections( ]: # 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._ListPrivateConnections(self._session, self._host, self._interceptor) # type: ignore + return self._ListPrivateConnections( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_routes( @@ -4754,7 +4748,9 @@ def update_connection_profile( ]: # 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._UpdateConnectionProfile(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateConnectionProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_stream( diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream.py index 6232cb7726f3..1421817d5ef4 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.datastream_v1alpha1.types import datastream_resources @@ -329,12 +329,12 @@ class ListConnectionProfilesResponse(proto.Message): def raw_page(self): return self - connection_profiles: MutableSequence[ - datastream_resources.ConnectionProfile - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=datastream_resources.ConnectionProfile, + connection_profiles: MutableSequence[datastream_resources.ConnectionProfile] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=datastream_resources.ConnectionProfile, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -961,12 +961,12 @@ class ListPrivateConnectionsResponse(proto.Message): def raw_page(self): return self - private_connections: MutableSequence[ - datastream_resources.PrivateConnection - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=datastream_resources.PrivateConnection, + private_connections: MutableSequence[datastream_resources.PrivateConnection] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=datastream_resources.PrivateConnection, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream_resources.py b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream_resources.py index 927f35fce545..13a1f30c54a1 100644 --- a/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream_resources.py +++ b/packages/google-cloud-datastream/google/cloud/datastream_v1alpha1/types/datastream_resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -71,6 +71,7 @@ class GcsFileFormat(proto.Enum): AVRO (1): Avro file format """ + _pb_options = {"deprecated": True} GCS_FILE_FORMAT_UNSPECIFIED = 0 AVRO = 1 @@ -87,6 +88,7 @@ class SchemaFileFormat(proto.Enum): AVRO_SCHEMA_FILE (2): Avro schema format. """ + SCHEMA_FILE_FORMAT_UNSPECIFIED = 0 NO_SCHEMA_FILE = 1 AVRO_SCHEMA_FILE = 2 @@ -323,6 +325,7 @@ class State(proto.Enum): FAILED (3): The private connection creation has failed. """ + STATE_UNSPECIFIED = 0 CREATING = 1 CREATED = 2 @@ -960,6 +963,7 @@ class JsonCompression(proto.Enum): GZIP (2): Gzip compression. """ + JSON_COMPRESSION_UNSPECIFIED = 0 NO_COMPRESSION = 1 GZIP = 2 @@ -1141,6 +1145,7 @@ class State(proto.Enum): The Stream is no longer reading new events, but still writing events in the buffer. """ + STATE_UNSPECIFIED = 0 CREATED = 1 RUNNING = 2 @@ -1338,6 +1343,7 @@ class Status(proto.Enum): PASSED (3): Validation passed. """ + STATUS_UNSPECIFIED = 0 NOT_EXECUTED = 1 FAILED = 2 @@ -1389,6 +1395,7 @@ class Level(proto.Enum): ERROR (2): Definitely cause issues with the Stream. """ + LEVEL_UNSPECIFIED = 0 WARNING = 1 ERROR = 2 diff --git a/packages/google-cloud-datastream/noxfile.py b/packages/google-cloud-datastream/noxfile.py index 10757612db00..87a6309d44e9 100644 --- a/packages/google-cloud-datastream/noxfile.py +++ b/packages/google-cloud-datastream/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1/test_datastream.py b/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1/test_datastream.py index eb64bbd98458..a4174cd4cab2 100644 --- a/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1/test_datastream.py +++ b/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1/test_datastream.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.datastream_v1.services.datastream import ( DatastreamAsyncClient, @@ -936,10 +938,9 @@ def test_datastream_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +985,9 @@ def test_datastream_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1023,9 @@ def test_datastream_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1255,13 +1254,13 @@ def test_datastream_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1942,9 +1941,9 @@ def test_get_connection_profile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_profile] = ( + mock_rpc + ) request = {} client.get_connection_profile(request) @@ -5769,9 +5768,9 @@ def test_get_stream_object_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_stream_object - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_stream_object] = ( + mock_rpc + ) request = {} client.get_stream_object(request) @@ -6114,9 +6113,9 @@ def test_lookup_stream_object_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.lookup_stream_object - ] = mock_rpc + client._transport._wrapped_methods[client._transport.lookup_stream_object] = ( + mock_rpc + ) request = {} client.lookup_stream_object(request) @@ -6373,9 +6372,9 @@ def test_list_stream_objects_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_stream_objects - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_stream_objects] = ( + mock_rpc + ) request = {} client.list_stream_objects(request) @@ -6913,9 +6912,9 @@ def test_start_backfill_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_backfill_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_backfill_job] = ( + mock_rpc + ) request = {} client.start_backfill_job(request) @@ -7246,9 +7245,9 @@ def test_stop_backfill_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_backfill_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_backfill_job] = ( + mock_rpc + ) request = {} client.stop_backfill_job(request) @@ -7582,9 +7581,9 @@ def test_fetch_static_ips_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_static_ips - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_static_ips] = ( + mock_rpc + ) request = {} client.fetch_static_ips(request) @@ -8497,9 +8496,9 @@ def test_get_private_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_private_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_private_connection] = ( + mock_rpc + ) request = {} client.get_private_connection(request) @@ -11496,9 +11495,9 @@ def test_get_connection_profile_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_profile] = ( + mock_rpc + ) request = {} client.get_connection_profile(request) @@ -13572,9 +13571,9 @@ def test_get_stream_object_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_stream_object - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_stream_object] = ( + mock_rpc + ) request = {} client.get_stream_object(request) @@ -13756,9 +13755,9 @@ def test_lookup_stream_object_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.lookup_stream_object - ] = mock_rpc + client._transport._wrapped_methods[client._transport.lookup_stream_object] = ( + mock_rpc + ) request = {} client.lookup_stream_object(request) @@ -13889,9 +13888,9 @@ def test_list_stream_objects_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_stream_objects - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_stream_objects] = ( + mock_rpc + ) request = {} client.list_stream_objects(request) @@ -14153,9 +14152,9 @@ def test_start_backfill_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_backfill_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_backfill_job] = ( + mock_rpc + ) request = {} client.start_backfill_job(request) @@ -14336,9 +14335,9 @@ def test_stop_backfill_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_backfill_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_backfill_job] = ( + mock_rpc + ) request = {} client.stop_backfill_job(request) @@ -14519,9 +14518,9 @@ def test_fetch_static_ips_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_static_ips - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_static_ips] = ( + mock_rpc + ) request = {} client.fetch_static_ips(request) @@ -15010,9 +15009,9 @@ def test_get_private_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_private_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_private_connection] = ( + mock_rpc + ) request = {} client.get_private_connection(request) @@ -17910,8 +17909,9 @@ def test_list_connection_profiles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17976,18 +17976,20 @@ def test_list_connection_profiles_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_list_connection_profiles" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_list_connection_profiles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_list_connection_profiles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_connection_profiles" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_list_connection_profiles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_list_connection_profiles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18047,8 +18049,9 @@ def test_get_connection_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18119,18 +18122,20 @@ def test_get_connection_profile_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_get_connection_profile" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_get_connection_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_get_connection_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_connection_profile" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_get_connection_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_get_connection_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18188,8 +18193,9 @@ def test_create_connection_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18435,20 +18441,21 @@ def test_create_connection_profile_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_create_connection_profile" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_create_connection_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_create_connection_profile" - ) as pre: + 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.DatastreamRestInterceptor, "post_create_connection_profile" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_create_connection_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_create_connection_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18505,8 +18512,9 @@ def test_update_connection_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18756,20 +18764,21 @@ def test_update_connection_profile_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_update_connection_profile" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_update_connection_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_update_connection_profile" - ) as pre: + 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.DatastreamRestInterceptor, "post_update_connection_profile" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_update_connection_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_update_connection_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18824,8 +18833,9 @@ def test_delete_connection_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18884,20 +18894,21 @@ def test_delete_connection_profile_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_delete_connection_profile" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_delete_connection_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_delete_connection_profile" - ) as pre: + 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.DatastreamRestInterceptor, "post_delete_connection_profile" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_delete_connection_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_delete_connection_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18950,8 +18961,9 @@ def test_discover_connection_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19011,18 +19023,20 @@ def test_discover_connection_profile_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_discover_connection_profile" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_discover_connection_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_discover_connection_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_discover_connection_profile" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_discover_connection_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_discover_connection_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19078,8 +19092,9 @@ def test_list_streams_rest_bad_request(request_type=datastream.ListStreamsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19144,17 +19159,19 @@ def test_list_streams_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_list_streams" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_list_streams_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_list_streams" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_streams" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_streams_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_list_streams" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19205,8 +19222,9 @@ def test_get_stream_rest_bad_request(request_type=datastream.GetStreamRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19282,17 +19300,19 @@ def test_get_stream_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_get_stream" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_get_stream_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_get_stream" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_stream" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_stream_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_get_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19343,8 +19363,9 @@ def test_create_stream_rest_bad_request(request_type=datastream.CreateStreamRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19700,19 +19721,20 @@ def test_create_stream_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_create_stream" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_create_stream_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_create_stream" - ) as pre: + 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.DatastreamRestInterceptor, "post_create_stream" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_create_stream_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_create_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19763,8 +19785,9 @@ def test_update_stream_rest_bad_request(request_type=datastream.UpdateStreamRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20122,19 +20145,20 @@ def test_update_stream_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_update_stream" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_update_stream_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_update_stream" - ) as pre: + 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.DatastreamRestInterceptor, "post_update_stream" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_update_stream_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_update_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20183,8 +20207,9 @@ def test_delete_stream_rest_bad_request(request_type=datastream.DeleteStreamRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20241,19 +20266,20 @@ def test_delete_stream_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_delete_stream" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_delete_stream_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_delete_stream" - ) as pre: + 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.DatastreamRestInterceptor, "post_delete_stream" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_delete_stream_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_delete_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20302,8 +20328,9 @@ def test_run_stream_rest_bad_request(request_type=datastream.RunStreamRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20360,19 +20387,20 @@ def test_run_stream_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_run_stream" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_run_stream_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_run_stream" - ) as pre: + 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.DatastreamRestInterceptor, "post_run_stream" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_run_stream_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_run_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20425,8 +20453,9 @@ def test_get_stream_object_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20493,17 +20522,19 @@ def test_get_stream_object_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_get_stream_object" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_get_stream_object_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_get_stream_object" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_stream_object" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_stream_object_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_get_stream_object" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20558,8 +20589,9 @@ def test_lookup_stream_object_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20624,17 +20656,20 @@ def test_lookup_stream_object_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_lookup_stream_object" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_lookup_stream_object_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_lookup_stream_object" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_lookup_stream_object" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_lookup_stream_object_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_lookup_stream_object" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20689,8 +20724,9 @@ def test_list_stream_objects_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20753,17 +20789,20 @@ def test_list_stream_objects_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_list_stream_objects" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_list_stream_objects_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_list_stream_objects" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_stream_objects" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_list_stream_objects_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_list_stream_objects" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20823,8 +20862,9 @@ def test_start_backfill_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20886,17 +20926,20 @@ def test_start_backfill_job_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_start_backfill_job" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_start_backfill_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_start_backfill_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_start_backfill_job" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_start_backfill_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_start_backfill_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20956,8 +20999,9 @@ def test_stop_backfill_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21019,17 +21063,19 @@ def test_stop_backfill_job_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_stop_backfill_job" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_stop_backfill_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_stop_backfill_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_stop_backfill_job" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_stop_backfill_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_stop_backfill_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21084,8 +21130,9 @@ def test_fetch_static_ips_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21150,17 +21197,19 @@ def test_fetch_static_ips_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_fetch_static_ips" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_fetch_static_ips_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_fetch_static_ips" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_fetch_static_ips" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_fetch_static_ips_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_fetch_static_ips" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21215,8 +21264,9 @@ def test_create_private_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21361,20 +21411,21 @@ def test_create_private_connection_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_create_private_connection" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_create_private_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_create_private_connection" - ) as pre: + 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.DatastreamRestInterceptor, "post_create_private_connection" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_create_private_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_create_private_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21429,8 +21480,9 @@ def test_get_private_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21503,18 +21555,20 @@ def test_get_private_connection_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_get_private_connection" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_get_private_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_get_private_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_private_connection" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_get_private_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_get_private_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21572,8 +21626,9 @@ def test_list_private_connections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21638,18 +21693,20 @@ def test_list_private_connections_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_list_private_connections" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_list_private_connections_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_list_private_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_private_connections" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_list_private_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_list_private_connections" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21709,8 +21766,9 @@ def test_delete_private_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21769,20 +21827,21 @@ def test_delete_private_connection_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_delete_private_connection" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_delete_private_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_delete_private_connection" - ) as pre: + 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.DatastreamRestInterceptor, "post_delete_private_connection" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_delete_private_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_delete_private_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21835,8 +21894,9 @@ def test_create_route_rest_bad_request(request_type=datastream.CreateRouteReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21971,19 +22031,20 @@ def test_create_route_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_create_route" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_create_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_create_route" - ) as pre: + 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.DatastreamRestInterceptor, "post_create_route" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_create_route_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_create_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22034,8 +22095,9 @@ def test_get_route_rest_bad_request(request_type=datastream.GetRouteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22106,17 +22168,17 @@ def test_get_route_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_get_route" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_get_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_get_route" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_route" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_route_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DatastreamRestInterceptor, "pre_get_route") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22167,8 +22229,9 @@ def test_list_routes_rest_bad_request(request_type=datastream.ListRoutesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22235,17 +22298,19 @@ def test_list_routes_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_list_routes" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_list_routes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_list_routes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_routes" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_routes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_list_routes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22298,8 +22363,9 @@ def test_delete_route_rest_bad_request(request_type=datastream.DeleteRouteReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22358,19 +22424,20 @@ def test_delete_route_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_delete_route" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_delete_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_delete_route" - ) as pre: + 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.DatastreamRestInterceptor, "post_delete_route" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_delete_route_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_delete_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22421,8 +22488,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22481,8 +22549,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22543,8 +22612,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22605,8 +22675,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22667,8 +22738,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22729,8 +22801,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -23441,11 +23514,14 @@ def test_datastream_base_transport(): def test_datastream_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datastream_v1.services.datastream.transports.DatastreamTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.datastream_v1.services.datastream.transports.DatastreamTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DatastreamTransport( @@ -23462,9 +23538,12 @@ def test_datastream_base_transport_with_credentials_file(): def test_datastream_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.datastream_v1.services.datastream.transports.DatastreamTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.datastream_v1.services.datastream.transports.DatastreamTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DatastreamTransport() @@ -23536,11 +23615,12 @@ def test_datastream_transport_auth_gdch_credentials(transport_class): def test_datastream_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1alpha1/test_datastream.py b/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1alpha1/test_datastream.py index d84a5a56e0ab..185a9e3c4aca 100644 --- a/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1alpha1/test_datastream.py +++ b/packages/google-cloud-datastream/tests/unit/gapic/datastream_v1alpha1/test_datastream.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.datastream_v1alpha1.services.datastream import ( DatastreamAsyncClient, @@ -932,10 +932,9 @@ def test_datastream_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +979,9 @@ def test_datastream_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1017,9 @@ def test_datastream_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1251,13 +1248,13 @@ def test_datastream_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1934,9 +1931,9 @@ def test_get_connection_profile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_profile] = ( + mock_rpc + ) request = {} client.get_connection_profile(request) @@ -5739,9 +5736,9 @@ def test_fetch_static_ips_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_static_ips - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_static_ips] = ( + mock_rpc + ) request = {} client.fetch_static_ips(request) @@ -6650,9 +6647,9 @@ def test_get_private_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_private_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_private_connection] = ( + mock_rpc + ) request = {} client.get_private_connection(request) @@ -9645,9 +9642,9 @@ def test_get_connection_profile_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_profile] = ( + mock_rpc + ) request = {} client.get_connection_profile(request) @@ -11637,9 +11634,9 @@ def test_fetch_static_ips_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_static_ips - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_static_ips] = ( + mock_rpc + ) request = {} client.fetch_static_ips(request) @@ -12124,9 +12121,9 @@ def test_get_private_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_private_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_private_connection] = ( + mock_rpc + ) request = {} client.get_private_connection(request) @@ -14759,8 +14756,9 @@ def test_list_connection_profiles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14825,18 +14823,20 @@ def test_list_connection_profiles_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_list_connection_profiles" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_list_connection_profiles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_list_connection_profiles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_connection_profiles" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_list_connection_profiles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_list_connection_profiles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14896,8 +14896,9 @@ def test_get_connection_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14964,18 +14965,20 @@ def test_get_connection_profile_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_get_connection_profile" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_get_connection_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_get_connection_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_connection_profile" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_get_connection_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_get_connection_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15033,8 +15036,9 @@ def test_create_connection_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15205,20 +15209,21 @@ def test_create_connection_profile_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_create_connection_profile" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_create_connection_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_create_connection_profile" - ) as pre: + 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.DatastreamRestInterceptor, "post_create_connection_profile" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_create_connection_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_create_connection_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15275,8 +15280,9 @@ def test_update_connection_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15451,20 +15457,21 @@ def test_update_connection_profile_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_update_connection_profile" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_update_connection_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_update_connection_profile" - ) as pre: + 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.DatastreamRestInterceptor, "post_update_connection_profile" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_update_connection_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_update_connection_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15519,8 +15526,9 @@ def test_delete_connection_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15579,20 +15587,21 @@ def test_delete_connection_profile_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_delete_connection_profile" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_delete_connection_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_delete_connection_profile" - ) as pre: + 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.DatastreamRestInterceptor, "post_delete_connection_profile" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_delete_connection_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_delete_connection_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15645,8 +15654,9 @@ def test_discover_connection_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15706,18 +15716,20 @@ def test_discover_connection_profile_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_discover_connection_profile" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_discover_connection_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_discover_connection_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_discover_connection_profile" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_discover_connection_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_discover_connection_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15773,8 +15785,9 @@ def test_list_streams_rest_bad_request(request_type=datastream.ListStreamsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15839,17 +15852,19 @@ def test_list_streams_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_list_streams" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_list_streams_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_list_streams" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_streams" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_streams_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_list_streams" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15900,8 +15915,9 @@ def test_get_stream_rest_bad_request(request_type=datastream.GetStreamRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15968,17 +15984,19 @@ def test_get_stream_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_get_stream" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_get_stream_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_get_stream" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_stream" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_stream_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_get_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16029,8 +16047,9 @@ def test_create_stream_rest_bad_request(request_type=datastream.CreateStreamRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16241,19 +16260,20 @@ def test_create_stream_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_create_stream" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_create_stream_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_create_stream" - ) as pre: + 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.DatastreamRestInterceptor, "post_create_stream" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_create_stream_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_create_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16304,8 +16324,9 @@ def test_update_stream_rest_bad_request(request_type=datastream.UpdateStreamRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16518,19 +16539,20 @@ def test_update_stream_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_update_stream" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_update_stream_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_update_stream" - ) as pre: + 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.DatastreamRestInterceptor, "post_update_stream" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_update_stream_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_update_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16579,8 +16601,9 @@ def test_delete_stream_rest_bad_request(request_type=datastream.DeleteStreamRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16637,19 +16660,20 @@ def test_delete_stream_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_delete_stream" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_delete_stream_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_delete_stream" - ) as pre: + 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.DatastreamRestInterceptor, "post_delete_stream" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_delete_stream_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_delete_stream" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16698,8 +16722,9 @@ def test_fetch_errors_rest_bad_request(request_type=datastream.FetchErrorsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16756,19 +16781,20 @@ def test_fetch_errors_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_fetch_errors" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_fetch_errors_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_fetch_errors" - ) as pre: + 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.DatastreamRestInterceptor, "post_fetch_errors" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_fetch_errors_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_fetch_errors" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16819,8 +16845,9 @@ def test_fetch_static_ips_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16885,17 +16912,19 @@ def test_fetch_static_ips_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_fetch_static_ips" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_fetch_static_ips_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_fetch_static_ips" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_fetch_static_ips" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_fetch_static_ips_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_fetch_static_ips" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16950,8 +16979,9 @@ def test_create_private_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17093,20 +17123,21 @@ def test_create_private_connection_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_create_private_connection" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_create_private_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_create_private_connection" - ) as pre: + 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.DatastreamRestInterceptor, "post_create_private_connection" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_create_private_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_create_private_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17161,8 +17192,9 @@ def test_get_private_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17231,18 +17263,20 @@ def test_get_private_connection_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_get_private_connection" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_get_private_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_get_private_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_private_connection" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_get_private_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_get_private_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17300,8 +17334,9 @@ def test_list_private_connections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17366,18 +17401,20 @@ def test_list_private_connections_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_list_private_connections" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_list_private_connections_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_list_private_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_private_connections" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_list_private_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_list_private_connections" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17437,8 +17474,9 @@ def test_delete_private_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17497,20 +17535,21 @@ def test_delete_private_connection_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_delete_private_connection" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, - "post_delete_private_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_delete_private_connection" - ) as pre: + 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.DatastreamRestInterceptor, "post_delete_private_connection" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, + "post_delete_private_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_delete_private_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17563,8 +17602,9 @@ def test_create_route_rest_bad_request(request_type=datastream.CreateRouteReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17699,19 +17739,20 @@ def test_create_route_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_create_route" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_create_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_create_route" - ) as pre: + 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.DatastreamRestInterceptor, "post_create_route" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_create_route_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_create_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17762,8 +17803,9 @@ def test_get_route_rest_bad_request(request_type=datastream.GetRouteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17834,17 +17876,17 @@ def test_get_route_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_get_route" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_get_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_get_route" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_route" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_get_route_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DatastreamRestInterceptor, "pre_get_route") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17895,8 +17937,9 @@ def test_list_routes_rest_bad_request(request_type=datastream.ListRoutesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17963,17 +18006,19 @@ def test_list_routes_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_list_routes" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_list_routes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_list_routes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_routes" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_list_routes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_list_routes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18026,8 +18071,9 @@ def test_delete_route_rest_bad_request(request_type=datastream.DeleteRouteReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18086,19 +18132,20 @@ def test_delete_route_rest_interceptors(null_interceptor): ) client = DatastreamClient(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.DatastreamRestInterceptor, "post_delete_route" - ) as post, mock.patch.object( - transports.DatastreamRestInterceptor, "post_delete_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DatastreamRestInterceptor, "pre_delete_route" - ) as pre: + 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.DatastreamRestInterceptor, "post_delete_route" + ) as post, + mock.patch.object( + transports.DatastreamRestInterceptor, "post_delete_route_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DatastreamRestInterceptor, "pre_delete_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18680,11 +18727,14 @@ def test_datastream_base_transport(): def test_datastream_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.datastream_v1alpha1.services.datastream.transports.DatastreamTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.datastream_v1alpha1.services.datastream.transports.DatastreamTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DatastreamTransport( @@ -18701,9 +18751,12 @@ def test_datastream_base_transport_with_credentials_file(): def test_datastream_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.datastream_v1alpha1.services.datastream.transports.DatastreamTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.datastream_v1alpha1.services.datastream.transports.DatastreamTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DatastreamTransport() @@ -18775,11 +18828,12 @@ def test_datastream_transport_auth_gdch_credentials(transport_class): def test_datastream_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-deploy/docs/conf.py b/packages/google-cloud-deploy/docs/conf.py index 5b6a69b5328a..b40404d86526 100644 --- a/packages/google-cloud-deploy/docs/conf.py +++ b/packages/google-cloud-deploy/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-deploy documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/__init__.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/__init__.py index 57fe9dee1826..df0993896fd8 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/__init__.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_deploy import CloudDeployAsyncClient, CloudDeployClient from .types.automation_payload import AutomationEvent from .types.automationrun_payload import AutomationRunEvent diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/async_client.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/async_client.py index ad953fef13bd..b167807cdd1d 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/async_client.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.deploy_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.deploy_v1.services.cloud_deploy import pagers from google.cloud.deploy_v1.types import cloud_deploy @@ -160,7 +162,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudDeployAsyncClient: The constructed client. """ - return CloudDeployClient.from_service_account_info.__func__(CloudDeployAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudDeployClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudDeployAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -176,7 +179,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudDeployAsyncClient: The constructed client. """ - return CloudDeployClient.from_service_account_file.__func__(CloudDeployAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudDeployClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CloudDeployAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/client.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/client.py index 15b55104e871..d968ea46f4f5 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/client.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.deploy_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.deploy_v1.services.cloud_deploy import pagers from google.cloud.deploy_v1.types import cloud_deploy @@ -1002,11 +1004,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudDeployClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudDeployClient._read_environment_variables() + ) self._client_cert_source = CloudDeployClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1041,8 +1041,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudDeployTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/pagers.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/pagers.py index 8c609f326fc9..cf159cfb7ba9 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/pagers.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1159,7 +1159,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1235,7 +1235,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1315,7 +1315,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1391,7 +1391,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/base.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/base.py index 5b0c13edbf44..99a4a8bd2b1b 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/base.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.deploy_v1 import gapic_version as package_version from google.cloud.deploy_v1.types import cloud_deploy @@ -1076,13 +1078,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc.py index 0166f7bc283a..2161aa0933ce 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.deploy_v1.types import cloud_deploy diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc_asyncio.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc_asyncio.py index 7f8e1fc43295..eb8be0f3cc37 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc_asyncio.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.deploy_v1.types import cloud_deploy diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest.py index 2743080f75c3..bb575f017df2 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -3494,9 +3496,7 @@ def __call__( The response object from ``CancelAutomationRun``. """ - http_options = ( - _BaseCloudDeployRestTransport._BaseCancelAutomationRun._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseCancelAutomationRun._get_http_options() request, metadata = self._interceptor.pre_cancel_automation_run( request, metadata @@ -3835,7 +3835,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3960,9 +3960,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseCreateCustomTargetType._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseCreateCustomTargetType._get_http_options() request, metadata = self._interceptor.pre_create_custom_target_type( request, metadata @@ -3988,7 +3986,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4113,9 +4111,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseCreateDeliveryPipeline._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseCreateDeliveryPipeline._get_http_options() request, metadata = self._interceptor.pre_create_delivery_pipeline( request, metadata @@ -4141,7 +4137,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4266,9 +4262,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseCreateDeployPolicy._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseCreateDeployPolicy._get_http_options() request, metadata = self._interceptor.pre_create_deploy_policy( request, metadata @@ -4294,7 +4288,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4449,7 +4443,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4605,7 +4599,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4762,7 +4756,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4910,7 +4904,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5033,9 +5027,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseDeleteCustomTargetType._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseDeleteCustomTargetType._get_http_options() request, metadata = self._interceptor.pre_delete_custom_target_type( request, metadata @@ -5057,7 +5049,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5180,9 +5172,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseDeleteDeliveryPipeline._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseDeleteDeliveryPipeline._get_http_options() request, metadata = self._interceptor.pre_delete_delivery_pipeline( request, metadata @@ -5204,7 +5194,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5327,9 +5317,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseDeleteDeployPolicy._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseDeleteDeployPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_deploy_policy( request, metadata @@ -5351,7 +5339,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5500,7 +5488,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6076,9 +6064,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseGetCustomTargetType._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseGetCustomTargetType._get_http_options() request, metadata = self._interceptor.pre_get_custom_target_type( request, metadata @@ -6226,9 +6212,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseGetDeliveryPipeline._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseGetDeliveryPipeline._get_http_options() request, metadata = self._interceptor.pre_get_delivery_pipeline( request, metadata @@ -7280,9 +7264,7 @@ def __call__( The response object from ``ListAutomationRuns``. """ - http_options = ( - _BaseCloudDeployRestTransport._BaseListAutomationRuns._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseListAutomationRuns._get_http_options() request, metadata = self._interceptor.pre_list_automation_runs( request, metadata @@ -7576,9 +7558,7 @@ def __call__( The response object from ``ListCustomTargetTypes.`` """ - http_options = ( - _BaseCloudDeployRestTransport._BaseListCustomTargetTypes._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseListCustomTargetTypes._get_http_options() request, metadata = self._interceptor.pre_list_custom_target_types( request, metadata @@ -7724,9 +7704,7 @@ def __call__( The response object from ``ListDeliveryPipelines``. """ - http_options = ( - _BaseCloudDeployRestTransport._BaseListDeliveryPipelines._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseListDeliveryPipelines._get_http_options() request, metadata = self._interceptor.pre_list_delivery_pipelines( request, metadata @@ -7872,9 +7850,7 @@ def __call__( The response object from ``ListDeployPolicies``. """ - http_options = ( - _BaseCloudDeployRestTransport._BaseListDeployPolicies._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseListDeployPolicies._get_http_options() request, metadata = self._interceptor.pre_list_deploy_policies( request, metadata @@ -9117,7 +9093,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9242,9 +9218,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseUpdateCustomTargetType._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseUpdateCustomTargetType._get_http_options() request, metadata = self._interceptor.pre_update_custom_target_type( request, metadata @@ -9270,7 +9244,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9395,9 +9369,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseUpdateDeliveryPipeline._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseUpdateDeliveryPipeline._get_http_options() request, metadata = self._interceptor.pre_update_delivery_pipeline( request, metadata @@ -9423,7 +9395,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9548,9 +9520,7 @@ def __call__( """ - http_options = ( - _BaseCloudDeployRestTransport._BaseUpdateDeployPolicy._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseUpdateDeployPolicy._get_http_options() request, metadata = self._interceptor.pre_update_deploy_policy( request, metadata @@ -9576,7 +9546,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9733,7 +9703,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9867,7 +9837,9 @@ def create_custom_target_type( ]: # 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._CreateCustomTargetType(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCustomTargetType( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_delivery_pipeline( @@ -9877,7 +9849,9 @@ def create_delivery_pipeline( ]: # 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._CreateDeliveryPipeline(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDeliveryPipeline( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_deploy_policy( @@ -9927,7 +9901,9 @@ def delete_custom_target_type( ]: # 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._DeleteCustomTargetType(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCustomTargetType( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_delivery_pipeline( @@ -9937,7 +9913,9 @@ def delete_delivery_pipeline( ]: # 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._DeleteDeliveryPipeline(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDeliveryPipeline( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_deploy_policy( @@ -10181,7 +10159,9 @@ def update_custom_target_type( ]: # 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._UpdateCustomTargetType(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCustomTargetType( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_delivery_pipeline( @@ -10191,7 +10171,9 @@ def update_delivery_pipeline( ]: # 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._UpdateDeliveryPipeline(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDeliveryPipeline( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_deploy_policy( @@ -10849,9 +10831,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseCloudDeployRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseCloudDeployRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest_base.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest_base.py index c2eb5269439b..d3d20b383149 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest_base.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/__init__.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/__init__.py index bcb894522cff..bc236a320825 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/__init__.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .automation_payload import AutomationEvent -from .automationrun_payload import AutomationRunEvent +from .automation_payload import ( + AutomationEvent, +) +from .automationrun_payload import ( + AutomationRunEvent, +) from .cloud_deploy import ( AbandonReleaseRequest, AbandonReleaseResponse, @@ -180,17 +184,39 @@ VerifyJobRun, WeeklyWindow, ) -from .customtargettype_notification_payload import CustomTargetTypeNotificationEvent -from .deliverypipeline_notification_payload import DeliveryPipelineNotificationEvent -from .deploypolicy_evaluation_payload import DeployPolicyEvaluationEvent -from .deploypolicy_notification_payload import DeployPolicyNotificationEvent -from .jobrun_notification_payload import JobRunNotificationEvent -from .log_enums import Type -from .release_notification_payload import ReleaseNotificationEvent -from .release_render_payload import ReleaseRenderEvent -from .rollout_notification_payload import RolloutNotificationEvent -from .rollout_update_payload import RolloutUpdateEvent -from .target_notification_payload import TargetNotificationEvent +from .customtargettype_notification_payload import ( + CustomTargetTypeNotificationEvent, +) +from .deliverypipeline_notification_payload import ( + DeliveryPipelineNotificationEvent, +) +from .deploypolicy_evaluation_payload import ( + DeployPolicyEvaluationEvent, +) +from .deploypolicy_notification_payload import ( + DeployPolicyNotificationEvent, +) +from .jobrun_notification_payload import ( + JobRunNotificationEvent, +) +from .log_enums import ( + Type, +) +from .release_notification_payload import ( + ReleaseNotificationEvent, +) +from .release_render_payload import ( + ReleaseRenderEvent, +) +from .rollout_notification_payload import ( + RolloutNotificationEvent, +) +from .rollout_update_payload import ( + RolloutUpdateEvent, +) +from .target_notification_payload import ( + TargetNotificationEvent, +) __all__ = ( "AutomationEvent", diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/cloud_deploy.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/cloud_deploy.py index bc1741bfc718..273c8729f29a 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/cloud_deploy.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/cloud_deploy.py @@ -17,12 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -208,6 +208,7 @@ class SkaffoldSupportState(proto.Enum): SKAFFOLD_SUPPORT_STATE_UNSUPPORTED (3): This Skaffold version is no longer supported. """ + SKAFFOLD_SUPPORT_STATE_UNSPECIFIED = 0 SKAFFOLD_SUPPORT_STATE_SUPPORTED = 1 SKAFFOLD_SUPPORT_STATE_MAINTENANCE_MODE = 2 @@ -225,6 +226,7 @@ class BackoffMode(proto.Enum): BACKOFF_MODE_EXPONENTIAL (2): Increases the wait time exponentially. """ + BACKOFF_MODE_UNSPECIFIED = 0 BACKOFF_MODE_LINEAR = 1 BACKOFF_MODE_EXPONENTIAL = 2 @@ -249,6 +251,7 @@ class RepairState(proto.Enum): REPAIR_STATE_ABORTED (7): The ``repair`` action was aborted. """ + REPAIR_STATE_UNSPECIFIED = 0 REPAIR_STATE_SUCCEEDED = 1 REPAIR_STATE_CANCELLED = 2 @@ -1790,6 +1793,7 @@ class ExecutionEnvironmentUsage(proto.Enum): POSTDEPLOY (5): Use for postdeploy job execution. """ + EXECUTION_ENVIRONMENT_USAGE_UNSPECIFIED = 0 RENDER = 1 DEPLOY = 2 @@ -2990,6 +2994,7 @@ class Invoker(proto.Enum): DEPLOY_AUTOMATION (2): Automated action by Cloud Deploy. """ + INVOKER_UNSPECIFIED = 0 USER = 1 DEPLOY_AUTOMATION = 2 @@ -3188,6 +3193,7 @@ class RolloutActions(proto.Enum): TERMINATE_JOBRUN (8): Terminate a jobrun. """ + ROLLOUT_ACTIONS_UNSPECIFIED = 0 ADVANCE = 1 APPROVE = 2 @@ -3341,12 +3347,12 @@ class PolicyViolation(proto.Message): Policy violation details. """ - policy_violation_details: MutableSequence[ - "PolicyViolationDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="PolicyViolationDetails", + policy_violation_details: MutableSequence["PolicyViolationDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="PolicyViolationDetails", + ) ) @@ -3493,6 +3499,7 @@ class RenderState(proto.Enum): IN_PROGRESS (3): Rendering has started and is not complete. """ + RENDER_STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -3536,6 +3543,7 @@ class TargetRenderState(proto.Enum): IN_PROGRESS (3): The render operation is in progress. """ + TARGET_RENDER_STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -3576,6 +3584,7 @@ class FailureCause(proto.Enum): The render operation had a feature configured that is not supported. """ + FAILURE_CAUSE_UNSPECIFIED = 0 CLOUD_BUILD_UNAVAILABLE = 1 EXECUTION_FAILED = 2 @@ -3756,12 +3765,12 @@ class ReleaseCondition(proto.Message): number=12, message="Target", ) - custom_target_type_snapshots: MutableSequence[ - "CustomTargetType" - ] = proto.RepeatedField( - proto.MESSAGE, - number=27, - message="CustomTargetType", + custom_target_type_snapshots: MutableSequence["CustomTargetType"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=27, + message="CustomTargetType", + ) ) render_state: RenderState = proto.Field( proto.ENUM, @@ -4536,6 +4545,7 @@ class ApprovalState(proto.Enum): REJECTED (4): The ``Rollout`` has been rejected. """ + APPROVAL_STATE_UNSPECIFIED = 0 NEEDS_APPROVAL = 1 DOES_NOT_NEED_APPROVAL = 2 @@ -4571,6 +4581,7 @@ class State(proto.Enum): HALTED (10): The ``Rollout`` is halted. """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -4613,6 +4624,7 @@ class FailureCause(proto.Enum): A Rollout operation had a feature configured that is not supported. """ + FAILURE_CAUSE_UNSPECIFIED = 0 CLOUD_BUILD_UNAVAILABLE = 1 EXECUTION_FAILED = 2 @@ -4946,6 +4958,7 @@ class State(proto.Enum): SKIPPED (6): The Phase was skipped. """ + STATE_UNSPECIFIED = 0 PENDING = 1 IN_PROGRESS = 2 @@ -5114,6 +5127,7 @@ class State(proto.Enum): IGNORED (8): The Job was ignored. """ + STATE_UNSPECIFIED = 0 PENDING = 1 DISABLED = 2 @@ -5737,6 +5751,7 @@ class State(proto.Enum): TERMINATED (5): The ``JobRun`` was terminated. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 SUCCEEDED = 2 @@ -5873,6 +5888,7 @@ class FailureCause(proto.Enum): The deploy operation had a feature configured that is not supported. """ + FAILURE_CAUSE_UNSPECIFIED = 0 CLOUD_BUILD_UNAVAILABLE = 1 EXECUTION_FAILED = 2 @@ -5953,6 +5969,7 @@ class FailureCause(proto.Enum): Cloud Build failed to fulfill Cloud Deploy's request. See failure_message for additional details. """ + FAILURE_CAUSE_UNSPECIFIED = 0 CLOUD_BUILD_UNAVAILABLE = 1 EXECUTION_FAILED = 2 @@ -6023,6 +6040,7 @@ class FailureCause(proto.Enum): Cloud Build failed to fulfill Cloud Deploy's request. See failure_message for additional details. """ + FAILURE_CAUSE_UNSPECIFIED = 0 CLOUD_BUILD_UNAVAILABLE = 1 EXECUTION_FAILED = 2 @@ -6085,6 +6103,7 @@ class FailureCause(proto.Enum): Cloud Build failed to fulfill Cloud Deploy's request. See failure_message for additional details. """ + FAILURE_CAUSE_UNSPECIFIED = 0 CLOUD_BUILD_UNAVAILABLE = 1 EXECUTION_FAILED = 2 @@ -7354,6 +7373,7 @@ class State(proto.Enum): ABORTED (6): The ``AutomationRun`` was aborted. """ + STATE_UNSPECIFIED = 0 SUCCEEDED = 1 CANCELLED = 2 diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/deploypolicy_evaluation_payload.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/deploypolicy_evaluation_payload.py index eed416cc7bf8..ce6ec1a04ef6 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/deploypolicy_evaluation_payload.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/deploypolicy_evaluation_payload.py @@ -90,6 +90,7 @@ class PolicyVerdict(proto.Enum): DENIED_BY_POLICY (2): Denied by policy. """ + POLICY_VERDICT_UNSPECIFIED = 0 ALLOWED_BY_POLICY = 1 DENIED_BY_POLICY = 2 @@ -107,6 +108,7 @@ class PolicyVerdictOverride(proto.Enum): POLICY_SUSPENDED (2): The policy was suspended. """ + POLICY_VERDICT_OVERRIDE_UNSPECIFIED = 0 POLICY_OVERRIDDEN = 1 POLICY_SUSPENDED = 2 diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/log_enums.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/log_enums.py index ffecfb3ab6ca..4e62d205a053 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/log_enums.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/log_enums.py @@ -52,6 +52,7 @@ class Type(proto.Enum): Deprecated: This field is never used. Use release_render log type instead. """ + TYPE_UNSPECIFIED = 0 TYPE_PUBSUB_NOTIFICATION_FAILURE = 1 TYPE_RESOURCE_STATE_CHANGE = 3 diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/rollout_update_payload.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/rollout_update_payload.py index 636ebfe134bc..1257e495aaaf 100644 --- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/rollout_update_payload.py +++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/rollout_update_payload.py @@ -89,6 +89,7 @@ class RolloutUpdateType(proto.Enum): ADVANCED (13): Rollout has been advanced. """ + ROLLOUT_UPDATE_TYPE_UNSPECIFIED = 0 PENDING = 1 PENDING_RELEASE = 2 diff --git a/packages/google-cloud-deploy/noxfile.py b/packages/google-cloud-deploy/noxfile.py index bd9102e3feb9..26071fed1eb3 100644 --- a/packages/google-cloud-deploy/noxfile.py +++ b/packages/google-cloud-deploy/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-deploy/tests/unit/gapic/deploy_v1/test_cloud_deploy.py b/packages/google-cloud-deploy/tests/unit/gapic/deploy_v1/test_cloud_deploy.py index d10599dc4389..bab26deb9976 100644 --- a/packages/google-cloud-deploy/tests/unit/gapic/deploy_v1/test_cloud_deploy.py +++ b/packages/google-cloud-deploy/tests/unit/gapic/deploy_v1/test_cloud_deploy.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,17 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,26 +62,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.deploy_v1.services.cloud_deploy import ( CloudDeployAsyncClient, @@ -943,10 +945,9 @@ def test_cloud_deploy_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +992,9 @@ def test_cloud_deploy_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1030,9 @@ def test_cloud_deploy_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1262,13 +1261,13 @@ def test_cloud_deploy_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1945,9 +1944,9 @@ def test_get_delivery_pipeline_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_delivery_pipeline - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_delivery_pipeline] = ( + mock_rpc + ) request = {} client.get_delivery_pipeline(request) @@ -6168,9 +6167,9 @@ def test_get_custom_target_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_target_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_target_type] = ( + mock_rpc + ) request = {} client.get_custom_target_type(request) @@ -9148,9 +9147,9 @@ def test_create_deploy_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deploy_policy] = ( + mock_rpc + ) request = {} client.create_deploy_policy(request) @@ -9513,9 +9512,9 @@ def test_update_deploy_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_deploy_policy] = ( + mock_rpc + ) request = {} client.update_deploy_policy(request) @@ -9872,9 +9871,9 @@ def test_delete_deploy_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deploy_policy] = ( + mock_rpc + ) request = {} client.delete_deploy_policy(request) @@ -10228,9 +10227,9 @@ def test_list_deploy_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deploy_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deploy_policies] = ( + mock_rpc + ) request = {} client.list_deploy_policies(request) @@ -10779,9 +10778,9 @@ def test_get_deploy_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_deploy_policy] = ( + mock_rpc + ) request = {} client.get_deploy_policy(request) @@ -14891,9 +14890,9 @@ def test_terminate_job_run_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.terminate_job_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.terminate_job_run] = ( + mock_rpc + ) request = {} client.terminate_job_run(request) @@ -15549,9 +15548,9 @@ def test_create_automation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_automation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_automation] = ( + mock_rpc + ) request = {} client.create_automation(request) @@ -15912,9 +15911,9 @@ def test_update_automation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_automation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_automation] = ( + mock_rpc + ) request = {} client.update_automation(request) @@ -16269,9 +16268,9 @@ def test_delete_automation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_automation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_automation] = ( + mock_rpc + ) request = {} client.delete_automation(request) @@ -16962,9 +16961,9 @@ def test_list_automations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_automations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_automations] = ( + mock_rpc + ) request = {} client.list_automations(request) @@ -17503,9 +17502,9 @@ def test_get_automation_run_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_automation_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_automation_run] = ( + mock_rpc + ) request = {} client.get_automation_run(request) @@ -17866,9 +17865,9 @@ def test_list_automation_runs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_automation_runs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_automation_runs] = ( + mock_rpc + ) request = {} client.list_automation_runs(request) @@ -18409,9 +18408,9 @@ def test_cancel_automation_run_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_automation_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_automation_run] = ( + mock_rpc + ) request = {} client.cancel_automation_run(request) @@ -18946,9 +18945,9 @@ def test_get_delivery_pipeline_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_delivery_pipeline - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_delivery_pipeline] = ( + mock_rpc + ) request = {} client.get_delivery_pipeline(request) @@ -21281,9 +21280,9 @@ def test_get_custom_target_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_target_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_target_type] = ( + mock_rpc + ) request = {} client.get_custom_target_type(request) @@ -22944,9 +22943,9 @@ def test_create_deploy_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deploy_policy] = ( + mock_rpc + ) request = {} client.create_deploy_policy(request) @@ -23166,9 +23165,9 @@ def test_update_deploy_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_deploy_policy] = ( + mock_rpc + ) request = {} client.update_deploy_policy(request) @@ -23373,9 +23372,9 @@ def test_delete_deploy_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deploy_policy] = ( + mock_rpc + ) request = {} client.delete_deploy_policy(request) @@ -23575,9 +23574,9 @@ def test_list_deploy_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deploy_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deploy_policies] = ( + mock_rpc + ) request = {} client.list_deploy_policies(request) @@ -23837,9 +23836,9 @@ def test_get_deploy_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_deploy_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_deploy_policy] = ( + mock_rpc + ) request = {} client.get_deploy_policy(request) @@ -26092,9 +26091,9 @@ def test_terminate_job_run_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.terminate_job_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.terminate_job_run] = ( + mock_rpc + ) request = {} client.terminate_job_run(request) @@ -26450,9 +26449,9 @@ def test_create_automation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_automation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_automation] = ( + mock_rpc + ) request = {} client.create_automation(request) @@ -26672,9 +26671,9 @@ def test_update_automation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_automation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_automation] = ( + mock_rpc + ) request = {} client.update_automation(request) @@ -26877,9 +26876,9 @@ def test_delete_automation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_automation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_automation] = ( + mock_rpc + ) request = {} client.delete_automation(request) @@ -27257,9 +27256,9 @@ def test_list_automations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_automations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_automations] = ( + mock_rpc + ) request = {} client.list_automations(request) @@ -27525,9 +27524,9 @@ def test_get_automation_run_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_automation_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_automation_run] = ( + mock_rpc + ) request = {} client.get_automation_run(request) @@ -27709,9 +27708,9 @@ def test_list_automation_runs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_automation_runs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_automation_runs] = ( + mock_rpc + ) request = {} client.list_automation_runs(request) @@ -27978,9 +27977,9 @@ def test_cancel_automation_run_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_automation_run - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_automation_run] = ( + mock_rpc + ) request = {} client.cancel_automation_run(request) @@ -30539,8 +30538,9 @@ def test_list_delivery_pipelines_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30605,18 +30605,20 @@ def test_list_delivery_pipelines_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_list_delivery_pipelines" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, - "post_list_delivery_pipelines_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_list_delivery_pipelines" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_delivery_pipelines" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_list_delivery_pipelines_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_list_delivery_pipelines" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30676,8 +30678,9 @@ def test_get_delivery_pipeline_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30750,18 +30753,20 @@ def test_get_delivery_pipeline_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_get_delivery_pipeline" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, - "post_get_delivery_pipeline_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_get_delivery_pipeline" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_delivery_pipeline" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_get_delivery_pipeline_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_get_delivery_pipeline" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30816,8 +30821,9 @@ def test_create_delivery_pipeline_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31052,20 +31058,21 @@ def test_create_delivery_pipeline_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_create_delivery_pipeline" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, - "post_create_delivery_pipeline_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_create_delivery_pipeline" - ) as pre: + 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.CloudDeployRestInterceptor, "post_create_delivery_pipeline" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_create_delivery_pipeline_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_create_delivery_pipeline" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31122,8 +31129,9 @@ def test_update_delivery_pipeline_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31362,20 +31370,21 @@ def test_update_delivery_pipeline_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_update_delivery_pipeline" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, - "post_update_delivery_pipeline_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_update_delivery_pipeline" - ) as pre: + 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.CloudDeployRestInterceptor, "post_update_delivery_pipeline" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_update_delivery_pipeline_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_update_delivery_pipeline" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31430,8 +31439,9 @@ def test_delete_delivery_pipeline_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31490,20 +31500,21 @@ def test_delete_delivery_pipeline_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_delete_delivery_pipeline" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, - "post_delete_delivery_pipeline_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_delete_delivery_pipeline" - ) as pre: + 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.CloudDeployRestInterceptor, "post_delete_delivery_pipeline" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_delete_delivery_pipeline_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_delete_delivery_pipeline" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31554,8 +31565,9 @@ def test_list_targets_rest_bad_request(request_type=cloud_deploy.ListTargetsRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31620,17 +31632,19 @@ def test_list_targets_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_list_targets" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_list_targets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_list_targets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_targets" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_targets_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_list_targets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31687,8 +31701,9 @@ def test_rollback_target_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31750,17 +31765,19 @@ def test_rollback_target_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_rollback_target" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_rollback_target_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_rollback_target" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_rollback_target" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_rollback_target_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_rollback_target" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31816,8 +31833,9 @@ def test_get_target_rest_bad_request(request_type=cloud_deploy.GetTargetRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31890,17 +31908,19 @@ def test_get_target_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_get_target" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_get_target_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_get_target" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_target" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_target_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_get_target" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31949,8 +31969,9 @@ def test_create_target_rest_bad_request(request_type=cloud_deploy.CreateTargetRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32117,19 +32138,20 @@ def test_create_target_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_create_target" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_create_target_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_create_target" - ) as pre: + 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.CloudDeployRestInterceptor, "post_create_target" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_create_target_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_create_target" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32182,8 +32204,9 @@ def test_update_target_rest_bad_request(request_type=cloud_deploy.UpdateTargetRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32352,19 +32375,20 @@ def test_update_target_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_update_target" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_update_target_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_update_target" - ) as pre: + 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.CloudDeployRestInterceptor, "post_update_target" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_update_target_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_update_target" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32415,8 +32439,9 @@ def test_delete_target_rest_bad_request(request_type=cloud_deploy.DeleteTargetRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32473,19 +32498,20 @@ def test_delete_target_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_delete_target" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_delete_target_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_delete_target" - ) as pre: + 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.CloudDeployRestInterceptor, "post_delete_target" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_delete_target_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_delete_target" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32538,8 +32564,9 @@ def test_list_custom_target_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32604,18 +32631,20 @@ def test_list_custom_target_types_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_list_custom_target_types" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, - "post_list_custom_target_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_list_custom_target_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_custom_target_types" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_list_custom_target_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_list_custom_target_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32675,8 +32704,9 @@ def test_get_custom_target_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32749,18 +32779,20 @@ def test_get_custom_target_type_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_get_custom_target_type" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, - "post_get_custom_target_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_get_custom_target_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_custom_target_type" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_get_custom_target_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_get_custom_target_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32815,8 +32847,9 @@ def test_create_custom_target_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32976,20 +33009,21 @@ def test_create_custom_target_type_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_create_custom_target_type" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, - "post_create_custom_target_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_create_custom_target_type" - ) as pre: + 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.CloudDeployRestInterceptor, "post_create_custom_target_type" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_create_custom_target_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_create_custom_target_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33046,8 +33080,9 @@ def test_update_custom_target_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33211,20 +33246,21 @@ def test_update_custom_target_type_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_update_custom_target_type" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, - "post_update_custom_target_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_update_custom_target_type" - ) as pre: + 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.CloudDeployRestInterceptor, "post_update_custom_target_type" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_update_custom_target_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_update_custom_target_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33279,8 +33315,9 @@ def test_delete_custom_target_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33339,20 +33376,21 @@ def test_delete_custom_target_type_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_delete_custom_target_type" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, - "post_delete_custom_target_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_delete_custom_target_type" - ) as pre: + 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.CloudDeployRestInterceptor, "post_delete_custom_target_type" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_delete_custom_target_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_delete_custom_target_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33405,8 +33443,9 @@ def test_list_releases_rest_bad_request(request_type=cloud_deploy.ListReleasesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33473,17 +33512,19 @@ def test_list_releases_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_list_releases" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_list_releases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_list_releases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_releases" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_releases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_list_releases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33538,8 +33579,9 @@ def test_get_release_rest_bad_request(request_type=cloud_deploy.GetReleaseReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33620,17 +33662,19 @@ def test_get_release_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_get_release" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_get_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_get_release" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_release" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_release_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_get_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33683,8 +33727,9 @@ def test_create_release_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34036,19 +34081,20 @@ def test_create_release_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_create_release" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_create_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_create_release" - ) as pre: + 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.CloudDeployRestInterceptor, "post_create_release" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_create_release_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_create_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34103,8 +34149,9 @@ def test_abandon_release_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34166,17 +34213,19 @@ def test_abandon_release_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_abandon_release" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_abandon_release_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_abandon_release" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_abandon_release" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_abandon_release_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_abandon_release" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34234,8 +34283,9 @@ def test_create_deploy_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34404,19 +34454,21 @@ def test_create_deploy_policy_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_create_deploy_policy" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_create_deploy_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_create_deploy_policy" - ) as pre: + 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.CloudDeployRestInterceptor, "post_create_deploy_policy" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_create_deploy_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_create_deploy_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34473,8 +34525,9 @@ def test_update_deploy_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34647,19 +34700,21 @@ def test_update_deploy_policy_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_update_deploy_policy" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_update_deploy_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_update_deploy_policy" - ) as pre: + 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.CloudDeployRestInterceptor, "post_update_deploy_policy" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_update_deploy_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_update_deploy_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34712,8 +34767,9 @@ def test_delete_deploy_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34770,19 +34826,21 @@ def test_delete_deploy_policy_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_delete_deploy_policy" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_delete_deploy_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_delete_deploy_policy" - ) as pre: + 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.CloudDeployRestInterceptor, "post_delete_deploy_policy" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_delete_deploy_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_delete_deploy_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34835,8 +34893,9 @@ def test_list_deploy_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34901,17 +34960,20 @@ def test_list_deploy_policies_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_list_deploy_policies" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_list_deploy_policies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_list_deploy_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_deploy_policies" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_list_deploy_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_list_deploy_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34969,8 +35031,9 @@ def test_get_deploy_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35041,17 +35104,20 @@ def test_get_deploy_policy_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_get_deploy_policy" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_get_deploy_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_get_deploy_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_deploy_policy" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_get_deploy_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_get_deploy_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35106,8 +35172,9 @@ def test_approve_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35169,17 +35236,19 @@ def test_approve_rollout_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_approve_rollout" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_approve_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_approve_rollout" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_approve_rollout" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_approve_rollout_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_approve_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35239,8 +35308,9 @@ def test_advance_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35302,17 +35372,19 @@ def test_advance_rollout_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_advance_rollout" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_advance_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_advance_rollout" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_advance_rollout" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_advance_rollout_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_advance_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35372,8 +35444,9 @@ def test_cancel_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35435,17 +35508,19 @@ def test_cancel_rollout_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_cancel_rollout" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_cancel_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_cancel_rollout" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_cancel_rollout" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_cancel_rollout_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_cancel_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35500,8 +35575,9 @@ def test_list_rollouts_rest_bad_request(request_type=cloud_deploy.ListRolloutsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35568,17 +35644,19 @@ def test_list_rollouts_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_list_rollouts" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_list_rollouts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_list_rollouts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_rollouts" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_rollouts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_list_rollouts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35633,8 +35711,9 @@ def test_get_rollout_rest_bad_request(request_type=cloud_deploy.GetRolloutReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35728,17 +35807,19 @@ def test_get_rollout_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_get_rollout" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_get_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_get_rollout" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_rollout" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_rollout_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_get_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35791,8 +35872,9 @@ def test_create_rollout_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35996,19 +36078,20 @@ def test_create_rollout_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_create_rollout" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_create_rollout_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_create_rollout" - ) as pre: + 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.CloudDeployRestInterceptor, "post_create_rollout" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_create_rollout_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_create_rollout" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36061,8 +36144,9 @@ def test_ignore_job_rest_bad_request(request_type=cloud_deploy.IgnoreJobRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36124,17 +36208,19 @@ def test_ignore_job_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_ignore_job" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_ignore_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_ignore_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_ignore_job" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_ignore_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_ignore_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36187,8 +36273,9 @@ def test_retry_job_rest_bad_request(request_type=cloud_deploy.RetryJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36250,17 +36337,19 @@ def test_retry_job_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_retry_job" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_retry_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_retry_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_retry_job" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_retry_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_retry_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36313,8 +36402,9 @@ def test_list_job_runs_rest_bad_request(request_type=cloud_deploy.ListJobRunsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36381,17 +36471,19 @@ def test_list_job_runs_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_list_job_runs" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_list_job_runs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_list_job_runs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_job_runs" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_job_runs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_list_job_runs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36446,8 +36538,9 @@ def test_get_job_run_rest_bad_request(request_type=cloud_deploy.GetJobRunRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36522,17 +36615,19 @@ def test_get_job_run_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_get_job_run" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_get_job_run_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_get_job_run" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_job_run" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_job_run_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_get_job_run" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36585,8 +36680,9 @@ def test_terminate_job_run_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36648,17 +36744,20 @@ def test_terminate_job_run_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_terminate_job_run" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_terminate_job_run_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_terminate_job_run" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_terminate_job_run" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_terminate_job_run_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_terminate_job_run" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36714,8 +36813,9 @@ def test_get_config_rest_bad_request(request_type=cloud_deploy.GetConfigRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36780,17 +36880,19 @@ def test_get_config_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_get_config" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_get_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_get_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_config" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_get_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36843,8 +36945,9 @@ def test_create_automation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37041,19 +37144,21 @@ def test_create_automation_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_create_automation" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_create_automation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_create_automation" - ) as pre: + 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.CloudDeployRestInterceptor, "post_create_automation" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_create_automation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_create_automation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37110,8 +37215,9 @@ def test_update_automation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37310,19 +37416,21 @@ def test_update_automation_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_update_automation" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_update_automation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_update_automation" - ) as pre: + 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.CloudDeployRestInterceptor, "post_update_automation" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_update_automation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_update_automation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37377,8 +37485,9 @@ def test_delete_automation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37437,19 +37546,21 @@ def test_delete_automation_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_delete_automation" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_delete_automation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_delete_automation" - ) as pre: + 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.CloudDeployRestInterceptor, "post_delete_automation" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_delete_automation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_delete_automation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37504,8 +37615,9 @@ def test_get_automation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37580,17 +37692,19 @@ def test_get_automation_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_get_automation" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_get_automation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_get_automation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_automation" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_automation_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_get_automation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37645,8 +37759,9 @@ def test_list_automations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37713,17 +37828,19 @@ def test_list_automations_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_list_automations" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_list_automations_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_list_automations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_automations" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_automations_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_list_automations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37783,8 +37900,9 @@ def test_get_automation_run_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37863,17 +37981,20 @@ def test_get_automation_run_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_get_automation_run" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_get_automation_run_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_get_automation_run" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_get_automation_run" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_get_automation_run_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_get_automation_run" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37928,8 +38049,9 @@ def test_list_automation_runs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37996,17 +38118,20 @@ def test_list_automation_runs_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_list_automation_runs" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, "post_list_automation_runs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_list_automation_runs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_list_automation_runs" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_list_automation_runs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_list_automation_runs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38066,8 +38191,9 @@ def test_cancel_automation_run_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38129,18 +38255,20 @@ def test_cancel_automation_run_rest_interceptors(null_interceptor): ) client = CloudDeployClient(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.CloudDeployRestInterceptor, "post_cancel_automation_run" - ) as post, mock.patch.object( - transports.CloudDeployRestInterceptor, - "post_cancel_automation_run_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudDeployRestInterceptor, "pre_cancel_automation_run" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudDeployRestInterceptor, "post_cancel_automation_run" + ) as post, + mock.patch.object( + transports.CloudDeployRestInterceptor, + "post_cancel_automation_run_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudDeployRestInterceptor, "pre_cancel_automation_run" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38198,8 +38326,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -38258,8 +38387,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -38321,8 +38451,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -38386,8 +38517,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -38451,8 +38583,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -38515,8 +38648,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -38577,8 +38711,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -38639,8 +38774,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -38701,8 +38837,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39829,11 +39966,14 @@ def test_cloud_deploy_base_transport(): def test_cloud_deploy_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.deploy_v1.services.cloud_deploy.transports.CloudDeployTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.deploy_v1.services.cloud_deploy.transports.CloudDeployTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudDeployTransport( @@ -39850,9 +39990,12 @@ def test_cloud_deploy_base_transport_with_credentials_file(): def test_cloud_deploy_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.deploy_v1.services.cloud_deploy.transports.CloudDeployTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.deploy_v1.services.cloud_deploy.transports.CloudDeployTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudDeployTransport() @@ -39924,11 +40067,12 @@ def test_cloud_deploy_transport_auth_gdch_credentials(transport_class): def test_cloud_deploy_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-developerconnect/docs/conf.py b/packages/google-cloud-developerconnect/docs/conf.py index 9dd8e9f72d98..46f89087d8bd 100644 --- a/packages/google-cloud-developerconnect/docs/conf.py +++ b/packages/google-cloud-developerconnect/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-developerconnect documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/__init__.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/__init__.py index aa777a853f23..11f54507b0ee 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/__init__.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.developer_connect import ( DeveloperConnectAsyncClient, DeveloperConnectClient, diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/async_client.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/async_client.py index 2b1968512bc2..9a3be6268cb1 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/async_client.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.developerconnect_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.developerconnect_v1.services.developer_connect import pagers from google.cloud.developerconnect_v1.types import developer_connect @@ -141,7 +141,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DeveloperConnectAsyncClient: The constructed client. """ - return DeveloperConnectClient.from_service_account_info.__func__(DeveloperConnectAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DeveloperConnectClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DeveloperConnectAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +158,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DeveloperConnectAsyncClient: The constructed client. """ - return DeveloperConnectClient.from_service_account_file.__func__(DeveloperConnectAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DeveloperConnectClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DeveloperConnectAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/client.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/client.py index 64fc83ca9a0e..9fd1fe8e1aee 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/client.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.developerconnect_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.developerconnect_v1.services.developer_connect import pagers from google.cloud.developerconnect_v1.types import developer_connect @@ -86,9 +86,7 @@ class DeveloperConnectClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DeveloperConnectTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DeveloperConnectTransport]] _transport_registry["grpc"] = DeveloperConnectGrpcTransport _transport_registry["grpc_asyncio"] = DeveloperConnectGrpcAsyncIOTransport _transport_registry["rest"] = DeveloperConnectRestTransport @@ -772,11 +770,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeveloperConnectClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeveloperConnectClient._read_environment_variables() + ) self._client_cert_source = DeveloperConnectClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -811,8 +807,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeveloperConnectTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/pagers.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/pagers.py index 4c7860568f00..747d2285e58b 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/pagers.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -461,7 +461,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -543,7 +543,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -619,7 +619,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -699,7 +699,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -777,7 +777,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -859,7 +859,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -935,7 +935,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/base.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/base.py index ee00c41429e8..907ab2c8749f 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/base.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.developerconnect_v1 import gapic_version as package_version from google.cloud.developerconnect_v1.types import developer_connect @@ -688,13 +688,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc.py index f9be3f0e7882..296ad956beaf 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.developerconnect_v1.types import developer_connect @@ -508,12 +508,12 @@ def create_git_repository_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_git_repository_link" not in self._stubs: - self._stubs[ - "create_git_repository_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/CreateGitRepositoryLink", - request_serializer=developer_connect.CreateGitRepositoryLinkRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_git_repository_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/CreateGitRepositoryLink", + request_serializer=developer_connect.CreateGitRepositoryLinkRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_git_repository_link"] @@ -538,12 +538,12 @@ def delete_git_repository_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_git_repository_link" not in self._stubs: - self._stubs[ - "delete_git_repository_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/DeleteGitRepositoryLink", - request_serializer=developer_connect.DeleteGitRepositoryLinkRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_git_repository_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/DeleteGitRepositoryLink", + request_serializer=developer_connect.DeleteGitRepositoryLinkRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_git_repository_link"] @@ -690,12 +690,12 @@ def fetch_linkable_git_repositories( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_linkable_git_repositories" not in self._stubs: - self._stubs[ - "fetch_linkable_git_repositories" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/FetchLinkableGitRepositories", - request_serializer=developer_connect.FetchLinkableGitRepositoriesRequest.serialize, - response_deserializer=developer_connect.FetchLinkableGitRepositoriesResponse.deserialize, + self._stubs["fetch_linkable_git_repositories"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/FetchLinkableGitRepositories", + request_serializer=developer_connect.FetchLinkableGitRepositoriesRequest.serialize, + response_deserializer=developer_connect.FetchLinkableGitRepositoriesResponse.deserialize, + ) ) return self._stubs["fetch_linkable_git_repositories"] @@ -725,12 +725,12 @@ def fetch_git_hub_installations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_git_hub_installations" not in self._stubs: - self._stubs[ - "fetch_git_hub_installations" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/FetchGitHubInstallations", - request_serializer=developer_connect.FetchGitHubInstallationsRequest.serialize, - response_deserializer=developer_connect.FetchGitHubInstallationsResponse.deserialize, + self._stubs["fetch_git_hub_installations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/FetchGitHubInstallations", + request_serializer=developer_connect.FetchGitHubInstallationsRequest.serialize, + response_deserializer=developer_connect.FetchGitHubInstallationsResponse.deserialize, + ) ) return self._stubs["fetch_git_hub_installations"] diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc_asyncio.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc_asyncio.py index 11aeef9c6806..eed54b5ed658 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc_asyncio.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.developerconnect_v1.types import developer_connect @@ -518,12 +518,12 @@ def create_git_repository_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_git_repository_link" not in self._stubs: - self._stubs[ - "create_git_repository_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/CreateGitRepositoryLink", - request_serializer=developer_connect.CreateGitRepositoryLinkRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_git_repository_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/CreateGitRepositoryLink", + request_serializer=developer_connect.CreateGitRepositoryLinkRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_git_repository_link"] @@ -549,12 +549,12 @@ def delete_git_repository_link( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_git_repository_link" not in self._stubs: - self._stubs[ - "delete_git_repository_link" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/DeleteGitRepositoryLink", - request_serializer=developer_connect.DeleteGitRepositoryLinkRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_git_repository_link"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/DeleteGitRepositoryLink", + request_serializer=developer_connect.DeleteGitRepositoryLinkRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_git_repository_link"] @@ -701,12 +701,12 @@ def fetch_linkable_git_repositories( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_linkable_git_repositories" not in self._stubs: - self._stubs[ - "fetch_linkable_git_repositories" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/FetchLinkableGitRepositories", - request_serializer=developer_connect.FetchLinkableGitRepositoriesRequest.serialize, - response_deserializer=developer_connect.FetchLinkableGitRepositoriesResponse.deserialize, + self._stubs["fetch_linkable_git_repositories"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/FetchLinkableGitRepositories", + request_serializer=developer_connect.FetchLinkableGitRepositoriesRequest.serialize, + response_deserializer=developer_connect.FetchLinkableGitRepositoriesResponse.deserialize, + ) ) return self._stubs["fetch_linkable_git_repositories"] @@ -736,12 +736,12 @@ def fetch_git_hub_installations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_git_hub_installations" not in self._stubs: - self._stubs[ - "fetch_git_hub_installations" - ] = self._logged_channel.unary_unary( - "/google.cloud.developerconnect.v1.DeveloperConnect/FetchGitHubInstallations", - request_serializer=developer_connect.FetchGitHubInstallationsRequest.serialize, - response_deserializer=developer_connect.FetchGitHubInstallationsResponse.deserialize, + self._stubs["fetch_git_hub_installations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.developerconnect.v1.DeveloperConnect/FetchGitHubInstallations", + request_serializer=developer_connect.FetchGitHubInstallationsRequest.serialize, + response_deserializer=developer_connect.FetchGitHubInstallationsResponse.deserialize, + ) ) return self._stubs["fetch_git_hub_installations"] diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/rest.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/rest.py index a3370f0126ff..f8fa4a824919 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/rest.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/developer_connect/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1820,9 +1820,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseCreateAccountConnector._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseCreateAccountConnector._get_http_options() request, metadata = self._interceptor.pre_create_account_connector( request, metadata @@ -1848,7 +1846,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1976,9 +1974,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseCreateConnection._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseCreateConnection._get_http_options() request, metadata = self._interceptor.pre_create_connection( request, metadata @@ -2004,7 +2000,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2132,9 +2128,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseCreateGitRepositoryLink._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseCreateGitRepositoryLink._get_http_options() request, metadata = self._interceptor.pre_create_git_repository_link( request, metadata @@ -2160,7 +2154,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2288,9 +2282,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseDeleteAccountConnector._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseDeleteAccountConnector._get_http_options() request, metadata = self._interceptor.pre_delete_account_connector( request, metadata @@ -2312,7 +2304,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2438,9 +2430,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseDeleteConnection._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseDeleteConnection._get_http_options() request, metadata = self._interceptor.pre_delete_connection( request, metadata @@ -2462,7 +2452,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2588,9 +2578,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseDeleteGitRepositoryLink._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseDeleteGitRepositoryLink._get_http_options() request, metadata = self._interceptor.pre_delete_git_repository_link( request, metadata @@ -2612,7 +2600,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2760,7 +2748,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2905,7 +2893,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3030,9 +3018,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseFetchAccessToken._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseFetchAccessToken._get_http_options() request, metadata = self._interceptor.pre_fetch_access_token( request, metadata @@ -3188,9 +3174,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseFetchGitHubInstallations._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseFetchGitHubInstallations._get_http_options() request, metadata = self._interceptor.pre_fetch_git_hub_installations( request, metadata @@ -3491,9 +3475,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseFetchLinkableGitRepositories._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseFetchLinkableGitRepositories._get_http_options() request, metadata = self._interceptor.pre_fetch_linkable_git_repositories( request, metadata @@ -3557,11 +3539,10 @@ def __call__( resp = self._interceptor.post_fetch_linkable_git_repositories(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_linkable_git_repositories_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_linkable_git_repositories_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3647,9 +3628,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseFetchReadToken._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseFetchReadToken._get_http_options() request, metadata = self._interceptor.pre_fetch_read_token( request, metadata @@ -3805,9 +3784,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseFetchReadWriteToken._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseFetchReadWriteToken._get_http_options() request, metadata = self._interceptor.pre_fetch_read_write_token( request, metadata @@ -4115,9 +4092,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseGetAccountConnector._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseGetAccountConnector._get_http_options() request, metadata = self._interceptor.pre_get_account_connector( request, metadata @@ -4263,9 +4238,7 @@ def __call__( Message describing Connection object """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseGetConnection._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseGetConnection._get_http_options() request, metadata = self._interceptor.pre_get_connection(request, metadata) transcoded_request = _BaseDeveloperConnectRestTransport._BaseGetConnection._get_transcoded_request( @@ -4411,9 +4384,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseGetGitRepositoryLink._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseGetGitRepositoryLink._get_http_options() request, metadata = self._interceptor.pre_get_git_repository_link( request, metadata @@ -4565,9 +4536,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseListAccountConnectors._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseListAccountConnectors._get_http_options() request, metadata = self._interceptor.pre_list_account_connectors( request, metadata @@ -4721,9 +4690,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseListConnections._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseListConnections._get_http_options() request, metadata = self._interceptor.pre_list_connections( request, metadata @@ -4873,9 +4840,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseListGitRepositoryLinks._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseListGitRepositoryLinks._get_http_options() request, metadata = self._interceptor.pre_list_git_repository_links( request, metadata @@ -5178,9 +5143,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseUpdateAccountConnector._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseUpdateAccountConnector._get_http_options() request, metadata = self._interceptor.pre_update_account_connector( request, metadata @@ -5206,7 +5169,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5334,9 +5297,7 @@ def __call__( """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseUpdateConnection._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseUpdateConnection._get_http_options() request, metadata = self._interceptor.pre_update_connection( request, metadata @@ -5362,7 +5323,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5437,7 +5398,9 @@ def create_account_connector( ]: # 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._CreateAccountConnector(self._session, self._host, self._interceptor) # type: ignore + return self._CreateAccountConnector( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_connection( @@ -5457,7 +5420,9 @@ def create_git_repository_link( ]: # 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._CreateGitRepositoryLink(self._session, self._host, self._interceptor) # type: ignore + return self._CreateGitRepositoryLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_account_connector( @@ -5467,7 +5432,9 @@ def delete_account_connector( ]: # 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._DeleteAccountConnector(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAccountConnector( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_connection( @@ -5487,7 +5454,9 @@ def delete_git_repository_link( ]: # 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._DeleteGitRepositoryLink(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteGitRepositoryLink( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_self( @@ -5525,7 +5494,9 @@ def fetch_git_hub_installations( ]: # 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._FetchGitHubInstallations(self._session, self._host, self._interceptor) # type: ignore + return self._FetchGitHubInstallations( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_git_refs( @@ -5546,7 +5517,9 @@ def fetch_linkable_git_repositories( ]: # 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._FetchLinkableGitRepositories(self._session, self._host, self._interceptor) # type: ignore + return self._FetchLinkableGitRepositories( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_read_token( @@ -5641,7 +5614,9 @@ def list_git_repository_links( ]: # 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._ListGitRepositoryLinks(self._session, self._host, self._interceptor) # type: ignore + return self._ListGitRepositoryLinks( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_users( @@ -5661,7 +5636,9 @@ def update_account_connector( ]: # 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._UpdateAccountConnector(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAccountConnector( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_connection( @@ -5870,9 +5847,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDeveloperConnectRestTransport._BaseListLocations._get_transcoded_request( @@ -6009,9 +5984,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -6129,9 +6102,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -6386,9 +6357,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDeveloperConnectRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDeveloperConnectRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDeveloperConnectRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/async_client.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/async_client.py index 644e06f9793e..060923457cda 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/async_client.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.developerconnect_v1 import gapic_version as package_version @@ -44,20 +44,19 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.developerconnect_v1.services.insights_config_service import pagers +from google.cloud.developerconnect_v1.types import developer_connect, insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import developer_connect -from google.cloud.developerconnect_v1.types import insights_config from .client import InsightsConfigServiceClient from .transports.base import DEFAULT_CLIENT_INFO, InsightsConfigServiceTransport @@ -141,7 +140,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: InsightsConfigServiceAsyncClient: The constructed client. """ - return InsightsConfigServiceClient.from_service_account_info.__func__(InsightsConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = InsightsConfigServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(InsightsConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +157,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: InsightsConfigServiceAsyncClient: The constructed client. """ - return InsightsConfigServiceClient.from_service_account_file.__func__(InsightsConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = InsightsConfigServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(InsightsConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -195,7 +196,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return InsightsConfigServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return InsightsConfigServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> InsightsConfigServiceTransport: diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/client.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/client.py index 9a7f9f88eea8..9e70f5554b1b 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/client.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.developerconnect_v1 import gapic_version as package_version @@ -61,20 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.developerconnect_v1.services.insights_config_service import pagers +from google.cloud.developerconnect_v1.types import developer_connect, insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import developer_connect -from google.cloud.developerconnect_v1.types import insights_config from .transports.base import DEFAULT_CLIENT_INFO, InsightsConfigServiceTransport from .transports.grpc import InsightsConfigServiceGrpcTransport @@ -90,9 +89,7 @@ class InsightsConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InsightsConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InsightsConfigServiceTransport]] _transport_registry["grpc"] = InsightsConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = InsightsConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = InsightsConfigServiceRestTransport @@ -648,11 +645,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InsightsConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InsightsConfigServiceClient._read_environment_variables() + ) self._client_cert_source = InsightsConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -687,8 +682,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InsightsConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/pagers.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/pagers.py index 4410381dfe1e..67d078aa1704 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/pagers.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/__init__.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/__init__.py index c0c4565b394b..79e16206791b 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/__init__.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InsightsConfigServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InsightsConfigServiceTransport]] _transport_registry["grpc"] = InsightsConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = InsightsConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = InsightsConfigServiceRestTransport diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/base.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/base.py index a91821d93a31..d47f27135b6c 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/base.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/base.py @@ -17,21 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.developerconnect_v1 import gapic_version as package_version +from google.cloud.developerconnect_v1.types import insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import insights_config DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -286,13 +286,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc.py index 4fcaeb0e1b44..b02a5c7d7461 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc.py @@ -16,24 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.developerconnect_v1.types import insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import insights_config from .base import DEFAULT_CLIENT_INFO, InsightsConfigServiceTransport diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc_asyncio.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc_asyncio.py index f5f7f2b2b23a..3a4a39233091 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,15 +31,12 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.developerconnect_v1.types import insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import insights_config from .base import DEFAULT_CLIENT_INFO, InsightsConfigServiceTransport from .grpc import InsightsConfigServiceGrpcTransport diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest.py index 77dcc6a22b3c..7c39ec2dcac5 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest.py @@ -16,24 +16,24 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.developerconnect_v1.types import insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import insights_config from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseInsightsConfigServiceRestTransport @@ -728,9 +728,7 @@ def __call__( """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseCreateInsightsConfig._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseCreateInsightsConfig._get_http_options() request, metadata = self._interceptor.pre_create_insights_config( request, metadata @@ -756,7 +754,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -884,9 +882,7 @@ def __call__( """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseDeleteInsightsConfig._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseDeleteInsightsConfig._get_http_options() request, metadata = self._interceptor.pre_delete_insights_config( request, metadata @@ -908,7 +904,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1040,9 +1036,7 @@ def __call__( """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseGetInsightsConfig._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseGetInsightsConfig._get_http_options() request, metadata = self._interceptor.pre_get_insights_config( request, metadata @@ -1192,9 +1186,7 @@ def __call__( """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseListInsightsConfigs._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseListInsightsConfigs._get_http_options() request, metadata = self._interceptor.pre_list_insights_configs( request, metadata @@ -1348,9 +1340,7 @@ def __call__( """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseUpdateInsightsConfig._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseUpdateInsightsConfig._get_http_options() request, metadata = self._interceptor.pre_update_insights_config( request, metadata @@ -1376,7 +1366,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1554,9 +1544,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseInsightsConfigServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1695,9 +1683,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseInsightsConfigServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1834,9 +1820,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1956,9 +1940,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2076,9 +2058,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseInsightsConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2217,9 +2197,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseInsightsConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseInsightsConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseInsightsConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest_base.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest_base.py index ed878a13c558..5dbf10bdaf8c 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest_base.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/services/insights_config_service/transports/rest_base.py @@ -22,10 +22,10 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.developerconnect_v1.types import insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import insights_config from .base import DEFAULT_CLIENT_INFO, InsightsConfigServiceTransport diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/developer_connect.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/developer_connect.py index 891c77a92dae..307a524f0b5b 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/developer_connect.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/developer_connect.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -119,6 +119,7 @@ class SystemProvider(proto.Enum): DYNATRACE (8): Dynatrace provider. """ + SYSTEM_PROVIDER_UNSPECIFIED = 0 GITHUB = 1 GITLAB = 2 @@ -460,6 +461,7 @@ class Stage(proto.Enum): COMPLETE (10): Installation process has been completed. """ + STAGE_UNSPECIFIED = 0 PENDING_CREATE_APP = 1 PENDING_USER_OAUTH = 2 @@ -516,6 +518,7 @@ class GitHubApp(proto.Enum): FIREBASE (2): The Firebase GitHub Application. """ + GIT_HUB_APP_UNSPECIFIED = 0 DEVELOPER_CONNECT = 1 FIREBASE = 2 @@ -2138,12 +2141,12 @@ class FetchLinkableGitRepositoriesResponse(proto.Message): def raw_page(self): return self - linkable_git_repositories: MutableSequence[ - "LinkableGitRepository" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="LinkableGitRepository", + linkable_git_repositories: MutableSequence["LinkableGitRepository"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="LinkableGitRepository", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -2252,6 +2255,7 @@ class RefType(proto.Enum): BRANCH (2): To fetch branches. """ + REF_TYPE_UNSPECIFIED = 0 TAG = 1 BRANCH = 2 diff --git a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/insights_config.py b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/insights_config.py index de746ee7dc2d..1af3cf6ca1ec 100644 --- a/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/insights_config.py +++ b/packages/google-cloud-developerconnect/google/cloud/developerconnect_v1/types/insights_config.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -115,6 +115,7 @@ class State(proto.Enum): ERROR (4): The InsightsConfig is in an error state. """ + STATE_UNSPECIFIED = 0 PENDING = 5 COMPLETE = 3 @@ -214,6 +215,7 @@ class State(proto.Enum): The runtime configuration has been unlinked to the InsightsConfig. """ + STATE_UNSPECIFIED = 0 LINKED = 1 UNLINKED = 2 diff --git a/packages/google-cloud-developerconnect/noxfile.py b/packages/google-cloud-developerconnect/noxfile.py index 4053f3537c41..368f11d4baeb 100644 --- a/packages/google-cloud-developerconnect/noxfile.py +++ b/packages/google-cloud-developerconnect/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_developer_connect.py b/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_developer_connect.py index ef022bd141db..4752311a4b72 100644 --- a/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_developer_connect.py +++ b/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_developer_connect.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.developerconnect_v1.services.developer_connect import ( DeveloperConnectAsyncClient, @@ -984,10 +984,9 @@ def test_developer_connect_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1031,9 @@ def test_developer_connect_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1071,10 +1069,9 @@ def test_developer_connect_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1322,13 +1319,13 @@ def test_developer_connect_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1443,9 +1440,9 @@ def test_list_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -2307,9 +2304,9 @@ def test_create_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -2691,9 +2688,9 @@ def test_update_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -3071,9 +3068,9 @@ def test_delete_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -5067,9 +5064,9 @@ def test_fetch_read_write_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_write_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_write_token] = ( + mock_rpc + ) request = {} client.fetch_read_write_token(request) @@ -5407,9 +5404,9 @@ def test_fetch_read_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_token] = ( + mock_rpc + ) request = {} client.fetch_read_token(request) @@ -7724,9 +7721,9 @@ def test_get_account_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_account_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_account_connector] = ( + mock_rpc + ) request = {} client.get_account_connector(request) @@ -9191,9 +9188,9 @@ def test_fetch_access_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_access_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_access_token] = ( + mock_rpc + ) request = {} client.fetch_access_token(request) @@ -10971,9 +10968,9 @@ def test_list_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -11413,9 +11410,9 @@ def test_create_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -11641,9 +11638,9 @@ def test_update_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -11854,9 +11851,9 @@ def test_delete_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -12941,9 +12938,9 @@ def test_fetch_read_write_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_write_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_write_token] = ( + mock_rpc + ) request = {} client.fetch_read_write_token(request) @@ -13126,9 +13123,9 @@ def test_fetch_read_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_read_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_read_token] = ( + mock_rpc + ) request = {} client.fetch_read_token(request) @@ -14313,9 +14310,9 @@ def test_get_account_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_account_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_account_connector] = ( + mock_rpc + ) request = {} client.get_account_connector(request) @@ -15144,9 +15141,9 @@ def test_fetch_access_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_access_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_access_token] = ( + mock_rpc + ) request = {} client.fetch_access_token(request) @@ -17478,8 +17475,9 @@ def test_list_connections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17544,18 +17542,20 @@ def test_list_connections_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_list_connections" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_list_connections_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_list_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_list_connections" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_list_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_list_connections" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17613,8 +17613,9 @@ def test_get_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17685,17 +17686,20 @@ def test_get_connection_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_get_connection" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "post_get_connection_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_get_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_get_connection" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_get_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_get_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17750,8 +17754,9 @@ def test_create_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17947,20 +17952,21 @@ def test_create_connection_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_create_connection" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_create_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_create_connection" - ) as pre: + 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.DeveloperConnectRestInterceptor, "post_create_connection" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_create_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_create_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18015,8 +18021,9 @@ def test_update_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18214,20 +18221,21 @@ def test_update_connection_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_update_connection" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_update_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_update_connection" - ) as pre: + 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.DeveloperConnectRestInterceptor, "post_update_connection" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_update_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_update_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18280,8 +18288,9 @@ def test_delete_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18338,20 +18347,21 @@ def test_delete_connection_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_delete_connection" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_delete_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_delete_connection" - ) as pre: + 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.DeveloperConnectRestInterceptor, "post_delete_connection" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_delete_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_delete_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18404,8 +18414,9 @@ def test_create_git_repository_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18545,20 +18556,22 @@ def test_create_git_repository_link_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_create_git_repository_link" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_create_git_repository_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_create_git_repository_link" - ) as pre: + 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.DeveloperConnectRestInterceptor, + "post_create_git_repository_link", + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_create_git_repository_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_create_git_repository_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18613,8 +18626,9 @@ def test_delete_git_repository_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18673,20 +18687,22 @@ def test_delete_git_repository_link_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_delete_git_repository_link" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_delete_git_repository_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_delete_git_repository_link" - ) as pre: + 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.DeveloperConnectRestInterceptor, + "post_delete_git_repository_link", + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_delete_git_repository_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_delete_git_repository_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18739,8 +18755,9 @@ def test_list_git_repository_links_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18805,18 +18822,20 @@ def test_list_git_repository_links_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_list_git_repository_links" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_list_git_repository_links_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_list_git_repository_links" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_list_git_repository_links" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_list_git_repository_links_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_list_git_repository_links" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18876,8 +18895,9 @@ def test_get_git_repository_link_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18954,18 +18974,20 @@ def test_get_git_repository_link_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_get_git_repository_link" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_get_git_repository_link_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_get_git_repository_link" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_get_git_repository_link" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_get_git_repository_link_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_get_git_repository_link" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19025,8 +19047,9 @@ def test_fetch_read_write_token_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19093,18 +19116,20 @@ def test_fetch_read_write_token_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_fetch_read_write_token" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_fetch_read_write_token_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_fetch_read_write_token" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_fetch_read_write_token" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_fetch_read_write_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_fetch_read_write_token" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19164,8 +19189,9 @@ def test_fetch_read_token_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19232,18 +19258,20 @@ def test_fetch_read_token_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_fetch_read_token" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_fetch_read_token_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_fetch_read_token" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_fetch_read_token" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_fetch_read_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_fetch_read_token" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19303,8 +19331,9 @@ def test_fetch_linkable_git_repositories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19371,20 +19400,22 @@ def test_fetch_linkable_git_repositories_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, - "post_fetch_linkable_git_repositories", - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_fetch_linkable_git_repositories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "pre_fetch_linkable_git_repositories", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_fetch_linkable_git_repositories", + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_fetch_linkable_git_repositories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "pre_fetch_linkable_git_repositories", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19444,8 +19475,9 @@ def test_fetch_git_hub_installations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19509,18 +19541,22 @@ def test_fetch_git_hub_installations_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_fetch_git_hub_installations" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_fetch_git_hub_installations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_fetch_git_hub_installations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_fetch_git_hub_installations", + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_fetch_git_hub_installations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "pre_fetch_git_hub_installations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19580,8 +19616,9 @@ def test_fetch_git_refs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19648,17 +19685,20 @@ def test_fetch_git_refs_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_fetch_git_refs" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "post_fetch_git_refs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_fetch_git_refs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_fetch_git_refs" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_fetch_git_refs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_fetch_git_refs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19716,8 +19756,9 @@ def test_list_account_connectors_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19782,18 +19823,20 @@ def test_list_account_connectors_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_list_account_connectors" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_list_account_connectors_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_list_account_connectors" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_list_account_connectors" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_list_account_connectors_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_list_account_connectors" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19853,8 +19896,9 @@ def test_get_account_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19923,18 +19967,20 @@ def test_get_account_connector_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_get_account_connector" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_get_account_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_get_account_connector" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_get_account_connector" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_get_account_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_get_account_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19989,8 +20035,9 @@ def test_create_account_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20129,20 +20176,21 @@ def test_create_account_connector_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_create_account_connector" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_create_account_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_create_account_connector" - ) as pre: + 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.DeveloperConnectRestInterceptor, "post_create_account_connector" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_create_account_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_create_account_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20199,8 +20247,9 @@ def test_update_account_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20343,20 +20392,21 @@ def test_update_account_connector_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_update_account_connector" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_update_account_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_update_account_connector" - ) as pre: + 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.DeveloperConnectRestInterceptor, "post_update_account_connector" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_update_account_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_update_account_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20411,8 +20461,9 @@ def test_delete_account_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20471,20 +20522,21 @@ def test_delete_account_connector_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_delete_account_connector" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_delete_account_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_delete_account_connector" - ) as pre: + 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.DeveloperConnectRestInterceptor, "post_delete_account_connector" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_delete_account_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_delete_account_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20539,8 +20591,9 @@ def test_fetch_access_token_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20607,18 +20660,20 @@ def test_fetch_access_token_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_fetch_access_token" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, - "post_fetch_access_token_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_fetch_access_token" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_fetch_access_token" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, + "post_fetch_access_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_fetch_access_token" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20676,8 +20731,9 @@ def test_list_users_rest_bad_request(request_type=developer_connect.ListUsersReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20744,17 +20800,19 @@ def test_list_users_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_list_users" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "post_list_users_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_list_users" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_list_users" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_list_users_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_list_users" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20812,8 +20870,9 @@ def test_delete_user_rest_bad_request(request_type=developer_connect.DeleteUserR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20872,19 +20931,20 @@ def test_delete_user_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_delete_user" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "post_delete_user_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_delete_user" - ) as pre: + 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.DeveloperConnectRestInterceptor, "post_delete_user" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_delete_user_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_delete_user" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20937,8 +20997,9 @@ def test_fetch_self_rest_bad_request(request_type=developer_connect.FetchSelfReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21005,17 +21066,19 @@ def test_fetch_self_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_fetch_self" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "post_fetch_self_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_fetch_self" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_fetch_self" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_fetch_self_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_fetch_self" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21068,8 +21131,9 @@ def test_delete_self_rest_bad_request(request_type=developer_connect.DeleteSelfR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21128,19 +21192,20 @@ def test_delete_self_rest_interceptors(null_interceptor): ) client = DeveloperConnectClient(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.DeveloperConnectRestInterceptor, "post_delete_self" - ) as post, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "post_delete_self_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DeveloperConnectRestInterceptor, "pre_delete_self" - ) as pre: + 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.DeveloperConnectRestInterceptor, "post_delete_self" + ) as post, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "post_delete_self_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DeveloperConnectRestInterceptor, "pre_delete_self" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21193,8 +21258,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21253,8 +21319,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21315,8 +21382,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21377,8 +21445,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21439,8 +21508,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21501,8 +21571,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22173,11 +22244,14 @@ def test_developer_connect_base_transport(): def test_developer_connect_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.developerconnect_v1.services.developer_connect.transports.DeveloperConnectTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.developerconnect_v1.services.developer_connect.transports.DeveloperConnectTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeveloperConnectTransport( @@ -22194,9 +22268,12 @@ def test_developer_connect_base_transport_with_credentials_file(): def test_developer_connect_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.developerconnect_v1.services.developer_connect.transports.DeveloperConnectTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.developerconnect_v1.services.developer_connect.transports.DeveloperConnectTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeveloperConnectTransport() @@ -22268,11 +22345,12 @@ def test_developer_connect_transport_auth_gdch_credentials(transport_class): def test_developer_connect_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_insights_config_service.py b/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_insights_config_service.py index ffa79f1301ee..bd02aa88162d 100644 --- a/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_insights_config_service.py +++ b/packages/google-cloud-developerconnect/tests/unit/gapic/developerconnect_v1/test_insights_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.developerconnect_v1.services.insights_config_service import ( InsightsConfigServiceAsyncClient, @@ -73,11 +73,10 @@ pagers, transports, ) +from google.cloud.developerconnect_v1.types import developer_connect, insights_config from google.cloud.developerconnect_v1.types import ( insights_config as gcd_insights_config, ) -from google.cloud.developerconnect_v1.types import developer_connect -from google.cloud.developerconnect_v1.types import insights_config CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1013,10 +1012,9 @@ def test_insights_config_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1059,9 @@ def test_insights_config_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1097,9 @@ def test_insights_config_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,13 +1355,13 @@ def test_insights_config_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1487,9 +1483,9 @@ def test_list_insights_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_insights_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_insights_configs] = ( + mock_rpc + ) request = {} client.list_insights_configs(request) @@ -2033,9 +2029,9 @@ def test_create_insights_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_insights_config] = ( + mock_rpc + ) request = {} client.create_insights_config(request) @@ -2419,9 +2415,9 @@ def test_get_insights_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_insights_config] = ( + mock_rpc + ) request = {} client.get_insights_config(request) @@ -2759,9 +2755,9 @@ def test_update_insights_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_insights_config] = ( + mock_rpc + ) request = {} client.update_insights_config(request) @@ -3022,9 +3018,9 @@ def test_delete_insights_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_insights_config] = ( + mock_rpc + ) request = {} client.delete_insights_config(request) @@ -3304,9 +3300,9 @@ def test_list_insights_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_insights_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_insights_configs] = ( + mock_rpc + ) request = {} client.list_insights_configs(request) @@ -3569,9 +3565,9 @@ def test_create_insights_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_insights_config] = ( + mock_rpc + ) request = {} client.create_insights_config(request) @@ -3793,9 +3789,9 @@ def test_get_insights_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_insights_config] = ( + mock_rpc + ) request = {} client.get_insights_config(request) @@ -3978,9 +3974,9 @@ def test_update_insights_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_insights_config] = ( + mock_rpc + ) request = {} client.update_insights_config(request) @@ -4117,9 +4113,9 @@ def test_delete_insights_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_insights_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_insights_config] = ( + mock_rpc + ) request = {} client.delete_insights_config(request) @@ -4689,8 +4685,9 @@ def test_list_insights_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4755,18 +4752,21 @@ def test_list_insights_configs_rest_interceptors(null_interceptor): ) client = InsightsConfigServiceClient(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.InsightsConfigServiceRestInterceptor, "post_list_insights_configs" - ) as post, mock.patch.object( - transports.InsightsConfigServiceRestInterceptor, - "post_list_insights_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InsightsConfigServiceRestInterceptor, "pre_list_insights_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InsightsConfigServiceRestInterceptor, + "post_list_insights_configs", + ) as post, + mock.patch.object( + transports.InsightsConfigServiceRestInterceptor, + "post_list_insights_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InsightsConfigServiceRestInterceptor, "pre_list_insights_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4824,8 +4824,9 @@ def test_create_insights_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4998,20 +4999,23 @@ def test_create_insights_config_rest_interceptors(null_interceptor): ) client = InsightsConfigServiceClient(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.InsightsConfigServiceRestInterceptor, "post_create_insights_config" - ) as post, mock.patch.object( - transports.InsightsConfigServiceRestInterceptor, - "post_create_insights_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InsightsConfigServiceRestInterceptor, "pre_create_insights_config" - ) as pre: + 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.InsightsConfigServiceRestInterceptor, + "post_create_insights_config", + ) as post, + mock.patch.object( + transports.InsightsConfigServiceRestInterceptor, + "post_create_insights_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InsightsConfigServiceRestInterceptor, + "pre_create_insights_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5066,8 +5070,9 @@ def test_get_insights_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5137,18 +5142,20 @@ def test_get_insights_config_rest_interceptors(null_interceptor): ) client = InsightsConfigServiceClient(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.InsightsConfigServiceRestInterceptor, "post_get_insights_config" - ) as post, mock.patch.object( - transports.InsightsConfigServiceRestInterceptor, - "post_get_insights_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InsightsConfigServiceRestInterceptor, "pre_get_insights_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InsightsConfigServiceRestInterceptor, "post_get_insights_config" + ) as post, + mock.patch.object( + transports.InsightsConfigServiceRestInterceptor, + "post_get_insights_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InsightsConfigServiceRestInterceptor, "pre_get_insights_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5207,8 +5214,9 @@ def test_update_insights_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5385,20 +5393,23 @@ def test_update_insights_config_rest_interceptors(null_interceptor): ) client = InsightsConfigServiceClient(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.InsightsConfigServiceRestInterceptor, "post_update_insights_config" - ) as post, mock.patch.object( - transports.InsightsConfigServiceRestInterceptor, - "post_update_insights_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InsightsConfigServiceRestInterceptor, "pre_update_insights_config" - ) as pre: + 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.InsightsConfigServiceRestInterceptor, + "post_update_insights_config", + ) as post, + mock.patch.object( + transports.InsightsConfigServiceRestInterceptor, + "post_update_insights_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InsightsConfigServiceRestInterceptor, + "pre_update_insights_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5453,8 +5464,9 @@ def test_delete_insights_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5513,20 +5525,23 @@ def test_delete_insights_config_rest_interceptors(null_interceptor): ) client = InsightsConfigServiceClient(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.InsightsConfigServiceRestInterceptor, "post_delete_insights_config" - ) as post, mock.patch.object( - transports.InsightsConfigServiceRestInterceptor, - "post_delete_insights_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InsightsConfigServiceRestInterceptor, "pre_delete_insights_config" - ) as pre: + 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.InsightsConfigServiceRestInterceptor, + "post_delete_insights_config", + ) as post, + mock.patch.object( + transports.InsightsConfigServiceRestInterceptor, + "post_delete_insights_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InsightsConfigServiceRestInterceptor, + "pre_delete_insights_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5579,8 +5594,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5639,8 +5655,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5701,8 +5718,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5763,8 +5781,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5825,8 +5844,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5887,8 +5907,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6138,11 +6159,14 @@ def test_insights_config_service_base_transport(): def test_insights_config_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.developerconnect_v1.services.insights_config_service.transports.InsightsConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.developerconnect_v1.services.insights_config_service.transports.InsightsConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InsightsConfigServiceTransport( @@ -6159,9 +6183,12 @@ def test_insights_config_service_base_transport_with_credentials_file(): def test_insights_config_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.developerconnect_v1.services.insights_config_service.transports.InsightsConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.developerconnect_v1.services.insights_config_service.transports.InsightsConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InsightsConfigServiceTransport() @@ -6235,11 +6262,12 @@ def test_insights_config_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-devicestreaming/docs/conf.py b/packages/google-cloud-devicestreaming/docs/conf.py index 552e761aca5d..e6636ee5e9d4 100644 --- a/packages/google-cloud-devicestreaming/docs/conf.py +++ b/packages/google-cloud-devicestreaming/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-devicestreaming documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/__init__.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/__init__.py index 51d72d1b5407..fdf77b600aed 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/__init__.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.direct_access_service import ( DirectAccessServiceAsyncClient, DirectAccessServiceClient, diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/async_client.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/async_client.py index a389d6d94906..62425c3aa83a 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/async_client.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devicestreaming_v1 import gapic_version as package_version @@ -47,9 +47,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.devicestreaming_v1.services.direct_access_service import pagers from google.cloud.devicestreaming_v1.types import adb_service, service @@ -133,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DirectAccessServiceAsyncClient: The constructed client. """ - return DirectAccessServiceClient.from_service_account_info.__func__(DirectAccessServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DirectAccessServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DirectAccessServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DirectAccessServiceAsyncClient: The constructed client. """ - return DirectAccessServiceClient.from_service_account_file.__func__(DirectAccessServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DirectAccessServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DirectAccessServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -187,7 +189,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DirectAccessServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DirectAccessServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DirectAccessServiceTransport: diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/client.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/client.py index c2fa9558740d..dad0087218a4 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/client.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.devicestreaming_v1 import gapic_version as package_version @@ -63,9 +63,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.devicestreaming_v1.services.direct_access_service import pagers from google.cloud.devicestreaming_v1.types import adb_service, service @@ -84,9 +84,7 @@ class DirectAccessServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DirectAccessServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DirectAccessServiceTransport]] _transport_registry["grpc"] = DirectAccessServiceGrpcTransport _transport_registry["grpc_asyncio"] = DirectAccessServiceGrpcAsyncIOTransport _transport_registry["rest"] = DirectAccessServiceRestTransport @@ -638,11 +636,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DirectAccessServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DirectAccessServiceClient._read_environment_variables() + ) self._client_cert_source = DirectAccessServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +673,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DirectAccessServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/pagers.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/pagers.py index 3a9ad8f29d5a..c0660e6891ef 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/pagers.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/__init__.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/__init__.py index 44959cda490a..d93a293d17f0 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/__init__.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import DirectAccessServiceRestInterceptor, DirectAccessServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DirectAccessServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DirectAccessServiceTransport]] _transport_registry["grpc"] = DirectAccessServiceGrpcTransport _transport_registry["grpc_asyncio"] = DirectAccessServiceGrpcAsyncIOTransport _transport_registry["rest"] = DirectAccessServiceRestTransport diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/base.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/base.py index b3b01813de53..0c1fc2113cd5 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/base.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.devicestreaming_v1 import gapic_version as package_version from google.cloud.devicestreaming_v1.types import adb_service, service diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc.py index 6d74ceac1a55..0c23abc7fca7 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.devicestreaming_v1.types import adb_service, service diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc_asyncio.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc_asyncio.py index 9f187b31f2c4..78e8b79b1fd3 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.devicestreaming_v1.types import adb_service, service diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest.py index 3acb81b35c7d..e3089c97401b 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -493,9 +493,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDirectAccessServiceRestTransport._BaseCancelDeviceSession._get_http_options() - ) + http_options = _BaseDirectAccessServiceRestTransport._BaseCancelDeviceSession._get_http_options() request, metadata = self._interceptor.pre_cancel_device_session( request, metadata @@ -521,7 +519,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -617,9 +615,7 @@ def __call__( """ - http_options = ( - _BaseDirectAccessServiceRestTransport._BaseCreateDeviceSession._get_http_options() - ) + http_options = _BaseDirectAccessServiceRestTransport._BaseCreateDeviceSession._get_http_options() request, metadata = self._interceptor.pre_create_device_session( request, metadata @@ -774,9 +770,7 @@ def __call__( """ - http_options = ( - _BaseDirectAccessServiceRestTransport._BaseGetDeviceSession._get_http_options() - ) + http_options = _BaseDirectAccessServiceRestTransport._BaseGetDeviceSession._get_http_options() request, metadata = self._interceptor.pre_get_device_session( request, metadata @@ -924,9 +918,7 @@ def __call__( """ - http_options = ( - _BaseDirectAccessServiceRestTransport._BaseListDeviceSessions._get_http_options() - ) + http_options = _BaseDirectAccessServiceRestTransport._BaseListDeviceSessions._get_http_options() request, metadata = self._interceptor.pre_list_device_sessions( request, metadata @@ -1079,9 +1071,7 @@ def __call__( """ - http_options = ( - _BaseDirectAccessServiceRestTransport._BaseUpdateDeviceSession._get_http_options() - ) + http_options = _BaseDirectAccessServiceRestTransport._BaseUpdateDeviceSession._get_http_options() request, metadata = self._interceptor.pre_update_device_session( request, metadata diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest_base.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest_base.py index 8b91c3fceda3..51f34526291d 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest_base.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.devicestreaming_v1.types import adb_service, service diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/adb_service.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/adb_service.py index 8dfa40c49173..691ff082d62a 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/adb_service.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/adb_service.py @@ -158,6 +158,7 @@ class DeviceState(proto.Enum): CONNECTING (14): The ADB device is in the "connecting" status. """ + DEVICE_STATE_UNSPECIFIED = 0 DEVICE = 1 RECOVERY = 2 diff --git a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/service.py b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/service.py index 7f343a8d1d46..88abc51f41d1 100644 --- a/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/service.py +++ b/packages/google-cloud-devicestreaming/google/cloud/devicestreaming_v1/types/service.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -275,6 +275,7 @@ class SessionState(proto.Enum): internal reason, such as an infrastructure failure. """ + SESSION_STATE_UNSPECIFIED = 0 REQUESTED = 1 PENDING = 2 diff --git a/packages/google-cloud-devicestreaming/noxfile.py b/packages/google-cloud-devicestreaming/noxfile.py index a09da8362ff7..86d92b453a38 100644 --- a/packages/google-cloud-devicestreaming/noxfile.py +++ b/packages/google-cloud-devicestreaming/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-devicestreaming/tests/unit/gapic/devicestreaming_v1/test_direct_access_service.py b/packages/google-cloud-devicestreaming/tests/unit/gapic/devicestreaming_v1/test_direct_access_service.py index bb62ef1256d6..c636427c4da5 100644 --- a/packages/google-cloud-devicestreaming/tests/unit/gapic/devicestreaming_v1/test_direct_access_service.py +++ b/packages/google-cloud-devicestreaming/tests/unit/gapic/devicestreaming_v1/test_direct_access_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.devicestreaming_v1.services.direct_access_service import ( DirectAccessServiceAsyncClient, @@ -995,10 +1000,9 @@ def test_direct_access_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1047,9 @@ def test_direct_access_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1085,9 @@ def test_direct_access_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1341,13 +1343,13 @@ def test_direct_access_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1467,9 +1469,9 @@ def test_create_device_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_device_session] = ( + mock_rpc + ) request = {} client.create_device_session(request) @@ -1836,9 +1838,9 @@ def test_list_device_sessions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_device_sessions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_device_sessions] = ( + mock_rpc + ) request = {} client.list_device_sessions(request) @@ -2383,9 +2385,9 @@ def test_get_device_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_device_session] = ( + mock_rpc + ) request = {} client.get_device_session(request) @@ -2726,9 +2728,9 @@ def test_cancel_device_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_device_session] = ( + mock_rpc + ) request = {} client.cancel_device_session(request) @@ -2975,9 +2977,9 @@ def test_update_device_session_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_device_session] = ( + mock_rpc + ) request = {} client.update_device_session(request) @@ -3412,9 +3414,9 @@ def test_create_device_session_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_device_session] = ( + mock_rpc + ) request = {} client.create_device_session(request) @@ -3607,9 +3609,9 @@ def test_list_device_sessions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_device_sessions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_device_sessions] = ( + mock_rpc + ) request = {} client.list_device_sessions(request) @@ -3867,9 +3869,9 @@ def test_get_device_session_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_device_session] = ( + mock_rpc + ) request = {} client.get_device_session(request) @@ -4048,9 +4050,9 @@ def test_cancel_device_session_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_device_session] = ( + mock_rpc + ) request = {} client.cancel_device_session(request) @@ -4171,9 +4173,9 @@ def test_update_device_session_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_device_session - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_device_session] = ( + mock_rpc + ) request = {} client.update_device_session(request) @@ -4756,8 +4758,9 @@ def test_create_device_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4914,18 +4917,20 @@ def test_create_device_session_rest_interceptors(null_interceptor): ) client = DirectAccessServiceClient(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.DirectAccessServiceRestInterceptor, "post_create_device_session" - ) as post, mock.patch.object( - transports.DirectAccessServiceRestInterceptor, - "post_create_device_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DirectAccessServiceRestInterceptor, "pre_create_device_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, "post_create_device_session" + ) as post, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, + "post_create_device_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, "pre_create_device_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4978,8 +4983,9 @@ def test_list_device_sessions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5042,18 +5048,20 @@ def test_list_device_sessions_rest_interceptors(null_interceptor): ) client = DirectAccessServiceClient(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.DirectAccessServiceRestInterceptor, "post_list_device_sessions" - ) as post, mock.patch.object( - transports.DirectAccessServiceRestInterceptor, - "post_list_device_sessions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DirectAccessServiceRestInterceptor, "pre_list_device_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, "post_list_device_sessions" + ) as post, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, + "post_list_device_sessions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, "pre_list_device_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5108,8 +5116,9 @@ def test_get_device_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5176,18 +5185,20 @@ def test_get_device_session_rest_interceptors(null_interceptor): ) client = DirectAccessServiceClient(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.DirectAccessServiceRestInterceptor, "post_get_device_session" - ) as post, mock.patch.object( - transports.DirectAccessServiceRestInterceptor, - "post_get_device_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DirectAccessServiceRestInterceptor, "pre_get_device_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, "post_get_device_session" + ) as post, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, + "post_get_device_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, "pre_get_device_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5240,8 +5251,9 @@ def test_cancel_device_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5298,13 +5310,13 @@ def test_cancel_device_session_rest_interceptors(null_interceptor): ) client = DirectAccessServiceClient(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.DirectAccessServiceRestInterceptor, "pre_cancel_device_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, "pre_cancel_device_session" + ) as pre, + ): pre.assert_not_called() pb_message = service.CancelDeviceSessionRequest.pb( service.CancelDeviceSessionRequest() @@ -5351,8 +5363,9 @@ def test_update_device_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5511,18 +5524,20 @@ def test_update_device_session_rest_interceptors(null_interceptor): ) client = DirectAccessServiceClient(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.DirectAccessServiceRestInterceptor, "post_update_device_session" - ) as post, mock.patch.object( - transports.DirectAccessServiceRestInterceptor, - "post_update_device_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DirectAccessServiceRestInterceptor, "pre_update_device_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, "post_update_device_session" + ) as post, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, + "post_update_device_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DirectAccessServiceRestInterceptor, "pre_update_device_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5751,11 +5766,14 @@ def test_direct_access_service_base_transport(): def test_direct_access_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.devicestreaming_v1.services.direct_access_service.transports.DirectAccessServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.devicestreaming_v1.services.direct_access_service.transports.DirectAccessServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DirectAccessServiceTransport( @@ -5772,9 +5790,12 @@ def test_direct_access_service_base_transport_with_credentials_file(): def test_direct_access_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.devicestreaming_v1.services.direct_access_service.transports.DirectAccessServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.devicestreaming_v1.services.direct_access_service.transports.DirectAccessServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DirectAccessServiceTransport() @@ -5846,11 +5867,12 @@ def test_direct_access_service_transport_auth_gdch_credentials(transport_class): def test_direct_access_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/docs/conf.py b/packages/google-cloud-dialogflow-cx/docs/conf.py index 1d4721b3131e..96f8db3a4f24 100644 --- a/packages/google-cloud-dialogflow-cx/docs/conf.py +++ b/packages/google-cloud-dialogflow-cx/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-dialogflow-cx documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/__init__.py index ddec0d64e06c..4739d9dd5b74 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.agents import AgentsAsyncClient, AgentsClient from .services.changelogs import ChangelogsAsyncClient, ChangelogsClient from .services.deployments import DeploymentsAsyncClient, DeploymentsClient diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/async_client.py index acbb972957ad..1b9769f35427 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,24 +44,27 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.agents import pagers from google.cloud.dialogflowcx_v3.types import ( - generative_settings as gcdc_generative_settings, + advanced_settings, + agent, + audio_config, + flow, + generative_settings, + safety_settings, ) -from google.cloud.dialogflowcx_v3.types import advanced_settings -from google.cloud.dialogflowcx_v3.types import agent from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import audio_config, flow -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import safety_settings +from google.cloud.dialogflowcx_v3.types import ( + generative_settings as gcdc_generative_settings, +) from .client import AgentsClient from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -147,7 +150,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_info.__func__(AgentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AgentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AgentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -163,7 +167,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_file.__func__(AgentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AgentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AgentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/client.py index 7ddf6965ae84..b9aab25d3a37 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,24 +61,27 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.agents import pagers from google.cloud.dialogflowcx_v3.types import ( - generative_settings as gcdc_generative_settings, + advanced_settings, + agent, + audio_config, + flow, + generative_settings, + safety_settings, ) -from google.cloud.dialogflowcx_v3.types import advanced_settings -from google.cloud.dialogflowcx_v3.types import agent from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import audio_config, flow -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import safety_settings +from google.cloud.dialogflowcx_v3.types import ( + generative_settings as gcdc_generative_settings, +) from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport from .transports.grpc import AgentsGrpcTransport @@ -818,11 +821,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AgentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AgentsClient._read_environment_variables() + ) self._client_cert_source = AgentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -857,8 +858,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AgentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/pagers.py index dff514a6dcf0..e8c99473d946 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/base.py index 03c800378637..94c88041f574 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/base.py @@ -17,24 +17,23 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version +from google.cloud.dialogflowcx_v3.types import agent, generative_settings +from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3.types import agent -from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import generative_settings DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -377,7 +376,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc.py index 6f2ecf1d8a34..77d18bb72f8b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc.py @@ -16,27 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import agent, generative_settings +from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3.types import agent -from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import generative_settings from .base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -610,12 +609,12 @@ def get_agent_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_agent_validation_result" not in self._stubs: - self._stubs[ - "get_agent_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Agents/GetAgentValidationResult", - request_serializer=agent.GetAgentValidationResultRequest.serialize, - response_deserializer=agent.AgentValidationResult.deserialize, + self._stubs["get_agent_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Agents/GetAgentValidationResult", + request_serializer=agent.GetAgentValidationResultRequest.serialize, + response_deserializer=agent.AgentValidationResult.deserialize, + ) ) return self._stubs["get_agent_validation_result"] @@ -669,12 +668,12 @@ def update_generative_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_generative_settings" not in self._stubs: - self._stubs[ - "update_generative_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Agents/UpdateGenerativeSettings", - request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, - response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + self._stubs["update_generative_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Agents/UpdateGenerativeSettings", + request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, + response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + ) ) return self._stubs["update_generative_settings"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc_asyncio.py index a3471542ffca..492a770d696a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,19 +31,14 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import agent, generative_settings +from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3.types import agent -from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import generative_settings from .base import DEFAULT_CLIENT_INFO, AgentsTransport from .grpc import AgentsGrpcTransport @@ -622,12 +621,12 @@ def get_agent_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_agent_validation_result" not in self._stubs: - self._stubs[ - "get_agent_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Agents/GetAgentValidationResult", - request_serializer=agent.GetAgentValidationResultRequest.serialize, - response_deserializer=agent.AgentValidationResult.deserialize, + self._stubs["get_agent_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Agents/GetAgentValidationResult", + request_serializer=agent.GetAgentValidationResultRequest.serialize, + response_deserializer=agent.AgentValidationResult.deserialize, + ) ) return self._stubs["get_agent_validation_result"] @@ -682,12 +681,12 @@ def update_generative_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_generative_settings" not in self._stubs: - self._stubs[ - "update_generative_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Agents/UpdateGenerativeSettings", - request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, - response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + self._stubs["update_generative_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Agents/UpdateGenerativeSettings", + request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, + response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + ) ) return self._stubs["update_generative_settings"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest.py index f05a80b6f2c7..fba0b7ef8455 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest.py @@ -16,27 +16,26 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3.types import agent, generative_settings +from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3.types import agent -from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import generative_settings from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAgentsRestTransport @@ -1153,7 +1152,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1272,7 +1271,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1556,9 +1555,7 @@ def __call__( """ - http_options = ( - _BaseAgentsRestTransport._BaseGetAgentValidationResult._get_http_options() - ) + http_options = _BaseAgentsRestTransport._BaseGetAgentValidationResult._get_http_options() request, metadata = self._interceptor.pre_get_agent_validation_result( request, metadata @@ -2032,7 +2029,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2322,9 +2319,7 @@ def __call__( Settings for Generative AI. """ - http_options = ( - _BaseAgentsRestTransport._BaseUpdateGenerativeSettings._get_http_options() - ) + http_options = _BaseAgentsRestTransport._BaseUpdateGenerativeSettings._get_http_options() request, metadata = self._interceptor.pre_update_generative_settings( request, metadata @@ -2610,7 +2605,9 @@ def get_agent_validation_result( ) -> Callable[[agent.GetAgentValidationResultRequest], agent.AgentValidationResult]: # 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._GetAgentValidationResult(self._session, self._host, self._interceptor) # type: ignore + return self._GetAgentValidationResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_generative_settings( @@ -2655,7 +2652,9 @@ def update_generative_settings( ]: # 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._UpdateGenerativeSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateGenerativeSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def validate_agent( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest_base.py index 22fe3535bafb..3d9405c6ced0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/agents/transports/rest_base.py @@ -17,18 +17,17 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflowcx_v3.types import agent, generative_settings +from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3.types import agent -from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import generative_settings from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/async_client.py index f50363dd0aa7..2ecde3ee1399 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.changelogs import pagers from google.cloud.dialogflowcx_v3.types import changelog @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ChangelogsAsyncClient: The constructed client. """ - return ChangelogsClient.from_service_account_info.__func__(ChangelogsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ChangelogsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ChangelogsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ChangelogsAsyncClient: The constructed client. """ - return ChangelogsClient.from_service_account_file.__func__(ChangelogsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ChangelogsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ChangelogsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/client.py index eb67fb37e484..631b4a61f702 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.changelogs import pagers from google.cloud.dialogflowcx_v3.types import changelog @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ChangelogsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ChangelogsClient._read_environment_variables() + ) self._client_cert_source = ChangelogsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ChangelogsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/pagers.py index e21b31c602e8..f6488805d6d8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/base.py index 894b66fd307c..53206bc08cbb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import changelog @@ -232,7 +232,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc.py index 58241b31ee79..e8174678815b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import changelog diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc_asyncio.py index 7da99b3d4f87..088e4b1d1eb3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import changelog diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/rest.py index 2fa84c36f376..d7a8e158da3f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/changelogs/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/async_client.py index 81a49c50080e..611310c34bc9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.deployments import pagers from google.cloud.dialogflowcx_v3.types import deployment @@ -123,7 +123,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DeploymentsAsyncClient: The constructed client. """ - return DeploymentsClient.from_service_account_info.__func__(DeploymentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DeploymentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DeploymentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +140,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DeploymentsAsyncClient: The constructed client. """ - return DeploymentsClient.from_service_account_file.__func__(DeploymentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DeploymentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DeploymentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/client.py index 3e0dd60fea3d..e9d3598c34fd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.deployments import pagers from google.cloud.dialogflowcx_v3.types import deployment @@ -706,11 +706,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeploymentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeploymentsClient._read_environment_variables() + ) self._client_cert_source = DeploymentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -745,8 +743,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeploymentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/pagers.py index f8b5d5a0bc48..7784521dce44 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/base.py index 1d160fe01748..743ed6f1c38b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import deployment @@ -232,7 +232,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc.py index 7592685c943f..9edb32fc68c2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import deployment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc_asyncio.py index 9ef797757fcd..2ed79d2f9415 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import deployment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/rest.py index f7066ecca9e6..d5cecf258fc9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/deployments/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/async_client.py index 9c2cb058e317..d20716daa4a4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.entity_types import pagers from google.cloud.dialogflowcx_v3.types import entity_type @@ -118,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_info.__func__(EntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EntityTypesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +135,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_file.__func__(EntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EntityTypesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/client.py index a4a7da041dda..544032bb44f9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.entity_types import pagers from google.cloud.dialogflowcx_v3.types import entity_type @@ -629,11 +629,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EntityTypesClient._read_environment_variables() + ) self._client_cert_source = EntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -668,8 +666,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/pagers.py index daf261c076a4..c3394c7461d6 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/base.py index 30919e1cdc46..987a9db06d96 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import entity_type @@ -309,7 +309,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc.py index ae2f1ab43e19..72faf23bec22 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import entity_type from google.cloud.dialogflowcx_v3.types import entity_type as gcdc_entity_type diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc_asyncio.py index 9f682c4ee45c..081bbc261411 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import entity_type from google.cloud.dialogflowcx_v3.types import entity_type as gcdc_entity_type diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest.py index eab6295f66bd..0210957a0c8e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -974,7 +974,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1095,7 +1095,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1431,7 +1431,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest_base.py index 458df1e2e047..9e7e39200bcc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/entity_types/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import entity_type diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/async_client.py index ab61bbb4c9e1..9289a9ce08fa 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.environments import pagers from google.cloud.dialogflowcx_v3.types import environment @@ -142,7 +142,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_info.__func__(EnvironmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EnvironmentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EnvironmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +159,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_file.__func__(EnvironmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EnvironmentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EnvironmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/client.py index a24810dcc2fe..96b0ae805299 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.environments import pagers from google.cloud.dialogflowcx_v3.types import environment @@ -803,11 +803,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EnvironmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EnvironmentsClient._read_environment_variables() + ) self._client_cert_source = EnvironmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -842,8 +840,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EnvironmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/pagers.py index 36095196311d..bb84731a7540 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -381,7 +381,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/base.py index 4bf284c6fbe6..8b910cdc4968 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import environment @@ -343,7 +343,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc.py index 7c240bc73be1..b97583ce4310 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import environment from google.cloud.dialogflowcx_v3.types import environment as gcdc_environment @@ -528,12 +528,12 @@ def lookup_environment_history( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_environment_history" not in self._stubs: - self._stubs[ - "lookup_environment_history" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Environments/LookupEnvironmentHistory", - request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, - response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + self._stubs["lookup_environment_history"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Environments/LookupEnvironmentHistory", + request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, + response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + ) ) return self._stubs["lookup_environment_history"] @@ -597,12 +597,12 @@ def list_continuous_test_results( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_continuous_test_results" not in self._stubs: - self._stubs[ - "list_continuous_test_results" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Environments/ListContinuousTestResults", - request_serializer=environment.ListContinuousTestResultsRequest.serialize, - response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + self._stubs["list_continuous_test_results"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Environments/ListContinuousTestResults", + request_serializer=environment.ListContinuousTestResultsRequest.serialize, + response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + ) ) return self._stubs["list_continuous_test_results"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc_asyncio.py index 247a2504fe0e..5ce0489e34e6 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import environment from google.cloud.dialogflowcx_v3.types import environment as gcdc_environment @@ -539,12 +539,12 @@ def lookup_environment_history( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_environment_history" not in self._stubs: - self._stubs[ - "lookup_environment_history" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Environments/LookupEnvironmentHistory", - request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, - response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + self._stubs["lookup_environment_history"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Environments/LookupEnvironmentHistory", + request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, + response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + ) ) return self._stubs["lookup_environment_history"] @@ -610,12 +610,12 @@ def list_continuous_test_results( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_continuous_test_results" not in self._stubs: - self._stubs[ - "list_continuous_test_results" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Environments/ListContinuousTestResults", - request_serializer=environment.ListContinuousTestResultsRequest.serialize, - response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + self._stubs["list_continuous_test_results"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Environments/ListContinuousTestResults", + request_serializer=environment.ListContinuousTestResultsRequest.serialize, + response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + ) ) return self._stubs["list_continuous_test_results"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest.py index 7440886c5a9a..98f1890728ac 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -888,9 +888,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -916,7 +914,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1034,9 +1032,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -1058,7 +1054,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1183,7 +1179,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1469,9 +1465,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseListContinuousTestResults._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseListContinuousTestResults._get_http_options() request, metadata = self._interceptor.pre_list_continuous_test_results( request, metadata @@ -1775,9 +1769,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseLookupEnvironmentHistory._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseLookupEnvironmentHistory._get_http_options() request, metadata = self._interceptor.pre_lookup_environment_history( request, metadata @@ -1930,9 +1922,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseRunContinuousTest._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseRunContinuousTest._get_http_options() request, metadata = self._interceptor.pre_run_continuous_test( request, metadata @@ -1958,7 +1948,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2084,9 +2074,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() request, metadata = self._interceptor.pre_update_environment( request, metadata @@ -2112,7 +2100,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2222,7 +2210,9 @@ def list_continuous_test_results( ]: # 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._ListContinuousTestResults(self._session, self._host, self._interceptor) # type: ignore + return self._ListContinuousTestResults( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_environments( @@ -2243,7 +2233,9 @@ def lookup_environment_history( ]: # 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._LookupEnvironmentHistory(self._session, self._host, self._interceptor) # type: ignore + return self._LookupEnvironmentHistory( + self._session, self._host, self._interceptor + ) # type: ignore @property def run_continuous_test( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest_base.py index 6ab803a951ac..4cb4f1830871 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/environments/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import environment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/async_client.py index df457a0c524d..eff9e683d7e5 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,15 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.examples import pagers -from google.cloud.dialogflowcx_v3.types import example +from google.cloud.dialogflowcx_v3.types import example, trace from google.cloud.dialogflowcx_v3.types import example as gcdc_example -from google.cloud.dialogflowcx_v3.types import trace from .client import ExamplesClient from .transports.base import DEFAULT_CLIENT_INFO, ExamplesTransport @@ -120,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ExamplesAsyncClient: The constructed client. """ - return ExamplesClient.from_service_account_info.__func__(ExamplesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ExamplesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ExamplesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ExamplesAsyncClient: The constructed client. """ - return ExamplesClient.from_service_account_file.__func__(ExamplesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ExamplesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ExamplesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/client.py index fdf166d4da9c..1046636963fd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,15 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.examples import pagers -from google.cloud.dialogflowcx_v3.types import example +from google.cloud.dialogflowcx_v3.types import example, trace from google.cloud.dialogflowcx_v3.types import example as gcdc_example -from google.cloud.dialogflowcx_v3.types import trace from .transports.base import DEFAULT_CLIENT_INFO, ExamplesTransport from .transports.grpc import ExamplesGrpcTransport @@ -703,11 +702,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ExamplesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ExamplesClient._read_environment_variables() + ) self._client_cert_source = ExamplesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -742,8 +739,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ExamplesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/pagers.py index 165405921244..c077654c8764 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/base.py index 0b905a76789c..9f005358afbf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import example @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc.py index cd8e2188ac1e..f3b2957dd3d9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import example from google.cloud.dialogflowcx_v3.types import example as gcdc_example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc_asyncio.py index 2ea3e92d6fd5..b4785d153875 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import example from google.cloud.dialogflowcx_v3.types import example as gcdc_example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest.py index a28ff38c862a..f89ea829156e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -766,7 +766,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest_base.py index 8dc5f698eafe..8e251839cd7b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/examples/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/async_client.py index 830aa457aba5..ca514e0723ff 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.experiments import pagers from google.cloud.dialogflowcx_v3.types import experiment @@ -120,7 +120,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ExperimentsAsyncClient: The constructed client. """ - return ExperimentsClient.from_service_account_info.__func__(ExperimentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ExperimentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ExperimentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +137,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ExperimentsAsyncClient: The constructed client. """ - return ExperimentsClient.from_service_account_file.__func__(ExperimentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ExperimentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ExperimentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/client.py index 31b502e339e7..338eda572f15 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.experiments import pagers from google.cloud.dialogflowcx_v3.types import experiment @@ -657,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ExperimentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ExperimentsClient._read_environment_variables() + ) self._client_cert_source = ExperimentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ExperimentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/pagers.py index acba2705a329..75e10ad999cf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/base.py index 46c00b713ad9..42b3036e30a8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import experiment @@ -304,7 +304,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc.py index 90eba76ee486..a070fcb76d84 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import experiment from google.cloud.dialogflowcx_v3.types import experiment as gcdc_experiment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc_asyncio.py index 143ff9a4c3b3..68a50153c3ca 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import experiment from google.cloud.dialogflowcx_v3.types import experiment as gcdc_experiment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest.py index b1ab5b7dab57..4eaa4b0f7ffd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -880,7 +880,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest_base.py index 1d160a5c5bea..ad048d425e5f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/experiments/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import experiment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/async_client.py index 39f74ee86344..84e4e57b041f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,23 +44,23 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.flows import pagers from google.cloud.dialogflowcx_v3.types import ( + advanced_settings, + flow, page, parameter_definition, validation_message, ) -from google.cloud.dialogflowcx_v3.types import advanced_settings -from google.cloud.dialogflowcx_v3.types import flow from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow from .client import FlowsClient @@ -139,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FlowsAsyncClient: The constructed client. """ - return FlowsClient.from_service_account_info.__func__(FlowsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = FlowsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(FlowsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +156,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FlowsAsyncClient: The constructed client. """ - return FlowsClient.from_service_account_file.__func__(FlowsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = FlowsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(FlowsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/client.py index 5b986336d53f..004e0fc40bd8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,23 +61,23 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.flows import pagers from google.cloud.dialogflowcx_v3.types import ( + advanced_settings, + flow, page, parameter_definition, validation_message, ) -from google.cloud.dialogflowcx_v3.types import advanced_settings -from google.cloud.dialogflowcx_v3.types import flow from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow from .transports.base import DEFAULT_CLIENT_INFO, FlowsTransport @@ -832,11 +832,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FlowsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FlowsClient._read_environment_variables() + ) self._client_cert_source = FlowsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -871,8 +869,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FlowsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/pagers.py index 998d471c1b39..8a257458a14f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/base.py index c7611935029d..a81c06297556 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import flow @@ -342,7 +342,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc.py index 19844ebee05d..90ab9be654e8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import flow from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow @@ -558,12 +558,12 @@ def get_flow_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_flow_validation_result" not in self._stubs: - self._stubs[ - "get_flow_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Flows/GetFlowValidationResult", - request_serializer=flow.GetFlowValidationResultRequest.serialize, - response_deserializer=flow.FlowValidationResult.deserialize, + self._stubs["get_flow_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Flows/GetFlowValidationResult", + request_serializer=flow.GetFlowValidationResultRequest.serialize, + response_deserializer=flow.FlowValidationResult.deserialize, + ) ) return self._stubs["get_flow_validation_result"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc_asyncio.py index 6fe47fa955de..8f24ea95f159 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import flow from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow @@ -578,12 +578,12 @@ def get_flow_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_flow_validation_result" not in self._stubs: - self._stubs[ - "get_flow_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.Flows/GetFlowValidationResult", - request_serializer=flow.GetFlowValidationResultRequest.serialize, - response_deserializer=flow.FlowValidationResult.deserialize, + self._stubs["get_flow_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.Flows/GetFlowValidationResult", + request_serializer=flow.GetFlowValidationResultRequest.serialize, + response_deserializer=flow.FlowValidationResult.deserialize, + ) ) return self._stubs["get_flow_validation_result"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest.py index 533433fff961..b1779ec7193a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1095,7 +1095,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1214,7 +1214,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1682,7 +1682,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1981,7 +1981,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2407,7 +2407,9 @@ def get_flow_validation_result( ) -> Callable[[flow.GetFlowValidationResultRequest], flow.FlowValidationResult]: # 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._GetFlowValidationResult(self._session, self._host, self._interceptor) # type: ignore + return self._GetFlowValidationResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_flow( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest_base.py index aad058f9492c..d60f4ba020e0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/flows/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import flow diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/async_client.py index 646a15dad716..0d3a409a65cc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.generators import pagers -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import generator +from google.cloud.dialogflowcx_v3.types import generative_settings, generator from google.cloud.dialogflowcx_v3.types import generator as gcdc_generator from .client import GeneratorsClient @@ -115,7 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_info.__func__(GeneratorsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GeneratorsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GeneratorsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_file.__func__(GeneratorsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GeneratorsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(GeneratorsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/client.py index 44e5a8e01c2c..f41c3ec83e82 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.generators import pagers -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import generator +from google.cloud.dialogflowcx_v3.types import generative_settings, generator from google.cloud.dialogflowcx_v3.types import generator as gcdc_generator from .transports.base import DEFAULT_CLIENT_INFO, GeneratorsTransport @@ -628,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeneratorsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeneratorsClient._read_environment_variables() + ) self._client_cert_source = GeneratorsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeneratorsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/pagers.py index e7b8cb79b5b6..1ff74a99d953 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/base.py index dbc08ed629ae..8476d0061327 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import generator @@ -276,7 +276,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc.py index 049b6788f3d7..4a2e6efc6419 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import generator from google.cloud.dialogflowcx_v3.types import generator as gcdc_generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc_asyncio.py index 464a92f1af03..e091aa6e6311 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import generator from google.cloud.dialogflowcx_v3.types import generator as gcdc_generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest.py index fed58ef9feef..79fa7f13003d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -768,7 +768,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest_base.py index 4936b202bb95..aaa0d0e971c0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/generators/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/async_client.py index 81a281ee3d0e..704a28a31c36 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.intents import pagers from google.cloud.dialogflowcx_v3.types import intent @@ -116,7 +116,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_info.__func__(IntentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = IntentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(IntentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +133,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_file.__func__(IntentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = IntentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(IntentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/client.py index 211326cce0fa..46b03517e279 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.intents import pagers from google.cloud.dialogflowcx_v3.types import intent @@ -653,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IntentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IntentsClient._read_environment_variables() + ) self._client_cert_source = IntentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -692,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IntentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/pagers.py index 8e7830e630b3..549b5c1fca40 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/base.py index c1f8670ca9d2..ae0c822f2b64 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import intent @@ -304,7 +304,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc.py index c66f00b548ee..1dfe7fd1c37e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import intent from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc_asyncio.py index 581cc5726ad7..48b99b5f1d5b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import intent from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest.py index 5e84d1083155..c24477b46457 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -924,7 +924,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1045,7 +1045,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1351,7 +1351,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest_base.py index 6d7ebf029093..9a707f44ea70 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/intents/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/async_client.py index ba174c5044f4..5a0d7dff49d8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.pages import pagers -from google.cloud.dialogflowcx_v3.types import advanced_settings, fulfillment -from google.cloud.dialogflowcx_v3.types import page +from google.cloud.dialogflowcx_v3.types import advanced_settings, fulfillment, page from google.cloud.dialogflowcx_v3.types import page as gcdc_page from .client import PagesClient @@ -127,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PagesAsyncClient: The constructed client. """ - return PagesClient.from_service_account_info.__func__(PagesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PagesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PagesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PagesAsyncClient: The constructed client. """ - return PagesClient.from_service_account_file.__func__(PagesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PagesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PagesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/client.py index a46889044876..c2d25e68f0e6 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.pages import pagers -from google.cloud.dialogflowcx_v3.types import advanced_settings, fulfillment -from google.cloud.dialogflowcx_v3.types import page +from google.cloud.dialogflowcx_v3.types import advanced_settings, fulfillment, page from google.cloud.dialogflowcx_v3.types import page as gcdc_page from .transports.base import DEFAULT_CLIENT_INFO, PagesTransport @@ -822,11 +821,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PagesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PagesClient._read_environment_variables() + ) self._client_cert_source = PagesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -861,8 +858,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PagesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/pagers.py index afa52530268b..39e778dc5a1a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/base.py index 36ae1810ba72..8a2bc8fba0d7 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import page @@ -267,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc.py index ebdcf1d03c34..7c41c9d8ef98 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import page from google.cloud.dialogflowcx_v3.types import page as gcdc_page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc_asyncio.py index c78f3014a53c..18f5746584e2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import page from google.cloud.dialogflowcx_v3.types import page as gcdc_page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest.py index 7250bf5df182..889bd08712d2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -762,7 +762,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest_base.py index 2ca131f3a781..9c7699ed462c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/pages/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/async_client.py index b2fce9622ec7..9311f3802383 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.playbooks import pagers from google.cloud.dialogflowcx_v3.types import ( @@ -58,8 +58,8 @@ example, generative_settings, parameter_definition, + playbook, ) -from google.cloud.dialogflowcx_v3.types import playbook from google.cloud.dialogflowcx_v3.types import playbook as gcdc_playbook from .client import PlaybooksClient @@ -138,7 +138,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PlaybooksAsyncClient: The constructed client. """ - return PlaybooksClient.from_service_account_info.__func__(PlaybooksAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PlaybooksClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PlaybooksAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +155,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PlaybooksAsyncClient: The constructed client. """ - return PlaybooksClient.from_service_account_file.__func__(PlaybooksAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PlaybooksClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PlaybooksAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/client.py index 4c38bc3d6b30..2b7d8832261d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.playbooks import pagers from google.cloud.dialogflowcx_v3.types import ( @@ -75,8 +75,8 @@ example, generative_settings, parameter_definition, + playbook, ) -from google.cloud.dialogflowcx_v3.types import playbook from google.cloud.dialogflowcx_v3.types import playbook as gcdc_playbook from .transports.base import DEFAULT_CLIENT_INFO, PlaybooksTransport @@ -785,11 +785,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PlaybooksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PlaybooksClient._read_environment_variables() + ) self._client_cert_source = PlaybooksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -824,8 +822,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PlaybooksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/pagers.py index 992ec0b013c7..c1e201deb4cb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/base.py index 7ad1816e7d55..b2eab4acc75e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import playbook @@ -384,7 +384,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc.py index 344b36caaedb..a6366604502a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import playbook from google.cloud.dialogflowcx_v3.types import playbook as gcdc_playbook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc_asyncio.py index e0f328378aa4..e9d20c4fecdd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import playbook from google.cloud.dialogflowcx_v3.types import playbook as gcdc_playbook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest.py index c1846e6cde15..0346cd2bed0f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1169,9 +1169,7 @@ def __call__( """ - http_options = ( - _BasePlaybooksRestTransport._BaseCreatePlaybookVersion._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseCreatePlaybookVersion._get_http_options() request, metadata = self._interceptor.pre_create_playbook_version( request, metadata @@ -1343,7 +1341,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1428,9 +1426,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePlaybooksRestTransport._BaseDeletePlaybookVersion._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseDeletePlaybookVersion._get_http_options() request, metadata = self._interceptor.pre_delete_playbook_version( request, metadata @@ -1452,7 +1448,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1577,7 +1573,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2044,7 +2040,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2319,9 +2315,7 @@ def __call__( """ - http_options = ( - _BasePlaybooksRestTransport._BaseListPlaybookVersions._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseListPlaybookVersions._get_http_options() request, metadata = self._interceptor.pre_list_playbook_versions( request, metadata @@ -2471,9 +2465,7 @@ def __call__( """ - http_options = ( - _BasePlaybooksRestTransport._BaseRestorePlaybookVersion._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseRestorePlaybookVersion._get_http_options() request, metadata = self._interceptor.pre_restore_playbook_version( request, metadata @@ -2831,7 +2823,9 @@ def restore_playbook_version( ]: # 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._RestorePlaybookVersion(self._session, self._host, self._interceptor) # type: ignore + return self._RestorePlaybookVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_playbook( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest_base.py index f77d10e21ea9..533d2e2df072 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/playbooks/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import playbook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/async_client.py index 1a100008738c..6cc3cb62df2b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,15 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.security_settings_service import pagers +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings from .client import SecuritySettingsServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport @@ -142,7 +142,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SecuritySettingsServiceAsyncClient: The constructed client. """ - return SecuritySettingsServiceClient.from_service_account_info.__func__(SecuritySettingsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SecuritySettingsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SecuritySettingsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +159,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SecuritySettingsServiceAsyncClient: The constructed client. """ - return SecuritySettingsServiceClient.from_service_account_file.__func__(SecuritySettingsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SecuritySettingsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + SecuritySettingsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -196,7 +200,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SecuritySettingsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SecuritySettingsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SecuritySettingsServiceTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/client.py index bb5d86716db2..9b87a961ebbf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,15 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.security_settings_service import pagers +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings from .transports.base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport from .transports.grpc import SecuritySettingsServiceGrpcTransport @@ -85,9 +85,7 @@ class SecuritySettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SecuritySettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SecuritySettingsServiceTransport]] _transport_registry["grpc"] = SecuritySettingsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SecuritySettingsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SecuritySettingsServiceRestTransport @@ -677,11 +675,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SecuritySettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SecuritySettingsServiceClient._read_environment_variables() + ) self._client_cert_source = ( SecuritySettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -718,8 +714,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SecuritySettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/pagers.py index 5640610c65b0..ca371dd4f344 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/__init__.py index 3a4ddec2334f..00bac1766862 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SecuritySettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SecuritySettingsServiceTransport]] _transport_registry["grpc"] = SecuritySettingsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SecuritySettingsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SecuritySettingsServiceRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/base.py index 27a42fcb0bd4..bbd821d66e0f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc.py index e124f0c98bf2..3c63df28735d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings from .base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc_asyncio.py index 15abaf517815..a2985ad373ff 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings from .base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport from .grpc import SecuritySettingsServiceGrpcTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest.py index 5ef630a94ec6..064b33984345 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSecuritySettingsServiceRestTransport @@ -614,9 +614,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseCreateSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseCreateSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_create_security_settings( request, metadata @@ -765,9 +763,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseDeleteSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseDeleteSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_delete_security_settings( request, metadata @@ -789,7 +785,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -885,9 +881,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseGetSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseGetSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_get_security_settings( request, metadata @@ -1039,9 +1033,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseListSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseListSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_list_security_settings( request, metadata @@ -1196,9 +1188,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseUpdateSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseUpdateSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_update_security_settings( request, metadata @@ -1304,7 +1294,9 @@ def create_security_settings( ]: # 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._CreateSecuritySettings(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecuritySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_security_settings( @@ -1312,7 +1304,9 @@ def delete_security_settings( ) -> Callable[[security_settings.DeleteSecuritySettingsRequest], empty_pb2.Empty]: # 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._DeleteSecuritySettings(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSecuritySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_security_settings( @@ -1345,7 +1339,9 @@ def update_security_settings( ]: # 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._UpdateSecuritySettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSecuritySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1405,9 +1401,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1546,9 +1540,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1686,9 +1678,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1806,9 +1796,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1947,9 +1935,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest_base.py index 943a8dbc4892..1412b130fcb1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/security_settings_service/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings from .base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/async_client.py index ee07ba20b2db..ad85d69a7161 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.session_entity_types import pagers +from google.cloud.dialogflowcx_v3.types import entity_type, session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import entity_type -from google.cloud.dialogflowcx_v3.types import session_entity_type from .client import SessionEntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -127,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_info.__func__(SessionEntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SessionEntityTypesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SessionEntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_file.__func__(SessionEntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SessionEntityTypesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SessionEntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +182,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SessionEntityTypesTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/client.py index bc7643d96e9d..942449624303 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.session_entity_types import pagers +from google.cloud.dialogflowcx_v3.types import entity_type, session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import entity_type -from google.cloud.dialogflowcx_v3.types import session_entity_type from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .transports.grpc import SessionEntityTypesGrpcTransport @@ -86,9 +85,7 @@ class SessionEntityTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionEntityTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport @@ -638,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionEntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionEntityTypesClient._read_environment_variables() + ) self._client_cert_source = SessionEntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionEntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/pagers.py index 9f313c583dcb..534fad82c769 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/__init__.py index f94244b2aec5..4e711301d110 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SessionEntityTypesRestInterceptor, SessionEntityTypesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SessionEntityTypesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/base.py index e110a05d4d99..e9aa268639e9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version +from google.cloud.dialogflowcx_v3.types import session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import session_entity_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc.py index 1aad45557590..9f44bdb50d59 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -409,12 +409,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -440,12 +440,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -470,12 +470,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc_asyncio.py index 86467cd3901a..eeb0424838c7 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .grpc import SessionEntityTypesGrpcTransport @@ -417,12 +417,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -448,12 +448,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -478,12 +478,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest.py index a7d57e7034cb..88122a082d30 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3.types import session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import session_entity_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionEntityTypesRestTransport @@ -629,9 +629,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_create_session_entity_type( request, metadata @@ -783,9 +781,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_delete_session_entity_type( request, metadata @@ -807,7 +803,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -916,9 +912,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_get_session_entity_type( request, metadata @@ -1070,9 +1064,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() request, metadata = self._interceptor.pre_list_session_entity_types( request, metadata @@ -1243,9 +1235,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_update_session_entity_type( request, metadata @@ -1353,7 +1343,9 @@ def create_session_entity_type( ]: # 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._CreateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_session_entity_type( @@ -1363,7 +1355,9 @@ def delete_session_entity_type( ]: # 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._DeleteSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_session_entity_type( @@ -1385,7 +1379,9 @@ def list_session_entity_types( ]: # 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._ListSessionEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._ListSessionEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_session_entity_type( @@ -1396,7 +1392,9 @@ def update_session_entity_type( ]: # 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._UpdateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1456,9 +1454,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_transcoded_request( @@ -1597,9 +1593,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_transcoded_request( @@ -1735,9 +1729,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1853,9 +1845,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_transcoded_request( @@ -1994,9 +1984,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest_base.py index b6a0dc81c881..e70405106f2f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/session_entity_types/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflowcx_v3.types import session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/async_client.py index 85dc4065918a..59e1b3ab4149 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -144,7 +144,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_info.__func__(SessionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SessionsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SessionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +161,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_file.__func__(SessionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SessionsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SessionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/client.py index 3e5803bd3002..e7a3cc1dab07 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -922,11 +922,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionsClient._read_environment_variables() + ) self._client_cert_source = SessionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -961,8 +959,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/base.py index 77d645e290f5..cc4fa9bbd54d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import session @@ -297,7 +297,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc.py index 734ed5393ea5..ebde39da383f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import session @@ -382,12 +382,12 @@ def server_streaming_detect_intent( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "server_streaming_detect_intent" not in self._stubs: - self._stubs[ - "server_streaming_detect_intent" - ] = self._logged_channel.unary_stream( - "/google.cloud.dialogflow.cx.v3.Sessions/ServerStreamingDetectIntent", - request_serializer=session.DetectIntentRequest.serialize, - response_deserializer=session.DetectIntentResponse.deserialize, + self._stubs["server_streaming_detect_intent"] = ( + self._logged_channel.unary_stream( + "/google.cloud.dialogflow.cx.v3.Sessions/ServerStreamingDetectIntent", + request_serializer=session.DetectIntentRequest.serialize, + response_deserializer=session.DetectIntentResponse.deserialize, + ) ) return self._stubs["server_streaming_detect_intent"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc_asyncio.py index 0cab69d5d27d..78eec4e382d2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import session @@ -394,12 +394,12 @@ def server_streaming_detect_intent( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "server_streaming_detect_intent" not in self._stubs: - self._stubs[ - "server_streaming_detect_intent" - ] = self._logged_channel.unary_stream( - "/google.cloud.dialogflow.cx.v3.Sessions/ServerStreamingDetectIntent", - request_serializer=session.DetectIntentRequest.serialize, - response_deserializer=session.DetectIntentResponse.deserialize, + self._stubs["server_streaming_detect_intent"] = ( + self._logged_channel.unary_stream( + "/google.cloud.dialogflow.cx.v3.Sessions/ServerStreamingDetectIntent", + request_serializer=session.DetectIntentRequest.serialize, + response_deserializer=session.DetectIntentResponse.deserialize, + ) ) return self._stubs["server_streaming_detect_intent"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/rest.py index 1abb06645c40..6aee02e55a50 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/sessions/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1087,9 +1087,7 @@ def __call__( """ - http_options = ( - _BaseSessionsRestTransport._BaseServerStreamingDetectIntent._get_http_options() - ) + http_options = _BaseSessionsRestTransport._BaseServerStreamingDetectIntent._get_http_options() request, metadata = self._interceptor.pre_server_streaming_detect_intent( request, metadata @@ -1157,11 +1155,10 @@ def __call__( resp = self._interceptor.post_server_streaming_detect_intent(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_server_streaming_detect_intent_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_server_streaming_detect_intent_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1384,7 +1381,9 @@ def server_streaming_detect_intent( ) -> Callable[[session.DetectIntentRequest], session.DetectIntentResponse]: # 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._ServerStreamingDetectIntent(self._session, self._host, self._interceptor) # type: ignore + return self._ServerStreamingDetectIntent( + self._session, self._host, self._interceptor + ) # type: ignore @property def streaming_detect_intent( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/async_client.py index f5dc056b1bf6..8bbd4fb1ae79 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.test_cases import pagers from google.cloud.dialogflowcx_v3.types import test_case @@ -148,7 +148,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TestCasesAsyncClient: The constructed client. """ - return TestCasesClient.from_service_account_info.__func__(TestCasesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = TestCasesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(TestCasesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -164,7 +165,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TestCasesAsyncClient: The constructed client. """ - return TestCasesClient.from_service_account_file.__func__(TestCasesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = TestCasesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(TestCasesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/client.py index 20bc5a6ad1b5..da435ad4c385 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.test_cases import pagers from google.cloud.dialogflowcx_v3.types import test_case @@ -923,11 +923,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TestCasesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TestCasesClient._read_environment_variables() + ) self._client_cert_source = TestCasesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -962,8 +960,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TestCasesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/pagers.py index 284820dbff69..6fbb90fc583c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/base.py index 054813fdcb0c..7e8699a2957e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import test_case @@ -384,7 +384,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc.py index c0ec2f8fd33f..0d3e72072a6a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import test_case from google.cloud.dialogflowcx_v3.types import test_case as gcdc_test_case diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc_asyncio.py index 7b36f30051bf..0f7fa802cf92 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import test_case from google.cloud.dialogflowcx_v3.types import test_case as gcdc_test_case diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest.py index c76267e406d2..3db2670ed780 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1038,9 +1038,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseTestCasesRestTransport._BaseBatchDeleteTestCases._get_http_options() - ) + http_options = _BaseTestCasesRestTransport._BaseBatchDeleteTestCases._get_http_options() request, metadata = self._interceptor.pre_batch_delete_test_cases( request, metadata @@ -1066,7 +1064,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1188,7 +1186,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1656,7 +1654,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2110,7 +2108,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2566,7 +2564,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest_base.py index ec2a894c33cd..135140cdfdff 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/test_cases/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import test_case diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/async_client.py index 2e8e856bfd39..f9f7eaa1e413 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.tools import pagers from google.cloud.dialogflowcx_v3.types import tool @@ -115,7 +115,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_info.__func__(ToolsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ToolsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ToolsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +132,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_file.__func__(ToolsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ToolsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ToolsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/client.py index 005df8ddf4b3..6d781b4181bd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.tools import pagers from google.cloud.dialogflowcx_v3.types import tool @@ -698,11 +698,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ToolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ToolsClient._read_environment_variables() + ) self._client_cert_source = ToolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -737,8 +735,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ToolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/pagers.py index b535f268cbd7..20ee4e505833 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/base.py index d7bf26bd5482..f62b9bd3db32 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import tool @@ -339,7 +339,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc.py index cc3deb60aac5..ae15340fe7cf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import tool from google.cloud.dialogflowcx_v3.types import tool as gcdc_tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc_asyncio.py index 1b2bb781523f..e0ec6ee558c2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import tool from google.cloud.dialogflowcx_v3.types import tool as gcdc_tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest.py index 8fdbcdd02d30..42057f0b1179 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1139,7 +1139,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1252,7 +1252,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest_base.py index 5202607205a6..bdac9bcad218 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/tools/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/async_client.py index f2da7995d9d5..abe9f9ca6581 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.transition_route_groups import pagers +from google.cloud.dialogflowcx_v3.types import page, transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import page -from google.cloud.dialogflowcx_v3.types import transition_route_group from .client import TransitionRouteGroupsClient from .transports.base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport @@ -143,7 +142,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TransitionRouteGroupsAsyncClient: The constructed client. """ - return TransitionRouteGroupsClient.from_service_account_info.__func__(TransitionRouteGroupsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = TransitionRouteGroupsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(TransitionRouteGroupsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +159,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TransitionRouteGroupsAsyncClient: The constructed client. """ - return TransitionRouteGroupsClient.from_service_account_file.__func__(TransitionRouteGroupsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = TransitionRouteGroupsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(TransitionRouteGroupsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -197,7 +198,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return TransitionRouteGroupsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return TransitionRouteGroupsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> TransitionRouteGroupsTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/client.py index 69733d58148f..e16fbcdeb618 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.transition_route_groups import pagers +from google.cloud.dialogflowcx_v3.types import page, transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import page -from google.cloud.dialogflowcx_v3.types import transition_route_group from .transports.base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport from .transports.grpc import TransitionRouteGroupsGrpcTransport @@ -86,9 +85,7 @@ class TransitionRouteGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TransitionRouteGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TransitionRouteGroupsTransport]] _transport_registry["grpc"] = TransitionRouteGroupsGrpcTransport _transport_registry["grpc_asyncio"] = TransitionRouteGroupsGrpcAsyncIOTransport _transport_registry["rest"] = TransitionRouteGroupsRestTransport @@ -786,11 +783,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TransitionRouteGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TransitionRouteGroupsClient._read_environment_variables() + ) self._client_cert_source = TransitionRouteGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -825,8 +820,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TransitionRouteGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/pagers.py index 5b7142e74e50..86867e9ad779 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/__init__.py index ae6220640bc0..c3a4dc341788 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[TransitionRouteGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[TransitionRouteGroupsTransport]] _transport_registry["grpc"] = TransitionRouteGroupsGrpcTransport _transport_registry["grpc_asyncio"] = TransitionRouteGroupsGrpcAsyncIOTransport _transport_registry["rest"] = TransitionRouteGroupsRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/base.py index a29c04682c90..02d5e10677b8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version +from google.cloud.dialogflowcx_v3.types import transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import transition_route_group DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc.py index 754557f7f2dd..9c9038076655 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import transition_route_group from .base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport @@ -351,12 +351,12 @@ def list_transition_route_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_transition_route_groups" not in self._stubs: - self._stubs[ - "list_transition_route_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/ListTransitionRouteGroups", - request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, - response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + self._stubs["list_transition_route_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/ListTransitionRouteGroups", + request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, + response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + ) ) return self._stubs["list_transition_route_groups"] @@ -383,12 +383,12 @@ def get_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_transition_route_group" not in self._stubs: - self._stubs[ - "get_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/GetTransitionRouteGroup", - request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, - response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["get_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/GetTransitionRouteGroup", + request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, + response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["get_transition_route_group"] @@ -420,12 +420,12 @@ def create_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_transition_route_group" not in self._stubs: - self._stubs[ - "create_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/CreateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["create_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/CreateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["create_transition_route_group"] @@ -456,12 +456,12 @@ def update_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_transition_route_group" not in self._stubs: - self._stubs[ - "update_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/UpdateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["update_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/UpdateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["update_transition_route_group"] @@ -491,12 +491,12 @@ def delete_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_transition_route_group" not in self._stubs: - self._stubs[ - "delete_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/DeleteTransitionRouteGroup", - request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/DeleteTransitionRouteGroup", + request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_transition_route_group"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc_asyncio.py index 5c1289b10431..537f7ae66b9d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import transition_route_group from .base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport from .grpc import TransitionRouteGroupsGrpcTransport @@ -359,12 +359,12 @@ def list_transition_route_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_transition_route_groups" not in self._stubs: - self._stubs[ - "list_transition_route_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/ListTransitionRouteGroups", - request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, - response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + self._stubs["list_transition_route_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/ListTransitionRouteGroups", + request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, + response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + ) ) return self._stubs["list_transition_route_groups"] @@ -391,12 +391,12 @@ def get_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_transition_route_group" not in self._stubs: - self._stubs[ - "get_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/GetTransitionRouteGroup", - request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, - response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["get_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/GetTransitionRouteGroup", + request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, + response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["get_transition_route_group"] @@ -428,12 +428,12 @@ def create_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_transition_route_group" not in self._stubs: - self._stubs[ - "create_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/CreateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["create_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/CreateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["create_transition_route_group"] @@ -464,12 +464,12 @@ def update_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_transition_route_group" not in self._stubs: - self._stubs[ - "update_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/UpdateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["update_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/UpdateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["update_transition_route_group"] @@ -500,12 +500,12 @@ def delete_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_transition_route_group" not in self._stubs: - self._stubs[ - "delete_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/DeleteTransitionRouteGroup", - request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/DeleteTransitionRouteGroup", + request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_transition_route_group"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest.py index c3033751a724..841b040a5ef8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3.types import transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import transition_route_group from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseTransitionRouteGroupsRestTransport @@ -617,9 +617,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseCreateTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseCreateTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_create_transition_route_group( request, metadata @@ -688,11 +686,10 @@ def __call__( resp = self._interceptor.post_create_transition_route_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_transition_route_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_transition_route_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -774,9 +771,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseDeleteTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseDeleteTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_delete_transition_route_group( request, metadata @@ -798,7 +793,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -893,9 +888,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseGetTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseGetTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_get_transition_route_group( request, metadata @@ -1046,9 +1039,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseListTransitionRouteGroups._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseListTransitionRouteGroups._get_http_options() request, metadata = self._interceptor.pre_list_transition_route_groups( request, metadata @@ -1202,9 +1193,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseUpdateTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseUpdateTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_update_transition_route_group( request, metadata @@ -1273,11 +1262,10 @@ def __call__( resp = self._interceptor.post_update_transition_route_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_transition_route_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_transition_route_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1315,7 +1303,9 @@ def create_transition_route_group( ]: # 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._CreateTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._CreateTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_transition_route_group( @@ -1325,7 +1315,9 @@ def delete_transition_route_group( ]: # 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._DeleteTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_transition_route_group( @@ -1336,7 +1328,9 @@ def get_transition_route_group( ]: # 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._GetTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._GetTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_transition_route_groups( @@ -1347,7 +1341,9 @@ def list_transition_route_groups( ]: # 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._ListTransitionRouteGroups(self._session, self._host, self._interceptor) # type: ignore + return self._ListTransitionRouteGroups( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_transition_route_group( @@ -1358,7 +1354,9 @@ def update_transition_route_group( ]: # 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._UpdateTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1418,9 +1416,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseGetLocation._get_transcoded_request( @@ -1559,9 +1555,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseListLocations._get_transcoded_request( @@ -1697,9 +1691,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1817,9 +1809,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseGetOperation._get_transcoded_request( @@ -1958,9 +1948,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest_base.py index 7783242935ef..3b2ef4fe0359 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/transition_route_groups/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflowcx_v3.types import transition_route_group from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import transition_route_group from .base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/async_client.py index 86a5da65e9a7..c9d35c0ccc71 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,18 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.versions import pagers -from google.cloud.dialogflowcx_v3.types import flow -from google.cloud.dialogflowcx_v3.types import version +from google.cloud.dialogflowcx_v3.types import flow, version from google.cloud.dialogflowcx_v3.types import version as gcdc_version from .client import VersionsClient @@ -118,7 +117,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_info.__func__(VersionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = VersionsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(VersionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +134,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_file.__func__(VersionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = VersionsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(VersionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/client.py index 61969f7a56f6..a79a8435b407 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,18 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.versions import pagers -from google.cloud.dialogflowcx_v3.types import flow -from google.cloud.dialogflowcx_v3.types import version +from google.cloud.dialogflowcx_v3.types import flow, version from google.cloud.dialogflowcx_v3.types import version as gcdc_version from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport @@ -635,11 +634,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VersionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VersionsClient._read_environment_variables() + ) self._client_cert_source = VersionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VersionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/pagers.py index a387eab8cad0..7d053d07a929 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/base.py index 2576ad3f2ee7..5db4d1a0b08e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import version @@ -307,7 +307,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc.py index cef84d37b094..2a6cf92aa365 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import version from google.cloud.dialogflowcx_v3.types import version as gcdc_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc_asyncio.py index 28e1472b9e14..daebfe08b83a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import version from google.cloud.dialogflowcx_v3.types import version as gcdc_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest.py index 10603c9524cf..d219921a0dca 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -947,7 +947,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1091,7 +1091,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1508,7 +1508,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest_base.py index 2d2327f04f0c..d622708aea98 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/versions/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/async_client.py index 4185ae645445..a84e1830abc8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.webhooks import pagers from google.cloud.dialogflowcx_v3.types import webhook @@ -117,7 +117,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: WebhooksAsyncClient: The constructed client. """ - return WebhooksClient.from_service_account_info.__func__(WebhooksAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = WebhooksClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(WebhooksAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +134,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: WebhooksAsyncClient: The constructed client. """ - return WebhooksClient.from_service_account_file.__func__(WebhooksAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = WebhooksClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(WebhooksAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/client.py index 47aae694554c..1a7730bdb4aa 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.webhooks import pagers from google.cloud.dialogflowcx_v3.types import webhook @@ -674,11 +674,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = WebhooksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + WebhooksClient._read_environment_variables() + ) self._client_cert_source = WebhooksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -713,8 +711,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(WebhooksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/pagers.py index 46b5442d732a..206f0a1e898b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/base.py index 0ce052ff5211..b695b1c354f2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3 import gapic_version as package_version from google.cloud.dialogflowcx_v3.types import webhook @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc.py index 05c3ac8c6b0b..93fe520edbfd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import webhook from google.cloud.dialogflowcx_v3.types import webhook as gcdc_webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc_asyncio.py index 14833593829e..f714a22134d4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3.types import webhook from google.cloud.dialogflowcx_v3.types import webhook as gcdc_webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest.py index 4209a887dbeb..67b5c24bdebf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -767,7 +767,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest_base.py index 773ea7e071f2..24e9274b3acb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/services/webhooks/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3.types import webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/__init__.py index a13971240d2e..f2b7b89c36dc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .advanced_settings import AdvancedSettings +from .advanced_settings import ( + AdvancedSettings, +) from .agent import ( Agent, AgentValidationResult, @@ -51,7 +53,9 @@ ListChangelogsRequest, ListChangelogsResponse, ) -from .code_block import CodeBlock +from .code_block import ( + CodeBlock, +) from .data_store_connection import ( DataStoreConnection, DataStoreConnectionSignals, @@ -142,9 +146,16 @@ UpdateFlowRequest, ValidateFlowRequest, ) -from .fulfillment import Fulfillment -from .gcs import GcsDestination -from .generative_settings import GenerativeSettings, LlmModelSettings +from .fulfillment import ( + Fulfillment, +) +from .gcs import ( + GcsDestination, +) +from .generative_settings import ( + GenerativeSettings, + LlmModelSettings, +) from .generator import ( CreateGeneratorRequest, DeleteGeneratorRequest, @@ -155,8 +166,13 @@ Phrase, UpdateGeneratorRequest, ) -from .import_strategy import ImportStrategy -from .inline import InlineDestination, InlineSource +from .import_strategy import ( + ImportStrategy, +) +from .inline import ( + InlineDestination, + InlineSource, +) from .intent import ( CreateIntentRequest, DeleteIntentRequest, @@ -215,8 +231,12 @@ RestorePlaybookVersionResponse, UpdatePlaybookRequest, ) -from .response_message import ResponseMessage -from .safety_settings import SafetySettings +from .response_message import ( + ResponseMessage, +) +from .safety_settings import ( + SafetySettings, +) from .security_settings import ( CreateSecuritySettingsRequest, DeleteSecuritySettingsRequest, @@ -317,7 +337,10 @@ ToolVersion, UpdateToolRequest, ) -from .tool_call import ToolCall, ToolCallResult +from .tool_call import ( + ToolCall, + ToolCallResult, +) from .trace import ( Action, AgentUtterance, @@ -340,7 +363,10 @@ TransitionRouteGroup, UpdateTransitionRouteGroupRequest, ) -from .validation_message import ResourceName, ValidationMessage +from .validation_message import ( + ResourceName, + ValidationMessage, +) from .version import ( CompareVersionsRequest, CompareVersionsResponse, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/advanced_settings.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/advanced_settings.py index 60f24c6b1c0e..0f44ebb983d3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/advanced_settings.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/advanced_settings.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import gcs diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/agent.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/agent.py index db69fe744b33..4deb7c1cddd7 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/agent.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/agent.py @@ -17,17 +17,17 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import ( advanced_settings as gcdc_advanced_settings, ) +from google.cloud.dialogflowcx_v3.types import audio_config, flow from google.cloud.dialogflowcx_v3.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3.types import audio_config, flow __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3", @@ -648,6 +648,7 @@ class DataFormat(proto.Enum): Agent content will be exported in JSON Package format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON_PACKAGE = 4 @@ -804,6 +805,7 @@ class RestoreOption(proto.Enum): Fallback to default settings if some settings are not supported in the target agent. """ + RESTORE_OPTION_UNSPECIFIED = 0 KEEP = 1 FALLBACK = 2 @@ -911,12 +913,12 @@ class AgentValidationResult(proto.Message): proto.STRING, number=1, ) - flow_validation_results: MutableSequence[ - flow.FlowValidationResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=flow.FlowValidationResult, + flow_validation_results: MutableSequence[flow.FlowValidationResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=flow.FlowValidationResult, + ) ) diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/audio_config.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/audio_config.py index c931e021d33c..08adc64909da 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/audio_config.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/audio_config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -91,6 +91,7 @@ class AudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + AUDIO_ENCODING_UNSPECIFIED = 0 AUDIO_ENCODING_LINEAR_16 = 1 AUDIO_ENCODING_FLAC = 2 @@ -138,6 +139,7 @@ class SpeechModelVariant(proto.Enum): documentation `__ describes which models have enhanced variants. """ + SPEECH_MODEL_VARIANT_UNSPECIFIED = 0 USE_BEST_AVAILABLE = 1 USE_STANDARD = 2 @@ -160,6 +162,7 @@ class SsmlVoiceGender(proto.Enum): SSML_VOICE_GENDER_NEUTRAL (3): A gender-neutral voice. """ + SSML_VOICE_GENDER_UNSPECIFIED = 0 SSML_VOICE_GENDER_MALE = 1 SSML_VOICE_GENDER_FEMALE = 2 @@ -194,6 +197,7 @@ class OutputAudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + OUTPUT_AUDIO_ENCODING_UNSPECIFIED = 0 OUTPUT_AUDIO_ENCODING_LINEAR_16 = 1 OUTPUT_AUDIO_ENCODING_MP3 = 2 @@ -557,13 +561,13 @@ class TextToSpeechSettings(proto.Message): is not specified. """ - synthesize_speech_configs: MutableMapping[ - str, "SynthesizeSpeechConfig" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=1, - message="SynthesizeSpeechConfig", + synthesize_speech_configs: MutableMapping[str, "SynthesizeSpeechConfig"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=1, + message="SynthesizeSpeechConfig", + ) ) diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/changelog.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/changelog.py index 73a126528a6f..0d25a94aa1ae 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/changelog.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/changelog.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/data_store_connection.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/data_store_connection.py index ad68284144b8..79422e0795e3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/data_store_connection.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/data_store_connection.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -50,6 +50,7 @@ class DataStoreType(proto.Enum): A data store that contains structured data (for example FAQ). """ + DATA_STORE_TYPE_UNSPECIFIED = 0 PUBLIC_WEB = 1 UNSTRUCTURED = 2 @@ -69,6 +70,7 @@ class DocumentProcessingMode(proto.Enum): CHUNKS (2): Documents are converted to chunks. """ + DOCUMENT_PROCESSING_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -295,6 +297,7 @@ class GroundingDecision(proto.Enum): REJECTED_BY_GROUNDING (2): Grounding have rejected the answer. """ + GROUNDING_DECISION_UNSPECIFIED = 0 ACCEPTED_BY_GROUNDING = 1 REJECTED_BY_GROUNDING = 2 @@ -321,6 +324,7 @@ class GroundingScoreBucket(proto.Enum): We have very high confidence that the answer is grounded. """ + GROUNDING_SCORE_BUCKET_UNSPECIFIED = 0 VERY_LOW = 1 LOW = 3 @@ -369,6 +373,7 @@ class SafetyDecision(proto.Enum): REJECTED_BY_SAFETY_CHECK (2): One ore more safety checks fired. """ + SAFETY_DECISION_UNSPECIFIED = 0 ACCEPTED_BY_SAFETY_CHECK = 1 REJECTED_BY_SAFETY_CHECK = 2 @@ -386,6 +391,7 @@ class BannedPhraseMatch(proto.Enum): BANNED_PHRASE_MATCH_RESPONSE (3): A banned phrase matched the response. """ + BANNED_PHRASE_MATCH_UNSPECIFIED = 0 BANNED_PHRASE_MATCH_NONE = 1 BANNED_PHRASE_MATCH_QUERY = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/deployment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/deployment.py index 87994587550f..e1b1be2123d1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/deployment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/deployment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -72,6 +72,7 @@ class State(proto.Enum): FAILED (3): The deployment failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/entity_type.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/entity_type.py index 15bd6ae53140..b32ccd852349 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/entity_type.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/entity_type.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import inline @@ -129,6 +129,7 @@ class Kind(proto.Enum): Regexp entity types allow to specify regular expressions in entries values. """ + KIND_UNSPECIFIED = 0 KIND_MAP = 1 KIND_LIST = 2 @@ -147,6 +148,7 @@ class AutoExpansionMode(proto.Enum): Allows an agent to recognize values that have not been explicitly listed in the entity. """ + AUTO_EXPANSION_MODE_UNSPECIFIED = 0 AUTO_EXPANSION_MODE_DEFAULT = 1 @@ -305,6 +307,7 @@ class DataFormat(proto.Enum): EntityTypes will be exported in JSON Package format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON_PACKAGE = 5 @@ -461,6 +464,7 @@ class MergeOption(proto.Enum): conflicting new entity type when display name conflicts exist. """ + MERGE_OPTION_UNSPECIFIED = 0 REPLACE = 1 MERGE = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/environment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/environment.py index ce908380fbb5..1eaf98768eb5 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/environment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/environment.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import test_case, webhook @@ -434,6 +434,7 @@ class AggregatedTestResult(proto.Enum): FAILED (2): At least one test did not pass. """ + AGGREGATED_TEST_RESULT_UNSPECIFIED = 0 PASSED = 1 FAILED = 2 @@ -553,12 +554,12 @@ class ListContinuousTestResultsResponse(proto.Message): def raw_page(self): return self - continuous_test_results: MutableSequence[ - "ContinuousTestResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ContinuousTestResult", + continuous_test_results: MutableSequence["ContinuousTestResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ContinuousTestResult", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/example.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/example.py index bc9b5d91027f..4804363a2f06 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/example.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/example.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import trace diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/experiment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/experiment.py index 2c48cae308a4..b64475cc8a0f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/experiment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/experiment.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -119,6 +119,7 @@ class State(proto.Enum): The experiment with auto-rollout enabled has failed. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 RUNNING = 2 @@ -189,6 +190,7 @@ class MetricType(proto.Enum): Percentage of sessions reached Dialogflow 'END_PAGE' or 'END_SESSION'. """ + METRIC_UNSPECIFIED = 0 CONTAINED_SESSION_NO_CALLBACK_RATE = 1 LIVE_AGENT_HANDOFF_RATE = 2 @@ -209,6 +211,7 @@ class CountType(proto.Enum): AVERAGE_TURN_COUNT (3): Average turn count in a session. """ + COUNT_TYPE_UNSPECIFIED = 0 TOTAL_NO_MATCH_COUNT = 1 TOTAL_TURN_COUNT = 2 @@ -335,12 +338,12 @@ class VersionMetrics(proto.Message): number=3, ) - version_metrics: MutableSequence[ - "Experiment.Result.VersionMetrics" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Experiment.Result.VersionMetrics", + version_metrics: MutableSequence["Experiment.Result.VersionMetrics"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Experiment.Result.VersionMetrics", + ) ) last_update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/flow.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/flow.py index 819ac112093b..f61a24c37c5f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/flow.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/flow.py @@ -17,19 +17,19 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import ( + advanced_settings as gcdc_advanced_settings, +) from google.cloud.dialogflowcx_v3.types import ( import_strategy, page, parameter_definition, validation_message, ) -from google.cloud.dialogflowcx_v3.types import ( - advanced_settings as gcdc_advanced_settings, -) __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3", @@ -88,6 +88,7 @@ class ModelType(proto.Enum): MODEL_TYPE_ADVANCED (3): Use advanced NLU model. """ + MODEL_TYPE_UNSPECIFIED = 0 MODEL_TYPE_STANDARD = 1 MODEL_TYPE_ADVANCED = 3 @@ -108,6 +109,7 @@ class ModelTrainingMode(proto.Enum): training. Best for large flows whose models take long time to train. """ + MODEL_TRAINING_MODE_UNSPECIFIED = 0 MODEL_TRAINING_MODE_AUTOMATIC = 1 MODEL_TRAINING_MODE_MANUAL = 2 @@ -630,12 +632,12 @@ class FlowValidationResult(proto.Message): proto.STRING, number=1, ) - validation_messages: MutableSequence[ - validation_message.ValidationMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=validation_message.ValidationMessage, + validation_messages: MutableSequence[validation_message.ValidationMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=validation_message.ValidationMessage, + ) ) update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, @@ -700,6 +702,7 @@ class ImportOption(proto.Enum): E.g. Standard NLU will be used if custom NLU is not available. """ + IMPORT_OPTION_UNSPECIFIED = 0 KEEP = 1 FALLBACK = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/fulfillment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/fulfillment.py index 121af88081a7..8af21074ce82 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/fulfillment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/fulfillment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import ( @@ -201,12 +201,12 @@ class CaseContent(proto.Message): message="Fulfillment.ConditionalCases.Case.CaseContent", ) - cases: MutableSequence[ - "Fulfillment.ConditionalCases.Case" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Fulfillment.ConditionalCases.Case", + cases: MutableSequence["Fulfillment.ConditionalCases.Case"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Fulfillment.ConditionalCases.Case", + ) ) class GeneratorSettings(proto.Message): diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/generator.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/generator.py index 5a7846c80e70..de2b3d8e21c9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/generator.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/generator.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import generative_settings diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/import_strategy.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/import_strategy.py index 4f1e6f57ba08..3a03a815a4fe 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/import_strategy.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/import_strategy.py @@ -51,6 +51,7 @@ class ImportStrategy(proto.Enum): IMPORT_STRATEGY_THROW_ERROR (5): Throw error if a conflict is encountered. """ + IMPORT_STRATEGY_UNSPECIFIED = 0 IMPORT_STRATEGY_CREATE_NEW = 1 IMPORT_STRATEGY_REPLACE = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/intent.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/intent.py index 9940b6d59718..81a05401734a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/intent.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/intent.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import inline @@ -58,6 +58,7 @@ class IntentView(proto.Enum): INTENT_VIEW_FULL (2): All fields are populated. """ + INTENT_VIEW_UNSPECIFIED = 0 INTENT_VIEW_PARTIAL = 1 INTENT_VIEW_FULL = 2 @@ -560,6 +561,7 @@ class MergeOption(proto.Enum): conflicting new intent when display name conflicts exist. """ + MERGE_OPTION_UNSPECIFIED = 0 REJECT = 1 REPLACE = 2 @@ -699,6 +701,7 @@ class DataFormat(proto.Enum): CSV (3): Intents will be exported in CSV format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/page.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/page.py index b653c08f71c9..2b54aa262153 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/page.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/page.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflowcx_v3.types import data_store_connection, fulfillment from google.cloud.dialogflowcx_v3.types import ( advanced_settings as gcdc_advanced_settings, ) +from google.cloud.dialogflowcx_v3.types import data_store_connection, fulfillment __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3", @@ -304,12 +304,12 @@ class FillBehavior(proto.Message): number=3, message=fulfillment.Fulfillment, ) - reprompt_event_handlers: MutableSequence[ - "EventHandler" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="EventHandler", + reprompt_event_handlers: MutableSequence["EventHandler"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="EventHandler", + ) ) display_name: str = proto.Field( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/parameter_definition.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/parameter_definition.py index 9257157bc1d5..e234cc2489d0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/parameter_definition.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/parameter_definition.py @@ -47,6 +47,7 @@ class DataType(proto.Enum): ARRAY (6): Represents a repeated value. """ + DATA_TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -92,6 +93,7 @@ class ParameterType(proto.Enum): LIST (6): Represents a repeated value. """ + PARAMETER_TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/playbook.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/playbook.py index 31dc94d8a209..b0b4083a3ac8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/playbook.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/playbook.py @@ -17,16 +17,18 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflowcx_v3.types import import_strategy as gcdc_import_strategy from google.cloud.dialogflowcx_v3.types import code_block as gcdc_code_block -from google.cloud.dialogflowcx_v3.types import example +from google.cloud.dialogflowcx_v3.types import ( + example, + generative_settings, + parameter_definition, +) from google.cloud.dialogflowcx_v3.types import fulfillment as gcdc_fulfillment -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import parameter_definition +from google.cloud.dialogflowcx_v3.types import import_strategy as gcdc_import_strategy __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3", @@ -280,6 +282,7 @@ class PlaybookType(proto.Enum): ROUTINE (3): Routine playbook. """ + PLAYBOOK_TYPE_UNSPECIFIED = 0 TASK = 1 ROUTINE = 3 @@ -651,6 +654,7 @@ class DataFormat(proto.Enum): JSON (2): Flow content will be exported in JSON format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/response_message.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/response_message.py index a3f4f6e5c09b..2a192ca5b4a0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/response_message.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/response_message.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import tool_call as gcdc_tool_call @@ -157,6 +157,7 @@ class ResponseType(proto.Enum): [event handler][EventHandler] in the page or flow or transition route group. """ + RESPONSE_TYPE_UNSPECIFIED = 0 ENTRY_PROMPT = 1 PARAMETER_PROMPT = 2 @@ -383,12 +384,12 @@ class Segment(proto.Message): number=3, ) - segments: MutableSequence[ - "ResponseMessage.MixedAudio.Segment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ResponseMessage.MixedAudio.Segment", + segments: MutableSequence["ResponseMessage.MixedAudio.Segment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ResponseMessage.MixedAudio.Segment", + ) ) class TelephonyTransferCall(proto.Message): diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/safety_settings.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/safety_settings.py index bfe296329370..3e911d62a295 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/safety_settings.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/safety_settings.py @@ -64,6 +64,7 @@ class PhraseMatchStrategy(proto.Enum): phrase will be matched, e.g. "foo" will match "a foo bar" and "foo bar", but not "foobar". """ + PHRASE_MATCH_STRATEGY_UNSPECIFIED = 0 PARTIAL_MATCH = 1 WORD_MATCH = 2 @@ -113,6 +114,7 @@ class SafetyFilterLevel(proto.Enum): BLOCK_MOST (4): Block most suspicious texts. """ + SAFETY_FILTER_LEVEL_UNSPECIFIED = 0 BLOCK_NONE = 1 BLOCK_FEW = 2 @@ -134,6 +136,7 @@ class SafetyCategory(proto.Enum): SEXUALLY_EXPLICIT_CONTENT (4): Sexually explicit content. """ + SAFETY_CATEGORY_UNSPECIFIED = 0 DANGEROUS_CONTENT = 1 HATE_SPEECH = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/security_settings.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/security_settings.py index 2d1e3e5dcdc8..4ec072852dab 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/security_settings.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/security_settings.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -306,6 +306,7 @@ class RedactionStrategy(proto.Enum): Call redaction service to clean up the data to be persisted. """ + REDACTION_STRATEGY_UNSPECIFIED = 0 REDACT_WITH_SERVICE = 1 @@ -321,6 +322,7 @@ class RedactionScope(proto.Enum): power is disconnected. This includes data that are temporarily saved on disk. """ + REDACTION_SCOPE_UNSPECIFIED = 0 REDACT_DISK_STORAGE = 2 @@ -338,6 +340,7 @@ class RetentionStrategy(proto.Enum): conversation ends when the corresponding Dialogflow session ends. """ + RETENTION_STRATEGY_UNSPECIFIED = 0 REMOVE_AFTER_CONVERSATION = 1 @@ -353,6 +356,7 @@ class PurgeDataType(proto.Enum): Cloud logging, which is owned by the user - not Dialogflow. """ + PURGE_DATA_TYPE_UNSPECIFIED = 0 DIALOGFLOW_HISTORY = 1 @@ -400,6 +404,7 @@ class AudioFormat(proto.Enum): OGG (3): OGG Vorbis. """ + AUDIO_FORMAT_UNSPECIFIED = 0 MULAW = 1 MP3 = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session.py index 44ee98493768..a254088e3851 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session.py @@ -17,28 +17,26 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import ( + advanced_settings as gcdc_advanced_settings, +) from google.cloud.dialogflowcx_v3.types import ( audio_config, data_store_connection, flow, generative_settings, -) -from google.cloud.dialogflowcx_v3.types import ( page, response_message, session_entity_type, tool_call, ) -from google.cloud.dialogflowcx_v3.types import ( - advanced_settings as gcdc_advanced_settings, -) from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent __protobuf__ = proto.module( @@ -96,6 +94,7 @@ class DetectIntentResponseView(proto.Enum): [QueryResult.trace_blocks][google.cloud.dialogflow.cx.v3.QueryResult.trace_blocks] """ + DETECT_INTENT_RESPONSE_VIEW_UNSPECIFIED = 0 DETECT_INTENT_RESPONSE_VIEW_FULL = 1 DETECT_INTENT_RESPONSE_VIEW_BASIC = 2 @@ -133,6 +132,7 @@ class Rating(proto.Enum): THUMBS_DOWN (2): Thumbs down feedback from user. """ + RATING_UNSPECIFIED = 0 THUMBS_UP = 1 THUMBS_DOWN = 2 @@ -327,6 +327,7 @@ class ResponseType(proto.Enum): FINAL (2): Final response. """ + RESPONSE_TYPE_UNSPECIFIED = 0 PARTIAL = 1 FINAL = 2 @@ -551,19 +552,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=5, ) - speech_partial_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=duration_pb2.Duration, + speech_partial_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=duration_pb2.Duration, + ) ) - speech_final_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=duration_pb2.Duration, + speech_final_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=duration_pb2.Duration, + ) ) partial_responses: int = proto.Field( proto.INT32, @@ -581,19 +582,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=11, ) - dtmf_partial_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message=duration_pb2.Duration, + dtmf_partial_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message=duration_pb2.Duration, + ) ) - dtmf_final_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=13, - message=duration_pb2.Duration, + dtmf_final_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=13, + message=duration_pb2.Duration, + ) ) single_utterance_end_time_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -802,6 +803,7 @@ class MessageType(proto.Enum): [``single_utterance``][google.cloud.dialogflow.cx.v3.InputAudioConfig.single_utterance] was set to ``true``, and is not used otherwise. """ + MESSAGE_TYPE_UNSPECIFIED = 0 TRANSCRIPT = 1 END_OF_SINGLE_UTTERANCE = 2 @@ -827,12 +829,12 @@ class MessageType(proto.Enum): proto.FLOAT, number=6, ) - speech_word_info: MutableSequence[ - audio_config.SpeechWordInfo - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=audio_config.SpeechWordInfo, + speech_word_info: MutableSequence[audio_config.SpeechWordInfo] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=audio_config.SpeechWordInfo, + ) ) speech_end_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -1025,12 +1027,12 @@ class QueryParameters(proto.Message): number=2, message=latlng_pb2.LatLng, ) - session_entity_types: MutableSequence[ - session_entity_type.SessionEntityType - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=session_entity_type.SessionEntityType, + session_entity_types: MutableSequence[session_entity_type.SessionEntityType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=session_entity_type.SessionEntityType, + ) ) payload: struct_pb2.Struct = proto.Field( proto.MESSAGE, @@ -1239,6 +1241,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. E.g. ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -1255,6 +1258,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -1672,12 +1676,12 @@ class QueryResult(proto.Message): number=3, message=struct_pb2.Struct, ) - response_messages: MutableSequence[ - response_message.ResponseMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=response_message.ResponseMessage, + response_messages: MutableSequence[response_message.ResponseMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=response_message.ResponseMessage, + ) ) webhook_statuses: MutableSequence[status_pb2.Status] = proto.RepeatedField( proto.MESSAGE, @@ -1916,6 +1920,7 @@ class MatchType(proto.Enum): The query was handled by a [``Playbook``][google.cloud.dialogflow.cx.v3.Playbook]. """ + MATCH_TYPE_UNSPECIFIED = 0 INTENT = 1 DIRECT_INTENT = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session_entity_type.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session_entity_type.py index 3b6d6734a0b1..e1fc530e60ca 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session_entity_type.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/session_entity_type.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import entity_type @@ -95,6 +95,7 @@ class EntityOverrideMode(proto.Enum): [EntityTypes.GetEntityType][google.cloud.dialogflow.cx.v3.EntityTypes.GetEntityType] on the custom entity type and merge. """ + ENTITY_OVERRIDE_MODE_UNSPECIFIED = 0 ENTITY_OVERRIDE_MODE_OVERRIDE = 1 ENTITY_OVERRIDE_MODE_SUPPLEMENT = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/test_case.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/test_case.py index 22e106675e32..bf8523f0a5e8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/test_case.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/test_case.py @@ -17,20 +17,20 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow +from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent +from google.cloud.dialogflowcx_v3.types import page as gcdc_page from google.cloud.dialogflowcx_v3.types import ( response_message, session, transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow -from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent -from google.cloud.dialogflowcx_v3.types import page as gcdc_page __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3", @@ -84,6 +84,7 @@ class TestResult(proto.Enum): FAILED (2): The test did not pass. """ + TEST_RESULT_UNSPECIFIED = 0 PASSED = 1 FAILED = 2 @@ -145,12 +146,12 @@ class TestCase(proto.Message): number=13, message="TestConfig", ) - test_case_conversation_turns: MutableSequence[ - "ConversationTurn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="ConversationTurn", + test_case_conversation_turns: MutableSequence["ConversationTurn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="ConversationTurn", + ) ) creation_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, @@ -361,12 +362,12 @@ class VirtualAgentOutput(proto.Message): number=8, message=gcdc_page.Page, ) - text_responses: MutableSequence[ - response_message.ResponseMessage.Text - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message=response_message.ResponseMessage.Text, + text_responses: MutableSequence[response_message.ResponseMessage.Text] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message=response_message.ResponseMessage.Text, + ) ) status: status_pb2.Status = proto.Field( proto.MESSAGE, @@ -415,6 +416,7 @@ class DiffType(proto.Enum): FLOW (5): The flow. """ + DIFF_TYPE_UNSPECIFIED = 0 INTENT = 1 PAGE = 2 @@ -705,6 +707,7 @@ class CoverageType(proto.Enum): TRANSITION_ROUTE_GROUP (3): Transition route group coverage. """ + COVERAGE_TYPE_UNSPECIFIED = 0 INTENT = 1 PAGE_TRANSITION = 2 @@ -812,6 +815,7 @@ class TestCaseView(proto.Enum): FULL (2): Include everything. """ + TEST_CASE_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -1252,6 +1256,7 @@ class DataFormat(proto.Enum): JSON (2): JSON format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/tool.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/tool.py index 138d1547d4ad..2837f7c04f6d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/tool.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/tool.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import data_store_connection @@ -249,6 +249,7 @@ class ToolType(proto.Enum): First party built-in tool created by Dialogflow which cannot be modified. """ + TOOL_TYPE_UNSPECIFIED = 0 CUSTOMIZED_TOOL = 1 BUILTIN_TOOL = 2 @@ -405,6 +406,7 @@ class RequestLocation(proto.Enum): QUERY_STRING (2): Represents the key in query string. """ + REQUEST_LOCATION_UNSPECIFIED = 0 HEADER = 1 QUERY_STRING = 2 @@ -485,6 +487,7 @@ class OauthGrantType(proto.Enum): Represents the `client credential flow `__. """ + OAUTH_GRANT_TYPE_UNSPECIFIED = 0 CLIENT_CREDENTIAL = 1 @@ -548,6 +551,7 @@ class ServiceAgentAuth(proto.Enum): other Google Cloud APIs after you grant required roles to ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com``. """ + SERVICE_AGENT_AUTH_UNSPECIFIED = 0 ID_TOKEN = 1 ACCESS_TOKEN = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/tool_call.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/tool_call.py index eeb8cff5eaeb..3d5908f7747c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/tool_call.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/tool_call.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/trace.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/trace.py index 3adaac9e764b..c5ba0eab68ea 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/trace.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/trace.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -55,6 +55,7 @@ class OutputState(proto.Enum): OUTPUT_STATE_PENDING (5): Pending. """ + OUTPUT_STATE_UNSPECIFIED = 0 OUTPUT_STATE_OK = 1 OUTPUT_STATE_CANCELLED = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/transition_route_group.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/transition_route_group.py index 72d12d39b001..609fca05751b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/transition_route_group.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/transition_route_group.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import page @@ -144,12 +144,12 @@ class ListTransitionRouteGroupsResponse(proto.Message): def raw_page(self): return self - transition_route_groups: MutableSequence[ - "TransitionRouteGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="TransitionRouteGroup", + transition_route_groups: MutableSequence["TransitionRouteGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="TransitionRouteGroup", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/validation_message.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/validation_message.py index 4341aab98e7e..111275d9554b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/validation_message.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/validation_message.py @@ -82,6 +82,7 @@ class ResourceType(proto.Enum): AGENT_TRANSITION_ROUTE_GROUP (14): Agent transition route group. """ + RESOURCE_TYPE_UNSPECIFIED = 0 AGENT = 1 INTENT = 2 @@ -112,6 +113,7 @@ class Severity(proto.Enum): ERROR (3): The agent may experience failures. """ + SEVERITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/version.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/version.py index fb06375316d9..490e655a8f7c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/version.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/version.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import flow @@ -100,6 +100,7 @@ class State(proto.Enum): FAILED (3): Version training failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/webhook.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/webhook.py index 5c4e5a0d2bc5..f3dd6d62db41 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/webhook.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3/types/webhook.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3.types import response_message @@ -184,6 +184,7 @@ class ServiceAgentAuth(proto.Enum): other Google Cloud APIs after you grant required roles to ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com``. """ + SERVICE_AGENT_AUTH_UNSPECIFIED = 0 NONE = 1 ID_TOKEN = 2 @@ -200,6 +201,7 @@ class WebhookType(proto.Enum): FLEXIBLE (2): Represents a flexible webhook. """ + WEBHOOK_TYPE_UNSPECIFIED = 0 STANDARD = 1 FLEXIBLE = 2 @@ -225,6 +227,7 @@ class HttpMethod(proto.Enum): OPTIONS (7): HTTP OPTIONS Method. """ + HTTP_METHOD_UNSPECIFIED = 0 POST = 1 GET = 2 @@ -923,16 +926,17 @@ class MergeBehavior(proto.Enum): ``messages`` will replace the list of messages waiting to be sent to the user. """ + MERGE_BEHAVIOR_UNSPECIFIED = 0 APPEND = 1 REPLACE = 2 - messages: MutableSequence[ - response_message.ResponseMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=response_message.ResponseMessage, + messages: MutableSequence[response_message.ResponseMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=response_message.ResponseMessage, + ) ) merge_behavior: "WebhookResponse.FulfillmentResponse.MergeBehavior" = ( proto.Field( @@ -1076,6 +1080,7 @@ class ParameterState(proto.Enum): FILLED (3): Indicates that the parameter has a value. """ + PARAMETER_STATE_UNSPECIFIED = 0 EMPTY = 1 INVALID = 2 @@ -1104,12 +1109,12 @@ class ParameterState(proto.Enum): number=5, ) - parameter_info: MutableSequence[ - "PageInfo.FormInfo.ParameterInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="PageInfo.FormInfo.ParameterInfo", + parameter_info: MutableSequence["PageInfo.FormInfo.ParameterInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="PageInfo.FormInfo.ParameterInfo", + ) ) current_page: str = proto.Field( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/__init__.py index 70c228658e6b..b10fda00803d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.agents import AgentsAsyncClient, AgentsClient from .services.changelogs import ChangelogsAsyncClient, ChangelogsClient from .services.conversation_history import ( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/async_client.py index c278c561a1fe..1be9dbe5c8b7 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,24 +44,28 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.agents import pagers -from google.cloud.dialogflowcx_v3beta1.types import audio_config, bigquery_export, flow from google.cloud.dialogflowcx_v3beta1.types import ( - generative_settings as gcdc_generative_settings, + advanced_settings, + agent, + audio_config, + bigquery_export, + flow, + generative_settings, + safety_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings -from google.cloud.dialogflowcx_v3beta1.types import agent from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import safety_settings +from google.cloud.dialogflowcx_v3beta1.types import ( + generative_settings as gcdc_generative_settings, +) from .client import AgentsClient from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -149,7 +153,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_info.__func__(AgentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AgentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AgentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +170,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_file.__func__(AgentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AgentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AgentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/client.py index f328080127c7..ae097bdb12bf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,24 +61,28 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.agents import pagers -from google.cloud.dialogflowcx_v3beta1.types import audio_config, bigquery_export, flow from google.cloud.dialogflowcx_v3beta1.types import ( - generative_settings as gcdc_generative_settings, + advanced_settings, + agent, + audio_config, + bigquery_export, + flow, + generative_settings, + safety_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings -from google.cloud.dialogflowcx_v3beta1.types import agent from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import safety_settings +from google.cloud.dialogflowcx_v3beta1.types import ( + generative_settings as gcdc_generative_settings, +) from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport from .transports.grpc import AgentsGrpcTransport @@ -820,11 +824,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AgentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AgentsClient._read_environment_variables() + ) self._client_cert_source = AgentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -859,8 +861,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AgentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/pagers.py index 7620debb0c84..d874d85afbd9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/base.py index a5fe8e1393f3..4c7f04e3d034 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/base.py @@ -17,24 +17,23 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version +from google.cloud.dialogflowcx_v3beta1.types import agent, generative_settings +from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import agent -from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -377,7 +376,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc.py index e9d35353bcca..ec900c7bacf9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc.py @@ -16,27 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import agent, generative_settings +from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import agent -from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings from .base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -611,12 +610,12 @@ def get_agent_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_agent_validation_result" not in self._stubs: - self._stubs[ - "get_agent_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Agents/GetAgentValidationResult", - request_serializer=agent.GetAgentValidationResultRequest.serialize, - response_deserializer=agent.AgentValidationResult.deserialize, + self._stubs["get_agent_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Agents/GetAgentValidationResult", + request_serializer=agent.GetAgentValidationResultRequest.serialize, + response_deserializer=agent.AgentValidationResult.deserialize, + ) ) return self._stubs["get_agent_validation_result"] @@ -670,12 +669,12 @@ def update_generative_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_generative_settings" not in self._stubs: - self._stubs[ - "update_generative_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Agents/UpdateGenerativeSettings", - request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, - response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + self._stubs["update_generative_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Agents/UpdateGenerativeSettings", + request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, + response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + ) ) return self._stubs["update_generative_settings"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc_asyncio.py index ab80a3e76538..fd7f77f553bd 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,19 +31,14 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import agent, generative_settings +from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import agent -from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings from .base import DEFAULT_CLIENT_INFO, AgentsTransport from .grpc import AgentsGrpcTransport @@ -623,12 +622,12 @@ def get_agent_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_agent_validation_result" not in self._stubs: - self._stubs[ - "get_agent_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Agents/GetAgentValidationResult", - request_serializer=agent.GetAgentValidationResultRequest.serialize, - response_deserializer=agent.AgentValidationResult.deserialize, + self._stubs["get_agent_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Agents/GetAgentValidationResult", + request_serializer=agent.GetAgentValidationResultRequest.serialize, + response_deserializer=agent.AgentValidationResult.deserialize, + ) ) return self._stubs["get_agent_validation_result"] @@ -683,12 +682,12 @@ def update_generative_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_generative_settings" not in self._stubs: - self._stubs[ - "update_generative_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Agents/UpdateGenerativeSettings", - request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, - response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + self._stubs["update_generative_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Agents/UpdateGenerativeSettings", + request_serializer=agent.UpdateGenerativeSettingsRequest.serialize, + response_deserializer=gcdc_generative_settings.GenerativeSettings.deserialize, + ) ) return self._stubs["update_generative_settings"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest.py index e2db63631471..cc7b59d5e92a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest.py @@ -16,27 +16,26 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3beta1.types import agent, generative_settings +from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import agent -from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAgentsRestTransport @@ -1155,7 +1154,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1274,7 +1273,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1559,9 +1558,7 @@ def __call__( """ - http_options = ( - _BaseAgentsRestTransport._BaseGetAgentValidationResult._get_http_options() - ) + http_options = _BaseAgentsRestTransport._BaseGetAgentValidationResult._get_http_options() request, metadata = self._interceptor.pre_get_agent_validation_result( request, metadata @@ -2035,7 +2032,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2326,9 +2323,7 @@ def __call__( Settings for Generative AI. """ - http_options = ( - _BaseAgentsRestTransport._BaseUpdateGenerativeSettings._get_http_options() - ) + http_options = _BaseAgentsRestTransport._BaseUpdateGenerativeSettings._get_http_options() request, metadata = self._interceptor.pre_update_generative_settings( request, metadata @@ -2614,7 +2609,9 @@ def get_agent_validation_result( ) -> Callable[[agent.GetAgentValidationResultRequest], agent.AgentValidationResult]: # 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._GetAgentValidationResult(self._session, self._host, self._interceptor) # type: ignore + return self._GetAgentValidationResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_generative_settings( @@ -2659,7 +2656,9 @@ def update_generative_settings( ]: # 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._UpdateGenerativeSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateGenerativeSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def validate_agent( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest_base.py index 8b45cb112fb5..2e043ea5adba 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/agents/transports/rest_base.py @@ -17,18 +17,17 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflowcx_v3beta1.types import agent, generative_settings +from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import agent -from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/async_client.py index 68294545e3a5..5412e82c01bb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.changelogs import pagers from google.cloud.dialogflowcx_v3beta1.types import changelog @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ChangelogsAsyncClient: The constructed client. """ - return ChangelogsClient.from_service_account_info.__func__(ChangelogsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ChangelogsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ChangelogsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ChangelogsAsyncClient: The constructed client. """ - return ChangelogsClient.from_service_account_file.__func__(ChangelogsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ChangelogsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ChangelogsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/client.py index 6e1705b57fb3..749f25236117 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.changelogs import pagers from google.cloud.dialogflowcx_v3beta1.types import changelog @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ChangelogsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ChangelogsClient._read_environment_variables() + ) self._client_cert_source = ChangelogsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ChangelogsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/pagers.py index c9b0e9be9e7d..c7c479acf6fb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/base.py index 8b4b431d1d30..284acb40d404 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import changelog @@ -232,7 +232,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc.py index 6f622cb2f708..58e65fb1c0cf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import changelog diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc_asyncio.py index 9a3a00fff84c..d84040c1b6e1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import changelog diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/rest.py index c6efae52680b..41c9b7a09cc3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/changelogs/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/async_client.py index 5e77c2ce462a..4eb2ad83c093 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.conversation_history import pagers from google.cloud.dialogflowcx_v3beta1.types import ( @@ -178,7 +178,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationHistoryAsyncClient: The constructed client. """ - return ConversationHistoryClient.from_service_account_info.__func__(ConversationHistoryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConversationHistoryClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConversationHistoryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -194,7 +195,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationHistoryAsyncClient: The constructed client. """ - return ConversationHistoryClient.from_service_account_file.__func__(ConversationHistoryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConversationHistoryClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConversationHistoryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -232,7 +234,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationHistoryClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationHistoryClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationHistoryTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/client.py index 3a14e65883e1..0174e06a84b2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.conversation_history import pagers from google.cloud.dialogflowcx_v3beta1.types import ( @@ -89,9 +89,7 @@ class ConversationHistoryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationHistoryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationHistoryTransport]] _transport_registry["grpc"] = ConversationHistoryGrpcTransport _transport_registry["grpc_asyncio"] = ConversationHistoryGrpcAsyncIOTransport _transport_registry["rest"] = ConversationHistoryRestTransport @@ -1075,11 +1073,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationHistoryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationHistoryClient._read_environment_variables() + ) self._client_cert_source = ConversationHistoryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1114,8 +1110,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationHistoryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/pagers.py index 4dd6f279146a..1c7aa49ed009 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/__init__.py index 43cf36e568b0..fb84dac0686c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ConversationHistoryRestInterceptor, ConversationHistoryRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationHistoryTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationHistoryTransport]] _transport_registry["grpc"] = ConversationHistoryGrpcTransport _transport_registry["grpc_asyncio"] = ConversationHistoryGrpcAsyncIOTransport _transport_registry["rest"] = ConversationHistoryRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/base.py index 952f8ed8146a..655d95f123aa 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import conversation_history @@ -250,7 +250,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc.py index e7446a40bfc8..7015cba83cb1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import conversation_history diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc_asyncio.py index 8deb8ec9aa05..166cda368432 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import conversation_history diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest.py index d52b893bd08c..e89d89a092fb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -482,9 +482,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -506,7 +504,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -598,9 +596,7 @@ def __call__( Represents a conversation. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -750,9 +746,7 @@ def __call__( """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -933,9 +927,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseConversationHistoryRestTransport._BaseGetLocation._get_transcoded_request( @@ -1074,9 +1066,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseConversationHistoryRestTransport._BaseListLocations._get_transcoded_request( @@ -1212,9 +1202,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1330,9 +1318,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationHistoryRestTransport._BaseGetOperation._get_transcoded_request( @@ -1471,9 +1457,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationHistoryRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationHistoryRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationHistoryRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest_base.py index a2a2d66d21f7..9cae48bb7e11 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/conversation_history/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3beta1.types import conversation_history diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/async_client.py index d865197024ed..389c6b98b5cc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.deployments import pagers from google.cloud.dialogflowcx_v3beta1.types import deployment @@ -123,7 +123,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DeploymentsAsyncClient: The constructed client. """ - return DeploymentsClient.from_service_account_info.__func__(DeploymentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DeploymentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DeploymentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +140,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DeploymentsAsyncClient: The constructed client. """ - return DeploymentsClient.from_service_account_file.__func__(DeploymentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DeploymentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DeploymentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/client.py index f04b8aadc20d..00040298dab9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.deployments import pagers from google.cloud.dialogflowcx_v3beta1.types import deployment @@ -706,11 +706,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DeploymentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DeploymentsClient._read_environment_variables() + ) self._client_cert_source = DeploymentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -745,8 +743,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DeploymentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/pagers.py index b9a7afbdb032..e90384def394 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/base.py index aeace332270e..5f70456d699d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import deployment @@ -232,7 +232,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc.py index 5bef153d486e..53cd18bd8be3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import deployment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc_asyncio.py index bac75ce74977..88c8ca6d17f3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import deployment diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/rest.py index d34550e4763b..c3e7585dd41a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/deployments/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/async_client.py index a838e7096350..a9e9da8dfff4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,15 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.entity_types import pagers -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from .client import EntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, EntityTypesTransport @@ -118,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_info.__func__(EntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EntityTypesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +135,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_file.__func__(EntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EntityTypesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/client.py index b39fe440261d..13ac3ce1a3c8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,15 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.entity_types import pagers -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from .transports.base import DEFAULT_CLIENT_INFO, EntityTypesTransport from .transports.grpc import EntityTypesGrpcTransport @@ -629,11 +629,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EntityTypesClient._read_environment_variables() + ) self._client_cert_source = EntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -668,8 +666,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/pagers.py index 21777e36d197..40fc9ba3af87 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/base.py index d7c2408e64c2..0a7c39b7ef71 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -309,7 +309,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc.py index 74eab041289f..acbe3cfab347 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc_asyncio.py index 5c4b28b42b1e..406b6155cb88 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,15 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport from .grpc import EntityTypesGrpcTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest.py index 80c9e3585108..814daa600d86 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest.py @@ -16,23 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEntityTypesRestTransport @@ -974,7 +974,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1095,7 +1095,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1431,7 +1431,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest_base.py index 6b8512e5deb5..ec1d162d76db 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/entity_types/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from google.cloud.dialogflowcx_v3beta1.types import entity_type +from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/async_client.py index d0a5e73b72e3..25eeb9f4c28b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,17 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.environments import pagers -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from .client import EnvironmentsClient from .transports.base import DEFAULT_CLIENT_INFO, EnvironmentsTransport @@ -142,7 +142,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_info.__func__(EnvironmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EnvironmentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EnvironmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +159,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_file.__func__(EnvironmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EnvironmentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EnvironmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/client.py index 3dc9446db48f..cac5e853ed7e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,17 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.environments import pagers -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from .transports.base import DEFAULT_CLIENT_INFO, EnvironmentsTransport from .transports.grpc import EnvironmentsGrpcTransport @@ -803,11 +803,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EnvironmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EnvironmentsClient._read_environment_variables() + ) self._client_cert_source = EnvironmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -842,8 +840,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EnvironmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/pagers.py index d93f748e3230..7b115bd3e166 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -381,7 +381,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/base.py index b2f9bd5f14c7..82a9bb90e814 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -343,7 +343,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc.py index a7504d32dced..1edbd5509d2b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from .base import DEFAULT_CLIENT_INFO, EnvironmentsTransport @@ -528,12 +528,12 @@ def lookup_environment_history( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_environment_history" not in self._stubs: - self._stubs[ - "lookup_environment_history" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Environments/LookupEnvironmentHistory", - request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, - response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + self._stubs["lookup_environment_history"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Environments/LookupEnvironmentHistory", + request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, + response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + ) ) return self._stubs["lookup_environment_history"] @@ -597,12 +597,12 @@ def list_continuous_test_results( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_continuous_test_results" not in self._stubs: - self._stubs[ - "list_continuous_test_results" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Environments/ListContinuousTestResults", - request_serializer=environment.ListContinuousTestResultsRequest.serialize, - response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + self._stubs["list_continuous_test_results"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Environments/ListContinuousTestResults", + request_serializer=environment.ListContinuousTestResultsRequest.serialize, + response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + ) ) return self._stubs["list_continuous_test_results"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc_asyncio.py index d3ca30216df9..f26324d425fb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,15 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from .base import DEFAULT_CLIENT_INFO, EnvironmentsTransport from .grpc import EnvironmentsGrpcTransport @@ -539,12 +539,12 @@ def lookup_environment_history( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "lookup_environment_history" not in self._stubs: - self._stubs[ - "lookup_environment_history" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Environments/LookupEnvironmentHistory", - request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, - response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + self._stubs["lookup_environment_history"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Environments/LookupEnvironmentHistory", + request_serializer=environment.LookupEnvironmentHistoryRequest.serialize, + response_deserializer=environment.LookupEnvironmentHistoryResponse.deserialize, + ) ) return self._stubs["lookup_environment_history"] @@ -610,12 +610,12 @@ def list_continuous_test_results( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_continuous_test_results" not in self._stubs: - self._stubs[ - "list_continuous_test_results" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Environments/ListContinuousTestResults", - request_serializer=environment.ListContinuousTestResultsRequest.serialize, - response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + self._stubs["list_continuous_test_results"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Environments/ListContinuousTestResults", + request_serializer=environment.ListContinuousTestResultsRequest.serialize, + response_deserializer=environment.ListContinuousTestResultsResponse.deserialize, + ) ) return self._stubs["list_continuous_test_results"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest.py index e6b46732d2d7..4fcc78e68ec8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest.py @@ -16,23 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEnvironmentsRestTransport @@ -888,9 +888,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -916,7 +914,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1034,9 +1032,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -1058,7 +1054,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1183,7 +1179,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1469,9 +1465,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseListContinuousTestResults._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseListContinuousTestResults._get_http_options() request, metadata = self._interceptor.pre_list_continuous_test_results( request, metadata @@ -1775,9 +1769,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseLookupEnvironmentHistory._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseLookupEnvironmentHistory._get_http_options() request, metadata = self._interceptor.pre_lookup_environment_history( request, metadata @@ -1930,9 +1922,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseRunContinuousTest._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseRunContinuousTest._get_http_options() request, metadata = self._interceptor.pre_run_continuous_test( request, metadata @@ -1958,7 +1948,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2084,9 +2074,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() request, metadata = self._interceptor.pre_update_environment( request, metadata @@ -2112,7 +2100,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2222,7 +2210,9 @@ def list_continuous_test_results( ]: # 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._ListContinuousTestResults(self._session, self._host, self._interceptor) # type: ignore + return self._ListContinuousTestResults( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_environments( @@ -2243,7 +2233,9 @@ def lookup_environment_history( ]: # 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._LookupEnvironmentHistory(self._session, self._host, self._interceptor) # type: ignore + return self._LookupEnvironmentHistory( + self._session, self._host, self._interceptor + ) # type: ignore @property def run_continuous_test( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest_base.py index 5e8f2dee8dcb..c40b88ce867e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/environments/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from google.cloud.dialogflowcx_v3beta1.types import environment +from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment from .base import DEFAULT_CLIENT_INFO, EnvironmentsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/async_client.py index a1ea192f709a..e7819f6c5fd2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,15 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.examples import pagers -from google.cloud.dialogflowcx_v3beta1.types import example +from google.cloud.dialogflowcx_v3beta1.types import example, trace from google.cloud.dialogflowcx_v3beta1.types import example as gcdc_example -from google.cloud.dialogflowcx_v3beta1.types import trace from .client import ExamplesClient from .transports.base import DEFAULT_CLIENT_INFO, ExamplesTransport @@ -120,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ExamplesAsyncClient: The constructed client. """ - return ExamplesClient.from_service_account_info.__func__(ExamplesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ExamplesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ExamplesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ExamplesAsyncClient: The constructed client. """ - return ExamplesClient.from_service_account_file.__func__(ExamplesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ExamplesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ExamplesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/client.py index 5daae80da0d5..179bf565a430 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,15 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.examples import pagers -from google.cloud.dialogflowcx_v3beta1.types import example +from google.cloud.dialogflowcx_v3beta1.types import example, trace from google.cloud.dialogflowcx_v3beta1.types import example as gcdc_example -from google.cloud.dialogflowcx_v3beta1.types import trace from .transports.base import DEFAULT_CLIENT_INFO, ExamplesTransport from .transports.grpc import ExamplesGrpcTransport @@ -703,11 +702,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ExamplesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ExamplesClient._read_environment_variables() + ) self._client_cert_source = ExamplesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -742,8 +739,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ExamplesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/pagers.py index 1a8d3aec05ba..09dbe01099d3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/base.py index a4437476ef39..5e3e8fc40c82 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import example @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc.py index 6462cd3bd858..ccadfe27856e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import example from google.cloud.dialogflowcx_v3beta1.types import example as gcdc_example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc_asyncio.py index 1e884103dffb..bf45a919624c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import example from google.cloud.dialogflowcx_v3beta1.types import example as gcdc_example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest.py index 28fb4185dc42..1cc1095331a4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -766,7 +766,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest_base.py index 3f0e3596f906..b9da2efe49f5 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/examples/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3beta1.types import example diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/async_client.py index 2c17eb108f1c..ab4af4dc057d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,15 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.experiments import pagers -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from .client import ExperimentsClient from .transports.base import DEFAULT_CLIENT_INFO, ExperimentsTransport @@ -120,7 +120,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ExperimentsAsyncClient: The constructed client. """ - return ExperimentsClient.from_service_account_info.__func__(ExperimentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ExperimentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ExperimentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +137,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ExperimentsAsyncClient: The constructed client. """ - return ExperimentsClient.from_service_account_file.__func__(ExperimentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ExperimentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ExperimentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/client.py index 0ff1001ee4e8..595b11a45c25 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,15 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.experiments import pagers -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from .transports.base import DEFAULT_CLIENT_INFO, ExperimentsTransport from .transports.grpc import ExperimentsGrpcTransport @@ -657,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ExperimentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ExperimentsClient._read_environment_variables() + ) self._client_cert_source = ExperimentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ExperimentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/pagers.py index 3d991394261a..9992f5f3328a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/base.py index c2b1d7be83af..85b199dc68e6 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -304,7 +304,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc.py index 6b5861428861..823e0b190ecb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from .base import DEFAULT_CLIENT_INFO, ExperimentsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc_asyncio.py index c86cc4c99931..698cb834566e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,15 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from .base import DEFAULT_CLIENT_INFO, ExperimentsTransport from .grpc import ExperimentsGrpcTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest.py index c40fcc2ff455..db3b051d3506 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +28,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseExperimentsRestTransport @@ -880,7 +880,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest_base.py index f720c4e06ceb..2fd681cfb37a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/experiments/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from .base import DEFAULT_CLIENT_INFO, ExperimentsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/async_client.py index 750aa3c5d0cd..a2c653bfa029 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,23 +44,23 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.flows import pagers from google.cloud.dialogflowcx_v3beta1.types import ( + advanced_settings, + flow, page, parameter_definition, validation_message, ) -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings -from google.cloud.dialogflowcx_v3beta1.types import flow from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow from .client import FlowsClient @@ -141,7 +141,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FlowsAsyncClient: The constructed client. """ - return FlowsClient.from_service_account_info.__func__(FlowsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = FlowsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(FlowsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +158,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FlowsAsyncClient: The constructed client. """ - return FlowsClient.from_service_account_file.__func__(FlowsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = FlowsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(FlowsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/client.py index ce1469c2a239..3d3b2457cbb1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,23 +61,23 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.flows import pagers from google.cloud.dialogflowcx_v3beta1.types import ( + advanced_settings, + flow, page, parameter_definition, validation_message, ) -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings -from google.cloud.dialogflowcx_v3beta1.types import flow from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow from .transports.base import DEFAULT_CLIENT_INFO, FlowsTransport @@ -834,11 +834,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FlowsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FlowsClient._read_environment_variables() + ) self._client_cert_source = FlowsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -873,8 +871,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FlowsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/pagers.py index c5a2a357fa43..34553e3d82ce 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/base.py index ab7da7525e90..7ef8ccfe818c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import flow @@ -342,7 +342,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc.py index d0f68853a52f..7851c68e0c11 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import flow from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow @@ -559,12 +559,12 @@ def get_flow_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_flow_validation_result" not in self._stubs: - self._stubs[ - "get_flow_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Flows/GetFlowValidationResult", - request_serializer=flow.GetFlowValidationResultRequest.serialize, - response_deserializer=flow.FlowValidationResult.deserialize, + self._stubs["get_flow_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Flows/GetFlowValidationResult", + request_serializer=flow.GetFlowValidationResultRequest.serialize, + response_deserializer=flow.FlowValidationResult.deserialize, + ) ) return self._stubs["get_flow_validation_result"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc_asyncio.py index 2713b03c74b9..d0deaa56fa12 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import flow from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow @@ -579,12 +579,12 @@ def get_flow_validation_result( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_flow_validation_result" not in self._stubs: - self._stubs[ - "get_flow_validation_result" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.Flows/GetFlowValidationResult", - request_serializer=flow.GetFlowValidationResultRequest.serialize, - response_deserializer=flow.FlowValidationResult.deserialize, + self._stubs["get_flow_validation_result"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.Flows/GetFlowValidationResult", + request_serializer=flow.GetFlowValidationResultRequest.serialize, + response_deserializer=flow.FlowValidationResult.deserialize, + ) ) return self._stubs["get_flow_validation_result"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest.py index b48552fb5133..f20356fe671f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1096,7 +1096,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1215,7 +1215,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1683,7 +1683,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1982,7 +1982,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2408,7 +2408,9 @@ def get_flow_validation_result( ) -> Callable[[flow.GetFlowValidationResultRequest], flow.FlowValidationResult]: # 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._GetFlowValidationResult(self._session, self._host, self._interceptor) # type: ignore + return self._GetFlowValidationResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_flow( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest_base.py index 4a6ae06d2f2b..f7224c89150a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/flows/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3beta1.types import flow diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/async_client.py index f3505cf5ce8d..4c91861b7166 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.generators import pagers -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import generator +from google.cloud.dialogflowcx_v3beta1.types import generative_settings, generator from google.cloud.dialogflowcx_v3beta1.types import generator as gcdc_generator from .client import GeneratorsClient @@ -115,7 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_info.__func__(GeneratorsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GeneratorsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GeneratorsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_file.__func__(GeneratorsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GeneratorsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(GeneratorsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/client.py index c8197d785250..2e8a3d1b6526 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.generators import pagers -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import generator +from google.cloud.dialogflowcx_v3beta1.types import generative_settings, generator from google.cloud.dialogflowcx_v3beta1.types import generator as gcdc_generator from .transports.base import DEFAULT_CLIENT_INFO, GeneratorsTransport @@ -628,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeneratorsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeneratorsClient._read_environment_variables() + ) self._client_cert_source = GeneratorsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeneratorsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/pagers.py index 276bc6f29b36..c346423a1152 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/base.py index 71eb058a4d2b..ba73dd8afb9f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import generator @@ -276,7 +276,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc.py index 4724555abf4e..26387cbc2c68 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import generator from google.cloud.dialogflowcx_v3beta1.types import generator as gcdc_generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc_asyncio.py index ec8ec1a56ee6..61a171191d41 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import generator from google.cloud.dialogflowcx_v3beta1.types import generator as gcdc_generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest.py index e71032d3db1e..d3b3f2cfd582 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -768,7 +768,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest_base.py index f07d2c0cc088..1d2c687496df 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/generators/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3beta1.types import generator diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/async_client.py index ff5a926d468e..16cb051d584c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.intents import pagers from google.cloud.dialogflowcx_v3beta1.types import intent @@ -116,7 +116,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_info.__func__(IntentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = IntentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(IntentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +133,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_file.__func__(IntentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = IntentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(IntentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/client.py index 64d064c87a23..3847450253b0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.intents import pagers from google.cloud.dialogflowcx_v3beta1.types import intent @@ -653,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IntentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IntentsClient._read_environment_variables() + ) self._client_cert_source = IntentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -692,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IntentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/pagers.py index 72abf9bf040a..54e3bc06c299 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/base.py index b92d23cc1bd7..cbb3e29a8732 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import intent @@ -304,7 +304,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc.py index 37cc60935716..00ba6b90a315 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import intent from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc_asyncio.py index 45b6a229809c..826e9fe8e3be 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import intent from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest.py index cb8fd8f8ce7c..e5d63de54d0e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -924,7 +924,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1045,7 +1045,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1351,7 +1351,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest_base.py index 341876ad7218..4595806322a3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/intents/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3beta1.types import intent diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/async_client.py index 0ae686e96b6a..57cdf15acc27 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.pages import pagers -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings, fulfillment -from google.cloud.dialogflowcx_v3beta1.types import page +from google.cloud.dialogflowcx_v3beta1.types import advanced_settings, fulfillment, page from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page from .client import PagesClient @@ -129,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PagesAsyncClient: The constructed client. """ - return PagesClient.from_service_account_info.__func__(PagesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PagesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PagesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PagesAsyncClient: The constructed client. """ - return PagesClient.from_service_account_file.__func__(PagesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PagesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PagesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/client.py index 4016c762a68d..d73c21680fc4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.pages import pagers -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings, fulfillment -from google.cloud.dialogflowcx_v3beta1.types import page +from google.cloud.dialogflowcx_v3beta1.types import advanced_settings, fulfillment, page from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page from .transports.base import DEFAULT_CLIENT_INFO, PagesTransport @@ -824,11 +823,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PagesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PagesClient._read_environment_variables() + ) self._client_cert_source = PagesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -863,8 +860,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PagesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/pagers.py index bd8398c44aef..76e664b15317 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/base.py index 047bce2f773a..2e479ee68bc0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import page @@ -267,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc.py index 8fa6836a19ed..63f72d16ac61 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import page from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc_asyncio.py index 3cc963168f7e..8918238243b1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import page from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest.py index f5c1056aad68..c87f83fc0604 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -763,7 +763,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest_base.py index 80300dd99879..686cfde735dc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/pages/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3beta1.types import page diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/async_client.py index acc0f735c191..3af2559710bf 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.playbooks import pagers from google.cloud.dialogflowcx_v3beta1.types import ( @@ -59,8 +59,8 @@ example, generative_settings, parameter_definition, + playbook, ) -from google.cloud.dialogflowcx_v3beta1.types import playbook from google.cloud.dialogflowcx_v3beta1.types import playbook as gcdc_playbook from .client import PlaybooksClient @@ -139,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PlaybooksAsyncClient: The constructed client. """ - return PlaybooksClient.from_service_account_info.__func__(PlaybooksAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PlaybooksClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PlaybooksAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +156,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PlaybooksAsyncClient: The constructed client. """ - return PlaybooksClient.from_service_account_file.__func__(PlaybooksAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PlaybooksClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PlaybooksAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/client.py index 3aa01aecb6ac..394130e3de8a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.playbooks import pagers from google.cloud.dialogflowcx_v3beta1.types import ( @@ -76,8 +76,8 @@ example, generative_settings, parameter_definition, + playbook, ) -from google.cloud.dialogflowcx_v3beta1.types import playbook from google.cloud.dialogflowcx_v3beta1.types import playbook as gcdc_playbook from .transports.base import DEFAULT_CLIENT_INFO, PlaybooksTransport @@ -786,11 +786,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PlaybooksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PlaybooksClient._read_environment_variables() + ) self._client_cert_source = PlaybooksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -825,8 +823,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PlaybooksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/pagers.py index 1dd3efe7cb05..5990d28e28dc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/base.py index 7c7a782ecf1c..e32aafd61bc0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import playbook @@ -384,7 +384,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc.py index 8892028625f9..64bf760de090 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import playbook from google.cloud.dialogflowcx_v3beta1.types import playbook as gcdc_playbook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc_asyncio.py index 3fe85b2f6a8c..57d80a3ce277 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import playbook from google.cloud.dialogflowcx_v3beta1.types import playbook as gcdc_playbook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest.py index 7723036b6d22..82e26c57faeb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1169,9 +1169,7 @@ def __call__( """ - http_options = ( - _BasePlaybooksRestTransport._BaseCreatePlaybookVersion._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseCreatePlaybookVersion._get_http_options() request, metadata = self._interceptor.pre_create_playbook_version( request, metadata @@ -1343,7 +1341,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1428,9 +1426,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePlaybooksRestTransport._BaseDeletePlaybookVersion._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseDeletePlaybookVersion._get_http_options() request, metadata = self._interceptor.pre_delete_playbook_version( request, metadata @@ -1452,7 +1448,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1577,7 +1573,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2044,7 +2040,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2319,9 +2315,7 @@ def __call__( """ - http_options = ( - _BasePlaybooksRestTransport._BaseListPlaybookVersions._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseListPlaybookVersions._get_http_options() request, metadata = self._interceptor.pre_list_playbook_versions( request, metadata @@ -2471,9 +2465,7 @@ def __call__( """ - http_options = ( - _BasePlaybooksRestTransport._BaseRestorePlaybookVersion._get_http_options() - ) + http_options = _BasePlaybooksRestTransport._BaseRestorePlaybookVersion._get_http_options() request, metadata = self._interceptor.pre_restore_playbook_version( request, metadata @@ -2831,7 +2823,9 @@ def restore_playbook_version( ]: # 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._RestorePlaybookVersion(self._session, self._host, self._interceptor) # type: ignore + return self._RestorePlaybookVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_playbook( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest_base.py index 4dfa57c6b441..e251304b60ec 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/playbooks/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3beta1.types import playbook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/async_client.py index 879c3ae7f324..cc5d44d810ec 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,15 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.security_settings_service import pagers +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings from .client import SecuritySettingsServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport @@ -142,7 +142,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SecuritySettingsServiceAsyncClient: The constructed client. """ - return SecuritySettingsServiceClient.from_service_account_info.__func__(SecuritySettingsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SecuritySettingsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SecuritySettingsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +159,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SecuritySettingsServiceAsyncClient: The constructed client. """ - return SecuritySettingsServiceClient.from_service_account_file.__func__(SecuritySettingsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SecuritySettingsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + SecuritySettingsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -196,7 +200,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SecuritySettingsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SecuritySettingsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SecuritySettingsServiceTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/client.py index 66b647aa2946..beb2d4c0d7dc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,15 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.security_settings_service import pagers +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings from .transports.base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport from .transports.grpc import SecuritySettingsServiceGrpcTransport @@ -85,9 +85,7 @@ class SecuritySettingsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SecuritySettingsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SecuritySettingsServiceTransport]] _transport_registry["grpc"] = SecuritySettingsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SecuritySettingsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SecuritySettingsServiceRestTransport @@ -677,11 +675,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SecuritySettingsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SecuritySettingsServiceClient._read_environment_variables() + ) self._client_cert_source = ( SecuritySettingsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -718,8 +714,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SecuritySettingsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/pagers.py index 8a88184b770d..560786944e94 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/__init__.py index 3a4ddec2334f..00bac1766862 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SecuritySettingsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SecuritySettingsServiceTransport]] _transport_registry["grpc"] = SecuritySettingsServiceGrpcTransport _transport_registry["grpc_asyncio"] = SecuritySettingsServiceGrpcAsyncIOTransport _transport_registry["rest"] = SecuritySettingsServiceRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/base.py index eca35f8c0c8a..af1713953505 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc.py index 0282659b178c..a0536e762d2c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings from .base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc_asyncio.py index 3bdd9d2e910a..51c0155b552f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings from .base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport from .grpc import SecuritySettingsServiceGrpcTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest.py index 4aaf00d1ee4d..ae2bbdab1320 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSecuritySettingsServiceRestTransport @@ -614,9 +614,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseCreateSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseCreateSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_create_security_settings( request, metadata @@ -765,9 +763,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseDeleteSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseDeleteSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_delete_security_settings( request, metadata @@ -789,7 +785,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -885,9 +881,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseGetSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseGetSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_get_security_settings( request, metadata @@ -1039,9 +1033,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseListSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseListSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_list_security_settings( request, metadata @@ -1196,9 +1188,7 @@ def __call__( """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseUpdateSecuritySettings._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseUpdateSecuritySettings._get_http_options() request, metadata = self._interceptor.pre_update_security_settings( request, metadata @@ -1304,7 +1294,9 @@ def create_security_settings( ]: # 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._CreateSecuritySettings(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecuritySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_security_settings( @@ -1312,7 +1304,9 @@ def delete_security_settings( ) -> Callable[[security_settings.DeleteSecuritySettingsRequest], empty_pb2.Empty]: # 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._DeleteSecuritySettings(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSecuritySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_security_settings( @@ -1345,7 +1339,9 @@ def update_security_settings( ]: # 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._UpdateSecuritySettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSecuritySettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1405,9 +1401,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1546,9 +1540,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1686,9 +1678,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1806,9 +1796,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1947,9 +1935,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSecuritySettingsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSecuritySettingsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSecuritySettingsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest_base.py index b4b9a2a1f747..85775752ec1b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/security_settings_service/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings from .base import DEFAULT_CLIENT_INFO, SecuritySettingsServiceTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/async_client.py index aba3e9f31d33..c7fdc98ceb22 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.session_entity_types import pagers +from google.cloud.dialogflowcx_v3beta1.types import entity_type, session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import entity_type -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from .client import SessionEntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -127,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_info.__func__(SessionEntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SessionEntityTypesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SessionEntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_file.__func__(SessionEntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SessionEntityTypesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SessionEntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +182,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SessionEntityTypesTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/client.py index e9510df63397..fda7b9d1d59c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.session_entity_types import pagers +from google.cloud.dialogflowcx_v3beta1.types import entity_type, session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import entity_type -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .transports.grpc import SessionEntityTypesGrpcTransport @@ -86,9 +85,7 @@ class SessionEntityTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionEntityTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport @@ -638,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionEntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionEntityTypesClient._read_environment_variables() + ) self._client_cert_source = SessionEntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionEntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/pagers.py index fba3eb0efcc7..9f262bc88ea0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/__init__.py index f94244b2aec5..4e711301d110 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SessionEntityTypesRestInterceptor, SessionEntityTypesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SessionEntityTypesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/base.py index b4b4405af995..827d66f6d036 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version +from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc.py index ce4b6da4b59d..0884f496ddfb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -409,12 +409,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -440,12 +440,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -470,12 +470,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc_asyncio.py index 26da482550e4..6ccba3a258c7 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .grpc import SessionEntityTypesGrpcTransport @@ -417,12 +417,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcdc_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -448,12 +448,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcdc_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcdc_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -478,12 +478,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest.py index 97220a0aa8b4..d597bb4e391a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionEntityTypesRestTransport @@ -629,9 +629,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_create_session_entity_type( request, metadata @@ -783,9 +781,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_delete_session_entity_type( request, metadata @@ -807,7 +803,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -916,9 +912,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_get_session_entity_type( request, metadata @@ -1070,9 +1064,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() request, metadata = self._interceptor.pre_list_session_entity_types( request, metadata @@ -1243,9 +1235,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_update_session_entity_type( request, metadata @@ -1353,7 +1343,9 @@ def create_session_entity_type( ]: # 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._CreateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_session_entity_type( @@ -1363,7 +1355,9 @@ def delete_session_entity_type( ]: # 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._DeleteSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_session_entity_type( @@ -1385,7 +1379,9 @@ def list_session_entity_types( ]: # 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._ListSessionEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._ListSessionEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_session_entity_type( @@ -1396,7 +1392,9 @@ def update_session_entity_type( ]: # 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._UpdateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1456,9 +1454,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_transcoded_request( @@ -1597,9 +1593,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_transcoded_request( @@ -1735,9 +1729,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1853,9 +1845,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_transcoded_request( @@ -1994,9 +1984,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest_base.py index 8c4b6ce04b61..53cd583a0f0f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/session_entity_types/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/async_client.py index 907af0939f39..d3c9d5b8bb15 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -146,7 +146,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_info.__func__(SessionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SessionsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SessionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -162,7 +163,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_file.__func__(SessionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SessionsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SessionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/client.py index 11f2e3262e12..fd0e67126a52 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -948,11 +948,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionsClient._read_environment_variables() + ) self._client_cert_source = SessionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -987,8 +985,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/base.py index bcd1a3c86aca..35f7162d6a62 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import session @@ -297,7 +297,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc.py index b5d34c2247fc..f5c5f1a2383f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import session @@ -382,12 +382,12 @@ def server_streaming_detect_intent( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "server_streaming_detect_intent" not in self._stubs: - self._stubs[ - "server_streaming_detect_intent" - ] = self._logged_channel.unary_stream( - "/google.cloud.dialogflow.cx.v3beta1.Sessions/ServerStreamingDetectIntent", - request_serializer=session.DetectIntentRequest.serialize, - response_deserializer=session.DetectIntentResponse.deserialize, + self._stubs["server_streaming_detect_intent"] = ( + self._logged_channel.unary_stream( + "/google.cloud.dialogflow.cx.v3beta1.Sessions/ServerStreamingDetectIntent", + request_serializer=session.DetectIntentRequest.serialize, + response_deserializer=session.DetectIntentResponse.deserialize, + ) ) return self._stubs["server_streaming_detect_intent"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc_asyncio.py index 22449c5e0d83..e58cbe92c04a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import session @@ -394,12 +394,12 @@ def server_streaming_detect_intent( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "server_streaming_detect_intent" not in self._stubs: - self._stubs[ - "server_streaming_detect_intent" - ] = self._logged_channel.unary_stream( - "/google.cloud.dialogflow.cx.v3beta1.Sessions/ServerStreamingDetectIntent", - request_serializer=session.DetectIntentRequest.serialize, - response_deserializer=session.DetectIntentResponse.deserialize, + self._stubs["server_streaming_detect_intent"] = ( + self._logged_channel.unary_stream( + "/google.cloud.dialogflow.cx.v3beta1.Sessions/ServerStreamingDetectIntent", + request_serializer=session.DetectIntentRequest.serialize, + response_deserializer=session.DetectIntentResponse.deserialize, + ) ) return self._stubs["server_streaming_detect_intent"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/rest.py index 8ba97cb30c98..0c1a47043364 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/sessions/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1087,9 +1087,7 @@ def __call__( """ - http_options = ( - _BaseSessionsRestTransport._BaseServerStreamingDetectIntent._get_http_options() - ) + http_options = _BaseSessionsRestTransport._BaseServerStreamingDetectIntent._get_http_options() request, metadata = self._interceptor.pre_server_streaming_detect_intent( request, metadata @@ -1157,11 +1155,10 @@ def __call__( resp = self._interceptor.post_server_streaming_detect_intent(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_server_streaming_detect_intent_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_server_streaming_detect_intent_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1384,7 +1381,9 @@ def server_streaming_detect_intent( ) -> Callable[[session.DetectIntentRequest], session.DetectIntentResponse]: # 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._ServerStreamingDetectIntent(self._session, self._host, self._interceptor) # type: ignore + return self._ServerStreamingDetectIntent( + self._session, self._host, self._interceptor + ) # type: ignore @property def streaming_detect_intent( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/async_client.py index d12cd83cc263..0db22310185e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.test_cases import pagers from google.cloud.dialogflowcx_v3beta1.types import test_case @@ -148,7 +148,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TestCasesAsyncClient: The constructed client. """ - return TestCasesClient.from_service_account_info.__func__(TestCasesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = TestCasesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(TestCasesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -164,7 +165,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TestCasesAsyncClient: The constructed client. """ - return TestCasesClient.from_service_account_file.__func__(TestCasesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = TestCasesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(TestCasesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/client.py index 7da42e33b2ab..090a5c40d854 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.test_cases import pagers from google.cloud.dialogflowcx_v3beta1.types import test_case @@ -923,11 +923,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TestCasesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TestCasesClient._read_environment_variables() + ) self._client_cert_source = TestCasesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -962,8 +960,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TestCasesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/pagers.py index 242ab3429392..be10b85149ab 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/base.py index 830242ba509a..39d7b71776be 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import test_case @@ -384,7 +384,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc.py index 69b6587c96a2..64cc557ce417 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import test_case from google.cloud.dialogflowcx_v3beta1.types import test_case as gcdc_test_case diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc_asyncio.py index 74489a066f81..6e4ef7ebe2eb 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import test_case from google.cloud.dialogflowcx_v3beta1.types import test_case as gcdc_test_case diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest.py index 03b0b9721f90..eb035adff9b3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1038,9 +1038,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseTestCasesRestTransport._BaseBatchDeleteTestCases._get_http_options() - ) + http_options = _BaseTestCasesRestTransport._BaseBatchDeleteTestCases._get_http_options() request, metadata = self._interceptor.pre_batch_delete_test_cases( request, metadata @@ -1066,7 +1064,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1188,7 +1186,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1656,7 +1654,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2110,7 +2108,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2566,7 +2564,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest_base.py index c21df0543ae9..01389b46574a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/test_cases/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3beta1.types import test_case diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/async_client.py index fe0e92c3e954..6f0bd45a12b1 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.tools import pagers from google.cloud.dialogflowcx_v3beta1.types import tool @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_info.__func__(ToolsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ToolsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ToolsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_file.__func__(ToolsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ToolsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ToolsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/client.py index 905d17c653b1..fb78e475f2f5 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.tools import pagers from google.cloud.dialogflowcx_v3beta1.types import tool @@ -702,11 +702,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ToolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ToolsClient._read_environment_variables() + ) self._client_cert_source = ToolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -741,8 +739,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ToolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/pagers.py index d87d223091a6..e1027691ee08 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/base.py index a8d0ec6dbcd8..897f578fa396 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import tool @@ -358,7 +358,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc.py index 3f5fface5dfa..953aa5d9c6e4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import tool from google.cloud.dialogflowcx_v3beta1.types import tool as gcdc_tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc_asyncio.py index cd68f24cc5ba..e49c228f34c3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import tool from google.cloud.dialogflowcx_v3beta1.types import tool as gcdc_tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest.py index b012d5f0726c..2f7f69e4d539 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1254,7 +1254,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1367,7 +1367,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1486,7 +1486,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest_base.py index 781bdf4ae194..2a91882f0133 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/tools/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3beta1.types import tool diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/async_client.py index 6f695586e669..91d161fbdf02 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.transition_route_groups import pagers +from google.cloud.dialogflowcx_v3beta1.types import page, transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import page -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from .client import TransitionRouteGroupsClient from .transports.base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport @@ -143,7 +142,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: TransitionRouteGroupsAsyncClient: The constructed client. """ - return TransitionRouteGroupsClient.from_service_account_info.__func__(TransitionRouteGroupsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = TransitionRouteGroupsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(TransitionRouteGroupsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +159,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: TransitionRouteGroupsAsyncClient: The constructed client. """ - return TransitionRouteGroupsClient.from_service_account_file.__func__(TransitionRouteGroupsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = TransitionRouteGroupsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(TransitionRouteGroupsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -197,7 +198,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return TransitionRouteGroupsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return TransitionRouteGroupsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> TransitionRouteGroupsTransport: diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/client.py index 697b6e26a20d..638197df594c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.transition_route_groups import pagers +from google.cloud.dialogflowcx_v3beta1.types import page, transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import page -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from .transports.base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport from .transports.grpc import TransitionRouteGroupsGrpcTransport @@ -86,9 +85,7 @@ class TransitionRouteGroupsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[TransitionRouteGroupsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[TransitionRouteGroupsTransport]] _transport_registry["grpc"] = TransitionRouteGroupsGrpcTransport _transport_registry["grpc_asyncio"] = TransitionRouteGroupsGrpcAsyncIOTransport _transport_registry["rest"] = TransitionRouteGroupsRestTransport @@ -786,11 +783,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = TransitionRouteGroupsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + TransitionRouteGroupsClient._read_environment_variables() + ) self._client_cert_source = TransitionRouteGroupsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -825,8 +820,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(TransitionRouteGroupsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/pagers.py index 377c9f34e5fa..4d4c30788e3a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/__init__.py index ae6220640bc0..c3a4dc341788 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[TransitionRouteGroupsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[TransitionRouteGroupsTransport]] _transport_registry["grpc"] = TransitionRouteGroupsGrpcTransport _transport_registry["grpc_asyncio"] = TransitionRouteGroupsGrpcAsyncIOTransport _transport_registry["rest"] = TransitionRouteGroupsRestTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/base.py index c16170d6211b..6c428d51c596 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version +from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc.py index d85dc0317338..a9933d5dda11 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from .base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport @@ -351,12 +351,12 @@ def list_transition_route_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_transition_route_groups" not in self._stubs: - self._stubs[ - "list_transition_route_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/ListTransitionRouteGroups", - request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, - response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + self._stubs["list_transition_route_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/ListTransitionRouteGroups", + request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, + response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + ) ) return self._stubs["list_transition_route_groups"] @@ -383,12 +383,12 @@ def get_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_transition_route_group" not in self._stubs: - self._stubs[ - "get_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/GetTransitionRouteGroup", - request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, - response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["get_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/GetTransitionRouteGroup", + request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, + response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["get_transition_route_group"] @@ -420,12 +420,12 @@ def create_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_transition_route_group" not in self._stubs: - self._stubs[ - "create_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/CreateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["create_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/CreateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["create_transition_route_group"] @@ -456,12 +456,12 @@ def update_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_transition_route_group" not in self._stubs: - self._stubs[ - "update_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/UpdateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["update_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/UpdateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["update_transition_route_group"] @@ -491,12 +491,12 @@ def delete_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_transition_route_group" not in self._stubs: - self._stubs[ - "delete_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/DeleteTransitionRouteGroup", - request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/DeleteTransitionRouteGroup", + request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_transition_route_group"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc_asyncio.py index 7d4b8b66e3e7..40bb1c3f0ec0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from .base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport from .grpc import TransitionRouteGroupsGrpcTransport @@ -359,12 +359,12 @@ def list_transition_route_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_transition_route_groups" not in self._stubs: - self._stubs[ - "list_transition_route_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/ListTransitionRouteGroups", - request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, - response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + self._stubs["list_transition_route_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/ListTransitionRouteGroups", + request_serializer=transition_route_group.ListTransitionRouteGroupsRequest.serialize, + response_deserializer=transition_route_group.ListTransitionRouteGroupsResponse.deserialize, + ) ) return self._stubs["list_transition_route_groups"] @@ -391,12 +391,12 @@ def get_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_transition_route_group" not in self._stubs: - self._stubs[ - "get_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/GetTransitionRouteGroup", - request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, - response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["get_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/GetTransitionRouteGroup", + request_serializer=transition_route_group.GetTransitionRouteGroupRequest.serialize, + response_deserializer=transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["get_transition_route_group"] @@ -428,12 +428,12 @@ def create_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_transition_route_group" not in self._stubs: - self._stubs[ - "create_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/CreateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["create_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/CreateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.CreateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["create_transition_route_group"] @@ -464,12 +464,12 @@ def update_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_transition_route_group" not in self._stubs: - self._stubs[ - "update_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/UpdateTransitionRouteGroup", - request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, - response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + self._stubs["update_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/UpdateTransitionRouteGroup", + request_serializer=gcdc_transition_route_group.UpdateTransitionRouteGroupRequest.serialize, + response_deserializer=gcdc_transition_route_group.TransitionRouteGroup.deserialize, + ) ) return self._stubs["update_transition_route_group"] @@ -500,12 +500,12 @@ def delete_transition_route_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_transition_route_group" not in self._stubs: - self._stubs[ - "delete_transition_route_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/DeleteTransitionRouteGroup", - request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_transition_route_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.cx.v3beta1.TransitionRouteGroups/DeleteTransitionRouteGroup", + request_serializer=transition_route_group.DeleteTransitionRouteGroupRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_transition_route_group"] diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest.py index f1f4a29b81db..9858ddb5ef9d 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseTransitionRouteGroupsRestTransport @@ -617,9 +617,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseCreateTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseCreateTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_create_transition_route_group( request, metadata @@ -688,11 +686,10 @@ def __call__( resp = self._interceptor.post_create_transition_route_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_transition_route_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_transition_route_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -774,9 +771,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseDeleteTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseDeleteTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_delete_transition_route_group( request, metadata @@ -798,7 +793,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -893,9 +888,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseGetTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseGetTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_get_transition_route_group( request, metadata @@ -1046,9 +1039,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseListTransitionRouteGroups._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseListTransitionRouteGroups._get_http_options() request, metadata = self._interceptor.pre_list_transition_route_groups( request, metadata @@ -1202,9 +1193,7 @@ def __call__( """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseUpdateTransitionRouteGroup._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseUpdateTransitionRouteGroup._get_http_options() request, metadata = self._interceptor.pre_update_transition_route_group( request, metadata @@ -1273,11 +1262,10 @@ def __call__( resp = self._interceptor.post_update_transition_route_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_transition_route_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_transition_route_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1315,7 +1303,9 @@ def create_transition_route_group( ]: # 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._CreateTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._CreateTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_transition_route_group( @@ -1325,7 +1315,9 @@ def delete_transition_route_group( ]: # 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._DeleteTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_transition_route_group( @@ -1336,7 +1328,9 @@ def get_transition_route_group( ]: # 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._GetTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._GetTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_transition_route_groups( @@ -1347,7 +1341,9 @@ def list_transition_route_groups( ]: # 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._ListTransitionRouteGroups(self._session, self._host, self._interceptor) # type: ignore + return self._ListTransitionRouteGroups( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_transition_route_group( @@ -1358,7 +1354,9 @@ def update_transition_route_group( ]: # 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._UpdateTransitionRouteGroup(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateTransitionRouteGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1418,9 +1416,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseGetLocation._get_transcoded_request( @@ -1559,9 +1555,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseListLocations._get_transcoded_request( @@ -1697,9 +1691,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1817,9 +1809,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseGetOperation._get_transcoded_request( @@ -1958,9 +1948,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseTransitionRouteGroupsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseTransitionRouteGroupsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseTransitionRouteGroupsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest_base.py index b837a2f56db1..b5d5627a5ffe 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/transition_route_groups/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group from .base import DEFAULT_CLIENT_INFO, TransitionRouteGroupsTransport diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/async_client.py index 417bb1bfbf77..59c894d4a7f6 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,18 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.versions import pagers -from google.cloud.dialogflowcx_v3beta1.types import flow -from google.cloud.dialogflowcx_v3beta1.types import version +from google.cloud.dialogflowcx_v3beta1.types import flow, version from google.cloud.dialogflowcx_v3beta1.types import version as gcdc_version from .client import VersionsClient @@ -118,7 +117,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_info.__func__(VersionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = VersionsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(VersionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +134,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_file.__func__(VersionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = VersionsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(VersionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/client.py index f8084fa472d4..e0cfa86833db 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,18 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.versions import pagers -from google.cloud.dialogflowcx_v3beta1.types import flow -from google.cloud.dialogflowcx_v3beta1.types import version +from google.cloud.dialogflowcx_v3beta1.types import flow, version from google.cloud.dialogflowcx_v3beta1.types import version as gcdc_version from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport @@ -635,11 +634,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VersionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VersionsClient._read_environment_variables() + ) self._client_cert_source = VersionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VersionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/pagers.py index ea44c83c5103..c225d35927fe 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/base.py index 114544289e72..50a8395abd21 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import version @@ -307,7 +307,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc.py index 5db0e1fcf268..d29e5061d033 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import version from google.cloud.dialogflowcx_v3beta1.types import version as gcdc_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc_asyncio.py index 2e86d3f12f14..601818b71b2a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import version from google.cloud.dialogflowcx_v3beta1.types import version as gcdc_version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest.py index 3f1532d35f53..c0b493a173c5 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -947,7 +947,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1091,7 +1091,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1508,7 +1508,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest_base.py index 1700760a5d84..4f664dcb9cc0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/versions/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3beta1.types import version diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/async_client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/async_client.py index fa770c7434bf..cfff738aea99 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/async_client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.webhooks import pagers from google.cloud.dialogflowcx_v3beta1.types import webhook @@ -117,7 +117,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: WebhooksAsyncClient: The constructed client. """ - return WebhooksClient.from_service_account_info.__func__(WebhooksAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = WebhooksClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(WebhooksAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +134,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: WebhooksAsyncClient: The constructed client. """ - return WebhooksClient.from_service_account_file.__func__(WebhooksAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = WebhooksClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(WebhooksAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/client.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/client.py index 48154f992618..43266452a1c9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/client.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.webhooks import pagers from google.cloud.dialogflowcx_v3beta1.types import webhook @@ -674,11 +674,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = WebhooksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + WebhooksClient._read_environment_variables() + ) self._client_cert_source = WebhooksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -713,8 +711,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(WebhooksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/pagers.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/pagers.py index 1a64130c1c37..a7fc8b68da6a 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/pagers.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/base.py index b6567b057518..f6555acd0481 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1 import gapic_version as package_version from google.cloud.dialogflowcx_v3beta1.types import webhook @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc.py index 4ced77e1c985..646ba3c441e2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import webhook from google.cloud.dialogflowcx_v3beta1.types import webhook as gcdc_webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc_asyncio.py index 78ac387ee10d..26d314aec8d8 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import webhook from google.cloud.dialogflowcx_v3beta1.types import webhook as gcdc_webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest.py index 626c0128e5e6..e3b90e986751 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -767,7 +767,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest_base.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest_base.py index 443c37564e08..36b07d1170f0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/services/webhooks/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflowcx_v3beta1.types import webhook diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/__init__.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/__init__.py index ea9e527b8595..5d38b65b5211 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/__init__.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .advanced_settings import AdvancedSettings +from .advanced_settings import ( + AdvancedSettings, +) from .agent import ( Agent, AgentValidationResult, @@ -45,14 +47,18 @@ TextToSpeechSettings, VoiceSelectionParams, ) -from .bigquery_export import BigQueryExportSettings +from .bigquery_export import ( + BigQueryExportSettings, +) from .changelog import ( Changelog, GetChangelogRequest, ListChangelogsRequest, ListChangelogsResponse, ) -from .code_block import CodeBlock +from .code_block import ( + CodeBlock, +) from .conversation_history import ( Conversation, DeleteConversationRequest, @@ -150,9 +156,16 @@ UpdateFlowRequest, ValidateFlowRequest, ) -from .fulfillment import Fulfillment -from .gcs import GcsDestination -from .generative_settings import GenerativeSettings, LlmModelSettings +from .fulfillment import ( + Fulfillment, +) +from .gcs import ( + GcsDestination, +) +from .generative_settings import ( + GenerativeSettings, + LlmModelSettings, +) from .generator import ( CreateGeneratorRequest, DeleteGeneratorRequest, @@ -163,8 +176,13 @@ Phrase, UpdateGeneratorRequest, ) -from .import_strategy import ImportStrategy -from .inline import InlineDestination, InlineSource +from .import_strategy import ( + ImportStrategy, +) +from .inline import ( + InlineDestination, + InlineSource, +) from .intent import ( CreateIntentRequest, DeleteIntentRequest, @@ -223,8 +241,12 @@ RestorePlaybookVersionResponse, UpdatePlaybookRequest, ) -from .response_message import ResponseMessage -from .safety_settings import SafetySettings +from .response_message import ( + ResponseMessage, +) +from .safety_settings import ( + SafetySettings, +) from .security_settings import ( CreateSecuritySettingsRequest, DeleteSecuritySettingsRequest, @@ -329,7 +351,10 @@ ToolVersion, UpdateToolRequest, ) -from .tool_call import ToolCall, ToolCallResult +from .tool_call import ( + ToolCall, + ToolCallResult, +) from .trace import ( Action, AgentUtterance, @@ -359,7 +384,10 @@ TransitionRouteGroup, UpdateTransitionRouteGroupRequest, ) -from .validation_message import ResourceName, ValidationMessage +from .validation_message import ( + ResourceName, + ValidationMessage, +) from .version import ( CompareVersionsRequest, CompareVersionsResponse, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/advanced_settings.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/advanced_settings.py index cad5d538962d..24833b647bc3 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/advanced_settings.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/advanced_settings.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import gcs diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/agent.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/agent.py index c98d7f84a3fc..37ac2227b27b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/agent.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/agent.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import audio_config, bigquery_export, flow from google.cloud.dialogflowcx_v3beta1.types import ( advanced_settings as gcdc_advanced_settings, ) +from google.cloud.dialogflowcx_v3beta1.types import audio_config, bigquery_export, flow from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) @@ -720,6 +720,7 @@ class DataFormat(proto.Enum): Agent content will be exported in JSON Package format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON_PACKAGE = 4 @@ -876,6 +877,7 @@ class RestoreOption(proto.Enum): Fallback to default settings if some settings are not supported in the target agent. """ + RESTORE_OPTION_UNSPECIFIED = 0 KEEP = 1 FALLBACK = 2 @@ -983,12 +985,12 @@ class AgentValidationResult(proto.Message): proto.STRING, number=1, ) - flow_validation_results: MutableSequence[ - flow.FlowValidationResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=flow.FlowValidationResult, + flow_validation_results: MutableSequence[flow.FlowValidationResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=flow.FlowValidationResult, + ) ) diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/audio_config.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/audio_config.py index 9a20e26410e0..d0621a7f39a9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/audio_config.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/audio_config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -91,6 +91,7 @@ class AudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + AUDIO_ENCODING_UNSPECIFIED = 0 AUDIO_ENCODING_LINEAR_16 = 1 AUDIO_ENCODING_FLAC = 2 @@ -139,6 +140,7 @@ class SpeechModelVariant(proto.Enum): documentation `__ describes which models have enhanced variants. """ + SPEECH_MODEL_VARIANT_UNSPECIFIED = 0 USE_BEST_AVAILABLE = 1 USE_STANDARD = 2 @@ -161,6 +163,7 @@ class SsmlVoiceGender(proto.Enum): SSML_VOICE_GENDER_NEUTRAL (3): A gender-neutral voice. """ + SSML_VOICE_GENDER_UNSPECIFIED = 0 SSML_VOICE_GENDER_MALE = 1 SSML_VOICE_GENDER_FEMALE = 2 @@ -195,6 +198,7 @@ class OutputAudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + OUTPUT_AUDIO_ENCODING_UNSPECIFIED = 0 OUTPUT_AUDIO_ENCODING_LINEAR_16 = 1 OUTPUT_AUDIO_ENCODING_MP3 = 2 @@ -559,13 +563,13 @@ class TextToSpeechSettings(proto.Message): is not specified. """ - synthesize_speech_configs: MutableMapping[ - str, "SynthesizeSpeechConfig" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=1, - message="SynthesizeSpeechConfig", + synthesize_speech_configs: MutableMapping[str, "SynthesizeSpeechConfig"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=1, + message="SynthesizeSpeechConfig", + ) ) diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/changelog.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/changelog.py index bf7cbfaeb660..1090f637c1ba 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/changelog.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/changelog.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/conversation_history.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/conversation_history.py index e447943b30eb..40b11982c665 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/conversation_history.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/conversation_history.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment @@ -213,6 +213,7 @@ class Type(proto.Enum): none of the requests contain text or audio input (eg. event or intent input). """ + TYPE_UNSPECIFIED = 0 AUDIO = 1 TEXT = 2 @@ -496,12 +497,12 @@ class StepMetrics(proto.Message): number=2, message=session.DetectIntentResponse, ) - partial_responses: MutableSequence[ - session.DetectIntentResponse - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=session.DetectIntentResponse, + partial_responses: MutableSequence[session.DetectIntentResponse] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=session.DetectIntentResponse, + ) ) request_utterances: str = proto.Field( proto.STRING, @@ -526,12 +527,12 @@ class StepMetrics(proto.Message): number=8, message="Conversation.Interaction.MissingTransition", ) - step_metrics: MutableSequence[ - "Conversation.Interaction.StepMetrics" - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message="Conversation.Interaction.StepMetrics", + step_metrics: MutableSequence["Conversation.Interaction.StepMetrics"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message="Conversation.Interaction.StepMetrics", + ) ) name: str = proto.Field( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/data_store_connection.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/data_store_connection.py index 6562bd0f20ab..2e4dc872e563 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/data_store_connection.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/data_store_connection.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -50,6 +50,7 @@ class DataStoreType(proto.Enum): A data store that contains structured data (for example FAQ). """ + DATA_STORE_TYPE_UNSPECIFIED = 0 PUBLIC_WEB = 1 UNSTRUCTURED = 2 @@ -69,6 +70,7 @@ class DocumentProcessingMode(proto.Enum): CHUNKS (2): Documents are converted to chunks. """ + DOCUMENT_PROCESSING_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -295,6 +297,7 @@ class GroundingDecision(proto.Enum): REJECTED_BY_GROUNDING (2): Grounding have rejected the answer. """ + GROUNDING_DECISION_UNSPECIFIED = 0 ACCEPTED_BY_GROUNDING = 1 REJECTED_BY_GROUNDING = 2 @@ -321,6 +324,7 @@ class GroundingScoreBucket(proto.Enum): We have very high confidence that the answer is grounded. """ + GROUNDING_SCORE_BUCKET_UNSPECIFIED = 0 VERY_LOW = 1 LOW = 3 @@ -369,6 +373,7 @@ class SafetyDecision(proto.Enum): REJECTED_BY_SAFETY_CHECK (2): One ore more safety checks fired. """ + SAFETY_DECISION_UNSPECIFIED = 0 ACCEPTED_BY_SAFETY_CHECK = 1 REJECTED_BY_SAFETY_CHECK = 2 @@ -386,6 +391,7 @@ class BannedPhraseMatch(proto.Enum): BANNED_PHRASE_MATCH_RESPONSE (3): A banned phrase matched the response. """ + BANNED_PHRASE_MATCH_UNSPECIFIED = 0 BANNED_PHRASE_MATCH_NONE = 1 BANNED_PHRASE_MATCH_QUERY = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/deployment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/deployment.py index a1608fad4118..bc488bcb96b9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/deployment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/deployment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -72,6 +72,7 @@ class State(proto.Enum): FAILED (3): The deployment failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/entity_type.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/entity_type.py index 13b9d270e35c..873465bbf918 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/entity_type.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/entity_type.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import inline @@ -129,6 +129,7 @@ class Kind(proto.Enum): Regexp entity types allow to specify regular expressions in entries values. """ + KIND_UNSPECIFIED = 0 KIND_MAP = 1 KIND_LIST = 2 @@ -147,6 +148,7 @@ class AutoExpansionMode(proto.Enum): Allows an agent to recognize values that have not been explicitly listed in the entity. """ + AUTO_EXPANSION_MODE_UNSPECIFIED = 0 AUTO_EXPANSION_MODE_DEFAULT = 1 @@ -305,6 +307,7 @@ class DataFormat(proto.Enum): EntityTypes will be exported in JSON Package format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON_PACKAGE = 5 @@ -461,6 +464,7 @@ class MergeOption(proto.Enum): conflicting new entity type when display name conflicts exist. """ + MERGE_OPTION_UNSPECIFIED = 0 REPLACE = 1 MERGE = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/environment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/environment.py index 56e4d4b62df0..2e17fda1d129 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/environment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/environment.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import test_case, webhook @@ -436,6 +436,7 @@ class AggregatedTestResult(proto.Enum): FAILED (2): At least one test did not pass. """ + AGGREGATED_TEST_RESULT_UNSPECIFIED = 0 PASSED = 1 FAILED = 2 @@ -555,12 +556,12 @@ class ListContinuousTestResultsResponse(proto.Message): def raw_page(self): return self - continuous_test_results: MutableSequence[ - "ContinuousTestResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ContinuousTestResult", + continuous_test_results: MutableSequence["ContinuousTestResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ContinuousTestResult", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/example.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/example.py index ddfd1d7b7adc..1e57dbb5cfd9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/example.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/example.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import trace diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/experiment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/experiment.py index 6666c1ea3e02..1acac0bd4a46 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/experiment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/experiment.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -119,6 +119,7 @@ class State(proto.Enum): The experiment with auto-rollout enabled has failed. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 RUNNING = 2 @@ -189,6 +190,7 @@ class MetricType(proto.Enum): Percentage of sessions reached Dialogflow 'END_PAGE' or 'END_SESSION'. """ + METRIC_UNSPECIFIED = 0 CONTAINED_SESSION_NO_CALLBACK_RATE = 1 LIVE_AGENT_HANDOFF_RATE = 2 @@ -209,6 +211,7 @@ class CountType(proto.Enum): AVERAGE_TURN_COUNT (3): Average turn count in a session. """ + COUNT_TYPE_UNSPECIFIED = 0 TOTAL_NO_MATCH_COUNT = 1 TOTAL_TURN_COUNT = 2 @@ -336,12 +339,12 @@ class VersionMetrics(proto.Message): number=3, ) - version_metrics: MutableSequence[ - "Experiment.Result.VersionMetrics" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Experiment.Result.VersionMetrics", + version_metrics: MutableSequence["Experiment.Result.VersionMetrics"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Experiment.Result.VersionMetrics", + ) ) last_update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/flow.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/flow.py index 164074aae830..4c0f60dd3c3c 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/flow.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/flow.py @@ -17,19 +17,19 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import ( + advanced_settings as gcdc_advanced_settings, +) from google.cloud.dialogflowcx_v3beta1.types import ( import_strategy, page, parameter_definition, validation_message, ) -from google.cloud.dialogflowcx_v3beta1.types import ( - advanced_settings as gcdc_advanced_settings, -) __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3beta1", @@ -88,6 +88,7 @@ class ModelType(proto.Enum): MODEL_TYPE_ADVANCED (3): Use advanced NLU model. """ + MODEL_TYPE_UNSPECIFIED = 0 MODEL_TYPE_STANDARD = 1 MODEL_TYPE_ADVANCED = 3 @@ -108,6 +109,7 @@ class ModelTrainingMode(proto.Enum): training. Best for large flows whose models take long time to train. """ + MODEL_TRAINING_MODE_UNSPECIFIED = 0 MODEL_TRAINING_MODE_AUTOMATIC = 1 MODEL_TRAINING_MODE_MANUAL = 2 @@ -629,12 +631,12 @@ class FlowValidationResult(proto.Message): proto.STRING, number=1, ) - validation_messages: MutableSequence[ - validation_message.ValidationMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=validation_message.ValidationMessage, + validation_messages: MutableSequence[validation_message.ValidationMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=validation_message.ValidationMessage, + ) ) update_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, @@ -699,6 +701,7 @@ class ImportOption(proto.Enum): E.g. Standard NLU will be used if custom NLU is not available. """ + IMPORT_OPTION_UNSPECIFIED = 0 KEEP = 1 FALLBACK = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/fulfillment.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/fulfillment.py index 1006935ff82b..a02af854f4e5 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/fulfillment.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/fulfillment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import ( @@ -201,12 +201,12 @@ class CaseContent(proto.Message): message="Fulfillment.ConditionalCases.Case.CaseContent", ) - cases: MutableSequence[ - "Fulfillment.ConditionalCases.Case" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Fulfillment.ConditionalCases.Case", + cases: MutableSequence["Fulfillment.ConditionalCases.Case"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Fulfillment.ConditionalCases.Case", + ) ) class GeneratorSettings(proto.Message): diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/generative_settings.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/generative_settings.py index 7ffffad84dc7..9eb72bbc54d2 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/generative_settings.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/generative_settings.py @@ -246,6 +246,7 @@ class InputTokenLimit(proto.Enum): INPUT_TOKEN_LIMIT_LONG (3): Input token limit up to 100k. """ + INPUT_TOKEN_LIMIT_UNSPECIFIED = 0 INPUT_TOKEN_LIMIT_SHORT = 1 INPUT_TOKEN_LIMIT_MEDIUM = 2 @@ -267,6 +268,7 @@ class OutputTokenLimit(proto.Enum): OUTPUT_TOKEN_LIMIT_LONG (3): Input token limit up to 2k. """ + OUTPUT_TOKEN_LIMIT_UNSPECIFIED = 0 OUTPUT_TOKEN_LIMIT_SHORT = 1 OUTPUT_TOKEN_LIMIT_MEDIUM = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/generator.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/generator.py index ba8d4d6bdbe0..3c07d7274a7f 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/generator.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/generator.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import generative_settings diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/import_strategy.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/import_strategy.py index b3a3a6da24f6..3ade8cd9df41 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/import_strategy.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/import_strategy.py @@ -51,6 +51,7 @@ class ImportStrategy(proto.Enum): IMPORT_STRATEGY_THROW_ERROR (5): Throw error if a conflict is encountered. """ + IMPORT_STRATEGY_UNSPECIFIED = 0 IMPORT_STRATEGY_CREATE_NEW = 1 IMPORT_STRATEGY_REPLACE = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/intent.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/intent.py index dd916f32f53d..276ea8807e7e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/intent.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/intent.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import inline @@ -58,6 +58,7 @@ class IntentView(proto.Enum): INTENT_VIEW_FULL (2): All fields are populated. """ + INTENT_VIEW_UNSPECIFIED = 0 INTENT_VIEW_PARTIAL = 1 INTENT_VIEW_FULL = 2 @@ -560,6 +561,7 @@ class MergeOption(proto.Enum): conflicting new intent when display name conflicts exist. """ + MERGE_OPTION_UNSPECIFIED = 0 REJECT = 1 REPLACE = 2 @@ -699,6 +701,7 @@ class DataFormat(proto.Enum): CSV (3): Intents will be exported in CSV format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/page.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/page.py index 506618ecb8c6..b527bd56be8e 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/page.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/page.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflowcx_v3beta1.types import data_store_connection, fulfillment from google.cloud.dialogflowcx_v3beta1.types import ( advanced_settings as gcdc_advanced_settings, ) +from google.cloud.dialogflowcx_v3beta1.types import data_store_connection, fulfillment __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3beta1", @@ -304,12 +304,12 @@ class FillBehavior(proto.Message): number=3, message=fulfillment.Fulfillment, ) - reprompt_event_handlers: MutableSequence[ - "EventHandler" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="EventHandler", + reprompt_event_handlers: MutableSequence["EventHandler"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="EventHandler", + ) ) display_name: str = proto.Field( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/parameter_definition.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/parameter_definition.py index 3e1a35e46ca3..9a99d8729ed0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/parameter_definition.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/parameter_definition.py @@ -47,6 +47,7 @@ class DataType(proto.Enum): ARRAY (6): Represents a repeated value. """ + DATA_TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -92,6 +93,7 @@ class ParameterType(proto.Enum): LIST (6): Represents a repeated value. """ + PARAMETER_TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/playbook.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/playbook.py index cb5a8cd0c85c..16432a599eb9 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/playbook.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/playbook.py @@ -17,19 +17,21 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import ( + advanced_settings, + example, + generative_settings, + parameter_definition, +) from google.cloud.dialogflowcx_v3beta1.types import code_block as gcdc_code_block from google.cloud.dialogflowcx_v3beta1.types import fulfillment as gcdc_fulfillment from google.cloud.dialogflowcx_v3beta1.types import ( import_strategy as gcdc_import_strategy, ) -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings -from google.cloud.dialogflowcx_v3beta1.types import example -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import parameter_definition __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3beta1", @@ -286,6 +288,7 @@ class PlaybookType(proto.Enum): ROUTINE (3): Routine playbook. """ + PLAYBOOK_TYPE_UNSPECIFIED = 0 TASK = 1 ROUTINE = 3 @@ -662,6 +665,7 @@ class DataFormat(proto.Enum): JSON (2): Flow content will be exported in JSON format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/response_message.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/response_message.py index f85d3976030f..e4cf2c5f2ddc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/response_message.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/response_message.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import tool_call as gcdc_tool_call @@ -357,12 +357,12 @@ class Segment(proto.Message): number=3, ) - segments: MutableSequence[ - "ResponseMessage.MixedAudio.Segment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ResponseMessage.MixedAudio.Segment", + segments: MutableSequence["ResponseMessage.MixedAudio.Segment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ResponseMessage.MixedAudio.Segment", + ) ) class TelephonyTransferCall(proto.Message): diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/safety_settings.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/safety_settings.py index 298d71019785..7c75da92ed56 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/safety_settings.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/safety_settings.py @@ -64,6 +64,7 @@ class PhraseMatchStrategy(proto.Enum): phrase will be matched, e.g. "foo" will match "a foo bar" and "foo bar", but not "foobar". """ + PHRASE_MATCH_STRATEGY_UNSPECIFIED = 0 PARTIAL_MATCH = 1 WORD_MATCH = 2 @@ -113,6 +114,7 @@ class SafetyFilterLevel(proto.Enum): BLOCK_MOST (4): Block most suspicious texts. """ + SAFETY_FILTER_LEVEL_UNSPECIFIED = 0 BLOCK_NONE = 1 BLOCK_FEW = 2 @@ -134,6 +136,7 @@ class SafetyCategory(proto.Enum): SEXUALLY_EXPLICIT_CONTENT (4): Sexually explicit content. """ + SAFETY_CATEGORY_UNSPECIFIED = 0 DANGEROUS_CONTENT = 1 HATE_SPEECH = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/security_settings.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/security_settings.py index 9a4a36778aa8..af40c6d04b5b 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/security_settings.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/security_settings.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -309,6 +309,7 @@ class RedactionStrategy(proto.Enum): Call redaction service to clean up the data to be persisted. """ + REDACTION_STRATEGY_UNSPECIFIED = 0 REDACT_WITH_SERVICE = 1 @@ -324,6 +325,7 @@ class RedactionScope(proto.Enum): power is disconnected. This includes data that are temporarily saved on disk. """ + REDACTION_SCOPE_UNSPECIFIED = 0 REDACT_DISK_STORAGE = 2 @@ -341,6 +343,7 @@ class RetentionStrategy(proto.Enum): explicitly established, a default conversation ends when the corresponding Dialogflow session ends. """ + RETENTION_STRATEGY_UNSPECIFIED = 0 REMOVE_AFTER_CONVERSATION = 1 @@ -356,6 +359,7 @@ class PurgeDataType(proto.Enum): Cloud logging, which is owned by the user - not Dialogflow. """ + PURGE_DATA_TYPE_UNSPECIFIED = 0 DIALOGFLOW_HISTORY = 1 @@ -403,6 +407,7 @@ class AudioFormat(proto.Enum): OGG (3): OGG Vorbis. """ + AUDIO_FORMAT_UNSPECIFIED = 0 MULAW = 1 MP3 = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session.py index 22ffe5c3a563..cf7df84778de 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session.py @@ -17,29 +17,27 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import ( + advanced_settings as gcdc_advanced_settings, +) from google.cloud.dialogflowcx_v3beta1.types import ( audio_config, data_store_connection, example, flow, generative_settings, -) -from google.cloud.dialogflowcx_v3beta1.types import ( page, response_message, session_entity_type, tool_call, ) -from google.cloud.dialogflowcx_v3beta1.types import ( - advanced_settings as gcdc_advanced_settings, -) from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent __protobuf__ = proto.module( @@ -96,6 +94,7 @@ class DetectIntentResponseView(proto.Enum): [QueryResult.generative_info][google.cloud.dialogflow.cx.v3beta1.QueryResult.generative_info] """ + DETECT_INTENT_RESPONSE_VIEW_UNSPECIFIED = 0 DETECT_INTENT_RESPONSE_VIEW_FULL = 1 DETECT_INTENT_RESPONSE_VIEW_BASIC = 2 @@ -132,6 +131,7 @@ class Rating(proto.Enum): THUMBS_DOWN (2): Thumbs down feedback from user. """ + RATING_UNSPECIFIED = 0 THUMBS_UP = 1 THUMBS_DOWN = 2 @@ -326,6 +326,7 @@ class ResponseType(proto.Enum): FINAL (2): Final response. """ + RESPONSE_TYPE_UNSPECIFIED = 0 PARTIAL = 1 FINAL = 2 @@ -550,19 +551,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=5, ) - speech_partial_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=duration_pb2.Duration, + speech_partial_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=duration_pb2.Duration, + ) ) - speech_final_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=duration_pb2.Duration, + speech_final_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=duration_pb2.Duration, + ) ) partial_responses: int = proto.Field( proto.INT32, @@ -580,19 +581,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=11, ) - dtmf_partial_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message=duration_pb2.Duration, + dtmf_partial_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message=duration_pb2.Duration, + ) ) - dtmf_final_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=13, - message=duration_pb2.Duration, + dtmf_final_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=13, + message=duration_pb2.Duration, + ) ) single_utterance_end_time_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -801,6 +802,7 @@ class MessageType(proto.Enum): [``single_utterance``][google.cloud.dialogflow.cx.v3beta1.InputAudioConfig.single_utterance] was set to ``true``, and is not used otherwise. """ + MESSAGE_TYPE_UNSPECIFIED = 0 TRANSCRIPT = 1 END_OF_SINGLE_UTTERANCE = 2 @@ -826,12 +828,12 @@ class MessageType(proto.Enum): proto.FLOAT, number=6, ) - speech_word_info: MutableSequence[ - audio_config.SpeechWordInfo - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=audio_config.SpeechWordInfo, + speech_word_info: MutableSequence[audio_config.SpeechWordInfo] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=audio_config.SpeechWordInfo, + ) ) speech_end_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -1024,12 +1026,12 @@ class QueryParameters(proto.Message): number=2, message=latlng_pb2.LatLng, ) - session_entity_types: MutableSequence[ - session_entity_type.SessionEntityType - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=session_entity_type.SessionEntityType, + session_entity_types: MutableSequence[session_entity_type.SessionEntityType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=session_entity_type.SessionEntityType, + ) ) payload: struct_pb2.Struct = proto.Field( proto.MESSAGE, @@ -1238,6 +1240,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. E.g. ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -1254,6 +1257,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -1714,12 +1718,12 @@ class QueryResult(proto.Message): number=3, message=struct_pb2.Struct, ) - response_messages: MutableSequence[ - response_message.ResponseMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=response_message.ResponseMessage, + response_messages: MutableSequence[response_message.ResponseMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=response_message.ResponseMessage, + ) ) webhook_ids: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -1981,6 +1985,7 @@ class MatchType(proto.Enum): The query was handled by a [``Playbook``][google.cloud.dialogflow.cx.v3beta1.Playbook]. """ + MATCH_TYPE_UNSPECIFIED = 0 INTENT = 1 DIRECT_INTENT = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session_entity_type.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session_entity_type.py index c30347b59633..11eecb9c1def 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session_entity_type.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/session_entity_type.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import entity_type @@ -95,6 +95,7 @@ class EntityOverrideMode(proto.Enum): [EntityTypes.GetEntityType][google.cloud.dialogflow.cx.v3beta1.EntityTypes.GetEntityType] on the custom entity type and merge. """ + ENTITY_OVERRIDE_MODE_UNSPECIFIED = 0 ENTITY_OVERRIDE_MODE_OVERRIDE = 1 ENTITY_OVERRIDE_MODE_SUPPLEMENT = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/test_case.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/test_case.py index 1a1e26e9945b..7987cf7a10a0 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/test_case.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/test_case.py @@ -17,20 +17,20 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow +from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent +from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page from google.cloud.dialogflowcx_v3beta1.types import ( response_message, session, transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow -from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent -from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page __protobuf__ = proto.module( package="google.cloud.dialogflow.cx.v3beta1", @@ -84,6 +84,7 @@ class TestResult(proto.Enum): FAILED (2): The test did not pass. """ + TEST_RESULT_UNSPECIFIED = 0 PASSED = 1 FAILED = 2 @@ -145,12 +146,12 @@ class TestCase(proto.Message): number=13, message="TestConfig", ) - test_case_conversation_turns: MutableSequence[ - "ConversationTurn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="ConversationTurn", + test_case_conversation_turns: MutableSequence["ConversationTurn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="ConversationTurn", + ) ) creation_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, @@ -363,12 +364,12 @@ class VirtualAgentOutput(proto.Message): number=8, message=gcdc_page.Page, ) - text_responses: MutableSequence[ - response_message.ResponseMessage.Text - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message=response_message.ResponseMessage.Text, + text_responses: MutableSequence[response_message.ResponseMessage.Text] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message=response_message.ResponseMessage.Text, + ) ) status: status_pb2.Status = proto.Field( proto.MESSAGE, @@ -417,6 +418,7 @@ class DiffType(proto.Enum): FLOW (5): The flow. """ + DIFF_TYPE_UNSPECIFIED = 0 INTENT = 1 PAGE = 2 @@ -707,6 +709,7 @@ class CoverageType(proto.Enum): TRANSITION_ROUTE_GROUP (3): Transition route group coverage. """ + COVERAGE_TYPE_UNSPECIFIED = 0 INTENT = 1 PAGE_TRANSITION = 2 @@ -814,6 +817,7 @@ class TestCaseView(proto.Enum): FULL (2): Include everything. """ + TEST_CASE_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -1254,6 +1258,7 @@ class DataFormat(proto.Enum): JSON (2): JSON format. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/tool.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/tool.py index f20f878f99e8..bedc106927e4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/tool.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/tool.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import data_store_connection, inline @@ -197,6 +197,7 @@ class DataFormat(proto.Enum): BLOB (1): Tools will be exported as raw bytes. """ + DATA_FORMAT_UNSPECIFIED = 0 BLOB = 1 @@ -377,6 +378,7 @@ class ToolType(proto.Enum): First party built-in tool created by Dialogflow which cannot be modified. """ + TOOL_TYPE_UNSPECIFIED = 0 CUSTOMIZED_TOOL = 1 BUILTIN_TOOL = 2 @@ -583,6 +585,7 @@ class OperationType(proto.Enum): DELETE (5): Delete operation. """ + OPERATION_TYPE_UNSPECIFIED = 0 LIST = 1 GET = 2 @@ -684,6 +687,7 @@ class RequestLocation(proto.Enum): QUERY_STRING (2): Represents the key in query string. """ + REQUEST_LOCATION_UNSPECIFIED = 0 HEADER = 1 QUERY_STRING = 2 @@ -764,6 +768,7 @@ class OauthGrantType(proto.Enum): Represents the `client credential flow `__. """ + OAUTH_GRANT_TYPE_UNSPECIFIED = 0 CLIENT_CREDENTIAL = 1 @@ -827,6 +832,7 @@ class ServiceAgentAuth(proto.Enum): other Google Cloud APIs after you grant required roles to ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com``. """ + SERVICE_AGENT_AUTH_UNSPECIFIED = 0 ID_TOKEN = 1 ACCESS_TOKEN = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/tool_call.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/tool_call.py index 390f66dea5e0..6fcd8d05c283 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/tool_call.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/tool_call.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/trace.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/trace.py index 6fa43d59ab84..356ac6e036cc 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/trace.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/trace.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import data_store_connection @@ -65,6 +65,7 @@ class OutputState(proto.Enum): OUTPUT_STATE_PENDING (5): Pending. """ + OUTPUT_STATE_UNSPECIFIED = 0 OUTPUT_STATE_OK = 1 OUTPUT_STATE_CANCELLED = 2 @@ -89,6 +90,7 @@ class RetrievalStrategy(proto.Enum): Example will never be inserted into the prompt. """ + RETRIEVAL_STRATEGY_UNSPECIFIED = 0 DEFAULT = 1 STATIC = 2 @@ -229,12 +231,12 @@ class MatchedIntent(proto.Message): message=struct_pb2.Struct, ) - matched_intents: MutableSequence[ - "Action.IntentMatch.MatchedIntent" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Action.IntentMatch.MatchedIntent", + matched_intents: MutableSequence["Action.IntentMatch.MatchedIntent"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Action.IntentMatch.MatchedIntent", + ) ) class FlowStateUpdate(proto.Message): @@ -922,6 +924,7 @@ class State(proto.Enum): ESCALATED (4): Playbook failed due to escalation. """ + _pb_options = {"deprecated": True} STATE_UNSPECIFIED = 0 OK = 1 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/transition_route_group.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/transition_route_group.py index 2941f18bc1c4..52d78732b779 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/transition_route_group.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/transition_route_group.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import page @@ -146,12 +146,12 @@ class ListTransitionRouteGroupsResponse(proto.Message): def raw_page(self): return self - transition_route_groups: MutableSequence[ - "TransitionRouteGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="TransitionRouteGroup", + transition_route_groups: MutableSequence["TransitionRouteGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="TransitionRouteGroup", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/validation_message.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/validation_message.py index eed678fbf8c2..926b97659d21 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/validation_message.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/validation_message.py @@ -82,6 +82,7 @@ class ResourceType(proto.Enum): AGENT_TRANSITION_ROUTE_GROUP (14): Agent transition route group. """ + RESOURCE_TYPE_UNSPECIFIED = 0 AGENT = 1 INTENT = 2 @@ -112,6 +113,7 @@ class Severity(proto.Enum): ERROR (3): The agent may experience failures. """ + SEVERITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/version.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/version.py index 7e05e2e5c2fa..0cbd0233ff60 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/version.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/version.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import flow @@ -100,6 +100,7 @@ class State(proto.Enum): FAILED (3): Version training failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/webhook.py b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/webhook.py index cd448f418c1a..f78ae89780e4 100644 --- a/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/webhook.py +++ b/packages/google-cloud-dialogflow-cx/google/cloud/dialogflowcx_v3beta1/types/webhook.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflowcx_v3beta1.types import response_message @@ -184,6 +184,7 @@ class ServiceAgentAuth(proto.Enum): other Google Cloud APIs after you grant required roles to ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com``. """ + SERVICE_AGENT_AUTH_UNSPECIFIED = 0 NONE = 1 ID_TOKEN = 2 @@ -200,6 +201,7 @@ class WebhookType(proto.Enum): FLEXIBLE (2): Represents a flexible webhook. """ + WEBHOOK_TYPE_UNSPECIFIED = 0 STANDARD = 1 FLEXIBLE = 2 @@ -225,6 +227,7 @@ class HttpMethod(proto.Enum): OPTIONS (7): HTTP OPTIONS Method. """ + HTTP_METHOD_UNSPECIFIED = 0 POST = 1 GET = 2 @@ -926,16 +929,17 @@ class MergeBehavior(proto.Enum): ``messages`` will replace the list of messages waiting to be sent to the user. """ + MERGE_BEHAVIOR_UNSPECIFIED = 0 APPEND = 1 REPLACE = 2 - messages: MutableSequence[ - response_message.ResponseMessage - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=response_message.ResponseMessage, + messages: MutableSequence[response_message.ResponseMessage] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=response_message.ResponseMessage, + ) ) merge_behavior: "WebhookResponse.FulfillmentResponse.MergeBehavior" = ( proto.Field( @@ -1079,6 +1083,7 @@ class ParameterState(proto.Enum): FILLED (3): Indicates that the parameter has a value. """ + PARAMETER_STATE_UNSPECIFIED = 0 EMPTY = 1 INVALID = 2 @@ -1107,12 +1112,12 @@ class ParameterState(proto.Enum): number=5, ) - parameter_info: MutableSequence[ - "PageInfo.FormInfo.ParameterInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="PageInfo.FormInfo.ParameterInfo", + parameter_info: MutableSequence["PageInfo.FormInfo.ParameterInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="PageInfo.FormInfo.ParameterInfo", + ) ) current_page: str = proto.Field( diff --git a/packages/google-cloud-dialogflow-cx/noxfile.py b/packages/google-cloud-dialogflow-cx/noxfile.py index a6461ae4ced2..50581ffaca32 100644 --- a/packages/google-cloud-dialogflow-cx/noxfile.py +++ b/packages/google-cloud-dialogflow-cx/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_agents.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_agents.py index 58f97502d816..c48977d56f1f 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_agents.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_agents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.agents import ( AgentsAsyncClient, @@ -74,14 +74,18 @@ transports, ) from google.cloud.dialogflowcx_v3.types import ( - generative_settings as gcdc_generative_settings, + advanced_settings, + agent, + audio_config, + flow, + gcs, + generative_settings, + safety_settings, ) -from google.cloud.dialogflowcx_v3.types import advanced_settings -from google.cloud.dialogflowcx_v3.types import agent from google.cloud.dialogflowcx_v3.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3.types import audio_config, flow, gcs -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import safety_settings +from google.cloud.dialogflowcx_v3.types import ( + generative_settings as gcdc_generative_settings, +) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -918,10 +922,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -966,10 +969,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1005,10 +1007,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1233,13 +1234,13 @@ def test_agents_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -7641,8 +7642,9 @@ def test_list_agents_rest_bad_request(request_type=agent.ListAgentsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7703,17 +7705,15 @@ def test_list_agents_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_list_agents" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_list_agents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_list_agents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AgentsRestInterceptor, "post_list_agents") as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_list_agents_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_list_agents") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7762,8 +7762,9 @@ def test_get_agent_rest_bad_request(request_type=agent.GetAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7851,17 +7852,15 @@ def test_get_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_get_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_get_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_get_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AgentsRestInterceptor, "post_get_agent") as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_get_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_get_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7910,8 +7909,9 @@ def test_create_agent_rest_bad_request(request_type=gcdc_agent.CreateAgentReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8127,17 +8127,17 @@ def test_create_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_create_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_create_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_create_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_create_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_create_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_create_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8188,8 +8188,9 @@ def test_update_agent_rest_bad_request(request_type=gcdc_agent.UpdateAgentReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8407,17 +8408,17 @@ def test_update_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_update_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_update_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_update_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_update_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_update_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_update_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8466,8 +8467,9 @@ def test_delete_agent_rest_bad_request(request_type=agent.DeleteAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8522,13 +8524,11 @@ def test_delete_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "pre_delete_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AgentsRestInterceptor, "pre_delete_agent") as pre, + ): pre.assert_not_called() pb_message = agent.DeleteAgentRequest.pb(agent.DeleteAgentRequest()) transcode.return_value = { @@ -8569,8 +8569,9 @@ def test_export_agent_rest_bad_request(request_type=agent.ExportAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8625,19 +8626,18 @@ def test_export_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_export_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_export_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_export_agent" - ) as pre: + 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.AgentsRestInterceptor, "post_export_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_export_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_export_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8686,8 +8686,9 @@ def test_restore_agent_rest_bad_request(request_type=agent.RestoreAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8742,19 +8743,18 @@ def test_restore_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_restore_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_restore_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_restore_agent" - ) as pre: + 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.AgentsRestInterceptor, "post_restore_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_restore_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_restore_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8803,8 +8803,9 @@ def test_validate_agent_rest_bad_request(request_type=agent.ValidateAgentRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8865,17 +8866,19 @@ def test_validate_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_validate_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_validate_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_validate_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_validate_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_validate_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AgentsRestInterceptor, "pre_validate_agent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8930,8 +8933,9 @@ def test_get_agent_validation_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8994,18 +8998,20 @@ def test_get_agent_validation_result_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_get_agent_validation_result" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, - "post_get_agent_validation_result_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_get_agent_validation_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_get_agent_validation_result" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, + "post_get_agent_validation_result_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AgentsRestInterceptor, "pre_get_agent_validation_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9062,8 +9068,9 @@ def test_get_generative_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9128,17 +9135,20 @@ def test_get_generative_settings_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_get_generative_settings" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_get_generative_settings_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_get_generative_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_get_generative_settings" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, + "post_get_generative_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AgentsRestInterceptor, "pre_get_generative_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9200,8 +9210,9 @@ def test_update_generative_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9372,18 +9383,20 @@ def test_update_generative_settings_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_update_generative_settings" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, - "post_update_generative_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_update_generative_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_update_generative_settings" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, + "post_update_generative_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AgentsRestInterceptor, "pre_update_generative_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9441,8 +9454,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9501,8 +9515,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9563,8 +9578,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9625,8 +9641,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9685,8 +9702,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10057,11 +10075,14 @@ def test_agents_base_transport(): def test_agents_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.agents.transports.AgentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.agents.transports.AgentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AgentsTransport( @@ -10081,9 +10102,12 @@ def test_agents_base_transport_with_credentials_file(): def test_agents_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.agents.transports.AgentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.agents.transports.AgentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AgentsTransport() @@ -10161,11 +10185,12 @@ def test_agents_transport_auth_gdch_credentials(transport_class): def test_agents_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_changelogs.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_changelogs.py index 8a027e8b1864..1e6e0676c148 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_changelogs.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_changelogs.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.changelogs import ( ChangelogsAsyncClient, @@ -921,10 +926,9 @@ def test_changelogs_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_changelogs_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_changelogs_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,13 +1242,13 @@ def test_changelogs_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2807,8 +2809,9 @@ def test_list_changelogs_rest_bad_request(request_type=changelog.ListChangelogsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2871,17 +2874,19 @@ def test_list_changelogs_rest_interceptors(null_interceptor): ) client = ChangelogsClient(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.ChangelogsRestInterceptor, "post_list_changelogs" - ) as post, mock.patch.object( - transports.ChangelogsRestInterceptor, "post_list_changelogs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChangelogsRestInterceptor, "pre_list_changelogs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChangelogsRestInterceptor, "post_list_changelogs" + ) as post, + mock.patch.object( + transports.ChangelogsRestInterceptor, "post_list_changelogs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChangelogsRestInterceptor, "pre_list_changelogs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2936,8 +2941,9 @@ def test_get_changelog_rest_bad_request(request_type=changelog.GetChangelogReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3014,17 +3020,19 @@ def test_get_changelog_rest_interceptors(null_interceptor): ) client = ChangelogsClient(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.ChangelogsRestInterceptor, "post_get_changelog" - ) as post, mock.patch.object( - transports.ChangelogsRestInterceptor, "post_get_changelog_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChangelogsRestInterceptor, "pre_get_changelog" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChangelogsRestInterceptor, "post_get_changelog" + ) as post, + mock.patch.object( + transports.ChangelogsRestInterceptor, "post_get_changelog_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChangelogsRestInterceptor, "pre_get_changelog" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3075,8 +3083,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3135,8 +3144,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3197,8 +3207,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3259,8 +3270,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3319,8 +3331,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3474,11 +3487,14 @@ def test_changelogs_base_transport(): def test_changelogs_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.changelogs.transports.ChangelogsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.changelogs.transports.ChangelogsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ChangelogsTransport( @@ -3498,9 +3514,12 @@ def test_changelogs_base_transport_with_credentials_file(): def test_changelogs_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.changelogs.transports.ChangelogsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.changelogs.transports.ChangelogsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ChangelogsTransport() @@ -3578,11 +3597,12 @@ def test_changelogs_transport_auth_gdch_credentials(transport_class): def test_changelogs_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_deployments.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_deployments.py index 7f072837f9f3..2d7bc512fc80 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_deployments.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_deployments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.deployments import ( DeploymentsAsyncClient, @@ -925,10 +930,9 @@ def test_deployments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +977,9 @@ def test_deployments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1015,9 @@ def test_deployments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1244,13 +1246,13 @@ def test_deployments_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1362,9 +1364,9 @@ def test_list_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -2148,9 +2150,9 @@ def test_list_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -2807,8 +2809,9 @@ def test_list_deployments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2873,17 +2876,19 @@ def test_list_deployments_rest_interceptors(null_interceptor): ) client = DeploymentsClient(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.DeploymentsRestInterceptor, "post_list_deployments" - ) as post, mock.patch.object( - transports.DeploymentsRestInterceptor, "post_list_deployments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DeploymentsRestInterceptor, "pre_list_deployments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeploymentsRestInterceptor, "post_list_deployments" + ) as post, + mock.patch.object( + transports.DeploymentsRestInterceptor, "post_list_deployments_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DeploymentsRestInterceptor, "pre_list_deployments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2938,8 +2943,9 @@ def test_get_deployment_rest_bad_request(request_type=deployment.GetDeploymentRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3008,17 +3014,19 @@ def test_get_deployment_rest_interceptors(null_interceptor): ) client = DeploymentsClient(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.DeploymentsRestInterceptor, "post_get_deployment" - ) as post, mock.patch.object( - transports.DeploymentsRestInterceptor, "post_get_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DeploymentsRestInterceptor, "pre_get_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeploymentsRestInterceptor, "post_get_deployment" + ) as post, + mock.patch.object( + transports.DeploymentsRestInterceptor, "post_get_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DeploymentsRestInterceptor, "pre_get_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3071,8 +3079,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3131,8 +3140,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3193,8 +3203,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3255,8 +3266,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3315,8 +3327,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3470,11 +3483,14 @@ def test_deployments_base_transport(): def test_deployments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.deployments.transports.DeploymentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.deployments.transports.DeploymentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeploymentsTransport( @@ -3494,9 +3510,12 @@ def test_deployments_base_transport_with_credentials_file(): def test_deployments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.deployments.transports.DeploymentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.deployments.transports.DeploymentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeploymentsTransport() @@ -3574,11 +3593,12 @@ def test_deployments_transport_auth_gdch_credentials(transport_class): def test_deployments_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_entity_types.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_entity_types.py index e140e8911935..d56b41e58e98 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_entity_types.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.entity_types import ( EntityTypesAsyncClient, @@ -70,9 +70,8 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import entity_type +from google.cloud.dialogflowcx_v3.types import entity_type, inline from google.cloud.dialogflowcx_v3.types import entity_type as gcdc_entity_type -from google.cloud.dialogflowcx_v3.types import inline CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -936,10 +935,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +982,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1020,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1255,13 +1251,13 @@ def test_entity_types_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1743,9 +1739,9 @@ def test_create_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -2121,9 +2117,9 @@ def test_update_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -2483,9 +2479,9 @@ def test_delete_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -2817,9 +2813,9 @@ def test_list_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -3361,9 +3357,9 @@ def test_export_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_entity_types] = ( + mock_rpc + ) request = {} client.export_entity_types(request) @@ -3624,9 +3620,9 @@ def test_import_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_entity_types] = ( + mock_rpc + ) request = {} client.import_entity_types(request) @@ -4000,9 +3996,9 @@ def test_create_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -4195,9 +4191,9 @@ def test_update_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -4394,9 +4390,9 @@ def test_delete_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -4573,9 +4569,9 @@ def test_list_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -4835,9 +4831,9 @@ def test_export_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_entity_types] = ( + mock_rpc + ) request = {} client.export_entity_types(request) @@ -4973,9 +4969,9 @@ def test_import_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_entity_types] = ( + mock_rpc + ) request = {} client.import_entity_types(request) @@ -5591,8 +5587,9 @@ def test_get_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5670,17 +5667,19 @@ def test_get_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_get_entity_type" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_get_entity_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_get_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_get_entity_type" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_get_entity_type_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_get_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5733,8 +5732,9 @@ def test_create_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5889,17 +5889,20 @@ def test_create_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_create_entity_type" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_create_entity_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_create_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_create_entity_type" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_create_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_create_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5958,8 +5961,9 @@ def test_update_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6118,17 +6122,20 @@ def test_update_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_update_entity_type" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_update_entity_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_update_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_update_entity_type" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_update_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_update_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6185,8 +6192,9 @@ def test_delete_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6245,13 +6253,13 @@ def test_delete_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "pre_delete_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_delete_entity_type" + ) as pre, + ): pre.assert_not_called() pb_message = entity_type.DeleteEntityTypeRequest.pb( entity_type.DeleteEntityTypeRequest() @@ -6296,8 +6304,9 @@ def test_list_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6360,17 +6369,20 @@ def test_list_entity_types_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_list_entity_types" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_list_entity_types_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_list_entity_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_list_entity_types" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_list_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_list_entity_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6428,8 +6440,9 @@ def test_export_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6486,19 +6499,21 @@ def test_export_entity_types_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_export_entity_types" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_export_entity_types_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_export_entity_types" - ) as pre: + 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.EntityTypesRestInterceptor, "post_export_entity_types" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_export_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_export_entity_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6551,8 +6566,9 @@ def test_import_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6609,19 +6625,21 @@ def test_import_entity_types_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_import_entity_types" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_import_entity_types_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_import_entity_types" - ) as pre: + 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.EntityTypesRestInterceptor, "post_import_entity_types" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_import_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_import_entity_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6674,8 +6692,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6734,8 +6753,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6796,8 +6816,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6858,8 +6879,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6918,8 +6940,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7212,11 +7235,14 @@ def test_entity_types_base_transport(): def test_entity_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EntityTypesTransport( @@ -7236,9 +7262,12 @@ def test_entity_types_base_transport_with_credentials_file(): def test_entity_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EntityTypesTransport() @@ -7316,11 +7345,12 @@ def test_entity_types_transport_auth_gdch_credentials(transport_class): def test_entity_types_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_environments.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_environments.py index 2b8283fb95b8..0fe7a14eb2ac 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_environments.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_environments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.environments import ( EnvironmentsAsyncClient, @@ -73,9 +73,8 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import environment +from google.cloud.dialogflowcx_v3.types import environment, webhook from google.cloud.dialogflowcx_v3.types import environment as gcdc_environment -from google.cloud.dialogflowcx_v3.types import webhook CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -943,10 +942,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +989,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1027,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1272,13 +1268,13 @@ def test_environments_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1394,9 +1390,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -2265,9 +2261,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -2617,9 +2613,9 @@ def test_update_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -2973,9 +2969,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -3851,9 +3847,9 @@ def test_run_continuous_test_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_continuous_test - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_continuous_test] = ( + mock_rpc + ) request = {} client.run_continuous_test(request) @@ -4839,9 +4835,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -5279,9 +5275,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -5471,9 +5467,9 @@ def test_update_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -5664,9 +5660,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -6108,9 +6104,9 @@ def test_run_continuous_test_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_continuous_test - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_continuous_test] = ( + mock_rpc + ) request = {} client.run_continuous_test(request) @@ -7198,8 +7194,9 @@ def test_list_environments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7262,17 +7259,20 @@ def test_list_environments_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_environments" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_list_environments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_environments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_environments" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_environments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_list_environments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7332,8 +7332,9 @@ def test_get_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7402,17 +7403,19 @@ def test_get_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_get_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_get_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_get_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_get_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7465,8 +7468,9 @@ def test_create_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7643,19 +7647,21 @@ def test_create_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_create_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_create_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_create_environment" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_create_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_create_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_create_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7712,8 +7718,9 @@ def test_update_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7894,19 +7901,21 @@ def test_update_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_update_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_update_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_update_environment" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_update_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_update_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_update_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7961,8 +7970,9 @@ def test_delete_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8021,13 +8031,13 @@ def test_delete_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "pre_delete_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_delete_environment" + ) as pre, + ): pre.assert_not_called() pb_message = environment.DeleteEnvironmentRequest.pb( environment.DeleteEnvironmentRequest() @@ -8074,8 +8084,9 @@ def test_lookup_environment_history_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8140,18 +8151,20 @@ def test_lookup_environment_history_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_lookup_environment_history" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_lookup_environment_history_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_lookup_environment_history" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_lookup_environment_history" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_lookup_environment_history_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_lookup_environment_history" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8211,8 +8224,9 @@ def test_run_continuous_test_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8271,19 +8285,21 @@ def test_run_continuous_test_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_run_continuous_test" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_run_continuous_test_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_run_continuous_test" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_run_continuous_test" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_run_continuous_test_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_run_continuous_test" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8338,8 +8354,9 @@ def test_list_continuous_test_results_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8404,18 +8421,20 @@ def test_list_continuous_test_results_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_continuous_test_results" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_list_continuous_test_results_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_continuous_test_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_continuous_test_results" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_continuous_test_results_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_list_continuous_test_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8473,8 +8492,9 @@ def test_deploy_flow_rest_bad_request(request_type=environment.DeployFlowRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8533,19 +8553,20 @@ def test_deploy_flow_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_deploy_flow" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_deploy_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_deploy_flow" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_deploy_flow" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_deploy_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_deploy_flow" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8596,8 +8617,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8656,8 +8678,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8718,8 +8741,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8780,8 +8804,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8840,8 +8865,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9178,11 +9204,14 @@ def test_environments_base_transport(): def test_environments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnvironmentsTransport( @@ -9202,9 +9231,12 @@ def test_environments_base_transport_with_credentials_file(): def test_environments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnvironmentsTransport() @@ -9282,11 +9314,12 @@ def test_environments_transport_auth_gdch_credentials(transport_class): def test_environments_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_examples.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_examples.py index d65642d541a6..a90ee7981821 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_examples.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_examples.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.examples import ( ExamplesAsyncClient, @@ -63,9 +68,8 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import example +from google.cloud.dialogflowcx_v3.types import example, trace from google.cloud.dialogflowcx_v3.types import example as gcdc_example -from google.cloud.dialogflowcx_v3.types import trace CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -914,10 +918,9 @@ def test_examples_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -962,10 +965,9 @@ def test_examples_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1001,10 +1003,9 @@ def test_examples_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1229,13 +1230,13 @@ def test_examples_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4506,8 +4507,9 @@ def test_create_example_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4694,17 +4696,19 @@ def test_create_example_rest_interceptors(null_interceptor): ) client = ExamplesClient(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.ExamplesRestInterceptor, "post_create_example" - ) as post, mock.patch.object( - transports.ExamplesRestInterceptor, "post_create_example_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExamplesRestInterceptor, "pre_create_example" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_create_example" + ) as post, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_create_example_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExamplesRestInterceptor, "pre_create_example" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4757,8 +4761,9 @@ def test_delete_example_rest_bad_request(request_type=example.DeleteExampleReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4815,13 +4820,13 @@ def test_delete_example_rest_interceptors(null_interceptor): ) client = ExamplesClient(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.ExamplesRestInterceptor, "pre_delete_example" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExamplesRestInterceptor, "pre_delete_example" + ) as pre, + ): pre.assert_not_called() pb_message = example.DeleteExampleRequest.pb(example.DeleteExampleRequest()) transcode.return_value = { @@ -4864,8 +4869,9 @@ def test_list_examples_rest_bad_request(request_type=example.ListExamplesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4928,17 +4934,19 @@ def test_list_examples_rest_interceptors(null_interceptor): ) client = ExamplesClient(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.ExamplesRestInterceptor, "post_list_examples" - ) as post, mock.patch.object( - transports.ExamplesRestInterceptor, "post_list_examples_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExamplesRestInterceptor, "pre_list_examples" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_list_examples" + ) as post, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_list_examples_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExamplesRestInterceptor, "pre_list_examples" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4991,8 +4999,9 @@ def test_get_example_rest_bad_request(request_type=example.GetExampleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5065,17 +5074,17 @@ def test_get_example_rest_interceptors(null_interceptor): ) client = ExamplesClient(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.ExamplesRestInterceptor, "post_get_example" - ) as post, mock.patch.object( - transports.ExamplesRestInterceptor, "post_get_example_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExamplesRestInterceptor, "pre_get_example" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_get_example" + ) as post, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_get_example_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ExamplesRestInterceptor, "pre_get_example") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5130,8 +5139,9 @@ def test_update_example_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5320,17 +5330,19 @@ def test_update_example_rest_interceptors(null_interceptor): ) client = ExamplesClient(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.ExamplesRestInterceptor, "post_update_example" - ) as post, mock.patch.object( - transports.ExamplesRestInterceptor, "post_update_example_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExamplesRestInterceptor, "pre_update_example" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_update_example" + ) as post, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_update_example_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExamplesRestInterceptor, "pre_update_example" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5383,8 +5395,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5443,8 +5456,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5505,8 +5519,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5567,8 +5582,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5627,8 +5643,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5845,11 +5862,14 @@ def test_examples_base_transport(): def test_examples_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.examples.transports.ExamplesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.examples.transports.ExamplesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ExamplesTransport( @@ -5869,9 +5889,12 @@ def test_examples_base_transport_with_credentials_file(): def test_examples_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.examples.transports.ExamplesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.examples.transports.ExamplesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ExamplesTransport() @@ -5949,11 +5972,12 @@ def test_examples_transport_auth_gdch_credentials(transport_class): def test_examples_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_experiments.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_experiments.py index 45b40591cdb5..c9a171aff10e 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_experiments.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_experiments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.experiments import ( ExperimentsAsyncClient, @@ -928,10 +933,9 @@ def test_experiments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +980,9 @@ def test_experiments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1018,9 @@ def test_experiments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1247,13 +1249,13 @@ def test_experiments_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1365,9 +1367,9 @@ def test_list_experiments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_experiments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_experiments] = ( + mock_rpc + ) request = {} client.list_experiments(request) @@ -2235,9 +2237,9 @@ def test_create_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_experiment] = ( + mock_rpc + ) request = {} client.create_experiment(request) @@ -2597,9 +2599,9 @@ def test_update_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_experiment] = ( + mock_rpc + ) request = {} client.update_experiment(request) @@ -2952,9 +2954,9 @@ def test_delete_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_experiment] = ( + mock_rpc + ) request = {} client.delete_experiment(request) @@ -3286,9 +3288,9 @@ def test_start_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_experiment] = ( + mock_rpc + ) request = {} client.start_experiment(request) @@ -3894,9 +3896,9 @@ def test_list_experiments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_experiments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_experiments] = ( + mock_rpc + ) request = {} client.list_experiments(request) @@ -4336,9 +4338,9 @@ def test_create_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_experiment] = ( + mock_rpc + ) request = {} client.create_experiment(request) @@ -4529,9 +4531,9 @@ def test_update_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_experiment] = ( + mock_rpc + ) request = {} client.update_experiment(request) @@ -4721,9 +4723,9 @@ def test_delete_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_experiment] = ( + mock_rpc + ) request = {} client.delete_experiment(request) @@ -4898,9 +4900,9 @@ def test_start_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_experiment] = ( + mock_rpc + ) request = {} client.start_experiment(request) @@ -5745,8 +5747,9 @@ def test_list_experiments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5811,17 +5814,19 @@ def test_list_experiments_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "post_list_experiments" - ) as post, mock.patch.object( - transports.ExperimentsRestInterceptor, "post_list_experiments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExperimentsRestInterceptor, "pre_list_experiments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_list_experiments" + ) as post, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_list_experiments_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_list_experiments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5876,8 +5881,9 @@ def test_get_experiment_rest_bad_request(request_type=experiment.GetExperimentRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5950,17 +5956,19 @@ def test_get_experiment_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "post_get_experiment" - ) as post, mock.patch.object( - transports.ExperimentsRestInterceptor, "post_get_experiment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExperimentsRestInterceptor, "pre_get_experiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_get_experiment" + ) as post, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_get_experiment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_get_experiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6015,8 +6023,9 @@ def test_create_experiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6220,17 +6229,20 @@ def test_create_experiment_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "post_create_experiment" - ) as post, mock.patch.object( - transports.ExperimentsRestInterceptor, "post_create_experiment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExperimentsRestInterceptor, "pre_create_experiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_create_experiment" + ) as post, + mock.patch.object( + transports.ExperimentsRestInterceptor, + "post_create_experiment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_create_experiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6287,8 +6299,9 @@ def test_update_experiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6494,17 +6507,20 @@ def test_update_experiment_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "post_update_experiment" - ) as post, mock.patch.object( - transports.ExperimentsRestInterceptor, "post_update_experiment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExperimentsRestInterceptor, "pre_update_experiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_update_experiment" + ) as post, + mock.patch.object( + transports.ExperimentsRestInterceptor, + "post_update_experiment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_update_experiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6559,8 +6575,9 @@ def test_delete_experiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6619,13 +6636,13 @@ def test_delete_experiment_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "pre_delete_experiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_delete_experiment" + ) as pre, + ): pre.assert_not_called() pb_message = experiment.DeleteExperimentRequest.pb( experiment.DeleteExperimentRequest() @@ -6672,8 +6689,9 @@ def test_start_experiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6746,17 +6764,19 @@ def test_start_experiment_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "post_start_experiment" - ) as post, mock.patch.object( - transports.ExperimentsRestInterceptor, "post_start_experiment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExperimentsRestInterceptor, "pre_start_experiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_start_experiment" + ) as post, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_start_experiment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_start_experiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6811,8 +6831,9 @@ def test_stop_experiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6885,17 +6906,19 @@ def test_stop_experiment_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "post_stop_experiment" - ) as post, mock.patch.object( - transports.ExperimentsRestInterceptor, "post_stop_experiment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExperimentsRestInterceptor, "pre_stop_experiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_stop_experiment" + ) as post, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_stop_experiment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_stop_experiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6948,8 +6971,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7008,8 +7032,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7070,8 +7095,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7132,8 +7158,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7192,8 +7219,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7458,11 +7486,14 @@ def test_experiments_base_transport(): def test_experiments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.experiments.transports.ExperimentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.experiments.transports.ExperimentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ExperimentsTransport( @@ -7482,9 +7513,12 @@ def test_experiments_base_transport_with_credentials_file(): def test_experiments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.experiments.transports.ExperimentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.experiments.transports.ExperimentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ExperimentsTransport() @@ -7562,11 +7596,12 @@ def test_experiments_transport_auth_gdch_credentials(transport_class): def test_experiments_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_flows.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_flows.py index 09edb4d55523..c4b7b42c2fc1 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_flows.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_flows.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.flows import ( FlowsAsyncClient, @@ -74,8 +74,10 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import advanced_settings, data_store_connection from google.cloud.dialogflowcx_v3.types import ( + advanced_settings, + data_store_connection, + flow, fulfillment, gcs, import_strategy, @@ -85,7 +87,6 @@ tool_call, validation_message, ) -from google.cloud.dialogflowcx_v3.types import flow from google.cloud.dialogflowcx_v3.types import flow as gcdc_flow CRED_INFO_JSON = { @@ -919,10 +920,9 @@ def test_flows_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -967,10 +967,9 @@ def test_flows_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1005,9 @@ def test_flows_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1234,13 +1232,13 @@ def test_flows_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6865,8 +6863,9 @@ def test_create_flow_rest_bad_request(request_type=gcdc_flow.CreateFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7173,17 +7172,15 @@ def test_create_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_create_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_create_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_create_flow" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FlowsRestInterceptor, "post_create_flow") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_create_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_create_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7234,8 +7231,9 @@ def test_delete_flow_rest_bad_request(request_type=flow.DeleteFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7292,13 +7290,11 @@ def test_delete_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "pre_delete_flow" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FlowsRestInterceptor, "pre_delete_flow") as pre, + ): pre.assert_not_called() pb_message = flow.DeleteFlowRequest.pb(flow.DeleteFlowRequest()) transcode.return_value = { @@ -7339,8 +7335,9 @@ def test_list_flows_rest_bad_request(request_type=flow.ListFlowsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7401,17 +7398,15 @@ def test_list_flows_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_list_flows" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_list_flows_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_list_flows" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FlowsRestInterceptor, "post_list_flows") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_list_flows_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_list_flows") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7462,8 +7457,9 @@ def test_get_flow_rest_bad_request(request_type=flow.GetFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7534,17 +7530,15 @@ def test_get_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_get_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_get_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_get_flow" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FlowsRestInterceptor, "post_get_flow") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_get_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_get_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7597,8 +7591,9 @@ def test_update_flow_rest_bad_request(request_type=gcdc_flow.UpdateFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7909,17 +7904,15 @@ def test_update_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_update_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_update_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_update_flow" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FlowsRestInterceptor, "post_update_flow") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_update_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_update_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7970,8 +7963,9 @@ def test_train_flow_rest_bad_request(request_type=flow.TrainFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8028,19 +8022,16 @@ def test_train_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_train_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_train_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_train_flow" - ) as pre: + 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.FlowsRestInterceptor, "post_train_flow") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_train_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_train_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8091,8 +8082,9 @@ def test_validate_flow_rest_bad_request(request_type=flow.ValidateFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8155,17 +8147,17 @@ def test_validate_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_validate_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_validate_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_validate_flow" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FlowsRestInterceptor, "post_validate_flow" + ) as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_validate_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_validate_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8218,8 +8210,9 @@ def test_get_flow_validation_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8282,17 +8275,20 @@ def test_get_flow_validation_result_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_get_flow_validation_result" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_get_flow_validation_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_get_flow_validation_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FlowsRestInterceptor, "post_get_flow_validation_result" + ) as post, + mock.patch.object( + transports.FlowsRestInterceptor, + "post_get_flow_validation_result_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FlowsRestInterceptor, "pre_get_flow_validation_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8343,8 +8339,9 @@ def test_import_flow_rest_bad_request(request_type=flow.ImportFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8399,19 +8396,16 @@ def test_import_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_import_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_import_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_import_flow" - ) as pre: + 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.FlowsRestInterceptor, "post_import_flow") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_import_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_import_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8462,8 +8456,9 @@ def test_export_flow_rest_bad_request(request_type=flow.ExportFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8520,19 +8515,16 @@ def test_export_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_export_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_export_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_export_flow" - ) as pre: + 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.FlowsRestInterceptor, "post_export_flow") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_export_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_export_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8583,8 +8575,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8643,8 +8636,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8705,8 +8699,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8767,8 +8762,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8827,8 +8823,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9174,11 +9171,14 @@ def test_flows_base_transport(): def test_flows_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.flows.transports.FlowsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.flows.transports.FlowsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FlowsTransport( @@ -9198,9 +9198,12 @@ def test_flows_base_transport_with_credentials_file(): def test_flows_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.flows.transports.FlowsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.flows.transports.FlowsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FlowsTransport() @@ -9278,11 +9281,12 @@ def test_flows_transport_auth_gdch_credentials(transport_class): def test_flows_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_generators.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_generators.py index 04d5337eefcb..98643c92783d 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_generators.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_generators.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.generators import ( GeneratorsAsyncClient, @@ -61,8 +66,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import generative_settings -from google.cloud.dialogflowcx_v3.types import generator +from google.cloud.dialogflowcx_v3.types import generative_settings, generator from google.cloud.dialogflowcx_v3.types import generator as gcdc_generator CRED_INFO_JSON = { @@ -923,10 +927,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +974,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1012,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1242,13 +1243,13 @@ def test_generators_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2208,9 +2209,9 @@ def test_create_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -2547,9 +2548,9 @@ def test_update_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -2881,9 +2882,9 @@ def test_delete_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -3569,9 +3570,9 @@ def test_create_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -3762,9 +3763,9 @@ def test_update_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -3959,9 +3960,9 @@ def test_delete_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -4492,8 +4493,9 @@ def test_list_generators_rest_bad_request(request_type=generator.ListGeneratorsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4556,17 +4558,19 @@ def test_list_generators_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_list_generators" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_list_generators_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_list_generators" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_list_generators" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_list_generators_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_list_generators" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4621,8 +4625,9 @@ def test_get_generator_rest_bad_request(request_type=generator.GetGeneratorReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4689,17 +4694,19 @@ def test_get_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_get_generator" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_get_generator_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_get_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_get_generator" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_get_generator_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_get_generator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4750,8 +4757,9 @@ def test_create_generator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4899,17 +4907,19 @@ def test_create_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_create_generator" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_create_generator_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_create_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_create_generator" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_create_generator_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_create_generator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4966,8 +4976,9 @@ def test_update_generator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5119,17 +5130,19 @@ def test_update_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_update_generator" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_update_generator_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_update_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_update_generator" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_update_generator_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_update_generator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5184,8 +5197,9 @@ def test_delete_generator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5244,13 +5258,13 @@ def test_delete_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "pre_delete_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_delete_generator" + ) as pre, + ): pre.assert_not_called() pb_message = generator.DeleteGeneratorRequest.pb( generator.DeleteGeneratorRequest() @@ -5295,8 +5309,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5355,8 +5370,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5417,8 +5433,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5479,8 +5496,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5539,8 +5557,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5757,11 +5776,14 @@ def test_generators_base_transport(): def test_generators_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeneratorsTransport( @@ -5781,9 +5803,12 @@ def test_generators_base_transport_with_credentials_file(): def test_generators_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeneratorsTransport() @@ -5861,11 +5886,12 @@ def test_generators_transport_auth_gdch_credentials(transport_class): def test_generators_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_intents.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_intents.py index 0a6e97e09260..a31e1b918f05 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_intents.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_intents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.intents import ( IntentsAsyncClient, @@ -70,8 +70,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import inline -from google.cloud.dialogflowcx_v3.types import intent +from google.cloud.dialogflowcx_v3.types import inline, intent from google.cloud.dialogflowcx_v3.types import intent as gcdc_intent CRED_INFO_JSON = { @@ -910,10 +909,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +956,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +994,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1225,13 +1221,13 @@ def test_intents_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5332,8 +5328,9 @@ def test_list_intents_rest_bad_request(request_type=intent.ListIntentsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5394,17 +5391,17 @@ def test_list_intents_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_list_intents" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_list_intents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_list_intents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "post_list_intents" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_list_intents_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.IntentsRestInterceptor, "pre_list_intents") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5455,8 +5452,9 @@ def test_get_intent_rest_bad_request(request_type=intent.GetIntentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5527,17 +5525,15 @@ def test_get_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_get_intent" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_get_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_get_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.IntentsRestInterceptor, "post_get_intent") as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_get_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.IntentsRestInterceptor, "pre_get_intent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5586,8 +5582,9 @@ def test_create_intent_rest_bad_request(request_type=gcdc_intent.CreateIntentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5746,17 +5743,19 @@ def test_create_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_create_intent" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_create_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_create_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "post_create_intent" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_create_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_create_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5811,8 +5810,9 @@ def test_update_intent_rest_bad_request(request_type=gcdc_intent.UpdateIntentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5975,17 +5975,19 @@ def test_update_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_update_intent" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_update_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_update_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "post_update_intent" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_update_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_update_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6038,8 +6040,9 @@ def test_delete_intent_rest_bad_request(request_type=intent.DeleteIntentRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6096,13 +6099,13 @@ def test_delete_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "pre_delete_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_delete_intent" + ) as pre, + ): pre.assert_not_called() pb_message = intent.DeleteIntentRequest.pb(intent.DeleteIntentRequest()) transcode.return_value = { @@ -6143,8 +6146,9 @@ def test_import_intents_rest_bad_request(request_type=intent.ImportIntentsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6199,19 +6203,20 @@ def test_import_intents_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_import_intents" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_import_intents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_import_intents" - ) as pre: + 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.IntentsRestInterceptor, "post_import_intents" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_import_intents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_import_intents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6260,8 +6265,9 @@ def test_export_intents_rest_bad_request(request_type=intent.ExportIntentsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6316,19 +6322,20 @@ def test_export_intents_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_export_intents" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_export_intents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_export_intents" - ) as pre: + 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.IntentsRestInterceptor, "post_export_intents" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_export_intents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_export_intents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6379,8 +6386,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6439,8 +6447,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6501,8 +6510,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6563,8 +6573,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6623,8 +6634,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6905,11 +6917,14 @@ def test_intents_base_transport(): def test_intents_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.intents.transports.IntentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.intents.transports.IntentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IntentsTransport( @@ -6929,9 +6944,12 @@ def test_intents_base_transport_with_credentials_file(): def test_intents_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.intents.transports.IntentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.intents.transports.IntentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IntentsTransport() @@ -7009,11 +7027,12 @@ def test_intents_transport_auth_gdch_credentials(transport_class): def test_intents_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_pages.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_pages.py index 743dd687034d..57e733e5e030 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_pages.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_pages.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.pages import ( PagesAsyncClient, @@ -68,10 +73,11 @@ data_store_connection, fulfillment, gcs, + page, + response_message, + tool_call, ) -from google.cloud.dialogflowcx_v3.types import page from google.cloud.dialogflowcx_v3.types import page as gcdc_page -from google.cloud.dialogflowcx_v3.types import response_message, tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -904,10 +910,9 @@ def test_pages_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -952,10 +957,9 @@ def test_pages_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +995,9 @@ def test_pages_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1219,13 +1222,13 @@ def test_pages_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4475,8 +4478,9 @@ def test_list_pages_rest_bad_request(request_type=page.ListPagesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4539,17 +4543,15 @@ def test_list_pages_rest_interceptors(null_interceptor): ) client = PagesClient(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.PagesRestInterceptor, "post_list_pages" - ) as post, mock.patch.object( - transports.PagesRestInterceptor, "post_list_pages_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PagesRestInterceptor, "pre_list_pages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.PagesRestInterceptor, "post_list_pages") as post, + mock.patch.object( + transports.PagesRestInterceptor, "post_list_pages_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PagesRestInterceptor, "pre_list_pages") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4600,8 +4602,9 @@ def test_get_page_rest_bad_request(request_type=page.GetPageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4670,17 +4673,15 @@ def test_get_page_rest_interceptors(null_interceptor): ) client = PagesClient(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.PagesRestInterceptor, "post_get_page" - ) as post, mock.patch.object( - transports.PagesRestInterceptor, "post_get_page_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PagesRestInterceptor, "pre_get_page" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.PagesRestInterceptor, "post_get_page") as post, + mock.patch.object( + transports.PagesRestInterceptor, "post_get_page_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PagesRestInterceptor, "pre_get_page") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4731,8 +4732,9 @@ def test_create_page_rest_bad_request(request_type=gcdc_page.CreatePageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5025,17 +5027,15 @@ def test_create_page_rest_interceptors(null_interceptor): ) client = PagesClient(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.PagesRestInterceptor, "post_create_page" - ) as post, mock.patch.object( - transports.PagesRestInterceptor, "post_create_page_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PagesRestInterceptor, "pre_create_page" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.PagesRestInterceptor, "post_create_page") as post, + mock.patch.object( + transports.PagesRestInterceptor, "post_create_page_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PagesRestInterceptor, "pre_create_page") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5088,8 +5088,9 @@ def test_update_page_rest_bad_request(request_type=gcdc_page.UpdatePageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5384,17 +5385,15 @@ def test_update_page_rest_interceptors(null_interceptor): ) client = PagesClient(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.PagesRestInterceptor, "post_update_page" - ) as post, mock.patch.object( - transports.PagesRestInterceptor, "post_update_page_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PagesRestInterceptor, "pre_update_page" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.PagesRestInterceptor, "post_update_page") as post, + mock.patch.object( + transports.PagesRestInterceptor, "post_update_page_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PagesRestInterceptor, "pre_update_page") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5445,8 +5444,9 @@ def test_delete_page_rest_bad_request(request_type=page.DeletePageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5503,13 +5503,11 @@ def test_delete_page_rest_interceptors(null_interceptor): ) client = PagesClient(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.PagesRestInterceptor, "pre_delete_page" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.PagesRestInterceptor, "pre_delete_page") as pre, + ): pre.assert_not_called() pb_message = page.DeletePageRequest.pb(page.DeletePageRequest()) transcode.return_value = { @@ -5552,8 +5550,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5612,8 +5611,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5674,8 +5674,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5736,8 +5737,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5796,8 +5798,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6014,11 +6017,14 @@ def test_pages_base_transport(): def test_pages_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.pages.transports.PagesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.pages.transports.PagesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PagesTransport( @@ -6038,9 +6044,12 @@ def test_pages_base_transport_with_credentials_file(): def test_pages_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.pages.transports.PagesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.pages.transports.PagesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PagesTransport() @@ -6118,11 +6127,12 @@ def test_pages_transport_auth_gdch_credentials(transport_class): def test_pages_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_playbooks.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_playbooks.py index 23f2ef4bed0a..0ad4256b2fa5 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_playbooks.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_playbooks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.playbooks import ( PlaybooksAsyncClient, @@ -82,9 +82,11 @@ generative_settings, import_strategy, parameter_definition, + playbook, + response_message, + tool_call, + trace, ) -from google.cloud.dialogflowcx_v3.types import response_message, tool_call, trace -from google.cloud.dialogflowcx_v3.types import playbook from google.cloud.dialogflowcx_v3.types import playbook as gcdc_playbook CRED_INFO_JSON = { @@ -941,10 +943,9 @@ def test_playbooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +990,9 @@ def test_playbooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1028,9 @@ def test_playbooks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1260,13 +1259,13 @@ def test_playbooks_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4141,9 +4140,9 @@ def test_get_playbook_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_playbook_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_playbook_version] = ( + mock_rpc + ) request = {} client.get_playbook_version(request) @@ -4823,9 +4822,9 @@ def test_list_playbook_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_playbook_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_playbook_versions] = ( + mock_rpc + ) request = {} client.list_playbook_versions(request) @@ -7046,9 +7045,9 @@ def test_get_playbook_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_playbook_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_playbook_version] = ( + mock_rpc + ) request = {} client.get_playbook_version(request) @@ -7417,9 +7416,9 @@ def test_list_playbook_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_playbook_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_playbook_versions] = ( + mock_rpc + ) request = {} client.list_playbook_versions(request) @@ -8584,8 +8583,9 @@ def test_create_playbook_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8882,17 +8882,19 @@ def test_create_playbook_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_create_playbook" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_create_playbook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_create_playbook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_create_playbook" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_create_playbook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_create_playbook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8945,8 +8947,9 @@ def test_delete_playbook_rest_bad_request(request_type=playbook.DeletePlaybookRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9003,13 +9006,13 @@ def test_delete_playbook_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "pre_delete_playbook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_delete_playbook" + ) as pre, + ): pre.assert_not_called() pb_message = playbook.DeletePlaybookRequest.pb(playbook.DeletePlaybookRequest()) transcode.return_value = { @@ -9050,8 +9053,9 @@ def test_list_playbooks_rest_bad_request(request_type=playbook.ListPlaybooksRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9112,17 +9116,19 @@ def test_list_playbooks_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_list_playbooks" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_list_playbooks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_list_playbooks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_list_playbooks" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_list_playbooks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_list_playbooks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9175,8 +9181,9 @@ def test_get_playbook_rest_bad_request(request_type=playbook.GetPlaybookRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9255,17 +9262,19 @@ def test_get_playbook_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_get_playbook" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_get_playbook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_get_playbook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_get_playbook" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_get_playbook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_get_playbook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9316,8 +9325,9 @@ def test_export_playbook_rest_bad_request(request_type=playbook.ExportPlaybookRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9374,19 +9384,20 @@ def test_export_playbook_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_export_playbook" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_export_playbook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_export_playbook" - ) as pre: + 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.PlaybooksRestInterceptor, "post_export_playbook" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_export_playbook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_export_playbook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9435,8 +9446,9 @@ def test_import_playbook_rest_bad_request(request_type=playbook.ImportPlaybookRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9491,19 +9503,20 @@ def test_import_playbook_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_import_playbook" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_import_playbook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_import_playbook" - ) as pre: + 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.PlaybooksRestInterceptor, "post_import_playbook" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_import_playbook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_import_playbook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9558,8 +9571,9 @@ def test_update_playbook_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9860,17 +9874,19 @@ def test_update_playbook_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_update_playbook" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_update_playbook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_update_playbook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_update_playbook" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_update_playbook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_update_playbook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9925,8 +9941,9 @@ def test_create_playbook_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10265,18 +10282,20 @@ def test_create_playbook_version_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_create_playbook_version" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, - "post_create_playbook_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_create_playbook_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_create_playbook_version" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, + "post_create_playbook_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_create_playbook_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10331,8 +10350,9 @@ def test_get_playbook_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10397,17 +10417,20 @@ def test_get_playbook_version_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_get_playbook_version" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_get_playbook_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_get_playbook_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_get_playbook_version" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, + "post_get_playbook_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_get_playbook_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10462,8 +10485,9 @@ def test_restore_playbook_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10523,18 +10547,20 @@ def test_restore_playbook_version_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_restore_playbook_version" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, - "post_restore_playbook_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_restore_playbook_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_restore_playbook_version" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, + "post_restore_playbook_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_restore_playbook_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10594,8 +10620,9 @@ def test_list_playbook_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10658,17 +10685,20 @@ def test_list_playbook_versions_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_list_playbook_versions" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_list_playbook_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_list_playbook_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_list_playbook_versions" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, + "post_list_playbook_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_list_playbook_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10728,8 +10758,9 @@ def test_delete_playbook_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10786,13 +10817,13 @@ def test_delete_playbook_version_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "pre_delete_playbook_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_delete_playbook_version" + ) as pre, + ): pre.assert_not_called() pb_message = playbook.DeletePlaybookVersionRequest.pb( playbook.DeletePlaybookVersionRequest() @@ -10837,8 +10868,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10897,8 +10929,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10959,8 +10992,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11021,8 +11055,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11081,8 +11116,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11478,11 +11514,14 @@ def test_playbooks_base_transport(): def test_playbooks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.playbooks.transports.PlaybooksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.playbooks.transports.PlaybooksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PlaybooksTransport( @@ -11502,9 +11541,12 @@ def test_playbooks_base_transport_with_credentials_file(): def test_playbooks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.playbooks.transports.PlaybooksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.playbooks.transports.PlaybooksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PlaybooksTransport() @@ -11582,11 +11624,12 @@ def test_playbooks_transport_auth_gdch_credentials(transport_class): def test_playbooks_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_security_settings_service.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_security_settings_service.py index a3b6258c2bd8..adc1362b18a9 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_security_settings_service.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_security_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.security_settings_service import ( SecuritySettingsServiceAsyncClient, @@ -61,10 +66,10 @@ pagers, transports, ) +from google.cloud.dialogflowcx_v3.types import security_settings from google.cloud.dialogflowcx_v3.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3.types import security_settings CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1004,10 +1009,9 @@ def test_security_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1056,9 @@ def test_security_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1094,9 @@ def test_security_settings_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1350,13 +1352,13 @@ def test_security_settings_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1902,9 +1904,9 @@ def test_get_security_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_security_settings] = ( + mock_rpc + ) request = {} client.get_security_settings(request) @@ -2671,9 +2673,9 @@ def test_list_security_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_security_settings] = ( + mock_rpc + ) request = {} client.list_security_settings(request) @@ -3677,9 +3679,9 @@ def test_get_security_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_security_settings] = ( + mock_rpc + ) request = {} client.get_security_settings(request) @@ -4061,9 +4063,9 @@ def test_list_security_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_security_settings] = ( + mock_rpc + ) request = {} client.list_security_settings(request) @@ -4898,8 +4900,9 @@ def test_create_security_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5073,20 +5076,22 @@ def test_create_security_settings_rest_interceptors(null_interceptor): ) client = SecuritySettingsServiceClient(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.SecuritySettingsServiceRestInterceptor, - "post_create_security_settings", - ) as post, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, - "post_create_security_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, - "pre_create_security_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_create_security_settings", + ) as post, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_create_security_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "pre_create_security_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5146,8 +5151,9 @@ def test_get_security_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5235,18 +5241,22 @@ def test_get_security_settings_rest_interceptors(null_interceptor): ) client = SecuritySettingsServiceClient(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.SecuritySettingsServiceRestInterceptor, "post_get_security_settings" - ) as post, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, - "post_get_security_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, "pre_get_security_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_get_security_settings", + ) as post, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_get_security_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "pre_get_security_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5305,8 +5315,9 @@ def test_update_security_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5484,20 +5495,22 @@ def test_update_security_settings_rest_interceptors(null_interceptor): ) client = SecuritySettingsServiceClient(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.SecuritySettingsServiceRestInterceptor, - "post_update_security_settings", - ) as post, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, - "post_update_security_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, - "pre_update_security_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_update_security_settings", + ) as post, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_update_security_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "pre_update_security_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5555,8 +5568,9 @@ def test_list_security_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5619,18 +5633,22 @@ def test_list_security_settings_rest_interceptors(null_interceptor): ) client = SecuritySettingsServiceClient(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.SecuritySettingsServiceRestInterceptor, "post_list_security_settings" - ) as post, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, - "post_list_security_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, "pre_list_security_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_list_security_settings", + ) as post, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_list_security_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "pre_list_security_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5690,8 +5708,9 @@ def test_delete_security_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5750,14 +5769,14 @@ def test_delete_security_settings_rest_interceptors(null_interceptor): ) client = SecuritySettingsServiceClient(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.SecuritySettingsServiceRestInterceptor, - "pre_delete_security_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "pre_delete_security_settings", + ) as pre, + ): pre.assert_not_called() pb_message = security_settings.DeleteSecuritySettingsRequest.pb( security_settings.DeleteSecuritySettingsRequest() @@ -5802,8 +5821,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5862,8 +5882,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5924,8 +5945,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5986,8 +6008,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6046,8 +6069,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6274,11 +6298,14 @@ def test_security_settings_service_base_transport(): def test_security_settings_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.security_settings_service.transports.SecuritySettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.security_settings_service.transports.SecuritySettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SecuritySettingsServiceTransport( @@ -6298,9 +6325,12 @@ def test_security_settings_service_base_transport_with_credentials_file(): def test_security_settings_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.security_settings_service.transports.SecuritySettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.security_settings_service.transports.SecuritySettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SecuritySettingsServiceTransport() @@ -6380,11 +6410,12 @@ def test_security_settings_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_session_entity_types.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_session_entity_types.py index 472a8237d3b2..afcad6717bdd 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_session_entity_types.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_session_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.session_entity_types import ( SessionEntityTypesAsyncClient, @@ -61,11 +66,10 @@ pagers, transports, ) +from google.cloud.dialogflowcx_v3.types import entity_type, session_entity_type from google.cloud.dialogflowcx_v3.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3.types import entity_type -from google.cloud.dialogflowcx_v3.types import session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -989,10 +993,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1078,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1327,13 +1328,13 @@ def test_session_entity_types_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4760,8 +4761,9 @@ def test_list_session_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4828,18 +4830,22 @@ def test_list_session_entity_types_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_list_session_entity_types" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_list_session_entity_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_list_session_entity_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_list_session_entity_types", + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_list_session_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_list_session_entity_types", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4899,8 +4905,9 @@ def test_get_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4970,18 +4977,20 @@ def test_get_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_get_session_entity_type" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_get_session_entity_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_get_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, "post_get_session_entity_type" + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_get_session_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, "pre_get_session_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5041,8 +5050,9 @@ def test_create_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5188,18 +5198,22 @@ def test_create_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_create_session_entity_type" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_create_session_entity_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_create_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_create_session_entity_type", + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_create_session_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_create_session_entity_type", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5261,8 +5275,9 @@ def test_update_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5410,18 +5425,22 @@ def test_update_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_update_session_entity_type" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_update_session_entity_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_update_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_update_session_entity_type", + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_update_session_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_update_session_entity_type", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5481,8 +5500,9 @@ def test_delete_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5541,13 +5561,14 @@ def test_delete_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "pre_delete_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_delete_session_entity_type", + ) as pre, + ): pre.assert_not_called() pb_message = session_entity_type.DeleteSessionEntityTypeRequest.pb( session_entity_type.DeleteSessionEntityTypeRequest() @@ -5592,8 +5613,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5652,8 +5674,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5714,8 +5737,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5776,8 +5800,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5836,8 +5861,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6064,11 +6090,14 @@ def test_session_entity_types_base_transport(): def test_session_entity_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionEntityTypesTransport( @@ -6088,9 +6117,12 @@ def test_session_entity_types_base_transport_with_credentials_file(): def test_session_entity_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionEntityTypesTransport() @@ -6168,11 +6200,12 @@ def test_session_entity_types_transport_auth_gdch_credentials(transport_class): def test_session_entity_types_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_sessions.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_sessions.py index 2b38a7616390..c8e76cab3f85 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_sessions.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_sessions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.sessions import ( SessionsAsyncClient, @@ -921,10 +926,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1236,13 +1238,13 @@ def test_sessions_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2506,9 +2508,9 @@ def test_submit_answer_feedback_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_answer_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_answer_feedback] = ( + mock_rpc + ) request = {} client.submit_answer_feedback(request) @@ -3136,9 +3138,9 @@ def test_submit_answer_feedback_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_answer_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_answer_feedback] = ( + mock_rpc + ) request = {} client.submit_answer_feedback(request) @@ -3652,8 +3654,9 @@ def test_detect_intent_rest_bad_request(request_type=session.DetectIntentRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3722,17 +3725,19 @@ def test_detect_intent_rest_interceptors(null_interceptor): ) client = SessionsClient(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.SessionsRestInterceptor, "post_detect_intent" - ) as post, mock.patch.object( - transports.SessionsRestInterceptor, "post_detect_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionsRestInterceptor, "pre_detect_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionsRestInterceptor, "post_detect_intent" + ) as post, + mock.patch.object( + transports.SessionsRestInterceptor, "post_detect_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionsRestInterceptor, "pre_detect_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3787,8 +3792,9 @@ def test_server_streaming_detect_intent_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3861,18 +3867,20 @@ def test_server_streaming_detect_intent_rest_interceptors(null_interceptor): ) client = SessionsClient(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.SessionsRestInterceptor, "post_server_streaming_detect_intent" - ) as post, mock.patch.object( - transports.SessionsRestInterceptor, - "post_server_streaming_detect_intent_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionsRestInterceptor, "pre_server_streaming_detect_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionsRestInterceptor, "post_server_streaming_detect_intent" + ) as post, + mock.patch.object( + transports.SessionsRestInterceptor, + "post_server_streaming_detect_intent_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionsRestInterceptor, "pre_server_streaming_detect_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3937,8 +3945,9 @@ def test_match_intent_rest_bad_request(request_type=session.MatchIntentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4000,17 +4009,19 @@ def test_match_intent_rest_interceptors(null_interceptor): ) client = SessionsClient(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.SessionsRestInterceptor, "post_match_intent" - ) as post, mock.patch.object( - transports.SessionsRestInterceptor, "post_match_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionsRestInterceptor, "pre_match_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionsRestInterceptor, "post_match_intent" + ) as post, + mock.patch.object( + transports.SessionsRestInterceptor, "post_match_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionsRestInterceptor, "pre_match_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4065,8 +4076,9 @@ def test_fulfill_intent_rest_bad_request(request_type=session.FulfillIntentReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4133,17 +4145,19 @@ def test_fulfill_intent_rest_interceptors(null_interceptor): ) client = SessionsClient(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.SessionsRestInterceptor, "post_fulfill_intent" - ) as post, mock.patch.object( - transports.SessionsRestInterceptor, "post_fulfill_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionsRestInterceptor, "pre_fulfill_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionsRestInterceptor, "post_fulfill_intent" + ) as post, + mock.patch.object( + transports.SessionsRestInterceptor, "post_fulfill_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionsRestInterceptor, "pre_fulfill_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4198,8 +4212,9 @@ def test_submit_answer_feedback_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4264,17 +4279,20 @@ def test_submit_answer_feedback_rest_interceptors(null_interceptor): ) client = SessionsClient(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.SessionsRestInterceptor, "post_submit_answer_feedback" - ) as post, mock.patch.object( - transports.SessionsRestInterceptor, "post_submit_answer_feedback_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionsRestInterceptor, "pre_submit_answer_feedback" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionsRestInterceptor, "post_submit_answer_feedback" + ) as post, + mock.patch.object( + transports.SessionsRestInterceptor, + "post_submit_answer_feedback_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionsRestInterceptor, "pre_submit_answer_feedback" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4327,8 +4345,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4387,8 +4406,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4449,8 +4469,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4511,8 +4532,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4571,8 +4593,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4794,11 +4817,14 @@ def test_sessions_base_transport(): def test_sessions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.sessions.transports.SessionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.sessions.transports.SessionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionsTransport( @@ -4818,9 +4844,12 @@ def test_sessions_base_transport_with_credentials_file(): def test_sessions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.sessions.transports.SessionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.sessions.transports.SessionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionsTransport() @@ -4898,11 +4927,12 @@ def test_sessions_transport_auth_gdch_credentials(transport_class): def test_sessions_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_test_cases.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_test_cases.py index 8ab82eb08d20..027cf026f05d 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_test_cases.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_test_cases.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.test_cases import ( TestCasesAsyncClient, @@ -85,10 +85,10 @@ page, response_message, session, + test_case, + tool_call, ) -from google.cloud.dialogflowcx_v3.types import test_case from google.cloud.dialogflowcx_v3.types import test_case as gcdc_test_case -from google.cloud.dialogflowcx_v3.types import tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -946,10 +946,9 @@ def test_test_cases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +993,9 @@ def test_test_cases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1031,9 @@ def test_test_cases_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1265,13 +1262,13 @@ def test_test_cases_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2567,9 +2564,9 @@ def test_create_test_case_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_test_case] = ( + mock_rpc + ) request = {} client.create_test_case(request) @@ -2910,9 +2907,9 @@ def test_update_test_case_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_test_case] = ( + mock_rpc + ) request = {} client.update_test_case(request) @@ -3503,9 +3500,9 @@ def test_batch_run_test_cases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_run_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_run_test_cases] = ( + mock_rpc + ) request = {} client.batch_run_test_cases(request) @@ -3765,9 +3762,9 @@ def test_calculate_coverage_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.calculate_coverage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.calculate_coverage] = ( + mock_rpc + ) request = {} client.calculate_coverage(request) @@ -4017,9 +4014,9 @@ def test_import_test_cases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_test_cases] = ( + mock_rpc + ) request = {} client.import_test_cases(request) @@ -4278,9 +4275,9 @@ def test_export_test_cases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_test_cases] = ( + mock_rpc + ) request = {} client.export_test_cases(request) @@ -4545,9 +4542,9 @@ def test_list_test_case_results_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_test_case_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_test_case_results] = ( + mock_rpc + ) request = {} client.list_test_case_results(request) @@ -5092,9 +5089,9 @@ def test_get_test_case_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_test_case_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_test_case_result] = ( + mock_rpc + ) request = {} client.get_test_case_result(request) @@ -5992,9 +5989,9 @@ def test_create_test_case_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_test_case] = ( + mock_rpc + ) request = {} client.create_test_case(request) @@ -6183,9 +6180,9 @@ def test_update_test_case_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_test_case] = ( + mock_rpc + ) request = {} client.update_test_case(request) @@ -6497,9 +6494,9 @@ def test_batch_run_test_cases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_run_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_run_test_cases] = ( + mock_rpc + ) request = {} client.batch_run_test_cases(request) @@ -6635,9 +6632,9 @@ def test_calculate_coverage_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.calculate_coverage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.calculate_coverage] = ( + mock_rpc + ) request = {} client.calculate_coverage(request) @@ -6767,9 +6764,9 @@ def test_import_test_cases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_test_cases] = ( + mock_rpc + ) request = {} client.import_test_cases(request) @@ -6891,9 +6888,9 @@ def test_export_test_cases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_test_cases] = ( + mock_rpc + ) request = {} client.export_test_cases(request) @@ -7018,9 +7015,9 @@ def test_list_test_case_results_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_test_case_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_test_case_results] = ( + mock_rpc + ) request = {} client.list_test_case_results(request) @@ -7284,9 +7281,9 @@ def test_get_test_case_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_test_case_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_test_case_result] = ( + mock_rpc + ) request = {} client.get_test_case_result(request) @@ -8184,8 +8181,9 @@ def test_list_test_cases_rest_bad_request(request_type=test_case.ListTestCasesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8246,17 +8244,19 @@ def test_list_test_cases_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_list_test_cases" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_list_test_cases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_list_test_cases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_list_test_cases" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_list_test_cases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_list_test_cases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8309,8 +8309,9 @@ def test_batch_delete_test_cases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8365,13 +8366,13 @@ def test_batch_delete_test_cases_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "pre_batch_delete_test_cases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_batch_delete_test_cases" + ) as pre, + ): pre.assert_not_called() pb_message = test_case.BatchDeleteTestCasesRequest.pb( test_case.BatchDeleteTestCasesRequest() @@ -8416,8 +8417,9 @@ def test_get_test_case_rest_bad_request(request_type=test_case.GetTestCaseReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8486,17 +8488,19 @@ def test_get_test_case_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_get_test_case" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_get_test_case_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_get_test_case" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_get_test_case" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_get_test_case_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_get_test_case" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8547,8 +8551,9 @@ def test_create_test_case_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8957,17 +8962,19 @@ def test_create_test_case_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_create_test_case" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_create_test_case_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_create_test_case" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_create_test_case" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_create_test_case_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_create_test_case" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9024,8 +9031,9 @@ def test_update_test_case_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9438,17 +9446,19 @@ def test_update_test_case_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_update_test_case" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_update_test_case_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_update_test_case" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_update_test_case" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_update_test_case_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_update_test_case" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9501,8 +9511,9 @@ def test_run_test_case_rest_bad_request(request_type=test_case.RunTestCaseReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9559,19 +9570,20 @@ def test_run_test_case_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_run_test_case" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_run_test_case_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_run_test_case" - ) as pre: + 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.TestCasesRestInterceptor, "post_run_test_case" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_run_test_case_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_run_test_case" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9622,8 +9634,9 @@ def test_batch_run_test_cases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9678,19 +9691,21 @@ def test_batch_run_test_cases_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_batch_run_test_cases" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_batch_run_test_cases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_batch_run_test_cases" - ) as pre: + 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.TestCasesRestInterceptor, "post_batch_run_test_cases" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, + "post_batch_run_test_cases_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_batch_run_test_cases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9743,8 +9758,9 @@ def test_calculate_coverage_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9805,17 +9821,19 @@ def test_calculate_coverage_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_calculate_coverage" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_calculate_coverage_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_calculate_coverage" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_calculate_coverage" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_calculate_coverage_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_calculate_coverage" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9873,8 +9891,9 @@ def test_import_test_cases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9929,19 +9948,20 @@ def test_import_test_cases_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_import_test_cases" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_import_test_cases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_import_test_cases" - ) as pre: + 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.TestCasesRestInterceptor, "post_import_test_cases" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_import_test_cases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_import_test_cases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9994,8 +10014,9 @@ def test_export_test_cases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10050,19 +10071,20 @@ def test_export_test_cases_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_export_test_cases" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_export_test_cases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_export_test_cases" - ) as pre: + 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.TestCasesRestInterceptor, "post_export_test_cases" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_export_test_cases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_export_test_cases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10117,8 +10139,9 @@ def test_list_test_case_results_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10181,17 +10204,20 @@ def test_list_test_case_results_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_list_test_case_results" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_list_test_case_results_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_list_test_case_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_list_test_case_results" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, + "post_list_test_case_results_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_list_test_case_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10251,8 +10277,9 @@ def test_get_test_case_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10319,17 +10346,20 @@ def test_get_test_case_result_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_get_test_case_result" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_get_test_case_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_get_test_case_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_get_test_case_result" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, + "post_get_test_case_result_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_get_test_case_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10382,8 +10412,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10442,8 +10473,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10504,8 +10536,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10566,8 +10599,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10626,8 +10660,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11027,11 +11062,14 @@ def test_test_cases_base_transport(): def test_test_cases_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.test_cases.transports.TestCasesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.test_cases.transports.TestCasesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TestCasesTransport( @@ -11051,9 +11089,12 @@ def test_test_cases_base_transport_with_credentials_file(): def test_test_cases_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.test_cases.transports.TestCasesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.test_cases.transports.TestCasesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TestCasesTransport() @@ -11131,11 +11172,12 @@ def test_test_cases_transport_auth_gdch_credentials(transport_class): def test_test_cases_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_tools.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_tools.py index 2961fa3f3246..4b077c32c967 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_tools.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_tools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.tools import ( ToolsAsyncClient, @@ -63,8 +68,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import data_store_connection -from google.cloud.dialogflowcx_v3.types import tool +from google.cloud.dialogflowcx_v3.types import data_store_connection, tool from google.cloud.dialogflowcx_v3.types import tool as gcdc_tool CRED_INFO_JSON = { @@ -898,10 +902,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -946,10 +949,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +987,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1213,13 +1214,13 @@ def test_tools_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3172,9 +3173,9 @@ def test_list_tool_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tool_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tool_versions] = ( + mock_rpc + ) request = {} client.list_tool_versions(request) @@ -3717,9 +3718,9 @@ def test_create_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tool_version] = ( + mock_rpc + ) request = {} client.create_tool_version(request) @@ -4062,9 +4063,9 @@ def test_get_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tool_version] = ( + mock_rpc + ) request = {} client.get_tool_version(request) @@ -4388,9 +4389,9 @@ def test_delete_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tool_version] = ( + mock_rpc + ) request = {} client.delete_tool_version(request) @@ -4717,9 +4718,9 @@ def test_restore_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_tool_version] = ( + mock_rpc + ) request = {} client.restore_tool_version(request) @@ -5959,9 +5960,9 @@ def test_list_tool_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tool_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tool_versions] = ( + mock_rpc + ) request = {} client.list_tool_versions(request) @@ -6221,9 +6222,9 @@ def test_create_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tool_version] = ( + mock_rpc + ) request = {} client.create_tool_version(request) @@ -6414,9 +6415,9 @@ def test_get_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tool_version] = ( + mock_rpc + ) request = {} client.get_tool_version(request) @@ -6596,9 +6597,9 @@ def test_delete_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tool_version] = ( + mock_rpc + ) request = {} client.delete_tool_version(request) @@ -6777,9 +6778,9 @@ def test_restore_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_tool_version] = ( + mock_rpc + ) request = {} client.restore_tool_version(request) @@ -7572,8 +7573,9 @@ def test_create_tool_rest_bad_request(request_type=gcdc_tool.CreateToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7757,17 +7759,15 @@ def test_create_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_create_tool" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_create_tool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_create_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_create_tool") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_create_tool_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_create_tool") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7816,8 +7816,9 @@ def test_list_tools_rest_bad_request(request_type=tool.ListToolsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7878,17 +7879,15 @@ def test_list_tools_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_list_tools" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_list_tools_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_list_tools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_list_tools") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_list_tools_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_list_tools") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7939,8 +7938,9 @@ def test_get_tool_rest_bad_request(request_type=tool.GetToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8009,17 +8009,15 @@ def test_get_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_get_tool" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_get_tool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_get_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_get_tool") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_get_tool_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_get_tool") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8072,8 +8070,9 @@ def test_update_tool_rest_bad_request(request_type=gcdc_tool.UpdateToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8261,17 +8260,15 @@ def test_update_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_update_tool" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_update_tool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_update_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_update_tool") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_update_tool_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_update_tool") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8322,8 +8319,9 @@ def test_delete_tool_rest_bad_request(request_type=tool.DeleteToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8380,13 +8378,11 @@ def test_delete_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "pre_delete_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "pre_delete_tool") as pre, + ): pre.assert_not_called() pb_message = tool.DeleteToolRequest.pb(tool.DeleteToolRequest()) transcode.return_value = { @@ -8429,8 +8425,9 @@ def test_list_tool_versions_rest_bad_request(request_type=tool.ListToolVersionsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8493,17 +8490,19 @@ def test_list_tool_versions_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_list_tool_versions" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_list_tool_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_list_tool_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ToolsRestInterceptor, "post_list_tool_versions" + ) as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_list_tool_versions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ToolsRestInterceptor, "pre_list_tool_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8558,8 +8557,9 @@ def test_create_tool_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8747,17 +8747,19 @@ def test_create_tool_version_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_create_tool_version" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_create_tool_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_create_tool_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ToolsRestInterceptor, "post_create_tool_version" + ) as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_create_tool_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ToolsRestInterceptor, "pre_create_tool_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8808,8 +8810,9 @@ def test_get_tool_version_rest_bad_request(request_type=tool.GetToolVersionReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8874,17 +8877,19 @@ def test_get_tool_version_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_get_tool_version" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_get_tool_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_get_tool_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ToolsRestInterceptor, "post_get_tool_version" + ) as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_get_tool_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ToolsRestInterceptor, "pre_get_tool_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8937,8 +8942,9 @@ def test_delete_tool_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8995,13 +9001,13 @@ def test_delete_tool_version_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "pre_delete_tool_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ToolsRestInterceptor, "pre_delete_tool_version" + ) as pre, + ): pre.assert_not_called() pb_message = tool.DeleteToolVersionRequest.pb(tool.DeleteToolVersionRequest()) transcode.return_value = { @@ -9046,8 +9052,9 @@ def test_restore_tool_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9107,17 +9114,19 @@ def test_restore_tool_version_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_restore_tool_version" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_restore_tool_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_restore_tool_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ToolsRestInterceptor, "post_restore_tool_version" + ) as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_restore_tool_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ToolsRestInterceptor, "pre_restore_tool_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9170,8 +9179,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9230,8 +9240,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9292,8 +9303,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9354,8 +9366,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9414,8 +9427,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9745,11 +9759,14 @@ def test_tools_base_transport(): def test_tools_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.tools.transports.ToolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.tools.transports.ToolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ToolsTransport( @@ -9769,9 +9786,12 @@ def test_tools_base_transport_with_credentials_file(): def test_tools_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.tools.transports.ToolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.tools.transports.ToolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ToolsTransport() @@ -9849,11 +9869,12 @@ def test_tools_transport_auth_gdch_credentials(transport_class): def test_tools_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_transition_route_groups.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_transition_route_groups.py index bfb58fc4534c..0f20c612e722 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_transition_route_groups.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_transition_route_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.transition_route_groups import ( TransitionRouteGroupsAsyncClient, @@ -70,11 +75,11 @@ page, response_message, tool_call, + transition_route_group, ) from google.cloud.dialogflowcx_v3.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3.types import transition_route_group CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1010,10 +1015,9 @@ def test_transition_route_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1062,9 @@ def test_transition_route_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1097,10 +1100,9 @@ def test_transition_route_groups_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1356,13 +1358,13 @@ def test_transition_route_groups_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4813,8 +4815,9 @@ def test_list_transition_route_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4881,20 +4884,22 @@ def test_list_transition_route_groups_rest_interceptors(null_interceptor): ) client = TransitionRouteGroupsClient(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.TransitionRouteGroupsRestInterceptor, - "post_list_transition_route_groups", - ) as post, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "post_list_transition_route_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "pre_list_transition_route_groups", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_list_transition_route_groups", + ) as post, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_list_transition_route_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "pre_list_transition_route_groups", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4954,8 +4959,9 @@ def test_get_transition_route_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5022,20 +5028,22 @@ def test_get_transition_route_group_rest_interceptors(null_interceptor): ) client = TransitionRouteGroupsClient(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.TransitionRouteGroupsRestInterceptor, - "post_get_transition_route_group", - ) as post, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "post_get_transition_route_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "pre_get_transition_route_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_get_transition_route_group", + ) as post, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_get_transition_route_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "pre_get_transition_route_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5095,8 +5103,9 @@ def test_create_transition_route_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5350,20 +5359,22 @@ def test_create_transition_route_group_rest_interceptors(null_interceptor): ) client = TransitionRouteGroupsClient(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.TransitionRouteGroupsRestInterceptor, - "post_create_transition_route_group", - ) as post, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "post_create_transition_route_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "pre_create_transition_route_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_create_transition_route_group", + ) as post, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_create_transition_route_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "pre_create_transition_route_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5425,8 +5436,9 @@ def test_update_transition_route_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5682,20 +5694,22 @@ def test_update_transition_route_group_rest_interceptors(null_interceptor): ) client = TransitionRouteGroupsClient(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.TransitionRouteGroupsRestInterceptor, - "post_update_transition_route_group", - ) as post, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "post_update_transition_route_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "pre_update_transition_route_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_update_transition_route_group", + ) as post, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_update_transition_route_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "pre_update_transition_route_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5755,8 +5769,9 @@ def test_delete_transition_route_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5815,14 +5830,14 @@ def test_delete_transition_route_group_rest_interceptors(null_interceptor): ) client = TransitionRouteGroupsClient(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.TransitionRouteGroupsRestInterceptor, - "pre_delete_transition_route_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "pre_delete_transition_route_group", + ) as pre, + ): pre.assert_not_called() pb_message = transition_route_group.DeleteTransitionRouteGroupRequest.pb( transition_route_group.DeleteTransitionRouteGroupRequest() @@ -5867,8 +5882,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5927,8 +5943,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5989,8 +6006,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6051,8 +6069,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6111,8 +6130,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6339,11 +6359,14 @@ def test_transition_route_groups_base_transport(): def test_transition_route_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.transition_route_groups.transports.TransitionRouteGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.transition_route_groups.transports.TransitionRouteGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TransitionRouteGroupsTransport( @@ -6363,9 +6386,12 @@ def test_transition_route_groups_base_transport_with_credentials_file(): def test_transition_route_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.transition_route_groups.transports.TransitionRouteGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.transition_route_groups.transports.TransitionRouteGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TransitionRouteGroupsTransport() @@ -6445,11 +6471,12 @@ def test_transition_route_groups_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_versions.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_versions.py index a4b62759b3d6..339c3dedcd74 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_versions.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_versions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.versions import ( VersionsAsyncClient, @@ -73,8 +73,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3.types import flow -from google.cloud.dialogflowcx_v3.types import version +from google.cloud.dialogflowcx_v3.types import flow, version from google.cloud.dialogflowcx_v3.types import version as gcdc_version CRED_INFO_JSON = { @@ -924,10 +923,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1011,10 +1008,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1239,13 +1235,13 @@ def test_versions_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3527,9 +3523,9 @@ def test_compare_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compare_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compare_versions] = ( + mock_rpc + ) request = {} client.compare_versions(request) @@ -4955,9 +4951,9 @@ def test_compare_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compare_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compare_versions] = ( + mock_rpc + ) request = {} client.compare_versions(request) @@ -5602,8 +5598,9 @@ def test_list_versions_rest_bad_request(request_type=version.ListVersionsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5666,17 +5663,19 @@ def test_list_versions_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_list_versions" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_list_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_list_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_list_versions" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_list_versions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_list_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5729,8 +5728,9 @@ def test_get_version_rest_bad_request(request_type=version.GetVersionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5799,17 +5799,17 @@ def test_get_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_get_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_get_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_get_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_get_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_get_version_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VersionsRestInterceptor, "pre_get_version") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5862,8 +5862,9 @@ def test_create_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5999,19 +6000,20 @@ def test_create_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_create_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_create_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_create_version" - ) as pre: + 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.VersionsRestInterceptor, "post_create_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_create_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_create_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6068,8 +6070,9 @@ def test_update_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6219,17 +6222,19 @@ def test_update_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_update_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_update_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_update_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_update_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_update_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_update_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6282,8 +6287,9 @@ def test_delete_version_rest_bad_request(request_type=version.DeleteVersionReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6340,13 +6346,13 @@ def test_delete_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "pre_delete_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_delete_version" + ) as pre, + ): pre.assert_not_called() pb_message = version.DeleteVersionRequest.pb(version.DeleteVersionRequest()) transcode.return_value = { @@ -6389,8 +6395,9 @@ def test_load_version_rest_bad_request(request_type=version.LoadVersionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6447,19 +6454,20 @@ def test_load_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_load_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_load_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_load_version" - ) as pre: + 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.VersionsRestInterceptor, "post_load_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_load_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_load_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6510,8 +6518,9 @@ def test_compare_versions_rest_bad_request(request_type=version.CompareVersionsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6576,17 +6585,19 @@ def test_compare_versions_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_compare_versions" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_compare_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_compare_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_compare_versions" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_compare_versions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_compare_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6639,8 +6650,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6699,8 +6711,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6761,8 +6774,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6823,8 +6837,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6883,8 +6898,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7165,11 +7181,14 @@ def test_versions_base_transport(): def test_versions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.versions.transports.VersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.versions.transports.VersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VersionsTransport( @@ -7189,9 +7208,12 @@ def test_versions_base_transport_with_credentials_file(): def test_versions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.versions.transports.VersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.versions.transports.VersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VersionsTransport() @@ -7269,11 +7291,12 @@ def test_versions_transport_auth_gdch_credentials(transport_class): def test_versions_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_webhooks.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_webhooks.py index a09bcfe73b84..ec2e041bd5b7 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_webhooks.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3/test_webhooks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3.services.webhooks import ( WebhooksAsyncClient, @@ -912,10 +917,9 @@ def test_webhooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +964,9 @@ def test_webhooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1002,9 @@ def test_webhooks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1227,13 +1229,13 @@ def test_webhooks_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4447,8 +4449,9 @@ def test_list_webhooks_rest_bad_request(request_type=webhook.ListWebhooksRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4509,17 +4512,19 @@ def test_list_webhooks_rest_interceptors(null_interceptor): ) client = WebhooksClient(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.WebhooksRestInterceptor, "post_list_webhooks" - ) as post, mock.patch.object( - transports.WebhooksRestInterceptor, "post_list_webhooks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WebhooksRestInterceptor, "pre_list_webhooks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_list_webhooks" + ) as post, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_list_webhooks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.WebhooksRestInterceptor, "pre_list_webhooks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4572,8 +4577,9 @@ def test_get_webhook_rest_bad_request(request_type=webhook.GetWebhookRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4640,17 +4646,17 @@ def test_get_webhook_rest_interceptors(null_interceptor): ) client = WebhooksClient(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.WebhooksRestInterceptor, "post_get_webhook" - ) as post, mock.patch.object( - transports.WebhooksRestInterceptor, "post_get_webhook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WebhooksRestInterceptor, "pre_get_webhook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_get_webhook" + ) as post, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_get_webhook_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.WebhooksRestInterceptor, "pre_get_webhook") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4701,8 +4707,9 @@ def test_create_webhook_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4863,17 +4870,19 @@ def test_create_webhook_rest_interceptors(null_interceptor): ) client = WebhooksClient(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.WebhooksRestInterceptor, "post_create_webhook" - ) as post, mock.patch.object( - transports.WebhooksRestInterceptor, "post_create_webhook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WebhooksRestInterceptor, "pre_create_webhook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_create_webhook" + ) as post, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_create_webhook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.WebhooksRestInterceptor, "pre_create_webhook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4930,8 +4939,9 @@ def test_update_webhook_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5096,17 +5106,19 @@ def test_update_webhook_rest_interceptors(null_interceptor): ) client = WebhooksClient(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.WebhooksRestInterceptor, "post_update_webhook" - ) as post, mock.patch.object( - transports.WebhooksRestInterceptor, "post_update_webhook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WebhooksRestInterceptor, "pre_update_webhook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_update_webhook" + ) as post, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_update_webhook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.WebhooksRestInterceptor, "pre_update_webhook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5159,8 +5171,9 @@ def test_delete_webhook_rest_bad_request(request_type=webhook.DeleteWebhookReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5217,13 +5230,13 @@ def test_delete_webhook_rest_interceptors(null_interceptor): ) client = WebhooksClient(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.WebhooksRestInterceptor, "pre_delete_webhook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WebhooksRestInterceptor, "pre_delete_webhook" + ) as pre, + ): pre.assert_not_called() pb_message = webhook.DeleteWebhookRequest.pb(webhook.DeleteWebhookRequest()) transcode.return_value = { @@ -5266,8 +5279,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5326,8 +5340,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5388,8 +5403,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5450,8 +5466,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5510,8 +5527,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5728,11 +5746,14 @@ def test_webhooks_base_transport(): def test_webhooks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3.services.webhooks.transports.WebhooksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3.services.webhooks.transports.WebhooksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.WebhooksTransport( @@ -5752,9 +5773,12 @@ def test_webhooks_base_transport_with_credentials_file(): def test_webhooks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3.services.webhooks.transports.WebhooksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3.services.webhooks.transports.WebhooksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.WebhooksTransport() @@ -5832,11 +5856,12 @@ def test_webhooks_transport_auth_gdch_credentials(transport_class): def test_webhooks_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_agents.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_agents.py index 01eb23fa2678..fa162304b523 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_agents.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_agents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.agents import ( AgentsAsyncClient, @@ -74,19 +74,19 @@ transports, ) from google.cloud.dialogflowcx_v3beta1.types import ( + advanced_settings, + agent, audio_config, bigquery_export, flow, gcs, + generative_settings, + safety_settings, ) +from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent from google.cloud.dialogflowcx_v3beta1.types import ( generative_settings as gcdc_generative_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import advanced_settings -from google.cloud.dialogflowcx_v3beta1.types import agent -from google.cloud.dialogflowcx_v3beta1.types import agent as gcdc_agent -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import safety_settings CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -923,10 +923,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +970,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1008,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1238,13 +1235,13 @@ def test_agents_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -7650,8 +7647,9 @@ def test_list_agents_rest_bad_request(request_type=agent.ListAgentsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7712,17 +7710,15 @@ def test_list_agents_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_list_agents" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_list_agents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_list_agents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AgentsRestInterceptor, "post_list_agents") as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_list_agents_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_list_agents") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7771,8 +7767,9 @@ def test_get_agent_rest_bad_request(request_type=agent.GetAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7860,17 +7857,15 @@ def test_get_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_get_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_get_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_get_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AgentsRestInterceptor, "post_get_agent") as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_get_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_get_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7919,8 +7914,9 @@ def test_create_agent_rest_bad_request(request_type=gcdc_agent.CreateAgentReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8147,17 +8143,17 @@ def test_create_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_create_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_create_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_create_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_create_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_create_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_create_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8208,8 +8204,9 @@ def test_update_agent_rest_bad_request(request_type=gcdc_agent.UpdateAgentReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8438,17 +8435,17 @@ def test_update_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_update_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_update_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_update_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_update_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_update_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_update_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8497,8 +8494,9 @@ def test_delete_agent_rest_bad_request(request_type=agent.DeleteAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8553,13 +8551,11 @@ def test_delete_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "pre_delete_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AgentsRestInterceptor, "pre_delete_agent") as pre, + ): pre.assert_not_called() pb_message = agent.DeleteAgentRequest.pb(agent.DeleteAgentRequest()) transcode.return_value = { @@ -8600,8 +8596,9 @@ def test_export_agent_rest_bad_request(request_type=agent.ExportAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8656,19 +8653,18 @@ def test_export_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_export_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_export_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_export_agent" - ) as pre: + 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.AgentsRestInterceptor, "post_export_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_export_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_export_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8717,8 +8713,9 @@ def test_restore_agent_rest_bad_request(request_type=agent.RestoreAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8773,19 +8770,18 @@ def test_restore_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_restore_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_restore_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_restore_agent" - ) as pre: + 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.AgentsRestInterceptor, "post_restore_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_restore_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_restore_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8834,8 +8830,9 @@ def test_validate_agent_rest_bad_request(request_type=agent.ValidateAgentRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8896,17 +8893,19 @@ def test_validate_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_validate_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_validate_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_validate_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_validate_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_validate_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AgentsRestInterceptor, "pre_validate_agent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8961,8 +8960,9 @@ def test_get_agent_validation_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9025,18 +9025,20 @@ def test_get_agent_validation_result_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_get_agent_validation_result" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, - "post_get_agent_validation_result_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_get_agent_validation_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_get_agent_validation_result" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, + "post_get_agent_validation_result_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AgentsRestInterceptor, "pre_get_agent_validation_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9093,8 +9095,9 @@ def test_get_generative_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9159,17 +9162,20 @@ def test_get_generative_settings_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_get_generative_settings" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_get_generative_settings_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_get_generative_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_get_generative_settings" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, + "post_get_generative_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AgentsRestInterceptor, "pre_get_generative_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9231,8 +9237,9 @@ def test_update_generative_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9408,18 +9415,20 @@ def test_update_generative_settings_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_update_generative_settings" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, - "post_update_generative_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_update_generative_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_update_generative_settings" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, + "post_update_generative_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AgentsRestInterceptor, "pre_update_generative_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9477,8 +9486,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9537,8 +9547,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9599,8 +9610,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9661,8 +9673,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9721,8 +9734,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10093,11 +10107,14 @@ def test_agents_base_transport(): def test_agents_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.agents.transports.AgentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.agents.transports.AgentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AgentsTransport( @@ -10117,9 +10134,12 @@ def test_agents_base_transport_with_credentials_file(): def test_agents_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.agents.transports.AgentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.agents.transports.AgentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AgentsTransport() @@ -10197,11 +10217,12 @@ def test_agents_transport_auth_gdch_credentials(transport_class): def test_agents_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_changelogs.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_changelogs.py index e53d8b47a933..8d0dc4f08ddc 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_changelogs.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_changelogs.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.changelogs import ( ChangelogsAsyncClient, @@ -921,10 +926,9 @@ def test_changelogs_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_changelogs_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_changelogs_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,13 +1242,13 @@ def test_changelogs_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2807,8 +2809,9 @@ def test_list_changelogs_rest_bad_request(request_type=changelog.ListChangelogsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2871,17 +2874,19 @@ def test_list_changelogs_rest_interceptors(null_interceptor): ) client = ChangelogsClient(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.ChangelogsRestInterceptor, "post_list_changelogs" - ) as post, mock.patch.object( - transports.ChangelogsRestInterceptor, "post_list_changelogs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChangelogsRestInterceptor, "pre_list_changelogs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChangelogsRestInterceptor, "post_list_changelogs" + ) as post, + mock.patch.object( + transports.ChangelogsRestInterceptor, "post_list_changelogs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChangelogsRestInterceptor, "pre_list_changelogs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2936,8 +2941,9 @@ def test_get_changelog_rest_bad_request(request_type=changelog.GetChangelogReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3014,17 +3020,19 @@ def test_get_changelog_rest_interceptors(null_interceptor): ) client = ChangelogsClient(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.ChangelogsRestInterceptor, "post_get_changelog" - ) as post, mock.patch.object( - transports.ChangelogsRestInterceptor, "post_get_changelog_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChangelogsRestInterceptor, "pre_get_changelog" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChangelogsRestInterceptor, "post_get_changelog" + ) as post, + mock.patch.object( + transports.ChangelogsRestInterceptor, "post_get_changelog_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChangelogsRestInterceptor, "pre_get_changelog" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3075,8 +3083,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3135,8 +3144,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3197,8 +3207,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3259,8 +3270,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3319,8 +3331,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3474,11 +3487,14 @@ def test_changelogs_base_transport(): def test_changelogs_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.changelogs.transports.ChangelogsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.changelogs.transports.ChangelogsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ChangelogsTransport( @@ -3498,9 +3514,12 @@ def test_changelogs_base_transport_with_credentials_file(): def test_changelogs_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.changelogs.transports.ChangelogsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.changelogs.transports.ChangelogsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ChangelogsTransport() @@ -3578,11 +3597,12 @@ def test_changelogs_transport_auth_gdch_credentials(transport_class): def test_changelogs_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_conversation_history.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_conversation_history.py index a7306782e95d..e53e17269109 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_conversation_history.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_conversation_history.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.conversation_history import ( ConversationHistoryAsyncClient, @@ -1002,10 +1007,9 @@ def test_conversation_history_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1050,10 +1054,9 @@ def test_conversation_history_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1089,10 +1092,9 @@ def test_conversation_history_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1348,13 +1350,13 @@ def test_conversation_history_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1474,9 +1476,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -2016,9 +2018,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -2349,9 +2351,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2614,9 +2616,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -2876,9 +2878,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -3060,9 +3062,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -3504,8 +3506,9 @@ def test_list_conversations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3568,18 +3571,20 @@ def test_list_conversations_rest_interceptors(null_interceptor): ) client = ConversationHistoryClient(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.ConversationHistoryRestInterceptor, "post_list_conversations" - ) as post, mock.patch.object( - transports.ConversationHistoryRestInterceptor, - "post_list_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationHistoryRestInterceptor, "pre_list_conversations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationHistoryRestInterceptor, "post_list_conversations" + ) as post, + mock.patch.object( + transports.ConversationHistoryRestInterceptor, + "post_list_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationHistoryRestInterceptor, "pre_list_conversations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3639,8 +3644,9 @@ def test_get_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3709,18 +3715,20 @@ def test_get_conversation_rest_interceptors(null_interceptor): ) client = ConversationHistoryClient(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.ConversationHistoryRestInterceptor, "post_get_conversation" - ) as post, mock.patch.object( - transports.ConversationHistoryRestInterceptor, - "post_get_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationHistoryRestInterceptor, "pre_get_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationHistoryRestInterceptor, "post_get_conversation" + ) as post, + mock.patch.object( + transports.ConversationHistoryRestInterceptor, + "post_get_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationHistoryRestInterceptor, "pre_get_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3777,8 +3785,9 @@ def test_delete_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3837,13 +3846,13 @@ def test_delete_conversation_rest_interceptors(null_interceptor): ) client = ConversationHistoryClient(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.ConversationHistoryRestInterceptor, "pre_delete_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationHistoryRestInterceptor, "pre_delete_conversation" + ) as pre, + ): pre.assert_not_called() pb_message = conversation_history.DeleteConversationRequest.pb( conversation_history.DeleteConversationRequest() @@ -3888,8 +3897,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3948,8 +3958,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4010,8 +4021,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4072,8 +4084,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4132,8 +4145,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4312,11 +4326,14 @@ def test_conversation_history_base_transport(): def test_conversation_history_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.conversation_history.transports.ConversationHistoryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.conversation_history.transports.ConversationHistoryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationHistoryTransport( @@ -4336,9 +4353,12 @@ def test_conversation_history_base_transport_with_credentials_file(): def test_conversation_history_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.conversation_history.transports.ConversationHistoryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.conversation_history.transports.ConversationHistoryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationHistoryTransport() @@ -4416,11 +4436,12 @@ def test_conversation_history_transport_auth_gdch_credentials(transport_class): def test_conversation_history_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_deployments.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_deployments.py index 0034f050f024..0e4d6893aef8 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_deployments.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_deployments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.deployments import ( DeploymentsAsyncClient, @@ -925,10 +930,9 @@ def test_deployments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +977,9 @@ def test_deployments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1015,9 @@ def test_deployments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1244,13 +1246,13 @@ def test_deployments_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1362,9 +1364,9 @@ def test_list_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -2148,9 +2150,9 @@ def test_list_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -2807,8 +2809,9 @@ def test_list_deployments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2873,17 +2876,19 @@ def test_list_deployments_rest_interceptors(null_interceptor): ) client = DeploymentsClient(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.DeploymentsRestInterceptor, "post_list_deployments" - ) as post, mock.patch.object( - transports.DeploymentsRestInterceptor, "post_list_deployments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DeploymentsRestInterceptor, "pre_list_deployments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeploymentsRestInterceptor, "post_list_deployments" + ) as post, + mock.patch.object( + transports.DeploymentsRestInterceptor, "post_list_deployments_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DeploymentsRestInterceptor, "pre_list_deployments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2938,8 +2943,9 @@ def test_get_deployment_rest_bad_request(request_type=deployment.GetDeploymentRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3008,17 +3014,19 @@ def test_get_deployment_rest_interceptors(null_interceptor): ) client = DeploymentsClient(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.DeploymentsRestInterceptor, "post_get_deployment" - ) as post, mock.patch.object( - transports.DeploymentsRestInterceptor, "post_get_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DeploymentsRestInterceptor, "pre_get_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DeploymentsRestInterceptor, "post_get_deployment" + ) as post, + mock.patch.object( + transports.DeploymentsRestInterceptor, "post_get_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DeploymentsRestInterceptor, "pre_get_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3071,8 +3079,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3131,8 +3140,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3193,8 +3203,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3255,8 +3266,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3315,8 +3327,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3470,11 +3483,14 @@ def test_deployments_base_transport(): def test_deployments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.deployments.transports.DeploymentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.deployments.transports.DeploymentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeploymentsTransport( @@ -3494,9 +3510,12 @@ def test_deployments_base_transport_with_credentials_file(): def test_deployments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.deployments.transports.DeploymentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.deployments.transports.DeploymentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DeploymentsTransport() @@ -3574,11 +3593,12 @@ def test_deployments_transport_auth_gdch_credentials(transport_class): def test_deployments_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_entity_types.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_entity_types.py index 9ec231bb0377..c39594cfd640 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_entity_types.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.entity_types import ( EntityTypesAsyncClient, @@ -70,9 +70,8 @@ pagers, transports, ) +from google.cloud.dialogflowcx_v3beta1.types import entity_type, inline from google.cloud.dialogflowcx_v3beta1.types import entity_type as gcdc_entity_type -from google.cloud.dialogflowcx_v3beta1.types import entity_type -from google.cloud.dialogflowcx_v3beta1.types import inline CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -936,10 +935,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +982,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1020,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1255,13 +1251,13 @@ def test_entity_types_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1743,9 +1739,9 @@ def test_create_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -2121,9 +2117,9 @@ def test_update_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -2483,9 +2479,9 @@ def test_delete_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -2817,9 +2813,9 @@ def test_list_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -3361,9 +3357,9 @@ def test_export_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_entity_types] = ( + mock_rpc + ) request = {} client.export_entity_types(request) @@ -3624,9 +3620,9 @@ def test_import_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_entity_types] = ( + mock_rpc + ) request = {} client.import_entity_types(request) @@ -4000,9 +3996,9 @@ def test_create_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -4195,9 +4191,9 @@ def test_update_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -4394,9 +4390,9 @@ def test_delete_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -4573,9 +4569,9 @@ def test_list_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -4835,9 +4831,9 @@ def test_export_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_entity_types] = ( + mock_rpc + ) request = {} client.export_entity_types(request) @@ -4973,9 +4969,9 @@ def test_import_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_entity_types] = ( + mock_rpc + ) request = {} client.import_entity_types(request) @@ -5591,8 +5587,9 @@ def test_get_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5670,17 +5667,19 @@ def test_get_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_get_entity_type" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_get_entity_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_get_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_get_entity_type" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_get_entity_type_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_get_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5733,8 +5732,9 @@ def test_create_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5889,17 +5889,20 @@ def test_create_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_create_entity_type" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_create_entity_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_create_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_create_entity_type" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_create_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_create_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5958,8 +5961,9 @@ def test_update_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6118,17 +6122,20 @@ def test_update_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_update_entity_type" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_update_entity_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_update_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_update_entity_type" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_update_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_update_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6185,8 +6192,9 @@ def test_delete_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6245,13 +6253,13 @@ def test_delete_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "pre_delete_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_delete_entity_type" + ) as pre, + ): pre.assert_not_called() pb_message = entity_type.DeleteEntityTypeRequest.pb( entity_type.DeleteEntityTypeRequest() @@ -6296,8 +6304,9 @@ def test_list_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6360,17 +6369,20 @@ def test_list_entity_types_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_list_entity_types" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_list_entity_types_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_list_entity_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_list_entity_types" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_list_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_list_entity_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6428,8 +6440,9 @@ def test_export_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6486,19 +6499,21 @@ def test_export_entity_types_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_export_entity_types" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_export_entity_types_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_export_entity_types" - ) as pre: + 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.EntityTypesRestInterceptor, "post_export_entity_types" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_export_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_export_entity_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6551,8 +6566,9 @@ def test_import_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6609,19 +6625,21 @@ def test_import_entity_types_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_import_entity_types" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_import_entity_types_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_import_entity_types" - ) as pre: + 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.EntityTypesRestInterceptor, "post_import_entity_types" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_import_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_import_entity_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6674,8 +6692,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6734,8 +6753,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6796,8 +6816,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6858,8 +6879,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6918,8 +6940,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7212,11 +7235,14 @@ def test_entity_types_base_transport(): def test_entity_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EntityTypesTransport( @@ -7236,9 +7262,12 @@ def test_entity_types_base_transport_with_credentials_file(): def test_entity_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EntityTypesTransport() @@ -7316,11 +7345,12 @@ def test_entity_types_transport_auth_gdch_credentials(transport_class): def test_entity_types_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_environments.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_environments.py index 0f7ce2c2e75d..2ac68bd2757a 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_environments.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_environments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.environments import ( EnvironmentsAsyncClient, @@ -73,9 +73,8 @@ pagers, transports, ) +from google.cloud.dialogflowcx_v3beta1.types import environment, webhook from google.cloud.dialogflowcx_v3beta1.types import environment as gcdc_environment -from google.cloud.dialogflowcx_v3beta1.types import environment -from google.cloud.dialogflowcx_v3beta1.types import webhook CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -943,10 +942,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +989,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1027,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1272,13 +1268,13 @@ def test_environments_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1394,9 +1390,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -2265,9 +2261,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -2617,9 +2613,9 @@ def test_update_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -2973,9 +2969,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -3851,9 +3847,9 @@ def test_run_continuous_test_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_continuous_test - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_continuous_test] = ( + mock_rpc + ) request = {} client.run_continuous_test(request) @@ -4839,9 +4835,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -5279,9 +5275,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -5471,9 +5467,9 @@ def test_update_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -5664,9 +5660,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -6108,9 +6104,9 @@ def test_run_continuous_test_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.run_continuous_test - ] = mock_rpc + client._transport._wrapped_methods[client._transport.run_continuous_test] = ( + mock_rpc + ) request = {} client.run_continuous_test(request) @@ -7198,8 +7194,9 @@ def test_list_environments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7262,17 +7259,20 @@ def test_list_environments_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_environments" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_list_environments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_environments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_environments" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_environments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_list_environments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7332,8 +7332,9 @@ def test_get_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7402,17 +7403,19 @@ def test_get_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_get_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_get_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_get_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_get_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7465,8 +7468,9 @@ def test_create_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7643,19 +7647,21 @@ def test_create_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_create_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_create_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_create_environment" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_create_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_create_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_create_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7712,8 +7718,9 @@ def test_update_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7894,19 +7901,21 @@ def test_update_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_update_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_update_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_update_environment" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_update_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_update_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_update_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7961,8 +7970,9 @@ def test_delete_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8021,13 +8031,13 @@ def test_delete_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "pre_delete_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_delete_environment" + ) as pre, + ): pre.assert_not_called() pb_message = environment.DeleteEnvironmentRequest.pb( environment.DeleteEnvironmentRequest() @@ -8074,8 +8084,9 @@ def test_lookup_environment_history_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8140,18 +8151,20 @@ def test_lookup_environment_history_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_lookup_environment_history" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_lookup_environment_history_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_lookup_environment_history" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_lookup_environment_history" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_lookup_environment_history_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_lookup_environment_history" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8211,8 +8224,9 @@ def test_run_continuous_test_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8271,19 +8285,21 @@ def test_run_continuous_test_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_run_continuous_test" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_run_continuous_test_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_run_continuous_test" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_run_continuous_test" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_run_continuous_test_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_run_continuous_test" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8338,8 +8354,9 @@ def test_list_continuous_test_results_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8404,18 +8421,20 @@ def test_list_continuous_test_results_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_continuous_test_results" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_list_continuous_test_results_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_continuous_test_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_continuous_test_results" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_continuous_test_results_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_list_continuous_test_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8473,8 +8492,9 @@ def test_deploy_flow_rest_bad_request(request_type=environment.DeployFlowRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8533,19 +8553,20 @@ def test_deploy_flow_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_deploy_flow" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_deploy_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_deploy_flow" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_deploy_flow" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_deploy_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_deploy_flow" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8596,8 +8617,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8656,8 +8678,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8718,8 +8741,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8780,8 +8804,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8840,8 +8865,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9178,11 +9204,14 @@ def test_environments_base_transport(): def test_environments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnvironmentsTransport( @@ -9202,9 +9231,12 @@ def test_environments_base_transport_with_credentials_file(): def test_environments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnvironmentsTransport() @@ -9282,11 +9314,12 @@ def test_environments_transport_auth_gdch_credentials(transport_class): def test_environments_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_examples.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_examples.py index 60e52e24473c..9d1f90a62a5b 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_examples.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_examples.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.examples import ( ExamplesAsyncClient, @@ -63,10 +68,12 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3beta1.types import data_store_connection -from google.cloud.dialogflowcx_v3beta1.types import example +from google.cloud.dialogflowcx_v3beta1.types import ( + data_store_connection, + example, + trace, +) from google.cloud.dialogflowcx_v3beta1.types import example as gcdc_example -from google.cloud.dialogflowcx_v3beta1.types import trace CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -915,10 +922,9 @@ def test_examples_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -963,10 +969,9 @@ def test_examples_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1002,10 +1007,9 @@ def test_examples_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1230,13 +1234,13 @@ def test_examples_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4507,8 +4511,9 @@ def test_create_example_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4819,17 +4824,19 @@ def test_create_example_rest_interceptors(null_interceptor): ) client = ExamplesClient(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.ExamplesRestInterceptor, "post_create_example" - ) as post, mock.patch.object( - transports.ExamplesRestInterceptor, "post_create_example_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExamplesRestInterceptor, "pre_create_example" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_create_example" + ) as post, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_create_example_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExamplesRestInterceptor, "pre_create_example" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4882,8 +4889,9 @@ def test_delete_example_rest_bad_request(request_type=example.DeleteExampleReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4940,13 +4948,13 @@ def test_delete_example_rest_interceptors(null_interceptor): ) client = ExamplesClient(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.ExamplesRestInterceptor, "pre_delete_example" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExamplesRestInterceptor, "pre_delete_example" + ) as pre, + ): pre.assert_not_called() pb_message = example.DeleteExampleRequest.pb(example.DeleteExampleRequest()) transcode.return_value = { @@ -4989,8 +4997,9 @@ def test_list_examples_rest_bad_request(request_type=example.ListExamplesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5053,17 +5062,19 @@ def test_list_examples_rest_interceptors(null_interceptor): ) client = ExamplesClient(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.ExamplesRestInterceptor, "post_list_examples" - ) as post, mock.patch.object( - transports.ExamplesRestInterceptor, "post_list_examples_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExamplesRestInterceptor, "pre_list_examples" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_list_examples" + ) as post, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_list_examples_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExamplesRestInterceptor, "pre_list_examples" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5116,8 +5127,9 @@ def test_get_example_rest_bad_request(request_type=example.GetExampleRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5190,17 +5202,17 @@ def test_get_example_rest_interceptors(null_interceptor): ) client = ExamplesClient(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.ExamplesRestInterceptor, "post_get_example" - ) as post, mock.patch.object( - transports.ExamplesRestInterceptor, "post_get_example_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExamplesRestInterceptor, "pre_get_example" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_get_example" + ) as post, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_get_example_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ExamplesRestInterceptor, "pre_get_example") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5255,8 +5267,9 @@ def test_update_example_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5569,17 +5582,19 @@ def test_update_example_rest_interceptors(null_interceptor): ) client = ExamplesClient(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.ExamplesRestInterceptor, "post_update_example" - ) as post, mock.patch.object( - transports.ExamplesRestInterceptor, "post_update_example_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExamplesRestInterceptor, "pre_update_example" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_update_example" + ) as post, + mock.patch.object( + transports.ExamplesRestInterceptor, "post_update_example_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExamplesRestInterceptor, "pre_update_example" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5632,8 +5647,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5692,8 +5708,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5754,8 +5771,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5816,8 +5834,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5876,8 +5895,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6094,11 +6114,14 @@ def test_examples_base_transport(): def test_examples_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.examples.transports.ExamplesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.examples.transports.ExamplesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ExamplesTransport( @@ -6118,9 +6141,12 @@ def test_examples_base_transport_with_credentials_file(): def test_examples_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.examples.transports.ExamplesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.examples.transports.ExamplesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ExamplesTransport() @@ -6198,11 +6224,12 @@ def test_examples_transport_auth_gdch_credentials(transport_class): def test_examples_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_experiments.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_experiments.py index f845b6acaf55..113e6b3210fb 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_experiments.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_experiments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.experiments import ( ExperimentsAsyncClient, @@ -63,8 +68,8 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment from google.cloud.dialogflowcx_v3beta1.types import experiment +from google.cloud.dialogflowcx_v3beta1.types import experiment as gcdc_experiment CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -928,10 +933,9 @@ def test_experiments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +980,9 @@ def test_experiments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1018,9 @@ def test_experiments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1247,13 +1249,13 @@ def test_experiments_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1365,9 +1367,9 @@ def test_list_experiments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_experiments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_experiments] = ( + mock_rpc + ) request = {} client.list_experiments(request) @@ -2235,9 +2237,9 @@ def test_create_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_experiment] = ( + mock_rpc + ) request = {} client.create_experiment(request) @@ -2597,9 +2599,9 @@ def test_update_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_experiment] = ( + mock_rpc + ) request = {} client.update_experiment(request) @@ -2952,9 +2954,9 @@ def test_delete_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_experiment] = ( + mock_rpc + ) request = {} client.delete_experiment(request) @@ -3286,9 +3288,9 @@ def test_start_experiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_experiment] = ( + mock_rpc + ) request = {} client.start_experiment(request) @@ -3894,9 +3896,9 @@ def test_list_experiments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_experiments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_experiments] = ( + mock_rpc + ) request = {} client.list_experiments(request) @@ -4336,9 +4338,9 @@ def test_create_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_experiment] = ( + mock_rpc + ) request = {} client.create_experiment(request) @@ -4529,9 +4531,9 @@ def test_update_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_experiment] = ( + mock_rpc + ) request = {} client.update_experiment(request) @@ -4721,9 +4723,9 @@ def test_delete_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_experiment] = ( + mock_rpc + ) request = {} client.delete_experiment(request) @@ -4898,9 +4900,9 @@ def test_start_experiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_experiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_experiment] = ( + mock_rpc + ) request = {} client.start_experiment(request) @@ -5745,8 +5747,9 @@ def test_list_experiments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5811,17 +5814,19 @@ def test_list_experiments_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "post_list_experiments" - ) as post, mock.patch.object( - transports.ExperimentsRestInterceptor, "post_list_experiments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExperimentsRestInterceptor, "pre_list_experiments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_list_experiments" + ) as post, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_list_experiments_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_list_experiments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5876,8 +5881,9 @@ def test_get_experiment_rest_bad_request(request_type=experiment.GetExperimentRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5950,17 +5956,19 @@ def test_get_experiment_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "post_get_experiment" - ) as post, mock.patch.object( - transports.ExperimentsRestInterceptor, "post_get_experiment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExperimentsRestInterceptor, "pre_get_experiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_get_experiment" + ) as post, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_get_experiment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_get_experiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6015,8 +6023,9 @@ def test_create_experiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6220,17 +6229,20 @@ def test_create_experiment_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "post_create_experiment" - ) as post, mock.patch.object( - transports.ExperimentsRestInterceptor, "post_create_experiment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExperimentsRestInterceptor, "pre_create_experiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_create_experiment" + ) as post, + mock.patch.object( + transports.ExperimentsRestInterceptor, + "post_create_experiment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_create_experiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6287,8 +6299,9 @@ def test_update_experiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6494,17 +6507,20 @@ def test_update_experiment_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "post_update_experiment" - ) as post, mock.patch.object( - transports.ExperimentsRestInterceptor, "post_update_experiment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExperimentsRestInterceptor, "pre_update_experiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_update_experiment" + ) as post, + mock.patch.object( + transports.ExperimentsRestInterceptor, + "post_update_experiment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_update_experiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6559,8 +6575,9 @@ def test_delete_experiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6619,13 +6636,13 @@ def test_delete_experiment_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "pre_delete_experiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_delete_experiment" + ) as pre, + ): pre.assert_not_called() pb_message = experiment.DeleteExperimentRequest.pb( experiment.DeleteExperimentRequest() @@ -6672,8 +6689,9 @@ def test_start_experiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6746,17 +6764,19 @@ def test_start_experiment_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "post_start_experiment" - ) as post, mock.patch.object( - transports.ExperimentsRestInterceptor, "post_start_experiment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExperimentsRestInterceptor, "pre_start_experiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_start_experiment" + ) as post, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_start_experiment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_start_experiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6811,8 +6831,9 @@ def test_stop_experiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6885,17 +6906,19 @@ def test_stop_experiment_rest_interceptors(null_interceptor): ) client = ExperimentsClient(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.ExperimentsRestInterceptor, "post_stop_experiment" - ) as post, mock.patch.object( - transports.ExperimentsRestInterceptor, "post_stop_experiment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ExperimentsRestInterceptor, "pre_stop_experiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_stop_experiment" + ) as post, + mock.patch.object( + transports.ExperimentsRestInterceptor, "post_stop_experiment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ExperimentsRestInterceptor, "pre_stop_experiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6948,8 +6971,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7008,8 +7032,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7070,8 +7095,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7132,8 +7158,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7192,8 +7219,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7458,11 +7486,14 @@ def test_experiments_base_transport(): def test_experiments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.experiments.transports.ExperimentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.experiments.transports.ExperimentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ExperimentsTransport( @@ -7482,9 +7513,12 @@ def test_experiments_base_transport_with_credentials_file(): def test_experiments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.experiments.transports.ExperimentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.experiments.transports.ExperimentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ExperimentsTransport() @@ -7562,11 +7596,12 @@ def test_experiments_transport_auth_gdch_credentials(transport_class): def test_experiments_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_flows.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_flows.py index c332de7eeef7..2bd6e7fd11a4 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_flows.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_flows.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.flows import ( FlowsAsyncClient, @@ -77,8 +77,7 @@ from google.cloud.dialogflowcx_v3beta1.types import ( advanced_settings, data_store_connection, -) -from google.cloud.dialogflowcx_v3beta1.types import ( + flow, fulfillment, gcs, import_strategy, @@ -88,7 +87,6 @@ tool_call, validation_message, ) -from google.cloud.dialogflowcx_v3beta1.types import flow from google.cloud.dialogflowcx_v3beta1.types import flow as gcdc_flow CRED_INFO_JSON = { @@ -922,10 +920,9 @@ def test_flows_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -970,10 +967,9 @@ def test_flows_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1009,10 +1005,9 @@ def test_flows_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1237,13 +1232,13 @@ def test_flows_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6868,8 +6863,9 @@ def test_create_flow_rest_bad_request(request_type=gcdc_flow.CreateFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7175,17 +7171,15 @@ def test_create_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_create_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_create_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_create_flow" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FlowsRestInterceptor, "post_create_flow") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_create_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_create_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7236,8 +7230,9 @@ def test_delete_flow_rest_bad_request(request_type=flow.DeleteFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7294,13 +7289,11 @@ def test_delete_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "pre_delete_flow" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FlowsRestInterceptor, "pre_delete_flow") as pre, + ): pre.assert_not_called() pb_message = flow.DeleteFlowRequest.pb(flow.DeleteFlowRequest()) transcode.return_value = { @@ -7341,8 +7334,9 @@ def test_list_flows_rest_bad_request(request_type=flow.ListFlowsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7403,17 +7397,15 @@ def test_list_flows_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_list_flows" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_list_flows_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_list_flows" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FlowsRestInterceptor, "post_list_flows") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_list_flows_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_list_flows") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7464,8 +7456,9 @@ def test_get_flow_rest_bad_request(request_type=flow.GetFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7536,17 +7529,15 @@ def test_get_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_get_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_get_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_get_flow" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FlowsRestInterceptor, "post_get_flow") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_get_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_get_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7599,8 +7590,9 @@ def test_update_flow_rest_bad_request(request_type=gcdc_flow.UpdateFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7910,17 +7902,15 @@ def test_update_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_update_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_update_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_update_flow" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.FlowsRestInterceptor, "post_update_flow") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_update_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_update_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7971,8 +7961,9 @@ def test_train_flow_rest_bad_request(request_type=flow.TrainFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8029,19 +8020,16 @@ def test_train_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_train_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_train_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_train_flow" - ) as pre: + 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.FlowsRestInterceptor, "post_train_flow") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_train_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_train_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8092,8 +8080,9 @@ def test_validate_flow_rest_bad_request(request_type=flow.ValidateFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8156,17 +8145,17 @@ def test_validate_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_validate_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_validate_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_validate_flow" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FlowsRestInterceptor, "post_validate_flow" + ) as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_validate_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_validate_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8219,8 +8208,9 @@ def test_get_flow_validation_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8283,17 +8273,20 @@ def test_get_flow_validation_result_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_get_flow_validation_result" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_get_flow_validation_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_get_flow_validation_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FlowsRestInterceptor, "post_get_flow_validation_result" + ) as post, + mock.patch.object( + transports.FlowsRestInterceptor, + "post_get_flow_validation_result_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FlowsRestInterceptor, "pre_get_flow_validation_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8344,8 +8337,9 @@ def test_import_flow_rest_bad_request(request_type=flow.ImportFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8400,19 +8394,16 @@ def test_import_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_import_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_import_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_import_flow" - ) as pre: + 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.FlowsRestInterceptor, "post_import_flow") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_import_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_import_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8463,8 +8454,9 @@ def test_export_flow_rest_bad_request(request_type=flow.ExportFlowRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8521,19 +8513,16 @@ def test_export_flow_rest_interceptors(null_interceptor): ) client = FlowsClient(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.FlowsRestInterceptor, "post_export_flow" - ) as post, mock.patch.object( - transports.FlowsRestInterceptor, "post_export_flow_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FlowsRestInterceptor, "pre_export_flow" - ) as pre: + 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.FlowsRestInterceptor, "post_export_flow") as post, + mock.patch.object( + transports.FlowsRestInterceptor, "post_export_flow_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.FlowsRestInterceptor, "pre_export_flow") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8584,8 +8573,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8644,8 +8634,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8706,8 +8697,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8768,8 +8760,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8828,8 +8821,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9175,11 +9169,14 @@ def test_flows_base_transport(): def test_flows_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.flows.transports.FlowsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.flows.transports.FlowsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FlowsTransport( @@ -9199,9 +9196,12 @@ def test_flows_base_transport_with_credentials_file(): def test_flows_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.flows.transports.FlowsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.flows.transports.FlowsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FlowsTransport() @@ -9279,11 +9279,12 @@ def test_flows_transport_auth_gdch_credentials(transport_class): def test_flows_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_generators.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_generators.py index 2df364239a0f..4eeefc59cd89 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_generators.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_generators.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.generators import ( GeneratorsAsyncClient, @@ -61,8 +66,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3beta1.types import generative_settings -from google.cloud.dialogflowcx_v3beta1.types import generator +from google.cloud.dialogflowcx_v3beta1.types import generative_settings, generator from google.cloud.dialogflowcx_v3beta1.types import generator as gcdc_generator CRED_INFO_JSON = { @@ -923,10 +927,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +974,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1012,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1242,13 +1243,13 @@ def test_generators_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2208,9 +2209,9 @@ def test_create_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -2547,9 +2548,9 @@ def test_update_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -2881,9 +2882,9 @@ def test_delete_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -3569,9 +3570,9 @@ def test_create_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -3762,9 +3763,9 @@ def test_update_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -3959,9 +3960,9 @@ def test_delete_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -4492,8 +4493,9 @@ def test_list_generators_rest_bad_request(request_type=generator.ListGeneratorsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4556,17 +4558,19 @@ def test_list_generators_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_list_generators" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_list_generators_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_list_generators" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_list_generators" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_list_generators_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_list_generators" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4621,8 +4625,9 @@ def test_get_generator_rest_bad_request(request_type=generator.GetGeneratorReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4689,17 +4694,19 @@ def test_get_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_get_generator" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_get_generator_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_get_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_get_generator" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_get_generator_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_get_generator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4750,8 +4757,9 @@ def test_create_generator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4904,17 +4912,19 @@ def test_create_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_create_generator" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_create_generator_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_create_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_create_generator" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_create_generator_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_create_generator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4971,8 +4981,9 @@ def test_update_generator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5129,17 +5140,19 @@ def test_update_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_update_generator" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_update_generator_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_update_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_update_generator" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_update_generator_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_update_generator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5194,8 +5207,9 @@ def test_delete_generator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5254,13 +5268,13 @@ def test_delete_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "pre_delete_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_delete_generator" + ) as pre, + ): pre.assert_not_called() pb_message = generator.DeleteGeneratorRequest.pb( generator.DeleteGeneratorRequest() @@ -5305,8 +5319,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5365,8 +5380,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5427,8 +5443,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5489,8 +5506,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5549,8 +5567,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5767,11 +5786,14 @@ def test_generators_base_transport(): def test_generators_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeneratorsTransport( @@ -5791,9 +5813,12 @@ def test_generators_base_transport_with_credentials_file(): def test_generators_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeneratorsTransport() @@ -5871,11 +5896,12 @@ def test_generators_transport_auth_gdch_credentials(transport_class): def test_generators_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_intents.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_intents.py index 039be0e3e32c..e3af17b0afdb 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_intents.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_intents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.intents import ( IntentsAsyncClient, @@ -70,8 +70,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3beta1.types import inline -from google.cloud.dialogflowcx_v3beta1.types import intent +from google.cloud.dialogflowcx_v3beta1.types import inline, intent from google.cloud.dialogflowcx_v3beta1.types import intent as gcdc_intent CRED_INFO_JSON = { @@ -910,10 +909,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +956,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +994,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1225,13 +1221,13 @@ def test_intents_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5332,8 +5328,9 @@ def test_list_intents_rest_bad_request(request_type=intent.ListIntentsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5394,17 +5391,17 @@ def test_list_intents_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_list_intents" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_list_intents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_list_intents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "post_list_intents" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_list_intents_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.IntentsRestInterceptor, "pre_list_intents") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5455,8 +5452,9 @@ def test_get_intent_rest_bad_request(request_type=intent.GetIntentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5527,17 +5525,15 @@ def test_get_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_get_intent" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_get_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_get_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.IntentsRestInterceptor, "post_get_intent") as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_get_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.IntentsRestInterceptor, "pre_get_intent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5586,8 +5582,9 @@ def test_create_intent_rest_bad_request(request_type=gcdc_intent.CreateIntentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5746,17 +5743,19 @@ def test_create_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_create_intent" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_create_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_create_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "post_create_intent" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_create_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_create_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5811,8 +5810,9 @@ def test_update_intent_rest_bad_request(request_type=gcdc_intent.UpdateIntentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5975,17 +5975,19 @@ def test_update_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_update_intent" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_update_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_update_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "post_update_intent" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_update_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_update_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6038,8 +6040,9 @@ def test_delete_intent_rest_bad_request(request_type=intent.DeleteIntentRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6096,13 +6099,13 @@ def test_delete_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "pre_delete_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_delete_intent" + ) as pre, + ): pre.assert_not_called() pb_message = intent.DeleteIntentRequest.pb(intent.DeleteIntentRequest()) transcode.return_value = { @@ -6143,8 +6146,9 @@ def test_import_intents_rest_bad_request(request_type=intent.ImportIntentsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6199,19 +6203,20 @@ def test_import_intents_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_import_intents" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_import_intents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_import_intents" - ) as pre: + 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.IntentsRestInterceptor, "post_import_intents" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_import_intents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_import_intents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6260,8 +6265,9 @@ def test_export_intents_rest_bad_request(request_type=intent.ExportIntentsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6316,19 +6322,20 @@ def test_export_intents_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_export_intents" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_export_intents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_export_intents" - ) as pre: + 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.IntentsRestInterceptor, "post_export_intents" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_export_intents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_export_intents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6379,8 +6386,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6439,8 +6447,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6501,8 +6510,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6563,8 +6573,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6623,8 +6634,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6905,11 +6917,14 @@ def test_intents_base_transport(): def test_intents_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.intents.transports.IntentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.intents.transports.IntentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IntentsTransport( @@ -6929,9 +6944,12 @@ def test_intents_base_transport_with_credentials_file(): def test_intents_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.intents.transports.IntentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.intents.transports.IntentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IntentsTransport() @@ -7009,11 +7027,12 @@ def test_intents_transport_auth_gdch_credentials(transport_class): def test_intents_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_pages.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_pages.py index 3a0d93534a4c..1dd80fa0f035 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_pages.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_pages.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.pages import ( PagesAsyncClient, @@ -68,10 +73,11 @@ data_store_connection, fulfillment, gcs, + page, + response_message, + tool_call, ) -from google.cloud.dialogflowcx_v3beta1.types import page from google.cloud.dialogflowcx_v3beta1.types import page as gcdc_page -from google.cloud.dialogflowcx_v3beta1.types import response_message, tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -904,10 +910,9 @@ def test_pages_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -952,10 +957,9 @@ def test_pages_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -991,10 +995,9 @@ def test_pages_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1219,13 +1222,13 @@ def test_pages_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4475,8 +4478,9 @@ def test_list_pages_rest_bad_request(request_type=page.ListPagesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4539,17 +4543,15 @@ def test_list_pages_rest_interceptors(null_interceptor): ) client = PagesClient(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.PagesRestInterceptor, "post_list_pages" - ) as post, mock.patch.object( - transports.PagesRestInterceptor, "post_list_pages_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PagesRestInterceptor, "pre_list_pages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.PagesRestInterceptor, "post_list_pages") as post, + mock.patch.object( + transports.PagesRestInterceptor, "post_list_pages_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PagesRestInterceptor, "pre_list_pages") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4600,8 +4602,9 @@ def test_get_page_rest_bad_request(request_type=page.GetPageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4670,17 +4673,15 @@ def test_get_page_rest_interceptors(null_interceptor): ) client = PagesClient(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.PagesRestInterceptor, "post_get_page" - ) as post, mock.patch.object( - transports.PagesRestInterceptor, "post_get_page_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PagesRestInterceptor, "pre_get_page" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.PagesRestInterceptor, "post_get_page") as post, + mock.patch.object( + transports.PagesRestInterceptor, "post_get_page_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PagesRestInterceptor, "pre_get_page") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4731,8 +4732,9 @@ def test_create_page_rest_bad_request(request_type=gcdc_page.CreatePageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5024,17 +5026,15 @@ def test_create_page_rest_interceptors(null_interceptor): ) client = PagesClient(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.PagesRestInterceptor, "post_create_page" - ) as post, mock.patch.object( - transports.PagesRestInterceptor, "post_create_page_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PagesRestInterceptor, "pre_create_page" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.PagesRestInterceptor, "post_create_page") as post, + mock.patch.object( + transports.PagesRestInterceptor, "post_create_page_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PagesRestInterceptor, "pre_create_page") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5087,8 +5087,9 @@ def test_update_page_rest_bad_request(request_type=gcdc_page.UpdatePageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5382,17 +5383,15 @@ def test_update_page_rest_interceptors(null_interceptor): ) client = PagesClient(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.PagesRestInterceptor, "post_update_page" - ) as post, mock.patch.object( - transports.PagesRestInterceptor, "post_update_page_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PagesRestInterceptor, "pre_update_page" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.PagesRestInterceptor, "post_update_page") as post, + mock.patch.object( + transports.PagesRestInterceptor, "post_update_page_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PagesRestInterceptor, "pre_update_page") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5443,8 +5442,9 @@ def test_delete_page_rest_bad_request(request_type=page.DeletePageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5501,13 +5501,11 @@ def test_delete_page_rest_interceptors(null_interceptor): ) client = PagesClient(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.PagesRestInterceptor, "pre_delete_page" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.PagesRestInterceptor, "pre_delete_page") as pre, + ): pre.assert_not_called() pb_message = page.DeletePageRequest.pb(page.DeletePageRequest()) transcode.return_value = { @@ -5550,8 +5548,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5610,8 +5609,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5672,8 +5672,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5734,8 +5735,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5794,8 +5796,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6012,11 +6015,14 @@ def test_pages_base_transport(): def test_pages_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.pages.transports.PagesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.pages.transports.PagesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PagesTransport( @@ -6036,9 +6042,12 @@ def test_pages_base_transport_with_credentials_file(): def test_pages_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.pages.transports.PagesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.pages.transports.PagesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PagesTransport() @@ -6116,11 +6125,12 @@ def test_pages_transport_auth_gdch_credentials(transport_class): def test_pages_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_playbooks.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_playbooks.py index f619ae4da7c9..aed2d9a7357a 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_playbooks.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_playbooks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.playbooks import ( PlaybooksAsyncClient, @@ -83,9 +83,11 @@ generative_settings, import_strategy, parameter_definition, + playbook, + response_message, + tool_call, + trace, ) -from google.cloud.dialogflowcx_v3beta1.types import response_message, tool_call, trace -from google.cloud.dialogflowcx_v3beta1.types import playbook from google.cloud.dialogflowcx_v3beta1.types import playbook as gcdc_playbook CRED_INFO_JSON = { @@ -942,10 +944,9 @@ def test_playbooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +991,9 @@ def test_playbooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1029,10 +1029,9 @@ def test_playbooks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1261,13 +1260,13 @@ def test_playbooks_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4142,9 +4141,9 @@ def test_get_playbook_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_playbook_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_playbook_version] = ( + mock_rpc + ) request = {} client.get_playbook_version(request) @@ -4824,9 +4823,9 @@ def test_list_playbook_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_playbook_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_playbook_versions] = ( + mock_rpc + ) request = {} client.list_playbook_versions(request) @@ -7047,9 +7046,9 @@ def test_get_playbook_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_playbook_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_playbook_version] = ( + mock_rpc + ) request = {} client.get_playbook_version(request) @@ -7418,9 +7417,9 @@ def test_list_playbook_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_playbook_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_playbook_versions] = ( + mock_rpc + ) request = {} client.list_playbook_versions(request) @@ -8585,8 +8584,9 @@ def test_create_playbook_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8888,17 +8888,19 @@ def test_create_playbook_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_create_playbook" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_create_playbook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_create_playbook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_create_playbook" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_create_playbook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_create_playbook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8951,8 +8953,9 @@ def test_delete_playbook_rest_bad_request(request_type=playbook.DeletePlaybookRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9009,13 +9012,13 @@ def test_delete_playbook_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "pre_delete_playbook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_delete_playbook" + ) as pre, + ): pre.assert_not_called() pb_message = playbook.DeletePlaybookRequest.pb(playbook.DeletePlaybookRequest()) transcode.return_value = { @@ -9056,8 +9059,9 @@ def test_list_playbooks_rest_bad_request(request_type=playbook.ListPlaybooksRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9118,17 +9122,19 @@ def test_list_playbooks_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_list_playbooks" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_list_playbooks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_list_playbooks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_list_playbooks" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_list_playbooks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_list_playbooks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9181,8 +9187,9 @@ def test_get_playbook_rest_bad_request(request_type=playbook.GetPlaybookRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9261,17 +9268,19 @@ def test_get_playbook_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_get_playbook" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_get_playbook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_get_playbook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_get_playbook" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_get_playbook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_get_playbook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9322,8 +9331,9 @@ def test_export_playbook_rest_bad_request(request_type=playbook.ExportPlaybookRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9380,19 +9390,20 @@ def test_export_playbook_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_export_playbook" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_export_playbook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_export_playbook" - ) as pre: + 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.PlaybooksRestInterceptor, "post_export_playbook" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_export_playbook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_export_playbook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9441,8 +9452,9 @@ def test_import_playbook_rest_bad_request(request_type=playbook.ImportPlaybookRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9497,19 +9509,20 @@ def test_import_playbook_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_import_playbook" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_import_playbook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_import_playbook" - ) as pre: + 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.PlaybooksRestInterceptor, "post_import_playbook" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_import_playbook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_import_playbook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9564,8 +9577,9 @@ def test_update_playbook_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9871,17 +9885,19 @@ def test_update_playbook_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_update_playbook" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_update_playbook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_update_playbook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_update_playbook" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_update_playbook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_update_playbook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9936,8 +9952,9 @@ def test_create_playbook_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10403,18 +10420,20 @@ def test_create_playbook_version_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_create_playbook_version" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, - "post_create_playbook_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_create_playbook_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_create_playbook_version" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, + "post_create_playbook_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_create_playbook_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10469,8 +10488,9 @@ def test_get_playbook_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10535,17 +10555,20 @@ def test_get_playbook_version_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_get_playbook_version" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_get_playbook_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_get_playbook_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_get_playbook_version" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, + "post_get_playbook_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_get_playbook_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10600,8 +10623,9 @@ def test_restore_playbook_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10661,18 +10685,20 @@ def test_restore_playbook_version_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_restore_playbook_version" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, - "post_restore_playbook_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_restore_playbook_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_restore_playbook_version" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, + "post_restore_playbook_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_restore_playbook_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10732,8 +10758,9 @@ def test_list_playbook_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10796,17 +10823,20 @@ def test_list_playbook_versions_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "post_list_playbook_versions" - ) as post, mock.patch.object( - transports.PlaybooksRestInterceptor, "post_list_playbook_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PlaybooksRestInterceptor, "pre_list_playbook_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "post_list_playbook_versions" + ) as post, + mock.patch.object( + transports.PlaybooksRestInterceptor, + "post_list_playbook_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_list_playbook_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10866,8 +10896,9 @@ def test_delete_playbook_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10924,13 +10955,13 @@ def test_delete_playbook_version_rest_interceptors(null_interceptor): ) client = PlaybooksClient(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.PlaybooksRestInterceptor, "pre_delete_playbook_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PlaybooksRestInterceptor, "pre_delete_playbook_version" + ) as pre, + ): pre.assert_not_called() pb_message = playbook.DeletePlaybookVersionRequest.pb( playbook.DeletePlaybookVersionRequest() @@ -10975,8 +11006,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11035,8 +11067,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11097,8 +11130,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11159,8 +11193,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11219,8 +11254,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11616,11 +11652,14 @@ def test_playbooks_base_transport(): def test_playbooks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.playbooks.transports.PlaybooksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.playbooks.transports.PlaybooksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PlaybooksTransport( @@ -11640,9 +11679,12 @@ def test_playbooks_base_transport_with_credentials_file(): def test_playbooks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.playbooks.transports.PlaybooksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.playbooks.transports.PlaybooksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PlaybooksTransport() @@ -11720,11 +11762,12 @@ def test_playbooks_transport_auth_gdch_credentials(transport_class): def test_playbooks_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_security_settings_service.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_security_settings_service.py index 5eedc4277f01..0ffe47b1d874 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_security_settings_service.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_security_settings_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.security_settings_service import ( SecuritySettingsServiceAsyncClient, @@ -61,10 +66,10 @@ pagers, transports, ) +from google.cloud.dialogflowcx_v3beta1.types import security_settings from google.cloud.dialogflowcx_v3beta1.types import ( security_settings as gcdc_security_settings, ) -from google.cloud.dialogflowcx_v3beta1.types import security_settings CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1004,10 +1009,9 @@ def test_security_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1056,9 @@ def test_security_settings_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1094,9 @@ def test_security_settings_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1350,13 +1352,13 @@ def test_security_settings_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1902,9 +1904,9 @@ def test_get_security_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_security_settings] = ( + mock_rpc + ) request = {} client.get_security_settings(request) @@ -2671,9 +2673,9 @@ def test_list_security_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_security_settings] = ( + mock_rpc + ) request = {} client.list_security_settings(request) @@ -3677,9 +3679,9 @@ def test_get_security_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_security_settings] = ( + mock_rpc + ) request = {} client.get_security_settings(request) @@ -4061,9 +4063,9 @@ def test_list_security_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_security_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_security_settings] = ( + mock_rpc + ) request = {} client.list_security_settings(request) @@ -4898,8 +4900,9 @@ def test_create_security_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5073,20 +5076,22 @@ def test_create_security_settings_rest_interceptors(null_interceptor): ) client = SecuritySettingsServiceClient(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.SecuritySettingsServiceRestInterceptor, - "post_create_security_settings", - ) as post, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, - "post_create_security_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, - "pre_create_security_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_create_security_settings", + ) as post, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_create_security_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "pre_create_security_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5146,8 +5151,9 @@ def test_get_security_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5235,18 +5241,22 @@ def test_get_security_settings_rest_interceptors(null_interceptor): ) client = SecuritySettingsServiceClient(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.SecuritySettingsServiceRestInterceptor, "post_get_security_settings" - ) as post, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, - "post_get_security_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, "pre_get_security_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_get_security_settings", + ) as post, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_get_security_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "pre_get_security_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5305,8 +5315,9 @@ def test_update_security_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5484,20 +5495,22 @@ def test_update_security_settings_rest_interceptors(null_interceptor): ) client = SecuritySettingsServiceClient(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.SecuritySettingsServiceRestInterceptor, - "post_update_security_settings", - ) as post, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, - "post_update_security_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, - "pre_update_security_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_update_security_settings", + ) as post, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_update_security_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "pre_update_security_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5555,8 +5568,9 @@ def test_list_security_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5619,18 +5633,22 @@ def test_list_security_settings_rest_interceptors(null_interceptor): ) client = SecuritySettingsServiceClient(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.SecuritySettingsServiceRestInterceptor, "post_list_security_settings" - ) as post, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, - "post_list_security_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SecuritySettingsServiceRestInterceptor, "pre_list_security_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_list_security_settings", + ) as post, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "post_list_security_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "pre_list_security_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5690,8 +5708,9 @@ def test_delete_security_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5750,14 +5769,14 @@ def test_delete_security_settings_rest_interceptors(null_interceptor): ) client = SecuritySettingsServiceClient(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.SecuritySettingsServiceRestInterceptor, - "pre_delete_security_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SecuritySettingsServiceRestInterceptor, + "pre_delete_security_settings", + ) as pre, + ): pre.assert_not_called() pb_message = security_settings.DeleteSecuritySettingsRequest.pb( security_settings.DeleteSecuritySettingsRequest() @@ -5802,8 +5821,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5862,8 +5882,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5924,8 +5945,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5986,8 +6008,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6046,8 +6069,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6274,11 +6298,14 @@ def test_security_settings_service_base_transport(): def test_security_settings_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.security_settings_service.transports.SecuritySettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.security_settings_service.transports.SecuritySettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SecuritySettingsServiceTransport( @@ -6298,9 +6325,12 @@ def test_security_settings_service_base_transport_with_credentials_file(): def test_security_settings_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.security_settings_service.transports.SecuritySettingsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.security_settings_service.transports.SecuritySettingsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SecuritySettingsServiceTransport() @@ -6380,11 +6410,12 @@ def test_security_settings_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_session_entity_types.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_session_entity_types.py index 390eb3dcb520..77370c4f04ca 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_session_entity_types.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_session_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.session_entity_types import ( SessionEntityTypesAsyncClient, @@ -61,11 +66,10 @@ pagers, transports, ) +from google.cloud.dialogflowcx_v3beta1.types import entity_type, session_entity_type from google.cloud.dialogflowcx_v3beta1.types import ( session_entity_type as gcdc_session_entity_type, ) -from google.cloud.dialogflowcx_v3beta1.types import entity_type -from google.cloud.dialogflowcx_v3beta1.types import session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -989,10 +993,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1078,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1327,13 +1328,13 @@ def test_session_entity_types_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4760,8 +4761,9 @@ def test_list_session_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4828,18 +4830,22 @@ def test_list_session_entity_types_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_list_session_entity_types" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_list_session_entity_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_list_session_entity_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_list_session_entity_types", + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_list_session_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_list_session_entity_types", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4899,8 +4905,9 @@ def test_get_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4970,18 +4977,20 @@ def test_get_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_get_session_entity_type" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_get_session_entity_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_get_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, "post_get_session_entity_type" + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_get_session_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, "pre_get_session_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5041,8 +5050,9 @@ def test_create_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5188,18 +5198,22 @@ def test_create_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_create_session_entity_type" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_create_session_entity_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_create_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_create_session_entity_type", + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_create_session_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_create_session_entity_type", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5261,8 +5275,9 @@ def test_update_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5410,18 +5425,22 @@ def test_update_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_update_session_entity_type" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_update_session_entity_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_update_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_update_session_entity_type", + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_update_session_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_update_session_entity_type", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5481,8 +5500,9 @@ def test_delete_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5541,13 +5561,14 @@ def test_delete_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "pre_delete_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_delete_session_entity_type", + ) as pre, + ): pre.assert_not_called() pb_message = session_entity_type.DeleteSessionEntityTypeRequest.pb( session_entity_type.DeleteSessionEntityTypeRequest() @@ -5592,8 +5613,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5652,8 +5674,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5714,8 +5737,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5776,8 +5800,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5836,8 +5861,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6064,11 +6090,14 @@ def test_session_entity_types_base_transport(): def test_session_entity_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionEntityTypesTransport( @@ -6088,9 +6117,12 @@ def test_session_entity_types_base_transport_with_credentials_file(): def test_session_entity_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionEntityTypesTransport() @@ -6168,11 +6200,12 @@ def test_session_entity_types_transport_auth_gdch_credentials(transport_class): def test_session_entity_types_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_sessions.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_sessions.py index d7c27c3d379d..880eb5ee3165 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_sessions.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_sessions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.sessions import ( SessionsAsyncClient, @@ -921,10 +926,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1236,13 +1238,13 @@ def test_sessions_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2506,9 +2508,9 @@ def test_submit_answer_feedback_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_answer_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_answer_feedback] = ( + mock_rpc + ) request = {} client.submit_answer_feedback(request) @@ -3136,9 +3138,9 @@ def test_submit_answer_feedback_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.submit_answer_feedback - ] = mock_rpc + client._transport._wrapped_methods[client._transport.submit_answer_feedback] = ( + mock_rpc + ) request = {} client.submit_answer_feedback(request) @@ -3652,8 +3654,9 @@ def test_detect_intent_rest_bad_request(request_type=session.DetectIntentRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3722,17 +3725,19 @@ def test_detect_intent_rest_interceptors(null_interceptor): ) client = SessionsClient(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.SessionsRestInterceptor, "post_detect_intent" - ) as post, mock.patch.object( - transports.SessionsRestInterceptor, "post_detect_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionsRestInterceptor, "pre_detect_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionsRestInterceptor, "post_detect_intent" + ) as post, + mock.patch.object( + transports.SessionsRestInterceptor, "post_detect_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionsRestInterceptor, "pre_detect_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3787,8 +3792,9 @@ def test_server_streaming_detect_intent_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3861,18 +3867,20 @@ def test_server_streaming_detect_intent_rest_interceptors(null_interceptor): ) client = SessionsClient(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.SessionsRestInterceptor, "post_server_streaming_detect_intent" - ) as post, mock.patch.object( - transports.SessionsRestInterceptor, - "post_server_streaming_detect_intent_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionsRestInterceptor, "pre_server_streaming_detect_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionsRestInterceptor, "post_server_streaming_detect_intent" + ) as post, + mock.patch.object( + transports.SessionsRestInterceptor, + "post_server_streaming_detect_intent_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionsRestInterceptor, "pre_server_streaming_detect_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3937,8 +3945,9 @@ def test_match_intent_rest_bad_request(request_type=session.MatchIntentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4000,17 +4009,19 @@ def test_match_intent_rest_interceptors(null_interceptor): ) client = SessionsClient(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.SessionsRestInterceptor, "post_match_intent" - ) as post, mock.patch.object( - transports.SessionsRestInterceptor, "post_match_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionsRestInterceptor, "pre_match_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionsRestInterceptor, "post_match_intent" + ) as post, + mock.patch.object( + transports.SessionsRestInterceptor, "post_match_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionsRestInterceptor, "pre_match_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4065,8 +4076,9 @@ def test_fulfill_intent_rest_bad_request(request_type=session.FulfillIntentReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4133,17 +4145,19 @@ def test_fulfill_intent_rest_interceptors(null_interceptor): ) client = SessionsClient(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.SessionsRestInterceptor, "post_fulfill_intent" - ) as post, mock.patch.object( - transports.SessionsRestInterceptor, "post_fulfill_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionsRestInterceptor, "pre_fulfill_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionsRestInterceptor, "post_fulfill_intent" + ) as post, + mock.patch.object( + transports.SessionsRestInterceptor, "post_fulfill_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionsRestInterceptor, "pre_fulfill_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4198,8 +4212,9 @@ def test_submit_answer_feedback_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4264,17 +4279,20 @@ def test_submit_answer_feedback_rest_interceptors(null_interceptor): ) client = SessionsClient(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.SessionsRestInterceptor, "post_submit_answer_feedback" - ) as post, mock.patch.object( - transports.SessionsRestInterceptor, "post_submit_answer_feedback_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionsRestInterceptor, "pre_submit_answer_feedback" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionsRestInterceptor, "post_submit_answer_feedback" + ) as post, + mock.patch.object( + transports.SessionsRestInterceptor, + "post_submit_answer_feedback_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionsRestInterceptor, "pre_submit_answer_feedback" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4327,8 +4345,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4387,8 +4406,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4449,8 +4469,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4511,8 +4532,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4571,8 +4593,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4794,11 +4817,14 @@ def test_sessions_base_transport(): def test_sessions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.sessions.transports.SessionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.sessions.transports.SessionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionsTransport( @@ -4818,9 +4844,12 @@ def test_sessions_base_transport_with_credentials_file(): def test_sessions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.sessions.transports.SessionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.sessions.transports.SessionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionsTransport() @@ -4898,11 +4927,12 @@ def test_sessions_transport_auth_gdch_credentials(transport_class): def test_sessions_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_test_cases.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_test_cases.py index 420c9a0f749d..69c1982d56e2 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_test_cases.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_test_cases.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.test_cases import ( TestCasesAsyncClient, @@ -85,10 +85,10 @@ page, response_message, session, + test_case, + tool_call, ) -from google.cloud.dialogflowcx_v3beta1.types import test_case from google.cloud.dialogflowcx_v3beta1.types import test_case as gcdc_test_case -from google.cloud.dialogflowcx_v3beta1.types import tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -946,10 +946,9 @@ def test_test_cases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +993,9 @@ def test_test_cases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1031,9 @@ def test_test_cases_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1265,13 +1262,13 @@ def test_test_cases_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2567,9 +2564,9 @@ def test_create_test_case_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_test_case] = ( + mock_rpc + ) request = {} client.create_test_case(request) @@ -2910,9 +2907,9 @@ def test_update_test_case_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_test_case] = ( + mock_rpc + ) request = {} client.update_test_case(request) @@ -3503,9 +3500,9 @@ def test_batch_run_test_cases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_run_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_run_test_cases] = ( + mock_rpc + ) request = {} client.batch_run_test_cases(request) @@ -3765,9 +3762,9 @@ def test_calculate_coverage_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.calculate_coverage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.calculate_coverage] = ( + mock_rpc + ) request = {} client.calculate_coverage(request) @@ -4017,9 +4014,9 @@ def test_import_test_cases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_test_cases] = ( + mock_rpc + ) request = {} client.import_test_cases(request) @@ -4278,9 +4275,9 @@ def test_export_test_cases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_test_cases] = ( + mock_rpc + ) request = {} client.export_test_cases(request) @@ -4545,9 +4542,9 @@ def test_list_test_case_results_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_test_case_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_test_case_results] = ( + mock_rpc + ) request = {} client.list_test_case_results(request) @@ -5092,9 +5089,9 @@ def test_get_test_case_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_test_case_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_test_case_result] = ( + mock_rpc + ) request = {} client.get_test_case_result(request) @@ -5992,9 +5989,9 @@ def test_create_test_case_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_test_case] = ( + mock_rpc + ) request = {} client.create_test_case(request) @@ -6183,9 +6180,9 @@ def test_update_test_case_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_test_case - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_test_case] = ( + mock_rpc + ) request = {} client.update_test_case(request) @@ -6497,9 +6494,9 @@ def test_batch_run_test_cases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_run_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_run_test_cases] = ( + mock_rpc + ) request = {} client.batch_run_test_cases(request) @@ -6635,9 +6632,9 @@ def test_calculate_coverage_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.calculate_coverage - ] = mock_rpc + client._transport._wrapped_methods[client._transport.calculate_coverage] = ( + mock_rpc + ) request = {} client.calculate_coverage(request) @@ -6767,9 +6764,9 @@ def test_import_test_cases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_test_cases] = ( + mock_rpc + ) request = {} client.import_test_cases(request) @@ -6891,9 +6888,9 @@ def test_export_test_cases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_test_cases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_test_cases] = ( + mock_rpc + ) request = {} client.export_test_cases(request) @@ -7018,9 +7015,9 @@ def test_list_test_case_results_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_test_case_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_test_case_results] = ( + mock_rpc + ) request = {} client.list_test_case_results(request) @@ -7284,9 +7281,9 @@ def test_get_test_case_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_test_case_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_test_case_result] = ( + mock_rpc + ) request = {} client.get_test_case_result(request) @@ -8184,8 +8181,9 @@ def test_list_test_cases_rest_bad_request(request_type=test_case.ListTestCasesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8246,17 +8244,19 @@ def test_list_test_cases_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_list_test_cases" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_list_test_cases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_list_test_cases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_list_test_cases" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_list_test_cases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_list_test_cases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8309,8 +8309,9 @@ def test_batch_delete_test_cases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8365,13 +8366,13 @@ def test_batch_delete_test_cases_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "pre_batch_delete_test_cases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_batch_delete_test_cases" + ) as pre, + ): pre.assert_not_called() pb_message = test_case.BatchDeleteTestCasesRequest.pb( test_case.BatchDeleteTestCasesRequest() @@ -8416,8 +8417,9 @@ def test_get_test_case_rest_bad_request(request_type=test_case.GetTestCaseReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8486,17 +8488,19 @@ def test_get_test_case_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_get_test_case" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_get_test_case_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_get_test_case" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_get_test_case" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_get_test_case_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_get_test_case" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8547,8 +8551,9 @@ def test_create_test_case_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8956,17 +8961,19 @@ def test_create_test_case_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_create_test_case" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_create_test_case_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_create_test_case" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_create_test_case" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_create_test_case_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_create_test_case" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9023,8 +9030,9 @@ def test_update_test_case_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9436,17 +9444,19 @@ def test_update_test_case_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_update_test_case" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_update_test_case_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_update_test_case" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_update_test_case" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_update_test_case_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_update_test_case" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9499,8 +9509,9 @@ def test_run_test_case_rest_bad_request(request_type=test_case.RunTestCaseReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9557,19 +9568,20 @@ def test_run_test_case_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_run_test_case" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_run_test_case_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_run_test_case" - ) as pre: + 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.TestCasesRestInterceptor, "post_run_test_case" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_run_test_case_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_run_test_case" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9620,8 +9632,9 @@ def test_batch_run_test_cases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9676,19 +9689,21 @@ def test_batch_run_test_cases_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_batch_run_test_cases" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_batch_run_test_cases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_batch_run_test_cases" - ) as pre: + 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.TestCasesRestInterceptor, "post_batch_run_test_cases" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, + "post_batch_run_test_cases_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_batch_run_test_cases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9741,8 +9756,9 @@ def test_calculate_coverage_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9803,17 +9819,19 @@ def test_calculate_coverage_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_calculate_coverage" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_calculate_coverage_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_calculate_coverage" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_calculate_coverage" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_calculate_coverage_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_calculate_coverage" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9871,8 +9889,9 @@ def test_import_test_cases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9927,19 +9946,20 @@ def test_import_test_cases_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_import_test_cases" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_import_test_cases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_import_test_cases" - ) as pre: + 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.TestCasesRestInterceptor, "post_import_test_cases" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_import_test_cases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_import_test_cases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9992,8 +10012,9 @@ def test_export_test_cases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10048,19 +10069,20 @@ def test_export_test_cases_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_export_test_cases" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_export_test_cases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_export_test_cases" - ) as pre: + 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.TestCasesRestInterceptor, "post_export_test_cases" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_export_test_cases_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_export_test_cases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10115,8 +10137,9 @@ def test_list_test_case_results_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10179,17 +10202,20 @@ def test_list_test_case_results_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_list_test_case_results" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_list_test_case_results_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_list_test_case_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_list_test_case_results" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, + "post_list_test_case_results_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_list_test_case_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10249,8 +10275,9 @@ def test_get_test_case_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10317,17 +10344,20 @@ def test_get_test_case_result_rest_interceptors(null_interceptor): ) client = TestCasesClient(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.TestCasesRestInterceptor, "post_get_test_case_result" - ) as post, mock.patch.object( - transports.TestCasesRestInterceptor, "post_get_test_case_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.TestCasesRestInterceptor, "pre_get_test_case_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TestCasesRestInterceptor, "post_get_test_case_result" + ) as post, + mock.patch.object( + transports.TestCasesRestInterceptor, + "post_get_test_case_result_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TestCasesRestInterceptor, "pre_get_test_case_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10380,8 +10410,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10440,8 +10471,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10502,8 +10534,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10564,8 +10597,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10624,8 +10658,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11025,11 +11060,14 @@ def test_test_cases_base_transport(): def test_test_cases_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.test_cases.transports.TestCasesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.test_cases.transports.TestCasesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TestCasesTransport( @@ -11049,9 +11087,12 @@ def test_test_cases_base_transport_with_credentials_file(): def test_test_cases_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.test_cases.transports.TestCasesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.test_cases.transports.TestCasesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TestCasesTransport() @@ -11129,11 +11170,12 @@ def test_test_cases_transport_auth_gdch_credentials(transport_class): def test_test_cases_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_tools.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_tools.py index 69fd0242c773..cad7606a76c0 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_tools.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_tools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.tools import ( ToolsAsyncClient, @@ -72,8 +72,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3beta1.types import data_store_connection -from google.cloud.dialogflowcx_v3beta1.types import tool +from google.cloud.dialogflowcx_v3beta1.types import data_store_connection, tool from google.cloud.dialogflowcx_v3beta1.types import tool as gcdc_tool CRED_INFO_JSON = { @@ -907,10 +906,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +953,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +991,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1222,13 +1218,13 @@ def test_tools_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3428,9 +3424,9 @@ def test_list_tool_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tool_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tool_versions] = ( + mock_rpc + ) request = {} client.list_tool_versions(request) @@ -3973,9 +3969,9 @@ def test_create_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tool_version] = ( + mock_rpc + ) request = {} client.create_tool_version(request) @@ -4318,9 +4314,9 @@ def test_get_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tool_version] = ( + mock_rpc + ) request = {} client.get_tool_version(request) @@ -4644,9 +4640,9 @@ def test_delete_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tool_version] = ( + mock_rpc + ) request = {} client.delete_tool_version(request) @@ -4973,9 +4969,9 @@ def test_restore_tool_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_tool_version] = ( + mock_rpc + ) request = {} client.restore_tool_version(request) @@ -6347,9 +6343,9 @@ def test_list_tool_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_tool_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_tool_versions] = ( + mock_rpc + ) request = {} client.list_tool_versions(request) @@ -6609,9 +6605,9 @@ def test_create_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tool_version] = ( + mock_rpc + ) request = {} client.create_tool_version(request) @@ -6802,9 +6798,9 @@ def test_get_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tool_version] = ( + mock_rpc + ) request = {} client.get_tool_version(request) @@ -6984,9 +6980,9 @@ def test_delete_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tool_version] = ( + mock_rpc + ) request = {} client.delete_tool_version(request) @@ -7165,9 +7161,9 @@ def test_restore_tool_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_tool_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_tool_version] = ( + mock_rpc + ) request = {} client.restore_tool_version(request) @@ -8006,8 +8002,9 @@ def test_create_tool_rest_bad_request(request_type=gcdc_tool.CreateToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8214,17 +8211,15 @@ def test_create_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_create_tool" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_create_tool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_create_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_create_tool") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_create_tool_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_create_tool") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8273,8 +8268,9 @@ def test_list_tools_rest_bad_request(request_type=tool.ListToolsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8335,17 +8331,15 @@ def test_list_tools_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_list_tools" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_list_tools_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_list_tools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_list_tools") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_list_tools_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_list_tools") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8394,8 +8388,9 @@ def test_export_tools_rest_bad_request(request_type=tool.ExportToolsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8450,19 +8445,16 @@ def test_export_tools_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_export_tools" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_export_tools_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_export_tools" - ) as pre: + 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.ToolsRestInterceptor, "post_export_tools") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_export_tools_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_export_tools") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8513,8 +8505,9 @@ def test_get_tool_rest_bad_request(request_type=tool.GetToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8583,17 +8576,15 @@ def test_get_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_get_tool" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_get_tool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_get_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_get_tool") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_get_tool_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_get_tool") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8646,8 +8637,9 @@ def test_update_tool_rest_bad_request(request_type=gcdc_tool.UpdateToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8858,17 +8850,15 @@ def test_update_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_update_tool" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_update_tool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_update_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_update_tool") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_update_tool_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_update_tool") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8919,8 +8909,9 @@ def test_delete_tool_rest_bad_request(request_type=tool.DeleteToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8977,13 +8968,11 @@ def test_delete_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "pre_delete_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "pre_delete_tool") as pre, + ): pre.assert_not_called() pb_message = tool.DeleteToolRequest.pb(tool.DeleteToolRequest()) transcode.return_value = { @@ -9026,8 +9015,9 @@ def test_list_tool_versions_rest_bad_request(request_type=tool.ListToolVersionsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9090,17 +9080,19 @@ def test_list_tool_versions_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_list_tool_versions" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_list_tool_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_list_tool_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ToolsRestInterceptor, "post_list_tool_versions" + ) as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_list_tool_versions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ToolsRestInterceptor, "pre_list_tool_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9155,8 +9147,9 @@ def test_create_tool_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9370,17 +9363,19 @@ def test_create_tool_version_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_create_tool_version" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_create_tool_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_create_tool_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ToolsRestInterceptor, "post_create_tool_version" + ) as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_create_tool_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ToolsRestInterceptor, "pre_create_tool_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9431,8 +9426,9 @@ def test_get_tool_version_rest_bad_request(request_type=tool.GetToolVersionReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9497,17 +9493,19 @@ def test_get_tool_version_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_get_tool_version" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_get_tool_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_get_tool_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ToolsRestInterceptor, "post_get_tool_version" + ) as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_get_tool_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ToolsRestInterceptor, "pre_get_tool_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9560,8 +9558,9 @@ def test_delete_tool_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9618,13 +9617,13 @@ def test_delete_tool_version_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "pre_delete_tool_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ToolsRestInterceptor, "pre_delete_tool_version" + ) as pre, + ): pre.assert_not_called() pb_message = tool.DeleteToolVersionRequest.pb(tool.DeleteToolVersionRequest()) transcode.return_value = { @@ -9669,8 +9668,9 @@ def test_restore_tool_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9730,17 +9730,19 @@ def test_restore_tool_version_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_restore_tool_version" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_restore_tool_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_restore_tool_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ToolsRestInterceptor, "post_restore_tool_version" + ) as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_restore_tool_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ToolsRestInterceptor, "pre_restore_tool_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9793,8 +9795,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9853,8 +9856,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9915,8 +9919,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9977,8 +9982,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10037,8 +10043,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10411,11 +10418,14 @@ def test_tools_base_transport(): def test_tools_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.tools.transports.ToolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.tools.transports.ToolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ToolsTransport( @@ -10435,9 +10445,12 @@ def test_tools_base_transport_with_credentials_file(): def test_tools_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.tools.transports.ToolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.tools.transports.ToolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ToolsTransport() @@ -10515,11 +10528,12 @@ def test_tools_transport_auth_gdch_credentials(transport_class): def test_tools_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_transition_route_groups.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_transition_route_groups.py index 9aa9af42a32f..24b3b8ae6356 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_transition_route_groups.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_transition_route_groups.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.transition_route_groups import ( TransitionRouteGroupsAsyncClient, @@ -70,11 +75,11 @@ page, response_message, tool_call, + transition_route_group, ) from google.cloud.dialogflowcx_v3beta1.types import ( transition_route_group as gcdc_transition_route_group, ) -from google.cloud.dialogflowcx_v3beta1.types import transition_route_group CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1010,10 +1015,9 @@ def test_transition_route_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1062,9 @@ def test_transition_route_groups_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1097,10 +1100,9 @@ def test_transition_route_groups_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1356,13 +1358,13 @@ def test_transition_route_groups_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4813,8 +4815,9 @@ def test_list_transition_route_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4881,20 +4884,22 @@ def test_list_transition_route_groups_rest_interceptors(null_interceptor): ) client = TransitionRouteGroupsClient(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.TransitionRouteGroupsRestInterceptor, - "post_list_transition_route_groups", - ) as post, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "post_list_transition_route_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "pre_list_transition_route_groups", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_list_transition_route_groups", + ) as post, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_list_transition_route_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "pre_list_transition_route_groups", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4954,8 +4959,9 @@ def test_get_transition_route_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5022,20 +5028,22 @@ def test_get_transition_route_group_rest_interceptors(null_interceptor): ) client = TransitionRouteGroupsClient(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.TransitionRouteGroupsRestInterceptor, - "post_get_transition_route_group", - ) as post, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "post_get_transition_route_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "pre_get_transition_route_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_get_transition_route_group", + ) as post, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_get_transition_route_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "pre_get_transition_route_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5095,8 +5103,9 @@ def test_create_transition_route_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5349,20 +5358,22 @@ def test_create_transition_route_group_rest_interceptors(null_interceptor): ) client = TransitionRouteGroupsClient(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.TransitionRouteGroupsRestInterceptor, - "post_create_transition_route_group", - ) as post, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "post_create_transition_route_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "pre_create_transition_route_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_create_transition_route_group", + ) as post, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_create_transition_route_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "pre_create_transition_route_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5424,8 +5435,9 @@ def test_update_transition_route_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5680,20 +5692,22 @@ def test_update_transition_route_group_rest_interceptors(null_interceptor): ) client = TransitionRouteGroupsClient(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.TransitionRouteGroupsRestInterceptor, - "post_update_transition_route_group", - ) as post, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "post_update_transition_route_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.TransitionRouteGroupsRestInterceptor, - "pre_update_transition_route_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_update_transition_route_group", + ) as post, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "post_update_transition_route_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "pre_update_transition_route_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5753,8 +5767,9 @@ def test_delete_transition_route_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5813,14 +5828,14 @@ def test_delete_transition_route_group_rest_interceptors(null_interceptor): ) client = TransitionRouteGroupsClient(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.TransitionRouteGroupsRestInterceptor, - "pre_delete_transition_route_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.TransitionRouteGroupsRestInterceptor, + "pre_delete_transition_route_group", + ) as pre, + ): pre.assert_not_called() pb_message = transition_route_group.DeleteTransitionRouteGroupRequest.pb( transition_route_group.DeleteTransitionRouteGroupRequest() @@ -5865,8 +5880,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5925,8 +5941,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5987,8 +6004,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6049,8 +6067,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6109,8 +6128,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6337,11 +6357,14 @@ def test_transition_route_groups_base_transport(): def test_transition_route_groups_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.transition_route_groups.transports.TransitionRouteGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.transition_route_groups.transports.TransitionRouteGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TransitionRouteGroupsTransport( @@ -6361,9 +6384,12 @@ def test_transition_route_groups_base_transport_with_credentials_file(): def test_transition_route_groups_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.transition_route_groups.transports.TransitionRouteGroupsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.transition_route_groups.transports.TransitionRouteGroupsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.TransitionRouteGroupsTransport() @@ -6443,11 +6469,12 @@ def test_transition_route_groups_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_versions.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_versions.py index 4ebedc1af180..125dafc77dfa 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_versions.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_versions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.versions import ( VersionsAsyncClient, @@ -73,8 +73,7 @@ pagers, transports, ) -from google.cloud.dialogflowcx_v3beta1.types import flow -from google.cloud.dialogflowcx_v3beta1.types import version +from google.cloud.dialogflowcx_v3beta1.types import flow, version from google.cloud.dialogflowcx_v3beta1.types import version as gcdc_version CRED_INFO_JSON = { @@ -924,10 +923,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +970,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1011,10 +1008,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1239,13 +1235,13 @@ def test_versions_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3527,9 +3523,9 @@ def test_compare_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compare_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compare_versions] = ( + mock_rpc + ) request = {} client.compare_versions(request) @@ -4955,9 +4951,9 @@ def test_compare_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compare_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compare_versions] = ( + mock_rpc + ) request = {} client.compare_versions(request) @@ -5602,8 +5598,9 @@ def test_list_versions_rest_bad_request(request_type=version.ListVersionsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5666,17 +5663,19 @@ def test_list_versions_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_list_versions" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_list_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_list_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_list_versions" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_list_versions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_list_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5729,8 +5728,9 @@ def test_get_version_rest_bad_request(request_type=version.GetVersionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5799,17 +5799,17 @@ def test_get_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_get_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_get_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_get_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_get_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_get_version_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VersionsRestInterceptor, "pre_get_version") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5862,8 +5862,9 @@ def test_create_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5999,19 +6000,20 @@ def test_create_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_create_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_create_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_create_version" - ) as pre: + 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.VersionsRestInterceptor, "post_create_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_create_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_create_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6068,8 +6070,9 @@ def test_update_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6219,17 +6222,19 @@ def test_update_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_update_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_update_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_update_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_update_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_update_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_update_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6282,8 +6287,9 @@ def test_delete_version_rest_bad_request(request_type=version.DeleteVersionReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6340,13 +6346,13 @@ def test_delete_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "pre_delete_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_delete_version" + ) as pre, + ): pre.assert_not_called() pb_message = version.DeleteVersionRequest.pb(version.DeleteVersionRequest()) transcode.return_value = { @@ -6389,8 +6395,9 @@ def test_load_version_rest_bad_request(request_type=version.LoadVersionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6447,19 +6454,20 @@ def test_load_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_load_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_load_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_load_version" - ) as pre: + 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.VersionsRestInterceptor, "post_load_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_load_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_load_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6510,8 +6518,9 @@ def test_compare_versions_rest_bad_request(request_type=version.CompareVersionsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6576,17 +6585,19 @@ def test_compare_versions_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_compare_versions" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_compare_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_compare_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_compare_versions" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_compare_versions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_compare_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6639,8 +6650,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6699,8 +6711,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6761,8 +6774,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6823,8 +6837,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6883,8 +6898,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7165,11 +7181,14 @@ def test_versions_base_transport(): def test_versions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.versions.transports.VersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.versions.transports.VersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VersionsTransport( @@ -7189,9 +7208,12 @@ def test_versions_base_transport_with_credentials_file(): def test_versions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.versions.transports.VersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.versions.transports.VersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VersionsTransport() @@ -7269,11 +7291,12 @@ def test_versions_transport_auth_gdch_credentials(transport_class): def test_versions_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_webhooks.py b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_webhooks.py index 40a29b0ff286..3517f9570183 100644 --- a/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_webhooks.py +++ b/packages/google-cloud-dialogflow-cx/tests/unit/gapic/dialogflowcx_v3beta1/test_webhooks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflowcx_v3beta1.services.webhooks import ( WebhooksAsyncClient, @@ -912,10 +917,9 @@ def test_webhooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +964,9 @@ def test_webhooks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1002,9 @@ def test_webhooks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1227,13 +1229,13 @@ def test_webhooks_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4447,8 +4449,9 @@ def test_list_webhooks_rest_bad_request(request_type=webhook.ListWebhooksRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4509,17 +4512,19 @@ def test_list_webhooks_rest_interceptors(null_interceptor): ) client = WebhooksClient(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.WebhooksRestInterceptor, "post_list_webhooks" - ) as post, mock.patch.object( - transports.WebhooksRestInterceptor, "post_list_webhooks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WebhooksRestInterceptor, "pre_list_webhooks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_list_webhooks" + ) as post, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_list_webhooks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.WebhooksRestInterceptor, "pre_list_webhooks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4572,8 +4577,9 @@ def test_get_webhook_rest_bad_request(request_type=webhook.GetWebhookRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4640,17 +4646,17 @@ def test_get_webhook_rest_interceptors(null_interceptor): ) client = WebhooksClient(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.WebhooksRestInterceptor, "post_get_webhook" - ) as post, mock.patch.object( - transports.WebhooksRestInterceptor, "post_get_webhook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WebhooksRestInterceptor, "pre_get_webhook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_get_webhook" + ) as post, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_get_webhook_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.WebhooksRestInterceptor, "pre_get_webhook") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4701,8 +4707,9 @@ def test_create_webhook_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4863,17 +4870,19 @@ def test_create_webhook_rest_interceptors(null_interceptor): ) client = WebhooksClient(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.WebhooksRestInterceptor, "post_create_webhook" - ) as post, mock.patch.object( - transports.WebhooksRestInterceptor, "post_create_webhook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WebhooksRestInterceptor, "pre_create_webhook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_create_webhook" + ) as post, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_create_webhook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.WebhooksRestInterceptor, "pre_create_webhook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4930,8 +4939,9 @@ def test_update_webhook_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5096,17 +5106,19 @@ def test_update_webhook_rest_interceptors(null_interceptor): ) client = WebhooksClient(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.WebhooksRestInterceptor, "post_update_webhook" - ) as post, mock.patch.object( - transports.WebhooksRestInterceptor, "post_update_webhook_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.WebhooksRestInterceptor, "pre_update_webhook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_update_webhook" + ) as post, + mock.patch.object( + transports.WebhooksRestInterceptor, "post_update_webhook_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.WebhooksRestInterceptor, "pre_update_webhook" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5159,8 +5171,9 @@ def test_delete_webhook_rest_bad_request(request_type=webhook.DeleteWebhookReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5217,13 +5230,13 @@ def test_delete_webhook_rest_interceptors(null_interceptor): ) client = WebhooksClient(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.WebhooksRestInterceptor, "pre_delete_webhook" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.WebhooksRestInterceptor, "pre_delete_webhook" + ) as pre, + ): pre.assert_not_called() pb_message = webhook.DeleteWebhookRequest.pb(webhook.DeleteWebhookRequest()) transcode.return_value = { @@ -5266,8 +5279,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5326,8 +5340,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5388,8 +5403,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5450,8 +5466,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5510,8 +5527,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5728,11 +5746,14 @@ def test_webhooks_base_transport(): def test_webhooks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.webhooks.transports.WebhooksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.webhooks.transports.WebhooksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.WebhooksTransport( @@ -5752,9 +5773,12 @@ def test_webhooks_base_transport_with_credentials_file(): def test_webhooks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflowcx_v3beta1.services.webhooks.transports.WebhooksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflowcx_v3beta1.services.webhooks.transports.WebhooksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.WebhooksTransport() @@ -5832,11 +5856,12 @@ def test_webhooks_transport_auth_gdch_credentials(transport_class): def test_webhooks_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/docs/conf.py b/packages/google-cloud-dialogflow/docs/conf.py index ff84f5d256e1..84cfe9699ca9 100644 --- a/packages/google-cloud-dialogflow/docs/conf.py +++ b/packages/google-cloud-dialogflow/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-dialogflow documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/__init__.py index 157877f25793..831da88affb4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.agents import AgentsAsyncClient, AgentsClient from .services.answer_records import AnswerRecordsAsyncClient, AnswerRecordsClient from .services.contexts import ContextsAsyncClient, ContextsClient diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/async_client.py index 12b3cd87236a..27c397c8c980 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,17 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.agents import pagers -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result from .client import AgentsClient from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -112,7 +111,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_info.__func__(AgentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AgentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AgentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +128,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_file.__func__(AgentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AgentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AgentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/client.py index f2b43a9ade20..09af80ec0b1f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,17 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.agents import pagers -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport from .transports.grpc import AgentsGrpcTransport @@ -620,11 +619,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AgentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AgentsClient._read_environment_variables() + ) self._client_cert_source = AgentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -659,8 +656,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AgentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/pagers.py index cb6544ecbf01..689bc6b6bfac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/base.py index 8c1cb474f9d7..b47f80c5984c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/base.py @@ -17,21 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -333,7 +332,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc.py index 6543cd922558..5ab71171eaef 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc.py @@ -16,24 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py index 129b39d71693..15fd33a8e84f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,16 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result from .base import DEFAULT_CLIENT_INFO, AgentsTransport from .grpc import AgentsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest.py index deb7d6bde3ee..59c05990d852 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest.py @@ -16,24 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAgentsRestTransport @@ -872,7 +871,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -991,7 +990,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1451,7 +1450,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1605,7 +1604,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2069,7 +2068,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest_base.py index 0f3ec0e543d6..a06646e68ecd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/agents/transports/rest_base.py @@ -17,15 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/async_client.py index eb10f471fdc4..c37d6a40c456 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.answer_records import pagers from google.cloud.dialogflow_v2.types import answer_record @@ -128,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AnswerRecordsAsyncClient: The constructed client. """ - return AnswerRecordsClient.from_service_account_info.__func__(AnswerRecordsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AnswerRecordsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AnswerRecordsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AnswerRecordsAsyncClient: The constructed client. """ - return AnswerRecordsClient.from_service_account_file.__func__(AnswerRecordsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AnswerRecordsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AnswerRecordsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/client.py index 2e3ce7b8c36c..1a20eff8a817 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.answer_records import pagers from google.cloud.dialogflow_v2.types import answer_record @@ -683,11 +683,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AnswerRecordsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AnswerRecordsClient._read_environment_variables() + ) self._client_cert_source = AnswerRecordsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -722,8 +720,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AnswerRecordsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/pagers.py index bb3b1b9c9f5f..1418dcd76f77 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/base.py index d17f912193c7..20b5fffa8858 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import answer_record @@ -235,7 +235,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc.py index 627e46be21e3..8dbe9a2e5ba2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import answer_record from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc_asyncio.py index 2771ff55e068..a9d1338bd1ac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import answer_record from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest.py index 780d10deb58c..6051e3fd627f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/answer_records/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -465,9 +465,7 @@ def __call__( """ - http_options = ( - _BaseAnswerRecordsRestTransport._BaseListAnswerRecords._get_http_options() - ) + http_options = _BaseAnswerRecordsRestTransport._BaseListAnswerRecords._get_http_options() request, metadata = self._interceptor.pre_list_answer_records( request, metadata @@ -647,9 +645,7 @@ def __call__( """ - http_options = ( - _BaseAnswerRecordsRestTransport._BaseUpdateAnswerRecord._get_http_options() - ) + http_options = _BaseAnswerRecordsRestTransport._BaseUpdateAnswerRecord._get_http_options() request, metadata = self._interceptor.pre_update_answer_record( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/async_client.py index cdfe61b46e33..1e52d2e31c53 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.contexts import pagers from google.cloud.dialogflow_v2.types import context @@ -111,7 +111,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ContextsAsyncClient: The constructed client. """ - return ContextsClient.from_service_account_info.__func__(ContextsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ContextsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ContextsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +128,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ContextsAsyncClient: The constructed client. """ - return ContextsClient.from_service_account_file.__func__(ContextsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ContextsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ContextsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/client.py index 1768cd4d4144..ac524ca677cd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.contexts import pagers from google.cloud.dialogflow_v2.types import context @@ -624,11 +624,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContextsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContextsClient._read_environment_variables() + ) self._client_cert_source = ContextsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -663,8 +661,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContextsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/pagers.py index 2d1302d4c40d..cec086b8f8e5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/base.py index ad348edf826d..c3c08a12e813 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import context @@ -286,7 +286,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc.py index 52e11c1fc03f..b8ed5b9fa877 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import context from google.cloud.dialogflow_v2.types import context as gcd_context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc_asyncio.py index 8f07a831d2b3..6ce04e62b970 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import context from google.cloud.dialogflow_v2.types import context as gcd_context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest.py index ea37649ed225..34a8ec79d6c8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -790,7 +790,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -901,7 +901,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest_base.py index bf37e18cf7d3..f1201939a274 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/contexts/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2.types import context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/async_client.py index 16ea20874148..05c2ef8fc51f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,18 +44,18 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_datasets import pagers +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset from .client import ConversationDatasetsClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport @@ -131,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationDatasetsAsyncClient: The constructed client. """ - return ConversationDatasetsClient.from_service_account_info.__func__(ConversationDatasetsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConversationDatasetsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConversationDatasetsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationDatasetsAsyncClient: The constructed client. """ - return ConversationDatasetsClient.from_service_account_file.__func__(ConversationDatasetsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConversationDatasetsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConversationDatasetsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -185,7 +187,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationDatasetsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationDatasetsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationDatasetsTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/client.py index e7e8ee6713df..8d3e2cd87fee 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,18 +61,18 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_datasets import pagers +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset from .transports.base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport from .transports.grpc import ConversationDatasetsGrpcTransport @@ -88,9 +88,7 @@ class ConversationDatasetsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationDatasetsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationDatasetsTransport]] _transport_registry["grpc"] = ConversationDatasetsGrpcTransport _transport_registry["grpc_asyncio"] = ConversationDatasetsGrpcAsyncIOTransport _transport_registry["rest"] = ConversationDatasetsRestTransport @@ -638,11 +636,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationDatasetsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationDatasetsClient._read_environment_variables() + ) self._client_cert_source = ConversationDatasetsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +673,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationDatasetsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/pagers.py index d01c4f0fc61f..f677e39aaeea 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/__init__.py index 2af8bedadff7..dc407fc2e845 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ConversationDatasetsRestInterceptor, ConversationDatasetsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationDatasetsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationDatasetsTransport]] _transport_registry["grpc"] = ConversationDatasetsGrpcTransport _transport_registry["grpc_asyncio"] = ConversationDatasetsGrpcAsyncIOTransport _transport_registry["rest"] = ConversationDatasetsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/base.py index 209bfec6a1da..cc17922ae964 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/base.py @@ -17,21 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -285,7 +285,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc.py index 4f0033f78a43..4fcf645f4a65 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc.py @@ -16,24 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset from .base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport @@ -378,12 +378,12 @@ def create_conversation_dataset( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_dataset" not in self._stubs: - self._stubs[ - "create_conversation_dataset" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationDatasets/CreateConversationDataset", - request_serializer=gcd_conversation_dataset.CreateConversationDatasetRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_conversation_dataset"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationDatasets/CreateConversationDataset", + request_serializer=gcd_conversation_dataset.CreateConversationDatasetRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_conversation_dataset"] @@ -439,12 +439,12 @@ def list_conversation_datasets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_datasets" not in self._stubs: - self._stubs[ - "list_conversation_datasets" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationDatasets/ListConversationDatasets", - request_serializer=conversation_dataset.ListConversationDatasetsRequest.serialize, - response_deserializer=conversation_dataset.ListConversationDatasetsResponse.deserialize, + self._stubs["list_conversation_datasets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationDatasets/ListConversationDatasets", + request_serializer=conversation_dataset.ListConversationDatasetsRequest.serialize, + response_deserializer=conversation_dataset.ListConversationDatasetsResponse.deserialize, + ) ) return self._stubs["list_conversation_datasets"] @@ -480,12 +480,12 @@ def delete_conversation_dataset( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversation_dataset" not in self._stubs: - self._stubs[ - "delete_conversation_dataset" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationDatasets/DeleteConversationDataset", - request_serializer=conversation_dataset.DeleteConversationDatasetRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_conversation_dataset"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationDatasets/DeleteConversationDataset", + request_serializer=conversation_dataset.DeleteConversationDatasetRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_conversation_dataset"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc_asyncio.py index 3df1186e264b..8917f03b791a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,15 +31,12 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset from .base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport from .grpc import ConversationDatasetsGrpcTransport @@ -386,12 +386,12 @@ def create_conversation_dataset( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_dataset" not in self._stubs: - self._stubs[ - "create_conversation_dataset" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationDatasets/CreateConversationDataset", - request_serializer=gcd_conversation_dataset.CreateConversationDatasetRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_conversation_dataset"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationDatasets/CreateConversationDataset", + request_serializer=gcd_conversation_dataset.CreateConversationDatasetRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_conversation_dataset"] @@ -447,12 +447,12 @@ def list_conversation_datasets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_datasets" not in self._stubs: - self._stubs[ - "list_conversation_datasets" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationDatasets/ListConversationDatasets", - request_serializer=conversation_dataset.ListConversationDatasetsRequest.serialize, - response_deserializer=conversation_dataset.ListConversationDatasetsResponse.deserialize, + self._stubs["list_conversation_datasets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationDatasets/ListConversationDatasets", + request_serializer=conversation_dataset.ListConversationDatasetsRequest.serialize, + response_deserializer=conversation_dataset.ListConversationDatasetsResponse.deserialize, + ) ) return self._stubs["list_conversation_datasets"] @@ -488,12 +488,12 @@ def delete_conversation_dataset( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversation_dataset" not in self._stubs: - self._stubs[ - "delete_conversation_dataset" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationDatasets/DeleteConversationDataset", - request_serializer=conversation_dataset.DeleteConversationDatasetRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_conversation_dataset"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationDatasets/DeleteConversationDataset", + request_serializer=conversation_dataset.DeleteConversationDatasetRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_conversation_dataset"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest.py index 6274dec95ea6..2c9089900888 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest.py @@ -16,24 +16,24 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationDatasetsRestTransport @@ -708,9 +708,7 @@ def __call__( """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseCreateConversationDataset._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseCreateConversationDataset._get_http_options() request, metadata = self._interceptor.pre_create_conversation_dataset( request, metadata @@ -736,7 +734,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -863,9 +861,7 @@ def __call__( """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseDeleteConversationDataset._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseDeleteConversationDataset._get_http_options() request, metadata = self._interceptor.pre_delete_conversation_dataset( request, metadata @@ -887,7 +883,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1016,9 +1012,7 @@ def __call__( """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseGetConversationDataset._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseGetConversationDataset._get_http_options() request, metadata = self._interceptor.pre_get_conversation_dataset( request, metadata @@ -1172,9 +1166,7 @@ def __call__( """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseImportConversationData._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseImportConversationData._get_http_options() request, metadata = self._interceptor.pre_import_conversation_data( request, metadata @@ -1200,7 +1192,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1328,9 +1320,7 @@ def __call__( """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseListConversationDatasets._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseListConversationDatasets._get_http_options() request, metadata = self._interceptor.pre_list_conversation_datasets( request, metadata @@ -1433,7 +1423,9 @@ def create_conversation_dataset( ]: # 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._CreateConversationDataset(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConversationDataset( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_conversation_dataset( @@ -1444,7 +1436,9 @@ def delete_conversation_dataset( ]: # 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._DeleteConversationDataset(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConversationDataset( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_conversation_dataset( @@ -1455,7 +1449,9 @@ def get_conversation_dataset( ]: # 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._GetConversationDataset(self._session, self._host, self._interceptor) # type: ignore + return self._GetConversationDataset( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_conversation_data( @@ -1465,7 +1461,9 @@ def import_conversation_data( ]: # 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._ImportConversationData(self._session, self._host, self._interceptor) # type: ignore + return self._ImportConversationData( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversation_datasets( @@ -1476,7 +1474,9 @@ def list_conversation_datasets( ]: # 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._ListConversationDatasets(self._session, self._host, self._interceptor) # type: ignore + return self._ListConversationDatasets( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1536,9 +1536,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseConversationDatasetsRestTransport._BaseGetLocation._get_transcoded_request( @@ -1677,9 +1675,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseConversationDatasetsRestTransport._BaseListLocations._get_transcoded_request( @@ -1815,9 +1811,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1933,9 +1927,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationDatasetsRestTransport._BaseGetOperation._get_transcoded_request( @@ -2074,9 +2066,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationDatasetsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationDatasetsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationDatasetsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest_base.py index 39b2787276eb..ec5976be40a7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_datasets/transports/rest_base.py @@ -22,10 +22,10 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflow_v2.types import conversation_dataset from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset from .base import DEFAULT_CLIENT_INFO, ConversationDatasetsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/async_client.py index 44ed9090129e..a7fc23461426 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,18 +44,18 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_models import pagers +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model from .client import ConversationModelsClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationModelsTransport @@ -141,7 +141,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationModelsAsyncClient: The constructed client. """ - return ConversationModelsClient.from_service_account_info.__func__(ConversationModelsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConversationModelsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConversationModelsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +158,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationModelsAsyncClient: The constructed client. """ - return ConversationModelsClient.from_service_account_file.__func__(ConversationModelsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConversationModelsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConversationModelsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -195,7 +197,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationModelsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationModelsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationModelsTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/client.py index 3a58f1e0d2dc..3578127110d6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,18 +61,18 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_models import pagers +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model from .transports.base import DEFAULT_CLIENT_INFO, ConversationModelsTransport from .transports.grpc import ConversationModelsGrpcTransport @@ -88,9 +88,7 @@ class ConversationModelsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationModelsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationModelsTransport]] _transport_registry["grpc"] = ConversationModelsGrpcTransport _transport_registry["grpc_asyncio"] = ConversationModelsGrpcAsyncIOTransport _transport_registry["rest"] = ConversationModelsRestTransport @@ -700,11 +698,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationModelsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationModelsClient._read_environment_variables() + ) self._client_cert_source = ConversationModelsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -739,8 +735,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationModelsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/pagers.py index c692bf680272..07a94e33ea1a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/__init__.py index efef7b9dc687..ec8b4e827bab 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ConversationModelsRestInterceptor, ConversationModelsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationModelsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationModelsTransport]] _transport_registry["grpc"] = ConversationModelsGrpcTransport _transport_registry["grpc_asyncio"] = ConversationModelsGrpcAsyncIOTransport _transport_registry["rest"] = ConversationModelsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/base.py index 5f28e95651bf..e141ac251b67 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/base.py @@ -17,21 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -347,7 +347,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc.py index 19fb436f699f..2fe6539dd0d1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc.py @@ -16,24 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model from .base import DEFAULT_CLIENT_INFO, ConversationModelsTransport @@ -554,12 +554,12 @@ def undeploy_conversation_model( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_conversation_model" not in self._stubs: - self._stubs[ - "undeploy_conversation_model" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/UndeployConversationModel", - request_serializer=conversation_model.UndeployConversationModelRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undeploy_conversation_model"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/UndeployConversationModel", + request_serializer=conversation_model.UndeployConversationModelRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undeploy_conversation_model"] @@ -586,12 +586,12 @@ def get_conversation_model_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_conversation_model_evaluation" not in self._stubs: - self._stubs[ - "get_conversation_model_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/GetConversationModelEvaluation", - request_serializer=conversation_model.GetConversationModelEvaluationRequest.serialize, - response_deserializer=conversation_model.ConversationModelEvaluation.deserialize, + self._stubs["get_conversation_model_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/GetConversationModelEvaluation", + request_serializer=conversation_model.GetConversationModelEvaluationRequest.serialize, + response_deserializer=conversation_model.ConversationModelEvaluation.deserialize, + ) ) return self._stubs["get_conversation_model_evaluation"] @@ -618,12 +618,12 @@ def list_conversation_model_evaluations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_model_evaluations" not in self._stubs: - self._stubs[ - "list_conversation_model_evaluations" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/ListConversationModelEvaluations", - request_serializer=conversation_model.ListConversationModelEvaluationsRequest.serialize, - response_deserializer=conversation_model.ListConversationModelEvaluationsResponse.deserialize, + self._stubs["list_conversation_model_evaluations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/ListConversationModelEvaluations", + request_serializer=conversation_model.ListConversationModelEvaluationsRequest.serialize, + response_deserializer=conversation_model.ListConversationModelEvaluationsResponse.deserialize, + ) ) return self._stubs["list_conversation_model_evaluations"] @@ -650,12 +650,12 @@ def create_conversation_model_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_model_evaluation" not in self._stubs: - self._stubs[ - "create_conversation_model_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/CreateConversationModelEvaluation", - request_serializer=conversation_model.CreateConversationModelEvaluationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_conversation_model_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/CreateConversationModelEvaluation", + request_serializer=conversation_model.CreateConversationModelEvaluationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_conversation_model_evaluation"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc_asyncio.py index 1aa1d5a5276e..755c783db2a3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,15 +31,12 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model from .base import DEFAULT_CLIENT_INFO, ConversationModelsTransport from .grpc import ConversationModelsGrpcTransport @@ -565,12 +565,12 @@ def undeploy_conversation_model( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_conversation_model" not in self._stubs: - self._stubs[ - "undeploy_conversation_model" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/UndeployConversationModel", - request_serializer=conversation_model.UndeployConversationModelRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undeploy_conversation_model"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/UndeployConversationModel", + request_serializer=conversation_model.UndeployConversationModelRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undeploy_conversation_model"] @@ -597,12 +597,12 @@ def get_conversation_model_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_conversation_model_evaluation" not in self._stubs: - self._stubs[ - "get_conversation_model_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/GetConversationModelEvaluation", - request_serializer=conversation_model.GetConversationModelEvaluationRequest.serialize, - response_deserializer=conversation_model.ConversationModelEvaluation.deserialize, + self._stubs["get_conversation_model_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/GetConversationModelEvaluation", + request_serializer=conversation_model.GetConversationModelEvaluationRequest.serialize, + response_deserializer=conversation_model.ConversationModelEvaluation.deserialize, + ) ) return self._stubs["get_conversation_model_evaluation"] @@ -629,12 +629,12 @@ def list_conversation_model_evaluations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_model_evaluations" not in self._stubs: - self._stubs[ - "list_conversation_model_evaluations" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/ListConversationModelEvaluations", - request_serializer=conversation_model.ListConversationModelEvaluationsRequest.serialize, - response_deserializer=conversation_model.ListConversationModelEvaluationsResponse.deserialize, + self._stubs["list_conversation_model_evaluations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/ListConversationModelEvaluations", + request_serializer=conversation_model.ListConversationModelEvaluationsRequest.serialize, + response_deserializer=conversation_model.ListConversationModelEvaluationsResponse.deserialize, + ) ) return self._stubs["list_conversation_model_evaluations"] @@ -661,12 +661,12 @@ def create_conversation_model_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_model_evaluation" not in self._stubs: - self._stubs[ - "create_conversation_model_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationModels/CreateConversationModelEvaluation", - request_serializer=conversation_model.CreateConversationModelEvaluationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_conversation_model_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationModels/CreateConversationModelEvaluation", + request_serializer=conversation_model.CreateConversationModelEvaluationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_conversation_model_evaluation"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest.py index 71f2e6b708ab..75618dbb4e91 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest.py @@ -16,24 +16,24 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationModelsRestTransport @@ -937,9 +937,7 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseCreateConversationModel._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseCreateConversationModel._get_http_options() request, metadata = self._interceptor.pre_create_conversation_model( request, metadata @@ -965,7 +963,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1097,15 +1095,12 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseCreateConversationModelEvaluation._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseCreateConversationModelEvaluation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_conversation_model_evaluation( - request, metadata + request, metadata = ( + self._interceptor.pre_create_conversation_model_evaluation( + request, metadata + ) ) transcoded_request = _BaseConversationModelsRestTransport._BaseCreateConversationModelEvaluation._get_transcoded_request( http_options, request @@ -1128,7 +1123,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1169,11 +1164,10 @@ def __call__( resp = self._interceptor.post_create_conversation_model_evaluation(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_conversation_model_evaluation_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_conversation_model_evaluation_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1257,9 +1251,7 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseDeleteConversationModel._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseDeleteConversationModel._get_http_options() request, metadata = self._interceptor.pre_delete_conversation_model( request, metadata @@ -1281,7 +1273,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1409,9 +1401,7 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseDeployConversationModel._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseDeployConversationModel._get_http_options() request, metadata = self._interceptor.pre_deploy_conversation_model( request, metadata @@ -1437,7 +1427,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1562,9 +1552,7 @@ def __call__( Represents a conversation model. """ - http_options = ( - _BaseConversationModelsRestTransport._BaseGetConversationModel._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseGetConversationModel._get_http_options() request, metadata = self._interceptor.pre_get_conversation_model( request, metadata @@ -1719,9 +1707,7 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseGetConversationModelEvaluation._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseGetConversationModelEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_conversation_model_evaluation( request, metadata @@ -1785,11 +1771,10 @@ def __call__( resp = self._interceptor.post_get_conversation_model_evaluation(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_conversation_model_evaluation_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_conversation_model_evaluation_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1877,15 +1862,12 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseListConversationModelEvaluations._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseListConversationModelEvaluations._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_conversation_model_evaluations( - request, metadata + request, metadata = ( + self._interceptor.pre_list_conversation_model_evaluations( + request, metadata + ) ) transcoded_request = _BaseConversationModelsRestTransport._BaseListConversationModelEvaluations._get_transcoded_request( http_options, request @@ -1948,11 +1930,10 @@ def __call__( resp = self._interceptor.post_list_conversation_model_evaluations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_conversation_model_evaluations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_conversation_model_evaluations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2037,9 +2018,7 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseListConversationModels._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseListConversationModels._get_http_options() request, metadata = self._interceptor.pre_list_conversation_models( request, metadata @@ -2196,9 +2175,7 @@ def __call__( """ - http_options = ( - _BaseConversationModelsRestTransport._BaseUndeployConversationModel._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseUndeployConversationModel._get_http_options() request, metadata = self._interceptor.pre_undeploy_conversation_model( request, metadata @@ -2224,7 +2201,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2300,7 +2277,9 @@ def create_conversation_model( ]: # 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._CreateConversationModel(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConversationModel( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_conversation_model_evaluation( @@ -2311,7 +2290,9 @@ def create_conversation_model_evaluation( ]: # 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._CreateConversationModelEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConversationModelEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_conversation_model( @@ -2321,7 +2302,9 @@ def delete_conversation_model( ]: # 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._DeleteConversationModel(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConversationModel( + self._session, self._host, self._interceptor + ) # type: ignore @property def deploy_conversation_model( @@ -2331,7 +2314,9 @@ def deploy_conversation_model( ]: # 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._DeployConversationModel(self._session, self._host, self._interceptor) # type: ignore + return self._DeployConversationModel( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_conversation_model( @@ -2353,7 +2338,9 @@ def get_conversation_model_evaluation( ]: # 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._GetConversationModelEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._GetConversationModelEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversation_model_evaluations( @@ -2364,7 +2351,9 @@ def list_conversation_model_evaluations( ]: # 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._ListConversationModelEvaluations(self._session, self._host, self._interceptor) # type: ignore + return self._ListConversationModelEvaluations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversation_models( @@ -2375,7 +2364,9 @@ def list_conversation_models( ]: # 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._ListConversationModels(self._session, self._host, self._interceptor) # type: ignore + return self._ListConversationModels( + self._session, self._host, self._interceptor + ) # type: ignore @property def undeploy_conversation_model( @@ -2385,7 +2376,9 @@ def undeploy_conversation_model( ]: # 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._UndeployConversationModel(self._session, self._host, self._interceptor) # type: ignore + return self._UndeployConversationModel( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -2445,9 +2438,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseConversationModelsRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseConversationModelsRestTransport._BaseGetLocation._get_transcoded_request( @@ -2586,9 +2577,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseConversationModelsRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseConversationModelsRestTransport._BaseListLocations._get_transcoded_request( @@ -2724,9 +2713,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationModelsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2842,9 +2829,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationModelsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationModelsRestTransport._BaseGetOperation._get_transcoded_request( @@ -2983,9 +2968,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationModelsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationModelsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationModelsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest_base.py index ac5c0a0c4d64..64652b737e83 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_models/transports/rest_base.py @@ -22,10 +22,10 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model from .base import DEFAULT_CLIENT_INFO, ConversationModelsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/async_client.py index 8d66ad58e142..5ae9a40595ac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,20 +44,22 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_profiles import pagers +from google.cloud.dialogflow_v2.types import ( + audio_config, + conversation_profile, + participant, +) from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import audio_config -from google.cloud.dialogflow_v2.types import conversation_profile -from google.cloud.dialogflow_v2.types import participant from .client import ConversationProfilesClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport @@ -157,7 +159,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationProfilesAsyncClient: The constructed client. """ - return ConversationProfilesClient.from_service_account_info.__func__(ConversationProfilesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConversationProfilesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConversationProfilesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +176,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationProfilesAsyncClient: The constructed client. """ - return ConversationProfilesClient.from_service_account_file.__func__(ConversationProfilesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConversationProfilesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConversationProfilesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -211,7 +215,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationProfilesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationProfilesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationProfilesTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/client.py index 7247400a11c4..7b01b1a406ea 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,20 +61,22 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_profiles import pagers +from google.cloud.dialogflow_v2.types import ( + audio_config, + conversation_profile, + participant, +) from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import audio_config -from google.cloud.dialogflow_v2.types import conversation_profile -from google.cloud.dialogflow_v2.types import participant from .transports.base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport from .transports.grpc import ConversationProfilesGrpcTransport @@ -90,9 +92,7 @@ class ConversationProfilesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationProfilesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationProfilesTransport]] _transport_registry["grpc"] = ConversationProfilesGrpcTransport _transport_registry["grpc_asyncio"] = ConversationProfilesGrpcAsyncIOTransport _transport_registry["rest"] = ConversationProfilesRestTransport @@ -780,11 +780,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationProfilesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationProfilesClient._read_environment_variables() + ) self._client_cert_source = ConversationProfilesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -819,8 +817,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationProfilesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/pagers.py index 094c4b1c76c7..b506e2b6aebb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/__init__.py index cfed16be48c8..2005af811949 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ConversationProfilesRestInterceptor, ConversationProfilesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationProfilesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationProfilesTransport]] _transport_registry["grpc"] = ConversationProfilesGrpcTransport _transport_registry["grpc_asyncio"] = ConversationProfilesGrpcAsyncIOTransport _transport_registry["rest"] = ConversationProfilesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/base.py index 80d7075b2659..84e74e80431f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import conversation_profile DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -320,7 +320,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc.py index 8fcf87455b77..ad507e99cb7e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import conversation_profile from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport @@ -368,12 +368,12 @@ def list_conversation_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_profiles" not in self._stubs: - self._stubs[ - "list_conversation_profiles" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/ListConversationProfiles", - request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, - response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + self._stubs["list_conversation_profiles"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/ListConversationProfiles", + request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, + response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + ) ) return self._stubs["list_conversation_profiles"] @@ -435,12 +435,12 @@ def create_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_profile" not in self._stubs: - self._stubs[ - "create_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/CreateConversationProfile", - request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["create_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/CreateConversationProfile", + request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["create_conversation_profile"] @@ -473,12 +473,12 @@ def update_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_conversation_profile" not in self._stubs: - self._stubs[ - "update_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/UpdateConversationProfile", - request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["update_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/UpdateConversationProfile", + request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["update_conversation_profile"] @@ -503,12 +503,12 @@ def delete_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversation_profile" not in self._stubs: - self._stubs[ - "delete_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/DeleteConversationProfile", - request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/DeleteConversationProfile", + request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_conversation_profile"] @@ -553,12 +553,12 @@ def set_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_suggestion_feature_config" not in self._stubs: - self._stubs[ - "set_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/SetSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/SetSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_suggestion_feature_config"] @@ -596,12 +596,12 @@ def clear_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "clear_suggestion_feature_config" not in self._stubs: - self._stubs[ - "clear_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/ClearSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["clear_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/ClearSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["clear_suggestion_feature_config"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc_asyncio.py index b74f5fb9e6e0..1239b71a7d7c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import conversation_profile from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport from .grpc import ConversationProfilesGrpcTransport @@ -376,12 +376,12 @@ def list_conversation_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_profiles" not in self._stubs: - self._stubs[ - "list_conversation_profiles" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/ListConversationProfiles", - request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, - response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + self._stubs["list_conversation_profiles"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/ListConversationProfiles", + request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, + response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + ) ) return self._stubs["list_conversation_profiles"] @@ -443,12 +443,12 @@ def create_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_profile" not in self._stubs: - self._stubs[ - "create_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/CreateConversationProfile", - request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["create_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/CreateConversationProfile", + request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["create_conversation_profile"] @@ -481,12 +481,12 @@ def update_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_conversation_profile" not in self._stubs: - self._stubs[ - "update_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/UpdateConversationProfile", - request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["update_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/UpdateConversationProfile", + request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["update_conversation_profile"] @@ -512,12 +512,12 @@ def delete_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversation_profile" not in self._stubs: - self._stubs[ - "delete_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/DeleteConversationProfile", - request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/DeleteConversationProfile", + request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_conversation_profile"] @@ -562,12 +562,12 @@ def set_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_suggestion_feature_config" not in self._stubs: - self._stubs[ - "set_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/SetSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/SetSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_suggestion_feature_config"] @@ -605,12 +605,12 @@ def clear_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "clear_suggestion_feature_config" not in self._stubs: - self._stubs[ - "clear_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.ConversationProfiles/ClearSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["clear_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.ConversationProfiles/ClearSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["clear_suggestion_feature_config"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest.py index d17d4c3b5c2a..8dad56bb594b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest.py @@ -16,25 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import conversation_profile from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationProfilesRestTransport @@ -791,9 +791,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseClearSuggestionFeatureConfig._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseClearSuggestionFeatureConfig._get_http_options() request, metadata = self._interceptor.pre_clear_suggestion_feature_config( request, metadata @@ -819,7 +817,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -860,11 +858,10 @@ def __call__( resp = self._interceptor.post_clear_suggestion_feature_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_clear_suggestion_feature_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_clear_suggestion_feature_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -949,9 +946,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseCreateConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseCreateConversationProfile._get_http_options() request, metadata = self._interceptor.pre_create_conversation_profile( request, metadata @@ -1104,9 +1099,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseDeleteConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseDeleteConversationProfile._get_http_options() request, metadata = self._interceptor.pre_delete_conversation_profile( request, metadata @@ -1128,7 +1121,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1220,9 +1213,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseGetConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseGetConversationProfile._get_http_options() request, metadata = self._interceptor.pre_get_conversation_profile( request, metadata @@ -1375,9 +1366,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseListConversationProfiles._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseListConversationProfiles._get_http_options() request, metadata = self._interceptor.pre_list_conversation_profiles( request, metadata @@ -1532,9 +1521,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseSetSuggestionFeatureConfig._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseSetSuggestionFeatureConfig._get_http_options() request, metadata = self._interceptor.pre_set_suggestion_feature_config( request, metadata @@ -1560,7 +1547,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1601,11 +1588,10 @@ def __call__( resp = self._interceptor.post_set_suggestion_feature_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_suggestion_feature_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_suggestion_feature_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1690,9 +1676,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseUpdateConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseUpdateConversationProfile._get_http_options() request, metadata = self._interceptor.pre_update_conversation_profile( request, metadata @@ -1798,7 +1782,9 @@ def clear_suggestion_feature_config( ]: # 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._ClearSuggestionFeatureConfig(self._session, self._host, self._interceptor) # type: ignore + return self._ClearSuggestionFeatureConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_conversation_profile( @@ -1809,7 +1795,9 @@ def create_conversation_profile( ]: # 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._CreateConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_conversation_profile( @@ -1819,7 +1807,9 @@ def delete_conversation_profile( ]: # 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._DeleteConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_conversation_profile( @@ -1830,7 +1820,9 @@ def get_conversation_profile( ]: # 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._GetConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._GetConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversation_profiles( @@ -1841,7 +1833,9 @@ def list_conversation_profiles( ]: # 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._ListConversationProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListConversationProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_suggestion_feature_config( @@ -1852,7 +1846,9 @@ def set_suggestion_feature_config( ]: # 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._SetSuggestionFeatureConfig(self._session, self._host, self._interceptor) # type: ignore + return self._SetSuggestionFeatureConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_conversation_profile( @@ -1863,7 +1859,9 @@ def update_conversation_profile( ]: # 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._UpdateConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1923,9 +1921,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseGetLocation._get_transcoded_request( @@ -2064,9 +2060,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseListLocations._get_transcoded_request( @@ -2202,9 +2196,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2320,9 +2312,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseGetOperation._get_transcoded_request( @@ -2461,9 +2451,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest_base.py index 1067f21aac52..ed47eef421ea 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversation_profiles/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflow_v2.types import conversation_profile from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import conversation_profile from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/async_client.py index bf0056949faf..a49358471525 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,14 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversations import pagers -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, generator, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import generator, participant from .client import ConversationsClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationsTransport @@ -159,7 +158,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationsAsyncClient: The constructed client. """ - return ConversationsClient.from_service_account_info.__func__(ConversationsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConversationsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConversationsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -175,7 +175,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationsAsyncClient: The constructed client. """ - return ConversationsClient.from_service_account_file.__func__(ConversationsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConversationsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConversationsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/client.py index adfc2bb7fddf..a101a141d45c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversations import pagers -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, generator, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import generator, participant from .transports.base import DEFAULT_CLIENT_INFO, ConversationsTransport from .transports.grpc import ConversationsGrpcTransport @@ -876,11 +875,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationsClient._read_environment_variables() + ) self._client_cert_source = ConversationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -915,8 +912,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/pagers.py index d8a711d6551a..cc1b0b63fe32 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/base.py index 910225316b1a..f61df65bf947 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import participant DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -381,7 +380,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc.py index c2ab061373b7..30018fcf83ac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import participant from .base import DEFAULT_CLIENT_INFO, ConversationsTransport @@ -545,12 +544,12 @@ def suggest_conversation_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "suggest_conversation_summary" not in self._stubs: - self._stubs[ - "suggest_conversation_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.Conversations/SuggestConversationSummary", - request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, - response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + self._stubs["suggest_conversation_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.Conversations/SuggestConversationSummary", + request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, + response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + ) ) return self._stubs["suggest_conversation_summary"] @@ -577,12 +576,12 @@ def generate_stateless_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_summary" not in self._stubs: - self._stubs[ - "generate_stateless_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSummary", - request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, - response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + self._stubs["generate_stateless_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSummary", + request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, + response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + ) ) return self._stubs["generate_stateless_summary"] @@ -609,12 +608,12 @@ def generate_stateless_suggestion( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_suggestion" not in self._stubs: - self._stubs[ - "generate_stateless_suggestion" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSuggestion", - request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, - response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + self._stubs["generate_stateless_suggestion"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSuggestion", + request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, + response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + ) ) return self._stubs["generate_stateless_suggestion"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc_asyncio.py index 2ed88fdb67b6..759b9db26c0b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import participant from .base import DEFAULT_CLIENT_INFO, ConversationsTransport from .grpc import ConversationsGrpcTransport @@ -557,12 +556,12 @@ def suggest_conversation_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "suggest_conversation_summary" not in self._stubs: - self._stubs[ - "suggest_conversation_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.Conversations/SuggestConversationSummary", - request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, - response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + self._stubs["suggest_conversation_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.Conversations/SuggestConversationSummary", + request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, + response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + ) ) return self._stubs["suggest_conversation_summary"] @@ -589,12 +588,12 @@ def generate_stateless_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_summary" not in self._stubs: - self._stubs[ - "generate_stateless_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSummary", - request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, - response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + self._stubs["generate_stateless_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSummary", + request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, + response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + ) ) return self._stubs["generate_stateless_summary"] @@ -621,12 +620,12 @@ def generate_stateless_suggestion( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_suggestion" not in self._stubs: - self._stubs[ - "generate_stateless_suggestion" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSuggestion", - request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, - response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + self._stubs["generate_stateless_suggestion"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.Conversations/GenerateStatelessSuggestion", + request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, + response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + ) ) return self._stubs["generate_stateless_suggestion"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest.py index 4f22706a9208..8a1be4252bf1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +27,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import participant from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationsRestTransport @@ -1000,9 +999,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseCompleteConversation._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseCompleteConversation._get_http_options() request, metadata = self._interceptor.pre_complete_conversation( request, metadata @@ -1160,9 +1157,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1317,9 +1312,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseGenerateStatelessSuggestion._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseGenerateStatelessSuggestion._get_http_options() request, metadata = self._interceptor.pre_generate_stateless_suggestion( request, metadata @@ -1390,11 +1383,10 @@ def __call__( resp = self._interceptor.post_generate_stateless_suggestion(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_stateless_suggestion_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_stateless_suggestion_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1483,9 +1475,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseGenerateStatelessSummary._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseGenerateStatelessSummary._get_http_options() request, metadata = self._interceptor.pre_generate_stateless_summary( request, metadata @@ -1642,9 +1632,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseGenerateSuggestions._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseGenerateSuggestions._get_http_options() request, metadata = self._interceptor.pre_generate_suggestions( request, metadata @@ -1954,9 +1942,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseIngestContextReferences._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseIngestContextReferences._get_http_options() request, metadata = self._interceptor.pre_ingest_context_references( request, metadata @@ -2114,9 +2100,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2574,9 +2558,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseSuggestConversationSummary._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseSuggestConversationSummary._get_http_options() request, metadata = self._interceptor.pre_suggest_conversation_summary( request, metadata @@ -2706,7 +2688,9 @@ def generate_stateless_suggestion( ]: # 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._GenerateStatelessSuggestion(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateStatelessSuggestion( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_stateless_summary( @@ -2717,7 +2701,9 @@ def generate_stateless_summary( ]: # 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._GenerateStatelessSummary(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateStatelessSummary( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_suggestions( @@ -2747,7 +2733,9 @@ def ingest_context_references( ]: # 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._IngestContextReferences(self._session, self._host, self._interceptor) # type: ignore + return self._IngestContextReferences( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversations( @@ -2788,7 +2776,9 @@ def suggest_conversation_summary( ]: # 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._SuggestConversationSummary(self._session, self._host, self._interceptor) # type: ignore + return self._SuggestConversationSummary( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest_base.py index 37adba7d3d31..d15a5c4f0246 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/conversations/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2.types import conversation +from google.cloud.dialogflow_v2.types import conversation, participant from google.cloud.dialogflow_v2.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2.types import participant from .base import DEFAULT_CLIENT_INFO, ConversationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/async_client.py index f5eb2679a8ae..6bf2f9e42feb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.documents import pagers from google.cloud.dialogflow_v2.types import document @@ -117,7 +117,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentsAsyncClient: The constructed client. """ - return DocumentsClient.from_service_account_info.__func__(DocumentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DocumentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DocumentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +134,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentsAsyncClient: The constructed client. """ - return DocumentsClient.from_service_account_file.__func__(DocumentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DocumentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DocumentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/client.py index 2a4e781c2ee0..13ccd2af1fcd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.documents import pagers from google.cloud.dialogflow_v2.types import document @@ -628,11 +628,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentsClient._read_environment_variables() + ) self._client_cert_source = DocumentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +665,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/pagers.py index 971287b1fec3..c9ea3ff1d7ff 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/base.py index 14dd3bb88e16..c118e1e6ab2c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import document @@ -321,7 +321,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc.py index 88ff759293a5..923c0162a87d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import document from google.cloud.dialogflow_v2.types import document as gcd_document diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc_asyncio.py index 9b4f733966e4..abed9328a837 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import document from google.cloud.dialogflow_v2.types import document as gcd_document diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest.py index de9915cb2826..503fe3224d6d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/documents/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -879,7 +879,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1030,7 +1030,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1187,7 +1187,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1501,7 +1501,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1810,7 +1810,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1968,7 +1968,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/async_client.py index 042056e1f218..a30a9e2020e3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from .client import EncryptionSpecServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport @@ -126,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EncryptionSpecServiceAsyncClient: The constructed client. """ - return EncryptionSpecServiceClient.from_service_account_info.__func__(EncryptionSpecServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EncryptionSpecServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EncryptionSpecServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EncryptionSpecServiceAsyncClient: The constructed client. """ - return EncryptionSpecServiceClient.from_service_account_file.__func__(EncryptionSpecServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EncryptionSpecServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EncryptionSpecServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -180,7 +182,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return EncryptionSpecServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return EncryptionSpecServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> EncryptionSpecServiceTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/client.py index d748546d9e3d..7a189e50efdd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from .transports.base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport from .transports.grpc import EncryptionSpecServiceGrpcTransport @@ -83,9 +83,7 @@ class EncryptionSpecServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EncryptionSpecServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EncryptionSpecServiceTransport]] _transport_registry["grpc"] = EncryptionSpecServiceGrpcTransport _transport_registry["grpc_asyncio"] = EncryptionSpecServiceGrpcAsyncIOTransport _transport_registry["rest"] = EncryptionSpecServiceRestTransport @@ -631,11 +629,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EncryptionSpecServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EncryptionSpecServiceClient._read_environment_variables() + ) self._client_cert_source = EncryptionSpecServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -670,8 +666,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EncryptionSpecServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/__init__.py index e85e850f9086..e2f6ba4fbf6f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EncryptionSpecServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EncryptionSpecServiceTransport]] _transport_registry["grpc"] = EncryptionSpecServiceGrpcTransport _transport_registry["grpc_asyncio"] = EncryptionSpecServiceGrpcAsyncIOTransport _transport_registry["rest"] = EncryptionSpecServiceRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/base.py index 8325a055c296..4b0133edd7d3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -237,7 +237,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc.py index b69672e1aa63..624b36cf00fd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport @@ -397,12 +397,12 @@ def initialize_encryption_spec( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "initialize_encryption_spec" not in self._stubs: - self._stubs[ - "initialize_encryption_spec" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.EncryptionSpecService/InitializeEncryptionSpec", - request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["initialize_encryption_spec"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.EncryptionSpecService/InitializeEncryptionSpec", + request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["initialize_encryption_spec"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc_asyncio.py index 03b8c767176a..7033d9def6db 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,13 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport from .grpc import EncryptionSpecServiceGrpcTransport @@ -407,12 +407,12 @@ def initialize_encryption_spec( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "initialize_encryption_spec" not in self._stubs: - self._stubs[ - "initialize_encryption_spec" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.EncryptionSpecService/InitializeEncryptionSpec", - request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["initialize_encryption_spec"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.EncryptionSpecService/InitializeEncryptionSpec", + request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["initialize_encryption_spec"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest.py index 1bdfe2aea174..96920bb7c652 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest.py @@ -16,22 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEncryptionSpecServiceRestTransport @@ -525,9 +525,7 @@ def __call__( """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseGetEncryptionSpec._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseGetEncryptionSpec._get_http_options() request, metadata = self._interceptor.pre_get_encryption_spec( request, metadata @@ -680,9 +678,7 @@ def __call__( """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseInitializeEncryptionSpec._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseInitializeEncryptionSpec._get_http_options() request, metadata = self._interceptor.pre_initialize_encryption_spec( request, metadata @@ -708,7 +704,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -793,7 +789,9 @@ def initialize_encryption_spec( ]: # 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._InitializeEncryptionSpec(self._session, self._host, self._interceptor) # type: ignore + return self._InitializeEncryptionSpec( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -853,9 +851,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -994,9 +990,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1132,9 +1126,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1252,9 +1244,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1393,9 +1383,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest_base.py index bcc316d3fa63..9867fd80c600 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/encryption_spec_service/transports/rest_base.py @@ -22,8 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/async_client.py index 70c7d4b9be5b..d3a315947a10 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.entity_types import pagers from google.cloud.dialogflow_v2.types import entity_type @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_info.__func__(EntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EntityTypesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_file.__func__(EntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EntityTypesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/client.py index a60dda29e179..e99777abcd75 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.entity_types import pagers from google.cloud.dialogflow_v2.types import entity_type @@ -625,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EntityTypesClient._read_environment_variables() + ) self._client_cert_source = EntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/pagers.py index 3b508f688723..d173533cd38f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/base.py index e30e85c26648..e6930e6174ad 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import entity_type @@ -351,7 +351,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc.py index 10dd3def17e5..0d1ca677f950 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import entity_type from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc_asyncio.py index 1fb79cf91b68..418f8c8d917b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import entity_type from google.cloud.dialogflow_v2.types import entity_type as gcd_entity_type diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest.py index 43c50f5a1e42..48bd5da394cf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -938,9 +938,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchCreateEntities._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchCreateEntities._get_http_options() request, metadata = self._interceptor.pre_batch_create_entities( request, metadata @@ -966,7 +964,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1092,9 +1090,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchDeleteEntities._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchDeleteEntities._get_http_options() request, metadata = self._interceptor.pre_batch_delete_entities( request, metadata @@ -1120,7 +1116,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1246,9 +1242,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchDeleteEntityTypes._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchDeleteEntityTypes._get_http_options() request, metadata = self._interceptor.pre_batch_delete_entity_types( request, metadata @@ -1274,7 +1268,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1400,9 +1394,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchUpdateEntities._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchUpdateEntities._get_http_options() request, metadata = self._interceptor.pre_batch_update_entities( request, metadata @@ -1428,7 +1420,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1554,9 +1546,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchUpdateEntityTypes._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchUpdateEntityTypes._get_http_options() request, metadata = self._interceptor.pre_batch_update_entity_types( request, metadata @@ -1582,7 +1572,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1892,7 +1882,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2431,7 +2421,9 @@ def batch_delete_entity_types( ]: # 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._BatchDeleteEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeleteEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_entities( @@ -2449,7 +2441,9 @@ def batch_update_entity_types( ]: # 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._BatchUpdateEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_entity_type( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest_base.py index ac578d325ce3..41a2e9dd22d6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/entity_types/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2.types import entity_type diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/async_client.py index 8917046817ac..28109edfc380 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.environments import pagers from google.cloud.dialogflow_v2.types import environment, fulfillment @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_info.__func__(EnvironmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EnvironmentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EnvironmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_file.__func__(EnvironmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EnvironmentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EnvironmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/client.py index 778a9b708b0e..c6ce51585dc4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.environments import pagers from google.cloud.dialogflow_v2.types import environment, fulfillment @@ -655,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EnvironmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EnvironmentsClient._read_environment_variables() + ) self._client_cert_source = EnvironmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EnvironmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/pagers.py index 6224f8fc79a0..4f6573b47222 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/base.py index 875159ce32e9..1d65116e9ecd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import environment @@ -291,7 +291,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc.py index 89cb0fb800cd..c32a8066bc1c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import environment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc_asyncio.py index 28dd415c775c..32713e2f9915 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import environment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest.py index c5e0c32b8a0e..64a8a81582ae 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -669,9 +669,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -817,9 +815,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -841,7 +837,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1096,9 +1092,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseGetEnvironmentHistory._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseGetEnvironmentHistory._get_http_options() request, metadata = self._interceptor.pre_get_environment_history( request, metadata @@ -1414,9 +1408,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() request, metadata = self._interceptor.pre_update_environment( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest_base.py index fb4c746ddd69..2c7c6e5f6f87 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/environments/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2.types import environment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/async_client.py index 8d14294eb8f8..3965b49727cb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.types import fulfillment from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment @@ -115,7 +115,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FulfillmentsAsyncClient: The constructed client. """ - return FulfillmentsClient.from_service_account_info.__func__(FulfillmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = FulfillmentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(FulfillmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +132,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FulfillmentsAsyncClient: The constructed client. """ - return FulfillmentsClient.from_service_account_file.__func__(FulfillmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = FulfillmentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(FulfillmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/client.py index fe3e6b875abe..d412c834ae55 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.types import fulfillment from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment @@ -617,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FulfillmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FulfillmentsClient._read_environment_variables() + ) self._client_cert_source = FulfillmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -656,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FulfillmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/base.py index bc55216ec22a..a39c98ea8567 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import fulfillment @@ -230,7 +230,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc.py index dd0560577064..297d7568c414 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import fulfillment from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc_asyncio.py index c5d6bf159247..d1b3eb3cee5b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import fulfillment from google.cloud.dialogflow_v2.types import fulfillment as gcd_fulfillment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest.py index 8c02c7fd2c21..c0cdc9dae9f3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/fulfillments/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -631,9 +631,7 @@ def __call__( """ - http_options = ( - _BaseFulfillmentsRestTransport._BaseUpdateFulfillment._get_http_options() - ) + http_options = _BaseFulfillmentsRestTransport._BaseUpdateFulfillment._get_http_options() request, metadata = self._interceptor.pre_update_fulfillment( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/async_client.py index 54c1b8a3c1cb..cccbbaf687d7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,19 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.generator_evaluations import pagers +from google.cloud.dialogflow_v2.types import generator, generator_evaluation, operations from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator -from google.cloud.dialogflow_v2.types import generator_evaluation -from google.cloud.dialogflow_v2.types import operations from .client import GeneratorEvaluationsClient from .transports.base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport @@ -132,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GeneratorEvaluationsAsyncClient: The constructed client. """ - return GeneratorEvaluationsClient.from_service_account_info.__func__(GeneratorEvaluationsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GeneratorEvaluationsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GeneratorEvaluationsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +147,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GeneratorEvaluationsAsyncClient: The constructed client. """ - return GeneratorEvaluationsClient.from_service_account_file.__func__(GeneratorEvaluationsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GeneratorEvaluationsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(GeneratorEvaluationsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -186,7 +186,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GeneratorEvaluationsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GeneratorEvaluationsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GeneratorEvaluationsTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/client.py index 082573fb966f..eba833af3603 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,19 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.generator_evaluations import pagers +from google.cloud.dialogflow_v2.types import generator, generator_evaluation, operations from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator -from google.cloud.dialogflow_v2.types import generator_evaluation -from google.cloud.dialogflow_v2.types import operations from .transports.base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport from .transports.grpc import GeneratorEvaluationsGrpcTransport @@ -89,9 +87,7 @@ class GeneratorEvaluationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GeneratorEvaluationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GeneratorEvaluationsTransport]] _transport_registry["grpc"] = GeneratorEvaluationsGrpcTransport _transport_registry["grpc_asyncio"] = GeneratorEvaluationsGrpcAsyncIOTransport _transport_registry["rest"] = GeneratorEvaluationsRestTransport @@ -681,11 +677,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeneratorEvaluationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeneratorEvaluationsClient._read_environment_variables() + ) self._client_cert_source = GeneratorEvaluationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -720,8 +714,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeneratorEvaluationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/pagers.py index ffcf521a6ab9..3ae51d405c2d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/__init__.py index d8fcc5682d44..9d3ec4732b37 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import GeneratorEvaluationsRestInterceptor, GeneratorEvaluationsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GeneratorEvaluationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GeneratorEvaluationsTransport]] _transport_registry["grpc"] = GeneratorEvaluationsGrpcTransport _transport_registry["grpc_asyncio"] = GeneratorEvaluationsGrpcAsyncIOTransport _transport_registry["rest"] = GeneratorEvaluationsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/base.py index 4edf8a84a35c..6917eecbd4f9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator_evaluation DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc.py index e6f073951544..33061a8aebe3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport @@ -366,12 +366,12 @@ def create_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_generator_evaluation" not in self._stubs: - self._stubs[ - "create_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.GeneratorEvaluations/CreateGeneratorEvaluation", - request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.GeneratorEvaluations/CreateGeneratorEvaluation", + request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_generator_evaluation"] @@ -426,12 +426,12 @@ def list_generator_evaluations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_generator_evaluations" not in self._stubs: - self._stubs[ - "list_generator_evaluations" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.GeneratorEvaluations/ListGeneratorEvaluations", - request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, - response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + self._stubs["list_generator_evaluations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.GeneratorEvaluations/ListGeneratorEvaluations", + request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, + response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + ) ) return self._stubs["list_generator_evaluations"] @@ -456,12 +456,12 @@ def delete_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_generator_evaluation" not in self._stubs: - self._stubs[ - "delete_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.GeneratorEvaluations/DeleteGeneratorEvaluation", - request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.GeneratorEvaluations/DeleteGeneratorEvaluation", + request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_generator_evaluation"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc_asyncio.py index 3d5fdc8da491..2b6cd86c222d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport from .grpc import GeneratorEvaluationsGrpcTransport @@ -374,12 +374,12 @@ def create_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_generator_evaluation" not in self._stubs: - self._stubs[ - "create_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.GeneratorEvaluations/CreateGeneratorEvaluation", - request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.GeneratorEvaluations/CreateGeneratorEvaluation", + request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_generator_evaluation"] @@ -434,12 +434,12 @@ def list_generator_evaluations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_generator_evaluations" not in self._stubs: - self._stubs[ - "list_generator_evaluations" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.GeneratorEvaluations/ListGeneratorEvaluations", - request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, - response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + self._stubs["list_generator_evaluations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.GeneratorEvaluations/ListGeneratorEvaluations", + request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, + response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + ) ) return self._stubs["list_generator_evaluations"] @@ -465,12 +465,12 @@ def delete_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_generator_evaluation" not in self._stubs: - self._stubs[ - "delete_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.GeneratorEvaluations/DeleteGeneratorEvaluation", - request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.GeneratorEvaluations/DeleteGeneratorEvaluation", + request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_generator_evaluation"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest.py index 50475d493ecc..7a71892e3714 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest.py @@ -16,25 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseGeneratorEvaluationsRestTransport @@ -610,9 +610,7 @@ def __call__( """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseCreateGeneratorEvaluation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseCreateGeneratorEvaluation._get_http_options() request, metadata = self._interceptor.pre_create_generator_evaluation( request, metadata @@ -638,7 +636,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -757,9 +755,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseDeleteGeneratorEvaluation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseDeleteGeneratorEvaluation._get_http_options() request, metadata = self._interceptor.pre_delete_generator_evaluation( request, metadata @@ -781,7 +777,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -872,9 +868,7 @@ def __call__( """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseGetGeneratorEvaluation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseGetGeneratorEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_generator_evaluation( request, metadata @@ -1024,9 +1018,7 @@ def __call__( Response of ListGeneratorEvaluations. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseListGeneratorEvaluations._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseListGeneratorEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_generator_evaluations( request, metadata @@ -1129,7 +1121,9 @@ def create_generator_evaluation( ]: # 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._CreateGeneratorEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateGeneratorEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_generator_evaluation( @@ -1139,7 +1133,9 @@ def delete_generator_evaluation( ]: # 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._DeleteGeneratorEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteGeneratorEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_generator_evaluation( @@ -1150,7 +1146,9 @@ def get_generator_evaluation( ]: # 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._GetGeneratorEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._GetGeneratorEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_generator_evaluations( @@ -1161,7 +1159,9 @@ def list_generator_evaluations( ]: # 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._ListGeneratorEvaluations(self._session, self._host, self._interceptor) # type: ignore + return self._ListGeneratorEvaluations( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1221,9 +1221,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseGetLocation._get_transcoded_request( @@ -1362,9 +1360,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseListLocations._get_transcoded_request( @@ -1500,9 +1496,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1618,9 +1612,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseGetOperation._get_transcoded_request( @@ -1759,9 +1751,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest_base.py index b95d0681cc32..e8d975ca6d70 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generator_evaluations/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflow_v2.types import generator_evaluation from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/async_client.py index 121fc6b49847..46df69df7f46 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.generators import pagers from google.cloud.dialogflow_v2.types import generator @@ -120,7 +120,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_info.__func__(GeneratorsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GeneratorsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GeneratorsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +137,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_file.__func__(GeneratorsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GeneratorsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(GeneratorsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/client.py index c7b098fe1b2d..90381cea2553 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.generators import pagers from google.cloud.dialogflow_v2.types import generator @@ -651,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeneratorsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeneratorsClient._read_environment_variables() + ) self._client_cert_source = GeneratorsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -690,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeneratorsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/pagers.py index 387d60ea3040..a4a55dee2734 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/base.py index cec69e604d06..df62742c595c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import generator @@ -276,7 +276,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc.py index 3d51e90343c1..83d2a74d8657 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import generator from google.cloud.dialogflow_v2.types import generator as gcd_generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc_asyncio.py index cd0dc5420746..c9ec8c4f6860 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import generator from google.cloud.dialogflow_v2.types import generator as gcd_generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest.py index e0c461df33b2..cd167d6da927 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -763,7 +763,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest_base.py index 71d2295cae3c..184c50619b72 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/generators/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2.types import generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/async_client.py index 80f2a1d2e99b..17780c8e380c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,17 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.intents import pagers -from google.cloud.dialogflow_v2.types import context -from google.cloud.dialogflow_v2.types import intent +from google.cloud.dialogflow_v2.types import context, intent from google.cloud.dialogflow_v2.types import intent as gcd_intent from .client import IntentsClient @@ -117,7 +116,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_info.__func__(IntentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = IntentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(IntentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +133,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_file.__func__(IntentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = IntentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(IntentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/client.py index 357ed9b7b4e9..28f8765dae27 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,17 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.intents import pagers -from google.cloud.dialogflow_v2.types import context -from google.cloud.dialogflow_v2.types import intent +from google.cloud.dialogflow_v2.types import context, intent from google.cloud.dialogflow_v2.types import intent as gcd_intent from .transports.base import DEFAULT_CLIENT_INFO, IntentsTransport @@ -645,11 +644,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IntentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IntentsClient._read_environment_variables() + ) self._client_cert_source = IntentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -684,8 +681,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IntentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/pagers.py index e1c44cf8d173..edbfa0b6c0d9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/base.py index d4bbc88c5d54..af46cd89d217 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import intent @@ -304,7 +304,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc.py index ecaa48d0136f..e0c071e9037c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import intent from google.cloud.dialogflow_v2.types import intent as gcd_intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc_asyncio.py index 33cb22fb937b..8cae740c2a73 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import intent from google.cloud.dialogflow_v2.types import intent as gcd_intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest.py index b7b7b23134ed..8ae35d74f2a6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -775,7 +775,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -928,7 +928,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1234,7 +1234,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest_base.py index 796083ef730d..1e9b4bfbbb1a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/intents/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2.types import intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/async_client.py index 0fa8951bd469..075bf5e47bbf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.knowledge_bases import pagers -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from .client import KnowledgeBasesClient from .transports.base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport @@ -122,7 +122,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: KnowledgeBasesAsyncClient: The constructed client. """ - return KnowledgeBasesClient.from_service_account_info.__func__(KnowledgeBasesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = KnowledgeBasesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(KnowledgeBasesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +139,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: KnowledgeBasesAsyncClient: The constructed client. """ - return KnowledgeBasesClient.from_service_account_file.__func__(KnowledgeBasesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = KnowledgeBasesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(KnowledgeBasesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/client.py index 9f1d1b8bdb12..2761101bd387 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.knowledge_bases import pagers -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from .transports.base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport from .transports.grpc import KnowledgeBasesGrpcTransport @@ -83,9 +83,7 @@ class KnowledgeBasesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[KnowledgeBasesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[KnowledgeBasesTransport]] _transport_registry["grpc"] = KnowledgeBasesGrpcTransport _transport_registry["grpc_asyncio"] = KnowledgeBasesGrpcAsyncIOTransport _transport_registry["rest"] = KnowledgeBasesRestTransport @@ -624,11 +622,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = KnowledgeBasesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + KnowledgeBasesClient._read_environment_variables() + ) self._client_cert_source = KnowledgeBasesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -663,8 +659,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(KnowledgeBasesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/pagers.py index 9a6672bdd538..57cc3b0dc237 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/base.py index e01fa22c9ce6..93c94039e92d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -282,7 +282,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc.py index a2dc1814ee6f..c4b73666f284 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc_asyncio.py index 5ae329d6842f..9057483aa292 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,15 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport from .grpc import KnowledgeBasesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest.py index 92a87538e2ba..1f78812fc78c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +28,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseKnowledgeBasesRestTransport @@ -616,9 +616,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseCreateKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseCreateKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_create_knowledge_base( request, metadata @@ -767,9 +765,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseDeleteKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseDeleteKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_delete_knowledge_base( request, metadata @@ -791,7 +787,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -892,9 +888,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseGetKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseGetKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_get_knowledge_base( request, metadata @@ -1041,9 +1035,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseListKnowledgeBases._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseListKnowledgeBases._get_http_options() request, metadata = self._interceptor.pre_list_knowledge_bases( request, metadata @@ -1204,9 +1196,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseUpdateKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseUpdateKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_update_knowledge_base( request, metadata @@ -1688,9 +1678,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest_base.py index 206b1c3f02b6..fac709d3acf4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/knowledge_bases/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/async_client.py index 9a52ab5dab9e..aa1a9e52c666 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -47,14 +47,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.participants import pagers -from google.cloud.dialogflow_v2.types import participant +from google.cloud.dialogflow_v2.types import participant, session from google.cloud.dialogflow_v2.types import participant as gcd_participant -from google.cloud.dialogflow_v2.types import session from .client import ParticipantsClient from .transports.base import DEFAULT_CLIENT_INFO, ParticipantsTransport @@ -136,7 +135,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ParticipantsAsyncClient: The constructed client. """ - return ParticipantsClient.from_service_account_info.__func__(ParticipantsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ParticipantsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ParticipantsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -152,7 +152,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ParticipantsAsyncClient: The constructed client. """ - return ParticipantsClient.from_service_account_file.__func__(ParticipantsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ParticipantsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ParticipantsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/client.py index a6d5f4c00f19..4ef56e7d6a64 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -63,14 +63,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.participants import pagers -from google.cloud.dialogflow_v2.types import participant +from google.cloud.dialogflow_v2.types import participant, session from google.cloud.dialogflow_v2.types import participant as gcd_participant -from google.cloud.dialogflow_v2.types import session from .transports.base import DEFAULT_CLIENT_INFO, ParticipantsTransport from .transports.grpc import ParticipantsGrpcTransport @@ -776,11 +775,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ParticipantsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ParticipantsClient._read_environment_variables() + ) self._client_cert_source = ParticipantsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -815,8 +812,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ParticipantsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/pagers.py index 18ca0fa61276..8a5759c4977f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/base.py index 5e5563bc77f1..9f36fafde00b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import participant @@ -372,7 +372,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc.py index 1fedbddd1ec8..4a7b7c4a7518 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import participant from google.cloud.dialogflow_v2.types import participant as gcd_participant @@ -506,12 +506,12 @@ def streaming_analyze_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "streaming_analyze_content" not in self._stubs: - self._stubs[ - "streaming_analyze_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.dialogflow.v2.Participants/StreamingAnalyzeContent", - request_serializer=participant.StreamingAnalyzeContentRequest.serialize, - response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + self._stubs["streaming_analyze_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.dialogflow.v2.Participants/StreamingAnalyzeContent", + request_serializer=participant.StreamingAnalyzeContentRequest.serialize, + response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + ) ) return self._stubs["streaming_analyze_content"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc_asyncio.py index 9748d5922b22..9985878762d9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import participant from google.cloud.dialogflow_v2.types import participant as gcd_participant @@ -520,12 +520,12 @@ def streaming_analyze_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "streaming_analyze_content" not in self._stubs: - self._stubs[ - "streaming_analyze_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.dialogflow.v2.Participants/StreamingAnalyzeContent", - request_serializer=participant.StreamingAnalyzeContentRequest.serialize, - response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + self._stubs["streaming_analyze_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.dialogflow.v2.Participants/StreamingAnalyzeContent", + request_serializer=participant.StreamingAnalyzeContentRequest.serialize, + response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + ) ) return self._stubs["streaming_analyze_content"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest.py index e9d8b4787d3c..77a3ede08947 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/participants/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1026,9 +1026,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseCreateParticipant._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseCreateParticipant._get_http_options() request, metadata = self._interceptor.pre_create_participant( request, metadata @@ -1655,9 +1653,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseSuggestFaqAnswers._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseSuggestFaqAnswers._get_http_options() request, metadata = self._interceptor.pre_suggest_faq_answers( request, metadata @@ -1812,9 +1808,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseSuggestKnowledgeAssist._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseSuggestKnowledgeAssist._get_http_options() request, metadata = self._interceptor.pre_suggest_knowledge_assist( request, metadata @@ -1969,9 +1963,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseSuggestSmartReplies._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseSuggestSmartReplies._get_http_options() request, metadata = self._interceptor.pre_suggest_smart_replies( request, metadata @@ -2126,9 +2118,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseUpdateParticipant._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseUpdateParticipant._get_http_options() request, metadata = self._interceptor.pre_update_participant( request, metadata @@ -2270,7 +2260,9 @@ def streaming_analyze_content( ]: # 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._StreamingAnalyzeContent(self._session, self._host, self._interceptor) # type: ignore + return self._StreamingAnalyzeContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def suggest_articles( @@ -2301,7 +2293,9 @@ def suggest_knowledge_assist( ]: # 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._SuggestKnowledgeAssist(self._session, self._host, self._interceptor) # type: ignore + return self._SuggestKnowledgeAssist( + self._session, self._host, self._interceptor + ) # type: ignore @property def suggest_smart_replies( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/async_client.py index b3fe5acb1eeb..77b0835d41ef 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.session_entity_types import pagers +from google.cloud.dialogflow_v2.types import entity_type, session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import entity_type -from google.cloud.dialogflow_v2.types import session_entity_type from .client import SessionEntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -127,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_info.__func__(SessionEntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SessionEntityTypesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SessionEntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_file.__func__(SessionEntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SessionEntityTypesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SessionEntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +182,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SessionEntityTypesTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/client.py index fd37dad9473b..e06b75d3f079 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.session_entity_types import pagers +from google.cloud.dialogflow_v2.types import entity_type, session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import entity_type -from google.cloud.dialogflow_v2.types import session_entity_type from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .transports.grpc import SessionEntityTypesGrpcTransport @@ -86,9 +85,7 @@ class SessionEntityTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionEntityTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport @@ -634,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionEntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionEntityTypesClient._read_environment_variables() + ) self._client_cert_source = SessionEntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -673,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionEntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/pagers.py index 484d20614953..fda324704bc5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/__init__.py index f94244b2aec5..4e711301d110 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SessionEntityTypesRestInterceptor, SessionEntityTypesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SessionEntityTypesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/base.py index 6669a343035f..d0e1e1d8d42e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version +from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import session_entity_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc.py index 91a60e30733b..67b130cbc0f9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -423,12 +423,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -458,12 +458,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -492,12 +492,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc_asyncio.py index 7095c0e449ca..782a3ce5b141 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .grpc import SessionEntityTypesGrpcTransport @@ -431,12 +431,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -466,12 +466,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -500,12 +500,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest.py index 33b140679aa1..dec556b5a96c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import session_entity_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionEntityTypesRestTransport @@ -622,9 +622,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_create_session_entity_type( request, metadata @@ -776,9 +774,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_delete_session_entity_type( request, metadata @@ -800,7 +796,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -902,9 +898,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_get_session_entity_type( request, metadata @@ -1056,9 +1050,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() request, metadata = self._interceptor.pre_list_session_entity_types( request, metadata @@ -1222,9 +1214,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_update_session_entity_type( request, metadata @@ -1332,7 +1322,9 @@ def create_session_entity_type( ]: # 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._CreateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_session_entity_type( @@ -1342,7 +1334,9 @@ def delete_session_entity_type( ]: # 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._DeleteSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_session_entity_type( @@ -1364,7 +1358,9 @@ def list_session_entity_types( ]: # 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._ListSessionEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._ListSessionEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_session_entity_type( @@ -1375,7 +1371,9 @@ def update_session_entity_type( ]: # 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._UpdateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1435,9 +1433,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_transcoded_request( @@ -1576,9 +1572,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_transcoded_request( @@ -1714,9 +1708,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1832,9 +1824,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_transcoded_request( @@ -1973,9 +1963,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest_base.py index 9c8daf5b9690..9eb4a07a0ea2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/session_entity_types/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflow_v2.types import session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/async_client.py index 3b2786609eb7..b515f1bd0153 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -47,12 +47,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.cloud.dialogflow_v2.types import audio_config -from google.cloud.dialogflow_v2.types import session +from google.cloud.dialogflow_v2.types import audio_config, session from google.cloud.dialogflow_v2.types import session as gcd_session from .client import SessionsClient @@ -127,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_info.__func__(SessionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SessionsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SessionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_file.__func__(SessionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SessionsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SessionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/client.py index b56fb4bb5bd4..cea9975d5458 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -63,12 +63,11 @@ _LOGGER = std_logging.getLogger(__name__) +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.cloud.dialogflow_v2.types import audio_config -from google.cloud.dialogflow_v2.types import session +from google.cloud.dialogflow_v2.types import audio_config, session from google.cloud.dialogflow_v2.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, SessionsTransport @@ -709,11 +708,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionsClient._read_environment_variables() + ) self._client_cert_source = SessionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -748,8 +745,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/base.py index 75058114fbef..49e6078ddc80 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import session @@ -245,7 +245,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc.py index ee067d310ae8..ef4a2a845bd6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import session from google.cloud.dialogflow_v2.types import session as gcd_session diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc_asyncio.py index 79c9940f69a3..162704db94c6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import session from google.cloud.dialogflow_v2.types import session as gcd_session diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest.py index 38d8dcc4aada..ea51fc6690db 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sessions/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/async_client.py index a8f58bcc0a09..5d04cf2345d9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.sip_trunks import pagers from google.cloud.dialogflow_v2.types import sip_trunk @@ -114,7 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SipTrunksAsyncClient: The constructed client. """ - return SipTrunksClient.from_service_account_info.__func__(SipTrunksAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SipTrunksClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SipTrunksAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SipTrunksAsyncClient: The constructed client. """ - return SipTrunksClient.from_service_account_file.__func__(SipTrunksAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SipTrunksClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SipTrunksAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/client.py index 5fd6ba75313d..d5a0914c7759 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.sip_trunks import pagers from google.cloud.dialogflow_v2.types import sip_trunk @@ -625,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SipTrunksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SipTrunksClient._read_environment_variables() + ) self._client_cert_source = SipTrunksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SipTrunksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/pagers.py index da5409622044..14e1128ee189 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/base.py index eae52f6fbced..b2c6b3865f00 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import sip_trunk @@ -275,7 +275,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc.py index 4c0703c18b19..bdc83144f0fd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import sip_trunk from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc_asyncio.py index c6e4e8a09d8b..2e3ddd28fcca 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import sip_trunk from google.cloud.dialogflow_v2.types import sip_trunk as gcd_sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest.py index 6b6c0135029e..2e79e8039c53 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -774,7 +774,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest_base.py index 887081a3e088..a8a5b23558a0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/sip_trunks/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2.types import sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/async_client.py index 003c135c0111..1ed3c33f63f5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.tools import pagers from google.cloud.dialogflow_v2.types import tool @@ -116,7 +116,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_info.__func__(ToolsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ToolsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ToolsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +133,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_file.__func__(ToolsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ToolsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ToolsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/client.py index 644e230bcaa1..6992358dfdd5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.tools import pagers from google.cloud.dialogflow_v2.types import tool @@ -673,11 +673,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ToolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ToolsClient._read_environment_variables() + ) self._client_cert_source = ToolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -712,8 +710,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ToolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/pagers.py index 0e44b3d25931..0161ef409e96 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/base.py index 65a086e6069f..1a7042b7a500 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import tool @@ -267,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc.py index 6696dc84c87c..9e54c922ca00 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import tool from google.cloud.dialogflow_v2.types import tool as gcd_tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc_asyncio.py index 3f53cb4088ed..5e49c2382a3b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import tool from google.cloud.dialogflow_v2.types import tool as gcd_tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest.py index cf15dedcdaaf..b9945ebf3875 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -737,7 +737,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest_base.py index c032ba8fc4d9..340601af1a40 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/tools/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2.types import tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/async_client.py index 49ed071641b8..0c3a36cd2473 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.versions import pagers from google.cloud.dialogflow_v2.types import version @@ -111,7 +111,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_info.__func__(VersionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = VersionsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(VersionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +128,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_file.__func__(VersionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = VersionsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(VersionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/client.py index b4ba189406c3..ab7db5403368 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.versions import pagers from google.cloud.dialogflow_v2.types import version @@ -621,11 +621,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VersionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VersionsClient._read_environment_variables() + ) self._client_cert_source = VersionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -660,8 +658,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VersionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/pagers.py index a16437ad9290..e0e03fa121dc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/base.py index 35ba4277e05e..496a944a62e2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2 import gapic_version as package_version from google.cloud.dialogflow_v2.types import version @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc.py index 2edb0faceee5..a2cf35ec0764 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import version from google.cloud.dialogflow_v2.types import version as gcd_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc_asyncio.py index 3cf83b03b8e0..d4b4021821ed 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2.types import version from google.cloud.dialogflow_v2.types import version as gcd_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest.py index 5839d007d64d..4b3cb677e1a4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -774,7 +774,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest_base.py index b568dd99cc8a..ef691c55ad30 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/services/versions/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2.types import version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/__init__.py index 8455a2beab80..672bfeb257f6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/__init__.py @@ -27,7 +27,9 @@ SetAgentRequest, TrainAgentRequest, ) -from .agent_coaching_instruction import AgentCoachingInstruction +from .agent_coaching_instruction import ( + AgentCoachingInstruction, +) from .answer_record import ( AgentAssistantFeedback, AgentAssistantRecord, @@ -101,7 +103,9 @@ ListConversationDatasetsRequest, ListConversationDatasetsResponse, ) -from .conversation_event import ConversationEvent +from .conversation_event import ( + ConversationEvent, +) from .conversation_model import ( ArticleSuggestionModelMetadata, ConversationModel, @@ -197,8 +201,15 @@ TextToSpeechSettings, UpdateEnvironmentRequest, ) -from .fulfillment import Fulfillment, GetFulfillmentRequest, UpdateFulfillmentRequest -from .gcs import GcsDestination, GcsSources +from .fulfillment import ( + Fulfillment, + GetFulfillmentRequest, + UpdateFulfillmentRequest, +) +from .gcs import ( + GcsDestination, + GcsSources, +) from .generator import ( AgentCoachingContext, AgentCoachingSuggestion, @@ -235,7 +246,9 @@ ListGeneratorEvaluationsResponse, SummarizationEvaluationMetrics, ) -from .human_agent_assistant_event import HumanAgentAssistantEvent +from .human_agent_assistant_event import ( + HumanAgentAssistantEvent, +) from .intent import ( BatchDeleteIntentsRequest, BatchUpdateIntentsRequest, @@ -259,7 +272,9 @@ ListKnowledgeBasesResponse, UpdateKnowledgeBaseRequest, ) -from .operations import GeneratorEvaluationOperationMetadata +from .operations import ( + GeneratorEvaluationOperationMetadata, +) from .participant import ( AnalyzeContentRequest, AnalyzeContentResponse, @@ -342,8 +357,14 @@ Tool, UpdateToolRequest, ) -from .tool_call import ToolCall, ToolCallResult -from .validation_result import ValidationError, ValidationResult +from .tool_call import ( + ToolCall, + ToolCallResult, +) +from .validation_result import ( + ValidationError, + ValidationResult, +) from .version import ( CreateVersionRequest, DeleteVersionRequest, @@ -353,7 +374,11 @@ UpdateVersionRequest, Version, ) -from .webhook import OriginalDetectIntentRequest, WebhookRequest, WebhookResponse +from .webhook import ( + OriginalDetectIntentRequest, + WebhookRequest, + WebhookResponse, +) __all__ = ( "Agent", diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent.py index 9705750bbf36..a17ccb8d4a92 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -126,6 +126,7 @@ class MatchMode(proto.Enum): examples in intents, especially the ones using @sys.any or very large custom entities. """ + MATCH_MODE_UNSPECIFIED = 0 MATCH_MODE_HYBRID = 1 MATCH_MODE_ML_ONLY = 2 @@ -143,6 +144,7 @@ class ApiVersion(proto.Enum): API_VERSION_V2_BETA_1 (3): V2beta1 API. """ + API_VERSION_UNSPECIFIED = 0 API_VERSION_V1 = 1 API_VERSION_V2 = 2 @@ -165,6 +167,7 @@ class Tier(proto.Enum): Essentials Edition (same as TIER_ENTERPRISE), previously known as Enterprise Plus Edition. """ + TIER_UNSPECIFIED = 0 TIER_STANDARD = 1 TIER_ENTERPRISE = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent_coaching_instruction.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent_coaching_instruction.py index d9bbe4178e23..f2a2050a5659 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent_coaching_instruction.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/agent_coaching_instruction.py @@ -80,6 +80,7 @@ class TriggerEvent(proto.Enum): TOOL_CALL_COMPLETION (5): Triggers on tool call completion. """ + TRIGGER_EVENT_UNSPECIFIED = 0 END_OF_UTTERANCE = 1 MANUAL_CALL = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/answer_record.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/answer_record.py index bf6345de22aa..3785c9814da6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/answer_record.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/answer_record.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import generator, participant @@ -262,6 +262,7 @@ class CorrectnessLevel(proto.Enum): FULLY_CORRECT (3): Answer is fully correct. """ + CORRECTNESS_LEVEL_UNSPECIFIED = 0 NOT_CORRECT = 1 PARTIALLY_CORRECT = 2 @@ -352,6 +353,7 @@ class AnswerRelevance(proto.Enum): RELEVANT (2): Answer is relevant to query. """ + ANSWER_RELEVANCE_UNSPECIFIED = 0 IRRELEVANT = 1 RELEVANT = 2 @@ -367,6 +369,7 @@ class DocumentCorrectness(proto.Enum): CORRECT (2): Information in document is correct. """ + DOCUMENT_CORRECTNESS_UNSPECIFIED = 0 INCORRECT = 1 CORRECT = 2 @@ -382,6 +385,7 @@ class DocumentEfficiency(proto.Enum): EFFICIENT (2): Document is efficient. """ + DOCUMENT_EFFICIENCY_UNSPECIFIED = 0 INEFFICIENT = 1 EFFICIENT = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/audio_config.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/audio_config.py index e9e3836f66fa..53c9e1de980a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/audio_config.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/audio_config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -83,6 +83,7 @@ class TelephonyDtmf(proto.Enum): Pound/diamond/hash/square/gate/octothorpe: '#'. """ + TELEPHONY_DTMF_UNSPECIFIED = 0 DTMF_ONE = 1 DTMF_TWO = 2 @@ -155,6 +156,7 @@ class AudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + AUDIO_ENCODING_UNSPECIFIED = 0 AUDIO_ENCODING_LINEAR_16 = 1 AUDIO_ENCODING_FLAC = 2 @@ -210,6 +212,7 @@ class SpeechModelVariant(proto.Enum): docs `__ for how to make your project eligible. """ + SPEECH_MODEL_VARIANT_UNSPECIFIED = 0 USE_BEST_AVAILABLE = 1 USE_STANDARD = 2 @@ -232,6 +235,7 @@ class SsmlVoiceGender(proto.Enum): SSML_VOICE_GENDER_NEUTRAL (3): A gender-neutral voice. """ + SSML_VOICE_GENDER_UNSPECIFIED = 0 SSML_VOICE_GENDER_MALE = 1 SSML_VOICE_GENDER_FEMALE = 2 @@ -266,6 +270,7 @@ class OutputAudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + OUTPUT_AUDIO_ENCODING_UNSPECIFIED = 0 OUTPUT_AUDIO_ENCODING_LINEAR_16 = 1 OUTPUT_AUDIO_ENCODING_MP3 = 2 @@ -641,6 +646,7 @@ class PhoneticEncoding(proto.Enum): X-SAMPA, such as apple -> "{p@l". https://en.wikipedia.org/wiki/X-SAMPA """ + PHONETIC_ENCODING_UNSPECIFIED = 0 PHONETIC_ENCODING_IPA = 1 PHONETIC_ENCODING_X_SAMPA = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/context.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/context.py index 29d9b36a0938..0d92d8fd3e9d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/context.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/context.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation.py index cee71aae243d..ea07c9f178ca 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import ( @@ -122,6 +122,7 @@ class LifecycleState(proto.Enum): COMPLETED (2): Conversation has been completed. """ + LIFECYCLE_STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 @@ -142,6 +143,7 @@ class ConversationStage(proto.Enum): The conversation should not provide responses, just listen and provide suggestions. """ + CONVERSATION_STAGE_UNSPECIFIED = 0 VIRTUAL_AGENT_STAGE = 1 HUMAN_ASSIST_STAGE = 2 @@ -260,6 +262,7 @@ class UpdateMode(proto.Enum): Context content updates are applied in overwrite mode. """ + UPDATE_MODE_UNSPECIFIED = 0 APPEND = 1 OVERWRITE = 2 @@ -295,6 +298,7 @@ class ContentFormat(proto.Enum): PLAIN_TEXT (2): Content was provided as plain text. """ + CONTENT_FORMAT_UNSPECIFIED = 0 JSON = 1 PLAIN_TEXT = 2 @@ -657,13 +661,13 @@ class IngestContextReferencesRequest(proto.Message): proto.STRING, number=1, ) - context_references: MutableMapping[ - str, "Conversation.ContextReference" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=2, - message="Conversation.ContextReference", + context_references: MutableMapping[str, "Conversation.ContextReference"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=2, + message="Conversation.ContextReference", + ) ) @@ -1016,13 +1020,13 @@ class GenerateStatelessSuggestionRequest(proto.Message): number=3, oneof="generator_resource", ) - context_references: MutableMapping[ - str, "Conversation.ContextReference" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=4, - message="Conversation.ContextReference", + context_references: MutableMapping[str, "Conversation.ContextReference"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=4, + message="Conversation.ContextReference", + ) ) conversation_context: gcd_generator.ConversationContext = proto.Field( proto.MESSAGE, @@ -1136,6 +1140,7 @@ class QuerySource(proto.Enum): The query is a suggested query from [Participants.SuggestKnowledgeAssist][google.cloud.dialogflow.v2.Participants.SuggestKnowledgeAssist]. """ + QUERY_SOURCE_UNSPECIFIED = 0 AGENT_QUERY = 1 SUGGESTED_QUERY = 2 @@ -1281,6 +1286,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. E.g. ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -1297,6 +1303,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -1524,6 +1531,7 @@ class AnswerType(proto.Enum): INTENT (3): The answer is from intent matching. """ + ANSWER_TYPE_UNSPECIFIED = 0 FAQ = 1 GENERATIVE = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_dataset.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_dataset.py index 4055f5c0dd3f..35e4efa4a951 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_dataset.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_dataset.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import gcs diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_event.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_event.py index faba94f46e53..2498c2189264 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_event.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_event.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import participant, session @@ -105,6 +105,7 @@ class Type(proto.Enum): or, - when we can recover from an error. """ + TYPE_UNSPECIFIED = 0 CONVERSATION_STARTED = 1 CONVERSATION_FINISHED = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_model.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_model.py index 6a25c639508c..818b45bfd069 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_model.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_model.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -129,6 +129,7 @@ class State(proto.Enum): until there is enough capacity to start training. """ + STATE_UNSPECIFIED = 0 CREATING = 1 UNDEPLOYED = 2 @@ -150,6 +151,7 @@ class ModelType(proto.Enum): SMART_REPLY_BERT_MODEL (6): ModelType smart reply bert model. """ + MODEL_TYPE_UNSPECIFIED = 0 SMART_REPLY_DUAL_ENCODER_MODEL = 2 SMART_REPLY_BERT_MODEL = 6 @@ -684,12 +686,12 @@ class ListConversationModelEvaluationsResponse(proto.Message): def raw_page(self): return self - conversation_model_evaluations: MutableSequence[ - "ConversationModelEvaluation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ConversationModelEvaluation", + conversation_model_evaluations: MutableSequence["ConversationModelEvaluation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ConversationModelEvaluation", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -762,6 +764,7 @@ class State(proto.Enum): TRAINING (6): Custom model is training. """ + STATE_UNSPECIFIED = 0 PENDING = 1 SUCCEEDED = 2 @@ -927,6 +930,7 @@ class State(proto.Enum): FAILED (5): The operation has failed. """ + STATE_UNSPECIFIED = 0 INITIALIZING = 1 RUNNING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_profile.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_profile.py index b1f5d0aa9621..2440aa429235 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_profile.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/conversation_profile.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import audio_config, generator, participant @@ -846,6 +846,7 @@ class SectionType(proto.Enum): amount, etc. Section names are prefixed by "entities/". """ + SECTION_TYPE_UNSPECIFIED = 0 SITUATION = 1 ACTION = 2 @@ -1152,6 +1153,7 @@ class MessageFormat(proto.Enum): JSON (2): Pub/Sub message will be json. """ + MESSAGE_FORMAT_UNSPECIFIED = 0 PROTO = 1 JSON = 2 @@ -1218,6 +1220,7 @@ class Type(proto.Enum): Run knowledge assist with automatic query generation. """ + TYPE_UNSPECIFIED = 0 ARTICLE_SUGGESTION = 1 FAQ = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/document.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/document.py index 17b439f7cc30..339a6ef0e79a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/document.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/document.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import gcs @@ -156,6 +156,7 @@ class KnowledgeType(proto.Enum): The document contains agent-facing Smart Reply entries. """ + KNOWLEDGE_TYPE_UNSPECIFIED = 0 FAQ = 1 EXTRACTIVE_QA = 2 @@ -179,6 +180,7 @@ class State(proto.Enum): DELETING (5): The document deletion is in progress. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -673,6 +675,7 @@ class State(proto.Enum): The operation is done, either cancelled or completed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/entity_type.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/entity_type.py index bc1ce2bc2d4b..d52d56513054 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/entity_type.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/entity_type.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -98,6 +98,7 @@ class Kind(proto.Enum): Regexp entity types allow to specify regular expressions in entries values. """ + KIND_UNSPECIFIED = 0 KIND_MAP = 1 KIND_LIST = 2 @@ -116,6 +117,7 @@ class AutoExpansionMode(proto.Enum): Allows an agent to recognize values that have not been explicitly listed in the entity. """ + AUTO_EXPANSION_MODE_UNSPECIFIED = 0 AUTO_EXPANSION_MODE_DEFAULT = 1 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/environment.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/environment.py index 572ec78e4ca3..2f5e36b637c6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/environment.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/environment.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import audio_config @@ -116,6 +116,7 @@ class State(proto.Enum): RUNNING (3): Running. """ + STATE_UNSPECIFIED = 0 STOPPED = 1 LOADING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/fulfillment.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/fulfillment.py index d921f1556740..53695f0e4698 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/fulfillment.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/fulfillment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -143,6 +143,7 @@ class Type(proto.Enum): SMALLTALK (1): Fulfillment is enabled for SmallTalk. """ + TYPE_UNSPECIFIED = 0 SMALLTALK = 1 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator.py index 641db6dfba5b..d3ff39df4db1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import agent_coaching_instruction @@ -73,6 +73,7 @@ class TriggerEvent(proto.Enum): AGENT_MESSAGE (4): Triggers after each agent message only. """ + TRIGGER_EVENT_UNSPECIFIED = 0 END_OF_UTTERANCE = 1 MANUAL_CALL = 2 @@ -263,6 +264,7 @@ class Role(proto.Enum): Participant is an end user that has called or chatted with Dialogflow services. """ + ROLE_UNSPECIFIED = 0 HUMAN_AGENT = 1 AUTOMATED_AGENT = 2 @@ -312,12 +314,12 @@ class SummarizationSectionList(proto.Message): Optional. Summarization sections. """ - summarization_sections: MutableSequence[ - "SummarizationSection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SummarizationSection", + summarization_sections: MutableSequence["SummarizationSection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SummarizationSection", + ) ) @@ -532,6 +534,7 @@ class Type(proto.Enum): type is only available if type ACTION is not selected. """ + TYPE_UNSPECIFIED = 0 SITUATION = 1 ACTION = 2 @@ -578,12 +581,12 @@ class SummarizationContext(proto.Message): empty. Supported 2.0 and later versions. """ - summarization_sections: MutableSequence[ - "SummarizationSection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SummarizationSection", + summarization_sections: MutableSequence["SummarizationSection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SummarizationSection", + ) ) few_shot_examples: MutableSequence["FewShotExample"] = proto.RepeatedField( proto.MESSAGE, @@ -934,12 +937,12 @@ class SampleResponse(proto.Message): number=1, message=agent_coaching_instruction.AgentCoachingInstruction, ) - agent_action_suggestions: MutableSequence[ - AgentActionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=AgentActionSuggestion, + agent_action_suggestions: MutableSequence[AgentActionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=AgentActionSuggestion, + ) ) sample_responses: MutableSequence[SampleResponse] = proto.RepeatedField( proto.MESSAGE, @@ -1078,6 +1081,7 @@ class RaiCategory(proto.Enum): HATE_SPEECH (4): Hate speech content. """ + RAI_CATEGORY_UNSPECIFIED = 0 DANGEROUS_CONTENT = 1 SEXUALLY_EXPLICIT = 2 @@ -1104,6 +1108,7 @@ class SensitivityLevel(proto.Enum): BLOCK_NONE (4): No filtering for this category. """ + SENSITIVITY_LEVEL_UNSPECIFIED = 0 BLOCK_MOST = 1 BLOCK_SOME = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator_evaluation.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator_evaluation.py index f90d926aa5cc..cf5f4054fa35 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator_evaluation.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/generator_evaluation.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import generator @@ -717,12 +717,12 @@ class SectionDetail(proto.Message): message="SummarizationEvaluationMetrics.SectionToken", ) - summarization_evaluation_results: MutableSequence[ - SummarizationEvaluationResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=SummarizationEvaluationResult, + summarization_evaluation_results: MutableSequence[SummarizationEvaluationResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=SummarizationEvaluationResult, + ) ) summarization_evaluation_merged_results_uri: str = proto.Field( proto.STRING, @@ -781,6 +781,7 @@ class InputDataSourceType(proto.Enum): chosen, input_data_config.start_time and input_data_config.end_timestamp must be provided. """ + INPUT_DATA_SOURCE_TYPE_UNSPECIFIED = 0 AGENT_ASSIST_CONVERSATIONS = 1 INSIGHTS_CONVERSATIONS = 2 @@ -886,6 +887,7 @@ class SummaryGenerationOption(proto.Enum): Do not generate new summaries. Only use existing summaries found. """ + SUMMARY_GENERATION_OPTION_UNSPECIFIED = 0 ALWAYS_GENERATE = 1 GENERATE_IF_MISSING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/human_agent_assistant_event.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/human_agent_assistant_event.py index 3f7e0a99c297..b7d20adbd244 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/human_agent_assistant_event.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/human_agent_assistant_event.py @@ -54,12 +54,12 @@ class HumanAgentAssistantEvent(proto.Message): proto.STRING, number=3, ) - suggestion_results: MutableSequence[ - gcd_participant.SuggestionResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gcd_participant.SuggestionResult, + suggestion_results: MutableSequence[gcd_participant.SuggestionResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gcd_participant.SuggestionResult, + ) ) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/intent.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/intent.py index 9e0740494d1c..4d2c65fabd07 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/intent.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/intent.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import context @@ -55,6 +55,7 @@ class IntentView(proto.Enum): INTENT_VIEW_FULL (1): All fields are populated. """ + INTENT_VIEW_UNSPECIFIED = 0 INTENT_VIEW_FULL = 1 @@ -192,6 +193,7 @@ class WebhookState(proto.Enum): intent. Also, each slot filling prompt is forwarded to the webhook. """ + WEBHOOK_STATE_UNSPECIFIED = 0 WEBHOOK_STATE_ENABLED = 1 WEBHOOK_STATE_ENABLED_FOR_SLOT_FILLING = 2 @@ -257,6 +259,7 @@ class Type(proto.Enum): existing training phrases that you've created in template mode, those will continue to work. """ + TYPE_UNSPECIFIED = 0 EXAMPLE = 1 TEMPLATE = 2 @@ -499,6 +502,7 @@ class Platform(proto.Enum): GOOGLE_HANGOUTS (11): Google Hangouts. """ + PLATFORM_UNSPECIFIED = 0 FACEBOOK = 1 SLACK = 2 @@ -611,12 +615,12 @@ class Button(proto.Message): proto.STRING, number=3, ) - buttons: MutableSequence[ - "Intent.Message.Card.Button" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Intent.Message.Card.Button", + buttons: MutableSequence["Intent.Message.Card.Button"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Intent.Message.Card.Button", + ) ) class SimpleResponse(proto.Message): @@ -658,12 +662,12 @@ class SimpleResponses(proto.Message): Required. The list of simple responses. """ - simple_responses: MutableSequence[ - "Intent.Message.SimpleResponse" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.SimpleResponse", + simple_responses: MutableSequence["Intent.Message.SimpleResponse"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.SimpleResponse", + ) ) class BasicCard(proto.Message): @@ -736,12 +740,12 @@ class OpenUriAction(proto.Message): number=4, message="Intent.Message.Image", ) - buttons: MutableSequence[ - "Intent.Message.BasicCard.Button" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="Intent.Message.BasicCard.Button", + buttons: MutableSequence["Intent.Message.BasicCard.Button"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="Intent.Message.BasicCard.Button", + ) ) class Suggestion(proto.Message): @@ -767,12 +771,12 @@ class Suggestions(proto.Message): Required. The list of suggested replies. """ - suggestions: MutableSequence[ - "Intent.Message.Suggestion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.Suggestion", + suggestions: MutableSequence["Intent.Message.Suggestion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.Suggestion", + ) ) class LinkOutSuggestion(proto.Message): @@ -847,12 +851,12 @@ class Item(proto.Message): proto.STRING, number=1, ) - items: MutableSequence[ - "Intent.Message.ListSelect.Item" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Intent.Message.ListSelect.Item", + items: MutableSequence["Intent.Message.ListSelect.Item"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Intent.Message.ListSelect.Item", + ) ) subtitle: str = proto.Field( proto.STRING, @@ -901,12 +905,12 @@ class Item(proto.Message): message="Intent.Message.Image", ) - items: MutableSequence[ - "Intent.Message.CarouselSelect.Item" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.CarouselSelect.Item", + items: MutableSequence["Intent.Message.CarouselSelect.Item"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.CarouselSelect.Item", + ) ) class SelectItemInfo(proto.Message): @@ -951,6 +955,7 @@ class ResponseMediaType(proto.Enum): AUDIO (1): Response media type is audio. """ + RESPONSE_MEDIA_TYPE_UNSPECIFIED = 0 AUDIO = 1 @@ -1065,6 +1070,7 @@ class ImageDisplayOptions(proto.Enum): Pad the gaps between image and image frame with a blurred copy of the same image. """ + IMAGE_DISPLAY_OPTIONS_UNSPECIFIED = 0 GRAY = 1 WHITE = 2 @@ -1116,6 +1122,7 @@ class UrlTypeHint(proto.Enum): to a canonical URL which refers to AMP content via . """ + URL_TYPE_HINT_UNSPECIFIED = 0 AMP_ACTION = 1 AMP_CONTENT = 2 @@ -1199,24 +1206,24 @@ class TableCard(proto.Message): number=3, message="Intent.Message.Image", ) - column_properties: MutableSequence[ - "Intent.Message.ColumnProperties" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Intent.Message.ColumnProperties", + column_properties: MutableSequence["Intent.Message.ColumnProperties"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Intent.Message.ColumnProperties", + ) ) rows: MutableSequence["Intent.Message.TableCardRow"] = proto.RepeatedField( proto.MESSAGE, number=5, message="Intent.Message.TableCardRow", ) - buttons: MutableSequence[ - "Intent.Message.BasicCard.Button" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="Intent.Message.BasicCard.Button", + buttons: MutableSequence["Intent.Message.BasicCard.Button"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="Intent.Message.BasicCard.Button", + ) ) class ColumnProperties(proto.Message): @@ -1247,6 +1254,7 @@ class HorizontalAlignment(proto.Enum): Text is aligned to the trailing edge of the column. """ + HORIZONTAL_ALIGNMENT_UNSPECIFIED = 0 LEADING = 1 CENTER = 2 @@ -1275,12 +1283,12 @@ class TableCardRow(proto.Message): after this row. """ - cells: MutableSequence[ - "Intent.Message.TableCardCell" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.TableCardCell", + cells: MutableSequence["Intent.Message.TableCardCell"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.TableCardCell", + ) ) divider_after: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/knowledge_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/knowledge_base.py index fa17987d984c..9e3eb1638696 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/knowledge_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/knowledge_base.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/participant.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/participant.py index 78931547e873..d4cf47ffa434 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/participant.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/participant.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import audio_config as gcd_audio_config @@ -174,6 +174,7 @@ class Role(proto.Enum): Participant is an end user that has called or chatted with Dialogflow services. """ + ROLE_UNSPECIFIED = 0 HUMAN_AGENT = 1 AUTOMATED_AGENT = 2 @@ -199,6 +200,7 @@ class AgentDesktopSource(proto.Enum): either not currently released or setting this field to the applicable desktop. """ + AGENT_DESKTOP_SOURCE_UNSPECIFIED = 0 LIVE_PERSON = 1 GENESYS_CLOUD = 2 @@ -640,19 +642,19 @@ class AnalyzeContentResponse(proto.Message): number=5, message="Message", ) - human_agent_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="SuggestionResult", + human_agent_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="SuggestionResult", + ) ) - end_user_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="SuggestionResult", + end_user_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="SuggestionResult", + ) ) dtmf_parameters: "DtmfParameters" = proto.Field( proto.MESSAGE, @@ -966,19 +968,19 @@ class StreamingAnalyzeContentResponse(proto.Message): number=6, message="Message", ) - human_agent_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="SuggestionResult", + human_agent_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="SuggestionResult", + ) ) - end_user_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="SuggestionResult", + end_user_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="SuggestionResult", + ) ) dtmf_parameters: "DtmfParameters" = proto.Field( proto.MESSAGE, @@ -1204,12 +1206,12 @@ class GeneratorSuggestionAnswer(proto.Message): number=3, ) - generator_suggestion_answers: MutableSequence[ - GeneratorSuggestionAnswer - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=GeneratorSuggestionAnswer, + generator_suggestion_answers: MutableSequence[GeneratorSuggestionAnswer] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=GeneratorSuggestionAnswer, + ) ) latest_message: str = proto.Field( proto.STRING, @@ -1390,6 +1392,7 @@ class AutomatedAgentReplyType(proto.Enum): FINAL (2): Final reply. """ + AUTOMATED_AGENT_REPLY_TYPE_UNSPECIFIED = 0 PARTIAL = 1 FINAL = 2 @@ -1845,6 +1848,7 @@ class Action(proto.Enum): This action is intended for tool calls that may write data. """ + ACTION_UNSPECIFIED = 0 CANCEL = 1 REVISE = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session.py index ce3f33d1a7ad..498d11d114d1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session.py @@ -17,17 +17,16 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import audio_config as gcd_audio_config -from google.cloud.dialogflow_v2.types import context +from google.cloud.dialogflow_v2.types import context, session_entity_type from google.cloud.dialogflow_v2.types import intent as gcd_intent -from google.cloud.dialogflow_v2.types import session_entity_type __protobuf__ = proto.module( package="google.cloud.dialogflow.v2", @@ -272,12 +271,12 @@ class QueryParameters(proto.Message): proto.BOOL, number=4, ) - session_entity_types: MutableSequence[ - session_entity_type.SessionEntityType - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=session_entity_type.SessionEntityType, + session_entity_types: MutableSequence[session_entity_type.SessionEntityType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=session_entity_type.SessionEntityType, + ) ) payload: struct_pb2.Struct = proto.Field( proto.MESSAGE, @@ -505,12 +504,12 @@ class QueryResult(proto.Message): proto.STRING, number=6, ) - fulfillment_messages: MutableSequence[ - gcd_intent.Intent.Message - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gcd_intent.Intent.Message, + fulfillment_messages: MutableSequence[gcd_intent.Intent.Message] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gcd_intent.Intent.Message, + ) ) webhook_source: str = proto.Field( proto.STRING, @@ -772,19 +771,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=5, ) - speech_partial_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=duration_pb2.Duration, + speech_partial_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=duration_pb2.Duration, + ) ) - speech_final_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=duration_pb2.Duration, + speech_final_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=duration_pb2.Duration, + ) ) partial_responses: int = proto.Field( proto.INT32, @@ -802,19 +801,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=11, ) - dtmf_partial_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message=duration_pb2.Duration, + dtmf_partial_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message=duration_pb2.Duration, + ) ) - dtmf_final_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=13, - message=duration_pb2.Duration, + dtmf_final_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=13, + message=duration_pb2.Duration, + ) ) single_utterance_end_time_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -1030,6 +1029,7 @@ class MessageType(proto.Enum): ``single_utterance`` was set to ``true``, and is not used otherwise. """ + MESSAGE_TYPE_UNSPECIFIED = 0 TRANSCRIPT = 1 END_OF_SINGLE_UTTERANCE = 2 @@ -1051,12 +1051,12 @@ class MessageType(proto.Enum): proto.FLOAT, number=4, ) - speech_word_info: MutableSequence[ - gcd_audio_config.SpeechWordInfo - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gcd_audio_config.SpeechWordInfo, + speech_word_info: MutableSequence[gcd_audio_config.SpeechWordInfo] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gcd_audio_config.SpeechWordInfo, + ) ) speech_end_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session_entity_type.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session_entity_type.py index 297ac0c3cc1a..2f5a1d92a78f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session_entity_type.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/session_entity_type.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2.types import entity_type @@ -94,6 +94,7 @@ class EntityOverrideMode(proto.Enum): [EntityTypes.GetEntityType][google.cloud.dialogflow.v2.EntityTypes.GetEntityType] on the custom entity type and merge. """ + ENTITY_OVERRIDE_MODE_UNSPECIFIED = 0 ENTITY_OVERRIDE_MODE_OVERRIDE = 1 ENTITY_OVERRIDE_MODE_SUPPLEMENT = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/sip_trunk.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/sip_trunk.py index ba066ca629bf..70734799f069 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/sip_trunk.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/sip_trunk.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -253,6 +253,7 @@ class State(proto.Enum): KEEPALIVE (4): SIP Trunk connection is keepalive. """ + STATE_UNSPECIFIED = 0 CONNECTED = 1 DISCONNECTED = 2 @@ -284,6 +285,7 @@ class CertificateState(proto.Enum): CERTIFICATE_QUOTA_EXCEEDED (8): Certificate has exhausted its quota. """ + CERTIFICATE_STATE_UNSPECIFIED = 0 CERTIFICATE_VALID = 1 CERTIFICATE_INVALID = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool.py index fd910fd892df..b642a2f2b900 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -270,6 +270,7 @@ class ConfirmationRequirement(proto.Enum): NOT_REQUIRED (2): Conformation is not required. """ + CONFIRMATION_REQUIREMENT_UNSPECIFIED = 0 REQUIRED = 1 NOT_REQUIRED = 2 @@ -291,6 +292,7 @@ class MethodType(proto.Enum): PATCH (5): PATCH method. """ + METHOD_TYPE_UNSPECIFIED = 0 GET = 1 POST = 2 @@ -467,6 +469,7 @@ class OperationType(proto.Enum): DELETE (5): Delete operation. """ + OPERATION_TYPE_UNSPECIFIED = 0 LIST = 1 GET = 2 @@ -558,6 +561,7 @@ class RequestLocation(proto.Enum): QUERY_STRING (2): Represents the key in query string. """ + REQUEST_LOCATION_UNSPECIFIED = 0 HEADER = 1 QUERY_STRING = 2 @@ -638,6 +642,7 @@ class OauthGrantType(proto.Enum): Represents the `client credential flow `__. """ + OAUTH_GRANT_TYPE_UNSPECIFIED = 0 CLIENT_CREDENTIAL = 1 @@ -701,6 +706,7 @@ class ServiceAgentAuth(proto.Enum): other Google Cloud APIs after you grant required roles to ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com``. """ + SERVICE_AGENT_AUTH_UNSPECIFIED = 0 ID_TOKEN = 1 ACCESS_TOKEN = 2 @@ -847,13 +853,13 @@ class ServiceDirectoryConfig(proto.Message): proto.STRING, number=3, ) - action_confirmation_requirement: MutableMapping[ - str, ConfirmationRequirement - ] = proto.MapField( - proto.STRING, - proto.ENUM, - number=17, - enum=ConfirmationRequirement, + action_confirmation_requirement: MutableMapping[str, ConfirmationRequirement] = ( + proto.MapField( + proto.STRING, + proto.ENUM, + number=17, + enum=ConfirmationRequirement, + ) ) extension_spec: ExtensionTool = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool_call.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool_call.py index e07821f87277..912568c6f8d0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool_call.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/tool_call.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -76,6 +76,7 @@ class State(proto.Enum): The tool call requires confirmation from a human. """ + STATE_UNSPECIFIED = 0 TRIGGERED = 1 NEEDS_CONFIRMATION = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/validation_result.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/validation_result.py index 18814c55c561..ef1f64474b8c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/validation_result.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/validation_result.py @@ -70,6 +70,7 @@ class Severity(proto.Enum): CRITICAL (4): The agent may completely fail. """ + SEVERITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/version.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/version.py index fe0fbf573303..5451603429fa 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/version.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/version.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -94,6 +94,7 @@ class VersionStatus(proto.Enum): FAILED (3): Version training failed. """ + VERSION_STATUS_UNSPECIFIED = 0 IN_PROGRESS = 1 READY = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/webhook.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/webhook.py index 877dc54a941a..a42def87e542 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/webhook.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2/types/webhook.py @@ -17,12 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflow_v2.types import context, intent +from google.cloud.dialogflow_v2.types import context, intent, session_entity_type from google.cloud.dialogflow_v2.types import session as gcd_session -from google.cloud.dialogflow_v2.types import session_entity_type __protobuf__ = proto.module( package="google.cloud.dialogflow.v2", @@ -174,12 +173,12 @@ class WebhookResponse(proto.Message): number=6, message=gcd_session.EventInput, ) - session_entity_types: MutableSequence[ - session_entity_type.SessionEntityType - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message=session_entity_type.SessionEntityType, + session_entity_types: MutableSequence[session_entity_type.SessionEntityType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message=session_entity_type.SessionEntityType, + ) ) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/__init__.py index 5a222e8e0743..cd836430eaab 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.agents import AgentsAsyncClient, AgentsClient from .services.answer_records import AnswerRecordsAsyncClient, AnswerRecordsClient from .services.contexts import ContextsAsyncClient, ContextsClient diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/async_client.py index fbfd48e7a5aa..fec49f952832 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,17 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.agents import pagers -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result from .client import AgentsClient from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport @@ -114,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_info.__func__(AgentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AgentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AgentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AgentsAsyncClient: The constructed client. """ - return AgentsClient.from_service_account_file.__func__(AgentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AgentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AgentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/client.py index 23e3107e6aae..5966b1d8e7aa 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,17 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.agents import pagers -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result from .transports.base import DEFAULT_CLIENT_INFO, AgentsTransport from .transports.grpc import AgentsGrpcTransport @@ -622,11 +621,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AgentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AgentsClient._read_environment_variables() + ) self._client_cert_source = AgentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -661,8 +658,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AgentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/pagers.py index 2637e7af6df6..a0d710174e0c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/base.py index bab0e326f93d..547bcae9d2c2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/base.py @@ -17,21 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -333,7 +332,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc.py index bf1fa3054210..4ba94ab29893 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc.py @@ -16,24 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc_asyncio.py index 87001129dd8b..8bd55111c7e3 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,16 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result from .base import DEFAULT_CLIENT_INFO, AgentsTransport from .grpc import AgentsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest.py index f43440b7d4d5..9cf98a6797bf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest.py @@ -16,24 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAgentsRestTransport @@ -873,7 +872,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -992,7 +991,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1452,7 +1451,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1606,7 +1605,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2070,7 +2069,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest_base.py index c9026bdf24df..367e640e996d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/agents/transports/rest_base.py @@ -17,15 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result from .base import DEFAULT_CLIENT_INFO, AgentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/async_client.py index 4986895f6661..0ff6af7db69f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -45,13 +45,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.answer_records import pagers -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from .client import AnswerRecordsClient from .transports.base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport @@ -131,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AnswerRecordsAsyncClient: The constructed client. """ - return AnswerRecordsClient.from_service_account_info.__func__(AnswerRecordsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AnswerRecordsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AnswerRecordsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AnswerRecordsAsyncClient: The constructed client. """ - return AnswerRecordsClient.from_service_account_file.__func__(AnswerRecordsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AnswerRecordsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AnswerRecordsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/client.py index 1711d4e95ff2..cdbc72884617 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.answer_records import pagers -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from .transports.base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport from .transports.grpc import AnswerRecordsGrpcTransport @@ -705,11 +705,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AnswerRecordsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AnswerRecordsClient._read_environment_variables() + ) self._client_cert_source = AnswerRecordsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -744,8 +742,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AnswerRecordsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/pagers.py index 2e21f759e08d..2cbb7413cbff 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/base.py index 6b5514f10971..b8b407cf1a7a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -249,7 +249,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc.py index 5a4f13dd7232..0c07d2b2fc4c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from .base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc_asyncio.py index 432c171d6ac4..a16f6c3c52ac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,13 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from .base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport from .grpc import AnswerRecordsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest.py index 4cd6d0b237cf..946b59a74af5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,12 +27,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAnswerRecordsRestTransport @@ -699,9 +699,7 @@ def __call__( """ - http_options = ( - _BaseAnswerRecordsRestTransport._BaseListAnswerRecords._get_http_options() - ) + http_options = _BaseAnswerRecordsRestTransport._BaseListAnswerRecords._get_http_options() request, metadata = self._interceptor.pre_list_answer_records( request, metadata @@ -880,9 +878,7 @@ def __call__( """ - http_options = ( - _BaseAnswerRecordsRestTransport._BaseUpdateAnswerRecord._get_http_options() - ) + http_options = _BaseAnswerRecordsRestTransport._BaseUpdateAnswerRecord._get_http_options() request, metadata = self._interceptor.pre_update_answer_record( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest_base.py index 48d4b25f45b3..fa10c68a1314 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/answer_records/transports/rest_base.py @@ -22,8 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from google.cloud.dialogflow_v2beta1.types import answer_record +from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record from .base import DEFAULT_CLIENT_INFO, AnswerRecordsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/async_client.py index 719ab9c58d0b..1641d19c5720 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.contexts import pagers from google.cloud.dialogflow_v2beta1.types import context @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ContextsAsyncClient: The constructed client. """ - return ContextsClient.from_service_account_info.__func__(ContextsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ContextsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ContextsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ContextsAsyncClient: The constructed client. """ - return ContextsClient.from_service_account_file.__func__(ContextsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ContextsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ContextsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/client.py index 85f9544cf86e..24c029e18201 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.contexts import pagers from google.cloud.dialogflow_v2beta1.types import context @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ContextsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ContextsClient._read_environment_variables() + ) self._client_cert_source = ContextsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ContextsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/pagers.py index 69022914402f..64e7a6bc8eff 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/base.py index 31317e74f6e5..00e2310a8a19 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import context @@ -286,7 +286,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc.py index 6b78fdecd090..4874cadc25f9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import context from google.cloud.dialogflow_v2beta1.types import context as gcd_context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc_asyncio.py index 46ec44ceed48..b8cc8d2f9883 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import context from google.cloud.dialogflow_v2beta1.types import context as gcd_context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest.py index daa5774362f6..d7bdd1e31343 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -791,7 +791,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -902,7 +902,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest_base.py index 01a061598f55..188ed4abb3e6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/contexts/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2beta1.types import context diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/async_client.py index 4d35bbcdad9e..363c83955ba4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,20 +44,22 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.conversation_profiles import pagers +from google.cloud.dialogflow_v2beta1.types import ( + audio_config, + conversation_profile, + participant, +) from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import audio_config -from google.cloud.dialogflow_v2beta1.types import conversation_profile -from google.cloud.dialogflow_v2beta1.types import participant from .client import ConversationProfilesClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport @@ -157,7 +159,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationProfilesAsyncClient: The constructed client. """ - return ConversationProfilesClient.from_service_account_info.__func__(ConversationProfilesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConversationProfilesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConversationProfilesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +176,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationProfilesAsyncClient: The constructed client. """ - return ConversationProfilesClient.from_service_account_file.__func__(ConversationProfilesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConversationProfilesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConversationProfilesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -211,7 +215,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationProfilesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationProfilesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationProfilesTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/client.py index 34bc076135e4..9de76b529fab 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,20 +61,22 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.conversation_profiles import pagers +from google.cloud.dialogflow_v2beta1.types import ( + audio_config, + conversation_profile, + participant, +) from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import audio_config -from google.cloud.dialogflow_v2beta1.types import conversation_profile -from google.cloud.dialogflow_v2beta1.types import participant from .transports.base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport from .transports.grpc import ConversationProfilesGrpcTransport @@ -90,9 +92,7 @@ class ConversationProfilesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationProfilesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationProfilesTransport]] _transport_registry["grpc"] = ConversationProfilesGrpcTransport _transport_registry["grpc_asyncio"] = ConversationProfilesGrpcAsyncIOTransport _transport_registry["rest"] = ConversationProfilesRestTransport @@ -780,11 +780,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationProfilesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationProfilesClient._read_environment_variables() + ) self._client_cert_source = ConversationProfilesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -819,8 +817,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationProfilesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/pagers.py index f45ea906b6de..35f9863fdc48 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/__init__.py index cfed16be48c8..2005af811949 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ConversationProfilesRestInterceptor, ConversationProfilesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationProfilesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationProfilesTransport]] _transport_registry["grpc"] = ConversationProfilesGrpcTransport _transport_registry["grpc_asyncio"] = ConversationProfilesGrpcAsyncIOTransport _transport_registry["rest"] = ConversationProfilesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/base.py index 76033b997d6e..d38fcc1f3c92 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import conversation_profile DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -320,7 +320,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc.py index 0a290e0423a5..40bc0f6d202d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import conversation_profile from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport @@ -368,12 +368,12 @@ def list_conversation_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_profiles" not in self._stubs: - self._stubs[ - "list_conversation_profiles" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ListConversationProfiles", - request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, - response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + self._stubs["list_conversation_profiles"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ListConversationProfiles", + request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, + response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + ) ) return self._stubs["list_conversation_profiles"] @@ -434,12 +434,12 @@ def create_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_profile" not in self._stubs: - self._stubs[ - "create_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/CreateConversationProfile", - request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["create_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/CreateConversationProfile", + request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["create_conversation_profile"] @@ -471,12 +471,12 @@ def update_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_conversation_profile" not in self._stubs: - self._stubs[ - "update_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/UpdateConversationProfile", - request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["update_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/UpdateConversationProfile", + request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["update_conversation_profile"] @@ -501,12 +501,12 @@ def delete_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversation_profile" not in self._stubs: - self._stubs[ - "delete_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/DeleteConversationProfile", - request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/DeleteConversationProfile", + request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_conversation_profile"] @@ -551,12 +551,12 @@ def set_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_suggestion_feature_config" not in self._stubs: - self._stubs[ - "set_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/SetSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/SetSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_suggestion_feature_config"] @@ -594,12 +594,12 @@ def clear_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "clear_suggestion_feature_config" not in self._stubs: - self._stubs[ - "clear_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ClearSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["clear_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ClearSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["clear_suggestion_feature_config"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc_asyncio.py index f853928130f1..d4a23fbc94da 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import conversation_profile from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport from .grpc import ConversationProfilesGrpcTransport @@ -376,12 +376,12 @@ def list_conversation_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversation_profiles" not in self._stubs: - self._stubs[ - "list_conversation_profiles" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ListConversationProfiles", - request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, - response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + self._stubs["list_conversation_profiles"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ListConversationProfiles", + request_serializer=conversation_profile.ListConversationProfilesRequest.serialize, + response_deserializer=conversation_profile.ListConversationProfilesResponse.deserialize, + ) ) return self._stubs["list_conversation_profiles"] @@ -442,12 +442,12 @@ def create_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversation_profile" not in self._stubs: - self._stubs[ - "create_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/CreateConversationProfile", - request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["create_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/CreateConversationProfile", + request_serializer=gcd_conversation_profile.CreateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["create_conversation_profile"] @@ -479,12 +479,12 @@ def update_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_conversation_profile" not in self._stubs: - self._stubs[ - "update_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/UpdateConversationProfile", - request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, - response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + self._stubs["update_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/UpdateConversationProfile", + request_serializer=gcd_conversation_profile.UpdateConversationProfileRequest.serialize, + response_deserializer=gcd_conversation_profile.ConversationProfile.deserialize, + ) ) return self._stubs["update_conversation_profile"] @@ -510,12 +510,12 @@ def delete_conversation_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversation_profile" not in self._stubs: - self._stubs[ - "delete_conversation_profile" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/DeleteConversationProfile", - request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_conversation_profile"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/DeleteConversationProfile", + request_serializer=conversation_profile.DeleteConversationProfileRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_conversation_profile"] @@ -560,12 +560,12 @@ def set_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_suggestion_feature_config" not in self._stubs: - self._stubs[ - "set_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/SetSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/SetSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.SetSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_suggestion_feature_config"] @@ -603,12 +603,12 @@ def clear_suggestion_feature_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "clear_suggestion_feature_config" not in self._stubs: - self._stubs[ - "clear_suggestion_feature_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ClearSuggestionFeatureConfig", - request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["clear_suggestion_feature_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.ConversationProfiles/ClearSuggestionFeatureConfig", + request_serializer=gcd_conversation_profile.ClearSuggestionFeatureConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["clear_suggestion_feature_config"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest.py index 4fea5fad4930..c10a78be6025 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest.py @@ -16,25 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import conversation_profile from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationProfilesRestTransport @@ -791,9 +791,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseClearSuggestionFeatureConfig._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseClearSuggestionFeatureConfig._get_http_options() request, metadata = self._interceptor.pre_clear_suggestion_feature_config( request, metadata @@ -819,7 +817,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -860,11 +858,10 @@ def __call__( resp = self._interceptor.post_clear_suggestion_feature_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_clear_suggestion_feature_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_clear_suggestion_feature_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -949,9 +946,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseCreateConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseCreateConversationProfile._get_http_options() request, metadata = self._interceptor.pre_create_conversation_profile( request, metadata @@ -1104,9 +1099,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseDeleteConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseDeleteConversationProfile._get_http_options() request, metadata = self._interceptor.pre_delete_conversation_profile( request, metadata @@ -1128,7 +1121,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1220,9 +1213,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseGetConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseGetConversationProfile._get_http_options() request, metadata = self._interceptor.pre_get_conversation_profile( request, metadata @@ -1375,9 +1366,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseListConversationProfiles._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseListConversationProfiles._get_http_options() request, metadata = self._interceptor.pre_list_conversation_profiles( request, metadata @@ -1532,9 +1521,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseSetSuggestionFeatureConfig._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseSetSuggestionFeatureConfig._get_http_options() request, metadata = self._interceptor.pre_set_suggestion_feature_config( request, metadata @@ -1560,7 +1547,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1601,11 +1588,10 @@ def __call__( resp = self._interceptor.post_set_suggestion_feature_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_suggestion_feature_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_suggestion_feature_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1690,9 +1676,7 @@ def __call__( """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseUpdateConversationProfile._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseUpdateConversationProfile._get_http_options() request, metadata = self._interceptor.pre_update_conversation_profile( request, metadata @@ -1798,7 +1782,9 @@ def clear_suggestion_feature_config( ]: # 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._ClearSuggestionFeatureConfig(self._session, self._host, self._interceptor) # type: ignore + return self._ClearSuggestionFeatureConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_conversation_profile( @@ -1809,7 +1795,9 @@ def create_conversation_profile( ]: # 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._CreateConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_conversation_profile( @@ -1819,7 +1807,9 @@ def delete_conversation_profile( ]: # 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._DeleteConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_conversation_profile( @@ -1830,7 +1820,9 @@ def get_conversation_profile( ]: # 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._GetConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._GetConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversation_profiles( @@ -1841,7 +1833,9 @@ def list_conversation_profiles( ]: # 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._ListConversationProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListConversationProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_suggestion_feature_config( @@ -1852,7 +1846,9 @@ def set_suggestion_feature_config( ]: # 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._SetSuggestionFeatureConfig(self._session, self._host, self._interceptor) # type: ignore + return self._SetSuggestionFeatureConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_conversation_profile( @@ -1863,7 +1859,9 @@ def update_conversation_profile( ]: # 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._UpdateConversationProfile(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateConversationProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1923,9 +1921,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseGetLocation._get_transcoded_request( @@ -2064,9 +2060,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseListLocations._get_transcoded_request( @@ -2202,9 +2196,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2320,9 +2312,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseGetOperation._get_transcoded_request( @@ -2461,9 +2451,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationProfilesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationProfilesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationProfilesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest_base.py index 66f2bcdaa88c..7dbc37993b77 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversation_profiles/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflow_v2beta1.types import conversation_profile from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import conversation_profile from .base import DEFAULT_CLIENT_INFO, ConversationProfilesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/async_client.py index 5cf4017fa432..66351805455f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,14 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.conversations import pagers +from google.cloud.dialogflow_v2beta1.types import conversation, generator, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import generator, participant from .client import ConversationsClient from .transports.base import DEFAULT_CLIENT_INFO, ConversationsTransport @@ -159,7 +158,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationsAsyncClient: The constructed client. """ - return ConversationsClient.from_service_account_info.__func__(ConversationsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ConversationsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ConversationsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -175,7 +175,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationsAsyncClient: The constructed client. """ - return ConversationsClient.from_service_account_file.__func__(ConversationsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ConversationsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ConversationsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/client.py index 28da89a97811..58b7e8b5b410 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.conversations import pagers +from google.cloud.dialogflow_v2beta1.types import conversation, generator, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import generator, participant from .transports.base import DEFAULT_CLIENT_INFO, ConversationsTransport from .transports.grpc import ConversationsGrpcTransport @@ -876,11 +875,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationsClient._read_environment_variables() + ) self._client_cert_source = ConversationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -915,8 +912,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/pagers.py index 2d86164738a8..d04ba3a4decb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/base.py index 6735921d6e5d..8113b9dd1eca 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.cloud.dialogflow_v2beta1.types import conversation, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import participant DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -398,7 +397,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc.py index 55d8ee2eba1e..efc44cddf14b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import conversation, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import participant from .base import DEFAULT_CLIENT_INFO, ConversationsTransport @@ -576,12 +575,12 @@ def suggest_conversation_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "suggest_conversation_summary" not in self._stubs: - self._stubs[ - "suggest_conversation_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.Conversations/SuggestConversationSummary", - request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, - response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + self._stubs["suggest_conversation_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.Conversations/SuggestConversationSummary", + request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, + response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + ) ) return self._stubs["suggest_conversation_summary"] @@ -608,12 +607,12 @@ def generate_stateless_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_summary" not in self._stubs: - self._stubs[ - "generate_stateless_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSummary", - request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, - response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + self._stubs["generate_stateless_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSummary", + request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, + response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + ) ) return self._stubs["generate_stateless_summary"] @@ -640,12 +639,12 @@ def generate_stateless_suggestion( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_suggestion" not in self._stubs: - self._stubs[ - "generate_stateless_suggestion" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSuggestion", - request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, - response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + self._stubs["generate_stateless_suggestion"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSuggestion", + request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, + response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + ) ) return self._stubs["generate_stateless_suggestion"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc_asyncio.py index cc13ad47da5d..d20bc8373567 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import conversation, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import participant from .base import DEFAULT_CLIENT_INFO, ConversationsTransport from .grpc import ConversationsGrpcTransport @@ -588,12 +587,12 @@ def suggest_conversation_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "suggest_conversation_summary" not in self._stubs: - self._stubs[ - "suggest_conversation_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.Conversations/SuggestConversationSummary", - request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, - response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + self._stubs["suggest_conversation_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.Conversations/SuggestConversationSummary", + request_serializer=gcd_conversation.SuggestConversationSummaryRequest.serialize, + response_deserializer=gcd_conversation.SuggestConversationSummaryResponse.deserialize, + ) ) return self._stubs["suggest_conversation_summary"] @@ -620,12 +619,12 @@ def generate_stateless_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_summary" not in self._stubs: - self._stubs[ - "generate_stateless_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSummary", - request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, - response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + self._stubs["generate_stateless_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSummary", + request_serializer=conversation.GenerateStatelessSummaryRequest.serialize, + response_deserializer=conversation.GenerateStatelessSummaryResponse.deserialize, + ) ) return self._stubs["generate_stateless_summary"] @@ -652,12 +651,12 @@ def generate_stateless_suggestion( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_stateless_suggestion" not in self._stubs: - self._stubs[ - "generate_stateless_suggestion" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSuggestion", - request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, - response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + self._stubs["generate_stateless_suggestion"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.Conversations/GenerateStatelessSuggestion", + request_serializer=conversation.GenerateStatelessSuggestionRequest.serialize, + response_deserializer=conversation.GenerateStatelessSuggestionResponse.deserialize, + ) ) return self._stubs["generate_stateless_suggestion"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest.py index 1b7dfb5561d3..6938edaadfaf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +27,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflow_v2beta1.types import conversation, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import participant from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationsRestTransport @@ -1054,9 +1053,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseBatchCreateMessages._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseBatchCreateMessages._get_http_options() request, metadata = self._interceptor.pre_batch_create_messages( request, metadata @@ -1216,9 +1213,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseCompleteConversation._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseCompleteConversation._get_http_options() request, metadata = self._interceptor.pre_complete_conversation( request, metadata @@ -1376,9 +1371,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1533,9 +1526,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseGenerateStatelessSuggestion._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseGenerateStatelessSuggestion._get_http_options() request, metadata = self._interceptor.pre_generate_stateless_suggestion( request, metadata @@ -1606,11 +1597,10 @@ def __call__( resp = self._interceptor.post_generate_stateless_suggestion(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_stateless_suggestion_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_stateless_suggestion_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1699,9 +1689,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseGenerateStatelessSummary._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseGenerateStatelessSummary._get_http_options() request, metadata = self._interceptor.pre_generate_stateless_summary( request, metadata @@ -1858,9 +1846,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseGenerateSuggestions._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseGenerateSuggestions._get_http_options() request, metadata = self._interceptor.pre_generate_suggestions( request, metadata @@ -2170,9 +2156,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseIngestContextReferences._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseIngestContextReferences._get_http_options() request, metadata = self._interceptor.pre_ingest_context_references( request, metadata @@ -2330,9 +2314,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2790,9 +2772,7 @@ def __call__( """ - http_options = ( - _BaseConversationsRestTransport._BaseSuggestConversationSummary._get_http_options() - ) + http_options = _BaseConversationsRestTransport._BaseSuggestConversationSummary._get_http_options() request, metadata = self._interceptor.pre_suggest_conversation_summary( request, metadata @@ -2933,7 +2913,9 @@ def generate_stateless_suggestion( ]: # 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._GenerateStatelessSuggestion(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateStatelessSuggestion( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_stateless_summary( @@ -2944,7 +2926,9 @@ def generate_stateless_summary( ]: # 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._GenerateStatelessSummary(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateStatelessSummary( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_suggestions( @@ -2974,7 +2958,9 @@ def ingest_context_references( ]: # 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._IngestContextReferences(self._session, self._host, self._interceptor) # type: ignore + return self._IngestContextReferences( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_conversations( @@ -3015,7 +3001,9 @@ def suggest_conversation_summary( ]: # 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._SuggestConversationSummary(self._session, self._host, self._interceptor) # type: ignore + return self._SuggestConversationSummary( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest_base.py index 3e2e4cadc349..5f6002e25290 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/conversations/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflow_v2beta1.types import conversation, participant from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation -from google.cloud.dialogflow_v2beta1.types import participant from .base import DEFAULT_CLIENT_INFO, ConversationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/async_client.py index 4c03eef8b8c5..a22bffe5b987 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,17 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.documents import pagers -from google.cloud.dialogflow_v2beta1.types import document +from google.cloud.dialogflow_v2beta1.types import document, gcs from google.cloud.dialogflow_v2beta1.types import document as gcd_document -from google.cloud.dialogflow_v2beta1.types import gcs from .client import DocumentsClient from .transports.base import DEFAULT_CLIENT_INFO, DocumentsTransport @@ -118,7 +117,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentsAsyncClient: The constructed client. """ - return DocumentsClient.from_service_account_info.__func__(DocumentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DocumentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DocumentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +134,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentsAsyncClient: The constructed client. """ - return DocumentsClient.from_service_account_file.__func__(DocumentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DocumentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DocumentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/client.py index d275809c02ba..8c96e3ac162d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,17 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.documents import pagers -from google.cloud.dialogflow_v2beta1.types import document +from google.cloud.dialogflow_v2beta1.types import document, gcs from google.cloud.dialogflow_v2beta1.types import document as gcd_document -from google.cloud.dialogflow_v2beta1.types import gcs from .transports.base import DEFAULT_CLIENT_INFO, DocumentsTransport from .transports.grpc import DocumentsGrpcTransport @@ -629,11 +628,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentsClient._read_environment_variables() + ) self._client_cert_source = DocumentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -668,8 +665,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/pagers.py index 62e0c7ab1056..101d1bcfac58 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/base.py index e2331f16c5ed..ea2978b82cd8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import document @@ -307,7 +307,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc.py index 4063e66a4494..73b12c48e2d5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import document from google.cloud.dialogflow_v2beta1.types import document as gcd_document diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc_asyncio.py index 42a5e4c2b551..b5cbcd7deb4e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import document from google.cloud.dialogflow_v2beta1.types import document as gcd_document diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest.py index 0c2e790ea6ef..1ab9882cbd12 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/documents/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -825,7 +825,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -976,7 +976,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1289,7 +1289,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1598,7 +1598,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1756,7 +1756,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/async_client.py index 4bca92865157..0aa6039d8ed5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from .client import EncryptionSpecServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport @@ -126,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EncryptionSpecServiceAsyncClient: The constructed client. """ - return EncryptionSpecServiceClient.from_service_account_info.__func__(EncryptionSpecServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EncryptionSpecServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EncryptionSpecServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EncryptionSpecServiceAsyncClient: The constructed client. """ - return EncryptionSpecServiceClient.from_service_account_file.__func__(EncryptionSpecServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EncryptionSpecServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EncryptionSpecServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -180,7 +182,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return EncryptionSpecServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return EncryptionSpecServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> EncryptionSpecServiceTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/client.py index 98187641f32d..8ea53be64333 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from .transports.base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport from .transports.grpc import EncryptionSpecServiceGrpcTransport @@ -83,9 +83,7 @@ class EncryptionSpecServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EncryptionSpecServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EncryptionSpecServiceTransport]] _transport_registry["grpc"] = EncryptionSpecServiceGrpcTransport _transport_registry["grpc_asyncio"] = EncryptionSpecServiceGrpcAsyncIOTransport _transport_registry["rest"] = EncryptionSpecServiceRestTransport @@ -631,11 +629,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EncryptionSpecServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EncryptionSpecServiceClient._read_environment_variables() + ) self._client_cert_source = EncryptionSpecServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -670,8 +666,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EncryptionSpecServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/__init__.py index e85e850f9086..e2f6ba4fbf6f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EncryptionSpecServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EncryptionSpecServiceTransport]] _transport_registry["grpc"] = EncryptionSpecServiceGrpcTransport _transport_registry["grpc_asyncio"] = EncryptionSpecServiceGrpcAsyncIOTransport _transport_registry["rest"] = EncryptionSpecServiceRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/base.py index f4145de3448a..8f82f6734e84 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -237,7 +237,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc.py index 3f1d2096379a..ad2b035c8485 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport @@ -397,12 +397,12 @@ def initialize_encryption_spec( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "initialize_encryption_spec" not in self._stubs: - self._stubs[ - "initialize_encryption_spec" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.EncryptionSpecService/InitializeEncryptionSpec", - request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["initialize_encryption_spec"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.EncryptionSpecService/InitializeEncryptionSpec", + request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["initialize_encryption_spec"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc_asyncio.py index ae4310ca80ec..3b096f55a2ce 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,13 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport from .grpc import EncryptionSpecServiceGrpcTransport @@ -407,12 +407,12 @@ def initialize_encryption_spec( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "initialize_encryption_spec" not in self._stubs: - self._stubs[ - "initialize_encryption_spec" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.EncryptionSpecService/InitializeEncryptionSpec", - request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["initialize_encryption_spec"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.EncryptionSpecService/InitializeEncryptionSpec", + request_serializer=gcd_encryption_spec.InitializeEncryptionSpecRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["initialize_encryption_spec"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest.py index 1e1e3f39dd12..4a09112125fc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest.py @@ -16,22 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEncryptionSpecServiceRestTransport @@ -525,9 +525,7 @@ def __call__( """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseGetEncryptionSpec._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseGetEncryptionSpec._get_http_options() request, metadata = self._interceptor.pre_get_encryption_spec( request, metadata @@ -680,9 +678,7 @@ def __call__( """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseInitializeEncryptionSpec._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseInitializeEncryptionSpec._get_http_options() request, metadata = self._interceptor.pre_initialize_encryption_spec( request, metadata @@ -708,7 +704,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -793,7 +789,9 @@ def initialize_encryption_spec( ]: # 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._InitializeEncryptionSpec(self._session, self._host, self._interceptor) # type: ignore + return self._InitializeEncryptionSpec( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -853,9 +851,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -994,9 +990,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1132,9 +1126,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1252,9 +1244,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1393,9 +1383,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEncryptionSpecServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEncryptionSpecServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEncryptionSpecServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest_base.py index 950e9350387e..b262e1f2eca0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/encryption_spec_service/transports/rest_base.py @@ -22,8 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from .base import DEFAULT_CLIENT_INFO, EncryptionSpecServiceTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/async_client.py index 1cb59be6dfe7..af5f3777faff 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,17 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.entity_types import pagers -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from .client import EntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, EntityTypesTransport @@ -120,7 +120,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_info.__func__(EntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EntityTypesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +137,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EntityTypesAsyncClient: The constructed client. """ - return EntityTypesClient.from_service_account_file.__func__(EntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EntityTypesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/client.py index a1ad50ef0f60..405fe3641938 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,17 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.entity_types import pagers -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from .transports.base import DEFAULT_CLIENT_INFO, EntityTypesTransport from .transports.grpc import EntityTypesGrpcTransport @@ -626,11 +626,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EntityTypesClient._read_environment_variables() + ) self._client_cert_source = EntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/pagers.py index a1b248d0d680..837ff61040dc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/base.py index bc21ad8fe9ac..0b9d8e274fae 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -351,7 +351,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc.py index d9d261705861..8fd80c17fb51 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc_asyncio.py index 0716d58bd07d..c390c991be36 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,15 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport from .grpc import EntityTypesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest.py index a65a949a1a08..e697b92d964f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest.py @@ -16,23 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEntityTypesRestTransport @@ -938,9 +938,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchCreateEntities._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchCreateEntities._get_http_options() request, metadata = self._interceptor.pre_batch_create_entities( request, metadata @@ -966,7 +964,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1092,9 +1090,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchDeleteEntities._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchDeleteEntities._get_http_options() request, metadata = self._interceptor.pre_batch_delete_entities( request, metadata @@ -1120,7 +1116,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1246,9 +1242,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchDeleteEntityTypes._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchDeleteEntityTypes._get_http_options() request, metadata = self._interceptor.pre_batch_delete_entity_types( request, metadata @@ -1274,7 +1268,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1400,9 +1394,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchUpdateEntities._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchUpdateEntities._get_http_options() request, metadata = self._interceptor.pre_batch_update_entities( request, metadata @@ -1428,7 +1420,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1554,9 +1546,7 @@ def __call__( """ - http_options = ( - _BaseEntityTypesRestTransport._BaseBatchUpdateEntityTypes._get_http_options() - ) + http_options = _BaseEntityTypesRestTransport._BaseBatchUpdateEntityTypes._get_http_options() request, metadata = self._interceptor.pre_batch_update_entity_types( request, metadata @@ -1582,7 +1572,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1892,7 +1882,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2431,7 +2421,9 @@ def batch_delete_entity_types( ]: # 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._BatchDeleteEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._BatchDeleteEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_update_entities( @@ -2449,7 +2441,9 @@ def batch_update_entity_types( ]: # 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._BatchUpdateEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_entity_type( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest_base.py index 595254c5a139..907a92e936e7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/entity_types/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from .base import DEFAULT_CLIENT_INFO, EntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/async_client.py index 3c982c00de94..c09c35b779ee 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.environments import pagers from google.cloud.dialogflow_v2beta1.types import environment, fulfillment @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_info.__func__(EnvironmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EnvironmentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EnvironmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_file.__func__(EnvironmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EnvironmentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EnvironmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/client.py index c77592b67901..2caca4ab9e75 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.environments import pagers from google.cloud.dialogflow_v2beta1.types import environment, fulfillment @@ -655,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EnvironmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EnvironmentsClient._read_environment_variables() + ) self._client_cert_source = EnvironmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EnvironmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/pagers.py index 34fdcf52cd8e..ee2fa1e3f805 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/base.py index f7e1d76912c6..5320f012343b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import environment @@ -291,7 +291,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc.py index b109f7e43518..837bdecf1d90 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import environment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc_asyncio.py index a3837340bec3..836dc3be030c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import environment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest.py index c4e0a684596d..e74c1a462754 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -669,9 +669,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -817,9 +815,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -841,7 +837,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1096,9 +1092,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseGetEnvironmentHistory._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseGetEnvironmentHistory._get_http_options() request, metadata = self._interceptor.pre_get_environment_history( request, metadata @@ -1414,9 +1408,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() request, metadata = self._interceptor.pre_update_environment( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest_base.py index a0e0a4865158..5405fc70830c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/environments/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2beta1.types import environment diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/async_client.py index 21b9f4ca522b..01b0523664b9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from .client import FulfillmentsClient from .transports.base import DEFAULT_CLIENT_INFO, FulfillmentsTransport @@ -115,7 +115,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FulfillmentsAsyncClient: The constructed client. """ - return FulfillmentsClient.from_service_account_info.__func__(FulfillmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = FulfillmentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(FulfillmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +132,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FulfillmentsAsyncClient: The constructed client. """ - return FulfillmentsClient.from_service_account_file.__func__(FulfillmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = FulfillmentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(FulfillmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/client.py index 15e5bf435c50..49bc8b2526d9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from .transports.base import DEFAULT_CLIENT_INFO, FulfillmentsTransport from .transports.grpc import FulfillmentsGrpcTransport @@ -617,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FulfillmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FulfillmentsClient._read_environment_variables() + ) self._client_cert_source = FulfillmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -656,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FulfillmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/base.py index ca0fbe8fdcd2..18658cca1f76 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -230,7 +230,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc.py index d4e1e67d22ad..80d6ff899b00 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from .base import DEFAULT_CLIENT_INFO, FulfillmentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc_asyncio.py index 1300fea344b3..e05cb06c4c50 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,13 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from .base import DEFAULT_CLIENT_INFO, FulfillmentsTransport from .grpc import FulfillmentsGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest.py index 318caae7be9f..25066baf5d40 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,12 +27,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseFulfillmentsRestTransport @@ -631,9 +631,7 @@ def __call__( """ - http_options = ( - _BaseFulfillmentsRestTransport._BaseUpdateFulfillment._get_http_options() - ) + http_options = _BaseFulfillmentsRestTransport._BaseUpdateFulfillment._get_http_options() request, metadata = self._interceptor.pre_update_fulfillment( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest_base.py index 8fafa838ca99..332afa99da6c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/fulfillments/transports/rest_base.py @@ -22,8 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from .base import DEFAULT_CLIENT_INFO, FulfillmentsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/async_client.py index 083a4e27cea3..596cbbb3dc4a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,19 +44,21 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.generator_evaluations import pagers +from google.cloud.dialogflow_v2beta1.types import ( + generator, + generator_evaluation, + operations, +) from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator -from google.cloud.dialogflow_v2beta1.types import generator_evaluation -from google.cloud.dialogflow_v2beta1.types import operations from .client import GeneratorEvaluationsClient from .transports.base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport @@ -132,7 +134,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GeneratorEvaluationsAsyncClient: The constructed client. """ - return GeneratorEvaluationsClient.from_service_account_info.__func__(GeneratorEvaluationsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GeneratorEvaluationsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GeneratorEvaluationsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +151,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GeneratorEvaluationsAsyncClient: The constructed client. """ - return GeneratorEvaluationsClient.from_service_account_file.__func__(GeneratorEvaluationsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GeneratorEvaluationsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(GeneratorEvaluationsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -186,7 +190,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GeneratorEvaluationsClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GeneratorEvaluationsClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GeneratorEvaluationsTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/client.py index b2c84c54e6f1..4765c7891be0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,19 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.generator_evaluations import pagers +from google.cloud.dialogflow_v2beta1.types import ( + generator, + generator_evaluation, + operations, +) from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator -from google.cloud.dialogflow_v2beta1.types import generator_evaluation -from google.cloud.dialogflow_v2beta1.types import operations from .transports.base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport from .transports.grpc import GeneratorEvaluationsGrpcTransport @@ -89,9 +91,7 @@ class GeneratorEvaluationsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GeneratorEvaluationsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GeneratorEvaluationsTransport]] _transport_registry["grpc"] = GeneratorEvaluationsGrpcTransport _transport_registry["grpc_asyncio"] = GeneratorEvaluationsGrpcAsyncIOTransport _transport_registry["rest"] = GeneratorEvaluationsRestTransport @@ -681,11 +681,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeneratorEvaluationsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeneratorEvaluationsClient._read_environment_variables() + ) self._client_cert_source = GeneratorEvaluationsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -720,8 +718,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeneratorEvaluationsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/pagers.py index 2ef1927ec914..50826eb559cf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/__init__.py index d8fcc5682d44..9d3ec4732b37 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import GeneratorEvaluationsRestInterceptor, GeneratorEvaluationsRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GeneratorEvaluationsTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GeneratorEvaluationsTransport]] _transport_registry["grpc"] = GeneratorEvaluationsGrpcTransport _transport_registry["grpc_asyncio"] = GeneratorEvaluationsGrpcAsyncIOTransport _transport_registry["rest"] = GeneratorEvaluationsRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/base.py index 99123ee93ea7..4a5093c7abc5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator_evaluation DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc.py index 19ef0ed41043..6500c77e9762 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport @@ -366,12 +366,12 @@ def create_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_generator_evaluation" not in self._stubs: - self._stubs[ - "create_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/CreateGeneratorEvaluation", - request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/CreateGeneratorEvaluation", + request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_generator_evaluation"] @@ -426,12 +426,12 @@ def list_generator_evaluations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_generator_evaluations" not in self._stubs: - self._stubs[ - "list_generator_evaluations" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/ListGeneratorEvaluations", - request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, - response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + self._stubs["list_generator_evaluations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/ListGeneratorEvaluations", + request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, + response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + ) ) return self._stubs["list_generator_evaluations"] @@ -456,12 +456,12 @@ def delete_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_generator_evaluation" not in self._stubs: - self._stubs[ - "delete_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/DeleteGeneratorEvaluation", - request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/DeleteGeneratorEvaluation", + request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_generator_evaluation"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc_asyncio.py index 12eb276ac9ec..9903bfe41f51 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport from .grpc import GeneratorEvaluationsGrpcTransport @@ -374,12 +374,12 @@ def create_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_generator_evaluation" not in self._stubs: - self._stubs[ - "create_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/CreateGeneratorEvaluation", - request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/CreateGeneratorEvaluation", + request_serializer=gcd_generator_evaluation.CreateGeneratorEvaluationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_generator_evaluation"] @@ -434,12 +434,12 @@ def list_generator_evaluations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_generator_evaluations" not in self._stubs: - self._stubs[ - "list_generator_evaluations" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/ListGeneratorEvaluations", - request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, - response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + self._stubs["list_generator_evaluations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/ListGeneratorEvaluations", + request_serializer=generator_evaluation.ListGeneratorEvaluationsRequest.serialize, + response_deserializer=generator_evaluation.ListGeneratorEvaluationsResponse.deserialize, + ) ) return self._stubs["list_generator_evaluations"] @@ -465,12 +465,12 @@ def delete_generator_evaluation( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_generator_evaluation" not in self._stubs: - self._stubs[ - "delete_generator_evaluation" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/DeleteGeneratorEvaluation", - request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_generator_evaluation"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.GeneratorEvaluations/DeleteGeneratorEvaluation", + request_serializer=generator_evaluation.DeleteGeneratorEvaluationRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_generator_evaluation"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest.py index 0704a7be091d..770ce503b11a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest.py @@ -16,25 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseGeneratorEvaluationsRestTransport @@ -610,9 +610,7 @@ def __call__( """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseCreateGeneratorEvaluation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseCreateGeneratorEvaluation._get_http_options() request, metadata = self._interceptor.pre_create_generator_evaluation( request, metadata @@ -638,7 +636,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -757,9 +755,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseDeleteGeneratorEvaluation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseDeleteGeneratorEvaluation._get_http_options() request, metadata = self._interceptor.pre_delete_generator_evaluation( request, metadata @@ -781,7 +777,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -872,9 +868,7 @@ def __call__( """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseGetGeneratorEvaluation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseGetGeneratorEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_generator_evaluation( request, metadata @@ -1024,9 +1018,7 @@ def __call__( Response of ListGeneratorEvaluations. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseListGeneratorEvaluations._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseListGeneratorEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_generator_evaluations( request, metadata @@ -1129,7 +1121,9 @@ def create_generator_evaluation( ]: # 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._CreateGeneratorEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateGeneratorEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_generator_evaluation( @@ -1139,7 +1133,9 @@ def delete_generator_evaluation( ]: # 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._DeleteGeneratorEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteGeneratorEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_generator_evaluation( @@ -1150,7 +1146,9 @@ def get_generator_evaluation( ]: # 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._GetGeneratorEvaluation(self._session, self._host, self._interceptor) # type: ignore + return self._GetGeneratorEvaluation( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_generator_evaluations( @@ -1161,7 +1159,9 @@ def list_generator_evaluations( ]: # 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._ListGeneratorEvaluations(self._session, self._host, self._interceptor) # type: ignore + return self._ListGeneratorEvaluations( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1221,9 +1221,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseGetLocation._get_transcoded_request( @@ -1362,9 +1360,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseListLocations._get_transcoded_request( @@ -1500,9 +1496,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1618,9 +1612,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseGetOperation._get_transcoded_request( @@ -1759,9 +1751,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGeneratorEvaluationsRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGeneratorEvaluationsRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGeneratorEvaluationsRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest_base.py index 6203e553a7ca..136c27d7d88d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generator_evaluations/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflow_v2beta1.types import generator_evaluation from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator_evaluation from .base import DEFAULT_CLIENT_INFO, GeneratorEvaluationsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/async_client.py index 5b1931d1aa6f..724c15d71c40 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.generators import pagers from google.cloud.dialogflow_v2beta1.types import generator @@ -120,7 +120,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_info.__func__(GeneratorsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GeneratorsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GeneratorsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -136,7 +137,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GeneratorsAsyncClient: The constructed client. """ - return GeneratorsClient.from_service_account_file.__func__(GeneratorsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GeneratorsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(GeneratorsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/client.py index 6c2e38c8f116..4e6d6f47d999 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.generators import pagers from google.cloud.dialogflow_v2beta1.types import generator @@ -651,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GeneratorsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GeneratorsClient._read_environment_variables() + ) self._client_cert_source = GeneratorsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -690,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GeneratorsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/pagers.py index c607f0a4e4d1..c19b6b51bdbd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/base.py index 4a8bd01e6398..d0ec23924a15 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import generator @@ -276,7 +276,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc.py index 0180a25ebc67..8c410dc94b14 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import generator from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc_asyncio.py index 2f053b71baf5..3cb6461ee90f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import generator from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest.py index 805796150f9e..5a2d91e59162 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -763,7 +763,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest_base.py index c3f7f990046f..dcc7fefbf66c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/generators/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2beta1.types import generator diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/async_client.py index b54c7583afd9..893911d67717 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,17 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.intents import pagers -from google.cloud.dialogflow_v2beta1.types import context -from google.cloud.dialogflow_v2beta1.types import intent +from google.cloud.dialogflow_v2beta1.types import context, intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent from .client import IntentsClient @@ -119,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_info.__func__(IntentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = IntentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(IntentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +135,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IntentsAsyncClient: The constructed client. """ - return IntentsClient.from_service_account_file.__func__(IntentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = IntentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(IntentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/client.py index 3536e17a7e97..fbdbda682bd7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,17 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.intents import pagers -from google.cloud.dialogflow_v2beta1.types import context -from google.cloud.dialogflow_v2beta1.types import intent +from google.cloud.dialogflow_v2beta1.types import context, intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent from .transports.base import DEFAULT_CLIENT_INFO, IntentsTransport @@ -647,11 +646,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IntentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IntentsClient._read_environment_variables() + ) self._client_cert_source = IntentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -686,8 +683,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IntentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/pagers.py index a71fe95a23f9..9d018a5b93eb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/base.py index 479270293b57..05a31320d74b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import intent @@ -304,7 +304,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc.py index 5a753197748c..b896a1544410 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc_asyncio.py index 5eab0de37a84..8c8189e90828 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest.py index 2e009aeec54e..faa174edc68b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -776,7 +776,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -930,7 +930,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1236,7 +1236,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest_base.py index 3b78723c2000..9fc45e9205ae 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/intents/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2beta1.types import intent diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/async_client.py index 7f47e323607a..9ef95b4c9bae 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.knowledge_bases import pagers -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from .client import KnowledgeBasesClient from .transports.base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport @@ -122,7 +122,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: KnowledgeBasesAsyncClient: The constructed client. """ - return KnowledgeBasesClient.from_service_account_info.__func__(KnowledgeBasesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = KnowledgeBasesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(KnowledgeBasesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +139,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: KnowledgeBasesAsyncClient: The constructed client. """ - return KnowledgeBasesClient.from_service_account_file.__func__(KnowledgeBasesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = KnowledgeBasesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(KnowledgeBasesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/client.py index 0ee7af9d95fa..1742a07f1344 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.knowledge_bases import pagers -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from .transports.base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport from .transports.grpc import KnowledgeBasesGrpcTransport @@ -83,9 +83,7 @@ class KnowledgeBasesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[KnowledgeBasesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[KnowledgeBasesTransport]] _transport_registry["grpc"] = KnowledgeBasesGrpcTransport _transport_registry["grpc_asyncio"] = KnowledgeBasesGrpcAsyncIOTransport _transport_registry["rest"] = KnowledgeBasesRestTransport @@ -624,11 +622,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = KnowledgeBasesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + KnowledgeBasesClient._read_environment_variables() + ) self._client_cert_source = KnowledgeBasesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -663,8 +659,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(KnowledgeBasesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/pagers.py index 024c0f00e16a..66657dcea287 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/base.py index 3cede4b30ada..6308633fa006 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/base.py @@ -17,20 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -282,7 +282,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc.py index aaa4e20be76c..b70302b48e88 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc.py @@ -16,23 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc_asyncio.py index 26afc59f4621..a4a20044d500 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,15 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport from .grpc import KnowledgeBasesGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest.py index 049b015fce74..c8c94036ab3f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +28,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseKnowledgeBasesRestTransport @@ -616,9 +616,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseCreateKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseCreateKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_create_knowledge_base( request, metadata @@ -767,9 +765,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseDeleteKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseDeleteKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_delete_knowledge_base( request, metadata @@ -791,7 +787,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -892,9 +888,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseGetKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseGetKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_get_knowledge_base( request, metadata @@ -1041,9 +1035,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseListKnowledgeBases._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseListKnowledgeBases._get_http_options() request, metadata = self._interceptor.pre_list_knowledge_bases( request, metadata @@ -1204,9 +1196,7 @@ def __call__( """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseUpdateKnowledgeBase._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseUpdateKnowledgeBase._get_http_options() request, metadata = self._interceptor.pre_update_knowledge_base( request, metadata @@ -1688,9 +1678,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseKnowledgeBasesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseKnowledgeBasesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest_base.py index 81cc1bac0c08..09ef3b31bc17 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/knowledge_bases/transports/rest_base.py @@ -17,14 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from .base import DEFAULT_CLIENT_INFO, KnowledgeBasesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/async_client.py index 14a075c3e7e1..060f3ae92e3f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -31,15 +32,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -48,14 +48,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.participants import pagers +from google.cloud.dialogflow_v2beta1.types import participant, session from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant -from google.cloud.dialogflow_v2beta1.types import participant -from google.cloud.dialogflow_v2beta1.types import session from .client import ParticipantsClient from .transports.base import DEFAULT_CLIENT_INFO, ParticipantsTransport @@ -139,7 +138,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ParticipantsAsyncClient: The constructed client. """ - return ParticipantsClient.from_service_account_info.__func__(ParticipantsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ParticipantsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ParticipantsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +155,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ParticipantsAsyncClient: The constructed client. """ - return ParticipantsClient.from_service_account_file.__func__(ParticipantsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ParticipantsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ParticipantsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/client.py index f80df3589236..c3d54ead4803 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -63,14 +63,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.participants import pagers +from google.cloud.dialogflow_v2beta1.types import participant, session from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant -from google.cloud.dialogflow_v2beta1.types import participant -from google.cloud.dialogflow_v2beta1.types import session from .transports.base import DEFAULT_CLIENT_INFO, ParticipantsTransport from .transports.grpc import ParticipantsGrpcTransport @@ -798,11 +797,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ParticipantsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ParticipantsClient._read_environment_variables() + ) self._client_cert_source = ParticipantsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -837,8 +834,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ParticipantsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/pagers.py index cea718889f5b..1c02f2030464 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/base.py index 530755351a5b..133e5770f167 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -430,7 +430,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc.py index e33baa63c4ba..9d61cd261c26 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from .base import DEFAULT_CLIENT_INFO, ParticipantsTransport @@ -505,12 +505,12 @@ def streaming_analyze_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "streaming_analyze_content" not in self._stubs: - self._stubs[ - "streaming_analyze_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.dialogflow.v2beta1.Participants/StreamingAnalyzeContent", - request_serializer=participant.StreamingAnalyzeContentRequest.serialize, - response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + self._stubs["streaming_analyze_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.dialogflow.v2beta1.Participants/StreamingAnalyzeContent", + request_serializer=participant.StreamingAnalyzeContentRequest.serialize, + response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + ) ) return self._stubs["streaming_analyze_content"] @@ -537,12 +537,12 @@ def bidi_streaming_analyze_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bidi_streaming_analyze_content" not in self._stubs: - self._stubs[ - "bidi_streaming_analyze_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.dialogflow.v2beta1.Participants/BidiStreamingAnalyzeContent", - request_serializer=participant.BidiStreamingAnalyzeContentRequest.serialize, - response_deserializer=participant.BidiStreamingAnalyzeContentResponse.deserialize, + self._stubs["bidi_streaming_analyze_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.dialogflow.v2beta1.Participants/BidiStreamingAnalyzeContent", + request_serializer=participant.BidiStreamingAnalyzeContentRequest.serialize, + response_deserializer=participant.BidiStreamingAnalyzeContentResponse.deserialize, + ) ) return self._stubs["bidi_streaming_analyze_content"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc_asyncio.py index 1a1cf549ae4e..5d730ecd0bd9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,13 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from .base import DEFAULT_CLIENT_INFO, ParticipantsTransport from .grpc import ParticipantsGrpcTransport @@ -519,12 +519,12 @@ def streaming_analyze_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "streaming_analyze_content" not in self._stubs: - self._stubs[ - "streaming_analyze_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.dialogflow.v2beta1.Participants/StreamingAnalyzeContent", - request_serializer=participant.StreamingAnalyzeContentRequest.serialize, - response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + self._stubs["streaming_analyze_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.dialogflow.v2beta1.Participants/StreamingAnalyzeContent", + request_serializer=participant.StreamingAnalyzeContentRequest.serialize, + response_deserializer=participant.StreamingAnalyzeContentResponse.deserialize, + ) ) return self._stubs["streaming_analyze_content"] @@ -551,12 +551,12 @@ def bidi_streaming_analyze_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "bidi_streaming_analyze_content" not in self._stubs: - self._stubs[ - "bidi_streaming_analyze_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.dialogflow.v2beta1.Participants/BidiStreamingAnalyzeContent", - request_serializer=participant.BidiStreamingAnalyzeContentRequest.serialize, - response_deserializer=participant.BidiStreamingAnalyzeContentResponse.deserialize, + self._stubs["bidi_streaming_analyze_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.dialogflow.v2beta1.Participants/BidiStreamingAnalyzeContent", + request_serializer=participant.BidiStreamingAnalyzeContentRequest.serialize, + response_deserializer=participant.BidiStreamingAnalyzeContentResponse.deserialize, + ) ) return self._stubs["bidi_streaming_analyze_content"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest.py index a3471662568a..91e6485bb5fc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,12 +27,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseParticipantsRestTransport @@ -1161,9 +1161,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseCompileSuggestion._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseCompileSuggestion._get_http_options() request, metadata = self._interceptor.pre_compile_suggestion( request, metadata @@ -1318,9 +1316,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseCreateParticipant._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseCreateParticipant._get_http_options() request, metadata = self._interceptor.pre_create_participant( request, metadata @@ -2098,9 +2094,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseSuggestFaqAnswers._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseSuggestFaqAnswers._get_http_options() request, metadata = self._interceptor.pre_suggest_faq_answers( request, metadata @@ -2255,9 +2249,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseSuggestKnowledgeAssist._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseSuggestKnowledgeAssist._get_http_options() request, metadata = self._interceptor.pre_suggest_knowledge_assist( request, metadata @@ -2412,9 +2404,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseSuggestSmartReplies._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseSuggestSmartReplies._get_http_options() request, metadata = self._interceptor.pre_suggest_smart_replies( request, metadata @@ -2569,9 +2559,7 @@ def __call__( """ - http_options = ( - _BaseParticipantsRestTransport._BaseUpdateParticipant._get_http_options() - ) + http_options = _BaseParticipantsRestTransport._BaseUpdateParticipant._get_http_options() request, metadata = self._interceptor.pre_update_participant( request, metadata @@ -2685,7 +2673,9 @@ def bidi_streaming_analyze_content( ]: # 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._BidiStreamingAnalyzeContent(self._session, self._host, self._interceptor) # type: ignore + return self._BidiStreamingAnalyzeContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def compile_suggestion( @@ -2744,7 +2734,9 @@ def streaming_analyze_content( ]: # 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._StreamingAnalyzeContent(self._session, self._host, self._interceptor) # type: ignore + return self._StreamingAnalyzeContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def suggest_articles( @@ -2775,7 +2767,9 @@ def suggest_knowledge_assist( ]: # 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._SuggestKnowledgeAssist(self._session, self._host, self._interceptor) # type: ignore + return self._SuggestKnowledgeAssist( + self._session, self._host, self._interceptor + ) # type: ignore @property def suggest_smart_replies( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest_base.py index 99a23252d8ae..90e203b8845d 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/participants/transports/rest_base.py @@ -22,8 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from google.cloud.dialogflow_v2beta1.types import participant +from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant from .base import DEFAULT_CLIENT_INFO, ParticipantsTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/async_client.py index 023b6af2e04e..141f97c0f682 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.phone_numbers import pagers -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from .client import PhoneNumbersClient from .transports.base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport @@ -116,7 +116,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PhoneNumbersAsyncClient: The constructed client. """ - return PhoneNumbersClient.from_service_account_info.__func__(PhoneNumbersAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PhoneNumbersClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PhoneNumbersAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +133,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PhoneNumbersAsyncClient: The constructed client. """ - return PhoneNumbersClient.from_service_account_file.__func__(PhoneNumbersAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PhoneNumbersClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PhoneNumbersAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/client.py index 6e6de81a25cb..4f3b25cc49c0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.phone_numbers import pagers -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from .transports.base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport from .transports.grpc import PhoneNumbersGrpcTransport @@ -622,11 +622,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PhoneNumbersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PhoneNumbersClient._read_environment_variables() + ) self._client_cert_source = PhoneNumbersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -661,8 +659,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PhoneNumbersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/pagers.py index 27b6eec5c951..cf7a604e560f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/base.py index c7aec0f4c19f..4ba3e6038045 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -261,7 +261,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc.py index a332ad838b0b..9016bfe3cd16 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from .base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc_asyncio.py index 8032ac8a7452..ab92c6835756 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,13 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from .base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport from .grpc import PhoneNumbersGrpcTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest.py index 9d7b05cb288b..104b7d953592 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,12 +27,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BasePhoneNumbersRestTransport @@ -579,9 +579,7 @@ def __call__( """ - http_options = ( - _BasePhoneNumbersRestTransport._BaseDeletePhoneNumber._get_http_options() - ) + http_options = _BasePhoneNumbersRestTransport._BaseDeletePhoneNumber._get_http_options() request, metadata = self._interceptor.pre_delete_phone_number( request, metadata @@ -882,9 +880,7 @@ def __call__( """ - http_options = ( - _BasePhoneNumbersRestTransport._BaseUndeletePhoneNumber._get_http_options() - ) + http_options = _BasePhoneNumbersRestTransport._BaseUndeletePhoneNumber._get_http_options() request, metadata = self._interceptor.pre_undelete_phone_number( request, metadata @@ -1039,9 +1035,7 @@ def __call__( """ - http_options = ( - _BasePhoneNumbersRestTransport._BaseUpdatePhoneNumber._get_http_options() - ) + http_options = _BasePhoneNumbersRestTransport._BaseUpdatePhoneNumber._get_http_options() request, metadata = self._interceptor.pre_update_phone_number( request, metadata diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest_base.py index 50c3b1ed47f8..bcc4330901d9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/phone_numbers/transports/rest_base.py @@ -22,8 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from .base import DEFAULT_CLIENT_INFO, PhoneNumbersTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/async_client.py index fa71e13f0d17..a9c4235f024c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.session_entity_types import pagers +from google.cloud.dialogflow_v2beta1.types import entity_type, session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import entity_type -from google.cloud.dialogflow_v2beta1.types import session_entity_type from .client import SessionEntityTypesClient from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -127,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_info.__func__(SessionEntityTypesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SessionEntityTypesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SessionEntityTypesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionEntityTypesAsyncClient: The constructed client. """ - return SessionEntityTypesClient.from_service_account_file.__func__(SessionEntityTypesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SessionEntityTypesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SessionEntityTypesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +182,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SessionEntityTypesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SessionEntityTypesTransport: diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/client.py index ff91476fe5fe..22e0ff7895c6 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.session_entity_types import pagers +from google.cloud.dialogflow_v2beta1.types import entity_type, session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import entity_type -from google.cloud.dialogflow_v2beta1.types import session_entity_type from .transports.base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .transports.grpc import SessionEntityTypesGrpcTransport @@ -86,9 +85,7 @@ class SessionEntityTypesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionEntityTypesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport @@ -634,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionEntityTypesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionEntityTypesClient._read_environment_variables() + ) self._client_cert_source = SessionEntityTypesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -673,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionEntityTypesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/pagers.py index 8396ff2364c7..9bb427eea3b1 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/__init__.py index f94244b2aec5..4e711301d110 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SessionEntityTypesRestInterceptor, SessionEntityTypesRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SessionEntityTypesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SessionEntityTypesTransport]] _transport_registry["grpc"] = SessionEntityTypesGrpcTransport _transport_registry["grpc_asyncio"] = SessionEntityTypesGrpcAsyncIOTransport _transport_registry["rest"] = SessionEntityTypesRestTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/base.py index 344a89ff096c..75a0fd748891 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/base.py @@ -17,22 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version +from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import session_entity_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc.py index d67c77cf1b58..8d0565e3cdde 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc.py @@ -16,25 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport @@ -423,12 +423,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -458,12 +458,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -492,12 +492,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc_asyncio.py index 0b07737a1487..ae69d0cb8e0b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport from .grpc import SessionEntityTypesGrpcTransport @@ -431,12 +431,12 @@ def create_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_session_entity_type" not in self._stubs: - self._stubs[ - "create_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/CreateSessionEntityType", - request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["create_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/CreateSessionEntityType", + request_serializer=gcd_session_entity_type.CreateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["create_session_entity_type"] @@ -466,12 +466,12 @@ def update_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_session_entity_type" not in self._stubs: - self._stubs[ - "update_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/UpdateSessionEntityType", - request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, - response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + self._stubs["update_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/UpdateSessionEntityType", + request_serializer=gcd_session_entity_type.UpdateSessionEntityTypeRequest.serialize, + response_deserializer=gcd_session_entity_type.SessionEntityType.deserialize, + ) ) return self._stubs["update_session_entity_type"] @@ -500,12 +500,12 @@ def delete_session_entity_type( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_session_entity_type" not in self._stubs: - self._stubs[ - "delete_session_entity_type" - ] = self._logged_channel.unary_unary( - "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/DeleteSessionEntityType", - request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_session_entity_type"] = ( + self._logged_channel.unary_unary( + "/google.cloud.dialogflow.v2beta1.SessionEntityTypes/DeleteSessionEntityType", + request_serializer=session_entity_type.DeleteSessionEntityTypeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_session_entity_type"] diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest.py index 0bcedabf756e..842a883e0f0e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionEntityTypesRestTransport @@ -622,9 +622,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCreateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_create_session_entity_type( request, metadata @@ -776,9 +774,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseDeleteSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_delete_session_entity_type( request, metadata @@ -800,7 +796,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -902,9 +898,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_get_session_entity_type( request, metadata @@ -1056,9 +1050,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListSessionEntityTypes._get_http_options() request, metadata = self._interceptor.pre_list_session_entity_types( request, metadata @@ -1222,9 +1214,7 @@ def __call__( """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseUpdateSessionEntityType._get_http_options() request, metadata = self._interceptor.pre_update_session_entity_type( request, metadata @@ -1332,7 +1322,9 @@ def create_session_entity_type( ]: # 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._CreateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_session_entity_type( @@ -1342,7 +1334,9 @@ def delete_session_entity_type( ]: # 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._DeleteSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_session_entity_type( @@ -1364,7 +1358,9 @@ def list_session_entity_types( ]: # 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._ListSessionEntityTypes(self._session, self._host, self._interceptor) # type: ignore + return self._ListSessionEntityTypes( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_session_entity_type( @@ -1375,7 +1371,9 @@ def update_session_entity_type( ]: # 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._UpdateSessionEntityType(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSessionEntityType( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1435,9 +1433,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetLocation._get_transcoded_request( @@ -1576,9 +1572,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListLocations._get_transcoded_request( @@ -1714,9 +1708,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1832,9 +1824,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseGetOperation._get_transcoded_request( @@ -1973,9 +1963,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSessionEntityTypesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest_base.py index 2cbb0e3c02ad..93c0841e6377 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/session_entity_types/transports/rest_base.py @@ -17,16 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.dialogflow_v2beta1.types import session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import session_entity_type from .base import DEFAULT_CLIENT_INFO, SessionEntityTypesTransport diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/async_client.py index 6eb3d3a1fa56..486e7413d3cb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -47,12 +47,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import audio_config -from google.cloud.dialogflow_v2beta1.types import session +from google.cloud.dialogflow_v2beta1.types import audio_config, session from google.cloud.dialogflow_v2beta1.types import session as gcd_session from .client import SessionsClient @@ -129,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_info.__func__(SessionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SessionsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SessionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionsAsyncClient: The constructed client. """ - return SessionsClient.from_service_account_file.__func__(SessionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SessionsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SessionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/client.py index 18839c2d90b2..36775457ebf9 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -63,12 +63,11 @@ _LOGGER = std_logging.getLogger(__name__) +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.cloud.dialogflow_v2beta1.types import audio_config -from google.cloud.dialogflow_v2beta1.types import session +from google.cloud.dialogflow_v2beta1.types import audio_config, session from google.cloud.dialogflow_v2beta1.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, SessionsTransport @@ -731,11 +730,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionsClient._read_environment_variables() + ) self._client_cert_source = SessionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -770,8 +767,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/base.py index 0286622b9afc..82d6284c179e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import session @@ -245,7 +245,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc.py index 088e20a54699..9e2a8640f9de 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import session from google.cloud.dialogflow_v2beta1.types import session as gcd_session diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc_asyncio.py index 08beab4bea7a..ff3b959e5cdb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import session from google.cloud.dialogflow_v2beta1.types import session as gcd_session diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest.py index 3fb3de5495c5..723ff1a42cac 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sessions/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/async_client.py index 52b1f0f56362..fedae2649620 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.sip_trunks import pagers from google.cloud.dialogflow_v2beta1.types import sip_trunk @@ -114,7 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SipTrunksAsyncClient: The constructed client. """ - return SipTrunksClient.from_service_account_info.__func__(SipTrunksAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SipTrunksClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SipTrunksAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SipTrunksAsyncClient: The constructed client. """ - return SipTrunksClient.from_service_account_file.__func__(SipTrunksAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SipTrunksClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SipTrunksAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/client.py index 816e2cdad6ec..ffe0a08f18c7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.sip_trunks import pagers from google.cloud.dialogflow_v2beta1.types import sip_trunk @@ -625,11 +625,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SipTrunksClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SipTrunksClient._read_environment_variables() + ) self._client_cert_source = SipTrunksClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +662,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SipTrunksTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/pagers.py index 1d45db947a5c..99dda31e9dbe 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/base.py index 288acfade6eb..e664572b3a3b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import sip_trunk @@ -275,7 +275,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc.py index fdaa13228722..a9fd7d9dce90 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import sip_trunk from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc_asyncio.py index 783021de5e9f..0bd72a806459 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import sip_trunk from google.cloud.dialogflow_v2beta1.types import sip_trunk as gcd_sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest.py index b3e14568717e..e99bd7634371 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -774,7 +774,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest_base.py index 0523dba0e3e1..b215c29c9481 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/sip_trunks/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2beta1.types import sip_trunk diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/async_client.py index 98ed58529f14..7f66eaa008f7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.tools import pagers from google.cloud.dialogflow_v2beta1.types import tool @@ -116,7 +116,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_info.__func__(ToolsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ToolsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ToolsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +133,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ToolsAsyncClient: The constructed client. """ - return ToolsClient.from_service_account_file.__func__(ToolsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ToolsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ToolsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/client.py index d9599092b57f..b786e470c0d0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.tools import pagers from google.cloud.dialogflow_v2beta1.types import tool @@ -673,11 +673,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ToolsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ToolsClient._read_environment_variables() + ) self._client_cert_source = ToolsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -712,8 +710,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ToolsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/pagers.py index 30a5c21c1498..fc902ee2bae7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/base.py index 509f15a89ce8..f90447c40f18 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import tool @@ -267,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc.py index 9585c84b9b7c..177f1ff25270 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import tool from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc_asyncio.py index f1ef56d7cdd2..bcd55d0cf0ed 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import tool from google.cloud.dialogflow_v2beta1.types import tool as gcd_tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest.py index 4e798ec9d711..691a1a117571 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -737,7 +737,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest_base.py index 5eeca57a94e0..afee8f9bd9f2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/tools/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2beta1.types import tool diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/async_client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/async_client.py index 2c6834e8cce7..5b78568893b4 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/async_client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.versions import pagers from google.cloud.dialogflow_v2beta1.types import version @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_info.__func__(VersionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = VersionsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(VersionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: VersionsAsyncClient: The constructed client. """ - return VersionsClient.from_service_account_file.__func__(VersionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = VersionsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(VersionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/client.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/client.py index b0bd7dea935c..95a3888be47e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/client.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dialogflow_v2beta1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.versions import pagers from google.cloud.dialogflow_v2beta1.types import version @@ -623,11 +623,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VersionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VersionsClient._read_environment_variables() + ) self._client_cert_source = VersionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -662,8 +660,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VersionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/pagers.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/pagers.py index 15195df0c5e5..152ed39ca5b2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/pagers.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/base.py index b81c6ff69a32..274d7d9ee4ec 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dialogflow_v2beta1 import gapic_version as package_version from google.cloud.dialogflow_v2beta1.types import version @@ -272,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc.py index c0bfb707fbe1..049b4800c80b 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import version from google.cloud.dialogflow_v2beta1.types import version as gcd_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc_asyncio.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc_asyncio.py index 3a7af98d222d..7ed4750c345c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import version from google.cloud.dialogflow_v2beta1.types import version as gcd_version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest.py index 484fe24a8ca6..941d499f1a5c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,8 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -775,7 +775,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest_base.py index c77e223cfc12..e7aa10a1a88f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/services/versions/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dialogflow_v2beta1.types import version diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/__init__.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/__init__.py index a8e1f9c6de33..9c9969e82f7f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/__init__.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/__init__.py @@ -28,7 +28,9 @@ SubAgent, TrainAgentRequest, ) -from .agent_coaching_instruction import AgentCoachingInstruction +from .agent_coaching_instruction import ( + AgentCoachingInstruction, +) from .answer_record import ( AgentAssistantFeedback, AgentAssistantRecord, @@ -92,7 +94,9 @@ SuggestConversationSummaryRequest, SuggestConversationSummaryResponse, ) -from .conversation_event import ConversationEvent +from .conversation_event import ( + ConversationEvent, +) from .conversation_profile import ( AutomatedAgentConfig, ClearSuggestionFeatureConfigOperationMetadata, @@ -161,8 +165,16 @@ TextToSpeechSettings, UpdateEnvironmentRequest, ) -from .fulfillment import Fulfillment, GetFulfillmentRequest, UpdateFulfillmentRequest -from .gcs import GcsDestination, GcsSource, GcsSources +from .fulfillment import ( + Fulfillment, + GetFulfillmentRequest, + UpdateFulfillmentRequest, +) +from .gcs import ( + GcsDestination, + GcsSource, + GcsSources, +) from .generator import ( AgentCoachingContext, AgentCoachingSuggestion, @@ -199,7 +211,9 @@ ListGeneratorEvaluationsResponse, SummarizationEvaluationMetrics, ) -from .human_agent_assistant_event import HumanAgentAssistantEvent +from .human_agent_assistant_event import ( + HumanAgentAssistantEvent, +) from .intent import ( BatchDeleteIntentsRequest, BatchUpdateIntentsRequest, @@ -223,7 +237,9 @@ ListKnowledgeBasesResponse, UpdateKnowledgeBaseRequest, ) -from .operations import GeneratorEvaluationOperationMetadata +from .operations import ( + GeneratorEvaluationOperationMetadata, +) from .participant import ( AnalyzeContentRequest, AnalyzeContentResponse, @@ -326,8 +342,14 @@ Tool, UpdateToolRequest, ) -from .tool_call import ToolCall, ToolCallResult -from .validation_result import ValidationError, ValidationResult +from .tool_call import ( + ToolCall, + ToolCallResult, +) +from .validation_result import ( + ValidationError, + ValidationResult, +) from .version import ( CreateVersionRequest, DeleteVersionRequest, @@ -337,7 +359,11 @@ UpdateVersionRequest, Version, ) -from .webhook import OriginalDetectIntentRequest, WebhookRequest, WebhookResponse +from .webhook import ( + OriginalDetectIntentRequest, + WebhookRequest, + WebhookResponse, +) __all__ = ( "Agent", diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent.py index c31531bd8255..1d1093297ada 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -128,6 +128,7 @@ class MatchMode(proto.Enum): examples in intents, especially the ones using @sys.any or very large custom entities. """ + MATCH_MODE_UNSPECIFIED = 0 MATCH_MODE_HYBRID = 1 MATCH_MODE_ML_ONLY = 2 @@ -145,6 +146,7 @@ class ApiVersion(proto.Enum): API_VERSION_V2_BETA_1 (3): V2beta1 API. """ + API_VERSION_UNSPECIFIED = 0 API_VERSION_V1 = 1 API_VERSION_V2 = 2 @@ -167,6 +169,7 @@ class Tier(proto.Enum): Essentials Edition (same as TIER_ENTERPRISE), previously known as Enterprise Plus Edition. """ + TIER_UNSPECIFIED = 0 TIER_STANDARD = 1 TIER_ENTERPRISE = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent_coaching_instruction.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent_coaching_instruction.py index 40969c30cac5..68db32dbf57c 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent_coaching_instruction.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/agent_coaching_instruction.py @@ -80,6 +80,7 @@ class TriggerEvent(proto.Enum): TOOL_CALL_COMPLETION (5): Triggers on tool call completion. """ + TRIGGER_EVENT_UNSPECIFIED = 0 END_OF_UTTERANCE = 1 MANUAL_CALL = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/answer_record.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/answer_record.py index 3debb5fdaa6b..dfc759114ade 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/answer_record.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/answer_record.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import generator, participant @@ -205,6 +205,7 @@ class CorrectnessLevel(proto.Enum): FULLY_CORRECT (3): Answer is fully correct. """ + CORRECTNESS_LEVEL_UNSPECIFIED = 0 NOT_CORRECT = 1 PARTIALLY_CORRECT = 2 @@ -294,6 +295,7 @@ class AnswerRelevance(proto.Enum): RELEVANT (2): Answer is relevant to query. """ + ANSWER_RELEVANCE_UNSPECIFIED = 0 IRRELEVANT = 1 RELEVANT = 2 @@ -309,6 +311,7 @@ class DocumentCorrectness(proto.Enum): CORRECT (2): Information in document is correct. """ + DOCUMENT_CORRECTNESS_UNSPECIFIED = 0 INCORRECT = 1 CORRECT = 2 @@ -324,6 +327,7 @@ class DocumentEfficiency(proto.Enum): EFFICIENT (2): Document is efficient. """ + DOCUMENT_EFFICIENCY_UNSPECIFIED = 0 INEFFICIENT = 1 EFFICIENT = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/audio_config.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/audio_config.py index 4a8d7eb78a58..df82fee676b0 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/audio_config.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/audio_config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -84,6 +84,7 @@ class TelephonyDtmf(proto.Enum): Pound/diamond/hash/square/gate/octothorpe: '#'. """ + TELEPHONY_DTMF_UNSPECIFIED = 0 DTMF_ONE = 1 DTMF_TWO = 2 @@ -156,6 +157,7 @@ class AudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + AUDIO_ENCODING_UNSPECIFIED = 0 AUDIO_ENCODING_LINEAR_16 = 1 AUDIO_ENCODING_FLAC = 2 @@ -213,6 +215,7 @@ class SpeechModelVariant(proto.Enum): docs `__ for how to make your project eligible. """ + SPEECH_MODEL_VARIANT_UNSPECIFIED = 0 USE_BEST_AVAILABLE = 1 USE_STANDARD = 2 @@ -235,6 +238,7 @@ class SsmlVoiceGender(proto.Enum): SSML_VOICE_GENDER_NEUTRAL (3): A gender-neutral voice. """ + SSML_VOICE_GENDER_UNSPECIFIED = 0 SSML_VOICE_GENDER_MALE = 1 SSML_VOICE_GENDER_FEMALE = 2 @@ -269,6 +273,7 @@ class OutputAudioEncoding(proto.Enum): 8-bit samples that compand 13-bit audio samples using G.711 PCMU/a-law. """ + OUTPUT_AUDIO_ENCODING_UNSPECIFIED = 0 OUTPUT_AUDIO_ENCODING_LINEAR_16 = 1 OUTPUT_AUDIO_ENCODING_MP3 = 2 @@ -725,6 +730,7 @@ class PhoneticEncoding(proto.Enum): X-SAMPA, such as apple -> "{p@l". https://en.wikipedia.org/wiki/X-SAMPA """ + PHONETIC_ENCODING_UNSPECIFIED = 0 PHONETIC_ENCODING_IPA = 1 PHONETIC_ENCODING_X_SAMPA = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/context.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/context.py index 95cd3c780234..a8704308d078 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/context.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/context.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation.py index d000e760fabd..732f0e10aa84 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import ( @@ -125,6 +125,7 @@ class LifecycleState(proto.Enum): COMPLETED (2): Conversation has been completed. """ + LIFECYCLE_STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 @@ -145,6 +146,7 @@ class ConversationStage(proto.Enum): The conversation should not provide responses, just listen and provide suggestions. """ + CONVERSATION_STAGE_UNSPECIFIED = 0 VIRTUAL_AGENT_STAGE = 1 HUMAN_ASSIST_STAGE = 2 @@ -263,6 +265,7 @@ class UpdateMode(proto.Enum): Context content updates are applied in overwrite mode. """ + UPDATE_MODE_UNSPECIFIED = 0 APPEND = 1 OVERWRITE = 2 @@ -298,6 +301,7 @@ class ContentFormat(proto.Enum): PLAIN_TEXT (2): Content was provided as plain text. """ + CONTENT_FORMAT_UNSPECIFIED = 0 JSON = 1 PLAIN_TEXT = 2 @@ -729,13 +733,13 @@ class IngestContextReferencesRequest(proto.Message): proto.STRING, number=1, ) - context_references: MutableMapping[ - str, "Conversation.ContextReference" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=2, - message="Conversation.ContextReference", + context_references: MutableMapping[str, "Conversation.ContextReference"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=2, + message="Conversation.ContextReference", + ) ) @@ -1087,13 +1091,13 @@ class GenerateStatelessSuggestionRequest(proto.Message): number=3, oneof="generator_resource", ) - context_references: MutableMapping[ - str, "Conversation.ContextReference" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=4, - message="Conversation.ContextReference", + context_references: MutableMapping[str, "Conversation.ContextReference"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=4, + message="Conversation.ContextReference", + ) ) conversation_context: gcd_generator.ConversationContext = proto.Field( proto.MESSAGE, @@ -1207,6 +1211,7 @@ class QuerySource(proto.Enum): The query is a suggested query from [Participants.SuggestKnowledgeAssist][google.cloud.dialogflow.v2beta1.Participants.SuggestKnowledgeAssist]. """ + QUERY_SOURCE_UNSPECIFIED = 0 AGENT_QUERY = 1 SUGGESTED_QUERY = 2 @@ -1352,6 +1357,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. E.g. ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -1368,6 +1374,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -1595,6 +1602,7 @@ class AnswerType(proto.Enum): INTENT (3): The answer is from intent matching. """ + ANSWER_TYPE_UNSPECIFIED = 0 FAQ = 1 GENERATIVE = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_event.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_event.py index 4cf6b292dda5..971c004bfff2 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_event.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_event.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import participant, session @@ -105,6 +105,7 @@ class Type(proto.Enum): or, - when we can recover from an error. """ + TYPE_UNSPECIFIED = 0 CONVERSATION_STARTED = 1 CONVERSATION_FINISHED = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_profile.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_profile.py index d4a2ec7c63d7..45e5ef265ef5 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_profile.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/conversation_profile.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import audio_config, generator, participant @@ -701,6 +701,7 @@ class SectionType(proto.Enum): amount, etc. Section names are prefixed by "entities/". """ + SECTION_TYPE_UNSPECIFIED = 0 SITUATION = 1 ACTION = 2 @@ -1007,6 +1008,7 @@ class MessageFormat(proto.Enum): JSON (2): Pub/Sub message will be json. """ + MESSAGE_FORMAT_UNSPECIFIED = 0 PROTO = 1 JSON = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/document.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/document.py index ace0a4169bac..6a28cb7e5f68 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/document.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/document.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import gcs @@ -165,6 +165,7 @@ class KnowledgeType(proto.Enum): The legacy enum for agent-facing smart reply feature. """ + _pb_options = {"allow_alias": True} KNOWLEDGE_TYPE_UNSPECIFIED = 0 FAQ = 1 @@ -190,6 +191,7 @@ class State(proto.Enum): DELETING (5): The document deletion is in progress. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -605,6 +607,7 @@ class State(proto.Enum): The operation is done, either cancelled or completed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/entity_type.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/entity_type.py index e04206bee9a4..205055e7c50a 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/entity_type.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/entity_type.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -100,6 +100,7 @@ class Kind(proto.Enum): Regexp entity types allow to specify regular expressions in entries values. """ + KIND_UNSPECIFIED = 0 KIND_MAP = 1 KIND_LIST = 2 @@ -118,6 +119,7 @@ class AutoExpansionMode(proto.Enum): Allows an agent to recognize values that have not been explicitly listed in the entity. """ + AUTO_EXPANSION_MODE_UNSPECIFIED = 0 AUTO_EXPANSION_MODE_DEFAULT = 1 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/environment.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/environment.py index d619b7f5eaaa..c545a9d12b48 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/environment.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/environment.py @@ -17,12 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import audio_config +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment __protobuf__ = proto.module( package="google.cloud.dialogflow.v2beta1", @@ -114,6 +114,7 @@ class State(proto.Enum): RUNNING (3): Running. """ + STATE_UNSPECIFIED = 0 STOPPED = 1 LOADING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/fulfillment.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/fulfillment.py index a6521f984184..972caf32aff7 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/fulfillment.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/fulfillment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -140,6 +140,7 @@ class Type(proto.Enum): SMALLTALK (1): Fulfillment is enabled for SmallTalk. """ + TYPE_UNSPECIFIED = 0 SMALLTALK = 1 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator.py index 0df7fc0c405c..19f64aa8dc7e 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import agent_coaching_instruction @@ -73,6 +73,7 @@ class TriggerEvent(proto.Enum): AGENT_MESSAGE (4): Triggers after each agent message only. """ + TRIGGER_EVENT_UNSPECIFIED = 0 END_OF_UTTERANCE = 1 MANUAL_CALL = 2 @@ -263,6 +264,7 @@ class Role(proto.Enum): Participant is an end user that has called or chatted with Dialogflow services. """ + ROLE_UNSPECIFIED = 0 HUMAN_AGENT = 1 AUTOMATED_AGENT = 2 @@ -312,12 +314,12 @@ class SummarizationSectionList(proto.Message): Optional. Summarization sections. """ - summarization_sections: MutableSequence[ - "SummarizationSection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SummarizationSection", + summarization_sections: MutableSequence["SummarizationSection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SummarizationSection", + ) ) @@ -532,6 +534,7 @@ class Type(proto.Enum): type is only available if type ACTION is not selected. """ + TYPE_UNSPECIFIED = 0 SITUATION = 1 ACTION = 2 @@ -578,12 +581,12 @@ class SummarizationContext(proto.Message): empty. Supported 2.0 and later versions. """ - summarization_sections: MutableSequence[ - "SummarizationSection" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SummarizationSection", + summarization_sections: MutableSequence["SummarizationSection"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SummarizationSection", + ) ) few_shot_examples: MutableSequence["FewShotExample"] = proto.RepeatedField( proto.MESSAGE, @@ -934,12 +937,12 @@ class SampleResponse(proto.Message): number=1, message=agent_coaching_instruction.AgentCoachingInstruction, ) - agent_action_suggestions: MutableSequence[ - AgentActionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=AgentActionSuggestion, + agent_action_suggestions: MutableSequence[AgentActionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=AgentActionSuggestion, + ) ) sample_responses: MutableSequence[SampleResponse] = proto.RepeatedField( proto.MESSAGE, @@ -1078,6 +1081,7 @@ class RaiCategory(proto.Enum): HATE_SPEECH (4): Hate speech content. """ + RAI_CATEGORY_UNSPECIFIED = 0 DANGEROUS_CONTENT = 1 SEXUALLY_EXPLICIT = 2 @@ -1104,6 +1108,7 @@ class SensitivityLevel(proto.Enum): BLOCK_NONE (4): No filtering for this category. """ + SENSITIVITY_LEVEL_UNSPECIFIED = 0 BLOCK_MOST = 1 BLOCK_SOME = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator_evaluation.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator_evaluation.py index e91e99dacb33..50bf84d09459 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator_evaluation.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/generator_evaluation.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import generator @@ -717,12 +717,12 @@ class SectionDetail(proto.Message): message="SummarizationEvaluationMetrics.SectionToken", ) - summarization_evaluation_results: MutableSequence[ - SummarizationEvaluationResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=SummarizationEvaluationResult, + summarization_evaluation_results: MutableSequence[SummarizationEvaluationResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=SummarizationEvaluationResult, + ) ) summarization_evaluation_merged_results_uri: str = proto.Field( proto.STRING, @@ -781,6 +781,7 @@ class InputDataSourceType(proto.Enum): chosen, input_data_config.start_time and input_data_config.end_timestamp must be provided. """ + INPUT_DATA_SOURCE_TYPE_UNSPECIFIED = 0 AGENT_ASSIST_CONVERSATIONS = 1 INSIGHTS_CONVERSATIONS = 2 @@ -886,6 +887,7 @@ class SummaryGenerationOption(proto.Enum): Do not generate new summaries. Only use existing summaries found. """ + SUMMARY_GENERATION_OPTION_UNSPECIFIED = 0 ALWAYS_GENERATE = 1 GENERATE_IF_MISSING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/human_agent_assistant_event.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/human_agent_assistant_event.py index 6522fe287b12..f5308721fe04 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/human_agent_assistant_event.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/human_agent_assistant_event.py @@ -62,12 +62,12 @@ class HumanAgentAssistantEvent(proto.Message): proto.STRING, number=3, ) - suggestion_results: MutableSequence[ - gcd_participant.SuggestionResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gcd_participant.SuggestionResult, + suggestion_results: MutableSequence[gcd_participant.SuggestionResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gcd_participant.SuggestionResult, + ) ) diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/intent.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/intent.py index 0d39d6efc4b6..89b5f629fadf 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/intent.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/intent.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import context @@ -55,6 +55,7 @@ class IntentView(proto.Enum): INTENT_VIEW_FULL (1): All fields are populated. """ + INTENT_VIEW_UNSPECIFIED = 0 INTENT_VIEW_FULL = 1 @@ -209,6 +210,7 @@ class WebhookState(proto.Enum): intent. Also, each slot filling prompt is forwarded to the webhook. """ + WEBHOOK_STATE_UNSPECIFIED = 0 WEBHOOK_STATE_ENABLED = 1 WEBHOOK_STATE_ENABLED_FOR_SLOT_FILLING = 2 @@ -275,6 +277,7 @@ class Type(proto.Enum): mode, they will be removed during training and it can cause a drop in agent performance. """ + TYPE_UNSPECIFIED = 0 EXAMPLE = 1 TEMPLATE = 2 @@ -546,6 +549,7 @@ class Platform(proto.Enum): GOOGLE_HANGOUTS (11): Google Hangouts. """ + PLATFORM_UNSPECIFIED = 0 FACEBOOK = 1 SLACK = 2 @@ -660,12 +664,12 @@ class Button(proto.Message): proto.STRING, number=3, ) - buttons: MutableSequence[ - "Intent.Message.Card.Button" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Intent.Message.Card.Button", + buttons: MutableSequence["Intent.Message.Card.Button"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Intent.Message.Card.Button", + ) ) class SimpleResponse(proto.Message): @@ -707,12 +711,12 @@ class SimpleResponses(proto.Message): Required. The list of simple responses. """ - simple_responses: MutableSequence[ - "Intent.Message.SimpleResponse" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.SimpleResponse", + simple_responses: MutableSequence["Intent.Message.SimpleResponse"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.SimpleResponse", + ) ) class BasicCard(proto.Message): @@ -785,12 +789,12 @@ class OpenUriAction(proto.Message): number=4, message="Intent.Message.Image", ) - buttons: MutableSequence[ - "Intent.Message.BasicCard.Button" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="Intent.Message.BasicCard.Button", + buttons: MutableSequence["Intent.Message.BasicCard.Button"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="Intent.Message.BasicCard.Button", + ) ) class Suggestion(proto.Message): @@ -816,12 +820,12 @@ class Suggestions(proto.Message): Required. The list of suggested replies. """ - suggestions: MutableSequence[ - "Intent.Message.Suggestion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.Suggestion", + suggestions: MutableSequence["Intent.Message.Suggestion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.Suggestion", + ) ) class LinkOutSuggestion(proto.Message): @@ -896,12 +900,12 @@ class Item(proto.Message): proto.STRING, number=1, ) - items: MutableSequence[ - "Intent.Message.ListSelect.Item" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Intent.Message.ListSelect.Item", + items: MutableSequence["Intent.Message.ListSelect.Item"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Intent.Message.ListSelect.Item", + ) ) subtitle: str = proto.Field( proto.STRING, @@ -950,12 +954,12 @@ class Item(proto.Message): message="Intent.Message.Image", ) - items: MutableSequence[ - "Intent.Message.CarouselSelect.Item" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.CarouselSelect.Item", + items: MutableSequence["Intent.Message.CarouselSelect.Item"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.CarouselSelect.Item", + ) ) class SelectItemInfo(proto.Message): @@ -1079,12 +1083,12 @@ class RbmText(proto.Message): proto.STRING, number=1, ) - rbm_suggestion: MutableSequence[ - "Intent.Message.RbmSuggestion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Intent.Message.RbmSuggestion", + rbm_suggestion: MutableSequence["Intent.Message.RbmSuggestion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Intent.Message.RbmSuggestion", + ) ) class RbmCarouselCard(proto.Message): @@ -1119,6 +1123,7 @@ class CardWidth(proto.Enum): MEDIUM (2): 232 DP. """ + CARD_WIDTH_UNSPECIFIED = 0 SMALL = 1 MEDIUM = 2 @@ -1128,12 +1133,12 @@ class CardWidth(proto.Enum): number=1, enum="Intent.Message.RbmCarouselCard.CardWidth", ) - card_contents: MutableSequence[ - "Intent.Message.RbmCardContent" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Intent.Message.RbmCardContent", + card_contents: MutableSequence["Intent.Message.RbmCardContent"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Intent.Message.RbmCardContent", + ) ) class RbmStandaloneCard(proto.Message): @@ -1168,6 +1173,7 @@ class CardOrientation(proto.Enum): VERTICAL (2): Vertical layout. """ + CARD_ORIENTATION_UNSPECIFIED = 0 HORIZONTAL = 1 VERTICAL = 2 @@ -1184,6 +1190,7 @@ class ThumbnailImageAlignment(proto.Enum): RIGHT (2): Thumbnail preview is right-aligned. """ + THUMBNAIL_IMAGE_ALIGNMENT_UNSPECIFIED = 0 LEFT = 1 RIGHT = 2 @@ -1287,6 +1294,7 @@ class Height(proto.Enum): 264 DP. Not available for rich card carousels when the card width is set to small. """ + HEIGHT_UNSPECIFIED = 0 SHORT = 1 MEDIUM = 2 @@ -1319,12 +1327,12 @@ class Height(proto.Enum): number=3, message="Intent.Message.RbmCardContent.RbmMedia", ) - suggestions: MutableSequence[ - "Intent.Message.RbmSuggestion" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Intent.Message.RbmSuggestion", + suggestions: MutableSequence["Intent.Message.RbmSuggestion"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Intent.Message.RbmSuggestion", + ) ) class RbmSuggestion(proto.Message): @@ -1515,6 +1523,7 @@ class ResponseMediaType(proto.Enum): AUDIO (1): Response media type is audio. """ + RESPONSE_MEDIA_TYPE_UNSPECIFIED = 0 AUDIO = 1 @@ -1629,6 +1638,7 @@ class ImageDisplayOptions(proto.Enum): Pad the gaps between image and image frame with a blurred copy of the same image. """ + IMAGE_DISPLAY_OPTIONS_UNSPECIFIED = 0 GRAY = 1 WHITE = 2 @@ -1680,6 +1690,7 @@ class UrlTypeHint(proto.Enum): to a canonical URL which refers to AMP content via . """ + URL_TYPE_HINT_UNSPECIFIED = 0 AMP_ACTION = 1 AMP_CONTENT = 2 @@ -1763,24 +1774,24 @@ class TableCard(proto.Message): number=3, message="Intent.Message.Image", ) - column_properties: MutableSequence[ - "Intent.Message.ColumnProperties" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Intent.Message.ColumnProperties", + column_properties: MutableSequence["Intent.Message.ColumnProperties"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Intent.Message.ColumnProperties", + ) ) rows: MutableSequence["Intent.Message.TableCardRow"] = proto.RepeatedField( proto.MESSAGE, number=5, message="Intent.Message.TableCardRow", ) - buttons: MutableSequence[ - "Intent.Message.BasicCard.Button" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="Intent.Message.BasicCard.Button", + buttons: MutableSequence["Intent.Message.BasicCard.Button"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="Intent.Message.BasicCard.Button", + ) ) class ColumnProperties(proto.Message): @@ -1811,6 +1822,7 @@ class HorizontalAlignment(proto.Enum): Text is aligned to the trailing edge of the column. """ + HORIZONTAL_ALIGNMENT_UNSPECIFIED = 0 LEADING = 1 CENTER = 2 @@ -1839,12 +1851,12 @@ class TableCardRow(proto.Message): after this row. """ - cells: MutableSequence[ - "Intent.Message.TableCardCell" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Intent.Message.TableCardCell", + cells: MutableSequence["Intent.Message.TableCardCell"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Intent.Message.TableCardCell", + ) ) divider_after: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/knowledge_base.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/knowledge_base.py index dee852232968..7e431ef055ce 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/knowledge_base.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/knowledge_base.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/participant.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/participant.py index 33029e6f720f..7df91a72e1f8 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/participant.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/participant.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import audio_config as gcd_audio_config @@ -180,6 +180,7 @@ class Role(proto.Enum): Participant is an end user that has called or chatted with Dialogflow services. """ + ROLE_UNSPECIFIED = 0 HUMAN_AGENT = 1 AUTOMATED_AGENT = 2 @@ -205,6 +206,7 @@ class AgentDesktopSource(proto.Enum): either not currently released or setting this field to the applicable desktop. """ + AGENT_DESKTOP_SOURCE_UNSPECIFIED = 0 LIVE_PERSON = 1 GENESYS_CLOUD = 2 @@ -572,6 +574,7 @@ class AutomatedAgentReplyType(proto.Enum): FINAL (2): Final reply. """ + AUTOMATED_AGENT_REPLY_TYPE_UNSPECIFIED = 0 PARTIAL = 1 FINAL = 2 @@ -679,6 +682,7 @@ class Action(proto.Enum): This action is intended for tool calls that may write data. """ + ACTION_UNSPECIFIED = 0 CANCEL = 1 REVISE = 2 @@ -779,6 +783,7 @@ class Type(proto.Enum): Run knowledge assist with automatic query generation. """ + TYPE_UNSPECIFIED = 0 ARTICLE_SUGGESTION = 1 FAQ = 2 @@ -1087,19 +1092,19 @@ class AnalyzeContentResponse(proto.Message): number=5, message="Message", ) - human_agent_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="SuggestionResult", + human_agent_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="SuggestionResult", + ) ) - end_user_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="SuggestionResult", + end_user_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="SuggestionResult", + ) ) dtmf_parameters: "DtmfParameters" = proto.Field( proto.MESSAGE, @@ -1478,19 +1483,19 @@ class StreamingAnalyzeContentResponse(proto.Message): number=6, message="Message", ) - human_agent_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="SuggestionResult", + human_agent_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="SuggestionResult", + ) ) - end_user_suggestion_results: MutableSequence[ - "SuggestionResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="SuggestionResult", + end_user_suggestion_results: MutableSequence["SuggestionResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="SuggestionResult", + ) ) dtmf_parameters: "DtmfParameters" = proto.Field( proto.MESSAGE, @@ -2195,12 +2200,12 @@ class GeneratorSuggestionAnswer(proto.Message): number=3, ) - generator_suggestion_answers: MutableSequence[ - GeneratorSuggestionAnswer - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=GeneratorSuggestionAnswer, + generator_suggestion_answers: MutableSequence[GeneratorSuggestionAnswer] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=GeneratorSuggestionAnswer, + ) ) latest_message: str = proto.Field( proto.STRING, @@ -2232,12 +2237,12 @@ class SuggestDialogflowAssistsResponse(proto.Message): the conversation. """ - dialogflow_assist_answers: MutableSequence[ - "DialogflowAssistAnswer" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="DialogflowAssistAnswer", + dialogflow_assist_answers: MutableSequence["DialogflowAssistAnswer"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="DialogflowAssistAnswer", + ) ) latest_message: str = proto.Field( proto.STRING, @@ -2692,12 +2697,12 @@ class Segment(proto.Message): number=3, ) - segments: MutableSequence[ - "ResponseMessage.MixedAudio.Segment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ResponseMessage.MixedAudio.Segment", + segments: MutableSequence["ResponseMessage.MixedAudio.Segment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ResponseMessage.MixedAudio.Segment", + ) ) class TelephonyTransferCall(proto.Message): diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/phone_number.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/phone_number.py index 4965f78d683b..debe4c0bfabd 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/phone_number.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/phone_number.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -80,6 +80,7 @@ class LifecycleState(proto.Enum): Number is pending deletion, and cannot receive calls. """ + LIFECYCLE_STATE_UNSPECIFIED = 0 ACTIVE = 1 DELETE_REQUESTED = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session.py index 92b40c5acb82..630e575ebecc 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session.py @@ -17,18 +17,16 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore import proto # type: ignore +from google.cloud.dialogflow_v2beta1.types import agent, context, session_entity_type from google.cloud.dialogflow_v2beta1.types import audio_config as gcd_audio_config -from google.cloud.dialogflow_v2beta1.types import agent -from google.cloud.dialogflow_v2beta1.types import context from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent -from google.cloud.dialogflow_v2beta1.types import session_entity_type __protobuf__ = proto.module( package="google.cloud.dialogflow.v2beta1", @@ -305,12 +303,12 @@ class QueryParameters(proto.Message): proto.BOOL, number=4, ) - session_entity_types: MutableSequence[ - session_entity_type.SessionEntityType - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=session_entity_type.SessionEntityType, + session_entity_types: MutableSequence[session_entity_type.SessionEntityType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=session_entity_type.SessionEntityType, + ) ) payload: struct_pb2.Struct = proto.Field( proto.MESSAGE, @@ -561,12 +559,12 @@ class QueryResult(proto.Message): proto.STRING, number=6, ) - fulfillment_messages: MutableSequence[ - gcd_intent.Intent.Message - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gcd_intent.Intent.Message, + fulfillment_messages: MutableSequence[gcd_intent.Intent.Message] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gcd_intent.Intent.Message, + ) ) webhook_source: str = proto.Field( proto.STRING, @@ -664,6 +662,7 @@ class MatchConfidenceLevel(proto.Enum): HIGH (3): Indicates our confidence is high. """ + MATCH_CONFIDENCE_LEVEL_UNSPECIFIED = 0 LOW = 1 MEDIUM = 2 @@ -932,19 +931,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=5, ) - speech_partial_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=duration_pb2.Duration, + speech_partial_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=duration_pb2.Duration, + ) ) - speech_final_results_end_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=duration_pb2.Duration, + speech_final_results_end_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=duration_pb2.Duration, + ) ) partial_responses: int = proto.Field( proto.INT32, @@ -962,19 +961,19 @@ class CloudConversationDebuggingInfo(proto.Message): proto.BOOL, number=11, ) - dtmf_partial_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message=duration_pb2.Duration, + dtmf_partial_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message=duration_pb2.Duration, + ) ) - dtmf_final_results_times: MutableSequence[ - duration_pb2.Duration - ] = proto.RepeatedField( - proto.MESSAGE, - number=13, - message=duration_pb2.Duration, + dtmf_final_results_times: MutableSequence[duration_pb2.Duration] = ( + proto.RepeatedField( + proto.MESSAGE, + number=13, + message=duration_pb2.Duration, + ) ) single_utterance_end_time_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -1231,6 +1230,7 @@ class MessageType(proto.Enum): be sent with DTMF digits collected up to the time of sending, which represents an intermediate result. """ + MESSAGE_TYPE_UNSPECIFIED = 0 TRANSCRIPT = 1 END_OF_SINGLE_UTTERANCE = 2 @@ -1258,12 +1258,12 @@ class MessageType(proto.Enum): proto.FLOAT, number=6, ) - speech_word_info: MutableSequence[ - gcd_audio_config.SpeechWordInfo - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message=gcd_audio_config.SpeechWordInfo, + speech_word_info: MutableSequence[gcd_audio_config.SpeechWordInfo] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message=gcd_audio_config.SpeechWordInfo, + ) ) speech_end_offset: duration_pb2.Duration = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session_entity_type.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session_entity_type.py index 74c91f5d7acd..b129f4ace312 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session_entity_type.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/session_entity_type.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.dialogflow_v2beta1.types import entity_type @@ -97,6 +97,7 @@ class EntityOverrideMode(proto.Enum): [EntityTypes.GetEntityType][google.cloud.dialogflow.v2beta1.EntityTypes.GetEntityType] on the custom entity type and merge. """ + ENTITY_OVERRIDE_MODE_UNSPECIFIED = 0 ENTITY_OVERRIDE_MODE_OVERRIDE = 1 ENTITY_OVERRIDE_MODE_SUPPLEMENT = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/sip_trunk.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/sip_trunk.py index b1310c457f50..5b4dea259f02 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/sip_trunk.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/sip_trunk.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -253,6 +253,7 @@ class State(proto.Enum): KEEPALIVE (4): SIP Trunk connection is keepalive. """ + STATE_UNSPECIFIED = 0 CONNECTED = 1 DISCONNECTED = 2 @@ -284,6 +285,7 @@ class CertificateState(proto.Enum): CERTIFICATE_QUOTA_EXCEEDED (8): Certificate has exhausted its quota. """ + CERTIFICATE_STATE_UNSPECIFIED = 0 CERTIFICATE_VALID = 1 CERTIFICATE_INVALID = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool.py index 28648e4ed075..33d273048f26 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -270,6 +270,7 @@ class ConfirmationRequirement(proto.Enum): NOT_REQUIRED (2): Conformation is not required. """ + CONFIRMATION_REQUIREMENT_UNSPECIFIED = 0 REQUIRED = 1 NOT_REQUIRED = 2 @@ -291,6 +292,7 @@ class MethodType(proto.Enum): PATCH (5): PATCH method. """ + METHOD_TYPE_UNSPECIFIED = 0 GET = 1 POST = 2 @@ -467,6 +469,7 @@ class OperationType(proto.Enum): DELETE (5): Delete operation. """ + OPERATION_TYPE_UNSPECIFIED = 0 LIST = 1 GET = 2 @@ -558,6 +561,7 @@ class RequestLocation(proto.Enum): QUERY_STRING (2): Represents the key in query string. """ + REQUEST_LOCATION_UNSPECIFIED = 0 HEADER = 1 QUERY_STRING = 2 @@ -638,6 +642,7 @@ class OauthGrantType(proto.Enum): Represents the `client credential flow `__. """ + OAUTH_GRANT_TYPE_UNSPECIFIED = 0 CLIENT_CREDENTIAL = 1 @@ -701,6 +706,7 @@ class ServiceAgentAuth(proto.Enum): other Google Cloud APIs after you grant required roles to ``service-@gcp-sa-dialogflow.iam.gserviceaccount.com``. """ + SERVICE_AGENT_AUTH_UNSPECIFIED = 0 ID_TOKEN = 1 ACCESS_TOKEN = 2 @@ -847,13 +853,13 @@ class ServiceDirectoryConfig(proto.Message): proto.STRING, number=3, ) - action_confirmation_requirement: MutableMapping[ - str, ConfirmationRequirement - ] = proto.MapField( - proto.STRING, - proto.ENUM, - number=17, - enum=ConfirmationRequirement, + action_confirmation_requirement: MutableMapping[str, ConfirmationRequirement] = ( + proto.MapField( + proto.STRING, + proto.ENUM, + number=17, + enum=ConfirmationRequirement, + ) ) extension_spec: ExtensionTool = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool_call.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool_call.py index 79d54ee9cbac..c93222d4f7eb 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool_call.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/tool_call.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -76,6 +76,7 @@ class State(proto.Enum): The tool call requires confirmation from a human. """ + STATE_UNSPECIFIED = 0 TRIGGERED = 1 NEEDS_CONFIRMATION = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/validation_result.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/validation_result.py index 288de6ac6ff7..3e945f490d9f 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/validation_result.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/validation_result.py @@ -70,6 +70,7 @@ class Severity(proto.Enum): CRITICAL (4): The agent may completely fail. """ + SEVERITY_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/version.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/version.py index dbee4c29e7e0..be96494bca60 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/version.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/version.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -94,6 +94,7 @@ class VersionStatus(proto.Enum): FAILED (3): Version training failed. """ + VERSION_STATUS_UNSPECIFIED = 0 IN_PROGRESS = 1 READY = 2 diff --git a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/webhook.py b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/webhook.py index 0a4bcc851f4c..8b10168d6c92 100644 --- a/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/webhook.py +++ b/packages/google-cloud-dialogflow/google/cloud/dialogflow_v2beta1/types/webhook.py @@ -17,12 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.dialogflow_v2beta1.types import context, intent +from google.cloud.dialogflow_v2beta1.types import context, intent, session_entity_type from google.cloud.dialogflow_v2beta1.types import session as gcd_session -from google.cloud.dialogflow_v2beta1.types import session_entity_type __protobuf__ = proto.module( package="google.cloud.dialogflow.v2beta1", @@ -75,12 +74,12 @@ class WebhookRequest(proto.Message): number=2, message=gcd_session.QueryResult, ) - alternative_query_results: MutableSequence[ - gcd_session.QueryResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=gcd_session.QueryResult, + alternative_query_results: MutableSequence[gcd_session.QueryResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=gcd_session.QueryResult, + ) ) original_detect_intent_request: "OriginalDetectIntentRequest" = proto.Field( proto.MESSAGE, @@ -206,12 +205,12 @@ class WebhookResponse(proto.Message): proto.BOOL, number=8, ) - session_entity_types: MutableSequence[ - session_entity_type.SessionEntityType - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message=session_entity_type.SessionEntityType, + session_entity_types: MutableSequence[session_entity_type.SessionEntityType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message=session_entity_type.SessionEntityType, + ) ) diff --git a/packages/google-cloud-dialogflow/noxfile.py b/packages/google-cloud-dialogflow/noxfile.py index c4844130aa13..4d540d033f28 100644 --- a/packages/google-cloud-dialogflow/noxfile.py +++ b/packages/google-cloud-dialogflow/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_async.py index 9df52b4aa879..e9a94415f3f4 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_async.py @@ -40,9 +40,7 @@ async def sample_create_generator_evaluation(): # Initialize request argument(s) generator_evaluation = dialogflow_v2.GeneratorEvaluation() - generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = ( - "INSIGHTS_CONVERSATIONS" - ) + generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = "INSIGHTS_CONVERSATIONS" generator_evaluation.generator_evaluation_config.output_gcs_bucket_path = ( "output_gcs_bucket_path_value" ) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_sync.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_sync.py index f19dfe565d43..6e832344a7ff 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_sync.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2_generated_generator_evaluations_create_generator_evaluation_sync.py @@ -40,9 +40,7 @@ def sample_create_generator_evaluation(): # Initialize request argument(s) generator_evaluation = dialogflow_v2.GeneratorEvaluation() - generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = ( - "INSIGHTS_CONVERSATIONS" - ) + generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = "INSIGHTS_CONVERSATIONS" generator_evaluation.generator_evaluation_config.output_gcs_bucket_path = ( "output_gcs_bucket_path_value" ) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_async.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_async.py index eb5b1897226f..c33f71f29d48 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_async.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_async.py @@ -40,9 +40,7 @@ async def sample_create_generator_evaluation(): # Initialize request argument(s) generator_evaluation = dialogflow_v2beta1.GeneratorEvaluation() - generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = ( - "INSIGHTS_CONVERSATIONS" - ) + generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = "INSIGHTS_CONVERSATIONS" generator_evaluation.generator_evaluation_config.output_gcs_bucket_path = ( "output_gcs_bucket_path_value" ) diff --git a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_sync.py b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_sync.py index 97f5abb99d2d..d0bed81b19d6 100644 --- a/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_sync.py +++ b/packages/google-cloud-dialogflow/samples/generated_samples/dialogflow_v2beta1_generated_generator_evaluations_create_generator_evaluation_sync.py @@ -40,9 +40,7 @@ def sample_create_generator_evaluation(): # Initialize request argument(s) generator_evaluation = dialogflow_v2beta1.GeneratorEvaluation() - generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = ( - "INSIGHTS_CONVERSATIONS" - ) + generator_evaluation.generator_evaluation_config.input_data_config.input_data_source_type = "INSIGHTS_CONVERSATIONS" generator_evaluation.generator_evaluation_config.output_gcs_bucket_path = ( "output_gcs_bucket_path_value" ) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_agents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_agents.py index 424f90ca120b..df4bdb274b6f 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_agents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_agents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.agents import ( AgentsAsyncClient, @@ -72,9 +72,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import agent +from google.cloud.dialogflow_v2.types import agent, validation_result from google.cloud.dialogflow_v2.types import agent as gcd_agent -from google.cloud.dialogflow_v2.types import validation_result CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -911,10 +910,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +957,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +995,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1226,13 +1222,13 @@ def test_agents_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4054,9 +4050,9 @@ def test_get_validation_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_validation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_validation_result] = ( + mock_rpc + ) request = {} client.get_validation_result(request) @@ -5604,9 +5600,9 @@ def test_get_validation_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_validation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_validation_result] = ( + mock_rpc + ) request = {} client.get_validation_result(request) @@ -6287,8 +6283,9 @@ def test_get_agent_rest_bad_request(request_type=agent.GetAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6373,17 +6370,15 @@ def test_get_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_get_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_get_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_get_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AgentsRestInterceptor, "post_get_agent") as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_get_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_get_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6432,8 +6427,9 @@ def test_set_agent_rest_bad_request(request_type=gcd_agent.SetAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6602,17 +6598,15 @@ def test_set_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_set_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_set_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_set_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AgentsRestInterceptor, "post_set_agent") as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_set_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_set_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6661,8 +6655,9 @@ def test_delete_agent_rest_bad_request(request_type=agent.DeleteAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6717,13 +6712,11 @@ def test_delete_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "pre_delete_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AgentsRestInterceptor, "pre_delete_agent") as pre, + ): pre.assert_not_called() pb_message = agent.DeleteAgentRequest.pb(agent.DeleteAgentRequest()) transcode.return_value = { @@ -6764,8 +6757,9 @@ def test_search_agents_rest_bad_request(request_type=agent.SearchAgentsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6826,17 +6820,17 @@ def test_search_agents_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_search_agents" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_search_agents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_search_agents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_search_agents" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_search_agents_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_search_agents") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6885,8 +6879,9 @@ def test_train_agent_rest_bad_request(request_type=agent.TrainAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6941,19 +6936,16 @@ def test_train_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_train_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_train_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_train_agent" - ) as pre: + 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.AgentsRestInterceptor, "post_train_agent") as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_train_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_train_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7002,8 +6994,9 @@ def test_export_agent_rest_bad_request(request_type=agent.ExportAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7058,19 +7051,18 @@ def test_export_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_export_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_export_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_export_agent" - ) as pre: + 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.AgentsRestInterceptor, "post_export_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_export_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_export_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7119,8 +7111,9 @@ def test_import_agent_rest_bad_request(request_type=agent.ImportAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7175,19 +7168,18 @@ def test_import_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_import_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_import_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_import_agent" - ) as pre: + 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.AgentsRestInterceptor, "post_import_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_import_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_import_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7236,8 +7228,9 @@ def test_restore_agent_rest_bad_request(request_type=agent.RestoreAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7292,19 +7285,18 @@ def test_restore_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_restore_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_restore_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_restore_agent" - ) as pre: + 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.AgentsRestInterceptor, "post_restore_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_restore_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_restore_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7355,8 +7347,9 @@ def test_get_validation_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7414,17 +7407,19 @@ def test_get_validation_result_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_get_validation_result" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_get_validation_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_get_validation_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_get_validation_result" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_get_validation_result_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AgentsRestInterceptor, "pre_get_validation_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7479,8 +7474,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7539,8 +7535,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7601,8 +7598,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7663,8 +7661,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7723,8 +7722,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8049,11 +8049,14 @@ def test_agents_base_transport(): def test_agents_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.agents.transports.AgentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.agents.transports.AgentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AgentsTransport( @@ -8073,9 +8076,12 @@ def test_agents_base_transport_with_credentials_file(): def test_agents_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.agents.transports.AgentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.agents.transports.AgentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AgentsTransport() @@ -8153,11 +8159,12 @@ def test_agents_transport_auth_gdch_credentials(transport_class): def test_agents_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_answer_records.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_answer_records.py index 39c9615202f5..56b7cf8b5805 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_answer_records.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_answer_records.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.answer_records import ( AnswerRecordsAsyncClient, @@ -64,6 +69,8 @@ transports, ) from google.cloud.dialogflow_v2.types import ( + agent_coaching_instruction, + answer_record, context, generator, intent, @@ -71,8 +78,6 @@ session, tool_call, ) -from google.cloud.dialogflow_v2.types import agent_coaching_instruction -from google.cloud.dialogflow_v2.types import answer_record from google.cloud.dialogflow_v2.types import answer_record as gcd_answer_record CRED_INFO_JSON = { @@ -956,10 +961,9 @@ def test_answer_records_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1008,9 @@ def test_answer_records_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1046,9 @@ def test_answer_records_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,13 +1291,13 @@ def test_answer_records_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1415,9 +1417,9 @@ def test_list_answer_records_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_answer_records - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_answer_records] = ( + mock_rpc + ) request = {} client.list_answer_records(request) @@ -1954,9 +1956,9 @@ def test_update_answer_record_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_answer_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_answer_record] = ( + mock_rpc + ) request = {} client.update_answer_record(request) @@ -2238,9 +2240,9 @@ def test_list_answer_records_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_answer_records - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_answer_records] = ( + mock_rpc + ) request = {} client.list_answer_records(request) @@ -2498,9 +2500,9 @@ def test_update_answer_record_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_answer_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_answer_record] = ( + mock_rpc + ) request = {} client.update_answer_record(request) @@ -2909,8 +2911,9 @@ def test_list_answer_records_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2973,18 +2976,20 @@ def test_list_answer_records_rest_interceptors(null_interceptor): ) client = AnswerRecordsClient(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.AnswerRecordsRestInterceptor, "post_list_answer_records" - ) as post, mock.patch.object( - transports.AnswerRecordsRestInterceptor, - "post_list_answer_records_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnswerRecordsRestInterceptor, "pre_list_answer_records" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, "post_list_answer_records" + ) as post, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, + "post_list_answer_records_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, "pre_list_answer_records" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3042,8 +3047,9 @@ def test_update_answer_record_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3508,18 +3514,20 @@ def test_update_answer_record_rest_interceptors(null_interceptor): ) client = AnswerRecordsClient(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.AnswerRecordsRestInterceptor, "post_update_answer_record" - ) as post, mock.patch.object( - transports.AnswerRecordsRestInterceptor, - "post_update_answer_record_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnswerRecordsRestInterceptor, "pre_update_answer_record" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, "post_update_answer_record" + ) as post, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, + "post_update_answer_record_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, "pre_update_answer_record" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3574,8 +3582,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3634,8 +3643,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3696,8 +3706,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3758,8 +3769,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3818,8 +3830,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3977,11 +3990,14 @@ def test_answer_records_base_transport(): def test_answer_records_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.answer_records.transports.AnswerRecordsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.answer_records.transports.AnswerRecordsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AnswerRecordsTransport( @@ -4001,9 +4017,12 @@ def test_answer_records_base_transport_with_credentials_file(): def test_answer_records_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.answer_records.transports.AnswerRecordsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.answer_records.transports.AnswerRecordsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AnswerRecordsTransport() @@ -4081,11 +4100,12 @@ def test_answer_records_transport_auth_gdch_credentials(transport_class): def test_answer_records_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_contexts.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_contexts.py index 725b76488f64..966d205b9963 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_contexts.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_contexts.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.contexts import ( ContextsAsyncClient, @@ -912,10 +917,9 @@ def test_contexts_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +964,9 @@ def test_contexts_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1002,9 @@ def test_contexts_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1227,13 +1229,13 @@ def test_contexts_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3161,9 +3163,9 @@ def test_delete_all_contexts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_all_contexts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_all_contexts] = ( + mock_rpc + ) request = {} client.delete_all_contexts(request) @@ -4399,9 +4401,9 @@ def test_delete_all_contexts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_all_contexts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_all_contexts] = ( + mock_rpc + ) request = {} client.delete_all_contexts(request) @@ -4976,8 +4978,9 @@ def test_list_contexts_rest_bad_request(request_type=context.ListContextsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5038,17 +5041,19 @@ def test_list_contexts_rest_interceptors(null_interceptor): ) client = ContextsClient(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.ContextsRestInterceptor, "post_list_contexts" - ) as post, mock.patch.object( - transports.ContextsRestInterceptor, "post_list_contexts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContextsRestInterceptor, "pre_list_contexts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContextsRestInterceptor, "post_list_contexts" + ) as post, + mock.patch.object( + transports.ContextsRestInterceptor, "post_list_contexts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ContextsRestInterceptor, "pre_list_contexts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5099,8 +5104,9 @@ def test_get_context_rest_bad_request(request_type=context.GetContextRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5163,17 +5169,17 @@ def test_get_context_rest_interceptors(null_interceptor): ) client = ContextsClient(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.ContextsRestInterceptor, "post_get_context" - ) as post, mock.patch.object( - transports.ContextsRestInterceptor, "post_get_context_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContextsRestInterceptor, "pre_get_context" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContextsRestInterceptor, "post_get_context" + ) as post, + mock.patch.object( + transports.ContextsRestInterceptor, "post_get_context_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ContextsRestInterceptor, "pre_get_context") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5222,8 +5228,9 @@ def test_create_context_rest_bad_request(request_type=gcd_context.CreateContextR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5358,17 +5365,19 @@ def test_create_context_rest_interceptors(null_interceptor): ) client = ContextsClient(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.ContextsRestInterceptor, "post_create_context" - ) as post, mock.patch.object( - transports.ContextsRestInterceptor, "post_create_context_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContextsRestInterceptor, "pre_create_context" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContextsRestInterceptor, "post_create_context" + ) as post, + mock.patch.object( + transports.ContextsRestInterceptor, "post_create_context_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ContextsRestInterceptor, "pre_create_context" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5421,8 +5430,9 @@ def test_update_context_rest_bad_request(request_type=gcd_context.UpdateContextR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5559,17 +5569,19 @@ def test_update_context_rest_interceptors(null_interceptor): ) client = ContextsClient(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.ContextsRestInterceptor, "post_update_context" - ) as post, mock.patch.object( - transports.ContextsRestInterceptor, "post_update_context_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContextsRestInterceptor, "pre_update_context" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContextsRestInterceptor, "post_update_context" + ) as post, + mock.patch.object( + transports.ContextsRestInterceptor, "post_update_context_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ContextsRestInterceptor, "pre_update_context" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5620,8 +5632,9 @@ def test_delete_context_rest_bad_request(request_type=context.DeleteContextReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5676,13 +5689,13 @@ def test_delete_context_rest_interceptors(null_interceptor): ) client = ContextsClient(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.ContextsRestInterceptor, "pre_delete_context" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContextsRestInterceptor, "pre_delete_context" + ) as pre, + ): pre.assert_not_called() pb_message = context.DeleteContextRequest.pb(context.DeleteContextRequest()) transcode.return_value = { @@ -5725,8 +5738,9 @@ def test_delete_all_contexts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5781,13 +5795,13 @@ def test_delete_all_contexts_rest_interceptors(null_interceptor): ) client = ContextsClient(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.ContextsRestInterceptor, "pre_delete_all_contexts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContextsRestInterceptor, "pre_delete_all_contexts" + ) as pre, + ): pre.assert_not_called() pb_message = context.DeleteAllContextsRequest.pb( context.DeleteAllContextsRequest() @@ -5832,8 +5846,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5892,8 +5907,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5954,8 +5970,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6016,8 +6033,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6076,8 +6094,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6317,11 +6336,14 @@ def test_contexts_base_transport(): def test_contexts_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.contexts.transports.ContextsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.contexts.transports.ContextsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContextsTransport( @@ -6341,9 +6363,12 @@ def test_contexts_base_transport_with_credentials_file(): def test_contexts_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.contexts.transports.ContextsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.contexts.transports.ContextsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContextsTransport() @@ -6421,11 +6446,12 @@ def test_contexts_transport_auth_gdch_credentials(transport_class): def test_contexts_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_datasets.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_datasets.py index 379513f8d923..3a4ffe5344f8 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_datasets.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_datasets.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_datasets import ( ConversationDatasetsAsyncClient, @@ -71,11 +71,10 @@ pagers, transports, ) +from google.cloud.dialogflow_v2.types import conversation_dataset, gcs from google.cloud.dialogflow_v2.types import ( conversation_dataset as gcd_conversation_dataset, ) -from google.cloud.dialogflow_v2.types import conversation_dataset -from google.cloud.dialogflow_v2.types import gcs CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1009,10 +1008,9 @@ def test_conversation_datasets_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1055,9 @@ def test_conversation_datasets_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1093,9 @@ def test_conversation_datasets_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1355,13 +1351,13 @@ def test_conversation_datasets_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4637,8 +4633,9 @@ def test_create_conversation_dataset_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4777,22 +4774,23 @@ def test_create_conversation_dataset_rest_interceptors(null_interceptor): ) client = ConversationDatasetsClient(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.ConversationDatasetsRestInterceptor, - "post_create_conversation_dataset", - ) as post, mock.patch.object( - transports.ConversationDatasetsRestInterceptor, - "post_create_conversation_dataset_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationDatasetsRestInterceptor, - "pre_create_conversation_dataset", - ) as pre: + 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.ConversationDatasetsRestInterceptor, + "post_create_conversation_dataset", + ) as post, + mock.patch.object( + transports.ConversationDatasetsRestInterceptor, + "post_create_conversation_dataset_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationDatasetsRestInterceptor, + "pre_create_conversation_dataset", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4845,8 +4843,9 @@ def test_get_conversation_dataset_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4919,18 +4918,22 @@ def test_get_conversation_dataset_rest_interceptors(null_interceptor): ) client = ConversationDatasetsClient(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.ConversationDatasetsRestInterceptor, "post_get_conversation_dataset" - ) as post, mock.patch.object( - transports.ConversationDatasetsRestInterceptor, - "post_get_conversation_dataset_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationDatasetsRestInterceptor, "pre_get_conversation_dataset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationDatasetsRestInterceptor, + "post_get_conversation_dataset", + ) as post, + mock.patch.object( + transports.ConversationDatasetsRestInterceptor, + "post_get_conversation_dataset_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationDatasetsRestInterceptor, + "pre_get_conversation_dataset", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4988,8 +4991,9 @@ def test_list_conversation_datasets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5054,19 +5058,22 @@ def test_list_conversation_datasets_rest_interceptors(null_interceptor): ) client = ConversationDatasetsClient(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.ConversationDatasetsRestInterceptor, - "post_list_conversation_datasets", - ) as post, mock.patch.object( - transports.ConversationDatasetsRestInterceptor, - "post_list_conversation_datasets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationDatasetsRestInterceptor, "pre_list_conversation_datasets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationDatasetsRestInterceptor, + "post_list_conversation_datasets", + ) as post, + mock.patch.object( + transports.ConversationDatasetsRestInterceptor, + "post_list_conversation_datasets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationDatasetsRestInterceptor, + "pre_list_conversation_datasets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5126,8 +5133,9 @@ def test_delete_conversation_dataset_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5186,22 +5194,23 @@ def test_delete_conversation_dataset_rest_interceptors(null_interceptor): ) client = ConversationDatasetsClient(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.ConversationDatasetsRestInterceptor, - "post_delete_conversation_dataset", - ) as post, mock.patch.object( - transports.ConversationDatasetsRestInterceptor, - "post_delete_conversation_dataset_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationDatasetsRestInterceptor, - "pre_delete_conversation_dataset", - ) as pre: + 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.ConversationDatasetsRestInterceptor, + "post_delete_conversation_dataset", + ) as post, + mock.patch.object( + transports.ConversationDatasetsRestInterceptor, + "post_delete_conversation_dataset_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationDatasetsRestInterceptor, + "pre_delete_conversation_dataset", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5254,8 +5263,9 @@ def test_import_conversation_data_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5312,20 +5322,23 @@ def test_import_conversation_data_rest_interceptors(null_interceptor): ) client = ConversationDatasetsClient(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.ConversationDatasetsRestInterceptor, "post_import_conversation_data" - ) as post, mock.patch.object( - transports.ConversationDatasetsRestInterceptor, - "post_import_conversation_data_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationDatasetsRestInterceptor, "pre_import_conversation_data" - ) as pre: + 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.ConversationDatasetsRestInterceptor, + "post_import_conversation_data", + ) as post, + mock.patch.object( + transports.ConversationDatasetsRestInterceptor, + "post_import_conversation_data_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationDatasetsRestInterceptor, + "pre_import_conversation_data", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5378,8 +5391,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5438,8 +5452,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5500,8 +5515,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5562,8 +5578,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5622,8 +5639,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5872,11 +5890,14 @@ def test_conversation_datasets_base_transport(): def test_conversation_datasets_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.conversation_datasets.transports.ConversationDatasetsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.conversation_datasets.transports.ConversationDatasetsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationDatasetsTransport( @@ -5896,9 +5917,12 @@ def test_conversation_datasets_base_transport_with_credentials_file(): def test_conversation_datasets_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.conversation_datasets.transports.ConversationDatasetsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.conversation_datasets.transports.ConversationDatasetsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationDatasetsTransport() @@ -5976,11 +6000,12 @@ def test_conversation_datasets_transport_auth_gdch_credentials(transport_class): def test_conversation_datasets_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_models.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_models.py index a9eccec1a65d..697addd4434c 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_models.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_models.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_models import ( ConversationModelsAsyncClient, @@ -71,10 +71,10 @@ pagers, transports, ) +from google.cloud.dialogflow_v2.types import conversation_model from google.cloud.dialogflow_v2.types import ( conversation_model as gcd_conversation_model, ) -from google.cloud.dialogflow_v2.types import conversation_model CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -998,10 +998,9 @@ def test_conversation_models_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1045,9 @@ def test_conversation_models_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1083,9 @@ def test_conversation_models_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,13 +1333,13 @@ def test_conversation_models_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1834,9 +1831,9 @@ def test_get_conversation_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation_model] = ( + mock_rpc + ) request = {} client.get_conversation_model(request) @@ -4999,9 +4996,9 @@ def test_get_conversation_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation_model] = ( + mock_rpc + ) request = {} client.get_conversation_model(request) @@ -7133,8 +7130,9 @@ def test_create_conversation_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7272,20 +7270,23 @@ def test_create_conversation_model_rest_interceptors(null_interceptor): ) client = ConversationModelsClient(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.ConversationModelsRestInterceptor, "post_create_conversation_model" - ) as post, mock.patch.object( - transports.ConversationModelsRestInterceptor, - "post_create_conversation_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationModelsRestInterceptor, "pre_create_conversation_model" - ) as pre: + 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.ConversationModelsRestInterceptor, + "post_create_conversation_model", + ) as post, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "post_create_conversation_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "pre_create_conversation_model", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7338,8 +7339,9 @@ def test_get_conversation_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7412,18 +7414,20 @@ def test_get_conversation_model_rest_interceptors(null_interceptor): ) client = ConversationModelsClient(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.ConversationModelsRestInterceptor, "post_get_conversation_model" - ) as post, mock.patch.object( - transports.ConversationModelsRestInterceptor, - "post_get_conversation_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationModelsRestInterceptor, "pre_get_conversation_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationModelsRestInterceptor, "post_get_conversation_model" + ) as post, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "post_get_conversation_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationModelsRestInterceptor, "pre_get_conversation_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7481,8 +7485,9 @@ def test_list_conversation_models_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7547,18 +7552,21 @@ def test_list_conversation_models_rest_interceptors(null_interceptor): ) client = ConversationModelsClient(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.ConversationModelsRestInterceptor, "post_list_conversation_models" - ) as post, mock.patch.object( - transports.ConversationModelsRestInterceptor, - "post_list_conversation_models_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationModelsRestInterceptor, "pre_list_conversation_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "post_list_conversation_models", + ) as post, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "post_list_conversation_models_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationModelsRestInterceptor, "pre_list_conversation_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7616,8 +7624,9 @@ def test_delete_conversation_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7674,20 +7683,23 @@ def test_delete_conversation_model_rest_interceptors(null_interceptor): ) client = ConversationModelsClient(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.ConversationModelsRestInterceptor, "post_delete_conversation_model" - ) as post, mock.patch.object( - transports.ConversationModelsRestInterceptor, - "post_delete_conversation_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationModelsRestInterceptor, "pre_delete_conversation_model" - ) as pre: + 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.ConversationModelsRestInterceptor, + "post_delete_conversation_model", + ) as post, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "post_delete_conversation_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "pre_delete_conversation_model", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7740,8 +7752,9 @@ def test_deploy_conversation_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7798,20 +7811,23 @@ def test_deploy_conversation_model_rest_interceptors(null_interceptor): ) client = ConversationModelsClient(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.ConversationModelsRestInterceptor, "post_deploy_conversation_model" - ) as post, mock.patch.object( - transports.ConversationModelsRestInterceptor, - "post_deploy_conversation_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationModelsRestInterceptor, "pre_deploy_conversation_model" - ) as pre: + 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.ConversationModelsRestInterceptor, + "post_deploy_conversation_model", + ) as post, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "post_deploy_conversation_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "pre_deploy_conversation_model", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7864,8 +7880,9 @@ def test_undeploy_conversation_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7922,20 +7939,23 @@ def test_undeploy_conversation_model_rest_interceptors(null_interceptor): ) client = ConversationModelsClient(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.ConversationModelsRestInterceptor, "post_undeploy_conversation_model" - ) as post, mock.patch.object( - transports.ConversationModelsRestInterceptor, - "post_undeploy_conversation_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationModelsRestInterceptor, "pre_undeploy_conversation_model" - ) as pre: + 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.ConversationModelsRestInterceptor, + "post_undeploy_conversation_model", + ) as post, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "post_undeploy_conversation_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "pre_undeploy_conversation_model", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7990,8 +8010,9 @@ def test_get_conversation_model_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8060,20 +8081,22 @@ def test_get_conversation_model_evaluation_rest_interceptors(null_interceptor): ) client = ConversationModelsClient(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.ConversationModelsRestInterceptor, - "post_get_conversation_model_evaluation", - ) as post, mock.patch.object( - transports.ConversationModelsRestInterceptor, - "post_get_conversation_model_evaluation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationModelsRestInterceptor, - "pre_get_conversation_model_evaluation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "post_get_conversation_model_evaluation", + ) as post, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "post_get_conversation_model_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "pre_get_conversation_model_evaluation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8131,8 +8154,9 @@ def test_list_conversation_model_evaluations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8197,20 +8221,22 @@ def test_list_conversation_model_evaluations_rest_interceptors(null_interceptor) ) client = ConversationModelsClient(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.ConversationModelsRestInterceptor, - "post_list_conversation_model_evaluations", - ) as post, mock.patch.object( - transports.ConversationModelsRestInterceptor, - "post_list_conversation_model_evaluations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationModelsRestInterceptor, - "pre_list_conversation_model_evaluations", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "post_list_conversation_model_evaluations", + ) as post, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "post_list_conversation_model_evaluations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "pre_list_conversation_model_evaluations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8274,8 +8300,9 @@ def test_create_conversation_model_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8334,22 +8361,23 @@ def test_create_conversation_model_evaluation_rest_interceptors(null_interceptor ) client = ConversationModelsClient(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.ConversationModelsRestInterceptor, - "post_create_conversation_model_evaluation", - ) as post, mock.patch.object( - transports.ConversationModelsRestInterceptor, - "post_create_conversation_model_evaluation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationModelsRestInterceptor, - "pre_create_conversation_model_evaluation", - ) as pre: + 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.ConversationModelsRestInterceptor, + "post_create_conversation_model_evaluation", + ) as post, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "post_create_conversation_model_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationModelsRestInterceptor, + "pre_create_conversation_model_evaluation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8402,8 +8430,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8462,8 +8491,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8524,8 +8554,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8586,8 +8617,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8646,8 +8678,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8988,11 +9021,14 @@ def test_conversation_models_base_transport(): def test_conversation_models_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.conversation_models.transports.ConversationModelsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.conversation_models.transports.ConversationModelsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationModelsTransport( @@ -9012,9 +9048,12 @@ def test_conversation_models_base_transport_with_credentials_file(): def test_conversation_models_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.conversation_models.transports.ConversationModelsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.conversation_models.transports.ConversationModelsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationModelsTransport() @@ -9092,11 +9131,12 @@ def test_conversation_models_transport_auth_gdch_credentials(transport_class): def test_conversation_models_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_profiles.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_profiles.py index bb9ae56f368b..d3b0af57b149 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_profiles.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversation_profiles.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversation_profiles import ( ConversationProfilesAsyncClient, @@ -72,12 +72,15 @@ pagers, transports, ) +from google.cloud.dialogflow_v2.types import ( + audio_config, + conversation_profile, + generator, + participant, +) from google.cloud.dialogflow_v2.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2.types import audio_config -from google.cloud.dialogflow_v2.types import conversation_profile -from google.cloud.dialogflow_v2.types import generator, participant CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1011,10 +1014,9 @@ def test_conversation_profiles_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1061,9 @@ def test_conversation_profiles_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1099,9 @@ def test_conversation_profiles_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1357,13 +1357,13 @@ def test_conversation_profiles_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6075,8 +6075,9 @@ def test_list_conversation_profiles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6141,19 +6142,22 @@ def test_list_conversation_profiles_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, - "post_list_conversation_profiles", - ) as post, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "post_list_conversation_profiles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationProfilesRestInterceptor, "pre_list_conversation_profiles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_list_conversation_profiles", + ) as post, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_list_conversation_profiles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_list_conversation_profiles", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6211,8 +6215,9 @@ def test_get_conversation_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6283,18 +6288,22 @@ def test_get_conversation_profile_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, "post_get_conversation_profile" - ) as post, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "post_get_conversation_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationProfilesRestInterceptor, "pre_get_conversation_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_get_conversation_profile", + ) as post, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_get_conversation_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_get_conversation_profile", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6352,8 +6361,9 @@ def test_create_conversation_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6613,20 +6623,22 @@ def test_create_conversation_profile_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, - "post_create_conversation_profile", - ) as post, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "post_create_conversation_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "pre_create_conversation_profile", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_create_conversation_profile", + ) as post, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_create_conversation_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_create_conversation_profile", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6688,8 +6700,9 @@ def test_update_conversation_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6953,20 +6966,22 @@ def test_update_conversation_profile_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, - "post_update_conversation_profile", - ) as post, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "post_update_conversation_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "pre_update_conversation_profile", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_update_conversation_profile", + ) as post, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_update_conversation_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_update_conversation_profile", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7024,8 +7039,9 @@ def test_delete_conversation_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7082,14 +7098,14 @@ def test_delete_conversation_profile_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, - "pre_delete_conversation_profile", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_delete_conversation_profile", + ) as pre, + ): pre.assert_not_called() pb_message = conversation_profile.DeleteConversationProfileRequest.pb( conversation_profile.DeleteConversationProfileRequest() @@ -7136,8 +7152,9 @@ def test_set_suggestion_feature_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7196,22 +7213,23 @@ def test_set_suggestion_feature_config_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, - "post_set_suggestion_feature_config", - ) as post, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "post_set_suggestion_feature_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "pre_set_suggestion_feature_config", - ) as pre: + 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.ConversationProfilesRestInterceptor, + "post_set_suggestion_feature_config", + ) as post, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_set_suggestion_feature_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_set_suggestion_feature_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7266,8 +7284,9 @@ def test_clear_suggestion_feature_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7326,22 +7345,23 @@ def test_clear_suggestion_feature_config_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, - "post_clear_suggestion_feature_config", - ) as post, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "post_clear_suggestion_feature_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "pre_clear_suggestion_feature_config", - ) as pre: + 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.ConversationProfilesRestInterceptor, + "post_clear_suggestion_feature_config", + ) as post, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_clear_suggestion_feature_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_clear_suggestion_feature_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7394,8 +7414,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7454,8 +7475,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7516,8 +7538,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7578,8 +7601,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7638,8 +7662,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7934,11 +7959,14 @@ def test_conversation_profiles_base_transport(): def test_conversation_profiles_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.conversation_profiles.transports.ConversationProfilesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.conversation_profiles.transports.ConversationProfilesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationProfilesTransport( @@ -7958,9 +7986,12 @@ def test_conversation_profiles_base_transport_with_credentials_file(): def test_conversation_profiles_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.conversation_profiles.transports.ConversationProfilesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.conversation_profiles.transports.ConversationProfilesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationProfilesTransport() @@ -8038,11 +8069,12 @@ def test_conversation_profiles_transport_auth_gdch_credentials(transport_class): def test_conversation_profiles_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversations.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversations.py index 0ac20c608523..cfd9ca885f3d 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversations.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_conversations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.conversations import ( ConversationsAsyncClient, @@ -63,15 +68,16 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import agent_coaching_instruction, audio_config from google.cloud.dialogflow_v2.types import ( + agent_coaching_instruction, + audio_config, + conversation, conversation_profile, generator, participant, session, tool_call, ) -from google.cloud.dialogflow_v2.types import conversation from google.cloud.dialogflow_v2.types import conversation as gcd_conversation CRED_INFO_JSON = { @@ -955,10 +961,9 @@ def test_conversations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1008,9 @@ def test_conversations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1046,9 @@ def test_conversations_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1288,13 +1291,13 @@ def test_conversations_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1424,9 +1427,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -1792,9 +1795,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -2340,9 +2343,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -2694,9 +2697,9 @@ def test_complete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_conversation] = ( + mock_rpc + ) request = {} client.complete_conversation(request) @@ -4830,9 +4833,9 @@ def test_search_knowledge_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_knowledge - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_knowledge] = ( + mock_rpc + ) request = {} client.search_knowledge(request) @@ -5081,9 +5084,9 @@ def test_generate_suggestions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_suggestions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_suggestions] = ( + mock_rpc + ) request = {} client.generate_suggestions(request) @@ -5355,9 +5358,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -5548,9 +5551,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -5806,9 +5809,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -5987,9 +5990,9 @@ def test_complete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_conversation] = ( + mock_rpc + ) request = {} client.complete_conversation(request) @@ -7086,9 +7089,9 @@ def test_search_knowledge_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_knowledge - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_knowledge] = ( + mock_rpc + ) request = {} client.search_knowledge(request) @@ -7229,9 +7232,9 @@ def test_generate_suggestions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_suggestions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_suggestions] = ( + mock_rpc + ) request = {} client.generate_suggestions(request) @@ -8094,8 +8097,9 @@ def test_create_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8255,18 +8259,20 @@ def test_create_conversation_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_create_conversation" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_create_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_create_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_create_conversation" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_create_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_create_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8321,8 +8327,9 @@ def test_list_conversations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8385,17 +8392,20 @@ def test_list_conversations_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_list_conversations" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, "post_list_conversations_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_list_conversations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_list_conversations" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_list_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_list_conversations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8453,8 +8463,9 @@ def test_get_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8528,17 +8539,20 @@ def test_get_conversation_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_get_conversation" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, "post_get_conversation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_get_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_get_conversation" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_get_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_get_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8591,8 +8605,9 @@ def test_complete_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8666,18 +8681,20 @@ def test_complete_conversation_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_complete_conversation" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_complete_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_complete_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_complete_conversation" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_complete_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_complete_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8732,8 +8749,9 @@ def test_ingest_context_references_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8795,18 +8813,20 @@ def test_ingest_context_references_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_ingest_context_references" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_ingest_context_references_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_ingest_context_references" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_ingest_context_references" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_ingest_context_references_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_ingest_context_references" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8862,8 +8882,9 @@ def test_list_messages_rest_bad_request(request_type=conversation.ListMessagesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8926,17 +8947,19 @@ def test_list_messages_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_list_messages" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, "post_list_messages_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_list_messages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_list_messages" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_list_messages_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_list_messages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8991,8 +9014,9 @@ def test_suggest_conversation_summary_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9059,18 +9083,20 @@ def test_suggest_conversation_summary_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_suggest_conversation_summary" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_suggest_conversation_summary_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_suggest_conversation_summary" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_suggest_conversation_summary" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_suggest_conversation_summary_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_suggest_conversation_summary" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9128,8 +9154,9 @@ def test_generate_stateless_summary_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9194,18 +9221,20 @@ def test_generate_stateless_summary_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_generate_stateless_summary" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_generate_stateless_summary_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_generate_stateless_summary" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_generate_stateless_summary" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_generate_stateless_summary_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_generate_stateless_summary" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9263,8 +9292,9 @@ def test_generate_stateless_suggestion_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9324,18 +9354,21 @@ def test_generate_stateless_suggestion_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_generate_stateless_suggestion" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_generate_stateless_suggestion_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_generate_stateless_suggestion" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_generate_stateless_suggestion", + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_generate_stateless_suggestion_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_generate_stateless_suggestion" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9393,8 +9426,9 @@ def test_search_knowledge_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9457,17 +9491,20 @@ def test_search_knowledge_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_search_knowledge" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, "post_search_knowledge_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_search_knowledge" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_search_knowledge" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_search_knowledge_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_search_knowledge" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9525,8 +9562,9 @@ def test_generate_suggestions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9589,18 +9627,20 @@ def test_generate_suggestions_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_generate_suggestions" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_generate_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_generate_suggestions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_generate_suggestions" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_generate_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_generate_suggestions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9658,8 +9698,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9718,8 +9759,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9780,8 +9822,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9842,8 +9885,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9902,8 +9946,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10262,11 +10307,14 @@ def test_conversations_base_transport(): def test_conversations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.conversations.transports.ConversationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.conversations.transports.ConversationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationsTransport( @@ -10286,9 +10334,12 @@ def test_conversations_base_transport_with_credentials_file(): def test_conversations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.conversations.transports.ConversationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.conversations.transports.ConversationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationsTransport() @@ -10366,11 +10417,12 @@ def test_conversations_transport_auth_gdch_credentials(transport_class): def test_conversations_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_documents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_documents.py index 984e536c9a25..77740535c18f 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_documents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_documents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.dialogflow_v2.services.documents import ( DocumentsAsyncClient, @@ -74,9 +74,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import document +from google.cloud.dialogflow_v2.types import document, gcs from google.cloud.dialogflow_v2.types import document as gcd_document -from google.cloud.dialogflow_v2.types import gcs CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -932,10 +931,9 @@ def test_documents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +978,9 @@ def test_documents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1016,9 @@ def test_documents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1251,13 +1247,13 @@ def test_documents_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2562,9 +2558,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -4610,9 +4606,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5897,8 +5893,9 @@ def test_list_documents_rest_bad_request(request_type=document.ListDocumentsRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5959,17 +5956,19 @@ def test_list_documents_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_list_documents" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_list_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_list_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_list_documents" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_list_documents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_list_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6020,8 +6019,9 @@ def test_get_document_rest_bad_request(request_type=document.GetDocumentRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6093,17 +6093,19 @@ def test_get_document_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_get_document" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_get_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_get_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_get_document" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_get_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_get_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6154,8 +6156,9 @@ def test_create_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6301,19 +6304,20 @@ def test_create_document_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_create_document" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_create_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_create_document" - ) as pre: + 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.DocumentsRestInterceptor, "post_create_document" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_create_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_create_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6366,8 +6370,9 @@ def test_import_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6422,19 +6427,20 @@ def test_import_documents_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_import_documents" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_import_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_import_documents" - ) as pre: + 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.DocumentsRestInterceptor, "post_import_documents" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_import_documents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_import_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6485,8 +6491,9 @@ def test_delete_document_rest_bad_request(request_type=document.DeleteDocumentRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6541,19 +6548,20 @@ def test_delete_document_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_delete_document" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_delete_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_delete_document" - ) as pre: + 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.DocumentsRestInterceptor, "post_delete_document" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_delete_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_delete_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6608,8 +6616,9 @@ def test_update_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6759,19 +6768,20 @@ def test_update_document_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_update_document" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_update_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_update_document" - ) as pre: + 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.DocumentsRestInterceptor, "post_update_document" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_update_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_update_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6822,8 +6832,9 @@ def test_reload_document_rest_bad_request(request_type=document.ReloadDocumentRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6878,19 +6889,20 @@ def test_reload_document_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_reload_document" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_reload_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_reload_document" - ) as pre: + 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.DocumentsRestInterceptor, "post_reload_document" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_reload_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_reload_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6939,8 +6951,9 @@ def test_export_document_rest_bad_request(request_type=document.ExportDocumentRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6995,19 +7008,20 @@ def test_export_document_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_export_document" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_export_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_export_document" - ) as pre: + 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.DocumentsRestInterceptor, "post_export_document" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_export_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_export_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7058,8 +7072,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7118,8 +7133,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7180,8 +7196,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7242,8 +7259,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7302,8 +7320,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7605,11 +7624,14 @@ def test_documents_base_transport(): def test_documents_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.documents.transports.DocumentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.documents.transports.DocumentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentsTransport( @@ -7629,9 +7651,12 @@ def test_documents_base_transport_with_credentials_file(): def test_documents_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.documents.transports.DocumentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.documents.transports.DocumentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentsTransport() @@ -7709,11 +7734,12 @@ def test_documents_transport_auth_gdch_credentials(transport_class): def test_documents_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_encryption_spec_service.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_encryption_spec_service.py index 20537caa7da4..f66601459f7b 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_encryption_spec_service.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_encryption_spec_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -68,8 +68,8 @@ EncryptionSpecServiceClient, transports, ) -from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2.types import encryption_spec +from google.cloud.dialogflow_v2.types import encryption_spec as gcd_encryption_spec CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1005,10 +1005,9 @@ def test_encryption_spec_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1053,10 +1052,9 @@ def test_encryption_spec_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1092,10 +1090,9 @@ def test_encryption_spec_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1351,13 +1348,13 @@ def test_encryption_spec_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1475,9 +1472,9 @@ def test_get_encryption_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_spec] = ( + mock_rpc + ) request = {} client.get_encryption_spec(request) @@ -2094,9 +2091,9 @@ def test_get_encryption_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_spec] = ( + mock_rpc + ) request = {} client.get_encryption_spec(request) @@ -2676,8 +2673,9 @@ def test_get_encryption_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2742,18 +2740,20 @@ def test_get_encryption_spec_rest_interceptors(null_interceptor): ) client = EncryptionSpecServiceClient(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.EncryptionSpecServiceRestInterceptor, "post_get_encryption_spec" - ) as post, mock.patch.object( - transports.EncryptionSpecServiceRestInterceptor, - "post_get_encryption_spec_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EncryptionSpecServiceRestInterceptor, "pre_get_encryption_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EncryptionSpecServiceRestInterceptor, "post_get_encryption_spec" + ) as post, + mock.patch.object( + transports.EncryptionSpecServiceRestInterceptor, + "post_get_encryption_spec_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EncryptionSpecServiceRestInterceptor, "pre_get_encryption_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2810,8 +2810,9 @@ def test_initialize_encryption_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2870,22 +2871,23 @@ def test_initialize_encryption_spec_rest_interceptors(null_interceptor): ) client = EncryptionSpecServiceClient(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.EncryptionSpecServiceRestInterceptor, - "post_initialize_encryption_spec", - ) as post, mock.patch.object( - transports.EncryptionSpecServiceRestInterceptor, - "post_initialize_encryption_spec_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EncryptionSpecServiceRestInterceptor, - "pre_initialize_encryption_spec", - ) as pre: + 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.EncryptionSpecServiceRestInterceptor, + "post_initialize_encryption_spec", + ) as post, + mock.patch.object( + transports.EncryptionSpecServiceRestInterceptor, + "post_initialize_encryption_spec_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EncryptionSpecServiceRestInterceptor, + "pre_initialize_encryption_spec", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2938,8 +2940,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2998,8 +3001,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3060,8 +3064,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3122,8 +3127,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3182,8 +3188,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3363,11 +3370,14 @@ def test_encryption_spec_service_base_transport(): def test_encryption_spec_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.encryption_spec_service.transports.EncryptionSpecServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.encryption_spec_service.transports.EncryptionSpecServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EncryptionSpecServiceTransport( @@ -3387,9 +3397,12 @@ def test_encryption_spec_service_base_transport_with_credentials_file(): def test_encryption_spec_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.encryption_spec_service.transports.EncryptionSpecServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.encryption_spec_service.transports.EncryptionSpecServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EncryptionSpecServiceTransport() @@ -3469,11 +3482,12 @@ def test_encryption_spec_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_entity_types.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_entity_types.py index f2693650dfbc..daf12c0ba9f7 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_entity_types.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.entity_types import ( EntityTypesAsyncClient, @@ -937,10 +937,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1256,13 +1253,13 @@ def test_entity_types_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1380,9 +1377,9 @@ def test_list_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -2303,9 +2300,9 @@ def test_create_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -2687,9 +2684,9 @@ def test_update_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -3047,9 +3044,9 @@ def test_delete_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -4001,9 +3998,9 @@ def test_batch_create_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_entities] = ( + mock_rpc + ) request = {} client.batch_create_entities(request) @@ -4369,9 +4366,9 @@ def test_batch_update_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_entities] = ( + mock_rpc + ) request = {} client.batch_update_entities(request) @@ -4737,9 +4734,9 @@ def test_batch_delete_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_entities] = ( + mock_rpc + ) request = {} client.batch_delete_entities(request) @@ -5035,9 +5032,9 @@ def test_list_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -5479,9 +5476,9 @@ def test_create_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -5675,9 +5672,9 @@ def test_update_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -5872,9 +5869,9 @@ def test_delete_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -6373,9 +6370,9 @@ def test_batch_create_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_entities] = ( + mock_rpc + ) request = {} client.batch_create_entities(request) @@ -6568,9 +6565,9 @@ def test_batch_update_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_entities] = ( + mock_rpc + ) request = {} client.batch_update_entities(request) @@ -6763,9 +6760,9 @@ def test_batch_delete_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_entities] = ( + mock_rpc + ) request = {} client.batch_delete_entities(request) @@ -7590,8 +7587,9 @@ def test_list_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7654,17 +7652,20 @@ def test_list_entity_types_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_list_entity_types" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_list_entity_types_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_list_entity_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_list_entity_types" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_list_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_list_entity_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7722,8 +7723,9 @@ def test_get_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7797,17 +7799,19 @@ def test_get_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_get_entity_type" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_get_entity_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_get_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_get_entity_type" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_get_entity_type_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_get_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7860,8 +7864,9 @@ def test_create_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8012,17 +8017,20 @@ def test_create_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_create_entity_type" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_create_entity_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_create_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_create_entity_type" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_create_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_create_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8077,8 +8085,9 @@ def test_update_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8231,17 +8240,20 @@ def test_update_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_update_entity_type" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_update_entity_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_update_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_update_entity_type" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_update_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_update_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8294,8 +8306,9 @@ def test_delete_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8352,13 +8365,13 @@ def test_delete_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "pre_delete_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_delete_entity_type" + ) as pre, + ): pre.assert_not_called() pb_message = entity_type.DeleteEntityTypeRequest.pb( entity_type.DeleteEntityTypeRequest() @@ -8403,8 +8416,9 @@ def test_batch_update_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8461,20 +8475,21 @@ def test_batch_update_entity_types_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_batch_update_entity_types" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, - "post_batch_update_entity_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_batch_update_entity_types" - ) as pre: + 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.EntityTypesRestInterceptor, "post_batch_update_entity_types" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_batch_update_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_batch_update_entity_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8527,8 +8542,9 @@ def test_batch_delete_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8585,20 +8601,21 @@ def test_batch_delete_entity_types_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_batch_delete_entity_types" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, - "post_batch_delete_entity_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_batch_delete_entity_types" - ) as pre: + 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.EntityTypesRestInterceptor, "post_batch_delete_entity_types" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_batch_delete_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_batch_delete_entity_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8651,8 +8668,9 @@ def test_batch_create_entities_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8709,20 +8727,21 @@ def test_batch_create_entities_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_batch_create_entities" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, - "post_batch_create_entities_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_batch_create_entities" - ) as pre: + 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.EntityTypesRestInterceptor, "post_batch_create_entities" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_batch_create_entities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_batch_create_entities" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8775,8 +8794,9 @@ def test_batch_update_entities_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8833,20 +8853,21 @@ def test_batch_update_entities_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_batch_update_entities" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, - "post_batch_update_entities_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_batch_update_entities" - ) as pre: + 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.EntityTypesRestInterceptor, "post_batch_update_entities" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_batch_update_entities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_batch_update_entities" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8899,8 +8920,9 @@ def test_batch_delete_entities_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8957,20 +8979,21 @@ def test_batch_delete_entities_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_batch_delete_entities" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, - "post_batch_delete_entities_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_batch_delete_entities" - ) as pre: + 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.EntityTypesRestInterceptor, "post_batch_delete_entities" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_batch_delete_entities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_batch_delete_entities" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9023,8 +9046,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9083,8 +9107,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9145,8 +9170,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9207,8 +9233,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9267,8 +9294,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9630,11 +9658,14 @@ def test_entity_types_base_transport(): def test_entity_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EntityTypesTransport( @@ -9654,9 +9685,12 @@ def test_entity_types_base_transport_with_credentials_file(): def test_entity_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EntityTypesTransport() @@ -9734,11 +9768,12 @@ def test_entity_types_transport_auth_gdch_credentials(transport_class): def test_entity_types_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_environments.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_environments.py index f1627d5f11b6..7518753857ee 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_environments.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_environments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.environments import ( EnvironmentsAsyncClient, @@ -930,10 +935,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +982,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1020,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1259,13 +1261,13 @@ def test_environments_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1381,9 +1383,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -2185,9 +2187,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -2448,9 +2450,9 @@ def test_update_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -2706,9 +2708,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -3351,9 +3353,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -3730,9 +3732,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -3879,9 +3881,9 @@ def test_update_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -4019,9 +4021,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -4770,8 +4772,9 @@ def test_list_environments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4834,17 +4837,20 @@ def test_list_environments_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_environments" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_list_environments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_environments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_environments" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_environments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_list_environments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4902,8 +4908,9 @@ def test_get_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4972,17 +4979,19 @@ def test_get_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_get_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_get_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_get_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_get_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5035,8 +5044,9 @@ def test_create_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5198,17 +5208,20 @@ def test_create_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_create_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_create_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_create_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_create_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_create_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_create_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5263,8 +5276,9 @@ def test_update_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5428,17 +5442,20 @@ def test_update_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_update_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_update_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_update_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_update_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_update_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_update_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5491,8 +5508,9 @@ def test_delete_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5549,13 +5567,13 @@ def test_delete_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "pre_delete_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_delete_environment" + ) as pre, + ): pre.assert_not_called() pb_message = environment.DeleteEnvironmentRequest.pb( environment.DeleteEnvironmentRequest() @@ -5600,8 +5618,9 @@ def test_get_environment_history_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5666,18 +5685,20 @@ def test_get_environment_history_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_get_environment_history" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_get_environment_history_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_get_environment_history" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment_history" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_get_environment_history_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_get_environment_history" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5732,8 +5753,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5792,8 +5814,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5854,8 +5877,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5916,8 +5940,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5976,8 +6001,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6225,11 +6251,14 @@ def test_environments_base_transport(): def test_environments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnvironmentsTransport( @@ -6249,9 +6278,12 @@ def test_environments_base_transport_with_credentials_file(): def test_environments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnvironmentsTransport() @@ -6329,11 +6361,12 @@ def test_environments_transport_auth_gdch_credentials(transport_class): def test_environments_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_fulfillments.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_fulfillments.py index 8ad8961e735a..33a2d5612198 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_fulfillments.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_fulfillments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.fulfillments import ( FulfillmentsAsyncClient, @@ -929,10 +934,9 @@ def test_fulfillments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +981,9 @@ def test_fulfillments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1019,9 @@ def test_fulfillments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1258,13 +1260,13 @@ def test_fulfillments_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1711,9 +1713,9 @@ def test_update_fulfillment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fulfillment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fulfillment] = ( + mock_rpc + ) request = {} client.update_fulfillment(request) @@ -2176,9 +2178,9 @@ def test_update_fulfillment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fulfillment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fulfillment] = ( + mock_rpc + ) request = {} client.update_fulfillment(request) @@ -2585,8 +2587,9 @@ def test_get_fulfillment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2653,17 +2656,19 @@ def test_get_fulfillment_rest_interceptors(null_interceptor): ) client = FulfillmentsClient(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.FulfillmentsRestInterceptor, "post_get_fulfillment" - ) as post, mock.patch.object( - transports.FulfillmentsRestInterceptor, "post_get_fulfillment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FulfillmentsRestInterceptor, "pre_get_fulfillment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FulfillmentsRestInterceptor, "post_get_fulfillment" + ) as post, + mock.patch.object( + transports.FulfillmentsRestInterceptor, "post_get_fulfillment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FulfillmentsRestInterceptor, "pre_get_fulfillment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2716,8 +2721,9 @@ def test_update_fulfillment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2864,17 +2870,20 @@ def test_update_fulfillment_rest_interceptors(null_interceptor): ) client = FulfillmentsClient(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.FulfillmentsRestInterceptor, "post_update_fulfillment" - ) as post, mock.patch.object( - transports.FulfillmentsRestInterceptor, "post_update_fulfillment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FulfillmentsRestInterceptor, "pre_update_fulfillment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FulfillmentsRestInterceptor, "post_update_fulfillment" + ) as post, + mock.patch.object( + transports.FulfillmentsRestInterceptor, + "post_update_fulfillment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FulfillmentsRestInterceptor, "pre_update_fulfillment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2929,8 +2938,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2989,8 +2999,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3051,8 +3062,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3113,8 +3125,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3173,8 +3186,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3330,11 +3344,14 @@ def test_fulfillments_base_transport(): def test_fulfillments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.fulfillments.transports.FulfillmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.fulfillments.transports.FulfillmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FulfillmentsTransport( @@ -3354,9 +3371,12 @@ def test_fulfillments_base_transport_with_credentials_file(): def test_fulfillments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.fulfillments.transports.FulfillmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.fulfillments.transports.FulfillmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FulfillmentsTransport() @@ -3434,11 +3454,12 @@ def test_fulfillments_transport_auth_gdch_credentials(transport_class): def test_fulfillments_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generator_evaluations.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generator_evaluations.py index 47d9d4fa0a60..816ea500bb6f 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generator_evaluations.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generator_evaluations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.dialogflow_v2.services.generator_evaluations import ( GeneratorEvaluationsAsyncClient, @@ -73,12 +73,16 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import agent_coaching_instruction, generator +from google.cloud.dialogflow_v2.types import ( + agent_coaching_instruction, + generator, + generator_evaluation, + operations, + tool_call, +) from google.cloud.dialogflow_v2.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2.types import generator_evaluation -from google.cloud.dialogflow_v2.types import operations, tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1012,10 +1016,9 @@ def test_generator_evaluations_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1063,9 @@ def test_generator_evaluations_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1099,10 +1101,9 @@ def test_generator_evaluations_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1358,13 +1359,13 @@ def test_generator_evaluations_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4172,8 +4173,9 @@ def test_create_generator_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4536,22 +4538,23 @@ def test_create_generator_evaluation_rest_interceptors(null_interceptor): ) client = GeneratorEvaluationsClient(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.GeneratorEvaluationsRestInterceptor, - "post_create_generator_evaluation", - ) as post, mock.patch.object( - transports.GeneratorEvaluationsRestInterceptor, - "post_create_generator_evaluation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GeneratorEvaluationsRestInterceptor, - "pre_create_generator_evaluation", - ) as pre: + 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.GeneratorEvaluationsRestInterceptor, + "post_create_generator_evaluation", + ) as post, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "post_create_generator_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "pre_create_generator_evaluation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4606,8 +4609,9 @@ def test_get_generator_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4678,18 +4682,22 @@ def test_get_generator_evaluation_rest_interceptors(null_interceptor): ) client = GeneratorEvaluationsClient(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.GeneratorEvaluationsRestInterceptor, "post_get_generator_evaluation" - ) as post, mock.patch.object( - transports.GeneratorEvaluationsRestInterceptor, - "post_get_generator_evaluation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GeneratorEvaluationsRestInterceptor, "pre_get_generator_evaluation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "post_get_generator_evaluation", + ) as post, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "post_get_generator_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "pre_get_generator_evaluation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4747,8 +4755,9 @@ def test_list_generator_evaluations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4813,19 +4822,22 @@ def test_list_generator_evaluations_rest_interceptors(null_interceptor): ) client = GeneratorEvaluationsClient(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.GeneratorEvaluationsRestInterceptor, - "post_list_generator_evaluations", - ) as post, mock.patch.object( - transports.GeneratorEvaluationsRestInterceptor, - "post_list_generator_evaluations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GeneratorEvaluationsRestInterceptor, "pre_list_generator_evaluations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "post_list_generator_evaluations", + ) as post, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "post_list_generator_evaluations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "pre_list_generator_evaluations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4885,8 +4897,9 @@ def test_delete_generator_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4945,14 +4958,14 @@ def test_delete_generator_evaluation_rest_interceptors(null_interceptor): ) client = GeneratorEvaluationsClient(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.GeneratorEvaluationsRestInterceptor, - "pre_delete_generator_evaluation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "pre_delete_generator_evaluation", + ) as pre, + ): pre.assert_not_called() pb_message = generator_evaluation.DeleteGeneratorEvaluationRequest.pb( generator_evaluation.DeleteGeneratorEvaluationRequest() @@ -4997,8 +5010,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5057,8 +5071,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5119,8 +5134,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5181,8 +5197,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5241,8 +5258,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5468,11 +5486,14 @@ def test_generator_evaluations_base_transport(): def test_generator_evaluations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.generator_evaluations.transports.GeneratorEvaluationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.generator_evaluations.transports.GeneratorEvaluationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeneratorEvaluationsTransport( @@ -5492,9 +5513,12 @@ def test_generator_evaluations_base_transport_with_credentials_file(): def test_generator_evaluations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.generator_evaluations.transports.GeneratorEvaluationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.generator_evaluations.transports.GeneratorEvaluationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeneratorEvaluationsTransport() @@ -5572,11 +5596,12 @@ def test_generator_evaluations_transport_auth_gdch_credentials(transport_class): def test_generator_evaluations_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generators.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generators.py index 291ea8b98b66..79034594ad84 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generators.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_generators.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.generators import ( GeneratorsAsyncClient, @@ -63,10 +68,12 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import agent_coaching_instruction -from google.cloud.dialogflow_v2.types import generator +from google.cloud.dialogflow_v2.types import ( + agent_coaching_instruction, + generator, + tool_call, +) from google.cloud.dialogflow_v2.types import generator as gcd_generator -from google.cloud.dialogflow_v2.types import tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -926,10 +933,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -974,10 +980,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1013,10 +1018,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1245,13 +1249,13 @@ def test_generators_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1370,9 +1374,9 @@ def test_create_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -2569,9 +2573,9 @@ def test_delete_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -2888,9 +2892,9 @@ def test_update_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -3165,9 +3169,9 @@ def test_create_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -3789,9 +3793,9 @@ def test_delete_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -3965,9 +3969,9 @@ def test_update_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -4511,8 +4515,9 @@ def test_create_generator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4773,17 +4778,19 @@ def test_create_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_create_generator" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_create_generator_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_create_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_create_generator" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_create_generator_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_create_generator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4834,8 +4841,9 @@ def test_get_generator_rest_bad_request(request_type=generator.GetGeneratorReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4905,17 +4913,19 @@ def test_get_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_get_generator" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_get_generator_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_get_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_get_generator" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_get_generator_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_get_generator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4964,8 +4974,9 @@ def test_list_generators_rest_bad_request(request_type=generator.ListGeneratorsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5028,17 +5039,19 @@ def test_list_generators_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_list_generators" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_list_generators_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_list_generators" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_list_generators" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_list_generators_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_list_generators" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5093,8 +5106,9 @@ def test_delete_generator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5151,13 +5165,13 @@ def test_delete_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "pre_delete_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_delete_generator" + ) as pre, + ): pre.assert_not_called() pb_message = generator.DeleteGeneratorRequest.pb( generator.DeleteGeneratorRequest() @@ -5204,8 +5218,9 @@ def test_update_generator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5468,17 +5483,19 @@ def test_update_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_update_generator" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_update_generator_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_update_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_update_generator" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_update_generator_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_update_generator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5531,8 +5548,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5591,8 +5609,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5653,8 +5672,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5715,8 +5735,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5775,8 +5796,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5993,11 +6015,14 @@ def test_generators_base_transport(): def test_generators_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeneratorsTransport( @@ -6017,9 +6042,12 @@ def test_generators_base_transport_with_credentials_file(): def test_generators_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeneratorsTransport() @@ -6097,11 +6125,12 @@ def test_generators_transport_auth_gdch_credentials(transport_class): def test_generators_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_intents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_intents.py index 62924ddcea23..68130a1f76f8 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_intents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_intents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2.services.intents import ( IntentsAsyncClient, @@ -72,8 +72,7 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import context -from google.cloud.dialogflow_v2.types import intent +from google.cloud.dialogflow_v2.types import context, intent from google.cloud.dialogflow_v2.types import intent as gcd_intent CRED_INFO_JSON = { @@ -912,10 +911,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +996,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1227,13 +1223,13 @@ def test_intents_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3393,9 +3389,9 @@ def test_batch_update_intents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_intents] = ( + mock_rpc + ) request = {} client.batch_update_intents(request) @@ -3760,9 +3756,9 @@ def test_batch_delete_intents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_intents] = ( + mock_rpc + ) request = {} client.batch_delete_intents(request) @@ -5061,9 +5057,9 @@ def test_batch_update_intents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_intents] = ( + mock_rpc + ) request = {} client.batch_update_intents(request) @@ -5247,9 +5243,9 @@ def test_batch_delete_intents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_intents] = ( + mock_rpc + ) request = {} client.batch_delete_intents(request) @@ -5934,8 +5930,9 @@ def test_list_intents_rest_bad_request(request_type=intent.ListIntentsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5996,17 +5993,17 @@ def test_list_intents_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_list_intents" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_list_intents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_list_intents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "post_list_intents" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_list_intents_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.IntentsRestInterceptor, "pre_list_intents") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6055,8 +6052,9 @@ def test_get_intent_rest_bad_request(request_type=intent.GetIntentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6147,17 +6145,15 @@ def test_get_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_get_intent" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_get_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_get_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.IntentsRestInterceptor, "post_get_intent") as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_get_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.IntentsRestInterceptor, "pre_get_intent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6206,8 +6202,9 @@ def test_create_intent_rest_bad_request(request_type=gcd_intent.CreateIntentRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6531,17 +6528,19 @@ def test_create_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_create_intent" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_create_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_create_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "post_create_intent" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_create_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_create_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6590,8 +6589,9 @@ def test_update_intent_rest_bad_request(request_type=gcd_intent.UpdateIntentRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6915,17 +6915,19 @@ def test_update_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_update_intent" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_update_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_update_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "post_update_intent" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_update_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_update_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6974,8 +6976,9 @@ def test_delete_intent_rest_bad_request(request_type=intent.DeleteIntentRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7030,13 +7033,13 @@ def test_delete_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "pre_delete_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_delete_intent" + ) as pre, + ): pre.assert_not_called() pb_message = intent.DeleteIntentRequest.pb(intent.DeleteIntentRequest()) transcode.return_value = { @@ -7079,8 +7082,9 @@ def test_batch_update_intents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7135,19 +7139,20 @@ def test_batch_update_intents_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_batch_update_intents" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_batch_update_intents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_batch_update_intents" - ) as pre: + 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.IntentsRestInterceptor, "post_batch_update_intents" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_batch_update_intents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_batch_update_intents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7200,8 +7205,9 @@ def test_batch_delete_intents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7256,19 +7262,20 @@ def test_batch_delete_intents_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_batch_delete_intents" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_batch_delete_intents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_batch_delete_intents" - ) as pre: + 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.IntentsRestInterceptor, "post_batch_delete_intents" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_batch_delete_intents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_batch_delete_intents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7321,8 +7328,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7381,8 +7389,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7443,8 +7452,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7505,8 +7515,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7565,8 +7576,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7851,11 +7863,14 @@ def test_intents_base_transport(): def test_intents_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.intents.transports.IntentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.intents.transports.IntentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IntentsTransport( @@ -7875,9 +7890,12 @@ def test_intents_base_transport_with_credentials_file(): def test_intents_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.intents.transports.IntentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.intents.transports.IntentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IntentsTransport() @@ -7955,11 +7973,12 @@ def test_intents_transport_auth_gdch_credentials(transport_class): def test_intents_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_knowledge_bases.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_knowledge_bases.py index f2e26210da37..cb7080b52e83 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_knowledge_bases.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_knowledge_bases.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.knowledge_bases import ( KnowledgeBasesAsyncClient, @@ -61,8 +66,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2.types import knowledge_base +from google.cloud.dialogflow_v2.types import knowledge_base as gcd_knowledge_base CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -949,10 +954,9 @@ def test_knowledge_bases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1001,9 @@ def test_knowledge_bases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1039,9 @@ def test_knowledge_bases_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1282,13 +1284,13 @@ def test_knowledge_bases_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1408,9 +1410,9 @@ def test_list_knowledge_bases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_knowledge_bases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_knowledge_bases] = ( + mock_rpc + ) request = {} client.list_knowledge_bases(request) @@ -1956,9 +1958,9 @@ def test_get_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_knowledge_base] = ( + mock_rpc + ) request = {} client.get_knowledge_base(request) @@ -2306,9 +2308,9 @@ def test_create_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_knowledge_base] = ( + mock_rpc + ) request = {} client.create_knowledge_base(request) @@ -2660,9 +2662,9 @@ def test_delete_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_knowledge_base] = ( + mock_rpc + ) request = {} client.delete_knowledge_base(request) @@ -2994,9 +2996,9 @@ def test_update_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_knowledge_base] = ( + mock_rpc + ) request = {} client.update_knowledge_base(request) @@ -3282,9 +3284,9 @@ def test_list_knowledge_bases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_knowledge_bases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_knowledge_bases] = ( + mock_rpc + ) request = {} client.list_knowledge_bases(request) @@ -3542,9 +3544,9 @@ def test_get_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_knowledge_base] = ( + mock_rpc + ) request = {} client.get_knowledge_base(request) @@ -3723,9 +3725,9 @@ def test_create_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_knowledge_base] = ( + mock_rpc + ) request = {} client.create_knowledge_base(request) @@ -3915,9 +3917,9 @@ def test_delete_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_knowledge_base] = ( + mock_rpc + ) request = {} client.delete_knowledge_base(request) @@ -4093,9 +4095,9 @@ def test_update_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_knowledge_base] = ( + mock_rpc + ) request = {} client.update_knowledge_base(request) @@ -4654,8 +4656,9 @@ def test_list_knowledge_bases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4718,18 +4721,20 @@ def test_list_knowledge_bases_rest_interceptors(null_interceptor): ) client = KnowledgeBasesClient(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.KnowledgeBasesRestInterceptor, "post_list_knowledge_bases" - ) as post, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, - "post_list_knowledge_bases_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, "pre_list_knowledge_bases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "post_list_knowledge_bases" + ) as post, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, + "post_list_knowledge_bases_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "pre_list_knowledge_bases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4787,8 +4792,9 @@ def test_get_knowledge_base_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4855,18 +4861,20 @@ def test_get_knowledge_base_rest_interceptors(null_interceptor): ) client = KnowledgeBasesClient(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.KnowledgeBasesRestInterceptor, "post_get_knowledge_base" - ) as post, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, - "post_get_knowledge_base_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, "pre_get_knowledge_base" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "post_get_knowledge_base" + ) as post, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, + "post_get_knowledge_base_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "pre_get_knowledge_base" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4921,8 +4929,9 @@ def test_create_knowledge_base_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5063,18 +5072,20 @@ def test_create_knowledge_base_rest_interceptors(null_interceptor): ) client = KnowledgeBasesClient(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.KnowledgeBasesRestInterceptor, "post_create_knowledge_base" - ) as post, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, - "post_create_knowledge_base_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, "pre_create_knowledge_base" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "post_create_knowledge_base" + ) as post, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, + "post_create_knowledge_base_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "pre_create_knowledge_base" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5129,8 +5140,9 @@ def test_delete_knowledge_base_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5187,13 +5199,13 @@ def test_delete_knowledge_base_rest_interceptors(null_interceptor): ) client = KnowledgeBasesClient(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.KnowledgeBasesRestInterceptor, "pre_delete_knowledge_base" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "pre_delete_knowledge_base" + ) as pre, + ): pre.assert_not_called() pb_message = knowledge_base.DeleteKnowledgeBaseRequest.pb( knowledge_base.DeleteKnowledgeBaseRequest() @@ -5240,8 +5252,9 @@ def test_update_knowledge_base_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5384,18 +5397,20 @@ def test_update_knowledge_base_rest_interceptors(null_interceptor): ) client = KnowledgeBasesClient(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.KnowledgeBasesRestInterceptor, "post_update_knowledge_base" - ) as post, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, - "post_update_knowledge_base_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, "pre_update_knowledge_base" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "post_update_knowledge_base" + ) as post, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, + "post_update_knowledge_base_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "pre_update_knowledge_base" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5450,8 +5465,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5510,8 +5526,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5572,8 +5589,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5634,8 +5652,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5694,8 +5713,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5922,11 +5942,14 @@ def test_knowledge_bases_base_transport(): def test_knowledge_bases_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.knowledge_bases.transports.KnowledgeBasesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.knowledge_bases.transports.KnowledgeBasesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.KnowledgeBasesTransport( @@ -5946,9 +5969,12 @@ def test_knowledge_bases_base_transport_with_credentials_file(): def test_knowledge_bases_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.knowledge_bases.transports.KnowledgeBasesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.knowledge_bases.transports.KnowledgeBasesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.KnowledgeBasesTransport() @@ -6026,11 +6052,12 @@ def test_knowledge_bases_transport_auth_gdch_credentials(transport_class): def test_knowledge_bases_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_participants.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_participants.py index a6f31b15210a..05f0b00adb9c 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_participants.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_participants.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore from google.cloud.dialogflow_v2.services.participants import ( ParticipantsAsyncClient, @@ -64,10 +69,15 @@ pagers, transports, ) -from google.cloud.dialogflow_v2.types import audio_config, context, entity_type -from google.cloud.dialogflow_v2.types import participant +from google.cloud.dialogflow_v2.types import ( + audio_config, + context, + entity_type, + participant, + session, + session_entity_type, +) from google.cloud.dialogflow_v2.types import participant as gcd_participant -from google.cloud.dialogflow_v2.types import session, session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -935,10 +945,9 @@ def test_participants_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -983,10 +992,9 @@ def test_participants_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1030,9 @@ def test_participants_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1264,13 +1271,13 @@ def test_participants_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1397,9 +1404,9 @@ def test_create_participant_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_participant] = ( + mock_rpc + ) request = {} client.create_participant(request) @@ -2105,9 +2112,9 @@ def test_list_participants_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -2655,9 +2662,9 @@ def test_update_participant_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_participant] = ( + mock_rpc + ) request = {} client.update_participant(request) @@ -3538,9 +3545,9 @@ def test_suggest_articles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_articles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_articles] = ( + mock_rpc + ) request = {} client.suggest_articles(request) @@ -3875,9 +3882,9 @@ def test_suggest_faq_answers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_faq_answers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_faq_answers] = ( + mock_rpc + ) request = {} client.suggest_faq_answers(request) @@ -4223,9 +4230,9 @@ def test_suggest_smart_replies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_smart_replies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_smart_replies] = ( + mock_rpc + ) request = {} client.suggest_smart_replies(request) @@ -4763,9 +4770,9 @@ def test_create_participant_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_participant] = ( + mock_rpc + ) request = {} client.create_participant(request) @@ -5134,9 +5141,9 @@ def test_list_participants_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -5394,9 +5401,9 @@ def test_update_participant_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_participant] = ( + mock_rpc + ) request = {} client.update_participant(request) @@ -5785,9 +5792,9 @@ def test_suggest_articles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_articles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_articles] = ( + mock_rpc + ) request = {} client.suggest_articles(request) @@ -5970,9 +5977,9 @@ def test_suggest_faq_answers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_faq_answers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_faq_answers] = ( + mock_rpc + ) request = {} client.suggest_faq_answers(request) @@ -6156,9 +6163,9 @@ def test_suggest_smart_replies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_smart_replies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_smart_replies] = ( + mock_rpc + ) request = {} client.suggest_smart_replies(request) @@ -7067,8 +7074,9 @@ def test_create_participant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7217,17 +7225,20 @@ def test_create_participant_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_create_participant" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_create_participant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_create_participant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_create_participant" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_create_participant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_create_participant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7284,8 +7295,9 @@ def test_get_participant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7361,17 +7373,19 @@ def test_get_participant_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_get_participant" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_get_participant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_get_participant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_get_participant" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_get_participant_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_get_participant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7424,8 +7438,9 @@ def test_list_participants_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7488,17 +7503,20 @@ def test_list_participants_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_list_participants" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_list_participants_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_list_participants" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_list_participants" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_list_participants_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_list_participants" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7560,8 +7578,9 @@ def test_update_participant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7714,17 +7733,20 @@ def test_update_participant_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_update_participant" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_update_participant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_update_participant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_update_participant" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_update_participant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_update_participant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7781,8 +7803,9 @@ def test_analyze_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7847,17 +7870,19 @@ def test_analyze_content_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_analyze_content" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_analyze_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_analyze_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_analyze_content" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_analyze_content_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_analyze_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7929,8 +7954,9 @@ def test_suggest_articles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7997,17 +8023,20 @@ def test_suggest_articles_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_suggest_articles" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_suggest_articles_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_suggest_articles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_suggest_articles" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_suggest_articles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_suggest_articles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8067,8 +8096,9 @@ def test_suggest_faq_answers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8135,17 +8165,20 @@ def test_suggest_faq_answers_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_suggest_faq_answers" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_suggest_faq_answers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_suggest_faq_answers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_suggest_faq_answers" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_suggest_faq_answers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_suggest_faq_answers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8205,8 +8238,9 @@ def test_suggest_smart_replies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8273,18 +8307,20 @@ def test_suggest_smart_replies_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_suggest_smart_replies" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, - "post_suggest_smart_replies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_suggest_smart_replies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_suggest_smart_replies" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_suggest_smart_replies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_suggest_smart_replies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8344,8 +8380,9 @@ def test_suggest_knowledge_assist_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8412,18 +8449,20 @@ def test_suggest_knowledge_assist_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_suggest_knowledge_assist" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, - "post_suggest_knowledge_assist_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_suggest_knowledge_assist" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_suggest_knowledge_assist" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_suggest_knowledge_assist_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_suggest_knowledge_assist" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8481,8 +8520,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8541,8 +8581,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8603,8 +8644,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8665,8 +8707,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8725,8 +8768,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9040,11 +9084,14 @@ def test_participants_base_transport(): def test_participants_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.participants.transports.ParticipantsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.participants.transports.ParticipantsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ParticipantsTransport( @@ -9064,9 +9111,12 @@ def test_participants_base_transport_with_credentials_file(): def test_participants_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.participants.transports.ParticipantsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.participants.transports.ParticipantsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ParticipantsTransport() @@ -9144,11 +9194,12 @@ def test_participants_transport_auth_gdch_credentials(transport_class): def test_participants_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_session_entity_types.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_session_entity_types.py index ceba4e0dc25b..5ac33cab195b 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_session_entity_types.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_session_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2.services.session_entity_types import ( SessionEntityTypesAsyncClient, @@ -61,11 +66,10 @@ pagers, transports, ) +from google.cloud.dialogflow_v2.types import entity_type, session_entity_type from google.cloud.dialogflow_v2.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2.types import entity_type -from google.cloud.dialogflow_v2.types import session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -989,10 +993,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1078,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1327,13 +1328,13 @@ def test_session_entity_types_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4752,8 +4753,9 @@ def test_list_session_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4818,18 +4820,22 @@ def test_list_session_entity_types_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_list_session_entity_types" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_list_session_entity_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_list_session_entity_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_list_session_entity_types", + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_list_session_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_list_session_entity_types", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4889,8 +4895,9 @@ def test_get_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4960,18 +4967,20 @@ def test_get_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_get_session_entity_type" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_get_session_entity_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_get_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, "post_get_session_entity_type" + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_get_session_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, "pre_get_session_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5029,8 +5038,9 @@ def test_create_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5174,18 +5184,22 @@ def test_create_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_create_session_entity_type" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_create_session_entity_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_create_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_create_session_entity_type", + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_create_session_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_create_session_entity_type", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5247,8 +5261,9 @@ def test_update_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5396,18 +5411,22 @@ def test_update_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_update_session_entity_type" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_update_session_entity_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_update_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_update_session_entity_type", + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_update_session_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_update_session_entity_type", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5467,8 +5486,9 @@ def test_delete_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5527,13 +5547,14 @@ def test_delete_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "pre_delete_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_delete_session_entity_type", + ) as pre, + ): pre.assert_not_called() pb_message = session_entity_type.DeleteSessionEntityTypeRequest.pb( session_entity_type.DeleteSessionEntityTypeRequest() @@ -5578,8 +5599,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5638,8 +5660,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5700,8 +5723,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5762,8 +5786,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5822,8 +5847,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6050,11 +6076,14 @@ def test_session_entity_types_base_transport(): def test_session_entity_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionEntityTypesTransport( @@ -6074,9 +6103,12 @@ def test_session_entity_types_base_transport_with_credentials_file(): def test_session_entity_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionEntityTypesTransport() @@ -6154,11 +6186,12 @@ def test_session_entity_types_transport_auth_gdch_credentials(transport_class): def test_session_entity_types_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sessions.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sessions.py index 576653360dda..c20481b9b45f 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sessions.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sessions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,30 +43,39 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore from google.cloud.dialogflow_v2.services.sessions import ( SessionsAsyncClient, SessionsClient, transports, ) -from google.cloud.dialogflow_v2.types import audio_config, context, entity_type -from google.cloud.dialogflow_v2.types import session +from google.cloud.dialogflow_v2.types import ( + audio_config, + context, + entity_type, + session, + session_entity_type, +) from google.cloud.dialogflow_v2.types import session as gcd_session -from google.cloud.dialogflow_v2.types import session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -915,10 +924,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -963,10 +971,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1002,10 +1009,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1230,13 +1236,13 @@ def test_sessions_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2186,8 +2192,9 @@ def test_detect_intent_rest_bad_request(request_type=gcd_session.DetectIntentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2250,17 +2257,19 @@ def test_detect_intent_rest_interceptors(null_interceptor): ) client = SessionsClient(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.SessionsRestInterceptor, "post_detect_intent" - ) as post, mock.patch.object( - transports.SessionsRestInterceptor, "post_detect_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionsRestInterceptor, "pre_detect_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionsRestInterceptor, "post_detect_intent" + ) as post, + mock.patch.object( + transports.SessionsRestInterceptor, "post_detect_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionsRestInterceptor, "pre_detect_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2327,8 +2336,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2387,8 +2397,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2449,8 +2460,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2511,8 +2523,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2571,8 +2584,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2706,11 +2720,14 @@ def test_sessions_base_transport(): def test_sessions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.sessions.transports.SessionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.sessions.transports.SessionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionsTransport( @@ -2730,9 +2747,12 @@ def test_sessions_base_transport_with_credentials_file(): def test_sessions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.sessions.transports.SessionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.sessions.transports.SessionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionsTransport() @@ -2810,11 +2830,12 @@ def test_sessions_transport_auth_gdch_credentials(transport_class): def test_sessions_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sip_trunks.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sip_trunks.py index 11e5e9abde37..66a0a664c4ec 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sip_trunks.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_sip_trunks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.sip_trunks import ( SipTrunksAsyncClient, @@ -921,10 +926,9 @@ def test_sip_trunks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_sip_trunks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_sip_trunks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,13 +1242,13 @@ def test_sip_trunks_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1360,9 +1362,9 @@ def test_create_sip_trunk_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sip_trunk] = ( + mock_rpc + ) request = {} client.create_sip_trunk(request) @@ -1696,9 +1698,9 @@ def test_delete_sip_trunk_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sip_trunk] = ( + mock_rpc + ) request = {} client.delete_sip_trunk(request) @@ -2858,9 +2860,9 @@ def test_update_sip_trunk_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sip_trunk] = ( + mock_rpc + ) request = {} client.update_sip_trunk(request) @@ -3133,9 +3135,9 @@ def test_create_sip_trunk_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sip_trunk] = ( + mock_rpc + ) request = {} client.create_sip_trunk(request) @@ -3323,9 +3325,9 @@ def test_delete_sip_trunk_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sip_trunk] = ( + mock_rpc + ) request = {} client.delete_sip_trunk(request) @@ -3929,9 +3931,9 @@ def test_update_sip_trunk_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sip_trunk] = ( + mock_rpc + ) request = {} client.update_sip_trunk(request) @@ -4472,8 +4474,9 @@ def test_create_sip_trunk_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4621,17 +4624,19 @@ def test_create_sip_trunk_rest_interceptors(null_interceptor): ) client = SipTrunksClient(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.SipTrunksRestInterceptor, "post_create_sip_trunk" - ) as post, mock.patch.object( - transports.SipTrunksRestInterceptor, "post_create_sip_trunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SipTrunksRestInterceptor, "pre_create_sip_trunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_create_sip_trunk" + ) as post, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_create_sip_trunk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SipTrunksRestInterceptor, "pre_create_sip_trunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4684,8 +4689,9 @@ def test_delete_sip_trunk_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4740,13 +4746,13 @@ def test_delete_sip_trunk_rest_interceptors(null_interceptor): ) client = SipTrunksClient(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.SipTrunksRestInterceptor, "pre_delete_sip_trunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SipTrunksRestInterceptor, "pre_delete_sip_trunk" + ) as pre, + ): pre.assert_not_called() pb_message = sip_trunk.DeleteSipTrunkRequest.pb( sip_trunk.DeleteSipTrunkRequest() @@ -4789,8 +4795,9 @@ def test_list_sip_trunks_rest_bad_request(request_type=sip_trunk.ListSipTrunksRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4851,17 +4858,19 @@ def test_list_sip_trunks_rest_interceptors(null_interceptor): ) client = SipTrunksClient(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.SipTrunksRestInterceptor, "post_list_sip_trunks" - ) as post, mock.patch.object( - transports.SipTrunksRestInterceptor, "post_list_sip_trunks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SipTrunksRestInterceptor, "pre_list_sip_trunks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_list_sip_trunks" + ) as post, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_list_sip_trunks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SipTrunksRestInterceptor, "pre_list_sip_trunks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4912,8 +4921,9 @@ def test_get_sip_trunk_rest_bad_request(request_type=sip_trunk.GetSipTrunkReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4978,17 +4988,19 @@ def test_get_sip_trunk_rest_interceptors(null_interceptor): ) client = SipTrunksClient(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.SipTrunksRestInterceptor, "post_get_sip_trunk" - ) as post, mock.patch.object( - transports.SipTrunksRestInterceptor, "post_get_sip_trunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SipTrunksRestInterceptor, "pre_get_sip_trunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_get_sip_trunk" + ) as post, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_get_sip_trunk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SipTrunksRestInterceptor, "pre_get_sip_trunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5041,8 +5053,9 @@ def test_update_sip_trunk_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5192,17 +5205,19 @@ def test_update_sip_trunk_rest_interceptors(null_interceptor): ) client = SipTrunksClient(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.SipTrunksRestInterceptor, "post_update_sip_trunk" - ) as post, mock.patch.object( - transports.SipTrunksRestInterceptor, "post_update_sip_trunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SipTrunksRestInterceptor, "pre_update_sip_trunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_update_sip_trunk" + ) as post, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_update_sip_trunk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SipTrunksRestInterceptor, "pre_update_sip_trunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5255,8 +5270,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5315,8 +5331,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5377,8 +5394,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5439,8 +5457,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5499,8 +5518,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5717,11 +5737,14 @@ def test_sip_trunks_base_transport(): def test_sip_trunks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.sip_trunks.transports.SipTrunksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.sip_trunks.transports.SipTrunksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SipTrunksTransport( @@ -5741,9 +5764,12 @@ def test_sip_trunks_base_transport_with_credentials_file(): def test_sip_trunks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.sip_trunks.transports.SipTrunksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.sip_trunks.transports.SipTrunksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SipTrunksTransport() @@ -5821,11 +5847,12 @@ def test_sip_trunks_transport_auth_gdch_credentials(transport_class): def test_sip_trunks_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_tools.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_tools.py index a0405e11554a..6cf528851c14 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_tools.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_tools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.tools import ( ToolsAsyncClient, @@ -897,10 +902,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -945,10 +949,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +987,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1212,13 +1214,13 @@ def test_tools_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4464,8 +4466,9 @@ def test_create_tool_rest_bad_request(request_type=gcd_tool.CreateToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4664,17 +4667,15 @@ def test_create_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_create_tool" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_create_tool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_create_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_create_tool") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_create_tool_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_create_tool") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4723,8 +4724,9 @@ def test_get_tool_rest_bad_request(request_type=tool.GetToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4795,17 +4797,15 @@ def test_get_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_get_tool" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_get_tool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_get_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_get_tool") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_get_tool_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_get_tool") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4854,8 +4854,9 @@ def test_list_tools_rest_bad_request(request_type=tool.ListToolsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4916,17 +4917,15 @@ def test_list_tools_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_list_tools" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_list_tools_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_list_tools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_list_tools") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_list_tools_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_list_tools") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4975,8 +4974,9 @@ def test_delete_tool_rest_bad_request(request_type=tool.DeleteToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5031,13 +5031,11 @@ def test_delete_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "pre_delete_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "pre_delete_tool") as pre, + ): pre.assert_not_called() pb_message = tool.DeleteToolRequest.pb(tool.DeleteToolRequest()) transcode.return_value = { @@ -5080,8 +5078,9 @@ def test_update_tool_rest_bad_request(request_type=gcd_tool.UpdateToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5282,17 +5281,15 @@ def test_update_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_update_tool" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_update_tool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_update_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_update_tool") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_update_tool_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_update_tool") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5343,8 +5340,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5403,8 +5401,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5465,8 +5464,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5527,8 +5527,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5587,8 +5588,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5805,11 +5807,14 @@ def test_tools_base_transport(): def test_tools_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.tools.transports.ToolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.tools.transports.ToolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ToolsTransport( @@ -5829,9 +5834,12 @@ def test_tools_base_transport_with_credentials_file(): def test_tools_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.tools.transports.ToolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.tools.transports.ToolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ToolsTransport() @@ -5909,11 +5917,12 @@ def test_tools_transport_auth_gdch_credentials(transport_class): def test_tools_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_versions.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_versions.py index a3927fd4aa43..12f1ec89502a 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_versions.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2/test_versions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2.services.versions import ( VersionsAsyncClient, @@ -912,10 +917,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +964,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1002,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1227,13 +1229,13 @@ def test_versions_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4445,8 +4447,9 @@ def test_list_versions_rest_bad_request(request_type=version.ListVersionsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4507,17 +4510,19 @@ def test_list_versions_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_list_versions" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_list_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_list_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_list_versions" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_list_versions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_list_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4568,8 +4573,9 @@ def test_get_version_rest_bad_request(request_type=version.GetVersionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4636,17 +4642,17 @@ def test_get_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_get_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_get_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_get_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_get_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_get_version_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VersionsRestInterceptor, "pre_get_version") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4695,8 +4701,9 @@ def test_create_version_rest_bad_request(request_type=gcd_version.CreateVersionR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4837,17 +4844,19 @@ def test_create_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_create_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_create_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_create_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_create_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_create_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_create_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4898,8 +4907,9 @@ def test_update_version_rest_bad_request(request_type=gcd_version.UpdateVersionR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5040,17 +5050,19 @@ def test_update_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_update_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_update_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_update_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_update_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_update_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_update_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5101,8 +5113,9 @@ def test_delete_version_rest_bad_request(request_type=version.DeleteVersionReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5157,13 +5170,13 @@ def test_delete_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "pre_delete_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_delete_version" + ) as pre, + ): pre.assert_not_called() pb_message = version.DeleteVersionRequest.pb(version.DeleteVersionRequest()) transcode.return_value = { @@ -5206,8 +5219,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5266,8 +5280,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5328,8 +5343,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5390,8 +5406,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5450,8 +5467,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5668,11 +5686,14 @@ def test_versions_base_transport(): def test_versions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2.services.versions.transports.VersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2.services.versions.transports.VersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VersionsTransport( @@ -5692,9 +5713,12 @@ def test_versions_base_transport_with_credentials_file(): def test_versions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2.services.versions.transports.VersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2.services.versions.transports.VersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VersionsTransport() @@ -5772,11 +5796,12 @@ def test_versions_transport_auth_gdch_credentials(transport_class): def test_versions_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_agents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_agents.py index 6e9cad06c775..a9ed4bf2fd3d 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_agents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_agents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.agents import ( AgentsAsyncClient, @@ -72,9 +72,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import agent +from google.cloud.dialogflow_v2beta1.types import agent, validation_result from google.cloud.dialogflow_v2beta1.types import agent as gcd_agent -from google.cloud.dialogflow_v2beta1.types import validation_result CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -911,10 +910,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +957,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +995,9 @@ def test_agents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1226,13 +1222,13 @@ def test_agents_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4054,9 +4050,9 @@ def test_get_validation_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_validation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_validation_result] = ( + mock_rpc + ) request = {} client.get_validation_result(request) @@ -5596,9 +5592,9 @@ def test_get_validation_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_validation_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_validation_result] = ( + mock_rpc + ) request = {} client.get_validation_result(request) @@ -6279,8 +6275,9 @@ def test_get_agent_rest_bad_request(request_type=agent.GetAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6365,17 +6362,15 @@ def test_get_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_get_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_get_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_get_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AgentsRestInterceptor, "post_get_agent") as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_get_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_get_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6424,8 +6419,9 @@ def test_set_agent_rest_bad_request(request_type=gcd_agent.SetAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6594,17 +6590,15 @@ def test_set_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_set_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_set_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_set_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AgentsRestInterceptor, "post_set_agent") as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_set_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_set_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6653,8 +6647,9 @@ def test_delete_agent_rest_bad_request(request_type=agent.DeleteAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6709,13 +6704,11 @@ def test_delete_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "pre_delete_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AgentsRestInterceptor, "pre_delete_agent") as pre, + ): pre.assert_not_called() pb_message = agent.DeleteAgentRequest.pb(agent.DeleteAgentRequest()) transcode.return_value = { @@ -6756,8 +6749,9 @@ def test_search_agents_rest_bad_request(request_type=agent.SearchAgentsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6818,17 +6812,17 @@ def test_search_agents_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_search_agents" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_search_agents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_search_agents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_search_agents" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_search_agents_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_search_agents") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6877,8 +6871,9 @@ def test_train_agent_rest_bad_request(request_type=agent.TrainAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6933,19 +6928,16 @@ def test_train_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_train_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_train_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_train_agent" - ) as pre: + 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.AgentsRestInterceptor, "post_train_agent") as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_train_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_train_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6994,8 +6986,9 @@ def test_export_agent_rest_bad_request(request_type=agent.ExportAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7050,19 +7043,18 @@ def test_export_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_export_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_export_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_export_agent" - ) as pre: + 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.AgentsRestInterceptor, "post_export_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_export_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_export_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7111,8 +7103,9 @@ def test_import_agent_rest_bad_request(request_type=agent.ImportAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7167,19 +7160,18 @@ def test_import_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_import_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_import_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_import_agent" - ) as pre: + 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.AgentsRestInterceptor, "post_import_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_import_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_import_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7228,8 +7220,9 @@ def test_restore_agent_rest_bad_request(request_type=agent.RestoreAgentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7284,19 +7277,18 @@ def test_restore_agent_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_restore_agent" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_restore_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_restore_agent" - ) as pre: + 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.AgentsRestInterceptor, "post_restore_agent" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_restore_agent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AgentsRestInterceptor, "pre_restore_agent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7347,8 +7339,9 @@ def test_get_validation_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7406,17 +7399,19 @@ def test_get_validation_result_rest_interceptors(null_interceptor): ) client = AgentsClient(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.AgentsRestInterceptor, "post_get_validation_result" - ) as post, mock.patch.object( - transports.AgentsRestInterceptor, "post_get_validation_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AgentsRestInterceptor, "pre_get_validation_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AgentsRestInterceptor, "post_get_validation_result" + ) as post, + mock.patch.object( + transports.AgentsRestInterceptor, "post_get_validation_result_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AgentsRestInterceptor, "pre_get_validation_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7471,8 +7466,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7531,8 +7527,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7593,8 +7590,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7655,8 +7653,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7715,8 +7714,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8041,11 +8041,14 @@ def test_agents_base_transport(): def test_agents_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.agents.transports.AgentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.agents.transports.AgentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AgentsTransport( @@ -8065,9 +8068,12 @@ def test_agents_base_transport_with_credentials_file(): def test_agents_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.agents.transports.AgentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.agents.transports.AgentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AgentsTransport() @@ -8145,11 +8151,12 @@ def test_agents_transport_auth_gdch_credentials(transport_class): def test_agents_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_answer_records.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_answer_records.py index 172557a68d34..a0a00a859ca0 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_answer_records.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_answer_records.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.answer_records import ( AnswerRecordsAsyncClient, @@ -64,6 +69,8 @@ transports, ) from google.cloud.dialogflow_v2beta1.types import ( + agent_coaching_instruction, + answer_record, context, generator, intent, @@ -72,8 +79,6 @@ tool_call, ) from google.cloud.dialogflow_v2beta1.types import answer_record as gcd_answer_record -from google.cloud.dialogflow_v2beta1.types import agent_coaching_instruction -from google.cloud.dialogflow_v2beta1.types import answer_record CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -956,10 +961,9 @@ def test_answer_records_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1008,9 @@ def test_answer_records_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1046,9 @@ def test_answer_records_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,13 +1291,13 @@ def test_answer_records_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1409,9 +1411,9 @@ def test_get_answer_record_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_answer_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_answer_record] = ( + mock_rpc + ) request = {} client.get_answer_record(request) @@ -1668,9 +1670,9 @@ def test_list_answer_records_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_answer_records - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_answer_records] = ( + mock_rpc + ) request = {} client.list_answer_records(request) @@ -2207,9 +2209,9 @@ def test_update_answer_record_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_answer_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_answer_record] = ( + mock_rpc + ) request = {} client.update_answer_record(request) @@ -2489,9 +2491,9 @@ def test_get_answer_record_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_answer_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_answer_record] = ( + mock_rpc + ) request = {} client.get_answer_record(request) @@ -2529,9 +2531,9 @@ def test_list_answer_records_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_answer_records - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_answer_records] = ( + mock_rpc + ) request = {} client.list_answer_records(request) @@ -2689,9 +2691,9 @@ def test_update_answer_record_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_answer_record - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_answer_record] = ( + mock_rpc + ) request = {} client.update_answer_record(request) @@ -3144,8 +3146,9 @@ def test_get_answer_record_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3208,17 +3211,20 @@ def test_get_answer_record_rest_interceptors(null_interceptor): ) client = AnswerRecordsClient(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.AnswerRecordsRestInterceptor, "post_get_answer_record" - ) as post, mock.patch.object( - transports.AnswerRecordsRestInterceptor, "post_get_answer_record_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AnswerRecordsRestInterceptor, "pre_get_answer_record" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, "post_get_answer_record" + ) as post, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, + "post_get_answer_record_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, "pre_get_answer_record" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3271,8 +3277,9 @@ def test_list_answer_records_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3335,18 +3342,20 @@ def test_list_answer_records_rest_interceptors(null_interceptor): ) client = AnswerRecordsClient(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.AnswerRecordsRestInterceptor, "post_list_answer_records" - ) as post, mock.patch.object( - transports.AnswerRecordsRestInterceptor, - "post_list_answer_records_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnswerRecordsRestInterceptor, "pre_list_answer_records" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, "post_list_answer_records" + ) as post, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, + "post_list_answer_records_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, "pre_list_answer_records" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3404,8 +3413,9 @@ def test_update_answer_record_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3927,18 +3937,20 @@ def test_update_answer_record_rest_interceptors(null_interceptor): ) client = AnswerRecordsClient(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.AnswerRecordsRestInterceptor, "post_update_answer_record" - ) as post, mock.patch.object( - transports.AnswerRecordsRestInterceptor, - "post_update_answer_record_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AnswerRecordsRestInterceptor, "pre_update_answer_record" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, "post_update_answer_record" + ) as post, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, + "post_update_answer_record_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AnswerRecordsRestInterceptor, "pre_update_answer_record" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3993,8 +4005,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4053,8 +4066,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4115,8 +4129,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4177,8 +4192,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4237,8 +4253,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4419,11 +4436,14 @@ def test_answer_records_base_transport(): def test_answer_records_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.answer_records.transports.AnswerRecordsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.answer_records.transports.AnswerRecordsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AnswerRecordsTransport( @@ -4443,9 +4463,12 @@ def test_answer_records_base_transport_with_credentials_file(): def test_answer_records_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.answer_records.transports.AnswerRecordsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.answer_records.transports.AnswerRecordsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AnswerRecordsTransport() @@ -4523,11 +4546,12 @@ def test_answer_records_transport_auth_gdch_credentials(transport_class): def test_answer_records_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_contexts.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_contexts.py index 377c86b6e32d..b214cae30e5d 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_contexts.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_contexts.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.contexts import ( ContextsAsyncClient, @@ -912,10 +917,9 @@ def test_contexts_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +964,9 @@ def test_contexts_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1002,9 @@ def test_contexts_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1227,13 +1229,13 @@ def test_contexts_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3161,9 +3163,9 @@ def test_delete_all_contexts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_all_contexts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_all_contexts] = ( + mock_rpc + ) request = {} client.delete_all_contexts(request) @@ -4399,9 +4401,9 @@ def test_delete_all_contexts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_all_contexts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_all_contexts] = ( + mock_rpc + ) request = {} client.delete_all_contexts(request) @@ -4976,8 +4978,9 @@ def test_list_contexts_rest_bad_request(request_type=context.ListContextsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5038,17 +5041,19 @@ def test_list_contexts_rest_interceptors(null_interceptor): ) client = ContextsClient(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.ContextsRestInterceptor, "post_list_contexts" - ) as post, mock.patch.object( - transports.ContextsRestInterceptor, "post_list_contexts_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContextsRestInterceptor, "pre_list_contexts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContextsRestInterceptor, "post_list_contexts" + ) as post, + mock.patch.object( + transports.ContextsRestInterceptor, "post_list_contexts_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ContextsRestInterceptor, "pre_list_contexts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5099,8 +5104,9 @@ def test_get_context_rest_bad_request(request_type=context.GetContextRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5163,17 +5169,17 @@ def test_get_context_rest_interceptors(null_interceptor): ) client = ContextsClient(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.ContextsRestInterceptor, "post_get_context" - ) as post, mock.patch.object( - transports.ContextsRestInterceptor, "post_get_context_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContextsRestInterceptor, "pre_get_context" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContextsRestInterceptor, "post_get_context" + ) as post, + mock.patch.object( + transports.ContextsRestInterceptor, "post_get_context_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ContextsRestInterceptor, "pre_get_context") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5222,8 +5228,9 @@ def test_create_context_rest_bad_request(request_type=gcd_context.CreateContextR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5358,17 +5365,19 @@ def test_create_context_rest_interceptors(null_interceptor): ) client = ContextsClient(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.ContextsRestInterceptor, "post_create_context" - ) as post, mock.patch.object( - transports.ContextsRestInterceptor, "post_create_context_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContextsRestInterceptor, "pre_create_context" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContextsRestInterceptor, "post_create_context" + ) as post, + mock.patch.object( + transports.ContextsRestInterceptor, "post_create_context_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ContextsRestInterceptor, "pre_create_context" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5421,8 +5430,9 @@ def test_update_context_rest_bad_request(request_type=gcd_context.UpdateContextR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5559,17 +5569,19 @@ def test_update_context_rest_interceptors(null_interceptor): ) client = ContextsClient(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.ContextsRestInterceptor, "post_update_context" - ) as post, mock.patch.object( - transports.ContextsRestInterceptor, "post_update_context_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ContextsRestInterceptor, "pre_update_context" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContextsRestInterceptor, "post_update_context" + ) as post, + mock.patch.object( + transports.ContextsRestInterceptor, "post_update_context_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ContextsRestInterceptor, "pre_update_context" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5620,8 +5632,9 @@ def test_delete_context_rest_bad_request(request_type=context.DeleteContextReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5676,13 +5689,13 @@ def test_delete_context_rest_interceptors(null_interceptor): ) client = ContextsClient(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.ContextsRestInterceptor, "pre_delete_context" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContextsRestInterceptor, "pre_delete_context" + ) as pre, + ): pre.assert_not_called() pb_message = context.DeleteContextRequest.pb(context.DeleteContextRequest()) transcode.return_value = { @@ -5725,8 +5738,9 @@ def test_delete_all_contexts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5781,13 +5795,13 @@ def test_delete_all_contexts_rest_interceptors(null_interceptor): ) client = ContextsClient(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.ContextsRestInterceptor, "pre_delete_all_contexts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ContextsRestInterceptor, "pre_delete_all_contexts" + ) as pre, + ): pre.assert_not_called() pb_message = context.DeleteAllContextsRequest.pb( context.DeleteAllContextsRequest() @@ -5832,8 +5846,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5892,8 +5907,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5954,8 +5970,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6016,8 +6033,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6076,8 +6094,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6317,11 +6336,14 @@ def test_contexts_base_transport(): def test_contexts_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.contexts.transports.ContextsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.contexts.transports.ContextsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContextsTransport( @@ -6341,9 +6363,12 @@ def test_contexts_base_transport_with_credentials_file(): def test_contexts_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.contexts.transports.ContextsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.contexts.transports.ContextsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ContextsTransport() @@ -6421,11 +6446,12 @@ def test_contexts_transport_auth_gdch_credentials(transport_class): def test_contexts_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversation_profiles.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversation_profiles.py index 67fd7a41969e..8825f3f39653 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversation_profiles.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversation_profiles.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.conversation_profiles import ( ConversationProfilesAsyncClient, @@ -72,12 +72,15 @@ pagers, transports, ) +from google.cloud.dialogflow_v2beta1.types import ( + audio_config, + conversation_profile, + generator, + participant, +) from google.cloud.dialogflow_v2beta1.types import ( conversation_profile as gcd_conversation_profile, ) -from google.cloud.dialogflow_v2beta1.types import audio_config -from google.cloud.dialogflow_v2beta1.types import conversation_profile -from google.cloud.dialogflow_v2beta1.types import generator, participant CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1011,10 +1014,9 @@ def test_conversation_profiles_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1061,9 @@ def test_conversation_profiles_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1099,9 @@ def test_conversation_profiles_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1357,13 +1357,13 @@ def test_conversation_profiles_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6083,8 +6083,9 @@ def test_list_conversation_profiles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6149,19 +6150,22 @@ def test_list_conversation_profiles_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, - "post_list_conversation_profiles", - ) as post, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "post_list_conversation_profiles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationProfilesRestInterceptor, "pre_list_conversation_profiles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_list_conversation_profiles", + ) as post, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_list_conversation_profiles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_list_conversation_profiles", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6219,8 +6223,9 @@ def test_get_conversation_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6291,18 +6296,22 @@ def test_get_conversation_profile_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, "post_get_conversation_profile" - ) as post, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "post_get_conversation_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationProfilesRestInterceptor, "pre_get_conversation_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_get_conversation_profile", + ) as post, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_get_conversation_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_get_conversation_profile", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6360,8 +6369,9 @@ def test_create_conversation_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6621,20 +6631,22 @@ def test_create_conversation_profile_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, - "post_create_conversation_profile", - ) as post, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "post_create_conversation_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "pre_create_conversation_profile", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_create_conversation_profile", + ) as post, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_create_conversation_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_create_conversation_profile", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6696,8 +6708,9 @@ def test_update_conversation_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6961,20 +6974,22 @@ def test_update_conversation_profile_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, - "post_update_conversation_profile", - ) as post, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "post_update_conversation_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "pre_update_conversation_profile", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_update_conversation_profile", + ) as post, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_update_conversation_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_update_conversation_profile", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7032,8 +7047,9 @@ def test_delete_conversation_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7090,14 +7106,14 @@ def test_delete_conversation_profile_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, - "pre_delete_conversation_profile", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_delete_conversation_profile", + ) as pre, + ): pre.assert_not_called() pb_message = conversation_profile.DeleteConversationProfileRequest.pb( conversation_profile.DeleteConversationProfileRequest() @@ -7144,8 +7160,9 @@ def test_set_suggestion_feature_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7204,22 +7221,23 @@ def test_set_suggestion_feature_config_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, - "post_set_suggestion_feature_config", - ) as post, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "post_set_suggestion_feature_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "pre_set_suggestion_feature_config", - ) as pre: + 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.ConversationProfilesRestInterceptor, + "post_set_suggestion_feature_config", + ) as post, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_set_suggestion_feature_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_set_suggestion_feature_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7274,8 +7292,9 @@ def test_clear_suggestion_feature_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7334,22 +7353,23 @@ def test_clear_suggestion_feature_config_rest_interceptors(null_interceptor): ) client = ConversationProfilesClient(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.ConversationProfilesRestInterceptor, - "post_clear_suggestion_feature_config", - ) as post, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "post_clear_suggestion_feature_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationProfilesRestInterceptor, - "pre_clear_suggestion_feature_config", - ) as pre: + 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.ConversationProfilesRestInterceptor, + "post_clear_suggestion_feature_config", + ) as post, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "post_clear_suggestion_feature_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationProfilesRestInterceptor, + "pre_clear_suggestion_feature_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7402,8 +7422,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7462,8 +7483,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7524,8 +7546,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7586,8 +7609,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7646,8 +7670,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7942,11 +7967,14 @@ def test_conversation_profiles_base_transport(): def test_conversation_profiles_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.conversation_profiles.transports.ConversationProfilesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.conversation_profiles.transports.ConversationProfilesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationProfilesTransport( @@ -7966,9 +7994,12 @@ def test_conversation_profiles_base_transport_with_credentials_file(): def test_conversation_profiles_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.conversation_profiles.transports.ConversationProfilesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.conversation_profiles.transports.ConversationProfilesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationProfilesTransport() @@ -8046,11 +8077,12 @@ def test_conversation_profiles_transport_auth_gdch_credentials(transport_class): def test_conversation_profiles_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversations.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversations.py index 121c24e70b9b..6138bff86551 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversations.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_conversations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.conversations import ( ConversationsAsyncClient, @@ -66,8 +71,7 @@ from google.cloud.dialogflow_v2beta1.types import ( agent_coaching_instruction, audio_config, -) -from google.cloud.dialogflow_v2beta1.types import ( + conversation, conversation_profile, generator, participant, @@ -75,7 +79,6 @@ tool_call, ) from google.cloud.dialogflow_v2beta1.types import conversation as gcd_conversation -from google.cloud.dialogflow_v2beta1.types import conversation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -958,10 +961,9 @@ def test_conversations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1008,9 @@ def test_conversations_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1046,9 @@ def test_conversations_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1291,13 +1291,13 @@ def test_conversations_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1427,9 +1427,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -1795,9 +1795,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -2343,9 +2343,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -2697,9 +2697,9 @@ def test_complete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_conversation] = ( + mock_rpc + ) request = {} client.complete_conversation(request) @@ -3443,9 +3443,9 @@ def test_batch_create_messages_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_messages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_messages] = ( + mock_rpc + ) request = {} client.batch_create_messages(request) @@ -5180,9 +5180,9 @@ def test_search_knowledge_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_knowledge - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_knowledge] = ( + mock_rpc + ) request = {} client.search_knowledge(request) @@ -5431,9 +5431,9 @@ def test_generate_suggestions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_suggestions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_suggestions] = ( + mock_rpc + ) request = {} client.generate_suggestions(request) @@ -5705,9 +5705,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -5899,9 +5899,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -6158,9 +6158,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -6340,9 +6340,9 @@ def test_complete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.complete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.complete_conversation] = ( + mock_rpc + ) request = {} client.complete_conversation(request) @@ -6738,9 +6738,9 @@ def test_batch_create_messages_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_messages - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_messages] = ( + mock_rpc + ) request = {} client.batch_create_messages(request) @@ -7634,9 +7634,9 @@ def test_search_knowledge_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_knowledge - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_knowledge] = ( + mock_rpc + ) request = {} client.search_knowledge(request) @@ -7777,9 +7777,9 @@ def test_generate_suggestions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_suggestions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_suggestions] = ( + mock_rpc + ) request = {} client.generate_suggestions(request) @@ -8692,8 +8692,9 @@ def test_create_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8853,18 +8854,20 @@ def test_create_conversation_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_create_conversation" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_create_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_create_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_create_conversation" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_create_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_create_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8919,8 +8922,9 @@ def test_list_conversations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8983,17 +8987,20 @@ def test_list_conversations_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_list_conversations" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, "post_list_conversations_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_list_conversations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_list_conversations" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_list_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_list_conversations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9051,8 +9058,9 @@ def test_get_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9126,17 +9134,20 @@ def test_get_conversation_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_get_conversation" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, "post_get_conversation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_get_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_get_conversation" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_get_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_get_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9189,8 +9200,9 @@ def test_complete_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9264,18 +9276,20 @@ def test_complete_conversation_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_complete_conversation" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_complete_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_complete_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_complete_conversation" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_complete_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_complete_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9330,8 +9344,9 @@ def test_ingest_context_references_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9393,18 +9408,20 @@ def test_ingest_context_references_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_ingest_context_references" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_ingest_context_references_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_ingest_context_references" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_ingest_context_references" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_ingest_context_references_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_ingest_context_references" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9462,8 +9479,9 @@ def test_batch_create_messages_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9523,18 +9541,20 @@ def test_batch_create_messages_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_batch_create_messages" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_batch_create_messages_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_batch_create_messages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_batch_create_messages" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_batch_create_messages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_batch_create_messages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9590,8 +9610,9 @@ def test_list_messages_rest_bad_request(request_type=conversation.ListMessagesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9654,17 +9675,19 @@ def test_list_messages_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_list_messages" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, "post_list_messages_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_list_messages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_list_messages" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_list_messages_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_list_messages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9719,8 +9742,9 @@ def test_suggest_conversation_summary_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9787,18 +9811,20 @@ def test_suggest_conversation_summary_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_suggest_conversation_summary" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_suggest_conversation_summary_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_suggest_conversation_summary" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_suggest_conversation_summary" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_suggest_conversation_summary_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_suggest_conversation_summary" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9856,8 +9882,9 @@ def test_generate_stateless_summary_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9922,18 +9949,20 @@ def test_generate_stateless_summary_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_generate_stateless_summary" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_generate_stateless_summary_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_generate_stateless_summary" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_generate_stateless_summary" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_generate_stateless_summary_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_generate_stateless_summary" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9991,8 +10020,9 @@ def test_generate_stateless_suggestion_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10052,18 +10082,21 @@ def test_generate_stateless_suggestion_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_generate_stateless_suggestion" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_generate_stateless_suggestion_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_generate_stateless_suggestion" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_generate_stateless_suggestion", + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_generate_stateless_suggestion_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_generate_stateless_suggestion" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10121,8 +10154,9 @@ def test_search_knowledge_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10185,17 +10219,20 @@ def test_search_knowledge_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_search_knowledge" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, "post_search_knowledge_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_search_knowledge" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_search_knowledge" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_search_knowledge_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_search_knowledge" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10253,8 +10290,9 @@ def test_generate_suggestions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10317,18 +10355,20 @@ def test_generate_suggestions_rest_interceptors(null_interceptor): ) client = ConversationsClient(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.ConversationsRestInterceptor, "post_generate_suggestions" - ) as post, mock.patch.object( - transports.ConversationsRestInterceptor, - "post_generate_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationsRestInterceptor, "pre_generate_suggestions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationsRestInterceptor, "post_generate_suggestions" + ) as post, + mock.patch.object( + transports.ConversationsRestInterceptor, + "post_generate_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationsRestInterceptor, "pre_generate_suggestions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10386,8 +10426,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10446,8 +10487,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10508,8 +10550,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10570,8 +10613,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10630,8 +10674,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11013,11 +11058,14 @@ def test_conversations_base_transport(): def test_conversations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.conversations.transports.ConversationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.conversations.transports.ConversationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationsTransport( @@ -11037,9 +11085,12 @@ def test_conversations_base_transport_with_credentials_file(): def test_conversations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.conversations.transports.ConversationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.conversations.transports.ConversationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationsTransport() @@ -11117,11 +11168,12 @@ def test_conversations_transport_auth_gdch_credentials(transport_class): def test_conversations_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_documents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_documents.py index 81632fea912e..fb7ef85c14aa 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_documents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_documents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.documents import ( DocumentsAsyncClient, @@ -74,9 +74,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import document +from google.cloud.dialogflow_v2beta1.types import document, gcs from google.cloud.dialogflow_v2beta1.types import document as gcd_document -from google.cloud.dialogflow_v2beta1.types import gcs CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -932,10 +931,9 @@ def test_documents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -980,10 +978,9 @@ def test_documents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1019,10 +1016,9 @@ def test_documents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1251,13 +1247,13 @@ def test_documents_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2562,9 +2558,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -4365,9 +4361,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5484,8 +5480,9 @@ def test_list_documents_rest_bad_request(request_type=document.ListDocumentsRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5546,17 +5543,19 @@ def test_list_documents_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_list_documents" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_list_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_list_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_list_documents" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_list_documents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_list_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5607,8 +5606,9 @@ def test_get_document_rest_bad_request(request_type=document.GetDocumentRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5680,17 +5680,19 @@ def test_get_document_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_get_document" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_get_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_get_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_get_document" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_get_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_get_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5741,8 +5743,9 @@ def test_create_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5889,19 +5892,20 @@ def test_create_document_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_create_document" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_create_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_create_document" - ) as pre: + 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.DocumentsRestInterceptor, "post_create_document" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_create_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_create_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5954,8 +5958,9 @@ def test_import_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6010,19 +6015,20 @@ def test_import_documents_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_import_documents" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_import_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_import_documents" - ) as pre: + 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.DocumentsRestInterceptor, "post_import_documents" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_import_documents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_import_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6073,8 +6079,9 @@ def test_delete_document_rest_bad_request(request_type=document.DeleteDocumentRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6129,19 +6136,20 @@ def test_delete_document_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_delete_document" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_delete_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_delete_document" - ) as pre: + 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.DocumentsRestInterceptor, "post_delete_document" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_delete_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_delete_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6196,8 +6204,9 @@ def test_update_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6348,19 +6357,20 @@ def test_update_document_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_update_document" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_update_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_update_document" - ) as pre: + 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.DocumentsRestInterceptor, "post_update_document" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_update_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_update_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6411,8 +6421,9 @@ def test_reload_document_rest_bad_request(request_type=document.ReloadDocumentRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6467,19 +6478,20 @@ def test_reload_document_rest_interceptors(null_interceptor): ) client = DocumentsClient(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.DocumentsRestInterceptor, "post_reload_document" - ) as post, mock.patch.object( - transports.DocumentsRestInterceptor, "post_reload_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentsRestInterceptor, "pre_reload_document" - ) as pre: + 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.DocumentsRestInterceptor, "post_reload_document" + ) as post, + mock.patch.object( + transports.DocumentsRestInterceptor, "post_reload_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentsRestInterceptor, "pre_reload_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6530,8 +6542,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6590,8 +6603,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6652,8 +6666,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6714,8 +6729,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6774,8 +6790,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7056,11 +7073,14 @@ def test_documents_base_transport(): def test_documents_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.documents.transports.DocumentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.documents.transports.DocumentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentsTransport( @@ -7080,9 +7100,12 @@ def test_documents_base_transport_with_credentials_file(): def test_documents_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.documents.transports.DocumentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.documents.transports.DocumentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentsTransport() @@ -7160,11 +7183,12 @@ def test_documents_transport_auth_gdch_credentials(transport_class): def test_documents_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_encryption_spec_service.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_encryption_spec_service.py index f50830b1a24f..22a38e2693cb 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_encryption_spec_service.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_encryption_spec_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -68,8 +68,8 @@ EncryptionSpecServiceClient, transports, ) -from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec from google.cloud.dialogflow_v2beta1.types import encryption_spec +from google.cloud.dialogflow_v2beta1.types import encryption_spec as gcd_encryption_spec CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1005,10 +1005,9 @@ def test_encryption_spec_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1053,10 +1052,9 @@ def test_encryption_spec_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1092,10 +1090,9 @@ def test_encryption_spec_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1351,13 +1348,13 @@ def test_encryption_spec_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1475,9 +1472,9 @@ def test_get_encryption_spec_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_spec] = ( + mock_rpc + ) request = {} client.get_encryption_spec(request) @@ -2094,9 +2091,9 @@ def test_get_encryption_spec_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_encryption_spec - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_encryption_spec] = ( + mock_rpc + ) request = {} client.get_encryption_spec(request) @@ -2676,8 +2673,9 @@ def test_get_encryption_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2742,18 +2740,20 @@ def test_get_encryption_spec_rest_interceptors(null_interceptor): ) client = EncryptionSpecServiceClient(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.EncryptionSpecServiceRestInterceptor, "post_get_encryption_spec" - ) as post, mock.patch.object( - transports.EncryptionSpecServiceRestInterceptor, - "post_get_encryption_spec_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EncryptionSpecServiceRestInterceptor, "pre_get_encryption_spec" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EncryptionSpecServiceRestInterceptor, "post_get_encryption_spec" + ) as post, + mock.patch.object( + transports.EncryptionSpecServiceRestInterceptor, + "post_get_encryption_spec_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EncryptionSpecServiceRestInterceptor, "pre_get_encryption_spec" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2810,8 +2810,9 @@ def test_initialize_encryption_spec_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2870,22 +2871,23 @@ def test_initialize_encryption_spec_rest_interceptors(null_interceptor): ) client = EncryptionSpecServiceClient(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.EncryptionSpecServiceRestInterceptor, - "post_initialize_encryption_spec", - ) as post, mock.patch.object( - transports.EncryptionSpecServiceRestInterceptor, - "post_initialize_encryption_spec_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EncryptionSpecServiceRestInterceptor, - "pre_initialize_encryption_spec", - ) as pre: + 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.EncryptionSpecServiceRestInterceptor, + "post_initialize_encryption_spec", + ) as post, + mock.patch.object( + transports.EncryptionSpecServiceRestInterceptor, + "post_initialize_encryption_spec_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EncryptionSpecServiceRestInterceptor, + "pre_initialize_encryption_spec", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2938,8 +2940,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2998,8 +3001,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3060,8 +3064,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3122,8 +3127,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3182,8 +3188,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3363,11 +3370,14 @@ def test_encryption_spec_service_base_transport(): def test_encryption_spec_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.encryption_spec_service.transports.EncryptionSpecServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.encryption_spec_service.transports.EncryptionSpecServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EncryptionSpecServiceTransport( @@ -3387,9 +3397,12 @@ def test_encryption_spec_service_base_transport_with_credentials_file(): def test_encryption_spec_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.encryption_spec_service.transports.EncryptionSpecServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.encryption_spec_service.transports.EncryptionSpecServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EncryptionSpecServiceTransport() @@ -3469,11 +3482,12 @@ def test_encryption_spec_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_entity_types.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_entity_types.py index 9185aa913642..7df8dee218b0 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_entity_types.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.entity_types import ( EntityTypesAsyncClient, @@ -72,8 +72,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type from google.cloud.dialogflow_v2beta1.types import entity_type +from google.cloud.dialogflow_v2beta1.types import entity_type as gcd_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -937,10 +937,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +984,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1022,9 @@ def test_entity_types_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1256,13 +1253,13 @@ def test_entity_types_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1380,9 +1377,9 @@ def test_list_entity_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -2303,9 +2300,9 @@ def test_create_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -2687,9 +2684,9 @@ def test_update_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -3057,9 +3054,9 @@ def test_delete_entity_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -4011,9 +4008,9 @@ def test_batch_create_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_entities] = ( + mock_rpc + ) request = {} client.batch_create_entities(request) @@ -4379,9 +4376,9 @@ def test_batch_update_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_entities] = ( + mock_rpc + ) request = {} client.batch_update_entities(request) @@ -4747,9 +4744,9 @@ def test_batch_delete_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_entities] = ( + mock_rpc + ) request = {} client.batch_delete_entities(request) @@ -5045,9 +5042,9 @@ def test_list_entity_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entity_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entity_types] = ( + mock_rpc + ) request = {} client.list_entity_types(request) @@ -5489,9 +5486,9 @@ def test_create_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entity_type] = ( + mock_rpc + ) request = {} client.create_entity_type(request) @@ -5685,9 +5682,9 @@ def test_update_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entity_type] = ( + mock_rpc + ) request = {} client.update_entity_type(request) @@ -5884,9 +5881,9 @@ def test_delete_entity_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entity_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entity_type] = ( + mock_rpc + ) request = {} client.delete_entity_type(request) @@ -6385,9 +6382,9 @@ def test_batch_create_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_create_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_create_entities] = ( + mock_rpc + ) request = {} client.batch_create_entities(request) @@ -6580,9 +6577,9 @@ def test_batch_update_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_entities] = ( + mock_rpc + ) request = {} client.batch_update_entities(request) @@ -6775,9 +6772,9 @@ def test_batch_delete_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_entities] = ( + mock_rpc + ) request = {} client.batch_delete_entities(request) @@ -7602,8 +7599,9 @@ def test_list_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7666,17 +7664,20 @@ def test_list_entity_types_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_list_entity_types" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_list_entity_types_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_list_entity_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_list_entity_types" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_list_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_list_entity_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7734,8 +7735,9 @@ def test_get_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7809,17 +7811,19 @@ def test_get_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_get_entity_type" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_get_entity_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_get_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_get_entity_type" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_get_entity_type_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_get_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7872,8 +7876,9 @@ def test_create_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8024,17 +8029,20 @@ def test_create_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_create_entity_type" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_create_entity_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_create_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_create_entity_type" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_create_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_create_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8089,8 +8097,9 @@ def test_update_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8243,17 +8252,20 @@ def test_update_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_update_entity_type" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, "post_update_entity_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_update_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "post_update_entity_type" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_update_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_update_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8306,8 +8318,9 @@ def test_delete_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8364,13 +8377,13 @@ def test_delete_entity_type_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "pre_delete_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_delete_entity_type" + ) as pre, + ): pre.assert_not_called() pb_message = entity_type.DeleteEntityTypeRequest.pb( entity_type.DeleteEntityTypeRequest() @@ -8415,8 +8428,9 @@ def test_batch_update_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8473,20 +8487,21 @@ def test_batch_update_entity_types_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_batch_update_entity_types" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, - "post_batch_update_entity_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_batch_update_entity_types" - ) as pre: + 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.EntityTypesRestInterceptor, "post_batch_update_entity_types" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_batch_update_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_batch_update_entity_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8539,8 +8554,9 @@ def test_batch_delete_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8597,20 +8613,21 @@ def test_batch_delete_entity_types_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_batch_delete_entity_types" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, - "post_batch_delete_entity_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_batch_delete_entity_types" - ) as pre: + 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.EntityTypesRestInterceptor, "post_batch_delete_entity_types" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_batch_delete_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_batch_delete_entity_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8663,8 +8680,9 @@ def test_batch_create_entities_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8721,20 +8739,21 @@ def test_batch_create_entities_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_batch_create_entities" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, - "post_batch_create_entities_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_batch_create_entities" - ) as pre: + 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.EntityTypesRestInterceptor, "post_batch_create_entities" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_batch_create_entities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_batch_create_entities" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8787,8 +8806,9 @@ def test_batch_update_entities_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8845,20 +8865,21 @@ def test_batch_update_entities_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_batch_update_entities" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, - "post_batch_update_entities_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_batch_update_entities" - ) as pre: + 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.EntityTypesRestInterceptor, "post_batch_update_entities" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_batch_update_entities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_batch_update_entities" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8911,8 +8932,9 @@ def test_batch_delete_entities_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8969,20 +8991,21 @@ def test_batch_delete_entities_rest_interceptors(null_interceptor): ) client = EntityTypesClient(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.EntityTypesRestInterceptor, "post_batch_delete_entities" - ) as post, mock.patch.object( - transports.EntityTypesRestInterceptor, - "post_batch_delete_entities_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EntityTypesRestInterceptor, "pre_batch_delete_entities" - ) as pre: + 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.EntityTypesRestInterceptor, "post_batch_delete_entities" + ) as post, + mock.patch.object( + transports.EntityTypesRestInterceptor, + "post_batch_delete_entities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EntityTypesRestInterceptor, "pre_batch_delete_entities" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9035,8 +9058,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9095,8 +9119,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9157,8 +9182,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9219,8 +9245,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9279,8 +9306,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9642,11 +9670,14 @@ def test_entity_types_base_transport(): def test_entity_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EntityTypesTransport( @@ -9666,9 +9697,12 @@ def test_entity_types_base_transport_with_credentials_file(): def test_entity_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.entity_types.transports.EntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EntityTypesTransport() @@ -9746,11 +9780,12 @@ def test_entity_types_transport_auth_gdch_credentials(transport_class): def test_entity_types_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_environments.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_environments.py index 2c691c0ee2a1..21dd37e05904 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_environments.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_environments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.environments import ( EnvironmentsAsyncClient, @@ -930,10 +935,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +982,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1020,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1259,13 +1261,13 @@ def test_environments_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1381,9 +1383,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -2185,9 +2187,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -2448,9 +2450,9 @@ def test_update_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -2706,9 +2708,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -3351,9 +3353,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -3731,9 +3733,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -3880,9 +3882,9 @@ def test_update_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -4020,9 +4022,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -4771,8 +4773,9 @@ def test_list_environments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4835,17 +4838,20 @@ def test_list_environments_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_environments" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_list_environments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_environments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_environments" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_environments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_list_environments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4903,8 +4909,9 @@ def test_get_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4973,17 +4980,19 @@ def test_get_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_get_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_get_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_get_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_get_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5036,8 +5045,9 @@ def test_create_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5199,17 +5209,20 @@ def test_create_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_create_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_create_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_create_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_create_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_create_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_create_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5264,8 +5277,9 @@ def test_update_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5429,17 +5443,20 @@ def test_update_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_update_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_update_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_update_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_update_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_update_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_update_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5492,8 +5509,9 @@ def test_delete_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5550,13 +5568,13 @@ def test_delete_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "pre_delete_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_delete_environment" + ) as pre, + ): pre.assert_not_called() pb_message = environment.DeleteEnvironmentRequest.pb( environment.DeleteEnvironmentRequest() @@ -5601,8 +5619,9 @@ def test_get_environment_history_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5667,18 +5686,20 @@ def test_get_environment_history_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_get_environment_history" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_get_environment_history_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_get_environment_history" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment_history" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_get_environment_history_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_get_environment_history" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5733,8 +5754,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5793,8 +5815,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5855,8 +5878,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5917,8 +5941,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5977,8 +6002,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6226,11 +6252,14 @@ def test_environments_base_transport(): def test_environments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnvironmentsTransport( @@ -6250,9 +6279,12 @@ def test_environments_base_transport_with_credentials_file(): def test_environments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnvironmentsTransport() @@ -6330,11 +6362,12 @@ def test_environments_transport_auth_gdch_credentials(transport_class): def test_environments_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_fulfillments.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_fulfillments.py index 8a11a6ff565b..7066abea5d95 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_fulfillments.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_fulfillments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,25 +43,30 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.fulfillments import ( FulfillmentsAsyncClient, FulfillmentsClient, transports, ) -from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment from google.cloud.dialogflow_v2beta1.types import fulfillment +from google.cloud.dialogflow_v2beta1.types import fulfillment as gcd_fulfillment CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -929,10 +934,9 @@ def test_fulfillments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +981,9 @@ def test_fulfillments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1019,9 @@ def test_fulfillments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1258,13 +1260,13 @@ def test_fulfillments_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1711,9 +1713,9 @@ def test_update_fulfillment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fulfillment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fulfillment] = ( + mock_rpc + ) request = {} client.update_fulfillment(request) @@ -2176,9 +2178,9 @@ def test_update_fulfillment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_fulfillment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_fulfillment] = ( + mock_rpc + ) request = {} client.update_fulfillment(request) @@ -2585,8 +2587,9 @@ def test_get_fulfillment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2653,17 +2656,19 @@ def test_get_fulfillment_rest_interceptors(null_interceptor): ) client = FulfillmentsClient(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.FulfillmentsRestInterceptor, "post_get_fulfillment" - ) as post, mock.patch.object( - transports.FulfillmentsRestInterceptor, "post_get_fulfillment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FulfillmentsRestInterceptor, "pre_get_fulfillment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FulfillmentsRestInterceptor, "post_get_fulfillment" + ) as post, + mock.patch.object( + transports.FulfillmentsRestInterceptor, "post_get_fulfillment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FulfillmentsRestInterceptor, "pre_get_fulfillment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2716,8 +2721,9 @@ def test_update_fulfillment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2864,17 +2870,20 @@ def test_update_fulfillment_rest_interceptors(null_interceptor): ) client = FulfillmentsClient(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.FulfillmentsRestInterceptor, "post_update_fulfillment" - ) as post, mock.patch.object( - transports.FulfillmentsRestInterceptor, "post_update_fulfillment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FulfillmentsRestInterceptor, "pre_update_fulfillment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FulfillmentsRestInterceptor, "post_update_fulfillment" + ) as post, + mock.patch.object( + transports.FulfillmentsRestInterceptor, + "post_update_fulfillment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FulfillmentsRestInterceptor, "pre_update_fulfillment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2929,8 +2938,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2989,8 +2999,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3051,8 +3062,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3113,8 +3125,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3173,8 +3186,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3330,11 +3344,14 @@ def test_fulfillments_base_transport(): def test_fulfillments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.fulfillments.transports.FulfillmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.fulfillments.transports.FulfillmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FulfillmentsTransport( @@ -3354,9 +3371,12 @@ def test_fulfillments_base_transport_with_credentials_file(): def test_fulfillments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.fulfillments.transports.FulfillmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.fulfillments.transports.FulfillmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FulfillmentsTransport() @@ -3434,11 +3454,12 @@ def test_fulfillments_transport_auth_gdch_credentials(transport_class): def test_fulfillments_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generator_evaluations.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generator_evaluations.py index f911524d7164..3e99583c2271 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generator_evaluations.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generator_evaluations.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.generator_evaluations import ( GeneratorEvaluationsAsyncClient, @@ -73,12 +73,16 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import agent_coaching_instruction, generator +from google.cloud.dialogflow_v2beta1.types import ( + agent_coaching_instruction, + generator, + generator_evaluation, + operations, + tool_call, +) from google.cloud.dialogflow_v2beta1.types import ( generator_evaluation as gcd_generator_evaluation, ) -from google.cloud.dialogflow_v2beta1.types import generator_evaluation -from google.cloud.dialogflow_v2beta1.types import operations, tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1012,10 +1016,9 @@ def test_generator_evaluations_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1063,9 @@ def test_generator_evaluations_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1099,10 +1101,9 @@ def test_generator_evaluations_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1358,13 +1359,13 @@ def test_generator_evaluations_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4172,8 +4173,9 @@ def test_create_generator_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4536,22 +4538,23 @@ def test_create_generator_evaluation_rest_interceptors(null_interceptor): ) client = GeneratorEvaluationsClient(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.GeneratorEvaluationsRestInterceptor, - "post_create_generator_evaluation", - ) as post, mock.patch.object( - transports.GeneratorEvaluationsRestInterceptor, - "post_create_generator_evaluation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GeneratorEvaluationsRestInterceptor, - "pre_create_generator_evaluation", - ) as pre: + 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.GeneratorEvaluationsRestInterceptor, + "post_create_generator_evaluation", + ) as post, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "post_create_generator_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "pre_create_generator_evaluation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4606,8 +4609,9 @@ def test_get_generator_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4678,18 +4682,22 @@ def test_get_generator_evaluation_rest_interceptors(null_interceptor): ) client = GeneratorEvaluationsClient(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.GeneratorEvaluationsRestInterceptor, "post_get_generator_evaluation" - ) as post, mock.patch.object( - transports.GeneratorEvaluationsRestInterceptor, - "post_get_generator_evaluation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GeneratorEvaluationsRestInterceptor, "pre_get_generator_evaluation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "post_get_generator_evaluation", + ) as post, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "post_get_generator_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "pre_get_generator_evaluation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4747,8 +4755,9 @@ def test_list_generator_evaluations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4813,19 +4822,22 @@ def test_list_generator_evaluations_rest_interceptors(null_interceptor): ) client = GeneratorEvaluationsClient(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.GeneratorEvaluationsRestInterceptor, - "post_list_generator_evaluations", - ) as post, mock.patch.object( - transports.GeneratorEvaluationsRestInterceptor, - "post_list_generator_evaluations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GeneratorEvaluationsRestInterceptor, "pre_list_generator_evaluations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "post_list_generator_evaluations", + ) as post, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "post_list_generator_evaluations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "pre_list_generator_evaluations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4885,8 +4897,9 @@ def test_delete_generator_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4945,14 +4958,14 @@ def test_delete_generator_evaluation_rest_interceptors(null_interceptor): ) client = GeneratorEvaluationsClient(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.GeneratorEvaluationsRestInterceptor, - "pre_delete_generator_evaluation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorEvaluationsRestInterceptor, + "pre_delete_generator_evaluation", + ) as pre, + ): pre.assert_not_called() pb_message = generator_evaluation.DeleteGeneratorEvaluationRequest.pb( generator_evaluation.DeleteGeneratorEvaluationRequest() @@ -4997,8 +5010,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5057,8 +5071,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5119,8 +5134,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5181,8 +5197,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5241,8 +5258,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5468,11 +5486,14 @@ def test_generator_evaluations_base_transport(): def test_generator_evaluations_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.generator_evaluations.transports.GeneratorEvaluationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.generator_evaluations.transports.GeneratorEvaluationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeneratorEvaluationsTransport( @@ -5492,9 +5513,12 @@ def test_generator_evaluations_base_transport_with_credentials_file(): def test_generator_evaluations_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.generator_evaluations.transports.GeneratorEvaluationsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.generator_evaluations.transports.GeneratorEvaluationsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeneratorEvaluationsTransport() @@ -5572,11 +5596,12 @@ def test_generator_evaluations_transport_auth_gdch_credentials(transport_class): def test_generator_evaluations_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generators.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generators.py index 3779551ace13..e8d5a54f8476 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generators.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_generators.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.generators import ( GeneratorsAsyncClient, @@ -63,10 +68,12 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import agent_coaching_instruction -from google.cloud.dialogflow_v2beta1.types import generator +from google.cloud.dialogflow_v2beta1.types import ( + agent_coaching_instruction, + generator, + tool_call, +) from google.cloud.dialogflow_v2beta1.types import generator as gcd_generator -from google.cloud.dialogflow_v2beta1.types import tool_call CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -926,10 +933,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -974,10 +980,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1013,10 +1018,9 @@ def test_generators_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1245,13 +1249,13 @@ def test_generators_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1370,9 +1374,9 @@ def test_create_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -2569,9 +2573,9 @@ def test_delete_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -2888,9 +2892,9 @@ def test_update_generator_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -3165,9 +3169,9 @@ def test_create_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_generator] = ( + mock_rpc + ) request = {} client.create_generator(request) @@ -3792,9 +3796,9 @@ def test_delete_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_generator] = ( + mock_rpc + ) request = {} client.delete_generator(request) @@ -3969,9 +3973,9 @@ def test_update_generator_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_generator - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_generator] = ( + mock_rpc + ) request = {} client.update_generator(request) @@ -4515,8 +4519,9 @@ def test_create_generator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4777,17 +4782,19 @@ def test_create_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_create_generator" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_create_generator_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_create_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_create_generator" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_create_generator_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_create_generator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4838,8 +4845,9 @@ def test_get_generator_rest_bad_request(request_type=generator.GetGeneratorReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4909,17 +4917,19 @@ def test_get_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_get_generator" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_get_generator_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_get_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_get_generator" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_get_generator_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_get_generator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4968,8 +4978,9 @@ def test_list_generators_rest_bad_request(request_type=generator.ListGeneratorsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5032,17 +5043,19 @@ def test_list_generators_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_list_generators" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_list_generators_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_list_generators" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_list_generators" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_list_generators_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_list_generators" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5097,8 +5110,9 @@ def test_delete_generator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5155,13 +5169,13 @@ def test_delete_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "pre_delete_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_delete_generator" + ) as pre, + ): pre.assert_not_called() pb_message = generator.DeleteGeneratorRequest.pb( generator.DeleteGeneratorRequest() @@ -5208,8 +5222,9 @@ def test_update_generator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5472,17 +5487,19 @@ def test_update_generator_rest_interceptors(null_interceptor): ) client = GeneratorsClient(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.GeneratorsRestInterceptor, "post_update_generator" - ) as post, mock.patch.object( - transports.GeneratorsRestInterceptor, "post_update_generator_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GeneratorsRestInterceptor, "pre_update_generator" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_update_generator" + ) as post, + mock.patch.object( + transports.GeneratorsRestInterceptor, "post_update_generator_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GeneratorsRestInterceptor, "pre_update_generator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5535,8 +5552,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5595,8 +5613,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5657,8 +5676,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5719,8 +5739,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5779,8 +5800,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5997,11 +6019,14 @@ def test_generators_base_transport(): def test_generators_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeneratorsTransport( @@ -6021,9 +6046,12 @@ def test_generators_base_transport_with_credentials_file(): def test_generators_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.generators.transports.GeneratorsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GeneratorsTransport() @@ -6101,11 +6129,12 @@ def test_generators_transport_auth_gdch_credentials(transport_class): def test_generators_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_intents.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_intents.py index 639b8e39a8fa..82b254a865ee 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_intents.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_intents.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.intents import ( IntentsAsyncClient, @@ -72,8 +72,7 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import context -from google.cloud.dialogflow_v2beta1.types import intent +from google.cloud.dialogflow_v2beta1.types import context, intent from google.cloud.dialogflow_v2beta1.types import intent as gcd_intent CRED_INFO_JSON = { @@ -912,10 +911,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +958,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +996,9 @@ def test_intents_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1227,13 +1223,13 @@ def test_intents_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3405,9 +3401,9 @@ def test_batch_update_intents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_intents] = ( + mock_rpc + ) request = {} client.batch_update_intents(request) @@ -3772,9 +3768,9 @@ def test_batch_delete_intents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_intents] = ( + mock_rpc + ) request = {} client.batch_delete_intents(request) @@ -5078,9 +5074,9 @@ def test_batch_update_intents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_intents] = ( + mock_rpc + ) request = {} client.batch_update_intents(request) @@ -5264,9 +5260,9 @@ def test_batch_delete_intents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_intents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_intents] = ( + mock_rpc + ) request = {} client.batch_delete_intents(request) @@ -5954,8 +5950,9 @@ def test_list_intents_rest_bad_request(request_type=intent.ListIntentsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6016,17 +6013,17 @@ def test_list_intents_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_list_intents" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_list_intents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_list_intents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "post_list_intents" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_list_intents_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.IntentsRestInterceptor, "pre_list_intents") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6075,8 +6072,9 @@ def test_get_intent_rest_bad_request(request_type=intent.GetIntentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6169,17 +6167,15 @@ def test_get_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_get_intent" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_get_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_get_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.IntentsRestInterceptor, "post_get_intent") as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_get_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.IntentsRestInterceptor, "pre_get_intent") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6228,8 +6224,9 @@ def test_create_intent_rest_bad_request(request_type=gcd_intent.CreateIntentRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6595,17 +6592,19 @@ def test_create_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_create_intent" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_create_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_create_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "post_create_intent" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_create_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_create_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6654,8 +6653,9 @@ def test_update_intent_rest_bad_request(request_type=gcd_intent.UpdateIntentRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7021,17 +7021,19 @@ def test_update_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_update_intent" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_update_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_update_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "post_update_intent" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_update_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_update_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7080,8 +7082,9 @@ def test_delete_intent_rest_bad_request(request_type=intent.DeleteIntentRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7136,13 +7139,13 @@ def test_delete_intent_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "pre_delete_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_delete_intent" + ) as pre, + ): pre.assert_not_called() pb_message = intent.DeleteIntentRequest.pb(intent.DeleteIntentRequest()) transcode.return_value = { @@ -7185,8 +7188,9 @@ def test_batch_update_intents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7241,19 +7245,20 @@ def test_batch_update_intents_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_batch_update_intents" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_batch_update_intents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_batch_update_intents" - ) as pre: + 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.IntentsRestInterceptor, "post_batch_update_intents" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_batch_update_intents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_batch_update_intents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7306,8 +7311,9 @@ def test_batch_delete_intents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7362,19 +7368,20 @@ def test_batch_delete_intents_rest_interceptors(null_interceptor): ) client = IntentsClient(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.IntentsRestInterceptor, "post_batch_delete_intents" - ) as post, mock.patch.object( - transports.IntentsRestInterceptor, "post_batch_delete_intents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IntentsRestInterceptor, "pre_batch_delete_intents" - ) as pre: + 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.IntentsRestInterceptor, "post_batch_delete_intents" + ) as post, + mock.patch.object( + transports.IntentsRestInterceptor, "post_batch_delete_intents_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IntentsRestInterceptor, "pre_batch_delete_intents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7427,8 +7434,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7487,8 +7495,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7549,8 +7558,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7611,8 +7621,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7671,8 +7682,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7957,11 +7969,14 @@ def test_intents_base_transport(): def test_intents_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.intents.transports.IntentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.intents.transports.IntentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IntentsTransport( @@ -7981,9 +7996,12 @@ def test_intents_base_transport_with_credentials_file(): def test_intents_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.intents.transports.IntentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.intents.transports.IntentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IntentsTransport() @@ -8061,11 +8079,12 @@ def test_intents_transport_auth_gdch_credentials(transport_class): def test_intents_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_knowledge_bases.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_knowledge_bases.py index 9a324e956ba8..b9076942ceec 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_knowledge_bases.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_knowledge_bases.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.knowledge_bases import ( KnowledgeBasesAsyncClient, @@ -61,8 +66,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base from google.cloud.dialogflow_v2beta1.types import knowledge_base +from google.cloud.dialogflow_v2beta1.types import knowledge_base as gcd_knowledge_base CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -949,10 +954,9 @@ def test_knowledge_bases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +1001,9 @@ def test_knowledge_bases_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1039,9 @@ def test_knowledge_bases_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1282,13 +1284,13 @@ def test_knowledge_bases_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1408,9 +1410,9 @@ def test_list_knowledge_bases_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_knowledge_bases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_knowledge_bases] = ( + mock_rpc + ) request = {} client.list_knowledge_bases(request) @@ -1956,9 +1958,9 @@ def test_get_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_knowledge_base] = ( + mock_rpc + ) request = {} client.get_knowledge_base(request) @@ -2306,9 +2308,9 @@ def test_create_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_knowledge_base] = ( + mock_rpc + ) request = {} client.create_knowledge_base(request) @@ -2660,9 +2662,9 @@ def test_delete_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_knowledge_base] = ( + mock_rpc + ) request = {} client.delete_knowledge_base(request) @@ -2994,9 +2996,9 @@ def test_update_knowledge_base_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_knowledge_base] = ( + mock_rpc + ) request = {} client.update_knowledge_base(request) @@ -3282,9 +3284,9 @@ def test_list_knowledge_bases_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_knowledge_bases - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_knowledge_bases] = ( + mock_rpc + ) request = {} client.list_knowledge_bases(request) @@ -3543,9 +3545,9 @@ def test_get_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_knowledge_base] = ( + mock_rpc + ) request = {} client.get_knowledge_base(request) @@ -3725,9 +3727,9 @@ def test_create_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_knowledge_base] = ( + mock_rpc + ) request = {} client.create_knowledge_base(request) @@ -3918,9 +3920,9 @@ def test_delete_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_knowledge_base] = ( + mock_rpc + ) request = {} client.delete_knowledge_base(request) @@ -4097,9 +4099,9 @@ def test_update_knowledge_base_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_knowledge_base - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_knowledge_base] = ( + mock_rpc + ) request = {} client.update_knowledge_base(request) @@ -4658,8 +4660,9 @@ def test_list_knowledge_bases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4722,18 +4725,20 @@ def test_list_knowledge_bases_rest_interceptors(null_interceptor): ) client = KnowledgeBasesClient(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.KnowledgeBasesRestInterceptor, "post_list_knowledge_bases" - ) as post, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, - "post_list_knowledge_bases_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, "pre_list_knowledge_bases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "post_list_knowledge_bases" + ) as post, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, + "post_list_knowledge_bases_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "pre_list_knowledge_bases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4791,8 +4796,9 @@ def test_get_knowledge_base_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4859,18 +4865,20 @@ def test_get_knowledge_base_rest_interceptors(null_interceptor): ) client = KnowledgeBasesClient(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.KnowledgeBasesRestInterceptor, "post_get_knowledge_base" - ) as post, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, - "post_get_knowledge_base_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, "pre_get_knowledge_base" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "post_get_knowledge_base" + ) as post, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, + "post_get_knowledge_base_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "pre_get_knowledge_base" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4925,8 +4933,9 @@ def test_create_knowledge_base_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5067,18 +5076,20 @@ def test_create_knowledge_base_rest_interceptors(null_interceptor): ) client = KnowledgeBasesClient(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.KnowledgeBasesRestInterceptor, "post_create_knowledge_base" - ) as post, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, - "post_create_knowledge_base_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, "pre_create_knowledge_base" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "post_create_knowledge_base" + ) as post, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, + "post_create_knowledge_base_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "pre_create_knowledge_base" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5133,8 +5144,9 @@ def test_delete_knowledge_base_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5191,13 +5203,13 @@ def test_delete_knowledge_base_rest_interceptors(null_interceptor): ) client = KnowledgeBasesClient(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.KnowledgeBasesRestInterceptor, "pre_delete_knowledge_base" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "pre_delete_knowledge_base" + ) as pre, + ): pre.assert_not_called() pb_message = knowledge_base.DeleteKnowledgeBaseRequest.pb( knowledge_base.DeleteKnowledgeBaseRequest() @@ -5244,8 +5256,9 @@ def test_update_knowledge_base_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5388,18 +5401,20 @@ def test_update_knowledge_base_rest_interceptors(null_interceptor): ) client = KnowledgeBasesClient(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.KnowledgeBasesRestInterceptor, "post_update_knowledge_base" - ) as post, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, - "post_update_knowledge_base_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KnowledgeBasesRestInterceptor, "pre_update_knowledge_base" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "post_update_knowledge_base" + ) as post, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, + "post_update_knowledge_base_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KnowledgeBasesRestInterceptor, "pre_update_knowledge_base" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5454,8 +5469,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5514,8 +5530,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5576,8 +5593,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5638,8 +5656,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5698,8 +5717,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5926,11 +5946,14 @@ def test_knowledge_bases_base_transport(): def test_knowledge_bases_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.knowledge_bases.transports.KnowledgeBasesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.knowledge_bases.transports.KnowledgeBasesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.KnowledgeBasesTransport( @@ -5950,9 +5973,12 @@ def test_knowledge_bases_base_transport_with_credentials_file(): def test_knowledge_bases_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.knowledge_bases.transports.KnowledgeBasesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.knowledge_bases.transports.KnowledgeBasesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.KnowledgeBasesTransport() @@ -6030,11 +6056,12 @@ def test_knowledge_bases_transport_auth_gdch_credentials(transport_class): def test_knowledge_bases_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_participants.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_participants.py index ab3b7ad7f017..1468f410b385 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_participants.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_participants.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,21 +43,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.participants import ( ParticipantsAsyncClient, @@ -70,10 +75,11 @@ audio_config, context, entity_type, + participant, + session, + session_entity_type, ) from google.cloud.dialogflow_v2beta1.types import participant as gcd_participant -from google.cloud.dialogflow_v2beta1.types import participant -from google.cloud.dialogflow_v2beta1.types import session, session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -941,10 +947,9 @@ def test_participants_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +994,9 @@ def test_participants_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1032,9 @@ def test_participants_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1270,13 +1273,13 @@ def test_participants_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1401,9 +1404,9 @@ def test_create_participant_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_participant] = ( + mock_rpc + ) request = {} client.create_participant(request) @@ -2103,9 +2106,9 @@ def test_list_participants_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -2651,9 +2654,9 @@ def test_update_participant_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_participant] = ( + mock_rpc + ) request = {} client.update_participant(request) @@ -3685,9 +3688,9 @@ def test_suggest_articles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_articles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_articles] = ( + mock_rpc + ) request = {} client.suggest_articles(request) @@ -4022,9 +4025,9 @@ def test_suggest_faq_answers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_faq_answers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_faq_answers] = ( + mock_rpc + ) request = {} client.suggest_faq_answers(request) @@ -4370,9 +4373,9 @@ def test_suggest_smart_replies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_smart_replies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_smart_replies] = ( + mock_rpc + ) request = {} client.suggest_smart_replies(request) @@ -4976,9 +4979,9 @@ def test_list_suggestions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_suggestions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_suggestions] = ( + mock_rpc + ) request = {} client.list_suggestions(request) @@ -5423,9 +5426,9 @@ def test_compile_suggestion_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compile_suggestion - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compile_suggestion] = ( + mock_rpc + ) request = {} client.compile_suggestion(request) @@ -5612,9 +5615,9 @@ def test_create_participant_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_participant] = ( + mock_rpc + ) request = {} client.create_participant(request) @@ -5983,9 +5986,9 @@ def test_list_participants_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_participants - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_participants] = ( + mock_rpc + ) request = {} client.list_participants(request) @@ -6243,9 +6246,9 @@ def test_update_participant_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_participant - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_participant] = ( + mock_rpc + ) request = {} client.update_participant(request) @@ -6645,9 +6648,9 @@ def test_suggest_articles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_articles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_articles] = ( + mock_rpc + ) request = {} client.suggest_articles(request) @@ -6830,9 +6833,9 @@ def test_suggest_faq_answers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_faq_answers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_faq_answers] = ( + mock_rpc + ) request = {} client.suggest_faq_answers(request) @@ -7016,9 +7019,9 @@ def test_suggest_smart_replies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.suggest_smart_replies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.suggest_smart_replies] = ( + mock_rpc + ) request = {} client.suggest_smart_replies(request) @@ -7325,9 +7328,9 @@ def test_list_suggestions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_suggestions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_suggestions] = ( + mock_rpc + ) request = {} client.list_suggestions(request) @@ -7430,9 +7433,9 @@ def test_compile_suggestion_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compile_suggestion - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compile_suggestion] = ( + mock_rpc + ) request = {} client.compile_suggestion(request) @@ -8182,8 +8185,9 @@ def test_create_participant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8329,17 +8333,20 @@ def test_create_participant_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_create_participant" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_create_participant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_create_participant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_create_participant" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_create_participant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_create_participant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8396,8 +8403,9 @@ def test_get_participant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8471,17 +8479,19 @@ def test_get_participant_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_get_participant" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_get_participant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_get_participant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_get_participant" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_get_participant_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_get_participant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8534,8 +8544,9 @@ def test_list_participants_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8598,17 +8609,20 @@ def test_list_participants_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_list_participants" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_list_participants_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_list_participants" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_list_participants" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_list_participants_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_list_participants" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8670,8 +8684,9 @@ def test_update_participant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8821,17 +8836,20 @@ def test_update_participant_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_update_participant" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_update_participant_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_update_participant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_update_participant" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_update_participant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_update_participant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8888,8 +8906,9 @@ def test_analyze_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8954,17 +8973,19 @@ def test_analyze_content_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_analyze_content" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_analyze_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_analyze_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_analyze_content" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_analyze_content_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_analyze_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9049,8 +9070,9 @@ def test_suggest_articles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9117,17 +9139,20 @@ def test_suggest_articles_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_suggest_articles" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_suggest_articles_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_suggest_articles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_suggest_articles" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_suggest_articles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_suggest_articles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9187,8 +9212,9 @@ def test_suggest_faq_answers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9255,17 +9281,20 @@ def test_suggest_faq_answers_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_suggest_faq_answers" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_suggest_faq_answers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_suggest_faq_answers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_suggest_faq_answers" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_suggest_faq_answers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_suggest_faq_answers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9325,8 +9354,9 @@ def test_suggest_smart_replies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9393,18 +9423,20 @@ def test_suggest_smart_replies_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_suggest_smart_replies" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, - "post_suggest_smart_replies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_suggest_smart_replies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_suggest_smart_replies" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_suggest_smart_replies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_suggest_smart_replies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9464,8 +9496,9 @@ def test_suggest_knowledge_assist_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9532,18 +9565,20 @@ def test_suggest_knowledge_assist_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_suggest_knowledge_assist" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, - "post_suggest_knowledge_assist_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_suggest_knowledge_assist" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_suggest_knowledge_assist" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_suggest_knowledge_assist_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_suggest_knowledge_assist" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9603,8 +9638,9 @@ def test_list_suggestions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9669,17 +9705,20 @@ def test_list_suggestions_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_list_suggestions" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_list_suggestions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_list_suggestions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_list_suggestions" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_list_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_list_suggestions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9739,8 +9778,9 @@ def test_compile_suggestion_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9807,17 +9847,20 @@ def test_compile_suggestion_rest_interceptors(null_interceptor): ) client = ParticipantsClient(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.ParticipantsRestInterceptor, "post_compile_suggestion" - ) as post, mock.patch.object( - transports.ParticipantsRestInterceptor, "post_compile_suggestion_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParticipantsRestInterceptor, "pre_compile_suggestion" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParticipantsRestInterceptor, "post_compile_suggestion" + ) as post, + mock.patch.object( + transports.ParticipantsRestInterceptor, + "post_compile_suggestion_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParticipantsRestInterceptor, "pre_compile_suggestion" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9875,8 +9918,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9935,8 +9979,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9997,8 +10042,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10059,8 +10105,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10119,8 +10166,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10479,11 +10527,14 @@ def test_participants_base_transport(): def test_participants_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.participants.transports.ParticipantsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.participants.transports.ParticipantsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ParticipantsTransport( @@ -10503,9 +10554,12 @@ def test_participants_base_transport_with_credentials_file(): def test_participants_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.participants.transports.ParticipantsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.participants.transports.ParticipantsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ParticipantsTransport() @@ -10583,11 +10637,12 @@ def test_participants_transport_auth_gdch_credentials(transport_class): def test_participants_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_phone_numbers.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_phone_numbers.py index 334af9285072..aa4baec077e8 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_phone_numbers.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_phone_numbers.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.phone_numbers import ( PhoneNumbersAsyncClient, @@ -61,8 +66,8 @@ pagers, transports, ) -from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number from google.cloud.dialogflow_v2beta1.types import phone_number +from google.cloud.dialogflow_v2beta1.types import phone_number as gcd_phone_number CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -930,10 +935,9 @@ def test_phone_numbers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +982,9 @@ def test_phone_numbers_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1017,10 +1020,9 @@ def test_phone_numbers_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1259,13 +1261,13 @@ def test_phone_numbers_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1383,9 +1385,9 @@ def test_list_phone_numbers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_phone_numbers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_phone_numbers] = ( + mock_rpc + ) request = {} client.list_phone_numbers(request) @@ -1930,9 +1932,9 @@ def test_update_phone_number_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_phone_number - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_phone_number] = ( + mock_rpc + ) request = {} client.update_phone_number(request) @@ -2296,9 +2298,9 @@ def test_delete_phone_number_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_phone_number - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_phone_number] = ( + mock_rpc + ) request = {} client.delete_phone_number(request) @@ -2650,9 +2652,9 @@ def test_undelete_phone_number_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.undelete_phone_number - ] = mock_rpc + client._transport._wrapped_methods[client._transport.undelete_phone_number] = ( + mock_rpc + ) request = {} client.undelete_phone_number(request) @@ -2930,9 +2932,9 @@ def test_list_phone_numbers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_phone_numbers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_phone_numbers] = ( + mock_rpc + ) request = {} client.list_phone_numbers(request) @@ -3191,9 +3193,9 @@ def test_update_phone_number_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_phone_number - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_phone_number] = ( + mock_rpc + ) request = {} client.update_phone_number(request) @@ -3375,9 +3377,9 @@ def test_delete_phone_number_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_phone_number - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_phone_number] = ( + mock_rpc + ) request = {} client.delete_phone_number(request) @@ -3557,9 +3559,9 @@ def test_undelete_phone_number_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.undelete_phone_number - ] = mock_rpc + client._transport._wrapped_methods[client._transport.undelete_phone_number] = ( + mock_rpc + ) request = {} client.undelete_phone_number(request) @@ -4072,8 +4074,9 @@ def test_list_phone_numbers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4136,17 +4139,20 @@ def test_list_phone_numbers_rest_interceptors(null_interceptor): ) client = PhoneNumbersClient(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.PhoneNumbersRestInterceptor, "post_list_phone_numbers" - ) as post, mock.patch.object( - transports.PhoneNumbersRestInterceptor, "post_list_phone_numbers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PhoneNumbersRestInterceptor, "pre_list_phone_numbers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PhoneNumbersRestInterceptor, "post_list_phone_numbers" + ) as post, + mock.patch.object( + transports.PhoneNumbersRestInterceptor, + "post_list_phone_numbers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PhoneNumbersRestInterceptor, "pre_list_phone_numbers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4204,8 +4210,9 @@ def test_update_phone_number_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4349,17 +4356,20 @@ def test_update_phone_number_rest_interceptors(null_interceptor): ) client = PhoneNumbersClient(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.PhoneNumbersRestInterceptor, "post_update_phone_number" - ) as post, mock.patch.object( - transports.PhoneNumbersRestInterceptor, "post_update_phone_number_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PhoneNumbersRestInterceptor, "pre_update_phone_number" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PhoneNumbersRestInterceptor, "post_update_phone_number" + ) as post, + mock.patch.object( + transports.PhoneNumbersRestInterceptor, + "post_update_phone_number_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PhoneNumbersRestInterceptor, "pre_update_phone_number" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4414,8 +4424,9 @@ def test_delete_phone_number_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4484,17 +4495,20 @@ def test_delete_phone_number_rest_interceptors(null_interceptor): ) client = PhoneNumbersClient(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.PhoneNumbersRestInterceptor, "post_delete_phone_number" - ) as post, mock.patch.object( - transports.PhoneNumbersRestInterceptor, "post_delete_phone_number_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PhoneNumbersRestInterceptor, "pre_delete_phone_number" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PhoneNumbersRestInterceptor, "post_delete_phone_number" + ) as post, + mock.patch.object( + transports.PhoneNumbersRestInterceptor, + "post_delete_phone_number_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PhoneNumbersRestInterceptor, "pre_delete_phone_number" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4547,8 +4561,9 @@ def test_undelete_phone_number_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4617,18 +4632,20 @@ def test_undelete_phone_number_rest_interceptors(null_interceptor): ) client = PhoneNumbersClient(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.PhoneNumbersRestInterceptor, "post_undelete_phone_number" - ) as post, mock.patch.object( - transports.PhoneNumbersRestInterceptor, - "post_undelete_phone_number_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PhoneNumbersRestInterceptor, "pre_undelete_phone_number" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PhoneNumbersRestInterceptor, "post_undelete_phone_number" + ) as post, + mock.patch.object( + transports.PhoneNumbersRestInterceptor, + "post_undelete_phone_number_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PhoneNumbersRestInterceptor, "pre_undelete_phone_number" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4681,8 +4698,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4741,8 +4759,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4803,8 +4822,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4865,8 +4885,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4925,8 +4946,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5130,11 +5152,14 @@ def test_phone_numbers_base_transport(): def test_phone_numbers_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.phone_numbers.transports.PhoneNumbersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.phone_numbers.transports.PhoneNumbersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PhoneNumbersTransport( @@ -5154,9 +5179,12 @@ def test_phone_numbers_base_transport_with_credentials_file(): def test_phone_numbers_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.phone_numbers.transports.PhoneNumbersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.phone_numbers.transports.PhoneNumbersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PhoneNumbersTransport() @@ -5234,11 +5262,12 @@ def test_phone_numbers_transport_auth_gdch_credentials(transport_class): def test_phone_numbers_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_session_entity_types.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_session_entity_types.py index 6c8aacaf9b93..934924625707 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_session_entity_types.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_session_entity_types.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.session_entity_types import ( SessionEntityTypesAsyncClient, @@ -61,11 +66,10 @@ pagers, transports, ) +from google.cloud.dialogflow_v2beta1.types import entity_type, session_entity_type from google.cloud.dialogflow_v2beta1.types import ( session_entity_type as gcd_session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import entity_type -from google.cloud.dialogflow_v2beta1.types import session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -989,10 +993,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1078,9 @@ def test_session_entity_types_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1327,13 +1328,13 @@ def test_session_entity_types_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4752,8 +4753,9 @@ def test_list_session_entity_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4818,18 +4820,22 @@ def test_list_session_entity_types_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_list_session_entity_types" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_list_session_entity_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_list_session_entity_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_list_session_entity_types", + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_list_session_entity_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_list_session_entity_types", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4889,8 +4895,9 @@ def test_get_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4960,18 +4967,20 @@ def test_get_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_get_session_entity_type" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_get_session_entity_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_get_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, "post_get_session_entity_type" + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_get_session_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, "pre_get_session_entity_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5029,8 +5038,9 @@ def test_create_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5174,18 +5184,22 @@ def test_create_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_create_session_entity_type" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_create_session_entity_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_create_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_create_session_entity_type", + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_create_session_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_create_session_entity_type", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5247,8 +5261,9 @@ def test_update_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5396,18 +5411,22 @@ def test_update_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "post_update_session_entity_type" - ) as post, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, - "post_update_session_entity_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SessionEntityTypesRestInterceptor, "pre_update_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_update_session_entity_type", + ) as post, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "post_update_session_entity_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_update_session_entity_type", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5467,8 +5486,9 @@ def test_delete_session_entity_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5527,13 +5547,14 @@ def test_delete_session_entity_type_rest_interceptors(null_interceptor): ) client = SessionEntityTypesClient(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.SessionEntityTypesRestInterceptor, "pre_delete_session_entity_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionEntityTypesRestInterceptor, + "pre_delete_session_entity_type", + ) as pre, + ): pre.assert_not_called() pb_message = session_entity_type.DeleteSessionEntityTypeRequest.pb( session_entity_type.DeleteSessionEntityTypeRequest() @@ -5578,8 +5599,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5638,8 +5660,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5700,8 +5723,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5762,8 +5786,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5822,8 +5847,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6050,11 +6076,14 @@ def test_session_entity_types_base_transport(): def test_session_entity_types_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionEntityTypesTransport( @@ -6074,9 +6103,12 @@ def test_session_entity_types_base_transport_with_credentials_file(): def test_session_entity_types_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.session_entity_types.transports.SessionEntityTypesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionEntityTypesTransport() @@ -6154,11 +6186,12 @@ def test_session_entity_types_transport_auth_gdch_credentials(transport_class): def test_session_entity_types_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sessions.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sessions.py index 77ee0a67651d..0549bc53e558 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sessions.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sessions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,21 +43,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.sessions import ( SessionsAsyncClient, @@ -69,10 +74,10 @@ audio_config, context, entity_type, + session, + session_entity_type, ) -from google.cloud.dialogflow_v2beta1.types import session from google.cloud.dialogflow_v2beta1.types import session as gcd_session -from google.cloud.dialogflow_v2beta1.types import session_entity_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -921,10 +926,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_sessions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1236,13 +1238,13 @@ def test_sessions_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2192,8 +2194,9 @@ def test_detect_intent_rest_bad_request(request_type=gcd_session.DetectIntentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2256,17 +2259,19 @@ def test_detect_intent_rest_interceptors(null_interceptor): ) client = SessionsClient(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.SessionsRestInterceptor, "post_detect_intent" - ) as post, mock.patch.object( - transports.SessionsRestInterceptor, "post_detect_intent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionsRestInterceptor, "pre_detect_intent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionsRestInterceptor, "post_detect_intent" + ) as post, + mock.patch.object( + transports.SessionsRestInterceptor, "post_detect_intent_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionsRestInterceptor, "pre_detect_intent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2333,8 +2338,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2393,8 +2399,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2455,8 +2462,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2517,8 +2525,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2577,8 +2586,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2712,11 +2722,14 @@ def test_sessions_base_transport(): def test_sessions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.sessions.transports.SessionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.sessions.transports.SessionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionsTransport( @@ -2736,9 +2749,12 @@ def test_sessions_base_transport_with_credentials_file(): def test_sessions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.sessions.transports.SessionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.sessions.transports.SessionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionsTransport() @@ -2816,11 +2832,12 @@ def test_sessions_transport_auth_gdch_credentials(transport_class): def test_sessions_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sip_trunks.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sip_trunks.py index 75e0d728ee82..378e6e2d8324 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sip_trunks.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_sip_trunks.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.sip_trunks import ( SipTrunksAsyncClient, @@ -921,10 +926,9 @@ def test_sip_trunks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_sip_trunks_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_sip_trunks_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,13 +1242,13 @@ def test_sip_trunks_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1360,9 +1362,9 @@ def test_create_sip_trunk_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sip_trunk] = ( + mock_rpc + ) request = {} client.create_sip_trunk(request) @@ -1696,9 +1698,9 @@ def test_delete_sip_trunk_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sip_trunk] = ( + mock_rpc + ) request = {} client.delete_sip_trunk(request) @@ -2858,9 +2860,9 @@ def test_update_sip_trunk_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sip_trunk] = ( + mock_rpc + ) request = {} client.update_sip_trunk(request) @@ -3133,9 +3135,9 @@ def test_create_sip_trunk_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sip_trunk] = ( + mock_rpc + ) request = {} client.create_sip_trunk(request) @@ -3324,9 +3326,9 @@ def test_delete_sip_trunk_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sip_trunk] = ( + mock_rpc + ) request = {} client.delete_sip_trunk(request) @@ -3933,9 +3935,9 @@ def test_update_sip_trunk_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sip_trunk - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sip_trunk] = ( + mock_rpc + ) request = {} client.update_sip_trunk(request) @@ -4476,8 +4478,9 @@ def test_create_sip_trunk_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4625,17 +4628,19 @@ def test_create_sip_trunk_rest_interceptors(null_interceptor): ) client = SipTrunksClient(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.SipTrunksRestInterceptor, "post_create_sip_trunk" - ) as post, mock.patch.object( - transports.SipTrunksRestInterceptor, "post_create_sip_trunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SipTrunksRestInterceptor, "pre_create_sip_trunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_create_sip_trunk" + ) as post, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_create_sip_trunk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SipTrunksRestInterceptor, "pre_create_sip_trunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4688,8 +4693,9 @@ def test_delete_sip_trunk_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4744,13 +4750,13 @@ def test_delete_sip_trunk_rest_interceptors(null_interceptor): ) client = SipTrunksClient(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.SipTrunksRestInterceptor, "pre_delete_sip_trunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SipTrunksRestInterceptor, "pre_delete_sip_trunk" + ) as pre, + ): pre.assert_not_called() pb_message = sip_trunk.DeleteSipTrunkRequest.pb( sip_trunk.DeleteSipTrunkRequest() @@ -4793,8 +4799,9 @@ def test_list_sip_trunks_rest_bad_request(request_type=sip_trunk.ListSipTrunksRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4855,17 +4862,19 @@ def test_list_sip_trunks_rest_interceptors(null_interceptor): ) client = SipTrunksClient(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.SipTrunksRestInterceptor, "post_list_sip_trunks" - ) as post, mock.patch.object( - transports.SipTrunksRestInterceptor, "post_list_sip_trunks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SipTrunksRestInterceptor, "pre_list_sip_trunks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_list_sip_trunks" + ) as post, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_list_sip_trunks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SipTrunksRestInterceptor, "pre_list_sip_trunks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4916,8 +4925,9 @@ def test_get_sip_trunk_rest_bad_request(request_type=sip_trunk.GetSipTrunkReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4982,17 +4992,19 @@ def test_get_sip_trunk_rest_interceptors(null_interceptor): ) client = SipTrunksClient(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.SipTrunksRestInterceptor, "post_get_sip_trunk" - ) as post, mock.patch.object( - transports.SipTrunksRestInterceptor, "post_get_sip_trunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SipTrunksRestInterceptor, "pre_get_sip_trunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_get_sip_trunk" + ) as post, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_get_sip_trunk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SipTrunksRestInterceptor, "pre_get_sip_trunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5045,8 +5057,9 @@ def test_update_sip_trunk_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5196,17 +5209,19 @@ def test_update_sip_trunk_rest_interceptors(null_interceptor): ) client = SipTrunksClient(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.SipTrunksRestInterceptor, "post_update_sip_trunk" - ) as post, mock.patch.object( - transports.SipTrunksRestInterceptor, "post_update_sip_trunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SipTrunksRestInterceptor, "pre_update_sip_trunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_update_sip_trunk" + ) as post, + mock.patch.object( + transports.SipTrunksRestInterceptor, "post_update_sip_trunk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SipTrunksRestInterceptor, "pre_update_sip_trunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5259,8 +5274,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5319,8 +5335,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5381,8 +5398,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5443,8 +5461,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5503,8 +5522,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5721,11 +5741,14 @@ def test_sip_trunks_base_transport(): def test_sip_trunks_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.sip_trunks.transports.SipTrunksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.sip_trunks.transports.SipTrunksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SipTrunksTransport( @@ -5745,9 +5768,12 @@ def test_sip_trunks_base_transport_with_credentials_file(): def test_sip_trunks_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.sip_trunks.transports.SipTrunksTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.sip_trunks.transports.SipTrunksTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SipTrunksTransport() @@ -5825,11 +5851,12 @@ def test_sip_trunks_transport_auth_gdch_credentials(transport_class): def test_sip_trunks_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_tools.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_tools.py index eb347364818c..3713161917cd 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_tools.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_tools.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.tools import ( ToolsAsyncClient, @@ -897,10 +902,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -945,10 +949,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +987,9 @@ def test_tools_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1212,13 +1214,13 @@ def test_tools_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4465,8 +4467,9 @@ def test_create_tool_rest_bad_request(request_type=gcd_tool.CreateToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4665,17 +4668,15 @@ def test_create_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_create_tool" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_create_tool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_create_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_create_tool") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_create_tool_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_create_tool") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4724,8 +4725,9 @@ def test_get_tool_rest_bad_request(request_type=tool.GetToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4796,17 +4798,15 @@ def test_get_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_get_tool" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_get_tool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_get_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_get_tool") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_get_tool_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_get_tool") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4855,8 +4855,9 @@ def test_list_tools_rest_bad_request(request_type=tool.ListToolsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4917,17 +4918,15 @@ def test_list_tools_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_list_tools" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_list_tools_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_list_tools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_list_tools") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_list_tools_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_list_tools") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4976,8 +4975,9 @@ def test_delete_tool_rest_bad_request(request_type=tool.DeleteToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5032,13 +5032,11 @@ def test_delete_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "pre_delete_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "pre_delete_tool") as pre, + ): pre.assert_not_called() pb_message = tool.DeleteToolRequest.pb(tool.DeleteToolRequest()) transcode.return_value = { @@ -5081,8 +5079,9 @@ def test_update_tool_rest_bad_request(request_type=gcd_tool.UpdateToolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5283,17 +5282,15 @@ def test_update_tool_rest_interceptors(null_interceptor): ) client = ToolsClient(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.ToolsRestInterceptor, "post_update_tool" - ) as post, mock.patch.object( - transports.ToolsRestInterceptor, "post_update_tool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ToolsRestInterceptor, "pre_update_tool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.ToolsRestInterceptor, "post_update_tool") as post, + mock.patch.object( + transports.ToolsRestInterceptor, "post_update_tool_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ToolsRestInterceptor, "pre_update_tool") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5344,8 +5341,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5404,8 +5402,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5466,8 +5465,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5528,8 +5528,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5588,8 +5589,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5806,11 +5808,14 @@ def test_tools_base_transport(): def test_tools_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.tools.transports.ToolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.tools.transports.ToolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ToolsTransport( @@ -5830,9 +5835,12 @@ def test_tools_base_transport_with_credentials_file(): def test_tools_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.tools.transports.ToolsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.tools.transports.ToolsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ToolsTransport() @@ -5910,11 +5918,12 @@ def test_tools_transport_auth_gdch_credentials(transport_class): def test_tools_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_versions.py b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_versions.py index 2c378f49e7eb..d89e0a2abd11 100644 --- a/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_versions.py +++ b/packages/google-cloud-dialogflow/tests/unit/gapic/dialogflow_v2beta1/test_versions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dialogflow_v2beta1.services.versions import ( VersionsAsyncClient, @@ -912,10 +917,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -960,10 +964,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -999,10 +1002,9 @@ def test_versions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1227,13 +1229,13 @@ def test_versions_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4450,8 +4452,9 @@ def test_list_versions_rest_bad_request(request_type=version.ListVersionsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4512,17 +4515,19 @@ def test_list_versions_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_list_versions" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_list_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_list_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_list_versions" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_list_versions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_list_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4573,8 +4578,9 @@ def test_get_version_rest_bad_request(request_type=version.GetVersionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4641,17 +4647,17 @@ def test_get_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_get_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_get_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_get_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_get_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_get_version_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.VersionsRestInterceptor, "pre_get_version") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4700,8 +4706,9 @@ def test_create_version_rest_bad_request(request_type=gcd_version.CreateVersionR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4842,17 +4849,19 @@ def test_create_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_create_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_create_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_create_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_create_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_create_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_create_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4903,8 +4912,9 @@ def test_update_version_rest_bad_request(request_type=gcd_version.UpdateVersionR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5045,17 +5055,19 @@ def test_update_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "post_update_version" - ) as post, mock.patch.object( - transports.VersionsRestInterceptor, "post_update_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.VersionsRestInterceptor, "pre_update_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "post_update_version" + ) as post, + mock.patch.object( + transports.VersionsRestInterceptor, "post_update_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_update_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5106,8 +5118,9 @@ def test_delete_version_rest_bad_request(request_type=version.DeleteVersionReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5162,13 +5175,13 @@ def test_delete_version_rest_interceptors(null_interceptor): ) client = VersionsClient(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.VersionsRestInterceptor, "pre_delete_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VersionsRestInterceptor, "pre_delete_version" + ) as pre, + ): pre.assert_not_called() pb_message = version.DeleteVersionRequest.pb(version.DeleteVersionRequest()) transcode.return_value = { @@ -5211,8 +5224,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5271,8 +5285,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5333,8 +5348,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5395,8 +5411,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5455,8 +5472,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5673,11 +5691,14 @@ def test_versions_base_transport(): def test_versions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dialogflow_v2beta1.services.versions.transports.VersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.versions.transports.VersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VersionsTransport( @@ -5697,9 +5718,12 @@ def test_versions_base_transport_with_credentials_file(): def test_versions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dialogflow_v2beta1.services.versions.transports.VersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dialogflow_v2beta1.services.versions.transports.VersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VersionsTransport() @@ -5777,11 +5801,12 @@ def test_versions_transport_auth_gdch_credentials(transport_class): def test_versions_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/docs/conf.py b/packages/google-cloud-discoveryengine/docs/conf.py index cd739b891f18..6c861d5886f0 100644 --- a/packages/google-cloud-discoveryengine/docs/conf.py +++ b/packages/google-cloud-discoveryengine/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-discoveryengine documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/__init__.py index 52eb9a2959b6..2859081bad70 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.assistant_service import ( AssistantServiceAsyncClient, AssistantServiceClient, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/async_client.py index 53976232bc61..4a9f69e38c76 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -129,7 +129,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AssistantServiceAsyncClient: The constructed client. """ - return AssistantServiceClient.from_service_account_info.__func__(AssistantServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AssistantServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AssistantServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +146,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AssistantServiceAsyncClient: The constructed client. """ - return AssistantServiceClient.from_service_account_file.__func__(AssistantServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AssistantServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AssistantServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/client.py index 630d3a11bff2..f7f1ad501920 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -81,9 +81,7 @@ class AssistantServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AssistantServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AssistantServiceTransport]] _transport_registry["grpc"] = AssistantServiceGrpcTransport _transport_registry["grpc_asyncio"] = AssistantServiceGrpcAsyncIOTransport _transport_registry["rest"] = AssistantServiceRestTransport @@ -731,11 +729,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssistantServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssistantServiceClient._read_environment_variables() + ) self._client_cert_source = AssistantServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -770,8 +766,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssistantServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/base.py index cdfff30d1a48..05e08e82a3c1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import assistant_service @@ -214,7 +214,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc.py index c4694cb3571e..b2493d8febcd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import assistant_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc_asyncio.py index b356fdf333fa..a69d350cc2ab 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import assistant_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest.py index 49ba60e14f26..eb3c52e21c77 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -516,9 +516,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAssistantServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAssistantServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -778,9 +776,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAssistantServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAssistantServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAssistantServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/async_client.py index a5e23bae15a0..61f6913a1b9b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.types import cmek_config_service @@ -132,7 +132,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CmekConfigServiceAsyncClient: The constructed client. """ - return CmekConfigServiceClient.from_service_account_info.__func__(CmekConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CmekConfigServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CmekConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +149,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CmekConfigServiceAsyncClient: The constructed client. """ - return CmekConfigServiceClient.from_service_account_file.__func__(CmekConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CmekConfigServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CmekConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/client.py index 1b5797c9c413..a5e8394dda2c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.types import cmek_config_service @@ -83,9 +83,7 @@ class CmekConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CmekConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CmekConfigServiceTransport]] _transport_registry["grpc"] = CmekConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = CmekConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = CmekConfigServiceRestTransport @@ -693,11 +691,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CmekConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CmekConfigServiceClient._read_environment_variables() + ) self._client_cert_source = CmekConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -732,8 +728,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CmekConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/base.py index 150ff4702bab..ef74c8a7b35b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import cmek_config_service @@ -254,7 +254,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc.py index a51541d73d1b..2d0bea4de25f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import cmek_config_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc_asyncio.py index 2e31add97da0..9cad7fc13f34 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import cmek_config_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest.py index 43ffa1c6f925..d5108659ab8f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -715,9 +715,7 @@ def __call__( """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseDeleteCmekConfig._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseDeleteCmekConfig._get_http_options() request, metadata = self._interceptor.pre_delete_cmek_config( request, metadata @@ -739,7 +737,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -863,9 +861,7 @@ def __call__( """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseGetCmekConfig._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseGetCmekConfig._get_http_options() request, metadata = self._interceptor.pre_get_cmek_config(request, metadata) transcoded_request = _BaseCmekConfigServiceRestTransport._BaseGetCmekConfig._get_transcoded_request( @@ -1013,9 +1009,7 @@ def __call__( """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseListCmekConfigs._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseListCmekConfigs._get_http_options() request, metadata = self._interceptor.pre_list_cmek_configs( request, metadata @@ -1167,9 +1161,7 @@ def __call__( """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseUpdateCmekConfig._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseUpdateCmekConfig._get_http_options() request, metadata = self._interceptor.pre_update_cmek_config( request, metadata @@ -1195,7 +1187,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1359,9 +1351,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1481,9 +1471,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCmekConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1622,9 +1610,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCmekConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/async_client.py index 31704e8c8267..bce09d3a968b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -121,7 +121,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_info.__func__(CompletionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CompletionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CompletionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +138,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_file.__func__(CompletionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CompletionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CompletionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/client.py index 4ac1c92ed1fe..a4c086bd9bf3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -86,9 +86,7 @@ class CompletionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CompletionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CompletionServiceTransport]] _transport_registry["grpc"] = CompletionServiceGrpcTransport _transport_registry["grpc_asyncio"] = CompletionServiceGrpcAsyncIOTransport _transport_registry["rest"] = CompletionServiceRestTransport @@ -632,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CompletionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CompletionServiceClient._read_environment_variables() + ) self._client_cert_source = CompletionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -671,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CompletionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/base.py index 1bebe5ff3d97..7f7e2a219285 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import ( @@ -270,7 +270,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc.py index 0901a44674cb..ce558fb78d68 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( completion_service, @@ -398,12 +398,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -431,12 +431,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -463,12 +463,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -495,12 +495,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc_asyncio.py index 7ac71da82875..178eb05b2aa0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( completion_service, @@ -407,12 +407,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -441,12 +441,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -474,12 +474,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -507,12 +507,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest.py index 828892b07ea0..6a27e58d7445 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -775,9 +775,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() request, metadata = self._interceptor.pre_complete_query(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_transcoded_request( @@ -929,9 +927,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_import_completion_suggestions( request, metadata @@ -957,7 +953,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -998,11 +994,10 @@ def __call__( resp = self._interceptor.post_import_completion_suggestions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_completion_suggestions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_completion_suggestions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1091,15 +1086,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_import_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_import_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1122,7 +1114,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1163,11 +1155,10 @@ def __call__( resp = self._interceptor.post_import_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1254,9 +1245,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_purge_completion_suggestions( request, metadata @@ -1282,7 +1271,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1411,15 +1400,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_purge_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_purge_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1442,7 +1428,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1483,11 +1469,10 @@ def __call__( resp = self._interceptor.post_purge_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1531,7 +1516,9 @@ def import_completion_suggestions( ]: # 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._ImportCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._ImportCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_suggestion_deny_list_entries( @@ -1541,7 +1528,9 @@ def import_suggestion_deny_list_entries( ]: # 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._ImportSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._ImportSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_completion_suggestions( @@ -1551,7 +1540,9 @@ def purge_completion_suggestions( ]: # 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._PurgeCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_suggestion_deny_list_entries( @@ -1561,7 +1552,9 @@ def purge_suggestion_deny_list_entries( ]: # 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._PurgeSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -1619,9 +1612,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1741,9 +1732,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1882,9 +1871,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/async_client.py index 6d551e10468e..a39afcabbb16 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,15 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.control_service import pagers -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import common, control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service from .client import ControlServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport @@ -128,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_info.__func__(ControlServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ControlServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ControlServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_file.__func__(ControlServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ControlServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ControlServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/client.py index 80b06872c664..e1ecbee20753 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,15 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.control_service import pagers -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import common, control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport from .transports.grpc import ControlServiceGrpcTransport @@ -85,9 +83,7 @@ class ControlServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ControlServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ControlServiceTransport]] _transport_registry["grpc"] = ControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = ControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = ControlServiceRestTransport @@ -681,11 +677,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ControlServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ControlServiceClient._read_environment_variables() + ) self._client_cert_source = ControlServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -720,8 +714,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ControlServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/pagers.py index 25df6ee7edfc..2b8cc1952926 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/base.py index d9fab0fa79f7..e615c03753df 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/base.py @@ -17,21 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -264,7 +263,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc.py index feee03b815e0..ce68de8a060b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc.py @@ -16,24 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc_asyncio.py index d1cd6f7eca62..fd32e13b0024 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,16 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport from .grpc import ControlServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest.py index a25262b30968..e0d00f32cf75 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,14 +28,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseControlServiceRestTransport @@ -712,7 +711,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1295,9 +1294,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest_base.py index f8b4a388e297..e84b88905874 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest_base.py @@ -17,15 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/async_client.py index f52112df7f9f..5f5a79d3dc61 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -46,23 +46,23 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.conversational_search_service import ( pagers, ) from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, conversational_search_service, safety, search_service, + session, ) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session from .client import ConversationalSearchServiceClient @@ -173,7 +173,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_info.__func__(ConversationalSearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationalSearchServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + ConversationalSearchServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -189,7 +194,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_file.__func__(ConversationalSearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationalSearchServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + ConversationalSearchServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -227,7 +237,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationalSearchServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/client.py index 5290127feefe..5271d777a6f3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -62,23 +62,23 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.conversational_search_service import ( pagers, ) from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, conversational_search_service, safety, search_service, + session, ) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport @@ -95,13 +95,11 @@ class ConversationalSearchServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationalSearchServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = ConversationalSearchServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + ConversationalSearchServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = ConversationalSearchServiceRestTransport def get_transport_class( @@ -827,11 +825,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationalSearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationalSearchServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConversationalSearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -868,8 +864,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationalSearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/pagers.py index 896deb696acc..d3383add4990 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +233,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/__init__.py index 855e35aad0c0..234e039d4add 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationalSearchServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConversationalSearchServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConversationalSearchServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/base.py index 49831647acdc..e67d297970d1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1 import gapic_version as package_version +from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -405,7 +407,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc.py index 87669a1bde2d..8cf4d2787c8f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc_asyncio.py index 5b47516e8e9e..a6e2effdae50 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest.py index ea6e8130b173..31a6a5551dfc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -1036,9 +1038,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() request, metadata = self._interceptor.pre_answer_query(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_transcoded_request( @@ -1198,9 +1198,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() request, metadata = self._interceptor.pre_converse_conversation( request, metadata @@ -1358,9 +1356,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1511,9 +1507,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() request, metadata = self._interceptor.pre_create_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_transcoded_request( @@ -1660,9 +1654,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1684,7 +1676,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1769,9 +1761,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() request, metadata = self._interceptor.pre_delete_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_transcoded_request( @@ -1791,7 +1781,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1882,9 +1872,7 @@ def __call__( Defines an answer. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() request, metadata = self._interceptor.pre_get_answer(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_transcoded_request( @@ -2031,9 +2019,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -2180,9 +2166,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() request, metadata = self._interceptor.pre_get_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_transcoded_request( @@ -2329,9 +2313,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2480,9 +2462,7 @@ def __call__( Response for ListSessions method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() request, metadata = self._interceptor.pre_list_sessions(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_transcoded_request( @@ -2638,9 +2618,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseStreamAnswerQuery._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseStreamAnswerQuery._get_http_options() request, metadata = self._interceptor.pre_stream_answer_query( request, metadata @@ -2788,9 +2766,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() request, metadata = self._interceptor.pre_update_conversation( request, metadata @@ -2941,9 +2917,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() request, metadata = self._interceptor.pre_update_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_transcoded_request( @@ -3238,9 +3212,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3363,9 +3335,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3506,9 +3476,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest_base.py index 4094e99450f5..bf68657c28f7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/async_client.py index 3dc9595013f9..1eb0e47aec6a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,22 +44,23 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.data_store_service import pagers from google.cloud.discoveryengine_v1.types import ( + cmek_config_service, + common, + data_store, data_store_service, document_processing_config, schema, ) -from google.cloud.discoveryengine_v1.types import cmek_config_service, common -from google.cloud.discoveryengine_v1.types import data_store from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store from .client import DataStoreServiceClient @@ -157,7 +158,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_info.__func__(DataStoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataStoreServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataStoreServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +175,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_file.__func__(DataStoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataStoreServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataStoreServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/client.py index 512090727f85..5345e9b3404f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,22 +61,23 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.data_store_service import pagers from google.cloud.discoveryengine_v1.types import ( + cmek_config_service, + common, + data_store, data_store_service, document_processing_config, schema, ) -from google.cloud.discoveryengine_v1.types import cmek_config_service, common -from google.cloud.discoveryengine_v1.types import data_store from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport @@ -93,9 +94,7 @@ class DataStoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataStoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataStoreServiceTransport]] _transport_registry["grpc"] = DataStoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataStoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataStoreServiceRestTransport @@ -801,11 +800,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataStoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataStoreServiceClient._read_environment_variables() + ) self._client_cert_source = DataStoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -840,8 +837,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataStoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/pagers.py index 7f58cc992a6b..8b24bf65c420 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/base.py index 8ac5db254017..3bc0c9b6e3ad 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store, data_store_service from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1.types import data_store_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -268,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc.py index 1912e521bbea..2fe1a734933f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store, data_store_service from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc_asyncio.py index 28891d658dc4..497b9e11a8d0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store, data_store_service from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport from .grpc import DataStoreServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest.py index 39d47ff88a08..2bf7ac133a82 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store, data_store_service from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1.types import data_store_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataStoreServiceRestTransport @@ -776,9 +775,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() request, metadata = self._interceptor.pre_create_data_store( request, metadata @@ -804,7 +801,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -931,9 +928,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() request, metadata = self._interceptor.pre_delete_data_store( request, metadata @@ -955,7 +950,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1228,9 +1223,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() request, metadata = self._interceptor.pre_list_data_stores( request, metadata @@ -1382,9 +1375,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() request, metadata = self._interceptor.pre_update_data_store( request, metadata @@ -1584,9 +1575,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1846,9 +1835,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataStoreServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest_base.py index acd1629b2ef9..92ac4b7f6ef7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store, data_store_service from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/async_client.py index 71054e73c44d..2097deffec29 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,21 +44,21 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.document_service import pagers from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document from .client import DocumentServiceClient @@ -138,7 +138,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DocumentServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DocumentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +155,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DocumentServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DocumentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/client.py index 4c1e6ce2f583..88f3dac83526 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,21 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.document_service import pagers from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -92,9 +92,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -719,11 +717,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -758,8 +754,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/pagers.py index ac51440eeead..5ba173f68090 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/base.py index 3013138e9ab9..8d1f5fcb3e71 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/base.py @@ -17,24 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -327,7 +327,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc.py index 05e0a2d3f1d3..65601cd70459 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc.py @@ -16,27 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -582,12 +582,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc_asyncio.py index 77f762d0e1d3..9ad5ad6b3ae3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,19 +31,15 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -599,12 +599,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest.py index 50a4d46dde6f..204304b0e2ec 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest.py @@ -16,27 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -908,9 +908,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() request, metadata = self._interceptor.pre_batch_get_documents_metadata( request, metadata @@ -1066,9 +1064,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -1213,9 +1209,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -1235,7 +1229,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1476,9 +1470,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() request, metadata = self._interceptor.pre_import_documents( request, metadata @@ -1504,7 +1496,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1782,9 +1774,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() request, metadata = self._interceptor.pre_purge_documents(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_transcoded_request( @@ -1808,7 +1798,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1935,9 +1925,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -2039,7 +2027,9 @@ def batch_get_documents_metadata( ]: # 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._BatchGetDocumentsMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetDocumentsMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_document( @@ -2154,9 +2144,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2416,9 +2404,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest_base.py index 46c67990ec00..49bb32150385 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest_base.py @@ -17,18 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/async_client.py index 925b30d7dfeb..2110ac53a6ba 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,19 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.engine_service import pagers -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import common, engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service from .client import EngineServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport @@ -128,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_info.__func__(EngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EngineServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EngineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_file.__func__(EngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EngineServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EngineServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/client.py index 52262f45fb30..a6861a2271c8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,19 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.engine_service import pagers -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import common, engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport from .transports.grpc import EngineServiceGrpcTransport @@ -657,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EngineServiceClient._read_environment_variables() + ) self._client_cert_source = EngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/pagers.py index ec1fde800ee2..6938785644d6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/base.py index 13e85acfd20d..59b321a6a6ab 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -268,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc.py index c3cfe00e1a7c..ae59f995c113 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc_asyncio.py index af710f3f1ef7..1194c88d4b74 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport from .grpc import EngineServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest.py index 5db6c2f5a8fe..81b53c2226d3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEngineServiceRestTransport @@ -789,7 +788,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -937,7 +936,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest_base.py index 325cff42db74..275ff273c4df 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/async_client.py index f6720459006b..0016a811d7e0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -140,7 +140,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_info.__func__(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GroundedGenerationServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -156,7 +159,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_file.__func__(GroundedGenerationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GroundedGenerationServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + GroundedGenerationServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -194,7 +202,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GroundedGenerationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/client.py index 27d0861824bb..50769f2988e8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -82,9 +82,7 @@ class GroundedGenerationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GroundedGenerationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport @@ -671,11 +669,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GroundedGenerationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GroundedGenerationServiceClient._read_environment_variables() + ) self._client_cert_source = ( GroundedGenerationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -712,8 +708,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GroundedGenerationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/__init__.py index 0f3052cbd079..ec0eaca83aa8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GroundedGenerationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/base.py index 9f147516dd14..07c5dbe5db1a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import grounded_generation_service @@ -239,7 +239,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc.py index 31f2246b579b..ae1fff974da5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import grounded_generation_service @@ -346,12 +346,12 @@ def stream_generate_grounded_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_generate_grounded_content" not in self._stubs: - self._stubs[ - "stream_generate_grounded_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.discoveryengine.v1.GroundedGenerationService/StreamGenerateGroundedContent", - request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, - response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + self._stubs["stream_generate_grounded_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.discoveryengine.v1.GroundedGenerationService/StreamGenerateGroundedContent", + request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, + response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + ) ) return self._stubs["stream_generate_grounded_content"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc_asyncio.py index f566cd344b8e..0392fa66d9f8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import grounded_generation_service @@ -354,12 +354,12 @@ def stream_generate_grounded_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_generate_grounded_content" not in self._stubs: - self._stubs[ - "stream_generate_grounded_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.discoveryengine.v1.GroundedGenerationService/StreamGenerateGroundedContent", - request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, - response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + self._stubs["stream_generate_grounded_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.discoveryengine.v1.GroundedGenerationService/StreamGenerateGroundedContent", + request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, + response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + ) ) return self._stubs["stream_generate_grounded_content"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest.py index 85d027c4ce30..d7b921d00915 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -424,9 +424,7 @@ def __call__( """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() request, metadata = self._interceptor.pre_check_grounding(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_transcoded_request( @@ -584,9 +582,7 @@ def __call__( Response for the ``GenerateGroundedContent`` method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGenerateGroundedContent._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGenerateGroundedContent._get_http_options() request, metadata = self._interceptor.pre_generate_grounded_content( request, metadata @@ -726,7 +722,9 @@ def generate_grounded_content( ]: # 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._GenerateGroundedContent(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateGroundedContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def stream_generate_grounded_content( @@ -737,7 +735,9 @@ def stream_generate_grounded_content( ]: # 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._StreamGenerateGroundedContent(self._session, self._host, self._interceptor) # type: ignore + return self._StreamGenerateGroundedContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -795,9 +795,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -920,9 +918,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1063,9 +1059,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/async_client.py index 68b258cafda5..fb980e0e2e65 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,21 +44,23 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.identity_mapping_store_service import ( pagers, ) +from google.cloud.discoveryengine_v1.types import ( + cmek_config_service, + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import cmek_config_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store from .client import IdentityMappingStoreServiceClient from .transports.base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport @@ -156,7 +158,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IdentityMappingStoreServiceAsyncClient: The constructed client. """ - return IdentityMappingStoreServiceClient.from_service_account_info.__func__(IdentityMappingStoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IdentityMappingStoreServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + IdentityMappingStoreServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -172,7 +179,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IdentityMappingStoreServiceAsyncClient: The constructed client. """ - return IdentityMappingStoreServiceClient.from_service_account_file.__func__(IdentityMappingStoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IdentityMappingStoreServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + IdentityMappingStoreServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -210,7 +222,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return IdentityMappingStoreServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return IdentityMappingStoreServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> IdentityMappingStoreServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/client.py index 5f9d221a11df..7fddef8d7e95 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,21 +61,23 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.identity_mapping_store_service import ( pagers, ) +from google.cloud.discoveryengine_v1.types import ( + cmek_config_service, + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import cmek_config_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store from .transports.base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport from .transports.grpc import IdentityMappingStoreServiceGrpcTransport @@ -91,13 +93,11 @@ class IdentityMappingStoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IdentityMappingStoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IdentityMappingStoreServiceTransport]] _transport_registry["grpc"] = IdentityMappingStoreServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = IdentityMappingStoreServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + IdentityMappingStoreServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = IdentityMappingStoreServiceRestTransport def get_transport_class( @@ -729,11 +729,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IdentityMappingStoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IdentityMappingStoreServiceClient._read_environment_variables() + ) self._client_cert_source = ( IdentityMappingStoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -770,8 +768,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IdentityMappingStoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/pagers.py index baf9caba7fd4..500e12b1c569 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -154,7 +154,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -240,7 +240,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -323,7 +323,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/__init__.py index 174d9fb7f1c1..4ae6f9190cf3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[IdentityMappingStoreServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[IdentityMappingStoreServiceTransport]] _transport_registry["grpc"] = IdentityMappingStoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = IdentityMappingStoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = IdentityMappingStoreServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/base.py index 9bafeb80b12e..608e9031cfcd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version +from google.cloud.discoveryengine_v1.types import ( + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -307,7 +309,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc.py index 9905e3da1955..4f7a306d9f12 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1.types import ( + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store from .base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport @@ -366,12 +368,12 @@ def create_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_identity_mapping_store" not in self._stubs: - self._stubs[ - "create_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/CreateIdentityMappingStore", - request_serializer=identity_mapping_store_service.CreateIdentityMappingStoreRequest.serialize, - response_deserializer=gcd_identity_mapping_store.IdentityMappingStore.deserialize, + self._stubs["create_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/CreateIdentityMappingStore", + request_serializer=identity_mapping_store_service.CreateIdentityMappingStoreRequest.serialize, + response_deserializer=gcd_identity_mapping_store.IdentityMappingStore.deserialize, + ) ) return self._stubs["create_identity_mapping_store"] @@ -397,12 +399,12 @@ def get_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_identity_mapping_store" not in self._stubs: - self._stubs[ - "get_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/GetIdentityMappingStore", - request_serializer=identity_mapping_store_service.GetIdentityMappingStoreRequest.serialize, - response_deserializer=identity_mapping_store.IdentityMappingStore.deserialize, + self._stubs["get_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/GetIdentityMappingStore", + request_serializer=identity_mapping_store_service.GetIdentityMappingStoreRequest.serialize, + response_deserializer=identity_mapping_store.IdentityMappingStore.deserialize, + ) ) return self._stubs["get_identity_mapping_store"] @@ -428,12 +430,12 @@ def delete_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_identity_mapping_store" not in self._stubs: - self._stubs[ - "delete_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/DeleteIdentityMappingStore", - request_serializer=identity_mapping_store_service.DeleteIdentityMappingStoreRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/DeleteIdentityMappingStore", + request_serializer=identity_mapping_store_service.DeleteIdentityMappingStoreRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_identity_mapping_store"] @@ -548,12 +550,12 @@ def list_identity_mapping_stores( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_identity_mapping_stores" not in self._stubs: - self._stubs[ - "list_identity_mapping_stores" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/ListIdentityMappingStores", - request_serializer=identity_mapping_store_service.ListIdentityMappingStoresRequest.serialize, - response_deserializer=identity_mapping_store_service.ListIdentityMappingStoresResponse.deserialize, + self._stubs["list_identity_mapping_stores"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/ListIdentityMappingStores", + request_serializer=identity_mapping_store_service.ListIdentityMappingStoresRequest.serialize, + response_deserializer=identity_mapping_store_service.ListIdentityMappingStoresResponse.deserialize, + ) ) return self._stubs["list_identity_mapping_stores"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc_asyncio.py index 051c342a8e43..31630b32346e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,16 +31,15 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1.types import ( + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store from .base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport from .grpc import IdentityMappingStoreServiceGrpcTransport @@ -376,12 +378,12 @@ def create_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_identity_mapping_store" not in self._stubs: - self._stubs[ - "create_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/CreateIdentityMappingStore", - request_serializer=identity_mapping_store_service.CreateIdentityMappingStoreRequest.serialize, - response_deserializer=gcd_identity_mapping_store.IdentityMappingStore.deserialize, + self._stubs["create_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/CreateIdentityMappingStore", + request_serializer=identity_mapping_store_service.CreateIdentityMappingStoreRequest.serialize, + response_deserializer=gcd_identity_mapping_store.IdentityMappingStore.deserialize, + ) ) return self._stubs["create_identity_mapping_store"] @@ -407,12 +409,12 @@ def get_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_identity_mapping_store" not in self._stubs: - self._stubs[ - "get_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/GetIdentityMappingStore", - request_serializer=identity_mapping_store_service.GetIdentityMappingStoreRequest.serialize, - response_deserializer=identity_mapping_store.IdentityMappingStore.deserialize, + self._stubs["get_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/GetIdentityMappingStore", + request_serializer=identity_mapping_store_service.GetIdentityMappingStoreRequest.serialize, + response_deserializer=identity_mapping_store.IdentityMappingStore.deserialize, + ) ) return self._stubs["get_identity_mapping_store"] @@ -438,12 +440,12 @@ def delete_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_identity_mapping_store" not in self._stubs: - self._stubs[ - "delete_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/DeleteIdentityMappingStore", - request_serializer=identity_mapping_store_service.DeleteIdentityMappingStoreRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/DeleteIdentityMappingStore", + request_serializer=identity_mapping_store_service.DeleteIdentityMappingStoreRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_identity_mapping_store"] @@ -558,12 +560,12 @@ def list_identity_mapping_stores( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_identity_mapping_stores" not in self._stubs: - self._stubs[ - "list_identity_mapping_stores" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/ListIdentityMappingStores", - request_serializer=identity_mapping_store_service.ListIdentityMappingStoresRequest.serialize, - response_deserializer=identity_mapping_store_service.ListIdentityMappingStoresResponse.deserialize, + self._stubs["list_identity_mapping_stores"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/ListIdentityMappingStores", + request_serializer=identity_mapping_store_service.ListIdentityMappingStoresRequest.serialize, + response_deserializer=identity_mapping_store_service.ListIdentityMappingStoresResponse.deserialize, + ) ) return self._stubs["list_identity_mapping_stores"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest.py index 96444f77f638..730252fde194 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest.py @@ -16,25 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1.types import ( + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseIdentityMappingStoreServiceRestTransport @@ -903,9 +905,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseCreateIdentityMappingStore._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseCreateIdentityMappingStore._get_http_options() request, metadata = self._interceptor.pre_create_identity_mapping_store( request, metadata @@ -974,11 +974,10 @@ def __call__( resp = self._interceptor.post_create_identity_mapping_store(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_identity_mapping_store_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_identity_mapping_store_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1069,9 +1068,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseDeleteIdentityMappingStore._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseDeleteIdentityMappingStore._get_http_options() request, metadata = self._interceptor.pre_delete_identity_mapping_store( request, metadata @@ -1093,7 +1090,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1133,11 +1130,10 @@ def __call__( resp = self._interceptor.post_delete_identity_mapping_store(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_identity_mapping_store_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_identity_mapping_store_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1223,9 +1219,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseGetIdentityMappingStore._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseGetIdentityMappingStore._get_http_options() request, metadata = self._interceptor.pre_get_identity_mapping_store( request, metadata @@ -1379,9 +1373,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseImportIdentityMappings._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseImportIdentityMappings._get_http_options() request, metadata = self._interceptor.pre_import_identity_mappings( request, metadata @@ -1407,7 +1399,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1532,9 +1524,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseListIdentityMappings._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseListIdentityMappings._get_http_options() request, metadata = self._interceptor.pre_list_identity_mappings( request, metadata @@ -1689,9 +1679,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseListIdentityMappingStores._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseListIdentityMappingStores._get_http_options() request, metadata = self._interceptor.pre_list_identity_mapping_stores( request, metadata @@ -1849,9 +1837,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BasePurgeIdentityMappings._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BasePurgeIdentityMappings._get_http_options() request, metadata = self._interceptor.pre_purge_identity_mappings( request, metadata @@ -1877,7 +1863,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1953,7 +1939,9 @@ def create_identity_mapping_store( ]: # 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._CreateIdentityMappingStore(self._session, self._host, self._interceptor) # type: ignore + return self._CreateIdentityMappingStore( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_identity_mapping_store( @@ -1964,7 +1952,9 @@ def delete_identity_mapping_store( ]: # 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._DeleteIdentityMappingStore(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteIdentityMappingStore( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_identity_mapping_store( @@ -1975,7 +1965,9 @@ def get_identity_mapping_store( ]: # 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._GetIdentityMappingStore(self._session, self._host, self._interceptor) # type: ignore + return self._GetIdentityMappingStore( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_identity_mappings( @@ -1986,7 +1978,9 @@ def import_identity_mappings( ]: # 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._ImportIdentityMappings(self._session, self._host, self._interceptor) # type: ignore + return self._ImportIdentityMappings( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_identity_mappings( @@ -2008,7 +2002,9 @@ def list_identity_mapping_stores( ]: # 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._ListIdentityMappingStores(self._session, self._host, self._interceptor) # type: ignore + return self._ListIdentityMappingStores( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_identity_mappings( @@ -2077,9 +2073,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2202,9 +2196,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseIdentityMappingStoreServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2345,9 +2337,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseIdentityMappingStoreServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest_base.py index ace057d7e5c4..74a5147b4aa9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest_base.py @@ -22,11 +22,13 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1.types import ( + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store from .base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/async_client.py index 70d0d80a8504..122930de45b8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_info.__func__(ProjectServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ProjectServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ProjectServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_file.__func__(ProjectServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ProjectServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ProjectServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/client.py index 95452db1b7e2..fadb617598a3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -82,9 +82,7 @@ class ProjectServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ProjectServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ProjectServiceTransport]] _transport_registry["grpc"] = ProjectServiceGrpcTransport _transport_registry["grpc_asyncio"] = ProjectServiceGrpcAsyncIOTransport _transport_registry["rest"] = ProjectServiceRestTransport @@ -619,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectServiceClient._read_environment_variables() + ) self._client_cert_source = ProjectServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -658,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/base.py index ae7560ff42db..46aed4832d39 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import project_service @@ -207,7 +207,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc.py index f34176357d51..20180a1891c8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import project_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc_asyncio.py index 4b559d1624d2..8f554808682f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import project_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest.py index 0a0653653735..10d1aedea0ec 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -541,9 +541,7 @@ def __call__( """ - http_options = ( - _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() request, metadata = self._interceptor.pre_provision_project( request, metadata @@ -569,7 +567,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -699,9 +697,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/async_client.py index bc75f18dbbf6..f4798eaf5964 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_info.__func__(RankServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = RankServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(RankServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_file.__func__(RankServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = RankServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(RankServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/client.py index 4fcd57f9801d..eb2ec6938f87 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -620,11 +620,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RankServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RankServiceClient._read_environment_variables() + ) self._client_cert_source = RankServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -659,8 +657,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RankServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/base.py index be797ff6eaa2..8ec782153d25 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import rank_service @@ -202,7 +202,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc.py index da47ea55a36c..40c03d1a0a98 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import rank_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc_asyncio.py index 356285718df1..27b8c1f06443 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import rank_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest.py index ec034858eae5..17f3ba62efaf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/async_client.py index c1ce0fab69d5..f87b90094b75 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -127,7 +127,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_info.__func__(RecommendationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = RecommendationServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(RecommendationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_file.__func__(RecommendationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = RecommendationServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(RecommendationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +183,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return RecommendationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return RecommendationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> RecommendationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/client.py index da8f6cb53cf7..3e76334c85b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class RecommendationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RecommendationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport @@ -702,11 +700,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RecommendationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RecommendationServiceClient._read_environment_variables() + ) self._client_cert_source = RecommendationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -741,8 +737,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RecommendationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/__init__.py index f21f53c111bf..a09bbaaf4d43 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RecommendationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/base.py index 9e05afb6a448..8c76810dd732 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import recommendation_service @@ -205,7 +205,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc.py index 87a59a304273..32fd9d9d20d3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import recommendation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc_asyncio.py index f7813777b005..00c1040d1029 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import recommendation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest.py index 5720b3cc98b0..e121d2ad9933 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -358,9 +358,7 @@ def __call__( """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() request, metadata = self._interceptor.pre_recommend(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseRecommend._get_transcoded_request( @@ -522,9 +520,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -647,9 +643,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -788,9 +782,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/async_client.py index cae8913850a8..c786c9198188 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,17 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.schema_service import pagers -from google.cloud.discoveryengine_v1.types import schema +from google.cloud.discoveryengine_v1.types import schema, schema_service from google.cloud.discoveryengine_v1.types import schema as gcd_schema -from google.cloud.discoveryengine_v1.types import schema_service from .client import SchemaServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport @@ -126,7 +125,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SchemaServiceAsyncClient: The constructed client. """ - return SchemaServiceClient.from_service_account_info.__func__(SchemaServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SchemaServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SchemaServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +142,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SchemaServiceAsyncClient: The constructed client. """ - return SchemaServiceClient.from_service_account_file.__func__(SchemaServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SchemaServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SchemaServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/client.py index a4d97d81772a..28984a8521dc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,17 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.schema_service import pagers -from google.cloud.discoveryengine_v1.types import schema +from google.cloud.discoveryengine_v1.types import schema, schema_service from google.cloud.discoveryengine_v1.types import schema as gcd_schema -from google.cloud.discoveryengine_v1.types import schema_service from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport from .transports.grpc import SchemaServiceGrpcTransport @@ -653,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SchemaServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SchemaServiceClient._read_environment_variables() + ) self._client_cert_source = SchemaServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -692,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SchemaServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/pagers.py index 39d3aa982444..84d8c61f58e5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/base.py index ee24a9b4b2ea..a656c50a5828 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import schema, schema_service @@ -266,7 +266,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc.py index ff6e12c5ed53..0f6f919718cd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import schema, schema_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc_asyncio.py index 86e834072ee1..910c630c5f69 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import schema, schema_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest.py index 55873e594a9c..f0361cf358f4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -789,7 +789,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -937,7 +937,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1394,7 +1394,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/async_client.py index 29a56caccd71..2c84db988eb7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -128,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_info.__func__(SearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SearchServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SearchServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_file.__func__(SearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SearchServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SearchServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/client.py index 47b4aab95c27..33daab8ddab5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -747,11 +747,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchServiceClient._read_environment_variables() + ) self._client_cert_source = SearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -786,8 +784,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/pagers.py index d3a0656343e3..07e7f8b65a42 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/base.py index 0e02ac12238f..cb311690d5f3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import search_service @@ -216,7 +216,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc.py index 75d3d2e6b966..6f2b0a432c19 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc_asyncio.py index ce258458a3c8..023fa53f0633 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest.py index 202f27b30213..db80fada9e9d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/async_client.py index b1641981be86..9a61e07e4ced 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -128,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_info.__func__(SearchTuningServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SearchTuningServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SearchTuningServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_file.__func__(SearchTuningServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SearchTuningServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SearchTuningServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -182,7 +184,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SearchTuningServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/client.py index 6a54cf2ee1c4..cb42d45e0b35 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -85,9 +85,7 @@ class SearchTuningServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SearchTuningServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport @@ -655,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchTuningServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchTuningServiceClient._read_environment_variables() + ) self._client_cert_source = SearchTuningServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchTuningServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/__init__.py index d759f5c3cdcd..170e258db18b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SearchTuningServiceRestInterceptor, SearchTuningServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SearchTuningServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/base.py index 99533ff5857d..a3a89e0763b5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import search_tuning_service @@ -224,7 +224,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc.py index 517cd9fa2925..661c6737fc1e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import search_tuning_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc_asyncio.py index 2230de5a3f2e..e5d052c9dfa5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import search_tuning_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest.py index 381276207316..b1d581e030b3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -601,9 +601,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() request, metadata = self._interceptor.pre_list_custom_models( request, metadata @@ -756,9 +754,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() request, metadata = self._interceptor.pre_train_custom_model( request, metadata @@ -784,7 +780,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -928,9 +924,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1051,9 +1045,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1192,9 +1184,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/async_client.py index 3ae0776e9c27..c26306021c3f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,14 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +from google.cloud.discoveryengine_v1.types import common, serving_config_service from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import serving_config_service from .client import ServingConfigServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport @@ -123,7 +122,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_info.__func__(ServingConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ServingConfigServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ServingConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +139,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_file.__func__(ServingConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ServingConfigServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ServingConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -177,7 +178,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ServingConfigServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/client.py index 06732595403d..0e7e6692e1ed 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +from google.cloud.discoveryengine_v1.types import common, serving_config_service from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import serving_config_service from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport from .transports.grpc import ServingConfigServiceGrpcTransport @@ -84,9 +83,7 @@ class ServingConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServingConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport @@ -634,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServingConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServingConfigServiceClient._read_environment_variables() + ) self._client_cert_source = ServingConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -673,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServingConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/__init__.py index 6bdd4697d637..5e6ab0b7e7f9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ServingConfigServiceRestInterceptor, ServingConfigServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServingConfigServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/base.py index 2ce88a05aa15..e521dfb1fadb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config @@ -206,7 +206,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc.py index d1c6a2fa0b24..018b75549665 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config from google.cloud.discoveryengine_v1.types import serving_config_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc_asyncio.py index a4f8d822aa90..e8093083ed15 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config from google.cloud.discoveryengine_v1.types import serving_config_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest.py index 308ca01f41d5..8f87ea9e4109 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -365,9 +365,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() request, metadata = self._interceptor.pre_update_serving_config( request, metadata @@ -533,9 +531,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -656,9 +652,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -797,9 +791,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/async_client.py index b347e794ea27..41f429ffa278 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,14 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.session_service import pagers -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session from .client import SessionServiceClient @@ -132,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_info.__func__(SessionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SessionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SessionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_file.__func__(SessionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SessionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SessionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/client.py index 2d3c187dcf52..5341a08f7337 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.session_service import pagers -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport @@ -85,9 +84,7 @@ class SessionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionServiceTransport]] _transport_registry["grpc"] = SessionServiceGrpcTransport _transport_registry["grpc_asyncio"] = SessionServiceGrpcAsyncIOTransport _transport_registry["rest"] = SessionServiceRestTransport @@ -759,11 +756,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionServiceClient._read_environment_variables() + ) self._client_cert_source = SessionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -798,8 +793,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/pagers.py index 81daa2b85b5d..2238be26d6c3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/base.py index a2812b396028..e445d62f61a1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -264,7 +263,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc.py index 8b0fc2b575ea..61404f493c9d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc_asyncio.py index b25a483d8ec6..a8421d84a150 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,15 +31,10 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest.py index 0248e2b45739..9a4bfb27f61c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +28,10 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -710,7 +709,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1292,9 +1291,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest_base.py index 639adc3c8330..b7e76e05e787 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest_base.py @@ -17,14 +17,13 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1.types import conversational_search_service -from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import conversational_search_service, session from google.cloud.discoveryengine_v1.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/async_client.py index 1dd928221c4d..9a550b9b545f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.site_search_engine_service import pagers from google.cloud.discoveryengine_v1.types import ( @@ -139,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_info.__func__(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SiteSearchEngineServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +156,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_file.__func__(SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SiteSearchEngineServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -193,7 +197,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SiteSearchEngineServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/client.py index ab6b9c986991..9e3469155f67 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.site_search_engine_service import pagers from google.cloud.discoveryengine_v1.types import ( @@ -88,9 +88,7 @@ class SiteSearchEngineServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport @@ -684,11 +682,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SiteSearchEngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SiteSearchEngineServiceClient._read_environment_variables() + ) self._client_cert_source = ( SiteSearchEngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -725,8 +721,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SiteSearchEngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/pagers.py index 02ccb3146820..12373407d5ba 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -315,7 +315,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/__init__.py index 5443c0c10cf1..0c91743e9878 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/base.py index 65593c566922..02c7c6d992ff 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import ( @@ -418,7 +418,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc.py index 082f14f87f21..e2da5052cbc1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( site_search_engine, @@ -657,12 +657,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -689,12 +689,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -782,12 +782,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc_asyncio.py index 2614081a8a1b..dccb9b396db2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( site_search_engine, @@ -671,12 +671,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -703,12 +703,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -797,12 +797,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest.py index d81dea2526f0..527de9a148bb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1354,9 +1354,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_create_target_sites( request, metadata @@ -1382,7 +1380,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1510,9 +1508,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_verify_target_sites( request, metadata @@ -1538,7 +1534,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1666,9 +1662,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_http_options() request, metadata = self._interceptor.pre_create_sitemap(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_transcoded_request( @@ -1692,7 +1686,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1822,9 +1816,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() request, metadata = self._interceptor.pre_create_target_site( request, metadata @@ -1850,7 +1842,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1979,9 +1971,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_http_options() request, metadata = self._interceptor.pre_delete_sitemap(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_transcoded_request( @@ -2001,7 +1991,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2129,9 +2119,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() request, metadata = self._interceptor.pre_delete_target_site( request, metadata @@ -2153,7 +2141,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2285,9 +2273,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_disable_advanced_site_search( request, metadata @@ -2313,7 +2299,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2442,9 +2428,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_enable_advanced_site_search( request, metadata @@ -2470,7 +2454,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2600,9 +2584,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() request, metadata = self._interceptor.pre_fetch_domain_verification_status( request, metadata @@ -2670,11 +2652,10 @@ def __call__( resp = self._interceptor.post_fetch_domain_verification_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_domain_verification_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_domain_verification_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2761,9 +2742,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_http_options() request, metadata = self._interceptor.pre_fetch_sitemaps(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_transcoded_request( @@ -2918,9 +2897,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() request, metadata = self._interceptor.pre_get_site_search_engine( request, metadata @@ -3073,9 +3050,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() request, metadata = self._interceptor.pre_get_target_site(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_transcoded_request( @@ -3225,9 +3200,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() request, metadata = self._interceptor.pre_list_target_sites( request, metadata @@ -3384,9 +3357,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() request, metadata = self._interceptor.pre_recrawl_uris(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_transcoded_request( @@ -3410,7 +3381,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3538,9 +3509,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() request, metadata = self._interceptor.pre_update_target_site( request, metadata @@ -3566,7 +3535,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3644,7 +3613,9 @@ def batch_create_target_sites( ]: # 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._BatchCreateTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_verify_target_sites( @@ -3655,7 +3626,9 @@ def batch_verify_target_sites( ]: # 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._BatchVerifyTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchVerifyTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_sitemap( @@ -3706,7 +3679,9 @@ def disable_advanced_site_search( ]: # 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._DisableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._DisableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_advanced_site_search( @@ -3717,7 +3692,9 @@ def enable_advanced_site_search( ]: # 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._EnableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._EnableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_domain_verification_status( @@ -3728,7 +3705,9 @@ def fetch_domain_verification_status( ]: # 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._FetchDomainVerificationStatus(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDomainVerificationStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_sitemaps( @@ -3849,9 +3828,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3974,9 +3951,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -4115,9 +4090,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/async_client.py index f7f698f5f8bb..39f699911be0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api import httpbody_pb2 # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.types import ( common, @@ -132,7 +132,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_info.__func__(UserEventServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = UserEventServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(UserEventServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +149,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_file.__func__(UserEventServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = UserEventServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(UserEventServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/client.py index a91aa167e130..b4a078faf4b4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api import httpbody_pb2 # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.types import ( common, @@ -91,9 +91,7 @@ class UserEventServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UserEventServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UserEventServiceTransport]] _transport_registry["grpc"] = UserEventServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserEventServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserEventServiceRestTransport @@ -687,11 +685,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserEventServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserEventServiceClient._read_environment_variables() + ) self._client_cert_source = UserEventServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -726,8 +722,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserEventServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/base.py index 10a09f7ec21e..7448f018ff22 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/base.py @@ -16,17 +16,17 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import ( @@ -264,7 +264,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc.py index 22f744b83b5d..5625f87121bc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( import_config, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc_asyncio.py index c18441a8fb15..7c9fff2fd578 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc_asyncio.py @@ -17,10 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -29,10 +32,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( import_config, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest.py index e93d914728ee..0ff07b94bbd1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -762,9 +762,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() request, metadata = self._interceptor.pre_collect_user_event( request, metadata @@ -786,7 +784,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -914,9 +912,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() request, metadata = self._interceptor.pre_import_user_events( request, metadata @@ -942,7 +938,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1069,9 +1065,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() request, metadata = self._interceptor.pre_purge_user_events( request, metadata @@ -1097,7 +1091,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1224,9 +1218,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() request, metadata = self._interceptor.pre_write_user_event( request, metadata @@ -1409,9 +1401,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1671,9 +1661,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseUserEventServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest_base.py index 55a14e57a4b0..28dd70146311 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest_base.py @@ -17,7 +17,7 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/async_client.py index dcebff58820b..9b6f817f4d82 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -122,7 +122,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UserLicenseServiceAsyncClient: The constructed client. """ - return UserLicenseServiceClient.from_service_account_info.__func__(UserLicenseServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = UserLicenseServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(UserLicenseServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +139,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UserLicenseServiceAsyncClient: The constructed client. """ - return UserLicenseServiceClient.from_service_account_file.__func__(UserLicenseServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = UserLicenseServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(UserLicenseServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -176,7 +178,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return UserLicenseServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return UserLicenseServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> UserLicenseServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/client.py index 07f06af0b848..6b489f39880b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -83,9 +83,7 @@ class UserLicenseServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UserLicenseServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UserLicenseServiceTransport]] _transport_registry["grpc"] = UserLicenseServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserLicenseServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserLicenseServiceRestTransport @@ -651,11 +649,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserLicenseServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserLicenseServiceClient._read_environment_variables() + ) self._client_cert_source = UserLicenseServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -690,8 +686,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserLicenseServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/pagers.py index 5fbeea13004a..76b08b24d865 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/__init__.py index 39a4af2019a0..f6f6820dcb5c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import UserLicenseServiceRestInterceptor, UserLicenseServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[UserLicenseServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[UserLicenseServiceTransport]] _transport_registry["grpc"] = UserLicenseServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserLicenseServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserLicenseServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/base.py index ef0ae8a80c54..7a0c399209d9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import user_license_service @@ -224,7 +224,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc.py index 6623b0fe8af6..15c1c4876943 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import user_license_service @@ -392,12 +392,12 @@ def batch_update_user_licenses( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_user_licenses" not in self._stubs: - self._stubs[ - "batch_update_user_licenses" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.UserLicenseService/BatchUpdateUserLicenses", - request_serializer=user_license_service.BatchUpdateUserLicensesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["batch_update_user_licenses"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.UserLicenseService/BatchUpdateUserLicenses", + request_serializer=user_license_service.BatchUpdateUserLicensesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["batch_update_user_licenses"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc_asyncio.py index b3d4161debc7..044f9c0d47a4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1.types import user_license_service @@ -401,12 +401,12 @@ def batch_update_user_licenses( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_user_licenses" not in self._stubs: - self._stubs[ - "batch_update_user_licenses" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.UserLicenseService/BatchUpdateUserLicenses", - request_serializer=user_license_service.BatchUpdateUserLicensesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["batch_update_user_licenses"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.UserLicenseService/BatchUpdateUserLicenses", + request_serializer=user_license_service.BatchUpdateUserLicensesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["batch_update_user_licenses"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest.py index dd67d173a26e..10725af4b2cc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -603,9 +603,7 @@ def __call__( """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseBatchUpdateUserLicenses._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseBatchUpdateUserLicenses._get_http_options() request, metadata = self._interceptor.pre_batch_update_user_licenses( request, metadata @@ -631,7 +629,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -758,9 +756,7 @@ def __call__( """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseListUserLicenses._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseListUserLicenses._get_http_options() request, metadata = self._interceptor.pre_list_user_licenses( request, metadata @@ -860,7 +856,9 @@ def batch_update_user_licenses( ]: # 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._BatchUpdateUserLicenses(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateUserLicenses( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_user_licenses( @@ -929,9 +927,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1052,9 +1048,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseUserLicenseServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1193,9 +1187,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseUserLicenseServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/__init__.py index 839ab2e31bfc..5fe9223209ca 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/__init__.py @@ -13,15 +13,25 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .answer import Answer -from .assist_answer import AssistAnswer, AssistantContent, AssistantGroundedContent -from .assistant import Assistant +from .answer import ( + Answer, +) +from .assist_answer import ( + AssistAnswer, + AssistantContent, + AssistantGroundedContent, +) +from .assistant import ( + Assistant, +) from .assistant_service import ( AssistUserMetadata, StreamAssistRequest, StreamAssistResponse, ) -from .chunk import Chunk +from .chunk import ( + Chunk, +) from .cmek_config_service import ( CmekConfig, DeleteCmekConfigMetadata, @@ -47,9 +57,18 @@ SolutionType, UserInfo, ) -from .completion import CompletionSuggestion, SuggestionDenyListEntry -from .completion_service import CompleteQueryRequest, CompleteQueryResponse -from .control import Condition, Control +from .completion import ( + CompletionSuggestion, + SuggestionDenyListEntry, +) +from .completion_service import ( + CompleteQueryRequest, + CompleteQueryResponse, +) +from .control import ( + Condition, + Control, +) from .control_service import ( CreateControlRequest, DeleteControlRequest, @@ -84,8 +103,14 @@ UpdateConversationRequest, UpdateSessionRequest, ) -from .custom_tuning_model import CustomTuningModel -from .data_store import AdvancedSiteSearchConfig, DataStore, WorkspaceConfig +from .custom_tuning_model import ( + CustomTuningModel, +) +from .data_store import ( + AdvancedSiteSearchConfig, + DataStore, + WorkspaceConfig, +) from .data_store_service import ( CreateDataStoreMetadata, CreateDataStoreRequest, @@ -96,8 +121,12 @@ ListDataStoresResponse, UpdateDataStoreRequest, ) -from .document import Document -from .document_processing_config import DocumentProcessingConfig +from .document import ( + Document, +) +from .document_processing_config import ( + DocumentProcessingConfig, +) from .document_service import ( BatchGetDocumentsMetadataRequest, BatchGetDocumentsMetadataResponse, @@ -108,7 +137,9 @@ ListDocumentsResponse, UpdateDocumentRequest, ) -from .engine import Engine +from .engine import ( + Engine, +) from .engine_service import ( CreateEngineMetadata, CreateEngineRequest, @@ -127,8 +158,14 @@ GenerateGroundedContentResponse, GroundedGenerationContent, ) -from .grounding import FactChunk, GroundingFact -from .identity_mapping_store import IdentityMappingEntry, IdentityMappingStore +from .grounding import ( + FactChunk, + GroundingFact, +) +from .identity_mapping_store import ( + IdentityMappingEntry, + IdentityMappingStore, +) from .identity_mapping_store_service import ( CreateIdentityMappingStoreRequest, DeleteIdentityMappingStoreMetadata, @@ -167,8 +204,13 @@ ImportUserEventsResponse, SpannerSource, ) -from .project import Project -from .project_service import ProvisionProjectMetadata, ProvisionProjectRequest +from .project import ( + Project, +) +from .project_service import ( + ProvisionProjectMetadata, + ProvisionProjectRequest, +) from .purge_config import ( PurgeCompletionSuggestionsMetadata, PurgeCompletionSuggestionsRequest, @@ -184,10 +226,22 @@ PurgeUserEventsRequest, PurgeUserEventsResponse, ) -from .rank_service import RankingRecord, RankRequest, RankResponse -from .recommendation_service import RecommendRequest, RecommendResponse -from .safety import HarmCategory, SafetyRating -from .schema import Schema +from .rank_service import ( + RankingRecord, + RankRequest, + RankResponse, +) +from .recommendation_service import ( + RecommendRequest, + RecommendResponse, +) +from .safety import ( + HarmCategory, + SafetyRating, +) +from .schema import ( + Schema, +) from .schema_service import ( CreateSchemaMetadata, CreateSchemaRequest, @@ -199,7 +253,10 @@ UpdateSchemaMetadata, UpdateSchemaRequest, ) -from .search_service import SearchRequest, SearchResponse +from .search_service import ( + SearchRequest, + SearchResponse, +) from .search_tuning_service import ( ListCustomModelsRequest, ListCustomModelsResponse, @@ -207,9 +264,16 @@ TrainCustomModelRequest, TrainCustomModelResponse, ) -from .serving_config import ServingConfig -from .serving_config_service import UpdateServingConfigRequest -from .session import Query, Session +from .serving_config import ( + ServingConfig, +) +from .serving_config_service import ( + UpdateServingConfigRequest, +) +from .session import ( + Query, + Session, +) from .site_search_engine import ( Sitemap, SiteSearchEngine, @@ -261,8 +325,13 @@ TransactionInfo, UserEvent, ) -from .user_event_service import CollectUserEventRequest, WriteUserEventRequest -from .user_license import UserLicense +from .user_event_service import ( + CollectUserEventRequest, + WriteUserEventRequest, +) +from .user_license import ( + UserLicense, +) from .user_license_service import ( BatchUpdateUserLicensesMetadata, BatchUpdateUserLicensesRequest, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/answer.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/answer.py index 39c29ccfbabd..12ad486b4592 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/answer.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/answer.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import safety @@ -88,6 +88,7 @@ class State(proto.Enum): STREAMING (4): Answer generation is currently in progress. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -161,6 +162,7 @@ class AnswerSkippedReason(proto.Enum): is not answerable, the answer is not relevant to the query, or the answer is not well-formatted. """ + ANSWER_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_ANSWER_SEEKING_QUERY_IGNORED = 2 @@ -544,6 +546,7 @@ class State(proto.Enum): SUCCEEDED (3): Step has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -772,6 +775,7 @@ class Type(proto.Enum): USER_DEFINED_CLASSIFICATION_QUERY (5): User defined query classification type. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assist_answer.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assist_answer.py index 3709ae87a66c..3bc4df748f5b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assist_answer.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assist_answer.py @@ -63,6 +63,7 @@ class State(proto.Enum): SKIPPED (4): Assist operation has been skipped. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -84,6 +85,7 @@ class AssistSkippedReason(proto.Enum): (e.g., the query or the answer contained a banned phrase). """ + ASSIST_SKIPPED_REASON_UNSPECIFIED = 0 NON_ASSIST_SEEKING_QUERY_IGNORED = 1 CUSTOMER_POLICY_VIOLATION = 2 @@ -253,6 +255,7 @@ class Outcome(proto.Enum): cancelled. There may or may not be a partial output present. """ + OUTCOME_UNSPECIFIED = 0 OUTCOME_OK = 1 OUTCOME_FAILED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/chunk.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/chunk.py index c476c9ea4e8f..040afd17ad77 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/chunk.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/chunk.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -92,6 +92,7 @@ class StructureType(proto.Enum): CHECKBOX_STRUCTURE (3): Checkbox structure. """ + STRUCTURE_TYPE_UNSPECIFIED = 0 SHAREHOLDER_STRUCTURE = 1 SIGNATURE_STRUCTURE = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/cmek_config_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/cmek_config_service.py index 378cd38ad0b7..bada27c7bcc4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/cmek_config_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/cmek_config_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -156,6 +156,7 @@ class State(proto.Enum): The KMS key is soft deleted. Some cleanup policy will eventually be applied. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -179,6 +180,7 @@ class NotebookLMState(proto.Enum): NOTEBOOK_LM_NOT_ENABLED (3): The NotebookLM is not enabled. """ + NOTEBOOK_LM_STATE_UNSPECIFIED = 0 NOTEBOOK_LM_NOT_READY = 1 NOTEBOOK_LM_READY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/common.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/common.py index ee09c5fad591..be1a0a5ae4dd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/common.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/common.py @@ -53,6 +53,7 @@ class IndustryVertical(proto.Enum): HEALTHCARE_FHIR (7): The healthcare FHIR vertical. """ + INDUSTRY_VERTICAL_UNSPECIFIED = 0 GENERIC = 1 MEDIA = 2 @@ -78,6 +79,7 @@ class SolutionType(proto.Enum): data stores must enrolled with ``SOLUTION_TYPE_CHAT`` solution. """ + SOLUTION_TYPE_UNSPECIFIED = 0 SOLUTION_TYPE_RECOMMENDATION = 1 SOLUTION_TYPE_SEARCH = 2 @@ -100,6 +102,7 @@ class SearchUseCase(proto.Enum): Browse use case. Expects the traffic has an empty [query][google.cloud.discoveryengine.v1.SearchRequest.query]. """ + SEARCH_USE_CASE_UNSPECIFIED = 0 SEARCH_USE_CASE_SEARCH = 1 SEARCH_USE_CASE_BROWSE = 2 @@ -119,6 +122,7 @@ class SearchTier(proto.Enum): SEARCH_TIER_ENTERPRISE (2): Enterprise tier. """ + SEARCH_TIER_UNSPECIFIED = 0 SEARCH_TIER_STANDARD = 1 SEARCH_TIER_ENTERPRISE = 2 @@ -134,6 +138,7 @@ class SearchAddOn(proto.Enum): SEARCH_ADD_ON_LLM (1): Large language model add-on. """ + SEARCH_ADD_ON_UNSPECIFIED = 0 SEARCH_ADD_ON_LLM = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion.py index f7f45960f38e..3a07432eb602 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion.py @@ -54,6 +54,7 @@ class MatchOperator(proto.Enum): CONTAINS (2): If the suggestion contains the block_phrase, then block it. """ + MATCH_OPERATOR_UNSPECIFIED = 0 EXACT_MATCH = 1 CONTAINS = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control.py index 8d8b1e4a4bf0..0bc1a527a64d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import common @@ -282,6 +282,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. For example, ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -298,6 +299,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control_service.py index b32fe3220982..fbbdc55feaa6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import control as gcd_control diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversation.py index 45179ba30683..9104da481710 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import search_service @@ -68,6 +68,7 @@ class State(proto.Enum): COMPLETED (2): Conversation has been completed. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversational_search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversational_search_service.py index d12fbaea8277..7861e1e5e032 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversational_search_service.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import answer as gcd_answer +from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import safety, search_service from google.cloud.discoveryengine_v1.types import session as gcd_session @@ -197,12 +197,12 @@ class ConverseConversationResponse(proto.Message): number=2, message=gcd_conversation.Conversation, ) - search_results: MutableSequence[ - search_service.SearchResponse.SearchResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=search_service.SearchResponse.SearchResult, + search_results: MutableSequence[search_service.SearchResponse.SearchResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=search_service.SearchResponse.SearchResult, + ) ) @@ -502,6 +502,7 @@ class HarmBlockThreshold(proto.Enum): OFF (5): Turn off the safety filter. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 @@ -573,6 +574,7 @@ class FilteringLevel(proto.Enum): FILTERING_LEVEL_HIGH (2): Filter answers based on a high threshold. """ + FILTERING_LEVEL_UNSPECIFIED = 0 FILTERING_LEVEL_LOW = 1 FILTERING_LEVEL_HIGH = 2 @@ -1095,6 +1097,7 @@ class Type(proto.Enum): USER_DEFINED_CLASSIFICATION_QUERY (5): User defined query classification type. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 @@ -1150,6 +1153,7 @@ class ModelType(proto.Enum): Large query rephraser model. Gemini 1.0 Pro model. """ + MODEL_TYPE_UNSPECIFIED = 0 SMALL = 1 LARGE = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/custom_tuning_model.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/custom_tuning_model.py index d4eacc8b57c8..708ad455753e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/custom_tuning_model.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/custom_tuning_model.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -83,6 +83,7 @@ class ModelState(proto.Enum): Input data validation failed. Model training didn't start. """ + MODEL_STATE_UNSPECIFIED = 0 TRAINING_PAUSED = 1 TRAINING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store.py index 397e4dce92ba..fc075a79328e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store.py @@ -17,14 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1.types import cmek_config_service, common, schema from google.cloud.discoveryengine_v1.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1.types import cmek_config_service, common -from google.cloud.discoveryengine_v1.types import schema __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -174,6 +173,7 @@ class ContentConfig(proto.Enum): workspace data store are specified in the [WorkspaceConfig][google.cloud.discoveryengine.v1.WorkspaceConfig]. """ + CONTENT_CONFIG_UNSPECIFIED = 0 NO_CONTENT = 1 CONTENT_REQUIRED = 2 @@ -384,6 +384,7 @@ class Type(proto.Enum): GOOGLE_PEOPLE (8): Workspace Data Store contains People data """ + TYPE_UNSPECIFIED = 0 GOOGLE_DRIVE = 1 GOOGLE_MAIL = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store_service.py index 6415db9c91d7..873ea39cedcd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document.py index aa775043afc9..394d09fcdc41 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import common @@ -226,12 +226,12 @@ class AccessRestriction(proto.Message): number=2, ) - readers: MutableSequence[ - "Document.AclInfo.AccessRestriction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.AclInfo.AccessRestriction", + readers: MutableSequence["Document.AclInfo.AccessRestriction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.AclInfo.AccessRestriction", + ) ) class IndexStatus(proto.Message): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_service.py index 6a4718de16f0..973d9939e895 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import document as gcd_document @@ -391,6 +391,7 @@ class State(proto.Enum): The [Document][google.cloud.discoveryengine.v1.Document] is not indexed. """ + STATE_UNSPECIFIED = 0 INDEXED = 1 NOT_IN_TARGET_SITE = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine.py index 6269a62ef070..c63025765bb9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import common @@ -229,6 +229,7 @@ class TrainingState(proto.Enum): TRAINING (2): The engine is training. """ + TRAINING_STATE_UNSPECIFIED = 0 PAUSED = 1 TRAINING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine_service.py index 484dbbcd23e3..f8a3c1ae70c5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import engine as gcd_engine diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounded_generation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounded_generation_service.py index 31c733582e6a..07ca656f8cbc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounded_generation_service.py @@ -258,6 +258,7 @@ class Version(proto.Enum): The V1 model which is evaluating each source independently. """ + VERSION_UNSPECIFIED = 0 V1_INDEPENDENT = 1 @@ -325,12 +326,12 @@ class InlineSource(proto.Message): author of the content). """ - grounding_facts: MutableSequence[ - grounding.GroundingFact - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=grounding.GroundingFact, + grounding_facts: MutableSequence[grounding.GroundingFact] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=grounding.GroundingFact, + ) ) attributes: MutableMapping[str, str] = proto.MapField( proto.STRING, @@ -558,6 +559,7 @@ class Source(proto.Enum): GOOGLE_MAPS (4): Google Maps. """ + SOURCE_UNSPECIFIED = 0 VERTEX_AI_SEARCH = 1 GOOGLE_SEARCH = 3 @@ -620,6 +622,7 @@ class Version(proto.Enum): The V1 model which is evaluating each source independently. """ + VERSION_UNSPECIFIED = 0 V1_INDEPENDENT = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/identity_mapping_store_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/identity_mapping_store_service.py index 1cce182f70d0..36c1243269e5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/identity_mapping_store_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/identity_mapping_store_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/import_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/import_config.py index 8aa69e0939e7..a1fcc7e2dbf2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/import_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/import_config.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import completion, document, user_event @@ -278,6 +278,7 @@ class Type(proto.Enum): JSON (7): JSON type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -298,6 +299,7 @@ class Encoding(proto.Enum): BINARY (2): Binary encoding. """ + ENCODING_UNSPECIFIED = 0 TEXT = 1 BINARY = 2 @@ -346,12 +348,12 @@ class BigtableColumnFamily(proto.Message): number=3, enum="BigtableOptions.Type", ) - columns: MutableSequence[ - "BigtableOptions.BigtableColumn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="BigtableOptions.BigtableColumn", + columns: MutableSequence["BigtableOptions.BigtableColumn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="BigtableOptions.BigtableColumn", + ) ) class BigtableColumn(proto.Message): @@ -1056,6 +1058,7 @@ class ReconciliationMode(proto.Enum): deleted if they are not present in the source location. """ + RECONCILIATION_MODE_UNSPECIFIED = 0 INCREMENTAL = 1 FULL = 2 @@ -1237,12 +1240,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - entries: MutableSequence[ - completion.SuggestionDenyListEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.SuggestionDenyListEntry, + entries: MutableSequence[completion.SuggestionDenyListEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.SuggestionDenyListEntry, + ) ) inline_source: InlineSource = proto.Field( @@ -1365,12 +1368,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - suggestions: MutableSequence[ - completion.CompletionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.CompletionSuggestion, + suggestions: MutableSequence[completion.CompletionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.CompletionSuggestion, + ) ) inline_source: InlineSource = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project.py index 23ec2dc21bae..7e9c020cf37d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -98,6 +98,7 @@ class State(proto.Enum): The project has declined or revoked the agreement to terms of service. """ + STATE_UNSPECIFIED = 0 TERMS_ACCEPTED = 1 TERMS_PENDING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/purge_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/purge_config.py index 74cbdd1f53f1..62857dcb4aca 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/purge_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/purge_config.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import import_config diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/recommendation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/recommendation_service.py index aa40514fe133..662baf156b80 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/recommendation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/recommendation_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import document as gcd_document diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/safety.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/safety.py index 19274c56b9f2..6691a56fee8c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/safety.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/safety.py @@ -46,6 +46,7 @@ class HarmCategory(proto.Enum): HARM_CATEGORY_CIVIC_INTEGRITY (5): The harm category is civic integrity. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_HATE_SPEECH = 1 HARM_CATEGORY_DANGEROUS_CONTENT = 2 @@ -90,6 +91,7 @@ class HarmProbability(proto.Enum): HIGH (4): High level of harm. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -111,6 +113,7 @@ class HarmSeverity(proto.Enum): HARM_SEVERITY_HIGH (4): High level of harm severity. """ + HARM_SEVERITY_UNSPECIFIED = 0 HARM_SEVERITY_NEGLIGIBLE = 1 HARM_SEVERITY_LOW = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema.py index 18e6d43e0a35..58315eabe1ce 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema_service.py index a54f02bcbd97..c1d6c532fe0e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import schema as gcd_schema diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py index 0bbbbac3121a..a19ba3366e9e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import chunk as gcd_chunk @@ -427,6 +427,7 @@ class RelevanceThreshold(proto.Enum): HIGH (4): High relevance threshold. """ + RELEVANCE_THRESHOLD_UNSPECIFIED = 0 LOWEST = 1 LOW = 2 @@ -446,6 +447,7 @@ class RankingExpressionBackend(proto.Enum): RANK_BY_FORMULA (4): Ranking by custom formula. """ + RANKING_EXPRESSION_BACKEND_UNSPECIFIED = 0 RANK_BY_EMBEDDING = 3 RANK_BY_FORMULA = 4 @@ -809,6 +811,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. For example, ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -825,6 +828,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -934,6 +938,7 @@ class Condition(proto.Enum): Automatic query expansion built by the Search API. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 AUTO = 2 @@ -977,6 +982,7 @@ class Mode(proto.Enum): Search API. Search will be based on the corrected query if found. """ + MODE_UNSPECIFIED = 0 SUGGESTION_ONLY = 1 AUTO = 2 @@ -1026,6 +1032,7 @@ class SearchResultMode(proto.Enum): [DocumentProcessingConfig.chunking_config][google.cloud.discoveryengine.v1.DocumentProcessingConfig.chunking_config] is specified. """ + SEARCH_RESULT_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -1414,6 +1421,7 @@ class Condition(proto.Enum): ideal for single-API implementations (e.g., debouncing). """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1447,6 +1455,7 @@ class MatchHighlightingCondition(proto.Enum): MATCH_HIGHLIGHTING_ENABLED (2): Enables match highlighting on all documents. """ + MATCH_HIGHLIGHTING_CONDITION_UNSPECIFIED = 0 MATCH_HIGHLIGHTING_DISABLED = 1 MATCH_HIGHLIGHTING_ENABLED = 2 @@ -1951,12 +1960,12 @@ class FacetValue(proto.Message): proto.STRING, number=1, ) - values: MutableSequence[ - "SearchResponse.Facet.FacetValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.Facet.FacetValue", + values: MutableSequence["SearchResponse.Facet.FacetValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.Facet.FacetValue", + ) ) dynamic_facet: bool = proto.Field( proto.BOOL, @@ -2050,6 +2059,7 @@ class SummarySkippedReason(proto.Enum): Google skips the summary if the time out. """ + SUMMARY_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_SUMMARY_SEEKING_QUERY_IGNORED = 2 @@ -2094,12 +2104,12 @@ class CitationMetadata(proto.Message): Citations for segments. """ - citations: MutableSequence[ - "SearchResponse.Summary.Citation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SearchResponse.Summary.Citation", + citations: MutableSequence["SearchResponse.Summary.Citation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SearchResponse.Summary.Citation", + ) ) class Citation(proto.Message): @@ -2123,12 +2133,12 @@ class Citation(proto.Message): proto.INT64, number=2, ) - sources: MutableSequence[ - "SearchResponse.Summary.CitationSource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.CitationSource", + sources: MutableSequence["SearchResponse.Summary.CitationSource"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.CitationSource", + ) ) class CitationSource(proto.Message): @@ -2226,12 +2236,12 @@ class SummaryWithMetadata(proto.Message): number=2, message="SearchResponse.Summary.CitationMetadata", ) - references: MutableSequence[ - "SearchResponse.Summary.Reference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.Reference", + references: MutableSequence["SearchResponse.Summary.Reference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.Reference", + ) ) summary_text: str = proto.Field( @@ -2360,12 +2370,12 @@ def raw_page(self): number=19, message=SessionInfo, ) - search_link_promotions: MutableSequence[ - common.SearchLinkPromotion - ] = proto.RepeatedField( - proto.MESSAGE, - number=23, - message=common.SearchLinkPromotion, + search_link_promotions: MutableSequence[common.SearchLinkPromotion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=23, + message=common.SearchLinkPromotion, + ) ) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_tuning_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_tuning_service.py index c054af1613aa..be111fdb0007 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_tuning_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import custom_tuning_model, import_config @@ -65,12 +65,12 @@ class ListCustomModelsResponse(proto.Message): List of custom tuning models. """ - models: MutableSequence[ - custom_tuning_model.CustomTuningModel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_tuning_model.CustomTuningModel, + models: MutableSequence[custom_tuning_model.CustomTuningModel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_tuning_model.CustomTuningModel, + ) ) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config.py index a8e4f0566f16..27ddbb4e1e94 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import common, search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config_service.py index a98b56d80234..54b3f74c3c3c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session.py index ce86a30fea33..6467d8a939d2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import answer as gcd_answer @@ -73,6 +73,7 @@ class State(proto.Enum): IN_PROGRESS (1): The session is currently open. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine.py index d9e98efc17a5..62d50a7e5591 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -103,6 +103,7 @@ class Type(proto.Enum): EXCLUDE (2): Exclude the target site. """ + TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -135,6 +136,7 @@ class IndexingStatus(proto.Enum): CANCELLED (6): The target site change is cancelled. """ + INDEXING_STATUS_UNSPECIFIED = 0 PENDING = 1 FAILED = 2 @@ -251,6 +253,7 @@ class SiteVerificationState(proto.Enum): Site exempt from verification, e.g., a public website that opens to all. """ + SITE_VERIFICATION_STATE_UNSPECIFIED = 0 VERIFIED = 1 UNVERIFIED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine_service.py index b4a266e68246..20a22dc2f146 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( @@ -371,12 +371,12 @@ class ListTargetSitesResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -424,12 +424,12 @@ class BatchCreateTargetSitesResponse(proto.Message): TargetSites created. """ - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) @@ -829,6 +829,7 @@ class CorpusType(proto.Enum): Denotes a crawling attempt for the mobile version of a page. """ + CORPUS_TYPE_UNSPECIFIED = 0 DESKTOP = 1 MOBILE = 2 @@ -1084,12 +1085,12 @@ class FetchDomainVerificationStatusResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_event.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_event.py index 4bed1bf502f0..88004bcb79a0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_event.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_event.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import common diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license.py index 203b5ed77612..4026316e1eba 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -84,6 +84,7 @@ class LicenseAssignmentState(proto.Enum): cannot get license assigned will be assigned NO_LICENSE state(License could be unassigned by admin). """ + LICENSE_ASSIGNMENT_STATE_UNSPECIFIED = 0 ASSIGNED = 1 UNASSIGNED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license_service.py index 44d117f50b75..a8246936e429 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license_service.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import user_license diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py index f0a8f6bae06d..96aac6493ce2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.acl_config_service import ( AclConfigServiceAsyncClient, AclConfigServiceClient, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/async_client.py index d035bf351f59..a97638fe84e6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AclConfigServiceAsyncClient: The constructed client. """ - return AclConfigServiceClient.from_service_account_info.__func__(AclConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AclConfigServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AclConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AclConfigServiceAsyncClient: The constructed client. """ - return AclConfigServiceClient.from_service_account_file.__func__(AclConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AclConfigServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AclConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/client.py index 13fab280986f..91736c1b5c07 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -84,9 +84,7 @@ class AclConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AclConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AclConfigServiceTransport]] _transport_registry["grpc"] = AclConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = AclConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = AclConfigServiceRestTransport @@ -625,11 +623,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AclConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AclConfigServiceClient._read_environment_variables() + ) self._client_cert_source = AclConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +660,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AclConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/base.py index 44390077ff35..cedd0381f98c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import acl_config, acl_config_service @@ -216,7 +216,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc.py index 43d56bd1e0cd..690f9177c77b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import acl_config, acl_config_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc_asyncio.py index 3cdaf8d90c3a..4360f2c52f9c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import acl_config, acl_config_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest.py index 546972609cc5..1384e40ffc6d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -556,9 +556,7 @@ def __call__( Access Control Configuration. """ - http_options = ( - _BaseAclConfigServiceRestTransport._BaseUpdateAclConfig._get_http_options() - ) + http_options = _BaseAclConfigServiceRestTransport._BaseUpdateAclConfig._get_http_options() request, metadata = self._interceptor.pre_update_acl_config( request, metadata @@ -725,9 +723,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAclConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAclConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -987,9 +983,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAclConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAclConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAclConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/async_client.py index 7960129d3aeb..65f24b69b8fb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.chunk_service import pagers from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service @@ -118,7 +118,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ChunkServiceAsyncClient: The constructed client. """ - return ChunkServiceClient.from_service_account_info.__func__(ChunkServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ChunkServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ChunkServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +135,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ChunkServiceAsyncClient: The constructed client. """ - return ChunkServiceClient.from_service_account_file.__func__(ChunkServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ChunkServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ChunkServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/client.py index e33796d6aec2..675ff0ed9644 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.chunk_service import pagers from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service @@ -657,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ChunkServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ChunkServiceClient._read_environment_variables() + ) self._client_cert_source = ChunkServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ChunkServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/pagers.py index d149f9181cf4..5190cc5840d4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/base.py index 5d30ffaf1b4d..c336bae22563 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service @@ -218,7 +218,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc.py index 46433ded4f84..ca6d1de32de6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc_asyncio.py index 5698a2ab1916..0875a3d6df2d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest.py index 1a05ebd9eaeb..e0a991595fb3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/async_client.py index 664c2c4995ec..d3850c1eb091 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -121,7 +121,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_info.__func__(CompletionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CompletionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CompletionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +138,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_file.__func__(CompletionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CompletionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CompletionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/client.py index fe72b9917bdd..13d60b45a582 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -86,9 +86,7 @@ class CompletionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CompletionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CompletionServiceTransport]] _transport_registry["grpc"] = CompletionServiceGrpcTransport _transport_registry["grpc_asyncio"] = CompletionServiceGrpcAsyncIOTransport _transport_registry["rest"] = CompletionServiceRestTransport @@ -632,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CompletionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CompletionServiceClient._read_environment_variables() + ) self._client_cert_source = CompletionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -671,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CompletionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/base.py index 338a6ae926ab..4397648dd17a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import ( @@ -270,7 +270,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc.py index e45e1cf97665..7ea49500c0d4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( completion_service, @@ -398,12 +398,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -431,12 +431,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -463,12 +463,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -495,12 +495,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc_asyncio.py index 7959c031d026..66deca2f1c41 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( completion_service, @@ -407,12 +407,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -441,12 +441,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -474,12 +474,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -507,12 +507,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest.py index da9b8ec81c86..f37365589020 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -765,9 +765,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() request, metadata = self._interceptor.pre_complete_query(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_transcoded_request( @@ -919,9 +917,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_import_completion_suggestions( request, metadata @@ -947,7 +943,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -988,11 +984,10 @@ def __call__( resp = self._interceptor.post_import_completion_suggestions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_completion_suggestions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_completion_suggestions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1081,15 +1076,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_import_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_import_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1112,7 +1104,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1153,11 +1145,10 @@ def __call__( resp = self._interceptor.post_import_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1244,9 +1235,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_purge_completion_suggestions( request, metadata @@ -1272,7 +1261,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1401,15 +1390,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_purge_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_purge_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1432,7 +1418,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1473,11 +1459,10 @@ def __call__( resp = self._interceptor.post_purge_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1521,7 +1506,9 @@ def import_completion_suggestions( ]: # 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._ImportCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._ImportCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_suggestion_deny_list_entries( @@ -1531,7 +1518,9 @@ def import_suggestion_deny_list_entries( ]: # 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._ImportSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._ImportSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_completion_suggestions( @@ -1541,7 +1530,9 @@ def purge_completion_suggestions( ]: # 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._PurgeCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_suggestion_deny_list_entries( @@ -1551,7 +1542,9 @@ def purge_suggestion_deny_list_entries( ]: # 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._PurgeSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -1609,9 +1602,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1731,9 +1722,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1872,9 +1861,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/async_client.py index e207dc52b9f7..c34aa06d3169 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,15 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.control_service import pagers -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import common, control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service from .client import ControlServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport @@ -126,7 +124,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_info.__func__(ControlServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ControlServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ControlServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +141,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_file.__func__(ControlServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ControlServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ControlServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/client.py index 74ee3d6aac73..230553ce1773 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,15 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.control_service import pagers -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import common, control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport from .transports.grpc import ControlServiceGrpcTransport @@ -85,9 +83,7 @@ class ControlServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ControlServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ControlServiceTransport]] _transport_registry["grpc"] = ControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = ControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = ControlServiceRestTransport @@ -655,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ControlServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ControlServiceClient._read_environment_variables() + ) self._client_cert_source = ControlServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ControlServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/pagers.py index 4fdfefa8c941..16384256b24a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/base.py index da513a8acb35..2703ee92ec4e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/base.py @@ -17,21 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -264,7 +263,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc.py index 62991007eaaa..5f6c6044992a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc.py @@ -16,24 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc_asyncio.py index d7c20e6d8b90..5d3090593277 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,16 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport from .grpc import ControlServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest.py index 11b7c06ce997..57cae66c0172 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,14 +28,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseControlServiceRestTransport @@ -712,7 +711,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1295,9 +1294,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest_base.py index d1e9cc380bc6..d2ca1b8a6fed 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest_base.py @@ -17,15 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/async_client.py index 5a0ed037092d..97c90a4f1a04 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,22 +44,22 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.conversational_search_service import ( pagers, ) from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, conversational_search_service, search_service, + session, ) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from .client import ConversationalSearchServiceClient @@ -164,7 +164,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_info.__func__(ConversationalSearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationalSearchServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + ConversationalSearchServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -180,7 +185,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_file.__func__(ConversationalSearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationalSearchServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + ConversationalSearchServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -218,7 +228,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationalSearchServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/client.py index 6ad1bfdc1f76..b4446bcfa866 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,22 +61,22 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.conversational_search_service import ( pagers, ) from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, conversational_search_service, search_service, + session, ) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport @@ -93,13 +93,11 @@ class ConversationalSearchServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationalSearchServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = ConversationalSearchServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + ConversationalSearchServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = ConversationalSearchServiceRestTransport def get_transport_class( @@ -797,11 +795,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationalSearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationalSearchServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConversationalSearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -838,8 +834,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationalSearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/pagers.py index b6329666a180..3d50c1f24914 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +233,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/__init__.py index 855e35aad0c0..234e039d4add 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationalSearchServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConversationalSearchServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConversationalSearchServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/base.py index 5387dac62136..c564d0802694 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -388,7 +390,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc.py index dfef0082e569..c565de9a8d36 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc_asyncio.py index d7ce30c63f09..7524be43cabd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest.py index 95bdbd1bbd07..8eb38647eaa8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -977,9 +979,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() request, metadata = self._interceptor.pre_answer_query(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_transcoded_request( @@ -1139,9 +1139,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() request, metadata = self._interceptor.pre_converse_conversation( request, metadata @@ -1299,9 +1297,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1452,9 +1448,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() request, metadata = self._interceptor.pre_create_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_transcoded_request( @@ -1601,9 +1595,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1625,7 +1617,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1710,9 +1702,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() request, metadata = self._interceptor.pre_delete_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_transcoded_request( @@ -1732,7 +1722,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1823,9 +1813,7 @@ def __call__( Defines an answer. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() request, metadata = self._interceptor.pre_get_answer(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_transcoded_request( @@ -1972,9 +1960,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -2121,9 +2107,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() request, metadata = self._interceptor.pre_get_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_transcoded_request( @@ -2270,9 +2254,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2421,9 +2403,7 @@ def __call__( Response for ListSessions method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() request, metadata = self._interceptor.pre_list_sessions(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_transcoded_request( @@ -2576,9 +2556,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() request, metadata = self._interceptor.pre_update_conversation( request, metadata @@ -2729,9 +2707,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() request, metadata = self._interceptor.pre_update_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_transcoded_request( @@ -3015,9 +2991,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3140,9 +3114,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3283,9 +3255,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest_base.py index da084da104dc..9c4c513525c0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1alpha.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import answer -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/async_client.py index f7fe424c9fb2..24a4b6e9fc48 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,24 +44,26 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.data_store_service import pagers +from google.cloud.discoveryengine_v1alpha.types import ( + common, + data_store, + data_store_service, + document_processing_config, + schema, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service -from google.cloud.discoveryengine_v1alpha.types import schema from .client import DataStoreServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport @@ -142,7 +144,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_info.__func__(DataStoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataStoreServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataStoreServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +161,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_file.__func__(DataStoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataStoreServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataStoreServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/client.py index 8db83849250f..8551cd2c1488 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,24 +61,26 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.data_store_service import pagers +from google.cloud.discoveryengine_v1alpha.types import ( + common, + data_store, + data_store_service, + document_processing_config, + schema, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service -from google.cloud.discoveryengine_v1alpha.types import schema from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport from .transports.grpc import DataStoreServiceGrpcTransport @@ -94,9 +96,7 @@ class DataStoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataStoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataStoreServiceTransport]] _transport_registry["grpc"] = DataStoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataStoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataStoreServiceRestTransport @@ -711,11 +711,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataStoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataStoreServiceClient._read_environment_variables() + ) self._client_cert_source = DataStoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -750,8 +748,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataStoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/pagers.py index bf1af67548e6..685146234277 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/base.py index 388a7b6830d8..08c03b56c711 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/base.py @@ -17,24 +17,26 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import ( + data_store, + data_store_service, + document_processing_config, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -306,7 +308,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc.py index 6b4a0fe42fa0..19a29af2ff9a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc.py @@ -16,27 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + data_store, + data_store_service, + document_processing_config, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport @@ -522,12 +524,12 @@ def get_document_processing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_document_processing_config" not in self._stubs: - self._stubs[ - "get_document_processing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DataStoreService/GetDocumentProcessingConfig", - request_serializer=data_store_service.GetDocumentProcessingConfigRequest.serialize, - response_deserializer=document_processing_config.DocumentProcessingConfig.deserialize, + self._stubs["get_document_processing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DataStoreService/GetDocumentProcessingConfig", + request_serializer=data_store_service.GetDocumentProcessingConfigRequest.serialize, + response_deserializer=document_processing_config.DocumentProcessingConfig.deserialize, + ) ) return self._stubs["get_document_processing_config"] @@ -562,12 +564,12 @@ def update_document_processing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_document_processing_config" not in self._stubs: - self._stubs[ - "update_document_processing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DataStoreService/UpdateDocumentProcessingConfig", - request_serializer=data_store_service.UpdateDocumentProcessingConfigRequest.serialize, - response_deserializer=gcd_document_processing_config.DocumentProcessingConfig.deserialize, + self._stubs["update_document_processing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DataStoreService/UpdateDocumentProcessingConfig", + request_serializer=data_store_service.UpdateDocumentProcessingConfigRequest.serialize, + response_deserializer=gcd_document_processing_config.DocumentProcessingConfig.deserialize, + ) ) return self._stubs["update_document_processing_config"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc_asyncio.py index be0a75a2844a..a7e0993e1559 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,18 +31,17 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + data_store, + data_store_service, + document_processing_config, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport from .grpc import DataStoreServiceGrpcTransport @@ -532,12 +534,12 @@ def get_document_processing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_document_processing_config" not in self._stubs: - self._stubs[ - "get_document_processing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DataStoreService/GetDocumentProcessingConfig", - request_serializer=data_store_service.GetDocumentProcessingConfigRequest.serialize, - response_deserializer=document_processing_config.DocumentProcessingConfig.deserialize, + self._stubs["get_document_processing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DataStoreService/GetDocumentProcessingConfig", + request_serializer=data_store_service.GetDocumentProcessingConfigRequest.serialize, + response_deserializer=document_processing_config.DocumentProcessingConfig.deserialize, + ) ) return self._stubs["get_document_processing_config"] @@ -572,12 +574,12 @@ def update_document_processing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_document_processing_config" not in self._stubs: - self._stubs[ - "update_document_processing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DataStoreService/UpdateDocumentProcessingConfig", - request_serializer=data_store_service.UpdateDocumentProcessingConfigRequest.serialize, - response_deserializer=gcd_document_processing_config.DocumentProcessingConfig.deserialize, + self._stubs["update_document_processing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DataStoreService/UpdateDocumentProcessingConfig", + request_serializer=data_store_service.UpdateDocumentProcessingConfigRequest.serialize, + response_deserializer=gcd_document_processing_config.DocumentProcessingConfig.deserialize, + ) ) return self._stubs["update_document_processing_config"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest.py index 3c5e0577ef4b..411dc4a9ca40 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest.py @@ -16,27 +16,29 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1alpha.types import ( + data_store, + data_store_service, + document_processing_config, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataStoreServiceRestTransport @@ -890,9 +892,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() request, metadata = self._interceptor.pre_create_data_store( request, metadata @@ -918,7 +918,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1045,9 +1045,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() request, metadata = self._interceptor.pre_delete_data_store( request, metadata @@ -1069,7 +1067,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1349,9 +1347,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseGetDocumentProcessingConfig._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseGetDocumentProcessingConfig._get_http_options() request, metadata = self._interceptor.pre_get_document_processing_config( request, metadata @@ -1415,11 +1411,10 @@ def __call__( resp = self._interceptor.post_get_document_processing_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_document_processing_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_document_processing_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1507,9 +1502,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() request, metadata = self._interceptor.pre_list_data_stores( request, metadata @@ -1661,9 +1654,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() request, metadata = self._interceptor.pre_update_data_store( request, metadata @@ -1825,9 +1816,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseUpdateDocumentProcessingConfig._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseUpdateDocumentProcessingConfig._get_http_options() request, metadata = self._interceptor.pre_update_document_processing_config( request, metadata @@ -1896,11 +1885,10 @@ def __call__( resp = self._interceptor.post_update_document_processing_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_document_processing_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_document_processing_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1966,7 +1954,9 @@ def get_document_processing_config( ]: # 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._GetDocumentProcessingConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetDocumentProcessingConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_data_stores( @@ -1998,7 +1988,9 @@ def update_document_processing_config( ]: # 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._UpdateDocumentProcessingConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDocumentProcessingConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -2056,9 +2048,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2318,9 +2308,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataStoreServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest_base.py index a651b272c3a3..18d42b365f04 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest_base.py @@ -22,13 +22,15 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1alpha.types import ( + data_store, + data_store_service, + document_processing_config, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/async_client.py index 967e825c1fc6..bf756d3acbc8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,21 +44,21 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.document_service import pagers from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document from .client import DocumentServiceClient @@ -134,7 +134,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DocumentServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DocumentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -150,7 +151,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DocumentServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DocumentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/client.py index 827f343950db..5090002c5738 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,21 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.document_service import pagers from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -92,9 +92,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -691,11 +689,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -730,8 +726,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/pagers.py index a6d2f86a14a2..31e49e7cdbf9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/base.py index 0bc6c56050c2..603833a7777d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/base.py @@ -17,24 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -341,7 +341,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc.py index 5e7fa066e5ff..4c53ec3ef7f0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc.py @@ -16,27 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -616,12 +616,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc_asyncio.py index d9ac56379040..50adb6c7009c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,19 +31,15 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -634,12 +634,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest.py index c91818db2d7f..a7f3adf0932b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest.py @@ -16,27 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -955,9 +955,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() request, metadata = self._interceptor.pre_batch_get_documents_metadata( request, metadata @@ -1113,9 +1111,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -1260,9 +1256,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -1282,7 +1276,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1525,9 +1519,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseGetProcessedDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseGetProcessedDocument._get_http_options() request, metadata = self._interceptor.pre_get_processed_document( request, metadata @@ -1675,9 +1667,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() request, metadata = self._interceptor.pre_import_documents( request, metadata @@ -1703,7 +1693,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1981,9 +1971,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() request, metadata = self._interceptor.pre_purge_documents(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_transcoded_request( @@ -2007,7 +1995,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2134,9 +2122,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -2238,7 +2224,9 @@ def batch_get_documents_metadata( ]: # 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._BatchGetDocumentsMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetDocumentsMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_document( @@ -2363,9 +2351,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2625,9 +2611,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest_base.py index 169f1a83cbbe..755d4b0f7a05 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest_base.py @@ -17,18 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.discoveryengine_v1alpha.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/async_client.py index 6c654fc9e890..47def29d9166 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,19 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.engine_service import pagers -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import common, engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service from .client import EngineServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport @@ -128,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_info.__func__(EngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EngineServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EngineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_file.__func__(EngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EngineServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EngineServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/client.py index 17e5127261d5..fa598f001590 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,19 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.engine_service import pagers -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import common, engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport from .transports.grpc import EngineServiceGrpcTransport @@ -657,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EngineServiceClient._read_environment_variables() + ) self._client_cert_source = EngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/pagers.py index 50ef5dbbc624..0bad1d478b5d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/base.py index b67a19088c40..451a8ce6ce18 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -310,7 +309,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc.py index 804660e8de71..565fb01e454c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc_asyncio.py index e31cf83803e6..bd1a08c71af9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport from .grpc import EngineServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest.py index ebf00ce3ec1e..0c37c8eabd6d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEngineServiceRestTransport @@ -939,7 +938,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1087,7 +1086,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1864,7 +1863,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest_base.py index 3ad4bdc6c541..89df4a29cd59 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/async_client.py index 55863e8bcacd..98fe19743754 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EstimateBillingServiceAsyncClient: The constructed client. """ - return EstimateBillingServiceClient.from_service_account_info.__func__(EstimateBillingServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EstimateBillingServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EstimateBillingServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EstimateBillingServiceAsyncClient: The constructed client. """ - return EstimateBillingServiceClient.from_service_account_file.__func__(EstimateBillingServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EstimateBillingServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + EstimateBillingServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -173,7 +177,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return EstimateBillingServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return EstimateBillingServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> EstimateBillingServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/client.py index 6ba450291b1b..6e70990a880a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -82,9 +82,7 @@ class EstimateBillingServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EstimateBillingServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EstimateBillingServiceTransport]] _transport_registry["grpc"] = EstimateBillingServiceGrpcTransport _transport_registry["grpc_asyncio"] = EstimateBillingServiceGrpcAsyncIOTransport _transport_registry["rest"] = EstimateBillingServiceRestTransport @@ -625,11 +623,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EstimateBillingServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EstimateBillingServiceClient._read_environment_variables() + ) self._client_cert_source = EstimateBillingServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +660,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EstimateBillingServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/__init__.py index 3a94a649d916..3c5e8b0ce3cc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EstimateBillingServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EstimateBillingServiceTransport]] _transport_registry["grpc"] = EstimateBillingServiceGrpcTransport _transport_registry["grpc_asyncio"] = EstimateBillingServiceGrpcAsyncIOTransport _transport_registry["rest"] = EstimateBillingServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/base.py index af03ce1f2ae2..8b3a0394d23f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service @@ -207,7 +207,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc.py index b8595639994d..1511693abd37 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc_asyncio.py index 81ab1944b72a..940de33439ee 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest.py index 399c5d25dd0d..291156325f30 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -532,9 +532,7 @@ def __call__( """ - http_options = ( - _BaseEstimateBillingServiceRestTransport._BaseEstimateDataSize._get_http_options() - ) + http_options = _BaseEstimateBillingServiceRestTransport._BaseEstimateDataSize._get_http_options() request, metadata = self._interceptor.pre_estimate_data_size( request, metadata @@ -560,7 +558,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -695,9 +693,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEstimateBillingServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEstimateBillingServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -820,9 +816,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEstimateBillingServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEstimateBillingServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEstimateBillingServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -961,9 +955,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEstimateBillingServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEstimateBillingServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEstimateBillingServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/async_client.py index 27c72b9a272a..c02bc3666c6c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,17 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1alpha.types import evaluation -from google.cloud.discoveryengine_v1alpha.types import evaluation_service from .client import EvaluationServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport @@ -144,7 +143,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EvaluationServiceAsyncClient: The constructed client. """ - return EvaluationServiceClient.from_service_account_info.__func__(EvaluationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EvaluationServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EvaluationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +160,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EvaluationServiceAsyncClient: The constructed client. """ - return EvaluationServiceClient.from_service_account_file.__func__(EvaluationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EvaluationServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EvaluationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/client.py index 4c4f7733e6f6..9902123196f9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,17 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1alpha.types import evaluation -from google.cloud.discoveryengine_v1alpha.types import evaluation_service from .transports.base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport from .transports.grpc import EvaluationServiceGrpcTransport @@ -87,9 +86,7 @@ class EvaluationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EvaluationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EvaluationServiceTransport]] _transport_registry["grpc"] = EvaluationServiceGrpcTransport _transport_registry["grpc_asyncio"] = EvaluationServiceGrpcAsyncIOTransport _transport_registry["rest"] = EvaluationServiceRestTransport @@ -794,11 +791,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EvaluationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EvaluationServiceClient._read_environment_variables() + ) self._client_cert_source = EvaluationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -833,8 +828,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EvaluationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/pagers.py index daa00c99e2d8..9674263f1972 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/base.py index ab3f4c82ed02..66e3da41d100 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service @@ -255,7 +255,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc.py index 344488b60937..abe9bef6ecbf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc_asyncio.py index b35d2cf49836..9b67b710af3f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest.py index ac044da80ed0..247582add31f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -709,9 +709,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseCreateEvaluation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseCreateEvaluation._get_http_options() request, metadata = self._interceptor.pre_create_evaluation( request, metadata @@ -737,7 +735,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -865,9 +863,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_evaluation(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_transcoded_request( @@ -1015,9 +1011,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListEvaluationResults._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListEvaluationResults._get_http_options() request, metadata = self._interceptor.pre_list_evaluation_results( request, metadata @@ -1173,9 +1167,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListEvaluations._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_evaluations( request, metadata @@ -1363,9 +1355,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1485,9 +1475,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1626,9 +1614,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/async_client.py index 0612b2bb6a49..2e4cedce07bd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -130,7 +130,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_info.__func__(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GroundedGenerationServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +149,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_file.__func__(GroundedGenerationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GroundedGenerationServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + GroundedGenerationServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -184,7 +192,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GroundedGenerationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/client.py index 933f8ea0ca3a..e2284f1c9c4b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -83,9 +83,7 @@ class GroundedGenerationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GroundedGenerationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport @@ -631,11 +629,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GroundedGenerationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GroundedGenerationServiceClient._read_environment_variables() + ) self._client_cert_source = ( GroundedGenerationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -672,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GroundedGenerationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/__init__.py index 0f3052cbd079..ec0eaca83aa8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GroundedGenerationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/base.py index 75f2969807a6..5758b88d33d4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service @@ -205,7 +205,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc.py index 641c6645ab89..6a93c5ba06b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc_asyncio.py index fbd280c7e258..32f5a99fa861 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest.py index a13211031044..1eb5255ef26d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -364,9 +364,7 @@ def __call__( """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() request, metadata = self._interceptor.pre_check_grounding(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_transcoded_request( @@ -532,9 +530,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -657,9 +653,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -800,9 +794,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/async_client.py index 2a7ea2e10abc..e3df08c9ac64 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,15 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service from .client import ProjectServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ProjectServiceTransport @@ -122,7 +121,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_info.__func__(ProjectServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ProjectServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ProjectServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +138,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_file.__func__(ProjectServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ProjectServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ProjectServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/client.py index e9158205635a..6f6a50731aeb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,15 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service from .transports.base import DEFAULT_CLIENT_INFO, ProjectServiceTransport from .transports.grpc import ProjectServiceGrpcTransport @@ -85,9 +84,7 @@ class ProjectServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ProjectServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ProjectServiceTransport]] _transport_registry["grpc"] = ProjectServiceGrpcTransport _transport_registry["grpc_asyncio"] = ProjectServiceGrpcAsyncIOTransport _transport_registry["rest"] = ProjectServiceRestTransport @@ -622,11 +619,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectServiceClient._read_environment_variables() + ) self._client_cert_source = ProjectServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -661,8 +656,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/base.py index b618d29ff4c7..980aaa827b57 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -237,7 +236,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc.py index 08f815e86000..3f02be789d03 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc_asyncio.py index 4589504386c2..f745047a47bd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport from .grpc import ProjectServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest.py index 238189fe25fe..5347c4252566 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseProjectServiceRestTransport @@ -794,9 +793,7 @@ def __call__( """ - http_options = ( - _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() request, metadata = self._interceptor.pre_provision_project( request, metadata @@ -822,7 +819,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -948,9 +945,7 @@ def __call__( """ - http_options = ( - _BaseProjectServiceRestTransport._BaseReportConsentChange._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseReportConsentChange._get_http_options() request, metadata = self._interceptor.pre_report_consent_change( request, metadata @@ -1124,9 +1119,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest_base.py index adc8d22d3e57..6bd4ddcf0ad3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/async_client.py index 477f0ce1aec9..2914b075f2a0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_info.__func__(RankServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = RankServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(RankServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_file.__func__(RankServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = RankServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(RankServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/client.py index 51eff83719fe..4ad7eb0234c3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -620,11 +620,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RankServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RankServiceClient._read_environment_variables() + ) self._client_cert_source = RankServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -659,8 +657,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RankServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/base.py index 08c2e2d31db4..baae369fab4e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import rank_service @@ -202,7 +202,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc.py index 3473ec70e031..6d31de27a950 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import rank_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc_asyncio.py index 74f232c7fe0b..a179765257b6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import rank_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest.py index 5addf747c92e..b2f2cabb22ed 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/async_client.py index f8aaf7121b36..877b1a976e4b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -127,7 +127,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_info.__func__(RecommendationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = RecommendationServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(RecommendationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_file.__func__(RecommendationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = RecommendationServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(RecommendationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +183,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return RecommendationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return RecommendationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> RecommendationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/client.py index 4245e9b5ae1c..67462f7442a5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -80,9 +80,7 @@ class RecommendationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RecommendationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport @@ -702,11 +700,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RecommendationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RecommendationServiceClient._read_environment_variables() + ) self._client_cert_source = RecommendationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -741,8 +737,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RecommendationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/__init__.py index f21f53c111bf..a09bbaaf4d43 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RecommendationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/base.py index 6f8d6fbda49e..8d3ef10867de 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import recommendation_service @@ -205,7 +205,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc.py index 422bf5d8587f..5a24c9e2674c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import recommendation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc_asyncio.py index c653d05e7799..76baf925f206 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import recommendation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest.py index 186cb85db951..1af2e9dfaccf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -358,9 +358,7 @@ def __call__( """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() request, metadata = self._interceptor.pre_recommend(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseRecommend._get_transcoded_request( @@ -522,9 +520,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -647,9 +643,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -788,9 +782,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/async_client.py index ccc37228b156..bd946f9fb629 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,18 +44,20 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.sample_query_service import pagers +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service from .client import SampleQueryServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport @@ -131,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SampleQueryServiceAsyncClient: The constructed client. """ - return SampleQueryServiceClient.from_service_account_info.__func__(SampleQueryServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SampleQueryServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SampleQueryServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SampleQueryServiceAsyncClient: The constructed client. """ - return SampleQueryServiceClient.from_service_account_file.__func__(SampleQueryServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SampleQueryServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SampleQueryServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -185,7 +189,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SampleQueryServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SampleQueryServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SampleQueryServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/client.py index 0e2c2fcf5cce..721f8c8536da 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,18 +61,20 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.sample_query_service import pagers +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service from .transports.base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport from .transports.grpc import SampleQueryServiceGrpcTransport @@ -88,9 +90,7 @@ class SampleQueryServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SampleQueryServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SampleQueryServiceTransport]] _transport_registry["grpc"] = SampleQueryServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQueryServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQueryServiceRestTransport @@ -660,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SampleQueryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SampleQueryServiceClient._read_environment_variables() + ) self._client_cert_source = SampleQueryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -699,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SampleQueryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/pagers.py index 71fe2d9f2ec8..a8d44b6b58b5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/__init__.py index 0f5acb01b776..f8fb6800d64a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SampleQueryServiceRestInterceptor, SampleQueryServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SampleQueryServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SampleQueryServiceTransport]] _transport_registry["grpc"] = SampleQueryServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQueryServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQueryServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/base.py index 90ff824241df..0f1c2ef8ab9e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -284,7 +286,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc.py index 202aedb811be..8175e39c922f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc_asyncio.py index 2f3997e05593..738275902907 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +31,15 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport from .grpc import SampleQueryServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest.py index 3a42f477f338..62758dd41387 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest.py @@ -16,25 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSampleQueryServiceRestTransport @@ -786,9 +788,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseCreateSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseCreateSampleQuery._get_http_options() request, metadata = self._interceptor.pre_create_sample_query( request, metadata @@ -936,9 +936,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseDeleteSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseDeleteSampleQuery._get_http_options() request, metadata = self._interceptor.pre_delete_sample_query( request, metadata @@ -960,7 +958,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1053,9 +1051,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseGetSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseGetSampleQuery._get_http_options() request, metadata = self._interceptor.pre_get_sample_query( request, metadata @@ -1206,9 +1202,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseImportSampleQueries._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseImportSampleQueries._get_http_options() request, metadata = self._interceptor.pre_import_sample_queries( request, metadata @@ -1234,7 +1228,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1363,9 +1357,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseListSampleQueries._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseListSampleQueries._get_http_options() request, metadata = self._interceptor.pre_list_sample_queries( request, metadata @@ -1517,9 +1509,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseUpdateSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseUpdateSampleQuery._get_http_options() request, metadata = self._interceptor.pre_update_sample_query( request, metadata @@ -1727,9 +1717,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1850,9 +1838,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1991,9 +1977,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSampleQueryServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest_base.py index 4728c94f0768..807191aeea28 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest_base.py @@ -17,16 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/async_client.py index 77b87387dd9d..1bd43011b5d2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,19 +44,21 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.sample_query_set_service import ( pagers, ) +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service from .client import SampleQuerySetServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport @@ -134,7 +136,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SampleQuerySetServiceAsyncClient: The constructed client. """ - return SampleQuerySetServiceClient.from_service_account_info.__func__(SampleQuerySetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SampleQuerySetServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SampleQuerySetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -150,7 +153,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SampleQuerySetServiceAsyncClient: The constructed client. """ - return SampleQuerySetServiceClient.from_service_account_file.__func__(SampleQuerySetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SampleQuerySetServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SampleQuerySetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -188,7 +192,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SampleQuerySetServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SampleQuerySetServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SampleQuerySetServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/client.py index c9572b7a68a7..0cbec5a71ac6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,19 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.sample_query_set_service import ( pagers, ) +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service from .transports.base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport from .transports.grpc import SampleQuerySetServiceGrpcTransport @@ -89,9 +91,7 @@ class SampleQuerySetServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SampleQuerySetServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SampleQuerySetServiceTransport]] _transport_registry["grpc"] = SampleQuerySetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQuerySetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQuerySetServiceRestTransport @@ -656,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SampleQuerySetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SampleQuerySetServiceClient._read_environment_variables() + ) self._client_cert_source = SampleQuerySetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -695,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SampleQuerySetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/pagers.py index 5c20e99b761d..f8ce2109c621 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/__init__.py index 44ad1aa56225..a953bda6fade 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SampleQuerySetServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SampleQuerySetServiceTransport]] _transport_registry["grpc"] = SampleQuerySetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQuerySetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQuerySetServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/base.py index 449d0092b972..8730e751611b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -274,7 +276,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc.py index e7e5954eaba8..c2feda6f2bff 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc_asyncio.py index 77cfd63d9821..5f3ff2d31ecc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport from .grpc import SampleQuerySetServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest.py index 66b4dee48653..77f1ce6ed248 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSampleQuerySetServiceRestTransport @@ -565,9 +567,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseCreateSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseCreateSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_create_sample_query_set( request, metadata @@ -719,9 +719,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseDeleteSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseDeleteSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_delete_sample_query_set( request, metadata @@ -743,7 +741,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -840,9 +838,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseGetSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseGetSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_get_sample_query_set( request, metadata @@ -994,9 +990,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseListSampleQuerySets._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseListSampleQuerySets._get_http_options() request, metadata = self._interceptor.pre_list_sample_query_sets( request, metadata @@ -1154,9 +1148,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseUpdateSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseUpdateSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_update_sample_query_set( request, metadata @@ -1365,9 +1357,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1490,9 +1480,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1631,9 +1619,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest_base.py index 76658c3d1e60..37d2c5776ade 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/async_client.py index e23c5e46c72b..dd1a988a859a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,17 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.schema_service import pagers -from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.discoveryengine_v1alpha.types import schema, schema_service from google.cloud.discoveryengine_v1alpha.types import schema as gcd_schema -from google.cloud.discoveryengine_v1alpha.types import schema_service from .client import SchemaServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport @@ -126,7 +125,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SchemaServiceAsyncClient: The constructed client. """ - return SchemaServiceClient.from_service_account_info.__func__(SchemaServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SchemaServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SchemaServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +142,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SchemaServiceAsyncClient: The constructed client. """ - return SchemaServiceClient.from_service_account_file.__func__(SchemaServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SchemaServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SchemaServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/client.py index 994674f793a6..eb31e4308986 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,17 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.schema_service import pagers -from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.discoveryengine_v1alpha.types import schema, schema_service from google.cloud.discoveryengine_v1alpha.types import schema as gcd_schema -from google.cloud.discoveryengine_v1alpha.types import schema_service from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport from .transports.grpc import SchemaServiceGrpcTransport @@ -653,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SchemaServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SchemaServiceClient._read_environment_variables() + ) self._client_cert_source = SchemaServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -692,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SchemaServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/pagers.py index f5efd716d3d5..f6ee53f16567 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/base.py index 8cf873d2f1ca..279eb7b45647 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import schema, schema_service @@ -266,7 +266,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc.py index 4e7f33fbe9ff..80d03a65b75a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import schema, schema_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc_asyncio.py index 2e7b5673ea53..65edb1a2d5d4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import schema, schema_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest.py index 7eade9324da8..f84ed363b954 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -779,7 +779,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -927,7 +927,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1384,7 +1384,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/async_client.py index f18a4ef0ba91..b3b8f26cd59a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -128,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_info.__func__(SearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SearchServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SearchServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_file.__func__(SearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SearchServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SearchServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/client.py index 4210b449ccaa..1b0dd833ea79 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -747,11 +747,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchServiceClient._read_environment_variables() + ) self._client_cert_source = SearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -786,8 +784,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/pagers.py index 58b027b8b742..379653b2a8c2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/base.py index d239671add7e..8742a35a76bf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import search_service @@ -202,7 +202,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc.py index 9030580c8efb..3d74e1a3ea1b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc_asyncio.py index 555da5238e97..60c2f8107bcf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest.py index d4feaa473f18..a866396e7505 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/async_client.py index e689cffa1d7c..798b8c58bb9d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -128,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_info.__func__(SearchTuningServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SearchTuningServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SearchTuningServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_file.__func__(SearchTuningServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SearchTuningServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SearchTuningServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -182,7 +184,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SearchTuningServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/client.py index cdecbe836177..de88d9d2e3f2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -85,9 +85,7 @@ class SearchTuningServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SearchTuningServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport @@ -655,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchTuningServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchTuningServiceClient._read_environment_variables() + ) self._client_cert_source = SearchTuningServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchTuningServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/__init__.py index d759f5c3cdcd..170e258db18b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SearchTuningServiceRestInterceptor, SearchTuningServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SearchTuningServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/base.py index 51cc4c7ce83f..68c4c3f38f2a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import search_tuning_service @@ -224,7 +224,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc.py index d44cf1faaece..e9e841d2d6fc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_tuning_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc_asyncio.py index f8a5cb229b0f..6f5b376ef66e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_tuning_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest.py index c90fd763bfb7..7f23ece525f4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -591,9 +591,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() request, metadata = self._interceptor.pre_list_custom_models( request, metadata @@ -746,9 +744,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() request, metadata = self._interceptor.pre_train_custom_model( request, metadata @@ -774,7 +770,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -918,9 +914,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1041,9 +1035,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1182,9 +1174,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/async_client.py index 1447f23f774d..268aae509c8a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,18 +44,20 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1alpha.types import ( + common, + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service from .client import ServingConfigServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport @@ -127,7 +129,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_info.__func__(ServingConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ServingConfigServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ServingConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +146,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_file.__func__(ServingConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ServingConfigServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ServingConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +185,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ServingConfigServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/client.py index 30e9f02b87dd..96de7b3d47f4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,18 +61,20 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1alpha.types import ( + common, + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport from .transports.grpc import ServingConfigServiceGrpcTransport @@ -88,9 +90,7 @@ class ServingConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServingConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport @@ -638,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServingConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServingConfigServiceClient._read_environment_variables() + ) self._client_cert_source = ServingConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServingConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/pagers.py index 24a16678965c..051dfede9559 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/__init__.py index 6bdd4697d637..5e6ab0b7e7f9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ServingConfigServiceRestInterceptor, ServingConfigServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServingConfigServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/base.py index a0afef2ea85a..76337c5d454c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -240,7 +242,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc.py index a05f1bdc3f4f..9679ff61f295 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc_asyncio.py index 3f137c837306..2cbd5722f858 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,16 +31,15 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport from .grpc import ServingConfigServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest.py index e475ede325f4..3cce427fd89d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +27,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1alpha.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseServingConfigServiceRestTransport @@ -483,9 +485,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetServingConfig._get_http_options() request, metadata = self._interceptor.pre_get_serving_config( request, metadata @@ -635,9 +635,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListServingConfigs._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListServingConfigs._get_http_options() request, metadata = self._interceptor.pre_list_serving_configs( request, metadata @@ -796,9 +794,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() request, metadata = self._interceptor.pre_update_serving_config( request, metadata @@ -985,9 +981,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1108,9 +1102,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1249,9 +1241,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest_base.py index 1f589b60cac7..5a276268f655 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest_base.py @@ -22,11 +22,13 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1alpha.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/async_client.py index 214877f6d77a..550317b0c2e6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,16 +44,18 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.session_service import pagers -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service from .client import SessionServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport @@ -129,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_info.__func__(SessionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SessionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SessionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_file.__func__(SessionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SessionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SessionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/client.py index 019b650c2ddf..c1d0956bf9d1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,16 +61,18 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.session_service import pagers -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport from .transports.grpc import SessionServiceGrpcTransport @@ -86,9 +88,7 @@ class SessionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionServiceTransport]] _transport_registry["grpc"] = SessionServiceGrpcTransport _transport_registry["grpc_asyncio"] = SessionServiceGrpcAsyncIOTransport _transport_registry["rest"] = SessionServiceRestTransport @@ -732,11 +732,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionServiceClient._read_environment_variables() + ) self._client_cert_source = SessionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -771,8 +769,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/pagers.py index d78399681d46..e93d5e7702e8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -149,7 +149,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -231,7 +231,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -307,7 +307,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/base.py index d66aafff8521..61d249491785 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -282,7 +284,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc.py index b337438a531f..6ad3cfb2dad2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc_asyncio.py index 2674071048ef..92699cea3b1e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,17 +31,15 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport from .grpc import SessionServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest.py index bfc68a801c15..aa82db74c96d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +28,15 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionServiceRestTransport @@ -769,7 +771,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1516,9 +1518,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest_base.py index 562d5a8f17a5..f0d5241d0f70 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest_base.py @@ -17,16 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service -from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import ( + conversational_search_service, + session, + session_service, +) from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/async_client.py index e7afd8396e21..7c57b08f04b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( pagers, @@ -139,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_info.__func__(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SiteSearchEngineServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +156,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_file.__func__(SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SiteSearchEngineServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -193,7 +197,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SiteSearchEngineServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/client.py index 6c294d3ea8e0..eead5f824949 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( pagers, @@ -90,9 +90,7 @@ class SiteSearchEngineServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport @@ -662,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SiteSearchEngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SiteSearchEngineServiceClient._read_environment_variables() + ) self._client_cert_source = ( SiteSearchEngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -703,8 +699,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SiteSearchEngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/pagers.py index e27d863f6e4d..a773918f5ee4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -315,7 +315,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/__init__.py index 5443c0c10cf1..0c91743e9878 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/base.py index 06979ffb4e17..d5dfd6f8358c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import ( @@ -404,7 +404,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc.py index 8f382f491cae..390023833684 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( site_search_engine, @@ -573,12 +573,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -605,12 +605,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -698,12 +698,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] @@ -730,12 +730,12 @@ def set_uri_pattern_document_data( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_uri_pattern_document_data" not in self._stubs: - self._stubs[ - "set_uri_pattern_document_data" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/SetUriPatternDocumentData", - request_serializer=site_search_engine_service.SetUriPatternDocumentDataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_uri_pattern_document_data"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/SetUriPatternDocumentData", + request_serializer=site_search_engine_service.SetUriPatternDocumentDataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_uri_pattern_document_data"] @@ -762,12 +762,12 @@ def get_uri_pattern_document_data( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_uri_pattern_document_data" not in self._stubs: - self._stubs[ - "get_uri_pattern_document_data" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/GetUriPatternDocumentData", - request_serializer=site_search_engine_service.GetUriPatternDocumentDataRequest.serialize, - response_deserializer=site_search_engine_service.GetUriPatternDocumentDataResponse.deserialize, + self._stubs["get_uri_pattern_document_data"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/GetUriPatternDocumentData", + request_serializer=site_search_engine_service.GetUriPatternDocumentDataRequest.serialize, + response_deserializer=site_search_engine_service.GetUriPatternDocumentDataResponse.deserialize, + ) ) return self._stubs["get_uri_pattern_document_data"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc_asyncio.py index 2ed1e259fb54..c2d953c2421f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( site_search_engine, @@ -585,12 +585,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -617,12 +617,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -711,12 +711,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] @@ -743,12 +743,12 @@ def set_uri_pattern_document_data( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_uri_pattern_document_data" not in self._stubs: - self._stubs[ - "set_uri_pattern_document_data" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/SetUriPatternDocumentData", - request_serializer=site_search_engine_service.SetUriPatternDocumentDataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_uri_pattern_document_data"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/SetUriPatternDocumentData", + request_serializer=site_search_engine_service.SetUriPatternDocumentDataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_uri_pattern_document_data"] @@ -775,12 +775,12 @@ def get_uri_pattern_document_data( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_uri_pattern_document_data" not in self._stubs: - self._stubs[ - "get_uri_pattern_document_data" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/GetUriPatternDocumentData", - request_serializer=site_search_engine_service.GetUriPatternDocumentDataRequest.serialize, - response_deserializer=site_search_engine_service.GetUriPatternDocumentDataResponse.deserialize, + self._stubs["get_uri_pattern_document_data"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/GetUriPatternDocumentData", + request_serializer=site_search_engine_service.GetUriPatternDocumentDataRequest.serialize, + response_deserializer=site_search_engine_service.GetUriPatternDocumentDataResponse.deserialize, + ) ) return self._stubs["get_uri_pattern_document_data"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest.py index 7fc6fb032896..234ca1eeec56 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1287,9 +1287,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_create_target_sites( request, metadata @@ -1315,7 +1313,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1443,9 +1441,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_verify_target_sites( request, metadata @@ -1471,7 +1467,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1599,9 +1595,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() request, metadata = self._interceptor.pre_create_target_site( request, metadata @@ -1627,7 +1621,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1756,9 +1750,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() request, metadata = self._interceptor.pre_delete_target_site( request, metadata @@ -1780,7 +1772,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1912,9 +1904,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_disable_advanced_site_search( request, metadata @@ -1940,7 +1930,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2069,9 +2059,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_enable_advanced_site_search( request, metadata @@ -2097,7 +2085,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2227,9 +2215,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() request, metadata = self._interceptor.pre_fetch_domain_verification_status( request, metadata @@ -2297,11 +2283,10 @@ def __call__( resp = self._interceptor.post_fetch_domain_verification_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_domain_verification_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_domain_verification_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2389,9 +2374,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() request, metadata = self._interceptor.pre_get_site_search_engine( request, metadata @@ -2544,9 +2527,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() request, metadata = self._interceptor.pre_get_target_site(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_transcoded_request( @@ -2699,9 +2680,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetUriPatternDocumentData._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetUriPatternDocumentData._get_http_options() request, metadata = self._interceptor.pre_get_uri_pattern_document_data( request, metadata @@ -2767,11 +2746,10 @@ def __call__( resp = self._interceptor.post_get_uri_pattern_document_data(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_uri_pattern_document_data_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_uri_pattern_document_data_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2858,9 +2836,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() request, metadata = self._interceptor.pre_list_target_sites( request, metadata @@ -3017,9 +2993,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() request, metadata = self._interceptor.pre_recrawl_uris(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_transcoded_request( @@ -3043,7 +3017,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3174,9 +3148,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseSetUriPatternDocumentData._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseSetUriPatternDocumentData._get_http_options() request, metadata = self._interceptor.pre_set_uri_pattern_document_data( request, metadata @@ -3202,7 +3174,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3243,11 +3215,10 @@ def __call__( resp = self._interceptor.post_set_uri_pattern_document_data(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_uri_pattern_document_data_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_uri_pattern_document_data_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3333,9 +3304,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() request, metadata = self._interceptor.pre_update_target_site( request, metadata @@ -3361,7 +3330,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3439,7 +3408,9 @@ def batch_create_target_sites( ]: # 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._BatchCreateTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_verify_target_sites( @@ -3450,7 +3421,9 @@ def batch_verify_target_sites( ]: # 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._BatchVerifyTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchVerifyTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_target_site( @@ -3481,7 +3454,9 @@ def disable_advanced_site_search( ]: # 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._DisableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._DisableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_advanced_site_search( @@ -3492,7 +3467,9 @@ def enable_advanced_site_search( ]: # 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._EnableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._EnableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_domain_verification_status( @@ -3503,7 +3480,9 @@ def fetch_domain_verification_status( ]: # 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._FetchDomainVerificationStatus(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDomainVerificationStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_site_search_engine( @@ -3535,7 +3514,9 @@ def get_uri_pattern_document_data( ]: # 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._GetUriPatternDocumentData(self._session, self._host, self._interceptor) # type: ignore + return self._GetUriPatternDocumentData( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_target_sites( @@ -3567,7 +3548,9 @@ def set_uri_pattern_document_data( ]: # 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._SetUriPatternDocumentData(self._session, self._host, self._interceptor) # type: ignore + return self._SetUriPatternDocumentData( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_target_site( @@ -3635,9 +3618,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3760,9 +3741,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3901,9 +3880,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/async_client.py index 1bb360f4083c..47a831054d3b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api import httpbody_pb2 # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( common, @@ -132,7 +132,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_info.__func__(UserEventServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = UserEventServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(UserEventServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +149,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_file.__func__(UserEventServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = UserEventServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(UserEventServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/client.py index 613e55142501..ae5e5b13f801 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api import httpbody_pb2 # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( common, @@ -91,9 +91,7 @@ class UserEventServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UserEventServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UserEventServiceTransport]] _transport_registry["grpc"] = UserEventServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserEventServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserEventServiceRestTransport @@ -687,11 +685,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserEventServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserEventServiceClient._read_environment_variables() + ) self._client_cert_source = UserEventServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -726,8 +722,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserEventServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/base.py index faaa9245915a..58082410998c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/base.py @@ -16,17 +16,17 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import ( @@ -264,7 +264,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc.py index 33e163821218..9cd0d70e75dc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( import_config, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc_asyncio.py index 5b08bb46fbfb..b0ce463918f5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc_asyncio.py @@ -17,10 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -29,10 +32,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( import_config, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest.py index f23996dff3db..279ad70e4e65 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -752,9 +752,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() request, metadata = self._interceptor.pre_collect_user_event( request, metadata @@ -776,7 +774,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -904,9 +902,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() request, metadata = self._interceptor.pre_import_user_events( request, metadata @@ -932,7 +928,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1059,9 +1055,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() request, metadata = self._interceptor.pre_purge_user_events( request, metadata @@ -1087,7 +1081,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1214,9 +1208,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() request, metadata = self._interceptor.pre_write_user_event( request, metadata @@ -1399,9 +1391,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1661,9 +1651,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseUserEventServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest_base.py index 92e31f17d2ab..0c3d3f495f1c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest_base.py @@ -17,7 +17,7 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/__init__.py index 5d1b94d52bc5..5699c3ac92d9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/__init__.py @@ -13,11 +13,24 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .acl_config import AclConfig -from .acl_config_service import GetAclConfigRequest, UpdateAclConfigRequest -from .answer import Answer -from .chunk import Chunk -from .chunk_service import GetChunkRequest, ListChunksRequest, ListChunksResponse +from .acl_config import ( + AclConfig, +) +from .acl_config_service import ( + GetAclConfigRequest, + UpdateAclConfigRequest, +) +from .answer import ( + Answer, +) +from .chunk import ( + Chunk, +) +from .chunk_service import ( + GetChunkRequest, + ListChunksRequest, + ListChunksResponse, +) from .common import ( CustomAttribute, CustomFineTuningSpec, @@ -35,9 +48,18 @@ SolutionType, UserInfo, ) -from .completion import CompletionSuggestion, SuggestionDenyListEntry -from .completion_service import CompleteQueryRequest, CompleteQueryResponse -from .control import Condition, Control +from .completion import ( + CompletionSuggestion, + SuggestionDenyListEntry, +) +from .completion_service import ( + CompleteQueryRequest, + CompleteQueryResponse, +) +from .control import ( + Condition, + Control, +) from .control_service import ( CreateControlRequest, DeleteControlRequest, @@ -72,8 +94,14 @@ UpdateConversationRequest, UpdateSessionRequest, ) -from .custom_tuning_model import CustomTuningModel -from .data_store import DataStore, LanguageInfo, WorkspaceConfig +from .custom_tuning_model import ( + CustomTuningModel, +) +from .data_store import ( + DataStore, + LanguageInfo, + WorkspaceConfig, +) from .data_store_service import ( CreateDataStoreMetadata, CreateDataStoreRequest, @@ -86,8 +114,13 @@ UpdateDataStoreRequest, UpdateDocumentProcessingConfigRequest, ) -from .document import Document, ProcessedDocument -from .document_processing_config import DocumentProcessingConfig +from .document import ( + Document, + ProcessedDocument, +) +from .document_processing_config import ( + DocumentProcessingConfig, +) from .document_service import ( BatchGetDocumentsMetadataRequest, BatchGetDocumentsMetadataResponse, @@ -99,7 +132,9 @@ ListDocumentsResponse, UpdateDocumentRequest, ) -from .engine import Engine +from .engine import ( + Engine, +) from .engine_service import ( CreateEngineMetadata, CreateEngineRequest, @@ -120,7 +155,10 @@ EstimateDataSizeRequest, EstimateDataSizeResponse, ) -from .evaluation import Evaluation, QualityMetrics +from .evaluation import ( + Evaluation, + QualityMetrics, +) from .evaluation_service import ( CreateEvaluationMetadata, CreateEvaluationRequest, @@ -135,7 +173,10 @@ CheckGroundingResponse, CheckGroundingSpec, ) -from .grounding import FactChunk, GroundingFact +from .grounding import ( + FactChunk, + GroundingFact, +) from .import_config import ( AlloyDbSource, BigQuerySource, @@ -163,7 +204,9 @@ ImportUserEventsResponse, SpannerSource, ) -from .project import Project +from .project import ( + Project, +) from .project_service import ( GetProjectRequest, ProvisionProjectMetadata, @@ -185,9 +228,18 @@ PurgeUserEventsRequest, PurgeUserEventsResponse, ) -from .rank_service import RankingRecord, RankRequest, RankResponse -from .recommendation_service import RecommendRequest, RecommendResponse -from .sample_query import SampleQuery +from .rank_service import ( + RankingRecord, + RankRequest, + RankResponse, +) +from .recommendation_service import ( + RecommendRequest, + RecommendResponse, +) +from .sample_query import ( + SampleQuery, +) from .sample_query_service import ( CreateSampleQueryRequest, DeleteSampleQueryRequest, @@ -196,7 +248,9 @@ ListSampleQueriesResponse, UpdateSampleQueryRequest, ) -from .sample_query_set import SampleQuerySet +from .sample_query_set import ( + SampleQuerySet, +) from .sample_query_set_service import ( CreateSampleQuerySetRequest, DeleteSampleQuerySetRequest, @@ -205,7 +259,10 @@ ListSampleQuerySetsResponse, UpdateSampleQuerySetRequest, ) -from .schema import FieldConfig, Schema +from .schema import ( + FieldConfig, + Schema, +) from .schema_service import ( CreateSchemaMetadata, CreateSchemaRequest, @@ -217,7 +274,10 @@ UpdateSchemaMetadata, UpdateSchemaRequest, ) -from .search_service import SearchRequest, SearchResponse +from .search_service import ( + SearchRequest, + SearchResponse, +) from .search_tuning_service import ( ListCustomModelsRequest, ListCustomModelsResponse, @@ -225,7 +285,9 @@ TrainCustomModelRequest, TrainCustomModelResponse, ) -from .serving_config import ServingConfig +from .serving_config import ( + ServingConfig, +) from .serving_config_service import ( GetServingConfigRequest, ListServingConfigsRequest, @@ -242,8 +304,15 @@ Session, VideoCharacteristics, ) -from .session_service import ListFilesRequest, ListFilesResponse -from .site_search_engine import SiteSearchEngine, SiteVerificationInfo, TargetSite +from .session_service import ( + ListFilesRequest, + ListFilesResponse, +) +from .site_search_engine import ( + SiteSearchEngine, + SiteVerificationInfo, + TargetSite, +) from .site_search_engine_service import ( BatchCreateTargetSiteMetadata, BatchCreateTargetSitesRequest, @@ -288,7 +357,10 @@ TransactionInfo, UserEvent, ) -from .user_event_service import CollectUserEventRequest, WriteUserEventRequest +from .user_event_service import ( + CollectUserEventRequest, + WriteUserEventRequest, +) __all__ = ( "AclConfig", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/answer.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/answer.py index ae0b7fa763b2..af2550c27a42 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/answer.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/answer.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -73,6 +73,7 @@ class State(proto.Enum): SUCCEEDED (3): Answer generation has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -118,6 +119,7 @@ class AnswerSkippedReason(proto.Enum): policy violation detected. The policy is defined by the customer. """ + ANSWER_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_ANSWER_SEEKING_QUERY_IGNORED = 2 @@ -425,6 +427,7 @@ class State(proto.Enum): SUCCEEDED (3): Step has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -649,6 +652,7 @@ class Type(proto.Enum): JAIL_BREAKING_QUERY (3): Jail-breaking query classification type. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/chunk.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/chunk.py index b51af63286be..62a93db479ae 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/chunk.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/chunk.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/common.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/common.py index 9419297699e0..8578fcfda540 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/common.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/common.py @@ -56,6 +56,7 @@ class IndustryVertical(proto.Enum): HEALTHCARE_FHIR (7): The healthcare FHIR vertical. """ + INDUSTRY_VERTICAL_UNSPECIFIED = 0 GENERIC = 1 MEDIA = 2 @@ -81,6 +82,7 @@ class SolutionType(proto.Enum): data stores must enrolled with ``SOLUTION_TYPE_CHAT`` solution. """ + SOLUTION_TYPE_UNSPECIFIED = 0 SOLUTION_TYPE_RECOMMENDATION = 1 SOLUTION_TYPE_SEARCH = 2 @@ -103,6 +105,7 @@ class SearchUseCase(proto.Enum): Browse use case. Expects the traffic has an empty [query][google.cloud.discoveryengine.v1alpha.SearchRequest.query]. """ + SEARCH_USE_CASE_UNSPECIFIED = 0 SEARCH_USE_CASE_SEARCH = 1 SEARCH_USE_CASE_BROWSE = 2 @@ -122,6 +125,7 @@ class SearchTier(proto.Enum): SEARCH_TIER_ENTERPRISE (2): Enterprise tier. """ + SEARCH_TIER_UNSPECIFIED = 0 SEARCH_TIER_STANDARD = 1 SEARCH_TIER_ENTERPRISE = 2 @@ -137,6 +141,7 @@ class SearchAddOn(proto.Enum): SEARCH_ADD_ON_LLM (1): Large language model add-on. """ + SEARCH_ADD_ON_UNSPECIFIED = 0 SEARCH_ADD_ON_LLM = 1 @@ -155,6 +160,7 @@ class FileOriginType(proto.Enum): The file was generated from other files by an internal process. """ + FILE_ORIGIN_TYPE_UNSPECIFIED = 0 USER_PROVIDED = 1 AI_GENERATED = 2 @@ -391,6 +397,7 @@ class IdpType(proto.Enum): THIRD_PARTY (2): Third party provider. """ + IDP_TYPE_UNSPECIFIED = 0 GSUITE = 1 THIRD_PARTY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion.py index db1f8d363f04..1a97c01c6b23 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion.py @@ -54,6 +54,7 @@ class MatchOperator(proto.Enum): CONTAINS (2): If the suggestion contains the block_phrase, then block it. """ + MATCH_OPERATOR_UNSPECIFIED = 0 EXACT_MATCH = 1 CONTAINS = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control.py index 00d7e933146b..60a0ca2286f8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import common diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control_service.py index bf70951accd8..acd5d44ae56c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import control as gcd_control diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversation.py index 363e242f7a1c..697e36379992 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_service @@ -68,6 +68,7 @@ class State(proto.Enum): COMPLETED (2): Conversation has been completed. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversational_search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversational_search_service.py index 03248e2fd0d7..d73c484be3af 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversational_search_service.py @@ -17,13 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1alpha.types import answer as gcd_answer -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import search_service +from google.cloud.discoveryengine_v1alpha.types import common, search_service +from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1alpha.types import session as gcd_session __protobuf__ = proto.module( @@ -204,12 +203,12 @@ class ConverseConversationResponse(proto.Message): proto.STRING, number=6, ) - search_results: MutableSequence[ - search_service.SearchResponse.SearchResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=search_service.SearchResponse.SearchResult, + search_results: MutableSequence[search_service.SearchResponse.SearchResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=search_service.SearchResponse.SearchResult, + ) ) @@ -935,6 +934,7 @@ class Type(proto.Enum): JAIL_BREAKING_QUERY (3): Jail-breaking query classification type. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/custom_tuning_model.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/custom_tuning_model.py index dd6c72e94ddf..aa009d3b2708 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/custom_tuning_model.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/custom_tuning_model.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -78,6 +78,7 @@ class ModelState(proto.Enum): Input data validation failed. Model training didn't start. """ + MODEL_STATE_UNSPECIFIED = 0 TRAINING_PAUSED = 1 TRAINING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store.py index 39a172f176e2..002357aa0c60 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store.py @@ -17,14 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import common, schema from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import schema __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -149,6 +148,7 @@ class ContentConfig(proto.Enum): workspace data store are specified in the [WorkspaceConfig][google.cloud.discoveryengine.v1alpha.WorkspaceConfig]. """ + CONTENT_CONFIG_UNSPECIFIED = 0 NO_CONTENT = 1 CONTENT_REQUIRED = 2 @@ -289,6 +289,7 @@ class Type(proto.Enum): GOOGLE_KEEP (7): Workspace Data Store contains Keep data """ + TYPE_UNSPECIFIED = 0 GOOGLE_DRIVE = 1 GOOGLE_MAIL = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store_service.py index 2547cd08e41d..93fe4332d92f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document.py index 8c516cd2895f..1b59bea76655 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import common @@ -212,12 +212,12 @@ class AccessRestriction(proto.Message): number=2, ) - readers: MutableSequence[ - "Document.AclInfo.AccessRestriction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.AclInfo.AccessRestriction", + readers: MutableSequence["Document.AclInfo.AccessRestriction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.AclInfo.AccessRestriction", + ) ) class IndexStatus(proto.Message): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_service.py index 37f30745eb28..26ba6eb55e7e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import document as gcd_document @@ -317,6 +317,7 @@ class ProcessedDocumentType(proto.Enum): Returns the converted Image bytes (as JPEG or PNG) if available. """ + PROCESSED_DOCUMENT_TYPE_UNSPECIFIED = 0 PARSED_DOCUMENT = 1 CHUNKED_DOCUMENT = 2 @@ -333,6 +334,7 @@ class ProcessedDocumentFormat(proto.Enum): Output format is a JSON string representation of processed document. """ + PROCESSED_DOCUMENT_FORMAT_UNSPECIFIED = 0 JSON = 1 @@ -446,6 +448,7 @@ class State(proto.Enum): [Document][google.cloud.discoveryengine.v1alpha.Document] is not indexed. """ + STATE_UNSPECIFIED = 0 INDEXED = 1 NOT_IN_TARGET_SITE = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine.py index 42a29402806a..30c153efad78 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import common @@ -238,6 +238,7 @@ class TrainingState(proto.Enum): TRAINING (2): The engine is training. """ + TRAINING_STATE_UNSPECIFIED = 0 PAUSED = 1 TRAINING = 2 @@ -443,6 +444,7 @@ class ServingState(proto.Enum): The engine is trained on tuned hyperparameters and can be queried. """ + SERVING_STATE_UNSPECIFIED = 0 INACTIVE = 1 ACTIVE = 2 @@ -463,6 +465,7 @@ class DataState(proto.Enum): data. Error messages can be queried via Stackdriver. """ + DATA_STATE_UNSPECIFIED = 0 DATA_OK = 1 DATA_ERROR = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine_service.py index 2c97a5d28828..dac5b2c3ce8d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/estimate_billing_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/estimate_billing_service.py index 11db5f0dd9b7..712a3ce1919a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/estimate_billing_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/estimate_billing_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import import_config diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation.py index adfc5ebade66..914d589f3bce 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_service @@ -92,6 +92,7 @@ class State(proto.Enum): FAILED (4): The evaluation failed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/import_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/import_config.py index abf627df7402..a2c383f67323 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/import_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/import_config.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( @@ -286,6 +286,7 @@ class Type(proto.Enum): JSON (7): JSON type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -306,6 +307,7 @@ class Encoding(proto.Enum): BINARY (2): Binary encoding. """ + ENCODING_UNSPECIFIED = 0 TEXT = 1 BINARY = 2 @@ -354,12 +356,12 @@ class BigtableColumnFamily(proto.Message): number=3, enum="BigtableOptions.Type", ) - columns: MutableSequence[ - "BigtableOptions.BigtableColumn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="BigtableOptions.BigtableColumn", + columns: MutableSequence["BigtableOptions.BigtableColumn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="BigtableOptions.BigtableColumn", + ) ) class BigtableColumn(proto.Message): @@ -1043,6 +1045,7 @@ class ReconciliationMode(proto.Enum): deleted if they are not present in the source location. """ + RECONCILIATION_MODE_UNSPECIFIED = 0 INCREMENTAL = 1 FULL = 2 @@ -1220,12 +1223,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - entries: MutableSequence[ - completion.SuggestionDenyListEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.SuggestionDenyListEntry, + entries: MutableSequence[completion.SuggestionDenyListEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.SuggestionDenyListEntry, + ) ) inline_source: InlineSource = proto.Field( @@ -1348,12 +1351,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - suggestions: MutableSequence[ - completion.CompletionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.CompletionSuggestion, + suggestions: MutableSequence[completion.CompletionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.CompletionSuggestion, + ) ) inline_source: InlineSource = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project.py index 4fbc542736c7..e2d625c48658 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -98,6 +98,7 @@ class State(proto.Enum): The project has declined or revoked the agreement to terms of service. """ + STATE_UNSPECIFIED = 0 TERMS_ACCEPTED = 1 TERMS_PENDING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project_service.py index 1b8fe4e3315b..89ffdf2c316d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project_service.py @@ -127,6 +127,7 @@ class ConsentChangeAction(proto.Enum): ACCEPT (1): User accepts service terms. """ + CONSENT_CHANGE_ACTION_UNSPECIFIED = 0 ACCEPT = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/purge_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/purge_config.py index f7c0e7ac2f29..af1404c4b1dc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/purge_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/purge_config.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import import_config diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/recommendation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/recommendation_service.py index db06b8c5820a..685185c83902 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/recommendation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/recommendation_service.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import user_event as gcd_user_event from google.cloud.discoveryengine_v1alpha.types import document as gcd_document +from google.cloud.discoveryengine_v1alpha.types import user_event as gcd_user_event __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query.py index e6d834a42d5c..ff5b6d8fc99b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_service.py index 29a623493981..d9d8d08ccf4f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set.py index 0b91372a0e2e..f5b0fb726369 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set_service.py index b493508c4cd9..327209056113 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( @@ -135,12 +135,12 @@ class ListSampleQuerySetsResponse(proto.Message): def raw_page(self): return self - sample_query_sets: MutableSequence[ - gcd_sample_query_set.SampleQuerySet - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_sample_query_set.SampleQuerySet, + sample_query_sets: MutableSequence[gcd_sample_query_set.SampleQuerySet] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_sample_query_set.SampleQuerySet, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema.py index c689e740ae89..328e0eabd71e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -306,6 +306,7 @@ class FieldType(proto.Enum): date and time. e.g. ``"2015-01-01"`` or ``"2015-01-01T12:10:30Z"`` """ + FIELD_TYPE_UNSPECIFIED = 0 OBJECT = 1 STRING = 2 @@ -326,6 +327,7 @@ class IndexableOption(proto.Enum): INDEXABLE_DISABLED (2): Indexable option disabled for a schema field. """ + INDEXABLE_OPTION_UNSPECIFIED = 0 INDEXABLE_ENABLED = 1 INDEXABLE_DISABLED = 2 @@ -343,6 +345,7 @@ class DynamicFacetableOption(proto.Enum): Dynamic facetable option disabled for a schema field. """ + DYNAMIC_FACETABLE_OPTION_UNSPECIFIED = 0 DYNAMIC_FACETABLE_ENABLED = 1 DYNAMIC_FACETABLE_DISABLED = 2 @@ -359,6 +362,7 @@ class SearchableOption(proto.Enum): Searchable option disabled for a schema field. """ + SEARCHABLE_OPTION_UNSPECIFIED = 0 SEARCHABLE_ENABLED = 1 SEARCHABLE_DISABLED = 2 @@ -376,6 +380,7 @@ class RetrievableOption(proto.Enum): Retrievable option disabled for a schema field. """ + RETRIEVABLE_OPTION_UNSPECIFIED = 0 RETRIEVABLE_ENABLED = 1 RETRIEVABLE_DISABLED = 2 @@ -393,6 +398,7 @@ class CompletableOption(proto.Enum): Completable option disabled for a schema field. """ + COMPLETABLE_OPTION_UNSPECIFIED = 0 COMPLETABLE_ENABLED = 1 COMPLETABLE_DISABLED = 2 @@ -409,6 +415,7 @@ class FilterableOption(proto.Enum): Filterable option disabled for a schema field. """ + FILTERABLE_OPTION_UNSPECIFIED = 0 FILTERABLE_ENABLED = 1 FILTERABLE_DISABLED = 2 @@ -430,6 +437,7 @@ class AdvancedSiteSearchDataSource(proto.Enum): SCHEMA_ORG (4): Retrieve value from schema.org data. """ + ADVANCED_SITE_SEARCH_DATA_SOURCE_UNSPECIFIED = 0 METATAGS = 1 PAGEMAP = 2 @@ -479,12 +487,12 @@ class AdvancedSiteSearchDataSource(proto.Enum): proto.STRING, number=7, ) - advanced_site_search_data_sources: MutableSequence[ - AdvancedSiteSearchDataSource - ] = proto.RepeatedField( - proto.ENUM, - number=10, - enum=AdvancedSiteSearchDataSource, + advanced_site_search_data_sources: MutableSequence[AdvancedSiteSearchDataSource] = ( + proto.RepeatedField( + proto.ENUM, + number=10, + enum=AdvancedSiteSearchDataSource, + ) ) schema_org_paths: MutableSequence[str] = proto.RepeatedField( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema_service.py index 1bcb7a03dc21..7625ff5156dd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import schema as gcd_schema diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py index ec032e3f2105..72961420aeb8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import chunk as gcd_chunk @@ -437,6 +437,7 @@ class RelevanceThreshold(proto.Enum): HIGH (4): High relevance threshold. """ + RELEVANCE_THRESHOLD_UNSPECIFIED = 0 LOWEST = 1 LOW = 2 @@ -456,6 +457,7 @@ class RankingExpressionBackend(proto.Enum): RANK_BY_FORMULA (4): Ranking by custom formula. """ + RANKING_EXPRESSION_BACKEND_UNSPECIFIED = 0 RANK_BY_EMBEDDING = 3 RANK_BY_FORMULA = 4 @@ -792,6 +794,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. For example, ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -808,6 +811,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -917,6 +921,7 @@ class Condition(proto.Enum): Automatic query expansion built by the Search API. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 AUTO = 2 @@ -960,6 +965,7 @@ class Mode(proto.Enum): Search API. Search will be based on the corrected query if found. """ + MODE_UNSPECIFIED = 0 SUGGESTION_ONLY = 1 AUTO = 2 @@ -1009,6 +1015,7 @@ class SearchResultMode(proto.Enum): [DataStore.DocumentProcessingConfig.chunking_config][] is specified. """ + SEARCH_RESULT_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -1419,6 +1426,7 @@ class FilterExtractionCondition(proto.Enum): ENABLED (2): Enables NL filter extraction. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1428,11 +1436,11 @@ class FilterExtractionCondition(proto.Enum): number=1, enum="SearchRequest.NaturalLanguageQueryUnderstandingSpec.FilterExtractionCondition", ) - geo_search_query_detection_field_names: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=2, + geo_search_query_detection_field_names: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=2, + ) ) class SearchAsYouTypeSpec(proto.Message): @@ -1458,6 +1466,7 @@ class Condition(proto.Enum): ENABLED (2): Enables Search As You Type. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1964,12 +1973,12 @@ class FacetValue(proto.Message): proto.STRING, number=1, ) - values: MutableSequence[ - "SearchResponse.Facet.FacetValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.Facet.FacetValue", + values: MutableSequence["SearchResponse.Facet.FacetValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.Facet.FacetValue", + ) ) dynamic_facet: bool = proto.Field( proto.BOOL, @@ -2102,6 +2111,7 @@ class SummarySkippedReason(proto.Enum): [SearchRequest.ContentSearchSpec.SummarySpec.ignore_non_answer_seeking_query] is set to ``true``. """ + SUMMARY_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_SUMMARY_SEEKING_QUERY_IGNORED = 2 @@ -2145,12 +2155,12 @@ class CitationMetadata(proto.Message): Citations for segments. """ - citations: MutableSequence[ - "SearchResponse.Summary.Citation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SearchResponse.Summary.Citation", + citations: MutableSequence["SearchResponse.Summary.Citation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SearchResponse.Summary.Citation", + ) ) class Citation(proto.Message): @@ -2174,12 +2184,12 @@ class Citation(proto.Message): proto.INT64, number=2, ) - sources: MutableSequence[ - "SearchResponse.Summary.CitationSource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.CitationSource", + sources: MutableSequence["SearchResponse.Summary.CitationSource"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.CitationSource", + ) ) class CitationSource(proto.Message): @@ -2277,12 +2287,12 @@ class SummaryWithMetadata(proto.Message): number=2, message="SearchResponse.Summary.CitationMetadata", ) - references: MutableSequence[ - "SearchResponse.Summary.Reference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.Reference", + references: MutableSequence["SearchResponse.Summary.Reference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.Reference", + ) ) summary_text: str = proto.Field( @@ -2451,6 +2461,7 @@ class Comparison(proto.Enum): GREATER_THAN (5): Denotes greater than ``>`` operator. """ + COMPARISON_UNSPECIFIED = 0 EQUALS = 1 LESS_THAN_EQUALS = 2 @@ -2694,6 +2705,7 @@ class OneBoxType(proto.Enum): SLACK (3): One Box result contains slack results. """ + ONE_BOX_TYPE_UNSPECIFIED = 0 PEOPLE = 1 ORGANIZATION = 2 @@ -2704,12 +2716,12 @@ class OneBoxType(proto.Enum): number=1, enum="SearchResponse.OneBoxResult.OneBoxType", ) - search_results: MutableSequence[ - "SearchResponse.SearchResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.SearchResult", + search_results: MutableSequence["SearchResponse.SearchResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.SearchResult", + ) ) @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_tuning_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_tuning_service.py index 2134c54c126e..c12391582ca4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_tuning_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( @@ -68,12 +68,12 @@ class ListCustomModelsResponse(proto.Message): List of custom tuning models. """ - models: MutableSequence[ - custom_tuning_model.CustomTuningModel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_tuning_model.CustomTuningModel, + models: MutableSequence[custom_tuning_model.CustomTuningModel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_tuning_model.CustomTuningModel, + ) ) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config.py index b375e48b8ce0..209aa733e538 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import common, search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config_service.py index 40b86435dce1..b19a4aa48391 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( @@ -126,12 +126,12 @@ class ListServingConfigsResponse(proto.Message): def raw_page(self): return self - serving_configs: MutableSequence[ - gcd_serving_config.ServingConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_serving_config.ServingConfig, + serving_configs: MutableSequence[gcd_serving_config.ServingConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_serving_config.ServingConfig, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session.py index a4ebfbde229b..2e27e51d34b4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import answer as gcd_answer @@ -58,6 +58,7 @@ class FileSource(proto.Enum): The file was retrieved from a URL (e.g. public web). """ + FILE_SOURCE_UNSPECIFIED = 0 FILE_SOURCE_INLINE = 1 FILE_SOURCE_LOCAL = 2 @@ -104,6 +105,7 @@ class State(proto.Enum): IN_PROGRESS (1): The session is currently open. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 @@ -253,6 +255,7 @@ class ColorSpace(proto.Enum): OTHER_COLOR_SPACE (5): Other colorspace. """ + COLOR_SPACE_UNSPECIFIED = 0 RGB = 1 CMYK = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine.py index 166338513ae6..d4a772f2e989 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -102,6 +102,7 @@ class Type(proto.Enum): EXCLUDE (2): Exclude the target site. """ + TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -129,6 +130,7 @@ class IndexingStatus(proto.Enum): 2. state reverts to SUCCEEDED if the unindexing fails. """ + INDEXING_STATUS_UNSPECIFIED = 0 PENDING = 1 FAILED = 2 @@ -243,6 +245,7 @@ class SiteVerificationState(proto.Enum): Site exempt from verification, e.g., a public website that opens to all. """ + SITE_VERIFICATION_STATE_UNSPECIFIED = 0 VERIFIED = 1 UNVERIFIED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine_service.py index a54f73fddbfc..e737bcded819 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( @@ -371,12 +371,12 @@ class ListTargetSitesResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -424,12 +424,12 @@ class BatchCreateTargetSitesResponse(proto.Message): TargetSites created. """ - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) @@ -618,6 +618,7 @@ class CorpusType(proto.Enum): Denotes a crawling attempt for the mobile version of a page. """ + CORPUS_TYPE_UNSPECIFIED = 0 DESKTOP = 1 MOBILE = 2 @@ -837,12 +838,12 @@ class FetchDomainVerificationStatusResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/user_event.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/user_event.py index 8b04f0b4a5ba..ff809bae5966 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/user_event.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/user_event.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import common diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/__init__.py index 499d1b7f56ae..6ccacbfdf560 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.completion_service import ( CompletionServiceAsyncClient, CompletionServiceClient, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/async_client.py index 696b788ee215..9b2b59f0863e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -129,7 +129,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_info.__func__(CompletionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CompletionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CompletionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +146,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_file.__func__(CompletionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CompletionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CompletionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/client.py index c41e24c823f1..0e62e82d9ecd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -86,9 +86,7 @@ class CompletionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CompletionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CompletionServiceTransport]] _transport_registry["grpc"] = CompletionServiceGrpcTransport _transport_registry["grpc_asyncio"] = CompletionServiceGrpcAsyncIOTransport _transport_registry["rest"] = CompletionServiceRestTransport @@ -680,11 +678,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CompletionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CompletionServiceClient._read_environment_variables() + ) self._client_cert_source = CompletionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -719,8 +715,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CompletionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/base.py index 83d33eb5f3a6..9690f72838bb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import ( @@ -287,7 +287,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc.py index 6ba36c174ca5..ad04b9d2a39b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( completion_service, @@ -428,12 +428,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -461,12 +461,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -493,12 +493,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -525,12 +525,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc_asyncio.py index 026a65da5aa3..589f60c73ee6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( completion_service, @@ -437,12 +437,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -471,12 +471,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -504,12 +504,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -537,12 +537,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest.py index 595318f8a1df..7ea9dbba3d93 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -818,9 +818,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseAdvancedCompleteQuery._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseAdvancedCompleteQuery._get_http_options() request, metadata = self._interceptor.pre_advanced_complete_query( request, metadata @@ -981,9 +979,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() request, metadata = self._interceptor.pre_complete_query(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_transcoded_request( @@ -1135,9 +1131,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_import_completion_suggestions( request, metadata @@ -1163,7 +1157,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1204,11 +1198,10 @@ def __call__( resp = self._interceptor.post_import_completion_suggestions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_completion_suggestions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_completion_suggestions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1297,15 +1290,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_import_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_import_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1328,7 +1318,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1369,11 +1359,10 @@ def __call__( resp = self._interceptor.post_import_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1460,9 +1449,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_purge_completion_suggestions( request, metadata @@ -1488,7 +1475,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1617,15 +1604,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_purge_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_purge_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1648,7 +1632,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1689,11 +1673,10 @@ def __call__( resp = self._interceptor.post_purge_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1748,7 +1731,9 @@ def import_completion_suggestions( ]: # 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._ImportCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._ImportCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_suggestion_deny_list_entries( @@ -1758,7 +1743,9 @@ def import_suggestion_deny_list_entries( ]: # 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._ImportSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._ImportSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_completion_suggestions( @@ -1768,7 +1755,9 @@ def purge_completion_suggestions( ]: # 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._PurgeCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_suggestion_deny_list_entries( @@ -1778,7 +1767,9 @@ def purge_suggestion_deny_list_entries( ]: # 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._PurgeSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -1836,9 +1827,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1958,9 +1947,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2099,9 +2086,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/async_client.py index 3888df9f0ba6..a2c251319a36 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,15 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.control_service import pagers -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import common, control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service from .client import ControlServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport @@ -126,7 +124,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_info.__func__(ControlServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ControlServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ControlServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +141,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_file.__func__(ControlServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ControlServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ControlServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/client.py index 820e4dbe2279..8cd1ede63fdc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,15 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.control_service import pagers -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import common, control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport from .transports.grpc import ControlServiceGrpcTransport @@ -85,9 +83,7 @@ class ControlServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ControlServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ControlServiceTransport]] _transport_registry["grpc"] = ControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = ControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = ControlServiceRestTransport @@ -655,11 +651,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ControlServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ControlServiceClient._read_environment_variables() + ) self._client_cert_source = ControlServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ControlServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/pagers.py index a1486ca1e14b..e174511d3124 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/base.py index 63b745ee1a34..ef2e74ddbe68 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/base.py @@ -17,21 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -264,7 +263,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc.py index 565c95b76904..d626996d62a9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc.py @@ -16,24 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc_asyncio.py index 3c7f3db9fd36..21d160d7470a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,16 +31,11 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport from .grpc import ControlServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest.py index 0a6dac3c2688..ebb12c0cdd0b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,14 +28,11 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseControlServiceRestTransport @@ -712,7 +711,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1295,9 +1294,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest_base.py index 565632c5892a..0f888f1cd44a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest_base.py @@ -17,15 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/async_client.py index 8cb819a55752..c6c97befa00b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,22 +44,22 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.conversational_search_service import ( pagers, ) from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, conversational_search_service, search_service, + session, ) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .client import ConversationalSearchServiceClient @@ -164,7 +164,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_info.__func__(ConversationalSearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + ConversationalSearchServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + ConversationalSearchServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -180,7 +185,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_file.__func__(ConversationalSearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + ConversationalSearchServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + ConversationalSearchServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -218,7 +228,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationalSearchServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/client.py index 692c151b5bfb..3c9668666458 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,22 +61,22 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.conversational_search_service import ( pagers, ) from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, conversational_search_service, search_service, + session, ) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport @@ -93,13 +93,11 @@ class ConversationalSearchServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationalSearchServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = ConversationalSearchServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + ConversationalSearchServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = ConversationalSearchServiceRestTransport def get_transport_class( @@ -797,11 +795,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationalSearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationalSearchServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConversationalSearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -838,8 +834,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationalSearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/pagers.py index a49e184bfdeb..8254c11211fe 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +233,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/__init__.py index 855e35aad0c0..234e039d4add 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationalSearchServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConversationalSearchServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConversationalSearchServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/base.py index 974dc196a579..b2adcab11e71 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta import gapic_version as package_version +from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -388,7 +390,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc.py index 131a37cfd5bd..7ee8e2903b3b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc_asyncio.py index 45e9effbe00b..aa4b5feee6d3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest.py index 2087c6d7b598..6cb5da9cc7cd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -977,9 +979,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() request, metadata = self._interceptor.pre_answer_query(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_transcoded_request( @@ -1139,9 +1139,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() request, metadata = self._interceptor.pre_converse_conversation( request, metadata @@ -1299,9 +1297,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1452,9 +1448,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() request, metadata = self._interceptor.pre_create_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_transcoded_request( @@ -1601,9 +1595,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1625,7 +1617,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1710,9 +1702,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() request, metadata = self._interceptor.pre_delete_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_transcoded_request( @@ -1732,7 +1722,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1823,9 +1813,7 @@ def __call__( Defines an answer. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() request, metadata = self._interceptor.pre_get_answer(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_transcoded_request( @@ -1972,9 +1960,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -2121,9 +2107,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() request, metadata = self._interceptor.pre_get_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_transcoded_request( @@ -2270,9 +2254,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2421,9 +2403,7 @@ def __call__( Response for ListSessions method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() request, metadata = self._interceptor.pre_list_sessions(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_transcoded_request( @@ -2576,9 +2556,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() request, metadata = self._interceptor.pre_update_conversation( request, metadata @@ -2729,9 +2707,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() request, metadata = self._interceptor.pre_update_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_transcoded_request( @@ -3015,9 +2991,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3140,9 +3114,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3283,9 +3255,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest_base.py index 86349a8bf62d..9cd2be9c192f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/async_client.py index 07a111abc18e..31758e6bdda5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,23 +44,23 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.data_store_service import pagers from google.cloud.discoveryengine_v1beta.types import ( + common, + data_store, data_store_service, document_processing_config, schema, ) from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import data_store from .client import DataStoreServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport @@ -141,7 +141,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_info.__func__(DataStoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataStoreServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataStoreServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +158,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_file.__func__(DataStoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataStoreServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataStoreServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/client.py index 831718574c1b..8796ede3c9b0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,23 +61,23 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.data_store_service import pagers from google.cloud.discoveryengine_v1beta.types import ( + common, + data_store, data_store_service, document_processing_config, schema, ) from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import data_store from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport from .transports.grpc import DataStoreServiceGrpcTransport @@ -93,9 +93,7 @@ class DataStoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataStoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataStoreServiceTransport]] _transport_registry["grpc"] = DataStoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataStoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataStoreServiceRestTransport @@ -710,11 +708,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataStoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataStoreServiceClient._read_environment_variables() + ) self._client_cert_source = DataStoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -749,8 +745,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataStoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/pagers.py index d0f8b59dd333..325cef6558b8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/base.py index f88070ea435e..df3a68ea8188 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version +from google.cloud.discoveryengine_v1beta.types import data_store, data_store_service from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import data_store -from google.cloud.discoveryengine_v1beta.types import data_store_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -268,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc.py index 34171a829227..9c05846646b0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import data_store, data_store_service from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import data_store -from google.cloud.discoveryengine_v1beta.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc_asyncio.py index 0230fe0f5c31..d993960945e6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import data_store, data_store_service from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import data_store -from google.cloud.discoveryengine_v1beta.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport from .grpc import DataStoreServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest.py index 4801b5d48cac..6f5fb50a4708 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1beta.types import data_store, data_store_service from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import data_store -from google.cloud.discoveryengine_v1beta.types import data_store_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataStoreServiceRestTransport @@ -758,9 +757,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() request, metadata = self._interceptor.pre_create_data_store( request, metadata @@ -786,7 +783,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -913,9 +910,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() request, metadata = self._interceptor.pre_delete_data_store( request, metadata @@ -937,7 +932,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1210,9 +1205,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() request, metadata = self._interceptor.pre_list_data_stores( request, metadata @@ -1364,9 +1357,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() request, metadata = self._interceptor.pre_update_data_store( request, metadata @@ -1566,9 +1557,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1828,9 +1817,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataStoreServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest_base.py index caabb77ccfcb..0e20d1a84c23 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1beta.types import data_store, data_store_service from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import data_store -from google.cloud.discoveryengine_v1beta.types import data_store_service from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/async_client.py index fe146fc67c62..7bb6056715bb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,21 +44,21 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.document_service import pagers from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document from .client import DocumentServiceClient @@ -138,7 +138,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DocumentServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DocumentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +155,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DocumentServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DocumentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/client.py index 7bfb3b3e365b..ce9251261e92 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,21 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.document_service import pagers from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -92,9 +92,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -719,11 +717,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -758,8 +754,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/pagers.py index 6977cda8ad51..727eeb7100c1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/base.py index a720c2eb8d48..4110007f482c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/base.py @@ -17,24 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -327,7 +327,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc.py index d433ba4b2b19..943d36bda1d1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc.py @@ -16,27 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -586,12 +586,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc_asyncio.py index e49316923f5f..5d6d7f48764e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,19 +31,15 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -603,12 +603,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest.py index 8353af5ec1e1..5e75dafb28be 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest.py @@ -16,27 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -890,9 +890,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() request, metadata = self._interceptor.pre_batch_get_documents_metadata( request, metadata @@ -1048,9 +1046,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -1195,9 +1191,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -1217,7 +1211,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1458,9 +1452,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() request, metadata = self._interceptor.pre_import_documents( request, metadata @@ -1486,7 +1478,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1764,9 +1756,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() request, metadata = self._interceptor.pre_purge_documents(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_transcoded_request( @@ -1790,7 +1780,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1917,9 +1907,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -2021,7 +2009,9 @@ def batch_get_documents_metadata( ]: # 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._BatchGetDocumentsMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetDocumentsMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_document( @@ -2136,9 +2126,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2398,9 +2386,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest_base.py index 3a2a42e6f465..666f2b02d3d7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest_base.py @@ -17,18 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/async_client.py index 61cebfea2d44..7cb07b316f8a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,19 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.engine_service import pagers -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import common, engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service from .client import EngineServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport @@ -128,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_info.__func__(EngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EngineServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EngineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_file.__func__(EngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EngineServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EngineServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/client.py index b85fe59bd397..1b153c4424ac 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,19 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.engine_service import pagers -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import common, engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport from .transports.grpc import EngineServiceGrpcTransport @@ -657,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EngineServiceClient._read_environment_variables() + ) self._client_cert_source = EngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -696,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/pagers.py index e7a17a16adc3..514c60b74f0a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/base.py index 7bdb2ca65d25..b025a1e084a7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -310,7 +309,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc.py index 5870795ef656..056a3bf26a58 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc_asyncio.py index d9b75c05f3c8..7b6304851f7b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport from .grpc import EngineServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest.py index 887e62d08bd5..de4f6ba8f389 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEngineServiceRestTransport @@ -931,7 +930,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1079,7 +1078,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1856,7 +1855,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest_base.py index 707a597badfb..0cb94b8b8b97 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/async_client.py index 43947eb1ca8f..6c5b0b0080e2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,17 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1beta.types import evaluation -from google.cloud.discoveryengine_v1beta.types import evaluation_service from .client import EvaluationServiceClient from .transports.base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport @@ -144,7 +143,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EvaluationServiceAsyncClient: The constructed client. """ - return EvaluationServiceClient.from_service_account_info.__func__(EvaluationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EvaluationServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EvaluationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +160,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EvaluationServiceAsyncClient: The constructed client. """ - return EvaluationServiceClient.from_service_account_file.__func__(EvaluationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EvaluationServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EvaluationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/client.py index 9d0c17cc15cc..fcb46b6b0025 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,17 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1beta.types import evaluation -from google.cloud.discoveryengine_v1beta.types import evaluation_service from .transports.base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport from .transports.grpc import EvaluationServiceGrpcTransport @@ -87,9 +86,7 @@ class EvaluationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EvaluationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EvaluationServiceTransport]] _transport_registry["grpc"] = EvaluationServiceGrpcTransport _transport_registry["grpc_asyncio"] = EvaluationServiceGrpcAsyncIOTransport _transport_registry["rest"] = EvaluationServiceRestTransport @@ -794,11 +791,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EvaluationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EvaluationServiceClient._read_environment_variables() + ) self._client_cert_source = EvaluationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -833,8 +828,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EvaluationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/pagers.py index 9a3049cfa341..48491fb17469 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/base.py index fdd1ffc19c35..08b73c0cc991 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service @@ -255,7 +255,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc.py index eab8f572169b..d74df80b4541 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc_asyncio.py index f1d611ceb6af..8b5d8c2b41f6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest.py index 54e4267e7cd7..f915ce2dfa94 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -701,9 +701,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseCreateEvaluation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseCreateEvaluation._get_http_options() request, metadata = self._interceptor.pre_create_evaluation( request, metadata @@ -729,7 +727,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -857,9 +855,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_evaluation(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_transcoded_request( @@ -1007,9 +1003,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListEvaluationResults._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListEvaluationResults._get_http_options() request, metadata = self._interceptor.pre_list_evaluation_results( request, metadata @@ -1165,9 +1159,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListEvaluations._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_evaluations( request, metadata @@ -1355,9 +1347,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1477,9 +1467,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1618,9 +1606,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/async_client.py index c65372ddc526..6155cf237e17 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -143,7 +143,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_info.__func__(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + GroundedGenerationServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +162,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_file.__func__(GroundedGenerationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + GroundedGenerationServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + GroundedGenerationServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -197,7 +205,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GroundedGenerationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/client.py index 81d3454d19a3..cc67cec69f43 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -85,9 +85,7 @@ class GroundedGenerationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GroundedGenerationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport @@ -674,11 +672,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GroundedGenerationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GroundedGenerationServiceClient._read_environment_variables() + ) self._client_cert_source = ( GroundedGenerationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -715,8 +711,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GroundedGenerationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/__init__.py index 0f3052cbd079..ec0eaca83aa8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GroundedGenerationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/base.py index 3208bacde8bf..11847d001a1b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import grounded_generation_service @@ -239,7 +239,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc.py index 97c4b7a47cff..c93b91d5718b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import grounded_generation_service @@ -346,12 +346,12 @@ def stream_generate_grounded_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_generate_grounded_content" not in self._stubs: - self._stubs[ - "stream_generate_grounded_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.discoveryengine.v1beta.GroundedGenerationService/StreamGenerateGroundedContent", - request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, - response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + self._stubs["stream_generate_grounded_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.discoveryengine.v1beta.GroundedGenerationService/StreamGenerateGroundedContent", + request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, + response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + ) ) return self._stubs["stream_generate_grounded_content"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc_asyncio.py index 248264e393c3..66b061dfee8a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import grounded_generation_service @@ -354,12 +354,12 @@ def stream_generate_grounded_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_generate_grounded_content" not in self._stubs: - self._stubs[ - "stream_generate_grounded_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.discoveryengine.v1beta.GroundedGenerationService/StreamGenerateGroundedContent", - request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, - response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + self._stubs["stream_generate_grounded_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.discoveryengine.v1beta.GroundedGenerationService/StreamGenerateGroundedContent", + request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, + response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + ) ) return self._stubs["stream_generate_grounded_content"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest.py index 4f218f7971e9..2bd8baeda92f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -424,9 +424,7 @@ def __call__( """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() request, metadata = self._interceptor.pre_check_grounding(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_transcoded_request( @@ -584,9 +582,7 @@ def __call__( Response for the ``GenerateGroundedContent`` method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGenerateGroundedContent._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGenerateGroundedContent._get_http_options() request, metadata = self._interceptor.pre_generate_grounded_content( request, metadata @@ -726,7 +722,9 @@ def generate_grounded_content( ]: # 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._GenerateGroundedContent(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateGroundedContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def stream_generate_grounded_content( @@ -737,7 +735,9 @@ def stream_generate_grounded_content( ]: # 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._StreamGenerateGroundedContent(self._session, self._host, self._interceptor) # type: ignore + return self._StreamGenerateGroundedContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -795,9 +795,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -920,9 +918,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1063,9 +1059,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/async_client.py index 552a89a63156..f4a792380605 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_info.__func__(ProjectServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ProjectServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ProjectServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_file.__func__(ProjectServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ProjectServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ProjectServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/client.py index ffeb87807c23..eb041cea9147 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -82,9 +82,7 @@ class ProjectServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ProjectServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ProjectServiceTransport]] _transport_registry["grpc"] = ProjectServiceGrpcTransport _transport_registry["grpc_asyncio"] = ProjectServiceGrpcAsyncIOTransport _transport_registry["rest"] = ProjectServiceRestTransport @@ -619,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectServiceClient._read_environment_variables() + ) self._client_cert_source = ProjectServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -658,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/base.py index c760a8cdc784..c36acb13fa2a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import project_service @@ -207,7 +207,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc.py index 06508f0203a3..bc6259df509a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import project_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc_asyncio.py index d1bdfde6cdd3..74fa602db21f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import project_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest.py index e0f89fde21a5..16a48c4deb4f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -523,9 +523,7 @@ def __call__( """ - http_options = ( - _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() request, metadata = self._interceptor.pre_provision_project( request, metadata @@ -551,7 +549,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -681,9 +679,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/async_client.py index 2c45bd54afed..34794fe88363 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_info.__func__(RankServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = RankServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(RankServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_file.__func__(RankServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = RankServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(RankServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/client.py index eed42b34cda3..11a3aa6113cf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -620,11 +620,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RankServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RankServiceClient._read_environment_variables() + ) self._client_cert_source = RankServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -659,8 +657,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RankServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/base.py index a703e7356aa8..942c5a3b6a82 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import rank_service @@ -202,7 +202,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc.py index 58ff9c29dca8..0179cf6eae42 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import rank_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc_asyncio.py index 8375e6cb7fb3..207c85b4f3a2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import rank_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest.py index 6f230c8ce341..4b2f8d6b7429 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/async_client.py index 62924e4d001c..d5742b03dc21 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -127,7 +127,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_info.__func__(RecommendationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = RecommendationServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(RecommendationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_file.__func__(RecommendationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = RecommendationServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(RecommendationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +183,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return RecommendationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return RecommendationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> RecommendationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/client.py index 2bd443c44749..7cff9d53476e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -80,9 +80,7 @@ class RecommendationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RecommendationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport @@ -702,11 +700,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RecommendationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RecommendationServiceClient._read_environment_variables() + ) self._client_cert_source = RecommendationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -741,8 +737,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RecommendationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/__init__.py index f21f53c111bf..a09bbaaf4d43 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RecommendationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/base.py index f8d46f6a2c6a..097be38da00e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import recommendation_service @@ -205,7 +205,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc.py index 7f36002600fd..de3fd7c6a30c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import recommendation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc_asyncio.py index ed2eb3222390..ceafa7dd7250 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import recommendation_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest.py index d60d15b2547b..1009031f45fe 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -358,9 +358,7 @@ def __call__( """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() request, metadata = self._interceptor.pre_recommend(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseRecommend._get_transcoded_request( @@ -522,9 +520,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -647,9 +643,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -788,9 +782,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/async_client.py index 9b267d313d5c..0c3e01d6c033 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,18 +44,20 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.sample_query_service import pagers +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service from .client import SampleQueryServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport @@ -131,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SampleQueryServiceAsyncClient: The constructed client. """ - return SampleQueryServiceClient.from_service_account_info.__func__(SampleQueryServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SampleQueryServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SampleQueryServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SampleQueryServiceAsyncClient: The constructed client. """ - return SampleQueryServiceClient.from_service_account_file.__func__(SampleQueryServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SampleQueryServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SampleQueryServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -185,7 +189,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SampleQueryServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SampleQueryServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SampleQueryServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/client.py index 65aa4e379696..7dbd8f55552c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,18 +61,20 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.sample_query_service import pagers +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service from .transports.base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport from .transports.grpc import SampleQueryServiceGrpcTransport @@ -88,9 +90,7 @@ class SampleQueryServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SampleQueryServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SampleQueryServiceTransport]] _transport_registry["grpc"] = SampleQueryServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQueryServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQueryServiceRestTransport @@ -660,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SampleQueryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SampleQueryServiceClient._read_environment_variables() + ) self._client_cert_source = SampleQueryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -699,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SampleQueryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/pagers.py index 2d8722fb80d9..34bb346d95d6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/__init__.py index 0f5acb01b776..f8fb6800d64a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SampleQueryServiceRestInterceptor, SampleQueryServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SampleQueryServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SampleQueryServiceTransport]] _transport_registry["grpc"] = SampleQueryServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQueryServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQueryServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/base.py index 42acf58e303a..f16c3770118f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta import gapic_version as package_version +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -284,7 +286,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc.py index 6fe3b9e28646..c87d5d9213a8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc_asyncio.py index b1f8d05cbb30..550618ac865d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,17 +31,15 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport from .grpc import SampleQueryServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest.py index ef6fbf5ee1f0..886083847437 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest.py @@ -16,25 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSampleQueryServiceRestTransport @@ -778,9 +780,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseCreateSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseCreateSampleQuery._get_http_options() request, metadata = self._interceptor.pre_create_sample_query( request, metadata @@ -928,9 +928,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseDeleteSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseDeleteSampleQuery._get_http_options() request, metadata = self._interceptor.pre_delete_sample_query( request, metadata @@ -952,7 +950,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1045,9 +1043,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseGetSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseGetSampleQuery._get_http_options() request, metadata = self._interceptor.pre_get_sample_query( request, metadata @@ -1198,9 +1194,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseImportSampleQueries._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseImportSampleQueries._get_http_options() request, metadata = self._interceptor.pre_import_sample_queries( request, metadata @@ -1226,7 +1220,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1355,9 +1349,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseListSampleQueries._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseListSampleQueries._get_http_options() request, metadata = self._interceptor.pre_list_sample_queries( request, metadata @@ -1509,9 +1501,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseUpdateSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseUpdateSampleQuery._get_http_options() request, metadata = self._interceptor.pre_update_sample_query( request, metadata @@ -1719,9 +1709,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1842,9 +1830,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1983,9 +1969,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSampleQueryServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest_base.py index e1867120fe46..884ce9623d6b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest_base.py @@ -17,16 +17,18 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/async_client.py index f7068c5d8516..42821bd1b48c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,17 +44,19 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.sample_query_set_service import pagers +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service from .client import SampleQuerySetServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport @@ -132,7 +134,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SampleQuerySetServiceAsyncClient: The constructed client. """ - return SampleQuerySetServiceClient.from_service_account_info.__func__(SampleQuerySetServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SampleQuerySetServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SampleQuerySetServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +151,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SampleQuerySetServiceAsyncClient: The constructed client. """ - return SampleQuerySetServiceClient.from_service_account_file.__func__(SampleQuerySetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SampleQuerySetServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SampleQuerySetServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -186,7 +190,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SampleQuerySetServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SampleQuerySetServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SampleQuerySetServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/client.py index 434f25c1a1d9..7956a60c8961 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,17 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.sample_query_set_service import pagers +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service from .transports.base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport from .transports.grpc import SampleQuerySetServiceGrpcTransport @@ -87,9 +89,7 @@ class SampleQuerySetServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SampleQuerySetServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SampleQuerySetServiceTransport]] _transport_registry["grpc"] = SampleQuerySetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQuerySetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQuerySetServiceRestTransport @@ -654,11 +654,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SampleQuerySetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SampleQuerySetServiceClient._read_environment_variables() + ) self._client_cert_source = SampleQuerySetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -693,8 +691,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SampleQuerySetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/pagers.py index fd027cc1e28d..ab5114e260e9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/__init__.py index 44ad1aa56225..a953bda6fade 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SampleQuerySetServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SampleQuerySetServiceTransport]] _transport_registry["grpc"] = SampleQuerySetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQuerySetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQuerySetServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/base.py index f26d4d01c04d..310fd61b10b5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta import gapic_version as package_version +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -274,7 +276,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc.py index 2040ee5d6e13..132e5a85bcfb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc_asyncio.py index 8c4096140d25..50f07675f41a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport from .grpc import SampleQuerySetServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest.py index 070b534d65a6..de5cbd6dc2a7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSampleQuerySetServiceRestTransport @@ -565,9 +567,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseCreateSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseCreateSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_create_sample_query_set( request, metadata @@ -719,9 +719,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseDeleteSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseDeleteSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_delete_sample_query_set( request, metadata @@ -743,7 +741,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -840,9 +838,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseGetSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseGetSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_get_sample_query_set( request, metadata @@ -994,9 +990,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseListSampleQuerySets._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseListSampleQuerySets._get_http_options() request, metadata = self._interceptor.pre_list_sample_query_sets( request, metadata @@ -1154,9 +1148,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseUpdateSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseUpdateSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_update_sample_query_set( request, metadata @@ -1365,9 +1357,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1490,9 +1480,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1631,9 +1619,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest_base.py index 15a4ee567698..5f8328b46ffb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/async_client.py index 5b52e5dfa060..be9e069e2dda 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,17 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.schema_service import pagers -from google.cloud.discoveryengine_v1beta.types import schema +from google.cloud.discoveryengine_v1beta.types import schema, schema_service from google.cloud.discoveryengine_v1beta.types import schema as gcd_schema -from google.cloud.discoveryengine_v1beta.types import schema_service from .client import SchemaServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport @@ -126,7 +125,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SchemaServiceAsyncClient: The constructed client. """ - return SchemaServiceClient.from_service_account_info.__func__(SchemaServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SchemaServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SchemaServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +142,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SchemaServiceAsyncClient: The constructed client. """ - return SchemaServiceClient.from_service_account_file.__func__(SchemaServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SchemaServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SchemaServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/client.py index 42a6e0b83341..2600bc3e6fb9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,17 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.schema_service import pagers -from google.cloud.discoveryengine_v1beta.types import schema +from google.cloud.discoveryengine_v1beta.types import schema, schema_service from google.cloud.discoveryengine_v1beta.types import schema as gcd_schema -from google.cloud.discoveryengine_v1beta.types import schema_service from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport from .transports.grpc import SchemaServiceGrpcTransport @@ -653,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SchemaServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SchemaServiceClient._read_environment_variables() + ) self._client_cert_source = SchemaServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -692,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SchemaServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/pagers.py index 3e571974fcfc..15bb85a654be 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/base.py index 39078257ffd7..4d6119220330 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import schema, schema_service @@ -266,7 +266,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc.py index 3bb625e3288e..ca6de7bbd6c7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import schema, schema_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc_asyncio.py index bf4829dc9442..1413949bf8ea 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import schema, schema_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest.py index 872adb10c4ac..f63d141e647b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -771,7 +771,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -919,7 +919,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1376,7 +1376,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/async_client.py index 9152e7214767..472b6609d012 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -128,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_info.__func__(SearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SearchServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SearchServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_file.__func__(SearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SearchServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SearchServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/client.py index 730696c17933..44f83220bf03 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -747,11 +747,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchServiceClient._read_environment_variables() + ) self._client_cert_source = SearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -786,8 +784,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/pagers.py index 245dd7f9e21d..eb15d810a10f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/base.py index c0d6ca633586..1897910a44dd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import search_service @@ -216,7 +216,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc.py index f19b576030c2..b499893234a2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc_asyncio.py index c6e20c6cd93a..2eeff5eaff61 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest.py index c46e4a992fed..efe6f030866a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,7 +27,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/async_client.py index 1aa612514291..8e06aff21b97 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -128,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_info.__func__(SearchTuningServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SearchTuningServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SearchTuningServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_file.__func__(SearchTuningServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SearchTuningServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SearchTuningServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -182,7 +184,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SearchTuningServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/client.py index 98912cb401e2..5ba5de7e6422 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -85,9 +85,7 @@ class SearchTuningServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SearchTuningServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport @@ -655,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchTuningServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchTuningServiceClient._read_environment_variables() + ) self._client_cert_source = SearchTuningServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchTuningServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/__init__.py index d759f5c3cdcd..170e258db18b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import SearchTuningServiceRestInterceptor, SearchTuningServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SearchTuningServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/base.py index 6bf9f9b79c8b..4faea8d179f7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import search_tuning_service @@ -224,7 +224,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc.py index 78eaf2b5a2e1..eaed35c3a518 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_tuning_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc_asyncio.py index 07fc4b8e2137..aa6a4e05c764 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_tuning_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest.py index c55d14440fc4..eaa4b1080641 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -583,9 +583,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() request, metadata = self._interceptor.pre_list_custom_models( request, metadata @@ -738,9 +736,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() request, metadata = self._interceptor.pre_train_custom_model( request, metadata @@ -766,7 +762,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -910,9 +906,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1033,9 +1027,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1174,9 +1166,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/async_client.py index f25cafc4960d..97c01f7883ab 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,18 +44,21 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1beta.types import ( + common, + search_service, + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import common, search_service -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service from .client import ServingConfigServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport @@ -127,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_info.__func__(ServingConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ServingConfigServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ServingConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +147,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_file.__func__(ServingConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ServingConfigServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ServingConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +186,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ServingConfigServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/client.py index 3589a839033a..7c01a2f3c7cc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,18 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1beta.types import ( + common, + search_service, + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import common, search_service -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport from .transports.grpc import ServingConfigServiceGrpcTransport @@ -88,9 +91,7 @@ class ServingConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServingConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport @@ -638,11 +639,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServingConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServingConfigServiceClient._read_environment_variables() + ) self._client_cert_source = ServingConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +676,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServingConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/pagers.py index d21bb5f36c17..fd0b70c7768e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/__init__.py index 6bdd4697d637..5e6ab0b7e7f9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ServingConfigServiceRestInterceptor, ServingConfigServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServingConfigServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/base.py index 58fc7641f93d..27d4dd4614fd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/base.py @@ -17,22 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version +from google.cloud.discoveryengine_v1beta.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -240,7 +242,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc.py index 4da66aaf6a85..633426752ffa 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc_asyncio.py index f4a00d16bf7e..0f5d4318c450 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,16 +31,15 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport from .grpc import ServingConfigServiceGrpcTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest.py index 8703bf54329f..2d8a911c3dda 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest.py @@ -16,9 +16,10 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,15 +27,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.discoveryengine_v1beta.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseServingConfigServiceRestTransport @@ -483,9 +485,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetServingConfig._get_http_options() request, metadata = self._interceptor.pre_get_serving_config( request, metadata @@ -635,9 +635,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListServingConfigs._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListServingConfigs._get_http_options() request, metadata = self._interceptor.pre_list_serving_configs( request, metadata @@ -796,9 +794,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() request, metadata = self._interceptor.pre_update_serving_config( request, metadata @@ -985,9 +981,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1108,9 +1102,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1249,9 +1241,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest_base.py index 07249d539623..bc386f8199d5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest_base.py @@ -22,11 +22,13 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.discoveryengine_v1beta.types import ( + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/async_client.py index 3e1a745dab83..df1528a0f3a3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,14 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.session_service import pagers -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .client import SessionServiceClient @@ -128,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_info.__func__(SessionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SessionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SessionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +147,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_file.__func__(SessionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SessionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SessionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/client.py index b350a3af8a39..25109ca29c20 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.session_service import pagers -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport @@ -85,9 +87,7 @@ class SessionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionServiceTransport]] _transport_registry["grpc"] = SessionServiceGrpcTransport _transport_registry["grpc_asyncio"] = SessionServiceGrpcAsyncIOTransport _transport_registry["rest"] = SessionServiceRestTransport @@ -731,11 +731,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionServiceClient._read_environment_variables() + ) self._client_cert_source = SessionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -770,8 +768,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/pagers.py index 519fa65bf54d..ada9ad122e6a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/base.py index eba764842b14..854b9bb70c80 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/base.py @@ -17,20 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -264,7 +266,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc.py index 68804799730f..a32c6ab7c58f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc_asyncio.py index 7e0ce89dfce1..774487e309dd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,15 +31,13 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest.py index b79c12438bfe..1ff209ab8a9e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,13 +28,13 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -710,7 +712,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1292,9 +1294,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest_base.py index 4da0f0a14e8f..c0bb3682c816 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest_base.py @@ -17,14 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.discoveryengine_v1beta.types import conversational_search_service -from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import ( + conversational_search_service, + session, +) from google.cloud.discoveryengine_v1beta.types import session as gcd_session from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/async_client.py index 89b86b5877ec..8c374128fb2b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( pagers, @@ -141,7 +141,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_info.__func__(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SiteSearchEngineServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +158,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_file.__func__(SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SiteSearchEngineServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -195,7 +199,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SiteSearchEngineServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/client.py index 9e8168d38ccb..5c858ce94a69 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( pagers, @@ -90,9 +90,7 @@ class SiteSearchEngineServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport @@ -686,11 +684,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SiteSearchEngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SiteSearchEngineServiceClient._read_environment_variables() + ) self._client_cert_source = ( SiteSearchEngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -727,8 +723,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SiteSearchEngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/pagers.py index e9d54b6c0c8f..8c24e83fb859 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -315,7 +315,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/__init__.py index 5443c0c10cf1..0c91743e9878 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/base.py index 8e10cca11b88..66a8ce46393c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import ( @@ -418,7 +418,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc.py index 529aa4ed06cf..aa0802588877 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( site_search_engine, @@ -661,12 +661,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -693,12 +693,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -786,12 +786,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc_asyncio.py index 3416e87016f7..df3556c19384 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( site_search_engine, @@ -675,12 +675,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -707,12 +707,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -801,12 +801,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest.py index cc9775658ae3..b7d9ae1df97b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1336,9 +1336,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_create_target_sites( request, metadata @@ -1364,7 +1362,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1492,9 +1490,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_verify_target_sites( request, metadata @@ -1520,7 +1516,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1648,9 +1644,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_http_options() request, metadata = self._interceptor.pre_create_sitemap(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_transcoded_request( @@ -1674,7 +1668,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1804,9 +1798,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() request, metadata = self._interceptor.pre_create_target_site( request, metadata @@ -1832,7 +1824,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1961,9 +1953,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_http_options() request, metadata = self._interceptor.pre_delete_sitemap(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_transcoded_request( @@ -1983,7 +1973,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2111,9 +2101,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() request, metadata = self._interceptor.pre_delete_target_site( request, metadata @@ -2135,7 +2123,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2267,9 +2255,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_disable_advanced_site_search( request, metadata @@ -2295,7 +2281,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2424,9 +2410,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_enable_advanced_site_search( request, metadata @@ -2452,7 +2436,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2582,9 +2566,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() request, metadata = self._interceptor.pre_fetch_domain_verification_status( request, metadata @@ -2652,11 +2634,10 @@ def __call__( resp = self._interceptor.post_fetch_domain_verification_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_domain_verification_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_domain_verification_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2743,9 +2724,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_http_options() request, metadata = self._interceptor.pre_fetch_sitemaps(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_transcoded_request( @@ -2900,9 +2879,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() request, metadata = self._interceptor.pre_get_site_search_engine( request, metadata @@ -3055,9 +3032,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() request, metadata = self._interceptor.pre_get_target_site(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_transcoded_request( @@ -3207,9 +3182,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() request, metadata = self._interceptor.pre_list_target_sites( request, metadata @@ -3366,9 +3339,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() request, metadata = self._interceptor.pre_recrawl_uris(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_transcoded_request( @@ -3392,7 +3363,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3520,9 +3491,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() request, metadata = self._interceptor.pre_update_target_site( request, metadata @@ -3548,7 +3517,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3626,7 +3595,9 @@ def batch_create_target_sites( ]: # 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._BatchCreateTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_verify_target_sites( @@ -3637,7 +3608,9 @@ def batch_verify_target_sites( ]: # 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._BatchVerifyTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchVerifyTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_sitemap( @@ -3688,7 +3661,9 @@ def disable_advanced_site_search( ]: # 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._DisableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._DisableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_advanced_site_search( @@ -3699,7 +3674,9 @@ def enable_advanced_site_search( ]: # 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._EnableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._EnableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_domain_verification_status( @@ -3710,7 +3687,9 @@ def fetch_domain_verification_status( ]: # 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._FetchDomainVerificationStatus(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDomainVerificationStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_sitemaps( @@ -3831,9 +3810,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3956,9 +3933,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -4097,9 +4072,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/async_client.py index 44ca653a5bfc..522d17e28b71 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api import httpbody_pb2 # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.types import ( common, @@ -132,7 +132,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_info.__func__(UserEventServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = UserEventServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(UserEventServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +149,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_file.__func__(UserEventServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = UserEventServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(UserEventServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/client.py index d3a2f51c2f74..e35a12028829 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api import httpbody_pb2 # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.types import ( common, @@ -91,9 +91,7 @@ class UserEventServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UserEventServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UserEventServiceTransport]] _transport_registry["grpc"] = UserEventServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserEventServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserEventServiceRestTransport @@ -687,11 +685,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserEventServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserEventServiceClient._read_environment_variables() + ) self._client_cert_source = UserEventServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -726,8 +722,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserEventServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/base.py index 96cd20ebb6b5..b6828c4c9260 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/base.py @@ -16,17 +16,17 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import ( @@ -264,7 +264,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc.py index e03099d5bb01..7ca0bdf0a7cd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( import_config, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc_asyncio.py index c48cc6540556..c4930d26da39 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc_asyncio.py @@ -17,10 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -29,10 +32,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( import_config, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest.py index e95583803a34..d7e9baa4de64 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -744,9 +744,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() request, metadata = self._interceptor.pre_collect_user_event( request, metadata @@ -768,7 +766,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -896,9 +894,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() request, metadata = self._interceptor.pre_import_user_events( request, metadata @@ -924,7 +920,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1051,9 +1047,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() request, metadata = self._interceptor.pre_purge_user_events( request, metadata @@ -1079,7 +1073,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1206,9 +1200,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() request, metadata = self._interceptor.pre_write_user_event( request, metadata @@ -1391,9 +1383,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1653,9 +1643,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseUserEventServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest_base.py index 88b1391c1cf6..a942240d0ab0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest_base.py @@ -17,7 +17,7 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/__init__.py index c349abe5f20e..8d70c32e357a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .answer import Answer -from .chunk import Chunk +from .answer import ( + Answer, +) +from .chunk import ( + Chunk, +) from .common import ( CustomAttribute, DoubleList, @@ -27,14 +31,20 @@ SolutionType, UserInfo, ) -from .completion import CompletionSuggestion, SuggestionDenyListEntry +from .completion import ( + CompletionSuggestion, + SuggestionDenyListEntry, +) from .completion_service import ( AdvancedCompleteQueryRequest, AdvancedCompleteQueryResponse, CompleteQueryRequest, CompleteQueryResponse, ) -from .control import Condition, Control +from .control import ( + Condition, + Control, +) from .control_service import ( CreateControlRequest, DeleteControlRequest, @@ -69,7 +79,9 @@ UpdateConversationRequest, UpdateSessionRequest, ) -from .custom_tuning_model import CustomTuningModel +from .custom_tuning_model import ( + CustomTuningModel, +) from .data_store import ( DataStore, LanguageInfo, @@ -86,8 +98,12 @@ ListDataStoresResponse, UpdateDataStoreRequest, ) -from .document import Document -from .document_processing_config import DocumentProcessingConfig +from .document import ( + Document, +) +from .document_processing_config import ( + DocumentProcessingConfig, +) from .document_service import ( BatchGetDocumentsMetadataRequest, BatchGetDocumentsMetadataResponse, @@ -98,7 +114,9 @@ ListDocumentsResponse, UpdateDocumentRequest, ) -from .engine import Engine +from .engine import ( + Engine, +) from .engine_service import ( CreateEngineMetadata, CreateEngineRequest, @@ -114,7 +132,10 @@ TuneEngineResponse, UpdateEngineRequest, ) -from .evaluation import Evaluation, QualityMetrics +from .evaluation import ( + Evaluation, + QualityMetrics, +) from .evaluation_service import ( CreateEvaluationMetadata, CreateEvaluationRequest, @@ -132,7 +153,11 @@ GenerateGroundedContentResponse, GroundedGenerationContent, ) -from .grounding import FactChunk, GroundingConfig, GroundingFact +from .grounding import ( + FactChunk, + GroundingConfig, + GroundingFact, +) from .import_config import ( AlloyDbSource, BigQuerySource, @@ -160,8 +185,13 @@ ImportUserEventsResponse, SpannerSource, ) -from .project import Project -from .project_service import ProvisionProjectMetadata, ProvisionProjectRequest +from .project import ( + Project, +) +from .project_service import ( + ProvisionProjectMetadata, + ProvisionProjectRequest, +) from .purge_config import ( PurgeCompletionSuggestionsMetadata, PurgeCompletionSuggestionsRequest, @@ -177,9 +207,18 @@ PurgeUserEventsRequest, PurgeUserEventsResponse, ) -from .rank_service import RankingRecord, RankRequest, RankResponse -from .recommendation_service import RecommendRequest, RecommendResponse -from .sample_query import SampleQuery +from .rank_service import ( + RankingRecord, + RankRequest, + RankResponse, +) +from .recommendation_service import ( + RecommendRequest, + RecommendResponse, +) +from .sample_query import ( + SampleQuery, +) from .sample_query_service import ( CreateSampleQueryRequest, DeleteSampleQueryRequest, @@ -188,7 +227,9 @@ ListSampleQueriesResponse, UpdateSampleQueryRequest, ) -from .sample_query_set import SampleQuerySet +from .sample_query_set import ( + SampleQuerySet, +) from .sample_query_set_service import ( CreateSampleQuerySetRequest, DeleteSampleQuerySetRequest, @@ -197,7 +238,9 @@ ListSampleQuerySetsResponse, UpdateSampleQuerySetRequest, ) -from .schema import Schema +from .schema import ( + Schema, +) from .schema_service import ( CreateSchemaMetadata, CreateSchemaRequest, @@ -209,7 +252,10 @@ UpdateSchemaMetadata, UpdateSchemaRequest, ) -from .search_service import SearchRequest, SearchResponse +from .search_service import ( + SearchRequest, + SearchResponse, +) from .search_tuning_service import ( ListCustomModelsRequest, ListCustomModelsResponse, @@ -217,14 +263,19 @@ TrainCustomModelRequest, TrainCustomModelResponse, ) -from .serving_config import ServingConfig +from .serving_config import ( + ServingConfig, +) from .serving_config_service import ( GetServingConfigRequest, ListServingConfigsRequest, ListServingConfigsResponse, UpdateServingConfigRequest, ) -from .session import Query, Session +from .session import ( + Query, + Session, +) from .site_search_engine import ( Sitemap, SiteSearchEngine, @@ -276,7 +327,10 @@ TransactionInfo, UserEvent, ) -from .user_event_service import CollectUserEventRequest, WriteUserEventRequest +from .user_event_service import ( + CollectUserEventRequest, + WriteUserEventRequest, +) __all__ = ( "Answer", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/answer.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/answer.py index b4a969b6f684..afad14118513 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/answer.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/answer.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -73,6 +73,7 @@ class State(proto.Enum): SUCCEEDED (3): Answer generation has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -131,6 +132,7 @@ class AnswerSkippedReason(proto.Enum): Google skips the answer if a well grounded answer was unable to be generated. """ + ANSWER_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_ANSWER_SEEKING_QUERY_IGNORED = 2 @@ -440,6 +442,7 @@ class State(proto.Enum): SUCCEEDED (3): Step has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -666,6 +669,7 @@ class Type(proto.Enum): Non-answer-seeking query classification type, for no clear intent. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/chunk.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/chunk.py index 495c1b461a84..be46f391b55e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/chunk.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/chunk.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/common.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/common.py index 77a3ec8f1d3f..be77227c8d3d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/common.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/common.py @@ -51,6 +51,7 @@ class IndustryVertical(proto.Enum): HEALTHCARE_FHIR (7): The healthcare FHIR vertical. """ + INDUSTRY_VERTICAL_UNSPECIFIED = 0 GENERIC = 1 MEDIA = 2 @@ -76,6 +77,7 @@ class SolutionType(proto.Enum): data stores must enrolled with ``SOLUTION_TYPE_CHAT`` solution. """ + SOLUTION_TYPE_UNSPECIFIED = 0 SOLUTION_TYPE_RECOMMENDATION = 1 SOLUTION_TYPE_SEARCH = 2 @@ -98,6 +100,7 @@ class SearchUseCase(proto.Enum): Browse use case. Expects the traffic has an empty [query][google.cloud.discoveryengine.v1beta.SearchRequest.query]. """ + SEARCH_USE_CASE_UNSPECIFIED = 0 SEARCH_USE_CASE_SEARCH = 1 SEARCH_USE_CASE_BROWSE = 2 @@ -117,6 +120,7 @@ class SearchTier(proto.Enum): SEARCH_TIER_ENTERPRISE (2): Enterprise tier. """ + SEARCH_TIER_UNSPECIFIED = 0 SEARCH_TIER_STANDARD = 1 SEARCH_TIER_ENTERPRISE = 2 @@ -132,6 +136,7 @@ class SearchAddOn(proto.Enum): SEARCH_ADD_ON_LLM (1): Large language model add-on. """ + SEARCH_ADD_ON_UNSPECIFIED = 0 SEARCH_ADD_ON_LLM = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion.py index 0a8b684bf6a3..691385fd26a4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion.py @@ -54,6 +54,7 @@ class MatchOperator(proto.Enum): CONTAINS (2): If the suggestion contains the block_phrase, then block it. """ + MATCH_OPERATOR_UNSPECIFIED = 0 EXACT_MATCH = 1 CONTAINS = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion_service.py index e577c83b84f4..bd6b0c56862a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import common @@ -275,6 +275,7 @@ class SuggestionType(proto.Enum): GOOGLE_WORKSPACE (5): Returns Google Workspace suggestions. """ + SUGGESTION_TYPE_UNSPECIFIED = 0 QUERY = 1 PEOPLE = 2 @@ -472,6 +473,7 @@ class PersonType(proto.Enum): THIRD_PARTY_IDENTITY (2): The suggestion is from a THIRD_PARTY_IDENTITY source. """ + PERSON_TYPE_UNSPECIFIED = 0 CLOUD_IDENTITY = 1 THIRD_PARTY_IDENTITY = 2 @@ -525,6 +527,7 @@ class ContentType(proto.Enum): THIRD_PARTY (2): The suggestion is from a third party source. """ + CONTENT_TYPE_UNSPECIFIED = 0 GOOGLE_WORKSPACE = 1 THIRD_PARTY = 2 @@ -589,12 +592,12 @@ class RecentSearchSuggestion(proto.Message): number=4, message=ContentSuggestion, ) - recent_search_suggestions: MutableSequence[ - RecentSearchSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=RecentSearchSuggestion, + recent_search_suggestions: MutableSequence[RecentSearchSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=RecentSearchSuggestion, + ) ) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control.py index 18f251314407..cad3e12dbccd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import common diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control_service.py index 0f75538cf8ef..331771f1d3a4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import control as gcd_control diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversation.py index 55405fdd47db..e12f813adbc9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_service @@ -68,6 +68,7 @@ class State(proto.Enum): COMPLETED (2): Conversation has been completed. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversational_search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversational_search_service.py index 17b66604760f..857b63cc0bed 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversational_search_service.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1beta.types import answer as gcd_answer +from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1beta.types import search_service from google.cloud.discoveryengine_v1beta.types import session as gcd_session @@ -203,12 +203,12 @@ class ConverseConversationResponse(proto.Message): proto.STRING, number=6, ) - search_results: MutableSequence[ - search_service.SearchResponse.SearchResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=search_service.SearchResponse.SearchResult, + search_results: MutableSequence[search_service.SearchResponse.SearchResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=search_service.SearchResponse.SearchResult, + ) ) @@ -516,6 +516,7 @@ class FilteringLevel(proto.Enum): FILTERING_LEVEL_HIGH (2): Filter answers based on a high threshold. """ + FILTERING_LEVEL_UNSPECIFIED = 0 FILTERING_LEVEL_LOW = 1 FILTERING_LEVEL_HIGH = 2 @@ -1042,6 +1043,7 @@ class Type(proto.Enum): Non-answer-seeking query classification type, for no clear intent. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/custom_tuning_model.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/custom_tuning_model.py index 6f67d52fa25d..9f35075df271 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/custom_tuning_model.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/custom_tuning_model.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -83,6 +83,7 @@ class ModelState(proto.Enum): Input data validation failed. Model training didn't start. """ + MODEL_STATE_UNSPECIFIED = 0 TRAINING_PAUSED = 1 TRAINING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store.py index 76f64b5352c7..fe4ec0ceff50 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store.py @@ -17,14 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import common, schema from google.cloud.discoveryengine_v1beta.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import schema __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -138,6 +137,7 @@ class ContentConfig(proto.Enum): workspace data store are specified in the [WorkspaceConfig][google.cloud.discoveryengine.v1beta.WorkspaceConfig]. """ + CONTENT_CONFIG_UNSPECIFIED = 0 NO_CONTENT = 1 CONTENT_REQUIRED = 2 @@ -342,6 +342,7 @@ class Mode(proto.Enum): Natural Language Query Understanding is enabled. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -396,6 +397,7 @@ class Type(proto.Enum): GOOGLE_KEEP (7): Workspace Data Store contains Keep data """ + TYPE_UNSPECIFIED = 0 GOOGLE_DRIVE = 1 GOOGLE_MAIL = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store_service.py index faf087d44736..e1a09c712598 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document.py index d673a125fca2..315bd1072211 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_service.py index 35a4e549e55b..45ced7872622 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import document as gcd_document @@ -395,6 +395,7 @@ class State(proto.Enum): The [Document][google.cloud.discoveryengine.v1beta.Document] is not indexed. """ + STATE_UNSPECIFIED = 0 INDEXED = 1 NOT_IN_TARGET_SITE = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine.py index ae9bd23a98af..eda437b100f3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import common diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine_service.py index da3b04f82745..23bfb60408f6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation.py index 3eaa5a067c45..41c713e4463c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_service @@ -92,6 +92,7 @@ class State(proto.Enum): FAILED (4): The evaluation failed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounded_generation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounded_generation_service.py index e17521198310..a1dd4455a586 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounded_generation_service.py @@ -248,6 +248,7 @@ class Version(proto.Enum): The V1 model which is evaluating each source independently. """ + VERSION_UNSPECIFIED = 0 V1_INDEPENDENT = 1 @@ -310,12 +311,12 @@ class InlineSource(proto.Message): author of the content). """ - grounding_facts: MutableSequence[ - grounding.GroundingFact - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=grounding.GroundingFact, + grounding_facts: MutableSequence[grounding.GroundingFact] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=grounding.GroundingFact, + ) ) attributes: MutableMapping[str, str] = proto.MapField( proto.STRING, @@ -529,6 +530,7 @@ class Source(proto.Enum): GOOGLE_MAPS (4): Google Maps. """ + SOURCE_UNSPECIFIED = 0 VERTEX_AI_SEARCH = 1 GOOGLE_SEARCH = 3 @@ -591,6 +593,7 @@ class Version(proto.Enum): The V1 model which is evaluating each source independently. """ + VERSION_UNSPECIFIED = 0 V1_INDEPENDENT = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/import_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/import_config.py index c1458f15a46d..f2dce6557580 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/import_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/import_config.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( @@ -286,6 +286,7 @@ class Type(proto.Enum): JSON (7): JSON type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -306,6 +307,7 @@ class Encoding(proto.Enum): BINARY (2): Binary encoding. """ + ENCODING_UNSPECIFIED = 0 TEXT = 1 BINARY = 2 @@ -354,12 +356,12 @@ class BigtableColumnFamily(proto.Message): number=3, enum="BigtableOptions.Type", ) - columns: MutableSequence[ - "BigtableOptions.BigtableColumn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="BigtableOptions.BigtableColumn", + columns: MutableSequence["BigtableOptions.BigtableColumn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="BigtableOptions.BigtableColumn", + ) ) class BigtableColumn(proto.Message): @@ -1043,6 +1045,7 @@ class ReconciliationMode(proto.Enum): deleted if they are not present in the source location. """ + RECONCILIATION_MODE_UNSPECIFIED = 0 INCREMENTAL = 1 FULL = 2 @@ -1220,12 +1223,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - entries: MutableSequence[ - completion.SuggestionDenyListEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.SuggestionDenyListEntry, + entries: MutableSequence[completion.SuggestionDenyListEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.SuggestionDenyListEntry, + ) ) inline_source: InlineSource = proto.Field( @@ -1348,12 +1351,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - suggestions: MutableSequence[ - completion.CompletionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.CompletionSuggestion, + suggestions: MutableSequence[completion.CompletionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.CompletionSuggestion, + ) ) inline_source: InlineSource = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project.py index 63d811e112e3..443e45bd81d6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -98,6 +98,7 @@ class State(proto.Enum): The project has declined or revoked the agreement to terms of service. """ + STATE_UNSPECIFIED = 0 TERMS_ACCEPTED = 1 TERMS_PENDING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/purge_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/purge_config.py index 56a18e79d469..e6cc3c0a67ad 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/purge_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/purge_config.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import import_config diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/recommendation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/recommendation_service.py index 51d09981d87b..ade0ee565e06 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/recommendation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/recommendation_service.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import user_event as gcd_user_event from google.cloud.discoveryengine_v1beta.types import document as gcd_document +from google.cloud.discoveryengine_v1beta.types import user_event as gcd_user_event __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query.py index 90d23995902d..38db4eba58a9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_service.py index 44db4975b6ce..33ef414a8774 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set.py index 83ae097221ad..35b6ed329f27 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set_service.py index 1dab3c6377bd..d21166b28e55 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( @@ -135,12 +135,12 @@ class ListSampleQuerySetsResponse(proto.Message): def raw_page(self): return self - sample_query_sets: MutableSequence[ - gcd_sample_query_set.SampleQuerySet - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_sample_query_set.SampleQuerySet, + sample_query_sets: MutableSequence[gcd_sample_query_set.SampleQuerySet] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_sample_query_set.SampleQuerySet, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema.py index 26a07ce369a8..675f4025ae15 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema_service.py index 42437b4bf244..0169bb406e1c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import schema as gcd_schema diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py index a8bd37079766..a608a6bc5449 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import chunk as gcd_chunk @@ -448,6 +448,7 @@ class RelevanceThreshold(proto.Enum): HIGH (4): High relevance threshold. """ + RELEVANCE_THRESHOLD_UNSPECIFIED = 0 LOWEST = 1 LOW = 2 @@ -467,6 +468,7 @@ class RankingExpressionBackend(proto.Enum): RANK_BY_FORMULA (4): Ranking by custom formula. """ + RANKING_EXPRESSION_BACKEND_UNSPECIFIED = 0 RANK_BY_EMBEDDING = 3 RANK_BY_FORMULA = 4 @@ -812,6 +814,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. For example, ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -828,6 +831,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -937,6 +941,7 @@ class Condition(proto.Enum): Automatic query expansion built by the Search API. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 AUTO = 2 @@ -980,6 +985,7 @@ class Mode(proto.Enum): Search API. Search will be based on the corrected query if found. """ + MODE_UNSPECIFIED = 0 SUGGESTION_ONLY = 1 AUTO = 2 @@ -1029,6 +1035,7 @@ class SearchResultMode(proto.Enum): [DataStore.DocumentProcessingConfig.chunking_config][] is specified. """ + SEARCH_RESULT_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -1456,6 +1463,7 @@ class FilterExtractionCondition(proto.Enum): ENABLED (2): Enables NL filter extraction. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1465,11 +1473,11 @@ class FilterExtractionCondition(proto.Enum): number=1, enum="SearchRequest.NaturalLanguageQueryUnderstandingSpec.FilterExtractionCondition", ) - geo_search_query_detection_field_names: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=2, + geo_search_query_detection_field_names: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=2, + ) ) class SearchAsYouTypeSpec(proto.Message): @@ -1495,6 +1503,7 @@ class Condition(proto.Enum): ENABLED (2): Enables Search As You Type. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1586,6 +1595,7 @@ class Mode(proto.Enum): DISABLED (2): Disable personalization. """ + MODE_UNSPECIFIED = 0 AUTO = 1 DISABLED = 2 @@ -2037,12 +2047,12 @@ class FacetValue(proto.Message): proto.STRING, number=1, ) - values: MutableSequence[ - "SearchResponse.Facet.FacetValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.Facet.FacetValue", + values: MutableSequence["SearchResponse.Facet.FacetValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.Facet.FacetValue", + ) ) dynamic_facet: bool = proto.Field( proto.BOOL, @@ -2177,6 +2187,7 @@ class SummarySkippedReason(proto.Enum): [SearchRequest.ContentSearchSpec.SummarySpec.ignore_non_answer_seeking_query] is set to ``true``. """ + SUMMARY_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_SUMMARY_SEEKING_QUERY_IGNORED = 2 @@ -2220,12 +2231,12 @@ class CitationMetadata(proto.Message): Citations for segments. """ - citations: MutableSequence[ - "SearchResponse.Summary.Citation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SearchResponse.Summary.Citation", + citations: MutableSequence["SearchResponse.Summary.Citation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SearchResponse.Summary.Citation", + ) ) class Citation(proto.Message): @@ -2249,12 +2260,12 @@ class Citation(proto.Message): proto.INT64, number=2, ) - sources: MutableSequence[ - "SearchResponse.Summary.CitationSource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.CitationSource", + sources: MutableSequence["SearchResponse.Summary.CitationSource"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.CitationSource", + ) ) class CitationSource(proto.Message): @@ -2352,12 +2363,12 @@ class SummaryWithMetadata(proto.Message): number=2, message="SearchResponse.Summary.CitationMetadata", ) - references: MutableSequence[ - "SearchResponse.Summary.Reference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.Reference", + references: MutableSequence["SearchResponse.Summary.Reference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.Reference", + ) ) summary_text: str = proto.Field( @@ -2526,6 +2537,7 @@ class Comparison(proto.Enum): GREATER_THAN (5): Denotes greater than ``>`` operator. """ + COMPARISON_UNSPECIFIED = 0 EQUALS = 1 LESS_THAN_EQUALS = 2 @@ -2772,6 +2784,7 @@ class OneBoxType(proto.Enum): One Box result contains Knowledge Graph search responses. """ + ONE_BOX_TYPE_UNSPECIFIED = 0 PEOPLE = 1 ORGANIZATION = 2 @@ -2783,12 +2796,12 @@ class OneBoxType(proto.Enum): number=1, enum="SearchResponse.OneBoxResult.OneBoxType", ) - search_results: MutableSequence[ - "SearchResponse.SearchResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.SearchResult", + search_results: MutableSequence["SearchResponse.SearchResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.SearchResult", + ) ) @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_tuning_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_tuning_service.py index ca1b175ba108..14f4278a619a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_tuning_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import custom_tuning_model, import_config @@ -65,12 +65,12 @@ class ListCustomModelsResponse(proto.Message): List of custom tuning models. """ - models: MutableSequence[ - custom_tuning_model.CustomTuningModel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_tuning_model.CustomTuningModel, + models: MutableSequence[custom_tuning_model.CustomTuningModel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_tuning_model.CustomTuningModel, + ) ) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config.py index c518f8a9b3f9..143df582d667 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import common, search_service diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config_service.py index 2701dec76cc8..8fc32222639f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( @@ -126,12 +126,12 @@ class ListServingConfigsResponse(proto.Message): def raw_page(self): return self - serving_configs: MutableSequence[ - gcd_serving_config.ServingConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_serving_config.ServingConfig, + serving_configs: MutableSequence[gcd_serving_config.ServingConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_serving_config.ServingConfig, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session.py index 013ee90b77c4..65fdaa1f7f71 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import answer as gcd_answer @@ -69,6 +69,7 @@ class State(proto.Enum): IN_PROGRESS (1): The session is currently open. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine.py index 87bb9aa78b38..98df317e227b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -103,6 +103,7 @@ class Type(proto.Enum): EXCLUDE (2): Exclude the target site. """ + TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -130,6 +131,7 @@ class IndexingStatus(proto.Enum): 2. state reverts to SUCCEEDED if the unindexing fails. """ + INDEXING_STATUS_UNSPECIFIED = 0 PENDING = 1 FAILED = 2 @@ -244,6 +246,7 @@ class SiteVerificationState(proto.Enum): Site exempt from verification, e.g., a public website that opens to all. """ + SITE_VERIFICATION_STATE_UNSPECIFIED = 0 VERIFIED = 1 UNVERIFIED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine_service.py index 2db134f26036..f2ad16932311 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( @@ -371,12 +371,12 @@ class ListTargetSitesResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -424,12 +424,12 @@ class BatchCreateTargetSitesResponse(proto.Message): TargetSites created. """ - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) @@ -838,6 +838,7 @@ class CorpusType(proto.Enum): Denotes a crawling attempt for the mobile version of a page. """ + CORPUS_TYPE_UNSPECIFIED = 0 DESKTOP = 1 MOBILE = 2 @@ -1079,12 +1080,12 @@ class FetchDomainVerificationStatusResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/user_event.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/user_event.py index 5c7918c4a605..3a05818f87de 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/user_event.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/user_event.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import common diff --git a/packages/google-cloud-discoveryengine/noxfile.py b/packages/google-cloud-discoveryengine/noxfile.py index b1aa5da98074..1d597a1beae5 100644 --- a/packages/google-cloud-discoveryengine/noxfile.py +++ b/packages/google-cloud-discoveryengine/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_assistant_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_assistant_service.py index 9c3262edc46b..53783ab09f2e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_assistant_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_assistant_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -976,10 +981,9 @@ def test_assistant_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1028,9 @@ def test_assistant_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1066,9 @@ def test_assistant_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1314,13 +1316,13 @@ def test_assistant_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1894,8 +1896,9 @@ def test_stream_assist_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1964,17 +1967,20 @@ def test_stream_assist_rest_interceptors(null_interceptor): ) client = AssistantServiceClient(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.AssistantServiceRestInterceptor, "post_stream_assist" - ) as post, mock.patch.object( - transports.AssistantServiceRestInterceptor, "post_stream_assist_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssistantServiceRestInterceptor, "pre_stream_assist" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssistantServiceRestInterceptor, "post_stream_assist" + ) as post, + mock.patch.object( + transports.AssistantServiceRestInterceptor, + "post_stream_assist_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssistantServiceRestInterceptor, "pre_stream_assist" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2034,8 +2040,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2096,8 +2103,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2156,8 +2164,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2288,11 +2297,14 @@ def test_assistant_service_base_transport(): def test_assistant_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.assistant_service.transports.AssistantServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.assistant_service.transports.AssistantServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssistantServiceTransport( @@ -2309,9 +2321,12 @@ def test_assistant_service_base_transport_with_credentials_file(): def test_assistant_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.assistant_service.transports.AssistantServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.assistant_service.transports.AssistantServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssistantServiceTransport() @@ -2383,11 +2398,12 @@ def test_assistant_service_transport_auth_gdch_credentials(transport_class): def test_assistant_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_cmek_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_cmek_config_service.py index 30435322d9c2..0b46123c059a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_cmek_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_cmek_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.cmek_config_service import ( CmekConfigServiceAsyncClient, @@ -989,10 +989,9 @@ def test_cmek_config_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1036,9 @@ def test_cmek_config_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1076,10 +1074,9 @@ def test_cmek_config_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1327,13 +1324,13 @@ def test_cmek_config_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1439,9 +1436,9 @@ def test_update_cmek_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cmek_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cmek_config] = ( + mock_rpc + ) request = {} client.update_cmek_config(request) @@ -2137,9 +2134,9 @@ def test_list_cmek_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cmek_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cmek_configs] = ( + mock_rpc + ) request = {} client.list_cmek_configs(request) @@ -2473,9 +2470,9 @@ def test_delete_cmek_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cmek_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cmek_config] = ( + mock_rpc + ) request = {} client.delete_cmek_config(request) @@ -2754,9 +2751,9 @@ def test_update_cmek_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cmek_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cmek_config] = ( + mock_rpc + ) request = {} client.update_cmek_config(request) @@ -3110,9 +3107,9 @@ def test_list_cmek_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cmek_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cmek_configs] = ( + mock_rpc + ) request = {} client.list_cmek_configs(request) @@ -3292,9 +3289,9 @@ def test_delete_cmek_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cmek_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cmek_config] = ( + mock_rpc + ) request = {} client.delete_cmek_config(request) @@ -3794,8 +3791,9 @@ def test_update_cmek_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3929,20 +3927,21 @@ def test_update_cmek_config_rest_interceptors(null_interceptor): ) client = CmekConfigServiceClient(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.CmekConfigServiceRestInterceptor, "post_update_cmek_config" - ) as post, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, - "post_update_cmek_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, "pre_update_cmek_config" - ) as pre: + 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.CmekConfigServiceRestInterceptor, "post_update_cmek_config" + ) as post, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, + "post_update_cmek_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "pre_update_cmek_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3995,8 +3994,9 @@ def test_get_cmek_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4074,18 +4074,20 @@ def test_get_cmek_config_rest_interceptors(null_interceptor): ) client = CmekConfigServiceClient(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.CmekConfigServiceRestInterceptor, "post_get_cmek_config" - ) as post, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, - "post_get_cmek_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, "pre_get_cmek_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "post_get_cmek_config" + ) as post, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, + "post_get_cmek_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "pre_get_cmek_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4140,8 +4142,9 @@ def test_list_cmek_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4201,18 +4204,20 @@ def test_list_cmek_configs_rest_interceptors(null_interceptor): ) client = CmekConfigServiceClient(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.CmekConfigServiceRestInterceptor, "post_list_cmek_configs" - ) as post, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, - "post_list_cmek_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, "pre_list_cmek_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "post_list_cmek_configs" + ) as post, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, + "post_list_cmek_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "pre_list_cmek_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4270,8 +4275,9 @@ def test_delete_cmek_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4328,20 +4334,21 @@ def test_delete_cmek_config_rest_interceptors(null_interceptor): ) client = CmekConfigServiceClient(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.CmekConfigServiceRestInterceptor, "post_delete_cmek_config" - ) as post, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, - "post_delete_cmek_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, "pre_delete_cmek_config" - ) as pre: + 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.CmekConfigServiceRestInterceptor, "post_delete_cmek_config" + ) as post, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, + "post_delete_cmek_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "pre_delete_cmek_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4396,8 +4403,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4458,8 +4466,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4518,8 +4527,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4741,11 +4751,14 @@ def test_cmek_config_service_base_transport(): def test_cmek_config_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.cmek_config_service.transports.CmekConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.cmek_config_service.transports.CmekConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CmekConfigServiceTransport( @@ -4762,9 +4775,12 @@ def test_cmek_config_service_base_transport_with_credentials_file(): def test_cmek_config_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.cmek_config_service.transports.CmekConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.cmek_config_service.transports.CmekConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CmekConfigServiceTransport() @@ -4836,11 +4852,12 @@ def test_cmek_config_service_transport_auth_gdch_credentials(transport_class): def test_cmek_config_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_completion_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_completion_service.py index 781466058306..6a6db72500e8 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_completion_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_completion_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.type import date_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.completion_service import ( CompletionServiceAsyncClient, @@ -994,10 +994,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1041,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1079,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1332,13 +1329,13 @@ def test_completion_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3711,8 +3708,9 @@ def test_complete_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3777,17 +3775,20 @@ def test_complete_query_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, "post_complete_query" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_complete_query_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_complete_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "post_complete_query" + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_complete_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "pre_complete_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3847,8 +3848,9 @@ def test_import_suggestion_deny_list_entries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3907,22 +3909,23 @@ def test_import_suggestion_deny_list_entries_rest_interceptors(null_interceptor) ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, - "post_import_suggestion_deny_list_entries", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_suggestion_deny_list_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "pre_import_suggestion_deny_list_entries", - ) as pre: + 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.CompletionServiceRestInterceptor, + "post_import_suggestion_deny_list_entries", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_suggestion_deny_list_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_import_suggestion_deny_list_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3977,8 +3980,9 @@ def test_purge_suggestion_deny_list_entries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4037,22 +4041,23 @@ def test_purge_suggestion_deny_list_entries_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, - "post_purge_suggestion_deny_list_entries", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_suggestion_deny_list_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "pre_purge_suggestion_deny_list_entries", - ) as pre: + 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.CompletionServiceRestInterceptor, + "post_purge_suggestion_deny_list_entries", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_suggestion_deny_list_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_purge_suggestion_deny_list_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4107,8 +4112,9 @@ def test_import_completion_suggestions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4167,21 +4173,23 @@ def test_import_completion_suggestions_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, - "post_import_completion_suggestions", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_completion_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_import_completion_suggestions" - ) as pre: + 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.CompletionServiceRestInterceptor, + "post_import_completion_suggestions", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_completion_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_import_completion_suggestions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4236,8 +4244,9 @@ def test_purge_completion_suggestions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4296,20 +4305,23 @@ def test_purge_completion_suggestions_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, "post_purge_completion_suggestions" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_completion_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_purge_completion_suggestions" - ) as pre: + 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.CompletionServiceRestInterceptor, + "post_purge_completion_suggestions", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_completion_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_purge_completion_suggestions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4364,8 +4376,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4426,8 +4439,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4486,8 +4500,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4732,11 +4747,14 @@ def test_completion_service_base_transport(): def test_completion_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompletionServiceTransport( @@ -4753,9 +4771,12 @@ def test_completion_service_base_transport_with_credentials_file(): def test_completion_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompletionServiceTransport() @@ -4827,11 +4848,12 @@ def test_completion_service_transport_auth_gdch_credentials(transport_class): def test_completion_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_control_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_control_service.py index 1ec4eb25622b..5af1c53c0c8a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_control_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_control_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.control_service import ( ControlServiceAsyncClient, @@ -62,10 +67,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import common, control, control_service from google.cloud.discoveryengine_v1.types import control as gcd_control -from google.cloud.discoveryengine_v1.types import control_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -952,10 +955,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +1002,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1040,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1285,13 +1285,13 @@ def test_control_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4616,8 +4616,9 @@ def test_create_control_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4804,17 +4805,20 @@ def test_create_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "post_create_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_create_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_create_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_create_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, + "post_create_control_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_create_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4869,8 +4873,9 @@ def test_delete_control_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4929,13 +4934,13 @@ def test_delete_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "pre_delete_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_delete_control" + ) as pre, + ): pre.assert_not_called() pb_message = control_service.DeleteControlRequest.pb( control_service.DeleteControlRequest() @@ -4984,8 +4989,9 @@ def test_update_control_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5176,17 +5182,20 @@ def test_update_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "post_update_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_update_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_update_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_update_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, + "post_update_control_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_update_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5239,8 +5248,9 @@ def test_get_control_rest_bad_request(request_type=control_service.GetControlReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5315,17 +5325,19 @@ def test_get_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "post_get_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_get_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_get_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_get_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_get_control_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_get_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5378,8 +5390,9 @@ def test_list_controls_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5442,17 +5455,19 @@ def test_list_controls_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "post_list_controls" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_list_controls_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_list_controls" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_list_controls" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_list_controls_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_list_controls" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5512,8 +5527,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5574,8 +5590,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5634,8 +5651,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5850,11 +5868,14 @@ def test_control_service_base_transport(): def test_control_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ControlServiceTransport( @@ -5871,9 +5892,12 @@ def test_control_service_base_transport_with_credentials_file(): def test_control_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ControlServiceTransport() @@ -5945,11 +5969,12 @@ def test_control_service_transport_auth_gdch_credentials(transport_class): def test_control_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_conversational_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_conversational_search_service.py index c05aa0bf3a79..ee6459b79187 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_conversational_search_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.conversational_search_service import ( ConversationalSearchServiceAsyncClient, @@ -64,14 +69,15 @@ transports, ) from google.cloud.discoveryengine_v1.types import ( + answer, + assist_answer, + conversation, conversational_search_service, safety, search_service, + session, ) from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer, assist_answer -from google.cloud.discoveryengine_v1.types import conversation -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session CRED_INFO_JSON = { @@ -1046,10 +1052,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1094,10 +1099,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1133,10 +1137,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1395,13 +1398,13 @@ def test_conversational_search_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1518,9 +1521,9 @@ def test_converse_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -1873,9 +1876,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2226,9 +2229,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2559,9 +2562,9 @@ def test_update_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -2913,9 +2916,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -3255,9 +3258,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -4047,9 +4050,9 @@ def test_stream_answer_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stream_answer_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stream_answer_query] = ( + mock_rpc + ) request = {} client.stream_answer_query(request) @@ -6454,9 +6457,9 @@ def test_converse_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -6655,9 +6658,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -6850,9 +6853,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -7029,9 +7032,9 @@ def test_update_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -7213,9 +7216,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -7397,9 +7400,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -7801,9 +7804,9 @@ def test_stream_answer_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stream_answer_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stream_answer_query] = ( + mock_rpc + ) request = {} client.stream_answer_query(request) @@ -9948,8 +9951,9 @@ def test_converse_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10015,20 +10019,22 @@ def test_converse_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, - "post_converse_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_converse_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "pre_converse_conversation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_converse_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_converse_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_converse_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10088,8 +10094,9 @@ def test_create_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10282,19 +10289,22 @@ def test_create_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, - "post_create_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_create_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_create_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10351,8 +10361,9 @@ def test_delete_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10411,13 +10422,14 @@ def test_delete_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "pre_delete_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_delete_conversation", + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteConversationRequest.pb( conversational_search_service.DeleteConversationRequest() @@ -10466,8 +10478,9 @@ def test_update_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10664,19 +10677,22 @@ def test_update_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, - "post_update_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_update_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_update_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10733,8 +10749,9 @@ def test_get_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10803,18 +10820,22 @@ def test_get_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_get_conversation" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_get_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10867,8 +10888,9 @@ def test_list_conversations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10933,18 +10955,22 @@ def test_list_conversations_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_list_conversations" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_list_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_list_conversations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_conversations", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_list_conversations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11004,8 +11030,9 @@ def test_answer_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11072,18 +11099,20 @@ def test_answer_query_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_answer_query" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_answer_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_answer_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_answer_query" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_answer_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_answer_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11143,8 +11172,9 @@ def test_stream_answer_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11215,19 +11245,22 @@ def test_stream_answer_query_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, - "post_stream_answer_query", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_stream_answer_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_stream_answer_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_stream_answer_query", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_stream_answer_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_stream_answer_query", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11287,8 +11320,9 @@ def test_get_answer_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11367,18 +11401,20 @@ def test_get_answer_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_get_answer" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_answer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_answer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_get_answer" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_answer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_get_answer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11431,8 +11467,9 @@ def test_create_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11755,18 +11792,20 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_create_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11821,8 +11860,9 @@ def test_delete_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11881,13 +11921,13 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "pre_delete_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteSessionRequest.pb( conversational_search_service.DeleteSessionRequest() @@ -11936,8 +11976,9 @@ def test_update_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12264,18 +12305,20 @@ def test_update_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_update_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_update_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_update_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_update_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12330,8 +12373,9 @@ def test_get_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12406,18 +12450,20 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12470,8 +12516,9 @@ def test_list_sessions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12536,18 +12583,20 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_list_sessions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_sessions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12607,8 +12656,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12669,8 +12719,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12729,8 +12780,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13146,11 +13198,14 @@ def test_conversational_search_service_base_transport(): def test_conversational_search_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationalSearchServiceTransport( @@ -13167,9 +13222,12 @@ def test_conversational_search_service_base_transport_with_credentials_file(): def test_conversational_search_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationalSearchServiceTransport() @@ -13246,11 +13304,12 @@ def test_conversational_search_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_data_store_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_data_store_service.py index 7b1565986638..2f478d8a8589 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_data_store_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_data_store_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.data_store_service import ( DataStoreServiceAsyncClient, @@ -74,12 +74,13 @@ transports, ) from google.cloud.discoveryengine_v1.types import ( + cmek_config_service, + common, + data_store, data_store_service, document_processing_config, schema, ) -from google.cloud.discoveryengine_v1.types import cmek_config_service, common -from google.cloud.discoveryengine_v1.types import data_store from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store CRED_INFO_JSON = { @@ -992,10 +993,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1040,10 +1040,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1079,10 +1078,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1330,13 +1328,13 @@ def test_data_store_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1448,9 +1446,9 @@ def test_create_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -2170,9 +2168,9 @@ def test_list_data_stores_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -2691,9 +2689,9 @@ def test_delete_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -3050,9 +3048,9 @@ def test_update_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -3348,9 +3346,9 @@ def test_create_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -3750,9 +3748,9 @@ def test_list_data_stores_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -4009,9 +4007,9 @@ def test_delete_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -4189,9 +4187,9 @@ def test_update_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -4754,8 +4752,9 @@ def test_create_data_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4968,20 +4967,21 @@ def test_create_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_create_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_create_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_create_data_store" - ) as pre: + 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.DataStoreServiceRestInterceptor, "post_create_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_create_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_create_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5034,8 +5034,9 @@ def test_get_data_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5114,17 +5115,20 @@ def test_get_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_get_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_get_data_store_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_get_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_get_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_get_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_get_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5177,8 +5181,9 @@ def test_list_data_stores_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5241,18 +5246,20 @@ def test_list_data_stores_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_list_data_stores" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_list_data_stores_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_list_data_stores" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_list_data_stores" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_list_data_stores_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_list_data_stores" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5310,8 +5317,9 @@ def test_delete_data_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5368,20 +5376,21 @@ def test_delete_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_delete_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_delete_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_delete_data_store" - ) as pre: + 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.DataStoreServiceRestInterceptor, "post_delete_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_delete_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_delete_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5436,8 +5445,9 @@ def test_update_data_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5674,18 +5684,20 @@ def test_update_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_update_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_update_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_update_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_update_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_update_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_update_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5740,8 +5752,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5802,8 +5815,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5862,8 +5876,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6106,11 +6121,14 @@ def test_data_store_service_base_transport(): def test_data_store_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataStoreServiceTransport( @@ -6127,9 +6145,12 @@ def test_data_store_service_base_transport_with_credentials_file(): def test_data_store_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataStoreServiceTransport() @@ -6201,11 +6222,12 @@ def test_data_store_service_transport_auth_gdch_credentials(transport_class): def test_data_store_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_document_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_document_service.py index a91655b558d8..fa124347e1fa 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_document_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_document_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import date_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.document_service import ( DocumentServiceAsyncClient, @@ -76,12 +76,12 @@ transports, ) from google.cloud.discoveryengine_v1.types import ( + common, + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document CRED_INFO_JSON = { @@ -993,10 +993,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1040,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1078,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1326,13 +1323,13 @@ def test_document_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3396,9 +3393,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5217,9 +5214,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -6180,8 +6177,9 @@ def test_get_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6253,17 +6251,19 @@ def test_get_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_get_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_get_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_get_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6318,8 +6318,9 @@ def test_list_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6384,17 +6385,20 @@ def test_list_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_list_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_list_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_list_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_list_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_list_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_list_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6454,8 +6458,9 @@ def test_create_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6639,17 +6644,20 @@ def test_create_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_create_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_create_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_create_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_create_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_create_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_create_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6706,8 +6714,9 @@ def test_update_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6893,17 +6902,20 @@ def test_update_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_update_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_update_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_update_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_update_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_update_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_update_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6958,8 +6970,9 @@ def test_delete_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7018,13 +7031,13 @@ def test_delete_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "pre_delete_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_delete_document" + ) as pre, + ): pre.assert_not_called() pb_message = document_service.DeleteDocumentRequest.pb( document_service.DeleteDocumentRequest() @@ -7071,8 +7084,9 @@ def test_import_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7131,19 +7145,21 @@ def test_import_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_import_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_import_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_import_documents" - ) as pre: + 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.DocumentServiceRestInterceptor, "post_import_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_import_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_import_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7198,8 +7214,9 @@ def test_purge_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7258,19 +7275,21 @@ def test_purge_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_purge_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_purge_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_purge_documents" - ) as pre: + 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.DocumentServiceRestInterceptor, "post_purge_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_purge_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_purge_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7325,8 +7344,9 @@ def test_batch_get_documents_metadata_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7390,18 +7410,22 @@ def test_batch_get_documents_metadata_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_batch_get_documents_metadata" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, - "post_batch_get_documents_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_batch_get_documents_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_get_documents_metadata", + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_get_documents_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "pre_batch_get_documents_metadata", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7461,8 +7485,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7523,8 +7548,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7583,8 +7609,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7886,11 +7913,14 @@ def test_document_service_base_transport(): def test_document_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport( @@ -7907,9 +7937,12 @@ def test_document_service_base_transport_with_credentials_file(): def test_document_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport() @@ -7981,11 +8014,12 @@ def test_document_service_transport_auth_gdch_credentials(transport_class): def test_document_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_engine_service.py index 5bac7d8ce46e..3d05024d6d6e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_engine_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.engine_service import ( EngineServiceAsyncClient, @@ -72,10 +72,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import common, engine, engine_service from google.cloud.discoveryengine_v1.types import engine as gcd_engine -from google.cloud.discoveryengine_v1.types import engine_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -958,10 +956,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1003,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1041,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1291,13 +1286,13 @@ def test_engine_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4687,8 +4682,9 @@ def test_create_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4850,19 +4846,20 @@ def test_create_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_create_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_create_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_create_engine" - ) as pre: + 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.EngineServiceRestInterceptor, "post_create_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_create_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_create_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4917,8 +4914,9 @@ def test_delete_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4977,19 +4975,20 @@ def test_delete_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_delete_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_delete_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_delete_engine" - ) as pre: + 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.EngineServiceRestInterceptor, "post_delete_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_delete_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_delete_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5046,8 +5045,9 @@ def test_update_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5229,17 +5229,19 @@ def test_update_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_update_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_update_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_update_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_update_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_update_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_update_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5292,8 +5294,9 @@ def test_get_engine_rest_bad_request(request_type=engine_service.GetEngineReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5368,17 +5371,19 @@ def test_get_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_get_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_get_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_get_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_get_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_get_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_get_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5429,8 +5434,9 @@ def test_list_engines_rest_bad_request(request_type=engine_service.ListEnginesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5493,17 +5499,19 @@ def test_list_engines_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_list_engines" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_list_engines_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_list_engines" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_list_engines" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_list_engines_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_list_engines" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5560,8 +5568,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5622,8 +5631,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5682,8 +5692,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5920,11 +5931,14 @@ def test_engine_service_base_transport(): def test_engine_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EngineServiceTransport( @@ -5941,9 +5955,12 @@ def test_engine_service_base_transport_with_credentials_file(): def test_engine_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EngineServiceTransport() @@ -6015,11 +6032,12 @@ def test_engine_service_transport_auth_gdch_credentials(transport_class): def test_engine_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_grounded_generation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_grounded_generation_service.py index c76467cb4a87..8d94732c2870 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_grounded_generation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -1009,10 +1014,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1061,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1099,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1358,13 +1360,13 @@ def test_grounded_generation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2569,8 +2571,9 @@ def test_generate_grounded_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2634,20 +2637,22 @@ def test_generate_grounded_content_rest_interceptors(null_interceptor): ) client = GroundedGenerationServiceClient(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.GroundedGenerationServiceRestInterceptor, - "post_generate_grounded_content", - ) as post, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "post_generate_grounded_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "pre_generate_grounded_content", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_generate_grounded_content", + ) as post, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_generate_grounded_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "pre_generate_grounded_content", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2711,8 +2716,9 @@ def test_check_grounding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2779,18 +2785,20 @@ def test_check_grounding_rest_interceptors(null_interceptor): ) client = GroundedGenerationServiceClient(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.GroundedGenerationServiceRestInterceptor, "post_check_grounding" - ) as post, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "post_check_grounding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, "pre_check_grounding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, "post_check_grounding" + ) as post, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_check_grounding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, "pre_check_grounding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2850,8 +2858,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2912,8 +2921,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2972,8 +2982,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3128,11 +3139,14 @@ def test_grounded_generation_service_base_transport(): def test_grounded_generation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroundedGenerationServiceTransport( @@ -3149,9 +3163,12 @@ def test_grounded_generation_service_base_transport_with_credentials_file(): def test_grounded_generation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroundedGenerationServiceTransport() @@ -3225,11 +3242,12 @@ def test_grounded_generation_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_identity_mapping_store_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_identity_mapping_store_service.py index 30ac2a5b92b0..bddd06081994 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_identity_mapping_store_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_identity_mapping_store_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.identity_mapping_store_service import ( IdentityMappingStoreServiceAsyncClient, @@ -70,12 +70,14 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1.types import ( + cmek_config_service, + identity_mapping_store, + identity_mapping_store_service, +) from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) -from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import cmek_config_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1049,10 +1051,9 @@ def test_identity_mapping_store_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1097,10 +1098,9 @@ def test_identity_mapping_store_service_client_get_mtls_endpoint_and_cert_source client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1136,10 +1136,9 @@ def test_identity_mapping_store_service_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1398,13 +1397,13 @@ def test_identity_mapping_store_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3121,9 +3120,9 @@ def test_list_identity_mappings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_identity_mappings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_identity_mappings] = ( + mock_rpc + ) request = {} client.list_identity_mappings(request) @@ -4945,9 +4944,9 @@ def test_list_identity_mappings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_identity_mappings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_identity_mappings] = ( + mock_rpc + ) request = {} client.list_identity_mappings(request) @@ -5909,8 +5908,9 @@ def test_create_identity_mapping_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6062,20 +6062,22 @@ def test_create_identity_mapping_store_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(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.IdentityMappingStoreServiceRestInterceptor, - "post_create_identity_mapping_store", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_create_identity_mapping_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_create_identity_mapping_store", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_create_identity_mapping_store", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_create_identity_mapping_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_create_identity_mapping_store", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6137,8 +6139,9 @@ def test_get_identity_mapping_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6205,20 +6208,22 @@ def test_get_identity_mapping_store_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(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.IdentityMappingStoreServiceRestInterceptor, - "post_get_identity_mapping_store", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_get_identity_mapping_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_get_identity_mapping_store", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_get_identity_mapping_store", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_get_identity_mapping_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_get_identity_mapping_store", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6278,8 +6283,9 @@ def test_delete_identity_mapping_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6338,22 +6344,23 @@ def test_delete_identity_mapping_store_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(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.IdentityMappingStoreServiceRestInterceptor, - "post_delete_identity_mapping_store", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_delete_identity_mapping_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_delete_identity_mapping_store", - ) as pre: + 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.IdentityMappingStoreServiceRestInterceptor, + "post_delete_identity_mapping_store", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_delete_identity_mapping_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_delete_identity_mapping_store", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6410,8 +6417,9 @@ def test_import_identity_mappings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6470,22 +6478,23 @@ def test_import_identity_mappings_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(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.IdentityMappingStoreServiceRestInterceptor, - "post_import_identity_mappings", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_import_identity_mappings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_import_identity_mappings", - ) as pre: + 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.IdentityMappingStoreServiceRestInterceptor, + "post_import_identity_mappings", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_import_identity_mappings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_import_identity_mappings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6540,8 +6549,9 @@ def test_purge_identity_mappings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6600,22 +6610,23 @@ def test_purge_identity_mappings_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(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.IdentityMappingStoreServiceRestInterceptor, - "post_purge_identity_mappings", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_purge_identity_mappings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_purge_identity_mappings", - ) as pre: + 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.IdentityMappingStoreServiceRestInterceptor, + "post_purge_identity_mappings", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_purge_identity_mappings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_purge_identity_mappings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6670,8 +6681,9 @@ def test_list_identity_mappings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6738,20 +6750,22 @@ def test_list_identity_mappings_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(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.IdentityMappingStoreServiceRestInterceptor, - "post_list_identity_mappings", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_list_identity_mappings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_list_identity_mappings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_list_identity_mappings", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_list_identity_mappings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_list_identity_mappings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6813,8 +6827,9 @@ def test_list_identity_mapping_stores_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6881,20 +6896,22 @@ def test_list_identity_mapping_stores_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(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.IdentityMappingStoreServiceRestInterceptor, - "post_list_identity_mapping_stores", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_list_identity_mapping_stores_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_list_identity_mapping_stores", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_list_identity_mapping_stores", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_list_identity_mapping_stores_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_list_identity_mapping_stores", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6958,8 +6975,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7020,8 +7038,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7080,8 +7099,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7374,11 +7394,14 @@ def test_identity_mapping_store_service_base_transport(): def test_identity_mapping_store_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.identity_mapping_store_service.transports.IdentityMappingStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.identity_mapping_store_service.transports.IdentityMappingStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IdentityMappingStoreServiceTransport( @@ -7395,9 +7418,12 @@ def test_identity_mapping_store_service_base_transport_with_credentials_file(): def test_identity_mapping_store_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.identity_mapping_store_service.transports.IdentityMappingStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.identity_mapping_store_service.transports.IdentityMappingStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IdentityMappingStoreServiceTransport() @@ -7476,11 +7502,12 @@ def test_identity_mapping_store_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_project_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_project_service.py index bf2f94880c1b..1d9f358f200b 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_project_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_project_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -955,10 +955,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1002,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1040,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1288,13 +1285,13 @@ def test_project_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1404,9 +1401,9 @@ def test_provision_project_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -1683,9 +1680,9 @@ def test_provision_project_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -2045,8 +2042,9 @@ def test_provision_project_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2103,19 +2101,21 @@ def test_provision_project_rest_interceptors(null_interceptor): ) client = ProjectServiceClient(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.ProjectServiceRestInterceptor, "post_provision_project" - ) as post, mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_provision_project_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectServiceRestInterceptor, "pre_provision_project" - ) as pre: + 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.ProjectServiceRestInterceptor, "post_provision_project" + ) as post, + mock.patch.object( + transports.ProjectServiceRestInterceptor, + "post_provision_project_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "pre_provision_project" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2170,8 +2170,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2232,8 +2233,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2292,8 +2294,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2448,11 +2451,14 @@ def test_project_service_base_transport(): def test_project_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectServiceTransport( @@ -2469,9 +2475,12 @@ def test_project_service_base_transport_with_credentials_file(): def test_project_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectServiceTransport() @@ -2543,11 +2552,12 @@ def test_project_service_transport_auth_gdch_credentials(transport_class): def test_project_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_rank_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_rank_service.py index e8e8fd0f98d2..e3316da173b7 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_rank_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_rank_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -923,10 +928,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +975,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1013,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1242,13 +1244,13 @@ def test_rank_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1392,9 +1394,9 @@ async def test_rank_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.rank - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.rank] = ( + mock_rpc + ) request = {} await client.rank(request) @@ -1817,8 +1819,9 @@ def test_rank_rest_bad_request(request_type=rank_service.RankRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1880,17 +1883,15 @@ def test_rank_rest_interceptors(null_interceptor): ) client = RankServiceClient(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.RankServiceRestInterceptor, "post_rank" - ) as post, mock.patch.object( - transports.RankServiceRestInterceptor, "post_rank_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RankServiceRestInterceptor, "pre_rank" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RankServiceRestInterceptor, "post_rank") as post, + mock.patch.object( + transports.RankServiceRestInterceptor, "post_rank_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RankServiceRestInterceptor, "pre_rank") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1943,8 +1944,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2005,8 +2007,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2065,8 +2068,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2197,11 +2201,14 @@ def test_rank_service_base_transport(): def test_rank_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RankServiceTransport( @@ -2218,9 +2225,12 @@ def test_rank_service_base_transport_with_credentials_file(): def test_rank_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RankServiceTransport() @@ -2292,11 +2302,12 @@ def test_rank_service_transport_auth_gdch_credentials(transport_class): def test_rank_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_recommendation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_recommendation_service.py index c2c9b232b98a..d32cd4582028 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_recommendation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_recommendation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.recommendation_service import ( RecommendationServiceAsyncClient, @@ -1002,10 +1007,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1050,10 +1054,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1089,10 +1092,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1348,13 +1350,13 @@ def test_recommendation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1945,8 +1947,9 @@ def test_recommend_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2015,17 +2018,20 @@ def test_recommend_rest_interceptors(null_interceptor): ) client = RecommendationServiceClient(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.RecommendationServiceRestInterceptor, "post_recommend" - ) as post, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "post_recommend_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "pre_recommend" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, "post_recommend" + ) as post, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, + "post_recommend_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, "pre_recommend" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2085,8 +2091,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2147,8 +2154,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2207,8 +2215,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2339,11 +2348,14 @@ def test_recommendation_service_base_transport(): def test_recommendation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RecommendationServiceTransport( @@ -2360,9 +2372,12 @@ def test_recommendation_service_base_transport_with_credentials_file(): def test_recommendation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RecommendationServiceTransport() @@ -2434,11 +2449,12 @@ def test_recommendation_service_transport_auth_gdch_credentials(transport_class) def test_recommendation_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_schema_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_schema_service.py index f627ceca09ff..bb33f420b34c 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_schema_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_schema_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.schema_service import ( SchemaServiceAsyncClient, @@ -71,9 +71,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1.types import schema +from google.cloud.discoveryengine_v1.types import schema, schema_service from google.cloud.discoveryengine_v1.types import schema as gcd_schema -from google.cloud.discoveryengine_v1.types import schema_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -956,10 +955,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1040,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,13 +1285,13 @@ def test_schema_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4451,8 +4447,9 @@ def test_get_schema_rest_bad_request(request_type=schema_service.GetSchemaReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4518,17 +4515,19 @@ def test_get_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_get_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_get_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_get_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_get_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_get_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_get_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4579,8 +4578,9 @@ def test_list_schemas_rest_bad_request(request_type=schema_service.ListSchemasRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4643,17 +4643,19 @@ def test_list_schemas_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_list_schemas" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_list_schemas_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_list_schemas" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_list_schemas" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_list_schemas_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_list_schemas" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4708,8 +4710,9 @@ def test_create_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4838,19 +4841,20 @@ def test_create_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_create_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_create_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_create_schema" - ) as pre: + 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.SchemaServiceRestInterceptor, "post_create_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_create_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_create_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4907,8 +4911,9 @@ def test_update_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5041,19 +5046,20 @@ def test_update_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_update_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_update_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_update_schema" - ) as pre: + 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.SchemaServiceRestInterceptor, "post_update_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_update_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_update_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5108,8 +5114,9 @@ def test_delete_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5168,19 +5175,20 @@ def test_delete_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_delete_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_delete_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_delete_schema" - ) as pre: + 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.SchemaServiceRestInterceptor, "post_delete_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_delete_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_delete_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5235,8 +5243,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5297,8 +5306,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5357,8 +5367,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5595,11 +5606,14 @@ def test_schema_service_base_transport(): def test_schema_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SchemaServiceTransport( @@ -5616,9 +5630,12 @@ def test_schema_service_base_transport_with_credentials_file(): def test_schema_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SchemaServiceTransport() @@ -5690,11 +5707,12 @@ def test_schema_service_transport_auth_gdch_credentials(transport_class): def test_schema_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_service.py index f8592537dccf..803d8bafd19a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.search_service import ( SearchServiceAsyncClient, @@ -944,10 +949,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -992,10 +996,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1034,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1277,13 +1279,13 @@ def test_search_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1455,9 +1457,9 @@ async def test_search_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.search - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.search] = ( + mock_rpc + ) request = {} await client.search(request) @@ -1770,7 +1772,9 @@ async def test_search_async_pages(): pages = [] # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 - async for page_ in (await client.search(request={})).pages: # pragma: no branch + async for page_ in ( # pragma: no branch + await client.search(request={}) + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token @@ -2861,8 +2865,9 @@ def test_search_rest_bad_request(request_type=search_service.SearchRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2935,17 +2940,17 @@ def test_search_rest_interceptors(null_interceptor): ) client = SearchServiceClient(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.SearchServiceRestInterceptor, "post_search" - ) as post, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SearchServiceRestInterceptor, "pre_search" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search" + ) as post, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SearchServiceRestInterceptor, "pre_search") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2998,8 +3003,9 @@ def test_search_lite_rest_bad_request(request_type=search_service.SearchRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3072,17 +3078,19 @@ def test_search_lite_rest_interceptors(null_interceptor): ) client = SearchServiceClient(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.SearchServiceRestInterceptor, "post_search_lite" - ) as post, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search_lite_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SearchServiceRestInterceptor, "pre_search_lite" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_lite" + ) as post, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_lite_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SearchServiceRestInterceptor, "pre_search_lite" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3137,8 +3145,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3199,8 +3208,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3259,8 +3269,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3412,11 +3423,14 @@ def test_search_service_base_transport(): def test_search_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchServiceTransport( @@ -3433,9 +3447,12 @@ def test_search_service_base_transport_with_credentials_file(): def test_search_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchServiceTransport() @@ -3507,11 +3524,12 @@ def test_search_service_transport_auth_gdch_credentials(transport_class): def test_search_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_tuning_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_tuning_service.py index e31b4262107a..b801dfca4267 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_tuning_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -1006,10 +1006,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1054,10 +1053,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1093,10 +1091,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1352,13 +1349,13 @@ def test_search_tuning_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1472,9 +1469,9 @@ def test_train_custom_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -1732,9 +1729,9 @@ def test_list_custom_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -1917,9 +1914,9 @@ def test_train_custom_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -2043,9 +2040,9 @@ def test_list_custom_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -2386,8 +2383,9 @@ def test_train_custom_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2446,20 +2444,21 @@ def test_train_custom_model_rest_interceptors(null_interceptor): ) client = SearchTuningServiceClient(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.SearchTuningServiceRestInterceptor, "post_train_custom_model" - ) as post, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, - "post_train_custom_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "pre_train_custom_model" - ) as pre: + 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.SearchTuningServiceRestInterceptor, "post_train_custom_model" + ) as post, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, + "post_train_custom_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "pre_train_custom_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2514,8 +2513,9 @@ def test_list_custom_models_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2577,18 +2577,20 @@ def test_list_custom_models_rest_interceptors(null_interceptor): ) client = SearchTuningServiceClient(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.SearchTuningServiceRestInterceptor, "post_list_custom_models" - ) as post, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, - "post_list_custom_models_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "pre_list_custom_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "post_list_custom_models" + ) as post, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, + "post_list_custom_models_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "pre_list_custom_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2648,8 +2650,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2710,8 +2713,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2770,8 +2774,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2949,11 +2954,14 @@ def test_search_tuning_service_base_transport(): def test_search_tuning_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchTuningServiceTransport( @@ -2970,9 +2978,12 @@ def test_search_tuning_service_base_transport_with_credentials_file(): def test_search_tuning_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchTuningServiceTransport() @@ -3044,11 +3055,12 @@ def test_search_tuning_service_transport_auth_gdch_credentials(transport_class): def test_search_tuning_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_serving_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_serving_config_service.py index 6773dbd9f3fc..bcaf47467442 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_serving_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_serving_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,27 +43,35 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.serving_config_service import ( ServingConfigServiceAsyncClient, ServingConfigServiceClient, transports, ) +from google.cloud.discoveryengine_v1.types import ( + common, + search_service, + serving_config_service, +) from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config -from google.cloud.discoveryengine_v1.types import common, search_service -from google.cloud.discoveryengine_v1.types import serving_config_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -997,10 +1005,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1052,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1084,10 +1090,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1343,13 +1348,13 @@ def test_serving_config_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1487,9 +1492,9 @@ def test_update_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -1824,9 +1829,9 @@ def test_update_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -2203,8 +2208,9 @@ def test_update_serving_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2448,18 +2454,20 @@ def test_update_serving_config_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(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.ServingConfigServiceRestInterceptor, "post_update_serving_config" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_update_serving_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_update_serving_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_update_serving_config" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_update_serving_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_update_serving_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2516,8 +2524,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2578,8 +2587,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2638,8 +2648,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2772,11 +2783,14 @@ def test_serving_config_service_base_transport(): def test_serving_config_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServingConfigServiceTransport( @@ -2793,9 +2807,12 @@ def test_serving_config_service_base_transport_with_credentials_file(): def test_serving_config_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServingConfigServiceTransport() @@ -2867,11 +2884,12 @@ def test_serving_config_service_transport_auth_gdch_credentials(transport_class) def test_serving_config_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_session_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_session_service.py index 6a36134e4cf5..55de62e58041 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_session_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_session_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.session_service import ( SessionServiceAsyncClient, @@ -68,8 +73,8 @@ assist_answer, conversational_search_service, safety, + session, ) -from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session CRED_INFO_JSON = { @@ -957,10 +962,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1005,10 +1009,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1047,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1290,13 +1292,13 @@ def test_session_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4578,8 +4580,9 @@ def test_create_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4902,17 +4905,20 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_create_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_create_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4967,8 +4973,9 @@ def test_delete_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5027,13 +5034,13 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "pre_delete_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteSessionRequest.pb( conversational_search_service.DeleteSessionRequest() @@ -5082,8 +5089,9 @@ def test_update_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5410,17 +5418,20 @@ def test_update_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_update_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_update_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_update_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_update_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, + "post_update_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_update_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5475,8 +5486,9 @@ def test_get_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5551,17 +5563,19 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_get_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_get_session_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5614,8 +5628,9 @@ def test_list_sessions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5680,17 +5695,19 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_list_sessions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_sessions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5750,8 +5767,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5812,8 +5830,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5872,8 +5891,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6088,11 +6108,14 @@ def test_session_service_base_transport(): def test_session_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionServiceTransport( @@ -6109,9 +6132,12 @@ def test_session_service_base_transport_with_credentials_file(): def test_session_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionServiceTransport() @@ -6183,11 +6209,12 @@ def test_session_service_transport_auth_gdch_credentials(transport_class): def test_session_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_site_search_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_site_search_engine_service.py index a273a06ad94e..21baf704124e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_site_search_engine_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.site_search_engine_service import ( SiteSearchEngineServiceAsyncClient, @@ -1014,10 +1014,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1061,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1101,10 +1099,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,13 +1357,13 @@ def test_site_search_engine_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1480,9 +1477,9 @@ def test_get_site_search_engine_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -1819,9 +1816,9 @@ def test_create_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -2784,9 +2781,9 @@ def test_update_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -3130,9 +3127,9 @@ def test_delete_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -3481,9 +3478,9 @@ def test_list_target_sites_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -6448,9 +6445,9 @@ def test_get_site_search_engine_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -6632,9 +6629,9 @@ def test_create_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -7141,9 +7138,9 @@ def test_update_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -7322,9 +7319,9 @@ def test_delete_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -7503,9 +7500,9 @@ def test_list_target_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -9919,8 +9916,9 @@ def test_get_site_search_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9985,18 +9983,22 @@ def test_get_site_search_engine_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_get_site_search_engine" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_site_search_engine_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_get_site_search_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_site_search_engine", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_site_search_engine_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_get_site_search_engine", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10056,8 +10058,9 @@ def test_create_target_site_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10200,20 +10203,21 @@ def test_create_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_create_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_create_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_create_target_site" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_create_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_create_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_create_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10268,8 +10272,9 @@ def test_batch_create_target_sites_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10328,22 +10333,23 @@ def test_batch_create_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_batch_create_target_sites", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_create_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_batch_create_target_sites", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_batch_create_target_sites", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_create_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_batch_create_target_sites", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10398,8 +10404,9 @@ def test_get_target_site_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10478,18 +10485,20 @@ def test_get_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_get_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_get_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_get_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_get_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10548,8 +10557,9 @@ def test_update_target_site_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10694,20 +10704,21 @@ def test_update_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_update_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_update_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_update_target_site" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_update_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_update_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_update_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10762,8 +10773,9 @@ def test_delete_target_site_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10822,20 +10834,21 @@ def test_delete_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_delete_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_delete_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_target_site" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_delete_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_delete_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10890,8 +10903,9 @@ def test_list_target_sites_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10960,18 +10974,20 @@ def test_list_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_list_target_sites" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_list_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_list_target_sites" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_list_target_sites" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_list_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_list_target_sites" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11031,8 +11047,9 @@ def test_create_sitemap_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11163,20 +11180,21 @@ def test_create_sitemap_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_create_sitemap" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_create_sitemap_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_create_sitemap" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_create_sitemap" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_create_sitemap_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_create_sitemap" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11231,8 +11249,9 @@ def test_delete_sitemap_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11291,20 +11310,21 @@ def test_delete_sitemap_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_delete_sitemap" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_delete_sitemap_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_sitemap" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_delete_sitemap" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_delete_sitemap_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_sitemap" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11359,8 +11379,9 @@ def test_fetch_sitemaps_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11422,18 +11443,20 @@ def test_fetch_sitemaps_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_fetch_sitemaps" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_sitemaps_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_fetch_sitemaps" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_fetch_sitemaps" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_sitemaps_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_fetch_sitemaps" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11493,8 +11516,9 @@ def test_enable_advanced_site_search_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11553,22 +11577,23 @@ def test_enable_advanced_site_search_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_enable_advanced_site_search", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_enable_advanced_site_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_enable_advanced_site_search", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_enable_advanced_site_search", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_enable_advanced_site_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_enable_advanced_site_search", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11623,8 +11648,9 @@ def test_disable_advanced_site_search_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11683,22 +11709,23 @@ def test_disable_advanced_site_search_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_disable_advanced_site_search", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_disable_advanced_site_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_disable_advanced_site_search", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_disable_advanced_site_search", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_disable_advanced_site_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_disable_advanced_site_search", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11753,8 +11780,9 @@ def test_recrawl_uris_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11813,20 +11841,21 @@ def test_recrawl_uris_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_recrawl_uris" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_recrawl_uris_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_recrawl_uris" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_recrawl_uris" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_recrawl_uris_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_recrawl_uris" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11881,8 +11910,9 @@ def test_batch_verify_target_sites_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11941,22 +11971,23 @@ def test_batch_verify_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_batch_verify_target_sites", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_verify_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_batch_verify_target_sites", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_batch_verify_target_sites", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_verify_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_batch_verify_target_sites", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12011,8 +12042,9 @@ def test_fetch_domain_verification_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12083,20 +12115,22 @@ def test_fetch_domain_verification_status_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_fetch_domain_verification_status", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_domain_verification_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_fetch_domain_verification_status", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_domain_verification_status", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_domain_verification_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_fetch_domain_verification_status", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12160,8 +12194,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12222,8 +12257,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12282,8 +12318,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12750,11 +12787,14 @@ def test_site_search_engine_service_base_transport(): def test_site_search_engine_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteSearchEngineServiceTransport( @@ -12771,9 +12811,12 @@ def test_site_search_engine_service_base_transport_with_credentials_file(): def test_site_search_engine_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteSearchEngineServiceTransport() @@ -12847,11 +12890,12 @@ def test_site_search_engine_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_event_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_event_service.py index 5aaf55582ca5..aac85f3fe041 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_event_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_event_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,8 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,20 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.user_event_service import ( UserEventServiceAsyncClient, @@ -991,10 +991,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1038,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1076,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1329,13 +1326,13 @@ def test_user_event_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1462,9 +1459,9 @@ def test_write_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -1738,9 +1735,9 @@ def test_collect_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -1993,9 +1990,9 @@ def test_purge_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2252,9 +2249,9 @@ def test_import_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -2444,9 +2441,9 @@ def test_write_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -2579,9 +2576,9 @@ def test_collect_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -2734,9 +2731,9 @@ def test_purge_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2872,9 +2869,9 @@ def test_import_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -3324,8 +3321,9 @@ def test_write_user_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3541,18 +3539,20 @@ def test_write_user_event_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(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.UserEventServiceRestInterceptor, "post_write_user_event" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_write_user_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_write_user_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_write_user_event" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_write_user_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_write_user_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3605,8 +3605,9 @@ def test_collect_user_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3668,18 +3669,20 @@ def test_collect_user_event_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(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.UserEventServiceRestInterceptor, "post_collect_user_event" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_collect_user_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_collect_user_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_collect_user_event" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_collect_user_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_collect_user_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3732,8 +3735,9 @@ def test_purge_user_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3790,20 +3794,21 @@ def test_purge_user_events_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(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.UserEventServiceRestInterceptor, "post_purge_user_events" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_purge_user_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_purge_user_events" - ) as pre: + 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.UserEventServiceRestInterceptor, "post_purge_user_events" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_purge_user_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_purge_user_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3856,8 +3861,9 @@ def test_import_user_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3914,20 +3920,21 @@ def test_import_user_events_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(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.UserEventServiceRestInterceptor, "post_import_user_events" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_import_user_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_import_user_events" - ) as pre: + 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.UserEventServiceRestInterceptor, "post_import_user_events" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_import_user_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_import_user_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3982,8 +3989,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4044,8 +4052,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4104,8 +4113,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4327,11 +4337,14 @@ def test_user_event_service_base_transport(): def test_user_event_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserEventServiceTransport( @@ -4348,9 +4361,12 @@ def test_user_event_service_base_transport_with_credentials_file(): def test_user_event_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserEventServiceTransport() @@ -4422,11 +4438,12 @@ def test_user_event_service_transport_auth_gdch_credentials(transport_class): def test_user_event_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_license_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_license_service.py index f61463b6b8aa..dc5bb2650fde 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_license_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_license_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1.services.user_license_service import ( UserLicenseServiceAsyncClient, @@ -995,10 +995,9 @@ def test_user_license_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1042,9 @@ def test_user_license_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1080,9 @@ def test_user_license_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1333,13 +1330,13 @@ def test_user_license_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1456,9 +1453,9 @@ def test_list_user_licenses_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_user_licenses - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_user_licenses] = ( + mock_rpc + ) request = {} client.list_user_licenses(request) @@ -2193,9 +2190,9 @@ def test_list_user_licenses_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_user_licenses - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_user_licenses] = ( + mock_rpc + ) request = {} client.list_user_licenses(request) @@ -2805,8 +2802,9 @@ def test_list_user_licenses_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2869,18 +2867,20 @@ def test_list_user_licenses_rest_interceptors(null_interceptor): ) client = UserLicenseServiceClient(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.UserLicenseServiceRestInterceptor, "post_list_user_licenses" - ) as post, mock.patch.object( - transports.UserLicenseServiceRestInterceptor, - "post_list_user_licenses_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserLicenseServiceRestInterceptor, "pre_list_user_licenses" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserLicenseServiceRestInterceptor, "post_list_user_licenses" + ) as post, + mock.patch.object( + transports.UserLicenseServiceRestInterceptor, + "post_list_user_licenses_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserLicenseServiceRestInterceptor, "pre_list_user_licenses" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2938,8 +2938,9 @@ def test_batch_update_user_licenses_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2996,20 +2997,23 @@ def test_batch_update_user_licenses_rest_interceptors(null_interceptor): ) client = UserLicenseServiceClient(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.UserLicenseServiceRestInterceptor, "post_batch_update_user_licenses" - ) as post, mock.patch.object( - transports.UserLicenseServiceRestInterceptor, - "post_batch_update_user_licenses_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserLicenseServiceRestInterceptor, "pre_batch_update_user_licenses" - ) as pre: + 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.UserLicenseServiceRestInterceptor, + "post_batch_update_user_licenses", + ) as post, + mock.patch.object( + transports.UserLicenseServiceRestInterceptor, + "post_batch_update_user_licenses_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserLicenseServiceRestInterceptor, + "pre_batch_update_user_licenses", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3064,8 +3068,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3126,8 +3131,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3186,8 +3192,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3365,11 +3372,14 @@ def test_user_license_service_base_transport(): def test_user_license_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.user_license_service.transports.UserLicenseServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.user_license_service.transports.UserLicenseServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserLicenseServiceTransport( @@ -3386,9 +3396,12 @@ def test_user_license_service_base_transport_with_credentials_file(): def test_user_license_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.user_license_service.transports.UserLicenseServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.user_license_service.transports.UserLicenseServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserLicenseServiceTransport() @@ -3460,11 +3473,12 @@ def test_user_license_service_transport_auth_gdch_credentials(transport_class): def test_user_license_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_acl_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_acl_config_service.py index 296c5360caeb..1d3213daab78 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_acl_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_acl_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -975,10 +980,9 @@ def test_acl_config_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1027,9 @@ def test_acl_config_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1065,9 @@ def test_acl_config_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1313,13 +1315,13 @@ def test_acl_config_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1426,9 +1428,9 @@ def test_update_acl_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_acl_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_acl_config] = ( + mock_rpc + ) request = {} client.update_acl_config(request) @@ -1935,9 +1937,9 @@ def test_update_acl_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_acl_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_acl_config] = ( + mock_rpc + ) request = {} client.update_acl_config(request) @@ -2450,8 +2452,9 @@ def test_update_acl_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2590,18 +2593,20 @@ def test_update_acl_config_rest_interceptors(null_interceptor): ) client = AclConfigServiceClient(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.AclConfigServiceRestInterceptor, "post_update_acl_config" - ) as post, mock.patch.object( - transports.AclConfigServiceRestInterceptor, - "post_update_acl_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AclConfigServiceRestInterceptor, "pre_update_acl_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AclConfigServiceRestInterceptor, "post_update_acl_config" + ) as post, + mock.patch.object( + transports.AclConfigServiceRestInterceptor, + "post_update_acl_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AclConfigServiceRestInterceptor, "pre_update_acl_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2654,8 +2659,9 @@ def test_get_acl_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2718,17 +2724,20 @@ def test_get_acl_config_rest_interceptors(null_interceptor): ) client = AclConfigServiceClient(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.AclConfigServiceRestInterceptor, "post_get_acl_config" - ) as post, mock.patch.object( - transports.AclConfigServiceRestInterceptor, "post_get_acl_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AclConfigServiceRestInterceptor, "pre_get_acl_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AclConfigServiceRestInterceptor, "post_get_acl_config" + ) as post, + mock.patch.object( + transports.AclConfigServiceRestInterceptor, + "post_get_acl_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AclConfigServiceRestInterceptor, "pre_get_acl_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2786,8 +2795,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2853,8 +2863,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2920,8 +2931,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3077,11 +3089,14 @@ def test_acl_config_service_base_transport(): def test_acl_config_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.acl_config_service.transports.AclConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.acl_config_service.transports.AclConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AclConfigServiceTransport( @@ -3098,9 +3113,12 @@ def test_acl_config_service_base_transport_with_credentials_file(): def test_acl_config_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.acl_config_service.transports.AclConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.acl_config_service.transports.AclConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AclConfigServiceTransport() @@ -3172,11 +3190,12 @@ def test_acl_config_service_transport_auth_gdch_credentials(transport_class): def test_acl_config_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_chunk_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_chunk_service.py index 921e52cffe94..ba928eeac7e4 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_chunk_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_chunk_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.chunk_service import ( ChunkServiceAsyncClient, @@ -929,10 +934,9 @@ def test_chunk_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -977,10 +981,9 @@ def test_chunk_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1019,9 @@ def test_chunk_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1258,13 +1260,13 @@ def test_chunk_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2805,8 +2807,9 @@ def test_get_chunk_rest_bad_request(request_type=chunk_service.GetChunkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2877,17 +2880,19 @@ def test_get_chunk_rest_interceptors(null_interceptor): ) client = ChunkServiceClient(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.ChunkServiceRestInterceptor, "post_get_chunk" - ) as post, mock.patch.object( - transports.ChunkServiceRestInterceptor, "post_get_chunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChunkServiceRestInterceptor, "pre_get_chunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChunkServiceRestInterceptor, "post_get_chunk" + ) as post, + mock.patch.object( + transports.ChunkServiceRestInterceptor, "post_get_chunk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChunkServiceRestInterceptor, "pre_get_chunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2938,8 +2943,9 @@ def test_list_chunks_rest_bad_request(request_type=chunk_service.ListChunksReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3004,17 +3010,19 @@ def test_list_chunks_rest_interceptors(null_interceptor): ) client = ChunkServiceClient(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.ChunkServiceRestInterceptor, "post_list_chunks" - ) as post, mock.patch.object( - transports.ChunkServiceRestInterceptor, "post_list_chunks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChunkServiceRestInterceptor, "pre_list_chunks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChunkServiceRestInterceptor, "post_list_chunks" + ) as post, + mock.patch.object( + transports.ChunkServiceRestInterceptor, "post_list_chunks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChunkServiceRestInterceptor, "pre_list_chunks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3074,8 +3082,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3141,8 +3150,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3208,8 +3218,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3363,11 +3374,14 @@ def test_chunk_service_base_transport(): def test_chunk_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.chunk_service.transports.ChunkServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.chunk_service.transports.ChunkServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ChunkServiceTransport( @@ -3384,9 +3398,12 @@ def test_chunk_service_base_transport_with_credentials_file(): def test_chunk_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.chunk_service.transports.ChunkServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.chunk_service.transports.ChunkServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ChunkServiceTransport() @@ -3458,11 +3475,12 @@ def test_chunk_service_transport_auth_gdch_credentials(transport_class): def test_chunk_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_completion_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_completion_service.py index b5dc0fcf8686..b49bf761080a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_completion_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_completion_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.type import date_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.completion_service import ( CompletionServiceAsyncClient, @@ -994,10 +994,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1041,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1081,10 +1079,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1332,13 +1329,13 @@ def test_completion_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3711,8 +3708,9 @@ def test_complete_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3777,17 +3775,20 @@ def test_complete_query_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, "post_complete_query" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_complete_query_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_complete_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "post_complete_query" + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_complete_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "pre_complete_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3847,8 +3848,9 @@ def test_import_suggestion_deny_list_entries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3907,22 +3909,23 @@ def test_import_suggestion_deny_list_entries_rest_interceptors(null_interceptor) ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, - "post_import_suggestion_deny_list_entries", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_suggestion_deny_list_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "pre_import_suggestion_deny_list_entries", - ) as pre: + 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.CompletionServiceRestInterceptor, + "post_import_suggestion_deny_list_entries", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_suggestion_deny_list_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_import_suggestion_deny_list_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3977,8 +3980,9 @@ def test_purge_suggestion_deny_list_entries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4037,22 +4041,23 @@ def test_purge_suggestion_deny_list_entries_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, - "post_purge_suggestion_deny_list_entries", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_suggestion_deny_list_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "pre_purge_suggestion_deny_list_entries", - ) as pre: + 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.CompletionServiceRestInterceptor, + "post_purge_suggestion_deny_list_entries", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_suggestion_deny_list_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_purge_suggestion_deny_list_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4107,8 +4112,9 @@ def test_import_completion_suggestions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4167,21 +4173,23 @@ def test_import_completion_suggestions_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, - "post_import_completion_suggestions", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_completion_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_import_completion_suggestions" - ) as pre: + 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.CompletionServiceRestInterceptor, + "post_import_completion_suggestions", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_completion_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_import_completion_suggestions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4236,8 +4244,9 @@ def test_purge_completion_suggestions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4296,20 +4305,23 @@ def test_purge_completion_suggestions_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, "post_purge_completion_suggestions" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_completion_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_purge_completion_suggestions" - ) as pre: + 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.CompletionServiceRestInterceptor, + "post_purge_completion_suggestions", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_completion_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_purge_completion_suggestions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4367,8 +4379,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4434,8 +4447,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4501,8 +4515,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4749,11 +4764,14 @@ def test_completion_service_base_transport(): def test_completion_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompletionServiceTransport( @@ -4770,9 +4788,12 @@ def test_completion_service_base_transport_with_credentials_file(): def test_completion_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompletionServiceTransport() @@ -4844,11 +4865,12 @@ def test_completion_service_transport_auth_gdch_credentials(transport_class): def test_completion_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_control_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_control_service.py index 1630c8551dda..31b0ef06aeac 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_control_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_control_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.control_service import ( ControlServiceAsyncClient, @@ -62,10 +67,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import common, control, control_service from google.cloud.discoveryengine_v1alpha.types import control as gcd_control -from google.cloud.discoveryengine_v1alpha.types import control_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -952,10 +955,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +1002,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1040,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1285,13 +1285,13 @@ def test_control_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4616,8 +4616,9 @@ def test_create_control_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4783,17 +4784,20 @@ def test_create_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "post_create_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_create_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_create_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_create_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, + "post_create_control_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_create_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4848,8 +4852,9 @@ def test_delete_control_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4908,13 +4913,13 @@ def test_delete_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "pre_delete_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_delete_control" + ) as pre, + ): pre.assert_not_called() pb_message = control_service.DeleteControlRequest.pb( control_service.DeleteControlRequest() @@ -4963,8 +4968,9 @@ def test_update_control_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5134,17 +5140,20 @@ def test_update_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "post_update_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_update_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_update_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_update_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, + "post_update_control_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_update_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5197,8 +5206,9 @@ def test_get_control_rest_bad_request(request_type=control_service.GetControlReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5273,17 +5283,19 @@ def test_get_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "post_get_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_get_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_get_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_get_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_get_control_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_get_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5336,8 +5348,9 @@ def test_list_controls_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5400,17 +5413,19 @@ def test_list_controls_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "post_list_controls" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_list_controls_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_list_controls" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_list_controls" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_list_controls_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_list_controls" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5473,8 +5488,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5540,8 +5556,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5607,8 +5624,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5825,11 +5843,14 @@ def test_control_service_base_transport(): def test_control_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ControlServiceTransport( @@ -5846,9 +5867,12 @@ def test_control_service_base_transport_with_credentials_file(): def test_control_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ControlServiceTransport() @@ -5920,11 +5944,12 @@ def test_control_service_transport_auth_gdch_credentials(transport_class): def test_control_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_conversational_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_conversational_search_service.py index 1aaaadfdd1e2..da059491dcfb 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_conversational_search_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.conversational_search_service import ( ConversationalSearchServiceAsyncClient, @@ -64,13 +69,14 @@ transports, ) from google.cloud.discoveryengine_v1alpha.types import ( + answer, + common, + conversation, conversational_search_service, search_service, + session, ) from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import answer, common -from google.cloud.discoveryengine_v1alpha.types import conversation -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session CRED_INFO_JSON = { @@ -1045,10 +1051,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1093,10 +1098,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1132,10 +1136,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1394,13 +1397,13 @@ def test_conversational_search_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1520,9 +1523,9 @@ def test_converse_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -1878,9 +1881,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2231,9 +2234,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2564,9 +2567,9 @@ def test_update_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -2918,9 +2921,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -3260,9 +3263,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -6185,9 +6188,9 @@ def test_converse_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -6386,9 +6389,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -6581,9 +6584,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -6760,9 +6763,9 @@ def test_update_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -6944,9 +6947,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -7128,9 +7131,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -9488,8 +9491,9 @@ def test_converse_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9558,20 +9562,22 @@ def test_converse_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, - "post_converse_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_converse_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "pre_converse_conversation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_converse_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_converse_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_converse_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9631,8 +9637,9 @@ def test_create_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9834,19 +9841,22 @@ def test_create_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, - "post_create_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_create_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_create_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9903,8 +9913,9 @@ def test_delete_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9963,13 +9974,14 @@ def test_delete_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "pre_delete_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_delete_conversation", + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteConversationRequest.pb( conversational_search_service.DeleteConversationRequest() @@ -10018,8 +10030,9 @@ def test_update_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10225,19 +10238,22 @@ def test_update_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, - "post_update_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_update_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_update_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10294,8 +10310,9 @@ def test_get_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10364,18 +10381,22 @@ def test_get_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_get_conversation" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_get_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10428,8 +10449,9 @@ def test_list_conversations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10494,18 +10516,22 @@ def test_list_conversations_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_list_conversations" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_list_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_list_conversations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_conversations", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_list_conversations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10565,8 +10591,9 @@ def test_answer_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10633,18 +10660,20 @@ def test_answer_query_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_answer_query" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_answer_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_answer_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_answer_query" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_answer_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_answer_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10704,8 +10733,9 @@ def test_get_answer_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10782,18 +10812,20 @@ def test_get_answer_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_get_answer" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_answer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_answer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_get_answer" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_answer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_get_answer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10846,8 +10878,9 @@ def test_create_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11093,18 +11126,20 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_create_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11159,8 +11194,9 @@ def test_delete_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11219,13 +11255,13 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "pre_delete_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteSessionRequest.pb( conversational_search_service.DeleteSessionRequest() @@ -11274,8 +11310,9 @@ def test_update_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11525,18 +11562,20 @@ def test_update_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_update_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_update_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_update_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_update_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11591,8 +11630,9 @@ def test_get_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11665,18 +11705,20 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11729,8 +11771,9 @@ def test_list_sessions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11795,18 +11838,20 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_list_sessions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_sessions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11869,8 +11914,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11936,8 +11982,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12003,8 +12050,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12399,11 +12447,14 @@ def test_conversational_search_service_base_transport(): def test_conversational_search_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationalSearchServiceTransport( @@ -12420,9 +12471,12 @@ def test_conversational_search_service_base_transport_with_credentials_file(): def test_conversational_search_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationalSearchServiceTransport() @@ -12499,11 +12553,12 @@ def test_conversational_search_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_data_store_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_data_store_service.py index 156c619a553b..13394799f947 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_data_store_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_data_store_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.data_store_service import ( DataStoreServiceAsyncClient, @@ -73,15 +73,17 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1alpha.types import ( + common, + data_store, + data_store_service, + document_processing_config, + schema, +) from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service -from google.cloud.discoveryengine_v1alpha.types import schema CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -993,10 +995,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1042,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1080,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1331,13 +1330,13 @@ def test_data_store_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1447,9 +1446,9 @@ def test_create_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -2161,9 +2160,9 @@ def test_list_data_stores_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -2682,9 +2681,9 @@ def test_delete_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -3037,9 +3036,9 @@ def test_update_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -4035,9 +4034,9 @@ def test_create_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -4435,9 +4434,9 @@ def test_list_data_stores_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -4695,9 +4694,9 @@ def test_delete_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -4876,9 +4875,9 @@ def test_update_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -5933,8 +5932,9 @@ def test_create_data_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6126,20 +6126,21 @@ def test_create_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_create_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_create_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_create_data_store" - ) as pre: + 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.DataStoreServiceRestInterceptor, "post_create_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_create_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_create_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6192,8 +6193,9 @@ def test_get_data_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6268,17 +6270,20 @@ def test_get_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_get_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_get_data_store_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_get_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_get_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_get_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_get_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6331,8 +6336,9 @@ def test_list_data_stores_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6395,18 +6401,20 @@ def test_list_data_stores_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_list_data_stores" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_list_data_stores_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_list_data_stores" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_list_data_stores" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_list_data_stores_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_list_data_stores" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6464,8 +6472,9 @@ def test_delete_data_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6522,20 +6531,21 @@ def test_delete_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_delete_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_delete_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_delete_data_store" - ) as pre: + 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.DataStoreServiceRestInterceptor, "post_delete_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_delete_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_delete_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6590,8 +6600,9 @@ def test_update_data_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6803,18 +6814,20 @@ def test_update_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_update_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_update_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_update_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_update_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_update_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_update_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6869,8 +6882,9 @@ def test_get_document_processing_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6937,19 +6951,22 @@ def test_get_document_processing_config_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, - "post_get_document_processing_config", - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_get_document_processing_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_get_document_processing_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_get_document_processing_config", + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_get_document_processing_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "pre_get_document_processing_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7011,8 +7028,9 @@ def test_update_document_processing_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7175,20 +7193,22 @@ def test_update_document_processing_config_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, - "post_update_document_processing_config", - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_update_document_processing_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "pre_update_document_processing_config", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_update_document_processing_config", + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_update_document_processing_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "pre_update_document_processing_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7251,8 +7271,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7318,8 +7339,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7385,8 +7407,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7677,11 +7700,14 @@ def test_data_store_service_base_transport(): def test_data_store_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataStoreServiceTransport( @@ -7698,9 +7724,12 @@ def test_data_store_service_base_transport_with_credentials_file(): def test_data_store_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataStoreServiceTransport() @@ -7772,11 +7801,12 @@ def test_data_store_service_transport_auth_gdch_credentials(transport_class): def test_data_store_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_document_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_document_service.py index bf5700928a6d..87edb504da72 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_document_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_document_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import date_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.document_service import ( DocumentServiceAsyncClient, @@ -76,12 +76,12 @@ transports, ) from google.cloud.discoveryengine_v1alpha.types import ( + common, + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document CRED_INFO_JSON = { @@ -993,10 +993,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1040,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1078,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1326,13 +1323,13 @@ def test_document_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3396,9 +3393,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -3901,9 +3898,9 @@ def test_get_processed_document_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processed_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processed_document] = ( + mock_rpc + ) request = {} client.get_processed_document(request) @@ -5561,9 +5558,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5822,9 +5819,9 @@ def test_get_processed_document_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processed_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processed_document] = ( + mock_rpc + ) request = {} client.get_processed_document(request) @@ -6781,8 +6778,9 @@ def test_get_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6854,17 +6852,19 @@ def test_get_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_get_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_get_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_get_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6919,8 +6919,9 @@ def test_list_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6985,17 +6986,20 @@ def test_list_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_list_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_list_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_list_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_list_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_list_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_list_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7055,8 +7059,9 @@ def test_create_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7235,17 +7240,20 @@ def test_create_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_create_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_create_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_create_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_create_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_create_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_create_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7302,8 +7310,9 @@ def test_update_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7484,17 +7493,20 @@ def test_update_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_update_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_update_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_update_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_update_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_update_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_update_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7549,8 +7561,9 @@ def test_delete_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7609,13 +7622,13 @@ def test_delete_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "pre_delete_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_delete_document" + ) as pre, + ): pre.assert_not_called() pb_message = document_service.DeleteDocumentRequest.pb( document_service.DeleteDocumentRequest() @@ -7662,8 +7675,9 @@ def test_import_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7722,19 +7736,21 @@ def test_import_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_import_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_import_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_import_documents" - ) as pre: + 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.DocumentServiceRestInterceptor, "post_import_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_import_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_import_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7789,8 +7805,9 @@ def test_purge_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7849,19 +7866,21 @@ def test_purge_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_purge_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_purge_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_purge_documents" - ) as pre: + 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.DocumentServiceRestInterceptor, "post_purge_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_purge_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_purge_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7916,8 +7935,9 @@ def test_get_processed_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7983,18 +8003,20 @@ def test_get_processed_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_get_processed_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, - "post_get_processed_document_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_get_processed_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_processed_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_get_processed_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_get_processed_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8049,8 +8071,9 @@ def test_batch_get_documents_metadata_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8114,18 +8137,22 @@ def test_batch_get_documents_metadata_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_batch_get_documents_metadata" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, - "post_batch_get_documents_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_batch_get_documents_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_get_documents_metadata", + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_get_documents_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "pre_batch_get_documents_metadata", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8188,8 +8215,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8255,8 +8283,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8322,8 +8351,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8650,11 +8680,14 @@ def test_document_service_base_transport(): def test_document_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport( @@ -8671,9 +8704,12 @@ def test_document_service_base_transport_with_credentials_file(): def test_document_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport() @@ -8745,11 +8781,12 @@ def test_document_service_transport_auth_gdch_credentials(transport_class): def test_document_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_engine_service.py index 2fd47324aed0..ec8cf42a8821 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_engine_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.engine_service import ( EngineServiceAsyncClient, @@ -72,10 +72,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import common, engine, engine_service from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine -from google.cloud.discoveryengine_v1alpha.types import engine_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -958,10 +956,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1003,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1041,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1291,13 +1286,13 @@ def test_engine_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6270,8 +6265,9 @@ def test_create_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6432,19 +6428,20 @@ def test_create_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_create_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_create_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_create_engine" - ) as pre: + 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.EngineServiceRestInterceptor, "post_create_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_create_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_create_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6499,8 +6496,9 @@ def test_delete_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6559,19 +6557,20 @@ def test_delete_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_delete_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_delete_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_delete_engine" - ) as pre: + 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.EngineServiceRestInterceptor, "post_delete_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_delete_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_delete_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6628,8 +6627,9 @@ def test_update_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6808,17 +6808,19 @@ def test_update_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_update_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_update_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_update_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_update_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_update_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_update_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6871,8 +6873,9 @@ def test_get_engine_rest_bad_request(request_type=engine_service.GetEngineReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6945,17 +6948,19 @@ def test_get_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_get_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_get_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_get_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_get_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_get_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_get_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7006,8 +7011,9 @@ def test_list_engines_rest_bad_request(request_type=engine_service.ListEnginesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7070,17 +7076,19 @@ def test_list_engines_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_list_engines" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_list_engines_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_list_engines" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_list_engines" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_list_engines_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_list_engines" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7135,8 +7143,9 @@ def test_pause_engine_rest_bad_request(request_type=engine_service.PauseEngineRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7209,17 +7218,19 @@ def test_pause_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_pause_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_pause_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_pause_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_pause_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_pause_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_pause_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7274,8 +7285,9 @@ def test_resume_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7348,17 +7360,19 @@ def test_resume_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_resume_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_resume_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_resume_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_resume_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_resume_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_resume_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7411,8 +7425,9 @@ def test_tune_engine_rest_bad_request(request_type=engine_service.TuneEngineRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7471,19 +7486,20 @@ def test_tune_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_tune_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_tune_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_tune_engine" - ) as pre: + 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.EngineServiceRestInterceptor, "post_tune_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_tune_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_tune_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7541,8 +7557,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7608,8 +7625,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7675,8 +7693,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7978,11 +7997,14 @@ def test_engine_service_base_transport(): def test_engine_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EngineServiceTransport( @@ -7999,9 +8021,12 @@ def test_engine_service_base_transport_with_credentials_file(): def test_engine_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EngineServiceTransport() @@ -8073,11 +8098,12 @@ def test_engine_service_transport_auth_gdch_credentials(transport_class): def test_engine_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_estimate_billing_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_estimate_billing_service.py index 765aa3d16124..508d34047601 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_estimate_billing_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_estimate_billing_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.type import date_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.estimate_billing_service import ( EstimateBillingServiceAsyncClient, @@ -1012,10 +1012,9 @@ def test_estimate_billing_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1059,9 @@ def test_estimate_billing_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1099,10 +1097,9 @@ def test_estimate_billing_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1358,13 +1355,13 @@ def test_estimate_billing_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1474,9 +1471,9 @@ def test_estimate_data_size_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.estimate_data_size - ] = mock_rpc + client._transport._wrapped_methods[client._transport.estimate_data_size] = ( + mock_rpc + ) request = {} client.estimate_data_size(request) @@ -1669,9 +1666,9 @@ def test_estimate_data_size_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.estimate_data_size - ] = mock_rpc + client._transport._wrapped_methods[client._transport.estimate_data_size] = ( + mock_rpc + ) request = {} client.estimate_data_size(request) @@ -1960,8 +1957,9 @@ def test_estimate_data_size_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2018,20 +2016,21 @@ def test_estimate_data_size_rest_interceptors(null_interceptor): ) client = EstimateBillingServiceClient(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.EstimateBillingServiceRestInterceptor, "post_estimate_data_size" - ) as post, mock.patch.object( - transports.EstimateBillingServiceRestInterceptor, - "post_estimate_data_size_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EstimateBillingServiceRestInterceptor, "pre_estimate_data_size" - ) as pre: + 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.EstimateBillingServiceRestInterceptor, "post_estimate_data_size" + ) as post, + mock.patch.object( + transports.EstimateBillingServiceRestInterceptor, + "post_estimate_data_size_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EstimateBillingServiceRestInterceptor, "pre_estimate_data_size" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2089,8 +2088,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2156,8 +2156,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2223,8 +2224,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2381,11 +2383,14 @@ def test_estimate_billing_service_base_transport(): def test_estimate_billing_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.estimate_billing_service.transports.EstimateBillingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.estimate_billing_service.transports.EstimateBillingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EstimateBillingServiceTransport( @@ -2402,9 +2407,12 @@ def test_estimate_billing_service_base_transport_with_credentials_file(): def test_estimate_billing_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.estimate_billing_service.transports.EstimateBillingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.estimate_billing_service.transports.EstimateBillingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EstimateBillingServiceTransport() @@ -2478,11 +2486,12 @@ def test_estimate_billing_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_evaluation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_evaluation_service.py index a8df43bd2a1c..2c819bbfd582 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_evaluation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_evaluation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.evaluation_service import ( EvaluationServiceAsyncClient, @@ -74,12 +74,12 @@ transports, ) from google.cloud.discoveryengine_v1alpha.types import ( + common, + evaluation, evaluation_service, search_service, ) from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import evaluation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -999,10 +999,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1046,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1084,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1337,13 +1334,13 @@ def test_evaluation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1780,9 +1777,9 @@ def test_list_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -2301,9 +2298,9 @@ def test_create_evaluation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation] = ( + mock_rpc + ) request = {} client.create_evaluation(request) @@ -3327,9 +3324,9 @@ def test_list_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -3585,9 +3582,9 @@ def test_create_evaluation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation] = ( + mock_rpc + ) request = {} client.create_evaluation(request) @@ -4364,8 +4361,9 @@ def test_get_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4430,17 +4428,20 @@ def test_get_evaluation_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(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.EvaluationServiceRestInterceptor, "post_get_evaluation" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "post_get_evaluation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_get_evaluation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_get_evaluation" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_get_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_get_evaluation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4493,8 +4494,9 @@ def test_list_evaluations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4557,18 +4559,20 @@ def test_list_evaluations_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(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.EvaluationServiceRestInterceptor, "post_list_evaluations" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, - "post_list_evaluations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_list_evaluations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_list_evaluations" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_list_evaluations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_list_evaluations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4626,8 +4630,9 @@ def test_create_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4911,20 +4916,21 @@ def test_create_evaluation_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(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.EvaluationServiceRestInterceptor, "post_create_evaluation" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, - "post_create_evaluation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_create_evaluation" - ) as pre: + 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.EvaluationServiceRestInterceptor, "post_create_evaluation" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_create_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_create_evaluation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4979,8 +4985,9 @@ def test_list_evaluation_results_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5045,18 +5052,20 @@ def test_list_evaluation_results_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(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.EvaluationServiceRestInterceptor, "post_list_evaluation_results" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, - "post_list_evaluation_results_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_list_evaluation_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_list_evaluation_results" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_list_evaluation_results_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_list_evaluation_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5119,8 +5128,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5186,8 +5196,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5253,8 +5264,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5476,11 +5488,14 @@ def test_evaluation_service_base_transport(): def test_evaluation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EvaluationServiceTransport( @@ -5497,9 +5512,12 @@ def test_evaluation_service_base_transport_with_credentials_file(): def test_evaluation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EvaluationServiceTransport() @@ -5571,11 +5589,12 @@ def test_evaluation_service_transport_auth_gdch_credentials(transport_class): def test_evaluation_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_grounded_generation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_grounded_generation_service.py index df2ca2192428..40b2db0511b9 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_grounded_generation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -1012,10 +1017,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1064,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1099,10 +1102,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,13 +1363,13 @@ def test_grounded_generation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1944,8 +1946,9 @@ def test_check_grounding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2012,18 +2015,20 @@ def test_check_grounding_rest_interceptors(null_interceptor): ) client = GroundedGenerationServiceClient(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.GroundedGenerationServiceRestInterceptor, "post_check_grounding" - ) as post, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "post_check_grounding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, "pre_check_grounding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, "post_check_grounding" + ) as post, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_check_grounding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, "pre_check_grounding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2086,8 +2091,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2153,8 +2159,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2220,8 +2227,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2354,11 +2362,14 @@ def test_grounded_generation_service_base_transport(): def test_grounded_generation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroundedGenerationServiceTransport( @@ -2375,9 +2386,12 @@ def test_grounded_generation_service_base_transport_with_credentials_file(): def test_grounded_generation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroundedGenerationServiceTransport() @@ -2451,11 +2465,12 @@ def test_grounded_generation_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_project_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_project_service.py index 8ae058e1700b..6f49952bcad5 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_project_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_project_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,26 +56,21 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.project_service import ( ProjectServiceAsyncClient, ProjectServiceClient, transports, ) -from google.cloud.discoveryengine_v1alpha.types import project +from google.cloud.discoveryengine_v1alpha.types import project, project_service from google.cloud.discoveryengine_v1alpha.types import project as gcd_project -from google.cloud.discoveryengine_v1alpha.types import project_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -958,10 +957,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1004,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1042,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1291,13 +1287,13 @@ def test_project_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1726,9 +1722,9 @@ def test_provision_project_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -2080,9 +2076,9 @@ def test_report_consent_change_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_consent_change - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_consent_change] = ( + mock_rpc + ) request = {} client.report_consent_change(request) @@ -2554,9 +2550,9 @@ def test_provision_project_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -2752,9 +2748,9 @@ def test_report_consent_change_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_consent_change - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_consent_change] = ( + mock_rpc + ) request = {} client.report_consent_change(request) @@ -3222,8 +3218,9 @@ def test_get_project_rest_bad_request(request_type=project_service.GetProjectReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3286,17 +3283,19 @@ def test_get_project_rest_interceptors(null_interceptor): ) client = ProjectServiceClient(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.ProjectServiceRestInterceptor, "post_get_project" - ) as post, mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_get_project_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectServiceRestInterceptor, "pre_get_project" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "post_get_project" + ) as post, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "post_get_project_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "pre_get_project" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3349,8 +3348,9 @@ def test_provision_project_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3407,19 +3407,21 @@ def test_provision_project_rest_interceptors(null_interceptor): ) client = ProjectServiceClient(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.ProjectServiceRestInterceptor, "post_provision_project" - ) as post, mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_provision_project_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectServiceRestInterceptor, "pre_provision_project" - ) as pre: + 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.ProjectServiceRestInterceptor, "post_provision_project" + ) as post, + mock.patch.object( + transports.ProjectServiceRestInterceptor, + "post_provision_project_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "pre_provision_project" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3472,8 +3474,9 @@ def test_report_consent_change_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3536,18 +3539,20 @@ def test_report_consent_change_rest_interceptors(null_interceptor): ) client = ProjectServiceClient(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.ProjectServiceRestInterceptor, "post_report_consent_change" - ) as post, mock.patch.object( - transports.ProjectServiceRestInterceptor, - "post_report_consent_change_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProjectServiceRestInterceptor, "pre_report_consent_change" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "post_report_consent_change" + ) as post, + mock.patch.object( + transports.ProjectServiceRestInterceptor, + "post_report_consent_change_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "pre_report_consent_change" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3605,8 +3610,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3672,8 +3678,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3739,8 +3746,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3941,11 +3949,14 @@ def test_project_service_base_transport(): def test_project_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectServiceTransport( @@ -3962,9 +3973,12 @@ def test_project_service_base_transport_with_credentials_file(): def test_project_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectServiceTransport() @@ -4036,11 +4050,12 @@ def test_project_service_transport_auth_gdch_credentials(transport_class): def test_project_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_rank_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_rank_service.py index 477b7362d809..c2d09b38feca 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_rank_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_rank_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -923,10 +928,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +975,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1013,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1242,13 +1244,13 @@ def test_rank_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1392,9 +1394,9 @@ async def test_rank_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.rank - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.rank] = ( + mock_rpc + ) request = {} await client.rank(request) @@ -1817,8 +1819,9 @@ def test_rank_rest_bad_request(request_type=rank_service.RankRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1880,17 +1883,15 @@ def test_rank_rest_interceptors(null_interceptor): ) client = RankServiceClient(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.RankServiceRestInterceptor, "post_rank" - ) as post, mock.patch.object( - transports.RankServiceRestInterceptor, "post_rank_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RankServiceRestInterceptor, "pre_rank" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RankServiceRestInterceptor, "post_rank") as post, + mock.patch.object( + transports.RankServiceRestInterceptor, "post_rank_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RankServiceRestInterceptor, "pre_rank") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1946,8 +1947,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2013,8 +2015,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2080,8 +2083,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2214,11 +2218,14 @@ def test_rank_service_base_transport(): def test_rank_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RankServiceTransport( @@ -2235,9 +2242,12 @@ def test_rank_service_base_transport_with_credentials_file(): def test_rank_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RankServiceTransport() @@ -2309,11 +2319,12 @@ def test_rank_service_transport_auth_gdch_credentials(transport_class): def test_rank_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_recommendation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_recommendation_service.py index 65832e4aa5f8..7f74278d7127 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_recommendation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_recommendation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.recommendation_service import ( RecommendationServiceAsyncClient, @@ -1002,10 +1007,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1050,10 +1054,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1089,10 +1092,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1348,13 +1350,13 @@ def test_recommendation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1945,8 +1947,9 @@ def test_recommend_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2015,17 +2018,20 @@ def test_recommend_rest_interceptors(null_interceptor): ) client = RecommendationServiceClient(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.RecommendationServiceRestInterceptor, "post_recommend" - ) as post, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "post_recommend_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "pre_recommend" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, "post_recommend" + ) as post, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, + "post_recommend_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, "pre_recommend" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2088,8 +2094,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2155,8 +2162,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2222,8 +2230,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2356,11 +2365,14 @@ def test_recommendation_service_base_transport(): def test_recommendation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RecommendationServiceTransport( @@ -2377,9 +2389,12 @@ def test_recommendation_service_base_transport_with_credentials_file(): def test_recommendation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RecommendationServiceTransport() @@ -2451,11 +2466,12 @@ def test_recommendation_service_transport_auth_gdch_credentials(transport_class) def test_recommendation_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_service.py index d4889db38d31..fe3f31363368 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.sample_query_service import ( SampleQueryServiceAsyncClient, @@ -72,10 +72,12 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1alpha.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1alpha.types import import_config -from google.cloud.discoveryengine_v1alpha.types import sample_query -from google.cloud.discoveryengine_v1alpha.types import sample_query_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -999,10 +1001,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1048,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1086,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1337,13 +1336,13 @@ def test_sample_query_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1450,9 +1449,9 @@ def test_get_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query] = ( + mock_rpc + ) request = {} client.get_sample_query(request) @@ -1784,9 +1783,9 @@ def test_list_sample_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_queries] = ( + mock_rpc + ) request = {} client.list_sample_queries(request) @@ -2330,9 +2329,9 @@ def test_create_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sample_query] = ( + mock_rpc + ) request = {} client.create_sample_query(request) @@ -2700,9 +2699,9 @@ def test_update_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sample_query] = ( + mock_rpc + ) request = {} client.update_sample_query(request) @@ -3061,9 +3060,9 @@ def test_delete_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sample_query] = ( + mock_rpc + ) request = {} client.delete_sample_query(request) @@ -3392,9 +3391,9 @@ def test_import_sample_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_sample_queries] = ( + mock_rpc + ) request = {} client.import_sample_queries(request) @@ -3585,9 +3584,9 @@ def test_get_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query] = ( + mock_rpc + ) request = {} client.get_sample_query(request) @@ -3769,9 +3768,9 @@ def test_list_sample_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_queries] = ( + mock_rpc + ) request = {} client.list_sample_queries(request) @@ -4035,9 +4034,9 @@ def test_create_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sample_query] = ( + mock_rpc + ) request = {} client.create_sample_query(request) @@ -4252,9 +4251,9 @@ def test_update_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sample_query] = ( + mock_rpc + ) request = {} client.update_sample_query(request) @@ -4442,9 +4441,9 @@ def test_delete_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sample_query] = ( + mock_rpc + ) request = {} client.delete_sample_query(request) @@ -4622,9 +4621,9 @@ def test_import_sample_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_sample_queries] = ( + mock_rpc + ) request = {} client.import_sample_queries(request) @@ -5167,8 +5166,9 @@ def test_get_sample_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5233,18 +5233,20 @@ def test_get_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(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.SampleQueryServiceRestInterceptor, "post_get_sample_query" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_get_sample_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_get_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_get_sample_query" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_get_sample_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_get_sample_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5299,8 +5301,9 @@ def test_list_sample_queries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5365,18 +5368,20 @@ def test_list_sample_queries_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(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.SampleQueryServiceRestInterceptor, "post_list_sample_queries" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_list_sample_queries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_list_sample_queries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_list_sample_queries" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_list_sample_queries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_list_sample_queries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5436,8 +5441,9 @@ def test_create_sample_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5581,18 +5587,20 @@ def test_create_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(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.SampleQueryServiceRestInterceptor, "post_create_sample_query" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_create_sample_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_create_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_create_sample_query" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_create_sample_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_create_sample_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5651,8 +5659,9 @@ def test_update_sample_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5798,18 +5807,20 @@ def test_update_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(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.SampleQueryServiceRestInterceptor, "post_update_sample_query" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_update_sample_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_update_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_update_sample_query" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_update_sample_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_update_sample_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5866,8 +5877,9 @@ def test_delete_sample_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5926,13 +5938,13 @@ def test_delete_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(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.SampleQueryServiceRestInterceptor, "pre_delete_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_delete_sample_query" + ) as pre, + ): pre.assert_not_called() pb_message = sample_query_service.DeleteSampleQueryRequest.pb( sample_query_service.DeleteSampleQueryRequest() @@ -5979,8 +5991,9 @@ def test_import_sample_queries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6039,20 +6052,21 @@ def test_import_sample_queries_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(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.SampleQueryServiceRestInterceptor, "post_import_sample_queries" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_import_sample_queries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_import_sample_queries" - ) as pre: + 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.SampleQueryServiceRestInterceptor, "post_import_sample_queries" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_import_sample_queries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_import_sample_queries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6110,8 +6124,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6177,8 +6192,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6244,8 +6260,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6515,11 +6532,14 @@ def test_sample_query_service_base_transport(): def test_sample_query_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQueryServiceTransport( @@ -6536,9 +6556,12 @@ def test_sample_query_service_base_transport_with_credentials_file(): def test_sample_query_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQueryServiceTransport() @@ -6610,11 +6633,12 @@ def test_sample_query_service_transport_auth_gdch_credentials(transport_class): def test_sample_query_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_set_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_set_service.py index 76e5197929ca..023010ce44ff 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_set_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_set_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.sample_query_set_service import ( SampleQuerySetServiceAsyncClient, @@ -62,11 +67,13 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1alpha.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set -from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1004,10 +1011,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1058,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1096,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1350,13 +1354,13 @@ def test_sample_query_set_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1473,9 +1477,9 @@ def test_get_sample_query_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query_set] = ( + mock_rpc + ) request = {} client.get_sample_query_set(request) @@ -1822,9 +1826,9 @@ def test_list_sample_query_sets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_query_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_query_sets] = ( + mock_rpc + ) request = {} client.list_sample_query_sets(request) @@ -3359,9 +3363,9 @@ def test_get_sample_query_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query_set] = ( + mock_rpc + ) request = {} client.get_sample_query_set(request) @@ -3544,9 +3548,9 @@ def test_list_sample_query_sets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_query_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_query_sets] = ( + mock_rpc + ) request = {} client.list_sample_query_sets(request) @@ -4767,8 +4771,9 @@ def test_get_sample_query_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4837,18 +4842,20 @@ def test_get_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(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.SampleQuerySetServiceRestInterceptor, "post_get_sample_query_set" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_get_sample_query_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_get_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, "post_get_sample_query_set" + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_get_sample_query_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, "pre_get_sample_query_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4903,8 +4910,9 @@ def test_list_sample_query_sets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4969,18 +4977,22 @@ def test_list_sample_query_sets_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(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.SampleQuerySetServiceRestInterceptor, "post_list_sample_query_sets" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_list_sample_query_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_list_sample_query_sets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_list_sample_query_sets", + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_list_sample_query_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_list_sample_query_sets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5038,8 +5050,9 @@ def test_create_sample_query_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5181,18 +5194,22 @@ def test_create_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(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.SampleQuerySetServiceRestInterceptor, "post_create_sample_query_set" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_create_sample_query_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_create_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_create_sample_query_set", + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_create_sample_query_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_create_sample_query_set", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5254,8 +5271,9 @@ def test_update_sample_query_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5401,18 +5419,22 @@ def test_update_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(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.SampleQuerySetServiceRestInterceptor, "post_update_sample_query_set" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_update_sample_query_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_update_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_update_sample_query_set", + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_update_sample_query_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_update_sample_query_set", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5472,8 +5494,9 @@ def test_delete_sample_query_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5532,13 +5555,14 @@ def test_delete_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(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.SampleQuerySetServiceRestInterceptor, "pre_delete_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_delete_sample_query_set", + ) as pre, + ): pre.assert_not_called() pb_message = sample_query_set_service.DeleteSampleQuerySetRequest.pb( sample_query_set_service.DeleteSampleQuerySetRequest() @@ -5588,8 +5612,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5655,8 +5680,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5722,8 +5748,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5950,11 +5977,14 @@ def test_sample_query_set_service_base_transport(): def test_sample_query_set_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQuerySetServiceTransport( @@ -5971,9 +6001,12 @@ def test_sample_query_set_service_base_transport_with_credentials_file(): def test_sample_query_set_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQuerySetServiceTransport() @@ -6047,11 +6080,12 @@ def test_sample_query_set_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_schema_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_schema_service.py index a3175e6384de..5793d986c031 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_schema_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_schema_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.schema_service import ( SchemaServiceAsyncClient, @@ -71,9 +71,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.discoveryengine_v1alpha.types import schema, schema_service from google.cloud.discoveryengine_v1alpha.types import schema as gcd_schema -from google.cloud.discoveryengine_v1alpha.types import schema_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -956,10 +955,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1040,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,13 +1285,13 @@ def test_schema_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4451,8 +4447,9 @@ def test_get_schema_rest_bad_request(request_type=schema_service.GetSchemaReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4518,17 +4515,19 @@ def test_get_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_get_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_get_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_get_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_get_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_get_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_get_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4579,8 +4578,9 @@ def test_list_schemas_rest_bad_request(request_type=schema_service.ListSchemasRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4643,17 +4643,19 @@ def test_list_schemas_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_list_schemas" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_list_schemas_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_list_schemas" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_list_schemas" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_list_schemas_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_list_schemas" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4708,8 +4710,9 @@ def test_create_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4856,19 +4859,20 @@ def test_create_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_create_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_create_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_create_schema" - ) as pre: + 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.SchemaServiceRestInterceptor, "post_create_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_create_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_create_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4925,8 +4929,9 @@ def test_update_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5077,19 +5082,20 @@ def test_update_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_update_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_update_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_update_schema" - ) as pre: + 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.SchemaServiceRestInterceptor, "post_update_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_update_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_update_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5144,8 +5150,9 @@ def test_delete_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5204,19 +5211,20 @@ def test_delete_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_delete_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_delete_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_delete_schema" - ) as pre: + 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.SchemaServiceRestInterceptor, "post_delete_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_delete_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_delete_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5274,8 +5282,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5341,8 +5350,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5408,8 +5418,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5648,11 +5659,14 @@ def test_schema_service_base_transport(): def test_schema_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SchemaServiceTransport( @@ -5669,9 +5683,12 @@ def test_schema_service_base_transport_with_credentials_file(): def test_schema_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SchemaServiceTransport() @@ -5743,11 +5760,12 @@ def test_schema_service_transport_auth_gdch_credentials(transport_class): def test_schema_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_service.py index b04199afee3f..1464ccf8668b 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.search_service import ( SearchServiceAsyncClient, @@ -944,10 +949,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -992,10 +996,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1034,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1277,13 +1279,13 @@ def test_search_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1459,9 +1461,9 @@ async def test_search_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.search - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.search] = ( + mock_rpc + ) request = {} await client.search(request) @@ -1776,7 +1778,9 @@ async def test_search_async_pages(): pages = [] # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 - async for page_ in (await client.search(request={})).pages: # pragma: no branch + async for page_ in ( # pragma: no branch + await client.search(request={}) + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token @@ -2157,8 +2161,9 @@ def test_search_rest_bad_request(request_type=search_service.SearchRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2233,17 +2238,17 @@ def test_search_rest_interceptors(null_interceptor): ) client = SearchServiceClient(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.SearchServiceRestInterceptor, "post_search" - ) as post, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SearchServiceRestInterceptor, "pre_search" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search" + ) as post, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SearchServiceRestInterceptor, "pre_search") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2301,8 +2306,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2368,8 +2374,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2435,8 +2442,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2569,11 +2577,14 @@ def test_search_service_base_transport(): def test_search_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchServiceTransport( @@ -2590,9 +2601,12 @@ def test_search_service_base_transport_with_credentials_file(): def test_search_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchServiceTransport() @@ -2664,11 +2678,12 @@ def test_search_service_transport_auth_gdch_credentials(transport_class): def test_search_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_tuning_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_tuning_service.py index 84e822575e46..fbcb269c1841 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_tuning_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -1006,10 +1006,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1054,10 +1053,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1093,10 +1091,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1352,13 +1349,13 @@ def test_search_tuning_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1472,9 +1469,9 @@ def test_train_custom_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -1732,9 +1729,9 @@ def test_list_custom_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -1917,9 +1914,9 @@ def test_train_custom_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -2043,9 +2040,9 @@ def test_list_custom_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -2386,8 +2383,9 @@ def test_train_custom_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2446,20 +2444,21 @@ def test_train_custom_model_rest_interceptors(null_interceptor): ) client = SearchTuningServiceClient(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.SearchTuningServiceRestInterceptor, "post_train_custom_model" - ) as post, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, - "post_train_custom_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "pre_train_custom_model" - ) as pre: + 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.SearchTuningServiceRestInterceptor, "post_train_custom_model" + ) as post, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, + "post_train_custom_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "pre_train_custom_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2514,8 +2513,9 @@ def test_list_custom_models_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2577,18 +2577,20 @@ def test_list_custom_models_rest_interceptors(null_interceptor): ) client = SearchTuningServiceClient(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.SearchTuningServiceRestInterceptor, "post_list_custom_models" - ) as post, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, - "post_list_custom_models_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "pre_list_custom_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "post_list_custom_models" + ) as post, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, + "post_list_custom_models_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "pre_list_custom_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2651,8 +2653,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2718,8 +2721,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2785,8 +2789,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2966,11 +2971,14 @@ def test_search_tuning_service_base_transport(): def test_search_tuning_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchTuningServiceTransport( @@ -2987,9 +2995,12 @@ def test_search_tuning_service_base_transport_with_credentials_file(): def test_search_tuning_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchTuningServiceTransport() @@ -3061,11 +3072,12 @@ def test_search_tuning_service_transport_auth_gdch_credentials(transport_class): def test_search_tuning_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_serving_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_serving_config_service.py index 67450626d661..6db70e4f9d6d 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_serving_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_serving_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.serving_config_service import ( ServingConfigServiceAsyncClient, @@ -62,12 +67,15 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1alpha.types import ( + common, + search_service, + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import common, search_service -from google.cloud.discoveryengine_v1alpha.types import serving_config -from google.cloud.discoveryengine_v1alpha.types import serving_config_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1001,10 +1009,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1049,10 +1056,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1088,10 +1094,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1347,13 +1352,13 @@ def test_serving_config_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1489,9 +1494,9 @@ def test_update_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -1917,9 +1922,9 @@ def test_get_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serving_config] = ( + mock_rpc + ) request = {} client.get_serving_config(request) @@ -2287,9 +2292,9 @@ def test_list_serving_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_serving_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_serving_configs] = ( + mock_rpc + ) request = {} client.list_serving_configs(request) @@ -2764,9 +2769,9 @@ def test_update_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -2958,9 +2963,9 @@ def test_get_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serving_config] = ( + mock_rpc + ) request = {} client.get_serving_config(request) @@ -3142,9 +3147,9 @@ def test_list_serving_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_serving_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_serving_configs] = ( + mock_rpc + ) request = {} client.list_serving_configs(request) @@ -3712,8 +3717,9 @@ def test_update_serving_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3956,18 +3962,20 @@ def test_update_serving_config_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(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.ServingConfigServiceRestInterceptor, "post_update_serving_config" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_update_serving_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_update_serving_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_update_serving_config" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_update_serving_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_update_serving_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4024,8 +4032,9 @@ def test_get_serving_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4116,18 +4125,20 @@ def test_get_serving_config_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(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.ServingConfigServiceRestInterceptor, "post_get_serving_config" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_get_serving_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_get_serving_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_get_serving_config" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_get_serving_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_get_serving_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4182,8 +4193,9 @@ def test_list_serving_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4248,18 +4260,20 @@ def test_list_serving_configs_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(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.ServingConfigServiceRestInterceptor, "post_list_serving_configs" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_list_serving_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_list_serving_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_list_serving_configs" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_list_serving_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_list_serving_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4322,8 +4336,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4389,8 +4404,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4456,8 +4472,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4638,11 +4655,14 @@ def test_serving_config_service_base_transport(): def test_serving_config_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServingConfigServiceTransport( @@ -4659,9 +4679,12 @@ def test_serving_config_service_base_transport_with_credentials_file(): def test_serving_config_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServingConfigServiceTransport() @@ -4733,11 +4756,12 @@ def test_serving_config_service_transport_auth_gdch_credentials(transport_class) def test_serving_config_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_session_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_session_service.py index 5da392ee507a..9a7087e764e0 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_session_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_session_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.session_service import ( SessionServiceAsyncClient, @@ -66,10 +71,10 @@ from google.cloud.discoveryengine_v1alpha.types import ( answer, conversational_search_service, + session, + session_service, ) -from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session -from google.cloud.discoveryengine_v1alpha.types import session_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -956,10 +961,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1008,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1046,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,13 +1291,13 @@ def test_session_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5387,8 +5389,9 @@ def test_create_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5634,17 +5637,20 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_create_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_create_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5699,8 +5705,9 @@ def test_delete_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5759,13 +5766,13 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "pre_delete_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteSessionRequest.pb( conversational_search_service.DeleteSessionRequest() @@ -5814,8 +5821,9 @@ def test_update_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6065,17 +6073,20 @@ def test_update_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_update_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_update_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_update_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_update_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, + "post_update_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_update_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6130,8 +6141,9 @@ def test_get_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6204,17 +6216,19 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_get_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_get_session_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6267,8 +6281,9 @@ def test_list_sessions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6333,17 +6348,19 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_list_sessions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_sessions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6401,8 +6418,9 @@ def test_list_files_rest_bad_request(request_type=session_service.ListFilesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6467,17 +6485,19 @@ def test_list_files_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_list_files" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_list_files_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_list_files" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_files" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_files_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_list_files" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6537,8 +6557,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6604,8 +6625,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6671,8 +6693,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6910,11 +6933,14 @@ def test_session_service_base_transport(): def test_session_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionServiceTransport( @@ -6931,9 +6957,12 @@ def test_session_service_base_transport_with_credentials_file(): def test_session_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionServiceTransport() @@ -7005,11 +7034,12 @@ def test_session_service_transport_auth_gdch_credentials(transport_class): def test_session_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_site_search_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_site_search_engine_service.py index fc41808e2e63..1aeafc79f4c3 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_site_search_engine_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( SiteSearchEngineServiceAsyncClient, @@ -1015,10 +1015,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1062,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1102,10 +1100,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,13 +1358,13 @@ def test_site_search_engine_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1481,9 +1478,9 @@ def test_get_site_search_engine_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -1820,9 +1817,9 @@ def test_create_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -2785,9 +2782,9 @@ def test_update_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -3131,9 +3128,9 @@ def test_delete_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -3482,9 +3479,9 @@ def test_list_target_sites_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -5983,9 +5980,9 @@ def test_get_site_search_engine_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -6167,9 +6164,9 @@ def test_create_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -6676,9 +6673,9 @@ def test_update_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -6857,9 +6854,9 @@ def test_delete_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -7038,9 +7035,9 @@ def test_list_target_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -9125,8 +9122,9 @@ def test_get_site_search_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9191,18 +9189,22 @@ def test_get_site_search_engine_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_get_site_search_engine" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_site_search_engine_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_get_site_search_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_site_search_engine", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_site_search_engine_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_get_site_search_engine", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9262,8 +9264,9 @@ def test_create_target_site_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9406,20 +9409,21 @@ def test_create_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_create_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_create_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_create_target_site" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_create_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_create_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_create_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9474,8 +9478,9 @@ def test_batch_create_target_sites_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9534,22 +9539,23 @@ def test_batch_create_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_batch_create_target_sites", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_create_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_batch_create_target_sites", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_batch_create_target_sites", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_create_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_batch_create_target_sites", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9604,8 +9610,9 @@ def test_get_target_site_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9684,18 +9691,20 @@ def test_get_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_get_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_get_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_get_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_get_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9754,8 +9763,9 @@ def test_update_target_site_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9900,20 +9910,21 @@ def test_update_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_update_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_update_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_update_target_site" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_update_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_update_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_update_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9968,8 +9979,9 @@ def test_delete_target_site_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10028,20 +10040,21 @@ def test_delete_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_delete_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_delete_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_target_site" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_delete_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_delete_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10096,8 +10109,9 @@ def test_list_target_sites_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10166,18 +10180,20 @@ def test_list_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_list_target_sites" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_list_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_list_target_sites" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_list_target_sites" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_list_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_list_target_sites" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10237,8 +10253,9 @@ def test_enable_advanced_site_search_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10297,22 +10314,23 @@ def test_enable_advanced_site_search_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_enable_advanced_site_search", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_enable_advanced_site_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_enable_advanced_site_search", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_enable_advanced_site_search", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_enable_advanced_site_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_enable_advanced_site_search", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10367,8 +10385,9 @@ def test_disable_advanced_site_search_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10427,22 +10446,23 @@ def test_disable_advanced_site_search_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_disable_advanced_site_search", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_disable_advanced_site_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_disable_advanced_site_search", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_disable_advanced_site_search", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_disable_advanced_site_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_disable_advanced_site_search", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10497,8 +10517,9 @@ def test_recrawl_uris_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10557,20 +10578,21 @@ def test_recrawl_uris_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_recrawl_uris" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_recrawl_uris_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_recrawl_uris" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_recrawl_uris" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_recrawl_uris_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_recrawl_uris" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10625,8 +10647,9 @@ def test_batch_verify_target_sites_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10685,22 +10708,23 @@ def test_batch_verify_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_batch_verify_target_sites", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_verify_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_batch_verify_target_sites", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_batch_verify_target_sites", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_verify_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_batch_verify_target_sites", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10755,8 +10779,9 @@ def test_fetch_domain_verification_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10827,20 +10852,22 @@ def test_fetch_domain_verification_status_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_fetch_domain_verification_status", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_domain_verification_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_fetch_domain_verification_status", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_domain_verification_status", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_domain_verification_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_fetch_domain_verification_status", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10904,8 +10931,9 @@ def test_set_uri_pattern_document_data_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10964,22 +10992,23 @@ def test_set_uri_pattern_document_data_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_set_uri_pattern_document_data", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_set_uri_pattern_document_data_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_set_uri_pattern_document_data", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_set_uri_pattern_document_data", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_set_uri_pattern_document_data_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_set_uri_pattern_document_data", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11034,8 +11063,9 @@ def test_get_uri_pattern_document_data_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11101,20 +11131,22 @@ def test_get_uri_pattern_document_data_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_get_uri_pattern_document_data", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_uri_pattern_document_data_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_get_uri_pattern_document_data", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_uri_pattern_document_data", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_uri_pattern_document_data_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_get_uri_pattern_document_data", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11181,8 +11213,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11248,8 +11281,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11315,8 +11349,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11768,11 +11803,14 @@ def test_site_search_engine_service_base_transport(): def test_site_search_engine_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteSearchEngineServiceTransport( @@ -11789,9 +11827,12 @@ def test_site_search_engine_service_base_transport_with_credentials_file(): def test_site_search_engine_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteSearchEngineServiceTransport() @@ -11865,11 +11906,12 @@ def test_site_search_engine_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_user_event_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_user_event_service.py index fcc2fd75aa68..0f562341e654 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_user_event_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_user_event_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,8 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,20 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore from google.cloud.discoveryengine_v1alpha.services.user_event_service import ( UserEventServiceAsyncClient, @@ -991,10 +991,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1038,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1076,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1329,13 +1326,13 @@ def test_user_event_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1460,9 +1457,9 @@ def test_write_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -1734,9 +1731,9 @@ def test_collect_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -1989,9 +1986,9 @@ def test_purge_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2248,9 +2245,9 @@ def test_import_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -2440,9 +2437,9 @@ def test_write_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -2575,9 +2572,9 @@ def test_collect_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -2730,9 +2727,9 @@ def test_purge_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2868,9 +2865,9 @@ def test_import_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -3319,8 +3316,9 @@ def test_write_user_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3526,18 +3524,20 @@ def test_write_user_event_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(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.UserEventServiceRestInterceptor, "post_write_user_event" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_write_user_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_write_user_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_write_user_event" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_write_user_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_write_user_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3590,8 +3590,9 @@ def test_collect_user_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3653,18 +3654,20 @@ def test_collect_user_event_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(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.UserEventServiceRestInterceptor, "post_collect_user_event" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_collect_user_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_collect_user_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_collect_user_event" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_collect_user_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_collect_user_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3717,8 +3720,9 @@ def test_purge_user_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3775,20 +3779,21 @@ def test_purge_user_events_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(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.UserEventServiceRestInterceptor, "post_purge_user_events" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_purge_user_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_purge_user_events" - ) as pre: + 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.UserEventServiceRestInterceptor, "post_purge_user_events" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_purge_user_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_purge_user_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3841,8 +3846,9 @@ def test_import_user_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3899,20 +3905,21 @@ def test_import_user_events_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(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.UserEventServiceRestInterceptor, "post_import_user_events" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_import_user_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_import_user_events" - ) as pre: + 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.UserEventServiceRestInterceptor, "post_import_user_events" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_import_user_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_import_user_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3970,8 +3977,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4037,8 +4045,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4104,8 +4113,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4329,11 +4339,14 @@ def test_user_event_service_base_transport(): def test_user_event_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserEventServiceTransport( @@ -4350,9 +4363,12 @@ def test_user_event_service_base_transport_with_credentials_file(): def test_user_event_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserEventServiceTransport() @@ -4424,11 +4440,12 @@ def test_user_event_service_transport_auth_gdch_credentials(transport_class): def test_user_event_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_completion_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_completion_service.py index 5832005fc4c8..e935c8c60167 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_completion_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_completion_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.type import date_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.completion_service import ( CompletionServiceAsyncClient, @@ -995,10 +995,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1042,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1080,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1333,13 +1330,13 @@ def test_completion_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4167,8 +4164,9 @@ def test_complete_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4233,17 +4231,20 @@ def test_complete_query_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, "post_complete_query" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_complete_query_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_complete_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "post_complete_query" + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_complete_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "pre_complete_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4303,8 +4304,9 @@ def test_advanced_complete_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4369,18 +4371,20 @@ def test_advanced_complete_query_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, "post_advanced_complete_query" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_advanced_complete_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_advanced_complete_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "post_advanced_complete_query" + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_advanced_complete_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "pre_advanced_complete_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4440,8 +4444,9 @@ def test_import_suggestion_deny_list_entries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4500,22 +4505,23 @@ def test_import_suggestion_deny_list_entries_rest_interceptors(null_interceptor) ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, - "post_import_suggestion_deny_list_entries", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_suggestion_deny_list_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "pre_import_suggestion_deny_list_entries", - ) as pre: + 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.CompletionServiceRestInterceptor, + "post_import_suggestion_deny_list_entries", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_suggestion_deny_list_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_import_suggestion_deny_list_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4570,8 +4576,9 @@ def test_purge_suggestion_deny_list_entries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4630,22 +4637,23 @@ def test_purge_suggestion_deny_list_entries_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, - "post_purge_suggestion_deny_list_entries", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_suggestion_deny_list_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "pre_purge_suggestion_deny_list_entries", - ) as pre: + 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.CompletionServiceRestInterceptor, + "post_purge_suggestion_deny_list_entries", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_suggestion_deny_list_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_purge_suggestion_deny_list_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4700,8 +4708,9 @@ def test_import_completion_suggestions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4760,21 +4769,23 @@ def test_import_completion_suggestions_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, - "post_import_completion_suggestions", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_completion_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_import_completion_suggestions" - ) as pre: + 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.CompletionServiceRestInterceptor, + "post_import_completion_suggestions", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_completion_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_import_completion_suggestions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4829,8 +4840,9 @@ def test_purge_completion_suggestions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4889,20 +4901,23 @@ def test_purge_completion_suggestions_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(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.CompletionServiceRestInterceptor, "post_purge_completion_suggestions" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_completion_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_purge_completion_suggestions" - ) as pre: + 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.CompletionServiceRestInterceptor, + "post_purge_completion_suggestions", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_completion_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_purge_completion_suggestions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4960,8 +4975,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5027,8 +5043,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5094,8 +5111,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5365,11 +5383,14 @@ def test_completion_service_base_transport(): def test_completion_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompletionServiceTransport( @@ -5386,9 +5407,12 @@ def test_completion_service_base_transport_with_credentials_file(): def test_completion_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompletionServiceTransport() @@ -5460,11 +5484,12 @@ def test_completion_service_transport_auth_gdch_credentials(transport_class): def test_completion_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_control_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_control_service.py index 04b1113b35fa..21ea312c4564 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_control_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_control_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.control_service import ( ControlServiceAsyncClient, @@ -62,10 +67,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import common, control, control_service from google.cloud.discoveryengine_v1beta.types import control as gcd_control -from google.cloud.discoveryengine_v1beta.types import control_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -952,10 +955,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +1002,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1040,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1285,13 +1285,13 @@ def test_control_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4616,8 +4616,9 @@ def test_create_control_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4784,17 +4785,20 @@ def test_create_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "post_create_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_create_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_create_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_create_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, + "post_create_control_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_create_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4849,8 +4853,9 @@ def test_delete_control_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4909,13 +4914,13 @@ def test_delete_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "pre_delete_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_delete_control" + ) as pre, + ): pre.assert_not_called() pb_message = control_service.DeleteControlRequest.pb( control_service.DeleteControlRequest() @@ -4964,8 +4969,9 @@ def test_update_control_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5136,17 +5142,20 @@ def test_update_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "post_update_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_update_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_update_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_update_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, + "post_update_control_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_update_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5199,8 +5208,9 @@ def test_get_control_rest_bad_request(request_type=control_service.GetControlReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5275,17 +5285,19 @@ def test_get_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "post_get_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_get_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_get_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_get_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_get_control_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_get_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5338,8 +5350,9 @@ def test_list_controls_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5402,17 +5415,19 @@ def test_list_controls_rest_interceptors(null_interceptor): ) client = ControlServiceClient(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.ControlServiceRestInterceptor, "post_list_controls" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_list_controls_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_list_controls" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_list_controls" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_list_controls_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_list_controls" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5475,8 +5490,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5542,8 +5558,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5609,8 +5626,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5827,11 +5845,14 @@ def test_control_service_base_transport(): def test_control_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ControlServiceTransport( @@ -5848,9 +5869,12 @@ def test_control_service_base_transport_with_credentials_file(): def test_control_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ControlServiceTransport() @@ -5922,11 +5946,12 @@ def test_control_service_transport_auth_gdch_credentials(transport_class): def test_control_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_conversational_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_conversational_search_service.py index da5ebf07ed70..51c117964500 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_conversational_search_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.conversational_search_service import ( ConversationalSearchServiceAsyncClient, @@ -64,13 +69,13 @@ transports, ) from google.cloud.discoveryengine_v1beta.types import ( + answer, + conversation, conversational_search_service, search_service, + session, ) from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import answer -from google.cloud.discoveryengine_v1beta.types import conversation -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session CRED_INFO_JSON = { @@ -1045,10 +1050,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1093,10 +1097,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1132,10 +1135,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1394,13 +1396,13 @@ def test_conversational_search_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1520,9 +1522,9 @@ def test_converse_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -1878,9 +1880,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2231,9 +2233,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2564,9 +2566,9 @@ def test_update_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -2918,9 +2920,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -3260,9 +3262,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -6185,9 +6187,9 @@ def test_converse_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -6386,9 +6388,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -6581,9 +6583,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -6760,9 +6762,9 @@ def test_update_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -6944,9 +6946,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -7128,9 +7130,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -9488,8 +9490,9 @@ def test_converse_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9558,20 +9561,22 @@ def test_converse_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, - "post_converse_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_converse_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "pre_converse_conversation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_converse_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_converse_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_converse_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9631,8 +9636,9 @@ def test_create_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9834,19 +9840,22 @@ def test_create_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, - "post_create_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_create_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_create_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9903,8 +9912,9 @@ def test_delete_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9963,13 +9973,14 @@ def test_delete_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "pre_delete_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_delete_conversation", + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteConversationRequest.pb( conversational_search_service.DeleteConversationRequest() @@ -10018,8 +10029,9 @@ def test_update_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10225,19 +10237,22 @@ def test_update_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, - "post_update_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_update_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_update_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10294,8 +10309,9 @@ def test_get_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10364,18 +10380,22 @@ def test_get_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_get_conversation" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_get_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10428,8 +10448,9 @@ def test_list_conversations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10494,18 +10515,22 @@ def test_list_conversations_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_list_conversations" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_list_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_list_conversations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_conversations", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_list_conversations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10565,8 +10590,9 @@ def test_answer_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10633,18 +10659,20 @@ def test_answer_query_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_answer_query" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_answer_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_answer_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_answer_query" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_answer_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_answer_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10704,8 +10732,9 @@ def test_get_answer_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10782,18 +10811,20 @@ def test_get_answer_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_get_answer" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_answer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_answer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_get_answer" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_answer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_get_answer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10846,8 +10877,9 @@ def test_create_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11093,18 +11125,20 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_create_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11159,8 +11193,9 @@ def test_delete_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11219,13 +11254,13 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "pre_delete_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteSessionRequest.pb( conversational_search_service.DeleteSessionRequest() @@ -11274,8 +11309,9 @@ def test_update_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11525,18 +11561,20 @@ def test_update_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_update_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_update_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_update_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_update_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11591,8 +11629,9 @@ def test_get_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11665,18 +11704,20 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11729,8 +11770,9 @@ def test_list_sessions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11795,18 +11837,20 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(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.ConversationalSearchServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_list_sessions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_sessions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11869,8 +11913,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11936,8 +11981,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12003,8 +12049,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12399,11 +12446,14 @@ def test_conversational_search_service_base_transport(): def test_conversational_search_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationalSearchServiceTransport( @@ -12420,9 +12470,12 @@ def test_conversational_search_service_base_transport_with_credentials_file(): def test_conversational_search_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationalSearchServiceTransport() @@ -12499,11 +12552,12 @@ def test_conversational_search_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_data_store_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_data_store_service.py index 5e86e9e8265e..958a19d48d48 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_data_store_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_data_store_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.data_store_service import ( DataStoreServiceAsyncClient, @@ -74,13 +74,13 @@ transports, ) from google.cloud.discoveryengine_v1beta.types import ( + common, + data_store, data_store_service, document_processing_config, schema, ) from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import data_store CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -992,10 +992,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1040,10 +1039,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1079,10 +1077,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1330,13 +1327,13 @@ def test_data_store_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1446,9 +1443,9 @@ def test_create_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -2156,9 +2153,9 @@ def test_list_data_stores_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -2677,9 +2674,9 @@ def test_delete_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -3030,9 +3027,9 @@ def test_update_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -3322,9 +3319,9 @@ def test_create_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -3722,9 +3719,9 @@ def test_list_data_stores_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -3982,9 +3979,9 @@ def test_delete_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -4163,9 +4160,9 @@ def test_update_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -4722,8 +4719,9 @@ def test_create_data_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4904,20 +4902,21 @@ def test_create_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_create_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_create_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_create_data_store" - ) as pre: + 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.DataStoreServiceRestInterceptor, "post_create_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_create_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_create_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4970,8 +4969,9 @@ def test_get_data_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5044,17 +5044,20 @@ def test_get_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_get_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_get_data_store_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_get_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_get_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_get_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_get_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5107,8 +5110,9 @@ def test_list_data_stores_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5171,18 +5175,20 @@ def test_list_data_stores_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_list_data_stores" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_list_data_stores_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_list_data_stores" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_list_data_stores" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_list_data_stores_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_list_data_stores" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5240,8 +5246,9 @@ def test_delete_data_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5298,20 +5305,21 @@ def test_delete_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_delete_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_delete_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_delete_data_store" - ) as pre: + 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.DataStoreServiceRestInterceptor, "post_delete_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_delete_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_delete_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5366,8 +5374,9 @@ def test_update_data_store_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5566,18 +5575,20 @@ def test_update_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(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.DataStoreServiceRestInterceptor, "post_update_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_update_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_update_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_update_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_update_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_update_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5635,8 +5646,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5702,8 +5714,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5769,8 +5782,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6015,11 +6029,14 @@ def test_data_store_service_base_transport(): def test_data_store_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataStoreServiceTransport( @@ -6036,9 +6053,12 @@ def test_data_store_service_base_transport_with_credentials_file(): def test_data_store_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataStoreServiceTransport() @@ -6110,11 +6130,12 @@ def test_data_store_service_transport_auth_gdch_credentials(transport_class): def test_data_store_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_document_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_document_service.py index 722cab5937fe..616bfe13a047 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_document_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_document_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import date_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.document_service import ( DocumentServiceAsyncClient, @@ -76,11 +76,11 @@ transports, ) from google.cloud.discoveryengine_v1beta.types import ( + document, document_service, import_config, purge_config, ) -from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document CRED_INFO_JSON = { @@ -992,10 +992,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1040,10 +1039,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1079,10 +1077,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1325,13 +1322,13 @@ def test_document_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3395,9 +3392,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5216,9 +5213,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -6179,8 +6176,9 @@ def test_get_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6252,17 +6250,19 @@ def test_get_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_get_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_get_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_get_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6317,8 +6317,9 @@ def test_list_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6383,17 +6384,20 @@ def test_list_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_list_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_list_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_list_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_list_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_list_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_list_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6453,8 +6457,9 @@ def test_create_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6623,17 +6628,20 @@ def test_create_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_create_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_create_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_create_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_create_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_create_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_create_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6690,8 +6698,9 @@ def test_update_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6862,17 +6871,20 @@ def test_update_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_update_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_update_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_update_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_update_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_update_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_update_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6927,8 +6939,9 @@ def test_delete_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6987,13 +7000,13 @@ def test_delete_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "pre_delete_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_delete_document" + ) as pre, + ): pre.assert_not_called() pb_message = document_service.DeleteDocumentRequest.pb( document_service.DeleteDocumentRequest() @@ -7040,8 +7053,9 @@ def test_import_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7100,19 +7114,21 @@ def test_import_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_import_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_import_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_import_documents" - ) as pre: + 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.DocumentServiceRestInterceptor, "post_import_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_import_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_import_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7167,8 +7183,9 @@ def test_purge_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7227,19 +7244,21 @@ def test_purge_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_purge_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_purge_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_purge_documents" - ) as pre: + 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.DocumentServiceRestInterceptor, "post_purge_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_purge_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_purge_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7294,8 +7313,9 @@ def test_batch_get_documents_metadata_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7359,18 +7379,22 @@ def test_batch_get_documents_metadata_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_batch_get_documents_metadata" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, - "post_batch_get_documents_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_batch_get_documents_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_get_documents_metadata", + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_get_documents_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "pre_batch_get_documents_metadata", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7433,8 +7457,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7500,8 +7525,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7567,8 +7593,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7872,11 +7899,14 @@ def test_document_service_base_transport(): def test_document_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport( @@ -7893,9 +7923,12 @@ def test_document_service_base_transport_with_credentials_file(): def test_document_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport() @@ -7967,11 +8000,12 @@ def test_document_service_transport_auth_gdch_credentials(transport_class): def test_document_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_engine_service.py index 848c03348e21..c029baea01da 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_engine_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.engine_service import ( EngineServiceAsyncClient, @@ -72,10 +72,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import common, engine, engine_service from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine -from google.cloud.discoveryengine_v1beta.types import engine_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -958,10 +956,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1003,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1041,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1291,13 +1286,13 @@ def test_engine_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6386,8 +6381,9 @@ def test_create_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6533,19 +6529,20 @@ def test_create_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_create_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_create_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_create_engine" - ) as pre: + 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.EngineServiceRestInterceptor, "post_create_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_create_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_create_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6600,8 +6597,9 @@ def test_delete_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6660,19 +6658,20 @@ def test_delete_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_delete_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_delete_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_delete_engine" - ) as pre: + 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.EngineServiceRestInterceptor, "post_delete_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_delete_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_delete_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6729,8 +6728,9 @@ def test_update_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6896,17 +6896,19 @@ def test_update_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_update_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_update_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_update_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_update_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_update_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_update_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6959,8 +6961,9 @@ def test_get_engine_rest_bad_request(request_type=engine_service.GetEngineReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7035,17 +7038,19 @@ def test_get_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_get_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_get_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_get_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_get_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_get_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_get_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7096,8 +7101,9 @@ def test_list_engines_rest_bad_request(request_type=engine_service.ListEnginesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7160,17 +7166,19 @@ def test_list_engines_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_list_engines" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_list_engines_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_list_engines" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_list_engines" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_list_engines_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_list_engines" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7225,8 +7233,9 @@ def test_pause_engine_rest_bad_request(request_type=engine_service.PauseEngineRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7301,17 +7310,19 @@ def test_pause_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_pause_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_pause_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_pause_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_pause_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_pause_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_pause_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7366,8 +7377,9 @@ def test_resume_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7442,17 +7454,19 @@ def test_resume_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_resume_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_resume_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_resume_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_resume_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_resume_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_resume_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7505,8 +7519,9 @@ def test_tune_engine_rest_bad_request(request_type=engine_service.TuneEngineRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7565,19 +7580,20 @@ def test_tune_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(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.EngineServiceRestInterceptor, "post_tune_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_tune_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_tune_engine" - ) as pre: + 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.EngineServiceRestInterceptor, "post_tune_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_tune_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_tune_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7635,8 +7651,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7702,8 +7719,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7769,8 +7787,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8072,11 +8091,14 @@ def test_engine_service_base_transport(): def test_engine_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EngineServiceTransport( @@ -8093,9 +8115,12 @@ def test_engine_service_base_transport_with_credentials_file(): def test_engine_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EngineServiceTransport() @@ -8167,11 +8192,12 @@ def test_engine_service_transport_auth_gdch_credentials(transport_class): def test_engine_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_evaluation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_evaluation_service.py index 4defdf119b37..94e8b19cec2e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_evaluation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_evaluation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.evaluation_service import ( EvaluationServiceAsyncClient, @@ -73,10 +73,13 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1beta.types import evaluation_service, search_service +from google.cloud.discoveryengine_v1beta.types import ( + common, + evaluation, + evaluation_service, + search_service, +) from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import evaluation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -996,10 +999,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1046,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1083,10 +1084,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1334,13 +1334,13 @@ def test_evaluation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1777,9 +1777,9 @@ def test_list_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -2298,9 +2298,9 @@ def test_create_evaluation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation] = ( + mock_rpc + ) request = {} client.create_evaluation(request) @@ -3324,9 +3324,9 @@ def test_list_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -3582,9 +3582,9 @@ def test_create_evaluation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation] = ( + mock_rpc + ) request = {} client.create_evaluation(request) @@ -4361,8 +4361,9 @@ def test_get_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4427,17 +4428,20 @@ def test_get_evaluation_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(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.EvaluationServiceRestInterceptor, "post_get_evaluation" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "post_get_evaluation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_get_evaluation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_get_evaluation" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_get_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_get_evaluation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4490,8 +4494,9 @@ def test_list_evaluations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4554,18 +4559,20 @@ def test_list_evaluations_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(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.EvaluationServiceRestInterceptor, "post_list_evaluations" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, - "post_list_evaluations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_list_evaluations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_list_evaluations" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_list_evaluations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_list_evaluations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4623,8 +4630,9 @@ def test_create_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4912,20 +4920,21 @@ def test_create_evaluation_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(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.EvaluationServiceRestInterceptor, "post_create_evaluation" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, - "post_create_evaluation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_create_evaluation" - ) as pre: + 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.EvaluationServiceRestInterceptor, "post_create_evaluation" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_create_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_create_evaluation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4980,8 +4989,9 @@ def test_list_evaluation_results_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5046,18 +5056,20 @@ def test_list_evaluation_results_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(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.EvaluationServiceRestInterceptor, "post_list_evaluation_results" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, - "post_list_evaluation_results_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_list_evaluation_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_list_evaluation_results" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_list_evaluation_results_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_list_evaluation_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5120,8 +5132,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5187,8 +5200,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5254,8 +5268,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5477,11 +5492,14 @@ def test_evaluation_service_base_transport(): def test_evaluation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EvaluationServiceTransport( @@ -5498,9 +5516,12 @@ def test_evaluation_service_base_transport_with_credentials_file(): def test_evaluation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EvaluationServiceTransport() @@ -5572,11 +5593,12 @@ def test_evaluation_service_transport_auth_gdch_credentials(transport_class): def test_evaluation_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_grounded_generation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_grounded_generation_service.py index 4851b2d5254b..863a20bee981 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_grounded_generation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -1012,10 +1017,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1060,10 +1064,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1099,10 +1102,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,13 +1363,13 @@ def test_grounded_generation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2572,8 +2574,9 @@ def test_generate_grounded_content_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2637,20 +2640,22 @@ def test_generate_grounded_content_rest_interceptors(null_interceptor): ) client = GroundedGenerationServiceClient(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.GroundedGenerationServiceRestInterceptor, - "post_generate_grounded_content", - ) as post, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "post_generate_grounded_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "pre_generate_grounded_content", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_generate_grounded_content", + ) as post, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_generate_grounded_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "pre_generate_grounded_content", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2714,8 +2719,9 @@ def test_check_grounding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2782,18 +2788,20 @@ def test_check_grounding_rest_interceptors(null_interceptor): ) client = GroundedGenerationServiceClient(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.GroundedGenerationServiceRestInterceptor, "post_check_grounding" - ) as post, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "post_check_grounding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, "pre_check_grounding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, "post_check_grounding" + ) as post, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_check_grounding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, "pre_check_grounding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2856,8 +2864,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2923,8 +2932,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2990,8 +3000,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3148,11 +3159,14 @@ def test_grounded_generation_service_base_transport(): def test_grounded_generation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroundedGenerationServiceTransport( @@ -3169,9 +3183,12 @@ def test_grounded_generation_service_base_transport_with_credentials_file(): def test_grounded_generation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroundedGenerationServiceTransport() @@ -3245,11 +3262,12 @@ def test_grounded_generation_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_project_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_project_service.py index a520e7110dc2..d59082d5ab40 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_project_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_project_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -955,10 +955,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1002,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1040,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1288,13 +1285,13 @@ def test_project_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1404,9 +1401,9 @@ def test_provision_project_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -1683,9 +1680,9 @@ def test_provision_project_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -2045,8 +2042,9 @@ def test_provision_project_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2103,19 +2101,21 @@ def test_provision_project_rest_interceptors(null_interceptor): ) client = ProjectServiceClient(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.ProjectServiceRestInterceptor, "post_provision_project" - ) as post, mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_provision_project_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectServiceRestInterceptor, "pre_provision_project" - ) as pre: + 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.ProjectServiceRestInterceptor, "post_provision_project" + ) as post, + mock.patch.object( + transports.ProjectServiceRestInterceptor, + "post_provision_project_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "pre_provision_project" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2173,8 +2173,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2240,8 +2241,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2307,8 +2309,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2465,11 +2468,14 @@ def test_project_service_base_transport(): def test_project_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectServiceTransport( @@ -2486,9 +2492,12 @@ def test_project_service_base_transport_with_credentials_file(): def test_project_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectServiceTransport() @@ -2560,11 +2569,12 @@ def test_project_service_transport_auth_gdch_credentials(transport_class): def test_project_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_rank_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_rank_service.py index 135fd656fbc8..c4ebbd6cb57d 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_rank_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_rank_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -923,10 +928,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -971,10 +975,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1010,10 +1013,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1242,13 +1244,13 @@ def test_rank_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1392,9 +1394,9 @@ async def test_rank_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.rank - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.rank] = ( + mock_rpc + ) request = {} await client.rank(request) @@ -1817,8 +1819,9 @@ def test_rank_rest_bad_request(request_type=rank_service.RankRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1880,17 +1883,15 @@ def test_rank_rest_interceptors(null_interceptor): ) client = RankServiceClient(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.RankServiceRestInterceptor, "post_rank" - ) as post, mock.patch.object( - transports.RankServiceRestInterceptor, "post_rank_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RankServiceRestInterceptor, "pre_rank" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RankServiceRestInterceptor, "post_rank") as post, + mock.patch.object( + transports.RankServiceRestInterceptor, "post_rank_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RankServiceRestInterceptor, "pre_rank") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1946,8 +1947,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2013,8 +2015,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2080,8 +2083,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2214,11 +2218,14 @@ def test_rank_service_base_transport(): def test_rank_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RankServiceTransport( @@ -2235,9 +2242,12 @@ def test_rank_service_base_transport_with_credentials_file(): def test_rank_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RankServiceTransport() @@ -2309,11 +2319,12 @@ def test_rank_service_transport_auth_gdch_credentials(transport_class): def test_rank_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_recommendation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_recommendation_service.py index 571d2e1c7a5f..217b63c3c1cc 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_recommendation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_recommendation_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.recommendation_service import ( RecommendationServiceAsyncClient, @@ -1002,10 +1007,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1050,10 +1054,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1089,10 +1092,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1348,13 +1350,13 @@ def test_recommendation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1945,8 +1947,9 @@ def test_recommend_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2015,17 +2018,20 @@ def test_recommend_rest_interceptors(null_interceptor): ) client = RecommendationServiceClient(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.RecommendationServiceRestInterceptor, "post_recommend" - ) as post, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "post_recommend_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "pre_recommend" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, "post_recommend" + ) as post, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, + "post_recommend_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, "pre_recommend" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2088,8 +2094,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2155,8 +2162,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2222,8 +2230,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2356,11 +2365,14 @@ def test_recommendation_service_base_transport(): def test_recommendation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RecommendationServiceTransport( @@ -2377,9 +2389,12 @@ def test_recommendation_service_base_transport_with_credentials_file(): def test_recommendation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RecommendationServiceTransport() @@ -2451,11 +2466,12 @@ def test_recommendation_service_transport_auth_gdch_credentials(transport_class) def test_recommendation_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_service.py index bc2ae04c11cd..9f00ddba2587 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.sample_query_service import ( SampleQueryServiceAsyncClient, @@ -72,10 +72,12 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1beta.types import ( + import_config, + sample_query, + sample_query_service, +) from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query -from google.cloud.discoveryengine_v1beta.types import import_config -from google.cloud.discoveryengine_v1beta.types import sample_query -from google.cloud.discoveryengine_v1beta.types import sample_query_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -999,10 +1001,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1048,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1086,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1337,13 +1336,13 @@ def test_sample_query_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1450,9 +1449,9 @@ def test_get_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query] = ( + mock_rpc + ) request = {} client.get_sample_query(request) @@ -1784,9 +1783,9 @@ def test_list_sample_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_queries] = ( + mock_rpc + ) request = {} client.list_sample_queries(request) @@ -2330,9 +2329,9 @@ def test_create_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sample_query] = ( + mock_rpc + ) request = {} client.create_sample_query(request) @@ -2700,9 +2699,9 @@ def test_update_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sample_query] = ( + mock_rpc + ) request = {} client.update_sample_query(request) @@ -3061,9 +3060,9 @@ def test_delete_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sample_query] = ( + mock_rpc + ) request = {} client.delete_sample_query(request) @@ -3392,9 +3391,9 @@ def test_import_sample_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_sample_queries] = ( + mock_rpc + ) request = {} client.import_sample_queries(request) @@ -3585,9 +3584,9 @@ def test_get_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query] = ( + mock_rpc + ) request = {} client.get_sample_query(request) @@ -3769,9 +3768,9 @@ def test_list_sample_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_queries] = ( + mock_rpc + ) request = {} client.list_sample_queries(request) @@ -4035,9 +4034,9 @@ def test_create_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sample_query] = ( + mock_rpc + ) request = {} client.create_sample_query(request) @@ -4252,9 +4251,9 @@ def test_update_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sample_query] = ( + mock_rpc + ) request = {} client.update_sample_query(request) @@ -4442,9 +4441,9 @@ def test_delete_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sample_query] = ( + mock_rpc + ) request = {} client.delete_sample_query(request) @@ -4622,9 +4621,9 @@ def test_import_sample_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_sample_queries] = ( + mock_rpc + ) request = {} client.import_sample_queries(request) @@ -5167,8 +5166,9 @@ def test_get_sample_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5233,18 +5233,20 @@ def test_get_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(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.SampleQueryServiceRestInterceptor, "post_get_sample_query" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_get_sample_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_get_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_get_sample_query" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_get_sample_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_get_sample_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5299,8 +5301,9 @@ def test_list_sample_queries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5365,18 +5368,20 @@ def test_list_sample_queries_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(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.SampleQueryServiceRestInterceptor, "post_list_sample_queries" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_list_sample_queries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_list_sample_queries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_list_sample_queries" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_list_sample_queries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_list_sample_queries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5436,8 +5441,9 @@ def test_create_sample_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5581,18 +5587,20 @@ def test_create_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(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.SampleQueryServiceRestInterceptor, "post_create_sample_query" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_create_sample_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_create_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_create_sample_query" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_create_sample_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_create_sample_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5651,8 +5659,9 @@ def test_update_sample_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5798,18 +5807,20 @@ def test_update_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(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.SampleQueryServiceRestInterceptor, "post_update_sample_query" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_update_sample_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_update_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_update_sample_query" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_update_sample_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_update_sample_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5866,8 +5877,9 @@ def test_delete_sample_query_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5926,13 +5938,13 @@ def test_delete_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(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.SampleQueryServiceRestInterceptor, "pre_delete_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_delete_sample_query" + ) as pre, + ): pre.assert_not_called() pb_message = sample_query_service.DeleteSampleQueryRequest.pb( sample_query_service.DeleteSampleQueryRequest() @@ -5979,8 +5991,9 @@ def test_import_sample_queries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6039,20 +6052,21 @@ def test_import_sample_queries_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(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.SampleQueryServiceRestInterceptor, "post_import_sample_queries" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_import_sample_queries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_import_sample_queries" - ) as pre: + 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.SampleQueryServiceRestInterceptor, "post_import_sample_queries" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_import_sample_queries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_import_sample_queries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6110,8 +6124,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6177,8 +6192,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6244,8 +6260,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6515,11 +6532,14 @@ def test_sample_query_service_base_transport(): def test_sample_query_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQueryServiceTransport( @@ -6536,9 +6556,12 @@ def test_sample_query_service_base_transport_with_credentials_file(): def test_sample_query_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQueryServiceTransport() @@ -6610,11 +6633,12 @@ def test_sample_query_service_transport_auth_gdch_credentials(transport_class): def test_sample_query_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_set_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_set_service.py index 37217734a641..bf564d5a891b 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_set_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_set_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.sample_query_set_service import ( SampleQuerySetServiceAsyncClient, @@ -62,11 +67,13 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1beta.types import ( + sample_query_set, + sample_query_set_service, +) from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set -from google.cloud.discoveryengine_v1beta.types import sample_query_set_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1004,10 +1011,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1058,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1096,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1350,13 +1354,13 @@ def test_sample_query_set_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1473,9 +1477,9 @@ def test_get_sample_query_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query_set] = ( + mock_rpc + ) request = {} client.get_sample_query_set(request) @@ -1822,9 +1826,9 @@ def test_list_sample_query_sets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_query_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_query_sets] = ( + mock_rpc + ) request = {} client.list_sample_query_sets(request) @@ -3359,9 +3363,9 @@ def test_get_sample_query_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query_set] = ( + mock_rpc + ) request = {} client.get_sample_query_set(request) @@ -3544,9 +3548,9 @@ def test_list_sample_query_sets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_query_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_query_sets] = ( + mock_rpc + ) request = {} client.list_sample_query_sets(request) @@ -4767,8 +4771,9 @@ def test_get_sample_query_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4837,18 +4842,20 @@ def test_get_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(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.SampleQuerySetServiceRestInterceptor, "post_get_sample_query_set" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_get_sample_query_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_get_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, "post_get_sample_query_set" + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_get_sample_query_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, "pre_get_sample_query_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4903,8 +4910,9 @@ def test_list_sample_query_sets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4969,18 +4977,22 @@ def test_list_sample_query_sets_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(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.SampleQuerySetServiceRestInterceptor, "post_list_sample_query_sets" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_list_sample_query_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_list_sample_query_sets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_list_sample_query_sets", + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_list_sample_query_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_list_sample_query_sets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5038,8 +5050,9 @@ def test_create_sample_query_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5181,18 +5194,22 @@ def test_create_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(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.SampleQuerySetServiceRestInterceptor, "post_create_sample_query_set" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_create_sample_query_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_create_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_create_sample_query_set", + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_create_sample_query_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_create_sample_query_set", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5254,8 +5271,9 @@ def test_update_sample_query_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5401,18 +5419,22 @@ def test_update_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(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.SampleQuerySetServiceRestInterceptor, "post_update_sample_query_set" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_update_sample_query_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_update_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_update_sample_query_set", + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_update_sample_query_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_update_sample_query_set", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5472,8 +5494,9 @@ def test_delete_sample_query_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5532,13 +5555,14 @@ def test_delete_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(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.SampleQuerySetServiceRestInterceptor, "pre_delete_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_delete_sample_query_set", + ) as pre, + ): pre.assert_not_called() pb_message = sample_query_set_service.DeleteSampleQuerySetRequest.pb( sample_query_set_service.DeleteSampleQuerySetRequest() @@ -5588,8 +5612,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5655,8 +5680,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5722,8 +5748,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5950,11 +5977,14 @@ def test_sample_query_set_service_base_transport(): def test_sample_query_set_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQuerySetServiceTransport( @@ -5971,9 +6001,12 @@ def test_sample_query_set_service_base_transport_with_credentials_file(): def test_sample_query_set_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQuerySetServiceTransport() @@ -6047,11 +6080,12 @@ def test_sample_query_set_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_schema_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_schema_service.py index 482a248978cf..2ce224ad4ad3 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_schema_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_schema_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.schema_service import ( SchemaServiceAsyncClient, @@ -71,9 +71,8 @@ pagers, transports, ) -from google.cloud.discoveryengine_v1beta.types import schema +from google.cloud.discoveryengine_v1beta.types import schema, schema_service from google.cloud.discoveryengine_v1beta.types import schema as gcd_schema -from google.cloud.discoveryengine_v1beta.types import schema_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -956,10 +955,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1004,10 +1002,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1040,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,13 +1285,13 @@ def test_schema_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4451,8 +4447,9 @@ def test_get_schema_rest_bad_request(request_type=schema_service.GetSchemaReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4518,17 +4515,19 @@ def test_get_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_get_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_get_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_get_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_get_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_get_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_get_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4579,8 +4578,9 @@ def test_list_schemas_rest_bad_request(request_type=schema_service.ListSchemasRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4643,17 +4643,19 @@ def test_list_schemas_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_list_schemas" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_list_schemas_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_list_schemas" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_list_schemas" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_list_schemas_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_list_schemas" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4708,8 +4710,9 @@ def test_create_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4838,19 +4841,20 @@ def test_create_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_create_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_create_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_create_schema" - ) as pre: + 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.SchemaServiceRestInterceptor, "post_create_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_create_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_create_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4907,8 +4911,9 @@ def test_update_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5041,19 +5046,20 @@ def test_update_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_update_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_update_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_update_schema" - ) as pre: + 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.SchemaServiceRestInterceptor, "post_update_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_update_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_update_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5108,8 +5114,9 @@ def test_delete_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5168,19 +5175,20 @@ def test_delete_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(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.SchemaServiceRestInterceptor, "post_delete_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_delete_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_delete_schema" - ) as pre: + 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.SchemaServiceRestInterceptor, "post_delete_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_delete_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_delete_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5238,8 +5246,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5305,8 +5314,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5372,8 +5382,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5612,11 +5623,14 @@ def test_schema_service_base_transport(): def test_schema_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SchemaServiceTransport( @@ -5633,9 +5647,12 @@ def test_schema_service_base_transport_with_credentials_file(): def test_schema_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SchemaServiceTransport() @@ -5707,11 +5724,12 @@ def test_schema_service_transport_auth_gdch_credentials(transport_class): def test_schema_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_service.py index d5ad39001222..0412fd694cc6 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.search_service import ( SearchServiceAsyncClient, @@ -944,10 +949,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -992,10 +996,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1034,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1277,13 +1279,13 @@ def test_search_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1459,9 +1461,9 @@ async def test_search_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.search - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.search] = ( + mock_rpc + ) request = {} await client.search(request) @@ -1776,7 +1778,9 @@ async def test_search_async_pages(): pages = [] # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 - async for page_ in (await client.search(request={})).pages: # pragma: no branch + async for page_ in ( # pragma: no branch + await client.search(request={}) + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token @@ -2875,8 +2879,9 @@ def test_search_rest_bad_request(request_type=search_service.SearchRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2951,17 +2956,17 @@ def test_search_rest_interceptors(null_interceptor): ) client = SearchServiceClient(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.SearchServiceRestInterceptor, "post_search" - ) as post, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SearchServiceRestInterceptor, "pre_search" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search" + ) as post, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SearchServiceRestInterceptor, "pre_search") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3014,8 +3019,9 @@ def test_search_lite_rest_bad_request(request_type=search_service.SearchRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3090,17 +3096,19 @@ def test_search_lite_rest_interceptors(null_interceptor): ) client = SearchServiceClient(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.SearchServiceRestInterceptor, "post_search_lite" - ) as post, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search_lite_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SearchServiceRestInterceptor, "pre_search_lite" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_lite" + ) as post, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_lite_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SearchServiceRestInterceptor, "pre_search_lite" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3158,8 +3166,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3225,8 +3234,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3292,8 +3302,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3447,11 +3458,14 @@ def test_search_service_base_transport(): def test_search_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchServiceTransport( @@ -3468,9 +3482,12 @@ def test_search_service_base_transport_with_credentials_file(): def test_search_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchServiceTransport() @@ -3542,11 +3559,12 @@ def test_search_service_transport_auth_gdch_credentials(transport_class): def test_search_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_tuning_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_tuning_service.py index 1b6b5db8e6bc..7cfcaa60aa93 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_tuning_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,11 +55,8 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -1006,10 +1006,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1054,10 +1053,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1093,10 +1091,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1352,13 +1349,13 @@ def test_search_tuning_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1472,9 +1469,9 @@ def test_train_custom_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -1732,9 +1729,9 @@ def test_list_custom_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -1917,9 +1914,9 @@ def test_train_custom_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -2043,9 +2040,9 @@ def test_list_custom_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -2386,8 +2383,9 @@ def test_train_custom_model_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2446,20 +2444,21 @@ def test_train_custom_model_rest_interceptors(null_interceptor): ) client = SearchTuningServiceClient(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.SearchTuningServiceRestInterceptor, "post_train_custom_model" - ) as post, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, - "post_train_custom_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "pre_train_custom_model" - ) as pre: + 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.SearchTuningServiceRestInterceptor, "post_train_custom_model" + ) as post, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, + "post_train_custom_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "pre_train_custom_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2514,8 +2513,9 @@ def test_list_custom_models_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2577,18 +2577,20 @@ def test_list_custom_models_rest_interceptors(null_interceptor): ) client = SearchTuningServiceClient(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.SearchTuningServiceRestInterceptor, "post_list_custom_models" - ) as post, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, - "post_list_custom_models_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "pre_list_custom_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "post_list_custom_models" + ) as post, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, + "post_list_custom_models_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "pre_list_custom_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2651,8 +2653,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2718,8 +2721,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2785,8 +2789,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2966,11 +2971,14 @@ def test_search_tuning_service_base_transport(): def test_search_tuning_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchTuningServiceTransport( @@ -2987,9 +2995,12 @@ def test_search_tuning_service_base_transport_with_credentials_file(): def test_search_tuning_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchTuningServiceTransport() @@ -3061,11 +3072,12 @@ def test_search_tuning_service_transport_auth_gdch_credentials(transport_class): def test_search_tuning_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_serving_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_serving_config_service.py index ca6e16decd4f..a084452e512f 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_serving_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_serving_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.serving_config_service import ( ServingConfigServiceAsyncClient, @@ -62,12 +67,15 @@ pagers, transports, ) +from google.cloud.discoveryengine_v1beta.types import ( + common, + search_service, + serving_config, + serving_config_service, +) from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import common, search_service -from google.cloud.discoveryengine_v1beta.types import serving_config -from google.cloud.discoveryengine_v1beta.types import serving_config_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1001,10 +1009,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1049,10 +1056,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1088,10 +1094,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1347,13 +1352,13 @@ def test_serving_config_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1489,9 +1494,9 @@ def test_update_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -1917,9 +1922,9 @@ def test_get_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serving_config] = ( + mock_rpc + ) request = {} client.get_serving_config(request) @@ -2287,9 +2292,9 @@ def test_list_serving_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_serving_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_serving_configs] = ( + mock_rpc + ) request = {} client.list_serving_configs(request) @@ -2764,9 +2769,9 @@ def test_update_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -2958,9 +2963,9 @@ def test_get_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serving_config] = ( + mock_rpc + ) request = {} client.get_serving_config(request) @@ -3142,9 +3147,9 @@ def test_list_serving_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_serving_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_serving_configs] = ( + mock_rpc + ) request = {} client.list_serving_configs(request) @@ -3712,8 +3717,9 @@ def test_update_serving_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3953,18 +3959,20 @@ def test_update_serving_config_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(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.ServingConfigServiceRestInterceptor, "post_update_serving_config" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_update_serving_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_update_serving_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_update_serving_config" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_update_serving_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_update_serving_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4021,8 +4029,9 @@ def test_get_serving_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4113,18 +4122,20 @@ def test_get_serving_config_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(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.ServingConfigServiceRestInterceptor, "post_get_serving_config" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_get_serving_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_get_serving_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_get_serving_config" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_get_serving_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_get_serving_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4179,8 +4190,9 @@ def test_list_serving_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4245,18 +4257,20 @@ def test_list_serving_configs_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(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.ServingConfigServiceRestInterceptor, "post_list_serving_configs" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_list_serving_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_list_serving_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_list_serving_configs" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_list_serving_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_list_serving_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4319,8 +4333,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4386,8 +4401,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4453,8 +4469,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4635,11 +4652,14 @@ def test_serving_config_service_base_transport(): def test_serving_config_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServingConfigServiceTransport( @@ -4656,9 +4676,12 @@ def test_serving_config_service_base_transport_with_credentials_file(): def test_serving_config_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServingConfigServiceTransport() @@ -4730,11 +4753,12 @@ def test_serving_config_service_transport_auth_gdch_credentials(transport_class) def test_serving_config_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_session_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_session_service.py index 6b0e3feaf4fc..1ae25afbbe08 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_session_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_session_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.session_service import ( SessionServiceAsyncClient, @@ -66,8 +71,8 @@ from google.cloud.discoveryengine_v1beta.types import ( answer, conversational_search_service, + session, ) -from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session CRED_INFO_JSON = { @@ -955,10 +960,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1007,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1045,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1288,13 +1290,13 @@ def test_session_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4561,8 +4563,9 @@ def test_create_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4808,17 +4811,20 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_create_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_create_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4873,8 +4879,9 @@ def test_delete_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4933,13 +4940,13 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "pre_delete_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteSessionRequest.pb( conversational_search_service.DeleteSessionRequest() @@ -4988,8 +4995,9 @@ def test_update_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5239,17 +5247,20 @@ def test_update_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_update_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_update_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_update_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_update_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, + "post_update_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_update_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5304,8 +5315,9 @@ def test_get_session_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5378,17 +5390,19 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_get_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_get_session_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5441,8 +5455,9 @@ def test_list_sessions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5507,17 +5522,19 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = SessionServiceClient(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.SessionServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_list_sessions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_sessions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5580,8 +5597,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5647,8 +5665,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5714,8 +5733,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5932,11 +5952,14 @@ def test_session_service_base_transport(): def test_session_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionServiceTransport( @@ -5953,9 +5976,12 @@ def test_session_service_base_transport_with_credentials_file(): def test_session_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionServiceTransport() @@ -6027,11 +6053,12 @@ def test_session_service_transport_auth_gdch_credentials(transport_class): def test_session_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_site_search_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_site_search_engine_service.py index f46435b6b588..4bba2265478d 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_site_search_engine_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +57,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( SiteSearchEngineServiceAsyncClient, @@ -1014,10 +1014,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1062,10 +1061,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1101,10 +1099,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,13 +1357,13 @@ def test_site_search_engine_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1480,9 +1477,9 @@ def test_get_site_search_engine_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -1819,9 +1816,9 @@ def test_create_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -2784,9 +2781,9 @@ def test_update_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -3130,9 +3127,9 @@ def test_delete_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -3481,9 +3478,9 @@ def test_list_target_sites_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -6448,9 +6445,9 @@ def test_get_site_search_engine_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -6632,9 +6629,9 @@ def test_create_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -7141,9 +7138,9 @@ def test_update_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -7322,9 +7319,9 @@ def test_delete_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -7503,9 +7500,9 @@ def test_list_target_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -9919,8 +9916,9 @@ def test_get_site_search_engine_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9985,18 +9983,22 @@ def test_get_site_search_engine_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_get_site_search_engine" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_site_search_engine_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_get_site_search_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_site_search_engine", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_site_search_engine_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_get_site_search_engine", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10056,8 +10058,9 @@ def test_create_target_site_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10200,20 +10203,21 @@ def test_create_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_create_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_create_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_create_target_site" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_create_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_create_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_create_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10268,8 +10272,9 @@ def test_batch_create_target_sites_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10328,22 +10333,23 @@ def test_batch_create_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_batch_create_target_sites", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_create_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_batch_create_target_sites", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_batch_create_target_sites", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_create_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_batch_create_target_sites", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10398,8 +10404,9 @@ def test_get_target_site_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10478,18 +10485,20 @@ def test_get_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_get_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_get_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_get_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_get_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10548,8 +10557,9 @@ def test_update_target_site_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10694,20 +10704,21 @@ def test_update_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_update_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_update_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_update_target_site" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_update_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_update_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_update_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10762,8 +10773,9 @@ def test_delete_target_site_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10822,20 +10834,21 @@ def test_delete_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_delete_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_delete_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_target_site" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_delete_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_delete_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10890,8 +10903,9 @@ def test_list_target_sites_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10960,18 +10974,20 @@ def test_list_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_list_target_sites" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_list_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_list_target_sites" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_list_target_sites" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_list_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_list_target_sites" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11031,8 +11047,9 @@ def test_create_sitemap_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11163,20 +11180,21 @@ def test_create_sitemap_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_create_sitemap" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_create_sitemap_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_create_sitemap" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_create_sitemap" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_create_sitemap_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_create_sitemap" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11231,8 +11249,9 @@ def test_delete_sitemap_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11291,20 +11310,21 @@ def test_delete_sitemap_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_delete_sitemap" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_delete_sitemap_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_sitemap" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_delete_sitemap" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_delete_sitemap_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_sitemap" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11359,8 +11379,9 @@ def test_fetch_sitemaps_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11422,18 +11443,20 @@ def test_fetch_sitemaps_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_fetch_sitemaps" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_sitemaps_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_fetch_sitemaps" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_fetch_sitemaps" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_sitemaps_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_fetch_sitemaps" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11493,8 +11516,9 @@ def test_enable_advanced_site_search_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11553,22 +11577,23 @@ def test_enable_advanced_site_search_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_enable_advanced_site_search", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_enable_advanced_site_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_enable_advanced_site_search", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_enable_advanced_site_search", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_enable_advanced_site_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_enable_advanced_site_search", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11623,8 +11648,9 @@ def test_disable_advanced_site_search_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11683,22 +11709,23 @@ def test_disable_advanced_site_search_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_disable_advanced_site_search", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_disable_advanced_site_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_disable_advanced_site_search", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_disable_advanced_site_search", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_disable_advanced_site_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_disable_advanced_site_search", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11753,8 +11780,9 @@ def test_recrawl_uris_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11813,20 +11841,21 @@ def test_recrawl_uris_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, "post_recrawl_uris" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_recrawl_uris_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_recrawl_uris" - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, "post_recrawl_uris" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_recrawl_uris_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_recrawl_uris" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11881,8 +11910,9 @@ def test_batch_verify_target_sites_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11941,22 +11971,23 @@ def test_batch_verify_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_batch_verify_target_sites", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_verify_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_batch_verify_target_sites", - ) as pre: + 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.SiteSearchEngineServiceRestInterceptor, + "post_batch_verify_target_sites", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_verify_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_batch_verify_target_sites", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12011,8 +12042,9 @@ def test_fetch_domain_verification_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12083,20 +12115,22 @@ def test_fetch_domain_verification_status_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(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.SiteSearchEngineServiceRestInterceptor, - "post_fetch_domain_verification_status", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_domain_verification_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_fetch_domain_verification_status", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_domain_verification_status", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_domain_verification_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_fetch_domain_verification_status", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12163,8 +12197,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12230,8 +12265,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12297,8 +12333,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12767,11 +12804,14 @@ def test_site_search_engine_service_base_transport(): def test_site_search_engine_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteSearchEngineServiceTransport( @@ -12788,9 +12828,12 @@ def test_site_search_engine_service_base_transport_with_credentials_file(): def test_site_search_engine_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteSearchEngineServiceTransport() @@ -12864,11 +12907,12 @@ def test_site_search_engine_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_user_event_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_user_event_service.py index 0d6b90d515f3..3d018c25286c 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_user_event_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_user_event_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,8 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,20 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore from google.cloud.discoveryengine_v1beta.services.user_event_service import ( UserEventServiceAsyncClient, @@ -991,10 +991,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1038,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1076,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1329,13 +1326,13 @@ def test_user_event_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1460,9 +1457,9 @@ def test_write_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -1734,9 +1731,9 @@ def test_collect_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -1989,9 +1986,9 @@ def test_purge_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2248,9 +2245,9 @@ def test_import_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -2440,9 +2437,9 @@ def test_write_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -2575,9 +2572,9 @@ def test_collect_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -2730,9 +2727,9 @@ def test_purge_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2868,9 +2865,9 @@ def test_import_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -3319,8 +3316,9 @@ def test_write_user_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3528,18 +3526,20 @@ def test_write_user_event_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(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.UserEventServiceRestInterceptor, "post_write_user_event" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_write_user_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_write_user_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_write_user_event" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_write_user_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_write_user_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3592,8 +3592,9 @@ def test_collect_user_event_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3655,18 +3656,20 @@ def test_collect_user_event_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(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.UserEventServiceRestInterceptor, "post_collect_user_event" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_collect_user_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_collect_user_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_collect_user_event" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_collect_user_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_collect_user_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3719,8 +3722,9 @@ def test_purge_user_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3777,20 +3781,21 @@ def test_purge_user_events_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(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.UserEventServiceRestInterceptor, "post_purge_user_events" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_purge_user_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_purge_user_events" - ) as pre: + 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.UserEventServiceRestInterceptor, "post_purge_user_events" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_purge_user_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_purge_user_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3843,8 +3848,9 @@ def test_import_user_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3901,20 +3907,21 @@ def test_import_user_events_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(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.UserEventServiceRestInterceptor, "post_import_user_events" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_import_user_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_import_user_events" - ) as pre: + 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.UserEventServiceRestInterceptor, "post_import_user_events" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_import_user_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_import_user_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3972,8 +3979,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4039,8 +4047,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4106,8 +4115,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4331,11 +4341,14 @@ def test_user_event_service_base_transport(): def test_user_event_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserEventServiceTransport( @@ -4352,9 +4365,12 @@ def test_user_event_service_base_transport_with_credentials_file(): def test_user_event_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserEventServiceTransport() @@ -4426,11 +4442,12 @@ def test_user_event_service_transport_auth_gdch_credentials(transport_class): def test_user_event_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dlp/docs/conf.py b/packages/google-cloud-dlp/docs/conf.py index b6d93475f1b2..c2ae1ad266c7 100644 --- a/packages/google-cloud-dlp/docs/conf.py +++ b/packages/google-cloud-dlp/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-dlp documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/__init__.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/__init__.py index 92b8084459ba..15ad56eaaaff 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/__init__.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dlp_service import DlpServiceAsyncClient, DlpServiceClient from .types.dlp import ( Action, diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/async_client.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/async_client.py index e5f24e2f4ad8..bdf3430fe6d7 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/async_client.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dlp_v2 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dlp_v2.services.dlp_service import pagers from google.cloud.dlp_v2.types import dlp, storage @@ -159,7 +159,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DlpServiceAsyncClient: The constructed client. """ - return DlpServiceClient.from_service_account_info.__func__(DlpServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DlpServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DlpServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -175,7 +176,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DlpServiceAsyncClient: The constructed client. """ - return DlpServiceClient.from_service_account_file.__func__(DlpServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DlpServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DlpServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/client.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/client.py index ee5887c22cc5..2b2e5fbdbe99 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/client.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.dlp_v2 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dlp_v2.services.dlp_service import pagers from google.cloud.dlp_v2.types import dlp, storage @@ -875,11 +875,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DlpServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DlpServiceClient._read_environment_variables() + ) self._client_cert_source = DlpServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -914,8 +912,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DlpServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/pagers.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/pagers.py index 72bcff57c828..eb1e40f21d86 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/pagers.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1159,7 +1159,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1235,7 +1235,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1315,7 +1315,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1391,7 +1391,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1471,7 +1471,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1547,7 +1547,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1627,7 +1627,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1703,7 +1703,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1783,7 +1783,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1859,7 +1859,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/base.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/base.py index 81bc0f97e041..784a5afda500 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/base.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.dlp_v2 import gapic_version as package_version from google.cloud.dlp_v2.types import dlp diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc.py index b0424d314079..59233c153bd4 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.dlp_v2.types import dlp @@ -666,12 +666,12 @@ def create_deidentify_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_deidentify_template" not in self._stubs: - self._stubs[ - "create_deidentify_template" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate", - request_serializer=dlp.CreateDeidentifyTemplateRequest.serialize, - response_deserializer=dlp.DeidentifyTemplate.deserialize, + self._stubs["create_deidentify_template"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate", + request_serializer=dlp.CreateDeidentifyTemplateRequest.serialize, + response_deserializer=dlp.DeidentifyTemplate.deserialize, + ) ) return self._stubs["create_deidentify_template"] @@ -697,12 +697,12 @@ def update_deidentify_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_deidentify_template" not in self._stubs: - self._stubs[ - "update_deidentify_template" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate", - request_serializer=dlp.UpdateDeidentifyTemplateRequest.serialize, - response_deserializer=dlp.DeidentifyTemplate.deserialize, + self._stubs["update_deidentify_template"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate", + request_serializer=dlp.UpdateDeidentifyTemplateRequest.serialize, + response_deserializer=dlp.DeidentifyTemplate.deserialize, + ) ) return self._stubs["update_deidentify_template"] @@ -788,12 +788,12 @@ def delete_deidentify_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_deidentify_template" not in self._stubs: - self._stubs[ - "delete_deidentify_template" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate", - request_serializer=dlp.DeleteDeidentifyTemplateRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_deidentify_template"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate", + request_serializer=dlp.DeleteDeidentifyTemplateRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_deidentify_template"] @@ -878,12 +878,12 @@ def hybrid_inspect_job_trigger( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "hybrid_inspect_job_trigger" not in self._stubs: - self._stubs[ - "hybrid_inspect_job_trigger" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/HybridInspectJobTrigger", - request_serializer=dlp.HybridInspectJobTriggerRequest.serialize, - response_deserializer=dlp.HybridInspectResponse.deserialize, + self._stubs["hybrid_inspect_job_trigger"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/HybridInspectJobTrigger", + request_serializer=dlp.HybridInspectJobTriggerRequest.serialize, + response_deserializer=dlp.HybridInspectResponse.deserialize, + ) ) return self._stubs["hybrid_inspect_job_trigger"] @@ -1454,12 +1454,12 @@ def list_project_data_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_project_data_profiles" not in self._stubs: - self._stubs[ - "list_project_data_profiles" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/ListProjectDataProfiles", - request_serializer=dlp.ListProjectDataProfilesRequest.serialize, - response_deserializer=dlp.ListProjectDataProfilesResponse.deserialize, + self._stubs["list_project_data_profiles"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/ListProjectDataProfiles", + request_serializer=dlp.ListProjectDataProfilesRequest.serialize, + response_deserializer=dlp.ListProjectDataProfilesResponse.deserialize, + ) ) return self._stubs["list_project_data_profiles"] @@ -1566,12 +1566,12 @@ def list_file_store_data_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_file_store_data_profiles" not in self._stubs: - self._stubs[ - "list_file_store_data_profiles" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/ListFileStoreDataProfiles", - request_serializer=dlp.ListFileStoreDataProfilesRequest.serialize, - response_deserializer=dlp.ListFileStoreDataProfilesResponse.deserialize, + self._stubs["list_file_store_data_profiles"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/ListFileStoreDataProfiles", + request_serializer=dlp.ListFileStoreDataProfilesRequest.serialize, + response_deserializer=dlp.ListFileStoreDataProfilesResponse.deserialize, + ) ) return self._stubs["list_file_store_data_profiles"] @@ -1594,12 +1594,12 @@ def get_file_store_data_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_file_store_data_profile" not in self._stubs: - self._stubs[ - "get_file_store_data_profile" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/GetFileStoreDataProfile", - request_serializer=dlp.GetFileStoreDataProfileRequest.serialize, - response_deserializer=dlp.FileStoreDataProfile.deserialize, + self._stubs["get_file_store_data_profile"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/GetFileStoreDataProfile", + request_serializer=dlp.GetFileStoreDataProfileRequest.serialize, + response_deserializer=dlp.FileStoreDataProfile.deserialize, + ) ) return self._stubs["get_file_store_data_profile"] @@ -1624,12 +1624,12 @@ def delete_file_store_data_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_file_store_data_profile" not in self._stubs: - self._stubs[ - "delete_file_store_data_profile" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/DeleteFileStoreDataProfile", - request_serializer=dlp.DeleteFileStoreDataProfileRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_file_store_data_profile"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/DeleteFileStoreDataProfile", + request_serializer=dlp.DeleteFileStoreDataProfileRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_file_store_data_profile"] diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc_asyncio.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc_asyncio.py index a6e9744f21da..845059f8ffdd 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.dlp_v2.types import dlp @@ -682,12 +682,12 @@ def create_deidentify_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_deidentify_template" not in self._stubs: - self._stubs[ - "create_deidentify_template" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate", - request_serializer=dlp.CreateDeidentifyTemplateRequest.serialize, - response_deserializer=dlp.DeidentifyTemplate.deserialize, + self._stubs["create_deidentify_template"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/CreateDeidentifyTemplate", + request_serializer=dlp.CreateDeidentifyTemplateRequest.serialize, + response_deserializer=dlp.DeidentifyTemplate.deserialize, + ) ) return self._stubs["create_deidentify_template"] @@ -715,12 +715,12 @@ def update_deidentify_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_deidentify_template" not in self._stubs: - self._stubs[ - "update_deidentify_template" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate", - request_serializer=dlp.UpdateDeidentifyTemplateRequest.serialize, - response_deserializer=dlp.DeidentifyTemplate.deserialize, + self._stubs["update_deidentify_template"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/UpdateDeidentifyTemplate", + request_serializer=dlp.UpdateDeidentifyTemplateRequest.serialize, + response_deserializer=dlp.DeidentifyTemplate.deserialize, + ) ) return self._stubs["update_deidentify_template"] @@ -809,12 +809,12 @@ def delete_deidentify_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_deidentify_template" not in self._stubs: - self._stubs[ - "delete_deidentify_template" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate", - request_serializer=dlp.DeleteDeidentifyTemplateRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_deidentify_template"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate", + request_serializer=dlp.DeleteDeidentifyTemplateRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_deidentify_template"] @@ -901,12 +901,12 @@ def hybrid_inspect_job_trigger( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "hybrid_inspect_job_trigger" not in self._stubs: - self._stubs[ - "hybrid_inspect_job_trigger" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/HybridInspectJobTrigger", - request_serializer=dlp.HybridInspectJobTriggerRequest.serialize, - response_deserializer=dlp.HybridInspectResponse.deserialize, + self._stubs["hybrid_inspect_job_trigger"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/HybridInspectJobTrigger", + request_serializer=dlp.HybridInspectJobTriggerRequest.serialize, + response_deserializer=dlp.HybridInspectResponse.deserialize, + ) ) return self._stubs["hybrid_inspect_job_trigger"] @@ -1490,12 +1490,12 @@ def list_project_data_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_project_data_profiles" not in self._stubs: - self._stubs[ - "list_project_data_profiles" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/ListProjectDataProfiles", - request_serializer=dlp.ListProjectDataProfilesRequest.serialize, - response_deserializer=dlp.ListProjectDataProfilesResponse.deserialize, + self._stubs["list_project_data_profiles"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/ListProjectDataProfiles", + request_serializer=dlp.ListProjectDataProfilesRequest.serialize, + response_deserializer=dlp.ListProjectDataProfilesResponse.deserialize, + ) ) return self._stubs["list_project_data_profiles"] @@ -1606,12 +1606,12 @@ def list_file_store_data_profiles( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_file_store_data_profiles" not in self._stubs: - self._stubs[ - "list_file_store_data_profiles" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/ListFileStoreDataProfiles", - request_serializer=dlp.ListFileStoreDataProfilesRequest.serialize, - response_deserializer=dlp.ListFileStoreDataProfilesResponse.deserialize, + self._stubs["list_file_store_data_profiles"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/ListFileStoreDataProfiles", + request_serializer=dlp.ListFileStoreDataProfilesRequest.serialize, + response_deserializer=dlp.ListFileStoreDataProfilesResponse.deserialize, + ) ) return self._stubs["list_file_store_data_profiles"] @@ -1636,12 +1636,12 @@ def get_file_store_data_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_file_store_data_profile" not in self._stubs: - self._stubs[ - "get_file_store_data_profile" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/GetFileStoreDataProfile", - request_serializer=dlp.GetFileStoreDataProfileRequest.serialize, - response_deserializer=dlp.FileStoreDataProfile.deserialize, + self._stubs["get_file_store_data_profile"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/GetFileStoreDataProfile", + request_serializer=dlp.GetFileStoreDataProfileRequest.serialize, + response_deserializer=dlp.FileStoreDataProfile.deserialize, + ) ) return self._stubs["get_file_store_data_profile"] @@ -1666,12 +1666,12 @@ def delete_file_store_data_profile( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_file_store_data_profile" not in self._stubs: - self._stubs[ - "delete_file_store_data_profile" - ] = self._logged_channel.unary_unary( - "/google.privacy.dlp.v2.DlpService/DeleteFileStoreDataProfile", - request_serializer=dlp.DeleteFileStoreDataProfileRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_file_store_data_profile"] = ( + self._logged_channel.unary_unary( + "/google.privacy.dlp.v2.DlpService/DeleteFileStoreDataProfile", + request_serializer=dlp.DeleteFileStoreDataProfileRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_file_store_data_profile"] diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest.py index 92ec00cf39de..0bc2e64f634f 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -3008,7 +3008,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3260,9 +3260,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseCreateDeidentifyTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseCreateDeidentifyTemplate._get_http_options() request, metadata = self._interceptor.pre_create_deidentify_template( request, metadata @@ -3420,9 +3418,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseCreateDiscoveryConfig._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseCreateDiscoveryConfig._get_http_options() request, metadata = self._interceptor.pre_create_discovery_config( request, metadata @@ -3742,9 +3738,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseCreateInspectTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseCreateInspectTemplate._get_http_options() request, metadata = self._interceptor.pre_create_inspect_template( request, metadata @@ -4054,9 +4048,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseCreateStoredInfoType._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseCreateStoredInfoType._get_http_options() request, metadata = self._interceptor.pre_create_stored_info_type( request, metadata @@ -4379,7 +4371,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4465,9 +4457,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseDeleteDeidentifyTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseDeleteDeidentifyTemplate._get_http_options() request, metadata = self._interceptor.pre_delete_deidentify_template( request, metadata @@ -4489,7 +4479,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4574,9 +4564,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseDeleteDiscoveryConfig._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseDeleteDiscoveryConfig._get_http_options() request, metadata = self._interceptor.pre_delete_discovery_config( request, metadata @@ -4598,7 +4586,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4709,7 +4697,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4795,9 +4783,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseDeleteFileStoreDataProfile._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseDeleteFileStoreDataProfile._get_http_options() request, metadata = self._interceptor.pre_delete_file_store_data_profile( request, metadata @@ -4819,7 +4805,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4906,9 +4892,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseDeleteInspectTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseDeleteInspectTemplate._get_http_options() request, metadata = self._interceptor.pre_delete_inspect_template( request, metadata @@ -4930,7 +4914,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5038,7 +5022,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5123,9 +5107,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseDeleteStoredInfoType._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseDeleteStoredInfoType._get_http_options() request, metadata = self._interceptor.pre_delete_stored_info_type( request, metadata @@ -5147,7 +5129,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5232,9 +5214,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseDeleteTableDataProfile._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseDeleteTableDataProfile._get_http_options() request, metadata = self._interceptor.pre_delete_table_data_profile( request, metadata @@ -5256,7 +5236,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5374,7 +5354,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5465,9 +5445,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseGetColumnDataProfile._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseGetColumnDataProfile._get_http_options() request, metadata = self._interceptor.pre_get_column_data_profile( request, metadata @@ -5768,9 +5746,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseGetDeidentifyTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseGetDeidentifyTemplate._get_http_options() request, metadata = self._interceptor.pre_get_deidentify_template( request, metadata @@ -6223,9 +6199,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseGetFileStoreDataProfile._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseGetFileStoreDataProfile._get_http_options() request, metadata = self._interceptor.pre_get_file_store_data_profile( request, metadata @@ -6679,9 +6653,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseGetProjectDataProfile._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseGetProjectDataProfile._get_http_options() request, metadata = self._interceptor.pre_get_project_data_profile( request, metadata @@ -6975,9 +6947,7 @@ def __call__( The profile for a scanned table. """ - http_options = ( - _BaseDlpServiceRestTransport._BaseGetTableDataProfile._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseGetTableDataProfile._get_http_options() request, metadata = self._interceptor.pre_get_table_data_profile( request, metadata @@ -7125,9 +7095,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseHybridInspectDlpJob._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseHybridInspectDlpJob._get_http_options() request, metadata = self._interceptor.pre_hybrid_inspect_dlp_job( request, metadata @@ -7281,9 +7249,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseHybridInspectJobTrigger._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseHybridInspectJobTrigger._get_http_options() request, metadata = self._interceptor.pre_hybrid_inspect_job_trigger( request, metadata @@ -7591,9 +7557,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListColumnDataProfiles._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListColumnDataProfiles._get_http_options() request, metadata = self._interceptor.pre_list_column_data_profiles( request, metadata @@ -7888,9 +7852,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListDeidentifyTemplates._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListDeidentifyTemplates._get_http_options() request, metadata = self._interceptor.pre_list_deidentify_templates( request, metadata @@ -8039,9 +8001,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListDiscoveryConfigs._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListDiscoveryConfigs._get_http_options() request, metadata = self._interceptor.pre_list_discovery_configs( request, metadata @@ -8344,9 +8304,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListFileStoreDataProfiles._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListFileStoreDataProfiles._get_http_options() request, metadata = self._interceptor.pre_list_file_store_data_profiles( request, metadata @@ -8410,11 +8368,10 @@ def __call__( resp = self._interceptor.post_list_file_store_data_profiles(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_file_store_data_profiles_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_file_store_data_profiles_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8648,9 +8605,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListInspectTemplates._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListInspectTemplates._get_http_options() request, metadata = self._interceptor.pre_list_inspect_templates( request, metadata @@ -8947,9 +8902,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListProjectDataProfiles._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListProjectDataProfiles._get_http_options() request, metadata = self._interceptor.pre_list_project_data_profiles( request, metadata @@ -9098,9 +9051,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListStoredInfoTypes._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListStoredInfoTypes._get_http_options() request, metadata = self._interceptor.pre_list_stored_info_types( request, metadata @@ -9248,9 +9199,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseListTableDataProfiles._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseListTableDataProfiles._get_http_options() request, metadata = self._interceptor.pre_list_table_data_profiles( request, metadata @@ -10016,9 +9965,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseUpdateDeidentifyTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseUpdateDeidentifyTemplate._get_http_options() request, metadata = self._interceptor.pre_update_deidentify_template( request, metadata @@ -10176,9 +10123,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseUpdateDiscoveryConfig._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseUpdateDiscoveryConfig._get_http_options() request, metadata = self._interceptor.pre_update_discovery_config( request, metadata @@ -10336,9 +10281,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseUpdateInspectTemplate._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseUpdateInspectTemplate._get_http_options() request, metadata = self._interceptor.pre_update_inspect_template( request, metadata @@ -10648,9 +10591,7 @@ def __call__( """ - http_options = ( - _BaseDlpServiceRestTransport._BaseUpdateStoredInfoType._get_http_options() - ) + http_options = _BaseDlpServiceRestTransport._BaseUpdateStoredInfoType._get_http_options() request, metadata = self._interceptor.pre_update_stored_info_type( request, metadata @@ -10773,7 +10714,9 @@ def create_deidentify_template( ) -> Callable[[dlp.CreateDeidentifyTemplateRequest], dlp.DeidentifyTemplate]: # 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._CreateDeidentifyTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDeidentifyTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_discovery_config( @@ -10835,7 +10778,9 @@ def delete_deidentify_template( ) -> Callable[[dlp.DeleteDeidentifyTemplateRequest], empty_pb2.Empty]: # 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._DeleteDeidentifyTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDeidentifyTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_discovery_config( @@ -10857,7 +10802,9 @@ def delete_file_store_data_profile( ) -> Callable[[dlp.DeleteFileStoreDataProfileRequest], empty_pb2.Empty]: # 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._DeleteFileStoreDataProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteFileStoreDataProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_inspect_template( @@ -10889,7 +10836,9 @@ def delete_table_data_profile( ) -> Callable[[dlp.DeleteTableDataProfileRequest], empty_pb2.Empty]: # 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._DeleteTableDataProfile(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteTableDataProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def finish_dlp_job(self) -> Callable[[dlp.FinishDlpJobRequest], empty_pb2.Empty]: @@ -10939,7 +10888,9 @@ def get_file_store_data_profile( ) -> Callable[[dlp.GetFileStoreDataProfileRequest], dlp.FileStoreDataProfile]: # 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._GetFileStoreDataProfile(self._session, self._host, self._interceptor) # type: ignore + return self._GetFileStoreDataProfile( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_inspect_template( @@ -10993,7 +10944,9 @@ def hybrid_inspect_job_trigger( ) -> Callable[[dlp.HybridInspectJobTriggerRequest], dlp.HybridInspectResponse]: # 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._HybridInspectJobTrigger(self._session, self._host, self._interceptor) # type: ignore + return self._HybridInspectJobTrigger( + self._session, self._host, self._interceptor + ) # type: ignore @property def inspect_content( @@ -11011,7 +10964,9 @@ def list_column_data_profiles( ]: # 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._ListColumnDataProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListColumnDataProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_connections( @@ -11029,7 +10984,9 @@ def list_deidentify_templates( ]: # 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._ListDeidentifyTemplates(self._session, self._host, self._interceptor) # type: ignore + return self._ListDeidentifyTemplates( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_discovery_configs( @@ -11055,7 +11012,9 @@ def list_file_store_data_profiles( ]: # 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._ListFileStoreDataProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListFileStoreDataProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_info_types( @@ -11089,7 +11048,9 @@ def list_project_data_profiles( ]: # 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._ListProjectDataProfiles(self._session, self._host, self._interceptor) # type: ignore + return self._ListProjectDataProfiles( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_stored_info_types( @@ -11147,7 +11108,9 @@ def update_deidentify_template( ) -> Callable[[dlp.UpdateDeidentifyTemplateRequest], dlp.DeidentifyTemplate]: # 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._UpdateDeidentifyTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDeidentifyTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_discovery_config( diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest_base.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest_base.py index b8d83c8934a8..b511deefd364 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest_base.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/services/dlp_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.dlp_v2.types import dlp diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/types/dlp.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/types/dlp.py index 8d1fd828e2f0..9b19633f798d 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/types/dlp.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/types/dlp.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore from google.cloud.dlp_v2.types import storage @@ -343,6 +343,7 @@ class TransformationResultStatusType(proto.Enum): This will be set when the transformation and storing of it is successful. """ + STATE_TYPE_UNSPECIFIED = 0 INVALID_TRANSFORM = 1 BIGQUERY_MAX_ROW_SIZE_EXCEEDED = 2 @@ -364,6 +365,7 @@ class TransformationContainerType(proto.Enum): TRANSFORM_TABLE (3): A table. """ + TRANSFORM_UNKNOWN_CONTAINER = 0 TRANSFORM_BODY = 1 TRANSFORM_METADATA = 2 @@ -407,6 +409,7 @@ class TransformationType(proto.Enum): REDACT_IMAGE (14): Redact image """ + TRANSFORMATION_TYPE_UNSPECIFIED = 0 RECORD_SUPPRESSION = 1 REPLACE_VALUE = 2 @@ -438,6 +441,7 @@ class ProfileGeneration(proto.Enum): The profile is an update to a previous profile. """ + PROFILE_GENERATION_UNSPECIFIED = 0 PROFILE_GENERATION_NEW = 1 PROFILE_GENERATION_UPDATE = 2 @@ -465,6 +469,7 @@ class BigQueryTableTypeCollection(proto.Enum): table types will not have partial profiles generated. """ + BIG_QUERY_COLLECTION_UNSPECIFIED = 0 BIG_QUERY_COLLECTION_ALL_TYPES = 1 BIG_QUERY_COLLECTION_ONLY_SUPPORTED_TYPES = 2 @@ -485,6 +490,7 @@ class BigQueryTableType(proto.Enum): BIG_QUERY_TABLE_TYPE_SNAPSHOT (3): A snapshot of a BigQuery table. """ + BIG_QUERY_TABLE_TYPE_UNSPECIFIED = 0 BIG_QUERY_TABLE_TYPE_TABLE = 1 BIG_QUERY_TABLE_TYPE_EXTERNAL_BIG_LAKE = 2 @@ -508,6 +514,7 @@ class DataProfileUpdateFrequency(proto.Enum): The data profile can be updated up to once every 30 days. Default. """ + UPDATE_FREQUENCY_UNSPECIFIED = 0 UPDATE_FREQUENCY_NEVER = 1 UPDATE_FREQUENCY_DAILY = 2 @@ -525,6 +532,7 @@ class BigQueryTableModification(proto.Enum): A table will be considered modified when the last_modified_time from BigQuery has been updated. """ + TABLE_MODIFICATION_UNSPECIFIED = 0 TABLE_MODIFIED_TIMESTAMP = 1 @@ -543,6 +551,7 @@ class BigQuerySchemaModification(proto.Enum): Profiles should be regenerated when columns are removed from the table. """ + SCHEMA_MODIFICATION_UNSPECIFIED = 0 SCHEMA_NEW_COLUMNS = 1 SCHEMA_REMOVED_COLUMNS = 2 @@ -571,6 +580,7 @@ class RelationalOperator(proto.Enum): EXISTS (7): Exists """ + RELATIONAL_OPERATOR_UNSPECIFIED = 0 EQUAL_TO = 1 NOT_EQUAL_TO = 2 @@ -615,6 +625,7 @@ class MatchingType(proto.Enum): - Exclude infoType: no intersection with affecting infoTypes findings """ + MATCHING_TYPE_UNSPECIFIED = 0 MATCHING_TYPE_FULL_MATCH = 1 MATCHING_TYPE_PARTIAL_MATCH = 2 @@ -634,6 +645,7 @@ class ContentOption(proto.Enum): CONTENT_IMAGE (2): Images found in the data. """ + CONTENT_UNSPECIFIED = 0 CONTENT_TEXT = 1 CONTENT_IMAGE = 2 @@ -649,6 +661,7 @@ class MetadataType(proto.Enum): General file metadata provided by Cloud Storage. """ + METADATATYPE_UNSPECIFIED = 0 STORAGE_METADATA = 2 @@ -664,6 +677,7 @@ class InfoTypeSupportedBy(proto.Enum): RISK_ANALYSIS (2): Supported by the risk analysis operations. """ + ENUM_TYPE_UNSPECIFIED = 0 INSPECT = 1 RISK_ANALYSIS = 2 @@ -681,6 +695,7 @@ class DlpJobType(proto.Enum): RISK_ANALYSIS_JOB (2): The job executed a Risk Analysis computation. """ + DLP_JOB_TYPE_UNSPECIFIED = 0 INSPECT_JOB = 1 RISK_ANALYSIS_JOB = 2 @@ -705,6 +720,7 @@ class StoredInfoTypeState(proto.Enum): StoredInfoType, use the ``UpdateStoredInfoType`` method to create a new version. """ + STORED_INFO_TYPE_STATE_UNSPECIFIED = 0 PENDING = 1 READY = 2 @@ -731,6 +747,7 @@ class ResourceVisibility(proto.Enum): RESOURCE_VISIBILITY_RESTRICTED (20): Visible only to specific users. """ + RESOURCE_VISIBILITY_UNSPECIFIED = 0 RESOURCE_VISIBILITY_PUBLIC = 10 RESOURCE_VISIBILITY_INCONCLUSIVE = 15 @@ -749,6 +766,7 @@ class EncryptionStatus(proto.Enum): ENCRYPTION_CUSTOMER_MANAGED (2): Customer provides the key. """ + ENCRYPTION_STATUS_UNSPECIFIED = 0 ENCRYPTION_GOOGLE_MANAGED = 1 ENCRYPTION_CUSTOMER_MANAGED = 2 @@ -770,6 +788,7 @@ class NullPercentageLevel(proto.Enum): NULL_PERCENTAGE_HIGH (4): A lot of null entries. """ + NULL_PERCENTAGE_LEVEL_UNSPECIFIED = 0 NULL_PERCENTAGE_VERY_LOW = 1 NULL_PERCENTAGE_LOW = 2 @@ -797,6 +816,7 @@ class UniquenessScoreLevel(proto.Enum): High uniqueness, possibly a column of free text or unique identifiers. """ + UNIQUENESS_SCORE_LEVEL_UNSPECIFIED = 0 UNIQUENESS_SCORE_LOW = 1 UNIQUENESS_SCORE_MEDIUM = 2 @@ -830,6 +850,7 @@ class ConnectionState(proto.Enum): properties will automatically mark it as AVAILABLE. """ + CONNECTION_STATE_UNSPECIFIED = 0 MISSING_CREDENTIALS = 1 AVAILABLE = 2 @@ -1215,12 +1236,12 @@ class InfoTypeLimit(proto.Message): number=2, enum=storage.Likelihood, ) - min_likelihood_per_info_type: MutableSequence[ - InfoTypeLikelihood - ] = proto.RepeatedField( - proto.MESSAGE, - number=11, - message=InfoTypeLikelihood, + min_likelihood_per_info_type: MutableSequence[InfoTypeLikelihood] = ( + proto.RepeatedField( + proto.MESSAGE, + number=11, + message=InfoTypeLikelihood, + ) ) limits: FindingLimits = proto.Field( proto.MESSAGE, @@ -1310,6 +1331,7 @@ class BytesType(proto.Enum): AI_MODEL (18): AI model file types. Only used for profiling. """ + BYTES_TYPE_UNSPECIFIED = 0 IMAGE = 6 IMAGE_JPEG = 1 @@ -2092,12 +2114,12 @@ class ImageRedactionConfig(proto.Message): number=2, message="InspectConfig", ) - image_redaction_configs: MutableSequence[ - ImageRedactionConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=ImageRedactionConfig, + image_redaction_configs: MutableSequence[ImageRedactionConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=ImageRedactionConfig, + ) ) include_findings: bool = proto.Field( proto.BOOL, @@ -2570,6 +2592,7 @@ class OutputSchema(proto.Enum): ALL_COLUMNS (5): Schema containing all columns. """ + OUTPUT_SCHEMA_UNSPECIFIED = 0 BASIC_COLUMNS = 1 GCS_COLUMNS = 2 @@ -2918,6 +2941,7 @@ class RegionalizationScope(proto.Enum): ANY_LOCATION (2): Feature may be used anywhere. Default value. """ + REGIONALIZATION_SCOPE_UNSPECIFIED = 0 REGIONAL = 1 ANY_LOCATION = 2 @@ -3165,6 +3189,7 @@ class LocationCategory(proto.Enum): The infoType is typically used in Google internally. """ + LOCATION_UNSPECIFIED = 0 GLOBAL = 1 ARGENTINA = 2 @@ -3236,6 +3261,7 @@ class IndustryCategory(proto.Enum): The infoType is typically used in the telecommunications industry. """ + INDUSTRY_UNSPECIFIED = 0 FINANCE = 1 HEALTH = 2 @@ -3275,6 +3301,7 @@ class TypeCategory(proto.Enum): CUSTOM (8): Category for ``CustomInfoType`` types. """ + TYPE_UNSPECIFIED = 0 PII = 1 SPII = 2 @@ -3819,12 +3846,12 @@ class QuasiIdField(proto.Message): message=storage.FieldId, ) - quasi_ids: MutableSequence[ - "PrivacyMetric.KMapEstimationConfig.TaggedField" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="PrivacyMetric.KMapEstimationConfig.TaggedField", + quasi_ids: MutableSequence["PrivacyMetric.KMapEstimationConfig.TaggedField"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="PrivacyMetric.KMapEstimationConfig.TaggedField", + ) ) region_code: str = proto.Field( proto.STRING, @@ -4172,12 +4199,12 @@ class LDiversityEquivalenceClass(proto.Message): proto.INT64, number=3, ) - top_sensitive_values: MutableSequence[ - "ValueFrequency" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="ValueFrequency", + top_sensitive_values: MutableSequence["ValueFrequency"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="ValueFrequency", + ) ) class LDiversityHistogramBucket(proto.Message): @@ -5071,6 +5098,7 @@ class TimePart(proto.Enum): HOUR_OF_DAY (6): [0-23] """ + TIME_PART_UNSPECIFIED = 0 YEAR = 1 MONTH = 2 @@ -5292,6 +5320,7 @@ class CommonCharsToIgnore(proto.Enum): WHITESPACE (5): Whitespace character, one of [ \\t\\n\\x0B\\f\\r] """ + COMMON_CHARS_TO_IGNORE_UNSPECIFIED = 0 NUMERIC = 1 ALPHA_UPPER_CASE = 2 @@ -5622,6 +5651,7 @@ class FfxCommonNativeAlphabet(proto.Enum): ALPHA_NUMERIC (4): ``[0-9A-Za-z]`` (radix of 62) """ + FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED = 0 NUMERIC = 1 HEXADECIMAL = 2 @@ -6086,6 +6116,7 @@ class LogicalOperator(proto.Enum): AND (1): Conditional AND """ + LOGICAL_OPERATOR_UNSPECIFIED = 0 AND = 1 @@ -6123,12 +6154,12 @@ class TransformationOverview(proto.Message): proto.INT64, number=2, ) - transformation_summaries: MutableSequence[ - "TransformationSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="TransformationSummary", + transformation_summaries: MutableSequence["TransformationSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="TransformationSummary", + ) ) @@ -6173,6 +6204,7 @@ class TransformationResultCode(proto.Enum): ERROR (2): Transformation had an error. """ + TRANSFORMATION_RESULT_CODE_UNSPECIFIED = 0 SUCCESS = 1 ERROR = 2 @@ -6665,6 +6697,7 @@ class ErrorExtraInfo(proto.Enum): File store cluster is not supported for profile generation. """ + ERROR_INFO_UNSPECIFIED = 0 IMAGE_SCAN_UNAVAILABLE_IN_REGION = 1 FILE_STORE_CLUSTER_UNSUPPORTED = 2 @@ -6752,6 +6785,7 @@ class Status(proto.Enum): CANCELLED (3): Trigger is cancelled and can not be resumed. """ + STATUS_UNSPECIFIED = 0 HEALTHY = 1 PAUSED = 2 @@ -7120,12 +7154,12 @@ class Deidentify(proto.Message): number=9, oneof="output", ) - file_types_to_transform: MutableSequence[ - storage.FileType - ] = proto.RepeatedField( - proto.ENUM, - number=8, - enum=storage.FileType, + file_types_to_transform: MutableSequence[storage.FileType] = ( + proto.RepeatedField( + proto.ENUM, + number=8, + enum=storage.FileType, + ) ) class JobNotificationEmails(proto.Message): @@ -8133,6 +8167,7 @@ class EventType(proto.Enum): ERROR_CHANGED (4): A user (non-internal) error occurred. """ + EVENT_TYPE_UNSPECIFIED = 0 NEW_PROFILE = 1 CHANGED_PROFILE = 2 @@ -8232,6 +8267,7 @@ class DetailLevel(proto.Enum): FILE_STORE_PROFILE (3): The full file store data profile. """ + DETAIL_LEVEL_UNSPECIFIED = 0 TABLE_PROFILE = 1 RESOURCE_NAME = 2 @@ -8387,12 +8423,12 @@ class TagValue(proto.Message): number=1, message="DataProfileAction.TagResources.TagCondition", ) - profile_generations_to_tag: MutableSequence[ - "ProfileGeneration" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="ProfileGeneration", + profile_generations_to_tag: MutableSequence["ProfileGeneration"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="ProfileGeneration", + ) ) lower_data_risk_to_low: bool = proto.Field( proto.BOOL, @@ -8824,6 +8860,7 @@ class Status(proto.Enum): PAUSED (2): The discovery config is paused temporarily. """ + STATUS_UNSPECIFIED = 0 RUNNING = 1 PAUSED = 2 @@ -9624,6 +9661,7 @@ class DatabaseEngine(proto.Enum): POSTGRES (3): PostgreSQL database. """ + DATABASE_ENGINE_UNSPECIFIED = 0 ALL_SUPPORTED_DATABASE_ENGINES = 1 MYSQL = 2 @@ -9642,6 +9680,7 @@ class DatabaseResourceType(proto.Enum): DATABASE_RESOURCE_TYPE_TABLE (2): Tables. """ + DATABASE_RESOURCE_TYPE_UNSPECIFIED = 0 DATABASE_RESOURCE_TYPE_ALL_SUPPORTED_TYPES = 1 DATABASE_RESOURCE_TYPE_TABLE = 2 @@ -9703,6 +9742,7 @@ class CloudSqlSchemaModification(proto.Enum): REMOVED_COLUMNS (2): Columns have been removed from the table. """ + SQL_SCHEMA_MODIFICATION_UNSPECIFIED = 0 NEW_COLUMNS = 1 REMOVED_COLUMNS = 2 @@ -10080,6 +10120,7 @@ class CloudStorageObjectAttribute(proto.Enum): Scan objects with the dual-regional storage class. This will incur retrieval fees. """ + CLOUD_STORAGE_OBJECT_ATTRIBUTE_UNSPECIFIED = 0 ALL_SUPPORTED_OBJECTS = 1 STANDARD = 2 @@ -10110,24 +10151,25 @@ class CloudStorageBucketAttribute(proto.Enum): should be set. Scanning Autoclass-enabled buckets can affect object storage classes. """ + CLOUD_STORAGE_BUCKET_ATTRIBUTE_UNSPECIFIED = 0 ALL_SUPPORTED_BUCKETS = 1 AUTOCLASS_DISABLED = 2 AUTOCLASS_ENABLED = 3 - included_object_attributes: MutableSequence[ - CloudStorageObjectAttribute - ] = proto.RepeatedField( - proto.ENUM, - number=1, - enum=CloudStorageObjectAttribute, + included_object_attributes: MutableSequence[CloudStorageObjectAttribute] = ( + proto.RepeatedField( + proto.ENUM, + number=1, + enum=CloudStorageObjectAttribute, + ) ) - included_bucket_attributes: MutableSequence[ - CloudStorageBucketAttribute - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum=CloudStorageBucketAttribute, + included_bucket_attributes: MutableSequence[CloudStorageBucketAttribute] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum=CloudStorageBucketAttribute, + ) ) @@ -10505,6 +10547,7 @@ class BucketType(proto.Enum): TYPE_GENERAL_PURPOSE (2): A general purpose Amazon S3 bucket. """ + TYPE_UNSPECIFIED = 0 TYPE_ALL_SUPPORTED = 1 TYPE_GENERAL_PURPOSE = 2 @@ -10528,6 +10571,7 @@ class ObjectStorageClass(proto.Enum): Objects in the S3 Intelligent-Tiering access tiers. """ + UNSPECIFIED = 0 ALL_SUPPORTED_CLASSES = 1 STANDARD = 2 @@ -10987,6 +11031,7 @@ class JobState(proto.Enum): finished no more calls to hybridInspect may be made. ACTIVE jobs can transition to DONE. """ + JOB_STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 @@ -12547,6 +12592,7 @@ class DataRiskLevelScore(proto.Enum): Re-identification of users may be possible. Consider limiting usage and or removing SPII. """ + RISK_SCORE_UNSPECIFIED = 0 RISK_LOW = 10 RISK_UNKNOWN = 12 @@ -12779,6 +12825,7 @@ class State(proto.Enum): profile_status.status.code is 0, the profile succeeded, otherwise, it failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 DONE = 2 @@ -13077,6 +13124,7 @@ class State(proto.Enum): profile_status.status.code is 0, the profile succeeded, otherwise, it failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 DONE = 2 @@ -13133,6 +13181,7 @@ class ColumnDataType(proto.Enum): TYPE_RANGE_TIMESTAMP (18): ``Range`` type. """ + COLUMN_DATA_TYPE_UNSPECIFIED = 0 TYPE_INT64 = 1 TYPE_BOOL = 2 @@ -13162,6 +13211,7 @@ class ColumnPolicyState(proto.Enum): COLUMN_POLICY_TAGGED (1): Column has policy tag applied. """ + COLUMN_POLICY_STATE_UNSPECIFIED = 0 COLUMN_POLICY_TAGGED = 1 @@ -13375,6 +13425,7 @@ class State(proto.Enum): profile_status.status.code is 0, the profile succeeded, otherwise, it failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 DONE = 2 @@ -13477,12 +13528,12 @@ class State(proto.Enum): proto.STRING, number=18, ) - file_store_info_type_summaries: MutableSequence[ - "FileStoreInfoTypeSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=21, - message="FileStoreInfoTypeSummary", + file_store_info_type_summaries: MutableSequence["FileStoreInfoTypeSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=21, + message="FileStoreInfoTypeSummary", + ) ) sample_findings_table: storage.BigQueryTable = proto.Field( proto.MESSAGE, @@ -13690,12 +13741,12 @@ class FileClusterSummary(proto.Message): number=1, message="FileClusterType", ) - file_store_info_type_summaries: MutableSequence[ - "FileStoreInfoTypeSummary" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="FileStoreInfoTypeSummary", + file_store_info_type_summaries: MutableSequence["FileStoreInfoTypeSummary"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="FileStoreInfoTypeSummary", + ) ) sensitivity_score: storage.SensitivityScore = proto.Field( proto.MESSAGE, @@ -13889,12 +13940,12 @@ class ListFileStoreDataProfilesResponse(proto.Message): def raw_page(self): return self - file_store_data_profiles: MutableSequence[ - "FileStoreDataProfile" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="FileStoreDataProfile", + file_store_data_profiles: MutableSequence["FileStoreDataProfile"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="FileStoreDataProfile", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -13967,6 +14018,7 @@ class ProfileScoreBucket(proto.Enum): MEDIUM_OR_HIGH (2): Medium or high risk/sensitivity detected. """ + PROFILE_SCORE_BUCKET_UNSPECIFIED = 0 HIGH = 1 MEDIUM_OR_HIGH = 2 @@ -14033,6 +14085,7 @@ class PubSubLogicalOperator(proto.Enum): AND (2): Conditional AND. """ + LOGICAL_OPERATOR_UNSPECIFIED = 0 OR = 1 AND = 2 @@ -14042,12 +14095,12 @@ class PubSubLogicalOperator(proto.Enum): number=1, enum="DataProfilePubSubCondition.PubSubExpressions.PubSubLogicalOperator", ) - conditions: MutableSequence[ - "DataProfilePubSubCondition.PubSubCondition" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="DataProfilePubSubCondition.PubSubCondition", + conditions: MutableSequence["DataProfilePubSubCondition.PubSubCondition"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="DataProfilePubSubCondition.PubSubCondition", + ) ) expressions: PubSubExpressions = proto.Field( @@ -14462,6 +14515,7 @@ class DatabaseEngine(proto.Enum): DATABASE_ENGINE_POSTGRES (2): Cloud SQL for PostgreSQL instance. """ + DATABASE_ENGINE_UNKNOWN = 0 DATABASE_ENGINE_MYSQL = 1 DATABASE_ENGINE_POSTGRES = 2 @@ -14569,6 +14623,7 @@ class Cluster(proto.Enum): CLUSTER_AI_MODEL (10): AI models like .tflite etc. """ + CLUSTER_UNSPECIFIED = 0 CLUSTER_UNKNOWN = 1 CLUSTER_TEXT = 2 @@ -14723,6 +14778,7 @@ class Category(proto.Enum): Indicates that the data profile is related to code. """ + CATEGORY_UNSPECIFIED = 0 AI = 1 CODE = 2 @@ -14753,6 +14809,7 @@ class Signal(proto.Enum): If the service determines the category type. For example, Vertex AI assets would always have a ``Category`` of ``AI``. """ + SIGNAL_UNSPECIFIED = 0 MODEL = 1 TEXT_EMBEDDING = 2 diff --git a/packages/google-cloud-dlp/google/cloud/dlp_v2/types/storage.py b/packages/google-cloud-dlp/google/cloud/dlp_v2/types/storage.py index 75c255cdbc9a..5b5d972688a9 100644 --- a/packages/google-cloud-dlp/google/cloud/dlp_v2/types/storage.py +++ b/packages/google-cloud-dlp/google/cloud/dlp_v2/types/storage.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -85,6 +85,7 @@ class Likelihood(proto.Enum): Confidence level is high. Lowest chance of a false positive. """ + LIKELIHOOD_UNSPECIFIED = 0 VERY_UNLIKELY = 1 UNLIKELY = 2 @@ -163,6 +164,7 @@ class FileType(proto.Enum): ``bytes_limit_per_file_percent`` has no effect on Excel files. """ + FILE_TYPE_UNSPECIFIED = 0 BINARY_FILE = 1 TEXT_FILE = 2 @@ -244,6 +246,7 @@ class SensitivityScoreLevel(proto.Enum): Re-identification of users might be possible. Consider limiting usage and or removing SPII. """ + SENSITIVITY_SCORE_UNSPECIFIED = 0 SENSITIVITY_LOW = 10 SENSITIVITY_UNKNOWN = 12 @@ -360,6 +363,7 @@ class ExclusionType(proto.Enum): excluded from final results, but can still affect rule execution. """ + EXCLUSION_TYPE_UNSPECIFIED = 0 EXCLUSION_TYPE_EXCLUDE = 1 @@ -879,6 +883,7 @@ class SampleMethod(proto.Enum): pick the offset to start scanning. The scanned bytes are contiguous. """ + SAMPLE_METHOD_UNSPECIFIED = 0 TOP = 1 RANDOM_START = 2 @@ -1039,6 +1044,7 @@ class SampleMethod(proto.Enum): RANDOM_START (2): Randomly pick groups of rows to scan. """ + SAMPLE_METHOD_UNSPECIFIED = 0 TOP = 1 RANDOM_START = 2 diff --git a/packages/google-cloud-dlp/noxfile.py b/packages/google-cloud-dlp/noxfile.py index 45c39a6287a8..b2a147cf318f 100644 --- a/packages/google-cloud-dlp/noxfile.py +++ b/packages/google-cloud-dlp/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dlp/tests/unit/gapic/dlp_v2/test_dlp_service.py b/packages/google-cloud-dlp/tests/unit/gapic/dlp_v2/test_dlp_service.py index 69538afc61fa..56b1539f4d35 100644 --- a/packages/google-cloud-dlp/tests/unit/gapic/dlp_v2/test_dlp_service.py +++ b/packages/google-cloud-dlp/tests/unit/gapic/dlp_v2/test_dlp_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,24 +43,29 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.dlp_v2.services.dlp_service import ( DlpServiceAsyncClient, @@ -928,10 +933,9 @@ def test_dlp_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +980,9 @@ def test_dlp_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1018,9 @@ def test_dlp_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1247,13 +1249,13 @@ def test_dlp_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1859,9 +1861,9 @@ def test_deidentify_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.deidentify_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.deidentify_content] = ( + mock_rpc + ) request = {} client.deidentify_content(request) @@ -2114,9 +2116,9 @@ def test_reidentify_content_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reidentify_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reidentify_content] = ( + mock_rpc + ) request = {} client.reidentify_content(request) @@ -3358,9 +3360,9 @@ def test_get_inspect_template_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_inspect_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_inspect_template] = ( + mock_rpc + ) request = {} client.get_inspect_template(request) @@ -3706,9 +3708,9 @@ def test_list_inspect_templates_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_inspect_templates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_inspect_templates] = ( + mock_rpc + ) request = {} client.list_inspect_templates(request) @@ -6555,9 +6557,9 @@ def test_create_job_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_job_trigger] = ( + mock_rpc + ) request = {} client.create_job_trigger(request) @@ -6914,9 +6916,9 @@ def test_update_job_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_job_trigger] = ( + mock_rpc + ) request = {} client.update_job_trigger(request) @@ -7950,9 +7952,9 @@ def test_list_job_triggers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_job_triggers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_job_triggers] = ( + mock_rpc + ) request = {} client.list_job_triggers(request) @@ -8490,9 +8492,9 @@ def test_delete_job_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_job_trigger] = ( + mock_rpc + ) request = {} client.delete_job_trigger(request) @@ -8828,9 +8830,9 @@ def test_activate_job_trigger_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.activate_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.activate_job_trigger] = ( + mock_rpc + ) request = {} client.activate_job_trigger(request) @@ -9825,9 +9827,9 @@ def test_get_discovery_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_discovery_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_discovery_config] = ( + mock_rpc + ) request = {} client.get_discovery_config(request) @@ -10173,9 +10175,9 @@ def test_list_discovery_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_discovery_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_discovery_configs] = ( + mock_rpc + ) request = {} client.list_discovery_configs(request) @@ -13559,9 +13561,9 @@ def test_get_stored_info_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_stored_info_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_stored_info_type] = ( + mock_rpc + ) request = {} client.get_stored_info_type(request) @@ -13903,9 +13905,9 @@ def test_list_stored_info_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_stored_info_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_stored_info_types] = ( + mock_rpc + ) request = {} client.list_stored_info_types(request) @@ -18086,9 +18088,9 @@ def test_get_table_data_profile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_table_data_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_table_data_profile] = ( + mock_rpc + ) request = {} client.get_table_data_profile(request) @@ -19196,9 +19198,9 @@ def test_hybrid_inspect_dlp_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.hybrid_inspect_dlp_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.hybrid_inspect_dlp_job] = ( + mock_rpc + ) request = {} client.hybrid_inspect_dlp_job(request) @@ -19765,9 +19767,9 @@ def test_create_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -20435,9 +20437,9 @@ def test_list_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -20964,9 +20966,9 @@ def test_search_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_connections] = ( + mock_rpc + ) request = {} client.search_connections(request) @@ -21502,9 +21504,9 @@ def test_delete_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -21834,9 +21836,9 @@ def test_update_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -22177,9 +22179,9 @@ def test_deidentify_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.deidentify_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.deidentify_content] = ( + mock_rpc + ) request = {} client.deidentify_content(request) @@ -22217,9 +22219,9 @@ def test_reidentify_content_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reidentify_content - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reidentify_content] = ( + mock_rpc + ) request = {} client.reidentify_content(request) @@ -22818,9 +22820,9 @@ def test_get_inspect_template_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_inspect_template - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_inspect_template] = ( + mock_rpc + ) request = {} client.get_inspect_template(request) @@ -23003,9 +23005,9 @@ def test_list_inspect_templates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_inspect_templates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_inspect_templates] = ( + mock_rpc + ) request = {} client.list_inspect_templates(request) @@ -24453,9 +24455,9 @@ def test_create_job_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_job_trigger] = ( + mock_rpc + ) request = {} client.create_job_trigger(request) @@ -24644,9 +24646,9 @@ def test_update_job_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_job_trigger] = ( + mock_rpc + ) request = {} client.update_job_trigger(request) @@ -25187,9 +25189,9 @@ def test_list_job_triggers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_job_triggers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_job_triggers] = ( + mock_rpc + ) request = {} client.list_job_triggers(request) @@ -25451,9 +25453,9 @@ def test_delete_job_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_job_trigger] = ( + mock_rpc + ) request = {} client.delete_job_trigger(request) @@ -25626,9 +25628,9 @@ def test_activate_job_trigger_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.activate_job_trigger - ] = mock_rpc + client._transport._wrapped_methods[client._transport.activate_job_trigger] = ( + mock_rpc + ) request = {} client.activate_job_trigger(request) @@ -26143,9 +26145,9 @@ def test_get_discovery_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_discovery_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_discovery_config] = ( + mock_rpc + ) request = {} client.get_discovery_config(request) @@ -26328,9 +26330,9 @@ def test_list_discovery_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_discovery_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_discovery_configs] = ( + mock_rpc + ) request = {} client.list_discovery_configs(request) @@ -28054,9 +28056,9 @@ def test_get_stored_info_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_stored_info_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_stored_info_type] = ( + mock_rpc + ) request = {} client.get_stored_info_type(request) @@ -28236,9 +28238,9 @@ def test_list_stored_info_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_stored_info_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_stored_info_types] = ( + mock_rpc + ) request = {} client.list_stored_info_types(request) @@ -30287,9 +30289,9 @@ def test_get_table_data_profile_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_table_data_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_table_data_profile] = ( + mock_rpc + ) request = {} client.get_table_data_profile(request) @@ -30837,9 +30839,9 @@ def test_hybrid_inspect_dlp_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.hybrid_inspect_dlp_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.hybrid_inspect_dlp_job] = ( + mock_rpc + ) request = {} client.hybrid_inspect_dlp_job(request) @@ -31134,9 +31136,9 @@ def test_create_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connection] = ( + mock_rpc + ) request = {} client.create_connection(request) @@ -31503,9 +31505,9 @@ def test_list_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connections] = ( + mock_rpc + ) request = {} client.list_connections(request) @@ -31761,9 +31763,9 @@ def test_search_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_connections] = ( + mock_rpc + ) request = {} client.search_connections(request) @@ -32019,9 +32021,9 @@ def test_delete_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connection] = ( + mock_rpc + ) request = {} client.delete_connection(request) @@ -32196,9 +32198,9 @@ def test_update_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connection] = ( + mock_rpc + ) request = {} client.update_connection(request) @@ -35340,8 +35342,9 @@ def test_inspect_content_rest_bad_request(request_type=dlp.InspectContentRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35401,17 +35404,19 @@ def test_inspect_content_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_inspect_content" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_inspect_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_inspect_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_inspect_content" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_inspect_content_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_inspect_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35460,8 +35465,9 @@ def test_redact_image_rest_bad_request(request_type=dlp.RedactImageRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35526,17 +35532,19 @@ def test_redact_image_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_redact_image" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_redact_image_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_redact_image" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_redact_image" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_redact_image_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_redact_image" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35585,8 +35593,9 @@ def test_deidentify_content_rest_bad_request(request_type=dlp.DeidentifyContentR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35646,17 +35655,20 @@ def test_deidentify_content_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_deidentify_content" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_deidentify_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_deidentify_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_deidentify_content" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_deidentify_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_deidentify_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35707,8 +35719,9 @@ def test_reidentify_content_rest_bad_request(request_type=dlp.ReidentifyContentR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35768,17 +35781,20 @@ def test_reidentify_content_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_reidentify_content" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_reidentify_content_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_reidentify_content" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_reidentify_content" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_reidentify_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_reidentify_content" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35829,8 +35845,9 @@ def test_list_info_types_rest_bad_request(request_type=dlp.ListInfoTypesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35890,17 +35907,19 @@ def test_list_info_types_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_list_info_types" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_list_info_types_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_list_info_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_info_types" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_info_types_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_list_info_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35951,8 +35970,9 @@ def test_create_inspect_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36019,18 +36039,20 @@ def test_create_inspect_template_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_create_inspect_template" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_create_inspect_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_create_inspect_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_create_inspect_template" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_create_inspect_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_create_inspect_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36085,8 +36107,9 @@ def test_update_inspect_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36155,18 +36178,20 @@ def test_update_inspect_template_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_update_inspect_template" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_update_inspect_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_update_inspect_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_update_inspect_template" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_update_inspect_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_update_inspect_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36221,8 +36246,9 @@ def test_get_inspect_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36291,17 +36317,20 @@ def test_get_inspect_template_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_get_inspect_template" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_get_inspect_template_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_get_inspect_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_inspect_template" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_get_inspect_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_get_inspect_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36352,8 +36381,9 @@ def test_list_inspect_templates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36416,18 +36446,20 @@ def test_list_inspect_templates_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_list_inspect_templates" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_list_inspect_templates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_list_inspect_templates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_inspect_templates" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_list_inspect_templates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_list_inspect_templates" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36484,8 +36516,9 @@ def test_delete_inspect_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36544,13 +36577,13 @@ def test_delete_inspect_template_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "pre_delete_inspect_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_delete_inspect_template" + ) as pre, + ): pre.assert_not_called() pb_message = dlp.DeleteInspectTemplateRequest.pb( dlp.DeleteInspectTemplateRequest() @@ -36595,8 +36628,9 @@ def test_create_deidentify_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36663,18 +36697,20 @@ def test_create_deidentify_template_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_create_deidentify_template" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_create_deidentify_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_create_deidentify_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_create_deidentify_template" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_create_deidentify_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_create_deidentify_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36727,8 +36763,9 @@ def test_update_deidentify_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36795,18 +36832,20 @@ def test_update_deidentify_template_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_update_deidentify_template" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_update_deidentify_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_update_deidentify_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_update_deidentify_template" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_update_deidentify_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_update_deidentify_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36859,8 +36898,9 @@ def test_get_deidentify_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36927,18 +36967,20 @@ def test_get_deidentify_template_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_get_deidentify_template" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_get_deidentify_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_get_deidentify_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_deidentify_template" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_get_deidentify_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_get_deidentify_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36991,8 +37033,9 @@ def test_list_deidentify_templates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37055,18 +37098,20 @@ def test_list_deidentify_templates_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_list_deidentify_templates" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_list_deidentify_templates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_list_deidentify_templates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_deidentify_templates" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_list_deidentify_templates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_list_deidentify_templates" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37124,8 +37169,9 @@ def test_delete_deidentify_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37182,13 +37228,13 @@ def test_delete_deidentify_template_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "pre_delete_deidentify_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_delete_deidentify_template" + ) as pre, + ): pre.assert_not_called() pb_message = dlp.DeleteDeidentifyTemplateRequest.pb( dlp.DeleteDeidentifyTemplateRequest() @@ -37231,8 +37277,9 @@ def test_create_job_trigger_rest_bad_request(request_type=dlp.CreateJobTriggerRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37301,17 +37348,20 @@ def test_create_job_trigger_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_create_job_trigger" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_create_job_trigger_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_create_job_trigger" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_create_job_trigger" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_create_job_trigger_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_create_job_trigger" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37360,8 +37410,9 @@ def test_update_job_trigger_rest_bad_request(request_type=dlp.UpdateJobTriggerRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37430,17 +37481,20 @@ def test_update_job_trigger_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_update_job_trigger" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_update_job_trigger_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_update_job_trigger" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_update_job_trigger" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_update_job_trigger_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_update_job_trigger" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37491,8 +37545,9 @@ def test_hybrid_inspect_job_trigger_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37552,18 +37607,20 @@ def test_hybrid_inspect_job_trigger_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_hybrid_inspect_job_trigger" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_hybrid_inspect_job_trigger_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_hybrid_inspect_job_trigger" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_hybrid_inspect_job_trigger" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_hybrid_inspect_job_trigger_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_hybrid_inspect_job_trigger" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37614,8 +37671,9 @@ def test_get_job_trigger_rest_bad_request(request_type=dlp.GetJobTriggerRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37684,17 +37742,19 @@ def test_get_job_trigger_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_get_job_trigger" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_get_job_trigger_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_get_job_trigger" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_job_trigger" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_job_trigger_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_get_job_trigger" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37743,8 +37803,9 @@ def test_list_job_triggers_rest_bad_request(request_type=dlp.ListJobTriggersRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37807,17 +37868,19 @@ def test_list_job_triggers_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_list_job_triggers" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_list_job_triggers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_list_job_triggers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_job_triggers" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_job_triggers_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_list_job_triggers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37868,8 +37931,9 @@ def test_delete_job_trigger_rest_bad_request(request_type=dlp.DeleteJobTriggerRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37926,13 +37990,13 @@ def test_delete_job_trigger_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "pre_delete_job_trigger" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_delete_job_trigger" + ) as pre, + ): pre.assert_not_called() pb_message = dlp.DeleteJobTriggerRequest.pb(dlp.DeleteJobTriggerRequest()) transcode.return_value = { @@ -37975,8 +38039,9 @@ def test_activate_job_trigger_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38045,17 +38110,20 @@ def test_activate_job_trigger_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_activate_job_trigger" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_activate_job_trigger_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_activate_job_trigger" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_activate_job_trigger" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_activate_job_trigger_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_activate_job_trigger" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38106,8 +38174,9 @@ def test_create_discovery_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38176,18 +38245,20 @@ def test_create_discovery_config_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_create_discovery_config" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_create_discovery_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_create_discovery_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_create_discovery_config" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_create_discovery_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_create_discovery_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38242,8 +38313,9 @@ def test_update_discovery_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38314,18 +38386,20 @@ def test_update_discovery_config_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_update_discovery_config" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_update_discovery_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_update_discovery_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_update_discovery_config" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_update_discovery_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_update_discovery_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38380,8 +38454,9 @@ def test_get_discovery_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38452,17 +38527,20 @@ def test_get_discovery_config_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_get_discovery_config" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_get_discovery_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_get_discovery_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_discovery_config" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_get_discovery_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_get_discovery_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38513,8 +38591,9 @@ def test_list_discovery_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38577,18 +38656,20 @@ def test_list_discovery_configs_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_list_discovery_configs" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_list_discovery_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_list_discovery_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_discovery_configs" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_list_discovery_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_list_discovery_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38645,8 +38726,9 @@ def test_delete_discovery_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38705,13 +38787,13 @@ def test_delete_discovery_config_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "pre_delete_discovery_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_delete_discovery_config" + ) as pre, + ): pre.assert_not_called() pb_message = dlp.DeleteDiscoveryConfigRequest.pb( dlp.DeleteDiscoveryConfigRequest() @@ -38754,8 +38836,9 @@ def test_create_dlp_job_rest_bad_request(request_type=dlp.CreateDlpJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38824,17 +38907,19 @@ def test_create_dlp_job_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_create_dlp_job" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_create_dlp_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_create_dlp_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_create_dlp_job" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_create_dlp_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_create_dlp_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38883,8 +38968,9 @@ def test_list_dlp_jobs_rest_bad_request(request_type=dlp.ListDlpJobsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38947,17 +39033,19 @@ def test_list_dlp_jobs_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_list_dlp_jobs" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_list_dlp_jobs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_list_dlp_jobs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_dlp_jobs" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_dlp_jobs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_list_dlp_jobs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39006,8 +39094,9 @@ def test_get_dlp_job_rest_bad_request(request_type=dlp.GetDlpJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39076,17 +39165,19 @@ def test_get_dlp_job_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_get_dlp_job" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_get_dlp_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_get_dlp_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_dlp_job" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_dlp_job_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_get_dlp_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39135,8 +39226,9 @@ def test_delete_dlp_job_rest_bad_request(request_type=dlp.DeleteDlpJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39193,13 +39285,13 @@ def test_delete_dlp_job_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "pre_delete_dlp_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_delete_dlp_job" + ) as pre, + ): pre.assert_not_called() pb_message = dlp.DeleteDlpJobRequest.pb(dlp.DeleteDlpJobRequest()) transcode.return_value = { @@ -39240,8 +39332,9 @@ def test_cancel_dlp_job_rest_bad_request(request_type=dlp.CancelDlpJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39298,13 +39391,13 @@ def test_cancel_dlp_job_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "pre_cancel_dlp_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_cancel_dlp_job" + ) as pre, + ): pre.assert_not_called() pb_message = dlp.CancelDlpJobRequest.pb(dlp.CancelDlpJobRequest()) transcode.return_value = { @@ -39347,8 +39440,9 @@ def test_create_stored_info_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39411,18 +39505,20 @@ def test_create_stored_info_type_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_create_stored_info_type" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_create_stored_info_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_create_stored_info_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_create_stored_info_type" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_create_stored_info_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_create_stored_info_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39475,8 +39571,9 @@ def test_update_stored_info_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39539,18 +39636,20 @@ def test_update_stored_info_type_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_update_stored_info_type" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_update_stored_info_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_update_stored_info_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_update_stored_info_type" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_update_stored_info_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_update_stored_info_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39603,8 +39702,9 @@ def test_get_stored_info_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39667,17 +39767,20 @@ def test_get_stored_info_type_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_get_stored_info_type" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_get_stored_info_type_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_get_stored_info_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_stored_info_type" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_get_stored_info_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_get_stored_info_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39728,8 +39831,9 @@ def test_list_stored_info_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39792,18 +39896,20 @@ def test_list_stored_info_types_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_list_stored_info_types" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_list_stored_info_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_list_stored_info_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_stored_info_types" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_list_stored_info_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_list_stored_info_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39856,8 +39962,9 @@ def test_delete_stored_info_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39914,13 +40021,13 @@ def test_delete_stored_info_type_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "pre_delete_stored_info_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_delete_stored_info_type" + ) as pre, + ): pre.assert_not_called() pb_message = dlp.DeleteStoredInfoTypeRequest.pb( dlp.DeleteStoredInfoTypeRequest() @@ -39965,8 +40072,9 @@ def test_list_project_data_profiles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40029,18 +40137,20 @@ def test_list_project_data_profiles_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_list_project_data_profiles" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_list_project_data_profiles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_list_project_data_profiles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_project_data_profiles" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_list_project_data_profiles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_list_project_data_profiles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40098,8 +40208,9 @@ def test_list_table_data_profiles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40162,18 +40273,20 @@ def test_list_table_data_profiles_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_list_table_data_profiles" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_list_table_data_profiles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_list_table_data_profiles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_table_data_profiles" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_list_table_data_profiles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_list_table_data_profiles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40228,8 +40341,9 @@ def test_list_column_data_profiles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40292,18 +40406,20 @@ def test_list_column_data_profiles_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_list_column_data_profiles" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_list_column_data_profiles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_list_column_data_profiles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_column_data_profiles" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_list_column_data_profiles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_list_column_data_profiles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40360,8 +40476,9 @@ def test_get_project_data_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40432,18 +40549,20 @@ def test_get_project_data_profile_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_get_project_data_profile" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_get_project_data_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_get_project_data_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_project_data_profile" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_get_project_data_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_get_project_data_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40496,8 +40615,9 @@ def test_list_file_store_data_profiles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40560,18 +40680,20 @@ def test_list_file_store_data_profiles_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_list_file_store_data_profiles" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_list_file_store_data_profiles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_list_file_store_data_profiles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_file_store_data_profiles" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_list_file_store_data_profiles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_list_file_store_data_profiles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40631,8 +40753,9 @@ def test_get_file_store_data_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40720,18 +40843,20 @@ def test_get_file_store_data_profile_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_get_file_store_data_profile" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_get_file_store_data_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_get_file_store_data_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_file_store_data_profile" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_get_file_store_data_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_get_file_store_data_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40786,8 +40911,9 @@ def test_delete_file_store_data_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40846,13 +40972,13 @@ def test_delete_file_store_data_profile_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "pre_delete_file_store_data_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_delete_file_store_data_profile" + ) as pre, + ): pre.assert_not_called() pb_message = dlp.DeleteFileStoreDataProfileRequest.pb( dlp.DeleteFileStoreDataProfileRequest() @@ -40899,8 +41025,9 @@ def test_get_table_data_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40994,18 +41121,20 @@ def test_get_table_data_profile_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_get_table_data_profile" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_get_table_data_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_get_table_data_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_table_data_profile" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_get_table_data_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_get_table_data_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41058,8 +41187,9 @@ def test_get_column_data_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41159,18 +41289,20 @@ def test_get_column_data_profile_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_get_column_data_profile" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_get_column_data_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_get_column_data_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_column_data_profile" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_get_column_data_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_get_column_data_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41225,8 +41357,9 @@ def test_delete_table_data_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41285,13 +41418,13 @@ def test_delete_table_data_profile_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "pre_delete_table_data_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_delete_table_data_profile" + ) as pre, + ): pre.assert_not_called() pb_message = dlp.DeleteTableDataProfileRequest.pb( dlp.DeleteTableDataProfileRequest() @@ -41336,8 +41469,9 @@ def test_hybrid_inspect_dlp_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41397,18 +41531,20 @@ def test_hybrid_inspect_dlp_job_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_hybrid_inspect_dlp_job" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, - "post_hybrid_inspect_dlp_job_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_hybrid_inspect_dlp_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_hybrid_inspect_dlp_job" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_hybrid_inspect_dlp_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_hybrid_inspect_dlp_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41457,8 +41593,9 @@ def test_finish_dlp_job_rest_bad_request(request_type=dlp.FinishDlpJobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41515,13 +41652,13 @@ def test_finish_dlp_job_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "pre_finish_dlp_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_finish_dlp_job" + ) as pre, + ): pre.assert_not_called() pb_message = dlp.FinishDlpJobRequest.pb(dlp.FinishDlpJobRequest()) transcode.return_value = { @@ -41562,8 +41699,9 @@ def test_create_connection_rest_bad_request(request_type=dlp.CreateConnectionReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41628,17 +41766,19 @@ def test_create_connection_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_create_connection" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_create_connection_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_create_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_create_connection" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_create_connection_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_create_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41687,8 +41827,9 @@ def test_get_connection_rest_bad_request(request_type=dlp.GetConnectionRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41753,17 +41894,19 @@ def test_get_connection_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_get_connection" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_get_connection_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_get_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_connection" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_get_connection_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_get_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41812,8 +41955,9 @@ def test_list_connections_rest_bad_request(request_type=dlp.ListConnectionsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41876,17 +42020,19 @@ def test_list_connections_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_list_connections" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_list_connections_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_list_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_connections" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_list_connections_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_list_connections" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41937,8 +42083,9 @@ def test_search_connections_rest_bad_request(request_type=dlp.SearchConnectionsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42001,17 +42148,20 @@ def test_search_connections_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_search_connections" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_search_connections_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_search_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_search_connections" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, + "post_search_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_search_connections" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42062,8 +42212,9 @@ def test_delete_connection_rest_bad_request(request_type=dlp.DeleteConnectionReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42120,13 +42271,13 @@ def test_delete_connection_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "pre_delete_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_delete_connection" + ) as pre, + ): pre.assert_not_called() pb_message = dlp.DeleteConnectionRequest.pb(dlp.DeleteConnectionRequest()) transcode.return_value = { @@ -42167,8 +42318,9 @@ def test_update_connection_rest_bad_request(request_type=dlp.UpdateConnectionReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42233,17 +42385,19 @@ def test_update_connection_rest_interceptors(null_interceptor): ) client = DlpServiceClient(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.DlpServiceRestInterceptor, "post_update_connection" - ) as post, mock.patch.object( - transports.DlpServiceRestInterceptor, "post_update_connection_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DlpServiceRestInterceptor, "pre_update_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_update_connection" + ) as post, + mock.patch.object( + transports.DlpServiceRestInterceptor, "post_update_connection_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DlpServiceRestInterceptor, "pre_update_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43583,11 +43737,14 @@ def test_dlp_service_base_transport(): def test_dlp_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dlp_v2.services.dlp_service.transports.DlpServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.dlp_v2.services.dlp_service.transports.DlpServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DlpServiceTransport( @@ -43604,9 +43761,12 @@ def test_dlp_service_base_transport_with_credentials_file(): def test_dlp_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.dlp_v2.services.dlp_service.transports.DlpServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.dlp_v2.services.dlp_service.transports.DlpServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DlpServiceTransport() @@ -43678,11 +43838,12 @@ def test_dlp_service_transport_auth_gdch_credentials(transport_class): def test_dlp_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-dms/docs/conf.py b/packages/google-cloud-dms/docs/conf.py index 8907a3e77b18..eb2f13ae3a38 100644 --- a/packages/google-cloud-dms/docs/conf.py +++ b/packages/google-cloud-dms/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-dms documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/__init__.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/__init__.py index b810ff6c46cd..8de511558e74 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/__init__.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_migration_service import ( DataMigrationServiceAsyncClient, DataMigrationServiceClient, diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/async_client.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/async_client.py index 270bb39b5bc1..454868708b9d 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/async_client.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.clouddms_v1 import gapic_version as package_version @@ -44,17 +44,19 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.clouddms_v1.services.data_migration_service import pagers from google.cloud.clouddms_v1.types import ( @@ -155,7 +157,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataMigrationServiceAsyncClient: The constructed client. """ - return DataMigrationServiceClient.from_service_account_info.__func__(DataMigrationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataMigrationServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataMigrationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +174,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataMigrationServiceAsyncClient: The constructed client. """ - return DataMigrationServiceClient.from_service_account_file.__func__(DataMigrationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataMigrationServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataMigrationServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -209,7 +213,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataMigrationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataMigrationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataMigrationServiceTransport: diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/client.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/client.py index d81377c0ac21..25c873f7b75d 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/client.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.clouddms_v1 import gapic_version as package_version @@ -61,17 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.clouddms_v1.services.data_migration_service import pagers from google.cloud.clouddms_v1.types import ( @@ -93,9 +95,7 @@ class DataMigrationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataMigrationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataMigrationServiceTransport]] _transport_registry["grpc"] = DataMigrationServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataMigrationServiceGrpcAsyncIOTransport @@ -747,11 +747,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataMigrationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataMigrationServiceClient._read_environment_variables() + ) self._client_cert_source = DataMigrationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -786,8 +784,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataMigrationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/pagers.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/pagers.py index dba44881c6f9..b0a7cbf946c6 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/pagers.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -459,7 +459,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -539,7 +539,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -615,7 +615,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -697,7 +697,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -773,7 +773,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -853,7 +853,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -929,7 +929,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1009,7 +1009,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1085,7 +1085,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/__init__.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/__init__.py index 45773a2636fa..4fc974367e11 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/__init__.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import DataMigrationServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataMigrationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataMigrationServiceTransport]] _transport_registry["grpc"] = DataMigrationServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataMigrationServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py index 3e9b1842d867..69c923e673be 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.clouddms_v1 import gapic_version as package_version from google.cloud.clouddms_v1.types import ( @@ -847,13 +849,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py index 49b685de2b3b..1a407f6352ac 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.clouddms_v1.types import ( clouddms, @@ -1002,12 +1004,12 @@ def list_conversion_workspaces( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversion_workspaces" not in self._stubs: - self._stubs[ - "list_conversion_workspaces" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/ListConversionWorkspaces", - request_serializer=clouddms.ListConversionWorkspacesRequest.serialize, - response_deserializer=clouddms.ListConversionWorkspacesResponse.deserialize, + self._stubs["list_conversion_workspaces"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/ListConversionWorkspaces", + request_serializer=clouddms.ListConversionWorkspacesRequest.serialize, + response_deserializer=clouddms.ListConversionWorkspacesResponse.deserialize, + ) ) return self._stubs["list_conversion_workspaces"] @@ -1033,12 +1035,12 @@ def create_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversion_workspace" not in self._stubs: - self._stubs[ - "create_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/CreateConversionWorkspace", - request_serializer=clouddms.CreateConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/CreateConversionWorkspace", + request_serializer=clouddms.CreateConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_conversion_workspace"] @@ -1064,12 +1066,12 @@ def update_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_conversion_workspace" not in self._stubs: - self._stubs[ - "update_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/UpdateConversionWorkspace", - request_serializer=clouddms.UpdateConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/UpdateConversionWorkspace", + request_serializer=clouddms.UpdateConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_conversion_workspace"] @@ -1094,12 +1096,12 @@ def delete_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversion_workspace" not in self._stubs: - self._stubs[ - "delete_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/DeleteConversionWorkspace", - request_serializer=clouddms.DeleteConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/DeleteConversionWorkspace", + request_serializer=clouddms.DeleteConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_conversion_workspace"] @@ -1292,12 +1294,12 @@ def convert_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "convert_conversion_workspace" not in self._stubs: - self._stubs[ - "convert_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/ConvertConversionWorkspace", - request_serializer=clouddms.ConvertConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["convert_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/ConvertConversionWorkspace", + request_serializer=clouddms.ConvertConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["convert_conversion_workspace"] @@ -1323,12 +1325,12 @@ def commit_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "commit_conversion_workspace" not in self._stubs: - self._stubs[ - "commit_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/CommitConversionWorkspace", - request_serializer=clouddms.CommitConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["commit_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/CommitConversionWorkspace", + request_serializer=clouddms.CommitConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["commit_conversion_workspace"] @@ -1354,12 +1356,12 @@ def rollback_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_conversion_workspace" not in self._stubs: - self._stubs[ - "rollback_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/RollbackConversionWorkspace", - request_serializer=clouddms.RollbackConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["rollback_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/RollbackConversionWorkspace", + request_serializer=clouddms.RollbackConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["rollback_conversion_workspace"] @@ -1383,12 +1385,12 @@ def apply_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "apply_conversion_workspace" not in self._stubs: - self._stubs[ - "apply_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/ApplyConversionWorkspace", - request_serializer=clouddms.ApplyConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["apply_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/ApplyConversionWorkspace", + request_serializer=clouddms.ApplyConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["apply_conversion_workspace"] @@ -1420,12 +1422,12 @@ def describe_database_entities( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "describe_database_entities" not in self._stubs: - self._stubs[ - "describe_database_entities" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/DescribeDatabaseEntities", - request_serializer=clouddms.DescribeDatabaseEntitiesRequest.serialize, - response_deserializer=clouddms.DescribeDatabaseEntitiesResponse.deserialize, + self._stubs["describe_database_entities"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/DescribeDatabaseEntities", + request_serializer=clouddms.DescribeDatabaseEntitiesRequest.serialize, + response_deserializer=clouddms.DescribeDatabaseEntitiesResponse.deserialize, + ) ) return self._stubs["describe_database_entities"] @@ -1487,12 +1489,12 @@ def describe_conversion_workspace_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "describe_conversion_workspace_revisions" not in self._stubs: - self._stubs[ - "describe_conversion_workspace_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/DescribeConversionWorkspaceRevisions", - request_serializer=clouddms.DescribeConversionWorkspaceRevisionsRequest.serialize, - response_deserializer=clouddms.DescribeConversionWorkspaceRevisionsResponse.deserialize, + self._stubs["describe_conversion_workspace_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/DescribeConversionWorkspaceRevisions", + request_serializer=clouddms.DescribeConversionWorkspaceRevisionsRequest.serialize, + response_deserializer=clouddms.DescribeConversionWorkspaceRevisionsResponse.deserialize, + ) ) return self._stubs["describe_conversion_workspace_revisions"] diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py index 15b192888899..4e16cd5e2e92 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.clouddms_v1.types import ( clouddms, @@ -1045,12 +1047,12 @@ def list_conversion_workspaces( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_conversion_workspaces" not in self._stubs: - self._stubs[ - "list_conversion_workspaces" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/ListConversionWorkspaces", - request_serializer=clouddms.ListConversionWorkspacesRequest.serialize, - response_deserializer=clouddms.ListConversionWorkspacesResponse.deserialize, + self._stubs["list_conversion_workspaces"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/ListConversionWorkspaces", + request_serializer=clouddms.ListConversionWorkspacesRequest.serialize, + response_deserializer=clouddms.ListConversionWorkspacesResponse.deserialize, + ) ) return self._stubs["list_conversion_workspaces"] @@ -1076,12 +1078,12 @@ def create_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_conversion_workspace" not in self._stubs: - self._stubs[ - "create_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/CreateConversionWorkspace", - request_serializer=clouddms.CreateConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/CreateConversionWorkspace", + request_serializer=clouddms.CreateConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_conversion_workspace"] @@ -1107,12 +1109,12 @@ def update_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_conversion_workspace" not in self._stubs: - self._stubs[ - "update_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/UpdateConversionWorkspace", - request_serializer=clouddms.UpdateConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/UpdateConversionWorkspace", + request_serializer=clouddms.UpdateConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_conversion_workspace"] @@ -1137,12 +1139,12 @@ def delete_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_conversion_workspace" not in self._stubs: - self._stubs[ - "delete_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/DeleteConversionWorkspace", - request_serializer=clouddms.DeleteConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/DeleteConversionWorkspace", + request_serializer=clouddms.DeleteConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_conversion_workspace"] @@ -1342,12 +1344,12 @@ def convert_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "convert_conversion_workspace" not in self._stubs: - self._stubs[ - "convert_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/ConvertConversionWorkspace", - request_serializer=clouddms.ConvertConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["convert_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/ConvertConversionWorkspace", + request_serializer=clouddms.ConvertConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["convert_conversion_workspace"] @@ -1373,12 +1375,12 @@ def commit_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "commit_conversion_workspace" not in self._stubs: - self._stubs[ - "commit_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/CommitConversionWorkspace", - request_serializer=clouddms.CommitConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["commit_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/CommitConversionWorkspace", + request_serializer=clouddms.CommitConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["commit_conversion_workspace"] @@ -1405,12 +1407,12 @@ def rollback_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_conversion_workspace" not in self._stubs: - self._stubs[ - "rollback_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/RollbackConversionWorkspace", - request_serializer=clouddms.RollbackConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["rollback_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/RollbackConversionWorkspace", + request_serializer=clouddms.RollbackConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["rollback_conversion_workspace"] @@ -1436,12 +1438,12 @@ def apply_conversion_workspace( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "apply_conversion_workspace" not in self._stubs: - self._stubs[ - "apply_conversion_workspace" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/ApplyConversionWorkspace", - request_serializer=clouddms.ApplyConversionWorkspaceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["apply_conversion_workspace"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/ApplyConversionWorkspace", + request_serializer=clouddms.ApplyConversionWorkspaceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["apply_conversion_workspace"] @@ -1473,12 +1475,12 @@ def describe_database_entities( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "describe_database_entities" not in self._stubs: - self._stubs[ - "describe_database_entities" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/DescribeDatabaseEntities", - request_serializer=clouddms.DescribeDatabaseEntitiesRequest.serialize, - response_deserializer=clouddms.DescribeDatabaseEntitiesResponse.deserialize, + self._stubs["describe_database_entities"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/DescribeDatabaseEntities", + request_serializer=clouddms.DescribeDatabaseEntitiesRequest.serialize, + response_deserializer=clouddms.DescribeDatabaseEntitiesResponse.deserialize, + ) ) return self._stubs["describe_database_entities"] @@ -1541,12 +1543,12 @@ def describe_conversion_workspace_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "describe_conversion_workspace_revisions" not in self._stubs: - self._stubs[ - "describe_conversion_workspace_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.clouddms.v1.DataMigrationService/DescribeConversionWorkspaceRevisions", - request_serializer=clouddms.DescribeConversionWorkspaceRevisionsRequest.serialize, - response_deserializer=clouddms.DescribeConversionWorkspaceRevisionsResponse.deserialize, + self._stubs["describe_conversion_workspace_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.clouddms.v1.DataMigrationService/DescribeConversionWorkspaceRevisions", + request_serializer=clouddms.DescribeConversionWorkspaceRevisionsRequest.serialize, + response_deserializer=clouddms.DescribeConversionWorkspaceRevisionsResponse.deserialize, + ) ) return self._stubs["describe_conversion_workspace_revisions"] diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms.py index b77b10bbe77e..f08f6b3d82cc 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.clouddms_v1.types import ( @@ -108,6 +108,7 @@ class DatabaseEntityView(proto.Enum): the page_size property of the request is ignored. The returned page will only include the top-most node types. """ + DATABASE_ENTITY_VIEW_UNSPECIFIED = 0 DATABASE_ENTITY_VIEW_BASIC = 1 DATABASE_ENTITY_VIEW_FULL = 2 @@ -195,12 +196,12 @@ class ListMigrationJobsResponse(proto.Message): def raw_page(self): return self - migration_jobs: MutableSequence[ - clouddms_resources.MigrationJob - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=clouddms_resources.MigrationJob, + migration_jobs: MutableSequence[clouddms_resources.MigrationJob] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=clouddms_resources.MigrationJob, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -723,12 +724,12 @@ class ListConnectionProfilesResponse(proto.Message): def raw_page(self): return self - connection_profiles: MutableSequence[ - clouddms_resources.ConnectionProfile - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=clouddms_resources.ConnectionProfile, + connection_profiles: MutableSequence[clouddms_resources.ConnectionProfile] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=clouddms_resources.ConnectionProfile, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1033,12 +1034,12 @@ class ListPrivateConnectionsResponse(proto.Message): def raw_page(self): return self - private_connections: MutableSequence[ - clouddms_resources.PrivateConnection - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=clouddms_resources.PrivateConnection, + private_connections: MutableSequence[clouddms_resources.PrivateConnection] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=clouddms_resources.PrivateConnection, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1529,12 +1530,12 @@ class ListMappingRulesResponse(proto.Message): def raw_page(self): return self - mapping_rules: MutableSequence[ - conversionworkspace_resources.MappingRule - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=conversionworkspace_resources.MappingRule, + mapping_rules: MutableSequence[conversionworkspace_resources.MappingRule] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=conversionworkspace_resources.MappingRule, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1773,6 +1774,7 @@ class DBTreeType(proto.Enum): DESTINATION_TREE (3): The destination database tree. """ + DB_TREE_TYPE_UNSPECIFIED = 0 SOURCE_TREE = 1 DRAFT_TREE = 2 @@ -1831,12 +1833,12 @@ class DescribeDatabaseEntitiesResponse(proto.Message): def raw_page(self): return self - database_entities: MutableSequence[ - conversionworkspace_resources.DatabaseEntity - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=conversionworkspace_resources.DatabaseEntity, + database_entities: MutableSequence[conversionworkspace_resources.DatabaseEntity] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=conversionworkspace_resources.DatabaseEntity, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1895,12 +1897,12 @@ class SearchBackgroundJobsResponse(proto.Message): rules. """ - jobs: MutableSequence[ - conversionworkspace_resources.BackgroundJobLogEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=conversionworkspace_resources.BackgroundJobLogEntry, + jobs: MutableSequence[conversionworkspace_resources.BackgroundJobLogEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=conversionworkspace_resources.BackgroundJobLogEntry, + ) ) @@ -1937,12 +1939,12 @@ class DescribeConversionWorkspaceRevisionsResponse(proto.Message): The list of conversion workspace revisions. """ - revisions: MutableSequence[ - conversionworkspace_resources.ConversionWorkspace - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=conversionworkspace_resources.ConversionWorkspace, + revisions: MutableSequence[conversionworkspace_resources.ConversionWorkspace] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=conversionworkspace_resources.ConversionWorkspace, + ) ) diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms_resources.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms_resources.py index 926602c963c3..857b19c52f6c 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms_resources.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/types/clouddms_resources.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -70,6 +70,7 @@ class NetworkArchitecture(proto.Enum): Instance is in Cloud SQL's new producer network architecture. """ + NETWORK_ARCHITECTURE_UNSPECIFIED = 0 NETWORK_ARCHITECTURE_OLD_CSQL_PRODUCER = 1 NETWORK_ARCHITECTURE_NEW_CSQL_PRODUCER = 2 @@ -89,6 +90,7 @@ class DatabaseEngine(proto.Enum): ORACLE (4): The source engine is Oracle. """ + DATABASE_ENGINE_UNSPECIFIED = 0 MYSQL = 1 POSTGRESQL = 2 @@ -110,6 +112,7 @@ class DatabaseProvider(proto.Enum): ALLOYDB (4): AlloyDB. """ + DATABASE_PROVIDER_UNSPECIFIED = 0 CLOUDSQL = 1 RDS = 2 @@ -154,6 +157,7 @@ class SslType(proto.Enum): Both server ('ca_certificate'), and client ('client_key', 'client_certificate') specified. """ + SSL_TYPE_UNSPECIFIED = 0 SERVER_ONLY = 1 SERVER_CLIENT = 2 @@ -741,6 +745,7 @@ class SqlActivationPolicy(proto.Enum): NEVER (2): The instance should never spin up. """ + SQL_ACTIVATION_POLICY_UNSPECIFIED = 0 ALWAYS = 1 NEVER = 2 @@ -756,6 +761,7 @@ class SqlDataDiskType(proto.Enum): PD_HDD (2): HDD disk. """ + SQL_DATA_DISK_TYPE_UNSPECIFIED = 0 PD_SSD = 1 PD_HDD = 2 @@ -787,6 +793,7 @@ class SqlDatabaseVersion(proto.Enum): POSTGRES_15 (18): PostgreSQL 15. """ + SQL_DATABASE_VERSION_UNSPECIFIED = 0 MYSQL_5_6 = 1 MYSQL_5_7 = 2 @@ -810,6 +817,7 @@ class SqlAvailabilityType(proto.Enum): REGIONAL (2): Regional availability instance. """ + SQL_AVAILABILITY_TYPE_UNSPECIFIED = 0 ZONAL = 1 REGIONAL = 2 @@ -826,6 +834,7 @@ class Edition(proto.Enum): ENTERPRISE_PLUS (3): The instance is an enterprise plus edition. """ + EDITION_UNSPECIFIED = 0 ENTERPRISE = 2 ENTERPRISE_PLUS = 3 @@ -1419,6 +1428,7 @@ class State(proto.Enum): RESUMING (15): The migration job is resuming. """ + STATE_UNSPECIFIED = 0 MAINTENANCE = 1 DRAFT = 2 @@ -1456,6 +1466,7 @@ class Phase(proto.Enum): Only RDS flow - the sources writes stopped, waiting for dump to begin """ + PHASE_UNSPECIFIED = 0 FULL_DUMP = 1 CDC = 2 @@ -1474,6 +1485,7 @@ class Type(proto.Enum): CONTINUOUS (2): The migration job is a continuous migration. """ + TYPE_UNSPECIFIED = 0 ONE_TIME = 1 CONTINUOUS = 2 @@ -1533,6 +1545,7 @@ class DumpParallelLevel(proto.Enum): MAX (3): Maximum parallel level. """ + DUMP_PARALLEL_LEVEL_UNSPECIFIED = 0 MIN = 1 OPTIMAL = 2 @@ -1775,6 +1788,7 @@ class State(proto.Enum): The last action on the connection profile failed. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 CREATING = 2 @@ -1951,6 +1965,7 @@ class ErrorCode(proto.Enum): Insufficient privilege to enable the parallelism configuration. """ + ERROR_CODE_UNSPECIFIED = 0 CONNECTION_FAILURE = 1 AUTHENTICATION_FAILURE = 2 @@ -2054,6 +2069,7 @@ class State(proto.Enum): DELETED (6): The private connection has been deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 CREATED = 2 diff --git a/packages/google-cloud-dms/google/cloud/clouddms_v1/types/conversionworkspace_resources.py b/packages/google-cloud-dms/google/cloud/clouddms_v1/types/conversionworkspace_resources.py index 63a1374cec73..9708731764fa 100644 --- a/packages/google-cloud-dms/google/cloud/clouddms_v1/types/conversionworkspace_resources.py +++ b/packages/google-cloud-dms/google/cloud/clouddms_v1/types/conversionworkspace_resources.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.clouddms_v1.types import clouddms_resources @@ -96,6 +96,7 @@ class ValuePresentInList(proto.Enum): If the source value is not in the supplied list at value_list """ + VALUE_PRESENT_IN_LIST_UNSPECIFIED = 0 VALUE_PRESENT_IN_LIST_IF_VALUE_LIST = 1 VALUE_PRESENT_IN_LIST_IF_VALUE_NOT_LIST = 2 @@ -138,6 +139,7 @@ class DatabaseEntityType(proto.Enum): DATABASE_ENTITY_TYPE_DATABASE (15): Database. """ + DATABASE_ENTITY_TYPE_UNSPECIFIED = 0 DATABASE_ENTITY_TYPE_SCHEMA = 1 DATABASE_ENTITY_TYPE_TABLE = 2 @@ -171,6 +173,7 @@ class EntityNameTransformation(proto.Enum): ENTITY_NAME_TRANSFORMATION_CAPITALIZED_CASE (4): Transform to capitalized case. """ + ENTITY_NAME_TRANSFORMATION_UNSPECIFIED = 0 ENTITY_NAME_TRANSFORMATION_NO_TRANSFORMATION = 1 ENTITY_NAME_TRANSFORMATION_LOWER_CASE = 2 @@ -197,6 +200,7 @@ class BackgroundJobType(proto.Enum): an external source such as an ora2pg config file. """ + BACKGROUND_JOB_TYPE_UNSPECIFIED = 0 BACKGROUND_JOB_TYPE_SOURCE_SEED = 1 BACKGROUND_JOB_TYPE_CONVERT = 2 @@ -215,6 +219,7 @@ class ImportRulesFileFormat(proto.Enum): IMPORT_RULES_FILE_FORMAT_ORATOPG_CONFIG_FILE (2): Ora2Pg configuration file. """ + IMPORT_RULES_FILE_FORMAT_UNSPECIFIED = 0 IMPORT_RULES_FILE_FORMAT_HARBOUR_BRIDGE_SESSION_FILE = 1 IMPORT_RULES_FILE_FORMAT_ORATOPG_CONFIG_FILE = 2 @@ -238,6 +243,7 @@ class ValueComparison(proto.Enum): Value is larger or equal than the Compare value. """ + VALUE_COMPARISON_UNSPECIFIED = 0 VALUE_COMPARISON_IF_VALUE_SMALLER_THAN = 1 VALUE_COMPARISON_IF_VALUE_SMALLER_EQUAL_THAN = 2 @@ -265,6 +271,7 @@ class NumericFilterOption(proto.Enum): numeric columns with no precision and scale specified. """ + NUMERIC_FILTER_OPTION_UNSPECIFIED = 0 NUMERIC_FILTER_OPTION_ALL = 1 NUMERIC_FILTER_OPTION_LIMIT = 2 @@ -441,6 +448,7 @@ class JobCompletionState(proto.Enum): FAILED (2): Error. """ + JOB_COMPLETION_STATE_UNSPECIFIED = 0 SUCCEEDED = 1 FAILED = 2 @@ -743,6 +751,7 @@ class State(proto.Enum): DELETED (3): The rule is logically deleted. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -1765,6 +1774,7 @@ class TreeType(proto.Enum): Tree of entities observed on the destination database. """ + TREE_TYPE_UNSPECIFIED = 0 SOURCE = 1 DRAFT = 2 @@ -2626,6 +2636,7 @@ class IssueType(proto.Enum): ISSUE_TYPE_CONVERT (3): Issue originated during the convert process """ + ISSUE_TYPE_UNSPECIFIED = 0 ISSUE_TYPE_DDL = 1 ISSUE_TYPE_APPLY = 2 @@ -2644,6 +2655,7 @@ class IssueSeverity(proto.Enum): ISSUE_SEVERITY_ERROR (3): Error """ + ISSUE_SEVERITY_UNSPECIFIED = 0 ISSUE_SEVERITY_INFO = 1 ISSUE_SEVERITY_WARNING = 2 diff --git a/packages/google-cloud-dms/noxfile.py b/packages/google-cloud-dms/noxfile.py index b58032abb1f8..15e4382adcfa 100644 --- a/packages/google-cloud-dms/noxfile.py +++ b/packages/google-cloud-dms/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-dms/tests/unit/gapic/clouddms_v1/test_data_migration_service.py b/packages/google-cloud-dms/tests/unit/gapic/clouddms_v1/test_data_migration_service.py index 08856beef9d5..e85b6801782a 100644 --- a/packages/google-cloud-dms/tests/unit/gapic/clouddms_v1/test_data_migration_service.py +++ b/packages/google-cloud-dms/tests/unit/gapic/clouddms_v1/test_data_migration_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,27 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.clouddms_v1.services.data_migration_service import ( DataMigrationServiceAsyncClient, @@ -985,10 +987,9 @@ def test_data_migration_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1034,9 @@ def test_data_migration_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1072,10 +1072,9 @@ def test_data_migration_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1320,13 +1319,13 @@ def test_data_migration_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1447,9 +1446,9 @@ def test_list_migration_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_migration_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_migration_jobs] = ( + mock_rpc + ) request = {} client.list_migration_jobs(request) @@ -2008,9 +2007,9 @@ def test_get_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_migration_job] = ( + mock_rpc + ) request = {} client.get_migration_job(request) @@ -2368,9 +2367,9 @@ def test_create_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_migration_job] = ( + mock_rpc + ) request = {} client.create_migration_job(request) @@ -2733,9 +2732,9 @@ def test_update_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_migration_job] = ( + mock_rpc + ) request = {} client.update_migration_job(request) @@ -3090,9 +3089,9 @@ def test_delete_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_migration_job] = ( + mock_rpc + ) request = {} client.delete_migration_job(request) @@ -3435,9 +3434,9 @@ def test_start_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.start_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.start_migration_job] = ( + mock_rpc + ) request = {} client.start_migration_job(request) @@ -3694,9 +3693,9 @@ def test_stop_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_migration_job] = ( + mock_rpc + ) request = {} client.stop_migration_job(request) @@ -3953,9 +3952,9 @@ def test_resume_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_migration_job] = ( + mock_rpc + ) request = {} client.resume_migration_job(request) @@ -4213,9 +4212,9 @@ def test_promote_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.promote_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.promote_migration_job] = ( + mock_rpc + ) request = {} client.promote_migration_job(request) @@ -4472,9 +4471,9 @@ def test_verify_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.verify_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.verify_migration_job] = ( + mock_rpc + ) request = {} client.verify_migration_job(request) @@ -4732,9 +4731,9 @@ def test_restart_migration_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_migration_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_migration_job] = ( + mock_rpc + ) request = {} client.restart_migration_job(request) @@ -4996,9 +4995,9 @@ def test_generate_ssh_script_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_ssh_script - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_ssh_script] = ( + mock_rpc + ) request = {} client.generate_ssh_script(request) @@ -6078,9 +6077,9 @@ def test_get_connection_profile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connection_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connection_profile] = ( + mock_rpc + ) request = {} client.get_connection_profile(request) @@ -7878,9 +7877,9 @@ def test_get_private_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_private_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_private_connection] = ( + mock_rpc + ) request = {} client.get_private_connection(request) @@ -11155,9 +11154,9 @@ def test_create_mapping_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_mapping_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_mapping_rule] = ( + mock_rpc + ) request = {} client.create_mapping_rule(request) @@ -11528,9 +11527,9 @@ def test_delete_mapping_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_mapping_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_mapping_rule] = ( + mock_rpc + ) request = {} client.delete_mapping_rule(request) @@ -11862,9 +11861,9 @@ def test_list_mapping_rules_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_mapping_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_mapping_rules] = ( + mock_rpc + ) request = {} client.list_mapping_rules(request) @@ -12416,9 +12415,9 @@ def test_get_mapping_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_mapping_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_mapping_rule] = ( + mock_rpc + ) request = {} client.get_mapping_rule(request) @@ -13022,9 +13021,9 @@ def test_import_mapping_rules_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_mapping_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_mapping_rules] = ( + mock_rpc + ) request = {} client.import_mapping_rules(request) @@ -14806,9 +14805,9 @@ def test_search_background_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_background_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_background_jobs] = ( + mock_rpc + ) request = {} client.search_background_jobs(request) @@ -15309,9 +15308,9 @@ def test_fetch_static_ips_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_static_ips - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_static_ips] = ( + mock_rpc + ) request = {} client.fetch_static_ips(request) @@ -18073,11 +18072,14 @@ def test_data_migration_service_base_transport(): def test_data_migration_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.clouddms_v1.services.data_migration_service.transports.DataMigrationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.clouddms_v1.services.data_migration_service.transports.DataMigrationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataMigrationServiceTransport( @@ -18094,9 +18096,12 @@ def test_data_migration_service_base_transport_with_credentials_file(): def test_data_migration_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.clouddms_v1.services.data_migration_service.transports.DataMigrationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.clouddms_v1.services.data_migration_service.transports.DataMigrationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataMigrationServiceTransport() @@ -18167,11 +18172,12 @@ def test_data_migration_service_transport_auth_gdch_credentials(transport_class) def test_data_migration_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-documentai/docs/conf.py b/packages/google-cloud-documentai/docs/conf.py index 86fa12809b79..0bcebff16eb8 100644 --- a/packages/google-cloud-documentai/docs/conf.py +++ b/packages/google-cloud-documentai/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-documentai documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/__init__.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/__init__.py index 19ade4249daa..a3760bdf5739 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/__init__.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.document_processor_service import ( DocumentProcessorServiceAsyncClient, DocumentProcessorServiceClient, diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/async_client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/async_client.py index 7252185b2c91..1040817042a0 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/async_client.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api import launch_stage_pb2 # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.documentai_v1.services.document_processor_service import pagers from google.cloud.documentai_v1.types import ( @@ -58,10 +58,10 @@ document_processor_service, document_schema, evaluation, + processor, + processor_type, ) -from google.cloud.documentai_v1.types import processor from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type from .client import DocumentProcessorServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport @@ -164,7 +164,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentProcessorServiceAsyncClient: The constructed client. """ - return DocumentProcessorServiceClient.from_service_account_info.__func__(DocumentProcessorServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DocumentProcessorServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DocumentProcessorServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -180,7 +181,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentProcessorServiceAsyncClient: The constructed client. """ - return DocumentProcessorServiceClient.from_service_account_file.__func__(DocumentProcessorServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DocumentProcessorServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + DocumentProcessorServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -218,7 +222,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DocumentProcessorServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DocumentProcessorServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DocumentProcessorServiceTransport: diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/client.py index 7a8051b7f6f6..e02297803068 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/client.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api import launch_stage_pb2 # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.documentai_v1.services.document_processor_service import pagers from google.cloud.documentai_v1.types import ( @@ -75,10 +75,10 @@ document_processor_service, document_schema, evaluation, + processor, + processor_type, ) -from google.cloud.documentai_v1.types import processor from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type from .transports.base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport from .transports.grpc import DocumentProcessorServiceGrpcTransport @@ -94,9 +94,7 @@ class DocumentProcessorServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentProcessorServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentProcessorServiceTransport]] _transport_registry["grpc"] = DocumentProcessorServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentProcessorServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentProcessorServiceRestTransport @@ -741,11 +739,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentProcessorServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentProcessorServiceClient._read_environment_variables() + ) self._client_cert_source = ( DocumentProcessorServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -782,8 +778,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentProcessorServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/pagers.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/pagers.py index f3513e10da6b..315003c3c809 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/pagers.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -150,7 +150,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -310,7 +310,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -392,7 +392,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -472,7 +472,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -554,7 +554,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -632,7 +632,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/__init__.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/__init__.py index 8ac84e5a7497..5db56eee3bb4 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/__init__.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DocumentProcessorServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DocumentProcessorServiceTransport]] _transport_registry["grpc"] = DocumentProcessorServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentProcessorServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentProcessorServiceRestTransport diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/base.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/base.py index 11f20cc9953a..c8333ff2858e 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/base.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/base.py @@ -17,21 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1 import gapic_version as package_version -from google.cloud.documentai_v1.types import document_processor_service, evaluation -from google.cloud.documentai_v1.types import processor +from google.cloud.documentai_v1.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -563,7 +566,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc.py index 97fd6f9aca7d..91d82f296485 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc.py @@ -16,24 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.documentai_v1.types import document_processor_service, evaluation -from google.cloud.documentai_v1.types import processor +from google.cloud.documentai_v1.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type from .base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport @@ -721,12 +724,12 @@ def undeploy_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_processor_version" not in self._stubs: - self._stubs[ - "undeploy_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1.DocumentProcessorService/UndeployProcessorVersion", - request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undeploy_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1.DocumentProcessorService/UndeployProcessorVersion", + request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undeploy_processor_version"] @@ -878,12 +881,12 @@ def set_default_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_default_processor_version" not in self._stubs: - self._stubs[ - "set_default_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1.DocumentProcessorService/SetDefaultProcessorVersion", - request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_default_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1.DocumentProcessorService/SetDefaultProcessorVersion", + request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_default_processor_version"] @@ -939,12 +942,12 @@ def evaluate_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "evaluate_processor_version" not in self._stubs: - self._stubs[ - "evaluate_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1.DocumentProcessorService/EvaluateProcessorVersion", - request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["evaluate_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1.DocumentProcessorService/EvaluateProcessorVersion", + request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["evaluate_processor_version"] diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc_asyncio.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc_asyncio.py index 14b72584dbea..abaeefc3d12d 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,15 +31,15 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.documentai_v1.types import document_processor_service, evaluation -from google.cloud.documentai_v1.types import processor +from google.cloud.documentai_v1.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type from .base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport from .grpc import DocumentProcessorServiceGrpcTransport @@ -730,12 +733,12 @@ def undeploy_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_processor_version" not in self._stubs: - self._stubs[ - "undeploy_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1.DocumentProcessorService/UndeployProcessorVersion", - request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undeploy_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1.DocumentProcessorService/UndeployProcessorVersion", + request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undeploy_processor_version"] @@ -891,12 +894,12 @@ def set_default_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_default_processor_version" not in self._stubs: - self._stubs[ - "set_default_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1.DocumentProcessorService/SetDefaultProcessorVersion", - request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_default_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1.DocumentProcessorService/SetDefaultProcessorVersion", + request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_default_processor_version"] @@ -953,12 +956,12 @@ def evaluate_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "evaluate_processor_version" not in self._stubs: - self._stubs[ - "evaluate_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1.DocumentProcessorService/EvaluateProcessorVersion", - request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["evaluate_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1.DocumentProcessorService/EvaluateProcessorVersion", + request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["evaluate_processor_version"] diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest.py index 55d9c19b7224..bfeee2803f67 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest.py @@ -16,24 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.documentai_v1.types import document_processor_service, evaluation -from google.cloud.documentai_v1.types import processor +from google.cloud.documentai_v1.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentProcessorServiceRestTransport @@ -1691,9 +1694,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseBatchProcessDocuments._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseBatchProcessDocuments._get_http_options() request, metadata = self._interceptor.pre_batch_process_documents( request, metadata @@ -1719,7 +1720,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1851,9 +1852,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseCreateProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseCreateProcessor._get_http_options() request, metadata = self._interceptor.pre_create_processor( request, metadata @@ -2010,9 +2009,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessor._get_http_options() request, metadata = self._interceptor.pre_delete_processor( request, metadata @@ -2034,7 +2031,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2162,9 +2159,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_delete_processor_version( request, metadata @@ -2186,7 +2181,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2313,9 +2308,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDeployProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDeployProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_deploy_processor_version( request, metadata @@ -2341,7 +2334,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2469,9 +2462,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDisableProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDisableProcessor._get_http_options() request, metadata = self._interceptor.pre_disable_processor( request, metadata @@ -2497,7 +2488,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2627,9 +2618,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseEnableProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseEnableProcessor._get_http_options() request, metadata = self._interceptor.pre_enable_processor( request, metadata @@ -2655,7 +2644,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2788,9 +2777,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseEvaluateProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseEvaluateProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_evaluate_processor_version( request, metadata @@ -2816,7 +2803,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2944,9 +2931,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseFetchProcessorTypes._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseFetchProcessorTypes._get_http_options() request, metadata = self._interceptor.pre_fetch_processor_types( request, metadata @@ -3097,9 +3082,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetEvaluation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_evaluation(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetEvaluation._get_transcoded_request( @@ -3250,9 +3233,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessor._get_http_options() request, metadata = self._interceptor.pre_get_processor(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessor._get_transcoded_request( @@ -3403,9 +3384,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorType._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorType._get_http_options() request, metadata = self._interceptor.pre_get_processor_type( request, metadata @@ -3562,9 +3541,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_get_processor_version( request, metadata @@ -3710,9 +3687,7 @@ def __call__( The response from ``ListEvaluations``. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListEvaluations._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_evaluations( request, metadata @@ -3867,9 +3842,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListProcessors._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListProcessors._get_http_options() request, metadata = self._interceptor.pre_list_processors(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseListProcessors._get_transcoded_request( @@ -4024,9 +3997,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListProcessorTypes._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListProcessorTypes._get_http_options() request, metadata = self._interceptor.pre_list_processor_types( request, metadata @@ -4182,9 +4153,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListProcessorVersions._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListProcessorVersions._get_http_options() request, metadata = self._interceptor.pre_list_processor_versions( request, metadata @@ -4337,9 +4306,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseProcessDocument._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseProcessDocument._get_http_options() request, metadata = self._interceptor.pre_process_document( request, metadata @@ -4499,9 +4466,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseReviewDocument._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseReviewDocument._get_http_options() request, metadata = self._interceptor.pre_review_document(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseReviewDocument._get_transcoded_request( @@ -4525,7 +4490,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4658,9 +4623,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseSetDefaultProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseSetDefaultProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_set_default_processor_version( request, metadata @@ -4686,7 +4649,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4727,11 +4690,10 @@ def __call__( resp = self._interceptor.post_set_default_processor_version(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_default_processor_version_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_default_processor_version_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4817,9 +4779,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseTrainProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseTrainProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_train_processor_version( request, metadata @@ -4845,7 +4805,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4976,9 +4936,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseUndeployProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseUndeployProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_undeploy_processor_version( request, metadata @@ -5004,7 +4962,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5110,7 +5068,9 @@ def delete_processor_version( ]: # 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._DeleteProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def deploy_processor_version( @@ -5121,7 +5081,9 @@ def deploy_processor_version( ]: # 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._DeployProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._DeployProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def disable_processor( @@ -5152,7 +5114,9 @@ def evaluate_processor_version( ]: # 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._EvaluateProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._EvaluateProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_processor_types( @@ -5281,7 +5245,9 @@ def set_default_processor_version( ]: # 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._SetDefaultProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._SetDefaultProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def train_processor_version( @@ -5303,7 +5269,9 @@ def undeploy_processor_version( ]: # 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._UndeployProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._UndeployProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -5363,9 +5331,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -5504,9 +5470,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -5644,9 +5608,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -5764,9 +5726,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -5907,9 +5867,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest_base.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest_base.py index 9a23a0f74e6e..8b8b9985aa9c 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest_base.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/transports/rest_base.py @@ -22,10 +22,13 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.documentai_v1.types import document_processor_service, evaluation -from google.cloud.documentai_v1.types import processor +from google.cloud.documentai_v1.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type from .base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/__init__.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/__init__.py index bcc7448d4719..690771ae6bf0 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/__init__.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .barcode import Barcode -from .document import Document +from .barcode import ( + Barcode, +) +from .document import ( + Document, +) from .document_io import ( BatchDocumentsInputConfig, DocumentOutputConfig, @@ -76,12 +80,29 @@ UndeployProcessorVersionRequest, UndeployProcessorVersionResponse, ) -from .document_schema import DocumentSchema -from .evaluation import Evaluation, EvaluationReference -from .geometry import BoundingPoly, NormalizedVertex, Vertex -from .operation_metadata import CommonOperationMetadata -from .processor import Processor, ProcessorVersion, ProcessorVersionAlias -from .processor_type import ProcessorType +from .document_schema import ( + DocumentSchema, +) +from .evaluation import ( + Evaluation, + EvaluationReference, +) +from .geometry import ( + BoundingPoly, + NormalizedVertex, + Vertex, +) +from .operation_metadata import ( + CommonOperationMetadata, +) +from .processor import ( + Processor, + ProcessorVersion, + ProcessorVersionAlias, +) +from .processor_type import ( + ProcessorType, +) __all__ = ( "Barcode", diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document.py index f5345ee48c7c..5a3b31baefde 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document.py @@ -17,13 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import color_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import money_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.color_pb2 as color_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore import proto # type: ignore from google.cloud.documentai_v1.types import barcode as gcd_barcode @@ -445,6 +445,7 @@ class Orientation(proto.Enum): Turn the head 90 degrees counterclockwise from upright to read. """ + ORIENTATION_UNSPECIFIED = 0 PAGE_UP = 1 PAGE_RIGHT = 2 @@ -491,12 +492,12 @@ class Block(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -525,12 +526,12 @@ class Paragraph(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -559,12 +560,12 @@ class Line(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -614,6 +615,7 @@ class Type(proto.Enum): A hyphen that indicates that a token has been split across lines. """ + TYPE_UNSPECIFIED = 0 SPACE = 1 WIDE_SPACE = 2 @@ -744,12 +746,12 @@ class StyleInfo(proto.Message): number=2, message="Document.Page.Token.DetectedBreak", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -780,12 +782,12 @@ class Symbol(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) class VisualElement(proto.Message): @@ -814,12 +816,12 @@ class VisualElement(proto.Message): proto.STRING, number=2, ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Document.Page.DetectedLanguage", + ) ) class Table(proto.Message): @@ -848,12 +850,12 @@ class TableRow(proto.Message): Cells that make up this row. """ - cells: MutableSequence[ - "Document.Page.Table.TableCell" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.Page.Table.TableCell", + cells: MutableSequence["Document.Page.Table.TableCell"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.Page.Table.TableCell", + ) ) class TableCell(proto.Message): @@ -899,26 +901,26 @@ class TableCell(proto.Message): number=1, message="Document.Page.Layout", ) - header_rows: MutableSequence[ - "Document.Page.Table.TableRow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.Table.TableRow", + header_rows: MutableSequence["Document.Page.Table.TableRow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.Table.TableRow", + ) ) - body_rows: MutableSequence[ - "Document.Page.Table.TableRow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Document.Page.Table.TableRow", + body_rows: MutableSequence["Document.Page.Table.TableRow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Document.Page.Table.TableRow", + ) ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -1131,12 +1133,12 @@ class DetectedDefect(proto.Message): number=3, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Document.Page.DetectedLanguage", + ) ) blocks: MutableSequence["Document.Page.Block"] = proto.RepeatedField( proto.MESSAGE, @@ -1158,12 +1160,12 @@ class DetectedDefect(proto.Message): number=8, message="Document.Page.Token", ) - visual_elements: MutableSequence[ - "Document.Page.VisualElement" - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message="Document.Page.VisualElement", + visual_elements: MutableSequence["Document.Page.VisualElement"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message="Document.Page.VisualElement", + ) ) tables: MutableSequence["Document.Page.Table"] = proto.RepeatedField( proto.MESSAGE, @@ -1180,12 +1182,12 @@ class DetectedDefect(proto.Message): number=12, message="Document.Page.Symbol", ) - detected_barcodes: MutableSequence[ - "Document.Page.DetectedBarcode" - ] = proto.RepeatedField( - proto.MESSAGE, - number=15, - message="Document.Page.DetectedBarcode", + detected_barcodes: MutableSequence["Document.Page.DetectedBarcode"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=15, + message="Document.Page.DetectedBarcode", + ) ) image_quality_scores: "Document.Page.ImageQualityScores" = proto.Field( proto.MESSAGE, @@ -1260,6 +1262,7 @@ class Method(proto.Enum): inference and is not necessarily an exact text extraction from the document. """ + METHOD_UNSPECIFIED = 0 EXTRACT = 1 DERIVE = 2 @@ -1502,12 +1505,12 @@ class TextSegment(proto.Message): number=2, ) - text_segments: MutableSequence[ - "Document.TextAnchor.TextSegment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.TextAnchor.TextSegment", + text_segments: MutableSequence["Document.TextAnchor.TextSegment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.TextAnchor.TextSegment", + ) ) content: str = proto.Field( proto.STRING, @@ -1591,6 +1594,7 @@ class LayoutType(proto.Enum): [Page.form_fields][google.cloud.documentai.v1.Document.Page.form_fields] element. """ + LAYOUT_TYPE_UNSPECIFIED = 0 BLOCK = 1 PARAGRAPH = 2 @@ -1680,6 +1684,7 @@ class OperationType(proto.Enum): Deprecated. Element is skipped in the validation process. """ + OPERATION_TYPE_UNSPECIFIED = 0 ADD = 1 REMOVE = 2 @@ -2111,12 +2116,12 @@ class LayoutListEntry(proto.Message): message=geometry.BoundingPoly, ) - blocks: MutableSequence[ - "Document.DocumentLayout.DocumentLayoutBlock" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.DocumentLayout.DocumentLayoutBlock", + blocks: MutableSequence["Document.DocumentLayout.DocumentLayoutBlock"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.DocumentLayout.DocumentLayoutBlock", + ) ) class ChunkedDocument(proto.Message): @@ -2285,6 +2290,7 @@ class ValidationResultType(proto.Enum): VALIDATION_RESULT_TYPE_NOT_APPLICABLE (4): The validation is not applicable. """ + VALIDATION_RESULT_TYPE_UNSPECIFIED = 0 VALIDATION_RESULT_TYPE_VALID = 1 VALIDATION_RESULT_TYPE_INVALID = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_io.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_io.py index d8539638fd33..f73d60162e9a 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_io.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_io.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_processor_service.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_processor_service.py index 1f515258c865..c57eed75ed3d 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_processor_service.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_processor_service.py @@ -17,18 +17,20 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore -from google.cloud.documentai_v1.types import document_schema as gcd_document_schema from google.cloud.documentai_v1.types import document as gcd_document -from google.cloud.documentai_v1.types import document_io +from google.cloud.documentai_v1.types import ( + document_io, + operation_metadata, + processor_type, +) +from google.cloud.documentai_v1.types import document_schema as gcd_document_schema from google.cloud.documentai_v1.types import evaluation as gcd_evaluation -from google.cloud.documentai_v1.types import operation_metadata from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type __protobuf__ = proto.module( package="google.cloud.documentai.v1", @@ -376,6 +378,7 @@ class State(proto.Enum): [state_message][google.cloud.documentai.v1.HumanReviewStatus.state_message] for details. """ + STATE_UNSPECIFIED = 0 SKIPPED = 1 VALIDATION_PASSED = 2 @@ -537,6 +540,7 @@ class State(proto.Enum): FAILED (6): The batch processing has failed. """ + STATE_UNSPECIFIED = 0 WAITING = 1 RUNNING = 2 @@ -604,12 +608,12 @@ class IndividualProcessStatus(proto.Message): number=4, message=timestamp_pb2.Timestamp, ) - individual_process_statuses: MutableSequence[ - IndividualProcessStatus - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=IndividualProcessStatus, + individual_process_statuses: MutableSequence[IndividualProcessStatus] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=IndividualProcessStatus, + ) ) @@ -641,12 +645,12 @@ class FetchProcessorTypesResponse(proto.Message): The list of processor types. """ - processor_types: MutableSequence[ - processor_type.ProcessorType - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=processor_type.ProcessorType, + processor_types: MutableSequence[processor_type.ProcessorType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=processor_type.ProcessorType, + ) ) @@ -700,12 +704,12 @@ class ListProcessorTypesResponse(proto.Message): def raw_page(self): return self - processor_types: MutableSequence[ - processor_type.ProcessorType - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=processor_type.ProcessorType, + processor_types: MutableSequence[processor_type.ProcessorType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=processor_type.ProcessorType, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -873,12 +877,12 @@ class ListProcessorVersionsResponse(proto.Message): def raw_page(self): return self - processor_versions: MutableSequence[ - gcd_processor.ProcessorVersion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_processor.ProcessorVersion, + processor_versions: MutableSequence[gcd_processor.ProcessorVersion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_processor.ProcessorVersion, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1304,6 +1308,7 @@ class TrainingMethod(proto.Enum): TEMPLATE_BASED (2): No description available. """ + TRAINING_METHOD_UNSPECIFIED = 0 MODEL_BASED = 1 TEMPLATE_BASED = 2 @@ -1500,6 +1505,7 @@ class Priority(proto.Enum): urgent task queue to respect this priority level. """ + DEFAULT = 0 URGENT = 1 @@ -1558,6 +1564,7 @@ class State(proto.Enum): SUCCEEDED (2): The review operation is succeeded. """ + STATE_UNSPECIFIED = 0 REJECTED = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_schema.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_schema.py index e4f9612df8f6..b74f420b2a83 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_schema.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/document_schema.py @@ -150,6 +150,7 @@ class OccurrenceType(proto.Enum): The entity type will appear once or more times. """ + OCCURRENCE_TYPE_UNSPECIFIED = 0 OPTIONAL_ONCE = 1 OPTIONAL_MULTIPLE = 2 @@ -171,6 +172,7 @@ class Method(proto.Enum): inference and is not necessarily an exact text extraction from the document. """ + METHOD_UNSPECIFIED = 0 EXTRACT = 1 DERIVE = 2 @@ -218,12 +220,12 @@ class Method(proto.Enum): proto.STRING, number=2, ) - properties: MutableSequence[ - "DocumentSchema.EntityType.Property" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="DocumentSchema.EntityType.Property", + properties: MutableSequence["DocumentSchema.EntityType.Property"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="DocumentSchema.EntityType.Property", + ) ) class Metadata(proto.Message): diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/evaluation.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/evaluation.py index 74dbead1bb66..ca1e248776ee 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/evaluation.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/evaluation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -270,6 +270,7 @@ class MetricsType(proto.Enum): parent (i.e., non-leaf) entity types are an aggregate of metrics for their children. """ + METRICS_TYPE_UNSPECIFIED = 0 AGGREGATE = 1 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/operation_metadata.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/operation_metadata.py index 35a3c0936077..0e43a351b058 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/operation_metadata.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/operation_metadata.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -62,6 +62,7 @@ class State(proto.Enum): CANCELLED (5): Operation is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 CANCELLING = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor.py index 5094af07a222..1afcccbe316b 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.documentai_v1.types import document_schema as gcd_document_schema @@ -110,6 +110,7 @@ class State(proto.Enum): IMPORTING (8): The processor version is being imported. """ + STATE_UNSPECIFIED = 0 DEPLOYED = 1 DEPLOYING = 2 @@ -133,6 +134,7 @@ class ModelType(proto.Enum): MODEL_TYPE_CUSTOM (2): The processor version has custom model type. """ + MODEL_TYPE_UNSPECIFIED = 0 MODEL_TYPE_GENERATIVE = 1 MODEL_TYPE_CUSTOM = 2 @@ -229,6 +231,7 @@ class CustomModelType(proto.Enum): FINE_TUNED (2): The model is a finetuned foundation model. """ + CUSTOM_MODEL_TYPE_UNSPECIFIED = 0 VERSIONED_FOUNDATION = 1 FINE_TUNED = 2 @@ -417,6 +420,7 @@ class State(proto.Enum): The processor is being deleted, will be removed if successful. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -447,12 +451,12 @@ class State(proto.Enum): proto.STRING, number=9, ) - processor_version_aliases: MutableSequence[ - "ProcessorVersionAlias" - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message="ProcessorVersionAlias", + processor_version_aliases: MutableSequence["ProcessorVersionAlias"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message="ProcessorVersionAlias", + ) ) process_endpoint: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor_type.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor_type.py index 8e68ab798644..ff987fc193e7 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor_type.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor_type.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.api import launch_stage_pb2 # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/__init__.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/__init__.py index 2b00dbfb0643..5168c3606cea 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/__init__.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.document_processor_service import ( DocumentProcessorServiceAsyncClient, DocumentProcessorServiceClient, diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/async_client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/async_client.py index 508ed28fcff6..c6b85dd8226d 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/async_client.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1beta3 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api import launch_stage_pb2 # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.documentai_v1beta3.services.document_processor_service import pagers from google.cloud.documentai_v1beta3.types import ( @@ -58,10 +58,10 @@ document_processor_service, document_schema, evaluation, + processor, + processor_type, ) -from google.cloud.documentai_v1beta3.types import processor from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type from .client import DocumentProcessorServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport @@ -164,7 +164,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentProcessorServiceAsyncClient: The constructed client. """ - return DocumentProcessorServiceClient.from_service_account_info.__func__(DocumentProcessorServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DocumentProcessorServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DocumentProcessorServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -180,7 +181,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentProcessorServiceAsyncClient: The constructed client. """ - return DocumentProcessorServiceClient.from_service_account_file.__func__(DocumentProcessorServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DocumentProcessorServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + DocumentProcessorServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -218,7 +222,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DocumentProcessorServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DocumentProcessorServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DocumentProcessorServiceTransport: diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/client.py index dd53aa3989dd..cb7e66028232 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/client.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1beta3 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api import launch_stage_pb2 # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.documentai_v1beta3.services.document_processor_service import pagers from google.cloud.documentai_v1beta3.types import ( @@ -75,10 +75,10 @@ document_processor_service, document_schema, evaluation, + processor, + processor_type, ) -from google.cloud.documentai_v1beta3.types import processor from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type from .transports.base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport from .transports.grpc import DocumentProcessorServiceGrpcTransport @@ -94,9 +94,7 @@ class DocumentProcessorServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentProcessorServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentProcessorServiceTransport]] _transport_registry["grpc"] = DocumentProcessorServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentProcessorServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentProcessorServiceRestTransport @@ -741,11 +739,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentProcessorServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentProcessorServiceClient._read_environment_variables() + ) self._client_cert_source = ( DocumentProcessorServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -782,8 +778,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentProcessorServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/pagers.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/pagers.py index 2830c8439f85..aa1fd3e3b349 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/pagers.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -150,7 +150,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -310,7 +310,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -392,7 +392,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -472,7 +472,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -554,7 +554,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -632,7 +632,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/__init__.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/__init__.py index 8ac84e5a7497..5db56eee3bb4 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/__init__.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DocumentProcessorServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DocumentProcessorServiceTransport]] _transport_registry["grpc"] = DocumentProcessorServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentProcessorServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentProcessorServiceRestTransport diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/base.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/base.py index d95f87060838..08003b58a4f4 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/base.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/base.py @@ -17,21 +17,24 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1beta3 import gapic_version as package_version -from google.cloud.documentai_v1beta3.types import document_processor_service, evaluation -from google.cloud.documentai_v1beta3.types import processor +from google.cloud.documentai_v1beta3.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -577,7 +580,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc.py index ca6b3abb8e36..b6c949a525f0 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc.py @@ -16,24 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.documentai_v1beta3.types import document_processor_service, evaluation -from google.cloud.documentai_v1beta3.types import processor +from google.cloud.documentai_v1beta3.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type from .base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport @@ -721,12 +724,12 @@ def undeploy_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_processor_version" not in self._stubs: - self._stubs[ - "undeploy_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1beta3.DocumentProcessorService/UndeployProcessorVersion", - request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undeploy_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1beta3.DocumentProcessorService/UndeployProcessorVersion", + request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undeploy_processor_version"] @@ -878,12 +881,12 @@ def set_default_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_default_processor_version" not in self._stubs: - self._stubs[ - "set_default_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1beta3.DocumentProcessorService/SetDefaultProcessorVersion", - request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_default_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1beta3.DocumentProcessorService/SetDefaultProcessorVersion", + request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_default_processor_version"] @@ -939,12 +942,12 @@ def evaluate_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "evaluate_processor_version" not in self._stubs: - self._stubs[ - "evaluate_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1beta3.DocumentProcessorService/EvaluateProcessorVersion", - request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["evaluate_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1beta3.DocumentProcessorService/EvaluateProcessorVersion", + request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["evaluate_processor_version"] diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc_asyncio.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc_asyncio.py index a820eddbc0b5..c194639a1c78 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,15 +31,15 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.documentai_v1beta3.types import document_processor_service, evaluation -from google.cloud.documentai_v1beta3.types import processor +from google.cloud.documentai_v1beta3.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type from .base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport from .grpc import DocumentProcessorServiceGrpcTransport @@ -730,12 +733,12 @@ def undeploy_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undeploy_processor_version" not in self._stubs: - self._stubs[ - "undeploy_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1beta3.DocumentProcessorService/UndeployProcessorVersion", - request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undeploy_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1beta3.DocumentProcessorService/UndeployProcessorVersion", + request_serializer=document_processor_service.UndeployProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undeploy_processor_version"] @@ -891,12 +894,12 @@ def set_default_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_default_processor_version" not in self._stubs: - self._stubs[ - "set_default_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1beta3.DocumentProcessorService/SetDefaultProcessorVersion", - request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_default_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1beta3.DocumentProcessorService/SetDefaultProcessorVersion", + request_serializer=document_processor_service.SetDefaultProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_default_processor_version"] @@ -953,12 +956,12 @@ def evaluate_processor_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "evaluate_processor_version" not in self._stubs: - self._stubs[ - "evaluate_processor_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.documentai.v1beta3.DocumentProcessorService/EvaluateProcessorVersion", - request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["evaluate_processor_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.documentai.v1beta3.DocumentProcessorService/EvaluateProcessorVersion", + request_serializer=document_processor_service.EvaluateProcessorVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["evaluate_processor_version"] diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest.py index c284c363dcbb..f9fba6e8fdc8 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest.py @@ -16,24 +16,27 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.documentai_v1beta3.types import document_processor_service, evaluation -from google.cloud.documentai_v1beta3.types import processor +from google.cloud.documentai_v1beta3.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentProcessorServiceRestTransport @@ -1744,9 +1747,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseBatchProcessDocuments._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseBatchProcessDocuments._get_http_options() request, metadata = self._interceptor.pre_batch_process_documents( request, metadata @@ -1772,7 +1773,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1904,9 +1905,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseCreateProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseCreateProcessor._get_http_options() request, metadata = self._interceptor.pre_create_processor( request, metadata @@ -2063,9 +2062,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessor._get_http_options() request, metadata = self._interceptor.pre_delete_processor( request, metadata @@ -2087,7 +2084,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2215,9 +2212,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDeleteProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_delete_processor_version( request, metadata @@ -2239,7 +2234,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2366,9 +2361,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDeployProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDeployProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_deploy_processor_version( request, metadata @@ -2394,7 +2387,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2522,9 +2515,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseDisableProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseDisableProcessor._get_http_options() request, metadata = self._interceptor.pre_disable_processor( request, metadata @@ -2550,7 +2541,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2680,9 +2671,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseEnableProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseEnableProcessor._get_http_options() request, metadata = self._interceptor.pre_enable_processor( request, metadata @@ -2708,7 +2697,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2841,9 +2830,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseEvaluateProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseEvaluateProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_evaluate_processor_version( request, metadata @@ -2869,7 +2856,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2997,9 +2984,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseFetchProcessorTypes._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseFetchProcessorTypes._get_http_options() request, metadata = self._interceptor.pre_fetch_processor_types( request, metadata @@ -3150,9 +3135,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetEvaluation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_evaluation(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetEvaluation._get_transcoded_request( @@ -3303,9 +3286,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetProcessor._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessor._get_http_options() request, metadata = self._interceptor.pre_get_processor(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessor._get_transcoded_request( @@ -3456,9 +3437,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorType._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorType._get_http_options() request, metadata = self._interceptor.pre_get_processor_type( request, metadata @@ -3615,9 +3594,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_get_processor_version( request, metadata @@ -3782,9 +3759,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseImportProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseImportProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_import_processor_version( request, metadata @@ -3810,7 +3785,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3933,9 +3908,7 @@ def __call__( The response from ``ListEvaluations``. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListEvaluations._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_evaluations( request, metadata @@ -4090,9 +4063,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListProcessors._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListProcessors._get_http_options() request, metadata = self._interceptor.pre_list_processors(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseListProcessors._get_transcoded_request( @@ -4247,9 +4218,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListProcessorTypes._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListProcessorTypes._get_http_options() request, metadata = self._interceptor.pre_list_processor_types( request, metadata @@ -4405,9 +4374,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListProcessorVersions._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListProcessorVersions._get_http_options() request, metadata = self._interceptor.pre_list_processor_versions( request, metadata @@ -4560,9 +4527,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseProcessDocument._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseProcessDocument._get_http_options() request, metadata = self._interceptor.pre_process_document( request, metadata @@ -4722,9 +4687,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseReviewDocument._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseReviewDocument._get_http_options() request, metadata = self._interceptor.pre_review_document(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseReviewDocument._get_transcoded_request( @@ -4748,7 +4711,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4881,9 +4844,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseSetDefaultProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseSetDefaultProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_set_default_processor_version( request, metadata @@ -4909,7 +4870,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4950,11 +4911,10 @@ def __call__( resp = self._interceptor.post_set_default_processor_version(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_default_processor_version_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_default_processor_version_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5040,9 +5000,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseTrainProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseTrainProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_train_processor_version( request, metadata @@ -5068,7 +5026,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5199,9 +5157,7 @@ def __call__( """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseUndeployProcessorVersion._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseUndeployProcessorVersion._get_http_options() request, metadata = self._interceptor.pre_undeploy_processor_version( request, metadata @@ -5227,7 +5183,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5333,7 +5289,9 @@ def delete_processor_version( ]: # 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._DeleteProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def deploy_processor_version( @@ -5344,7 +5302,9 @@ def deploy_processor_version( ]: # 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._DeployProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._DeployProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def disable_processor( @@ -5375,7 +5335,9 @@ def evaluate_processor_version( ]: # 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._EvaluateProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._EvaluateProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_processor_types( @@ -5439,7 +5401,9 @@ def import_processor_version( ]: # 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._ImportProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._ImportProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_evaluations( @@ -5515,7 +5479,9 @@ def set_default_processor_version( ]: # 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._SetDefaultProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._SetDefaultProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def train_processor_version( @@ -5537,7 +5503,9 @@ def undeploy_processor_version( ]: # 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._UndeployProcessorVersion(self._session, self._host, self._interceptor) # type: ignore + return self._UndeployProcessorVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -5597,9 +5565,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -5738,9 +5704,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -5878,9 +5842,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -5998,9 +5960,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -6141,9 +6101,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentProcessorServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentProcessorServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentProcessorServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest_base.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest_base.py index 31233c32c0cd..5e1f0ff13c2c 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest_base.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/transports/rest_base.py @@ -22,10 +22,13 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.documentai_v1beta3.types import document_processor_service, evaluation -from google.cloud.documentai_v1beta3.types import processor +from google.cloud.documentai_v1beta3.types import ( + document_processor_service, + evaluation, + processor, + processor_type, +) from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type from .base import DEFAULT_CLIENT_INFO, DocumentProcessorServiceTransport diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/async_client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/async_client.py index 78108f2926fa..f68e56ee7a12 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/async_client.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1beta3 import gapic_version as package_version @@ -44,19 +44,19 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.documentai_v1beta3.services.document_service import pagers from google.cloud.documentai_v1beta3.types import ( + dataset, document, document_schema, document_service, ) -from google.cloud.documentai_v1beta3.types import dataset from google.cloud.documentai_v1beta3.types import dataset as gcd_dataset from .client import DocumentServiceClient @@ -133,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DocumentServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DocumentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DocumentServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DocumentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/client.py index a78fc83c0378..dcb9b1e49a5c 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/client.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1beta3 import gapic_version as package_version @@ -61,19 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.documentai_v1beta3.services.document_service import pagers from google.cloud.documentai_v1beta3.types import ( + dataset, document, document_schema, document_service, ) -from google.cloud.documentai_v1beta3.types import dataset from google.cloud.documentai_v1beta3.types import dataset as gcd_dataset from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport @@ -90,9 +90,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -680,11 +678,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -719,8 +715,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/pagers.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/pagers.py index 442c816ee02d..456ccd43d467 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/pagers.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/base.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/base.py index 314a5ae0b99c..9040f417ccf2 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/base.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.documentai_v1beta3 import gapic_version as package_version from google.cloud.documentai_v1beta3.types import dataset, document_service @@ -307,7 +307,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc.py index a49181635aa7..653f2dfc5d1b 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.documentai_v1beta3.types import dataset, document_service diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc_asyncio.py index 9b30f0e82f70..a027b2b3bd69 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.documentai_v1beta3.types import dataset, document_service diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/rest.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/rest.py index 42243d80e926..95a45abd6cae 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/rest.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -809,9 +809,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseBatchDeleteDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseBatchDeleteDocuments._get_http_options() request, metadata = self._interceptor.pre_batch_delete_documents( request, metadata @@ -837,7 +835,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -958,9 +956,7 @@ def __call__( Dataset Schema. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseGetDatasetSchema._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseGetDatasetSchema._get_http_options() request, metadata = self._interceptor.pre_get_dataset_schema( request, metadata @@ -1254,9 +1250,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() request, metadata = self._interceptor.pre_import_documents( request, metadata @@ -1282,7 +1276,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1585,7 +1579,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1708,9 +1702,7 @@ def __call__( Dataset Schema. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDatasetSchema._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDatasetSchema._get_http_options() request, metadata = self._interceptor.pre_update_dataset_schema( request, metadata @@ -2201,9 +2193,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2458,9 +2448,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/__init__.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/__init__.py index 49425673851e..6b59e3952969 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/__init__.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/__init__.py @@ -13,9 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .barcode import Barcode -from .dataset import BatchDatasetDocuments, Dataset, DatasetSchema, DocumentId -from .document import Document, RevisionRef +from .barcode import ( + Barcode, +) +from .dataset import ( + BatchDatasetDocuments, + Dataset, + DatasetSchema, + DocumentId, +) +from .document import ( + Document, + RevisionRef, +) from .document_io import ( BatchDocumentsInputConfig, DocumentOutputConfig, @@ -107,11 +117,26 @@ UpdateDatasetRequest, UpdateDatasetSchemaRequest, ) -from .evaluation import Evaluation, EvaluationReference -from .geometry import BoundingPoly, NormalizedVertex, Vertex -from .operation_metadata import CommonOperationMetadata -from .processor import Processor, ProcessorVersion, ProcessorVersionAlias -from .processor_type import ProcessorType +from .evaluation import ( + Evaluation, + EvaluationReference, +) +from .geometry import ( + BoundingPoly, + NormalizedVertex, + Vertex, +) +from .operation_metadata import ( + CommonOperationMetadata, +) +from .processor import ( + Processor, + ProcessorVersion, + ProcessorVersionAlias, +) +from .processor_type import ( + ProcessorType, +) __all__ = ( "Barcode", diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/dataset.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/dataset.py index 8c408f497500..ff9fcb2ae13a 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/dataset.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/dataset.py @@ -19,8 +19,8 @@ import proto # type: ignore -from google.cloud.documentai_v1beta3.types import document_schema as gcd_document_schema from google.cloud.documentai_v1beta3.types import document, document_io +from google.cloud.documentai_v1beta3.types import document_schema as gcd_document_schema __protobuf__ = proto.module( package="google.cloud.documentai.v1beta3", @@ -97,6 +97,7 @@ class State(proto.Enum): INITIALIZED (3): Dataset has been initialized. """ + STATE_UNSPECIFIED = 0 UNINITIALIZED = 1 INITIALIZING = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document.py index 63069e997415..84d88490575b 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document.py @@ -17,13 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import color_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import money_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.color_pb2 as color_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore import proto # type: ignore from google.cloud.documentai_v1beta3.types import barcode as gcd_barcode @@ -453,6 +453,7 @@ class Orientation(proto.Enum): Turn the head 90 degrees counterclockwise from upright to read. """ + ORIENTATION_UNSPECIFIED = 0 PAGE_UP = 1 PAGE_RIGHT = 2 @@ -500,12 +501,12 @@ class Block(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -534,12 +535,12 @@ class Paragraph(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -569,12 +570,12 @@ class Line(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -625,6 +626,7 @@ class Type(proto.Enum): A hyphen that indicates that a token has been split across lines. """ + TYPE_UNSPECIFIED = 0 SPACE = 1 WIDE_SPACE = 2 @@ -755,12 +757,12 @@ class StyleInfo(proto.Message): number=2, message="Document.Page.Token.DetectedBreak", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -791,12 +793,12 @@ class Symbol(proto.Message): number=1, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.DetectedLanguage", + ) ) class VisualElement(proto.Message): @@ -825,12 +827,12 @@ class VisualElement(proto.Message): proto.STRING, number=2, ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Document.Page.DetectedLanguage", + ) ) class Table(proto.Message): @@ -860,12 +862,12 @@ class TableRow(proto.Message): Cells that make up this row. """ - cells: MutableSequence[ - "Document.Page.Table.TableCell" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.Page.Table.TableCell", + cells: MutableSequence["Document.Page.Table.TableCell"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.Page.Table.TableCell", + ) ) class TableCell(proto.Message): @@ -911,26 +913,26 @@ class TableCell(proto.Message): number=1, message="Document.Page.Layout", ) - header_rows: MutableSequence[ - "Document.Page.Table.TableRow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="Document.Page.Table.TableRow", + header_rows: MutableSequence["Document.Page.Table.TableRow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="Document.Page.Table.TableRow", + ) ) - body_rows: MutableSequence[ - "Document.Page.Table.TableRow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Document.Page.Table.TableRow", + body_rows: MutableSequence["Document.Page.Table.TableRow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Document.Page.Table.TableRow", + ) ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Document.Page.DetectedLanguage", + ) ) provenance: "Document.Provenance" = proto.Field( proto.MESSAGE, @@ -1143,12 +1145,12 @@ class DetectedDefect(proto.Message): number=3, message="Document.Page.Layout", ) - detected_languages: MutableSequence[ - "Document.Page.DetectedLanguage" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="Document.Page.DetectedLanguage", + detected_languages: MutableSequence["Document.Page.DetectedLanguage"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="Document.Page.DetectedLanguage", + ) ) blocks: MutableSequence["Document.Page.Block"] = proto.RepeatedField( proto.MESSAGE, @@ -1170,12 +1172,12 @@ class DetectedDefect(proto.Message): number=8, message="Document.Page.Token", ) - visual_elements: MutableSequence[ - "Document.Page.VisualElement" - ] = proto.RepeatedField( - proto.MESSAGE, - number=9, - message="Document.Page.VisualElement", + visual_elements: MutableSequence["Document.Page.VisualElement"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=9, + message="Document.Page.VisualElement", + ) ) tables: MutableSequence["Document.Page.Table"] = proto.RepeatedField( proto.MESSAGE, @@ -1192,12 +1194,12 @@ class DetectedDefect(proto.Message): number=12, message="Document.Page.Symbol", ) - detected_barcodes: MutableSequence[ - "Document.Page.DetectedBarcode" - ] = proto.RepeatedField( - proto.MESSAGE, - number=15, - message="Document.Page.DetectedBarcode", + detected_barcodes: MutableSequence["Document.Page.DetectedBarcode"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=15, + message="Document.Page.DetectedBarcode", + ) ) image_quality_scores: "Document.Page.ImageQualityScores" = proto.Field( proto.MESSAGE, @@ -1273,6 +1275,7 @@ class Method(proto.Enum): inference and is not necessarily an exact text extraction from the document. """ + METHOD_UNSPECIFIED = 0 EXTRACT = 1 DERIVE = 2 @@ -1517,12 +1520,12 @@ class TextSegment(proto.Message): number=2, ) - text_segments: MutableSequence[ - "Document.TextAnchor.TextSegment" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.TextAnchor.TextSegment", + text_segments: MutableSequence["Document.TextAnchor.TextSegment"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.TextAnchor.TextSegment", + ) ) content: str = proto.Field( proto.STRING, @@ -1606,6 +1609,7 @@ class LayoutType(proto.Enum): [Page.form_fields][google.cloud.documentai.v1beta3.Document.Page.form_fields] element. """ + LAYOUT_TYPE_UNSPECIFIED = 0 BLOCK = 1 PARAGRAPH = 2 @@ -1695,6 +1699,7 @@ class OperationType(proto.Enum): Deprecated. Element is skipped in the validation process. """ + OPERATION_TYPE_UNSPECIFIED = 0 ADD = 1 REMOVE = 2 @@ -2232,12 +2237,12 @@ class LayoutImageBlock(proto.Message): message=geometry.BoundingPoly, ) - blocks: MutableSequence[ - "Document.DocumentLayout.DocumentLayoutBlock" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.DocumentLayout.DocumentLayoutBlock", + blocks: MutableSequence["Document.DocumentLayout.DocumentLayoutBlock"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.DocumentLayout.DocumentLayoutBlock", + ) ) class ChunkedDocument(proto.Message): @@ -2552,6 +2557,7 @@ class ValidationResultType(proto.Enum): VALIDATION_RESULT_TYPE_NOT_APPLICABLE (4): The validation is not applicable. """ + VALIDATION_RESULT_TYPE_UNSPECIFIED = 0 VALIDATION_RESULT_TYPE_VALID = 1 VALIDATION_RESULT_TYPE_INVALID = 2 @@ -2751,6 +2757,7 @@ class RevisionCase(proto.Enum): BASE_OCR_REVISION (3): The first (OCR) revision. """ + REVISION_CASE_UNSPECIFIED = 0 LATEST_HUMAN_REVIEW = 1 LATEST_TIMESTAMP = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_io.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_io.py index 40d7495476a2..08015e20c2ee 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_io.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_io.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_processor_service.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_processor_service.py index 04f29c6520e1..8622fd47afcc 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_processor_service.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_processor_service.py @@ -17,18 +17,20 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore -from google.cloud.documentai_v1beta3.types import document_schema as gcd_document_schema from google.cloud.documentai_v1beta3.types import document as gcd_document -from google.cloud.documentai_v1beta3.types import document_io +from google.cloud.documentai_v1beta3.types import ( + document_io, + operation_metadata, + processor_type, +) +from google.cloud.documentai_v1beta3.types import document_schema as gcd_document_schema from google.cloud.documentai_v1beta3.types import evaluation as gcd_evaluation -from google.cloud.documentai_v1beta3.types import operation_metadata from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type __protobuf__ = proto.module( package="google.cloud.documentai.v1beta3", @@ -435,6 +437,7 @@ class State(proto.Enum): [state_message][google.cloud.documentai.v1beta3.HumanReviewStatus.state_message] for details. """ + STATE_UNSPECIFIED = 0 SKIPPED = 1 VALIDATION_PASSED = 2 @@ -664,6 +667,7 @@ class State(proto.Enum): FAILED (6): The batch processing has failed. """ + STATE_UNSPECIFIED = 0 WAITING = 1 RUNNING = 2 @@ -742,12 +746,12 @@ class IndividualProcessStatus(proto.Message): number=4, message=timestamp_pb2.Timestamp, ) - individual_process_statuses: MutableSequence[ - IndividualProcessStatus - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=IndividualProcessStatus, + individual_process_statuses: MutableSequence[IndividualProcessStatus] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=IndividualProcessStatus, + ) ) @@ -779,12 +783,12 @@ class FetchProcessorTypesResponse(proto.Message): The list of processor types. """ - processor_types: MutableSequence[ - processor_type.ProcessorType - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=processor_type.ProcessorType, + processor_types: MutableSequence[processor_type.ProcessorType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=processor_type.ProcessorType, + ) ) @@ -838,12 +842,12 @@ class ListProcessorTypesResponse(proto.Message): def raw_page(self): return self - processor_types: MutableSequence[ - processor_type.ProcessorType - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=processor_type.ProcessorType, + processor_types: MutableSequence[processor_type.ProcessorType] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=processor_type.ProcessorType, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1011,12 +1015,12 @@ class ListProcessorVersionsResponse(proto.Message): def raw_page(self): return self - processor_versions: MutableSequence[ - gcd_processor.ProcessorVersion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_processor.ProcessorVersion, + processor_versions: MutableSequence[gcd_processor.ProcessorVersion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_processor.ProcessorVersion, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1442,6 +1446,7 @@ class TrainingMethod(proto.Enum): TEMPLATE_BASED (2): No description available. """ + TRAINING_METHOD_UNSPECIFIED = 0 MODEL_BASED = 1 TEMPLATE_BASED = 2 @@ -1640,6 +1645,7 @@ class Priority(proto.Enum): urgent task queue to respect this priority level. """ + DEFAULT = 0 URGENT = 1 @@ -1703,6 +1709,7 @@ class State(proto.Enum): SUCCEEDED (2): The review operation is succeeded. """ + STATE_UNSPECIFIED = 0 REJECTED = 1 SUCCEEDED = 2 @@ -1762,6 +1769,7 @@ class State(proto.Enum): CANCELLED (5): Operation is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 CANCELLING = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_schema.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_schema.py index c20c913b29b4..236ec018b9a7 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_schema.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_schema.py @@ -54,6 +54,7 @@ class Length(proto.Enum): COMPREHENSIVE (3): The longest option available. """ + LENGTH_UNSPECIFIED = 0 BRIEF = 1 MODERATE = 2 @@ -70,6 +71,7 @@ class Format(proto.Enum): BULLETS (2): Format the output in bullets. """ + FORMAT_UNSPECIFIED = 0 PARAGRAPH = 1 BULLETS = 2 @@ -274,6 +276,7 @@ class OccurrenceType(proto.Enum): The entity type will appear once or more times. """ + OCCURRENCE_TYPE_UNSPECIFIED = 0 OPTIONAL_ONCE = 1 OPTIONAL_MULTIPLE = 2 @@ -295,6 +298,7 @@ class Method(proto.Enum): inference and is not necessarily an exact text extraction from the document. """ + METHOD_UNSPECIFIED = 0 EXTRACT = 1 DERIVE = 2 @@ -355,12 +359,12 @@ class Method(proto.Enum): proto.STRING, number=2, ) - properties: MutableSequence[ - "DocumentSchema.EntityType.Property" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="DocumentSchema.EntityType.Property", + properties: MutableSequence["DocumentSchema.EntityType.Property"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="DocumentSchema.EntityType.Property", + ) ) entity_type_metadata: "EntityTypeMetadata" = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_service.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_service.py index a45ab42b5df5..8d43423d29a3 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_service.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_service.py @@ -17,13 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore -from google.cloud.documentai_v1beta3.types import document_io, operation_metadata from google.cloud.documentai_v1beta3.types import dataset as gcd_dataset from google.cloud.documentai_v1beta3.types import document as gcd_document +from google.cloud.documentai_v1beta3.types import document_io, operation_metadata __protobuf__ = proto.module( package="google.cloud.documentai.v1beta3", @@ -64,6 +64,7 @@ class DatasetSplitType(proto.Enum): DATASET_SPLIT_UNASSIGNED (3): Identifies the unassigned documents. """ + DATASET_SPLIT_TYPE_UNSPECIFIED = 0 DATASET_SPLIT_TRAIN = 1 DATASET_SPLIT_TEST = 2 @@ -83,6 +84,7 @@ class DocumentLabelingState(proto.Enum): DOCUMENT_AUTO_LABELED (3): Document has been auto-labeled. """ + DOCUMENT_LABELING_STATE_UNSPECIFIED = 0 DOCUMENT_LABELED = 1 DOCUMENT_UNLABELED = 2 @@ -205,12 +207,12 @@ class AutoSplitConfig(proto.Message): proto.STRING, number=1, ) - batch_documents_import_configs: MutableSequence[ - BatchDocumentsImportConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=BatchDocumentsImportConfig, + batch_documents_import_configs: MutableSequence[BatchDocumentsImportConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=BatchDocumentsImportConfig, + ) ) @@ -293,19 +295,19 @@ class ImportConfigValidationResult(proto.Message): number=1, message=operation_metadata.CommonOperationMetadata, ) - individual_import_statuses: MutableSequence[ - IndividualImportStatus - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=IndividualImportStatus, + individual_import_statuses: MutableSequence[IndividualImportStatus] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=IndividualImportStatus, + ) ) - import_config_validation_results: MutableSequence[ - ImportConfigValidationResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=ImportConfigValidationResult, + import_config_validation_results: MutableSequence[ImportConfigValidationResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=ImportConfigValidationResult, + ) ) total_document_count: int = proto.Field( proto.INT32, @@ -573,12 +575,12 @@ class IndividualBatchDeleteStatus(proto.Message): number=1, message=operation_metadata.CommonOperationMetadata, ) - individual_batch_delete_statuses: MutableSequence[ - IndividualBatchDeleteStatus - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=IndividualBatchDeleteStatus, + individual_batch_delete_statuses: MutableSequence[IndividualBatchDeleteStatus] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=IndividualBatchDeleteStatus, + ) ) total_document_count: int = proto.Field( proto.INT32, diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/evaluation.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/evaluation.py index 0312d0058b2f..40e090490c11 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/evaluation.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/evaluation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -270,6 +270,7 @@ class MetricsType(proto.Enum): parent (i.e., non-leaf) entity types are an aggregate of metrics for their children. """ + METRICS_TYPE_UNSPECIFIED = 0 AGGREGATE = 1 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/operation_metadata.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/operation_metadata.py index 4e862d73d708..b60aec2fe1a7 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/operation_metadata.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/operation_metadata.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -62,6 +62,7 @@ class State(proto.Enum): CANCELLED (5): Operation is cancelled. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 CANCELLING = 2 diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor.py index 3ae06a4fa246..fee0f42ca859 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.documentai_v1beta3.types import document_schema as gcd_document_schema @@ -110,6 +110,7 @@ class State(proto.Enum): IMPORTING (8): The processor version is being imported. """ + STATE_UNSPECIFIED = 0 DEPLOYED = 1 DEPLOYING = 2 @@ -133,6 +134,7 @@ class ModelType(proto.Enum): MODEL_TYPE_CUSTOM (2): The processor version has custom model type. """ + MODEL_TYPE_UNSPECIFIED = 0 MODEL_TYPE_GENERATIVE = 1 MODEL_TYPE_CUSTOM = 2 @@ -229,6 +231,7 @@ class CustomModelType(proto.Enum): FINE_TUNED (2): The model is a finetuned foundation model. """ + CUSTOM_MODEL_TYPE_UNSPECIFIED = 0 VERSIONED_FOUNDATION = 1 FINE_TUNED = 2 @@ -417,6 +420,7 @@ class State(proto.Enum): The processor is being deleted, will be removed if successful. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -447,12 +451,12 @@ class State(proto.Enum): proto.STRING, number=9, ) - processor_version_aliases: MutableSequence[ - "ProcessorVersionAlias" - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message="ProcessorVersionAlias", + processor_version_aliases: MutableSequence["ProcessorVersionAlias"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message="ProcessorVersionAlias", + ) ) process_endpoint: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor_type.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor_type.py index 76f23431bddf..30bcf795401e 100644 --- a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor_type.py +++ b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor_type.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.api import launch_stage_pb2 # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-documentai/noxfile.py b/packages/google-cloud-documentai/noxfile.py index 1015764837f2..434e22c31b27 100644 --- a/packages/google-cloud-documentai/noxfile.py +++ b/packages/google-cloud-documentai/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_async.py b/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_async.py index 68544c55562d..517146d6dfa5 100644 --- a/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_async.py +++ b/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_async.py @@ -40,9 +40,7 @@ async def sample_batch_delete_documents(): # Initialize request argument(s) dataset_documents = documentai_v1beta3.BatchDatasetDocuments() - dataset_documents.individual_document_ids.document_ids.gcs_managed_doc_id.gcs_uri = ( - "gcs_uri_value" - ) + dataset_documents.individual_document_ids.document_ids.gcs_managed_doc_id.gcs_uri = "gcs_uri_value" request = documentai_v1beta3.BatchDeleteDocumentsRequest( dataset="dataset_value", diff --git a/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_sync.py b/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_sync.py index 27ab9b76b523..6185f63d7007 100644 --- a/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_sync.py +++ b/packages/google-cloud-documentai/samples/generated_samples/documentai_v1beta3_generated_document_service_batch_delete_documents_sync.py @@ -40,9 +40,7 @@ def sample_batch_delete_documents(): # Initialize request argument(s) dataset_documents = documentai_v1beta3.BatchDatasetDocuments() - dataset_documents.individual_document_ids.document_ids.gcs_managed_doc_id.gcs_uri = ( - "gcs_uri_value" - ) + dataset_documents.individual_document_ids.document_ids.gcs_managed_doc_id.gcs_uri = "gcs_uri_value" request = documentai_v1beta3.BatchDeleteDocumentsRequest( dataset="dataset_value", diff --git a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1/test_document_processor_service.py b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1/test_document_processor_service.py index 04e1c3025c21..e1ebd4ea1ac2 100644 --- a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1/test_document_processor_service.py +++ b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1/test_document_processor_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,8 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import launch_stage_pb2 # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.color_pb2 as color_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,28 +68,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import color_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import money_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore from google.cloud.documentai_v1.services.document_processor_service import ( DocumentProcessorServiceAsyncClient, @@ -90,10 +90,10 @@ document_schema, evaluation, geometry, + processor, + processor_type, ) -from google.cloud.documentai_v1.types import processor from google.cloud.documentai_v1.types import processor as gcd_processor -from google.cloud.documentai_v1.types import processor_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1038,10 +1038,9 @@ def test_document_processor_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1085,9 @@ def test_document_processor_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1125,10 +1123,9 @@ def test_document_processor_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1385,13 +1382,13 @@ def test_document_processor_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1495,9 +1492,9 @@ def test_process_document_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.process_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.process_document] = ( + mock_rpc + ) request = {} client.process_document(request) @@ -2169,9 +2166,9 @@ def test_fetch_processor_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_processor_types] = ( + mock_rpc + ) request = {} client.fetch_processor_types(request) @@ -2510,9 +2507,9 @@ def test_list_processor_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_processor_types] = ( + mock_rpc + ) request = {} client.list_processor_types(request) @@ -3064,9 +3061,9 @@ def test_get_processor_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_type] = ( + mock_rpc + ) request = {} client.get_processor_type(request) @@ -4667,9 +4664,9 @@ def test_get_processor_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_version] = ( + mock_rpc + ) request = {} client.get_processor_version(request) @@ -6626,9 +6623,9 @@ def test_create_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_processor] = ( + mock_rpc + ) request = {} client.create_processor(request) @@ -6975,9 +6972,9 @@ def test_delete_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_processor] = ( + mock_rpc + ) request = {} client.delete_processor(request) @@ -7305,9 +7302,9 @@ def test_enable_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_processor] = ( + mock_rpc + ) request = {} client.enable_processor(request) @@ -7557,9 +7554,9 @@ def test_disable_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_processor] = ( + mock_rpc + ) request = {} client.disable_processor(request) @@ -9086,9 +9083,9 @@ def test_list_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -9542,9 +9539,9 @@ def test_process_document_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.process_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.process_document] = ( + mock_rpc + ) request = {} client.process_document(request) @@ -9913,9 +9910,9 @@ def test_fetch_processor_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_processor_types] = ( + mock_rpc + ) request = {} client.fetch_processor_types(request) @@ -10099,9 +10096,9 @@ def test_list_processor_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_processor_types] = ( + mock_rpc + ) request = {} client.list_processor_types(request) @@ -10364,9 +10361,9 @@ def test_get_processor_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_type] = ( + mock_rpc + ) request = {} client.get_processor_type(request) @@ -11183,9 +11180,9 @@ def test_get_processor_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_version] = ( + mock_rpc + ) request = {} client.get_processor_version(request) @@ -12189,9 +12186,9 @@ def test_create_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_processor] = ( + mock_rpc + ) request = {} client.create_processor(request) @@ -12379,9 +12376,9 @@ def test_delete_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_processor] = ( + mock_rpc + ) request = {} client.delete_processor(request) @@ -12559,9 +12556,9 @@ def test_enable_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_processor] = ( + mock_rpc + ) request = {} client.enable_processor(request) @@ -12683,9 +12680,9 @@ def test_disable_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_processor] = ( + mock_rpc + ) request = {} client.disable_processor(request) @@ -13496,9 +13493,9 @@ def test_list_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -14993,8 +14990,9 @@ def test_process_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15054,18 +15052,20 @@ def test_process_document_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_process_document" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_process_document_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_process_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "post_process_document" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_process_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_process_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15123,8 +15123,9 @@ def test_batch_process_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15181,22 +15182,23 @@ def test_batch_process_documents_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_batch_process_documents", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_batch_process_documents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_batch_process_documents", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_batch_process_documents", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_batch_process_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_batch_process_documents", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15249,8 +15251,9 @@ def test_fetch_processor_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15312,18 +15315,22 @@ def test_fetch_processor_types_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_fetch_processor_types" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_fetch_processor_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_fetch_processor_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_fetch_processor_types", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_fetch_processor_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_fetch_processor_types", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15381,8 +15388,9 @@ def test_list_processor_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15447,18 +15455,22 @@ def test_list_processor_types_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_list_processor_types" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_list_processor_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_list_processor_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_list_processor_types", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_list_processor_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_list_processor_types", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15516,8 +15528,9 @@ def test_get_processor_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15590,18 +15603,21 @@ def test_get_processor_type_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_get_processor_type" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_get_processor_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_get_processor_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_get_processor_type", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_get_processor_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_get_processor_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15656,8 +15672,9 @@ def test_list_processors_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15722,18 +15739,20 @@ def test_list_processors_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_list_processors" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_list_processors_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_list_processors" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "post_list_processors" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_list_processors_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_list_processors" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15791,8 +15810,9 @@ def test_get_processor_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15871,18 +15891,20 @@ def test_get_processor_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_get_processor" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_get_processor_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_get_processor" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "post_get_processor" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_get_processor_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_get_processor" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15935,8 +15957,9 @@ def test_train_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15993,22 +16016,23 @@ def test_train_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_train_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_train_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_train_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_train_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_train_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_train_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16063,8 +16087,9 @@ def test_get_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16148,18 +16173,22 @@ def test_get_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_get_processor_version" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_get_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_get_processor_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_get_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_get_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_get_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16212,8 +16241,9 @@ def test_list_processor_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16278,20 +16308,22 @@ def test_list_processor_versions_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_list_processor_versions", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_list_processor_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_list_processor_versions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_list_processor_versions", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_list_processor_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_list_processor_versions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16351,8 +16383,9 @@ def test_delete_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16411,22 +16444,23 @@ def test_delete_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_delete_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_delete_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_delete_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_delete_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_delete_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_delete_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16481,8 +16515,9 @@ def test_deploy_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16541,22 +16576,23 @@ def test_deploy_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_deploy_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_deploy_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_deploy_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_deploy_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_deploy_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_deploy_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16611,8 +16647,9 @@ def test_undeploy_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16671,22 +16708,23 @@ def test_undeploy_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_undeploy_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_undeploy_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_undeploy_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_undeploy_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_undeploy_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_undeploy_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16739,8 +16777,9 @@ def test_create_processor_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16903,18 +16942,20 @@ def test_create_processor_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_create_processor" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_create_processor_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_create_processor" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "post_create_processor" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_create_processor_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_create_processor" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16967,8 +17008,9 @@ def test_delete_processor_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17025,20 +17067,21 @@ def test_delete_processor_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_delete_processor" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_delete_processor_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_delete_processor" - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, "post_delete_processor" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_delete_processor_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_delete_processor" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17091,8 +17134,9 @@ def test_enable_processor_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17149,20 +17193,21 @@ def test_enable_processor_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_enable_processor" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_enable_processor_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_enable_processor" - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, "post_enable_processor" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_enable_processor_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_enable_processor" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17215,8 +17260,9 @@ def test_disable_processor_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17273,20 +17319,21 @@ def test_disable_processor_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_disable_processor" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_disable_processor_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_disable_processor" - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, "post_disable_processor" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_disable_processor_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_disable_processor" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17341,8 +17388,9 @@ def test_set_default_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17401,22 +17449,23 @@ def test_set_default_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_set_default_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_set_default_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_set_default_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_set_default_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_set_default_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_set_default_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17471,8 +17520,9 @@ def test_review_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17531,20 +17581,21 @@ def test_review_document_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_review_document" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_review_document_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_review_document" - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, "post_review_document" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_review_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_review_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17599,8 +17650,9 @@ def test_evaluate_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17659,22 +17711,23 @@ def test_evaluate_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_evaluate_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_evaluate_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_evaluate_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_evaluate_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_evaluate_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_evaluate_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17729,8 +17782,9 @@ def test_get_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17799,18 +17853,20 @@ def test_get_evaluation_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_get_evaluation" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_get_evaluation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_get_evaluation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "post_get_evaluation" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_get_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_get_evaluation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17865,8 +17921,9 @@ def test_list_evaluations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17933,18 +17990,20 @@ def test_list_evaluations_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_list_evaluations" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_list_evaluations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_list_evaluations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "post_list_evaluations" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_list_evaluations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_list_evaluations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18002,8 +18061,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18062,8 +18122,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18124,8 +18185,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18186,8 +18248,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18248,8 +18311,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18871,11 +18935,14 @@ def test_document_processor_service_base_transport(): def test_document_processor_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.documentai_v1.services.document_processor_service.transports.DocumentProcessorServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.documentai_v1.services.document_processor_service.transports.DocumentProcessorServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentProcessorServiceTransport( @@ -18892,9 +18959,12 @@ def test_document_processor_service_base_transport_with_credentials_file(): def test_document_processor_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.documentai_v1.services.document_processor_service.transports.DocumentProcessorServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.documentai_v1.services.document_processor_service.transports.DocumentProcessorServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentProcessorServiceTransport() @@ -18968,11 +19038,12 @@ def test_document_processor_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_processor_service.py b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_processor_service.py index aae6d525fd76..c2c41a59c68b 100644 --- a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_processor_service.py +++ b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_processor_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,8 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import launch_stage_pb2 # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.color_pb2 as color_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,28 +68,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import color_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import money_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore from google.cloud.documentai_v1beta3.services.document_processor_service import ( DocumentProcessorServiceAsyncClient, @@ -90,10 +90,10 @@ document_schema, evaluation, geometry, + processor, + processor_type, ) -from google.cloud.documentai_v1beta3.types import processor from google.cloud.documentai_v1beta3.types import processor as gcd_processor -from google.cloud.documentai_v1beta3.types import processor_type CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1038,10 +1038,9 @@ def test_document_processor_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1085,9 @@ def test_document_processor_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1125,10 +1123,9 @@ def test_document_processor_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1385,13 +1382,13 @@ def test_document_processor_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1498,9 +1495,9 @@ def test_process_document_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.process_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.process_document] = ( + mock_rpc + ) request = {} client.process_document(request) @@ -2175,9 +2172,9 @@ def test_fetch_processor_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_processor_types] = ( + mock_rpc + ) request = {} client.fetch_processor_types(request) @@ -2516,9 +2513,9 @@ def test_list_processor_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_processor_types] = ( + mock_rpc + ) request = {} client.list_processor_types(request) @@ -3070,9 +3067,9 @@ def test_get_processor_type_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_type] = ( + mock_rpc + ) request = {} client.get_processor_type(request) @@ -4673,9 +4670,9 @@ def test_get_processor_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_version] = ( + mock_rpc + ) request = {} client.get_processor_version(request) @@ -6632,9 +6629,9 @@ def test_create_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_processor] = ( + mock_rpc + ) request = {} client.create_processor(request) @@ -6981,9 +6978,9 @@ def test_delete_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_processor] = ( + mock_rpc + ) request = {} client.delete_processor(request) @@ -7311,9 +7308,9 @@ def test_enable_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_processor] = ( + mock_rpc + ) request = {} client.enable_processor(request) @@ -7563,9 +7560,9 @@ def test_disable_processor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_processor] = ( + mock_rpc + ) request = {} client.disable_processor(request) @@ -9092,9 +9089,9 @@ def test_list_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -9897,9 +9894,9 @@ def test_process_document_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.process_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.process_document] = ( + mock_rpc + ) request = {} client.process_document(request) @@ -10268,9 +10265,9 @@ def test_fetch_processor_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_processor_types] = ( + mock_rpc + ) request = {} client.fetch_processor_types(request) @@ -10454,9 +10451,9 @@ def test_list_processor_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_processor_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_processor_types] = ( + mock_rpc + ) request = {} client.list_processor_types(request) @@ -10719,9 +10716,9 @@ def test_get_processor_type_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_type - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_type] = ( + mock_rpc + ) request = {} client.get_processor_type(request) @@ -11540,9 +11537,9 @@ def test_get_processor_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processor_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processor_version] = ( + mock_rpc + ) request = {} client.get_processor_version(request) @@ -12546,9 +12543,9 @@ def test_create_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_processor] = ( + mock_rpc + ) request = {} client.create_processor(request) @@ -12737,9 +12734,9 @@ def test_delete_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_processor] = ( + mock_rpc + ) request = {} client.delete_processor(request) @@ -12918,9 +12915,9 @@ def test_enable_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_processor] = ( + mock_rpc + ) request = {} client.enable_processor(request) @@ -13042,9 +13039,9 @@ def test_disable_processor_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.disable_processor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.disable_processor] = ( + mock_rpc + ) request = {} client.disable_processor(request) @@ -13855,9 +13852,9 @@ def test_list_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -15589,8 +15586,9 @@ def test_process_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15653,18 +15651,20 @@ def test_process_document_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_process_document" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_process_document_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_process_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "post_process_document" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_process_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_process_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15722,8 +15722,9 @@ def test_batch_process_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15780,22 +15781,23 @@ def test_batch_process_documents_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_batch_process_documents", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_batch_process_documents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_batch_process_documents", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_batch_process_documents", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_batch_process_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_batch_process_documents", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15848,8 +15850,9 @@ def test_fetch_processor_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15911,18 +15914,22 @@ def test_fetch_processor_types_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_fetch_processor_types" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_fetch_processor_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_fetch_processor_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_fetch_processor_types", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_fetch_processor_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_fetch_processor_types", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15980,8 +15987,9 @@ def test_list_processor_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16046,18 +16054,22 @@ def test_list_processor_types_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_list_processor_types" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_list_processor_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_list_processor_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_list_processor_types", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_list_processor_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_list_processor_types", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16115,8 +16127,9 @@ def test_get_processor_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16189,18 +16202,21 @@ def test_get_processor_type_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_get_processor_type" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_get_processor_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_get_processor_type" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_get_processor_type", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_get_processor_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_get_processor_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16255,8 +16271,9 @@ def test_list_processors_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16321,18 +16338,20 @@ def test_list_processors_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_list_processors" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_list_processors_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_list_processors" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "post_list_processors" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_list_processors_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_list_processors" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16390,8 +16409,9 @@ def test_get_processor_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16470,18 +16490,20 @@ def test_get_processor_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_get_processor" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_get_processor_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_get_processor" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "post_get_processor" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_get_processor_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_get_processor" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16534,8 +16556,9 @@ def test_train_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16592,22 +16615,23 @@ def test_train_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_train_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_train_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_train_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_train_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_train_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_train_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16662,8 +16686,9 @@ def test_get_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16747,18 +16772,22 @@ def test_get_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_get_processor_version" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_get_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_get_processor_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_get_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_get_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_get_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16811,8 +16840,9 @@ def test_list_processor_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16877,20 +16907,22 @@ def test_list_processor_versions_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_list_processor_versions", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_list_processor_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_list_processor_versions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_list_processor_versions", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_list_processor_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_list_processor_versions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16950,8 +16982,9 @@ def test_delete_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17010,22 +17043,23 @@ def test_delete_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_delete_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_delete_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_delete_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_delete_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_delete_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_delete_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17080,8 +17114,9 @@ def test_deploy_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17140,22 +17175,23 @@ def test_deploy_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_deploy_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_deploy_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_deploy_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_deploy_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_deploy_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_deploy_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17210,8 +17246,9 @@ def test_undeploy_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17270,22 +17307,23 @@ def test_undeploy_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_undeploy_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_undeploy_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_undeploy_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_undeploy_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_undeploy_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_undeploy_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17338,8 +17376,9 @@ def test_create_processor_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17502,18 +17541,20 @@ def test_create_processor_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_create_processor" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_create_processor_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_create_processor" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "post_create_processor" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_create_processor_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_create_processor" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17566,8 +17607,9 @@ def test_delete_processor_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17624,20 +17666,21 @@ def test_delete_processor_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_delete_processor" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_delete_processor_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_delete_processor" - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, "post_delete_processor" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_delete_processor_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_delete_processor" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17690,8 +17733,9 @@ def test_enable_processor_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17748,20 +17792,21 @@ def test_enable_processor_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_enable_processor" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_enable_processor_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_enable_processor" - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, "post_enable_processor" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_enable_processor_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_enable_processor" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17814,8 +17859,9 @@ def test_disable_processor_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17872,20 +17918,21 @@ def test_disable_processor_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_disable_processor" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_disable_processor_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_disable_processor" - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, "post_disable_processor" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_disable_processor_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_disable_processor" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17940,8 +17987,9 @@ def test_set_default_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18000,22 +18048,23 @@ def test_set_default_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_set_default_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_set_default_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_set_default_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_set_default_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_set_default_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_set_default_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18070,8 +18119,9 @@ def test_review_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18130,20 +18180,21 @@ def test_review_document_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_review_document" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_review_document_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_review_document" - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, "post_review_document" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_review_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_review_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18198,8 +18249,9 @@ def test_evaluate_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18258,22 +18310,23 @@ def test_evaluate_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_evaluate_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_evaluate_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_evaluate_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_evaluate_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_evaluate_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_evaluate_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18328,8 +18381,9 @@ def test_get_evaluation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18398,18 +18452,20 @@ def test_get_evaluation_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_get_evaluation" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_get_evaluation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_get_evaluation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "post_get_evaluation" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_get_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_get_evaluation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18464,8 +18520,9 @@ def test_list_evaluations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18532,18 +18589,20 @@ def test_list_evaluations_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, "post_list_evaluations" - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_list_evaluations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, "pre_list_evaluations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "post_list_evaluations" + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_list_evaluations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, "pre_list_evaluations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18601,8 +18660,9 @@ def test_import_processor_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18659,22 +18719,23 @@ def test_import_processor_version_rest_interceptors(null_interceptor): ) client = DocumentProcessorServiceClient(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.DocumentProcessorServiceRestInterceptor, - "post_import_processor_version", - ) as post, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "post_import_processor_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentProcessorServiceRestInterceptor, - "pre_import_processor_version", - ) as pre: + 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.DocumentProcessorServiceRestInterceptor, + "post_import_processor_version", + ) as post, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "post_import_processor_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentProcessorServiceRestInterceptor, + "pre_import_processor_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18727,8 +18788,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18787,8 +18849,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18849,8 +18912,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18911,8 +18975,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18973,8 +19038,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -19619,11 +19685,14 @@ def test_document_processor_service_base_transport(): def test_document_processor_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.documentai_v1beta3.services.document_processor_service.transports.DocumentProcessorServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.documentai_v1beta3.services.document_processor_service.transports.DocumentProcessorServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentProcessorServiceTransport( @@ -19640,9 +19709,12 @@ def test_document_processor_service_base_transport_with_credentials_file(): def test_document_processor_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.documentai_v1beta3.services.document_processor_service.transports.DocumentProcessorServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.documentai_v1beta3.services.document_processor_service.transports.DocumentProcessorServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentProcessorServiceTransport() @@ -19716,11 +19788,12 @@ def test_document_processor_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_service.py b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_service.py index 6c661d930b0c..f4f0b3f829eb 100644 --- a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_service.py +++ b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.documentai_v1beta3.services.document_service import ( DocumentServiceAsyncClient, @@ -71,12 +71,12 @@ transports, ) from google.cloud.documentai_v1beta3.types import ( + dataset, document, document_io, document_schema, document_service, ) -from google.cloud.documentai_v1beta3.types import dataset from google.cloud.documentai_v1beta3.types import dataset as gcd_dataset CRED_INFO_JSON = { @@ -988,10 +988,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1036,10 +1035,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1075,10 +1073,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1321,13 +1318,13 @@ def test_document_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1796,9 +1793,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -2975,9 +2972,9 @@ def test_batch_delete_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_documents] = ( + mock_rpc + ) request = {} client.batch_delete_documents(request) @@ -3328,9 +3325,9 @@ def test_get_dataset_schema_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_dataset_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_dataset_schema] = ( + mock_rpc + ) request = {} client.get_dataset_schema(request) @@ -3675,9 +3672,9 @@ def test_update_dataset_schema_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_dataset_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_dataset_schema] = ( + mock_rpc + ) request = {} client.update_dataset_schema(request) @@ -4154,9 +4151,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -4795,9 +4792,9 @@ def test_batch_delete_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_documents] = ( + mock_rpc + ) request = {} client.batch_delete_documents(request) @@ -4987,9 +4984,9 @@ def test_get_dataset_schema_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_dataset_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_dataset_schema] = ( + mock_rpc + ) request = {} client.get_dataset_schema(request) @@ -5174,9 +5171,9 @@ def test_update_dataset_schema_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_dataset_schema - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_dataset_schema] = ( + mock_rpc + ) request = {} client.update_dataset_schema(request) @@ -5824,8 +5821,9 @@ def test_update_dataset_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5968,19 +5966,21 @@ def test_update_dataset_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_update_dataset" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_update_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_update_dataset" - ) as pre: + 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.DocumentServiceRestInterceptor, "post_update_dataset" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_update_dataset_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_update_dataset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6035,8 +6035,9 @@ def test_import_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6095,19 +6096,21 @@ def test_import_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_import_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_import_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_import_documents" - ) as pre: + 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.DocumentServiceRestInterceptor, "post_import_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_import_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_import_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6162,8 +6165,9 @@ def test_get_document_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6225,17 +6229,19 @@ def test_get_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_get_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_get_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_get_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6295,8 +6301,9 @@ def test_list_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6363,17 +6370,20 @@ def test_list_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_list_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_list_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_list_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_list_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_list_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_list_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6433,8 +6443,9 @@ def test_batch_delete_documents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6493,20 +6504,21 @@ def test_batch_delete_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_batch_delete_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, - "post_batch_delete_documents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_batch_delete_documents" - ) as pre: + 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.DocumentServiceRestInterceptor, "post_batch_delete_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_delete_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_batch_delete_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6561,8 +6573,9 @@ def test_get_dataset_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6631,18 +6644,20 @@ def test_get_dataset_schema_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_get_dataset_schema" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, - "post_get_dataset_schema_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_get_dataset_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_dataset_schema" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_get_dataset_schema_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_get_dataset_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6699,8 +6714,9 @@ def test_update_dataset_schema_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6881,18 +6897,20 @@ def test_update_dataset_schema_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(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.DocumentServiceRestInterceptor, "post_update_dataset_schema" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, - "post_update_dataset_schema_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_update_dataset_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_update_dataset_schema" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_update_dataset_schema_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_update_dataset_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6945,8 +6963,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7005,8 +7024,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7067,8 +7087,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7129,8 +7150,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7191,8 +7213,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7479,11 +7502,14 @@ def test_document_service_base_transport(): def test_document_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.documentai_v1beta3.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.documentai_v1beta3.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport( @@ -7500,9 +7526,12 @@ def test_document_service_base_transport_with_credentials_file(): def test_document_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.documentai_v1beta3.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.documentai_v1beta3.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport() @@ -7574,11 +7603,12 @@ def test_document_service_transport_auth_gdch_credentials(transport_class): def test_document_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-domains/docs/conf.py b/packages/google-cloud-domains/docs/conf.py index 3f05ac2b02b4..f8f6e54b6cae 100644 --- a/packages/google-cloud-domains/docs/conf.py +++ b/packages/google-cloud-domains/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-domains documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/__init__.py b/packages/google-cloud-domains/google/cloud/domains_v1/__init__.py index e8d02a3de9cb..2803dcba177e 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/__init__.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.domains import DomainsAsyncClient, DomainsClient from .types.domains import ( AuthorizationCode, diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/async_client.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/async_client.py index 7260bec26049..24f3518cef18 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/async_client.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.domains_v1 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore from google.cloud.domains_v1.services.domains import pagers from google.cloud.domains_v1.types import domains @@ -114,7 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DomainsAsyncClient: The constructed client. """ - return DomainsClient.from_service_account_info.__func__(DomainsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DomainsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DomainsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DomainsAsyncClient: The constructed client. """ - return DomainsClient.from_service_account_file.__func__(DomainsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DomainsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DomainsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/client.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/client.py index 17208aae24a3..762bfa151c1e 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/client.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.domains_v1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore from google.cloud.domains_v1.services.domains import pagers from google.cloud.domains_v1.types import domains @@ -627,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DomainsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DomainsClient._read_environment_variables() + ) self._client_cert_source = DomainsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -666,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DomainsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/pagers.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/pagers.py index 221c5da2861c..e9cb898c2c63 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/pagers.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/base.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/base.py index 09a27efac837..1d2fed797189 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/base.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.domains_v1 import gapic_version as package_version from google.cloud.domains_v1.types import domains diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc.py index 51f791f94b01..df3de685bcf9 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.domains_v1.types import domains @@ -395,12 +395,12 @@ def retrieve_register_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_register_parameters" not in self._stubs: - self._stubs[ - "retrieve_register_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/RetrieveRegisterParameters", - request_serializer=domains.RetrieveRegisterParametersRequest.serialize, - response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + self._stubs["retrieve_register_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/RetrieveRegisterParameters", + request_serializer=domains.RetrieveRegisterParametersRequest.serialize, + response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + ) ) return self._stubs["retrieve_register_parameters"] @@ -469,12 +469,12 @@ def retrieve_transfer_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_transfer_parameters" not in self._stubs: - self._stubs[ - "retrieve_transfer_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/RetrieveTransferParameters", - request_serializer=domains.RetrieveTransferParametersRequest.serialize, - response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + self._stubs["retrieve_transfer_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/RetrieveTransferParameters", + request_serializer=domains.RetrieveTransferParametersRequest.serialize, + response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + ) ) return self._stubs["retrieve_transfer_parameters"] @@ -636,12 +636,12 @@ def configure_management_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_management_settings" not in self._stubs: - self._stubs[ - "configure_management_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/ConfigureManagementSettings", - request_serializer=domains.ConfigureManagementSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_management_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/ConfigureManagementSettings", + request_serializer=domains.ConfigureManagementSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_management_settings"] @@ -691,12 +691,12 @@ def configure_contact_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_contact_settings" not in self._stubs: - self._stubs[ - "configure_contact_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/ConfigureContactSettings", - request_serializer=domains.ConfigureContactSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_contact_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/ConfigureContactSettings", + request_serializer=domains.ConfigureContactSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_contact_settings"] @@ -807,12 +807,12 @@ def retrieve_authorization_code( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_authorization_code" not in self._stubs: - self._stubs[ - "retrieve_authorization_code" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/RetrieveAuthorizationCode", - request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, - response_deserializer=domains.AuthorizationCode.deserialize, + self._stubs["retrieve_authorization_code"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/RetrieveAuthorizationCode", + request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, + response_deserializer=domains.AuthorizationCode.deserialize, + ) ) return self._stubs["retrieve_authorization_code"] diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc_asyncio.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc_asyncio.py index ed91906ab84f..199c8559f337 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc_asyncio.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.domains_v1.types import domains @@ -405,12 +405,12 @@ def retrieve_register_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_register_parameters" not in self._stubs: - self._stubs[ - "retrieve_register_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/RetrieveRegisterParameters", - request_serializer=domains.RetrieveRegisterParametersRequest.serialize, - response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + self._stubs["retrieve_register_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/RetrieveRegisterParameters", + request_serializer=domains.RetrieveRegisterParametersRequest.serialize, + response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + ) ) return self._stubs["retrieve_register_parameters"] @@ -479,12 +479,12 @@ def retrieve_transfer_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_transfer_parameters" not in self._stubs: - self._stubs[ - "retrieve_transfer_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/RetrieveTransferParameters", - request_serializer=domains.RetrieveTransferParametersRequest.serialize, - response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + self._stubs["retrieve_transfer_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/RetrieveTransferParameters", + request_serializer=domains.RetrieveTransferParametersRequest.serialize, + response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + ) ) return self._stubs["retrieve_transfer_parameters"] @@ -649,12 +649,12 @@ def configure_management_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_management_settings" not in self._stubs: - self._stubs[ - "configure_management_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/ConfigureManagementSettings", - request_serializer=domains.ConfigureManagementSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_management_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/ConfigureManagementSettings", + request_serializer=domains.ConfigureManagementSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_management_settings"] @@ -708,12 +708,12 @@ def configure_contact_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_contact_settings" not in self._stubs: - self._stubs[ - "configure_contact_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/ConfigureContactSettings", - request_serializer=domains.ConfigureContactSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_contact_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/ConfigureContactSettings", + request_serializer=domains.ConfigureContactSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_contact_settings"] @@ -828,12 +828,12 @@ def retrieve_authorization_code( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_authorization_code" not in self._stubs: - self._stubs[ - "retrieve_authorization_code" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1.Domains/RetrieveAuthorizationCode", - request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, - response_deserializer=domains.AuthorizationCode.deserialize, + self._stubs["retrieve_authorization_code"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1.Domains/RetrieveAuthorizationCode", + request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, + response_deserializer=domains.AuthorizationCode.deserialize, + ) ) return self._stubs["retrieve_authorization_code"] diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/rest.py b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/rest.py index 9afc0fdbd678..e57efd7b13da 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/rest.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/services/domains/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1112,9 +1112,7 @@ def __call__( """ - http_options = ( - _BaseDomainsRestTransport._BaseConfigureContactSettings._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseConfigureContactSettings._get_http_options() request, metadata = self._interceptor.pre_configure_contact_settings( request, metadata @@ -1140,7 +1138,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1293,7 +1291,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1419,9 +1417,7 @@ def __call__( """ - http_options = ( - _BaseDomainsRestTransport._BaseConfigureManagementSettings._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseConfigureManagementSettings._get_http_options() request, metadata = self._interceptor.pre_configure_management_settings( request, metadata @@ -1447,7 +1443,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1488,11 +1484,10 @@ def __call__( resp = self._interceptor.post_configure_management_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_configure_management_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_configure_management_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1598,7 +1593,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1750,7 +1745,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2227,7 +2222,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2349,9 +2344,7 @@ def __call__( Defines an authorization code. """ - http_options = ( - _BaseDomainsRestTransport._BaseResetAuthorizationCode._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseResetAuthorizationCode._get_http_options() request, metadata = self._interceptor.pre_reset_authorization_code( request, metadata @@ -2501,9 +2494,7 @@ def __call__( Defines an authorization code. """ - http_options = ( - _BaseDomainsRestTransport._BaseRetrieveAuthorizationCode._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseRetrieveAuthorizationCode._get_http_options() request, metadata = self._interceptor.pre_retrieve_authorization_code( request, metadata @@ -2648,9 +2639,7 @@ def __call__( Response for the ``RetrieveRegisterParameters`` method. """ - http_options = ( - _BaseDomainsRestTransport._BaseRetrieveRegisterParameters._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseRetrieveRegisterParameters._get_http_options() request, metadata = self._interceptor.pre_retrieve_register_parameters( request, metadata @@ -2797,9 +2786,7 @@ def __call__( Response for the ``RetrieveTransferParameters`` method. """ - http_options = ( - _BaseDomainsRestTransport._BaseRetrieveTransferParameters._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseRetrieveTransferParameters._get_http_options() request, metadata = self._interceptor.pre_retrieve_transfer_parameters( request, metadata @@ -3125,7 +3112,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3278,7 +3265,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3351,7 +3338,9 @@ def configure_contact_settings( ) -> Callable[[domains.ConfigureContactSettingsRequest], 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._ConfigureContactSettings(self._session, self._host, self._interceptor) # type: ignore + return self._ConfigureContactSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def configure_dns_settings( @@ -3369,7 +3358,9 @@ def configure_management_settings( ]: # 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._ConfigureManagementSettings(self._session, self._host, self._interceptor) # type: ignore + return self._ConfigureManagementSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_registration( @@ -3419,7 +3410,9 @@ def reset_authorization_code( ) -> Callable[[domains.ResetAuthorizationCodeRequest], domains.AuthorizationCode]: # 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._ResetAuthorizationCode(self._session, self._host, self._interceptor) # type: ignore + return self._ResetAuthorizationCode( + self._session, self._host, self._interceptor + ) # type: ignore @property def retrieve_authorization_code( @@ -3429,7 +3422,9 @@ def retrieve_authorization_code( ]: # 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._RetrieveAuthorizationCode(self._session, self._host, self._interceptor) # type: ignore + return self._RetrieveAuthorizationCode( + self._session, self._host, self._interceptor + ) # type: ignore @property def retrieve_register_parameters( @@ -3440,7 +3435,9 @@ def retrieve_register_parameters( ]: # 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._RetrieveRegisterParameters(self._session, self._host, self._interceptor) # type: ignore + return self._RetrieveRegisterParameters( + self._session, self._host, self._interceptor + ) # type: ignore @property def retrieve_transfer_parameters( @@ -3451,7 +3448,9 @@ def retrieve_transfer_parameters( ]: # 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._RetrieveTransferParameters(self._session, self._host, self._interceptor) # type: ignore + return self._RetrieveTransferParameters( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_domains( diff --git a/packages/google-cloud-domains/google/cloud/domains_v1/types/domains.py b/packages/google-cloud-domains/google/cloud/domains_v1/types/domains.py index 4c49559edc0e..093c94e18902 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1/types/domains.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1/types/domains.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -91,6 +91,7 @@ class ContactPrivacy(proto.Enum): details, see `the registration privacy article `__. """ + CONTACT_PRIVACY_UNSPECIFIED = 0 PUBLIC_CONTACT_DATA = 1 PRIVATE_CONTACT_DATA = 2 @@ -110,6 +111,7 @@ class DomainNotice(proto.Enum): `how to get an SSL certificate `__. """ + DOMAIN_NOTICE_UNSPECIFIED = 0 HSTS_PRELOADED = 1 @@ -125,6 +127,7 @@ class ContactNotice(proto.Enum): ``ContactSettings`` to ``PUBLIC_CONTACT_DATA``, which exposes contact data publicly. """ + CONTACT_NOTICE_UNSPECIFIED = 0 PUBLIC_CONTACT_DATA_ACKNOWLEDGEMENT = 1 @@ -142,6 +145,7 @@ class TransferLockState(proto.Enum): The domain is locked and cannot be transferred to another registrar. """ + TRANSFER_LOCK_STATE_UNSPECIFIED = 0 UNLOCKED = 1 LOCKED = 2 @@ -256,6 +260,7 @@ class State(proto.Enum): shown about it may be stale. Domains in this state are not automatically renewed by Cloud Domains. """ + STATE_UNSPECIFIED = 0 REGISTRATION_PENDING = 1 REGISTRATION_FAILED = 2 @@ -285,6 +290,7 @@ class Issue(proto.Enum): verification email, call ConfigureContactSettings and provide the current ``registrant_contact.email``. """ + ISSUE_UNSPECIFIED = 0 CONTACT_SUPPORT = 1 UNVERIFIED_EMAIL = 2 @@ -381,6 +387,7 @@ class RenewalMethod(proto.Enum): To manage the domain's current billing and renewal settings, go to `Google Domains `__. """ + RENEWAL_METHOD_UNSPECIFIED = 0 AUTOMATIC_RENEWAL = 1 MANUAL_RENEWAL = 2 @@ -441,6 +448,7 @@ class DsState(proto.Enum): ``Registration``'s ``dns_provider`` field is already DNSSEC-signed. """ + DS_STATE_UNSPECIFIED = 0 DS_RECORDS_UNPUBLISHED = 1 DS_RECORDS_PUBLISHED = 2 @@ -581,6 +589,7 @@ class Algorithm(proto.Enum): Private algorithm OID. Cannot be used for new deployments. """ + ALGORITHM_UNSPECIFIED = 0 RSAMD5 = 1 DH = 2 @@ -616,6 +625,7 @@ class DigestType(proto.Enum): SHA384 (4): SHA-384. """ + DIGEST_TYPE_UNSPECIFIED = 0 SHA1 = 1 SHA256 = 2 @@ -1370,6 +1380,7 @@ class Availability(proto.Enum): availability, generally due to system maintenance at the domain name registry. """ + AVAILABILITY_UNSPECIFIED = 0 AVAILABLE = 1 UNAVAILABLE = 2 diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/__init__.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/__init__.py index c52dd4f0b48b..2e1262af7848 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/__init__.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.domains import DomainsAsyncClient, DomainsClient from .types.domains import ( AuthorizationCode, diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/async_client.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/async_client.py index 04bb9a2955eb..c5ae6676b6bf 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/async_client.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.domains_v1beta1 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore from google.cloud.domains_v1beta1.services.domains import pagers from google.cloud.domains_v1beta1.types import domains @@ -114,7 +114,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DomainsAsyncClient: The constructed client. """ - return DomainsClient.from_service_account_info.__func__(DomainsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DomainsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DomainsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -130,7 +131,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DomainsAsyncClient: The constructed client. """ - return DomainsClient.from_service_account_file.__func__(DomainsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DomainsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DomainsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/client.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/client.py index fb67f2978a49..3efadbc66003 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/client.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.domains_v1beta1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore from google.cloud.domains_v1beta1.services.domains import pagers from google.cloud.domains_v1beta1.types import domains @@ -627,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DomainsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DomainsClient._read_environment_variables() + ) self._client_cert_source = DomainsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -666,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DomainsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/pagers.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/pagers.py index ca729f0ed896..0e54d2627514 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/pagers.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/base.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/base.py index 0f82b625411e..d0c377799ba0 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/base.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.domains_v1beta1 import gapic_version as package_version from google.cloud.domains_v1beta1.types import domains diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc.py index 8df46cc106fb..be66deb6f02e 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.domains_v1beta1.types import domains @@ -395,12 +395,12 @@ def retrieve_register_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_register_parameters" not in self._stubs: - self._stubs[ - "retrieve_register_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/RetrieveRegisterParameters", - request_serializer=domains.RetrieveRegisterParametersRequest.serialize, - response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + self._stubs["retrieve_register_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/RetrieveRegisterParameters", + request_serializer=domains.RetrieveRegisterParametersRequest.serialize, + response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + ) ) return self._stubs["retrieve_register_parameters"] @@ -469,12 +469,12 @@ def retrieve_transfer_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_transfer_parameters" not in self._stubs: - self._stubs[ - "retrieve_transfer_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/RetrieveTransferParameters", - request_serializer=domains.RetrieveTransferParametersRequest.serialize, - response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + self._stubs["retrieve_transfer_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/RetrieveTransferParameters", + request_serializer=domains.RetrieveTransferParametersRequest.serialize, + response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + ) ) return self._stubs["retrieve_transfer_parameters"] @@ -636,12 +636,12 @@ def configure_management_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_management_settings" not in self._stubs: - self._stubs[ - "configure_management_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/ConfigureManagementSettings", - request_serializer=domains.ConfigureManagementSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_management_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/ConfigureManagementSettings", + request_serializer=domains.ConfigureManagementSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_management_settings"] @@ -691,12 +691,12 @@ def configure_contact_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_contact_settings" not in self._stubs: - self._stubs[ - "configure_contact_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/ConfigureContactSettings", - request_serializer=domains.ConfigureContactSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_contact_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/ConfigureContactSettings", + request_serializer=domains.ConfigureContactSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_contact_settings"] @@ -807,12 +807,12 @@ def retrieve_authorization_code( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_authorization_code" not in self._stubs: - self._stubs[ - "retrieve_authorization_code" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/RetrieveAuthorizationCode", - request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, - response_deserializer=domains.AuthorizationCode.deserialize, + self._stubs["retrieve_authorization_code"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/RetrieveAuthorizationCode", + request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, + response_deserializer=domains.AuthorizationCode.deserialize, + ) ) return self._stubs["retrieve_authorization_code"] diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc_asyncio.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc_asyncio.py index 5212c7e21d48..4f9a34e789ab 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc_asyncio.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.domains_v1beta1.types import domains @@ -405,12 +405,12 @@ def retrieve_register_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_register_parameters" not in self._stubs: - self._stubs[ - "retrieve_register_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/RetrieveRegisterParameters", - request_serializer=domains.RetrieveRegisterParametersRequest.serialize, - response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + self._stubs["retrieve_register_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/RetrieveRegisterParameters", + request_serializer=domains.RetrieveRegisterParametersRequest.serialize, + response_deserializer=domains.RetrieveRegisterParametersResponse.deserialize, + ) ) return self._stubs["retrieve_register_parameters"] @@ -479,12 +479,12 @@ def retrieve_transfer_parameters( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_transfer_parameters" not in self._stubs: - self._stubs[ - "retrieve_transfer_parameters" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/RetrieveTransferParameters", - request_serializer=domains.RetrieveTransferParametersRequest.serialize, - response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + self._stubs["retrieve_transfer_parameters"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/RetrieveTransferParameters", + request_serializer=domains.RetrieveTransferParametersRequest.serialize, + response_deserializer=domains.RetrieveTransferParametersResponse.deserialize, + ) ) return self._stubs["retrieve_transfer_parameters"] @@ -649,12 +649,12 @@ def configure_management_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_management_settings" not in self._stubs: - self._stubs[ - "configure_management_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/ConfigureManagementSettings", - request_serializer=domains.ConfigureManagementSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_management_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/ConfigureManagementSettings", + request_serializer=domains.ConfigureManagementSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_management_settings"] @@ -708,12 +708,12 @@ def configure_contact_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "configure_contact_settings" not in self._stubs: - self._stubs[ - "configure_contact_settings" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/ConfigureContactSettings", - request_serializer=domains.ConfigureContactSettingsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["configure_contact_settings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/ConfigureContactSettings", + request_serializer=domains.ConfigureContactSettingsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["configure_contact_settings"] @@ -828,12 +828,12 @@ def retrieve_authorization_code( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "retrieve_authorization_code" not in self._stubs: - self._stubs[ - "retrieve_authorization_code" - ] = self._logged_channel.unary_unary( - "/google.cloud.domains.v1beta1.Domains/RetrieveAuthorizationCode", - request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, - response_deserializer=domains.AuthorizationCode.deserialize, + self._stubs["retrieve_authorization_code"] = ( + self._logged_channel.unary_unary( + "/google.cloud.domains.v1beta1.Domains/RetrieveAuthorizationCode", + request_serializer=domains.RetrieveAuthorizationCodeRequest.serialize, + response_deserializer=domains.AuthorizationCode.deserialize, + ) ) return self._stubs["retrieve_authorization_code"] diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/rest.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/rest.py index 55fd33ff4661..ecc0fa7b1951 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/rest.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/services/domains/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1112,9 +1112,7 @@ def __call__( """ - http_options = ( - _BaseDomainsRestTransport._BaseConfigureContactSettings._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseConfigureContactSettings._get_http_options() request, metadata = self._interceptor.pre_configure_contact_settings( request, metadata @@ -1140,7 +1138,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1293,7 +1291,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1419,9 +1417,7 @@ def __call__( """ - http_options = ( - _BaseDomainsRestTransport._BaseConfigureManagementSettings._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseConfigureManagementSettings._get_http_options() request, metadata = self._interceptor.pre_configure_management_settings( request, metadata @@ -1447,7 +1443,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1488,11 +1484,10 @@ def __call__( resp = self._interceptor.post_configure_management_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_configure_management_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_configure_management_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1598,7 +1593,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1750,7 +1745,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2227,7 +2222,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2349,9 +2344,7 @@ def __call__( Defines an authorization code. """ - http_options = ( - _BaseDomainsRestTransport._BaseResetAuthorizationCode._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseResetAuthorizationCode._get_http_options() request, metadata = self._interceptor.pre_reset_authorization_code( request, metadata @@ -2501,9 +2494,7 @@ def __call__( Defines an authorization code. """ - http_options = ( - _BaseDomainsRestTransport._BaseRetrieveAuthorizationCode._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseRetrieveAuthorizationCode._get_http_options() request, metadata = self._interceptor.pre_retrieve_authorization_code( request, metadata @@ -2648,9 +2639,7 @@ def __call__( Response for the ``RetrieveRegisterParameters`` method. """ - http_options = ( - _BaseDomainsRestTransport._BaseRetrieveRegisterParameters._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseRetrieveRegisterParameters._get_http_options() request, metadata = self._interceptor.pre_retrieve_register_parameters( request, metadata @@ -2797,9 +2786,7 @@ def __call__( Response for the ``RetrieveTransferParameters`` method. """ - http_options = ( - _BaseDomainsRestTransport._BaseRetrieveTransferParameters._get_http_options() - ) + http_options = _BaseDomainsRestTransport._BaseRetrieveTransferParameters._get_http_options() request, metadata = self._interceptor.pre_retrieve_transfer_parameters( request, metadata @@ -3125,7 +3112,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3278,7 +3265,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3351,7 +3338,9 @@ def configure_contact_settings( ) -> Callable[[domains.ConfigureContactSettingsRequest], 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._ConfigureContactSettings(self._session, self._host, self._interceptor) # type: ignore + return self._ConfigureContactSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def configure_dns_settings( @@ -3369,7 +3358,9 @@ def configure_management_settings( ]: # 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._ConfigureManagementSettings(self._session, self._host, self._interceptor) # type: ignore + return self._ConfigureManagementSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_registration( @@ -3419,7 +3410,9 @@ def reset_authorization_code( ) -> Callable[[domains.ResetAuthorizationCodeRequest], domains.AuthorizationCode]: # 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._ResetAuthorizationCode(self._session, self._host, self._interceptor) # type: ignore + return self._ResetAuthorizationCode( + self._session, self._host, self._interceptor + ) # type: ignore @property def retrieve_authorization_code( @@ -3429,7 +3422,9 @@ def retrieve_authorization_code( ]: # 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._RetrieveAuthorizationCode(self._session, self._host, self._interceptor) # type: ignore + return self._RetrieveAuthorizationCode( + self._session, self._host, self._interceptor + ) # type: ignore @property def retrieve_register_parameters( @@ -3440,7 +3435,9 @@ def retrieve_register_parameters( ]: # 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._RetrieveRegisterParameters(self._session, self._host, self._interceptor) # type: ignore + return self._RetrieveRegisterParameters( + self._session, self._host, self._interceptor + ) # type: ignore @property def retrieve_transfer_parameters( @@ -3451,7 +3448,9 @@ def retrieve_transfer_parameters( ]: # 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._RetrieveTransferParameters(self._session, self._host, self._interceptor) # type: ignore + return self._RetrieveTransferParameters( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_domains( diff --git a/packages/google-cloud-domains/google/cloud/domains_v1beta1/types/domains.py b/packages/google-cloud-domains/google/cloud/domains_v1beta1/types/domains.py index c2ee88a63613..7bf91fee45f3 100644 --- a/packages/google-cloud-domains/google/cloud/domains_v1beta1/types/domains.py +++ b/packages/google-cloud-domains/google/cloud/domains_v1beta1/types/domains.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -91,6 +91,7 @@ class ContactPrivacy(proto.Enum): details, see `the registration privacy article `__. """ + CONTACT_PRIVACY_UNSPECIFIED = 0 PUBLIC_CONTACT_DATA = 1 PRIVATE_CONTACT_DATA = 2 @@ -110,6 +111,7 @@ class DomainNotice(proto.Enum): `how to get an SSL certificate `__. """ + DOMAIN_NOTICE_UNSPECIFIED = 0 HSTS_PRELOADED = 1 @@ -125,6 +127,7 @@ class ContactNotice(proto.Enum): ``ContactSettings`` to ``PUBLIC_CONTACT_DATA``, which exposes contact data publicly. """ + CONTACT_NOTICE_UNSPECIFIED = 0 PUBLIC_CONTACT_DATA_ACKNOWLEDGEMENT = 1 @@ -142,6 +145,7 @@ class TransferLockState(proto.Enum): The domain is locked and cannot be transferred to another registrar. """ + TRANSFER_LOCK_STATE_UNSPECIFIED = 0 UNLOCKED = 1 LOCKED = 2 @@ -256,6 +260,7 @@ class State(proto.Enum): shown about it may be stale. Domains in this state are not automatically renewed by Cloud Domains. """ + STATE_UNSPECIFIED = 0 REGISTRATION_PENDING = 1 REGISTRATION_FAILED = 2 @@ -285,6 +290,7 @@ class Issue(proto.Enum): verification email, call ConfigureContactSettings and provide the current ``registrant_contact.email``. """ + ISSUE_UNSPECIFIED = 0 CONTACT_SUPPORT = 1 UNVERIFIED_EMAIL = 2 @@ -381,6 +387,7 @@ class RenewalMethod(proto.Enum): To manage the domain's current billing and renewal settings, go to `Google Domains `__. """ + RENEWAL_METHOD_UNSPECIFIED = 0 AUTOMATIC_RENEWAL = 1 MANUAL_RENEWAL = 2 @@ -441,6 +448,7 @@ class DsState(proto.Enum): ``Registration``'s ``dns_provider`` field is already DNSSEC-signed. """ + DS_STATE_UNSPECIFIED = 0 DS_RECORDS_UNPUBLISHED = 1 DS_RECORDS_PUBLISHED = 2 @@ -581,6 +589,7 @@ class Algorithm(proto.Enum): Private algorithm OID. Cannot be used for new deployments. """ + ALGORITHM_UNSPECIFIED = 0 RSAMD5 = 1 DH = 2 @@ -616,6 +625,7 @@ class DigestType(proto.Enum): SHA384 (4): SHA-384. """ + DIGEST_TYPE_UNSPECIFIED = 0 SHA1 = 1 SHA256 = 2 @@ -1370,6 +1380,7 @@ class Availability(proto.Enum): availability, generally due to system maintenance at the domain name registry. """ + AVAILABILITY_UNSPECIFIED = 0 AVAILABLE = 1 UNAVAILABLE = 2 diff --git a/packages/google-cloud-domains/noxfile.py b/packages/google-cloud-domains/noxfile.py index 652bca03e96c..e5fa7a45373e 100644 --- a/packages/google-cloud-domains/noxfile.py +++ b/packages/google-cloud-domains/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-domains/tests/unit/gapic/domains_v1/test_domains.py b/packages/google-cloud-domains/tests/unit/gapic/domains_v1/test_domains.py index e4260efe4772..c24ad53a70c5 100644 --- a/packages/google-cloud-domains/tests/unit/gapic/domains_v1/test_domains.py +++ b/packages/google-cloud-domains/tests/unit/gapic/domains_v1/test_domains.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +60,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore from google.cloud.domains_v1.services.domains import ( DomainsAsyncClient, @@ -911,10 +911,9 @@ def test_domains_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +958,9 @@ def test_domains_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +996,9 @@ def test_domains_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1226,13 +1223,13 @@ def test_domains_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3080,9 +3077,9 @@ def test_list_registrations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_registrations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_registrations] = ( + mock_rpc + ) request = {} client.list_registrations(request) @@ -3625,9 +3622,9 @@ def test_get_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_registration] = ( + mock_rpc + ) request = {} client.get_registration(request) @@ -3957,9 +3954,9 @@ def test_update_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_registration] = ( + mock_rpc + ) request = {} client.update_registration(request) @@ -4692,9 +4689,9 @@ def test_configure_dns_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.configure_dns_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.configure_dns_settings] = ( + mock_rpc + ) request = {} client.configure_dns_settings(request) @@ -5460,9 +5457,9 @@ def test_export_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_registration] = ( + mock_rpc + ) request = {} client.export_registration(request) @@ -5805,9 +5802,9 @@ def test_delete_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_registration] = ( + mock_rpc + ) request = {} client.delete_registration(request) @@ -7771,9 +7768,9 @@ def test_list_registrations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_registrations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_registrations] = ( + mock_rpc + ) request = {} client.list_registrations(request) @@ -8029,9 +8026,9 @@ def test_get_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_registration] = ( + mock_rpc + ) request = {} client.get_registration(request) @@ -8213,9 +8210,9 @@ def test_update_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_registration] = ( + mock_rpc + ) request = {} client.update_registration(request) @@ -8602,9 +8599,9 @@ def test_configure_dns_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.configure_dns_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.configure_dns_settings] = ( + mock_rpc + ) request = {} client.configure_dns_settings(request) @@ -9007,9 +9004,9 @@ def test_export_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_registration] = ( + mock_rpc + ) request = {} client.export_registration(request) @@ -9191,9 +9188,9 @@ def test_delete_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_registration] = ( + mock_rpc + ) request = {} client.delete_registration(request) @@ -10604,8 +10601,9 @@ def test_search_domains_rest_bad_request(request_type=domains.SearchDomainsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10663,17 +10661,19 @@ def test_search_domains_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_search_domains" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_search_domains_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_search_domains" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_search_domains" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_search_domains_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_search_domains" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10726,8 +10726,9 @@ def test_retrieve_register_parameters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10785,18 +10786,20 @@ def test_retrieve_register_parameters_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_retrieve_register_parameters" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, - "post_retrieve_register_parameters_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_retrieve_register_parameters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_retrieve_register_parameters" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_retrieve_register_parameters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_retrieve_register_parameters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10852,8 +10855,9 @@ def test_register_domain_rest_bad_request(request_type=domains.RegisterDomainReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10908,19 +10912,20 @@ def test_register_domain_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_register_domain" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_register_domain_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_register_domain" - ) as pre: + 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.DomainsRestInterceptor, "post_register_domain" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_register_domain_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_register_domain" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10971,8 +10976,9 @@ def test_retrieve_transfer_parameters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11030,18 +11036,20 @@ def test_retrieve_transfer_parameters_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_retrieve_transfer_parameters" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, - "post_retrieve_transfer_parameters_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_retrieve_transfer_parameters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_retrieve_transfer_parameters" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_retrieve_transfer_parameters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_retrieve_transfer_parameters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11097,8 +11105,9 @@ def test_transfer_domain_rest_bad_request(request_type=domains.TransferDomainReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11153,19 +11162,20 @@ def test_transfer_domain_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_transfer_domain" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_transfer_domain_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_transfer_domain" - ) as pre: + 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.DomainsRestInterceptor, "post_transfer_domain" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_transfer_domain_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_transfer_domain" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11216,8 +11226,9 @@ def test_list_registrations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11278,17 +11289,19 @@ def test_list_registrations_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_list_registrations" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_list_registrations_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_list_registrations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_list_registrations" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_list_registrations_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_list_registrations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11341,8 +11354,9 @@ def test_get_registration_rest_bad_request(request_type=domains.GetRegistrationR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11411,17 +11425,19 @@ def test_get_registration_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_get_registration" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_get_registration_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_get_registration" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_get_registration" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_get_registration_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_get_registration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11476,8 +11492,9 @@ def test_update_registration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11669,19 +11686,20 @@ def test_update_registration_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_update_registration" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_update_registration_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_update_registration" - ) as pre: + 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.DomainsRestInterceptor, "post_update_registration" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_update_registration_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_update_registration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11736,8 +11754,9 @@ def test_configure_management_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11794,20 +11813,21 @@ def test_configure_management_settings_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_configure_management_settings" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, - "post_configure_management_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_configure_management_settings" - ) as pre: + 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.DomainsRestInterceptor, "post_configure_management_settings" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_configure_management_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_configure_management_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11862,8 +11882,9 @@ def test_configure_dns_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11920,19 +11941,21 @@ def test_configure_dns_settings_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_configure_dns_settings" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_configure_dns_settings_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_configure_dns_settings" - ) as pre: + 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.DomainsRestInterceptor, "post_configure_dns_settings" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_configure_dns_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_configure_dns_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11987,8 +12010,9 @@ def test_configure_contact_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12045,20 +12069,21 @@ def test_configure_contact_settings_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_configure_contact_settings" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, - "post_configure_contact_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_configure_contact_settings" - ) as pre: + 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.DomainsRestInterceptor, "post_configure_contact_settings" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_configure_contact_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_configure_contact_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12111,8 +12136,9 @@ def test_export_registration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12167,19 +12193,20 @@ def test_export_registration_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_export_registration" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_export_registration_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_export_registration" - ) as pre: + 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.DomainsRestInterceptor, "post_export_registration" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_export_registration_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_export_registration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12232,8 +12259,9 @@ def test_delete_registration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12288,19 +12316,20 @@ def test_delete_registration_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_delete_registration" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_delete_registration_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_delete_registration" - ) as pre: + 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.DomainsRestInterceptor, "post_delete_registration" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_delete_registration_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_delete_registration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12355,8 +12384,9 @@ def test_retrieve_authorization_code_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12419,18 +12449,20 @@ def test_retrieve_authorization_code_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_retrieve_authorization_code" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, - "post_retrieve_authorization_code_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_retrieve_authorization_code" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_retrieve_authorization_code" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_retrieve_authorization_code_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_retrieve_authorization_code" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12485,8 +12517,9 @@ def test_reset_authorization_code_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12549,17 +12582,20 @@ def test_reset_authorization_code_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_reset_authorization_code" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_reset_authorization_code_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_reset_authorization_code" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_reset_authorization_code" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_reset_authorization_code_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_reset_authorization_code" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13019,11 +13055,14 @@ def test_domains_base_transport(): def test_domains_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.domains_v1.services.domains.transports.DomainsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.domains_v1.services.domains.transports.DomainsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DomainsTransport( @@ -13040,9 +13079,12 @@ def test_domains_base_transport_with_credentials_file(): def test_domains_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.domains_v1.services.domains.transports.DomainsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.domains_v1.services.domains.transports.DomainsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DomainsTransport() @@ -13114,11 +13156,12 @@ def test_domains_transport_auth_gdch_credentials(transport_class): def test_domains_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-domains/tests/unit/gapic/domains_v1beta1/test_domains.py b/packages/google-cloud-domains/tests/unit/gapic/domains_v1beta1/test_domains.py index 6df2b2349d07..6cc929b5db78 100644 --- a/packages/google-cloud-domains/tests/unit/gapic/domains_v1beta1/test_domains.py +++ b/packages/google-cloud-domains/tests/unit/gapic/domains_v1beta1/test_domains.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +60,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import money_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore from google.cloud.domains_v1beta1.services.domains import ( DomainsAsyncClient, @@ -911,10 +911,9 @@ def test_domains_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +958,9 @@ def test_domains_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +996,9 @@ def test_domains_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1226,13 +1223,13 @@ def test_domains_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3080,9 +3077,9 @@ def test_list_registrations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_registrations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_registrations] = ( + mock_rpc + ) request = {} client.list_registrations(request) @@ -3625,9 +3622,9 @@ def test_get_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_registration] = ( + mock_rpc + ) request = {} client.get_registration(request) @@ -3957,9 +3954,9 @@ def test_update_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_registration] = ( + mock_rpc + ) request = {} client.update_registration(request) @@ -4692,9 +4689,9 @@ def test_configure_dns_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.configure_dns_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.configure_dns_settings] = ( + mock_rpc + ) request = {} client.configure_dns_settings(request) @@ -5460,9 +5457,9 @@ def test_export_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_registration] = ( + mock_rpc + ) request = {} client.export_registration(request) @@ -5805,9 +5802,9 @@ def test_delete_registration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_registration] = ( + mock_rpc + ) request = {} client.delete_registration(request) @@ -7771,9 +7768,9 @@ def test_list_registrations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_registrations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_registrations] = ( + mock_rpc + ) request = {} client.list_registrations(request) @@ -8029,9 +8026,9 @@ def test_get_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_registration] = ( + mock_rpc + ) request = {} client.get_registration(request) @@ -8213,9 +8210,9 @@ def test_update_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_registration] = ( + mock_rpc + ) request = {} client.update_registration(request) @@ -8602,9 +8599,9 @@ def test_configure_dns_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.configure_dns_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.configure_dns_settings] = ( + mock_rpc + ) request = {} client.configure_dns_settings(request) @@ -9007,9 +9004,9 @@ def test_export_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_registration] = ( + mock_rpc + ) request = {} client.export_registration(request) @@ -9191,9 +9188,9 @@ def test_delete_registration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_registration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_registration] = ( + mock_rpc + ) request = {} client.delete_registration(request) @@ -10604,8 +10601,9 @@ def test_search_domains_rest_bad_request(request_type=domains.SearchDomainsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10663,17 +10661,19 @@ def test_search_domains_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_search_domains" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_search_domains_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_search_domains" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_search_domains" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_search_domains_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_search_domains" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10726,8 +10726,9 @@ def test_retrieve_register_parameters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10785,18 +10786,20 @@ def test_retrieve_register_parameters_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_retrieve_register_parameters" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, - "post_retrieve_register_parameters_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_retrieve_register_parameters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_retrieve_register_parameters" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_retrieve_register_parameters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_retrieve_register_parameters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10852,8 +10855,9 @@ def test_register_domain_rest_bad_request(request_type=domains.RegisterDomainReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10908,19 +10912,20 @@ def test_register_domain_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_register_domain" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_register_domain_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_register_domain" - ) as pre: + 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.DomainsRestInterceptor, "post_register_domain" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_register_domain_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_register_domain" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10971,8 +10976,9 @@ def test_retrieve_transfer_parameters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11030,18 +11036,20 @@ def test_retrieve_transfer_parameters_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_retrieve_transfer_parameters" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, - "post_retrieve_transfer_parameters_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_retrieve_transfer_parameters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_retrieve_transfer_parameters" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_retrieve_transfer_parameters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_retrieve_transfer_parameters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11097,8 +11105,9 @@ def test_transfer_domain_rest_bad_request(request_type=domains.TransferDomainReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11153,19 +11162,20 @@ def test_transfer_domain_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_transfer_domain" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_transfer_domain_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_transfer_domain" - ) as pre: + 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.DomainsRestInterceptor, "post_transfer_domain" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_transfer_domain_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_transfer_domain" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11216,8 +11226,9 @@ def test_list_registrations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11278,17 +11289,19 @@ def test_list_registrations_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_list_registrations" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_list_registrations_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_list_registrations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_list_registrations" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_list_registrations_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_list_registrations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11341,8 +11354,9 @@ def test_get_registration_rest_bad_request(request_type=domains.GetRegistrationR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11411,17 +11425,19 @@ def test_get_registration_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_get_registration" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_get_registration_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_get_registration" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_get_registration" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_get_registration_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_get_registration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11476,8 +11492,9 @@ def test_update_registration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11669,19 +11686,20 @@ def test_update_registration_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_update_registration" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_update_registration_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_update_registration" - ) as pre: + 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.DomainsRestInterceptor, "post_update_registration" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_update_registration_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_update_registration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11736,8 +11754,9 @@ def test_configure_management_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11794,20 +11813,21 @@ def test_configure_management_settings_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_configure_management_settings" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, - "post_configure_management_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_configure_management_settings" - ) as pre: + 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.DomainsRestInterceptor, "post_configure_management_settings" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_configure_management_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_configure_management_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11862,8 +11882,9 @@ def test_configure_dns_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11920,19 +11941,21 @@ def test_configure_dns_settings_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_configure_dns_settings" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_configure_dns_settings_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_configure_dns_settings" - ) as pre: + 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.DomainsRestInterceptor, "post_configure_dns_settings" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_configure_dns_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_configure_dns_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11987,8 +12010,9 @@ def test_configure_contact_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12045,20 +12069,21 @@ def test_configure_contact_settings_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_configure_contact_settings" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, - "post_configure_contact_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_configure_contact_settings" - ) as pre: + 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.DomainsRestInterceptor, "post_configure_contact_settings" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_configure_contact_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_configure_contact_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12111,8 +12136,9 @@ def test_export_registration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12167,19 +12193,20 @@ def test_export_registration_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_export_registration" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_export_registration_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_export_registration" - ) as pre: + 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.DomainsRestInterceptor, "post_export_registration" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_export_registration_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_export_registration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12232,8 +12259,9 @@ def test_delete_registration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12288,19 +12316,20 @@ def test_delete_registration_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_delete_registration" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_delete_registration_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_delete_registration" - ) as pre: + 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.DomainsRestInterceptor, "post_delete_registration" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, "post_delete_registration_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_delete_registration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12355,8 +12384,9 @@ def test_retrieve_authorization_code_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12419,18 +12449,20 @@ def test_retrieve_authorization_code_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_retrieve_authorization_code" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, - "post_retrieve_authorization_code_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_retrieve_authorization_code" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_retrieve_authorization_code" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_retrieve_authorization_code_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_retrieve_authorization_code" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12485,8 +12517,9 @@ def test_reset_authorization_code_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12549,17 +12582,20 @@ def test_reset_authorization_code_rest_interceptors(null_interceptor): ) client = DomainsClient(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.DomainsRestInterceptor, "post_reset_authorization_code" - ) as post, mock.patch.object( - transports.DomainsRestInterceptor, "post_reset_authorization_code_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DomainsRestInterceptor, "pre_reset_authorization_code" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DomainsRestInterceptor, "post_reset_authorization_code" + ) as post, + mock.patch.object( + transports.DomainsRestInterceptor, + "post_reset_authorization_code_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DomainsRestInterceptor, "pre_reset_authorization_code" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13019,11 +13055,14 @@ def test_domains_base_transport(): def test_domains_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.domains_v1beta1.services.domains.transports.DomainsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.domains_v1beta1.services.domains.transports.DomainsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DomainsTransport( @@ -13040,9 +13079,12 @@ def test_domains_base_transport_with_credentials_file(): def test_domains_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.domains_v1beta1.services.domains.transports.DomainsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.domains_v1beta1.services.domains.transports.DomainsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DomainsTransport() @@ -13114,11 +13156,12 @@ def test_domains_transport_auth_gdch_credentials(transport_class): def test_domains_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-edgecontainer/docs/conf.py b/packages/google-cloud-edgecontainer/docs/conf.py index 7c35a60a989b..845780991e4e 100644 --- a/packages/google-cloud-edgecontainer/docs/conf.py +++ b/packages/google-cloud-edgecontainer/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-edgecontainer documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/__init__.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/__init__.py index 00b43969262a..4dac2936478a 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/__init__.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.edge_container import EdgeContainerAsyncClient, EdgeContainerClient from .types.resources import ( Authorization, diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/async_client.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/async_client.py index 36822ea9f3dc..66258b27c75b 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/async_client.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.edgecontainer_v1 import gapic_version as package_version @@ -45,13 +45,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.edgecontainer_v1.services.edge_container import pagers from google.cloud.edgecontainer_v1.types import resources, service @@ -138,7 +138,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EdgeContainerAsyncClient: The constructed client. """ - return EdgeContainerClient.from_service_account_info.__func__(EdgeContainerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EdgeContainerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EdgeContainerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +155,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EdgeContainerAsyncClient: The constructed client. """ - return EdgeContainerClient.from_service_account_file.__func__(EdgeContainerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EdgeContainerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EdgeContainerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/client.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/client.py index 7a1245cb7009..8085bc0f6bb0 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/client.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.edgecontainer_v1 import gapic_version as package_version @@ -62,13 +62,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.edgecontainer_v1.services.edge_container import pagers from google.cloud.edgecontainer_v1.types import resources, service @@ -747,11 +747,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EdgeContainerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EdgeContainerClient._read_environment_variables() + ) self._client_cert_source = EdgeContainerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -786,8 +784,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EdgeContainerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/pagers.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/pagers.py index 9a751fc44762..4999a9087dbe 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/pagers.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/base.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/base.py index 99bcb8b94863..b705181f1a2b 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/base.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.edgecontainer_v1 import gapic_version as package_version from google.cloud.edgecontainer_v1.types import resources, service @@ -596,13 +596,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc.py index a66b6d4b0839..22cc823d70cb 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.edgecontainer_v1.types import resources, service @@ -546,12 +546,12 @@ def generate_offline_credential( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_offline_credential" not in self._stubs: - self._stubs[ - "generate_offline_credential" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgecontainer.v1.EdgeContainer/GenerateOfflineCredential", - request_serializer=service.GenerateOfflineCredentialRequest.serialize, - response_deserializer=service.GenerateOfflineCredentialResponse.deserialize, + self._stubs["generate_offline_credential"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgecontainer.v1.EdgeContainer/GenerateOfflineCredential", + request_serializer=service.GenerateOfflineCredentialRequest.serialize, + response_deserializer=service.GenerateOfflineCredentialResponse.deserialize, + ) ) return self._stubs["generate_offline_credential"] diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc_asyncio.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc_asyncio.py index 16cb6a8ff144..a38434689122 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc_asyncio.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.edgecontainer_v1.types import resources, service @@ -559,12 +559,12 @@ def generate_offline_credential( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_offline_credential" not in self._stubs: - self._stubs[ - "generate_offline_credential" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgecontainer.v1.EdgeContainer/GenerateOfflineCredential", - request_serializer=service.GenerateOfflineCredentialRequest.serialize, - response_deserializer=service.GenerateOfflineCredentialResponse.deserialize, + self._stubs["generate_offline_credential"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgecontainer.v1.EdgeContainer/GenerateOfflineCredential", + request_serializer=service.GenerateOfflineCredentialRequest.serialize, + response_deserializer=service.GenerateOfflineCredentialResponse.deserialize, + ) ) return self._stubs["generate_offline_credential"] diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/rest.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/rest.py index a4d02d702af7..81d99c050534 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/rest.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/services/edge_container/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1547,7 +1547,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1700,7 +1700,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1825,9 +1825,7 @@ def __call__( """ - http_options = ( - _BaseEdgeContainerRestTransport._BaseCreateVpnConnection._get_http_options() - ) + http_options = _BaseEdgeContainerRestTransport._BaseCreateVpnConnection._get_http_options() request, metadata = self._interceptor.pre_create_vpn_connection( request, metadata @@ -1853,7 +1851,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1999,7 +1997,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2146,7 +2144,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2269,9 +2267,7 @@ def __call__( """ - http_options = ( - _BaseEdgeContainerRestTransport._BaseDeleteVpnConnection._get_http_options() - ) + http_options = _BaseEdgeContainerRestTransport._BaseDeleteVpnConnection._get_http_options() request, metadata = self._interceptor.pre_delete_vpn_connection( request, metadata @@ -2293,7 +2289,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2414,9 +2410,7 @@ def __call__( An access token for a cluster. """ - http_options = ( - _BaseEdgeContainerRestTransport._BaseGenerateAccessToken._get_http_options() - ) + http_options = _BaseEdgeContainerRestTransport._BaseGenerateAccessToken._get_http_options() request, metadata = self._interceptor.pre_generate_access_token( request, metadata @@ -2565,9 +2559,7 @@ def __call__( An offline credential for a cluster. """ - http_options = ( - _BaseEdgeContainerRestTransport._BaseGenerateOfflineCredential._get_http_options() - ) + http_options = _BaseEdgeContainerRestTransport._BaseGenerateOfflineCredential._get_http_options() request, metadata = self._interceptor.pre_generate_offline_credential( request, metadata @@ -3313,9 +3305,7 @@ def __call__( A VPN connection . """ - http_options = ( - _BaseEdgeContainerRestTransport._BaseGetVpnConnection._get_http_options() - ) + http_options = _BaseEdgeContainerRestTransport._BaseGetVpnConnection._get_http_options() request, metadata = self._interceptor.pre_get_vpn_connection( request, metadata @@ -3893,9 +3883,7 @@ def __call__( """ - http_options = ( - _BaseEdgeContainerRestTransport._BaseListVpnConnections._get_http_options() - ) + http_options = _BaseEdgeContainerRestTransport._BaseListVpnConnections._get_http_options() request, metadata = self._interceptor.pre_list_vpn_connections( request, metadata @@ -4071,7 +4059,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4224,7 +4212,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4375,7 +4363,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4509,7 +4497,9 @@ def generate_offline_credential( ]: # 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._GenerateOfflineCredential(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateOfflineCredential( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_cluster(self) -> Callable[[service.GetClusterRequest], resources.Cluster]: diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/resources.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/resources.py index 5b16d887b965..ef7da6a122eb 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/resources.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/resources.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -65,6 +65,7 @@ class KmsKeyState(proto.Enum): The key is unavailable for an unspecified reason. Dependent resources may be inaccessible. """ + KMS_KEY_STATE_UNSPECIFIED = 0 KMS_KEY_STATE_KEY_AVAILABLE = 1 KMS_KEY_STATE_KEY_UNAVAILABLE = 2 @@ -81,6 +82,7 @@ class ResourceState(proto.Enum): RESOURCE_STATE_LOCK_DOWN_PENDING (2): The resource is pending lock down. """ + RESOURCE_STATE_UNSPECIFIED = 0 RESOURCE_STATE_LOCK_DOWN = 1 RESOURCE_STATE_LOCK_DOWN_PENDING = 2 @@ -192,6 +194,7 @@ class Status(proto.Enum): The cluster is undergoing some work such as version upgrades, etc. """ + STATUS_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -211,6 +214,7 @@ class ReleaseChannel(proto.Enum): REGULAR (2): Regular release channel. """ + RELEASE_CHANNEL_UNSPECIFIED = 0 NONE = 1 REGULAR = 2 @@ -260,6 +264,7 @@ class SharedDeploymentPolicy(proto.Enum): control plane nodes and can only be deployed on worker nodes. """ + SHARED_DEPLOYMENT_POLICY_UNSPECIFIED = 0 ALLOWED = 1 DISALLOWED = 2 @@ -511,6 +516,7 @@ class Type(proto.Enum): GOOGLE_DRIVEN_UPGRADE (2): Upgrade driven by Google. """ + TYPE_UNSPECIFIED = 0 USER_INITIATED_UPGRADE = 1 GOOGLE_DRIVEN_UPGRADE = 2 @@ -524,6 +530,7 @@ class Schedule(proto.Enum): IMMEDIATELY (1): Immediately after receiving the request. """ + SCHEDULE_UNSPECIFIED = 0 IMMEDIATELY = 1 @@ -541,6 +548,7 @@ class State(proto.Enum): FAILED (3): The maintenance event failed. """ + STATE_UNSPECIFIED = 0 RECONCILING = 1 SUCCEEDED = 2 @@ -642,6 +650,7 @@ class State(proto.Enum): Google, but may have recently reconnected after a disconnection. It is still syncing back. """ + STATE_UNSPECIFIED = 0 DISCONNECTED = 1 CONNECTED = 2 @@ -731,11 +740,11 @@ class State(proto.Enum): number=16, message=SystemAddonsConfig, ) - external_load_balancer_ipv4_address_pools: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=17, + external_load_balancer_ipv4_address_pools: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=17, + ) ) control_plane_encryption: ControlPlaneEncryption = proto.Field( proto.MESSAGE, @@ -766,11 +775,11 @@ class State(proto.Enum): number=24, message=SurvivabilityConfig, ) - external_load_balancer_ipv6_address_pools: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=25, + external_load_balancer_ipv6_address_pools: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=25, + ) ) connection_state: ConnectionState = proto.Field( proto.MESSAGE, @@ -1165,6 +1174,7 @@ class BgpRoutingMode(proto.Enum): GLOBAL (2): Global mode. """ + BGP_ROUTING_MODE_UNSPECIFIED = 0 REGIONAL = 1 GLOBAL = 2 @@ -1219,6 +1229,7 @@ class State(proto.Enum): STATE_ERROR (3): Error occurred. """ + STATE_UNSPECIFIED = 0 STATE_CONNECTED = 1 STATE_CONNECTING = 2 @@ -1264,12 +1275,12 @@ class CloudVpn(proto.Message): number=3, message="VpnConnection.Details.CloudRouter", ) - cloud_vpns: MutableSequence[ - "VpnConnection.Details.CloudVpn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="VpnConnection.Details.CloudVpn", + cloud_vpns: MutableSequence["VpnConnection.Details.CloudVpn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="VpnConnection.Details.CloudVpn", + ) ) name: str = proto.Field( @@ -1375,6 +1386,7 @@ class RackType(proto.Enum): Expansion rack type, also known as standalone racks, added by customers on demand. """ + RACK_TYPE_UNSPECIFIED = 0 BASE = 1 EXPANSION = 2 @@ -1466,12 +1478,12 @@ class MaintenancePolicy(proto.Message): number=1, message="MaintenanceWindow", ) - maintenance_exclusions: MutableSequence[ - "MaintenanceExclusionWindow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="MaintenanceExclusionWindow", + maintenance_exclusions: MutableSequence["MaintenanceExclusionWindow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="MaintenanceExclusionWindow", + ) ) diff --git a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/service.py b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/service.py index 52d316efb05b..d95dd230118a 100644 --- a/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/service.py +++ b/packages/google-cloud-edgecontainer/google/cloud/edgecontainer_v1/types/service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.edgecontainer_v1.types import resources @@ -100,6 +100,7 @@ class StatusReason(proto.Enum): UPGRADE_PAUSED (1): The cluster upgrade is currently paused. """ + STATUS_REASON_UNSPECIFIED = 0 UPGRADE_PAUSED = 1 @@ -334,6 +335,7 @@ class Schedule(proto.Enum): The cluster is going to be upgraded immediately after receiving the request. """ + SCHEDULE_UNSPECIFIED = 0 IMMEDIATELY = 1 diff --git a/packages/google-cloud-edgecontainer/noxfile.py b/packages/google-cloud-edgecontainer/noxfile.py index 09ad33986101..ebd2cf5de354 100644 --- a/packages/google-cloud-edgecontainer/noxfile.py +++ b/packages/google-cloud-edgecontainer/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-edgecontainer/tests/unit/gapic/edgecontainer_v1/test_edge_container.py b/packages/google-cloud-edgecontainer/tests/unit/gapic/edgecontainer_v1/test_edge_container.py index 1a73bbabede9..2c18e34981e7 100644 --- a/packages/google-cloud-edgecontainer/tests/unit/gapic/edgecontainer_v1/test_edge_container.py +++ b/packages/google-cloud-edgecontainer/tests/unit/gapic/edgecontainer_v1/test_edge_container.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,22 +62,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.edgecontainer_v1.services.edge_container import ( EdgeContainerAsyncClient, @@ -959,10 +959,9 @@ def test_edge_container_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1007,10 +1006,9 @@ def test_edge_container_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1044,9 @@ def test_edge_container_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1292,13 +1289,13 @@ def test_edge_container_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3686,9 +3683,9 @@ def test_generate_access_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_access_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_access_token] = ( + mock_rpc + ) request = {} client.generate_access_token(request) @@ -5235,9 +5232,9 @@ def test_create_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_pool] = ( + mock_rpc + ) request = {} client.create_node_pool(request) @@ -5584,9 +5581,9 @@ def test_update_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_node_pool] = ( + mock_rpc + ) request = {} client.update_node_pool(request) @@ -5925,9 +5922,9 @@ def test_delete_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_node_pool] = ( + mock_rpc + ) request = {} client.delete_node_pool(request) @@ -7133,9 +7130,9 @@ def test_list_vpn_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_vpn_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_vpn_connections] = ( + mock_rpc + ) request = {} client.list_vpn_connections(request) @@ -7690,9 +7687,9 @@ def test_get_vpn_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_vpn_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_vpn_connection] = ( + mock_rpc + ) request = {} client.get_vpn_connection(request) @@ -8045,9 +8042,9 @@ def test_create_vpn_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_vpn_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_vpn_connection] = ( + mock_rpc + ) request = {} client.create_vpn_connection(request) @@ -8413,9 +8410,9 @@ def test_delete_vpn_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_vpn_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_vpn_connection] = ( + mock_rpc + ) request = {} client.delete_vpn_connection(request) @@ -8759,9 +8756,9 @@ def test_get_server_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_config] = ( + mock_rpc + ) request = {} client.get_server_config(request) @@ -10146,9 +10143,9 @@ def test_generate_access_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_access_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_access_token] = ( + mock_rpc + ) request = {} client.generate_access_token(request) @@ -10953,9 +10950,9 @@ def test_create_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_node_pool] = ( + mock_rpc + ) request = {} client.create_node_pool(request) @@ -11173,9 +11170,9 @@ def test_update_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_node_pool] = ( + mock_rpc + ) request = {} client.update_node_pool(request) @@ -11277,9 +11274,9 @@ def test_delete_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_node_pool] = ( + mock_rpc + ) request = {} client.delete_node_pool(request) @@ -11892,9 +11889,9 @@ def test_list_vpn_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_vpn_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_vpn_connections] = ( + mock_rpc + ) request = {} client.list_vpn_connections(request) @@ -12156,9 +12153,9 @@ def test_get_vpn_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_vpn_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_vpn_connection] = ( + mock_rpc + ) request = {} client.get_vpn_connection(request) @@ -12341,9 +12338,9 @@ def test_create_vpn_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_vpn_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_vpn_connection] = ( + mock_rpc + ) request = {} client.create_vpn_connection(request) @@ -12562,9 +12559,9 @@ def test_delete_vpn_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_vpn_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_vpn_connection] = ( + mock_rpc + ) request = {} client.delete_vpn_connection(request) @@ -12745,9 +12742,9 @@ def test_get_server_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_config] = ( + mock_rpc + ) request = {} client.get_server_config(request) @@ -14044,8 +14041,9 @@ def test_list_clusters_rest_bad_request(request_type=service.ListClustersRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14110,17 +14108,19 @@ def test_list_clusters_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_list_clusters" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_list_clusters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_list_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_list_clusters" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_list_clusters_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_list_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14171,8 +14171,9 @@ def test_get_cluster_rest_bad_request(request_type=service.GetClusterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14265,17 +14266,19 @@ def test_get_cluster_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_get_cluster" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_get_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_get_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_get_cluster" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_get_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_get_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14324,8 +14327,9 @@ def test_create_cluster_rest_bad_request(request_type=service.CreateClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14539,19 +14543,20 @@ def test_create_cluster_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_create_cluster" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_create_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_create_cluster" - ) as pre: + 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.EdgeContainerRestInterceptor, "post_create_cluster" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_create_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_create_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14602,8 +14607,9 @@ def test_update_cluster_rest_bad_request(request_type=service.UpdateClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14819,19 +14825,20 @@ def test_update_cluster_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_update_cluster" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_update_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_update_cluster" - ) as pre: + 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.EdgeContainerRestInterceptor, "post_update_cluster" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_update_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_update_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14880,8 +14887,9 @@ def test_upgrade_cluster_rest_bad_request(request_type=service.UpgradeClusterReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14938,19 +14946,21 @@ def test_upgrade_cluster_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_upgrade_cluster" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_upgrade_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_upgrade_cluster" - ) as pre: + 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.EdgeContainerRestInterceptor, "post_upgrade_cluster" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, + "post_upgrade_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_upgrade_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14999,8 +15009,9 @@ def test_delete_cluster_rest_bad_request(request_type=service.DeleteClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15057,19 +15068,20 @@ def test_delete_cluster_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_delete_cluster" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_delete_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_delete_cluster" - ) as pre: + 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.EdgeContainerRestInterceptor, "post_delete_cluster" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_delete_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_delete_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15120,8 +15132,9 @@ def test_generate_access_token_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15184,18 +15197,20 @@ def test_generate_access_token_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_generate_access_token" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, - "post_generate_access_token_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_generate_access_token" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_generate_access_token" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, + "post_generate_access_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_generate_access_token" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15253,8 +15268,9 @@ def test_generate_offline_credential_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15321,18 +15337,20 @@ def test_generate_offline_credential_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_generate_offline_credential" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, - "post_generate_offline_credential_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_generate_offline_credential" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_generate_offline_credential" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, + "post_generate_offline_credential_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_generate_offline_credential" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15388,8 +15406,9 @@ def test_list_node_pools_rest_bad_request(request_type=service.ListNodePoolsRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15454,17 +15473,20 @@ def test_list_node_pools_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_list_node_pools" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_list_node_pools_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_list_node_pools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_list_node_pools" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, + "post_list_node_pools_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_list_node_pools" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15517,8 +15539,9 @@ def test_get_node_pool_rest_bad_request(request_type=service.GetNodePoolRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15591,17 +15614,19 @@ def test_get_node_pool_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_get_node_pool" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_get_node_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_get_node_pool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_get_node_pool" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_get_node_pool_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_get_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15650,8 +15675,9 @@ def test_create_node_pool_rest_bad_request(request_type=service.CreateNodePoolRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15805,19 +15831,21 @@ def test_create_node_pool_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_create_node_pool" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_create_node_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_create_node_pool" - ) as pre: + 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.EdgeContainerRestInterceptor, "post_create_node_pool" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, + "post_create_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_create_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15870,8 +15898,9 @@ def test_update_node_pool_rest_bad_request(request_type=service.UpdateNodePoolRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16029,19 +16058,21 @@ def test_update_node_pool_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_update_node_pool" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_update_node_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_update_node_pool" - ) as pre: + 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.EdgeContainerRestInterceptor, "post_update_node_pool" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, + "post_update_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_update_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16092,8 +16123,9 @@ def test_delete_node_pool_rest_bad_request(request_type=service.DeleteNodePoolRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16152,19 +16184,21 @@ def test_delete_node_pool_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_delete_node_pool" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_delete_node_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_delete_node_pool" - ) as pre: + 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.EdgeContainerRestInterceptor, "post_delete_node_pool" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, + "post_delete_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_delete_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16213,8 +16247,9 @@ def test_list_machines_rest_bad_request(request_type=service.ListMachinesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16279,17 +16314,19 @@ def test_list_machines_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_list_machines" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_list_machines_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_list_machines" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_list_machines" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_list_machines_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_list_machines" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16340,8 +16377,9 @@ def test_get_machine_rest_bad_request(request_type=service.GetMachineRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16412,17 +16450,19 @@ def test_get_machine_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_get_machine" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_get_machine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_get_machine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_get_machine" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_get_machine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_get_machine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16473,8 +16513,9 @@ def test_list_vpn_connections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16539,18 +16580,20 @@ def test_list_vpn_connections_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_list_vpn_connections" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, - "post_list_vpn_connections_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_list_vpn_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_list_vpn_connections" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, + "post_list_vpn_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_list_vpn_connections" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16605,8 +16648,9 @@ def test_get_vpn_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16681,17 +16725,20 @@ def test_get_vpn_connection_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_get_vpn_connection" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_get_vpn_connection_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_get_vpn_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_get_vpn_connection" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, + "post_get_vpn_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_get_vpn_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16744,8 +16791,9 @@ def test_create_vpn_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16891,20 +16939,21 @@ def test_create_vpn_connection_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_create_vpn_connection" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, - "post_create_vpn_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_create_vpn_connection" - ) as pre: + 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.EdgeContainerRestInterceptor, "post_create_vpn_connection" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, + "post_create_vpn_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_create_vpn_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16957,8 +17006,9 @@ def test_delete_vpn_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17015,20 +17065,21 @@ def test_delete_vpn_connection_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_delete_vpn_connection" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, - "post_delete_vpn_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_delete_vpn_connection" - ) as pre: + 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.EdgeContainerRestInterceptor, "post_delete_vpn_connection" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, + "post_delete_vpn_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_delete_vpn_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17081,8 +17132,9 @@ def test_get_server_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17145,17 +17197,20 @@ def test_get_server_config_rest_interceptors(null_interceptor): ) client = EdgeContainerClient(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.EdgeContainerRestInterceptor, "post_get_server_config" - ) as post, mock.patch.object( - transports.EdgeContainerRestInterceptor, "post_get_server_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeContainerRestInterceptor, "pre_get_server_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "post_get_server_config" + ) as post, + mock.patch.object( + transports.EdgeContainerRestInterceptor, + "post_get_server_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeContainerRestInterceptor, "pre_get_server_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17206,8 +17261,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -17266,8 +17322,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -17328,8 +17385,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -17390,8 +17448,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -17452,8 +17511,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -17514,8 +17574,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18084,11 +18145,14 @@ def test_edge_container_base_transport(): def test_edge_container_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.edgecontainer_v1.services.edge_container.transports.EdgeContainerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.edgecontainer_v1.services.edge_container.transports.EdgeContainerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EdgeContainerTransport( @@ -18105,9 +18169,12 @@ def test_edge_container_base_transport_with_credentials_file(): def test_edge_container_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.edgecontainer_v1.services.edge_container.transports.EdgeContainerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.edgecontainer_v1.services.edge_container.transports.EdgeContainerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EdgeContainerTransport() @@ -18179,11 +18246,12 @@ def test_edge_container_transport_auth_gdch_credentials(transport_class): def test_edge_container_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-edgenetwork/docs/conf.py b/packages/google-cloud-edgenetwork/docs/conf.py index 512cee1a4ac6..0d61ec61f2ed 100644 --- a/packages/google-cloud-edgenetwork/docs/conf.py +++ b/packages/google-cloud-edgenetwork/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-edgenetwork documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/__init__.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/__init__.py index 6b4b5d55cdf3..32b2e3d74114 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/__init__.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.edge_network import EdgeNetworkAsyncClient, EdgeNetworkClient from .types.resources import ( Interconnect, diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/async_client.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/async_client.py index 4b8b6ef9a01d..8165386ee70c 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/async_client.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.edgenetwork_v1 import gapic_version as package_version @@ -45,13 +45,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.edgenetwork_v1.services.edge_network import pagers from google.cloud.edgenetwork_v1.types import resources, service @@ -137,7 +137,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EdgeNetworkAsyncClient: The constructed client. """ - return EdgeNetworkClient.from_service_account_info.__func__(EdgeNetworkAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EdgeNetworkClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EdgeNetworkAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -153,7 +154,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EdgeNetworkAsyncClient: The constructed client. """ - return EdgeNetworkClient.from_service_account_file.__func__(EdgeNetworkAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EdgeNetworkClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EdgeNetworkAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/client.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/client.py index 6a692e0ac97e..852d8e1d296a 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/client.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.edgenetwork_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.edgenetwork_v1.services.edge_network import pagers from google.cloud.edgenetwork_v1.types import resources, service @@ -751,11 +751,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EdgeNetworkClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EdgeNetworkClient._read_environment_variables() + ) self._client_cert_source = EdgeNetworkClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -790,8 +788,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EdgeNetworkTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/pagers.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/pagers.py index 8fa6dd096742..c3d3c6751b15 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/pagers.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/base.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/base.py index 19e3fac4f3ed..fb26eec3267a 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/base.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.edgenetwork_v1 import gapic_version as package_version from google.cloud.edgenetwork_v1.types import resources, service @@ -704,13 +704,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc.py index 913869ee2c53..918f4473649c 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.edgenetwork_v1.types import resources, service @@ -786,12 +786,12 @@ def list_interconnect_attachments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_interconnect_attachments" not in self._stubs: - self._stubs[ - "list_interconnect_attachments" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/ListInterconnectAttachments", - request_serializer=service.ListInterconnectAttachmentsRequest.serialize, - response_deserializer=service.ListInterconnectAttachmentsResponse.deserialize, + self._stubs["list_interconnect_attachments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/ListInterconnectAttachments", + request_serializer=service.ListInterconnectAttachmentsRequest.serialize, + response_deserializer=service.ListInterconnectAttachmentsResponse.deserialize, + ) ) return self._stubs["list_interconnect_attachments"] @@ -816,12 +816,12 @@ def get_interconnect_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_interconnect_attachment" not in self._stubs: - self._stubs[ - "get_interconnect_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/GetInterconnectAttachment", - request_serializer=service.GetInterconnectAttachmentRequest.serialize, - response_deserializer=resources.InterconnectAttachment.deserialize, + self._stubs["get_interconnect_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/GetInterconnectAttachment", + request_serializer=service.GetInterconnectAttachmentRequest.serialize, + response_deserializer=resources.InterconnectAttachment.deserialize, + ) ) return self._stubs["get_interconnect_attachment"] @@ -847,12 +847,12 @@ def create_interconnect_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_interconnect_attachment" not in self._stubs: - self._stubs[ - "create_interconnect_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/CreateInterconnectAttachment", - request_serializer=service.CreateInterconnectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_interconnect_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/CreateInterconnectAttachment", + request_serializer=service.CreateInterconnectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_interconnect_attachment"] @@ -877,12 +877,12 @@ def delete_interconnect_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_interconnect_attachment" not in self._stubs: - self._stubs[ - "delete_interconnect_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/DeleteInterconnectAttachment", - request_serializer=service.DeleteInterconnectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_interconnect_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/DeleteInterconnectAttachment", + request_serializer=service.DeleteInterconnectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_interconnect_attachment"] diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc_asyncio.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc_asyncio.py index f75322be010e..45abb2690189 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc_asyncio.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.edgenetwork_v1.types import resources, service @@ -805,12 +805,12 @@ def list_interconnect_attachments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_interconnect_attachments" not in self._stubs: - self._stubs[ - "list_interconnect_attachments" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/ListInterconnectAttachments", - request_serializer=service.ListInterconnectAttachmentsRequest.serialize, - response_deserializer=service.ListInterconnectAttachmentsResponse.deserialize, + self._stubs["list_interconnect_attachments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/ListInterconnectAttachments", + request_serializer=service.ListInterconnectAttachmentsRequest.serialize, + response_deserializer=service.ListInterconnectAttachmentsResponse.deserialize, + ) ) return self._stubs["list_interconnect_attachments"] @@ -836,12 +836,12 @@ def get_interconnect_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_interconnect_attachment" not in self._stubs: - self._stubs[ - "get_interconnect_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/GetInterconnectAttachment", - request_serializer=service.GetInterconnectAttachmentRequest.serialize, - response_deserializer=resources.InterconnectAttachment.deserialize, + self._stubs["get_interconnect_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/GetInterconnectAttachment", + request_serializer=service.GetInterconnectAttachmentRequest.serialize, + response_deserializer=resources.InterconnectAttachment.deserialize, + ) ) return self._stubs["get_interconnect_attachment"] @@ -868,12 +868,12 @@ def create_interconnect_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_interconnect_attachment" not in self._stubs: - self._stubs[ - "create_interconnect_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/CreateInterconnectAttachment", - request_serializer=service.CreateInterconnectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_interconnect_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/CreateInterconnectAttachment", + request_serializer=service.CreateInterconnectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_interconnect_attachment"] @@ -899,12 +899,12 @@ def delete_interconnect_attachment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_interconnect_attachment" not in self._stubs: - self._stubs[ - "delete_interconnect_attachment" - ] = self._logged_channel.unary_unary( - "/google.cloud.edgenetwork.v1.EdgeNetwork/DeleteInterconnectAttachment", - request_serializer=service.DeleteInterconnectAttachmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_interconnect_attachment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.edgenetwork.v1.EdgeNetwork/DeleteInterconnectAttachment", + request_serializer=service.DeleteInterconnectAttachmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_interconnect_attachment"] diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/rest.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/rest.py index 507c8685935d..907680a725f7 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/rest.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/services/edge_network/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1856,9 +1856,7 @@ def __call__( """ - http_options = ( - _BaseEdgeNetworkRestTransport._BaseCreateInterconnectAttachment._get_http_options() - ) + http_options = _BaseEdgeNetworkRestTransport._BaseCreateInterconnectAttachment._get_http_options() request, metadata = self._interceptor.pre_create_interconnect_attachment( request, metadata @@ -1884,7 +1882,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1927,11 +1925,10 @@ def __call__( resp = self._interceptor.post_create_interconnect_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_interconnect_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_interconnect_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2044,7 +2041,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2201,7 +2198,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2358,7 +2355,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2485,9 +2482,7 @@ def __call__( """ - http_options = ( - _BaseEdgeNetworkRestTransport._BaseDeleteInterconnectAttachment._get_http_options() - ) + http_options = _BaseEdgeNetworkRestTransport._BaseDeleteInterconnectAttachment._get_http_options() request, metadata = self._interceptor.pre_delete_interconnect_attachment( request, metadata @@ -2509,7 +2504,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2551,11 +2546,10 @@ def __call__( resp = self._interceptor.post_delete_interconnect_attachment(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_interconnect_attachment_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_interconnect_attachment_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2661,7 +2655,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2810,7 +2804,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2959,7 +2953,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3084,9 +3078,7 @@ def __call__( """ - http_options = ( - _BaseEdgeNetworkRestTransport._BaseDiagnoseInterconnect._get_http_options() - ) + http_options = _BaseEdgeNetworkRestTransport._BaseDiagnoseInterconnect._get_http_options() request, metadata = self._interceptor.pre_diagnose_interconnect( request, metadata @@ -3682,9 +3674,7 @@ def __call__( """ - http_options = ( - _BaseEdgeNetworkRestTransport._BaseGetInterconnectAttachment._get_http_options() - ) + http_options = _BaseEdgeNetworkRestTransport._BaseGetInterconnectAttachment._get_http_options() request, metadata = self._interceptor.pre_get_interconnect_attachment( request, metadata @@ -4575,9 +4565,7 @@ def __call__( """ - http_options = ( - _BaseEdgeNetworkRestTransport._BaseListInterconnectAttachments._get_http_options() - ) + http_options = _BaseEdgeNetworkRestTransport._BaseListInterconnectAttachments._get_http_options() request, metadata = self._interceptor.pre_list_interconnect_attachments( request, metadata @@ -4643,11 +4631,10 @@ def __call__( resp = self._interceptor.post_list_interconnect_attachments(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_interconnect_attachments_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_interconnect_attachments_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5517,7 +5504,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5674,7 +5661,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5749,7 +5736,9 @@ def create_interconnect_attachment( ]: # 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._CreateInterconnectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateInterconnectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_network( @@ -5783,7 +5772,9 @@ def delete_interconnect_attachment( ]: # 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._DeleteInterconnectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteInterconnectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_network( @@ -5851,7 +5842,9 @@ def get_interconnect_attachment( ]: # 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._GetInterconnectAttachment(self._session, self._host, self._interceptor) # type: ignore + return self._GetInterconnectAttachment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_network(self) -> Callable[[service.GetNetworkRequest], resources.Network]: @@ -5894,7 +5887,9 @@ def list_interconnect_attachments( ]: # 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._ListInterconnectAttachments(self._session, self._host, self._interceptor) # type: ignore + return self._ListInterconnectAttachments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_interconnects( diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/resources.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/resources.py index 580987521b86..ec273aae1fae 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/resources.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/resources.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -63,6 +63,7 @@ class ResourceState(proto.Enum): STATE_DELETING (5): The resource is under deletion. """ + STATE_UNKNOWN = 0 STATE_PENDING = 1 STATE_PROVISIONING = 2 @@ -84,6 +85,7 @@ class RemotePeeringNetworkType(proto.Enum): Customer's untrust network that has internet access. """ + REMOTE_PEERING_NETWORK_TYPE_UNSPECIFIED = 0 REMOTE_PEERING_NETWORK_TYPE_CUSTOMER_INTERNAL = 1 REMOTE_PEERING_NETWORK_TYPE_CUSTOMER_INTERNET = 2 @@ -247,6 +249,7 @@ class BondingType(proto.Enum): NON_BONDED (2): Single homed. """ + BONDING_TYPE_UNSPECIFIED = 0 BONDED = 1 NON_BONDED = 2 @@ -346,6 +349,7 @@ class InterconnectType(proto.Enum): DEDICATED (1): Dedicated Interconnect. """ + INTERCONNECT_TYPE_UNSPECIFIED = 0 DEDICATED = 1 @@ -809,12 +813,12 @@ class LinkStatus(proto.Message): number=2, message="InterconnectDiagnostics.LinkLACPStatus", ) - lldp_statuses: MutableSequence[ - "InterconnectDiagnostics.LinkLLDPStatus" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="InterconnectDiagnostics.LinkLLDPStatus", + lldp_statuses: MutableSequence["InterconnectDiagnostics.LinkLLDPStatus"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="InterconnectDiagnostics.LinkLLDPStatus", + ) ) packet_counts: "InterconnectDiagnostics.PacketCounts" = proto.Field( proto.MESSAGE, @@ -916,6 +920,7 @@ class State(proto.Enum): this means the rest of the object should be empty. """ + UNKNOWN = 0 ACTIVE = 1 DETACHED = 2 @@ -1067,6 +1072,7 @@ class BgpStatus(proto.Enum): The DOWN state indicating BGP session is not established yet. """ + UNKNOWN = 0 UP = 1 DOWN = 2 diff --git a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/service.py b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/service.py index 15b4a1c0dc09..c04dd1bf64fa 100644 --- a/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/service.py +++ b/packages/google-cloud-edgenetwork/google/cloud/edgenetwork_v1/types/service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.edgenetwork_v1.types import resources @@ -712,12 +712,12 @@ class ListInterconnectAttachmentsResponse(proto.Message): def raw_page(self): return self - interconnect_attachments: MutableSequence[ - resources.InterconnectAttachment - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.InterconnectAttachment, + interconnect_attachments: MutableSequence[resources.InterconnectAttachment] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.InterconnectAttachment, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1180,6 +1180,7 @@ class MacsecStatus(proto.Enum): At least one relevant link does not have any MACsec sessions up. """ + MACSEC_STATUS_UNSPECIFIED = 0 SECURE = 1 UNSECURE = 2 diff --git a/packages/google-cloud-edgenetwork/noxfile.py b/packages/google-cloud-edgenetwork/noxfile.py index 447457fd10c8..01d7fb869bd5 100644 --- a/packages/google-cloud-edgenetwork/noxfile.py +++ b/packages/google-cloud-edgenetwork/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-edgenetwork/tests/unit/gapic/edgenetwork_v1/test_edge_network.py b/packages/google-cloud-edgenetwork/tests/unit/gapic/edgenetwork_v1/test_edge_network.py index 62dd3d8d1558..b6f831977d04 100644 --- a/packages/google-cloud-edgenetwork/tests/unit/gapic/edgenetwork_v1/test_edge_network.py +++ b/packages/google-cloud-edgenetwork/tests/unit/gapic/edgenetwork_v1/test_edge_network.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.edgenetwork_v1.services.edge_network import ( EdgeNetworkAsyncClient, @@ -936,10 +936,9 @@ def test_edge_network_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -984,10 +983,9 @@ def test_edge_network_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1023,10 +1021,9 @@ def test_edge_network_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1255,13 +1252,13 @@ def test_edge_network_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3382,9 +3379,9 @@ def test_diagnose_network_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_network - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_network] = ( + mock_rpc + ) request = {} client.diagnose_network(request) @@ -6287,9 +6284,9 @@ def test_list_interconnects_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_interconnects - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_interconnects] = ( + mock_rpc + ) request = {} client.list_interconnects(request) @@ -6843,9 +6840,9 @@ def test_get_interconnect_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_interconnect - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_interconnect] = ( + mock_rpc + ) request = {} client.get_interconnect(request) @@ -7189,9 +7186,9 @@ def test_diagnose_interconnect_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_interconnect - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_interconnect] = ( + mock_rpc + ) request = {} client.diagnose_interconnect(request) @@ -12348,9 +12345,9 @@ def test_diagnose_network_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_network - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_network] = ( + mock_rpc + ) request = {} client.diagnose_network(request) @@ -13949,9 +13946,9 @@ def test_list_interconnects_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_interconnects - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_interconnects] = ( + mock_rpc + ) request = {} client.list_interconnects(request) @@ -14209,9 +14206,9 @@ def test_get_interconnect_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_interconnect - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_interconnect] = ( + mock_rpc + ) request = {} client.get_interconnect(request) @@ -14394,9 +14391,9 @@ def test_diagnose_interconnect_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_interconnect - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_interconnect] = ( + mock_rpc + ) request = {} client.diagnose_interconnect(request) @@ -18041,8 +18038,9 @@ def test_initialize_zone_rest_bad_request(request_type=service.InitializeZoneReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18102,17 +18100,19 @@ def test_initialize_zone_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_initialize_zone" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_initialize_zone_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_initialize_zone" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_initialize_zone" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_initialize_zone_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_initialize_zone" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18163,8 +18163,9 @@ def test_list_zones_rest_bad_request(request_type=service.ListZonesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18229,17 +18230,19 @@ def test_list_zones_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_list_zones" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_list_zones_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_list_zones" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_list_zones" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_list_zones_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_list_zones" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18288,8 +18291,9 @@ def test_get_zone_rest_bad_request(request_type=service.GetZoneRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18354,17 +18358,17 @@ def test_get_zone_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_get_zone" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_get_zone_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_get_zone" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_get_zone" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_get_zone_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.EdgeNetworkRestInterceptor, "pre_get_zone") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18413,8 +18417,9 @@ def test_list_networks_rest_bad_request(request_type=service.ListNetworksRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18479,17 +18484,19 @@ def test_list_networks_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_list_networks" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_list_networks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_list_networks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_list_networks" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_list_networks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_list_networks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18542,8 +18549,9 @@ def test_get_network_rest_bad_request(request_type=service.GetNetworkRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18612,17 +18620,19 @@ def test_get_network_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_get_network" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_get_network_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_get_network" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_get_network" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_get_network_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_get_network" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18673,8 +18683,9 @@ def test_diagnose_network_rest_bad_request(request_type=service.DiagnoseNetworkR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18736,17 +18747,19 @@ def test_diagnose_network_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_diagnose_network" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_diagnose_network_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_diagnose_network" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_diagnose_network" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_diagnose_network_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_diagnose_network" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18797,8 +18810,9 @@ def test_create_network_rest_bad_request(request_type=service.CreateNetworkReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18930,19 +18944,20 @@ def test_create_network_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_create_network" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_create_network_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_create_network" - ) as pre: + 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.EdgeNetworkRestInterceptor, "post_create_network" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_create_network_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_create_network" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18993,8 +19008,9 @@ def test_delete_network_rest_bad_request(request_type=service.DeleteNetworkReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19053,19 +19069,20 @@ def test_delete_network_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_delete_network" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_delete_network_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_delete_network" - ) as pre: + 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.EdgeNetworkRestInterceptor, "post_delete_network" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_delete_network_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_delete_network" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19114,8 +19131,9 @@ def test_list_subnets_rest_bad_request(request_type=service.ListSubnetsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19180,17 +19198,19 @@ def test_list_subnets_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_list_subnets" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_list_subnets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_list_subnets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_list_subnets" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_list_subnets_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_list_subnets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19243,8 +19263,9 @@ def test_get_subnet_rest_bad_request(request_type=service.GetSubnetRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19323,17 +19344,19 @@ def test_get_subnet_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_get_subnet" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_get_subnet_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_get_subnet" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_get_subnet" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_get_subnet_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_get_subnet" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19382,8 +19405,9 @@ def test_create_subnet_rest_bad_request(request_type=service.CreateSubnetRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19520,19 +19544,20 @@ def test_create_subnet_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_create_subnet" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_create_subnet_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_create_subnet" - ) as pre: + 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.EdgeNetworkRestInterceptor, "post_create_subnet" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_create_subnet_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_create_subnet" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19585,8 +19610,9 @@ def test_update_subnet_rest_bad_request(request_type=service.UpdateSubnetRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19727,19 +19753,20 @@ def test_update_subnet_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_update_subnet" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_update_subnet_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_update_subnet" - ) as pre: + 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.EdgeNetworkRestInterceptor, "post_update_subnet" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_update_subnet_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_update_subnet" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19790,8 +19817,9 @@ def test_delete_subnet_rest_bad_request(request_type=service.DeleteSubnetRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19850,19 +19878,20 @@ def test_delete_subnet_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_delete_subnet" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_delete_subnet_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_delete_subnet" - ) as pre: + 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.EdgeNetworkRestInterceptor, "post_delete_subnet" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_delete_subnet_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_delete_subnet" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19913,8 +19942,9 @@ def test_list_interconnects_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19979,17 +20009,20 @@ def test_list_interconnects_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_list_interconnects" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_list_interconnects_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_list_interconnects" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_list_interconnects" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, + "post_list_interconnects_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_list_interconnects" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20044,8 +20077,9 @@ def test_get_interconnect_rest_bad_request(request_type=service.GetInterconnectR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20127,17 +20161,19 @@ def test_get_interconnect_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_get_interconnect" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_get_interconnect_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_get_interconnect" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_get_interconnect" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_get_interconnect_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_get_interconnect" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20190,8 +20226,9 @@ def test_diagnose_interconnect_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20253,18 +20290,20 @@ def test_diagnose_interconnect_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_diagnose_interconnect" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, - "post_diagnose_interconnect_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_diagnose_interconnect" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_diagnose_interconnect" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, + "post_diagnose_interconnect_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_diagnose_interconnect" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20322,8 +20361,9 @@ def test_list_interconnect_attachments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20388,18 +20428,20 @@ def test_list_interconnect_attachments_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_list_interconnect_attachments" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, - "post_list_interconnect_attachments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_list_interconnect_attachments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_list_interconnect_attachments" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, + "post_list_interconnect_attachments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_list_interconnect_attachments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20459,8 +20501,9 @@ def test_get_interconnect_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20542,18 +20585,20 @@ def test_get_interconnect_attachment_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_get_interconnect_attachment" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, - "post_get_interconnect_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_get_interconnect_attachment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_get_interconnect_attachment" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, + "post_get_interconnect_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_get_interconnect_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20608,8 +20653,9 @@ def test_create_interconnect_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20750,20 +20796,21 @@ def test_create_interconnect_attachment_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_create_interconnect_attachment" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, - "post_create_interconnect_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_create_interconnect_attachment" - ) as pre: + 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.EdgeNetworkRestInterceptor, "post_create_interconnect_attachment" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, + "post_create_interconnect_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_create_interconnect_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20818,8 +20865,9 @@ def test_delete_interconnect_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20878,20 +20926,21 @@ def test_delete_interconnect_attachment_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_delete_interconnect_attachment" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, - "post_delete_interconnect_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_delete_interconnect_attachment" - ) as pre: + 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.EdgeNetworkRestInterceptor, "post_delete_interconnect_attachment" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, + "post_delete_interconnect_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_delete_interconnect_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20942,8 +20991,9 @@ def test_list_routers_rest_bad_request(request_type=service.ListRoutersRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21008,17 +21058,19 @@ def test_list_routers_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_list_routers" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_list_routers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_list_routers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_list_routers" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_list_routers_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_list_routers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21071,8 +21123,9 @@ def test_get_router_rest_bad_request(request_type=service.GetRouterRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21145,17 +21198,19 @@ def test_get_router_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_get_router" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_get_router_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_get_router" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_get_router" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_get_router_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_get_router" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21206,8 +21261,9 @@ def test_diagnose_router_rest_bad_request(request_type=service.DiagnoseRouterReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21269,17 +21325,19 @@ def test_diagnose_router_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_diagnose_router" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_diagnose_router_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_diagnose_router" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_diagnose_router" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_diagnose_router_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_diagnose_router" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21330,8 +21388,9 @@ def test_create_router_rest_bad_request(request_type=service.CreateRouterRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21494,19 +21553,20 @@ def test_create_router_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_create_router" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_create_router_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_create_router" - ) as pre: + 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.EdgeNetworkRestInterceptor, "post_create_router" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_create_router_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_create_router" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21559,8 +21619,9 @@ def test_update_router_rest_bad_request(request_type=service.UpdateRouterRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21727,19 +21788,20 @@ def test_update_router_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_update_router" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_update_router_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_update_router" - ) as pre: + 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.EdgeNetworkRestInterceptor, "post_update_router" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_update_router_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_update_router" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21790,8 +21852,9 @@ def test_delete_router_rest_bad_request(request_type=service.DeleteRouterRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21850,19 +21913,20 @@ def test_delete_router_rest_interceptors(null_interceptor): ) client = EdgeNetworkClient(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.EdgeNetworkRestInterceptor, "post_delete_router" - ) as post, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "post_delete_router_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EdgeNetworkRestInterceptor, "pre_delete_router" - ) as pre: + 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.EdgeNetworkRestInterceptor, "post_delete_router" + ) as post, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "post_delete_router_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EdgeNetworkRestInterceptor, "pre_delete_router" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21913,8 +21977,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21973,8 +22038,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22035,8 +22101,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22097,8 +22164,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22159,8 +22227,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22221,8 +22290,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -22915,11 +22985,14 @@ def test_edge_network_base_transport(): def test_edge_network_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.edgenetwork_v1.services.edge_network.transports.EdgeNetworkTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.edgenetwork_v1.services.edge_network.transports.EdgeNetworkTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EdgeNetworkTransport( @@ -22936,9 +23009,12 @@ def test_edge_network_base_transport_with_credentials_file(): def test_edge_network_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.edgenetwork_v1.services.edge_network.transports.EdgeNetworkTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.edgenetwork_v1.services.edge_network.transports.EdgeNetworkTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EdgeNetworkTransport() @@ -23010,11 +23086,12 @@ def test_edge_network_transport_auth_gdch_credentials(transport_class): def test_edge_network_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-enterpriseknowledgegraph/docs/conf.py b/packages/google-cloud-enterpriseknowledgegraph/docs/conf.py index bb39eb703bd8..7839e3f04f2b 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/docs/conf.py +++ b/packages/google-cloud-enterpriseknowledgegraph/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-enterpriseknowledgegraph documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/__init__.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/__init__.py index 2decda5279f9..3e14962909a3 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/__init__.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.enterprise_knowledge_graph_service import ( EnterpriseKnowledgeGraphServiceAsyncClient, EnterpriseKnowledgeGraphServiceClient, diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/async_client.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/async_client.py index 0e3e99d0b3ff..d6e2803ec413 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/async_client.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.enterpriseknowledgegraph_v1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.enterpriseknowledgegraph_v1.services.enterprise_knowledge_graph_service import ( pagers, @@ -155,7 +155,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EnterpriseKnowledgeGraphServiceAsyncClient: The constructed client. """ - return EnterpriseKnowledgeGraphServiceClient.from_service_account_info.__func__(EnterpriseKnowledgeGraphServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + EnterpriseKnowledgeGraphServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + EnterpriseKnowledgeGraphServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -171,7 +176,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EnterpriseKnowledgeGraphServiceAsyncClient: The constructed client. """ - return EnterpriseKnowledgeGraphServiceClient.from_service_account_file.__func__(EnterpriseKnowledgeGraphServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + EnterpriseKnowledgeGraphServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + EnterpriseKnowledgeGraphServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -209,7 +219,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return EnterpriseKnowledgeGraphServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return EnterpriseKnowledgeGraphServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> EnterpriseKnowledgeGraphServiceTransport: diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/client.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/client.py index 18a500f94d6d..294603fee687 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/client.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.enterpriseknowledgegraph_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.enterpriseknowledgegraph_v1.services.enterprise_knowledge_graph_service import ( pagers, @@ -88,13 +88,11 @@ class EnterpriseKnowledgeGraphServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EnterpriseKnowledgeGraphServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EnterpriseKnowledgeGraphServiceTransport]] _transport_registry["grpc"] = EnterpriseKnowledgeGraphServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = EnterpriseKnowledgeGraphServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + EnterpriseKnowledgeGraphServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = EnterpriseKnowledgeGraphServiceRestTransport def get_transport_class( @@ -727,11 +725,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EnterpriseKnowledgeGraphServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EnterpriseKnowledgeGraphServiceClient._read_environment_variables() + ) self._client_cert_source = ( EnterpriseKnowledgeGraphServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -772,8 +768,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EnterpriseKnowledgeGraphServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/pagers.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/pagers.py index ea6a18ebf605..cd670da937c0 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/pagers.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/__init__.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/__init__.py index 31a0cfa042ce..f4bb9b9d16c0 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/__init__.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EnterpriseKnowledgeGraphServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EnterpriseKnowledgeGraphServiceTransport]] _transport_registry["grpc"] = EnterpriseKnowledgeGraphServiceGrpcTransport -_transport_registry[ - "grpc_asyncio" -] = EnterpriseKnowledgeGraphServiceGrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + EnterpriseKnowledgeGraphServiceGrpcAsyncIOTransport +) _transport_registry["rest"] = EnterpriseKnowledgeGraphServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/base.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/base.py index 3979a746b3e1..e6bb1a2e2d32 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/base.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.enterpriseknowledgegraph_v1 import gapic_version as package_version from google.cloud.enterpriseknowledgegraph_v1.types import service diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc.py index c3a11705610e..d7f889bcaf58 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.enterpriseknowledgegraph_v1.types import service @@ -349,12 +349,12 @@ def create_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "create_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CreateEntityReconciliationJob", - request_serializer=service.CreateEntityReconciliationJobRequest.serialize, - response_deserializer=service.EntityReconciliationJob.deserialize, + self._stubs["create_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CreateEntityReconciliationJob", + request_serializer=service.CreateEntityReconciliationJobRequest.serialize, + response_deserializer=service.EntityReconciliationJob.deserialize, + ) ) return self._stubs["create_entity_reconciliation_job"] @@ -379,12 +379,12 @@ def get_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "get_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/GetEntityReconciliationJob", - request_serializer=service.GetEntityReconciliationJobRequest.serialize, - response_deserializer=service.EntityReconciliationJob.deserialize, + self._stubs["get_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/GetEntityReconciliationJob", + request_serializer=service.GetEntityReconciliationJobRequest.serialize, + response_deserializer=service.EntityReconciliationJob.deserialize, + ) ) return self._stubs["get_entity_reconciliation_job"] @@ -411,12 +411,12 @@ def list_entity_reconciliation_jobs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_entity_reconciliation_jobs" not in self._stubs: - self._stubs[ - "list_entity_reconciliation_jobs" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/ListEntityReconciliationJobs", - request_serializer=service.ListEntityReconciliationJobsRequest.serialize, - response_deserializer=service.ListEntityReconciliationJobsResponse.deserialize, + self._stubs["list_entity_reconciliation_jobs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/ListEntityReconciliationJobs", + request_serializer=service.ListEntityReconciliationJobsRequest.serialize, + response_deserializer=service.ListEntityReconciliationJobsResponse.deserialize, + ) ) return self._stubs["list_entity_reconciliation_jobs"] @@ -441,12 +441,12 @@ def cancel_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "cancel_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CancelEntityReconciliationJob", - request_serializer=service.CancelEntityReconciliationJobRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["cancel_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CancelEntityReconciliationJob", + request_serializer=service.CancelEntityReconciliationJobRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["cancel_entity_reconciliation_job"] @@ -472,12 +472,12 @@ def delete_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "delete_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/DeleteEntityReconciliationJob", - request_serializer=service.DeleteEntityReconciliationJobRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/DeleteEntityReconciliationJob", + request_serializer=service.DeleteEntityReconciliationJobRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_entity_reconciliation_job"] diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc_asyncio.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc_asyncio.py index dae87dfa9387..46910f13641f 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.enterpriseknowledgegraph_v1.types import service @@ -358,12 +358,12 @@ def create_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "create_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CreateEntityReconciliationJob", - request_serializer=service.CreateEntityReconciliationJobRequest.serialize, - response_deserializer=service.EntityReconciliationJob.deserialize, + self._stubs["create_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CreateEntityReconciliationJob", + request_serializer=service.CreateEntityReconciliationJobRequest.serialize, + response_deserializer=service.EntityReconciliationJob.deserialize, + ) ) return self._stubs["create_entity_reconciliation_job"] @@ -389,12 +389,12 @@ def get_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "get_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/GetEntityReconciliationJob", - request_serializer=service.GetEntityReconciliationJobRequest.serialize, - response_deserializer=service.EntityReconciliationJob.deserialize, + self._stubs["get_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/GetEntityReconciliationJob", + request_serializer=service.GetEntityReconciliationJobRequest.serialize, + response_deserializer=service.EntityReconciliationJob.deserialize, + ) ) return self._stubs["get_entity_reconciliation_job"] @@ -421,12 +421,12 @@ def list_entity_reconciliation_jobs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_entity_reconciliation_jobs" not in self._stubs: - self._stubs[ - "list_entity_reconciliation_jobs" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/ListEntityReconciliationJobs", - request_serializer=service.ListEntityReconciliationJobsRequest.serialize, - response_deserializer=service.ListEntityReconciliationJobsResponse.deserialize, + self._stubs["list_entity_reconciliation_jobs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/ListEntityReconciliationJobs", + request_serializer=service.ListEntityReconciliationJobsRequest.serialize, + response_deserializer=service.ListEntityReconciliationJobsResponse.deserialize, + ) ) return self._stubs["list_entity_reconciliation_jobs"] @@ -453,12 +453,12 @@ def cancel_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "cancel_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "cancel_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CancelEntityReconciliationJob", - request_serializer=service.CancelEntityReconciliationJobRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["cancel_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/CancelEntityReconciliationJob", + request_serializer=service.CancelEntityReconciliationJobRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["cancel_entity_reconciliation_job"] @@ -486,12 +486,12 @@ def delete_entity_reconciliation_job( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_entity_reconciliation_job" not in self._stubs: - self._stubs[ - "delete_entity_reconciliation_job" - ] = self._logged_channel.unary_unary( - "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/DeleteEntityReconciliationJob", - request_serializer=service.DeleteEntityReconciliationJobRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_entity_reconciliation_job"] = ( + self._logged_channel.unary_unary( + "/google.cloud.enterpriseknowledgegraph.v1.EnterpriseKnowledgeGraphService/DeleteEntityReconciliationJob", + request_serializer=service.DeleteEntityReconciliationJobRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_entity_reconciliation_job"] diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest.py index d6ef5178e3ab..73fa16b562f7 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -656,9 +656,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseCancelEntityReconciliationJob._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseCancelEntityReconciliationJob._get_http_options() request, metadata = self._interceptor.pre_cancel_entity_reconciliation_job( request, metadata @@ -684,7 +682,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -779,9 +777,7 @@ def __call__( Entity reconciliation job message. """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseCreateEntityReconciliationJob._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseCreateEntityReconciliationJob._get_http_options() request, metadata = self._interceptor.pre_create_entity_reconciliation_job( request, metadata @@ -850,11 +846,10 @@ def __call__( resp = self._interceptor.post_create_entity_reconciliation_job(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_entity_reconciliation_job_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_entity_reconciliation_job_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -934,9 +929,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseDeleteEntityReconciliationJob._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseDeleteEntityReconciliationJob._get_http_options() request, metadata = self._interceptor.pre_delete_entity_reconciliation_job( request, metadata @@ -958,7 +951,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1051,9 +1044,7 @@ def __call__( Entity reconciliation job message. """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseGetEntityReconciliationJob._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseGetEntityReconciliationJob._get_http_options() request, metadata = self._interceptor.pre_get_entity_reconciliation_job( request, metadata @@ -1117,11 +1108,10 @@ def __call__( resp = self._interceptor.post_get_entity_reconciliation_job(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_entity_reconciliation_job_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_entity_reconciliation_job_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1207,9 +1197,7 @@ def __call__( """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseListEntityReconciliationJobs._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseListEntityReconciliationJobs._get_http_options() request, metadata = self._interceptor.pre_list_entity_reconciliation_jobs( request, metadata @@ -1273,11 +1261,10 @@ def __call__( resp = self._interceptor.post_list_entity_reconciliation_jobs(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_entity_reconciliation_jobs_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_entity_reconciliation_jobs_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1362,9 +1349,7 @@ def __call__( """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseLookup._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseLookup._get_http_options() request, metadata = self._interceptor.pre_lookup(request, metadata) transcoded_request = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseLookup._get_transcoded_request( @@ -1512,9 +1497,7 @@ def __call__( """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseLookupPublicKg._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseLookupPublicKg._get_http_options() request, metadata = self._interceptor.pre_lookup_public_kg( request, metadata @@ -1662,9 +1645,7 @@ def __call__( """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseSearch._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseSearch._get_http_options() request, metadata = self._interceptor.pre_search(request, metadata) transcoded_request = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseSearch._get_transcoded_request( @@ -1812,9 +1793,7 @@ def __call__( """ - http_options = ( - _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseSearchPublicKg._get_http_options() - ) + http_options = _BaseEnterpriseKnowledgeGraphServiceRestTransport._BaseSearchPublicKg._get_http_options() request, metadata = self._interceptor.pre_search_public_kg( request, metadata @@ -1910,7 +1889,9 @@ def cancel_entity_reconciliation_job( ) -> Callable[[service.CancelEntityReconciliationJobRequest], empty_pb2.Empty]: # 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._CancelEntityReconciliationJob(self._session, self._host, self._interceptor) # type: ignore + return self._CancelEntityReconciliationJob( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_entity_reconciliation_job( @@ -1920,7 +1901,9 @@ def create_entity_reconciliation_job( ]: # 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._CreateEntityReconciliationJob(self._session, self._host, self._interceptor) # type: ignore + return self._CreateEntityReconciliationJob( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_entity_reconciliation_job( @@ -1928,7 +1911,9 @@ def delete_entity_reconciliation_job( ) -> Callable[[service.DeleteEntityReconciliationJobRequest], empty_pb2.Empty]: # 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._DeleteEntityReconciliationJob(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteEntityReconciliationJob( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_entity_reconciliation_job( @@ -1938,7 +1923,9 @@ def get_entity_reconciliation_job( ]: # 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._GetEntityReconciliationJob(self._session, self._host, self._interceptor) # type: ignore + return self._GetEntityReconciliationJob( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_entity_reconciliation_jobs( @@ -1949,7 +1936,9 @@ def list_entity_reconciliation_jobs( ]: # 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._ListEntityReconciliationJobs(self._session, self._host, self._interceptor) # type: ignore + return self._ListEntityReconciliationJobs( + self._session, self._host, self._interceptor + ) # type: ignore @property def lookup(self) -> Callable[[service.LookupRequest], service.LookupResponse]: diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest_base.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest_base.py index cb6a4327e845..07c268f90aee 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest_base.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/services/enterprise_knowledge_graph_service/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.enterpriseknowledgegraph_v1.types import service diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/__init__.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/__init__.py index 4e7fa70adb23..a2449e24070e 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/__init__.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .job_state import JobState -from .operation_metadata import CommonOperationMetadata +from .job_state import ( + JobState, +) +from .operation_metadata import ( + CommonOperationMetadata, +) from .service import ( AffinityClusteringConfig, BigQueryInputConfig, diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/job_state.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/job_state.py index 7084f7a9f9b3..bb8095236d3c 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/job_state.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/job_state.py @@ -56,6 +56,7 @@ class JobState(proto.Enum): Entity Recon API: The exporting clusters job is running. """ + JOB_STATE_UNSPECIFIED = 0 JOB_STATE_PENDING = 9 JOB_STATE_RUNNING = 1 diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/operation_metadata.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/operation_metadata.py index 8d07a7dc8238..20d6e4896a0c 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/operation_metadata.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/operation_metadata.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -59,6 +59,7 @@ class State(proto.Enum): PENDING (6): Operation is pending not running yet. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 CANCELLING = 2 diff --git a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/service.py b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/service.py index b1e1a2680551..27f48506a12c 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/service.py +++ b/packages/google-cloud-enterpriseknowledgegraph/google/cloud/enterpriseknowledgegraph_v1/types/service.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.enterpriseknowledgegraph_v1.types import job_state, operation_metadata @@ -91,6 +91,7 @@ class EntityType(proto.Enum): PERSON (7): Person entity. """ + ENTITY_TYPE_UNSPECIFIED = 0 PEOPLE = 1 ESTABLISHMENT = 2 @@ -100,12 +101,12 @@ class EntityType(proto.Enum): LOCAL_BUSINESS = 6 PERSON = 7 - bigquery_input_configs: MutableSequence[ - "BigQueryInputConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="BigQueryInputConfig", + bigquery_input_configs: MutableSequence["BigQueryInputConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="BigQueryInputConfig", + ) ) entity_type: EntityType = proto.Field( proto.ENUM, @@ -386,12 +387,12 @@ class ListEntityReconciliationJobsResponse(proto.Message): def raw_page(self): return self - entity_reconciliation_jobs: MutableSequence[ - "EntityReconciliationJob" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="EntityReconciliationJob", + entity_reconciliation_jobs: MutableSequence["EntityReconciliationJob"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="EntityReconciliationJob", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-enterpriseknowledgegraph/noxfile.py b/packages/google-cloud-enterpriseknowledgegraph/noxfile.py index d897d8e771fe..6167d5962871 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/noxfile.py +++ b/packages/google-cloud-enterpriseknowledgegraph/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-enterpriseknowledgegraph/tests/unit/gapic/enterpriseknowledgegraph_v1/test_enterprise_knowledge_graph_service.py b/packages/google-cloud-enterpriseknowledgegraph/tests/unit/gapic/enterpriseknowledgegraph_v1/test_enterprise_knowledge_graph_service.py index 3899526f28f9..4a75156aa192 100644 --- a/packages/google-cloud-enterpriseknowledgegraph/tests/unit/gapic/enterpriseknowledgegraph_v1/test_enterprise_knowledge_graph_service.py +++ b/packages/google-cloud-enterpriseknowledgegraph/tests/unit/gapic/enterpriseknowledgegraph_v1/test_enterprise_knowledge_graph_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.enterpriseknowledgegraph_v1.services.enterprise_knowledge_graph_service import ( EnterpriseKnowledgeGraphServiceAsyncClient, @@ -1065,10 +1070,9 @@ def test_enterprise_knowledge_graph_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1113,10 +1117,9 @@ def test_enterprise_knowledge_graph_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1152,10 +1155,9 @@ def test_enterprise_knowledge_graph_service_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1416,13 +1418,13 @@ def test_enterprise_knowledge_graph_service_client_create_channel_credentials_fi ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3488,9 +3490,9 @@ async def test_lookup_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.lookup - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.lookup] = ( + mock_rpc + ) request = {} await client.lookup(request) @@ -3815,9 +3817,9 @@ async def test_search_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.search - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.search] = ( + mock_rpc + ) request = {} await client.search(request) @@ -4103,9 +4105,9 @@ def test_lookup_public_kg_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.lookup_public_kg - ] = mock_rpc + client._transport._wrapped_methods[client._transport.lookup_public_kg] = ( + mock_rpc + ) request = {} client.lookup_public_kg(request) @@ -4434,9 +4436,9 @@ def test_search_public_kg_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_public_kg - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_public_kg] = ( + mock_rpc + ) request = {} client.search_public_kg(request) @@ -6147,9 +6149,9 @@ def test_lookup_public_kg_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.lookup_public_kg - ] = mock_rpc + client._transport._wrapped_methods[client._transport.lookup_public_kg] = ( + mock_rpc + ) request = {} client.lookup_public_kg(request) @@ -6362,9 +6364,9 @@ def test_search_public_kg_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_public_kg - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_public_kg] = ( + mock_rpc + ) request = {} client.search_public_kg(request) @@ -7136,8 +7138,9 @@ def test_create_entity_reconciliation_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7309,20 +7312,22 @@ def test_create_entity_reconciliation_job_rest_interceptors(null_interceptor): ) client = EnterpriseKnowledgeGraphServiceClient(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.EnterpriseKnowledgeGraphServiceRestInterceptor, - "post_create_entity_reconciliation_job", - ) as post, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, - "post_create_entity_reconciliation_job_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, - "pre_create_entity_reconciliation_job", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "post_create_entity_reconciliation_job", + ) as post, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "post_create_entity_reconciliation_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "pre_create_entity_reconciliation_job", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7379,8 +7384,9 @@ def test_get_entity_reconciliation_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7447,20 +7453,22 @@ def test_get_entity_reconciliation_job_rest_interceptors(null_interceptor): ) client = EnterpriseKnowledgeGraphServiceClient(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.EnterpriseKnowledgeGraphServiceRestInterceptor, - "post_get_entity_reconciliation_job", - ) as post, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, - "post_get_entity_reconciliation_job_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, - "pre_get_entity_reconciliation_job", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "post_get_entity_reconciliation_job", + ) as post, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "post_get_entity_reconciliation_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "pre_get_entity_reconciliation_job", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7515,8 +7523,9 @@ def test_list_entity_reconciliation_jobs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7579,20 +7588,22 @@ def test_list_entity_reconciliation_jobs_rest_interceptors(null_interceptor): ) client = EnterpriseKnowledgeGraphServiceClient(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.EnterpriseKnowledgeGraphServiceRestInterceptor, - "post_list_entity_reconciliation_jobs", - ) as post, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, - "post_list_entity_reconciliation_jobs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, - "pre_list_entity_reconciliation_jobs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "post_list_entity_reconciliation_jobs", + ) as post, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "post_list_entity_reconciliation_jobs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "pre_list_entity_reconciliation_jobs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7652,8 +7663,9 @@ def test_cancel_entity_reconciliation_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7712,14 +7724,14 @@ def test_cancel_entity_reconciliation_job_rest_interceptors(null_interceptor): ) client = EnterpriseKnowledgeGraphServiceClient(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.EnterpriseKnowledgeGraphServiceRestInterceptor, - "pre_cancel_entity_reconciliation_job", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "pre_cancel_entity_reconciliation_job", + ) as pre, + ): pre.assert_not_called() pb_message = service.CancelEntityReconciliationJobRequest.pb( service.CancelEntityReconciliationJobRequest() @@ -7766,8 +7778,9 @@ def test_delete_entity_reconciliation_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7826,14 +7839,14 @@ def test_delete_entity_reconciliation_job_rest_interceptors(null_interceptor): ) client = EnterpriseKnowledgeGraphServiceClient(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.EnterpriseKnowledgeGraphServiceRestInterceptor, - "pre_delete_entity_reconciliation_job", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "pre_delete_entity_reconciliation_job", + ) as pre, + ): pre.assert_not_called() pb_message = service.DeleteEntityReconciliationJobRequest.pb( service.DeleteEntityReconciliationJobRequest() @@ -7876,8 +7889,9 @@ def test_lookup_rest_bad_request(request_type=service.LookupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7937,18 +7951,20 @@ def test_lookup_rest_interceptors(null_interceptor): ) client = EnterpriseKnowledgeGraphServiceClient(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.EnterpriseKnowledgeGraphServiceRestInterceptor, "post_lookup" - ) as post, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, - "post_lookup_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, "pre_lookup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, "post_lookup" + ) as post, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "post_lookup_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, "pre_lookup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7997,8 +8013,9 @@ def test_search_rest_bad_request(request_type=service.SearchRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8058,18 +8075,20 @@ def test_search_rest_interceptors(null_interceptor): ) client = EnterpriseKnowledgeGraphServiceClient(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.EnterpriseKnowledgeGraphServiceRestInterceptor, "post_search" - ) as post, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, - "post_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, "pre_search" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, "post_search" + ) as post, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "post_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, "pre_search" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8118,8 +8137,9 @@ def test_lookup_public_kg_rest_bad_request(request_type=service.LookupPublicKgRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8179,20 +8199,22 @@ def test_lookup_public_kg_rest_interceptors(null_interceptor): ) client = EnterpriseKnowledgeGraphServiceClient(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.EnterpriseKnowledgeGraphServiceRestInterceptor, - "post_lookup_public_kg", - ) as post, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, - "post_lookup_public_kg_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, - "pre_lookup_public_kg", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "post_lookup_public_kg", + ) as post, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "post_lookup_public_kg_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "pre_lookup_public_kg", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8243,8 +8265,9 @@ def test_search_public_kg_rest_bad_request(request_type=service.SearchPublicKgRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8304,20 +8327,22 @@ def test_search_public_kg_rest_interceptors(null_interceptor): ) client = EnterpriseKnowledgeGraphServiceClient(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.EnterpriseKnowledgeGraphServiceRestInterceptor, - "post_search_public_kg", - ) as post, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, - "post_search_public_kg_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnterpriseKnowledgeGraphServiceRestInterceptor, - "pre_search_public_kg", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "post_search_public_kg", + ) as post, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "post_search_public_kg_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnterpriseKnowledgeGraphServiceRestInterceptor, + "pre_search_public_kg", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8617,11 +8642,14 @@ def test_enterprise_knowledge_graph_service_base_transport(): def test_enterprise_knowledge_graph_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.enterpriseknowledgegraph_v1.services.enterprise_knowledge_graph_service.transports.EnterpriseKnowledgeGraphServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.enterpriseknowledgegraph_v1.services.enterprise_knowledge_graph_service.transports.EnterpriseKnowledgeGraphServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnterpriseKnowledgeGraphServiceTransport( @@ -8638,9 +8666,12 @@ def test_enterprise_knowledge_graph_service_base_transport_with_credentials_file def test_enterprise_knowledge_graph_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.enterpriseknowledgegraph_v1.services.enterprise_knowledge_graph_service.transports.EnterpriseKnowledgeGraphServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.enterpriseknowledgegraph_v1.services.enterprise_knowledge_graph_service.transports.EnterpriseKnowledgeGraphServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnterpriseKnowledgeGraphServiceTransport() @@ -8719,11 +8750,12 @@ def test_enterprise_knowledge_graph_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-essential-contacts/docs/conf.py b/packages/google-cloud-essential-contacts/docs/conf.py index f69d97b4156e..03123e1c9fa8 100644 --- a/packages/google-cloud-essential-contacts/docs/conf.py +++ b/packages/google-cloud-essential-contacts/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-essential-contacts documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/__init__.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/__init__.py index 53c1012f3184..823cd59fbe49 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/__init__.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.essential_contacts_service import ( EssentialContactsServiceAsyncClient, EssentialContactsServiceClient, diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/async_client.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/async_client.py index 280ffa627aba..610b0d850c66 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/async_client.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.essential_contacts_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.essential_contacts_v1.services.essential_contacts_service import ( pagers, @@ -124,7 +124,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EssentialContactsServiceAsyncClient: The constructed client. """ - return EssentialContactsServiceClient.from_service_account_info.__func__(EssentialContactsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EssentialContactsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EssentialContactsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +141,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EssentialContactsServiceAsyncClient: The constructed client. """ - return EssentialContactsServiceClient.from_service_account_file.__func__(EssentialContactsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EssentialContactsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + EssentialContactsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -178,7 +182,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return EssentialContactsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return EssentialContactsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> EssentialContactsServiceTransport: diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/client.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/client.py index ab2e4d3b0c14..9143bae26d8e 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/client.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.essential_contacts_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.essential_contacts_v1.services.essential_contacts_service import ( pagers, @@ -83,9 +83,7 @@ class EssentialContactsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EssentialContactsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EssentialContactsServiceTransport]] _transport_registry["grpc"] = EssentialContactsServiceGrpcTransport _transport_registry["grpc_asyncio"] = EssentialContactsServiceGrpcAsyncIOTransport _transport_registry["rest"] = EssentialContactsServiceRestTransport @@ -626,11 +624,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EssentialContactsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EssentialContactsServiceClient._read_environment_variables() + ) self._client_cert_source = ( EssentialContactsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -667,8 +663,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EssentialContactsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/pagers.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/pagers.py index 263e9b4669d5..38aab8c8c004 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/pagers.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/__init__.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/__init__.py index d87d47428cd3..3dca773575d2 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/__init__.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EssentialContactsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EssentialContactsServiceTransport]] _transport_registry["grpc"] = EssentialContactsServiceGrpcTransport _transport_registry["grpc_asyncio"] = EssentialContactsServiceGrpcAsyncIOTransport _transport_registry["rest"] = EssentialContactsServiceRestTransport diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/base.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/base.py index c6c2a46af4ab..1d7320da49ee 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/base.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.essential_contacts_v1 import gapic_version as package_version from google.cloud.essential_contacts_v1.types import service diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc.py index 8590cec2f68c..4d76b4fd1d72 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.essential_contacts_v1.types import service diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc_asyncio.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc_asyncio.py index dd8ce6da653a..51283d9a8365 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.essential_contacts_v1.types import service diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest.py index e7905f9e4aa2..2df2a91b79cb 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -523,9 +523,7 @@ def __call__( """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseComputeContacts._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseComputeContacts._get_http_options() request, metadata = self._interceptor.pre_compute_contacts( request, metadata @@ -676,9 +674,7 @@ def __call__( """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseCreateContact._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseCreateContact._get_http_options() request, metadata = self._interceptor.pre_create_contact(request, metadata) transcoded_request = _BaseEssentialContactsServiceRestTransport._BaseCreateContact._get_transcoded_request( @@ -825,9 +821,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseDeleteContact._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseDeleteContact._get_http_options() request, metadata = self._interceptor.pre_delete_contact(request, metadata) transcoded_request = _BaseEssentialContactsServiceRestTransport._BaseDeleteContact._get_transcoded_request( @@ -847,7 +841,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -941,9 +935,7 @@ def __call__( """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseGetContact._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseGetContact._get_http_options() request, metadata = self._interceptor.pre_get_contact(request, metadata) transcoded_request = _BaseEssentialContactsServiceRestTransport._BaseGetContact._get_transcoded_request( @@ -1089,9 +1081,7 @@ def __call__( """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseListContacts._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseListContacts._get_http_options() request, metadata = self._interceptor.pre_list_contacts(request, metadata) transcoded_request = _BaseEssentialContactsServiceRestTransport._BaseListContacts._get_transcoded_request( @@ -1234,9 +1224,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseSendTestMessage._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseSendTestMessage._get_http_options() request, metadata = self._interceptor.pre_send_test_message( request, metadata @@ -1262,7 +1250,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1358,9 +1346,7 @@ def __call__( """ - http_options = ( - _BaseEssentialContactsServiceRestTransport._BaseUpdateContact._get_http_options() - ) + http_options = _BaseEssentialContactsServiceRestTransport._BaseUpdateContact._get_http_options() request, metadata = self._interceptor.pre_update_contact(request, metadata) transcoded_request = _BaseEssentialContactsServiceRestTransport._BaseUpdateContact._get_transcoded_request( diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest_base.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest_base.py index e5bb189d6181..2ef77c5b329d 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest_base.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/services/essential_contacts_service/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.essential_contacts_v1.types import service diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/__init__.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/__init__.py index 6282cba27b92..8a604cb4d775 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/__init__.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .enums import NotificationCategory, ValidationState +from .enums import ( + NotificationCategory, + ValidationState, +) from .service import ( ComputeContactsRequest, ComputeContactsResponse, diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/enums.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/enums.py index 4127726c5981..d769f4cab57e 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/enums.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/enums.py @@ -66,6 +66,7 @@ class NotificationCategory(proto.Enum): technical incident notifications will go to these contacts instead of TECHNICAL. """ + NOTIFICATION_CATEGORY_UNSPECIFIED = 0 ALL = 2 SUSPENSION = 3 @@ -95,6 +96,7 @@ class ValidationState(proto.Enum): become the state if the contact's email is found to be unreachable. """ + VALIDATION_STATE_UNSPECIFIED = 0 VALID = 1 INVALID = 2 diff --git a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/service.py b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/service.py index 303cd000ae40..8f8b8c750e4c 100644 --- a/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/service.py +++ b/packages/google-cloud-essential-contacts/google/cloud/essential_contacts_v1/types/service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.essential_contacts_v1.types import enums @@ -79,12 +79,12 @@ class Contact(proto.Message): proto.STRING, number=2, ) - notification_category_subscriptions: MutableSequence[ - enums.NotificationCategory - ] = proto.RepeatedField( - proto.ENUM, - number=3, - enum=enums.NotificationCategory, + notification_category_subscriptions: MutableSequence[enums.NotificationCategory] = ( + proto.RepeatedField( + proto.ENUM, + number=3, + enum=enums.NotificationCategory, + ) ) language_tag: str = proto.Field( proto.STRING, @@ -282,12 +282,12 @@ class ComputeContactsRequest(proto.Message): proto.STRING, number=1, ) - notification_categories: MutableSequence[ - enums.NotificationCategory - ] = proto.RepeatedField( - proto.ENUM, - number=6, - enum=enums.NotificationCategory, + notification_categories: MutableSequence[enums.NotificationCategory] = ( + proto.RepeatedField( + proto.ENUM, + number=6, + enum=enums.NotificationCategory, + ) ) page_size: int = proto.Field( proto.INT32, diff --git a/packages/google-cloud-essential-contacts/noxfile.py b/packages/google-cloud-essential-contacts/noxfile.py index fc2115b9ca16..89dcf3d1cf71 100644 --- a/packages/google-cloud-essential-contacts/noxfile.py +++ b/packages/google-cloud-essential-contacts/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-essential-contacts/tests/unit/gapic/essential_contacts_v1/test_essential_contacts_service.py b/packages/google-cloud-essential-contacts/tests/unit/gapic/essential_contacts_v1/test_essential_contacts_service.py index 5e8ea51b8a72..1e602fd985ad 100644 --- a/packages/google-cloud-essential-contacts/tests/unit/gapic/essential_contacts_v1/test_essential_contacts_service.py +++ b/packages/google-cloud-essential-contacts/tests/unit/gapic/essential_contacts_v1/test_essential_contacts_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.essential_contacts_v1.services.essential_contacts_service import ( EssentialContactsServiceAsyncClient, @@ -1005,10 +1010,9 @@ def test_essential_contacts_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1053,10 +1057,9 @@ def test_essential_contacts_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1092,10 +1095,9 @@ def test_essential_contacts_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1352,13 +1354,13 @@ def test_essential_contacts_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3330,9 +3332,9 @@ def test_compute_contacts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compute_contacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compute_contacts] = ( + mock_rpc + ) request = {} client.compute_contacts(request) @@ -3768,9 +3770,9 @@ def test_send_test_message_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.send_test_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.send_test_message] = ( + mock_rpc + ) request = {} client.send_test_message(request) @@ -4899,9 +4901,9 @@ def test_compute_contacts_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.compute_contacts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.compute_contacts] = ( + mock_rpc + ) request = {} client.compute_contacts(request) @@ -5099,9 +5101,9 @@ def test_send_test_message_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.send_test_message - ] = mock_rpc + client._transport._wrapped_methods[client._transport.send_test_message] = ( + mock_rpc + ) request = {} client.send_test_message(request) @@ -5691,8 +5693,9 @@ def test_create_contact_rest_bad_request(request_type=service.CreateContactReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5840,18 +5843,20 @@ def test_create_contact_rest_interceptors(null_interceptor): ) client = EssentialContactsServiceClient(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.EssentialContactsServiceRestInterceptor, "post_create_contact" - ) as post, mock.patch.object( - transports.EssentialContactsServiceRestInterceptor, - "post_create_contact_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EssentialContactsServiceRestInterceptor, "pre_create_contact" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, "post_create_contact" + ) as post, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, + "post_create_contact_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, "pre_create_contact" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5900,8 +5905,9 @@ def test_update_contact_rest_bad_request(request_type=service.UpdateContactReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6049,18 +6055,20 @@ def test_update_contact_rest_interceptors(null_interceptor): ) client = EssentialContactsServiceClient(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.EssentialContactsServiceRestInterceptor, "post_update_contact" - ) as post, mock.patch.object( - transports.EssentialContactsServiceRestInterceptor, - "post_update_contact_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EssentialContactsServiceRestInterceptor, "pre_update_contact" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, "post_update_contact" + ) as post, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, + "post_update_contact_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, "pre_update_contact" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6109,8 +6117,9 @@ def test_list_contacts_rest_bad_request(request_type=service.ListContactsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6173,18 +6182,20 @@ def test_list_contacts_rest_interceptors(null_interceptor): ) client = EssentialContactsServiceClient(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.EssentialContactsServiceRestInterceptor, "post_list_contacts" - ) as post, mock.patch.object( - transports.EssentialContactsServiceRestInterceptor, - "post_list_contacts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EssentialContactsServiceRestInterceptor, "pre_list_contacts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, "post_list_contacts" + ) as post, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, + "post_list_contacts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, "pre_list_contacts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6235,8 +6246,9 @@ def test_get_contact_rest_bad_request(request_type=service.GetContactRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6309,18 +6321,20 @@ def test_get_contact_rest_interceptors(null_interceptor): ) client = EssentialContactsServiceClient(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.EssentialContactsServiceRestInterceptor, "post_get_contact" - ) as post, mock.patch.object( - transports.EssentialContactsServiceRestInterceptor, - "post_get_contact_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EssentialContactsServiceRestInterceptor, "pre_get_contact" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, "post_get_contact" + ) as post, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, + "post_get_contact_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, "pre_get_contact" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6369,8 +6383,9 @@ def test_delete_contact_rest_bad_request(request_type=service.DeleteContactReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6427,13 +6442,13 @@ def test_delete_contact_rest_interceptors(null_interceptor): ) client = EssentialContactsServiceClient(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.EssentialContactsServiceRestInterceptor, "pre_delete_contact" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, "pre_delete_contact" + ) as pre, + ): pre.assert_not_called() pb_message = service.DeleteContactRequest.pb(service.DeleteContactRequest()) transcode.return_value = { @@ -6474,8 +6489,9 @@ def test_compute_contacts_rest_bad_request(request_type=service.ComputeContactsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6538,18 +6554,20 @@ def test_compute_contacts_rest_interceptors(null_interceptor): ) client = EssentialContactsServiceClient(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.EssentialContactsServiceRestInterceptor, "post_compute_contacts" - ) as post, mock.patch.object( - transports.EssentialContactsServiceRestInterceptor, - "post_compute_contacts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EssentialContactsServiceRestInterceptor, "pre_compute_contacts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, "post_compute_contacts" + ) as post, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, + "post_compute_contacts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, "pre_compute_contacts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6602,8 +6620,9 @@ def test_send_test_message_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6660,13 +6679,13 @@ def test_send_test_message_rest_interceptors(null_interceptor): ) client = EssentialContactsServiceClient(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.EssentialContactsServiceRestInterceptor, "pre_send_test_message" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EssentialContactsServiceRestInterceptor, "pre_send_test_message" + ) as pre, + ): pre.assert_not_called() pb_message = service.SendTestMessageRequest.pb(service.SendTestMessageRequest()) transcode.return_value = { @@ -6906,11 +6925,14 @@ def test_essential_contacts_service_base_transport(): def test_essential_contacts_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.essential_contacts_v1.services.essential_contacts_service.transports.EssentialContactsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.essential_contacts_v1.services.essential_contacts_service.transports.EssentialContactsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EssentialContactsServiceTransport( @@ -6927,9 +6949,12 @@ def test_essential_contacts_service_base_transport_with_credentials_file(): def test_essential_contacts_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.essential_contacts_v1.services.essential_contacts_service.transports.EssentialContactsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.essential_contacts_v1.services.essential_contacts_service.transports.EssentialContactsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EssentialContactsServiceTransport() @@ -7003,11 +7028,12 @@ def test_essential_contacts_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-eventarc-publishing/docs/conf.py b/packages/google-cloud-eventarc-publishing/docs/conf.py index fb3a6292bffd..f5b780f6a552 100644 --- a/packages/google-cloud-eventarc-publishing/docs/conf.py +++ b/packages/google-cloud-eventarc-publishing/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-eventarc-publishing documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/__init__.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/__init__.py index 26a983d53376..8098232f8629 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/__init__.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.publisher import PublisherAsyncClient, PublisherClient from .types.cloud_event import CloudEvent from .types.publisher import ( diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/async_client.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/async_client.py index fbe0e21eaf46..380d55c4a9d9 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/async_client.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.eventarc_publishing_v1 import gapic_version as package_version @@ -139,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PublisherAsyncClient: The constructed client. """ - return PublisherClient.from_service_account_info.__func__(PublisherAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PublisherClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PublisherAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +156,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PublisherAsyncClient: The constructed client. """ - return PublisherClient.from_service_account_file.__func__(PublisherAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PublisherClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PublisherAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/client.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/client.py index ee593afd9ff1..6a577577f19d 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/client.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.eventarc_publishing_v1 import gapic_version as package_version @@ -630,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PublisherClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PublisherClient._read_environment_variables() + ) self._client_cert_source = PublisherClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -669,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PublisherTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/base.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/base.py index cfa70fc18abf..3197b0dd9238 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/base.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.eventarc_publishing_v1 import gapic_version as package_version from google.cloud.eventarc_publishing_v1.types import publisher diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc.py index 87a4667d7277..4661831a78ff 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.eventarc_publishing_v1.types import publisher @@ -379,12 +379,12 @@ def publish_channel_connection_events( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "publish_channel_connection_events" not in self._stubs: - self._stubs[ - "publish_channel_connection_events" - ] = self._logged_channel.unary_unary( - "/google.cloud.eventarc.publishing.v1.Publisher/PublishChannelConnectionEvents", - request_serializer=publisher.PublishChannelConnectionEventsRequest.serialize, - response_deserializer=publisher.PublishChannelConnectionEventsResponse.deserialize, + self._stubs["publish_channel_connection_events"] = ( + self._logged_channel.unary_unary( + "/google.cloud.eventarc.publishing.v1.Publisher/PublishChannelConnectionEvents", + request_serializer=publisher.PublishChannelConnectionEventsRequest.serialize, + response_deserializer=publisher.PublishChannelConnectionEventsResponse.deserialize, + ) ) return self._stubs["publish_channel_connection_events"] diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc_asyncio.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc_asyncio.py index 031427fc1011..73d026b28be4 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc_asyncio.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.eventarc_publishing_v1.types import publisher @@ -387,12 +387,12 @@ def publish_channel_connection_events( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "publish_channel_connection_events" not in self._stubs: - self._stubs[ - "publish_channel_connection_events" - ] = self._logged_channel.unary_unary( - "/google.cloud.eventarc.publishing.v1.Publisher/PublishChannelConnectionEvents", - request_serializer=publisher.PublishChannelConnectionEventsRequest.serialize, - response_deserializer=publisher.PublishChannelConnectionEventsResponse.deserialize, + self._stubs["publish_channel_connection_events"] = ( + self._logged_channel.unary_unary( + "/google.cloud.eventarc.publishing.v1.Publisher/PublishChannelConnectionEvents", + request_serializer=publisher.PublishChannelConnectionEventsRequest.serialize, + response_deserializer=publisher.PublishChannelConnectionEventsResponse.deserialize, + ) ) return self._stubs["publish_channel_connection_events"] diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/rest.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/rest.py index 104a2d5befcb..54b67ab78671 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/rest.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/services/publisher/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -583,9 +583,7 @@ def __call__( """ - http_options = ( - _BasePublisherRestTransport._BasePublishChannelConnectionEvents._get_http_options() - ) + http_options = _BasePublisherRestTransport._BasePublishChannelConnectionEvents._get_http_options() request, metadata = self._interceptor.pre_publish_channel_connection_events( request, metadata @@ -656,11 +654,10 @@ def __call__( resp = self._interceptor.post_publish_channel_connection_events(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_publish_channel_connection_events_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_publish_channel_connection_events_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -865,7 +862,9 @@ def publish_channel_connection_events( ]: # 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._PublishChannelConnectionEvents(self._session, self._host, self._interceptor) # type: ignore + return self._PublishChannelConnectionEvents( + self._session, self._host, self._interceptor + ) # type: ignore @property def publish_events( diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/__init__.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/__init__.py index a610e5d26bc8..2a9d51149b13 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/__init__.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .cloud_event import CloudEvent +from .cloud_event import ( + CloudEvent, +) from .publisher import ( PublishChannelConnectionEventsRequest, PublishChannelConnectionEventsResponse, diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/cloud_event.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/cloud_event.py index ce7b1df133ef..41d38ed2fc9b 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/cloud_event.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/cloud_event.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/publisher.py b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/publisher.py index cb471c98a881..c3bfb2462acd 100644 --- a/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/publisher.py +++ b/packages/google-cloud-eventarc-publishing/google/cloud/eventarc_publishing_v1/types/publisher.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore import proto # type: ignore from google.cloud.eventarc_publishing_v1.types import cloud_event diff --git a/packages/google-cloud-eventarc-publishing/noxfile.py b/packages/google-cloud-eventarc-publishing/noxfile.py index 19070e539837..46b8f9c5c604 100644 --- a/packages/google-cloud-eventarc-publishing/noxfile.py +++ b/packages/google-cloud-eventarc-publishing/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-eventarc-publishing/tests/unit/gapic/eventarc_publishing_v1/test_publisher.py b/packages/google-cloud-eventarc-publishing/tests/unit/gapic/eventarc_publishing_v1/test_publisher.py index c93a1a7107d7..a7366609f763 100644 --- a/packages/google-cloud-eventarc-publishing/tests/unit/gapic/eventarc_publishing_v1/test_publisher.py +++ b/packages/google-cloud-eventarc-publishing/tests/unit/gapic/eventarc_publishing_v1/test_publisher.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.eventarc_publishing_v1.services.publisher import ( PublisherAsyncClient, @@ -915,10 +920,9 @@ def test_publisher_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -963,10 +967,9 @@ def test_publisher_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1002,10 +1005,9 @@ def test_publisher_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1234,13 +1236,13 @@ def test_publisher_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2461,8 +2463,9 @@ def test_publish_channel_connection_events_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2522,18 +2525,21 @@ def test_publish_channel_connection_events_rest_interceptors(null_interceptor): ) client = PublisherClient(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.PublisherRestInterceptor, "post_publish_channel_connection_events" - ) as post, mock.patch.object( - transports.PublisherRestInterceptor, - "post_publish_channel_connection_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PublisherRestInterceptor, "pre_publish_channel_connection_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublisherRestInterceptor, + "post_publish_channel_connection_events", + ) as post, + mock.patch.object( + transports.PublisherRestInterceptor, + "post_publish_channel_connection_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PublisherRestInterceptor, "pre_publish_channel_connection_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2589,8 +2595,9 @@ def test_publish_events_rest_bad_request(request_type=publisher.PublishEventsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2648,17 +2655,19 @@ def test_publish_events_rest_interceptors(null_interceptor): ) client = PublisherClient(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.PublisherRestInterceptor, "post_publish_events" - ) as post, mock.patch.object( - transports.PublisherRestInterceptor, "post_publish_events_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublisherRestInterceptor, "pre_publish_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PublisherRestInterceptor, "post_publish_events" + ) as post, + mock.patch.object( + transports.PublisherRestInterceptor, "post_publish_events_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PublisherRestInterceptor, "pre_publish_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2711,8 +2720,9 @@ def test_publish_rest_bad_request(request_type=publisher.PublishRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2772,17 +2782,15 @@ def test_publish_rest_interceptors(null_interceptor): ) client = PublisherClient(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.PublisherRestInterceptor, "post_publish" - ) as post, mock.patch.object( - transports.PublisherRestInterceptor, "post_publish_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PublisherRestInterceptor, "pre_publish" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.PublisherRestInterceptor, "post_publish") as post, + mock.patch.object( + transports.PublisherRestInterceptor, "post_publish_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PublisherRestInterceptor, "pre_publish") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2946,11 +2954,14 @@ def test_publisher_base_transport(): def test_publisher_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.eventarc_publishing_v1.services.publisher.transports.PublisherTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.eventarc_publishing_v1.services.publisher.transports.PublisherTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PublisherTransport( @@ -2967,9 +2978,12 @@ def test_publisher_base_transport_with_credentials_file(): def test_publisher_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.eventarc_publishing_v1.services.publisher.transports.PublisherTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.eventarc_publishing_v1.services.publisher.transports.PublisherTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PublisherTransport() @@ -3041,11 +3055,12 @@ def test_publisher_transport_auth_gdch_credentials(transport_class): def test_publisher_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-eventarc/docs/conf.py b/packages/google-cloud-eventarc/docs/conf.py index 52d6c69202de..1d1df26159c0 100644 --- a/packages/google-cloud-eventarc/docs/conf.py +++ b/packages/google-cloud-eventarc/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-eventarc documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/__init__.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/__init__.py index e692e54a8f2d..e2fb52e5f7c5 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/__init__.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.eventarc import EventarcAsyncClient, EventarcClient from .types.channel import Channel from .types.channel_connection import ChannelConnection diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py index bb0cb6bc0829..301f92c5c96d 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.eventarc_v1 import gapic_version as package_version @@ -44,36 +44,40 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.eventarc_v1.services.eventarc import pagers +from google.cloud.eventarc_v1.types import ( + channel, + channel_connection, + discovery, + enrollment, + eventarc, + google_api_source, + google_channel_config, + logging_config, + message_bus, + pipeline, + trigger, +) +from google.cloud.eventarc_v1.types import channel as gce_channel from google.cloud.eventarc_v1.types import channel_connection as gce_channel_connection +from google.cloud.eventarc_v1.types import enrollment as gce_enrollment from google.cloud.eventarc_v1.types import google_api_source as gce_google_api_source from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import channel -from google.cloud.eventarc_v1.types import channel as gce_channel -from google.cloud.eventarc_v1.types import channel_connection -from google.cloud.eventarc_v1.types import discovery -from google.cloud.eventarc_v1.types import enrollment -from google.cloud.eventarc_v1.types import enrollment as gce_enrollment -from google.cloud.eventarc_v1.types import eventarc -from google.cloud.eventarc_v1.types import google_api_source -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import logging_config -from google.cloud.eventarc_v1.types import message_bus from google.cloud.eventarc_v1.types import message_bus as gce_message_bus -from google.cloud.eventarc_v1.types import pipeline from google.cloud.eventarc_v1.types import pipeline as gce_pipeline -from google.cloud.eventarc_v1.types import trigger from google.cloud.eventarc_v1.types import trigger as gce_trigger from .client import EventarcClient @@ -175,7 +179,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EventarcAsyncClient: The constructed client. """ - return EventarcClient.from_service_account_info.__func__(EventarcAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EventarcClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EventarcAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -191,7 +196,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EventarcAsyncClient: The constructed client. """ - return EventarcClient.from_service_account_file.__func__(EventarcAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EventarcClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EventarcAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/client.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/client.py index dfff579a56d6..dab76effeb7b 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/client.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.eventarc_v1 import gapic_version as package_version @@ -61,36 +61,40 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.eventarc_v1.services.eventarc import pagers +from google.cloud.eventarc_v1.types import ( + channel, + channel_connection, + discovery, + enrollment, + eventarc, + google_api_source, + google_channel_config, + logging_config, + message_bus, + pipeline, + trigger, +) +from google.cloud.eventarc_v1.types import channel as gce_channel from google.cloud.eventarc_v1.types import channel_connection as gce_channel_connection +from google.cloud.eventarc_v1.types import enrollment as gce_enrollment from google.cloud.eventarc_v1.types import google_api_source as gce_google_api_source from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import channel -from google.cloud.eventarc_v1.types import channel as gce_channel -from google.cloud.eventarc_v1.types import channel_connection -from google.cloud.eventarc_v1.types import discovery -from google.cloud.eventarc_v1.types import enrollment -from google.cloud.eventarc_v1.types import enrollment as gce_enrollment -from google.cloud.eventarc_v1.types import eventarc -from google.cloud.eventarc_v1.types import google_api_source -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import logging_config -from google.cloud.eventarc_v1.types import message_bus from google.cloud.eventarc_v1.types import message_bus as gce_message_bus -from google.cloud.eventarc_v1.types import pipeline from google.cloud.eventarc_v1.types import pipeline as gce_pipeline -from google.cloud.eventarc_v1.types import trigger from google.cloud.eventarc_v1.types import trigger as gce_trigger from .transports.base import DEFAULT_CLIENT_INFO, EventarcTransport @@ -966,11 +970,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EventarcClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EventarcClient._read_environment_variables() + ) self._client_cert_source = EventarcClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1005,8 +1007,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EventarcTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/pagers.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/pagers.py index 81996d3eb220..c5d9cb669ecb 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/pagers.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/pagers.py @@ -77,7 +77,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -153,7 +153,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +233,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -309,7 +309,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -389,7 +389,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -465,7 +465,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -545,7 +545,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -621,7 +621,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -701,7 +701,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -777,7 +777,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -857,7 +857,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -933,7 +933,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1013,7 +1013,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1089,7 +1089,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1169,7 +1169,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1245,7 +1245,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1325,7 +1325,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1401,7 +1401,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/base.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/base.py index ec0c776fd9f0..7a028f49eb37 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/base.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.eventarc_v1 import gapic_version as package_version from google.cloud.eventarc_v1.types import ( @@ -37,12 +39,14 @@ enrollment, eventarc, google_api_source, + google_channel_config, + message_bus, + pipeline, + trigger, ) from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import message_bus, pipeline, trigger DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -992,13 +996,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py index 19f57ded9bd9..5149925abe3c 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.eventarc_v1.types import ( channel, @@ -39,12 +41,14 @@ enrollment, eventarc, google_api_source, + google_channel_config, + message_bus, + pipeline, + trigger, ) from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import message_bus, pipeline, trigger from .base import DEFAULT_CLIENT_INFO, EventarcTransport @@ -829,12 +833,12 @@ def update_google_channel_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_google_channel_config" not in self._stubs: - self._stubs[ - "update_google_channel_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.eventarc.v1.Eventarc/UpdateGoogleChannelConfig", - request_serializer=eventarc.UpdateGoogleChannelConfigRequest.serialize, - response_deserializer=gce_google_channel_config.GoogleChannelConfig.deserialize, + self._stubs["update_google_channel_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.eventarc.v1.Eventarc/UpdateGoogleChannelConfig", + request_serializer=eventarc.UpdateGoogleChannelConfigRequest.serialize, + response_deserializer=gce_google_channel_config.GoogleChannelConfig.deserialize, + ) ) return self._stubs["update_google_channel_config"] @@ -914,12 +918,12 @@ def list_message_bus_enrollments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_message_bus_enrollments" not in self._stubs: - self._stubs[ - "list_message_bus_enrollments" - ] = self._logged_channel.unary_unary( - "/google.cloud.eventarc.v1.Eventarc/ListMessageBusEnrollments", - request_serializer=eventarc.ListMessageBusEnrollmentsRequest.serialize, - response_deserializer=eventarc.ListMessageBusEnrollmentsResponse.deserialize, + self._stubs["list_message_bus_enrollments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.eventarc.v1.Eventarc/ListMessageBusEnrollments", + request_serializer=eventarc.ListMessageBusEnrollmentsRequest.serialize, + response_deserializer=eventarc.ListMessageBusEnrollmentsResponse.deserialize, + ) ) return self._stubs["list_message_bus_enrollments"] diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py index cacec0272f88..5b16f3fe0003 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.eventarc_v1.types import ( channel, @@ -42,12 +44,14 @@ enrollment, eventarc, google_api_source, + google_channel_config, + message_bus, + pipeline, + trigger, ) from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import message_bus, pipeline, trigger from .base import DEFAULT_CLIENT_INFO, EventarcTransport from .grpc import EventarcGrpcTransport @@ -852,12 +856,12 @@ def update_google_channel_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_google_channel_config" not in self._stubs: - self._stubs[ - "update_google_channel_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.eventarc.v1.Eventarc/UpdateGoogleChannelConfig", - request_serializer=eventarc.UpdateGoogleChannelConfigRequest.serialize, - response_deserializer=gce_google_channel_config.GoogleChannelConfig.deserialize, + self._stubs["update_google_channel_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.eventarc.v1.Eventarc/UpdateGoogleChannelConfig", + request_serializer=eventarc.UpdateGoogleChannelConfigRequest.serialize, + response_deserializer=gce_google_channel_config.GoogleChannelConfig.deserialize, + ) ) return self._stubs["update_google_channel_config"] @@ -937,12 +941,12 @@ def list_message_bus_enrollments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_message_bus_enrollments" not in self._stubs: - self._stubs[ - "list_message_bus_enrollments" - ] = self._logged_channel.unary_unary( - "/google.cloud.eventarc.v1.Eventarc/ListMessageBusEnrollments", - request_serializer=eventarc.ListMessageBusEnrollmentsRequest.serialize, - response_deserializer=eventarc.ListMessageBusEnrollmentsResponse.deserialize, + self._stubs["list_message_bus_enrollments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.eventarc.v1.Eventarc/ListMessageBusEnrollments", + request_serializer=eventarc.ListMessageBusEnrollmentsRequest.serialize, + response_deserializer=eventarc.ListMessageBusEnrollmentsResponse.deserialize, + ) ) return self._stubs["list_message_bus_enrollments"] diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest.py index 4ee421da60b4..2355a61e77a6 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -39,12 +41,14 @@ enrollment, eventarc, google_api_source, + google_channel_config, + message_bus, + pipeline, + trigger, ) from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import message_bus, pipeline, trigger from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEventarcRestTransport @@ -2706,7 +2710,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2832,9 +2836,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseCreateChannelConnection._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseCreateChannelConnection._get_http_options() request, metadata = self._interceptor.pre_create_channel_connection( request, metadata @@ -2860,7 +2862,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3018,7 +3020,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3144,9 +3146,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseCreateGoogleApiSource._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseCreateGoogleApiSource._get_http_options() request, metadata = self._interceptor.pre_create_google_api_source( request, metadata @@ -3172,7 +3172,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3330,7 +3330,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3488,7 +3488,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3644,7 +3644,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3795,7 +3795,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3919,9 +3919,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseDeleteChannelConnection._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseDeleteChannelConnection._get_http_options() request, metadata = self._interceptor.pre_delete_channel_connection( request, metadata @@ -3943,7 +3941,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4093,7 +4091,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4217,9 +4215,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseDeleteGoogleApiSource._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseDeleteGoogleApiSource._get_http_options() request, metadata = self._interceptor.pre_delete_google_api_source( request, metadata @@ -4241,7 +4237,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4391,7 +4387,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4541,7 +4537,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4691,7 +4687,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5438,9 +5434,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseGetGoogleChannelConfig._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseGetGoogleChannelConfig._get_http_options() request, metadata = self._interceptor.pre_get_google_channel_config( request, metadata @@ -6193,9 +6187,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseListChannelConnections._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseListChannelConnections._get_http_options() request, metadata = self._interceptor.pre_list_channel_connections( request, metadata @@ -6796,9 +6788,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseListMessageBusEnrollments._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseListMessageBusEnrollments._get_http_options() request, metadata = self._interceptor.pre_list_message_bus_enrollments( request, metadata @@ -7579,7 +7569,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7737,7 +7727,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7863,9 +7853,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseUpdateGoogleApiSource._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseUpdateGoogleApiSource._get_http_options() request, metadata = self._interceptor.pre_update_google_api_source( request, metadata @@ -7891,7 +7879,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8023,9 +8011,7 @@ def __call__( """ - http_options = ( - _BaseEventarcRestTransport._BaseUpdateGoogleChannelConfig._get_http_options() - ) + http_options = _BaseEventarcRestTransport._BaseUpdateGoogleChannelConfig._get_http_options() request, metadata = self._interceptor.pre_update_google_channel_config( request, metadata @@ -8213,7 +8199,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8371,7 +8357,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8527,7 +8513,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8608,7 +8594,9 @@ def create_channel_connection( ) -> Callable[[eventarc.CreateChannelConnectionRequest], 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._CreateChannelConnection(self._session, self._host, self._interceptor) # type: ignore + return self._CreateChannelConnection( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_enrollment( @@ -8664,7 +8652,9 @@ def delete_channel_connection( ) -> Callable[[eventarc.DeleteChannelConnectionRequest], 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._DeleteChannelConnection(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteChannelConnection( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_enrollment( @@ -8749,7 +8739,9 @@ def get_google_channel_config( ]: # 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._GetGoogleChannelConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetGoogleChannelConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_message_bus( @@ -8790,7 +8782,9 @@ def list_channel_connections( ]: # 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._ListChannelConnections(self._session, self._host, self._interceptor) # type: ignore + return self._ListChannelConnections( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_channels( @@ -8827,7 +8821,9 @@ def list_message_bus_enrollments( ]: # 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._ListMessageBusEnrollments(self._session, self._host, self._interceptor) # type: ignore + return self._ListMessageBusEnrollments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_message_buses( @@ -8896,7 +8892,9 @@ def update_google_channel_config( ]: # 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._UpdateGoogleChannelConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateGoogleChannelConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_message_bus( diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest_base.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest_base.py index 63829611cb7b..ec4305579cf7 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest_base.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format @@ -31,12 +33,14 @@ enrollment, eventarc, google_api_source, + google_channel_config, + message_bus, + pipeline, + trigger, ) from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import message_bus, pipeline, trigger from .base import DEFAULT_CLIENT_INFO, EventarcTransport diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/__init__.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/__init__.py index 509eea237a19..b358427e7429 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/__init__.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/__init__.py @@ -13,10 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .channel import Channel -from .channel_connection import ChannelConnection -from .discovery import EventType, FilteringAttribute, Provider -from .enrollment import Enrollment +from .channel import ( + Channel, +) +from .channel_connection import ( + ChannelConnection, +) +from .discovery import ( + EventType, + FilteringAttribute, + Provider, +) +from .enrollment import ( + Enrollment, +) from .eventarc import ( CreateChannelConnectionRequest, CreateChannelRequest, @@ -68,12 +78,24 @@ UpdatePipelineRequest, UpdateTriggerRequest, ) -from .google_api_source import GoogleApiSource -from .google_channel_config import GoogleChannelConfig -from .logging_config import LoggingConfig -from .message_bus import MessageBus -from .network_config import NetworkConfig -from .pipeline import Pipeline +from .google_api_source import ( + GoogleApiSource, +) +from .google_channel_config import ( + GoogleChannelConfig, +) +from .logging_config import ( + LoggingConfig, +) +from .message_bus import ( + MessageBus, +) +from .network_config import ( + NetworkConfig, +) +from .pipeline import ( + Pipeline, +) from .trigger import ( GKE, CloudRun, diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/channel.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/channel.py index b4eed51d35d8..54113d1b4b45 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/channel.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/channel.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -115,6 +115,7 @@ class State(proto.Enum): the subscriber should create a new Channel and give it to the provider. """ + STATE_UNSPECIFIED = 0 PENDING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/channel_connection.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/channel_connection.py index 04d1f23a7dfe..815f80ac79d1 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/channel_connection.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/channel_connection.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/enrollment.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/enrollment.py index ae0757a71872..bd5e6fe3361c 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/enrollment.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/enrollment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/eventarc.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/eventarc.py index 9a11d0c921a9..4c3a05a0a911 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/eventarc.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/eventarc.py @@ -17,18 +17,18 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.eventarc_v1.types import channel as gce_channel from google.cloud.eventarc_v1.types import channel_connection as gce_channel_connection +from google.cloud.eventarc_v1.types import discovery +from google.cloud.eventarc_v1.types import enrollment as gce_enrollment from google.cloud.eventarc_v1.types import google_api_source as gce_google_api_source from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import channel as gce_channel -from google.cloud.eventarc_v1.types import discovery -from google.cloud.eventarc_v1.types import enrollment as gce_enrollment from google.cloud.eventarc_v1.types import message_bus as gce_message_bus from google.cloud.eventarc_v1.types import pipeline as gce_pipeline from google.cloud.eventarc_v1.types import trigger as gce_trigger @@ -656,12 +656,12 @@ class ListChannelConnectionsResponse(proto.Message): def raw_page(self): return self - channel_connections: MutableSequence[ - gce_channel_connection.ChannelConnection - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gce_channel_connection.ChannelConnection, + channel_connections: MutableSequence[gce_channel_connection.ChannelConnection] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gce_channel_connection.ChannelConnection, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1554,12 +1554,12 @@ class ListGoogleApiSourcesResponse(proto.Message): def raw_page(self): return self - google_api_sources: MutableSequence[ - gce_google_api_source.GoogleApiSource - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gce_google_api_source.GoogleApiSource, + google_api_sources: MutableSequence[gce_google_api_source.GoogleApiSource] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gce_google_api_source.GoogleApiSource, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/google_api_source.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/google_api_source.py index 7a618cdeacca..aa28961cc561 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/google_api_source.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/google_api_source.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.eventarc_v1.types import logging_config as gce_logging_config diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/google_channel_config.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/google_channel_config.py index 3569fcde3c17..2504bb358e71 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/google_channel_config.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/google_channel_config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/logging_config.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/logging_config.py index 7b57ee465f91..176307323d97 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/logging_config.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/logging_config.py @@ -74,6 +74,7 @@ class LogSeverity(proto.Enum): EMERGENCY (9): One or more systems are unusable. """ + LOG_SEVERITY_UNSPECIFIED = 0 NONE = 1 DEBUG = 2 diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/message_bus.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/message_bus.py index f8285f6b9569..30fb4ca46ec5 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/message_bus.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/message_bus.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.eventarc_v1.types import logging_config as gce_logging_config diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/pipeline.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/pipeline.py index 59adf87a83e2..0fe21180ab9d 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/pipeline.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/pipeline.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.eventarc_v1.types import logging_config as gce_logging_config diff --git a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/trigger.py b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/trigger.py index 8e213354fe91..7a114befcc9e 100644 --- a/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/trigger.py +++ b/packages/google-cloud-eventarc/google/cloud/eventarc_v1/types/trigger.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import code_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore import proto # type: ignore from google.cloud.eventarc_v1.types import network_config as gce_network_config diff --git a/packages/google-cloud-eventarc/noxfile.py b/packages/google-cloud-eventarc/noxfile.py index 776be6e7a999..02ff7440fbf5 100644 --- a/packages/google-cloud-eventarc/noxfile.py +++ b/packages/google-cloud-eventarc/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py b/packages/google-cloud-eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py index 5514e5bd8502..66d1904ebcec 100644 --- a/packages/google-cloud-eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py +++ b/packages/google-cloud-eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import code_pb2 # type: ignore from google.cloud.eventarc_v1.services.eventarc import ( EventarcAsyncClient, @@ -76,27 +78,29 @@ pagers, transports, ) +from google.cloud.eventarc_v1.types import ( + channel, + channel_connection, + discovery, + enrollment, + eventarc, + google_api_source, + google_channel_config, + logging_config, + message_bus, + network_config, + pipeline, + trigger, +) +from google.cloud.eventarc_v1.types import channel as gce_channel from google.cloud.eventarc_v1.types import channel_connection as gce_channel_connection +from google.cloud.eventarc_v1.types import enrollment as gce_enrollment from google.cloud.eventarc_v1.types import google_api_source as gce_google_api_source from google.cloud.eventarc_v1.types import ( google_channel_config as gce_google_channel_config, ) -from google.cloud.eventarc_v1.types import channel -from google.cloud.eventarc_v1.types import channel as gce_channel -from google.cloud.eventarc_v1.types import channel_connection -from google.cloud.eventarc_v1.types import discovery -from google.cloud.eventarc_v1.types import enrollment -from google.cloud.eventarc_v1.types import enrollment as gce_enrollment -from google.cloud.eventarc_v1.types import eventarc -from google.cloud.eventarc_v1.types import google_api_source -from google.cloud.eventarc_v1.types import google_channel_config -from google.cloud.eventarc_v1.types import logging_config -from google.cloud.eventarc_v1.types import message_bus from google.cloud.eventarc_v1.types import message_bus as gce_message_bus -from google.cloud.eventarc_v1.types import network_config -from google.cloud.eventarc_v1.types import pipeline from google.cloud.eventarc_v1.types import pipeline as gce_pipeline -from google.cloud.eventarc_v1.types import trigger from google.cloud.eventarc_v1.types import trigger as gce_trigger CRED_INFO_JSON = { @@ -946,10 +950,9 @@ def test_eventarc_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +997,9 @@ def test_eventarc_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1035,9 @@ def test_eventarc_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1261,13 +1262,13 @@ def test_eventarc_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6016,9 +6017,9 @@ def test_get_channel_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_channel_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_channel_connection] = ( + mock_rpc + ) request = {} client.get_channel_connection(request) @@ -8695,9 +8696,9 @@ def test_list_message_buses_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_message_buses - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_message_buses] = ( + mock_rpc + ) request = {} client.list_message_buses(request) @@ -9796,9 +9797,9 @@ def test_create_message_bus_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_message_bus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_message_bus] = ( + mock_rpc + ) request = {} client.create_message_bus(request) @@ -10157,9 +10158,9 @@ def test_update_message_bus_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_message_bus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_message_bus] = ( + mock_rpc + ) request = {} client.update_message_bus(request) @@ -10514,9 +10515,9 @@ def test_delete_message_bus_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_message_bus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_message_bus] = ( + mock_rpc + ) request = {} client.delete_message_bus(request) @@ -11221,9 +11222,9 @@ def test_list_enrollments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_enrollments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_enrollments] = ( + mock_rpc + ) request = {} client.list_enrollments(request) @@ -11745,9 +11746,9 @@ def test_create_enrollment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_enrollment] = ( + mock_rpc + ) request = {} client.create_enrollment(request) @@ -12104,9 +12105,9 @@ def test_update_enrollment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_enrollment] = ( + mock_rpc + ) request = {} client.update_enrollment(request) @@ -12459,9 +12460,9 @@ def test_delete_enrollment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_enrollment] = ( + mock_rpc + ) request = {} client.delete_enrollment(request) @@ -14715,9 +14716,9 @@ def test_get_google_api_source_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_google_api_source - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_google_api_source] = ( + mock_rpc + ) request = {} client.get_google_api_source(request) @@ -18928,9 +18929,9 @@ def test_get_channel_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_channel_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_channel_connection] = ( + mock_rpc + ) request = {} client.get_channel_connection(request) @@ -20333,9 +20334,9 @@ def test_list_message_buses_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_message_buses - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_message_buses] = ( + mock_rpc + ) request = {} client.list_message_buses(request) @@ -20860,9 +20861,9 @@ def test_create_message_bus_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_message_bus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_message_bus] = ( + mock_rpc + ) request = {} client.create_message_bus(request) @@ -21080,9 +21081,9 @@ def test_update_message_bus_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_message_bus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_message_bus] = ( + mock_rpc + ) request = {} client.update_message_bus(request) @@ -21280,9 +21281,9 @@ def test_delete_message_bus_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_message_bus - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_message_bus] = ( + mock_rpc + ) request = {} client.delete_message_bus(request) @@ -21660,9 +21661,9 @@ def test_list_enrollments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_enrollments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_enrollments] = ( + mock_rpc + ) request = {} client.list_enrollments(request) @@ -21920,9 +21921,9 @@ def test_create_enrollment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_enrollment] = ( + mock_rpc + ) request = {} client.create_enrollment(request) @@ -22138,9 +22139,9 @@ def test_update_enrollment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_enrollment] = ( + mock_rpc + ) request = {} client.update_enrollment(request) @@ -22336,9 +22337,9 @@ def test_delete_enrollment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_enrollment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_enrollment] = ( + mock_rpc + ) request = {} client.delete_enrollment(request) @@ -23579,9 +23580,9 @@ def test_get_google_api_source_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_google_api_source - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_google_api_source] = ( + mock_rpc + ) request = {} client.get_google_api_source(request) @@ -26724,8 +26725,9 @@ def test_get_trigger_rest_bad_request(request_type=eventarc.GetTriggerRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26798,17 +26800,17 @@ def test_get_trigger_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_get_trigger" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_get_trigger_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_get_trigger" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_trigger" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_trigger_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.EventarcRestInterceptor, "pre_get_trigger") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26857,8 +26859,9 @@ def test_list_triggers_rest_bad_request(request_type=eventarc.ListTriggersReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26921,17 +26924,19 @@ def test_list_triggers_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_list_triggers" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_list_triggers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_list_triggers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_triggers" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_triggers_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_list_triggers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26982,8 +26987,9 @@ def test_create_trigger_rest_bad_request(request_type=eventarc.CreateTriggerRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27147,19 +27153,20 @@ def test_create_trigger_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_create_trigger" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_create_trigger_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_create_trigger" - ) as pre: + 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.EventarcRestInterceptor, "post_create_trigger" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_create_trigger_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_create_trigger" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27210,8 +27217,9 @@ def test_update_trigger_rest_bad_request(request_type=eventarc.UpdateTriggerRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27377,19 +27385,20 @@ def test_update_trigger_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_update_trigger" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_update_trigger_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_update_trigger" - ) as pre: + 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.EventarcRestInterceptor, "post_update_trigger" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_update_trigger_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_update_trigger" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27438,8 +27447,9 @@ def test_delete_trigger_rest_bad_request(request_type=eventarc.DeleteTriggerRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27494,19 +27504,20 @@ def test_delete_trigger_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_delete_trigger" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_delete_trigger_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_delete_trigger" - ) as pre: + 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.EventarcRestInterceptor, "post_delete_trigger" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_delete_trigger_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_delete_trigger" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27555,8 +27566,9 @@ def test_get_channel_rest_bad_request(request_type=eventarc.GetChannelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27630,17 +27642,17 @@ def test_get_channel_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_get_channel" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_get_channel_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_get_channel" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_channel" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_channel_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.EventarcRestInterceptor, "pre_get_channel") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27689,8 +27701,9 @@ def test_list_channels_rest_bad_request(request_type=eventarc.ListChannelsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27753,17 +27766,19 @@ def test_list_channels_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_list_channels" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_list_channels_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_list_channels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_channels" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_channels_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_list_channels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27814,8 +27829,9 @@ def test_create_channel_rest_bad_request(request_type=eventarc.CreateChannelRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27950,19 +27966,20 @@ def test_create_channel_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_create_channel" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_create_channel_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_create_channel" - ) as pre: + 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.EventarcRestInterceptor, "post_create_channel" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_create_channel_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_create_channel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28013,8 +28030,9 @@ def test_update_channel_rest_bad_request(request_type=eventarc.UpdateChannelRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28151,19 +28169,20 @@ def test_update_channel_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_update_channel" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_update_channel_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_update_channel" - ) as pre: + 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.EventarcRestInterceptor, "post_update_channel" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_update_channel_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_update_channel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28212,8 +28231,9 @@ def test_delete_channel_rest_bad_request(request_type=eventarc.DeleteChannelRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28268,19 +28288,20 @@ def test_delete_channel_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_delete_channel" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_delete_channel_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_delete_channel" - ) as pre: + 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.EventarcRestInterceptor, "post_delete_channel" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_delete_channel_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_delete_channel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28329,8 +28350,9 @@ def test_get_provider_rest_bad_request(request_type=eventarc.GetProviderRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28393,17 +28415,19 @@ def test_get_provider_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_get_provider" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_get_provider_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_get_provider" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_provider" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_provider_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_get_provider" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28452,8 +28476,9 @@ def test_list_providers_rest_bad_request(request_type=eventarc.ListProvidersRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28516,17 +28541,19 @@ def test_list_providers_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_list_providers" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_list_providers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_list_providers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_providers" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_providers_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_list_providers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28581,8 +28608,9 @@ def test_get_channel_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28651,17 +28679,20 @@ def test_get_channel_connection_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_get_channel_connection" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_get_channel_connection_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_get_channel_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_channel_connection" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, + "post_get_channel_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_get_channel_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28719,8 +28750,9 @@ def test_list_channel_connections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28783,18 +28815,20 @@ def test_list_channel_connections_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_list_channel_connections" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, - "post_list_channel_connections_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_list_channel_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_channel_connections" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, + "post_list_channel_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_list_channel_connections" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28852,8 +28886,9 @@ def test_create_channel_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28986,20 +29021,21 @@ def test_create_channel_connection_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_create_channel_connection" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, - "post_create_channel_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_create_channel_connection" - ) as pre: + 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.EventarcRestInterceptor, "post_create_channel_connection" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, + "post_create_channel_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_create_channel_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29054,8 +29090,9 @@ def test_delete_channel_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29112,20 +29149,21 @@ def test_delete_channel_connection_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_delete_channel_connection" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, - "post_delete_channel_connection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_delete_channel_connection" - ) as pre: + 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.EventarcRestInterceptor, "post_delete_channel_connection" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, + "post_delete_channel_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_delete_channel_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29178,8 +29216,9 @@ def test_get_google_channel_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29242,18 +29281,20 @@ def test_get_google_channel_config_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_get_google_channel_config" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, - "post_get_google_channel_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_get_google_channel_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_google_channel_config" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, + "post_get_google_channel_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_get_google_channel_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29315,8 +29356,9 @@ def test_update_google_channel_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29460,18 +29502,20 @@ def test_update_google_channel_config_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_update_google_channel_config" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, - "post_update_google_channel_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_update_google_channel_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_update_google_channel_config" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, + "post_update_google_channel_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_update_google_channel_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29527,8 +29571,9 @@ def test_get_message_bus_rest_bad_request(request_type=eventarc.GetMessageBusReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29597,17 +29642,19 @@ def test_get_message_bus_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_get_message_bus" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_get_message_bus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_get_message_bus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_message_bus" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_message_bus_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_get_message_bus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29658,8 +29705,9 @@ def test_list_message_buses_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29722,17 +29770,19 @@ def test_list_message_buses_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_list_message_buses" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_list_message_buses_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_list_message_buses" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_message_buses" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_message_buses_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_list_message_buses" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29787,8 +29837,9 @@ def test_list_message_bus_enrollments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29853,18 +29904,20 @@ def test_list_message_bus_enrollments_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_list_message_bus_enrollments" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, - "post_list_message_bus_enrollments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_list_message_bus_enrollments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_message_bus_enrollments" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, + "post_list_message_bus_enrollments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_list_message_bus_enrollments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29922,8 +29975,9 @@ def test_create_message_bus_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30057,19 +30111,20 @@ def test_create_message_bus_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_create_message_bus" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_create_message_bus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_create_message_bus" - ) as pre: + 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.EventarcRestInterceptor, "post_create_message_bus" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_create_message_bus_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_create_message_bus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30126,8 +30181,9 @@ def test_update_message_bus_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30265,19 +30321,20 @@ def test_update_message_bus_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_update_message_bus" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_update_message_bus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_update_message_bus" - ) as pre: + 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.EventarcRestInterceptor, "post_update_message_bus" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_update_message_bus_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_update_message_bus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30330,8 +30387,9 @@ def test_delete_message_bus_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30386,19 +30444,20 @@ def test_delete_message_bus_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_delete_message_bus" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_delete_message_bus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_delete_message_bus" - ) as pre: + 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.EventarcRestInterceptor, "post_delete_message_bus" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_delete_message_bus_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_delete_message_bus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30449,8 +30508,9 @@ def test_get_enrollment_rest_bad_request(request_type=eventarc.GetEnrollmentRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30523,17 +30583,19 @@ def test_get_enrollment_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_get_enrollment" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_get_enrollment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_get_enrollment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_enrollment" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_enrollment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_get_enrollment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30584,8 +30646,9 @@ def test_list_enrollments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30648,17 +30711,19 @@ def test_list_enrollments_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_list_enrollments" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_list_enrollments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_list_enrollments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_enrollments" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_enrollments_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_list_enrollments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30713,8 +30778,9 @@ def test_create_enrollment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30849,19 +30915,20 @@ def test_create_enrollment_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_create_enrollment" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_create_enrollment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_create_enrollment" - ) as pre: + 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.EventarcRestInterceptor, "post_create_enrollment" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_create_enrollment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_create_enrollment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30916,8 +30983,9 @@ def test_update_enrollment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31054,19 +31122,20 @@ def test_update_enrollment_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_update_enrollment" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_update_enrollment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_update_enrollment" - ) as pre: + 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.EventarcRestInterceptor, "post_update_enrollment" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_update_enrollment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_update_enrollment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31119,8 +31188,9 @@ def test_delete_enrollment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31175,19 +31245,20 @@ def test_delete_enrollment_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_delete_enrollment" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_delete_enrollment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_delete_enrollment" - ) as pre: + 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.EventarcRestInterceptor, "post_delete_enrollment" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_delete_enrollment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_delete_enrollment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31238,8 +31309,9 @@ def test_get_pipeline_rest_bad_request(request_type=eventarc.GetPipelineRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31310,17 +31382,19 @@ def test_get_pipeline_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_get_pipeline" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_get_pipeline_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_get_pipeline" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_pipeline" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_pipeline_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_get_pipeline" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31369,8 +31443,9 @@ def test_list_pipelines_rest_bad_request(request_type=eventarc.ListPipelinesRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31433,17 +31508,19 @@ def test_list_pipelines_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_list_pipelines" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_list_pipelines_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_list_pipelines" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_pipelines" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_pipelines_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_list_pipelines" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31494,8 +31571,9 @@ def test_create_pipeline_rest_bad_request(request_type=eventarc.CreatePipelineRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31670,19 +31748,20 @@ def test_create_pipeline_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_create_pipeline" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_create_pipeline_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_create_pipeline" - ) as pre: + 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.EventarcRestInterceptor, "post_create_pipeline" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_create_pipeline_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_create_pipeline" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31733,8 +31812,9 @@ def test_update_pipeline_rest_bad_request(request_type=eventarc.UpdatePipelineRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31911,19 +31991,20 @@ def test_update_pipeline_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_update_pipeline" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_update_pipeline_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_update_pipeline" - ) as pre: + 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.EventarcRestInterceptor, "post_update_pipeline" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_update_pipeline_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_update_pipeline" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31972,8 +32053,9 @@ def test_delete_pipeline_rest_bad_request(request_type=eventarc.DeletePipelineRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32028,19 +32110,20 @@ def test_delete_pipeline_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_delete_pipeline" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_delete_pipeline_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_delete_pipeline" - ) as pre: + 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.EventarcRestInterceptor, "post_delete_pipeline" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, "post_delete_pipeline_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_delete_pipeline" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32093,8 +32176,9 @@ def test_get_google_api_source_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32167,17 +32251,20 @@ def test_get_google_api_source_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_get_google_api_source" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_get_google_api_source_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_get_google_api_source" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_get_google_api_source" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, + "post_get_google_api_source_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_get_google_api_source" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32232,8 +32319,9 @@ def test_list_google_api_sources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32296,17 +32384,20 @@ def test_list_google_api_sources_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_list_google_api_sources" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, "post_list_google_api_sources_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_list_google_api_sources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EventarcRestInterceptor, "post_list_google_api_sources" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, + "post_list_google_api_sources_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_list_google_api_sources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32364,8 +32455,9 @@ def test_create_google_api_source_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32502,20 +32594,21 @@ def test_create_google_api_source_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_create_google_api_source" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, - "post_create_google_api_source_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_create_google_api_source" - ) as pre: + 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.EventarcRestInterceptor, "post_create_google_api_source" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, + "post_create_google_api_source_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_create_google_api_source" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32572,8 +32665,9 @@ def test_update_google_api_source_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32714,20 +32808,21 @@ def test_update_google_api_source_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_update_google_api_source" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, - "post_update_google_api_source_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_update_google_api_source" - ) as pre: + 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.EventarcRestInterceptor, "post_update_google_api_source" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, + "post_update_google_api_source_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_update_google_api_source" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32782,8 +32877,9 @@ def test_delete_google_api_source_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32840,20 +32936,21 @@ def test_delete_google_api_source_rest_interceptors(null_interceptor): ) client = EventarcClient(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.EventarcRestInterceptor, "post_delete_google_api_source" - ) as post, mock.patch.object( - transports.EventarcRestInterceptor, - "post_delete_google_api_source_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EventarcRestInterceptor, "pre_delete_google_api_source" - ) as pre: + 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.EventarcRestInterceptor, "post_delete_google_api_source" + ) as post, + mock.patch.object( + transports.EventarcRestInterceptor, + "post_delete_google_api_source_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EventarcRestInterceptor, "pre_delete_google_api_source" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32906,8 +33003,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -32966,8 +33064,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33028,8 +33127,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33090,8 +33190,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33152,8 +33253,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33214,8 +33316,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33276,8 +33379,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33338,8 +33442,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -33400,8 +33505,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -34396,11 +34502,14 @@ def test_eventarc_base_transport(): def test_eventarc_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.eventarc_v1.services.eventarc.transports.EventarcTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.eventarc_v1.services.eventarc.transports.EventarcTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EventarcTransport( @@ -34417,9 +34526,12 @@ def test_eventarc_base_transport_with_credentials_file(): def test_eventarc_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.eventarc_v1.services.eventarc.transports.EventarcTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.eventarc_v1.services.eventarc.transports.EventarcTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EventarcTransport() @@ -34491,11 +34603,12 @@ def test_eventarc_transport_auth_gdch_credentials(transport_class): def test_eventarc_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-filestore/docs/conf.py b/packages/google-cloud-filestore/docs/conf.py index 899ebe0e5594..f6bab80e3bba 100644 --- a/packages/google-cloud-filestore/docs/conf.py +++ b/packages/google-cloud-filestore/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-filestore documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/__init__.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/__init__.py index f0a5be5d0223..caa6bf474138 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/__init__.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_filestore_manager import ( CloudFilestoreManagerAsyncClient, CloudFilestoreManagerClient, diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/async_client.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/async_client.py index 581e53c39332..cb6c82b8d789 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/async_client.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.filestore_v1 import gapic_version as package_version @@ -44,15 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.common.types import operation_metadata from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.filestore_v1.services.cloud_filestore_manager import pagers from google.cloud.filestore_v1.types import cloud_filestore_service @@ -152,7 +152,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudFilestoreManagerAsyncClient: The constructed client. """ - return CloudFilestoreManagerClient.from_service_account_info.__func__(CloudFilestoreManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudFilestoreManagerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudFilestoreManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -168,7 +169,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudFilestoreManagerAsyncClient: The constructed client. """ - return CloudFilestoreManagerClient.from_service_account_file.__func__(CloudFilestoreManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudFilestoreManagerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CloudFilestoreManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -206,7 +208,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudFilestoreManagerClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudFilestoreManagerClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudFilestoreManagerTransport: diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/client.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/client.py index 3153bc692762..64ab2d4e4ff9 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/client.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.filestore_v1 import gapic_version as package_version @@ -61,15 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.common.types import operation_metadata from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.filestore_v1.services.cloud_filestore_manager import pagers from google.cloud.filestore_v1.types import cloud_filestore_service @@ -88,9 +88,7 @@ class CloudFilestoreManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudFilestoreManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudFilestoreManagerTransport]] _transport_registry["grpc"] = CloudFilestoreManagerGrpcTransport _transport_registry["grpc_asyncio"] = CloudFilestoreManagerGrpcAsyncIOTransport _transport_registry["rest"] = CloudFilestoreManagerRestTransport @@ -705,11 +703,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudFilestoreManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudFilestoreManagerClient._read_environment_variables() + ) self._client_cert_source = CloudFilestoreManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -744,8 +740,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudFilestoreManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/pagers.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/pagers.py index 9b20555d4d14..3a1412324f32 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/pagers.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -225,7 +225,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -459,7 +459,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/__init__.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/__init__.py index f15214f27465..0261bfd726bc 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/__init__.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudFilestoreManagerTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudFilestoreManagerTransport]] _transport_registry["grpc"] = CloudFilestoreManagerGrpcTransport _transport_registry["grpc_asyncio"] = CloudFilestoreManagerGrpcAsyncIOTransport _transport_registry["rest"] = CloudFilestoreManagerRestTransport diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/base.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/base.py index 8084e7348bb0..a5b716df01ca 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/base.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.filestore_v1 import gapic_version as package_version from google.cloud.filestore_v1.types import cloud_filestore_service @@ -513,13 +513,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc.py index 1b7639e4411f..f7a5bb271104 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.filestore_v1.types import cloud_filestore_service diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc_asyncio.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc_asyncio.py index 669a6b4cf1b1..8ecf149df40f 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.filestore_v1.types import cloud_filestore_service diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/rest.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/rest.py index 17cd686ec166..d46707a1524c 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/rest.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/services/cloud_filestore_manager/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1488,9 +1488,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseCreateBackup._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseCreateBackup._get_http_options() request, metadata = self._interceptor.pre_create_backup(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseCreateBackup._get_transcoded_request( @@ -1514,7 +1512,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1641,9 +1639,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseCreateInstance._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseCreateInstance._get_http_options() request, metadata = self._interceptor.pre_create_instance(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseCreateInstance._get_transcoded_request( @@ -1667,7 +1663,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1794,9 +1790,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseCreateSnapshot._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseCreateSnapshot._get_http_options() request, metadata = self._interceptor.pre_create_snapshot(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseCreateSnapshot._get_transcoded_request( @@ -1820,7 +1814,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1945,9 +1939,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseDeleteBackup._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseDeleteBackup._get_http_options() request, metadata = self._interceptor.pre_delete_backup(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseDeleteBackup._get_transcoded_request( @@ -1967,7 +1959,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2092,9 +2084,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseDeleteInstance._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseDeleteInstance._get_http_options() request, metadata = self._interceptor.pre_delete_instance(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseDeleteInstance._get_transcoded_request( @@ -2114,7 +2104,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2239,9 +2229,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseDeleteSnapshot._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseDeleteSnapshot._get_http_options() request, metadata = self._interceptor.pre_delete_snapshot(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseDeleteSnapshot._get_transcoded_request( @@ -2261,7 +2249,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2383,9 +2371,7 @@ def __call__( A Filestore backup. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseGetBackup._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseGetBackup._get_http_options() request, metadata = self._interceptor.pre_get_backup(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseGetBackup._get_transcoded_request( @@ -2529,9 +2515,7 @@ def __call__( A Filestore instance. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseGetInstance._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseGetInstance._get_http_options() request, metadata = self._interceptor.pre_get_instance(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseGetInstance._get_transcoded_request( @@ -2677,9 +2661,7 @@ def __call__( A Filestore snapshot. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseGetSnapshot._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseGetSnapshot._get_http_options() request, metadata = self._interceptor.pre_get_snapshot(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseGetSnapshot._get_transcoded_request( @@ -2826,9 +2808,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseListBackups._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseListBackups._get_http_options() request, metadata = self._interceptor.pre_list_backups(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseListBackups._get_transcoded_request( @@ -2975,9 +2955,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseListInstances._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseListInstances._get_http_options() request, metadata = self._interceptor.pre_list_instances(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseListInstances._get_transcoded_request( @@ -3124,9 +3102,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseListSnapshots._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseListSnapshots._get_http_options() request, metadata = self._interceptor.pre_list_snapshots(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseListSnapshots._get_transcoded_request( @@ -3276,9 +3252,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BasePromoteReplica._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BasePromoteReplica._get_http_options() request, metadata = self._interceptor.pre_promote_replica(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BasePromoteReplica._get_transcoded_request( @@ -3302,7 +3276,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3430,9 +3404,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseRestoreInstance._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseRestoreInstance._get_http_options() request, metadata = self._interceptor.pre_restore_instance( request, metadata @@ -3458,7 +3430,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3588,9 +3560,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseRevertInstance._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseRevertInstance._get_http_options() request, metadata = self._interceptor.pre_revert_instance(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseRevertInstance._get_transcoded_request( @@ -3614,7 +3584,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3741,9 +3711,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseUpdateBackup._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseUpdateBackup._get_http_options() request, metadata = self._interceptor.pre_update_backup(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseUpdateBackup._get_transcoded_request( @@ -3767,7 +3735,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3894,9 +3862,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseUpdateInstance._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseUpdateInstance._get_http_options() request, metadata = self._interceptor.pre_update_instance(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseUpdateInstance._get_transcoded_request( @@ -3920,7 +3886,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4048,9 +4014,7 @@ def __call__( """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseUpdateSnapshot._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseUpdateSnapshot._get_http_options() request, metadata = self._interceptor.pre_update_snapshot(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseUpdateSnapshot._get_transcoded_request( @@ -4074,7 +4038,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4382,9 +4346,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseGetLocation._get_transcoded_request( @@ -4523,9 +4485,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseListLocations._get_transcoded_request( @@ -4662,9 +4622,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -4784,9 +4742,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -4904,9 +4860,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseGetOperation._get_transcoded_request( @@ -5045,9 +4999,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCloudFilestoreManagerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCloudFilestoreManagerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCloudFilestoreManagerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-filestore/google/cloud/filestore_v1/types/cloud_filestore_service.py b/packages/google-cloud-filestore/google/cloud/filestore_v1/types/cloud_filestore_service.py index 01c41db9695e..aa00ae77b919 100644 --- a/packages/google-cloud-filestore/google/cloud/filestore_v1/types/cloud_filestore_service.py +++ b/packages/google-cloud-filestore/google/cloud/filestore_v1/types/cloud_filestore_service.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -111,6 +111,7 @@ class AddressMode(proto.Enum): MODE_IPV4 (1): Use the IPv4 internet protocol. """ + ADDRESS_MODE_UNSPECIFIED = 0 MODE_IPV4 = 1 @@ -129,6 +130,7 @@ class ConnectMode(proto.Enum): provides an IP address range for multiple Google Cloud services, including Filestore. """ + CONNECT_MODE_UNSPECIFIED = 0 DIRECT_PEERING = 1 PRIVATE_SERVICE_ACCESS = 2 @@ -249,6 +251,7 @@ class AccessMode(proto.Enum): The client can read and write the file share (default). """ + ACCESS_MODE_UNSPECIFIED = 0 READ_ONLY = 1 READ_WRITE = 2 @@ -266,6 +269,7 @@ class SquashMode(proto.Enum): The Root user has squashed access to the anonymous uid/gid. """ + SQUASH_MODE_UNSPECIFIED = 0 NO_ROOT_SQUASH = 1 ROOT_SQUASH = 2 @@ -328,6 +332,7 @@ class State(proto.Enum): You can get further details from the ``stateReasons`` field of the ``ReplicaConfig`` object. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 3 @@ -347,6 +352,7 @@ class StateReason(proto.Enum): The remove replica peer instance operation failed. """ + STATE_REASON_UNSPECIFIED = 0 PEER_INSTANCE_UNREACHABLE = 1 REMOVE_FAILED = 2 @@ -397,6 +403,7 @@ class Role(proto.Enum): The instance is the ``STANDBY`` replication member, functions as the replication destination instance. """ + ROLE_UNSPECIFIED = 0 ACTIVE = 1 STANDBY = 2 @@ -533,6 +540,7 @@ class State(proto.Enum): PROMOTING (13): The replica instance is being promoted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -580,6 +588,7 @@ class Tier(proto.Enum): availability needed for mission-critical workloads. """ + TIER_UNSPECIFIED = 0 STANDARD = 1 PREMIUM = 2 @@ -601,6 +610,7 @@ class SuspensionReason(proto.Enum): The KMS key used by the instance is either revoked or denied access to. """ + SUSPENSION_REASON_UNSPECIFIED = 0 KMS_KEY_ISSUE = 1 @@ -616,6 +626,7 @@ class FileProtocol(proto.Enum): NFS_V4_1 (2): NFS 4.1. """ + FILE_PROTOCOL_UNSPECIFIED = 0 NFS_V3 = 1 NFS_V4_1 = 2 @@ -1152,6 +1163,7 @@ class State(proto.Enum): DELETING (3): Snapshot is being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -1455,6 +1467,7 @@ class State(proto.Enum): creating new instances or restoring existing instances. """ + STATE_UNSPECIFIED = 0 CREATING = 1 FINALIZING = 2 diff --git a/packages/google-cloud-filestore/noxfile.py b/packages/google-cloud-filestore/noxfile.py index 46e6acabed01..abd1782d1eed 100644 --- a/packages/google-cloud-filestore/noxfile.py +++ b/packages/google-cloud-filestore/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-filestore/tests/unit/gapic/filestore_v1/test_cloud_filestore_manager.py b/packages/google-cloud-filestore/tests/unit/gapic/filestore_v1/test_cloud_filestore_manager.py index dd1db5c92982..3b1565591e6c 100644 --- a/packages/google-cloud-filestore/tests/unit/gapic/filestore_v1/test_cloud_filestore_manager.py +++ b/packages/google-cloud-filestore/tests/unit/gapic/filestore_v1/test_cloud_filestore_manager.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +59,14 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.common.types import operation_metadata from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.filestore_v1.services.cloud_filestore_manager import ( CloudFilestoreManagerAsyncClient, @@ -1010,10 +1010,9 @@ def test_cloud_filestore_manager_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1057,9 @@ def test_cloud_filestore_manager_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1097,10 +1095,9 @@ def test_cloud_filestore_manager_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1356,13 +1353,13 @@ def test_cloud_filestore_manager_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3062,9 +3059,9 @@ def test_restore_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_instance] = ( + mock_rpc + ) request = {} client.restore_instance(request) @@ -8610,9 +8607,9 @@ def test_restore_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_instance] = ( + mock_rpc + ) request = {} client.restore_instance(request) @@ -12198,8 +12195,9 @@ def test_list_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12264,18 +12262,20 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_list_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_list_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12333,8 +12333,9 @@ def test_get_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12425,18 +12426,20 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_get_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_get_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12491,8 +12494,9 @@ def test_create_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12682,20 +12686,21 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_create_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_create_instance" - ) as pre: + 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.CloudFilestoreManagerRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_create_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12750,8 +12755,9 @@ def test_update_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12943,20 +12949,21 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_update_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_update_instance" - ) as pre: + 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.CloudFilestoreManagerRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_update_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13009,8 +13016,9 @@ def test_restore_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13067,20 +13075,21 @@ def test_restore_instance_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_restore_instance" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_restore_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_restore_instance" - ) as pre: + 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.CloudFilestoreManagerRestInterceptor, "post_restore_instance" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_restore_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_restore_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13133,8 +13142,9 @@ def test_revert_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13191,20 +13201,21 @@ def test_revert_instance_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_revert_instance" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_revert_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_revert_instance" - ) as pre: + 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.CloudFilestoreManagerRestInterceptor, "post_revert_instance" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_revert_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_revert_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13257,8 +13268,9 @@ def test_delete_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13315,20 +13327,21 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_delete_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_delete_instance" - ) as pre: + 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.CloudFilestoreManagerRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_delete_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13381,8 +13394,9 @@ def test_list_snapshots_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13447,18 +13461,20 @@ def test_list_snapshots_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_list_snapshots" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_list_snapshots_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_list_snapshots" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "post_list_snapshots" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_list_snapshots_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_list_snapshots" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13518,8 +13534,9 @@ def test_get_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13590,18 +13607,20 @@ def test_get_snapshot_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_get_snapshot" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_get_snapshot_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_get_snapshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "post_get_snapshot" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_get_snapshot_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_get_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13656,8 +13675,9 @@ def test_create_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13790,20 +13810,21 @@ def test_create_snapshot_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_create_snapshot" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_create_snapshot_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_create_snapshot" - ) as pre: + 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.CloudFilestoreManagerRestInterceptor, "post_create_snapshot" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_create_snapshot_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_create_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13858,8 +13879,9 @@ def test_delete_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13918,20 +13940,21 @@ def test_delete_snapshot_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_delete_snapshot" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_delete_snapshot_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_delete_snapshot" - ) as pre: + 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.CloudFilestoreManagerRestInterceptor, "post_delete_snapshot" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_delete_snapshot_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_delete_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13988,8 +14011,9 @@ def test_update_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14126,20 +14150,21 @@ def test_update_snapshot_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_update_snapshot" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_update_snapshot_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_update_snapshot" - ) as pre: + 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.CloudFilestoreManagerRestInterceptor, "post_update_snapshot" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_update_snapshot_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_update_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14192,8 +14217,9 @@ def test_list_backups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14258,18 +14284,20 @@ def test_list_backups_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_list_backups" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_list_backups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_list_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "post_list_backups" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_list_backups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_list_backups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14327,8 +14355,9 @@ def test_get_backup_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14418,17 +14447,20 @@ def test_get_backup_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_get_backup" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "post_get_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_get_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "post_get_backup" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_get_backup_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_get_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14483,8 +14515,9 @@ def test_create_backup_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14626,20 +14659,21 @@ def test_create_backup_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_create_backup" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_create_backup_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_create_backup" - ) as pre: + 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.CloudFilestoreManagerRestInterceptor, "post_create_backup" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_create_backup_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_create_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14692,8 +14726,9 @@ def test_delete_backup_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14750,20 +14785,21 @@ def test_delete_backup_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_delete_backup" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_delete_backup_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_delete_backup" - ) as pre: + 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.CloudFilestoreManagerRestInterceptor, "post_delete_backup" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_delete_backup_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_delete_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14818,8 +14854,9 @@ def test_update_backup_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14963,20 +15000,21 @@ def test_update_backup_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_update_backup" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_update_backup_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_update_backup" - ) as pre: + 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.CloudFilestoreManagerRestInterceptor, "post_update_backup" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_update_backup_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_update_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15029,8 +15067,9 @@ def test_promote_replica_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15087,20 +15126,21 @@ def test_promote_replica_rest_interceptors(null_interceptor): ) client = CloudFilestoreManagerClient(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.CloudFilestoreManagerRestInterceptor, "post_promote_replica" - ) as post, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, - "post_promote_replica_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFilestoreManagerRestInterceptor, "pre_promote_replica" - ) as pre: + 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.CloudFilestoreManagerRestInterceptor, "post_promote_replica" + ) as post, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, + "post_promote_replica_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFilestoreManagerRestInterceptor, "pre_promote_replica" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15153,8 +15193,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15213,8 +15254,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15275,8 +15317,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15337,8 +15380,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15399,8 +15443,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15461,8 +15506,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -15975,11 +16021,14 @@ def test_cloud_filestore_manager_base_transport(): def test_cloud_filestore_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.filestore_v1.services.cloud_filestore_manager.transports.CloudFilestoreManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.filestore_v1.services.cloud_filestore_manager.transports.CloudFilestoreManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudFilestoreManagerTransport( @@ -15996,9 +16045,12 @@ def test_cloud_filestore_manager_base_transport_with_credentials_file(): def test_cloud_filestore_manager_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.filestore_v1.services.cloud_filestore_manager.transports.CloudFilestoreManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.filestore_v1.services.cloud_filestore_manager.transports.CloudFilestoreManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudFilestoreManagerTransport() @@ -16072,11 +16124,12 @@ def test_cloud_filestore_manager_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-financialservices/docs/conf.py b/packages/google-cloud-financialservices/docs/conf.py index 8191d549e14e..4783a5ee61eb 100644 --- a/packages/google-cloud-financialservices/docs/conf.py +++ b/packages/google-cloud-financialservices/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-financialservices documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/__init__.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/__init__.py index a2391c72dadd..d31214700e04 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/__init__.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.aml import AMLAsyncClient, AMLClient from .types.backtest_result import ( BacktestResult, diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/async_client.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/async_client.py index 9ce5398c26eb..08fa0d9533ca 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/async_client.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.financialservices_v1 import gapic_version as package_version @@ -45,40 +45,42 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.financialservices_v1.services.aml import pagers +from google.cloud.financialservices_v1.types import ( + backtest_result, + bigquery_destination, + dataset, + engine_config, + engine_version, + instance, + line_of_business, + model, + prediction_result, + service, +) from google.cloud.financialservices_v1.types import ( backtest_result as gcf_backtest_result, ) +from google.cloud.financialservices_v1.types import dataset as gcf_dataset from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config +from google.cloud.financialservices_v1.types import instance as gcf_instance from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) +from google.cloud.financialservices_v1.types import model as gcf_model from google.cloud.financialservices_v1.types import ( prediction_result as gcf_prediction_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import bigquery_destination -from google.cloud.financialservices_v1.types import dataset -from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance -from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import line_of_business -from google.cloud.financialservices_v1.types import model -from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result -from google.cloud.financialservices_v1.types import service from .client import AMLClient from .transports.base import DEFAULT_CLIENT_INFO, AMLTransport @@ -150,7 +152,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AMLAsyncClient: The constructed client. """ - return AMLClient.from_service_account_info.__func__(AMLAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AMLClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AMLAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -166,7 +169,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AMLAsyncClient: The constructed client. """ - return AMLClient.from_service_account_file.__func__(AMLAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AMLClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AMLAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/client.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/client.py index 4cfaa33fadd3..c588cc620f5b 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/client.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.financialservices_v1 import gapic_version as package_version @@ -62,40 +62,42 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.financialservices_v1.services.aml import pagers +from google.cloud.financialservices_v1.types import ( + backtest_result, + bigquery_destination, + dataset, + engine_config, + engine_version, + instance, + line_of_business, + model, + prediction_result, + service, +) from google.cloud.financialservices_v1.types import ( backtest_result as gcf_backtest_result, ) +from google.cloud.financialservices_v1.types import dataset as gcf_dataset from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config +from google.cloud.financialservices_v1.types import instance as gcf_instance from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) +from google.cloud.financialservices_v1.types import model as gcf_model from google.cloud.financialservices_v1.types import ( prediction_result as gcf_prediction_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import bigquery_destination -from google.cloud.financialservices_v1.types import dataset -from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance -from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import line_of_business -from google.cloud.financialservices_v1.types import model -from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result -from google.cloud.financialservices_v1.types import service from .transports.base import DEFAULT_CLIENT_INFO, AMLTransport from .transports.grpc import AMLGrpcTransport @@ -797,11 +799,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AMLClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AMLClient._read_environment_variables() + ) self._client_cert_source = AMLClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -836,8 +836,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AMLTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/pagers.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/pagers.py index cc9f14dc79b5..78ec55edb6e1 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/pagers.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/pagers.py @@ -75,7 +75,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -231,7 +231,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -307,7 +307,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -387,7 +387,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -463,7 +463,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -543,7 +543,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -619,7 +619,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -699,7 +699,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -775,7 +775,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -855,7 +855,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -933,7 +933,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1015,7 +1015,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1091,7 +1091,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/base.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/base.py index 6914c9ccf6c9..1bf82ae7edf3 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/base.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/base.py @@ -17,34 +17,36 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.financialservices_v1 import gapic_version as package_version from google.cloud.financialservices_v1.types import ( - backtest_result as gcf_backtest_result, + backtest_result, + dataset, + engine_config, + engine_version, + instance, + model, + prediction_result, ) -from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import ( - prediction_result as gcf_prediction_result, + backtest_result as gcf_backtest_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import dataset from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance +from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import model from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result +from google.cloud.financialservices_v1.types import ( + prediction_result as gcf_prediction_result, +) DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -771,13 +773,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc.py index 8a7766fa386b..4724405799ab 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc.py @@ -16,37 +16,39 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.financialservices_v1.types import ( - backtest_result as gcf_backtest_result, + backtest_result, + dataset, + engine_config, + engine_version, + instance, + model, + prediction_result, ) -from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import ( - prediction_result as gcf_prediction_result, + backtest_result as gcf_backtest_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import dataset from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance +from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import model from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result +from google.cloud.financialservices_v1.types import ( + prediction_result as gcf_prediction_result, +) from .base import DEFAULT_CLIENT_INFO, AMLTransport @@ -962,12 +964,12 @@ def export_engine_config_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_engine_config_metadata" not in self._stubs: - self._stubs[ - "export_engine_config_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.financialservices.v1.AML/ExportEngineConfigMetadata", - request_serializer=gcf_engine_config.ExportEngineConfigMetadataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["export_engine_config_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.financialservices.v1.AML/ExportEngineConfigMetadata", + request_serializer=gcf_engine_config.ExportEngineConfigMetadataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["export_engine_config_metadata"] @@ -1193,12 +1195,12 @@ def export_prediction_result_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_prediction_result_metadata" not in self._stubs: - self._stubs[ - "export_prediction_result_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.financialservices.v1.AML/ExportPredictionResultMetadata", - request_serializer=gcf_prediction_result.ExportPredictionResultMetadataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["export_prediction_result_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.financialservices.v1.AML/ExportPredictionResultMetadata", + request_serializer=gcf_prediction_result.ExportPredictionResultMetadataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["export_prediction_result_metadata"] @@ -1368,12 +1370,12 @@ def export_backtest_result_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_backtest_result_metadata" not in self._stubs: - self._stubs[ - "export_backtest_result_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.financialservices.v1.AML/ExportBacktestResultMetadata", - request_serializer=gcf_backtest_result.ExportBacktestResultMetadataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["export_backtest_result_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.financialservices.v1.AML/ExportBacktestResultMetadata", + request_serializer=gcf_backtest_result.ExportBacktestResultMetadataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["export_backtest_result_metadata"] diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc_asyncio.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc_asyncio.py index 194c05f80632..8e236598d2f5 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc_asyncio.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,28 +31,27 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.financialservices_v1.types import ( - backtest_result as gcf_backtest_result, + backtest_result, + dataset, + engine_config, + engine_version, + instance, + model, + prediction_result, ) -from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import ( - prediction_result as gcf_prediction_result, + backtest_result as gcf_backtest_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import dataset from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance +from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import model from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result +from google.cloud.financialservices_v1.types import ( + prediction_result as gcf_prediction_result, +) from .base import DEFAULT_CLIENT_INFO, AMLTransport from .grpc import AMLGrpcTransport @@ -997,12 +999,12 @@ def export_engine_config_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_engine_config_metadata" not in self._stubs: - self._stubs[ - "export_engine_config_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.financialservices.v1.AML/ExportEngineConfigMetadata", - request_serializer=gcf_engine_config.ExportEngineConfigMetadataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["export_engine_config_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.financialservices.v1.AML/ExportEngineConfigMetadata", + request_serializer=gcf_engine_config.ExportEngineConfigMetadataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["export_engine_config_metadata"] @@ -1233,12 +1235,12 @@ def export_prediction_result_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_prediction_result_metadata" not in self._stubs: - self._stubs[ - "export_prediction_result_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.financialservices.v1.AML/ExportPredictionResultMetadata", - request_serializer=gcf_prediction_result.ExportPredictionResultMetadataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["export_prediction_result_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.financialservices.v1.AML/ExportPredictionResultMetadata", + request_serializer=gcf_prediction_result.ExportPredictionResultMetadataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["export_prediction_result_metadata"] @@ -1412,12 +1414,12 @@ def export_backtest_result_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "export_backtest_result_metadata" not in self._stubs: - self._stubs[ - "export_backtest_result_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.financialservices.v1.AML/ExportBacktestResultMetadata", - request_serializer=gcf_backtest_result.ExportBacktestResultMetadataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["export_backtest_result_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.financialservices.v1.AML/ExportBacktestResultMetadata", + request_serializer=gcf_backtest_result.ExportBacktestResultMetadataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["export_backtest_result_metadata"] diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest.py index 0b80c2ca808d..6ae4164c5969 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest.py @@ -16,37 +16,39 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version from google.cloud.financialservices_v1.types import ( - backtest_result as gcf_backtest_result, + backtest_result, + dataset, + engine_config, + engine_version, + instance, + model, + prediction_result, ) -from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import ( - prediction_result as gcf_prediction_result, + backtest_result as gcf_backtest_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import dataset from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance +from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import model from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result +from google.cloud.financialservices_v1.types import ( + prediction_result as gcf_prediction_result, +) from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAMLRestTransport @@ -2605,7 +2607,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2757,7 +2759,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2915,7 +2917,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3067,7 +3069,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3219,7 +3221,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3373,7 +3375,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3526,7 +3528,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3671,7 +3673,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3822,7 +3824,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3967,7 +3969,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4112,7 +4114,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4260,7 +4262,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4386,9 +4388,7 @@ def __call__( """ - http_options = ( - _BaseAMLRestTransport._BaseExportBacktestResultMetadata._get_http_options() - ) + http_options = _BaseAMLRestTransport._BaseExportBacktestResultMetadata._get_http_options() request, metadata = self._interceptor.pre_export_backtest_result_metadata( request, metadata @@ -4414,7 +4414,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4455,11 +4455,10 @@ def __call__( resp = self._interceptor.post_export_backtest_result_metadata(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_export_backtest_result_metadata_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_export_backtest_result_metadata_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4544,9 +4543,7 @@ def __call__( """ - http_options = ( - _BaseAMLRestTransport._BaseExportEngineConfigMetadata._get_http_options() - ) + http_options = _BaseAMLRestTransport._BaseExportEngineConfigMetadata._get_http_options() request, metadata = self._interceptor.pre_export_engine_config_metadata( request, metadata @@ -4572,7 +4569,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4613,11 +4610,10 @@ def __call__( resp = self._interceptor.post_export_engine_config_metadata(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_export_engine_config_metadata_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_export_engine_config_metadata_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4734,7 +4730,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4861,9 +4857,7 @@ def __call__( """ - http_options = ( - _BaseAMLRestTransport._BaseExportPredictionResultMetadata._get_http_options() - ) + http_options = _BaseAMLRestTransport._BaseExportPredictionResultMetadata._get_http_options() request, metadata = self._interceptor.pre_export_prediction_result_metadata( request, metadata @@ -4889,7 +4883,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4930,11 +4924,10 @@ def __call__( resp = self._interceptor.post_export_prediction_result_metadata(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_export_prediction_result_metadata_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_export_prediction_result_metadata_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5046,7 +5039,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6251,7 +6244,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7474,7 +7467,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7625,7 +7618,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7782,7 +7775,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7933,7 +7926,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8084,7 +8077,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8238,7 +8231,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8357,7 +8350,9 @@ def create_prediction_result( ]: # 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._CreatePredictionResult(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePredictionResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_backtest_result( @@ -8409,7 +8404,9 @@ def delete_prediction_result( ]: # 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._DeletePredictionResult(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePredictionResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_backtest_result_metadata( @@ -8420,7 +8417,9 @@ def export_backtest_result_metadata( ]: # 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._ExportBacktestResultMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._ExportBacktestResultMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_engine_config_metadata( @@ -8430,7 +8429,9 @@ def export_engine_config_metadata( ]: # 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._ExportEngineConfigMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._ExportEngineConfigMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_model_metadata( @@ -8449,7 +8450,9 @@ def export_prediction_result_metadata( ]: # 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._ExportPredictionResultMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._ExportPredictionResultMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def export_registered_parties( @@ -8457,7 +8460,9 @@ def export_registered_parties( ) -> Callable[[instance.ExportRegisteredPartiesRequest], 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._ExportRegisteredParties(self._session, self._host, self._interceptor) # type: ignore + return self._ExportRegisteredParties( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backtest_result( @@ -8524,7 +8529,9 @@ def import_registered_parties( ) -> Callable[[instance.ImportRegisteredPartiesRequest], 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._ImportRegisteredParties(self._session, self._host, self._interceptor) # type: ignore + return self._ImportRegisteredParties( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_backtest_results( @@ -8646,7 +8653,9 @@ def update_prediction_result( ]: # 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._UpdatePredictionResult(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePredictionResult( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest_base.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest_base.py index c754c7cd5f78..51382406dd1f 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest_base.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/services/aml/transports/rest_base.py @@ -23,22 +23,24 @@ from google.protobuf import json_format from google.cloud.financialservices_v1.types import ( - backtest_result as gcf_backtest_result, + backtest_result, + dataset, + engine_config, + engine_version, + instance, + model, + prediction_result, ) -from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import ( - prediction_result as gcf_prediction_result, + backtest_result as gcf_backtest_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import dataset from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance +from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import model from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result +from google.cloud.financialservices_v1.types import ( + prediction_result as gcf_prediction_result, +) from .base import DEFAULT_CLIENT_INFO, AMLTransport diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/__init__.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/__init__.py index 39fd49590d9f..f9c30b7369fc 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/__init__.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/__init__.py @@ -24,7 +24,9 @@ ListBacktestResultsResponse, UpdateBacktestResultRequest, ) -from .bigquery_destination import BigQueryDestination +from .bigquery_destination import ( + BigQueryDestination, +) from .dataset import ( CreateDatasetRequest, Dataset, @@ -64,7 +66,9 @@ ListInstancesResponse, UpdateInstanceRequest, ) -from .line_of_business import LineOfBusiness +from .line_of_business import ( + LineOfBusiness, +) from .model import ( CreateModelRequest, DeleteModelRequest, @@ -87,7 +91,9 @@ PredictionResult, UpdatePredictionResultRequest, ) -from .service import OperationMetadata +from .service import ( + OperationMetadata, +) __all__ = ( "BacktestResult", diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/backtest_result.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/backtest_result.py index 4d3ee8965edb..50b7881dcccd 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/backtest_result.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/backtest_result.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.financialservices_v1.types import bigquery_destination from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) -from google.cloud.financialservices_v1.types import bigquery_destination __protobuf__ = proto.module( package="google.cloud.financialservices.v1", @@ -105,6 +105,7 @@ class State(proto.Enum): The resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/bigquery_destination.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/bigquery_destination.py index 68294fbcf61e..7faa79fef8b2 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/bigquery_destination.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/bigquery_destination.py @@ -58,6 +58,7 @@ class WriteDisposition(proto.Enum): If the table already exists, the data will be overwritten. """ + WRITE_DISPOSITION_UNSPECIFIED = 0 WRITE_EMPTY = 1 WRITE_TRUNCATE = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/dataset.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/dataset.py index 1d595d197605..797327260b10 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/dataset.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/dataset.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -94,6 +94,7 @@ class State(proto.Enum): The resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_config.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_config.py index da577abf1534..900a0d0cc99a 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_config.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_config.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.financialservices_v1.types import bigquery_destination from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) -from google.cloud.financialservices_v1.types import bigquery_destination __protobuf__ = proto.module( package="google.cloud.financialservices.v1", @@ -106,6 +106,7 @@ class State(proto.Enum): The resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -126,6 +127,7 @@ class HyperparameterSourceType(proto.Enum): The hyperparameters are inherited from another EngineConfig. """ + HYPERPARAMETER_SOURCE_TYPE_UNSPECIFIED = 0 TUNING = 1 INHERITED = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_version.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_version.py index 8ddedc9679a4..a8a38b924c91 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_version.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/engine_version.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.financialservices_v1.types import ( @@ -79,6 +79,7 @@ class State(proto.Enum): Version is deprecated, listed for informational purposes only. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 LIMITED = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/instance.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/instance.py index c046d70d0764..584a0d039477 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/instance.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/instance.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.financialservices_v1.types import bigquery_destination from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) -from google.cloud.financialservices_v1.types import bigquery_destination __protobuf__ = proto.module( package="google.cloud.financialservices.v1", @@ -91,6 +91,7 @@ class State(proto.Enum): The resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -403,6 +404,7 @@ class UpdateMode(proto.Enum): APPEND (2): Add new parties to Parties Table. """ + UPDATE_MODE_UNSPECIFIED = 0 REPLACE = 1 APPEND = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/line_of_business.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/line_of_business.py index aa7057a16532..7d7dbbe8e08d 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/line_of_business.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/line_of_business.py @@ -38,6 +38,7 @@ class LineOfBusiness(proto.Enum): RETAIL (2): Retail LineOfBusiness. """ + LINE_OF_BUSINESS_UNSPECIFIED = 0 COMMERCIAL = 1 RETAIL = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/model.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/model.py index 8fa6b21eab11..21a3a1f760ec 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/model.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/model.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.financialservices_v1.types import bigquery_destination from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) -from google.cloud.financialservices_v1.types import bigquery_destination __protobuf__ = proto.module( package="google.cloud.financialservices.v1", @@ -103,6 +103,7 @@ class State(proto.Enum): The resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/prediction_result.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/prediction_result.py index a05820cb949a..7aeca6c52072 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/prediction_result.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/prediction_result.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.financialservices_v1.types import bigquery_destination from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) -from google.cloud.financialservices_v1.types import bigquery_destination __protobuf__ = proto.module( package="google.cloud.financialservices.v1", @@ -107,6 +107,7 @@ class State(proto.Enum): The resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 diff --git a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/service.py b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/service.py index d50bcaf31de0..148959e035c6 100644 --- a/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/service.py +++ b/packages/google-cloud-financialservices/google/cloud/financialservices_v1/types/service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-financialservices/noxfile.py b/packages/google-cloud-financialservices/noxfile.py index 0cd19310d635..6268dfca39b3 100644 --- a/packages/google-cloud-financialservices/noxfile.py +++ b/packages/google-cloud-financialservices/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-financialservices/tests/unit/gapic/financialservices_v1/test_aml.py b/packages/google-cloud-financialservices/tests/unit/gapic/financialservices_v1/test_aml.py index dc3fe50f4710..1c64fdcdda6b 100644 --- a/packages/google-cloud-financialservices/tests/unit/gapic/financialservices_v1/test_aml.py +++ b/packages/google-cloud-financialservices/tests/unit/gapic/financialservices_v1/test_aml.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,21 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.financialservices_v1.services.aml import ( AMLAsyncClient, @@ -75,29 +75,31 @@ pagers, transports, ) +from google.cloud.financialservices_v1.types import ( + backtest_result, + bigquery_destination, + dataset, + engine_config, + engine_version, + instance, + line_of_business, + model, + prediction_result, + service, +) from google.cloud.financialservices_v1.types import ( backtest_result as gcf_backtest_result, ) +from google.cloud.financialservices_v1.types import dataset as gcf_dataset from google.cloud.financialservices_v1.types import engine_config as gcf_engine_config +from google.cloud.financialservices_v1.types import instance as gcf_instance from google.cloud.financialservices_v1.types import ( line_of_business as gcf_line_of_business, ) +from google.cloud.financialservices_v1.types import model as gcf_model from google.cloud.financialservices_v1.types import ( prediction_result as gcf_prediction_result, ) -from google.cloud.financialservices_v1.types import backtest_result -from google.cloud.financialservices_v1.types import bigquery_destination -from google.cloud.financialservices_v1.types import dataset -from google.cloud.financialservices_v1.types import dataset as gcf_dataset -from google.cloud.financialservices_v1.types import engine_config -from google.cloud.financialservices_v1.types import engine_version -from google.cloud.financialservices_v1.types import instance -from google.cloud.financialservices_v1.types import instance as gcf_instance -from google.cloud.financialservices_v1.types import line_of_business -from google.cloud.financialservices_v1.types import model -from google.cloud.financialservices_v1.types import model as gcf_model -from google.cloud.financialservices_v1.types import prediction_result -from google.cloud.financialservices_v1.types import service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -907,10 +909,9 @@ def test_aml_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -955,10 +956,9 @@ def test_aml_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +994,9 @@ def test_aml_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1220,13 +1219,13 @@ def test_aml_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -7379,9 +7378,9 @@ def test_export_model_metadata_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_model_metadata - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_model_metadata] = ( + mock_rpc + ) request = {} client.export_model_metadata(request) @@ -8082,9 +8081,9 @@ def test_list_engine_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_engine_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_engine_configs] = ( + mock_rpc + ) request = {} client.list_engine_configs(request) @@ -8636,9 +8635,9 @@ def test_get_engine_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_engine_config] = ( + mock_rpc + ) request = {} client.get_engine_config(request) @@ -8989,9 +8988,9 @@ def test_create_engine_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_engine_config] = ( + mock_rpc + ) request = {} client.create_engine_config(request) @@ -9355,9 +9354,9 @@ def test_update_engine_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_engine_config] = ( + mock_rpc + ) request = {} client.update_engine_config(request) @@ -10078,9 +10077,9 @@ def test_delete_engine_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_engine_config] = ( + mock_rpc + ) request = {} client.delete_engine_config(request) @@ -10431,9 +10430,9 @@ def test_get_engine_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_engine_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_engine_version] = ( + mock_rpc + ) request = {} client.get_engine_version(request) @@ -10784,9 +10783,9 @@ def test_list_engine_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_engine_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_engine_versions] = ( + mock_rpc + ) request = {} client.list_engine_versions(request) @@ -11896,9 +11895,9 @@ def test_get_prediction_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_prediction_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_prediction_result] = ( + mock_rpc + ) request = {} client.get_prediction_result(request) @@ -13699,9 +13698,9 @@ def test_list_backtest_results_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backtest_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backtest_results] = ( + mock_rpc + ) request = {} client.list_backtest_results(request) @@ -14255,9 +14254,9 @@ def test_get_backtest_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backtest_result] = ( + mock_rpc + ) request = {} client.get_backtest_result(request) @@ -14609,9 +14608,9 @@ def test_create_backtest_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backtest_result] = ( + mock_rpc + ) request = {} client.create_backtest_result(request) @@ -14976,9 +14975,9 @@ def test_update_backtest_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backtest_result] = ( + mock_rpc + ) request = {} client.update_backtest_result(request) @@ -15700,9 +15699,9 @@ def test_delete_backtest_result_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backtest_result] = ( + mock_rpc + ) request = {} client.delete_backtest_result(request) @@ -19280,9 +19279,9 @@ def test_export_model_metadata_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.export_model_metadata - ] = mock_rpc + client._transport._wrapped_methods[client._transport.export_model_metadata] = ( + mock_rpc + ) request = {} client.export_model_metadata(request) @@ -19657,9 +19656,9 @@ def test_list_engine_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_engine_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_engine_configs] = ( + mock_rpc + ) request = {} client.list_engine_configs(request) @@ -19923,9 +19922,9 @@ def test_get_engine_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_engine_config] = ( + mock_rpc + ) request = {} client.get_engine_config(request) @@ -20107,9 +20106,9 @@ def test_create_engine_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_engine_config] = ( + mock_rpc + ) request = {} client.create_engine_config(request) @@ -20329,9 +20328,9 @@ def test_update_engine_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_engine_config] = ( + mock_rpc + ) request = {} client.update_engine_config(request) @@ -20728,9 +20727,9 @@ def test_delete_engine_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_engine_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_engine_config] = ( + mock_rpc + ) request = {} client.delete_engine_config(request) @@ -20913,9 +20912,9 @@ def test_get_engine_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_engine_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_engine_version] = ( + mock_rpc + ) request = {} client.get_engine_version(request) @@ -21097,9 +21096,9 @@ def test_list_engine_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_engine_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_engine_versions] = ( + mock_rpc + ) request = {} client.list_engine_versions(request) @@ -21637,9 +21636,9 @@ def test_get_prediction_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_prediction_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_prediction_result] = ( + mock_rpc + ) request = {} client.get_prediction_result(request) @@ -22635,9 +22634,9 @@ def test_list_backtest_results_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backtest_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backtest_results] = ( + mock_rpc + ) request = {} client.list_backtest_results(request) @@ -22903,9 +22902,9 @@ def test_get_backtest_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backtest_result] = ( + mock_rpc + ) request = {} client.get_backtest_result(request) @@ -23088,9 +23087,9 @@ def test_create_backtest_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backtest_result] = ( + mock_rpc + ) request = {} client.create_backtest_result(request) @@ -23311,9 +23310,9 @@ def test_update_backtest_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backtest_result] = ( + mock_rpc + ) request = {} client.update_backtest_result(request) @@ -23711,9 +23710,9 @@ def test_delete_backtest_result_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backtest_result - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backtest_result] = ( + mock_rpc + ) request = {} client.delete_backtest_result(request) @@ -25908,8 +25907,9 @@ def test_list_instances_rest_bad_request(request_type=instance.ListInstancesRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25972,17 +25972,15 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AMLRestInterceptor, "post_list_instances") as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_list_instances") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26033,8 +26031,9 @@ def test_get_instance_rest_bad_request(request_type=instance.GetInstanceRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26099,17 +26098,15 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AMLRestInterceptor, "post_get_instance") as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_get_instance") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26160,8 +26157,9 @@ def test_create_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26291,19 +26289,18 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_create_instance" - ) as pre: + 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.AMLRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_create_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_create_instance") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26358,8 +26355,9 @@ def test_update_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26491,19 +26489,18 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_update_instance" - ) as pre: + 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.AMLRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_update_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_update_instance") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26554,8 +26551,9 @@ def test_delete_instance_rest_bad_request(request_type=instance.DeleteInstanceRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26610,19 +26608,18 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_delete_instance" - ) as pre: + 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.AMLRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_delete_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_delete_instance") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26673,8 +26670,9 @@ def test_import_registered_parties_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26729,19 +26727,21 @@ def test_import_registered_parties_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_import_registered_parties" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_import_registered_parties_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_import_registered_parties" - ) as pre: + 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.AMLRestInterceptor, "post_import_registered_parties" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, + "post_import_registered_parties_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_import_registered_parties" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26794,8 +26794,9 @@ def test_export_registered_parties_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26850,19 +26851,21 @@ def test_export_registered_parties_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_export_registered_parties" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_export_registered_parties_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_export_registered_parties" - ) as pre: + 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.AMLRestInterceptor, "post_export_registered_parties" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, + "post_export_registered_parties_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_export_registered_parties" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26913,8 +26916,9 @@ def test_list_datasets_rest_bad_request(request_type=dataset.ListDatasetsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26977,17 +26981,15 @@ def test_list_datasets_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_list_datasets" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_list_datasets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_list_datasets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AMLRestInterceptor, "post_list_datasets") as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_list_datasets_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_list_datasets") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27040,8 +27042,9 @@ def test_get_dataset_rest_bad_request(request_type=dataset.GetDatasetRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27106,17 +27109,15 @@ def test_get_dataset_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_get_dataset" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_get_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_get_dataset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AMLRestInterceptor, "post_get_dataset") as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_get_dataset_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_get_dataset") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27165,8 +27166,9 @@ def test_create_dataset_rest_bad_request(request_type=gcf_dataset.CreateDatasetR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27298,19 +27300,16 @@ def test_create_dataset_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_create_dataset" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_create_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_create_dataset" - ) as pre: + 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.AMLRestInterceptor, "post_create_dataset") as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_create_dataset_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_create_dataset") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27365,8 +27364,9 @@ def test_update_dataset_rest_bad_request(request_type=gcf_dataset.UpdateDatasetR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27502,19 +27502,16 @@ def test_update_dataset_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_update_dataset" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_update_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_update_dataset" - ) as pre: + 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.AMLRestInterceptor, "post_update_dataset") as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_update_dataset_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_update_dataset") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27567,8 +27564,9 @@ def test_delete_dataset_rest_bad_request(request_type=dataset.DeleteDatasetReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27625,19 +27623,16 @@ def test_delete_dataset_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_delete_dataset" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_delete_dataset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_delete_dataset" - ) as pre: + 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.AMLRestInterceptor, "post_delete_dataset") as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_delete_dataset_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_delete_dataset") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27686,8 +27681,9 @@ def test_list_models_rest_bad_request(request_type=model.ListModelsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27750,17 +27746,15 @@ def test_list_models_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_list_models" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_list_models_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_list_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AMLRestInterceptor, "post_list_models") as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_list_models_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_list_models") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27811,8 +27805,9 @@ def test_get_model_rest_bad_request(request_type=model.GetModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27885,17 +27880,15 @@ def test_get_model_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_get_model" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_get_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_get_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.AMLRestInterceptor, "post_get_model") as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_get_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_get_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27944,8 +27937,9 @@ def test_create_model_rest_bad_request(request_type=gcf_model.CreateModelRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28079,19 +28073,16 @@ def test_create_model_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_create_model" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_create_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_create_model" - ) as pre: + 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.AMLRestInterceptor, "post_create_model") as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_create_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_create_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28144,8 +28135,9 @@ def test_update_model_rest_bad_request(request_type=gcf_model.UpdateModelRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28283,19 +28275,16 @@ def test_update_model_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_update_model" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_update_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_update_model" - ) as pre: + 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.AMLRestInterceptor, "post_update_model") as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_update_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_update_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28348,8 +28337,9 @@ def test_export_model_metadata_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28406,19 +28396,20 @@ def test_export_model_metadata_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_export_model_metadata" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_export_model_metadata_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_export_model_metadata" - ) as pre: + 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.AMLRestInterceptor, "post_export_model_metadata" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_export_model_metadata_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_export_model_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28471,8 +28462,9 @@ def test_delete_model_rest_bad_request(request_type=model.DeleteModelRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28529,19 +28521,16 @@ def test_delete_model_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_delete_model" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_delete_model_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_delete_model" - ) as pre: + 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.AMLRestInterceptor, "post_delete_model") as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_delete_model_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.AMLRestInterceptor, "pre_delete_model") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28592,8 +28581,9 @@ def test_list_engine_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28656,17 +28646,19 @@ def test_list_engine_configs_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_list_engine_configs" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_list_engine_configs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_list_engine_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AMLRestInterceptor, "post_list_engine_configs" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_list_engine_configs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_list_engine_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28726,8 +28718,9 @@ def test_get_engine_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28801,17 +28794,19 @@ def test_get_engine_config_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_get_engine_config" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_get_engine_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_get_engine_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AMLRestInterceptor, "post_get_engine_config" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_get_engine_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_get_engine_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28864,8 +28859,9 @@ def test_create_engine_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29005,19 +29001,20 @@ def test_create_engine_config_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_create_engine_config" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_create_engine_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_create_engine_config" - ) as pre: + 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.AMLRestInterceptor, "post_create_engine_config" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_create_engine_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_create_engine_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29074,8 +29071,9 @@ def test_update_engine_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29219,19 +29217,20 @@ def test_update_engine_config_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_update_engine_config" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_update_engine_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_update_engine_config" - ) as pre: + 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.AMLRestInterceptor, "post_update_engine_config" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_update_engine_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_update_engine_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29286,8 +29285,9 @@ def test_export_engine_config_metadata_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29344,20 +29344,21 @@ def test_export_engine_config_metadata_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_export_engine_config_metadata" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, - "post_export_engine_config_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_export_engine_config_metadata" - ) as pre: + 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.AMLRestInterceptor, "post_export_engine_config_metadata" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, + "post_export_engine_config_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_export_engine_config_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29412,8 +29413,9 @@ def test_delete_engine_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29470,19 +29472,20 @@ def test_delete_engine_config_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_delete_engine_config" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_delete_engine_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_delete_engine_config" - ) as pre: + 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.AMLRestInterceptor, "post_delete_engine_config" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_delete_engine_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_delete_engine_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29537,8 +29540,9 @@ def test_get_engine_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29605,17 +29609,19 @@ def test_get_engine_version_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_get_engine_version" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_get_engine_version_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_get_engine_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AMLRestInterceptor, "post_get_engine_version" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_get_engine_version_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_get_engine_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29670,8 +29676,9 @@ def test_list_engine_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29734,17 +29741,19 @@ def test_list_engine_versions_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_list_engine_versions" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_list_engine_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_list_engine_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AMLRestInterceptor, "post_list_engine_versions" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_list_engine_versions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_list_engine_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29802,8 +29811,9 @@ def test_list_prediction_results_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29866,17 +29876,19 @@ def test_list_prediction_results_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_list_prediction_results" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_list_prediction_results_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_list_prediction_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AMLRestInterceptor, "post_list_prediction_results" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_list_prediction_results_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_list_prediction_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29936,8 +29948,9 @@ def test_get_prediction_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30010,17 +30023,19 @@ def test_get_prediction_result_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_get_prediction_result" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_get_prediction_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_get_prediction_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AMLRestInterceptor, "post_get_prediction_result" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_get_prediction_result_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_get_prediction_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30075,8 +30090,9 @@ def test_create_prediction_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30219,19 +30235,20 @@ def test_create_prediction_result_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_create_prediction_result" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_create_prediction_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_create_prediction_result" - ) as pre: + 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.AMLRestInterceptor, "post_create_prediction_result" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_create_prediction_result_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_create_prediction_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30288,8 +30305,9 @@ def test_update_prediction_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30436,19 +30454,20 @@ def test_update_prediction_result_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_update_prediction_result" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_update_prediction_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_update_prediction_result" - ) as pre: + 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.AMLRestInterceptor, "post_update_prediction_result" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_update_prediction_result_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_update_prediction_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30503,8 +30522,9 @@ def test_export_prediction_result_metadata_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30561,20 +30581,21 @@ def test_export_prediction_result_metadata_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_export_prediction_result_metadata" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, - "post_export_prediction_result_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_export_prediction_result_metadata" - ) as pre: + 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.AMLRestInterceptor, "post_export_prediction_result_metadata" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, + "post_export_prediction_result_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_export_prediction_result_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30629,8 +30650,9 @@ def test_delete_prediction_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30687,19 +30709,20 @@ def test_delete_prediction_result_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_delete_prediction_result" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_delete_prediction_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_delete_prediction_result" - ) as pre: + 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.AMLRestInterceptor, "post_delete_prediction_result" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_delete_prediction_result_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_delete_prediction_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30752,8 +30775,9 @@ def test_list_backtest_results_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30816,17 +30840,19 @@ def test_list_backtest_results_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_list_backtest_results" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_list_backtest_results_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_list_backtest_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AMLRestInterceptor, "post_list_backtest_results" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_list_backtest_results_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_list_backtest_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30886,8 +30912,9 @@ def test_get_backtest_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30960,17 +30987,19 @@ def test_get_backtest_result_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_get_backtest_result" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_get_backtest_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_get_backtest_result" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AMLRestInterceptor, "post_get_backtest_result" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_get_backtest_result_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_get_backtest_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31025,8 +31054,9 @@ def test_create_backtest_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31163,19 +31193,20 @@ def test_create_backtest_result_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_create_backtest_result" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_create_backtest_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_create_backtest_result" - ) as pre: + 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.AMLRestInterceptor, "post_create_backtest_result" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_create_backtest_result_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_create_backtest_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31232,8 +31263,9 @@ def test_update_backtest_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31374,19 +31406,20 @@ def test_update_backtest_result_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_update_backtest_result" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_update_backtest_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_update_backtest_result" - ) as pre: + 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.AMLRestInterceptor, "post_update_backtest_result" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_update_backtest_result_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_update_backtest_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31441,8 +31474,9 @@ def test_export_backtest_result_metadata_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31499,20 +31533,21 @@ def test_export_backtest_result_metadata_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_export_backtest_result_metadata" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, - "post_export_backtest_result_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_export_backtest_result_metadata" - ) as pre: + 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.AMLRestInterceptor, "post_export_backtest_result_metadata" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, + "post_export_backtest_result_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_export_backtest_result_metadata" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31567,8 +31602,9 @@ def test_delete_backtest_result_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31625,19 +31661,20 @@ def test_delete_backtest_result_rest_interceptors(null_interceptor): ) client = AMLClient(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.AMLRestInterceptor, "post_delete_backtest_result" - ) as post, mock.patch.object( - transports.AMLRestInterceptor, "post_delete_backtest_result_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AMLRestInterceptor, "pre_delete_backtest_result" - ) as pre: + 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.AMLRestInterceptor, "post_delete_backtest_result" + ) as post, + mock.patch.object( + transports.AMLRestInterceptor, "post_delete_backtest_result_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AMLRestInterceptor, "pre_delete_backtest_result" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31690,8 +31727,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31750,8 +31788,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31812,8 +31851,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31874,8 +31914,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31936,8 +31977,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31998,8 +32040,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -32978,11 +33021,14 @@ def test_aml_base_transport(): def test_aml_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.financialservices_v1.services.aml.transports.AMLTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.financialservices_v1.services.aml.transports.AMLTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AMLTransport( @@ -32999,9 +33045,12 @@ def test_aml_base_transport_with_credentials_file(): def test_aml_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.financialservices_v1.services.aml.transports.AMLTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.financialservices_v1.services.aml.transports.AMLTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AMLTransport() @@ -33073,11 +33122,12 @@ def test_aml_transport_auth_gdch_credentials(transport_class): def test_aml_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-functions/docs/conf.py b/packages/google-cloud-functions/docs/conf.py index d2bd7a2ced8e..6189a9341e9e 100644 --- a/packages/google-cloud-functions/docs/conf.py +++ b/packages/google-cloud-functions/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-functions documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/__init__.py b/packages/google-cloud-functions/google/cloud/functions_v1/__init__.py index 02772ffc354a..f606afc732ec 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/__init__.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_functions_service import ( CloudFunctionsServiceAsyncClient, CloudFunctionsServiceClient, diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/async_client.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/async_client.py index 3799ccd3d331..ed0e3f2f550f 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/async_client.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.functions_v1 import gapic_version as package_version @@ -44,15 +44,19 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.functions_v1.services.cloud_functions_service import pagers from google.cloud.functions_v1.types import functions, operations @@ -137,7 +141,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudFunctionsServiceAsyncClient: The constructed client. """ - return CloudFunctionsServiceClient.from_service_account_info.__func__(CloudFunctionsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudFunctionsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudFunctionsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -153,7 +158,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudFunctionsServiceAsyncClient: The constructed client. """ - return CloudFunctionsServiceClient.from_service_account_file.__func__(CloudFunctionsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudFunctionsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CloudFunctionsServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -191,7 +197,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudFunctionsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudFunctionsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudFunctionsServiceTransport: @@ -1272,7 +1280,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import functions_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -1390,7 +1398,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import functions_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -1508,7 +1516,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import functions_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/client.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/client.py index b7dbad96a9c7..fe00bc36cab2 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/client.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.functions_v1 import gapic_version as package_version @@ -61,15 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.functions_v1.services.cloud_functions_service import pagers from google.cloud.functions_v1.types import functions, operations @@ -88,9 +92,7 @@ class CloudFunctionsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudFunctionsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudFunctionsServiceTransport]] _transport_registry["grpc"] = CloudFunctionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = CloudFunctionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = CloudFunctionsServiceRestTransport @@ -686,11 +688,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudFunctionsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudFunctionsServiceClient._read_environment_variables() + ) self._client_cert_source = CloudFunctionsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -725,8 +725,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudFunctionsServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1731,7 +1730,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import functions_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -1848,7 +1847,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import functions_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -1965,7 +1964,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import functions_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/pagers.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/pagers.py index 0947d608bef2..28c131615310 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/pagers.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/__init__.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/__init__.py index 15d2b6150200..6c6842ac2e7a 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/__init__.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudFunctionsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudFunctionsServiceTransport]] _transport_registry["grpc"] = CloudFunctionsServiceGrpcTransport _transport_registry["grpc_asyncio"] = CloudFunctionsServiceGrpcAsyncIOTransport _transport_registry["rest"] = CloudFunctionsServiceRestTransport diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/base.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/base.py index ce88cf4ffc4c..d4577ea380ba 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/base.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/base.py @@ -17,17 +17,21 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.functions_v1 import gapic_version as package_version from google.cloud.functions_v1.types import functions diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc.py index 5cab9bc9e8d4..a5cdedf61a3a 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc.py @@ -16,21 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.functions_v1.types import functions diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc_asyncio.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc_asyncio.py index 1fe588ce4424..ab0d9a68387a 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/grpc_asyncio.py @@ -17,23 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.functions_v1.types import functions diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest.py index cd38f0662a7a..558c3c702b70 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest.py @@ -16,19 +16,23 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -959,9 +963,7 @@ def __call__( Response of ``CallFunction`` method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseCallFunction._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseCallFunction._get_http_options() request, metadata = self._interceptor.pre_call_function(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseCallFunction._get_transcoded_request( @@ -1113,9 +1115,7 @@ def __call__( """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseCreateFunction._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseCreateFunction._get_http_options() request, metadata = self._interceptor.pre_create_function(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseCreateFunction._get_transcoded_request( @@ -1139,7 +1139,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1264,9 +1264,7 @@ def __call__( """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseDeleteFunction._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseDeleteFunction._get_http_options() request, metadata = self._interceptor.pre_delete_function(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseDeleteFunction._get_transcoded_request( @@ -1286,7 +1284,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1408,9 +1406,7 @@ def __call__( Response of ``GenerateDownloadUrl`` method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseGenerateDownloadUrl._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseGenerateDownloadUrl._get_http_options() request, metadata = self._interceptor.pre_generate_download_url( request, metadata @@ -1565,9 +1561,7 @@ def __call__( Response of ``GenerateSourceUploadUrl`` method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseGenerateUploadUrl._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseGenerateUploadUrl._get_http_options() request, metadata = self._interceptor.pre_generate_upload_url( request, metadata @@ -1725,9 +1719,7 @@ def __call__( """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseGetFunction._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseGetFunction._get_http_options() request, metadata = self._interceptor.pre_get_function(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseGetFunction._get_transcoded_request( @@ -1945,9 +1937,7 @@ def __call__( """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2090,9 +2080,7 @@ def __call__( Response for the ``ListFunctions`` method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseListFunctions._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseListFunctions._get_http_options() request, metadata = self._interceptor.pre_list_functions(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseListFunctions._get_transcoded_request( @@ -2311,9 +2299,7 @@ def __call__( """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2462,9 +2448,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2620,9 +2604,7 @@ def __call__( """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseUpdateFunction._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseUpdateFunction._get_http_options() request, metadata = self._interceptor.pre_update_function(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseUpdateFunction._get_transcoded_request( @@ -2646,7 +2628,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2866,9 +2848,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -3007,9 +2987,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3148,9 +3126,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCloudFunctionsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCloudFunctionsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCloudFunctionsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest_base.py b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest_base.py index fcc000c11da0..0c3b77a9cedd 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest_base.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/services/cloud_functions_service/transports/rest_base.py @@ -17,10 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/types/__init__.py b/packages/google-cloud-functions/google/cloud/functions_v1/types/__init__.py index 110a919c29cd..5e8659f9439b 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/types/__init__.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/types/__init__.py @@ -35,7 +35,10 @@ SourceRepository, UpdateFunctionRequest, ) -from .operations import OperationMetadataV1, OperationType +from .operations import ( + OperationMetadataV1, + OperationType, +) __all__ = ( "CallFunctionRequest", diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/types/functions.py b/packages/google-cloud-functions/google/cloud/functions_v1/types/functions.py index f8b93dbb05dc..4fc739781c86 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/types/functions.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/types/functions.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -71,6 +71,7 @@ class CloudFunctionStatus(proto.Enum): be updated or deleted to move it out of this state. """ + CLOUD_FUNCTION_STATUS_UNSPECIFIED = 0 ACTIVE = 1 OFFLINE = 2 @@ -321,6 +322,7 @@ class VpcConnectorEgressSettings(proto.Enum): Force the use of VPC Access Connector for all egress traffic from the function. """ + VPC_CONNECTOR_EGRESS_SETTINGS_UNSPECIFIED = 0 PRIVATE_RANGES_ONLY = 1 ALL_TRAFFIC = 2 @@ -345,6 +347,7 @@ class IngressSettings(proto.Enum): Allow HTTP traffic from private VPC sources and through GCLB. """ + INGRESS_SETTINGS_UNSPECIFIED = 0 ALLOW_ALL = 1 ALLOW_INTERNAL_ONLY = 2 @@ -367,6 +370,7 @@ class DockerRegistry(proto.Enum): also be specified by the user using the ``docker_repository`` field. """ + DOCKER_REGISTRY_UNSPECIFIED = 0 CONTAINER_REGISTRY = 1 ARTIFACT_REGISTRY = 2 @@ -633,6 +637,7 @@ class SecurityLevel(proto.Enum): application can examine the request to determine which protocol was used and respond accordingly. """ + SECURITY_LEVEL_UNSPECIFIED = 0 SECURE_ALWAYS = 1 SECURE_OPTIONAL = 2 diff --git a/packages/google-cloud-functions/google/cloud/functions_v1/types/operations.py b/packages/google-cloud-functions/google/cloud/functions_v1/types/operations.py index c71ead091831..585ed0341d2e 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v1/types/operations.py +++ b/packages/google-cloud-functions/google/cloud/functions_v1/types/operations.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -43,6 +43,7 @@ class OperationType(proto.Enum): DELETE_FUNCTION (3): Triggered by DeleteFunction call. """ + OPERATION_UNSPECIFIED = 0 CREATE_FUNCTION = 1 UPDATE_FUNCTION = 2 diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/__init__.py b/packages/google-cloud-functions/google/cloud/functions_v2/__init__.py index 3328bc2025a6..c60161d267bb 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/__init__.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.function_service import FunctionServiceAsyncClient, FunctionServiceClient from .types.functions import ( AutomaticUpdatePolicy, diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/async_client.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/async_client.py index 0b59ed7bc53d..13779bdb5b0c 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/async_client.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.functions_v2 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.functions_v2.services.function_service import pagers from google.cloud.functions_v2.types import functions @@ -147,7 +149,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FunctionServiceAsyncClient: The constructed client. """ - return FunctionServiceClient.from_service_account_info.__func__(FunctionServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = FunctionServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(FunctionServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -163,7 +166,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FunctionServiceAsyncClient: The constructed client. """ - return FunctionServiceClient.from_service_account_file.__func__(FunctionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = FunctionServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(FunctionServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/client.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/client.py index 73b824e3f289..80c54311aecc 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/client.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.functions_v2 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.functions_v2.services.function_service import pagers from google.cloud.functions_v2.types import functions @@ -88,9 +90,7 @@ class FunctionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FunctionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FunctionServiceTransport]] _transport_registry["grpc"] = FunctionServiceGrpcTransport _transport_registry["grpc_asyncio"] = FunctionServiceGrpcAsyncIOTransport _transport_registry["rest"] = FunctionServiceRestTransport @@ -837,11 +837,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FunctionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FunctionServiceClient._read_environment_variables() + ) self._client_cert_source = FunctionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -876,8 +874,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FunctionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/pagers.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/pagers.py index e09a433570f0..575ec083e653 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/pagers.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/base.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/base.py index ee3abbe08d6b..29953094aebc 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/base.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.functions_v2 import gapic_version as package_version from google.cloud.functions_v2.types import functions diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc.py index f63177f6642a..03ecd4468196 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.functions_v2.types import functions diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc_asyncio.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc_asyncio.py index 21b5564dbb8b..516347fbe416 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.functions_v2.types import functions diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest.py index b5fb2063a4a3..4961363d0138 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -867,9 +869,7 @@ def __call__( """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseCreateFunction._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseCreateFunction._get_http_options() request, metadata = self._interceptor.pre_create_function(request, metadata) transcoded_request = _BaseFunctionServiceRestTransport._BaseCreateFunction._get_transcoded_request( @@ -893,7 +893,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1017,9 +1017,7 @@ def __call__( """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseDeleteFunction._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseDeleteFunction._get_http_options() request, metadata = self._interceptor.pre_delete_function(request, metadata) transcoded_request = _BaseFunctionServiceRestTransport._BaseDeleteFunction._get_transcoded_request( @@ -1039,7 +1037,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1161,9 +1159,7 @@ def __call__( Response of ``GenerateDownloadUrl`` method. """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseGenerateDownloadUrl._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseGenerateDownloadUrl._get_http_options() request, metadata = self._interceptor.pre_generate_download_url( request, metadata @@ -1316,9 +1312,7 @@ def __call__( Response of ``GenerateSourceUploadUrl`` method. """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseGenerateUploadUrl._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseGenerateUploadUrl._get_http_options() request, metadata = self._interceptor.pre_generate_upload_url( request, metadata @@ -1909,9 +1903,7 @@ def __call__( """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseUpdateFunction._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseUpdateFunction._get_http_options() request, metadata = self._interceptor.pre_update_function(request, metadata) transcoded_request = _BaseFunctionServiceRestTransport._BaseUpdateFunction._get_transcoded_request( @@ -1935,7 +1927,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2555,9 +2547,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2842,9 +2832,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseFunctionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseFunctionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseFunctionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest_base.py b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest_base.py index e352529de1c4..c3868d1d3167 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest_base.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/services/function_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-functions/google/cloud/functions_v2/types/functions.py b/packages/google-cloud-functions/google/cloud/functions_v2/types/functions.py index a9b7125d74e1..27e43bd0ec67 100644 --- a/packages/google-cloud-functions/google/cloud/functions_v2/types/functions.py +++ b/packages/google-cloud-functions/google/cloud/functions_v2/types/functions.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -74,6 +74,7 @@ class OperationType(proto.Enum): DELETE_FUNCTION (3): DeleteFunction """ + OPERATIONTYPE_UNSPECIFIED = 0 CREATE_FUNCTION = 1 UPDATE_FUNCTION = 2 @@ -91,6 +92,7 @@ class Environment(proto.Enum): GEN_2 (2): Gen 2 """ + ENVIRONMENT_UNSPECIFIED = 0 GEN_1 = 1 GEN_2 = 2 @@ -171,6 +173,7 @@ class State(proto.Enum): be updated or deleted to move it out of this state. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 FAILED = 2 @@ -271,6 +274,7 @@ class Severity(proto.Enum): INFO (3): INFO-level severity. """ + SEVERITY_UNSPECIFIED = 0 ERROR = 1 WARNING = 2 @@ -601,6 +605,7 @@ class DockerRegistry(proto.Enum): also be specified by the user using the ``docker_repository`` field. """ + DOCKER_REGISTRY_UNSPECIFIED = 0 CONTAINER_REGISTRY = 1 ARTIFACT_REGISTRY = 2 @@ -783,6 +788,7 @@ class VpcConnectorEgressSettings(proto.Enum): Force the use of VPC Access Connector for all egress traffic from the function. """ + VPC_CONNECTOR_EGRESS_SETTINGS_UNSPECIFIED = 0 PRIVATE_RANGES_ONLY = 1 ALL_TRAFFIC = 2 @@ -807,6 +813,7 @@ class IngressSettings(proto.Enum): Allow HTTP traffic from private VPC sources and through GCLB. """ + INGRESS_SETTINGS_UNSPECIFIED = 0 ALLOW_ALL = 1 ALLOW_INTERNAL_ONLY = 2 @@ -835,6 +842,7 @@ class SecurityLevel(proto.Enum): application can examine the request to determine which protocol was used and respond accordingly. """ + SECURITY_LEVEL_UNSPECIFIED = 0 SECURE_ALWAYS = 1 SECURE_OPTIONAL = 2 @@ -1110,6 +1118,7 @@ class RetryPolicy(proto.Enum): Retry on any failure, retry up to 7 days with an exponential backoff (capped at 10 seconds). """ + RETRY_POLICY_UNSPECIFIED = 0 RETRY_POLICY_DO_NOT_RETRY = 1 RETRY_POLICY_RETRY = 2 @@ -1543,6 +1552,7 @@ class RuntimeStage(proto.Enum): DECOMMISSIONED (6): The runtime is no longer supported. """ + RUNTIME_STAGE_UNSPECIFIED = 0 DEVELOPMENT = 1 ALPHA = 2 @@ -1791,6 +1801,7 @@ class Name(proto.Enum): TRIGGER_ROLLBACK (6): Trigger Rollback Stage """ + NAME_UNSPECIFIED = 0 ARTIFACT_REGISTRY = 1 BUILD = 2 @@ -1812,6 +1823,7 @@ class State(proto.Enum): COMPLETE (3): Stage has completed. """ + STATE_UNSPECIFIED = 0 NOT_STARTED = 1 IN_PROGRESS = 2 diff --git a/packages/google-cloud-functions/noxfile.py b/packages/google-cloud-functions/noxfile.py index c70ad80a3ef9..f036c530c3ea 100644 --- a/packages/google-cloud-functions/noxfile.py +++ b/packages/google-cloud-functions/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_async.py b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_async.py index 0aa93d923ed3..c34d2bcb0363 100644 --- a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_async.py +++ b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-functions -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START cloudfunctions_v1_generated_CloudFunctionsService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import functions_v1 diff --git a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_sync.py b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_sync.py index b134958a05a5..cad2ec5a4692 100644 --- a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_sync.py +++ b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-functions -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START cloudfunctions_v1_generated_CloudFunctionsService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import functions_v1 diff --git a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_async.py b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_async.py index c5b414745680..d3dab46649ee 100644 --- a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_async.py +++ b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-functions -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START cloudfunctions_v1_generated_CloudFunctionsService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import functions_v1 diff --git a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_sync.py b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_sync.py index 5ddadcc5e010..4e359995646c 100644 --- a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_sync.py +++ b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-functions -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START cloudfunctions_v1_generated_CloudFunctionsService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import functions_v1 diff --git a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_async.py b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_async.py index 470980e438e0..c8f434a72cc2 100644 --- a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_async.py +++ b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-functions -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START cloudfunctions_v1_generated_CloudFunctionsService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import functions_v1 diff --git a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_sync.py b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_sync.py index 7c37c580ebad..7874e9298800 100644 --- a/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-functions/samples/generated_samples/cloudfunctions_v1_generated_cloud_functions_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-functions -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START cloudfunctions_v1_generated_CloudFunctionsService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import functions_v1 diff --git a/packages/google-cloud-functions/tests/unit/gapic/functions_v1/test_cloud_functions_service.py b/packages/google-cloud-functions/tests/unit/gapic/functions_v1/test_cloud_functions_service.py index 5e922300a216..76be6faac165 100644 --- a/packages/google-cloud-functions/tests/unit/gapic/functions_v1/test_cloud_functions_service.py +++ b/packages/google-cloud-functions/tests/unit/gapic/functions_v1/test_cloud_functions_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +63,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.functions_v1.services.cloud_functions_service import ( CloudFunctionsServiceAsyncClient, @@ -1013,10 +1018,9 @@ def test_cloud_functions_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1065,9 @@ def test_cloud_functions_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1103,9 @@ def test_cloud_functions_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,13 +1361,13 @@ def test_cloud_functions_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3675,9 +3677,9 @@ def test_generate_upload_url_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_upload_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_upload_url] = ( + mock_rpc + ) request = {} client.generate_upload_url(request) @@ -3931,9 +3933,9 @@ def test_generate_download_url_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_download_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_download_url] = ( + mock_rpc + ) request = {} client.generate_download_url(request) @@ -4707,9 +4709,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5926,9 +5928,9 @@ def test_generate_upload_url_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_upload_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_upload_url] = ( + mock_rpc + ) request = {} client.generate_upload_url(request) @@ -5967,9 +5969,9 @@ def test_generate_download_url_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_download_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_download_url] = ( + mock_rpc + ) request = {} client.generate_download_url(request) @@ -6254,9 +6256,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -7062,8 +7064,9 @@ def test_list_functions_rest_bad_request(request_type=functions.ListFunctionsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7128,18 +7131,20 @@ def test_list_functions_rest_interceptors(null_interceptor): ) client = CloudFunctionsServiceClient(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.CloudFunctionsServiceRestInterceptor, "post_list_functions" - ) as post, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, - "post_list_functions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, "pre_list_functions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "post_list_functions" + ) as post, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, + "post_list_functions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "pre_list_functions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7190,8 +7195,9 @@ def test_get_function_rest_bad_request(request_type=functions.GetFunctionRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7305,18 +7311,20 @@ def test_get_function_rest_interceptors(null_interceptor): ) client = CloudFunctionsServiceClient(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.CloudFunctionsServiceRestInterceptor, "post_get_function" - ) as post, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, - "post_get_function_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, "pre_get_function" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "post_get_function" + ) as post, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, + "post_get_function_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "pre_get_function" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7365,8 +7373,9 @@ def test_create_function_rest_bad_request(request_type=functions.CreateFunctionR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7547,20 +7556,21 @@ def test_create_function_rest_interceptors(null_interceptor): ) client = CloudFunctionsServiceClient(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.CloudFunctionsServiceRestInterceptor, "post_create_function" - ) as post, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, - "post_create_function_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, "pre_create_function" - ) as pre: + 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.CloudFunctionsServiceRestInterceptor, "post_create_function" + ) as post, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, + "post_create_function_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "pre_create_function" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7613,8 +7623,9 @@ def test_update_function_rest_bad_request(request_type=functions.UpdateFunctionR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7797,20 +7808,21 @@ def test_update_function_rest_interceptors(null_interceptor): ) client = CloudFunctionsServiceClient(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.CloudFunctionsServiceRestInterceptor, "post_update_function" - ) as post, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, - "post_update_function_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, "pre_update_function" - ) as pre: + 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.CloudFunctionsServiceRestInterceptor, "post_update_function" + ) as post, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, + "post_update_function_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "pre_update_function" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7861,8 +7873,9 @@ def test_delete_function_rest_bad_request(request_type=functions.DeleteFunctionR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7919,20 +7932,21 @@ def test_delete_function_rest_interceptors(null_interceptor): ) client = CloudFunctionsServiceClient(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.CloudFunctionsServiceRestInterceptor, "post_delete_function" - ) as post, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, - "post_delete_function_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, "pre_delete_function" - ) as pre: + 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.CloudFunctionsServiceRestInterceptor, "post_delete_function" + ) as post, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, + "post_delete_function_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "pre_delete_function" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7983,8 +7997,9 @@ def test_call_function_rest_bad_request(request_type=functions.CallFunctionReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8051,18 +8066,20 @@ def test_call_function_rest_interceptors(null_interceptor): ) client = CloudFunctionsServiceClient(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.CloudFunctionsServiceRestInterceptor, "post_call_function" - ) as post, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, - "post_call_function_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, "pre_call_function" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "post_call_function" + ) as post, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, + "post_call_function_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "pre_call_function" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8115,8 +8132,9 @@ def test_generate_upload_url_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8179,18 +8197,20 @@ def test_generate_upload_url_rest_interceptors(null_interceptor): ) client = CloudFunctionsServiceClient(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.CloudFunctionsServiceRestInterceptor, "post_generate_upload_url" - ) as post, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, - "post_generate_upload_url_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, "pre_generate_upload_url" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "post_generate_upload_url" + ) as post, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, + "post_generate_upload_url_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "pre_generate_upload_url" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8248,8 +8268,9 @@ def test_generate_download_url_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8312,18 +8333,21 @@ def test_generate_download_url_rest_interceptors(null_interceptor): ) client = CloudFunctionsServiceClient(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.CloudFunctionsServiceRestInterceptor, "post_generate_download_url" - ) as post, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, - "post_generate_download_url_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, "pre_generate_download_url" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, + "post_generate_download_url", + ) as post, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, + "post_generate_download_url_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "pre_generate_download_url" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8381,8 +8405,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8444,18 +8469,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = CloudFunctionsServiceClient(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.CloudFunctionsServiceRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8506,8 +8533,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8569,18 +8597,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = CloudFunctionsServiceClient(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.CloudFunctionsServiceRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8631,8 +8661,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8692,18 +8723,20 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = CloudFunctionsServiceClient(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.CloudFunctionsServiceRestInterceptor, "post_test_iam_permissions" - ) as post, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudFunctionsServiceRestInterceptor, "pre_test_iam_permissions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "post_test_iam_permissions" + ) as post, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudFunctionsServiceRestInterceptor, "pre_test_iam_permissions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8759,8 +8792,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8819,8 +8853,9 @@ def test_get_operation_rest_bad_request( request = json_format.ParseDict({"name": "operations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8879,8 +8914,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9249,11 +9285,14 @@ def test_cloud_functions_service_base_transport(): def test_cloud_functions_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.functions_v1.services.cloud_functions_service.transports.CloudFunctionsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.functions_v1.services.cloud_functions_service.transports.CloudFunctionsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudFunctionsServiceTransport( @@ -9270,9 +9309,12 @@ def test_cloud_functions_service_base_transport_with_credentials_file(): def test_cloud_functions_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.functions_v1.services.cloud_functions_service.transports.CloudFunctionsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.functions_v1.services.cloud_functions_service.transports.CloudFunctionsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudFunctionsServiceTransport() @@ -9346,11 +9388,12 @@ def test_cloud_functions_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-functions/tests/unit/gapic/functions_v2/test_function_service.py b/packages/google-cloud-functions/tests/unit/gapic/functions_v2/test_function_service.py index 75a7f164e9c0..9b11531d1ef6 100644 --- a/packages/google-cloud-functions/tests/unit/gapic/functions_v2/test_function_service.py +++ b/packages/google-cloud-functions/tests/unit/gapic/functions_v2/test_function_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.functions_v2.services.function_service import ( FunctionServiceAsyncClient, @@ -986,10 +988,9 @@ def test_function_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1035,9 @@ def test_function_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1073,10 +1073,9 @@ def test_function_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1319,13 +1318,13 @@ def test_function_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3321,9 +3320,9 @@ def test_generate_upload_url_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_upload_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_upload_url] = ( + mock_rpc + ) request = {} client.generate_upload_url(request) @@ -3577,9 +3576,9 @@ def test_generate_download_url_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_download_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_download_url] = ( + mock_rpc + ) request = {} client.generate_download_url(request) @@ -5067,9 +5066,9 @@ def test_generate_upload_url_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_upload_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_upload_url] = ( + mock_rpc + ) request = {} client.generate_upload_url(request) @@ -5193,9 +5192,9 @@ def test_generate_download_url_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_download_url - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_download_url] = ( + mock_rpc + ) request = {} client.generate_download_url(request) @@ -5999,8 +5998,9 @@ def test_get_function_rest_bad_request(request_type=functions.GetFunctionRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6075,17 +6075,19 @@ def test_get_function_rest_interceptors(null_interceptor): ) client = FunctionServiceClient(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.FunctionServiceRestInterceptor, "post_get_function" - ) as post, mock.patch.object( - transports.FunctionServiceRestInterceptor, "post_get_function_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FunctionServiceRestInterceptor, "pre_get_function" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "post_get_function" + ) as post, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "post_get_function_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "pre_get_function" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6134,8 +6136,9 @@ def test_list_functions_rest_bad_request(request_type=functions.ListFunctionsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6200,17 +6203,20 @@ def test_list_functions_rest_interceptors(null_interceptor): ) client = FunctionServiceClient(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.FunctionServiceRestInterceptor, "post_list_functions" - ) as post, mock.patch.object( - transports.FunctionServiceRestInterceptor, "post_list_functions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FunctionServiceRestInterceptor, "pre_list_functions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "post_list_functions" + ) as post, + mock.patch.object( + transports.FunctionServiceRestInterceptor, + "post_list_functions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "pre_list_functions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6261,8 +6267,9 @@ def test_create_function_rest_bad_request(request_type=functions.CreateFunctionR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6488,19 +6495,21 @@ def test_create_function_rest_interceptors(null_interceptor): ) client = FunctionServiceClient(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.FunctionServiceRestInterceptor, "post_create_function" - ) as post, mock.patch.object( - transports.FunctionServiceRestInterceptor, "post_create_function_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FunctionServiceRestInterceptor, "pre_create_function" - ) as pre: + 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.FunctionServiceRestInterceptor, "post_create_function" + ) as post, + mock.patch.object( + transports.FunctionServiceRestInterceptor, + "post_create_function_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "pre_create_function" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6553,8 +6562,9 @@ def test_update_function_rest_bad_request(request_type=functions.UpdateFunctionR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6782,19 +6792,21 @@ def test_update_function_rest_interceptors(null_interceptor): ) client = FunctionServiceClient(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.FunctionServiceRestInterceptor, "post_update_function" - ) as post, mock.patch.object( - transports.FunctionServiceRestInterceptor, "post_update_function_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FunctionServiceRestInterceptor, "pre_update_function" - ) as pre: + 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.FunctionServiceRestInterceptor, "post_update_function" + ) as post, + mock.patch.object( + transports.FunctionServiceRestInterceptor, + "post_update_function_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "pre_update_function" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6845,8 +6857,9 @@ def test_delete_function_rest_bad_request(request_type=functions.DeleteFunctionR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6903,19 +6916,21 @@ def test_delete_function_rest_interceptors(null_interceptor): ) client = FunctionServiceClient(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.FunctionServiceRestInterceptor, "post_delete_function" - ) as post, mock.patch.object( - transports.FunctionServiceRestInterceptor, "post_delete_function_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FunctionServiceRestInterceptor, "pre_delete_function" - ) as pre: + 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.FunctionServiceRestInterceptor, "post_delete_function" + ) as post, + mock.patch.object( + transports.FunctionServiceRestInterceptor, + "post_delete_function_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "pre_delete_function" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6968,8 +6983,9 @@ def test_generate_upload_url_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7032,18 +7048,20 @@ def test_generate_upload_url_rest_interceptors(null_interceptor): ) client = FunctionServiceClient(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.FunctionServiceRestInterceptor, "post_generate_upload_url" - ) as post, mock.patch.object( - transports.FunctionServiceRestInterceptor, - "post_generate_upload_url_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FunctionServiceRestInterceptor, "pre_generate_upload_url" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "post_generate_upload_url" + ) as post, + mock.patch.object( + transports.FunctionServiceRestInterceptor, + "post_generate_upload_url_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "pre_generate_upload_url" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7101,8 +7119,9 @@ def test_generate_download_url_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7165,18 +7184,20 @@ def test_generate_download_url_rest_interceptors(null_interceptor): ) client = FunctionServiceClient(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.FunctionServiceRestInterceptor, "post_generate_download_url" - ) as post, mock.patch.object( - transports.FunctionServiceRestInterceptor, - "post_generate_download_url_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FunctionServiceRestInterceptor, "pre_generate_download_url" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "post_generate_download_url" + ) as post, + mock.patch.object( + transports.FunctionServiceRestInterceptor, + "post_generate_download_url_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "pre_generate_download_url" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7232,8 +7253,9 @@ def test_list_runtimes_rest_bad_request(request_type=functions.ListRuntimesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7293,17 +7315,20 @@ def test_list_runtimes_rest_interceptors(null_interceptor): ) client = FunctionServiceClient(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.FunctionServiceRestInterceptor, "post_list_runtimes" - ) as post, mock.patch.object( - transports.FunctionServiceRestInterceptor, "post_list_runtimes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FunctionServiceRestInterceptor, "pre_list_runtimes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "post_list_runtimes" + ) as post, + mock.patch.object( + transports.FunctionServiceRestInterceptor, + "post_list_runtimes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FunctionServiceRestInterceptor, "pre_list_runtimes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7356,8 +7381,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7418,8 +7444,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7480,8 +7507,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7542,8 +7570,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7604,8 +7633,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7666,8 +7696,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7974,11 +8005,14 @@ def test_function_service_base_transport(): def test_function_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.functions_v2.services.function_service.transports.FunctionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.functions_v2.services.function_service.transports.FunctionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FunctionServiceTransport( @@ -7995,9 +8029,12 @@ def test_function_service_base_transport_with_credentials_file(): def test_function_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.functions_v2.services.function_service.transports.FunctionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.functions_v2.services.function_service.transports.FunctionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FunctionServiceTransport() @@ -8069,11 +8106,12 @@ def test_function_service_transport_auth_gdch_credentials(transport_class): def test_function_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-gdchardwaremanagement/docs/conf.py b/packages/google-cloud-gdchardwaremanagement/docs/conf.py index 0800a0220467..f86c7797a7a9 100644 --- a/packages/google-cloud-gdchardwaremanagement/docs/conf.py +++ b/packages/google-cloud-gdchardwaremanagement/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-gdchardwaremanagement documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/__init__.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/__init__.py index 318cb910e0ab..e1adc44f6e0c 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/__init__.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.gdc_hardware_management import ( GDCHardwareManagementAsyncClient, GDCHardwareManagementClient, diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/async_client.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/async_client.py index beb32da53d92..20bb08c761f4 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/async_client.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gdchardwaremanagement_v1alpha import gapic_version as package_version @@ -44,14 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore from google.cloud.gdchardwaremanagement_v1alpha.services.gdc_hardware_management import ( pagers, @@ -146,7 +146,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GDCHardwareManagementAsyncClient: The constructed client. """ - return GDCHardwareManagementClient.from_service_account_info.__func__(GDCHardwareManagementAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GDCHardwareManagementClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GDCHardwareManagementAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -162,7 +163,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GDCHardwareManagementAsyncClient: The constructed client. """ - return GDCHardwareManagementClient.from_service_account_file.__func__(GDCHardwareManagementAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GDCHardwareManagementClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(GDCHardwareManagementAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -200,7 +202,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GDCHardwareManagementClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GDCHardwareManagementClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GDCHardwareManagementTransport: diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/client.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/client.py index f66dd12bbf7b..6430f3e7144f 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/client.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gdchardwaremanagement_v1alpha import gapic_version as package_version @@ -61,14 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore from google.cloud.gdchardwaremanagement_v1alpha.services.gdc_hardware_management import ( pagers, @@ -89,9 +89,7 @@ class GDCHardwareManagementClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GDCHardwareManagementTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GDCHardwareManagementTransport]] _transport_registry["grpc"] = GDCHardwareManagementGrpcTransport _transport_registry["grpc_asyncio"] = GDCHardwareManagementGrpcAsyncIOTransport _transport_registry["rest"] = GDCHardwareManagementRestTransport @@ -797,11 +795,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GDCHardwareManagementClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GDCHardwareManagementClient._read_environment_variables() + ) self._client_cert_source = GDCHardwareManagementClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -836,8 +832,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GDCHardwareManagementTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/pagers.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/pagers.py index 223ad333591e..a97395f4062b 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/pagers.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1159,7 +1159,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1235,7 +1235,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/__init__.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/__init__.py index 2eb7be7de59a..717ff6deab8c 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/__init__.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GDCHardwareManagementTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GDCHardwareManagementTransport]] _transport_registry["grpc"] = GDCHardwareManagementGrpcTransport _transport_registry["grpc_asyncio"] = GDCHardwareManagementGrpcAsyncIOTransport _transport_registry["rest"] = GDCHardwareManagementRestTransport diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/base.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/base.py index 61f8cd604149..3de3bc85c133 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/base.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gdchardwaremanagement_v1alpha import gapic_version as package_version from google.cloud.gdchardwaremanagement_v1alpha.types import resources, service @@ -980,13 +980,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc.py index f18c3a4cda45..1f99b5a2eec1 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.gdchardwaremanagement_v1alpha.types import resources, service diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc_asyncio.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc_asyncio.py index 9845e3230cb7..fb971f8aad19 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc_asyncio.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gdchardwaremanagement_v1alpha.types import resources, service diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/rest.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/rest.py index 997ea042d9ea..6bab872ba9d7 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/rest.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/services/gdc_hardware_management/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2433,9 +2433,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCancelOrder._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCancelOrder._get_http_options() request, metadata = self._interceptor.pre_cancel_order(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseCancelOrder._get_transcoded_request( @@ -2459,7 +2457,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2585,9 +2583,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCreateComment._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCreateComment._get_http_options() request, metadata = self._interceptor.pre_create_comment(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseCreateComment._get_transcoded_request( @@ -2611,7 +2607,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2737,9 +2733,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCreateHardware._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCreateHardware._get_http_options() request, metadata = self._interceptor.pre_create_hardware(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseCreateHardware._get_transcoded_request( @@ -2763,7 +2757,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2889,9 +2883,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCreateHardwareGroup._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCreateHardwareGroup._get_http_options() request, metadata = self._interceptor.pre_create_hardware_group( request, metadata @@ -2917,7 +2909,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3045,9 +3037,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCreateOrder._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCreateOrder._get_http_options() request, metadata = self._interceptor.pre_create_order(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseCreateOrder._get_transcoded_request( @@ -3071,7 +3061,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3197,9 +3187,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCreateSite._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCreateSite._get_http_options() request, metadata = self._interceptor.pre_create_site(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseCreateSite._get_transcoded_request( @@ -3223,7 +3211,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3349,9 +3337,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCreateZone._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCreateZone._get_http_options() request, metadata = self._interceptor.pre_create_zone(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseCreateZone._get_transcoded_request( @@ -3375,7 +3361,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3500,9 +3486,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseDeleteHardware._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseDeleteHardware._get_http_options() request, metadata = self._interceptor.pre_delete_hardware(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseDeleteHardware._get_transcoded_request( @@ -3522,7 +3506,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3646,9 +3630,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseDeleteHardwareGroup._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseDeleteHardwareGroup._get_http_options() request, metadata = self._interceptor.pre_delete_hardware_group( request, metadata @@ -3670,7 +3652,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3796,9 +3778,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseDeleteOrder._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseDeleteOrder._get_http_options() request, metadata = self._interceptor.pre_delete_order(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseDeleteOrder._get_transcoded_request( @@ -3818,7 +3798,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3942,9 +3922,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseDeleteSite._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseDeleteSite._get_http_options() request, metadata = self._interceptor.pre_delete_site(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseDeleteSite._get_transcoded_request( @@ -3964,7 +3942,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4088,9 +4066,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseDeleteZone._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseDeleteZone._get_http_options() request, metadata = self._interceptor.pre_delete_zone(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseDeleteZone._get_transcoded_request( @@ -4110,7 +4086,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4233,9 +4209,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetChangeLogEntry._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetChangeLogEntry._get_http_options() request, metadata = self._interceptor.pre_get_change_log_entry( request, metadata @@ -4382,9 +4356,7 @@ def __call__( A comment on an order. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetComment._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetComment._get_http_options() request, metadata = self._interceptor.pre_get_comment(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseGetComment._get_transcoded_request( @@ -4529,9 +4501,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetHardware._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetHardware._get_http_options() request, metadata = self._interceptor.pre_get_hardware(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseGetHardware._get_transcoded_request( @@ -4677,9 +4647,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetHardwareGroup._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetHardwareGroup._get_http_options() request, metadata = self._interceptor.pre_get_hardware_group( request, metadata @@ -4826,9 +4794,7 @@ def __call__( An order for GDC hardware. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetOrder._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetOrder._get_http_options() request, metadata = self._interceptor.pre_get_order(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseGetOrder._get_transcoded_request( @@ -5410,9 +5376,7 @@ def __call__( A list of change log entries. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListChangeLogEntries._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListChangeLogEntries._get_http_options() request, metadata = self._interceptor.pre_list_change_log_entries( request, metadata @@ -5561,9 +5525,7 @@ def __call__( A request to list comments. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListComments._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListComments._get_http_options() request, metadata = self._interceptor.pre_list_comments(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListComments._get_transcoded_request( @@ -5706,9 +5668,7 @@ def __call__( A list of hardware. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListHardware._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListHardware._get_http_options() request, metadata = self._interceptor.pre_list_hardware(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListHardware._get_transcoded_request( @@ -5851,9 +5811,7 @@ def __call__( A list of hardware groups. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListHardwareGroups._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListHardwareGroups._get_http_options() request, metadata = self._interceptor.pre_list_hardware_groups( request, metadata @@ -6002,9 +5960,7 @@ def __call__( A list of orders. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListOrders._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListOrders._get_http_options() request, metadata = self._interceptor.pre_list_orders(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListOrders._get_transcoded_request( @@ -6147,9 +6103,7 @@ def __call__( A list of sites. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListSites._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListSites._get_http_options() request, metadata = self._interceptor.pre_list_sites(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListSites._get_transcoded_request( @@ -6292,9 +6246,7 @@ def __call__( A list of SKUs. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListSkus._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListSkus._get_http_options() request, metadata = self._interceptor.pre_list_skus(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListSkus._get_transcoded_request( @@ -6437,9 +6389,7 @@ def __call__( A list of zones. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListZones._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListZones._get_http_options() request, metadata = self._interceptor.pre_list_zones(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListZones._get_transcoded_request( @@ -6584,9 +6534,7 @@ def __call__( A comment on an order. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseRecordActionOnComment._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseRecordActionOnComment._get_http_options() request, metadata = self._interceptor.pre_record_action_on_comment( request, metadata @@ -6743,9 +6691,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseRequestOrderDateChange._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseRequestOrderDateChange._get_http_options() request, metadata = self._interceptor.pre_request_order_date_change( request, metadata @@ -6771,7 +6717,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6898,9 +6844,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseSignalZoneState._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseSignalZoneState._get_http_options() request, metadata = self._interceptor.pre_signal_zone_state( request, metadata @@ -6926,7 +6870,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7054,9 +6998,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseSubmitOrder._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseSubmitOrder._get_http_options() request, metadata = self._interceptor.pre_submit_order(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseSubmitOrder._get_transcoded_request( @@ -7080,7 +7022,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7206,9 +7148,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseUpdateHardware._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseUpdateHardware._get_http_options() request, metadata = self._interceptor.pre_update_hardware(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseUpdateHardware._get_transcoded_request( @@ -7232,7 +7172,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7358,9 +7298,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseUpdateHardwareGroup._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseUpdateHardwareGroup._get_http_options() request, metadata = self._interceptor.pre_update_hardware_group( request, metadata @@ -7386,7 +7324,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7514,9 +7452,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseUpdateOrder._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseUpdateOrder._get_http_options() request, metadata = self._interceptor.pre_update_order(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseUpdateOrder._get_transcoded_request( @@ -7540,7 +7476,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7666,9 +7602,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseUpdateSite._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseUpdateSite._get_http_options() request, metadata = self._interceptor.pre_update_site(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseUpdateSite._get_transcoded_request( @@ -7692,7 +7626,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7818,9 +7752,7 @@ def __call__( """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseUpdateZone._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseUpdateZone._get_http_options() request, metadata = self._interceptor.pre_update_zone(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseUpdateZone._get_transcoded_request( @@ -7844,7 +7776,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8143,7 +8075,9 @@ def request_order_date_change( ) -> Callable[[service.RequestOrderDateChangeRequest], 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._RequestOrderDateChange(self._session, self._host, self._interceptor) # type: ignore + return self._RequestOrderDateChange( + self._session, self._host, self._interceptor + ) # type: ignore @property def signal_zone_state( @@ -8259,9 +8193,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseGetLocation._get_transcoded_request( @@ -8400,9 +8332,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListLocations._get_transcoded_request( @@ -8539,9 +8469,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -8661,9 +8589,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -8781,9 +8707,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseGetOperation._get_transcoded_request( @@ -8922,9 +8846,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGDCHardwareManagementRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGDCHardwareManagementRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGDCHardwareManagementRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py index 503566f60f83..0be9025fe9e3 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/resources.py @@ -17,12 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -67,6 +67,7 @@ class PowerSupply(proto.Enum): POWER_SUPPLY_DC (2): DC power supply. """ + POWER_SUPPLY_UNSPECIFIED = 0 POWER_SUPPLY_AC = 1 POWER_SUPPLY_DC = 2 @@ -85,6 +86,7 @@ class Entity(proto.Enum): VENDOR (3): Vendor. """ + ENTITY_UNSPECIFIED = 0 GOOGLE = 1 CUSTOMER = 2 @@ -219,6 +221,7 @@ class State(proto.Enum): CANCELLED (11): Order has been cancelled. """ + STATE_UNSPECIFIED = 0 DRAFT = 1 SUBMITTED = 2 @@ -246,6 +249,7 @@ class Type(proto.Enum): UNPAID (2): Not billed. """ + _pb_options = {"allow_alias": True} TYPE_UNSPECIFIED = 0 PAID = 1 @@ -270,6 +274,7 @@ class DeploymentType(proto.Enum): Customer lab deployment that we support as though it's prod. """ + DEPLOYMENT_TYPE_UNSPECIFIED = 0 FULL_PRODUCTION = 1 PROOF_OF_CONCEPT = 2 @@ -576,6 +581,7 @@ class State(proto.Enum): An error occurred and customer intervention is required. """ + STATE_UNSPECIFIED = 0 ADDITIONAL_INFO_NEEDED = 1 BUILDING = 2 @@ -724,6 +730,7 @@ class State(proto.Enum): An error occurred and customer intervention is required. """ + STATE_UNSPECIFIED = 0 ADDITIONAL_INFO_NEEDED = 1 BUILDING = 2 @@ -760,6 +767,7 @@ class AddressType(proto.Enum): VIRTUAL (3): Address of a virtual interface. """ + ADDRESS_TYPE_UNSPECIFIED = 0 NIC = 1 BMC = 2 @@ -1105,6 +1113,7 @@ class Type(proto.Enum): SERVER (2): Server SKU. """ + TYPE_UNSPECIFIED = 0 RACK = 1 SERVER = 2 @@ -1268,6 +1277,7 @@ class State(proto.Enum): CANCELLED (4): The Zone has been cancelled. """ + STATE_UNSPECIFIED = 0 ADDITIONAL_INFO_NEEDED = 1 PREPARING = 2 @@ -1292,6 +1302,7 @@ class ProvisioningState(proto.Enum): PROVISIONING_COMPLETE (3): Provisioning is complete. Set by customer. """ + PROVISIONING_STATE_UNSPECIFIED = 0 PROVISIONING_REQUIRED = 1 PROVISIONING_IN_PROGRESS = 2 @@ -1598,6 +1609,7 @@ class PowerReceptacleType(proto.Enum): TYPE_F (7): Type F. """ + POWER_RECEPTACLE_TYPE_UNSPECIFIED = 0 NEMA_5_15 = 1 C_13 = 2 @@ -1616,6 +1628,7 @@ class NetworkUplinkType(proto.Enum): RJ_45 (1): RJ-45. """ + NETWORK_UPLINK_TYPE_UNSPECIFIED = 0 RJ_45 = 1 @@ -1630,6 +1643,7 @@ class Voltage(proto.Enum): VOLTAGE_220 (3): 220V. """ + VOLTAGE_UNSPECIFIED = 0 VOLTAGE_110 = 1 VOLTAGE_220 = 3 @@ -1643,6 +1657,7 @@ class Amperes(proto.Enum): AMPERES_15 (1): 15A. """ + AMPERES_UNSPECIFIED = 0 AMPERES_15 = 1 @@ -1701,6 +1716,7 @@ class RackType(proto.Enum): FOUR_POST (2): Four post rack. """ + RACK_TYPE_UNSPECIFIED = 0 TWO_POST = 1 FOUR_POST = 2 @@ -1979,6 +1995,7 @@ class SubscriptionState(proto.Enum): The subscription has been completed, because it has reached the end date. """ + SUBSCRIPTION_STATE_UNSPECIFIED = 0 ACTIVE = 1 INACTIVE = 2 diff --git a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/service.py b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/service.py index 40d1d9ab9f79..0353b454c7d2 100644 --- a/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/service.py +++ b/packages/google-cloud-gdchardwaremanagement/google/cloud/gdchardwaremanagement_v1alpha/types/service.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore from google.cloud.gdchardwaremanagement_v1alpha.types import resources @@ -325,6 +325,7 @@ class Type(proto.Enum): hardware physical and installation information, etc. Further changes to any order information will no longer be allowed. """ + TYPE_UNSPECIFIED = 0 INFO_PENDING = 1 INFO_COMPLETE = 2 @@ -1094,6 +1095,7 @@ class ActionType(proto.Enum): UNREAD (2): Mark comment as unread. """ + ACTION_TYPE_UNSPECIFIED = 0 READ = 1 UNREAD = 2 @@ -1538,6 +1540,7 @@ class StateSignal(proto.Enum): Verify that a valid cluster intent is present. """ + _pb_options = {"allow_alias": True} STATE_SIGNAL_UNSPECIFIED = 0 FACTORY_TURNUP_CHECKS_STARTED = 3 @@ -1557,6 +1560,7 @@ class ProvisioningStateSignal(proto.Enum): PROVISIONING_COMPLETE (2): Provisioning is complete. """ + PROVISIONING_STATE_SIGNAL_UNSPECIFIED = 0 PROVISIONING_IN_PROGRESS = 1 PROVISIONING_COMPLETE = 2 diff --git a/packages/google-cloud-gdchardwaremanagement/noxfile.py b/packages/google-cloud-gdchardwaremanagement/noxfile.py index 1505c9172bb7..de4669e70250 100644 --- a/packages/google-cloud-gdchardwaremanagement/noxfile.py +++ b/packages/google-cloud-gdchardwaremanagement/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gdchardwaremanagement/tests/unit/gapic/gdchardwaremanagement_v1alpha/test_gdc_hardware_management.py b/packages/google-cloud-gdchardwaremanagement/tests/unit/gapic/gdchardwaremanagement_v1alpha/test_gdc_hardware_management.py index ea4854c08f81..026039855c15 100644 --- a/packages/google-cloud-gdchardwaremanagement/tests/unit/gapic/gdchardwaremanagement_v1alpha/test_gdc_hardware_management.py +++ b/packages/google-cloud-gdchardwaremanagement/tests/unit/gapic/gdchardwaremanagement_v1alpha/test_gdc_hardware_management.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.postal_address_pb2 as postal_address_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +63,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import postal_address_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.gdchardwaremanagement_v1alpha.services.gdc_hardware_management import ( GDCHardwareManagementAsyncClient, @@ -1013,10 +1013,9 @@ def test_gdc_hardware_management_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1060,9 @@ def test_gdc_hardware_management_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1098,9 @@ def test_gdc_hardware_management_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,13 +1356,13 @@ def test_gdc_hardware_management_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5924,9 +5921,9 @@ def test_list_hardware_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_hardware_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_hardware_groups] = ( + mock_rpc + ) request = {} client.list_hardware_groups(request) @@ -6477,9 +6474,9 @@ def test_get_hardware_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_hardware_group] = ( + mock_rpc + ) request = {} client.get_hardware_group(request) @@ -6828,9 +6825,9 @@ def test_create_hardware_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_hardware_group] = ( + mock_rpc + ) request = {} client.create_hardware_group(request) @@ -7194,9 +7191,9 @@ def test_update_hardware_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_hardware_group] = ( + mock_rpc + ) request = {} client.update_hardware_group(request) @@ -7552,9 +7549,9 @@ def test_delete_hardware_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_hardware_group] = ( + mock_rpc + ) request = {} client.delete_hardware_group(request) @@ -11912,9 +11909,9 @@ def test_get_change_log_entry_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_change_log_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_change_log_entry] = ( + mock_rpc + ) request = {} client.get_change_log_entry(request) @@ -15009,9 +15006,9 @@ def test_signal_zone_state_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.signal_zone_state - ] = mock_rpc + client._transport._wrapped_methods[client._transport.signal_zone_state] = ( + mock_rpc + ) request = {} client.signal_zone_state(request) @@ -18028,9 +18025,9 @@ def test_list_hardware_groups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_hardware_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_hardware_groups] = ( + mock_rpc + ) request = {} client.list_hardware_groups(request) @@ -18292,9 +18289,9 @@ def test_get_hardware_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_hardware_group] = ( + mock_rpc + ) request = {} client.get_hardware_group(request) @@ -18477,9 +18474,9 @@ def test_create_hardware_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_hardware_group] = ( + mock_rpc + ) request = {} client.create_hardware_group(request) @@ -18684,9 +18681,9 @@ def test_update_hardware_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_hardware_group] = ( + mock_rpc + ) request = {} client.update_hardware_group(request) @@ -18888,9 +18885,9 @@ def test_delete_hardware_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_hardware_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_hardware_group] = ( + mock_rpc + ) request = {} client.delete_hardware_group(request) @@ -21168,9 +21165,9 @@ def test_get_change_log_entry_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_change_log_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_change_log_entry] = ( + mock_rpc + ) request = {} client.get_change_log_entry(request) @@ -22780,9 +22777,9 @@ def test_signal_zone_state_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.signal_zone_state - ] = mock_rpc + client._transport._wrapped_methods[client._transport.signal_zone_state] = ( + mock_rpc + ) request = {} client.signal_zone_state(request) @@ -25102,8 +25099,9 @@ def test_list_orders_rest_bad_request(request_type=service.ListOrdersRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25168,18 +25166,20 @@ def test_list_orders_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_list_orders" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_list_orders_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_list_orders" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_list_orders" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_list_orders_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_list_orders" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25228,8 +25228,9 @@ def test_get_order_rest_bad_request(request_type=service.GetOrderRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25314,17 +25315,20 @@ def test_get_order_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_get_order" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "post_get_order_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_get_order" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_get_order" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_get_order_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_get_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25373,8 +25377,9 @@ def test_create_order_rest_bad_request(request_type=service.CreateOrderRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25569,20 +25574,21 @@ def test_create_order_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_create_order" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_create_order_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_create_order" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_create_order" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_create_order_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_create_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25633,8 +25639,9 @@ def test_update_order_rest_bad_request(request_type=service.UpdateOrderRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25831,20 +25838,21 @@ def test_update_order_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_update_order" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_update_order_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_update_order" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_update_order" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_update_order_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_update_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25893,8 +25901,9 @@ def test_delete_order_rest_bad_request(request_type=service.DeleteOrderRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25951,20 +25960,21 @@ def test_delete_order_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_delete_order" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_delete_order_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_delete_order" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_delete_order" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_delete_order_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_delete_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26013,8 +26023,9 @@ def test_submit_order_rest_bad_request(request_type=service.SubmitOrderRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26071,20 +26082,21 @@ def test_submit_order_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_submit_order" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_submit_order_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_submit_order" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_submit_order" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_submit_order_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_submit_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26133,8 +26145,9 @@ def test_cancel_order_rest_bad_request(request_type=service.CancelOrderRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26191,20 +26204,21 @@ def test_cancel_order_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_cancel_order" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_cancel_order_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_cancel_order" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_cancel_order" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_cancel_order_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_cancel_order" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26253,8 +26267,9 @@ def test_list_sites_rest_bad_request(request_type=service.ListSitesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26319,17 +26334,20 @@ def test_list_sites_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_list_sites" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "post_list_sites_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_list_sites" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_list_sites" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_list_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_list_sites" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26378,8 +26396,9 @@ def test_get_site_rest_bad_request(request_type=service.GetSiteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26452,17 +26471,20 @@ def test_get_site_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_get_site" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "post_get_site_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_get_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_get_site" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_get_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_get_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26511,8 +26533,9 @@ def test_create_site_rest_bad_request(request_type=service.CreateSiteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26686,20 +26709,21 @@ def test_create_site_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_create_site" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_create_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_create_site" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_create_site" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_create_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_create_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26750,8 +26774,9 @@ def test_update_site_rest_bad_request(request_type=service.UpdateSiteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -26927,20 +26952,21 @@ def test_update_site_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_update_site" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_update_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_update_site" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_update_site" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_update_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_update_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -26989,8 +27015,9 @@ def test_delete_site_rest_bad_request(request_type=service.DeleteSiteRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27047,20 +27074,21 @@ def test_delete_site_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_delete_site" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_delete_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_delete_site" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_delete_site" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_delete_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_delete_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27111,8 +27139,9 @@ def test_list_hardware_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27177,18 +27206,20 @@ def test_list_hardware_groups_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_list_hardware_groups" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_list_hardware_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_list_hardware_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_list_hardware_groups" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_list_hardware_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_list_hardware_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27245,8 +27276,9 @@ def test_get_hardware_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27319,18 +27351,20 @@ def test_get_hardware_group_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_get_hardware_group" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_get_hardware_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_get_hardware_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_get_hardware_group" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_get_hardware_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_get_hardware_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27383,8 +27417,9 @@ def test_create_hardware_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27524,20 +27559,22 @@ def test_create_hardware_group_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_create_hardware_group" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_create_hardware_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_create_hardware_group" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, + "post_create_hardware_group", + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_create_hardware_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_create_hardware_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27594,8 +27631,9 @@ def test_update_hardware_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27739,20 +27777,22 @@ def test_update_hardware_group_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_update_hardware_group" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_update_hardware_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_update_hardware_group" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, + "post_update_hardware_group", + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_update_hardware_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_update_hardware_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27807,8 +27847,9 @@ def test_delete_hardware_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27867,20 +27908,22 @@ def test_delete_hardware_group_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_delete_hardware_group" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_delete_hardware_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_delete_hardware_group" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, + "post_delete_hardware_group", + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_delete_hardware_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_delete_hardware_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27931,8 +27974,9 @@ def test_list_hardware_rest_bad_request(request_type=service.ListHardwareRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27997,18 +28041,20 @@ def test_list_hardware_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_list_hardware" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_list_hardware_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_list_hardware" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_list_hardware" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_list_hardware_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_list_hardware" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28059,8 +28105,9 @@ def test_get_hardware_rest_bad_request(request_type=service.GetHardwareRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28137,18 +28184,20 @@ def test_get_hardware_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_get_hardware" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_get_hardware_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_get_hardware" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_get_hardware" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_get_hardware_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_get_hardware" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28197,8 +28246,9 @@ def test_create_hardware_rest_bad_request(request_type=service.CreateHardwareReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28385,20 +28435,21 @@ def test_create_hardware_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_create_hardware" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_create_hardware_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_create_hardware" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_create_hardware" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_create_hardware_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_create_hardware" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28449,8 +28500,9 @@ def test_update_hardware_rest_bad_request(request_type=service.UpdateHardwareReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28639,20 +28691,21 @@ def test_update_hardware_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_update_hardware" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_update_hardware_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_update_hardware" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_update_hardware" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_update_hardware_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_update_hardware" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28701,8 +28754,9 @@ def test_delete_hardware_rest_bad_request(request_type=service.DeleteHardwareReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28759,20 +28813,21 @@ def test_delete_hardware_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_delete_hardware" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_delete_hardware_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_delete_hardware" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_delete_hardware" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_delete_hardware_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_delete_hardware" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28821,8 +28876,9 @@ def test_list_comments_rest_bad_request(request_type=service.ListCommentsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28887,18 +28943,20 @@ def test_list_comments_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_list_comments" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_list_comments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_list_comments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_list_comments" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_list_comments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_list_comments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28951,8 +29009,9 @@ def test_get_comment_rest_bad_request(request_type=service.GetCommentRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29023,18 +29082,20 @@ def test_get_comment_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_get_comment" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_get_comment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_get_comment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_get_comment" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_get_comment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_get_comment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29083,8 +29144,9 @@ def test_create_comment_rest_bad_request(request_type=service.CreateCommentReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29217,20 +29279,21 @@ def test_create_comment_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_create_comment" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_create_comment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_create_comment" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_create_comment" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_create_comment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_create_comment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29283,8 +29346,9 @@ def test_record_action_on_comment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29355,18 +29419,22 @@ def test_record_action_on_comment_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_record_action_on_comment" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_record_action_on_comment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_record_action_on_comment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_record_action_on_comment", + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_record_action_on_comment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "pre_record_action_on_comment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29419,8 +29487,9 @@ def test_list_change_log_entries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29485,18 +29554,22 @@ def test_list_change_log_entries_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_list_change_log_entries" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_list_change_log_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_list_change_log_entries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_list_change_log_entries", + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_list_change_log_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "pre_list_change_log_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29556,8 +29629,9 @@ def test_get_change_log_entry_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29624,18 +29698,20 @@ def test_get_change_log_entry_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_get_change_log_entry" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_get_change_log_entry_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_get_change_log_entry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_get_change_log_entry" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_get_change_log_entry_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_get_change_log_entry" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29686,8 +29762,9 @@ def test_list_skus_rest_bad_request(request_type=service.ListSkusRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29752,17 +29829,20 @@ def test_list_skus_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_list_skus" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "post_list_skus_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_list_skus" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_list_skus" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_list_skus_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_list_skus" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29811,8 +29891,9 @@ def test_get_sku_rest_bad_request(request_type=service.GetSkuRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29887,17 +29968,20 @@ def test_get_sku_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_get_sku" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "post_get_sku_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_get_sku" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_get_sku" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_get_sku_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_get_sku" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29946,8 +30030,9 @@ def test_list_zones_rest_bad_request(request_type=service.ListZonesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30012,17 +30097,20 @@ def test_list_zones_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_list_zones" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "post_list_zones_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_list_zones" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_list_zones" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_list_zones_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_list_zones" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30071,8 +30159,9 @@ def test_get_zone_rest_bad_request(request_type=service.GetZoneRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30154,17 +30243,20 @@ def test_get_zone_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_get_zone" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "post_get_zone_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_get_zone" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "post_get_zone" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_get_zone_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_get_zone" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30213,8 +30305,9 @@ def test_create_zone_rest_bad_request(request_type=service.CreateZoneRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30395,20 +30488,21 @@ def test_create_zone_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_create_zone" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_create_zone_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_create_zone" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_create_zone" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_create_zone_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_create_zone" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30459,8 +30553,9 @@ def test_update_zone_rest_bad_request(request_type=service.UpdateZoneRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30643,20 +30738,21 @@ def test_update_zone_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_update_zone" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_update_zone_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_update_zone" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_update_zone" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_update_zone_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_update_zone" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30705,8 +30801,9 @@ def test_delete_zone_rest_bad_request(request_type=service.DeleteZoneRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30763,20 +30860,21 @@ def test_delete_zone_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_delete_zone" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_delete_zone_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_delete_zone" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_delete_zone" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_delete_zone_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_delete_zone" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30827,8 +30925,9 @@ def test_signal_zone_state_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30885,20 +30984,21 @@ def test_signal_zone_state_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, "post_signal_zone_state" - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_signal_zone_state_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_signal_zone_state" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, "post_signal_zone_state" + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_signal_zone_state_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, "pre_signal_zone_state" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30949,8 +31049,9 @@ def test_request_order_date_change_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31007,21 +31108,23 @@ def test_request_order_date_change_rest_interceptors(null_interceptor): ) client = GDCHardwareManagementClient(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.GDCHardwareManagementRestInterceptor, - "post_request_order_date_change", - ) as post, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, - "post_request_order_date_change_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GDCHardwareManagementRestInterceptor, "pre_request_order_date_change" - ) as pre: + 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.GDCHardwareManagementRestInterceptor, + "post_request_order_date_change", + ) as post, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "post_request_order_date_change_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GDCHardwareManagementRestInterceptor, + "pre_request_order_date_change", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31074,8 +31177,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31134,8 +31238,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31196,8 +31301,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31258,8 +31364,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31320,8 +31427,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -31382,8 +31490,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -32315,11 +32424,14 @@ def test_gdc_hardware_management_base_transport(): def test_gdc_hardware_management_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gdchardwaremanagement_v1alpha.services.gdc_hardware_management.transports.GDCHardwareManagementTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.gdchardwaremanagement_v1alpha.services.gdc_hardware_management.transports.GDCHardwareManagementTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GDCHardwareManagementTransport( @@ -32336,9 +32448,12 @@ def test_gdc_hardware_management_base_transport_with_credentials_file(): def test_gdc_hardware_management_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.gdchardwaremanagement_v1alpha.services.gdc_hardware_management.transports.GDCHardwareManagementTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.gdchardwaremanagement_v1alpha.services.gdc_hardware_management.transports.GDCHardwareManagementTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GDCHardwareManagementTransport() @@ -32412,11 +32527,12 @@ def test_gdc_hardware_management_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-geminidataanalytics/docs/conf.py b/packages/google-cloud-geminidataanalytics/docs/conf.py index 079d0acce422..668961f572fd 100644 --- a/packages/google-cloud-geminidataanalytics/docs/conf.py +++ b/packages/google-cloud-geminidataanalytics/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-geminidataanalytics documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/__init__.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/__init__.py index 130f9fe047be..7bfd8c533fcb 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/__init__.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_agent_service import ( DataAgentServiceAsyncClient, DataAgentServiceClient, diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/async_client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/async_client.py index cc9d583593db..570495a7b02b 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/async_client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1alpha import gapic_version as package_version @@ -44,23 +44,23 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha.services.data_agent_service import pagers from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, data_agent_service, data_analytics_agent, ) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent from .client import DataAgentServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport @@ -128,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataAgentServiceAsyncClient: The constructed client. """ - return DataAgentServiceClient.from_service_account_info.__func__(DataAgentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataAgentServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataAgentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataAgentServiceAsyncClient: The constructed client. """ - return DataAgentServiceClient.from_service_account_file.__func__(DataAgentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataAgentServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataAgentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -1467,7 +1469,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import geminidataanalytics_v1alpha - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -1605,7 +1607,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import geminidataanalytics_v1alpha - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/client.py index a48b9f3d71de..2b1805c4642c 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1alpha import gapic_version as package_version @@ -61,23 +61,23 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha.services.data_agent_service import pagers from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, data_agent_service, data_analytics_agent, ) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent from .transports.base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport from .transports.grpc import DataAgentServiceGrpcTransport @@ -93,9 +93,7 @@ class DataAgentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataAgentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataAgentServiceTransport]] _transport_registry["grpc"] = DataAgentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataAgentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataAgentServiceRestTransport @@ -637,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataAgentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataAgentServiceClient._read_environment_variables() + ) self._client_cert_source = DataAgentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -676,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataAgentServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1884,7 +1879,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import geminidataanalytics_v1alpha - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -2023,7 +2018,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import geminidataanalytics_v1alpha - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/pagers.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/pagers.py index d14a3f395fb9..10da92dce562 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/pagers.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -226,7 +226,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -304,7 +304,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/base.py index 2d9172c48cc0..1bf10b8b6d8f 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha import gapic_version as package_version +from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, + data_agent_service, +) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -373,13 +375,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc.py index 8374d94061e0..bf83e1233c7b 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, + data_agent_service, +) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent_service from .base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport @@ -397,12 +399,12 @@ def list_accessible_data_agents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_accessible_data_agents" not in self._stubs: - self._stubs[ - "list_accessible_data_agents" - ] = self._logged_channel.unary_unary( - "/google.cloud.geminidataanalytics.v1alpha.DataAgentService/ListAccessibleDataAgents", - request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, - response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + self._stubs["list_accessible_data_agents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.geminidataanalytics.v1alpha.DataAgentService/ListAccessibleDataAgents", + request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, + response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + ) ) return self._stubs["list_accessible_data_agents"] diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc_asyncio.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc_asyncio.py index 7422b6b98c07..4e1418cf90b1 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/grpc_asyncio.py @@ -17,28 +17,30 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, + data_agent_service, +) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent_service from .base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport from .grpc import DataAgentServiceGrpcTransport @@ -405,12 +407,12 @@ def list_accessible_data_agents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_accessible_data_agents" not in self._stubs: - self._stubs[ - "list_accessible_data_agents" - ] = self._logged_channel.unary_unary( - "/google.cloud.geminidataanalytics.v1alpha.DataAgentService/ListAccessibleDataAgents", - request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, - response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + self._stubs["list_accessible_data_agents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.geminidataanalytics.v1alpha.DataAgentService/ListAccessibleDataAgents", + request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, + response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + ) ) return self._stubs["list_accessible_data_agents"] diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest.py index e593ce9ab0b7..3506c939e563 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest.py @@ -16,26 +16,28 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, + data_agent_service, +) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataAgentServiceRestTransport @@ -1020,9 +1022,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseCreateDataAgent._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseCreateDataAgent._get_http_options() request, metadata = self._interceptor.pre_create_data_agent( request, metadata @@ -1048,7 +1048,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1173,9 +1173,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseCreateDataAgentSync._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseCreateDataAgentSync._get_http_options() request, metadata = self._interceptor.pre_create_data_agent_sync( request, metadata @@ -1328,9 +1326,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseDeleteDataAgent._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseDeleteDataAgent._get_http_options() request, metadata = self._interceptor.pre_delete_data_agent( request, metadata @@ -1352,7 +1348,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1469,9 +1465,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseDeleteDataAgentSync._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseDeleteDataAgentSync._get_http_options() request, metadata = self._interceptor.pre_delete_data_agent_sync( request, metadata @@ -1493,7 +1487,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1957,9 +1951,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListAccessibleDataAgents._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListAccessibleDataAgents._get_http_options() request, metadata = self._interceptor.pre_list_accessible_data_agents( request, metadata @@ -2112,9 +2104,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListDataAgents._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListDataAgents._get_http_options() request, metadata = self._interceptor.pre_list_data_agents( request, metadata @@ -2490,9 +2480,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseUpdateDataAgent._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseUpdateDataAgent._get_http_options() request, metadata = self._interceptor.pre_update_data_agent( request, metadata @@ -2518,7 +2506,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2643,9 +2631,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseUpdateDataAgentSync._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseUpdateDataAgentSync._get_http_options() request, metadata = self._interceptor.pre_update_data_agent_sync( request, metadata @@ -2803,7 +2789,9 @@ def list_accessible_data_agents( ]: # 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._ListAccessibleDataAgents(self._session, self._host, self._interceptor) # type: ignore + return self._ListAccessibleDataAgents( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_data_agents( @@ -3041,9 +3029,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataAgentServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -3180,9 +3166,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3300,9 +3284,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3557,9 +3539,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataAgentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest_base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest_base.py index 92bef3cf3c92..7adea4c33fff 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest_base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_agent_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.geminidataanalytics_v1alpha.types import ( + data_agent, + data_agent_service, +) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent_service from .base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/async_client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/async_client.py index 1aa9229ba416..a5c15b313736 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/async_client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1alpha import gapic_version as package_version @@ -46,16 +46,18 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha.services.data_chat_service import pagers +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service from .client import DataChatServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataChatServiceTransport @@ -130,7 +132,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataChatServiceAsyncClient: The constructed client. """ - return DataChatServiceClient.from_service_account_info.__func__(DataChatServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataChatServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataChatServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +149,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataChatServiceAsyncClient: The constructed client. """ - return DataChatServiceClient.from_service_account_file.__func__(DataChatServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataChatServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataChatServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/client.py index 0baa4db1c3d4..436996facaf8 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1alpha import gapic_version as package_version @@ -62,16 +62,18 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha.services.data_chat_service import pagers +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service from .transports.base import DEFAULT_CLIENT_INFO, DataChatServiceTransport from .transports.grpc import DataChatServiceGrpcTransport @@ -87,9 +89,7 @@ class DataChatServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataChatServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataChatServiceTransport]] _transport_registry["grpc"] = DataChatServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataChatServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataChatServiceRestTransport @@ -656,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataChatServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataChatServiceClient._read_environment_variables() + ) self._client_cert_source = DataChatServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -695,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataChatServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/pagers.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/pagers.py index e6eb14b32733..0a408ac51470 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/pagers.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -226,7 +226,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -302,7 +302,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/base.py index 8b8baf3fa031..f805c1214b57 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha import gapic_version as package_version +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -315,13 +317,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc.py index 7bcb8f0f166a..fc4592e93703 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service from .base import DEFAULT_CLIENT_INFO, DataChatServiceTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc_asyncio.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc_asyncio.py index 703aeb8f30f6..42f54d79accf 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service from .base import DEFAULT_CLIENT_INFO, DataChatServiceTransport from .grpc import DataChatServiceGrpcTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest.py index 8c5d3c16d553..9ab4154c447d 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataChatServiceRestTransport @@ -883,9 +885,7 @@ def __call__( Message for a conversation. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1032,9 +1032,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1056,7 +1054,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1145,9 +1143,7 @@ def __call__( Message for a conversation. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -1295,9 +1291,7 @@ def __call__( """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2094,9 +2088,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2213,9 +2205,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2470,9 +2460,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataChatServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest_base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest_base.py index a03fc7af445f..d3a64303a495 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest_base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/services/data_chat_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.geminidataanalytics_v1alpha.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation -from google.cloud.geminidataanalytics_v1alpha.types import data_chat_service from .base import DEFAULT_CLIENT_INFO, DataChatServiceTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/__init__.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/__init__.py index 1c0709d8d30f..5075d62b5939 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/__init__.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .agent_context import AgentContextReference +from .agent_context import ( + AgentContextReference, +) from .context import ( AnalysisOptions, ChartOptions, @@ -33,8 +35,13 @@ ListConversationsRequest, ListConversationsResponse, ) -from .credentials import Credentials, OAuthCredentials -from .data_agent import DataAgent +from .credentials import ( + Credentials, + OAuthCredentials, +) +from .data_agent import ( + DataAgent, +) from .data_agent_service import ( CreateDataAgentRequest, DeleteDataAgentRequest, @@ -46,7 +53,9 @@ OperationMetadata, UpdateDataAgentRequest, ) -from .data_analytics_agent import DataAnalyticsAgent +from .data_analytics_agent import ( + DataAnalyticsAgent, +) from .data_chat_service import ( AnalysisEvent, AnalysisMessage, diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/context.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/context.py index 0ec422a29242..b266ed8a45e5 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/context.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/context.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore from google.cloud.geminidataanalytics_v1alpha.types import datasource as gcg_datasource @@ -120,6 +120,7 @@ class Source(proto.Enum): The source of the schema relationship is BigQuery table constraints. """ + SOURCE_UNSPECIFIED = 0 BIGQUERY_JOB_HISTORY = 1 LLM_SUGGESTED = 2 @@ -156,12 +157,12 @@ class SchemaPaths(proto.Message): number=2, message="Context.SchemaRelationship.SchemaPaths", ) - sources: MutableSequence[ - "Context.SchemaRelationship.Source" - ] = proto.RepeatedField( - proto.ENUM, - number=3, - enum="Context.SchemaRelationship.Source", + sources: MutableSequence["Context.SchemaRelationship.Source"] = ( + proto.RepeatedField( + proto.ENUM, + number=3, + enum="Context.SchemaRelationship.Source", + ) ) confidence_score: float = proto.Field( proto.FLOAT, diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/conversation.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/conversation.py index 8d8d36b9216c..3cb80aa5f231 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/conversation.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/conversation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_agent.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_agent.py index 85d2be3755fc..3093b62e5312 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_agent.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_agent.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.geminidataanalytics_v1alpha.types import ( diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_agent_service.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_agent_service.py index 7e1382e15752..2795059cd583 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_agent_service.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_agent_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent @@ -179,6 +179,7 @@ class CreatorFilter(proto.Enum): Only agents not created by the user calling the API will be returned. """ + CREATOR_FILTER_UNSPECIFIED = 0 NONE = 1 CREATOR_ONLY = 2 diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_chat_service.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_chat_service.py index 82345e5e2b60..31ab3e5fe3f9 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_chat_service.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/data_chat_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.geminidataanalytics_v1alpha.types import context as gcg_context @@ -531,6 +531,7 @@ class ContextVersion(proto.Enum): Using this version, DCS will use the latest published context for the data agent. """ + CONTEXT_VERSION_UNSPECIFIED = 0 STAGING = 1 PUBLISHED = 2 @@ -811,6 +812,7 @@ class TextType(proto.Enum): the final answer to the user (``FINAL_RESPONSE``). These messages provide insight into the agent's actions. """ + TEXT_TYPE_UNSPECIFIED = 0 FINAL_RESPONSE = 1 THOUGHT = 2 diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/datasource.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/datasource.py index 338cea007637..bb76cc6131f9 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/datasource.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1alpha/types/datasource.py @@ -17,13 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore +from google.cloud.geminidataanalytics_v1alpha.types import agent_context from google.cloud.geminidataanalytics_v1alpha.types import ( credentials as gcg_credentials, ) -from google.cloud.geminidataanalytics_v1alpha.types import agent_context __protobuf__ = proto.module( package="google.cloud.geminidataanalytics.v1alpha", @@ -63,6 +63,7 @@ class DataFilterType(proto.Enum): filter by default. Currently only used for Looker data sources. """ + DATA_FILTER_TYPE_UNSPECIFIED = 0 ALWAYS_FILTER = 1 @@ -205,12 +206,12 @@ class StudioDatasourceReferences(proto.Message): The references to the studio datasources. """ - studio_references: MutableSequence[ - "StudioDatasourceReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="StudioDatasourceReference", + studio_references: MutableSequence["StudioDatasourceReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="StudioDatasourceReference", + ) ) @@ -358,6 +359,7 @@ class Engine(proto.Enum): POSTGRESQL (2): PostgreSQL """ + ENGINE_UNSPECIFIED = 0 GOOGLE_SQL = 1 POSTGRESQL = 2 @@ -447,6 +449,7 @@ class Engine(proto.Enum): MYSQL (2): MySQL """ + ENGINE_UNSPECIFIED = 0 POSTGRESQL = 1 MYSQL = 2 diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/__init__.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/__init__.py index 2b84fb18ed3f..60e87ba7ffea 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/__init__.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.data_agent_service import ( DataAgentServiceAsyncClient, DataAgentServiceClient, diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/async_client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/async_client.py index 40c9e02b569e..71c4e54c7f06 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/async_client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1beta import gapic_version as package_version @@ -44,23 +44,23 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta.services.data_agent_service import pagers from google.cloud.geminidataanalytics_v1beta.types import ( + data_agent, data_agent_service, data_analytics_agent, ) from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent from .client import DataAgentServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport @@ -128,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataAgentServiceAsyncClient: The constructed client. """ - return DataAgentServiceClient.from_service_account_info.__func__(DataAgentServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataAgentServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataAgentServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataAgentServiceAsyncClient: The constructed client. """ - return DataAgentServiceClient.from_service_account_file.__func__(DataAgentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataAgentServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataAgentServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -1467,7 +1469,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import geminidataanalytics_v1beta - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -1605,7 +1607,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import geminidataanalytics_v1beta - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/client.py index b5643b276713..c473386e883e 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1beta import gapic_version as package_version @@ -61,23 +61,23 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta.services.data_agent_service import pagers from google.cloud.geminidataanalytics_v1beta.types import ( + data_agent, data_agent_service, data_analytics_agent, ) from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent from .transports.base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport from .transports.grpc import DataAgentServiceGrpcTransport @@ -93,9 +93,7 @@ class DataAgentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataAgentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataAgentServiceTransport]] _transport_registry["grpc"] = DataAgentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataAgentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataAgentServiceRestTransport @@ -637,11 +635,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataAgentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataAgentServiceClient._read_environment_variables() + ) self._client_cert_source = DataAgentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -676,8 +672,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataAgentServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1884,7 +1879,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import geminidataanalytics_v1beta - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -2023,7 +2018,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import geminidataanalytics_v1beta - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/pagers.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/pagers.py index 0d3251f97334..1ba82a89622d 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/pagers.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/base.py index 0c6584c61095..8bd2d14cb878 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/base.py @@ -17,23 +17,22 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta import gapic_version as package_version +from google.cloud.geminidataanalytics_v1beta.types import data_agent, data_agent_service from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -373,13 +372,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc.py index ade5a9abc6dc..271c27a5a487 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc.py @@ -16,26 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.geminidataanalytics_v1beta.types import data_agent, data_agent_service from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent_service from .base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport @@ -397,12 +396,12 @@ def list_accessible_data_agents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_accessible_data_agents" not in self._stubs: - self._stubs[ - "list_accessible_data_agents" - ] = self._logged_channel.unary_unary( - "/google.cloud.geminidataanalytics.v1beta.DataAgentService/ListAccessibleDataAgents", - request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, - response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + self._stubs["list_accessible_data_agents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.geminidataanalytics.v1beta.DataAgentService/ListAccessibleDataAgents", + request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, + response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + ) ) return self._stubs["list_accessible_data_agents"] diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc_asyncio.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc_asyncio.py index bea89f44fd66..3b6a45a5349f 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/grpc_asyncio.py @@ -17,28 +17,27 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.geminidataanalytics_v1beta.types import data_agent, data_agent_service from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent_service from .base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport from .grpc import DataAgentServiceGrpcTransport @@ -405,12 +404,12 @@ def list_accessible_data_agents( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_accessible_data_agents" not in self._stubs: - self._stubs[ - "list_accessible_data_agents" - ] = self._logged_channel.unary_unary( - "/google.cloud.geminidataanalytics.v1beta.DataAgentService/ListAccessibleDataAgents", - request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, - response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + self._stubs["list_accessible_data_agents"] = ( + self._logged_channel.unary_unary( + "/google.cloud.geminidataanalytics.v1beta.DataAgentService/ListAccessibleDataAgents", + request_serializer=data_agent_service.ListAccessibleDataAgentsRequest.serialize, + response_deserializer=data_agent_service.ListAccessibleDataAgentsResponse.deserialize, + ) ) return self._stubs["list_accessible_data_agents"] diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest.py index 007694e8f7c7..e9284fbb0062 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest.py @@ -16,26 +16,25 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.geminidataanalytics_v1beta.types import data_agent, data_agent_service from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataAgentServiceRestTransport @@ -1020,9 +1019,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseCreateDataAgent._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseCreateDataAgent._get_http_options() request, metadata = self._interceptor.pre_create_data_agent( request, metadata @@ -1048,7 +1045,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1173,9 +1170,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseCreateDataAgentSync._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseCreateDataAgentSync._get_http_options() request, metadata = self._interceptor.pre_create_data_agent_sync( request, metadata @@ -1328,9 +1323,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseDeleteDataAgent._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseDeleteDataAgent._get_http_options() request, metadata = self._interceptor.pre_delete_data_agent( request, metadata @@ -1352,7 +1345,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1469,9 +1462,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseDeleteDataAgentSync._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseDeleteDataAgentSync._get_http_options() request, metadata = self._interceptor.pre_delete_data_agent_sync( request, metadata @@ -1493,7 +1484,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1957,9 +1948,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListAccessibleDataAgents._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListAccessibleDataAgents._get_http_options() request, metadata = self._interceptor.pre_list_accessible_data_agents( request, metadata @@ -2112,9 +2101,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListDataAgents._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListDataAgents._get_http_options() request, metadata = self._interceptor.pre_list_data_agents( request, metadata @@ -2490,9 +2477,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseUpdateDataAgent._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseUpdateDataAgent._get_http_options() request, metadata = self._interceptor.pre_update_data_agent( request, metadata @@ -2518,7 +2503,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2643,9 +2628,7 @@ def __call__( """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseUpdateDataAgentSync._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseUpdateDataAgentSync._get_http_options() request, metadata = self._interceptor.pre_update_data_agent_sync( request, metadata @@ -2803,7 +2786,9 @@ def list_accessible_data_agents( ]: # 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._ListAccessibleDataAgents(self._session, self._host, self._interceptor) # type: ignore + return self._ListAccessibleDataAgents( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_data_agents( @@ -3041,9 +3026,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDataAgentServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -3180,9 +3163,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3300,9 +3281,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3557,9 +3536,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataAgentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataAgentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataAgentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest_base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest_base.py index 85131c14d035..6a55c1ea430b 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest_base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_agent_service/transports/rest_base.py @@ -17,17 +17,16 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.geminidataanalytics_v1beta.types import data_agent, data_agent_service from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent_service from .base import DEFAULT_CLIENT_INFO, DataAgentServiceTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/async_client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/async_client.py index d7612cd9c85e..cc94ed3f9a24 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/async_client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, Awaitable, @@ -31,13 +31,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1beta import gapic_version as package_version @@ -46,16 +46,18 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta.services.data_chat_service import pagers +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service from .client import DataChatServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DataChatServiceTransport @@ -130,7 +132,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataChatServiceAsyncClient: The constructed client. """ - return DataChatServiceClient.from_service_account_info.__func__(DataChatServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataChatServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataChatServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +149,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataChatServiceAsyncClient: The constructed client. """ - return DataChatServiceClient.from_service_account_file.__func__(DataChatServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataChatServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataChatServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/client.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/client.py index d7572def9a4f..5ecfd88da76a 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/client.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -33,8 +34,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.geminidataanalytics_v1beta import gapic_version as package_version @@ -62,16 +62,18 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta.services.data_chat_service import pagers +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service from .transports.base import DEFAULT_CLIENT_INFO, DataChatServiceTransport from .transports.grpc import DataChatServiceGrpcTransport @@ -87,9 +89,7 @@ class DataChatServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataChatServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataChatServiceTransport]] _transport_registry["grpc"] = DataChatServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataChatServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataChatServiceRestTransport @@ -656,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataChatServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataChatServiceClient._read_environment_variables() + ) self._client_cert_source = DataChatServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -695,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataChatServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/pagers.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/pagers.py index 9455a99a94cb..7c03072d1830 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/pagers.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -146,7 +146,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -226,7 +226,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -302,7 +302,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/base.py index 4e2da8a3a574..10147c4db8f4 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta import gapic_version as package_version +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -315,13 +317,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc.py index 8685c6a26e84..f0e10c6ad02a 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service from .base import DEFAULT_CLIENT_INFO, DataChatServiceTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc_asyncio.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc_asyncio.py index 09525e524cf5..0ca93a1bdfa3 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,18 +31,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service from .base import DEFAULT_CLIENT_INFO, DataChatServiceTransport from .grpc import DataChatServiceGrpcTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest.py index 633c13997f9c..8ecd080712d8 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest.py @@ -16,9 +16,11 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -26,16 +28,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataChatServiceRestTransport @@ -883,9 +885,7 @@ def __call__( Message for a conversation. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1032,9 +1032,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1056,7 +1054,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1145,9 +1143,7 @@ def __call__( Message for a conversation. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -1295,9 +1291,7 @@ def __call__( """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2094,9 +2088,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2213,9 +2205,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2470,9 +2460,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataChatServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataChatServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataChatServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest_base.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest_base.py index 2f747fb78f91..93e4830249c8 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest_base.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/services/data_chat_service/transports/rest_base.py @@ -17,17 +17,19 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.geminidataanalytics_v1beta.types import ( + conversation, + data_chat_service, +) from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation -from google.cloud.geminidataanalytics_v1beta.types import data_chat_service from .base import DEFAULT_CLIENT_INFO, DataChatServiceTransport diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/__init__.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/__init__.py index 1c0709d8d30f..5075d62b5939 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/__init__.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .agent_context import AgentContextReference +from .agent_context import ( + AgentContextReference, +) from .context import ( AnalysisOptions, ChartOptions, @@ -33,8 +35,13 @@ ListConversationsRequest, ListConversationsResponse, ) -from .credentials import Credentials, OAuthCredentials -from .data_agent import DataAgent +from .credentials import ( + Credentials, + OAuthCredentials, +) +from .data_agent import ( + DataAgent, +) from .data_agent_service import ( CreateDataAgentRequest, DeleteDataAgentRequest, @@ -46,7 +53,9 @@ OperationMetadata, UpdateDataAgentRequest, ) -from .data_analytics_agent import DataAnalyticsAgent +from .data_analytics_agent import ( + DataAnalyticsAgent, +) from .data_chat_service import ( AnalysisEvent, AnalysisMessage, diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/context.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/context.py index 0a9ce18d949f..2909ba715eb9 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/context.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/context.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore from google.cloud.geminidataanalytics_v1beta.types import datasource as gcg_datasource @@ -120,6 +120,7 @@ class Source(proto.Enum): The source of the schema relationship is BigQuery table constraints. """ + SOURCE_UNSPECIFIED = 0 BIGQUERY_JOB_HISTORY = 1 LLM_SUGGESTED = 2 @@ -156,12 +157,12 @@ class SchemaPaths(proto.Message): number=2, message="Context.SchemaRelationship.SchemaPaths", ) - sources: MutableSequence[ - "Context.SchemaRelationship.Source" - ] = proto.RepeatedField( - proto.ENUM, - number=3, - enum="Context.SchemaRelationship.Source", + sources: MutableSequence["Context.SchemaRelationship.Source"] = ( + proto.RepeatedField( + proto.ENUM, + number=3, + enum="Context.SchemaRelationship.Source", + ) ) confidence_score: float = proto.Field( proto.FLOAT, diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/conversation.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/conversation.py index 5f580fe785e0..f7d9983c093b 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/conversation.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/conversation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_agent.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_agent.py index a7a1f32f4273..52ae7f2fb8c2 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_agent.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_agent.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.geminidataanalytics_v1beta.types import ( diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_agent_service.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_agent_service.py index 47058a6717cf..101af3b9eeef 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_agent_service.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_agent_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent @@ -179,6 +179,7 @@ class CreatorFilter(proto.Enum): Only agents not created by the user calling the API will be returned. """ + CREATOR_FILTER_UNSPECIFIED = 0 NONE = 1 CREATOR_ONLY = 2 diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_chat_service.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_chat_service.py index b11efaddbde7..9b70a520fb54 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_chat_service.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/data_chat_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.geminidataanalytics_v1beta.types import context as gcg_context @@ -529,6 +529,7 @@ class ContextVersion(proto.Enum): Using this version, DCS will use the latest published context for the data agent. """ + CONTEXT_VERSION_UNSPECIFIED = 0 STAGING = 1 PUBLISHED = 2 @@ -809,6 +810,7 @@ class TextType(proto.Enum): the final answer to the user (``FINAL_RESPONSE``). These messages provide insight into the agent's actions. """ + TEXT_TYPE_UNSPECIFIED = 0 FINAL_RESPONSE = 1 THOUGHT = 2 diff --git a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/datasource.py b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/datasource.py index be46f73303fa..94fda6abd6bc 100644 --- a/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/datasource.py +++ b/packages/google-cloud-geminidataanalytics/google/cloud/geminidataanalytics_v1beta/types/datasource.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.geminidataanalytics_v1beta.types import credentials as gcg_credentials from google.cloud.geminidataanalytics_v1beta.types import agent_context +from google.cloud.geminidataanalytics_v1beta.types import credentials as gcg_credentials __protobuf__ = proto.module( package="google.cloud.geminidataanalytics.v1beta", @@ -61,6 +61,7 @@ class DataFilterType(proto.Enum): filter by default. Currently only used for Looker data sources. """ + DATA_FILTER_TYPE_UNSPECIFIED = 0 ALWAYS_FILTER = 1 @@ -203,12 +204,12 @@ class StudioDatasourceReferences(proto.Message): The references to the studio datasources. """ - studio_references: MutableSequence[ - "StudioDatasourceReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="StudioDatasourceReference", + studio_references: MutableSequence["StudioDatasourceReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="StudioDatasourceReference", + ) ) @@ -356,6 +357,7 @@ class Engine(proto.Enum): POSTGRESQL (2): PostgreSQL """ + ENGINE_UNSPECIFIED = 0 GOOGLE_SQL = 1 POSTGRESQL = 2 @@ -445,6 +447,7 @@ class Engine(proto.Enum): MYSQL (2): MySQL """ + ENGINE_UNSPECIFIED = 0 POSTGRESQL = 1 MYSQL = 2 diff --git a/packages/google-cloud-geminidataanalytics/noxfile.py b/packages/google-cloud-geminidataanalytics/noxfile.py index 13deeed25422..74026a6e73e6 100644 --- a/packages/google-cloud-geminidataanalytics/noxfile.py +++ b/packages/google-cloud-geminidataanalytics/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_async.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_async.py index bb6cb6fa88fd..edd4affc4a30 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_async.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1alpha_generated_DataAgentService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1alpha diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_sync.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_sync.py index db4c3ea1fe16..599712186a8b 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_sync.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1alpha_generated_DataAgentService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1alpha diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_async.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_async.py index d47fec46eab9..d3aca518cd78 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_async.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1alpha_generated_DataAgentService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1alpha diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_sync.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_sync.py index 06d9143c0075..5fc102177a8a 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_sync.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1alpha_generated_data_agent_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1alpha_generated_DataAgentService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1alpha diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_async.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_async.py index e785edef9208..662c1920dd0c 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_async.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1beta_generated_DataAgentService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1beta diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_sync.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_sync.py index 3eebe85ba810..77d8b4aeed29 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_sync.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1beta_generated_DataAgentService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1beta diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_async.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_async.py index eb605f8bdcdb..1c0f9b3e1ef6 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_async.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1beta_generated_DataAgentService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1beta diff --git a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_sync.py b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_sync.py index 4204fabd49fd..946901741651 100644 --- a/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_sync.py +++ b/packages/google-cloud-geminidataanalytics/samples/generated_samples/geminidataanalytics_v1beta_generated_data_agent_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-geminidataanalytics -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START geminidataanalytics_v1beta_generated_DataAgentService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import geminidataanalytics_v1beta diff --git a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_agent_service.py b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_agent_service.py index 59f5cd43d4d3..7fc815283fba 100644 --- a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_agent_service.py +++ b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_agent_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +63,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha.services.data_agent_service import ( DataAgentServiceAsyncClient, @@ -77,18 +77,16 @@ pagers, transports, ) -from google.cloud.geminidataanalytics_v1alpha.types import ( - data_agent_service, - data_analytics_agent, - datasource, -) from google.cloud.geminidataanalytics_v1alpha.types import ( agent_context, context, credentials, + data_agent, + data_agent_service, + data_analytics_agent, + datasource, ) from google.cloud.geminidataanalytics_v1alpha.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1alpha.types import data_agent CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1000,10 +998,9 @@ def test_data_agent_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1048,10 +1045,9 @@ def test_data_agent_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1087,10 +1083,9 @@ def test_data_agent_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1338,13 +1333,13 @@ def test_data_agent_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1459,9 +1454,9 @@ def test_list_data_agents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_agents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_agents] = ( + mock_rpc + ) request = {} client.list_data_agents(request) @@ -2872,9 +2867,9 @@ def test_create_data_agent_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent] = ( + mock_rpc + ) request = {} client.create_data_agent(request) @@ -3284,9 +3279,9 @@ def test_create_data_agent_sync_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent_sync] = ( + mock_rpc + ) request = {} client.create_data_agent_sync(request) @@ -3677,9 +3672,9 @@ def test_update_data_agent_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent] = ( + mock_rpc + ) request = {} client.update_data_agent(request) @@ -4073,9 +4068,9 @@ def test_update_data_agent_sync_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent_sync] = ( + mock_rpc + ) request = {} client.update_data_agent_sync(request) @@ -4460,9 +4455,9 @@ def test_delete_data_agent_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent] = ( + mock_rpc + ) request = {} client.delete_data_agent(request) @@ -4807,9 +4802,9 @@ def test_delete_data_agent_sync_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent_sync] = ( + mock_rpc + ) request = {} client.delete_data_agent_sync(request) @@ -5751,9 +5746,9 @@ def test_list_data_agents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_agents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_agents] = ( + mock_rpc + ) request = {} client.list_data_agents(request) @@ -6469,9 +6464,9 @@ def test_create_data_agent_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent] = ( + mock_rpc + ) request = {} client.create_data_agent(request) @@ -6688,9 +6683,9 @@ def test_create_data_agent_sync_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent_sync] = ( + mock_rpc + ) request = {} client.create_data_agent_sync(request) @@ -6905,9 +6900,9 @@ def test_update_data_agent_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent] = ( + mock_rpc + ) request = {} client.update_data_agent(request) @@ -7116,9 +7111,9 @@ def test_update_data_agent_sync_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent_sync] = ( + mock_rpc + ) request = {} client.update_data_agent_sync(request) @@ -7325,9 +7320,9 @@ def test_delete_data_agent_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent] = ( + mock_rpc + ) request = {} client.delete_data_agent(request) @@ -7511,9 +7506,9 @@ def test_delete_data_agent_sync_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent_sync] = ( + mock_rpc + ) request = {} client.delete_data_agent_sync(request) @@ -8725,8 +8720,9 @@ def test_list_data_agents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8791,18 +8787,20 @@ def test_list_data_agents_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_list_data_agents" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_list_data_agents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_list_data_agents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "post_list_data_agents" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_list_data_agents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_list_data_agents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8860,8 +8858,9 @@ def test_list_accessible_data_agents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8928,18 +8927,22 @@ def test_list_accessible_data_agents_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_list_accessible_data_agents" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_list_accessible_data_agents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_list_accessible_data_agents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_list_accessible_data_agents", + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_list_accessible_data_agents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "pre_list_accessible_data_agents", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8997,8 +9000,9 @@ def test_get_data_agent_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9065,17 +9069,20 @@ def test_get_data_agent_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_get_data_agent" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "post_get_data_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_get_data_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "post_get_data_agent" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_get_data_agent_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_get_data_agent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9128,8 +9135,9 @@ def test_create_data_agent_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9419,20 +9427,21 @@ def test_create_data_agent_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_create_data_agent" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_create_data_agent_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_create_data_agent" - ) as pre: + 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.DataAgentServiceRestInterceptor, "post_create_data_agent" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_create_data_agent_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_create_data_agent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9485,8 +9494,9 @@ def test_create_data_agent_sync_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9786,18 +9796,20 @@ def test_create_data_agent_sync_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_create_data_agent_sync" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_create_data_agent_sync_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_create_data_agent_sync" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "post_create_data_agent_sync" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_create_data_agent_sync_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_create_data_agent_sync" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9852,8 +9864,9 @@ def test_update_data_agent_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10145,20 +10158,21 @@ def test_update_data_agent_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_update_data_agent" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_update_data_agent_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_update_data_agent" - ) as pre: + 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.DataAgentServiceRestInterceptor, "post_update_data_agent" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_update_data_agent_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_update_data_agent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10213,8 +10227,9 @@ def test_update_data_agent_sync_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10516,18 +10531,20 @@ def test_update_data_agent_sync_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_update_data_agent_sync" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_update_data_agent_sync_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_update_data_agent_sync" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "post_update_data_agent_sync" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_update_data_agent_sync_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_update_data_agent_sync" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10580,8 +10597,9 @@ def test_delete_data_agent_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10638,20 +10656,21 @@ def test_delete_data_agent_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_delete_data_agent" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_delete_data_agent_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_delete_data_agent" - ) as pre: + 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.DataAgentServiceRestInterceptor, "post_delete_data_agent" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_delete_data_agent_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_delete_data_agent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10704,8 +10723,9 @@ def test_delete_data_agent_sync_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10762,13 +10782,13 @@ def test_delete_data_agent_sync_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "pre_delete_data_agent_sync" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_delete_data_agent_sync" + ) as pre, + ): pre.assert_not_called() pb_message = data_agent_service.DeleteDataAgentRequest.pb( data_agent_service.DeleteDataAgentRequest() @@ -10813,8 +10833,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10876,17 +10897,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10937,8 +10961,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11000,17 +11025,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11061,8 +11089,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11121,8 +11150,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11183,8 +11213,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11245,8 +11276,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11307,8 +11339,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11369,8 +11402,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11750,11 +11784,14 @@ def test_data_agent_service_base_transport(): def test_data_agent_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.geminidataanalytics_v1alpha.services.data_agent_service.transports.DataAgentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.geminidataanalytics_v1alpha.services.data_agent_service.transports.DataAgentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataAgentServiceTransport( @@ -11771,9 +11808,12 @@ def test_data_agent_service_base_transport_with_credentials_file(): def test_data_agent_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.geminidataanalytics_v1alpha.services.data_agent_service.transports.DataAgentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.geminidataanalytics_v1alpha.services.data_agent_service.transports.DataAgentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataAgentServiceTransport() @@ -11845,11 +11885,12 @@ def test_data_agent_service_transport_auth_gdch_credentials(transport_class): def test_data_agent_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_chat_service.py b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_chat_service.py index c1e48ff2e7a4..096207582c7b 100644 --- a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_chat_service.py +++ b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1alpha/test_data_chat_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.geminidataanalytics_v1alpha.services.data_chat_service import ( DataChatServiceAsyncClient, @@ -63,8 +68,10 @@ pagers, transports, ) -from google.cloud.geminidataanalytics_v1alpha.types import agent_context, context from google.cloud.geminidataanalytics_v1alpha.types import ( + agent_context, + context, + conversation, credentials, data_chat_service, datasource, @@ -72,7 +79,6 @@ from google.cloud.geminidataanalytics_v1alpha.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1alpha.types import conversation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -983,10 +989,9 @@ def test_data_chat_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1036,9 @@ def test_data_chat_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1070,10 +1074,9 @@ def test_data_chat_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1316,13 +1319,13 @@ def test_data_chat_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1465,9 +1468,9 @@ async def test_chat_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.chat - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.chat] = ( + mock_rpc + ) request = {} await client.chat(request) @@ -1677,9 +1680,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2038,9 +2041,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2366,9 +2369,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -2703,9 +2706,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -4082,9 +4085,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -4289,9 +4292,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -4466,9 +4469,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -4650,9 +4653,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -5769,8 +5772,9 @@ def test_chat_rest_bad_request(request_type=data_chat_service.ChatRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5837,17 +5841,17 @@ def test_chat_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "post_chat" - ) as post, mock.patch.object( - transports.DataChatServiceRestInterceptor, "post_chat_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataChatServiceRestInterceptor, "pre_chat" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_chat" + ) as post, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_chat_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DataChatServiceRestInterceptor, "pre_chat") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5898,8 +5902,9 @@ def test_create_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6038,18 +6043,20 @@ def test_create_conversation_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "post_create_conversation" - ) as post, mock.patch.object( - transports.DataChatServiceRestInterceptor, - "post_create_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataChatServiceRestInterceptor, "pre_create_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_create_conversation" + ) as post, + mock.patch.object( + transports.DataChatServiceRestInterceptor, + "post_create_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "pre_create_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6104,8 +6111,9 @@ def test_delete_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6162,13 +6170,13 @@ def test_delete_conversation_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "pre_delete_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "pre_delete_conversation" + ) as pre, + ): pre.assert_not_called() pb_message = conversation.DeleteConversationRequest.pb( conversation.DeleteConversationRequest() @@ -6213,8 +6221,9 @@ def test_get_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6279,17 +6288,20 @@ def test_get_conversation_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "post_get_conversation" - ) as post, mock.patch.object( - transports.DataChatServiceRestInterceptor, "post_get_conversation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataChatServiceRestInterceptor, "pre_get_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_get_conversation" + ) as post, + mock.patch.object( + transports.DataChatServiceRestInterceptor, + "post_get_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "pre_get_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6342,8 +6354,9 @@ def test_list_conversations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6406,18 +6419,20 @@ def test_list_conversations_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "post_list_conversations" - ) as post, mock.patch.object( - transports.DataChatServiceRestInterceptor, - "post_list_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataChatServiceRestInterceptor, "pre_list_conversations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_list_conversations" + ) as post, + mock.patch.object( + transports.DataChatServiceRestInterceptor, + "post_list_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "pre_list_conversations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6477,8 +6492,9 @@ def test_list_messages_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6543,17 +6559,20 @@ def test_list_messages_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "post_list_messages" - ) as post, mock.patch.object( - transports.DataChatServiceRestInterceptor, "post_list_messages_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataChatServiceRestInterceptor, "pre_list_messages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_list_messages" + ) as post, + mock.patch.object( + transports.DataChatServiceRestInterceptor, + "post_list_messages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "pre_list_messages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6609,8 +6628,9 @@ def test_query_data_rest_bad_request(request_type=data_chat_service.QueryDataReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6679,17 +6699,19 @@ def test_query_data_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "post_query_data" - ) as post, mock.patch.object( - transports.DataChatServiceRestInterceptor, "post_query_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataChatServiceRestInterceptor, "pre_query_data" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_query_data" + ) as post, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_query_data_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "pre_query_data" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6747,8 +6769,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6807,8 +6830,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6869,8 +6893,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6931,8 +6956,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6993,8 +7019,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7055,8 +7082,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7322,11 +7350,14 @@ def test_data_chat_service_base_transport(): def test_data_chat_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.geminidataanalytics_v1alpha.services.data_chat_service.transports.DataChatServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.geminidataanalytics_v1alpha.services.data_chat_service.transports.DataChatServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataChatServiceTransport( @@ -7343,9 +7374,12 @@ def test_data_chat_service_base_transport_with_credentials_file(): def test_data_chat_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.geminidataanalytics_v1alpha.services.data_chat_service.transports.DataChatServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.geminidataanalytics_v1alpha.services.data_chat_service.transports.DataChatServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataChatServiceTransport() @@ -7417,11 +7451,12 @@ def test_data_chat_service_transport_auth_gdch_credentials(transport_class): def test_data_chat_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_agent_service.py b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_agent_service.py index 1cc680ea7ec3..9f15f6ffee78 100644 --- a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_agent_service.py +++ b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_agent_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +63,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta.services.data_agent_service import ( DataAgentServiceAsyncClient, @@ -77,18 +77,16 @@ pagers, transports, ) -from google.cloud.geminidataanalytics_v1beta.types import ( - data_agent_service, - data_analytics_agent, - datasource, -) from google.cloud.geminidataanalytics_v1beta.types import ( agent_context, context, credentials, + data_agent, + data_agent_service, + data_analytics_agent, + datasource, ) from google.cloud.geminidataanalytics_v1beta.types import data_agent as gcg_data_agent -from google.cloud.geminidataanalytics_v1beta.types import data_agent CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1000,10 +998,9 @@ def test_data_agent_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1048,10 +1045,9 @@ def test_data_agent_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1087,10 +1083,9 @@ def test_data_agent_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1338,13 +1333,13 @@ def test_data_agent_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1459,9 +1454,9 @@ def test_list_data_agents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_agents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_agents] = ( + mock_rpc + ) request = {} client.list_data_agents(request) @@ -2872,9 +2867,9 @@ def test_create_data_agent_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent] = ( + mock_rpc + ) request = {} client.create_data_agent(request) @@ -3284,9 +3279,9 @@ def test_create_data_agent_sync_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent_sync] = ( + mock_rpc + ) request = {} client.create_data_agent_sync(request) @@ -3677,9 +3672,9 @@ def test_update_data_agent_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent] = ( + mock_rpc + ) request = {} client.update_data_agent(request) @@ -4073,9 +4068,9 @@ def test_update_data_agent_sync_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent_sync] = ( + mock_rpc + ) request = {} client.update_data_agent_sync(request) @@ -4460,9 +4455,9 @@ def test_delete_data_agent_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent] = ( + mock_rpc + ) request = {} client.delete_data_agent(request) @@ -4807,9 +4802,9 @@ def test_delete_data_agent_sync_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent_sync] = ( + mock_rpc + ) request = {} client.delete_data_agent_sync(request) @@ -5751,9 +5746,9 @@ def test_list_data_agents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_agents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_agents] = ( + mock_rpc + ) request = {} client.list_data_agents(request) @@ -6469,9 +6464,9 @@ def test_create_data_agent_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent] = ( + mock_rpc + ) request = {} client.create_data_agent(request) @@ -6688,9 +6683,9 @@ def test_create_data_agent_sync_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_agent_sync] = ( + mock_rpc + ) request = {} client.create_data_agent_sync(request) @@ -6905,9 +6900,9 @@ def test_update_data_agent_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent] = ( + mock_rpc + ) request = {} client.update_data_agent(request) @@ -7116,9 +7111,9 @@ def test_update_data_agent_sync_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_agent_sync] = ( + mock_rpc + ) request = {} client.update_data_agent_sync(request) @@ -7325,9 +7320,9 @@ def test_delete_data_agent_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent] = ( + mock_rpc + ) request = {} client.delete_data_agent(request) @@ -7511,9 +7506,9 @@ def test_delete_data_agent_sync_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_agent_sync - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_agent_sync] = ( + mock_rpc + ) request = {} client.delete_data_agent_sync(request) @@ -8725,8 +8720,9 @@ def test_list_data_agents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8791,18 +8787,20 @@ def test_list_data_agents_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_list_data_agents" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_list_data_agents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_list_data_agents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "post_list_data_agents" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_list_data_agents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_list_data_agents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8860,8 +8858,9 @@ def test_list_accessible_data_agents_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8928,18 +8927,22 @@ def test_list_accessible_data_agents_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_list_accessible_data_agents" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_list_accessible_data_agents_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_list_accessible_data_agents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_list_accessible_data_agents", + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_list_accessible_data_agents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "pre_list_accessible_data_agents", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8997,8 +9000,9 @@ def test_get_data_agent_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9065,17 +9069,20 @@ def test_get_data_agent_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_get_data_agent" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "post_get_data_agent_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_get_data_agent" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "post_get_data_agent" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_get_data_agent_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_get_data_agent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9128,8 +9135,9 @@ def test_create_data_agent_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9419,20 +9427,21 @@ def test_create_data_agent_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_create_data_agent" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_create_data_agent_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_create_data_agent" - ) as pre: + 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.DataAgentServiceRestInterceptor, "post_create_data_agent" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_create_data_agent_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_create_data_agent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9485,8 +9494,9 @@ def test_create_data_agent_sync_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9786,18 +9796,20 @@ def test_create_data_agent_sync_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_create_data_agent_sync" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_create_data_agent_sync_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_create_data_agent_sync" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "post_create_data_agent_sync" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_create_data_agent_sync_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_create_data_agent_sync" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9852,8 +9864,9 @@ def test_update_data_agent_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10145,20 +10158,21 @@ def test_update_data_agent_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_update_data_agent" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_update_data_agent_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_update_data_agent" - ) as pre: + 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.DataAgentServiceRestInterceptor, "post_update_data_agent" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_update_data_agent_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_update_data_agent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10213,8 +10227,9 @@ def test_update_data_agent_sync_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10516,18 +10531,20 @@ def test_update_data_agent_sync_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_update_data_agent_sync" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_update_data_agent_sync_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_update_data_agent_sync" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "post_update_data_agent_sync" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_update_data_agent_sync_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_update_data_agent_sync" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10580,8 +10597,9 @@ def test_delete_data_agent_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10638,20 +10656,21 @@ def test_delete_data_agent_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_delete_data_agent" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, - "post_delete_data_agent_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_delete_data_agent" - ) as pre: + 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.DataAgentServiceRestInterceptor, "post_delete_data_agent" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_delete_data_agent_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_delete_data_agent" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10704,8 +10723,9 @@ def test_delete_data_agent_sync_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10762,13 +10782,13 @@ def test_delete_data_agent_sync_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "pre_delete_data_agent_sync" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_delete_data_agent_sync" + ) as pre, + ): pre.assert_not_called() pb_message = data_agent_service.DeleteDataAgentRequest.pb( data_agent_service.DeleteDataAgentRequest() @@ -10813,8 +10833,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10876,17 +10897,20 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "post_get_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "post_get_iam_policy" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_get_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10937,8 +10961,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11000,17 +11025,20 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = DataAgentServiceClient(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.DataAgentServiceRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "post_set_iam_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataAgentServiceRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "post_set_iam_policy" + ) as post, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataAgentServiceRestInterceptor, "pre_set_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11061,8 +11089,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11121,8 +11150,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11183,8 +11213,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11245,8 +11276,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11307,8 +11339,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11369,8 +11402,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11750,11 +11784,14 @@ def test_data_agent_service_base_transport(): def test_data_agent_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.geminidataanalytics_v1beta.services.data_agent_service.transports.DataAgentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.geminidataanalytics_v1beta.services.data_agent_service.transports.DataAgentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataAgentServiceTransport( @@ -11771,9 +11808,12 @@ def test_data_agent_service_base_transport_with_credentials_file(): def test_data_agent_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.geminidataanalytics_v1beta.services.data_agent_service.transports.DataAgentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.geminidataanalytics_v1beta.services.data_agent_service.transports.DataAgentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataAgentServiceTransport() @@ -11845,11 +11885,12 @@ def test_data_agent_service_transport_auth_gdch_credentials(transport_class): def test_data_agent_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_chat_service.py b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_chat_service.py index df04f1537a94..27f863b9c140 100644 --- a/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_chat_service.py +++ b/packages/google-cloud-geminidataanalytics/tests/unit/gapic/geminidataanalytics_v1beta/test_data_chat_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.geminidataanalytics_v1beta.services.data_chat_service import ( DataChatServiceAsyncClient, @@ -63,8 +68,10 @@ pagers, transports, ) -from google.cloud.geminidataanalytics_v1beta.types import agent_context, context from google.cloud.geminidataanalytics_v1beta.types import ( + agent_context, + context, + conversation, credentials, data_chat_service, datasource, @@ -72,7 +79,6 @@ from google.cloud.geminidataanalytics_v1beta.types import ( conversation as gcg_conversation, ) -from google.cloud.geminidataanalytics_v1beta.types import conversation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -983,10 +989,9 @@ def test_data_chat_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1036,9 @@ def test_data_chat_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1070,10 +1074,9 @@ def test_data_chat_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1316,13 +1319,13 @@ def test_data_chat_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1465,9 +1468,9 @@ async def test_chat_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.chat - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.chat] = ( + mock_rpc + ) request = {} await client.chat(request) @@ -1677,9 +1680,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2038,9 +2041,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2366,9 +2369,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -2703,9 +2706,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -4082,9 +4085,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -4289,9 +4292,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -4466,9 +4469,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -4650,9 +4653,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -5769,8 +5772,9 @@ def test_chat_rest_bad_request(request_type=data_chat_service.ChatRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5837,17 +5841,17 @@ def test_chat_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "post_chat" - ) as post, mock.patch.object( - transports.DataChatServiceRestInterceptor, "post_chat_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataChatServiceRestInterceptor, "pre_chat" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_chat" + ) as post, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_chat_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.DataChatServiceRestInterceptor, "pre_chat") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5898,8 +5902,9 @@ def test_create_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6038,18 +6043,20 @@ def test_create_conversation_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "post_create_conversation" - ) as post, mock.patch.object( - transports.DataChatServiceRestInterceptor, - "post_create_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataChatServiceRestInterceptor, "pre_create_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_create_conversation" + ) as post, + mock.patch.object( + transports.DataChatServiceRestInterceptor, + "post_create_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "pre_create_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6104,8 +6111,9 @@ def test_delete_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6162,13 +6170,13 @@ def test_delete_conversation_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "pre_delete_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "pre_delete_conversation" + ) as pre, + ): pre.assert_not_called() pb_message = conversation.DeleteConversationRequest.pb( conversation.DeleteConversationRequest() @@ -6213,8 +6221,9 @@ def test_get_conversation_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6279,17 +6288,20 @@ def test_get_conversation_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "post_get_conversation" - ) as post, mock.patch.object( - transports.DataChatServiceRestInterceptor, "post_get_conversation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataChatServiceRestInterceptor, "pre_get_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_get_conversation" + ) as post, + mock.patch.object( + transports.DataChatServiceRestInterceptor, + "post_get_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "pre_get_conversation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6342,8 +6354,9 @@ def test_list_conversations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6406,18 +6419,20 @@ def test_list_conversations_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "post_list_conversations" - ) as post, mock.patch.object( - transports.DataChatServiceRestInterceptor, - "post_list_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataChatServiceRestInterceptor, "pre_list_conversations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_list_conversations" + ) as post, + mock.patch.object( + transports.DataChatServiceRestInterceptor, + "post_list_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "pre_list_conversations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6477,8 +6492,9 @@ def test_list_messages_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6543,17 +6559,20 @@ def test_list_messages_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "post_list_messages" - ) as post, mock.patch.object( - transports.DataChatServiceRestInterceptor, "post_list_messages_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataChatServiceRestInterceptor, "pre_list_messages" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_list_messages" + ) as post, + mock.patch.object( + transports.DataChatServiceRestInterceptor, + "post_list_messages_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "pre_list_messages" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6609,8 +6628,9 @@ def test_query_data_rest_bad_request(request_type=data_chat_service.QueryDataReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6679,17 +6699,19 @@ def test_query_data_rest_interceptors(null_interceptor): ) client = DataChatServiceClient(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.DataChatServiceRestInterceptor, "post_query_data" - ) as post, mock.patch.object( - transports.DataChatServiceRestInterceptor, "post_query_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataChatServiceRestInterceptor, "pre_query_data" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_query_data" + ) as post, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "post_query_data_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DataChatServiceRestInterceptor, "pre_query_data" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6747,8 +6769,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6807,8 +6830,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6869,8 +6893,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6931,8 +6956,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6993,8 +7019,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7055,8 +7082,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7322,11 +7350,14 @@ def test_data_chat_service_base_transport(): def test_data_chat_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.geminidataanalytics_v1beta.services.data_chat_service.transports.DataChatServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.geminidataanalytics_v1beta.services.data_chat_service.transports.DataChatServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataChatServiceTransport( @@ -7343,9 +7374,12 @@ def test_data_chat_service_base_transport_with_credentials_file(): def test_data_chat_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.geminidataanalytics_v1beta.services.data_chat_service.transports.DataChatServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.geminidataanalytics_v1beta.services.data_chat_service.transports.DataChatServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataChatServiceTransport() @@ -7417,11 +7451,12 @@ def test_data_chat_service_transport_auth_gdch_credentials(transport_class): def test_data_chat_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-gke-backup/docs/conf.py b/packages/google-cloud-gke-backup/docs/conf.py index 7ee7f396e73d..101a2a1938d6 100644 --- a/packages/google-cloud-gke-backup/docs/conf.py +++ b/packages/google-cloud-gke-backup/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-gke-backup documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/__init__.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/__init__.py index 67197767587c..4b409f688453 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/__init__.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.backup_for_gke import BackupForGKEAsyncClient, BackupForGKEClient from .types.backup import Backup from .types.backup_channel import BackupChannel diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/async_client.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/async_client.py index fef6e3483bfe..9e4db9f4004d 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/async_client.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_backup_v1 import gapic_version as package_version @@ -44,31 +44,38 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.gke_backup_v1.services.backup_for_gke import pagers -from google.cloud.gke_backup_v1.types import backup_plan_binding, common, gkebackup -from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel -from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel -from google.cloud.gke_backup_v1.types import backup +from google.cloud.gke_backup_v1.types import ( + backup, + backup_channel, + backup_plan, + backup_plan_binding, + common, + gkebackup, + restore, + restore_channel, + restore_plan, + restore_plan_binding, + volume, +) from google.cloud.gke_backup_v1.types import backup as gcg_backup -from google.cloud.gke_backup_v1.types import backup_channel -from google.cloud.gke_backup_v1.types import backup_plan +from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel from google.cloud.gke_backup_v1.types import backup_plan as gcg_backup_plan -from google.cloud.gke_backup_v1.types import restore from google.cloud.gke_backup_v1.types import restore as gcg_restore -from google.cloud.gke_backup_v1.types import restore_channel -from google.cloud.gke_backup_v1.types import restore_plan +from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel from google.cloud.gke_backup_v1.types import restore_plan as gcg_restore_plan -from google.cloud.gke_backup_v1.types import restore_plan_binding, volume from .client import BackupForGKEClient from .transports.base import DEFAULT_CLIENT_INFO, BackupForGKETransport @@ -169,7 +176,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: BackupForGKEAsyncClient: The constructed client. """ - return BackupForGKEClient.from_service_account_info.__func__(BackupForGKEAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = BackupForGKEClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(BackupForGKEAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -185,7 +193,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: BackupForGKEAsyncClient: The constructed client. """ - return BackupForGKEClient.from_service_account_file.__func__(BackupForGKEAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = BackupForGKEClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(BackupForGKEAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/client.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/client.py index 5c96a0a0acf7..bbfb0f26f755 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/client.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_backup_v1 import gapic_version as package_version @@ -61,31 +61,38 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.gke_backup_v1.services.backup_for_gke import pagers -from google.cloud.gke_backup_v1.types import backup_plan_binding, common, gkebackup -from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel -from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel -from google.cloud.gke_backup_v1.types import backup +from google.cloud.gke_backup_v1.types import ( + backup, + backup_channel, + backup_plan, + backup_plan_binding, + common, + gkebackup, + restore, + restore_channel, + restore_plan, + restore_plan_binding, + volume, +) from google.cloud.gke_backup_v1.types import backup as gcg_backup -from google.cloud.gke_backup_v1.types import backup_channel -from google.cloud.gke_backup_v1.types import backup_plan +from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel from google.cloud.gke_backup_v1.types import backup_plan as gcg_backup_plan -from google.cloud.gke_backup_v1.types import restore from google.cloud.gke_backup_v1.types import restore as gcg_restore -from google.cloud.gke_backup_v1.types import restore_channel -from google.cloud.gke_backup_v1.types import restore_plan +from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel from google.cloud.gke_backup_v1.types import restore_plan as gcg_restore_plan -from google.cloud.gke_backup_v1.types import restore_plan_binding, volume from .transports.base import DEFAULT_CLIENT_INFO, BackupForGKETransport from .transports.grpc import BackupForGKEGrpcTransport @@ -906,11 +913,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = BackupForGKEClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + BackupForGKEClient._read_environment_variables() + ) self._client_cert_source = BackupForGKEClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -945,8 +950,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(BackupForGKETransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/pagers.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/pagers.py index b78f078519c1..e3324be07135 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/pagers.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/pagers.py @@ -78,7 +78,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -154,7 +154,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -234,7 +234,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -310,7 +310,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -390,7 +390,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -466,7 +466,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -546,7 +546,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -622,7 +622,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -702,7 +702,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -778,7 +778,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -858,7 +858,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -934,7 +934,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1014,7 +1014,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1090,7 +1090,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1170,7 +1170,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1246,7 +1246,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1326,7 +1326,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1402,7 +1402,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1482,7 +1482,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1558,7 +1558,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/base.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/base.py index b6ef00fcfd1d..c04afa057b01 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/base.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_backup_v1 import gapic_version as package_version from google.cloud.gke_backup_v1.types import ( @@ -1007,13 +1009,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc.py index c43f2dd2603a..88e31bf7606b 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.gke_backup_v1.types import ( backup, @@ -1144,12 +1146,12 @@ def list_restore_plan_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_restore_plan_bindings" not in self._stubs: - self._stubs[ - "list_restore_plan_bindings" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkebackup.v1.BackupForGKE/ListRestorePlanBindings", - request_serializer=gkebackup.ListRestorePlanBindingsRequest.serialize, - response_deserializer=gkebackup.ListRestorePlanBindingsResponse.deserialize, + self._stubs["list_restore_plan_bindings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkebackup.v1.BackupForGKE/ListRestorePlanBindings", + request_serializer=gkebackup.ListRestorePlanBindingsRequest.serialize, + response_deserializer=gkebackup.ListRestorePlanBindingsResponse.deserialize, + ) ) return self._stubs["list_restore_plan_bindings"] @@ -1386,12 +1388,12 @@ def get_backup_index_download_url( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_backup_index_download_url" not in self._stubs: - self._stubs[ - "get_backup_index_download_url" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkebackup.v1.BackupForGKE/GetBackupIndexDownloadUrl", - request_serializer=gkebackup.GetBackupIndexDownloadUrlRequest.serialize, - response_deserializer=gkebackup.GetBackupIndexDownloadUrlResponse.deserialize, + self._stubs["get_backup_index_download_url"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkebackup.v1.BackupForGKE/GetBackupIndexDownloadUrl", + request_serializer=gkebackup.GetBackupIndexDownloadUrlRequest.serialize, + response_deserializer=gkebackup.GetBackupIndexDownloadUrlResponse.deserialize, + ) ) return self._stubs["get_backup_index_download_url"] diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc_asyncio.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc_asyncio.py index 3b77a27343b9..18a5da2ab93a 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc_asyncio.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gke_backup_v1.types import ( backup, @@ -1191,12 +1193,12 @@ def list_restore_plan_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_restore_plan_bindings" not in self._stubs: - self._stubs[ - "list_restore_plan_bindings" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkebackup.v1.BackupForGKE/ListRestorePlanBindings", - request_serializer=gkebackup.ListRestorePlanBindingsRequest.serialize, - response_deserializer=gkebackup.ListRestorePlanBindingsResponse.deserialize, + self._stubs["list_restore_plan_bindings"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkebackup.v1.BackupForGKE/ListRestorePlanBindings", + request_serializer=gkebackup.ListRestorePlanBindingsRequest.serialize, + response_deserializer=gkebackup.ListRestorePlanBindingsResponse.deserialize, + ) ) return self._stubs["list_restore_plan_bindings"] @@ -1444,12 +1446,12 @@ def get_backup_index_download_url( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_backup_index_download_url" not in self._stubs: - self._stubs[ - "get_backup_index_download_url" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkebackup.v1.BackupForGKE/GetBackupIndexDownloadUrl", - request_serializer=gkebackup.GetBackupIndexDownloadUrlRequest.serialize, - response_deserializer=gkebackup.GetBackupIndexDownloadUrlResponse.deserialize, + self._stubs["get_backup_index_download_url"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkebackup.v1.BackupForGKE/GetBackupIndexDownloadUrl", + request_serializer=gkebackup.GetBackupIndexDownloadUrlRequest.serialize, + response_deserializer=gkebackup.GetBackupIndexDownloadUrlResponse.deserialize, + ) ) return self._stubs["get_backup_index_download_url"] diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest.py index 77f55ab9c908..ea1a4f2c2751 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2726,7 +2728,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2852,9 +2854,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseCreateBackupChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseCreateBackupChannel._get_http_options() request, metadata = self._interceptor.pre_create_backup_channel( request, metadata @@ -2880,7 +2880,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3033,7 +3033,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3184,7 +3184,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3310,9 +3310,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseCreateRestoreChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseCreateRestoreChannel._get_http_options() request, metadata = self._interceptor.pre_create_restore_channel( request, metadata @@ -3338,7 +3336,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3464,9 +3462,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseCreateRestorePlan._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseCreateRestorePlan._get_http_options() request, metadata = self._interceptor.pre_create_restore_plan( request, metadata @@ -3492,7 +3488,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3640,7 +3636,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3764,9 +3760,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseDeleteBackupChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseDeleteBackupChannel._get_http_options() request, metadata = self._interceptor.pre_delete_backup_channel( request, metadata @@ -3788,7 +3782,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3935,7 +3929,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4080,7 +4074,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4204,9 +4198,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseDeleteRestoreChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseDeleteRestoreChannel._get_http_options() request, metadata = self._interceptor.pre_delete_restore_channel( request, metadata @@ -4228,7 +4220,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4352,9 +4344,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseDeleteRestorePlan._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseDeleteRestorePlan._get_http_options() request, metadata = self._interceptor.pre_delete_restore_plan( request, metadata @@ -4376,7 +4366,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4806,9 +4796,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseGetBackupIndexDownloadUrl._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseGetBackupIndexDownloadUrl._get_http_options() request, metadata = self._interceptor.pre_get_backup_index_download_url( request, metadata @@ -4874,11 +4862,10 @@ def __call__( resp = self._interceptor.post_get_backup_index_download_url(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_backup_index_download_url_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_backup_index_download_url_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5114,9 +5101,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseGetBackupPlanBinding._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseGetBackupPlanBinding._get_http_options() request, metadata = self._interceptor.pre_get_backup_plan_binding( request, metadata @@ -5419,9 +5404,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseGetRestoreChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseGetRestoreChannel._get_http_options() request, metadata = self._interceptor.pre_get_restore_channel( request, metadata @@ -5724,9 +5707,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseGetRestorePlanBinding._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseGetRestorePlanBinding._get_http_options() request, metadata = self._interceptor.pre_get_restore_plan_binding( request, metadata @@ -6174,9 +6155,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseListBackupChannels._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseListBackupChannels._get_http_options() request, metadata = self._interceptor.pre_list_backup_channels( request, metadata @@ -6325,9 +6304,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseListBackupPlanBindings._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseListBackupPlanBindings._get_http_options() request, metadata = self._interceptor.pre_list_backup_plan_bindings( request, metadata @@ -6772,9 +6749,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseListRestoreChannels._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseListRestoreChannels._get_http_options() request, metadata = self._interceptor.pre_list_restore_channels( request, metadata @@ -6925,9 +6900,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseListRestorePlanBindings._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseListRestorePlanBindings._get_http_options() request, metadata = self._interceptor.pre_list_restore_plan_bindings( request, metadata @@ -7372,9 +7345,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseListVolumeBackups._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseListVolumeBackups._get_http_options() request, metadata = self._interceptor.pre_list_volume_backups( request, metadata @@ -7523,9 +7494,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseListVolumeRestores._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseListVolumeRestores._get_http_options() request, metadata = self._interceptor.pre_list_volume_restores( request, metadata @@ -7705,7 +7674,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7831,9 +7800,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseUpdateBackupChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseUpdateBackupChannel._get_http_options() request, metadata = self._interceptor.pre_update_backup_channel( request, metadata @@ -7859,7 +7826,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8012,7 +7979,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8163,7 +8130,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8289,9 +8256,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseUpdateRestoreChannel._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseUpdateRestoreChannel._get_http_options() request, metadata = self._interceptor.pre_update_restore_channel( request, metadata @@ -8317,7 +8282,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8443,9 +8408,7 @@ def __call__( """ - http_options = ( - _BaseBackupForGKERestTransport._BaseUpdateRestorePlan._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseUpdateRestorePlan._get_http_options() request, metadata = self._interceptor.pre_update_restore_plan( request, metadata @@ -8471,7 +8434,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8657,7 +8620,9 @@ def get_backup_index_download_url( ]: # 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._GetBackupIndexDownloadUrl(self._session, self._host, self._interceptor) # type: ignore + return self._GetBackupIndexDownloadUrl( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_backup_plan( @@ -8745,7 +8710,9 @@ def list_backup_plan_bindings( ]: # 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._ListBackupPlanBindings(self._session, self._host, self._interceptor) # type: ignore + return self._ListBackupPlanBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_backup_plans( @@ -8784,7 +8751,9 @@ def list_restore_plan_bindings( ]: # 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._ListRestorePlanBindings(self._session, self._host, self._interceptor) # type: ignore + return self._ListRestorePlanBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_restore_plans( @@ -9506,9 +9475,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseBackupForGKERestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseBackupForGKERestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest_base.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest_base.py index 42b064656915..1e004c8955fa 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest_base.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/services/backup_for_gke/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/__init__.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/__init__.py index 86969796c7da..56ffe8362b44 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/__init__.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/__init__.py @@ -13,10 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .backup import Backup -from .backup_channel import BackupChannel -from .backup_plan import BackupPlan, ExclusionWindow, RpoConfig -from .backup_plan_binding import BackupPlanBinding +from .backup import ( + Backup, +) +from .backup_channel import ( + BackupChannel, +) +from .backup_plan import ( + BackupPlan, + ExclusionWindow, + RpoConfig, +) +from .backup_plan_binding import ( + BackupPlanBinding, +) from .common import ( EncryptionKey, NamespacedName, @@ -83,10 +93,19 @@ RestoreConfig, VolumeDataRestorePolicyOverride, ) -from .restore_channel import RestoreChannel -from .restore_plan import RestorePlan -from .restore_plan_binding import RestorePlanBinding -from .volume import VolumeBackup, VolumeRestore +from .restore_channel import ( + RestoreChannel, +) +from .restore_plan import ( + RestorePlan, +) +from .restore_plan_binding import ( + RestorePlanBinding, +) +from .volume import ( + VolumeBackup, + VolumeRestore, +) __all__ = ( "Backup", diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup.py index 4efaf8234fff..af04fb66ff4f 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.gke_backup_v1.types import common @@ -210,6 +210,7 @@ class State(proto.Enum): This Backup resource (and its associated artifacts) is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 IN_PROGRESS = 2 diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_channel.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_channel.py index 08c6ec187a50..94215197322e 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_channel.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_channel.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan.py index 9abdaf252ca8..7520e746c8ef 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore from google.cloud.gke_backup_v1.types import common @@ -155,6 +155,7 @@ class State(proto.Enum): The BackupPlan is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CLUSTER_PENDING = 1 PROVISIONING = 2 diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan_binding.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan_binding.py index fc94933e457c..d428afb642f5 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan_binding.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/backup_plan_binding.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.gke_backup_v1.types import common @@ -137,6 +137,7 @@ class State(proto.Enum): The BackupPlan is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CLUSTER_PENDING = 1 PROVISIONING = 2 diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/common.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/common.py index 3303756836c9..2c82a5008c51 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/common.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/common.py @@ -111,6 +111,7 @@ class VolumeType(proto.Enum): GCE_PERSISTENT_DISK (1): Compute Engine Persistent Disk volume """ + VOLUME_TYPE_UNSPECIFIED = 0 GCE_PERSISTENT_DISK = 1 diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/gkebackup.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/gkebackup.py index 1bbb8619a685..a90e3c41f37d 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/gkebackup.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/gkebackup.py @@ -17,18 +17,21 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel -from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel from google.cloud.gke_backup_v1.types import backup as gcg_backup +from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel from google.cloud.gke_backup_v1.types import backup_plan as gcg_backup_plan -from google.cloud.gke_backup_v1.types import backup_plan_binding +from google.cloud.gke_backup_v1.types import ( + backup_plan_binding, + restore_plan_binding, + volume, +) from google.cloud.gke_backup_v1.types import restore as gcg_restore +from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel from google.cloud.gke_backup_v1.types import restore_plan as gcg_restore_plan -from google.cloud.gke_backup_v1.types import restore_plan_binding, volume __protobuf__ = proto.module( package="google.cloud.gkebackup.v1", @@ -463,12 +466,12 @@ class ListBackupChannelsResponse(proto.Message): def raw_page(self): return self - backup_channels: MutableSequence[ - gcg_backup_channel.BackupChannel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcg_backup_channel.BackupChannel, + backup_channels: MutableSequence[gcg_backup_channel.BackupChannel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcg_backup_channel.BackupChannel, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -635,12 +638,12 @@ class ListBackupPlanBindingsResponse(proto.Message): def raw_page(self): return self - backup_plan_bindings: MutableSequence[ - backup_plan_binding.BackupPlanBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=backup_plan_binding.BackupPlanBinding, + backup_plan_bindings: MutableSequence[backup_plan_binding.BackupPlanBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=backup_plan_binding.BackupPlanBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1297,12 +1300,12 @@ class ListRestoreChannelsResponse(proto.Message): def raw_page(self): return self - restore_channels: MutableSequence[ - gcg_restore_channel.RestoreChannel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcg_restore_channel.RestoreChannel, + restore_channels: MutableSequence[gcg_restore_channel.RestoreChannel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcg_restore_channel.RestoreChannel, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1461,12 +1464,12 @@ class ListRestorePlanBindingsResponse(proto.Message): def raw_page(self): return self - restore_plan_bindings: MutableSequence[ - restore_plan_binding.RestorePlanBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=restore_plan_binding.RestorePlanBinding, + restore_plan_bindings: MutableSequence[restore_plan_binding.RestorePlanBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=restore_plan_binding.RestorePlanBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore.py index c17cac6c887d..50a5a5b16812 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.gke_backup_v1.types import common @@ -158,6 +158,7 @@ class State(proto.Enum): The Kubernetes resources created by this Restore are being validated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 IN_PROGRESS = 2 @@ -399,6 +400,7 @@ class VolumeDataRestorePolicy(proto.Enum): result in either dynamically provisioning blank PVs or binding to statically provisioned PVs. """ + VOLUME_DATA_RESTORE_POLICY_UNSPECIFIED = 0 RESTORE_VOLUME_DATA_FROM_BACKUP = 1 REUSE_VOLUME_HANDLE_FROM_BACKUP = 2 @@ -424,6 +426,7 @@ class ClusterResourceConflictPolicy(proto.Enum): deleting a CRD will cause Kubernetes to delete all CRs of that type. """ + CLUSTER_RESOURCE_CONFLICT_POLICY_UNSPECIFIED = 0 USE_EXISTING_VERSION = 1 USE_BACKUP_VERSION = 2 @@ -496,6 +499,7 @@ class NamespacedResourceRestoreMode(proto.Enum): cluster, and the original PV can be retained or deleted depending on its reclaim policy. """ + NAMESPACED_RESOURCE_RESTORE_MODE_UNSPECIFIED = 0 DELETE_AND_RESTORE = 1 FAIL_ON_CONFLICT = 2 @@ -580,19 +584,19 @@ class ClusterResourceRestoreScope(proto.Message): message. """ - selected_group_kinds: MutableSequence[ - "RestoreConfig.GroupKind" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="RestoreConfig.GroupKind", + selected_group_kinds: MutableSequence["RestoreConfig.GroupKind"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="RestoreConfig.GroupKind", + ) ) - excluded_group_kinds: MutableSequence[ - "RestoreConfig.GroupKind" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="RestoreConfig.GroupKind", + excluded_group_kinds: MutableSequence["RestoreConfig.GroupKind"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="RestoreConfig.GroupKind", + ) ) all_group_kinds: bool = proto.Field( proto.BOOL, @@ -663,12 +667,12 @@ class SubstitutionRule(proto.Message): proto.STRING, number=1, ) - target_group_kinds: MutableSequence[ - "RestoreConfig.GroupKind" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="RestoreConfig.GroupKind", + target_group_kinds: MutableSequence["RestoreConfig.GroupKind"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="RestoreConfig.GroupKind", + ) ) target_json_path: str = proto.Field( proto.STRING, @@ -748,6 +752,7 @@ class Op(proto.Enum): operation object MUST contain a "value" member whose content specifies the replacement value. """ + OP_UNSPECIFIED = 0 REMOVE = 1 MOVE = 2 @@ -847,12 +852,12 @@ class TransformationRule(proto.Message): string description of the transformation rule. """ - field_actions: MutableSequence[ - "RestoreConfig.TransformationRuleAction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="RestoreConfig.TransformationRuleAction", + field_actions: MutableSequence["RestoreConfig.TransformationRuleAction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="RestoreConfig.TransformationRuleAction", + ) ) resource_filter: "RestoreConfig.ResourceFilter" = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_channel.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_channel.py index 585a6bbc5749..b6372a138f22 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_channel.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_channel.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_plan.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_plan.py index 0f61b8f76463..7cd1e0b547a7 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_plan.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_plan.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.gke_backup_v1.types import restore @@ -118,6 +118,7 @@ class State(proto.Enum): The RestorePlan is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CLUSTER_PENDING = 1 READY = 2 diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_plan_binding.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_plan_binding.py index 28639b9536ea..7425209c32ee 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_plan_binding.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/restore_plan_binding.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/volume.py b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/volume.py index 7bb527501dfb..40d2bb6d7e2a 100644 --- a/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/volume.py +++ b/packages/google-cloud-gke-backup/google/cloud/gke_backup_v1/types/volume.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.gke_backup_v1.types import common @@ -110,6 +110,7 @@ class VolumeBackupFormat(proto.Enum): Compute Engine Persistent Disk snapshot based volume backup. """ + VOLUME_BACKUP_FORMAT_UNSPECIFIED = 0 GCE_PERSISTENT_DISK = 1 @@ -147,6 +148,7 @@ class State(proto.Enum): The underlying artifacts of a volume backup (eg: persistent disk snapshots) are deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 SNAPSHOTTING = 2 @@ -285,6 +287,7 @@ class VolumeType(proto.Enum): GCE_PERSISTENT_DISK (1): Compute Engine Persistent Disk volume """ + VOLUME_TYPE_UNSPECIFIED = 0 GCE_PERSISTENT_DISK = 1 @@ -308,6 +311,7 @@ class State(proto.Enum): This VolumeRestore resource is in the process of being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 RESTORING = 2 diff --git a/packages/google-cloud-gke-backup/noxfile.py b/packages/google-cloud-gke-backup/noxfile.py index e5312bb89f14..db771cf4b9df 100644 --- a/packages/google-cloud-gke-backup/noxfile.py +++ b/packages/google-cloud-gke-backup/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gke-backup/tests/unit/gapic/gke_backup_v1/test_backup_for_gke.py b/packages/google-cloud-gke-backup/tests/unit/gapic/gke_backup_v1/test_backup_for_gke.py index e4916e1f160a..62d190dc73ae 100644 --- a/packages/google-cloud-gke-backup/tests/unit/gapic/gke_backup_v1/test_backup_for_gke.py +++ b/packages/google-cloud-gke-backup/tests/unit/gapic/gke_backup_v1/test_backup_for_gke.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,17 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,26 +62,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.gke_backup_v1.services.backup_for_gke import ( BackupForGKEAsyncClient, @@ -79,20 +81,25 @@ pagers, transports, ) -from google.cloud.gke_backup_v1.types import backup_plan_binding, common, gkebackup -from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel -from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel -from google.cloud.gke_backup_v1.types import backup +from google.cloud.gke_backup_v1.types import ( + backup, + backup_channel, + backup_plan, + backup_plan_binding, + common, + gkebackup, + restore, + restore_channel, + restore_plan, + restore_plan_binding, + volume, +) from google.cloud.gke_backup_v1.types import backup as gcg_backup -from google.cloud.gke_backup_v1.types import backup_channel -from google.cloud.gke_backup_v1.types import backup_plan +from google.cloud.gke_backup_v1.types import backup_channel as gcg_backup_channel from google.cloud.gke_backup_v1.types import backup_plan as gcg_backup_plan -from google.cloud.gke_backup_v1.types import restore from google.cloud.gke_backup_v1.types import restore as gcg_restore -from google.cloud.gke_backup_v1.types import restore_channel -from google.cloud.gke_backup_v1.types import restore_plan +from google.cloud.gke_backup_v1.types import restore_channel as gcg_restore_channel from google.cloud.gke_backup_v1.types import restore_plan as gcg_restore_plan -from google.cloud.gke_backup_v1.types import restore_plan_binding, volume CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -960,10 +967,9 @@ def test_backup_for_gke_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1014,9 @@ def test_backup_for_gke_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1052,9 @@ def test_backup_for_gke_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1289,13 +1293,13 @@ def test_backup_for_gke_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1407,9 +1411,9 @@ def test_create_backup_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_plan] = ( + mock_rpc + ) request = {} client.create_backup_plan(request) @@ -1781,9 +1785,9 @@ def test_list_backup_plans_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_plans - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_plans] = ( + mock_rpc + ) request = {} client.list_backup_plans(request) @@ -2686,9 +2690,9 @@ def test_update_backup_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_plan] = ( + mock_rpc + ) request = {} client.update_backup_plan(request) @@ -3043,9 +3047,9 @@ def test_delete_backup_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_plan] = ( + mock_rpc + ) request = {} client.delete_backup_plan(request) @@ -3391,9 +3395,9 @@ def test_create_backup_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_channel] = ( + mock_rpc + ) request = {} client.create_backup_channel(request) @@ -3767,9 +3771,9 @@ def test_list_backup_channels_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_channels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_channels] = ( + mock_rpc + ) request = {} client.list_backup_channels(request) @@ -4322,9 +4326,9 @@ def test_get_backup_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_channel] = ( + mock_rpc + ) request = {} client.get_backup_channel(request) @@ -4667,9 +4671,9 @@ def test_update_backup_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_channel] = ( + mock_rpc + ) request = {} client.update_backup_channel(request) @@ -5025,9 +5029,9 @@ def test_delete_backup_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_channel] = ( + mock_rpc + ) request = {} client.delete_backup_channel(request) @@ -8226,9 +8230,9 @@ def test_list_volume_backups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_volume_backups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_volume_backups] = ( + mock_rpc + ) request = {} client.list_volume_backups(request) @@ -8789,9 +8793,9 @@ def test_get_volume_backup_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_volume_backup - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_volume_backup] = ( + mock_rpc + ) request = {} client.get_volume_backup(request) @@ -9147,9 +9151,9 @@ def test_create_restore_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_restore_plan] = ( + mock_rpc + ) request = {} client.create_restore_plan(request) @@ -9523,9 +9527,9 @@ def test_list_restore_plans_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_restore_plans - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_restore_plans] = ( + mock_rpc + ) request = {} client.list_restore_plans(request) @@ -10078,9 +10082,9 @@ def test_get_restore_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_restore_plan] = ( + mock_rpc + ) request = {} client.get_restore_plan(request) @@ -10418,9 +10422,9 @@ def test_update_restore_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_restore_plan] = ( + mock_rpc + ) request = {} client.update_restore_plan(request) @@ -10775,9 +10779,9 @@ def test_delete_restore_plan_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_restore_plan] = ( + mock_rpc + ) request = {} client.delete_restore_plan(request) @@ -11123,9 +11127,9 @@ def test_create_restore_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_restore_channel] = ( + mock_rpc + ) request = {} client.create_restore_channel(request) @@ -11500,9 +11504,9 @@ def test_list_restore_channels_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_restore_channels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_restore_channels] = ( + mock_rpc + ) request = {} client.list_restore_channels(request) @@ -12055,9 +12059,9 @@ def test_get_restore_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_restore_channel] = ( + mock_rpc + ) request = {} client.get_restore_channel(request) @@ -12400,9 +12404,9 @@ def test_update_restore_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_restore_channel] = ( + mock_rpc + ) request = {} client.update_restore_channel(request) @@ -12758,9 +12762,9 @@ def test_delete_restore_channel_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_restore_channel] = ( + mock_rpc + ) request = {} client.delete_restore_channel(request) @@ -15932,9 +15936,9 @@ def test_list_volume_restores_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_volume_restores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_volume_restores] = ( + mock_rpc + ) request = {} client.list_volume_restores(request) @@ -16489,9 +16493,9 @@ def test_get_volume_restore_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_volume_restore - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_volume_restore] = ( + mock_rpc + ) request = {} client.get_volume_restore(request) @@ -17119,9 +17123,9 @@ def test_create_backup_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_plan] = ( + mock_rpc + ) request = {} client.create_backup_plan(request) @@ -17327,9 +17331,9 @@ def test_list_backup_plans_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_plans - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_plans] = ( + mock_rpc + ) request = {} client.list_backup_plans(request) @@ -17769,9 +17773,9 @@ def test_update_backup_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_plan] = ( + mock_rpc + ) request = {} client.update_backup_plan(request) @@ -17954,9 +17958,9 @@ def test_delete_backup_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_plan] = ( + mock_rpc + ) request = {} client.delete_backup_plan(request) @@ -18140,9 +18144,9 @@ def test_create_backup_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_channel] = ( + mock_rpc + ) request = {} client.create_backup_channel(request) @@ -18336,9 +18340,9 @@ def test_list_backup_channels_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_channels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_channels] = ( + mock_rpc + ) request = {} client.list_backup_channels(request) @@ -18600,9 +18604,9 @@ def test_get_backup_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_channel] = ( + mock_rpc + ) request = {} client.get_backup_channel(request) @@ -18785,9 +18789,9 @@ def test_update_backup_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_channel] = ( + mock_rpc + ) request = {} client.update_backup_channel(request) @@ -18971,9 +18975,9 @@ def test_delete_backup_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_channel] = ( + mock_rpc + ) request = {} client.delete_backup_channel(request) @@ -20620,9 +20624,9 @@ def test_list_volume_backups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_volume_backups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_volume_backups] = ( + mock_rpc + ) request = {} client.list_volume_backups(request) @@ -20886,9 +20890,9 @@ def test_get_volume_backup_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_volume_backup - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_volume_backup] = ( + mock_rpc + ) request = {} client.get_volume_backup(request) @@ -21070,9 +21074,9 @@ def test_create_restore_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_restore_plan] = ( + mock_rpc + ) request = {} client.create_restore_plan(request) @@ -21280,9 +21284,9 @@ def test_list_restore_plans_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_restore_plans - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_restore_plans] = ( + mock_rpc + ) request = {} client.list_restore_plans(request) @@ -21542,9 +21546,9 @@ def test_get_restore_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_restore_plan] = ( + mock_rpc + ) request = {} client.get_restore_plan(request) @@ -21726,9 +21730,9 @@ def test_update_restore_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_restore_plan] = ( + mock_rpc + ) request = {} client.update_restore_plan(request) @@ -21911,9 +21915,9 @@ def test_delete_restore_plan_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_restore_plan - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_restore_plan] = ( + mock_rpc + ) request = {} client.delete_restore_plan(request) @@ -22110,9 +22114,9 @@ def test_create_restore_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_restore_channel] = ( + mock_rpc + ) request = {} client.create_restore_channel(request) @@ -22307,9 +22311,9 @@ def test_list_restore_channels_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_restore_channels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_restore_channels] = ( + mock_rpc + ) request = {} client.list_restore_channels(request) @@ -22571,9 +22575,9 @@ def test_get_restore_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_restore_channel] = ( + mock_rpc + ) request = {} client.get_restore_channel(request) @@ -22756,9 +22760,9 @@ def test_update_restore_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_restore_channel] = ( + mock_rpc + ) request = {} client.update_restore_channel(request) @@ -22942,9 +22946,9 @@ def test_delete_restore_channel_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_restore_channel - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_restore_channel] = ( + mock_rpc + ) request = {} client.delete_restore_channel(request) @@ -24604,9 +24608,9 @@ def test_list_volume_restores_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_volume_restores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_volume_restores] = ( + mock_rpc + ) request = {} client.list_volume_restores(request) @@ -24872,9 +24876,9 @@ def test_get_volume_restore_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_volume_restore - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_volume_restore] = ( + mock_rpc + ) request = {} client.get_volume_restore(request) @@ -27393,8 +27397,9 @@ def test_create_backup_plan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27584,19 +27589,21 @@ def test_create_backup_plan_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_create_backup_plan" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_create_backup_plan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_create_backup_plan" - ) as pre: + 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.BackupForGKERestInterceptor, "post_create_backup_plan" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_create_backup_plan_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_create_backup_plan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27649,8 +27656,9 @@ def test_list_backup_plans_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27715,17 +27723,20 @@ def test_list_backup_plans_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_list_backup_plans" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_list_backup_plans_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_list_backup_plans" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_list_backup_plans" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_list_backup_plans_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_list_backup_plans" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27778,8 +27789,9 @@ def test_get_backup_plan_rest_bad_request(request_type=gkebackup.GetBackupPlanRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -27864,17 +27876,19 @@ def test_get_backup_plan_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_get_backup_plan" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_get_backup_plan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_get_backup_plan" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_backup_plan" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_backup_plan_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_get_backup_plan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -27929,8 +27943,9 @@ def test_update_backup_plan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28124,19 +28139,21 @@ def test_update_backup_plan_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_update_backup_plan" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_update_backup_plan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_update_backup_plan" - ) as pre: + 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.BackupForGKERestInterceptor, "post_update_backup_plan" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_update_backup_plan_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_update_backup_plan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28189,8 +28206,9 @@ def test_delete_backup_plan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28247,19 +28265,21 @@ def test_delete_backup_plan_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_delete_backup_plan" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_delete_backup_plan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_delete_backup_plan" - ) as pre: + 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.BackupForGKERestInterceptor, "post_delete_backup_plan" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_delete_backup_plan_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_delete_backup_plan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28312,8 +28332,9 @@ def test_create_backup_channel_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28448,20 +28469,21 @@ def test_create_backup_channel_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_create_backup_channel" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_create_backup_channel_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_create_backup_channel" - ) as pre: + 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.BackupForGKERestInterceptor, "post_create_backup_channel" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_create_backup_channel_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_create_backup_channel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28514,8 +28536,9 @@ def test_list_backup_channels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28580,18 +28603,20 @@ def test_list_backup_channels_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_list_backup_channels" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_list_backup_channels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_list_backup_channels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_list_backup_channels" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_list_backup_channels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_list_backup_channels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28649,8 +28674,9 @@ def test_get_backup_channel_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28723,17 +28749,20 @@ def test_get_backup_channel_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_get_backup_channel" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_get_backup_channel_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_get_backup_channel" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_backup_channel" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_get_backup_channel_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_get_backup_channel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28792,8 +28821,9 @@ def test_update_backup_channel_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -28932,20 +28962,21 @@ def test_update_backup_channel_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_update_backup_channel" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_update_backup_channel_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_update_backup_channel" - ) as pre: + 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.BackupForGKERestInterceptor, "post_update_backup_channel" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_update_backup_channel_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_update_backup_channel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -28998,8 +29029,9 @@ def test_delete_backup_channel_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29056,20 +29088,21 @@ def test_delete_backup_channel_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_delete_backup_channel" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_delete_backup_channel_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_delete_backup_channel" - ) as pre: + 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.BackupForGKERestInterceptor, "post_delete_backup_channel" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_delete_backup_channel_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_delete_backup_channel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29124,8 +29157,9 @@ def test_list_backup_plan_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29192,18 +29226,20 @@ def test_list_backup_plan_bindings_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_list_backup_plan_bindings" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_list_backup_plan_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_list_backup_plan_bindings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_list_backup_plan_bindings" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_list_backup_plan_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_list_backup_plan_bindings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29263,8 +29299,9 @@ def test_get_backup_plan_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29337,18 +29374,20 @@ def test_get_backup_plan_binding_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_get_backup_plan_binding" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_get_backup_plan_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_get_backup_plan_binding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_backup_plan_binding" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_get_backup_plan_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_get_backup_plan_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29404,8 +29443,9 @@ def test_create_backup_rest_bad_request(request_type=gkebackup.CreateBackupReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29571,19 +29611,20 @@ def test_create_backup_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_create_backup" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_create_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_create_backup" - ) as pre: + 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.BackupForGKERestInterceptor, "post_create_backup" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_create_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_create_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29632,8 +29673,9 @@ def test_list_backups_rest_bad_request(request_type=gkebackup.ListBackupsRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29698,17 +29740,19 @@ def test_list_backups_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_list_backups" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_list_backups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_list_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_list_backups" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_list_backups_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_list_backups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29761,8 +29805,9 @@ def test_get_backup_rest_bad_request(request_type=gkebackup.GetBackupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -29864,17 +29909,19 @@ def test_get_backup_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_get_backup" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_get_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_get_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_backup" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_get_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -29927,8 +29974,9 @@ def test_update_backup_rest_bad_request(request_type=gkebackup.UpdateBackupReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30098,19 +30146,20 @@ def test_update_backup_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_update_backup" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_update_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_update_backup" - ) as pre: + 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.BackupForGKERestInterceptor, "post_update_backup" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_update_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_update_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30161,8 +30210,9 @@ def test_delete_backup_rest_bad_request(request_type=gkebackup.DeleteBackupReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30221,19 +30271,20 @@ def test_delete_backup_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_delete_backup" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_delete_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_delete_backup" - ) as pre: + 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.BackupForGKERestInterceptor, "post_delete_backup" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_delete_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_delete_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30286,8 +30337,9 @@ def test_list_volume_backups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30352,17 +30404,20 @@ def test_list_volume_backups_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_list_volume_backups" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_list_volume_backups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_list_volume_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_list_volume_backups" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_list_volume_backups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_list_volume_backups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30422,8 +30477,9 @@ def test_get_volume_backup_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30510,17 +30566,20 @@ def test_get_volume_backup_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_get_volume_backup" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_get_volume_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_get_volume_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_volume_backup" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_get_volume_backup_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_get_volume_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30573,8 +30632,9 @@ def test_create_restore_plan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30773,19 +30833,21 @@ def test_create_restore_plan_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_create_restore_plan" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_create_restore_plan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_create_restore_plan" - ) as pre: + 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.BackupForGKERestInterceptor, "post_create_restore_plan" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_create_restore_plan_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_create_restore_plan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30838,8 +30900,9 @@ def test_list_restore_plans_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -30904,17 +30967,20 @@ def test_list_restore_plans_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_list_restore_plans" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_list_restore_plans_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_list_restore_plans" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_list_restore_plans" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_list_restore_plans_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_list_restore_plans" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -30969,8 +31035,9 @@ def test_get_restore_plan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31049,17 +31116,20 @@ def test_get_restore_plan_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_get_restore_plan" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_get_restore_plan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_get_restore_plan" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_restore_plan" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_get_restore_plan_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_get_restore_plan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31116,8 +31186,9 @@ def test_update_restore_plan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31320,19 +31391,21 @@ def test_update_restore_plan_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_update_restore_plan" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_update_restore_plan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_update_restore_plan" - ) as pre: + 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.BackupForGKERestInterceptor, "post_update_restore_plan" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_update_restore_plan_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_update_restore_plan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31385,8 +31458,9 @@ def test_delete_restore_plan_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31443,19 +31517,21 @@ def test_delete_restore_plan_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_delete_restore_plan" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_delete_restore_plan_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_delete_restore_plan" - ) as pre: + 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.BackupForGKERestInterceptor, "post_delete_restore_plan" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_delete_restore_plan_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_delete_restore_plan" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31508,8 +31584,9 @@ def test_create_restore_channel_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31644,20 +31721,21 @@ def test_create_restore_channel_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_create_restore_channel" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_create_restore_channel_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_create_restore_channel" - ) as pre: + 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.BackupForGKERestInterceptor, "post_create_restore_channel" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_create_restore_channel_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_create_restore_channel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31710,8 +31788,9 @@ def test_list_restore_channels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31776,18 +31855,20 @@ def test_list_restore_channels_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_list_restore_channels" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_list_restore_channels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_list_restore_channels" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_list_restore_channels" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_list_restore_channels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_list_restore_channels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31847,8 +31928,9 @@ def test_get_restore_channel_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31923,17 +32005,20 @@ def test_get_restore_channel_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_get_restore_channel" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_get_restore_channel_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_get_restore_channel" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_restore_channel" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_get_restore_channel_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_get_restore_channel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31992,8 +32077,9 @@ def test_update_restore_channel_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32132,20 +32218,21 @@ def test_update_restore_channel_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_update_restore_channel" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_update_restore_channel_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_update_restore_channel" - ) as pre: + 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.BackupForGKERestInterceptor, "post_update_restore_channel" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_update_restore_channel_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_update_restore_channel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32200,8 +32287,9 @@ def test_delete_restore_channel_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32260,20 +32348,21 @@ def test_delete_restore_channel_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_delete_restore_channel" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_delete_restore_channel_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_delete_restore_channel" - ) as pre: + 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.BackupForGKERestInterceptor, "post_delete_restore_channel" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_delete_restore_channel_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_delete_restore_channel" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32328,8 +32417,9 @@ def test_list_restore_plan_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32396,18 +32486,20 @@ def test_list_restore_plan_bindings_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_list_restore_plan_bindings" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_list_restore_plan_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_list_restore_plan_bindings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_list_restore_plan_bindings" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_list_restore_plan_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_list_restore_plan_bindings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32467,8 +32559,9 @@ def test_get_restore_plan_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32541,18 +32634,20 @@ def test_get_restore_plan_binding_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_get_restore_plan_binding" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_get_restore_plan_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_get_restore_plan_binding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_restore_plan_binding" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_get_restore_plan_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_get_restore_plan_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32608,8 +32703,9 @@ def test_create_restore_rest_bad_request(request_type=gkebackup.CreateRestoreReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32824,19 +32920,20 @@ def test_create_restore_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_create_restore" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_create_restore_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_create_restore" - ) as pre: + 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.BackupForGKERestInterceptor, "post_create_restore" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_create_restore_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_create_restore" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32885,8 +32982,9 @@ def test_list_restores_rest_bad_request(request_type=gkebackup.ListRestoresReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32951,17 +33049,19 @@ def test_list_restores_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_list_restores" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_list_restores_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_list_restores" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_list_restores" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_list_restores_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_list_restores" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33014,8 +33114,9 @@ def test_get_restore_rest_bad_request(request_type=gkebackup.GetRestoreRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33102,17 +33203,19 @@ def test_get_restore_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_get_restore" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_get_restore_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_get_restore" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_restore" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_restore_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_get_restore" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33165,8 +33268,9 @@ def test_update_restore_rest_bad_request(request_type=gkebackup.UpdateRestoreReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33385,19 +33489,20 @@ def test_update_restore_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_update_restore" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_update_restore_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_update_restore" - ) as pre: + 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.BackupForGKERestInterceptor, "post_update_restore" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_update_restore_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_update_restore" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33448,8 +33553,9 @@ def test_delete_restore_rest_bad_request(request_type=gkebackup.DeleteRestoreReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33508,19 +33614,20 @@ def test_delete_restore_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_delete_restore" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_delete_restore_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_delete_restore" - ) as pre: + 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.BackupForGKERestInterceptor, "post_delete_restore" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_delete_restore_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_delete_restore" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33573,8 +33680,9 @@ def test_list_volume_restores_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33639,18 +33747,20 @@ def test_list_volume_restores_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_list_volume_restores" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_list_volume_restores_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_list_volume_restores" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_list_volume_restores" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_list_volume_restores_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_list_volume_restores" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33710,8 +33820,9 @@ def test_get_volume_restore_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33790,17 +33901,20 @@ def test_get_volume_restore_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_get_volume_restore" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, "post_get_volume_restore_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_get_volume_restore" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_volume_restore" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_get_volume_restore_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_get_volume_restore" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33855,8 +33969,9 @@ def test_get_backup_index_download_url_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33921,18 +34036,20 @@ def test_get_backup_index_download_url_rest_interceptors(null_interceptor): ) client = BackupForGKEClient(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.BackupForGKERestInterceptor, "post_get_backup_index_download_url" - ) as post, mock.patch.object( - transports.BackupForGKERestInterceptor, - "post_get_backup_index_download_url_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.BackupForGKERestInterceptor, "pre_get_backup_index_download_url" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.BackupForGKERestInterceptor, "post_get_backup_index_download_url" + ) as post, + mock.patch.object( + transports.BackupForGKERestInterceptor, + "post_get_backup_index_download_url_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.BackupForGKERestInterceptor, "pre_get_backup_index_download_url" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33990,8 +34107,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -34050,8 +34168,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -34112,8 +34231,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -34176,8 +34296,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -34240,8 +34361,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -34304,8 +34426,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -34366,8 +34489,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -34428,8 +34552,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -34490,8 +34615,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -35502,11 +35628,14 @@ def test_backup_for_gke_base_transport(): def test_backup_for_gke_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gke_backup_v1.services.backup_for_gke.transports.BackupForGKETransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.gke_backup_v1.services.backup_for_gke.transports.BackupForGKETransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackupForGKETransport( @@ -35523,9 +35652,12 @@ def test_backup_for_gke_base_transport_with_credentials_file(): def test_backup_for_gke_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.gke_backup_v1.services.backup_for_gke.transports.BackupForGKETransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.gke_backup_v1.services.backup_for_gke.transports.BackupForGKETransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.BackupForGKETransport() @@ -35597,11 +35729,12 @@ def test_backup_for_gke_transport_auth_gdch_credentials(transport_class): def test_backup_for_gke_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-gke-connect-gateway/docs/conf.py b/packages/google-cloud-gke-connect-gateway/docs/conf.py index ffc37ff879de..7bf6169b89f9 100644 --- a/packages/google-cloud-gke-connect-gateway/docs/conf.py +++ b/packages/google-cloud-gke-connect-gateway/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-gke-connect-gateway documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/__init__.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/__init__.py index 567f847e33d1..b1b0f9473a3b 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/__init__.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.gateway_control import GatewayControlClient from .types.control import GenerateCredentialsRequest, GenerateCredentialsResponse diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/client.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/client.py index 12c62c4d76d1..6ba26b256281 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/client.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkeconnect.gateway_v1 import gapic_version as package_version @@ -75,9 +75,7 @@ class GatewayControlClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GatewayControlTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GatewayControlTransport]] _transport_registry["rest"] = GatewayControlRestTransport def get_transport_class( @@ -593,11 +591,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GatewayControlClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GatewayControlClient._read_environment_variables() + ) self._client_cert_source = GatewayControlClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -632,8 +628,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GatewayControlTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/base.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/base.py index 02b00444c486..c5dc6a333d11 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/base.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkeconnect.gateway_v1 import gapic_version as package_version from google.cloud.gkeconnect.gateway_v1.types import control diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/rest.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/rest.py index 4cd4e8d7a3f7..9bdcb7e0e6b5 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/rest.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/services/gateway_control/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -282,9 +282,7 @@ def __call__( """ - http_options = ( - _BaseGatewayControlRestTransport._BaseGenerateCredentials._get_http_options() - ) + http_options = _BaseGatewayControlRestTransport._BaseGenerateCredentials._get_http_options() request, metadata = self._interceptor.pre_generate_credentials( request, metadata diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/__init__.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/__init__.py index c61bb994430b..6085c2882eaa 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/__init__.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .control import GenerateCredentialsRequest, GenerateCredentialsResponse +from .control import ( + GenerateCredentialsRequest, + GenerateCredentialsResponse, +) __all__ = ( "GenerateCredentialsRequest", diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/control.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/control.py index 4622feaed6e2..2ce5cb673c6c 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/control.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1/types/control.py @@ -73,6 +73,7 @@ class OperatingSystem(proto.Enum): Generates a kubeconfig that is specifically designed to work with Windows. """ + OPERATING_SYSTEM_UNSPECIFIED = 0 OPERATING_SYSTEM_WINDOWS = 1 diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/__init__.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/__init__.py index 4123485e3a47..8a6650500817 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/__init__.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.gateway_control import GatewayControlClient from .types.control import GenerateCredentialsRequest, GenerateCredentialsResponse diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/client.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/client.py index 462491552278..a972711d3963 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/client.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkeconnect.gateway_v1beta1 import gapic_version as package_version @@ -75,9 +75,7 @@ class GatewayControlClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GatewayControlTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GatewayControlTransport]] _transport_registry["rest"] = GatewayControlRestTransport def get_transport_class( @@ -596,11 +594,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GatewayControlClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GatewayControlClient._read_environment_variables() + ) self._client_cert_source = GatewayControlClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -635,8 +631,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GatewayControlTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/base.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/base.py index 03171a671028..a892d6e35504 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/base.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkeconnect.gateway_v1beta1 import gapic_version as package_version from google.cloud.gkeconnect.gateway_v1beta1.types import control diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/rest.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/rest.py index 960ffd3cca38..8faac542bfef 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/rest.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/services/gateway_control/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -286,9 +286,7 @@ def __call__( """ - http_options = ( - _BaseGatewayControlRestTransport._BaseGenerateCredentials._get_http_options() - ) + http_options = _BaseGatewayControlRestTransport._BaseGenerateCredentials._get_http_options() request, metadata = self._interceptor.pre_generate_credentials( request, metadata diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/__init__.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/__init__.py index c61bb994430b..6085c2882eaa 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/__init__.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .control import GenerateCredentialsRequest, GenerateCredentialsResponse +from .control import ( + GenerateCredentialsRequest, + GenerateCredentialsResponse, +) __all__ = ( "GenerateCredentialsRequest", diff --git a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/control.py b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/control.py index 65c6dd082e3c..805b7e4e6cd9 100644 --- a/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/control.py +++ b/packages/google-cloud-gke-connect-gateway/google/cloud/gkeconnect/gateway_v1beta1/types/control.py @@ -73,6 +73,7 @@ class OperatingSystem(proto.Enum): Generates a kubeconfig that is specifically designed to work with Windows. """ + OPERATING_SYSTEM_UNSPECIFIED = 0 OPERATING_SYSTEM_WINDOWS = 1 diff --git a/packages/google-cloud-gke-connect-gateway/noxfile.py b/packages/google-cloud-gke-connect-gateway/noxfile.py index b385f461767d..dc5bbcdcf93c 100644 --- a/packages/google-cloud-gke-connect-gateway/noxfile.py +++ b/packages/google-cloud-gke-connect-gateway/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1/test_gateway_control.py b/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1/test_gateway_control.py index 93c9afe4e6fd..2c026a02a45c 100644 --- a/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1/test_gateway_control.py +++ b/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1/test_gateway_control.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -894,10 +899,9 @@ def test_gateway_control_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -942,10 +946,9 @@ def test_gateway_control_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -981,10 +984,9 @@ def test_gateway_control_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1163,9 +1165,9 @@ def test_generate_credentials_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_credentials - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_credentials] = ( + mock_rpc + ) request = {} client.generate_credentials(request) @@ -1376,8 +1378,9 @@ def test_generate_credentials_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1442,18 +1445,20 @@ def test_generate_credentials_rest_interceptors(null_interceptor): ) client = GatewayControlClient(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.GatewayControlRestInterceptor, "post_generate_credentials" - ) as post, mock.patch.object( - transports.GatewayControlRestInterceptor, - "post_generate_credentials_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GatewayControlRestInterceptor, "pre_generate_credentials" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GatewayControlRestInterceptor, "post_generate_credentials" + ) as post, + mock.patch.object( + transports.GatewayControlRestInterceptor, + "post_generate_credentials_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GatewayControlRestInterceptor, "pre_generate_credentials" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1569,11 +1574,14 @@ def test_gateway_control_base_transport(): def test_gateway_control_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gkeconnect.gateway_v1.services.gateway_control.transports.GatewayControlTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.gkeconnect.gateway_v1.services.gateway_control.transports.GatewayControlTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GatewayControlTransport( @@ -1590,9 +1598,12 @@ def test_gateway_control_base_transport_with_credentials_file(): def test_gateway_control_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.gkeconnect.gateway_v1.services.gateway_control.transports.GatewayControlTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.gkeconnect.gateway_v1.services.gateway_control.transports.GatewayControlTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GatewayControlTransport() diff --git a/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1beta1/test_gateway_control.py b/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1beta1/test_gateway_control.py index cdd13eb689ed..3fc9c5913e8c 100644 --- a/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1beta1/test_gateway_control.py +++ b/packages/google-cloud-gke-connect-gateway/tests/unit/gapic/gateway_v1beta1/test_gateway_control.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -894,10 +899,9 @@ def test_gateway_control_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -942,10 +946,9 @@ def test_gateway_control_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -981,10 +984,9 @@ def test_gateway_control_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1163,9 +1165,9 @@ def test_generate_credentials_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_credentials - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_credentials] = ( + mock_rpc + ) request = {} client.generate_credentials(request) @@ -1376,8 +1378,9 @@ def test_generate_credentials_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1442,18 +1445,20 @@ def test_generate_credentials_rest_interceptors(null_interceptor): ) client = GatewayControlClient(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.GatewayControlRestInterceptor, "post_generate_credentials" - ) as post, mock.patch.object( - transports.GatewayControlRestInterceptor, - "post_generate_credentials_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GatewayControlRestInterceptor, "pre_generate_credentials" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GatewayControlRestInterceptor, "post_generate_credentials" + ) as post, + mock.patch.object( + transports.GatewayControlRestInterceptor, + "post_generate_credentials_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GatewayControlRestInterceptor, "pre_generate_credentials" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1569,11 +1574,14 @@ def test_gateway_control_base_transport(): def test_gateway_control_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gkeconnect.gateway_v1beta1.services.gateway_control.transports.GatewayControlTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.gkeconnect.gateway_v1beta1.services.gateway_control.transports.GatewayControlTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GatewayControlTransport( @@ -1590,9 +1598,12 @@ def test_gateway_control_base_transport_with_credentials_file(): def test_gateway_control_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.gkeconnect.gateway_v1beta1.services.gateway_control.transports.GatewayControlTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.gkeconnect.gateway_v1beta1.services.gateway_control.transports.GatewayControlTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GatewayControlTransport() diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py index 3a47a2acd0c6..4e26d478dd04 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py @@ -103,10 +103,11 @@ class Membership(proto.Message): that have never connected successfully, this field will be unset. unique_id (str): - Output only. Google-generated UUID for this resource. This - is unique across all Membership resources. If a Membership - resource is deleted and another resource with the same name - is created, it gets a different unique_id. + Output only. Google-generated UUID for this + resource. This is unique across all Membership + resources. If a Membership resource is deleted + and another resource with the same name is + created, it gets a different unique_id. authority (google.cloud.gkehub_v1.types.Authority): Optional. How to identify workloads from this Membership. See the documentation on Workload @@ -306,9 +307,10 @@ class ResourceOptions(proto.Message): Attributes: connect_version (str): Optional. The Connect agent version to use for - connect_resources. Defaults to the latest GKE Connect - version. The version must be a currently supported version, - obsolete versions will be rejected. + connect_resources. Defaults to the latest GKE + Connect version. The version must be a currently + supported version, obsolete versions will be + rejected. v1beta1_crd (bool): Optional. Use ``apiextensions/v1beta1`` instead of ``apiextensions/v1`` for CustomResourceDefinition resources. @@ -382,8 +384,9 @@ class GkeCluster(proto.Message): Zonal clusters are also supported. cluster_missing (bool): - Output only. If cluster_missing is set then it denotes that - the GKE cluster no longer exists in the GKE Control Plane. + Output only. If cluster_missing is set then it + denotes that the GKE cluster no longer exists in + the GKE Control Plane. """ resource_link: str = proto.Field( @@ -405,9 +408,10 @@ class KubernetesMetadata(proto.Message): Output only. Kubernetes API server version string as reported by ``/version``. node_provider_id (str): - Output only. Node providerID as reported by the first node - in the list of nodes on the Kubernetes endpoint. On - Kubernetes platforms that support zero-node clusters (like + Output only. Node providerID as reported by the + first node in the list of nodes on the + Kubernetes endpoint. On Kubernetes platforms + that support zero-node clusters (like GKE-on-GCP), the node_count will be zero and the node_provider_id will be empty. node_count (int): @@ -421,10 +425,11 @@ class KubernetesMetadata(proto.Message): reported by the sum of all Kubernetes nodes resources, defined in MB. update_time (google.protobuf.timestamp_pb2.Timestamp): - Output only. The time at which these details were last - updated. This update_time is different from the - Membership-level update_time since EndpointDetails are - updated internally for API consumers. + Output only. The time at which these details + were last updated. This update_time is different + from the Membership-level update_time since + EndpointDetails are updated internally for API + consumers. """ kubernetes_api_server_version: str = proto.Field( diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/types/membership.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/types/membership.py index 34f8f3f8f5c9..baac04ca6cdb 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/types/membership.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/types/membership.py @@ -130,10 +130,11 @@ class Membership(proto.Message): that have never connected successfully, this field will be unset. unique_id (str): - Output only. Google-generated UUID for this resource. This - is unique across all Membership resources. If a Membership - resource is deleted and another resource with the same name - is created, it gets a different unique_id. + Output only. Google-generated UUID for this + resource. This is unique across all Membership + resources. If a Membership resource is deleted + and another resource with the same name is + created, it gets a different unique_id. infrastructure_type (google.cloud.gkehub_v1beta1.types.Membership.InfrastructureType): Optional. The infrastructure type this Membership is running on. @@ -409,9 +410,10 @@ class ResourceOptions(proto.Message): Attributes: connect_version (str): Optional. The Connect agent version to use for - connect_resources. Defaults to the latest GKE Connect - version. The version must be a currently supported version, - obsolete versions will be rejected. + connect_resources. Defaults to the latest GKE + Connect version. The version must be a currently + supported version, obsolete versions will be + rejected. v1beta1_crd (bool): Optional. Use ``apiextensions/v1beta1`` instead of ``apiextensions/v1`` for CustomResourceDefinition resources. @@ -484,8 +486,9 @@ class GkeCluster(proto.Message): Zonal clusters are also supported. cluster_missing (bool): - Output only. If cluster_missing is set then it denotes that - the GKE cluster no longer exists in the GKE Control Plane. + Output only. If cluster_missing is set then it + denotes that the GKE cluster no longer exists in + the GKE Control Plane. """ resource_link: str = proto.Field( @@ -510,9 +513,10 @@ class OnPremCluster(proto.Message): //gkeonprem.googleapis.com/projects/my-project/locations/us-west1-a/vmwareClusters/my-cluster //gkeonprem.googleapis.com/projects/my-project/locations/us-west1-a/bareMetalClusters/my-cluster cluster_missing (bool): - Output only. If cluster_missing is set then it denotes that - API(gkeonprem.googleapis.com) resource for this GKE On-Prem - cluster no longer exists. + Output only. If cluster_missing is set then it + denotes that API(gkeonprem.googleapis.com) + resource for this GKE On-Prem cluster no longer + exists. admin_cluster (bool): Immutable. Whether the cluster is an admin cluster. @@ -574,9 +578,10 @@ class MultiCloudCluster(proto.Message): //gkemulticloud.googleapis.com/projects/my-project/locations/us-west1-a/azureClusters/my-cluster //gkemulticloud.googleapis.com/projects/my-project/locations/us-west1-a/attachedClusters/my-cluster cluster_missing (bool): - Output only. If cluster_missing is set then it denotes that - API(gkemulticloud.googleapis.com) resource for this GKE - Multi-Cloud cluster no longer exists. + Output only. If cluster_missing is set then it + denotes that API(gkemulticloud.googleapis.com) + resource for this GKE Multi-Cloud cluster no + longer exists. """ resource_link: str = proto.Field( @@ -634,9 +639,10 @@ class KubernetesMetadata(proto.Message): Output only. Kubernetes API server version string as reported by '/version'. node_provider_id (str): - Output only. Node providerID as reported by the first node - in the list of nodes on the Kubernetes endpoint. On - Kubernetes platforms that support zero-node clusters (like + Output only. Node providerID as reported by the + first node in the list of nodes on the + Kubernetes endpoint. On Kubernetes platforms + that support zero-node clusters (like GKE-on-GCP), the node_count will be zero and the node_provider_id will be empty. node_count (int): @@ -650,10 +656,11 @@ class KubernetesMetadata(proto.Message): reported by the sum of all Kubernetes nodes resources, defined in MB. update_time (google.protobuf.timestamp_pb2.Timestamp): - Output only. The time at which these details were last - updated. This update_time is different from the - Membership-level update_time since EndpointDetails are - updated internally for API consumers. + Output only. The time at which these details + were last updated. This update_time is different + from the Membership-level update_time since + EndpointDetails are updated internally for API + consumers. """ kubernetes_api_server_version: str = proto.Field( diff --git a/packages/google-cloud-gke-multicloud/docs/conf.py b/packages/google-cloud-gke-multicloud/docs/conf.py index 87a28b3ab319..ecf0198e4529 100644 --- a/packages/google-cloud-gke-multicloud/docs/conf.py +++ b/packages/google-cloud-gke-multicloud/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-gke-multicloud documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/__init__.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/__init__.py index 29774dc88796..6b8a3fcdaf1c 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/__init__.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.attached_clusters import ( AttachedClustersAsyncClient, AttachedClustersClient, diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/async_client.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/async_client.py index e4c66fa0ce6f..a4c09332223b 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/async_client.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.attached_clusters import pagers from google.cloud.gke_multicloud_v1.types import ( @@ -135,7 +135,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AttachedClustersAsyncClient: The constructed client. """ - return AttachedClustersClient.from_service_account_info.__func__(AttachedClustersAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AttachedClustersClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AttachedClustersAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -151,7 +152,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AttachedClustersAsyncClient: The constructed client. """ - return AttachedClustersClient.from_service_account_file.__func__(AttachedClustersAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AttachedClustersClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AttachedClustersAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/client.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/client.py index 4fdf9b558828..63293d859594 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/client.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.attached_clusters import pagers from google.cloud.gke_multicloud_v1.types import ( @@ -89,9 +89,7 @@ class AttachedClustersClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AttachedClustersTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AttachedClustersTransport]] _transport_registry["grpc"] = AttachedClustersGrpcTransport _transport_registry["grpc_asyncio"] = AttachedClustersGrpcAsyncIOTransport _transport_registry["rest"] = AttachedClustersRestTransport @@ -659,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AttachedClustersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AttachedClustersClient._read_environment_variables() + ) self._client_cert_source = AttachedClustersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -698,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AttachedClustersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/pagers.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/pagers.py index b1e6477da8ea..c1160c255434 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/pagers.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/base.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/base.py index ca31eb7ad0f2..490ccaca9190 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/base.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version from google.cloud.gke_multicloud_v1.types import attached_resources, attached_service @@ -383,13 +383,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc.py index 11d4c859b8c2..67f201c89801 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.gke_multicloud_v1.types import attached_resources, attached_service @@ -559,12 +559,12 @@ def get_attached_server_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_attached_server_config" not in self._stubs: - self._stubs[ - "get_attached_server_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AttachedClusters/GetAttachedServerConfig", - request_serializer=attached_service.GetAttachedServerConfigRequest.serialize, - response_deserializer=attached_resources.AttachedServerConfig.deserialize, + self._stubs["get_attached_server_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AttachedClusters/GetAttachedServerConfig", + request_serializer=attached_service.GetAttachedServerConfigRequest.serialize, + response_deserializer=attached_resources.AttachedServerConfig.deserialize, + ) ) return self._stubs["get_attached_server_config"] @@ -592,12 +592,12 @@ def generate_attached_cluster_install_manifest( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_attached_cluster_install_manifest" not in self._stubs: - self._stubs[ - "generate_attached_cluster_install_manifest" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterInstallManifest", - request_serializer=attached_service.GenerateAttachedClusterInstallManifestRequest.serialize, - response_deserializer=attached_service.GenerateAttachedClusterInstallManifestResponse.deserialize, + self._stubs["generate_attached_cluster_install_manifest"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterInstallManifest", + request_serializer=attached_service.GenerateAttachedClusterInstallManifestRequest.serialize, + response_deserializer=attached_service.GenerateAttachedClusterInstallManifestResponse.deserialize, + ) ) return self._stubs["generate_attached_cluster_install_manifest"] @@ -624,12 +624,12 @@ def generate_attached_cluster_agent_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_attached_cluster_agent_token" not in self._stubs: - self._stubs[ - "generate_attached_cluster_agent_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterAgentToken", - request_serializer=attached_service.GenerateAttachedClusterAgentTokenRequest.serialize, - response_deserializer=attached_service.GenerateAttachedClusterAgentTokenResponse.deserialize, + self._stubs["generate_attached_cluster_agent_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterAgentToken", + request_serializer=attached_service.GenerateAttachedClusterAgentTokenRequest.serialize, + response_deserializer=attached_service.GenerateAttachedClusterAgentTokenResponse.deserialize, + ) ) return self._stubs["generate_attached_cluster_agent_token"] diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc_asyncio.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc_asyncio.py index ead7a05b4c86..673c0ac4d4fd 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc_asyncio.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gke_multicloud_v1.types import attached_resources, attached_service @@ -572,12 +572,12 @@ def get_attached_server_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_attached_server_config" not in self._stubs: - self._stubs[ - "get_attached_server_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AttachedClusters/GetAttachedServerConfig", - request_serializer=attached_service.GetAttachedServerConfigRequest.serialize, - response_deserializer=attached_resources.AttachedServerConfig.deserialize, + self._stubs["get_attached_server_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AttachedClusters/GetAttachedServerConfig", + request_serializer=attached_service.GetAttachedServerConfigRequest.serialize, + response_deserializer=attached_resources.AttachedServerConfig.deserialize, + ) ) return self._stubs["get_attached_server_config"] @@ -605,12 +605,12 @@ def generate_attached_cluster_install_manifest( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_attached_cluster_install_manifest" not in self._stubs: - self._stubs[ - "generate_attached_cluster_install_manifest" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterInstallManifest", - request_serializer=attached_service.GenerateAttachedClusterInstallManifestRequest.serialize, - response_deserializer=attached_service.GenerateAttachedClusterInstallManifestResponse.deserialize, + self._stubs["generate_attached_cluster_install_manifest"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterInstallManifest", + request_serializer=attached_service.GenerateAttachedClusterInstallManifestRequest.serialize, + response_deserializer=attached_service.GenerateAttachedClusterInstallManifestResponse.deserialize, + ) ) return self._stubs["generate_attached_cluster_install_manifest"] @@ -637,12 +637,12 @@ def generate_attached_cluster_agent_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_attached_cluster_agent_token" not in self._stubs: - self._stubs[ - "generate_attached_cluster_agent_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterAgentToken", - request_serializer=attached_service.GenerateAttachedClusterAgentTokenRequest.serialize, - response_deserializer=attached_service.GenerateAttachedClusterAgentTokenResponse.deserialize, + self._stubs["generate_attached_cluster_agent_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AttachedClusters/GenerateAttachedClusterAgentToken", + request_serializer=attached_service.GenerateAttachedClusterAgentTokenRequest.serialize, + response_deserializer=attached_service.GenerateAttachedClusterAgentTokenResponse.deserialize, + ) ) return self._stubs["generate_attached_cluster_agent_token"] diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/rest.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/rest.py index 94a9068d50f7..9961a2cac298 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/rest.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/attached_clusters/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -909,9 +909,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseCreateAttachedCluster._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseCreateAttachedCluster._get_http_options() request, metadata = self._interceptor.pre_create_attached_cluster( request, metadata @@ -937,7 +935,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1065,9 +1063,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseDeleteAttachedCluster._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseDeleteAttachedCluster._get_http_options() request, metadata = self._interceptor.pre_delete_attached_cluster( request, metadata @@ -1089,7 +1085,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1216,15 +1212,12 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseGenerateAttachedClusterAgentToken._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseGenerateAttachedClusterAgentToken._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_generate_attached_cluster_agent_token( - request, metadata + request, metadata = ( + self._interceptor.pre_generate_attached_cluster_agent_token( + request, metadata + ) ) transcoded_request = _BaseAttachedClustersRestTransport._BaseGenerateAttachedClusterAgentToken._get_transcoded_request( http_options, request @@ -1292,11 +1285,10 @@ def __call__( resp = self._interceptor.post_generate_attached_cluster_agent_token(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_attached_cluster_agent_token_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_attached_cluster_agent_token_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1386,15 +1378,12 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseGenerateAttachedClusterInstallManifest._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseGenerateAttachedClusterInstallManifest._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_generate_attached_cluster_install_manifest( - request, metadata + request, metadata = ( + self._interceptor.pre_generate_attached_cluster_install_manifest( + request, metadata + ) ) transcoded_request = _BaseAttachedClustersRestTransport._BaseGenerateAttachedClusterInstallManifest._get_transcoded_request( http_options, request @@ -1459,11 +1448,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_attached_cluster_install_manifest_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_attached_cluster_install_manifest_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1548,9 +1536,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseGetAttachedCluster._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseGetAttachedCluster._get_http_options() request, metadata = self._interceptor.pre_get_attached_cluster( request, metadata @@ -1702,9 +1688,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseGetAttachedServerConfig._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseGetAttachedServerConfig._get_http_options() request, metadata = self._interceptor.pre_get_attached_server_config( request, metadata @@ -1858,9 +1842,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseImportAttachedCluster._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseImportAttachedCluster._get_http_options() request, metadata = self._interceptor.pre_import_attached_cluster( request, metadata @@ -1886,7 +1868,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2013,9 +1995,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseListAttachedClusters._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseListAttachedClusters._get_http_options() request, metadata = self._interceptor.pre_list_attached_clusters( request, metadata @@ -2169,9 +2149,7 @@ def __call__( """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseUpdateAttachedCluster._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseUpdateAttachedCluster._get_http_options() request, metadata = self._interceptor.pre_update_attached_cluster( request, metadata @@ -2197,7 +2175,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2295,7 +2273,9 @@ def generate_attached_cluster_agent_token( ]: # 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._GenerateAttachedClusterAgentToken(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAttachedClusterAgentToken( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_attached_cluster_install_manifest( @@ -2306,7 +2286,9 @@ def generate_attached_cluster_install_manifest( ]: # 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._GenerateAttachedClusterInstallManifest(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAttachedClusterInstallManifest( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_attached_cluster( @@ -2327,7 +2309,9 @@ def get_attached_server_config( ]: # 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._GetAttachedServerConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetAttachedServerConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_attached_cluster( @@ -2416,9 +2400,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2536,9 +2518,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2793,9 +2773,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAttachedClustersRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAttachedClustersRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAttachedClustersRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/async_client.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/async_client.py index 30a6630bffec..aba6621f9ea4 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/async_client.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version @@ -45,12 +45,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.aws_clusters import pagers from google.cloud.gke_multicloud_v1.types import ( @@ -130,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AwsClustersAsyncClient: The constructed client. """ - return AwsClustersClient.from_service_account_info.__func__(AwsClustersAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AwsClustersClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AwsClustersAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +147,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AwsClustersAsyncClient: The constructed client. """ - return AwsClustersClient.from_service_account_file.__func__(AwsClustersAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AwsClustersClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AwsClustersAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/client.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/client.py index 4db1d401e986..acfc6e66a89e 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/client.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.aws_clusters import pagers from google.cloud.gke_multicloud_v1.types import ( @@ -681,11 +681,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AwsClustersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AwsClustersClient._read_environment_variables() + ) self._client_cert_source = AwsClustersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -720,8 +718,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AwsClustersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/pagers.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/pagers.py index 11ed0e06bf08..078a1abcf575 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/pagers.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/base.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/base.py index 93960e1c7a90..00b2bbf2aeb9 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/base.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version from google.cloud.gke_multicloud_v1.types import aws_resources, aws_service @@ -514,13 +514,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc.py index 02e32df515ea..8f078f0592dc 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.gke_multicloud_v1.types import aws_resources, aws_service @@ -514,12 +514,12 @@ def generate_aws_cluster_agent_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_aws_cluster_agent_token" not in self._stubs: - self._stubs[ - "generate_aws_cluster_agent_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AwsClusters/GenerateAwsClusterAgentToken", - request_serializer=aws_service.GenerateAwsClusterAgentTokenRequest.serialize, - response_deserializer=aws_service.GenerateAwsClusterAgentTokenResponse.deserialize, + self._stubs["generate_aws_cluster_agent_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AwsClusters/GenerateAwsClusterAgentToken", + request_serializer=aws_service.GenerateAwsClusterAgentTokenRequest.serialize, + response_deserializer=aws_service.GenerateAwsClusterAgentTokenResponse.deserialize, + ) ) return self._stubs["generate_aws_cluster_agent_token"] @@ -639,12 +639,12 @@ def rollback_aws_node_pool_update( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_aws_node_pool_update" not in self._stubs: - self._stubs[ - "rollback_aws_node_pool_update" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AwsClusters/RollbackAwsNodePoolUpdate", - request_serializer=aws_service.RollbackAwsNodePoolUpdateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["rollback_aws_node_pool_update"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AwsClusters/RollbackAwsNodePoolUpdate", + request_serializer=aws_service.RollbackAwsNodePoolUpdateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["rollback_aws_node_pool_update"] diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc_asyncio.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc_asyncio.py index 8abfe05f8131..c6ff70b05770 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc_asyncio.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gke_multicloud_v1.types import aws_resources, aws_service @@ -531,12 +531,12 @@ def generate_aws_cluster_agent_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_aws_cluster_agent_token" not in self._stubs: - self._stubs[ - "generate_aws_cluster_agent_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AwsClusters/GenerateAwsClusterAgentToken", - request_serializer=aws_service.GenerateAwsClusterAgentTokenRequest.serialize, - response_deserializer=aws_service.GenerateAwsClusterAgentTokenResponse.deserialize, + self._stubs["generate_aws_cluster_agent_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AwsClusters/GenerateAwsClusterAgentToken", + request_serializer=aws_service.GenerateAwsClusterAgentTokenRequest.serialize, + response_deserializer=aws_service.GenerateAwsClusterAgentTokenResponse.deserialize, + ) ) return self._stubs["generate_aws_cluster_agent_token"] @@ -661,12 +661,12 @@ def rollback_aws_node_pool_update( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "rollback_aws_node_pool_update" not in self._stubs: - self._stubs[ - "rollback_aws_node_pool_update" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AwsClusters/RollbackAwsNodePoolUpdate", - request_serializer=aws_service.RollbackAwsNodePoolUpdateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["rollback_aws_node_pool_update"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AwsClusters/RollbackAwsNodePoolUpdate", + request_serializer=aws_service.RollbackAwsNodePoolUpdateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["rollback_aws_node_pool_update"] diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/rest.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/rest.py index d0dbea46edc6..ca38b0a8f2a3 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/rest.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/aws_clusters/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1319,7 +1319,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1473,7 +1473,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1622,7 +1622,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1770,7 +1770,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1893,9 +1893,7 @@ def __call__( """ - http_options = ( - _BaseAwsClustersRestTransport._BaseGenerateAwsAccessToken._get_http_options() - ) + http_options = _BaseAwsClustersRestTransport._BaseGenerateAwsAccessToken._get_http_options() request, metadata = self._interceptor.pre_generate_aws_access_token( request, metadata @@ -2044,9 +2042,7 @@ def __call__( """ - http_options = ( - _BaseAwsClustersRestTransport._BaseGenerateAwsClusterAgentToken._get_http_options() - ) + http_options = _BaseAwsClustersRestTransport._BaseGenerateAwsClusterAgentToken._get_http_options() request, metadata = self._interceptor.pre_generate_aws_cluster_agent_token( request, metadata @@ -2117,11 +2113,10 @@ def __call__( resp = self._interceptor.post_generate_aws_cluster_agent_token(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_aws_cluster_agent_token_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_aws_cluster_agent_token_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2657,9 +2652,7 @@ def __call__( """ - http_options = ( - _BaseAwsClustersRestTransport._BaseGetAwsOpenIdConfig._get_http_options() - ) + http_options = _BaseAwsClustersRestTransport._BaseGetAwsOpenIdConfig._get_http_options() request, metadata = self._interceptor.pre_get_aws_open_id_config( request, metadata @@ -2806,9 +2799,7 @@ def __call__( """ - http_options = ( - _BaseAwsClustersRestTransport._BaseGetAwsServerConfig._get_http_options() - ) + http_options = _BaseAwsClustersRestTransport._BaseGetAwsServerConfig._get_http_options() request, metadata = self._interceptor.pre_get_aws_server_config( request, metadata @@ -3261,9 +3252,7 @@ def __call__( """ - http_options = ( - _BaseAwsClustersRestTransport._BaseRollbackAwsNodePoolUpdate._get_http_options() - ) + http_options = _BaseAwsClustersRestTransport._BaseRollbackAwsNodePoolUpdate._get_http_options() request, metadata = self._interceptor.pre_rollback_aws_node_pool_update( request, metadata @@ -3289,7 +3278,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3332,11 +3321,10 @@ def __call__( resp = self._interceptor.post_rollback_aws_node_pool_update(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_rollback_aws_node_pool_update_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_rollback_aws_node_pool_update_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3448,7 +3436,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3602,7 +3590,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3710,7 +3698,9 @@ def generate_aws_access_token( ]: # 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._GenerateAwsAccessToken(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAwsAccessToken( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_aws_cluster_agent_token( @@ -3721,7 +3711,9 @@ def generate_aws_cluster_agent_token( ]: # 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._GenerateAwsClusterAgentToken(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAwsClusterAgentToken( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_aws_cluster( @@ -3795,7 +3787,9 @@ def rollback_aws_node_pool_update( ]: # 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._RollbackAwsNodePoolUpdate(self._session, self._host, self._interceptor) # type: ignore + return self._RollbackAwsNodePoolUpdate( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_aws_cluster( diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/async_client.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/async_client.py index ac15fff79398..e289010a04a1 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/async_client.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version @@ -45,12 +45,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.azure_clusters import pagers from google.cloud.gke_multicloud_v1.types import ( @@ -142,7 +142,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AzureClustersAsyncClient: The constructed client. """ - return AzureClustersClient.from_service_account_info.__func__(AzureClustersAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AzureClustersClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AzureClustersAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +159,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AzureClustersAsyncClient: The constructed client. """ - return AzureClustersClient.from_service_account_file.__func__(AzureClustersAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AzureClustersClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AzureClustersAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/client.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/client.py index b589592e8dcf..15987ba9e632 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/client.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.azure_clusters import pagers from google.cloud.gke_multicloud_v1.types import ( @@ -701,11 +701,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AzureClustersClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AzureClustersClient._read_environment_variables() + ) self._client_cert_source = AzureClustersClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -740,8 +738,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AzureClustersTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/pagers.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/pagers.py index d7866309d81c..72c7ce741cc4 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/pagers.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/base.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/base.py index 40ab9ea10283..c6fa966c8c1c 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/base.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gke_multicloud_v1 import gapic_version as package_version from google.cloud.gke_multicloud_v1.types import azure_resources, azure_service @@ -586,13 +586,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc.py index f82109ce9404..c1b7fc4b10f3 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.gke_multicloud_v1.types import azure_resources, azure_service @@ -647,12 +647,12 @@ def generate_azure_cluster_agent_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_azure_cluster_agent_token" not in self._stubs: - self._stubs[ - "generate_azure_cluster_agent_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureClusterAgentToken", - request_serializer=azure_service.GenerateAzureClusterAgentTokenRequest.serialize, - response_deserializer=azure_service.GenerateAzureClusterAgentTokenResponse.deserialize, + self._stubs["generate_azure_cluster_agent_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureClusterAgentToken", + request_serializer=azure_service.GenerateAzureClusterAgentTokenRequest.serialize, + response_deserializer=azure_service.GenerateAzureClusterAgentTokenResponse.deserialize, + ) ) return self._stubs["generate_azure_cluster_agent_token"] @@ -680,12 +680,12 @@ def generate_azure_access_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_azure_access_token" not in self._stubs: - self._stubs[ - "generate_azure_access_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureAccessToken", - request_serializer=azure_service.GenerateAzureAccessTokenRequest.serialize, - response_deserializer=azure_service.GenerateAzureAccessTokenResponse.deserialize, + self._stubs["generate_azure_access_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureAccessToken", + request_serializer=azure_service.GenerateAzureAccessTokenRequest.serialize, + response_deserializer=azure_service.GenerateAzureAccessTokenResponse.deserialize, + ) ) return self._stubs["generate_azure_access_token"] diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc_asyncio.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc_asyncio.py index ffee2dd1e0f5..741d771149dd 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc_asyncio.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gke_multicloud_v1.types import azure_resources, azure_service @@ -670,12 +670,12 @@ def generate_azure_cluster_agent_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_azure_cluster_agent_token" not in self._stubs: - self._stubs[ - "generate_azure_cluster_agent_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureClusterAgentToken", - request_serializer=azure_service.GenerateAzureClusterAgentTokenRequest.serialize, - response_deserializer=azure_service.GenerateAzureClusterAgentTokenResponse.deserialize, + self._stubs["generate_azure_cluster_agent_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureClusterAgentToken", + request_serializer=azure_service.GenerateAzureClusterAgentTokenRequest.serialize, + response_deserializer=azure_service.GenerateAzureClusterAgentTokenResponse.deserialize, + ) ) return self._stubs["generate_azure_cluster_agent_token"] @@ -703,12 +703,12 @@ def generate_azure_access_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_azure_access_token" not in self._stubs: - self._stubs[ - "generate_azure_access_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureAccessToken", - request_serializer=azure_service.GenerateAzureAccessTokenRequest.serialize, - response_deserializer=azure_service.GenerateAzureAccessTokenResponse.deserialize, + self._stubs["generate_azure_access_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkemulticloud.v1.AzureClusters/GenerateAzureAccessToken", + request_serializer=azure_service.GenerateAzureAccessTokenRequest.serialize, + response_deserializer=azure_service.GenerateAzureAccessTokenResponse.deserialize, + ) ) return self._stubs["generate_azure_access_token"] diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/rest.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/rest.py index d6168d50ad3c..60f393914d20 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/rest.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/services/azure_clusters/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1473,9 +1473,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseCreateAzureClient._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseCreateAzureClient._get_http_options() request, metadata = self._interceptor.pre_create_azure_client( request, metadata @@ -1501,7 +1499,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1627,9 +1625,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseCreateAzureCluster._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseCreateAzureCluster._get_http_options() request, metadata = self._interceptor.pre_create_azure_cluster( request, metadata @@ -1655,7 +1651,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1781,9 +1777,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseCreateAzureNodePool._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseCreateAzureNodePool._get_http_options() request, metadata = self._interceptor.pre_create_azure_node_pool( request, metadata @@ -1809,7 +1803,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1934,9 +1928,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseDeleteAzureClient._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseDeleteAzureClient._get_http_options() request, metadata = self._interceptor.pre_delete_azure_client( request, metadata @@ -1958,7 +1950,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2082,9 +2074,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseDeleteAzureCluster._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseDeleteAzureCluster._get_http_options() request, metadata = self._interceptor.pre_delete_azure_cluster( request, metadata @@ -2106,7 +2096,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2230,9 +2220,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseDeleteAzureNodePool._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseDeleteAzureNodePool._get_http_options() request, metadata = self._interceptor.pre_delete_azure_node_pool( request, metadata @@ -2254,7 +2242,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2379,9 +2367,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseGenerateAzureAccessToken._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseGenerateAzureAccessToken._get_http_options() request, metadata = self._interceptor.pre_generate_azure_access_token( request, metadata @@ -2532,15 +2518,12 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseGenerateAzureClusterAgentToken._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseGenerateAzureClusterAgentToken._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_generate_azure_cluster_agent_token( - request, metadata + request, metadata = ( + self._interceptor.pre_generate_azure_cluster_agent_token( + request, metadata + ) ) transcoded_request = _BaseAzureClustersRestTransport._BaseGenerateAzureClusterAgentToken._get_transcoded_request( http_options, request @@ -2606,11 +2589,10 @@ def __call__( resp = self._interceptor.post_generate_azure_cluster_agent_token(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_azure_cluster_agent_token_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_azure_cluster_agent_token_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3009,9 +2991,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseGetAzureJsonWebKeys._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseGetAzureJsonWebKeys._get_http_options() request, metadata = self._interceptor.pre_get_azure_json_web_keys( request, metadata @@ -3158,9 +3138,7 @@ def __call__( An Anthos node pool running on Azure. """ - http_options = ( - _BaseAzureClustersRestTransport._BaseGetAzureNodePool._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseGetAzureNodePool._get_http_options() request, metadata = self._interceptor.pre_get_azure_node_pool( request, metadata @@ -3311,9 +3289,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseGetAzureOpenIdConfig._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseGetAzureOpenIdConfig._get_http_options() request, metadata = self._interceptor.pre_get_azure_open_id_config( request, metadata @@ -3464,9 +3440,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseGetAzureServerConfig._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseGetAzureServerConfig._get_http_options() request, metadata = self._interceptor.pre_get_azure_server_config( request, metadata @@ -3615,9 +3589,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseListAzureClients._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseListAzureClients._get_http_options() request, metadata = self._interceptor.pre_list_azure_clients( request, metadata @@ -3766,9 +3738,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseListAzureClusters._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseListAzureClusters._get_http_options() request, metadata = self._interceptor.pre_list_azure_clusters( request, metadata @@ -3917,9 +3887,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseListAzureNodePools._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseListAzureNodePools._get_http_options() request, metadata = self._interceptor.pre_list_azure_node_pools( request, metadata @@ -4070,9 +4038,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseUpdateAzureCluster._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseUpdateAzureCluster._get_http_options() request, metadata = self._interceptor.pre_update_azure_cluster( request, metadata @@ -4098,7 +4064,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4224,9 +4190,7 @@ def __call__( """ - http_options = ( - _BaseAzureClustersRestTransport._BaseUpdateAzureNodePool._get_http_options() - ) + http_options = _BaseAzureClustersRestTransport._BaseUpdateAzureNodePool._get_http_options() request, metadata = self._interceptor.pre_update_azure_node_pool( request, metadata @@ -4252,7 +4216,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4376,7 +4340,9 @@ def generate_azure_access_token( ]: # 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._GenerateAzureAccessToken(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAzureAccessToken( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_azure_cluster_agent_token( @@ -4387,7 +4353,9 @@ def generate_azure_cluster_agent_token( ]: # 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._GenerateAzureClusterAgentToken(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAzureClusterAgentToken( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_azure_client( diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_resources.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_resources.py index 2bcbaeaa5b1a..fb46777df2bd 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_resources.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore from google.cloud.gke_multicloud_v1.types import common_resources @@ -190,6 +190,7 @@ class State(proto.Enum): requires user action to restore full functionality. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -435,12 +436,12 @@ class AttachedServerConfig(proto.Message): proto.STRING, number=1, ) - valid_versions: MutableSequence[ - "AttachedPlatformVersionInfo" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="AttachedPlatformVersionInfo", + valid_versions: MutableSequence["AttachedPlatformVersionInfo"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="AttachedPlatformVersionInfo", + ) ) @@ -609,6 +610,7 @@ class KeyOperator(proto.Enum): KEY_OPERATOR_EXISTS (2): Operator maps to 'Exists'. """ + KEY_OPERATOR_UNSPECIFIED = 0 KEY_OPERATOR_EQUAL = 1 KEY_OPERATOR_EXISTS = 2 @@ -626,6 +628,7 @@ class Effect(proto.Enum): EFFECT_NO_EXECUTE (3): Effect maps to 'NoExecute'. """ + EFFECT_UNSPECIFIED = 0 EFFECT_NO_SCHEDULE = 1 EFFECT_PREFER_NO_SCHEDULE = 2 diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_service.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_service.py index 0c57609d8df5..c7f118acc7bf 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_service.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/attached_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.gke_multicloud_v1.types import attached_resources @@ -380,12 +380,12 @@ class ListAttachedClustersResponse(proto.Message): def raw_page(self): return self - attached_clusters: MutableSequence[ - attached_resources.AttachedCluster - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=attached_resources.AttachedCluster, + attached_clusters: MutableSequence[attached_resources.AttachedCluster] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=attached_resources.AttachedCluster, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/aws_resources.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/aws_resources.py index 1a8c7cca0459..2c94e4d4f739 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/aws_resources.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/aws_resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore from google.cloud.gke_multicloud_v1.types import common_resources @@ -175,6 +175,7 @@ class State(proto.Enum): requires user action to restore full functionality. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -586,6 +587,7 @@ class VolumeType(proto.Enum): GP3 (2): GP3 (General Purpose SSD volume type). """ + VOLUME_TYPE_UNSPECIFIED = 0 GP2 = 1 GP3 = 2 @@ -768,6 +770,7 @@ class State(proto.Enum): requires user action to restore full functionality. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -1344,6 +1347,7 @@ class Tenancy(proto.Enum): HOST (3): Launch this instance to a dedicated host. """ + TENANCY_UNSPECIFIED = 0 DEFAULT = 1 DEDICATED = 2 diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/aws_service.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/aws_service.py index c88280285ab8..58c9a7e89abc 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/aws_service.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/aws_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.gke_multicloud_v1.types import aws_resources diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_resources.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_resources.py index 17d623afc63b..0b1aefa9a3f0 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_resources.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore from google.cloud.gke_multicloud_v1.types import common_resources @@ -201,6 +201,7 @@ class State(proto.Enum): requires user action to restore full functionality. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 @@ -937,6 +938,7 @@ class State(proto.Enum): requires user action to restore full functionality. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 RUNNING = 2 diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_service.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_service.py index 530cd30b19d6..2d513aa17314 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_service.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/azure_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.gke_multicloud_v1.types import azure_resources @@ -506,12 +506,12 @@ class ListAzureNodePoolsResponse(proto.Message): def raw_page(self): return self - azure_node_pools: MutableSequence[ - azure_resources.AzureNodePool - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=azure_resources.AzureNodePool, + azure_node_pools: MutableSequence[azure_resources.AzureNodePool] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=azure_resources.AzureNodePool, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/common_resources.py b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/common_resources.py index 372891d7ae57..c88bb2dcf525 100644 --- a/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/common_resources.py +++ b/packages/google-cloud-gke-multicloud/google/cloud/gke_multicloud_v1/types/common_resources.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -248,6 +248,7 @@ class Effect(proto.Enum): tolerate the taint. Currently enforced by NodeController. """ + EFFECT_UNSPECIFIED = 0 NO_SCHEDULE = 1 PREFER_NO_SCHEDULE = 2 @@ -432,6 +433,7 @@ class Component(proto.Enum): This indicates that user workload logging component is enabled. """ + COMPONENT_UNSPECIFIED = 0 SYSTEM_COMPONENTS = 1 WORKLOADS = 2 @@ -529,6 +531,7 @@ class EvaluationMode(proto.Enum): BinaryAuthorization using the project's singleton policy. """ + EVALUATION_MODE_UNSPECIFIED = 0 DISABLED = 1 PROJECT_SINGLETON_POLICY_ENFORCE = 2 @@ -564,6 +567,7 @@ class VulnerabilityMode(proto.Enum): Applies the Security Posture's vulnerability on cluster Enterprise level features. """ + VULNERABILITY_MODE_UNSPECIFIED = 0 VULNERABILITY_DISABLED = 1 VULNERABILITY_ENTERPRISE = 2 diff --git a/packages/google-cloud-gke-multicloud/noxfile.py b/packages/google-cloud-gke-multicloud/noxfile.py index 08020301ed4a..55017a8edf8c 100644 --- a/packages/google-cloud-gke-multicloud/noxfile.py +++ b/packages/google-cloud-gke-multicloud/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_attached_clusters.py b/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_attached_clusters.py index 83b30766ed98..3317567b95c1 100644 --- a/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_attached_clusters.py +++ b/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_attached_clusters.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.attached_clusters import ( AttachedClustersAsyncClient, @@ -987,10 +987,9 @@ def test_attached_clusters_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1035,10 +1034,9 @@ def test_attached_clusters_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1074,10 +1072,9 @@ def test_attached_clusters_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1325,13 +1322,13 @@ def test_attached_clusters_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2547,9 +2544,9 @@ def test_get_attached_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_attached_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_attached_cluster] = ( + mock_rpc + ) request = {} client.get_attached_cluster(request) @@ -2910,9 +2907,9 @@ def test_list_attached_clusters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_attached_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_attached_clusters] = ( + mock_rpc + ) request = {} client.list_attached_clusters(request) @@ -5367,9 +5364,9 @@ def test_get_attached_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_attached_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_attached_cluster] = ( + mock_rpc + ) request = {} client.get_attached_cluster(request) @@ -5552,9 +5549,9 @@ def test_list_attached_clusters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_attached_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_attached_clusters] = ( + mock_rpc + ) request = {} client.list_attached_clusters(request) @@ -7197,8 +7194,9 @@ def test_create_attached_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7373,20 +7371,21 @@ def test_create_attached_cluster_rest_interceptors(null_interceptor): ) client = AttachedClustersClient(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.AttachedClustersRestInterceptor, "post_create_attached_cluster" - ) as post, mock.patch.object( - transports.AttachedClustersRestInterceptor, - "post_create_attached_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AttachedClustersRestInterceptor, "pre_create_attached_cluster" - ) as pre: + 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.AttachedClustersRestInterceptor, "post_create_attached_cluster" + ) as post, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "post_create_attached_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AttachedClustersRestInterceptor, "pre_create_attached_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7443,8 +7442,9 @@ def test_update_attached_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7623,20 +7623,21 @@ def test_update_attached_cluster_rest_interceptors(null_interceptor): ) client = AttachedClustersClient(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.AttachedClustersRestInterceptor, "post_update_attached_cluster" - ) as post, mock.patch.object( - transports.AttachedClustersRestInterceptor, - "post_update_attached_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AttachedClustersRestInterceptor, "pre_update_attached_cluster" - ) as pre: + 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.AttachedClustersRestInterceptor, "post_update_attached_cluster" + ) as post, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "post_update_attached_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AttachedClustersRestInterceptor, "pre_update_attached_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7689,8 +7690,9 @@ def test_import_attached_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7747,20 +7749,21 @@ def test_import_attached_cluster_rest_interceptors(null_interceptor): ) client = AttachedClustersClient(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.AttachedClustersRestInterceptor, "post_import_attached_cluster" - ) as post, mock.patch.object( - transports.AttachedClustersRestInterceptor, - "post_import_attached_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AttachedClustersRestInterceptor, "pre_import_attached_cluster" - ) as pre: + 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.AttachedClustersRestInterceptor, "post_import_attached_cluster" + ) as post, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "post_import_attached_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AttachedClustersRestInterceptor, "pre_import_attached_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7815,8 +7818,9 @@ def test_get_attached_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7899,18 +7903,20 @@ def test_get_attached_cluster_rest_interceptors(null_interceptor): ) client = AttachedClustersClient(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.AttachedClustersRestInterceptor, "post_get_attached_cluster" - ) as post, mock.patch.object( - transports.AttachedClustersRestInterceptor, - "post_get_attached_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AttachedClustersRestInterceptor, "pre_get_attached_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AttachedClustersRestInterceptor, "post_get_attached_cluster" + ) as post, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "post_get_attached_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AttachedClustersRestInterceptor, "pre_get_attached_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7965,8 +7971,9 @@ def test_list_attached_clusters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8029,18 +8036,20 @@ def test_list_attached_clusters_rest_interceptors(null_interceptor): ) client = AttachedClustersClient(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.AttachedClustersRestInterceptor, "post_list_attached_clusters" - ) as post, mock.patch.object( - transports.AttachedClustersRestInterceptor, - "post_list_attached_clusters_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AttachedClustersRestInterceptor, "pre_list_attached_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AttachedClustersRestInterceptor, "post_list_attached_clusters" + ) as post, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "post_list_attached_clusters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AttachedClustersRestInterceptor, "pre_list_attached_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8100,8 +8109,9 @@ def test_delete_attached_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8160,20 +8170,21 @@ def test_delete_attached_cluster_rest_interceptors(null_interceptor): ) client = AttachedClustersClient(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.AttachedClustersRestInterceptor, "post_delete_attached_cluster" - ) as post, mock.patch.object( - transports.AttachedClustersRestInterceptor, - "post_delete_attached_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AttachedClustersRestInterceptor, "pre_delete_attached_cluster" - ) as pre: + 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.AttachedClustersRestInterceptor, "post_delete_attached_cluster" + ) as post, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "post_delete_attached_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AttachedClustersRestInterceptor, "pre_delete_attached_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8226,8 +8237,9 @@ def test_get_attached_server_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8290,18 +8302,21 @@ def test_get_attached_server_config_rest_interceptors(null_interceptor): ) client = AttachedClustersClient(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.AttachedClustersRestInterceptor, "post_get_attached_server_config" - ) as post, mock.patch.object( - transports.AttachedClustersRestInterceptor, - "post_get_attached_server_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AttachedClustersRestInterceptor, "pre_get_attached_server_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "post_get_attached_server_config", + ) as post, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "post_get_attached_server_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AttachedClustersRestInterceptor, "pre_get_attached_server_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8359,8 +8374,9 @@ def test_generate_attached_cluster_install_manifest_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8429,20 +8445,22 @@ def test_generate_attached_cluster_install_manifest_rest_interceptors(null_inter ) client = AttachedClustersClient(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.AttachedClustersRestInterceptor, - "post_generate_attached_cluster_install_manifest", - ) as post, mock.patch.object( - transports.AttachedClustersRestInterceptor, - "post_generate_attached_cluster_install_manifest_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AttachedClustersRestInterceptor, - "pre_generate_attached_cluster_install_manifest", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "post_generate_attached_cluster_install_manifest", + ) as post, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "post_generate_attached_cluster_install_manifest_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "pre_generate_attached_cluster_install_manifest", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8506,8 +8524,9 @@ def test_generate_attached_cluster_agent_token_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8580,20 +8599,22 @@ def test_generate_attached_cluster_agent_token_rest_interceptors(null_intercepto ) client = AttachedClustersClient(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.AttachedClustersRestInterceptor, - "post_generate_attached_cluster_agent_token", - ) as post, mock.patch.object( - transports.AttachedClustersRestInterceptor, - "post_generate_attached_cluster_agent_token_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AttachedClustersRestInterceptor, - "pre_generate_attached_cluster_agent_token", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "post_generate_attached_cluster_agent_token", + ) as post, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "post_generate_attached_cluster_agent_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AttachedClustersRestInterceptor, + "pre_generate_attached_cluster_agent_token", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8655,8 +8676,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8717,8 +8739,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8779,8 +8802,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8841,8 +8865,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9182,11 +9207,14 @@ def test_attached_clusters_base_transport(): def test_attached_clusters_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gke_multicloud_v1.services.attached_clusters.transports.AttachedClustersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.gke_multicloud_v1.services.attached_clusters.transports.AttachedClustersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AttachedClustersTransport( @@ -9203,9 +9231,12 @@ def test_attached_clusters_base_transport_with_credentials_file(): def test_attached_clusters_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.gke_multicloud_v1.services.attached_clusters.transports.AttachedClustersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.gke_multicloud_v1.services.attached_clusters.transports.AttachedClustersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AttachedClustersTransport() @@ -9277,11 +9308,12 @@ def test_attached_clusters_transport_auth_gdch_credentials(transport_class): def test_attached_clusters_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_aws_clusters.py b/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_aws_clusters.py index 29d9911a5219..52f8500a0969 100644 --- a/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_aws_clusters.py +++ b/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_aws_clusters.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.aws_clusters import ( AwsClustersAsyncClient, @@ -939,10 +939,9 @@ def test_aws_clusters_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +986,9 @@ def test_aws_clusters_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1024,9 @@ def test_aws_clusters_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1258,13 +1255,13 @@ def test_aws_clusters_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1376,9 +1373,9 @@ def test_create_aws_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_aws_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_aws_cluster] = ( + mock_rpc + ) request = {} client.create_aws_cluster(request) @@ -1737,9 +1734,9 @@ def test_update_aws_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_aws_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_aws_cluster] = ( + mock_rpc + ) request = {} client.update_aws_cluster(request) @@ -2450,9 +2447,9 @@ def test_list_aws_clusters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_aws_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_aws_clusters] = ( + mock_rpc + ) request = {} client.list_aws_clusters(request) @@ -2992,9 +2989,9 @@ def test_delete_aws_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_aws_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_aws_cluster] = ( + mock_rpc + ) request = {} client.delete_aws_cluster(request) @@ -3879,9 +3876,9 @@ def test_create_aws_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_aws_node_pool] = ( + mock_rpc + ) request = {} client.create_aws_node_pool(request) @@ -4240,9 +4237,9 @@ def test_update_aws_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_aws_node_pool] = ( + mock_rpc + ) request = {} client.update_aws_node_pool(request) @@ -4955,9 +4952,9 @@ def test_get_aws_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_node_pool] = ( + mock_rpc + ) request = {} client.get_aws_node_pool(request) @@ -5310,9 +5307,9 @@ def test_list_aws_node_pools_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_aws_node_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_aws_node_pools] = ( + mock_rpc + ) request = {} client.list_aws_node_pools(request) @@ -5852,9 +5849,9 @@ def test_delete_aws_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_aws_node_pool] = ( + mock_rpc + ) request = {} client.delete_aws_node_pool(request) @@ -6217,9 +6214,9 @@ def test_get_aws_open_id_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_open_id_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_open_id_config] = ( + mock_rpc + ) request = {} client.get_aws_open_id_config(request) @@ -6486,9 +6483,9 @@ def test_get_aws_json_web_keys_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_json_web_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_json_web_keys] = ( + mock_rpc + ) request = {} client.get_aws_json_web_keys(request) @@ -6741,9 +6738,9 @@ def test_get_aws_server_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_server_config] = ( + mock_rpc + ) request = {} client.get_aws_server_config(request) @@ -7016,9 +7013,9 @@ def test_create_aws_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_aws_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_aws_cluster] = ( + mock_rpc + ) request = {} client.create_aws_cluster(request) @@ -7235,9 +7232,9 @@ def test_update_aws_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_aws_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_aws_cluster] = ( + mock_rpc + ) request = {} client.update_aws_cluster(request) @@ -7616,9 +7613,9 @@ def test_list_aws_clusters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_aws_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_aws_clusters] = ( + mock_rpc + ) request = {} client.list_aws_clusters(request) @@ -7876,9 +7873,9 @@ def test_delete_aws_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_aws_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_aws_cluster] = ( + mock_rpc + ) request = {} client.delete_aws_cluster(request) @@ -8355,9 +8352,9 @@ def test_create_aws_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_aws_node_pool] = ( + mock_rpc + ) request = {} client.create_aws_node_pool(request) @@ -8576,9 +8573,9 @@ def test_update_aws_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_aws_node_pool] = ( + mock_rpc + ) request = {} client.update_aws_node_pool(request) @@ -8964,9 +8961,9 @@ def test_get_aws_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_node_pool] = ( + mock_rpc + ) request = {} client.get_aws_node_pool(request) @@ -9148,9 +9145,9 @@ def test_list_aws_node_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_aws_node_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_aws_node_pools] = ( + mock_rpc + ) request = {} client.list_aws_node_pools(request) @@ -9412,9 +9409,9 @@ def test_delete_aws_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_aws_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_aws_node_pool] = ( + mock_rpc + ) request = {} client.delete_aws_node_pool(request) @@ -9615,9 +9612,9 @@ def test_get_aws_open_id_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_open_id_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_open_id_config] = ( + mock_rpc + ) request = {} client.get_aws_open_id_config(request) @@ -9740,9 +9737,9 @@ def test_get_aws_json_web_keys_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_json_web_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_json_web_keys] = ( + mock_rpc + ) request = {} client.get_aws_json_web_keys(request) @@ -9865,9 +9862,9 @@ def test_get_aws_server_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_aws_server_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_aws_server_config] = ( + mock_rpc + ) request = {} client.get_aws_server_config(request) @@ -10999,8 +10996,9 @@ def test_create_aws_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11198,19 +11196,21 @@ def test_create_aws_cluster_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_create_aws_cluster" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, "post_create_aws_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_create_aws_cluster" - ) as pre: + 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.AwsClustersRestInterceptor, "post_create_aws_cluster" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_create_aws_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_create_aws_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11267,8 +11267,9 @@ def test_update_aws_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11470,19 +11471,21 @@ def test_update_aws_cluster_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_update_aws_cluster" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, "post_update_aws_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_update_aws_cluster" - ) as pre: + 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.AwsClustersRestInterceptor, "post_update_aws_cluster" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_update_aws_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_update_aws_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11535,8 +11538,9 @@ def test_get_aws_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11615,17 +11619,19 @@ def test_get_aws_cluster_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_get_aws_cluster" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, "post_get_aws_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_get_aws_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AwsClustersRestInterceptor, "post_get_aws_cluster" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, "post_get_aws_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_get_aws_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11678,8 +11684,9 @@ def test_list_aws_clusters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11742,17 +11749,20 @@ def test_list_aws_clusters_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_list_aws_clusters" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, "post_list_aws_clusters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_list_aws_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AwsClustersRestInterceptor, "post_list_aws_clusters" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_list_aws_clusters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_list_aws_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11810,8 +11820,9 @@ def test_delete_aws_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11868,19 +11879,21 @@ def test_delete_aws_cluster_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_delete_aws_cluster" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, "post_delete_aws_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_delete_aws_cluster" - ) as pre: + 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.AwsClustersRestInterceptor, "post_delete_aws_cluster" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_delete_aws_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_delete_aws_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11935,8 +11948,9 @@ def test_generate_aws_cluster_agent_token_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12005,18 +12019,22 @@ def test_generate_aws_cluster_agent_token_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_generate_aws_cluster_agent_token" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, - "post_generate_aws_cluster_agent_token_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_generate_aws_cluster_agent_token" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_generate_aws_cluster_agent_token", + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_generate_aws_cluster_agent_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "pre_generate_aws_cluster_agent_token", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12076,8 +12094,9 @@ def test_generate_aws_access_token_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12142,18 +12161,20 @@ def test_generate_aws_access_token_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_generate_aws_access_token" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, - "post_generate_aws_access_token_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_generate_aws_access_token" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AwsClustersRestInterceptor, "post_generate_aws_access_token" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_generate_aws_access_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_generate_aws_access_token" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12211,8 +12232,9 @@ def test_create_aws_node_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12395,19 +12417,21 @@ def test_create_aws_node_pool_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_create_aws_node_pool" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, "post_create_aws_node_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_create_aws_node_pool" - ) as pre: + 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.AwsClustersRestInterceptor, "post_create_aws_node_pool" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_create_aws_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_create_aws_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12464,8 +12488,9 @@ def test_update_aws_node_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12652,19 +12677,21 @@ def test_update_aws_node_pool_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_update_aws_node_pool" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, "post_update_aws_node_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_update_aws_node_pool" - ) as pre: + 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.AwsClustersRestInterceptor, "post_update_aws_node_pool" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_update_aws_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_update_aws_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12719,8 +12746,9 @@ def test_rollback_aws_node_pool_update_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12779,20 +12807,21 @@ def test_rollback_aws_node_pool_update_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_rollback_aws_node_pool_update" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, - "post_rollback_aws_node_pool_update_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_rollback_aws_node_pool_update" - ) as pre: + 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.AwsClustersRestInterceptor, "post_rollback_aws_node_pool_update" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_rollback_aws_node_pool_update_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_rollback_aws_node_pool_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12847,8 +12876,9 @@ def test_get_aws_node_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12925,17 +12955,20 @@ def test_get_aws_node_pool_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_get_aws_node_pool" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, "post_get_aws_node_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_get_aws_node_pool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AwsClustersRestInterceptor, "post_get_aws_node_pool" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_get_aws_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_get_aws_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12988,8 +13021,9 @@ def test_list_aws_node_pools_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13052,17 +13086,20 @@ def test_list_aws_node_pools_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_list_aws_node_pools" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, "post_list_aws_node_pools_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_list_aws_node_pools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AwsClustersRestInterceptor, "post_list_aws_node_pools" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_list_aws_node_pools_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_list_aws_node_pools" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13122,8 +13159,9 @@ def test_delete_aws_node_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13182,19 +13220,21 @@ def test_delete_aws_node_pool_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_delete_aws_node_pool" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, "post_delete_aws_node_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_delete_aws_node_pool" - ) as pre: + 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.AwsClustersRestInterceptor, "post_delete_aws_node_pool" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_delete_aws_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_delete_aws_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13249,8 +13289,9 @@ def test_get_aws_open_id_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13331,18 +13372,20 @@ def test_get_aws_open_id_config_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_get_aws_open_id_config" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, - "post_get_aws_open_id_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_get_aws_open_id_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AwsClustersRestInterceptor, "post_get_aws_open_id_config" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_get_aws_open_id_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_get_aws_open_id_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13399,8 +13442,9 @@ def test_get_aws_json_web_keys_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13462,18 +13506,20 @@ def test_get_aws_json_web_keys_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_get_aws_json_web_keys" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, - "post_get_aws_json_web_keys_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_get_aws_json_web_keys" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AwsClustersRestInterceptor, "post_get_aws_json_web_keys" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_get_aws_json_web_keys_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_get_aws_json_web_keys" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13528,8 +13574,9 @@ def test_get_aws_server_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13594,18 +13641,20 @@ def test_get_aws_server_config_rest_interceptors(null_interceptor): ) client = AwsClustersClient(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.AwsClustersRestInterceptor, "post_get_aws_server_config" - ) as post, mock.patch.object( - transports.AwsClustersRestInterceptor, - "post_get_aws_server_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AwsClustersRestInterceptor, "pre_get_aws_server_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AwsClustersRestInterceptor, "post_get_aws_server_config" + ) as post, + mock.patch.object( + transports.AwsClustersRestInterceptor, + "post_get_aws_server_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AwsClustersRestInterceptor, "pre_get_aws_server_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13662,8 +13711,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13724,8 +13774,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13786,8 +13837,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13848,8 +13900,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14348,11 +14401,14 @@ def test_aws_clusters_base_transport(): def test_aws_clusters_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gke_multicloud_v1.services.aws_clusters.transports.AwsClustersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.gke_multicloud_v1.services.aws_clusters.transports.AwsClustersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AwsClustersTransport( @@ -14369,9 +14425,12 @@ def test_aws_clusters_base_transport_with_credentials_file(): def test_aws_clusters_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.gke_multicloud_v1.services.aws_clusters.transports.AwsClustersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.gke_multicloud_v1.services.aws_clusters.transports.AwsClustersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AwsClustersTransport() @@ -14443,11 +14502,12 @@ def test_aws_clusters_transport_auth_gdch_credentials(transport_class): def test_aws_clusters_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_azure_clusters.py b/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_azure_clusters.py index ef595c071b55..7589136a7b20 100644 --- a/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_azure_clusters.py +++ b/packages/google-cloud-gke-multicloud/tests/unit/gapic/gke_multicloud_v1/test_azure_clusters.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.gke_multicloud_v1.services.azure_clusters import ( AzureClustersAsyncClient, @@ -958,10 +958,9 @@ def test_azure_clusters_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1005,9 @@ def test_azure_clusters_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1043,9 @@ def test_azure_clusters_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1291,13 +1288,13 @@ def test_azure_clusters_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1409,9 +1406,9 @@ def test_create_azure_client_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_azure_client - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_azure_client] = ( + mock_rpc + ) request = {} client.create_azure_client(request) @@ -1781,9 +1778,9 @@ def test_get_azure_client_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_azure_client - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_azure_client] = ( + mock_rpc + ) request = {} client.get_azure_client(request) @@ -2124,9 +2121,9 @@ def test_list_azure_clients_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_azure_clients - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_azure_clients] = ( + mock_rpc + ) request = {} client.list_azure_clients(request) @@ -2664,9 +2661,9 @@ def test_delete_azure_client_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_azure_client - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_azure_client] = ( + mock_rpc + ) request = {} client.delete_azure_client(request) @@ -3011,9 +3008,9 @@ def test_create_azure_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_azure_cluster] = ( + mock_rpc + ) request = {} client.create_azure_cluster(request) @@ -3373,9 +3370,9 @@ def test_update_azure_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_azure_cluster] = ( + mock_rpc + ) request = {} client.update_azure_cluster(request) @@ -3750,9 +3747,9 @@ def test_get_azure_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_azure_cluster] = ( + mock_rpc + ) request = {} client.get_azure_cluster(request) @@ -4113,9 +4110,9 @@ def test_list_azure_clusters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_azure_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_azure_clusters] = ( + mock_rpc + ) request = {} client.list_azure_clusters(request) @@ -4655,9 +4652,9 @@ def test_delete_azure_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_azure_cluster] = ( + mock_rpc + ) request = {} client.delete_azure_cluster(request) @@ -5544,9 +5541,9 @@ def test_create_azure_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_azure_node_pool] = ( + mock_rpc + ) request = {} client.create_azure_node_pool(request) @@ -5907,9 +5904,9 @@ def test_update_azure_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_azure_node_pool] = ( + mock_rpc + ) request = {} client.update_azure_node_pool(request) @@ -6280,9 +6277,9 @@ def test_get_azure_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_azure_node_pool] = ( + mock_rpc + ) request = {} client.get_azure_node_pool(request) @@ -6638,9 +6635,9 @@ def test_list_azure_node_pools_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_azure_node_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_azure_node_pools] = ( + mock_rpc + ) request = {} client.list_azure_node_pools(request) @@ -7182,9 +7179,9 @@ def test_delete_azure_node_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_azure_node_pool] = ( + mock_rpc + ) request = {} client.delete_azure_node_pool(request) @@ -8522,9 +8519,9 @@ def test_create_azure_client_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_azure_client - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_azure_client] = ( + mock_rpc + ) request = {} client.create_azure_client(request) @@ -8739,9 +8736,9 @@ def test_get_azure_client_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_azure_client - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_azure_client] = ( + mock_rpc + ) request = {} client.get_azure_client(request) @@ -8923,9 +8920,9 @@ def test_list_azure_clients_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_azure_clients - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_azure_clients] = ( + mock_rpc + ) request = {} client.list_azure_clients(request) @@ -9183,9 +9180,9 @@ def test_delete_azure_client_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_azure_client - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_azure_client] = ( + mock_rpc + ) request = {} client.delete_azure_client(request) @@ -9381,9 +9378,9 @@ def test_create_azure_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_azure_cluster] = ( + mock_rpc + ) request = {} client.create_azure_cluster(request) @@ -9600,9 +9597,9 @@ def test_update_azure_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_azure_cluster] = ( + mock_rpc + ) request = {} client.update_azure_cluster(request) @@ -9801,9 +9798,9 @@ def test_get_azure_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_azure_cluster] = ( + mock_rpc + ) request = {} client.get_azure_cluster(request) @@ -9985,9 +9982,9 @@ def test_list_azure_clusters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_azure_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_azure_clusters] = ( + mock_rpc + ) request = {} client.list_azure_clusters(request) @@ -10245,9 +10242,9 @@ def test_delete_azure_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_azure_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_azure_cluster] = ( + mock_rpc + ) request = {} client.delete_azure_cluster(request) @@ -10727,9 +10724,9 @@ def test_create_azure_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_azure_node_pool] = ( + mock_rpc + ) request = {} client.create_azure_node_pool(request) @@ -10949,9 +10946,9 @@ def test_update_azure_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_azure_node_pool] = ( + mock_rpc + ) request = {} client.update_azure_node_pool(request) @@ -11152,9 +11149,9 @@ def test_get_azure_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_azure_node_pool] = ( + mock_rpc + ) request = {} client.get_azure_node_pool(request) @@ -11337,9 +11334,9 @@ def test_list_azure_node_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_azure_node_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_azure_node_pools] = ( + mock_rpc + ) request = {} client.list_azure_node_pools(request) @@ -11602,9 +11599,9 @@ def test_delete_azure_node_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_azure_node_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_azure_node_pool] = ( + mock_rpc + ) request = {} client.delete_azure_node_pool(request) @@ -13473,8 +13470,9 @@ def test_create_azure_client_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13609,20 +13607,21 @@ def test_create_azure_client_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_create_azure_client" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_create_azure_client_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_create_azure_client" - ) as pre: + 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.AzureClustersRestInterceptor, "post_create_azure_client" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_create_azure_client_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_create_azure_client" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13675,8 +13674,9 @@ def test_get_azure_client_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13749,17 +13749,20 @@ def test_get_azure_client_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_get_azure_client" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, "post_get_azure_client_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_get_azure_client" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AzureClustersRestInterceptor, "post_get_azure_client" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_get_azure_client_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_get_azure_client" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13814,8 +13817,9 @@ def test_list_azure_clients_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13878,17 +13882,20 @@ def test_list_azure_clients_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_list_azure_clients" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, "post_list_azure_clients_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_list_azure_clients" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AzureClustersRestInterceptor, "post_list_azure_clients" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_list_azure_clients_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_list_azure_clients" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13946,8 +13953,9 @@ def test_delete_azure_client_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14004,20 +14012,21 @@ def test_delete_azure_client_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_delete_azure_client" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_delete_azure_client_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_delete_azure_client" - ) as pre: + 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.AzureClustersRestInterceptor, "post_delete_azure_client" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_delete_azure_client_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_delete_azure_client" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14070,8 +14079,9 @@ def test_create_azure_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14272,20 +14282,21 @@ def test_create_azure_cluster_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_create_azure_cluster" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_create_azure_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_create_azure_cluster" - ) as pre: + 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.AzureClustersRestInterceptor, "post_create_azure_cluster" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_create_azure_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_create_azure_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14342,8 +14353,9 @@ def test_update_azure_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14548,20 +14560,21 @@ def test_update_azure_cluster_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_update_azure_cluster" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_update_azure_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_update_azure_cluster" - ) as pre: + 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.AzureClustersRestInterceptor, "post_update_azure_cluster" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_update_azure_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_update_azure_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14614,8 +14627,9 @@ def test_get_azure_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14698,17 +14712,20 @@ def test_get_azure_cluster_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_get_azure_cluster" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, "post_get_azure_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_get_azure_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AzureClustersRestInterceptor, "post_get_azure_cluster" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_get_azure_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_get_azure_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14763,8 +14780,9 @@ def test_list_azure_clusters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14827,18 +14845,20 @@ def test_list_azure_clusters_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_list_azure_clusters" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_list_azure_clusters_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_list_azure_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AzureClustersRestInterceptor, "post_list_azure_clusters" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_list_azure_clusters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_list_azure_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14896,8 +14916,9 @@ def test_delete_azure_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14954,20 +14975,21 @@ def test_delete_azure_cluster_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_delete_azure_cluster" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_delete_azure_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_delete_azure_cluster" - ) as pre: + 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.AzureClustersRestInterceptor, "post_delete_azure_cluster" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_delete_azure_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_delete_azure_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15022,8 +15044,9 @@ def test_generate_azure_cluster_agent_token_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15094,20 +15117,22 @@ def test_generate_azure_cluster_agent_token_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, - "post_generate_azure_cluster_agent_token", - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_generate_azure_cluster_agent_token_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, - "pre_generate_azure_cluster_agent_token", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_generate_azure_cluster_agent_token", + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_generate_azure_cluster_agent_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "pre_generate_azure_cluster_agent_token", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15167,8 +15192,9 @@ def test_generate_azure_access_token_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15233,18 +15259,20 @@ def test_generate_azure_access_token_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_generate_azure_access_token" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_generate_azure_access_token_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_generate_azure_access_token" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AzureClustersRestInterceptor, "post_generate_azure_access_token" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_generate_azure_access_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_generate_azure_access_token" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15304,8 +15332,9 @@ def test_create_azure_node_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15465,20 +15494,21 @@ def test_create_azure_node_pool_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_create_azure_node_pool" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_create_azure_node_pool_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_create_azure_node_pool" - ) as pre: + 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.AzureClustersRestInterceptor, "post_create_azure_node_pool" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_create_azure_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_create_azure_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15535,8 +15565,9 @@ def test_update_azure_node_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15698,20 +15729,21 @@ def test_update_azure_node_pool_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_update_azure_node_pool" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_update_azure_node_pool_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_update_azure_node_pool" - ) as pre: + 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.AzureClustersRestInterceptor, "post_update_azure_node_pool" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_update_azure_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_update_azure_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15766,8 +15798,9 @@ def test_get_azure_node_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15846,18 +15879,20 @@ def test_get_azure_node_pool_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_get_azure_node_pool" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_get_azure_node_pool_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_get_azure_node_pool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AzureClustersRestInterceptor, "post_get_azure_node_pool" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_get_azure_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_get_azure_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15914,8 +15949,9 @@ def test_list_azure_node_pools_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15980,18 +16016,20 @@ def test_list_azure_node_pools_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_list_azure_node_pools" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_list_azure_node_pools_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_list_azure_node_pools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AzureClustersRestInterceptor, "post_list_azure_node_pools" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_list_azure_node_pools_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_list_azure_node_pools" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16051,8 +16089,9 @@ def test_delete_azure_node_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16111,20 +16150,21 @@ def test_delete_azure_node_pool_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_delete_azure_node_pool" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_delete_azure_node_pool_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_delete_azure_node_pool" - ) as pre: + 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.AzureClustersRestInterceptor, "post_delete_azure_node_pool" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_delete_azure_node_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_delete_azure_node_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16179,8 +16219,9 @@ def test_get_azure_open_id_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16261,18 +16302,20 @@ def test_get_azure_open_id_config_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_get_azure_open_id_config" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_get_azure_open_id_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_get_azure_open_id_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AzureClustersRestInterceptor, "post_get_azure_open_id_config" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_get_azure_open_id_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_get_azure_open_id_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16329,8 +16372,9 @@ def test_get_azure_json_web_keys_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16392,18 +16436,20 @@ def test_get_azure_json_web_keys_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_get_azure_json_web_keys" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_get_azure_json_web_keys_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_get_azure_json_web_keys" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AzureClustersRestInterceptor, "post_get_azure_json_web_keys" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_get_azure_json_web_keys_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_get_azure_json_web_keys" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16458,8 +16504,9 @@ def test_get_azure_server_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16524,18 +16571,20 @@ def test_get_azure_server_config_rest_interceptors(null_interceptor): ) client = AzureClustersClient(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.AzureClustersRestInterceptor, "post_get_azure_server_config" - ) as post, mock.patch.object( - transports.AzureClustersRestInterceptor, - "post_get_azure_server_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AzureClustersRestInterceptor, "pre_get_azure_server_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AzureClustersRestInterceptor, "post_get_azure_server_config" + ) as post, + mock.patch.object( + transports.AzureClustersRestInterceptor, + "post_get_azure_server_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AzureClustersRestInterceptor, "pre_get_azure_server_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16592,8 +16641,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16654,8 +16704,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16716,8 +16767,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -16778,8 +16830,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -17347,11 +17400,14 @@ def test_azure_clusters_base_transport(): def test_azure_clusters_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gke_multicloud_v1.services.azure_clusters.transports.AzureClustersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.gke_multicloud_v1.services.azure_clusters.transports.AzureClustersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AzureClustersTransport( @@ -17368,9 +17424,12 @@ def test_azure_clusters_base_transport_with_credentials_file(): def test_azure_clusters_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.gke_multicloud_v1.services.azure_clusters.transports.AzureClustersTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.gke_multicloud_v1.services.azure_clusters.transports.AzureClustersTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AzureClustersTransport() @@ -17442,11 +17501,12 @@ def test_azure_clusters_transport_auth_gdch_credentials(transport_class): def test_azure_clusters_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-gkerecommender/docs/conf.py b/packages/google-cloud-gkerecommender/docs/conf.py index 77dcf0d97d44..423e047940c3 100644 --- a/packages/google-cloud-gkerecommender/docs/conf.py +++ b/packages/google-cloud-gkerecommender/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-gkerecommender documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/__init__.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/__init__.py index c7a229c69ffb..3f9797621309 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/__init__.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.gke_inference_quickstart import ( GkeInferenceQuickstartAsyncClient, GkeInferenceQuickstartClient, diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/async_client.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/async_client.py index 19182edb0c6c..e440046d6d38 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/async_client.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkerecommender_v1 import gapic_version as package_version @@ -117,7 +117,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GkeInferenceQuickstartAsyncClient: The constructed client. """ - return GkeInferenceQuickstartClient.from_service_account_info.__func__(GkeInferenceQuickstartAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GkeInferenceQuickstartClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GkeInferenceQuickstartAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +134,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GkeInferenceQuickstartAsyncClient: The constructed client. """ - return GkeInferenceQuickstartClient.from_service_account_file.__func__(GkeInferenceQuickstartAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GkeInferenceQuickstartClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + GkeInferenceQuickstartAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -171,7 +175,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GkeInferenceQuickstartClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GkeInferenceQuickstartClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GkeInferenceQuickstartTransport: diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/client.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/client.py index 792c19e2b384..b45335526af0 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/client.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkerecommender_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class GkeInferenceQuickstartClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GkeInferenceQuickstartTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GkeInferenceQuickstartTransport]] _transport_registry["grpc"] = GkeInferenceQuickstartGrpcTransport _transport_registry["grpc_asyncio"] = GkeInferenceQuickstartGrpcAsyncIOTransport _transport_registry["rest"] = GkeInferenceQuickstartRestTransport @@ -608,11 +606,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GkeInferenceQuickstartClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GkeInferenceQuickstartClient._read_environment_variables() + ) self._client_cert_source = GkeInferenceQuickstartClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -647,8 +643,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GkeInferenceQuickstartTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/pagers.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/pagers.py index 6a59cefc936c..219a75c319aa 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/pagers.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -539,7 +539,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -615,7 +615,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/__init__.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/__init__.py index 4163ed5a0753..6629edb770d8 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/__init__.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GkeInferenceQuickstartTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GkeInferenceQuickstartTransport]] _transport_registry["grpc"] = GkeInferenceQuickstartGrpcTransport _transport_registry["grpc_asyncio"] = GkeInferenceQuickstartGrpcAsyncIOTransport _transport_registry["rest"] = GkeInferenceQuickstartRestTransport diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/base.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/base.py index 8fbe3b17984e..61d445d94263 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/base.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gkerecommender_v1 import gapic_version as package_version from google.cloud.gkerecommender_v1.types import gkerecommender diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc.py index a7de081a7d1b..a7dafae89407 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.gkerecommender_v1.types import gkerecommender @@ -412,12 +412,12 @@ def fetch_model_server_versions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_model_server_versions" not in self._stubs: - self._stubs[ - "fetch_model_server_versions" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/FetchModelServerVersions", - request_serializer=gkerecommender.FetchModelServerVersionsRequest.serialize, - response_deserializer=gkerecommender.FetchModelServerVersionsResponse.deserialize, + self._stubs["fetch_model_server_versions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/FetchModelServerVersions", + request_serializer=gkerecommender.FetchModelServerVersionsRequest.serialize, + response_deserializer=gkerecommender.FetchModelServerVersionsResponse.deserialize, + ) ) return self._stubs["fetch_model_server_versions"] @@ -486,12 +486,12 @@ def generate_optimized_manifest( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_optimized_manifest" not in self._stubs: - self._stubs[ - "generate_optimized_manifest" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/GenerateOptimizedManifest", - request_serializer=gkerecommender.GenerateOptimizedManifestRequest.serialize, - response_deserializer=gkerecommender.GenerateOptimizedManifestResponse.deserialize, + self._stubs["generate_optimized_manifest"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/GenerateOptimizedManifest", + request_serializer=gkerecommender.GenerateOptimizedManifestRequest.serialize, + response_deserializer=gkerecommender.GenerateOptimizedManifestResponse.deserialize, + ) ) return self._stubs["generate_optimized_manifest"] diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc_asyncio.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc_asyncio.py index cfcb8a830400..4deac0db9bf6 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc_asyncio.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gkerecommender_v1.types import gkerecommender @@ -421,12 +421,12 @@ def fetch_model_server_versions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_model_server_versions" not in self._stubs: - self._stubs[ - "fetch_model_server_versions" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/FetchModelServerVersions", - request_serializer=gkerecommender.FetchModelServerVersionsRequest.serialize, - response_deserializer=gkerecommender.FetchModelServerVersionsResponse.deserialize, + self._stubs["fetch_model_server_versions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/FetchModelServerVersions", + request_serializer=gkerecommender.FetchModelServerVersionsRequest.serialize, + response_deserializer=gkerecommender.FetchModelServerVersionsResponse.deserialize, + ) ) return self._stubs["fetch_model_server_versions"] @@ -496,12 +496,12 @@ def generate_optimized_manifest( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_optimized_manifest" not in self._stubs: - self._stubs[ - "generate_optimized_manifest" - ] = self._logged_channel.unary_unary( - "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/GenerateOptimizedManifest", - request_serializer=gkerecommender.GenerateOptimizedManifestRequest.serialize, - response_deserializer=gkerecommender.GenerateOptimizedManifestResponse.deserialize, + self._stubs["generate_optimized_manifest"] = ( + self._logged_channel.unary_unary( + "/google.cloud.gkerecommender.v1.GkeInferenceQuickstart/GenerateOptimizedManifest", + request_serializer=gkerecommender.GenerateOptimizedManifestRequest.serialize, + response_deserializer=gkerecommender.GenerateOptimizedManifestResponse.deserialize, + ) ) return self._stubs["generate_optimized_manifest"] diff --git a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/rest.py b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/rest.py index 179a7341a991..7034aaf3f34c 100644 --- a/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/rest.py +++ b/packages/google-cloud-gkerecommender/google/cloud/gkerecommender_v1/services/gke_inference_quickstart/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -583,9 +583,7 @@ def __call__( """ - http_options = ( - _BaseGkeInferenceQuickstartRestTransport._BaseFetchBenchmarkingData._get_http_options() - ) + http_options = _BaseGkeInferenceQuickstartRestTransport._BaseFetchBenchmarkingData._get_http_options() request, metadata = self._interceptor.pre_fetch_benchmarking_data( request, metadata @@ -740,9 +738,7 @@ def __call__( """ - http_options = ( - _BaseGkeInferenceQuickstartRestTransport._BaseFetchModels._get_http_options() - ) + http_options = _BaseGkeInferenceQuickstartRestTransport._BaseFetchModels._get_http_options() request, metadata = self._interceptor.pre_fetch_models(request, metadata) transcoded_request = _BaseGkeInferenceQuickstartRestTransport._BaseFetchModels._get_transcoded_request( @@ -890,9 +886,7 @@ def __call__( """ - http_options = ( - _BaseGkeInferenceQuickstartRestTransport._BaseFetchModelServers._get_http_options() - ) + http_options = _BaseGkeInferenceQuickstartRestTransport._BaseFetchModelServers._get_http_options() request, metadata = self._interceptor.pre_fetch_model_servers( request, metadata @@ -1045,9 +1039,7 @@ def __call__( """ - http_options = ( - _BaseGkeInferenceQuickstartRestTransport._BaseFetchModelServerVersions._get_http_options() - ) + http_options = _BaseGkeInferenceQuickstartRestTransport._BaseFetchModelServerVersions._get_http_options() request, metadata = self._interceptor.pre_fetch_model_server_versions( request, metadata @@ -1200,9 +1192,7 @@ def __call__( """ - http_options = ( - _BaseGkeInferenceQuickstartRestTransport._BaseFetchProfiles._get_http_options() - ) + http_options = _BaseGkeInferenceQuickstartRestTransport._BaseFetchProfiles._get_http_options() request, metadata = self._interceptor.pre_fetch_profiles(request, metadata) transcoded_request = _BaseGkeInferenceQuickstartRestTransport._BaseFetchProfiles._get_transcoded_request( @@ -1357,9 +1347,7 @@ def __call__( """ - http_options = ( - _BaseGkeInferenceQuickstartRestTransport._BaseGenerateOptimizedManifest._get_http_options() - ) + http_options = _BaseGkeInferenceQuickstartRestTransport._BaseGenerateOptimizedManifest._get_http_options() request, metadata = self._interceptor.pre_generate_optimized_manifest( request, metadata @@ -1499,7 +1487,9 @@ def fetch_model_server_versions( ]: # 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._FetchModelServerVersions(self._session, self._host, self._interceptor) # type: ignore + return self._FetchModelServerVersions( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_profiles( @@ -1520,7 +1510,9 @@ def generate_optimized_manifest( ]: # 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._GenerateOptimizedManifest(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateOptimizedManifest( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-gkerecommender/noxfile.py b/packages/google-cloud-gkerecommender/noxfile.py index d6b8208e6fd9..71f9fb8f4036 100644 --- a/packages/google-cloud-gkerecommender/noxfile.py +++ b/packages/google-cloud-gkerecommender/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gkerecommender/tests/unit/gapic/gkerecommender_v1/test_gke_inference_quickstart.py b/packages/google-cloud-gkerecommender/tests/unit/gapic/gkerecommender_v1/test_gke_inference_quickstart.py index 3ef8ea194bfc..8da97d74350a 100644 --- a/packages/google-cloud-gkerecommender/tests/unit/gapic/gkerecommender_v1/test_gke_inference_quickstart.py +++ b/packages/google-cloud-gkerecommender/tests/unit/gapic/gkerecommender_v1/test_gke_inference_quickstart.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -998,10 +1003,9 @@ def test_gke_inference_quickstart_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1050,9 @@ def test_gke_inference_quickstart_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1088,9 @@ def test_gke_inference_quickstart_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1344,13 +1346,13 @@ def test_gke_inference_quickstart_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1842,9 +1844,9 @@ def test_fetch_model_servers_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_model_servers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_model_servers] = ( + mock_rpc + ) request = {} client.fetch_model_servers(request) @@ -3433,9 +3435,9 @@ def test_fetch_model_servers_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.fetch_model_servers - ] = mock_rpc + client._transport._wrapped_methods[client._transport.fetch_model_servers] = ( + mock_rpc + ) request = {} client.fetch_model_servers(request) @@ -4656,8 +4658,9 @@ def test_fetch_models_rest_bad_request(request_type=gkerecommender.FetchModelsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4722,18 +4725,20 @@ def test_fetch_models_rest_interceptors(null_interceptor): ) client = GkeInferenceQuickstartClient(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.GkeInferenceQuickstartRestInterceptor, "post_fetch_models" - ) as post, mock.patch.object( - transports.GkeInferenceQuickstartRestInterceptor, - "post_fetch_models_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GkeInferenceQuickstartRestInterceptor, "pre_fetch_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, "post_fetch_models" + ) as post, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, + "post_fetch_models_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, "pre_fetch_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4788,8 +4793,9 @@ def test_fetch_model_servers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4854,18 +4860,20 @@ def test_fetch_model_servers_rest_interceptors(null_interceptor): ) client = GkeInferenceQuickstartClient(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.GkeInferenceQuickstartRestInterceptor, "post_fetch_model_servers" - ) as post, mock.patch.object( - transports.GkeInferenceQuickstartRestInterceptor, - "post_fetch_model_servers_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GkeInferenceQuickstartRestInterceptor, "pre_fetch_model_servers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, "post_fetch_model_servers" + ) as post, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, + "post_fetch_model_servers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, "pre_fetch_model_servers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4923,8 +4931,9 @@ def test_fetch_model_server_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4989,20 +4998,22 @@ def test_fetch_model_server_versions_rest_interceptors(null_interceptor): ) client = GkeInferenceQuickstartClient(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.GkeInferenceQuickstartRestInterceptor, - "post_fetch_model_server_versions", - ) as post, mock.patch.object( - transports.GkeInferenceQuickstartRestInterceptor, - "post_fetch_model_server_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GkeInferenceQuickstartRestInterceptor, - "pre_fetch_model_server_versions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, + "post_fetch_model_server_versions", + ) as post, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, + "post_fetch_model_server_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, + "pre_fetch_model_server_versions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5060,8 +5071,9 @@ def test_fetch_profiles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5126,18 +5138,20 @@ def test_fetch_profiles_rest_interceptors(null_interceptor): ) client = GkeInferenceQuickstartClient(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.GkeInferenceQuickstartRestInterceptor, "post_fetch_profiles" - ) as post, mock.patch.object( - transports.GkeInferenceQuickstartRestInterceptor, - "post_fetch_profiles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GkeInferenceQuickstartRestInterceptor, "pre_fetch_profiles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, "post_fetch_profiles" + ) as post, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, + "post_fetch_profiles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, "pre_fetch_profiles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5195,8 +5209,9 @@ def test_generate_optimized_manifest_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5261,20 +5276,22 @@ def test_generate_optimized_manifest_rest_interceptors(null_interceptor): ) client = GkeInferenceQuickstartClient(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.GkeInferenceQuickstartRestInterceptor, - "post_generate_optimized_manifest", - ) as post, mock.patch.object( - transports.GkeInferenceQuickstartRestInterceptor, - "post_generate_optimized_manifest_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GkeInferenceQuickstartRestInterceptor, - "pre_generate_optimized_manifest", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, + "post_generate_optimized_manifest", + ) as post, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, + "post_generate_optimized_manifest_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, + "pre_generate_optimized_manifest", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5332,8 +5349,9 @@ def test_fetch_benchmarking_data_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5393,18 +5411,22 @@ def test_fetch_benchmarking_data_rest_interceptors(null_interceptor): ) client = GkeInferenceQuickstartClient(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.GkeInferenceQuickstartRestInterceptor, "post_fetch_benchmarking_data" - ) as post, mock.patch.object( - transports.GkeInferenceQuickstartRestInterceptor, - "post_fetch_benchmarking_data_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GkeInferenceQuickstartRestInterceptor, "pre_fetch_benchmarking_data" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, + "post_fetch_benchmarking_data", + ) as post, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, + "post_fetch_benchmarking_data_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GkeInferenceQuickstartRestInterceptor, + "pre_fetch_benchmarking_data", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5644,11 +5666,14 @@ def test_gke_inference_quickstart_base_transport(): def test_gke_inference_quickstart_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gkerecommender_v1.services.gke_inference_quickstart.transports.GkeInferenceQuickstartTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.gkerecommender_v1.services.gke_inference_quickstart.transports.GkeInferenceQuickstartTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GkeInferenceQuickstartTransport( @@ -5665,9 +5690,12 @@ def test_gke_inference_quickstart_base_transport_with_credentials_file(): def test_gke_inference_quickstart_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.gkerecommender_v1.services.gke_inference_quickstart.transports.GkeInferenceQuickstartTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.gkerecommender_v1.services.gke_inference_quickstart.transports.GkeInferenceQuickstartTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GkeInferenceQuickstartTransport() @@ -5741,11 +5769,12 @@ def test_gke_inference_quickstart_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-gsuiteaddons/docs/conf.py b/packages/google-cloud-gsuiteaddons/docs/conf.py index 053800d6d51c..8729020a2316 100644 --- a/packages/google-cloud-gsuiteaddons/docs/conf.py +++ b/packages/google-cloud-gsuiteaddons/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-gsuiteaddons documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/__init__.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/__init__.py index e90740e2c6c0..74896d6dd80e 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/__init__.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.g_suite_add_ons import GSuiteAddOnsAsyncClient, GSuiteAddOnsClient from .types.gsuiteaddons import ( AddOns, diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/async_client.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/async_client.py index 2556f3fc19ba..b56e230e43d1 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/async_client.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gsuiteaddons_v1 import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.gsuiteaddons_v1.services.g_suite_add_ons import pagers from google.cloud.gsuiteaddons_v1.types import gsuiteaddons @@ -152,7 +152,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GSuiteAddOnsAsyncClient: The constructed client. """ - return GSuiteAddOnsClient.from_service_account_info.__func__(GSuiteAddOnsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GSuiteAddOnsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GSuiteAddOnsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -168,7 +169,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GSuiteAddOnsAsyncClient: The constructed client. """ - return GSuiteAddOnsClient.from_service_account_file.__func__(GSuiteAddOnsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GSuiteAddOnsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(GSuiteAddOnsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/client.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/client.py index 141e61d3de9a..17893d449cef 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/client.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.gsuiteaddons_v1 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.gsuiteaddons_v1.services.g_suite_add_ons import pagers from google.cloud.gsuiteaddons_v1.types import gsuiteaddons @@ -687,11 +687,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GSuiteAddOnsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GSuiteAddOnsClient._read_environment_variables() + ) self._client_cert_source = GSuiteAddOnsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -726,8 +724,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GSuiteAddOnsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/pagers.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/pagers.py index aa33b2daa13b..f8b453262436 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/pagers.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/base.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/base.py index 233a61c0da49..5aab5b8f99f7 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/base.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.gsuiteaddons_v1 import gapic_version as package_version from google.cloud.gsuiteaddons_v1.types import gsuiteaddons diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc.py index 7bc15a1bf64c..60b937b7b5d2 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.gsuiteaddons_v1.types import gsuiteaddons diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc_asyncio.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc_asyncio.py index 8c684b27f4bd..a2bf53a09f88 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc_asyncio.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.gsuiteaddons_v1.types import gsuiteaddons diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest.py index fa65f9abaec4..3367d453a79e 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -821,7 +821,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1350,9 +1350,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGSuiteAddOnsRestTransport._BaseInstallDeployment._get_http_options() - ) + http_options = _BaseGSuiteAddOnsRestTransport._BaseInstallDeployment._get_http_options() request, metadata = self._interceptor.pre_install_deployment( request, metadata @@ -1378,7 +1376,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1618,9 +1616,7 @@ def __call__( A Google Workspace add-on deployment """ - http_options = ( - _BaseGSuiteAddOnsRestTransport._BaseReplaceDeployment._get_http_options() - ) + http_options = _BaseGSuiteAddOnsRestTransport._BaseReplaceDeployment._get_http_options() request, metadata = self._interceptor.pre_replace_deployment( request, metadata @@ -1767,9 +1763,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGSuiteAddOnsRestTransport._BaseUninstallDeployment._get_http_options() - ) + http_options = _BaseGSuiteAddOnsRestTransport._BaseUninstallDeployment._get_http_options() request, metadata = self._interceptor.pre_uninstall_deployment( request, metadata @@ -1795,7 +1789,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest_base.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest_base.py index 00702585c501..42020c231045 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest_base.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/services/g_suite_add_ons/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.gsuiteaddons_v1.types import gsuiteaddons diff --git a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/types/gsuiteaddons.py b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/types/gsuiteaddons.py index 1bbdcf191ace..af528a40d40f 100644 --- a/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/types/gsuiteaddons.py +++ b/packages/google-cloud-gsuiteaddons/google/cloud/gsuiteaddons_v1/types/gsuiteaddons.py @@ -17,6 +17,8 @@ from typing import MutableMapping, MutableSequence +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import proto # type: ignore from google.apps.script.type.calendar.types import calendar_addon_manifest from google.apps.script.type.docs.types import docs_addon_manifest from google.apps.script.type.drive.types import drive_addon_manifest @@ -24,8 +26,6 @@ from google.apps.script.type.sheets.types import sheets_addon_manifest from google.apps.script.type.slides.types import slides_addon_manifest from google.apps.script.type.types import script_manifest -from google.protobuf import wrappers_pb2 # type: ignore -import proto # type: ignore __protobuf__ = proto.module( package="google.cloud.gsuiteaddons.v1", diff --git a/packages/google-cloud-gsuiteaddons/noxfile.py b/packages/google-cloud-gsuiteaddons/noxfile.py index 6c7f062dd778..5971321b8b70 100644 --- a/packages/google-cloud-gsuiteaddons/noxfile.py +++ b/packages/google-cloud-gsuiteaddons/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-gsuiteaddons/tests/unit/gapic/gsuiteaddons_v1/test_g_suite_add_ons.py b/packages/google-cloud-gsuiteaddons/tests/unit/gapic/gsuiteaddons_v1/test_g_suite_add_ons.py index 0bc4cc8d1119..71bb88644ffd 100644 --- a/packages/google-cloud-gsuiteaddons/tests/unit/gapic/gsuiteaddons_v1/test_g_suite_add_ons.py +++ b/packages/google-cloud-gsuiteaddons/tests/unit/gapic/gsuiteaddons_v1/test_g_suite_add_ons.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,8 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries from google.apps.script.type.calendar.types import calendar_addon_manifest @@ -58,12 +66,9 @@ extension_point, script_manifest, ) -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.gsuiteaddons_v1.services.g_suite_add_ons import ( GSuiteAddOnsAsyncClient, @@ -939,10 +944,9 @@ def test_g_suite_add_ons_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +991,9 @@ def test_g_suite_add_ons_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1029,9 @@ def test_g_suite_add_ons_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1268,13 +1270,13 @@ def test_g_suite_add_ons_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1389,9 +1391,9 @@ def test_get_authorization_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_authorization - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_authorization] = ( + mock_rpc + ) request = {} client.get_authorization(request) @@ -1738,9 +1740,9 @@ def test_create_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deployment] = ( + mock_rpc + ) request = {} client.create_deployment(request) @@ -2103,9 +2105,9 @@ def test_replace_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.replace_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.replace_deployment] = ( + mock_rpc + ) request = {} client.replace_deployment(request) @@ -2775,9 +2777,9 @@ def test_list_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -3297,9 +3299,9 @@ def test_delete_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deployment] = ( + mock_rpc + ) request = {} client.delete_deployment(request) @@ -3626,9 +3628,9 @@ def test_install_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.install_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.install_deployment] = ( + mock_rpc + ) request = {} client.install_deployment(request) @@ -3955,9 +3957,9 @@ def test_uninstall_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.uninstall_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.uninstall_deployment] = ( + mock_rpc + ) request = {} client.uninstall_deployment(request) @@ -4288,9 +4290,9 @@ def test_get_install_status_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_install_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_install_status] = ( + mock_rpc + ) request = {} client.get_install_status(request) @@ -4559,9 +4561,9 @@ def test_get_authorization_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_authorization - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_authorization] = ( + mock_rpc + ) request = {} client.get_authorization(request) @@ -4737,9 +4739,9 @@ def test_create_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_deployment] = ( + mock_rpc + ) request = {} client.create_deployment(request) @@ -4946,9 +4948,9 @@ def test_replace_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.replace_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.replace_deployment] = ( + mock_rpc + ) request = {} client.replace_deployment(request) @@ -5299,9 +5301,9 @@ def test_list_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_deployments] = ( + mock_rpc + ) request = {} client.list_deployments(request) @@ -5555,9 +5557,9 @@ def test_delete_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_deployment] = ( + mock_rpc + ) request = {} client.delete_deployment(request) @@ -5732,9 +5734,9 @@ def test_install_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.install_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.install_deployment] = ( + mock_rpc + ) request = {} client.install_deployment(request) @@ -5909,9 +5911,9 @@ def test_uninstall_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.uninstall_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.uninstall_deployment] = ( + mock_rpc + ) request = {} client.uninstall_deployment(request) @@ -6086,9 +6088,9 @@ def test_get_install_status_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_install_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_install_status] = ( + mock_rpc + ) request = {} client.get_install_status(request) @@ -6839,8 +6841,9 @@ def test_get_authorization_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6907,17 +6910,20 @@ def test_get_authorization_rest_interceptors(null_interceptor): ) client = GSuiteAddOnsClient(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.GSuiteAddOnsRestInterceptor, "post_get_authorization" - ) as post, mock.patch.object( - transports.GSuiteAddOnsRestInterceptor, "post_get_authorization_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GSuiteAddOnsRestInterceptor, "pre_get_authorization" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "post_get_authorization" + ) as post, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, + "post_get_authorization_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "pre_get_authorization" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6970,8 +6976,9 @@ def test_create_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7204,17 +7211,20 @@ def test_create_deployment_rest_interceptors(null_interceptor): ) client = GSuiteAddOnsClient(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.GSuiteAddOnsRestInterceptor, "post_create_deployment" - ) as post, mock.patch.object( - transports.GSuiteAddOnsRestInterceptor, "post_create_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GSuiteAddOnsRestInterceptor, "pre_create_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "post_create_deployment" + ) as post, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, + "post_create_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "pre_create_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7267,8 +7277,9 @@ def test_replace_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7501,17 +7512,20 @@ def test_replace_deployment_rest_interceptors(null_interceptor): ) client = GSuiteAddOnsClient(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.GSuiteAddOnsRestInterceptor, "post_replace_deployment" - ) as post, mock.patch.object( - transports.GSuiteAddOnsRestInterceptor, "post_replace_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GSuiteAddOnsRestInterceptor, "pre_replace_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "post_replace_deployment" + ) as post, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, + "post_replace_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "pre_replace_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7564,8 +7578,9 @@ def test_get_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7632,17 +7647,19 @@ def test_get_deployment_rest_interceptors(null_interceptor): ) client = GSuiteAddOnsClient(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.GSuiteAddOnsRestInterceptor, "post_get_deployment" - ) as post, mock.patch.object( - transports.GSuiteAddOnsRestInterceptor, "post_get_deployment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GSuiteAddOnsRestInterceptor, "pre_get_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "post_get_deployment" + ) as post, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "post_get_deployment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "pre_get_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7695,8 +7712,9 @@ def test_list_deployments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7759,17 +7777,20 @@ def test_list_deployments_rest_interceptors(null_interceptor): ) client = GSuiteAddOnsClient(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.GSuiteAddOnsRestInterceptor, "post_list_deployments" - ) as post, mock.patch.object( - transports.GSuiteAddOnsRestInterceptor, "post_list_deployments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GSuiteAddOnsRestInterceptor, "pre_list_deployments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "post_list_deployments" + ) as post, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, + "post_list_deployments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "pre_list_deployments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7827,8 +7848,9 @@ def test_delete_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7885,13 +7907,13 @@ def test_delete_deployment_rest_interceptors(null_interceptor): ) client = GSuiteAddOnsClient(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.GSuiteAddOnsRestInterceptor, "pre_delete_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "pre_delete_deployment" + ) as pre, + ): pre.assert_not_called() pb_message = gsuiteaddons.DeleteDeploymentRequest.pb( gsuiteaddons.DeleteDeploymentRequest() @@ -7936,8 +7958,9 @@ def test_install_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7994,13 +8017,13 @@ def test_install_deployment_rest_interceptors(null_interceptor): ) client = GSuiteAddOnsClient(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.GSuiteAddOnsRestInterceptor, "pre_install_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "pre_install_deployment" + ) as pre, + ): pre.assert_not_called() pb_message = gsuiteaddons.InstallDeploymentRequest.pb( gsuiteaddons.InstallDeploymentRequest() @@ -8045,8 +8068,9 @@ def test_uninstall_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8103,13 +8127,13 @@ def test_uninstall_deployment_rest_interceptors(null_interceptor): ) client = GSuiteAddOnsClient(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.GSuiteAddOnsRestInterceptor, "pre_uninstall_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "pre_uninstall_deployment" + ) as pre, + ): pre.assert_not_called() pb_message = gsuiteaddons.UninstallDeploymentRequest.pb( gsuiteaddons.UninstallDeploymentRequest() @@ -8154,8 +8178,9 @@ def test_get_install_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8218,17 +8243,20 @@ def test_get_install_status_rest_interceptors(null_interceptor): ) client = GSuiteAddOnsClient(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.GSuiteAddOnsRestInterceptor, "post_get_install_status" - ) as post, mock.patch.object( - transports.GSuiteAddOnsRestInterceptor, "post_get_install_status_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.GSuiteAddOnsRestInterceptor, "pre_get_install_status" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "post_get_install_status" + ) as post, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, + "post_get_install_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GSuiteAddOnsRestInterceptor, "pre_get_install_status" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8532,11 +8560,14 @@ def test_g_suite_add_ons_base_transport(): def test_g_suite_add_ons_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.gsuiteaddons_v1.services.g_suite_add_ons.transports.GSuiteAddOnsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.gsuiteaddons_v1.services.g_suite_add_ons.transports.GSuiteAddOnsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GSuiteAddOnsTransport( @@ -8553,9 +8584,12 @@ def test_g_suite_add_ons_base_transport_with_credentials_file(): def test_g_suite_add_ons_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.gsuiteaddons_v1.services.g_suite_add_ons.transports.GSuiteAddOnsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.gsuiteaddons_v1.services.g_suite_add_ons.transports.GSuiteAddOnsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GSuiteAddOnsTransport() @@ -8627,11 +8661,12 @@ def test_g_suite_add_ons_transport_auth_gdch_credentials(transport_class): def test_g_suite_add_ons_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-hypercomputecluster/docs/conf.py b/packages/google-cloud-hypercomputecluster/docs/conf.py index bde792c924e2..a78531fba8fe 100644 --- a/packages/google-cloud-hypercomputecluster/docs/conf.py +++ b/packages/google-cloud-hypercomputecluster/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-hypercomputecluster documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/__init__.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/__init__.py index f8799b13db32..1146c7e968b0 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/__init__.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.hypercompute_cluster import ( HypercomputeClusterAsyncClient, HypercomputeClusterClient, diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/async_client.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/async_client.py index b41721d357e5..c17bed4fbfd1 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/async_client.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.hypercomputecluster_v1beta import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.hypercomputecluster_v1beta.services.hypercompute_cluster import pagers from google.cloud.hypercomputecluster_v1beta.types import ( @@ -152,7 +152,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: HypercomputeClusterAsyncClient: The constructed client. """ - return HypercomputeClusterClient.from_service_account_info.__func__(HypercomputeClusterAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = HypercomputeClusterClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(HypercomputeClusterAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -168,7 +169,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: HypercomputeClusterAsyncClient: The constructed client. """ - return HypercomputeClusterClient.from_service_account_file.__func__(HypercomputeClusterAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = HypercomputeClusterClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(HypercomputeClusterAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -206,7 +208,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return HypercomputeClusterClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return HypercomputeClusterClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> HypercomputeClusterTransport: diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/client.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/client.py index 9a3f7262bfa6..1208e3c0e0aa 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/client.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.hypercomputecluster_v1beta import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.hypercomputecluster_v1beta.services.hypercompute_cluster import pagers from google.cloud.hypercomputecluster_v1beta.types import ( @@ -89,9 +89,7 @@ class HypercomputeClusterClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[HypercomputeClusterTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[HypercomputeClusterTransport]] _transport_registry["grpc"] = HypercomputeClusterGrpcTransport _transport_registry["grpc_asyncio"] = HypercomputeClusterGrpcAsyncIOTransport _transport_registry["rest"] = HypercomputeClusterRestTransport @@ -803,11 +801,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = HypercomputeClusterClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + HypercomputeClusterClient._read_environment_variables() + ) self._client_cert_source = HypercomputeClusterClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -842,8 +838,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(HypercomputeClusterTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/pagers.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/pagers.py index de194ed12f13..7efecac38899 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/pagers.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/__init__.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/__init__.py index 4b149df54077..10f56f362bc3 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/__init__.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import HypercomputeClusterRestInterceptor, HypercomputeClusterRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[HypercomputeClusterTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[HypercomputeClusterTransport]] _transport_registry["grpc"] = HypercomputeClusterGrpcTransport _transport_registry["grpc_asyncio"] = HypercomputeClusterGrpcAsyncIOTransport _transport_registry["rest"] = HypercomputeClusterRestTransport diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/base.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/base.py index f44ace4d8e67..82d119d4dcff 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/base.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.hypercomputecluster_v1beta import gapic_version as package_version from google.cloud.hypercomputecluster_v1beta.types import hypercompute_cluster @@ -299,13 +299,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc.py index 243b0ac19aca..ef7e2588bd28 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.hypercomputecluster_v1beta.types import hypercompute_cluster diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc_asyncio.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc_asyncio.py index c1c4168c3425..dd358f58de24 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc_asyncio.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.hypercomputecluster_v1beta.types import hypercompute_cluster diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/rest.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/rest.py index 0fb9cd71856b..000598d31420 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/rest.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/services/hypercompute_cluster/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -715,9 +715,7 @@ def __call__( """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseCreateCluster._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseCreateCluster._get_http_options() request, metadata = self._interceptor.pre_create_cluster(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseCreateCluster._get_transcoded_request( @@ -741,7 +739,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -867,9 +865,7 @@ def __call__( """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseDeleteCluster._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseDeleteCluster._get_http_options() request, metadata = self._interceptor.pre_delete_cluster(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseDeleteCluster._get_transcoded_request( @@ -889,7 +885,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1023,9 +1019,7 @@ def __call__( """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseGetCluster._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseGetCluster._get_http_options() request, metadata = self._interceptor.pre_get_cluster(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseGetCluster._get_transcoded_request( @@ -1171,9 +1165,7 @@ def __call__( """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseListClusters._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseListClusters._get_http_options() request, metadata = self._interceptor.pre_list_clusters(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseListClusters._get_transcoded_request( @@ -1323,9 +1315,7 @@ def __call__( """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseUpdateCluster._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseUpdateCluster._get_http_options() request, metadata = self._interceptor.pre_update_cluster(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseUpdateCluster._get_transcoded_request( @@ -1349,7 +1339,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1525,9 +1515,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseGetLocation._get_transcoded_request( @@ -1666,9 +1654,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseListLocations._get_transcoded_request( @@ -1805,9 +1791,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1925,9 +1909,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2043,9 +2025,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseGetOperation._get_transcoded_request( @@ -2184,9 +2164,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseHypercomputeClusterRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseHypercomputeClusterRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseHypercomputeClusterRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/__init__.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/__init__.py index 9678a03165f3..6a4ac8ffc639 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/__init__.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/__init__.py @@ -56,7 +56,9 @@ StorageResourceConfig, UpdateClusterRequest, ) -from .operation_metadata import OperationMetadata +from .operation_metadata import ( + OperationMetadata, +) __all__ = ( "BootDisk", diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/hypercompute_cluster.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/hypercompute_cluster.py index bffc64924c1b..5be1e7fab67d 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/hypercompute_cluster.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/hypercompute_cluster.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -778,6 +778,7 @@ class Tier(proto.Enum): mission-critical, high-performance computing workloads. """ + TIER_UNSPECIFIED = 0 ZONAL = 4 REGIONAL = 6 @@ -793,6 +794,7 @@ class Protocol(proto.Enum): NFSV41 (2): NFS 4.1. """ + PROTOCOL_UNSPECIFIED = 0 NFSV3 = 1 NFSV41 = 2 @@ -921,6 +923,7 @@ class `__ for Lowest-cost storage for data archiving, online backup, and disaster recovery. """ + STORAGE_CLASS_UNSPECIFIED = 0 STANDARD = 1 NEARLINE = 2 @@ -969,6 +972,7 @@ class TerminalStorageClass(proto.Enum): TERMINAL_STORAGE_CLASS_UNSPECIFIED (0): Unspecified terminal storage class """ + TERMINAL_STORAGE_CLASS_UNSPECIFIED = 0 enabled: bool = proto.Field( diff --git a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/operation_metadata.py b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/operation_metadata.py index 983f8ba945f5..74a71e0b2f93 100644 --- a/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/operation_metadata.py +++ b/packages/google-cloud-hypercomputecluster/google/cloud/hypercomputecluster_v1beta/types/operation_metadata.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-hypercomputecluster/noxfile.py b/packages/google-cloud-hypercomputecluster/noxfile.py index c000e757b3c6..386ea5b9fa34 100644 --- a/packages/google-cloud-hypercomputecluster/noxfile.py +++ b/packages/google-cloud-hypercomputecluster/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-hypercomputecluster/tests/unit/gapic/hypercomputecluster_v1beta/test_hypercompute_cluster.py b/packages/google-cloud-hypercomputecluster/tests/unit/gapic/hypercomputecluster_v1beta/test_hypercompute_cluster.py index 1491c8e7503d..f92d9c86cbf8 100644 --- a/packages/google-cloud-hypercomputecluster/tests/unit/gapic/hypercomputecluster_v1beta/test_hypercompute_cluster.py +++ b/packages/google-cloud-hypercomputecluster/tests/unit/gapic/hypercomputecluster_v1beta/test_hypercompute_cluster.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.hypercomputecluster_v1beta.services.hypercompute_cluster import ( HypercomputeClusterAsyncClient, @@ -1010,10 +1010,9 @@ def test_hypercompute_cluster_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1058,10 +1057,9 @@ def test_hypercompute_cluster_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1097,10 +1095,9 @@ def test_hypercompute_cluster_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1356,13 +1353,13 @@ def test_hypercompute_cluster_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4655,8 +4652,9 @@ def test_list_clusters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4721,18 +4719,20 @@ def test_list_clusters_rest_interceptors(null_interceptor): ) client = HypercomputeClusterClient(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.HypercomputeClusterRestInterceptor, "post_list_clusters" - ) as post, mock.patch.object( - transports.HypercomputeClusterRestInterceptor, - "post_list_clusters_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HypercomputeClusterRestInterceptor, "pre_list_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HypercomputeClusterRestInterceptor, "post_list_clusters" + ) as post, + mock.patch.object( + transports.HypercomputeClusterRestInterceptor, + "post_list_clusters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HypercomputeClusterRestInterceptor, "pre_list_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4790,8 +4790,9 @@ def test_get_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4858,17 +4859,20 @@ def test_get_cluster_rest_interceptors(null_interceptor): ) client = HypercomputeClusterClient(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.HypercomputeClusterRestInterceptor, "post_get_cluster" - ) as post, mock.patch.object( - transports.HypercomputeClusterRestInterceptor, "post_get_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.HypercomputeClusterRestInterceptor, "pre_get_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HypercomputeClusterRestInterceptor, "post_get_cluster" + ) as post, + mock.patch.object( + transports.HypercomputeClusterRestInterceptor, + "post_get_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HypercomputeClusterRestInterceptor, "pre_get_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4923,8 +4927,9 @@ def test_create_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5106,20 +5111,21 @@ def test_create_cluster_rest_interceptors(null_interceptor): ) client = HypercomputeClusterClient(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.HypercomputeClusterRestInterceptor, "post_create_cluster" - ) as post, mock.patch.object( - transports.HypercomputeClusterRestInterceptor, - "post_create_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HypercomputeClusterRestInterceptor, "pre_create_cluster" - ) as pre: + 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.HypercomputeClusterRestInterceptor, "post_create_cluster" + ) as post, + mock.patch.object( + transports.HypercomputeClusterRestInterceptor, + "post_create_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HypercomputeClusterRestInterceptor, "pre_create_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5174,8 +5180,9 @@ def test_update_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5359,20 +5366,21 @@ def test_update_cluster_rest_interceptors(null_interceptor): ) client = HypercomputeClusterClient(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.HypercomputeClusterRestInterceptor, "post_update_cluster" - ) as post, mock.patch.object( - transports.HypercomputeClusterRestInterceptor, - "post_update_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HypercomputeClusterRestInterceptor, "pre_update_cluster" - ) as pre: + 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.HypercomputeClusterRestInterceptor, "post_update_cluster" + ) as post, + mock.patch.object( + transports.HypercomputeClusterRestInterceptor, + "post_update_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HypercomputeClusterRestInterceptor, "pre_update_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5425,8 +5433,9 @@ def test_delete_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5483,20 +5492,21 @@ def test_delete_cluster_rest_interceptors(null_interceptor): ) client = HypercomputeClusterClient(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.HypercomputeClusterRestInterceptor, "post_delete_cluster" - ) as post, mock.patch.object( - transports.HypercomputeClusterRestInterceptor, - "post_delete_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HypercomputeClusterRestInterceptor, "pre_delete_cluster" - ) as pre: + 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.HypercomputeClusterRestInterceptor, "post_delete_cluster" + ) as post, + mock.patch.object( + transports.HypercomputeClusterRestInterceptor, + "post_delete_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HypercomputeClusterRestInterceptor, "pre_delete_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5549,8 +5559,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5609,8 +5620,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5671,8 +5683,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5733,8 +5746,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5795,8 +5809,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5857,8 +5872,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6098,11 +6114,14 @@ def test_hypercompute_cluster_base_transport(): def test_hypercompute_cluster_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.hypercomputecluster_v1beta.services.hypercompute_cluster.transports.HypercomputeClusterTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.hypercomputecluster_v1beta.services.hypercompute_cluster.transports.HypercomputeClusterTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HypercomputeClusterTransport( @@ -6119,9 +6138,12 @@ def test_hypercompute_cluster_base_transport_with_credentials_file(): def test_hypercompute_cluster_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.hypercomputecluster_v1beta.services.hypercompute_cluster.transports.HypercomputeClusterTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.hypercomputecluster_v1beta.services.hypercompute_cluster.transports.HypercomputeClusterTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HypercomputeClusterTransport() @@ -6193,11 +6215,12 @@ def test_hypercompute_cluster_transport_auth_gdch_credentials(transport_class): def test_hypercompute_cluster_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-iam-logging/docs/conf.py b/packages/google-cloud-iam-logging/docs/conf.py index 41c19f286083..beca16a4e716 100644 --- a/packages/google-cloud-iam-logging/docs/conf.py +++ b/packages/google-cloud-iam-logging/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-iam-logging documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/__init__.py b/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/__init__.py index c0b55d857c66..55b5a79ed152 100644 --- a/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/__init__.py +++ b/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .types.audit_data import AuditData if hasattr(api_core, "check_python_version") and hasattr( diff --git a/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/types/__init__.py b/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/types/__init__.py index 4392ad6079da..5b55739307e2 100644 --- a/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/types/__init__.py +++ b/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/types/__init__.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .audit_data import AuditData +from .audit_data import ( + AuditData, +) __all__ = ("AuditData",) diff --git a/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/types/audit_data.py b/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/types/audit_data.py index 53ebbf2c41fe..7af92b568949 100644 --- a/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/types/audit_data.py +++ b/packages/google-cloud-iam-logging/google/cloud/iam_logging_v1/types/audit_data.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.iam.v1 import policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-iam-logging/noxfile.py b/packages/google-cloud-iam-logging/noxfile.py index 8152b5ef7342..0fb9d788990d 100644 --- a/packages/google-cloud-iam-logging/noxfile.py +++ b/packages/google-cloud-iam-logging/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-iam/docs/conf.py b/packages/google-cloud-iam/docs/conf.py index 57ce71c28364..a644550b2b4c 100644 --- a/packages/google-cloud-iam/docs/conf.py +++ b/packages/google-cloud-iam/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-iam documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/__init__.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/__init__.py index 1fe269ddafb4..894b005dd625 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.iam import IAMAsyncClient, IAMClient from .types.audit_data import AuditData from .types.iam import ( diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/async_client.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/async_client.py index 8520a3c4631e..8a8ffda0ae50 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_admin_v1 import gapic_version as package_version @@ -45,9 +45,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.iam_admin_v1.services.iam import pagers from google.cloud.iam_admin_v1.types import iam @@ -140,7 +140,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IAMAsyncClient: The constructed client. """ - return IAMClient.from_service_account_info.__func__(IAMAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = IAMClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(IAMAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -156,7 +157,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IAMAsyncClient: The constructed client. """ - return IAMClient.from_service_account_file.__func__(IAMAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = IAMClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(IAMAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -2570,7 +2572,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import iam_admin_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -2730,7 +2732,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import iam_admin_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -2870,7 +2872,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import iam_admin_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/client.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/client.py index e5c6a8ba98d9..5f0e25a4e1d3 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_admin_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.iam_admin_v1.services.iam import pagers from google.cloud.iam_admin_v1.types import iam @@ -670,11 +670,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IAMClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IAMClient._read_environment_variables() + ) self._client_cert_source = IAMClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -709,8 +707,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IAMTransport, transport) self._api_endpoint = self._transport.host @@ -2995,7 +2992,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import iam_admin_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -3156,7 +3153,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import iam_admin_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -3297,7 +3294,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import iam_admin_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/pagers.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/pagers.py index 7e0803d9bf67..3cd5d2791b71 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/base.py index 2fa5cb793f7c..a10c812f43ea 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.iam_admin_v1 import gapic_version as package_version from google.cloud.iam_admin_v1.types import iam diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc.py index edfddcaeb877..c2b79256b946 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.iam_admin_v1.types import iam @@ -727,12 +727,12 @@ def create_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_account_key" not in self._stubs: - self._stubs[ - "create_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/CreateServiceAccountKey", - request_serializer=iam.CreateServiceAccountKeyRequest.serialize, - response_deserializer=iam.ServiceAccountKey.deserialize, + self._stubs["create_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/CreateServiceAccountKey", + request_serializer=iam.CreateServiceAccountKeyRequest.serialize, + response_deserializer=iam.ServiceAccountKey.deserialize, + ) ) return self._stubs["create_service_account_key"] @@ -760,12 +760,12 @@ def upload_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "upload_service_account_key" not in self._stubs: - self._stubs[ - "upload_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/UploadServiceAccountKey", - request_serializer=iam.UploadServiceAccountKeyRequest.serialize, - response_deserializer=iam.ServiceAccountKey.deserialize, + self._stubs["upload_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/UploadServiceAccountKey", + request_serializer=iam.UploadServiceAccountKeyRequest.serialize, + response_deserializer=iam.ServiceAccountKey.deserialize, + ) ) return self._stubs["upload_service_account_key"] @@ -792,12 +792,12 @@ def delete_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_account_key" not in self._stubs: - self._stubs[ - "delete_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/DeleteServiceAccountKey", - request_serializer=iam.DeleteServiceAccountKeyRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/DeleteServiceAccountKey", + request_serializer=iam.DeleteServiceAccountKeyRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_service_account_key"] @@ -823,12 +823,12 @@ def disable_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_service_account_key" not in self._stubs: - self._stubs[ - "disable_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/DisableServiceAccountKey", - request_serializer=iam.DisableServiceAccountKeyRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["disable_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/DisableServiceAccountKey", + request_serializer=iam.DisableServiceAccountKeyRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["disable_service_account_key"] @@ -852,12 +852,12 @@ def enable_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_service_account_key" not in self._stubs: - self._stubs[ - "enable_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/EnableServiceAccountKey", - request_serializer=iam.EnableServiceAccountKeyRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["enable_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/EnableServiceAccountKey", + request_serializer=iam.EnableServiceAccountKeyRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["enable_service_account_key"] @@ -1257,12 +1257,12 @@ def query_testable_permissions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_testable_permissions" not in self._stubs: - self._stubs[ - "query_testable_permissions" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/QueryTestablePermissions", - request_serializer=iam.QueryTestablePermissionsRequest.serialize, - response_deserializer=iam.QueryTestablePermissionsResponse.deserialize, + self._stubs["query_testable_permissions"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/QueryTestablePermissions", + request_serializer=iam.QueryTestablePermissionsRequest.serialize, + response_deserializer=iam.QueryTestablePermissionsResponse.deserialize, + ) ) return self._stubs["query_testable_permissions"] diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc_asyncio.py index 25d8ecdbf6eb..6345576ee1dc 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/services/iam/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_admin_v1.types import iam @@ -741,12 +741,12 @@ def create_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_account_key" not in self._stubs: - self._stubs[ - "create_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/CreateServiceAccountKey", - request_serializer=iam.CreateServiceAccountKeyRequest.serialize, - response_deserializer=iam.ServiceAccountKey.deserialize, + self._stubs["create_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/CreateServiceAccountKey", + request_serializer=iam.CreateServiceAccountKeyRequest.serialize, + response_deserializer=iam.ServiceAccountKey.deserialize, + ) ) return self._stubs["create_service_account_key"] @@ -776,12 +776,12 @@ def upload_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "upload_service_account_key" not in self._stubs: - self._stubs[ - "upload_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/UploadServiceAccountKey", - request_serializer=iam.UploadServiceAccountKeyRequest.serialize, - response_deserializer=iam.ServiceAccountKey.deserialize, + self._stubs["upload_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/UploadServiceAccountKey", + request_serializer=iam.UploadServiceAccountKeyRequest.serialize, + response_deserializer=iam.ServiceAccountKey.deserialize, + ) ) return self._stubs["upload_service_account_key"] @@ -808,12 +808,12 @@ def delete_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_account_key" not in self._stubs: - self._stubs[ - "delete_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/DeleteServiceAccountKey", - request_serializer=iam.DeleteServiceAccountKeyRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/DeleteServiceAccountKey", + request_serializer=iam.DeleteServiceAccountKeyRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_service_account_key"] @@ -839,12 +839,12 @@ def disable_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_service_account_key" not in self._stubs: - self._stubs[ - "disable_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/DisableServiceAccountKey", - request_serializer=iam.DisableServiceAccountKeyRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["disable_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/DisableServiceAccountKey", + request_serializer=iam.DisableServiceAccountKeyRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["disable_service_account_key"] @@ -868,12 +868,12 @@ def enable_service_account_key( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_service_account_key" not in self._stubs: - self._stubs[ - "enable_service_account_key" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/EnableServiceAccountKey", - request_serializer=iam.EnableServiceAccountKeyRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["enable_service_account_key"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/EnableServiceAccountKey", + request_serializer=iam.EnableServiceAccountKeyRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["enable_service_account_key"] @@ -1282,12 +1282,12 @@ def query_testable_permissions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_testable_permissions" not in self._stubs: - self._stubs[ - "query_testable_permissions" - ] = self._logged_channel.unary_unary( - "/google.iam.admin.v1.IAM/QueryTestablePermissions", - request_serializer=iam.QueryTestablePermissionsRequest.serialize, - response_deserializer=iam.QueryTestablePermissionsResponse.deserialize, + self._stubs["query_testable_permissions"] = ( + self._logged_channel.unary_unary( + "/google.iam.admin.v1.IAM/QueryTestablePermissions", + request_serializer=iam.QueryTestablePermissionsRequest.serialize, + response_deserializer=iam.QueryTestablePermissionsResponse.deserialize, + ) ) return self._stubs["query_testable_permissions"] diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/__init__.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/__init__.py index 381706689641..63688b8fba35 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .audit_data import AuditData +from .audit_data import ( + AuditData, +) from .iam import ( CreateRoleRequest, CreateServiceAccountKeyRequest, diff --git a/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/iam.py b/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/iam.py index bfdd162e5d25..135de6166498 100644 --- a/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/iam.py +++ b/packages/google-cloud-iam/google/cloud/iam_admin_v1/types/iam.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -87,6 +87,7 @@ class ServiceAccountKeyAlgorithm(proto.Enum): KEY_ALG_RSA_2048 (2): 2k RSA Key. """ + KEY_ALG_UNSPECIFIED = 0 KEY_ALG_RSA_1024 = 1 KEY_ALG_RSA_2048 = 2 @@ -105,6 +106,7 @@ class ServiceAccountPrivateKeyType(proto.Enum): TYPE_GOOGLE_CREDENTIALS_FILE (2): Google Credentials File format. """ + TYPE_UNSPECIFIED = 0 TYPE_PKCS12_FILE = 1 TYPE_GOOGLE_CREDENTIALS_FILE = 2 @@ -121,6 +123,7 @@ class ServiceAccountPublicKeyType(proto.Enum): TYPE_RAW_PUBLIC_KEY (2): Raw public key. """ + TYPE_NONE = 0 TYPE_X509_PEM_FILE = 1 TYPE_RAW_PUBLIC_KEY = 2 @@ -137,6 +140,7 @@ class ServiceAccountKeyOrigin(proto.Enum): GOOGLE_PROVIDED (2): Key is provided by Google. """ + ORIGIN_UNSPECIFIED = 0 USER_PROVIDED = 1 GOOGLE_PROVIDED = 2 @@ -152,6 +156,7 @@ class RoleView(proto.Enum): FULL (1): Returns all fields. """ + BASIC = 0 FULL = 1 @@ -532,6 +537,7 @@ class KeyType(proto.Enum): System-managed keys (managed and rotated by Google). """ + KEY_TYPE_UNSPECIFIED = 0 USER_MANAGED = 1 SYSTEM_MANAGED = 2 @@ -1046,6 +1052,7 @@ class RoleLaunchStage(proto.Enum): The user has indicated this role is currently in an EAP phase. """ + ALPHA = 0 BETA = 1 GA = 2 @@ -1543,6 +1550,7 @@ class PermissionLaunchStage(proto.Enum): DEPRECATED (3): The permission is being deprecated. """ + ALPHA = 0 BETA = 1 GA = 2 @@ -1562,6 +1570,7 @@ class CustomRolesSupportLevel(proto.Enum): Permission is not supported for custom role use. """ + SUPPORTED = 0 TESTING = 1 NOT_SUPPORTED = 2 @@ -1795,6 +1804,7 @@ class Level(proto.Enum): A validation unit which operates on an individual condition within a binding. """ + LEVEL_UNSPECIFIED = 0 CONDITION = 3 @@ -1835,6 +1845,7 @@ class Severity(proto.Enum): DEPRECATED (5): Deprecated severity level. """ + SEVERITY_UNSPECIFIED = 0 ERROR = 1 WARNING = 2 diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/__init__.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/__init__.py index 0e3d599a1571..0b8a079136b5 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.iam_credentials import IAMCredentialsAsyncClient, IAMCredentialsClient from .types.common import ( GenerateAccessTokenRequest, diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/async_client.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/async_client.py index 73188552e800..bf0b3aa38280 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_credentials_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.iam_credentials_v1.types import common @@ -127,7 +127,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IAMCredentialsAsyncClient: The constructed client. """ - return IAMCredentialsClient.from_service_account_info.__func__(IAMCredentialsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = IAMCredentialsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(IAMCredentialsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IAMCredentialsAsyncClient: The constructed client. """ - return IAMCredentialsClient.from_service_account_file.__func__(IAMCredentialsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = IAMCredentialsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(IAMCredentialsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/client.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/client.py index 387ba1b2833c..d3d342308e38 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_credentials_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.iam_credentials_v1.types import common @@ -80,9 +80,7 @@ class IAMCredentialsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IAMCredentialsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IAMCredentialsTransport]] _transport_registry["grpc"] = IAMCredentialsGrpcTransport _transport_registry["grpc_asyncio"] = IAMCredentialsGrpcAsyncIOTransport _transport_registry["rest"] = IAMCredentialsRestTransport @@ -630,11 +628,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IAMCredentialsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IAMCredentialsClient._read_environment_variables() + ) self._client_cert_source = IAMCredentialsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -669,8 +665,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IAMCredentialsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/base.py index 047dd9b2ac98..3f110d50a81a 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_credentials_v1 import gapic_version as package_version from google.cloud.iam_credentials_v1.types import common diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc.py index c568c621265f..e3c505cdba44 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.iam_credentials_v1.types import common diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc_asyncio.py index ec99428d8341..c265affb206e 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_credentials_v1.types import common diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/rest.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/rest.py index d29607e7b521..923726aefacb 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/rest.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/services/iam_credentials/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -449,9 +449,7 @@ def __call__( """ - http_options = ( - _BaseIAMCredentialsRestTransport._BaseGenerateAccessToken._get_http_options() - ) + http_options = _BaseIAMCredentialsRestTransport._BaseGenerateAccessToken._get_http_options() request, metadata = self._interceptor.pre_generate_access_token( request, metadata @@ -603,9 +601,7 @@ def __call__( """ - http_options = ( - _BaseIAMCredentialsRestTransport._BaseGenerateIdToken._get_http_options() - ) + http_options = _BaseIAMCredentialsRestTransport._BaseGenerateIdToken._get_http_options() request, metadata = self._interceptor.pre_generate_id_token( request, metadata diff --git a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/types/common.py b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/types/common.py index b5d77a8bbb73..f2f42dd93afe 100644 --- a/packages/google-cloud-iam/google/cloud/iam_credentials_v1/types/common.py +++ b/packages/google-cloud-iam/google/cloud/iam_credentials_v1/types/common.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v2/__init__.py index 188188af59d2..7c2c753ecea2 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.policies import PoliciesAsyncClient, PoliciesClient from .types.deny import DenyRule from .types.policy import ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/async_client.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/async_client.py index a752dea16bcb..8338e68f7e24 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v2 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.iam_v2.services.policies import pagers from google.cloud.iam_v2.types import policy @@ -111,7 +111,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PoliciesAsyncClient: The constructed client. """ - return PoliciesClient.from_service_account_info.__func__(PoliciesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PoliciesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PoliciesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +128,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PoliciesAsyncClient: The constructed client. """ - return PoliciesClient.from_service_account_file.__func__(PoliciesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PoliciesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PoliciesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/client.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/client.py index 92192dd63be1..24532526e102 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v2 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.iam_v2.services.policies import pagers from google.cloud.iam_v2.types import policy @@ -604,11 +604,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PoliciesClient._read_environment_variables() + ) self._client_cert_source = PoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +641,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/pagers.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/pagers.py index 9fa46e7c5e83..7faccfbb9293 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/base.py index e6f2db3a7bcd..058a38866f4c 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v2 import gapic_version as package_version from google.cloud.iam_v2.types import policy diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc.py index e8db5583170f..3c5c312406b2 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.iam_v2.types import policy from google.cloud.iam_v2.types import policy as gi_policy diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc_asyncio.py index 16cffd0570dd..7074aeaa5624 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_v2.types import policy from google.cloud.iam_v2.types import policy as gi_policy diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/rest.py b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/rest.py index 335fc9b8878e..b341cbecc3f9 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/rest.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/services/policies/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -581,7 +581,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -729,7 +729,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1171,7 +1171,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/types/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v2/types/__init__.py index 962d7a696566..995b92b87cc9 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/types/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .deny import DenyRule +from .deny import ( + DenyRule, +) from .policy import ( CreatePolicyRequest, DeletePolicyRequest, diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/types/deny.py b/packages/google-cloud-iam/google/cloud/iam_v2/types/deny.py index 78c38d080d49..bc70778530cf 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/types/deny.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/types/deny.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.type import expr_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-iam/google/cloud/iam_v2/types/policy.py b/packages/google-cloud-iam/google/cloud/iam_v2/types/policy.py index 38ac5f4d6230..ebbcacb68e06 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2/types/policy.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2/types/policy.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.iam_v2.types import deny diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/__init__.py index f3d09491ef2a..3776318f20c5 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.policies import PoliciesAsyncClient, PoliciesClient from .types.deny import DenyRule from .types.policy import ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/async_client.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/async_client.py index 2e3de0240249..9e4d0152da59 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v2beta import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.iam_v2beta.services.policies import pagers from google.cloud.iam_v2beta.types import policy @@ -111,7 +111,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PoliciesAsyncClient: The constructed client. """ - return PoliciesClient.from_service_account_info.__func__(PoliciesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PoliciesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PoliciesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -127,7 +128,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PoliciesAsyncClient: The constructed client. """ - return PoliciesClient.from_service_account_file.__func__(PoliciesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PoliciesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PoliciesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/client.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/client.py index fd35e28ae9b4..f91d54658658 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v2beta import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.iam_v2beta.services.policies import pagers from google.cloud.iam_v2beta.types import policy @@ -602,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PoliciesClient._read_environment_variables() + ) self._client_cert_source = PoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/pagers.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/pagers.py index e75c2e525d26..0375f8c4fb42 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/base.py index bb0ba51d9cb4..5d6efea36657 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v2beta import gapic_version as package_version from google.cloud.iam_v2beta.types import policy diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc.py index d37d3d016821..f7e4c686964f 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.iam_v2beta.types import policy from google.cloud.iam_v2beta.types import policy as gi_policy diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc_asyncio.py index e16d9ebd5748..eb72ec35548d 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/services/policies/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_v2beta.types import policy from google.cloud.iam_v2beta.types import policy as gi_policy diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/types/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/types/__init__.py index 962d7a696566..995b92b87cc9 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/types/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .deny import DenyRule +from .deny import ( + DenyRule, +) from .policy import ( CreatePolicyRequest, DeletePolicyRequest, diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/types/deny.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/types/deny.py index 516d3cbcfe94..0e6688ed6af7 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/types/deny.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/types/deny.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.type import expr_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-iam/google/cloud/iam_v2beta/types/policy.py b/packages/google-cloud-iam/google/cloud/iam_v2beta/types/policy.py index 82c0df545201..7cf4537b295c 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v2beta/types/policy.py +++ b/packages/google-cloud-iam/google/cloud/iam_v2beta/types/policy.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.iam_v2beta.types import deny diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v3/__init__.py index 92ac785eba34..8ea1969e25a1 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.policy_bindings import PolicyBindingsAsyncClient, PolicyBindingsClient from .services.principal_access_boundary_policies import ( PrincipalAccessBoundaryPoliciesAsyncClient, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/async_client.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/async_client.py index dfbdcf460566..587cd9b7984a 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3 import gapic_version as package_version @@ -44,14 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.iam_v3.services.policy_bindings import pagers from google.cloud.iam_v3.types import ( @@ -130,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyBindingsAsyncClient: The constructed client. """ - return PolicyBindingsClient.from_service_account_info.__func__(PolicyBindingsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PolicyBindingsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PolicyBindingsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +147,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyBindingsAsyncClient: The constructed client. """ - return PolicyBindingsClient.from_service_account_file.__func__(PolicyBindingsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PolicyBindingsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PolicyBindingsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/client.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/client.py index 03fe428edefe..43868be62355 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3 import gapic_version as package_version @@ -61,14 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.iam_v3.services.policy_bindings import pagers from google.cloud.iam_v3.types import ( @@ -91,9 +91,7 @@ class PolicyBindingsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyBindingsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyBindingsTransport]] _transport_registry["grpc"] = PolicyBindingsGrpcTransport _transport_registry["grpc_asyncio"] = PolicyBindingsGrpcAsyncIOTransport _transport_registry["rest"] = PolicyBindingsRestTransport @@ -635,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyBindingsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyBindingsClient._read_environment_variables() + ) self._client_cert_source = PolicyBindingsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyBindingsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/pagers.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/pagers.py index 116100111687..7bcf1ad244a9 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/base.py index 40c70aa31639..adcfd2c81f5c 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3 import gapic_version as package_version from google.cloud.iam_v3.types import policy_binding_resources, policy_bindings_service diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc.py index 213b85c3c8c1..85c7ddeed506 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.iam_v3.types import policy_binding_resources, policy_bindings_service @@ -518,12 +518,12 @@ def search_target_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_target_policy_bindings" not in self._stubs: - self._stubs[ - "search_target_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PolicyBindings/SearchTargetPolicyBindings", - request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, - response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + self._stubs["search_target_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PolicyBindings/SearchTargetPolicyBindings", + request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, + response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_target_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc_asyncio.py index 5e09a4532702..66d20aa4a85f 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_v3.types import policy_binding_resources, policy_bindings_service @@ -529,12 +529,12 @@ def search_target_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_target_policy_bindings" not in self._stubs: - self._stubs[ - "search_target_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PolicyBindings/SearchTargetPolicyBindings", - request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, - response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + self._stubs["search_target_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PolicyBindings/SearchTargetPolicyBindings", + request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, + response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_target_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/rest.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/rest.py index 2fc3bbeed668..e98cedb36168 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/rest.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/policy_bindings/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -647,9 +647,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseCreatePolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseCreatePolicyBinding._get_http_options() request, metadata = self._interceptor.pre_create_policy_binding( request, metadata @@ -675,7 +673,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -801,9 +799,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseDeletePolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseDeletePolicyBinding._get_http_options() request, metadata = self._interceptor.pre_delete_policy_binding( request, metadata @@ -825,7 +821,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -946,9 +942,7 @@ def __call__( IAM policy binding resource. """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseGetPolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseGetPolicyBinding._get_http_options() request, metadata = self._interceptor.pre_get_policy_binding( request, metadata @@ -1097,9 +1091,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseListPolicyBindings._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseListPolicyBindings._get_http_options() request, metadata = self._interceptor.pre_list_policy_bindings( request, metadata @@ -1252,9 +1244,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseSearchTargetPolicyBindings._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseSearchTargetPolicyBindings._get_http_options() request, metadata = self._interceptor.pre_search_target_policy_bindings( request, metadata @@ -1322,11 +1312,10 @@ def __call__( resp = self._interceptor.post_search_target_policy_bindings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_search_target_policy_bindings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_search_target_policy_bindings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1413,9 +1402,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseUpdatePolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseUpdatePolicyBinding._get_http_options() request, metadata = self._interceptor.pre_update_policy_binding( request, metadata @@ -1441,7 +1428,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1559,7 +1546,9 @@ def search_target_policy_bindings( ]: # 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._SearchTargetPolicyBindings(self._session, self._host, self._interceptor) # type: ignore + return self._SearchTargetPolicyBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_policy_binding( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/async_client.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/async_client.py index 165aa584b0c2..d85d65815f5e 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.iam_v3.services.principal_access_boundary_policies import pagers from google.cloud.iam_v3.types import ( @@ -149,7 +149,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PrincipalAccessBoundaryPoliciesAsyncClient: The constructed client. """ - return PrincipalAccessBoundaryPoliciesClient.from_service_account_info.__func__(PrincipalAccessBoundaryPoliciesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PrincipalAccessBoundaryPoliciesClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + PrincipalAccessBoundaryPoliciesAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +170,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PrincipalAccessBoundaryPoliciesAsyncClient: The constructed client. """ - return PrincipalAccessBoundaryPoliciesClient.from_service_account_file.__func__(PrincipalAccessBoundaryPoliciesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PrincipalAccessBoundaryPoliciesClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + PrincipalAccessBoundaryPoliciesAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -203,7 +213,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return PrincipalAccessBoundaryPoliciesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return PrincipalAccessBoundaryPoliciesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> PrincipalAccessBoundaryPoliciesTransport: diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/client.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/client.py index 0ec695a044de..e16af90c4b35 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.iam_v3.services.principal_access_boundary_policies import pagers from google.cloud.iam_v3.types import ( @@ -94,13 +94,11 @@ class PrincipalAccessBoundaryPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] _transport_registry["grpc"] = PrincipalAccessBoundaryPoliciesGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport + ) _transport_registry["rest"] = PrincipalAccessBoundaryPoliciesRestTransport def get_transport_class( @@ -674,11 +672,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PrincipalAccessBoundaryPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PrincipalAccessBoundaryPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( PrincipalAccessBoundaryPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -719,8 +715,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PrincipalAccessBoundaryPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/pagers.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/pagers.py index f0253da4d4de..90a6cf8b1ba5 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/pagers.py @@ -74,7 +74,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -165,7 +165,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -258,7 +258,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -345,7 +345,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/__init__.py index a61a05fb134f..572b487008f5 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] _transport_registry["grpc"] = PrincipalAccessBoundaryPoliciesGrpcTransport -_transport_registry[ - "grpc_asyncio" -] = PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport +) _transport_registry["rest"] = PrincipalAccessBoundaryPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/base.py index bdb95b67b529..d44c8f935747 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3 import gapic_version as package_version from google.cloud.iam_v3.types import ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc.py index bf68a5c96b22..b59bbff9a0d7 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.iam_v3.types import ( principal_access_boundary_policies_service, @@ -372,12 +372,12 @@ def create_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "create_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_principal_access_boundary_policy"] @@ -406,12 +406,12 @@ def get_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "get_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + self._stubs["get_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + ) ) return self._stubs["get_principal_access_boundary_policy"] @@ -440,12 +440,12 @@ def update_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "update_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_principal_access_boundary_policy"] @@ -474,12 +474,12 @@ def delete_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "delete_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_principal_access_boundary_policy"] @@ -508,12 +508,12 @@ def list_principal_access_boundary_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_principal_access_boundary_policies" not in self._stubs: - self._stubs[ - "list_principal_access_boundary_policies" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", - request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + self._stubs["list_principal_access_boundary_policies"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", + request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + ) ) return self._stubs["list_principal_access_boundary_policies"] @@ -544,12 +544,12 @@ def search_principal_access_boundary_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_principal_access_boundary_policy_bindings" not in self._stubs: - self._stubs[ - "search_principal_access_boundary_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", - request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + self._stubs["search_principal_access_boundary_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", + request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_principal_access_boundary_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc_asyncio.py index d16ff1021db8..d343d431a181 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_v3.types import ( principal_access_boundary_policies_service, @@ -380,12 +380,12 @@ def create_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "create_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_principal_access_boundary_policy"] @@ -416,12 +416,12 @@ def get_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "get_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + self._stubs["get_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + ) ) return self._stubs["get_principal_access_boundary_policy"] @@ -450,12 +450,12 @@ def update_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "update_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_principal_access_boundary_policy"] @@ -484,12 +484,12 @@ def delete_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "delete_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_principal_access_boundary_policy"] @@ -520,12 +520,12 @@ def list_principal_access_boundary_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_principal_access_boundary_policies" not in self._stubs: - self._stubs[ - "list_principal_access_boundary_policies" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", - request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + self._stubs["list_principal_access_boundary_policies"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", + request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + ) ) return self._stubs["list_principal_access_boundary_policies"] @@ -558,12 +558,12 @@ def search_principal_access_boundary_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_principal_access_boundary_policy_bindings" not in self._stubs: - self._stubs[ - "search_principal_access_boundary_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", - request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + self._stubs["search_principal_access_boundary_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", + request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_principal_access_boundary_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/rest.py b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/rest.py index ba73b6e5a381..6fae4c7654a6 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/rest.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/services/principal_access_boundary_policies/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -300,9 +300,7 @@ def pre_list_principal_access_boundary_policies( def post_list_principal_access_boundary_policies( self, response: principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse, - ) -> ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse - ): + ) -> principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse: """Post-rpc interceptor for list_principal_access_boundary_policies DEPRECATED. Please use the `post_list_principal_access_boundary_policies_with_metadata` @@ -355,9 +353,7 @@ def pre_search_principal_access_boundary_policy_bindings( def post_search_principal_access_boundary_policy_bindings( self, response: principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse, - ) -> ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse - ): + ) -> principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse: """Post-rpc interceptor for search_principal_access_boundary_policy_bindings DEPRECATED. Please use the `post_search_principal_access_boundary_policy_bindings_with_metadata` @@ -666,15 +662,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseCreatePrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseCreatePrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_create_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseCreatePrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -697,7 +690,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -738,11 +731,10 @@ def __call__( resp = self._interceptor.post_create_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -830,15 +822,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseDeletePrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseDeletePrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseDeletePrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -857,7 +846,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -897,11 +886,10 @@ def __call__( resp = self._interceptor.post_delete_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -987,15 +975,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetPrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetPrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_get_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetPrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -1049,9 +1034,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy() - ) + resp = principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy() pb_resp = principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.pb( resp ) @@ -1060,11 +1043,10 @@ def __call__( resp = self._interceptor.post_get_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1129,9 +1111,7 @@ def __call__( retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Optional[float] = None, metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), - ) -> ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse - ): + ) -> principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse: r"""Call the list principal access boundary policies method over HTTP. @@ -1156,15 +1136,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseListPrincipalAccessBoundaryPolicies._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseListPrincipalAccessBoundaryPolicies._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_principal_access_boundary_policies( - request, metadata + request, metadata = ( + self._interceptor.pre_list_principal_access_boundary_policies( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseListPrincipalAccessBoundaryPolicies._get_transcoded_request( http_options, request @@ -1218,9 +1195,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + resp = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() pb_resp = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.pb( resp ) @@ -1229,11 +1204,10 @@ def __call__( resp = self._interceptor.post_list_principal_access_boundary_policies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_principal_access_boundary_policies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_principal_access_boundary_policies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1298,9 +1272,7 @@ def __call__( retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Optional[float] = None, metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), - ) -> ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse - ): + ) -> principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse: r"""Call the search principal access boundary policy bindings method over HTTP. @@ -1325,15 +1297,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseSearchPrincipalAccessBoundaryPolicyBindings._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseSearchPrincipalAccessBoundaryPolicyBindings._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_search_principal_access_boundary_policy_bindings( - request, metadata + request, metadata = ( + self._interceptor.pre_search_principal_access_boundary_policy_bindings( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseSearchPrincipalAccessBoundaryPolicyBindings._get_transcoded_request( http_options, request @@ -1387,9 +1356,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + resp = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() pb_resp = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.pb( resp ) @@ -1402,11 +1369,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_search_principal_access_boundary_policy_bindings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_search_principal_access_boundary_policy_bindings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1497,15 +1463,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseUpdatePrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseUpdatePrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_update_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseUpdatePrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -1528,7 +1491,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1569,11 +1532,10 @@ def __call__( resp = self._interceptor.post_update_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1609,7 +1571,9 @@ def create_principal_access_boundary_policy( ]: # 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._CreatePrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_principal_access_boundary_policy( @@ -1622,7 +1586,9 @@ def delete_principal_access_boundary_policy( ]: # 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._DeletePrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_principal_access_boundary_policy( @@ -1635,7 +1601,9 @@ def get_principal_access_boundary_policy( ]: # 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._GetPrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._GetPrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_principal_access_boundary_policies( @@ -1648,7 +1616,9 @@ def list_principal_access_boundary_policies( ]: # 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._ListPrincipalAccessBoundaryPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._ListPrincipalAccessBoundaryPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_principal_access_boundary_policy_bindings( @@ -1661,7 +1631,9 @@ def search_principal_access_boundary_policy_bindings( ]: # 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._SearchPrincipalAccessBoundaryPolicyBindings(self._session, self._host, self._interceptor) # type: ignore + return self._SearchPrincipalAccessBoundaryPolicyBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_principal_access_boundary_policy( @@ -1674,7 +1646,9 @@ def update_principal_access_boundary_policy( ]: # 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._UpdatePrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -1734,9 +1708,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/types/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v3/types/__init__.py index f4ebb2d7c755..bb0caa3a5e8d 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/types/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .operation_metadata import OperationMetadata -from .policy_binding_resources import PolicyBinding +from .operation_metadata import ( + OperationMetadata, +) +from .policy_binding_resources import ( + PolicyBinding, +) from .policy_bindings_service import ( CreatePolicyBindingRequest, DeletePolicyBindingRequest, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/types/operation_metadata.py b/packages/google-cloud-iam/google/cloud/iam_v3/types/operation_metadata.py index a2c98ce6ab33..85bb60cfa9eb 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/types/operation_metadata.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/types/operation_metadata.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_binding_resources.py b/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_binding_resources.py index 3b5104c26b0c..fe70ee5e4dc7 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_binding_resources.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_binding_resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -136,6 +136,7 @@ class PolicyKind(proto.Enum): PRINCIPAL_ACCESS_BOUNDARY (1): Principal access boundary policy kind """ + POLICY_KIND_UNSPECIFIED = 0 PRINCIPAL_ACCESS_BOUNDARY = 1 diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_bindings_service.py b/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_bindings_service.py index 866970d04b46..951f6421e850 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_bindings_service.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/types/policy_bindings_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.iam_v3.types import policy_binding_resources @@ -261,12 +261,12 @@ class ListPolicyBindingsResponse(proto.Message): def raw_page(self): return self - policy_bindings: MutableSequence[ - policy_binding_resources.PolicyBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=policy_binding_resources.PolicyBinding, + policy_bindings: MutableSequence[policy_binding_resources.PolicyBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=policy_binding_resources.PolicyBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -354,12 +354,12 @@ class SearchTargetPolicyBindingsResponse(proto.Message): def raw_page(self): return self - policy_bindings: MutableSequence[ - policy_binding_resources.PolicyBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=policy_binding_resources.PolicyBinding, + policy_bindings: MutableSequence[policy_binding_resources.PolicyBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=policy_binding_resources.PolicyBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policies_service.py b/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policies_service.py index 95190ee9528d..ac0552725826 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policies_service.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policies_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.iam_v3.types import ( @@ -316,12 +316,12 @@ class SearchPrincipalAccessBoundaryPolicyBindingsResponse(proto.Message): def raw_page(self): return self - policy_bindings: MutableSequence[ - policy_binding_resources.PolicyBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=policy_binding_resources.PolicyBinding, + policy_bindings: MutableSequence[policy_binding_resources.PolicyBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=policy_binding_resources.PolicyBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policy_resources.py b/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policy_resources.py index 625412e8af7d..a535f1f6e7d2 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policy_resources.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3/types/principal_access_boundary_policy_resources.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -171,6 +171,7 @@ class Effect(proto.Enum): ALLOW (1): Allows access to the resources in this rule. """ + EFFECT_UNSPECIFIED = 0 ALLOW = 1 diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/__init__.py index e8fd62d22033..20cbd036ab53 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.policy_bindings import PolicyBindingsAsyncClient, PolicyBindingsClient from .services.principal_access_boundary_policies import ( PrincipalAccessBoundaryPoliciesAsyncClient, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/async_client.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/async_client.py index dfa24d44249f..6d3466aa84b1 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3beta import gapic_version as package_version @@ -44,14 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.iam_v3beta.services.policy_bindings import pagers from google.cloud.iam_v3beta.types import ( @@ -130,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyBindingsAsyncClient: The constructed client. """ - return PolicyBindingsClient.from_service_account_info.__func__(PolicyBindingsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PolicyBindingsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PolicyBindingsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +147,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyBindingsAsyncClient: The constructed client. """ - return PolicyBindingsClient.from_service_account_file.__func__(PolicyBindingsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PolicyBindingsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PolicyBindingsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/client.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/client.py index e72fada3a3fa..000d387752cc 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3beta import gapic_version as package_version @@ -61,14 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.iam_v3beta.services.policy_bindings import pagers from google.cloud.iam_v3beta.types import ( @@ -91,9 +91,7 @@ class PolicyBindingsClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyBindingsTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyBindingsTransport]] _transport_registry["grpc"] = PolicyBindingsGrpcTransport _transport_registry["grpc_asyncio"] = PolicyBindingsGrpcAsyncIOTransport _transport_registry["rest"] = PolicyBindingsRestTransport @@ -635,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyBindingsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyBindingsClient._read_environment_variables() + ) self._client_cert_source = PolicyBindingsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyBindingsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/pagers.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/pagers.py index e2bd05272231..92935e339382 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/pagers.py @@ -70,7 +70,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +232,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -314,7 +314,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/base.py index bdff01ed38f0..5a9929c737b7 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3beta import gapic_version as package_version from google.cloud.iam_v3beta.types import ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc.py index 244f4fc08ae8..6ac8496408a0 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.iam_v3beta.types import ( policy_binding_resources, @@ -521,12 +521,12 @@ def search_target_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_target_policy_bindings" not in self._stubs: - self._stubs[ - "search_target_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PolicyBindings/SearchTargetPolicyBindings", - request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, - response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + self._stubs["search_target_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PolicyBindings/SearchTargetPolicyBindings", + request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, + response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_target_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc_asyncio.py index 1bda4a8117f5..14a25d0e153e 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_v3beta.types import ( policy_binding_resources, @@ -532,12 +532,12 @@ def search_target_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_target_policy_bindings" not in self._stubs: - self._stubs[ - "search_target_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PolicyBindings/SearchTargetPolicyBindings", - request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, - response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + self._stubs["search_target_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PolicyBindings/SearchTargetPolicyBindings", + request_serializer=policy_bindings_service.SearchTargetPolicyBindingsRequest.serialize, + response_deserializer=policy_bindings_service.SearchTargetPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_target_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/rest.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/rest.py index 88517daa5a1f..9137b276e850 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/rest.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/policy_bindings/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -650,9 +650,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseCreatePolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseCreatePolicyBinding._get_http_options() request, metadata = self._interceptor.pre_create_policy_binding( request, metadata @@ -678,7 +676,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -804,9 +802,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseDeletePolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseDeletePolicyBinding._get_http_options() request, metadata = self._interceptor.pre_delete_policy_binding( request, metadata @@ -828,7 +824,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -949,9 +945,7 @@ def __call__( IAM policy binding resource. """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseGetPolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseGetPolicyBinding._get_http_options() request, metadata = self._interceptor.pre_get_policy_binding( request, metadata @@ -1100,9 +1094,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseListPolicyBindings._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseListPolicyBindings._get_http_options() request, metadata = self._interceptor.pre_list_policy_bindings( request, metadata @@ -1255,9 +1247,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseSearchTargetPolicyBindings._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseSearchTargetPolicyBindings._get_http_options() request, metadata = self._interceptor.pre_search_target_policy_bindings( request, metadata @@ -1325,11 +1315,10 @@ def __call__( resp = self._interceptor.post_search_target_policy_bindings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_search_target_policy_bindings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_search_target_policy_bindings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1416,9 +1405,7 @@ def __call__( """ - http_options = ( - _BasePolicyBindingsRestTransport._BaseUpdatePolicyBinding._get_http_options() - ) + http_options = _BasePolicyBindingsRestTransport._BaseUpdatePolicyBinding._get_http_options() request, metadata = self._interceptor.pre_update_policy_binding( request, metadata @@ -1444,7 +1431,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1562,7 +1549,9 @@ def search_target_policy_bindings( ]: # 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._SearchTargetPolicyBindings(self._session, self._host, self._interceptor) # type: ignore + return self._SearchTargetPolicyBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_policy_binding( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/async_client.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/async_client.py index ae7f7602de5b..68e304e4b088 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/async_client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3beta import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.iam_v3beta.services.principal_access_boundary_policies import pagers from google.cloud.iam_v3beta.types import ( @@ -149,7 +149,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PrincipalAccessBoundaryPoliciesAsyncClient: The constructed client. """ - return PrincipalAccessBoundaryPoliciesClient.from_service_account_info.__func__(PrincipalAccessBoundaryPoliciesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PrincipalAccessBoundaryPoliciesClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + PrincipalAccessBoundaryPoliciesAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -165,7 +170,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PrincipalAccessBoundaryPoliciesAsyncClient: The constructed client. """ - return PrincipalAccessBoundaryPoliciesClient.from_service_account_file.__func__(PrincipalAccessBoundaryPoliciesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PrincipalAccessBoundaryPoliciesClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + PrincipalAccessBoundaryPoliciesAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -203,7 +213,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return PrincipalAccessBoundaryPoliciesClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return PrincipalAccessBoundaryPoliciesClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> PrincipalAccessBoundaryPoliciesTransport: diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/client.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/client.py index 356b0eeb91c7..d3c977b7502d 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/client.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3beta import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.iam_v3beta.services.principal_access_boundary_policies import pagers from google.cloud.iam_v3beta.types import ( @@ -94,13 +94,11 @@ class PrincipalAccessBoundaryPoliciesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] _transport_registry["grpc"] = PrincipalAccessBoundaryPoliciesGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport + ) _transport_registry["rest"] = PrincipalAccessBoundaryPoliciesRestTransport def get_transport_class( @@ -674,11 +672,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PrincipalAccessBoundaryPoliciesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PrincipalAccessBoundaryPoliciesClient._read_environment_variables() + ) self._client_cert_source = ( PrincipalAccessBoundaryPoliciesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -719,8 +715,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PrincipalAccessBoundaryPoliciesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/pagers.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/pagers.py index 0b0975052920..5927f0680f1c 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/pagers.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/pagers.py @@ -74,7 +74,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -165,7 +165,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -258,7 +258,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -345,7 +345,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/__init__.py index a61a05fb134f..572b487008f5 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PrincipalAccessBoundaryPoliciesTransport]] _transport_registry["grpc"] = PrincipalAccessBoundaryPoliciesGrpcTransport -_transport_registry[ - "grpc_asyncio" -] = PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + PrincipalAccessBoundaryPoliciesGrpcAsyncIOTransport +) _transport_registry["rest"] = PrincipalAccessBoundaryPoliciesRestTransport __all__ = ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/base.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/base.py index 11f29faab3b5..1859d733de0b 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/base.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iam_v3beta import gapic_version as package_version from google.cloud.iam_v3beta.types import ( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc.py index d30db8766e3e..4989312dcd8b 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.iam_v3beta.types import ( principal_access_boundary_policies_service, @@ -372,12 +372,12 @@ def create_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "create_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_principal_access_boundary_policy"] @@ -406,12 +406,12 @@ def get_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "get_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + self._stubs["get_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + ) ) return self._stubs["get_principal_access_boundary_policy"] @@ -440,12 +440,12 @@ def update_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "update_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_principal_access_boundary_policy"] @@ -474,12 +474,12 @@ def delete_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "delete_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_principal_access_boundary_policy"] @@ -508,12 +508,12 @@ def list_principal_access_boundary_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_principal_access_boundary_policies" not in self._stubs: - self._stubs[ - "list_principal_access_boundary_policies" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", - request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + self._stubs["list_principal_access_boundary_policies"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", + request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + ) ) return self._stubs["list_principal_access_boundary_policies"] @@ -544,12 +544,12 @@ def search_principal_access_boundary_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_principal_access_boundary_policy_bindings" not in self._stubs: - self._stubs[ - "search_principal_access_boundary_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", - request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + self._stubs["search_principal_access_boundary_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", + request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_principal_access_boundary_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc_asyncio.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc_asyncio.py index b9ef2ab3399c..7c79fde33a98 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc_asyncio.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iam_v3beta.types import ( principal_access_boundary_policies_service, @@ -380,12 +380,12 @@ def create_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "create_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/CreatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_principal_access_boundary_policy"] @@ -416,12 +416,12 @@ def get_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "get_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + self._stubs["get_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/GetPrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.deserialize, + ) ) return self._stubs["get_principal_access_boundary_policy"] @@ -450,12 +450,12 @@ def update_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "update_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/UpdatePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_principal_access_boundary_policy"] @@ -484,12 +484,12 @@ def delete_principal_access_boundary_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_principal_access_boundary_policy" not in self._stubs: - self._stubs[ - "delete_principal_access_boundary_policy" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", - request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_principal_access_boundary_policy"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/DeletePrincipalAccessBoundaryPolicy", + request_serializer=principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_principal_access_boundary_policy"] @@ -520,12 +520,12 @@ def list_principal_access_boundary_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_principal_access_boundary_policies" not in self._stubs: - self._stubs[ - "list_principal_access_boundary_policies" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", - request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + self._stubs["list_principal_access_boundary_policies"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/ListPrincipalAccessBoundaryPolicies", + request_serializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.deserialize, + ) ) return self._stubs["list_principal_access_boundary_policies"] @@ -558,12 +558,12 @@ def search_principal_access_boundary_policy_bindings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_principal_access_boundary_policy_bindings" not in self._stubs: - self._stubs[ - "search_principal_access_boundary_policy_bindings" - ] = self._logged_channel.unary_unary( - "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", - request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, - response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + self._stubs["search_principal_access_boundary_policy_bindings"] = ( + self._logged_channel.unary_unary( + "/google.iam.v3beta.PrincipalAccessBoundaryPolicies/SearchPrincipalAccessBoundaryPolicyBindings", + request_serializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest.serialize, + response_deserializer=principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.deserialize, + ) ) return self._stubs["search_principal_access_boundary_policy_bindings"] diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/rest.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/rest.py index bc7acb0ddb56..a3bb2a317ce4 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/rest.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/services/principal_access_boundary_policies/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -300,9 +300,7 @@ def pre_list_principal_access_boundary_policies( def post_list_principal_access_boundary_policies( self, response: principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse, - ) -> ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse - ): + ) -> principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse: """Post-rpc interceptor for list_principal_access_boundary_policies DEPRECATED. Please use the `post_list_principal_access_boundary_policies_with_metadata` @@ -355,9 +353,7 @@ def pre_search_principal_access_boundary_policy_bindings( def post_search_principal_access_boundary_policy_bindings( self, response: principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse, - ) -> ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse - ): + ) -> principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse: """Post-rpc interceptor for search_principal_access_boundary_policy_bindings DEPRECATED. Please use the `post_search_principal_access_boundary_policy_bindings_with_metadata` @@ -666,15 +662,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseCreatePrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseCreatePrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_create_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseCreatePrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -697,7 +690,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -738,11 +731,10 @@ def __call__( resp = self._interceptor.post_create_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -830,15 +822,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseDeletePrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseDeletePrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseDeletePrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -857,7 +846,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -897,11 +886,10 @@ def __call__( resp = self._interceptor.post_delete_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -987,15 +975,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetPrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetPrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_get_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetPrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -1049,9 +1034,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy() - ) + resp = principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy() pb_resp = principal_access_boundary_policy_resources.PrincipalAccessBoundaryPolicy.pb( resp ) @@ -1060,11 +1043,10 @@ def __call__( resp = self._interceptor.post_get_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1129,9 +1111,7 @@ def __call__( retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Optional[float] = None, metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), - ) -> ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse - ): + ) -> principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse: r"""Call the list principal access boundary policies method over HTTP. @@ -1156,15 +1136,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseListPrincipalAccessBoundaryPolicies._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseListPrincipalAccessBoundaryPolicies._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_principal_access_boundary_policies( - request, metadata + request, metadata = ( + self._interceptor.pre_list_principal_access_boundary_policies( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseListPrincipalAccessBoundaryPolicies._get_transcoded_request( http_options, request @@ -1218,9 +1195,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + resp = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() pb_resp = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse.pb( resp ) @@ -1229,11 +1204,10 @@ def __call__( resp = self._interceptor.post_list_principal_access_boundary_policies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_principal_access_boundary_policies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_principal_access_boundary_policies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1298,9 +1272,7 @@ def __call__( retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Optional[float] = None, metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), - ) -> ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse - ): + ) -> principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse: r"""Call the search principal access boundary policy bindings method over HTTP. @@ -1325,15 +1297,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseSearchPrincipalAccessBoundaryPolicyBindings._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseSearchPrincipalAccessBoundaryPolicyBindings._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_search_principal_access_boundary_policy_bindings( - request, metadata + request, metadata = ( + self._interceptor.pre_search_principal_access_boundary_policy_bindings( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseSearchPrincipalAccessBoundaryPolicyBindings._get_transcoded_request( http_options, request @@ -1387,9 +1356,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + resp = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() pb_resp = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse.pb( resp ) @@ -1402,11 +1369,10 @@ def __call__( ) ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_search_principal_access_boundary_policy_bindings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_search_principal_access_boundary_policy_bindings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1497,15 +1463,12 @@ def __call__( """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseUpdatePrincipalAccessBoundaryPolicy._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseUpdatePrincipalAccessBoundaryPolicy._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_principal_access_boundary_policy( - request, metadata + request, metadata = ( + self._interceptor.pre_update_principal_access_boundary_policy( + request, metadata + ) ) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseUpdatePrincipalAccessBoundaryPolicy._get_transcoded_request( http_options, request @@ -1528,7 +1491,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1569,11 +1532,10 @@ def __call__( resp = self._interceptor.post_update_principal_access_boundary_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_principal_access_boundary_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_principal_access_boundary_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1609,7 +1571,9 @@ def create_principal_access_boundary_policy( ]: # 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._CreatePrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_principal_access_boundary_policy( @@ -1622,7 +1586,9 @@ def delete_principal_access_boundary_policy( ]: # 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._DeletePrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_principal_access_boundary_policy( @@ -1635,7 +1601,9 @@ def get_principal_access_boundary_policy( ]: # 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._GetPrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._GetPrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_principal_access_boundary_policies( @@ -1648,7 +1616,9 @@ def list_principal_access_boundary_policies( ]: # 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._ListPrincipalAccessBoundaryPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._ListPrincipalAccessBoundaryPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_principal_access_boundary_policy_bindings( @@ -1661,7 +1631,9 @@ def search_principal_access_boundary_policy_bindings( ]: # 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._SearchPrincipalAccessBoundaryPolicyBindings(self._session, self._host, self._interceptor) # type: ignore + return self._SearchPrincipalAccessBoundaryPolicyBindings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_principal_access_boundary_policy( @@ -1674,7 +1646,9 @@ def update_principal_access_boundary_policy( ]: # 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._UpdatePrincipalAccessBoundaryPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePrincipalAccessBoundaryPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -1734,9 +1708,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePrincipalAccessBoundaryPoliciesRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/__init__.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/__init__.py index f4ebb2d7c755..bb0caa3a5e8d 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/__init__.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .operation_metadata import OperationMetadata -from .policy_binding_resources import PolicyBinding +from .operation_metadata import ( + OperationMetadata, +) +from .policy_binding_resources import ( + PolicyBinding, +) from .policy_bindings_service import ( CreatePolicyBindingRequest, DeletePolicyBindingRequest, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/operation_metadata.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/operation_metadata.py index ea3f154d636e..ec1928afb3d4 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/operation_metadata.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/operation_metadata.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_binding_resources.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_binding_resources.py index 3ac4463d3368..364ebe83c9b4 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_binding_resources.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_binding_resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -136,6 +136,7 @@ class PolicyKind(proto.Enum): PRINCIPAL_ACCESS_BOUNDARY (1): Principal access boundary policy kind """ + POLICY_KIND_UNSPECIFIED = 0 PRINCIPAL_ACCESS_BOUNDARY = 1 diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_bindings_service.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_bindings_service.py index aea59630d199..83de2fce724d 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_bindings_service.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/policy_bindings_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.iam_v3beta.types import policy_binding_resources @@ -261,12 +261,12 @@ class ListPolicyBindingsResponse(proto.Message): def raw_page(self): return self - policy_bindings: MutableSequence[ - policy_binding_resources.PolicyBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=policy_binding_resources.PolicyBinding, + policy_bindings: MutableSequence[policy_binding_resources.PolicyBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=policy_binding_resources.PolicyBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -354,12 +354,12 @@ class SearchTargetPolicyBindingsResponse(proto.Message): def raw_page(self): return self - policy_bindings: MutableSequence[ - policy_binding_resources.PolicyBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=policy_binding_resources.PolicyBinding, + policy_bindings: MutableSequence[policy_binding_resources.PolicyBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=policy_binding_resources.PolicyBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policies_service.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policies_service.py index b3c45141e87e..0a429ce125ea 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policies_service.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policies_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.iam_v3beta.types import ( @@ -316,12 +316,12 @@ class SearchPrincipalAccessBoundaryPolicyBindingsResponse(proto.Message): def raw_page(self): return self - policy_bindings: MutableSequence[ - policy_binding_resources.PolicyBinding - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=policy_binding_resources.PolicyBinding, + policy_bindings: MutableSequence[policy_binding_resources.PolicyBinding] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=policy_binding_resources.PolicyBinding, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policy_resources.py b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policy_resources.py index 5346dcd1b208..271256e78dc0 100644 --- a/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policy_resources.py +++ b/packages/google-cloud-iam/google/cloud/iam_v3beta/types/principal_access_boundary_policy_resources.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -171,6 +171,7 @@ class Effect(proto.Enum): ALLOW (1): Allows access to the resources in this rule. """ + EFFECT_UNSPECIFIED = 0 ALLOW = 1 diff --git a/packages/google-cloud-iam/noxfile.py b/packages/google-cloud-iam/noxfile.py index 4f83b31943f5..dcd779768b90 100644 --- a/packages/google-cloud-iam/noxfile.py +++ b/packages/google-cloud-iam/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_async.py b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_async.py index ad7f04258bde..5ffdda4ed4af 100644 --- a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_async.py +++ b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iam -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START iam_v1_generated_IAM_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iam_admin_v1 diff --git a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_sync.py b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_sync.py index 9143426bdc43..3cd494d62363 100644 --- a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_sync.py +++ b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iam -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START iam_v1_generated_IAM_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iam_admin_v1 diff --git a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_async.py b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_async.py index edc05f491fcc..a7ecb8f4e9e1 100644 --- a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_async.py +++ b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iam -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START iam_v1_generated_IAM_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iam_admin_v1 diff --git a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_sync.py b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_sync.py index a20fc0a03869..275a47981900 100644 --- a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_sync.py +++ b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iam -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START iam_v1_generated_IAM_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iam_admin_v1 diff --git a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_async.py b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_async.py index 248d850e6364..f4efd400eaa1 100644 --- a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_async.py +++ b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iam -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START iam_v1_generated_IAM_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iam_admin_v1 diff --git a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_sync.py b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_sync.py index 417a7ea978a0..9441abaf2baf 100644 --- a/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_sync.py +++ b/packages/google-cloud-iam/samples/generated_samples/iam_v1_generated_iam_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iam -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START iam_v1_generated_IAM_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iam_admin_v1 diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_admin_v1/test_iam.py b/packages/google-cloud-iam/tests/unit/gapic/iam_admin_v1/test_iam.py index acd8ded8eeb7..3129f68ab770 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_admin_v1/test_iam.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_admin_v1/test_iam.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,20 +39,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.iam_admin_v1.services.iam import ( IAMAsyncClient, @@ -855,10 +860,9 @@ def test_iam_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -903,10 +907,9 @@ def test_iam_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -942,10 +945,9 @@ def test_iam_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1166,13 +1168,13 @@ def test_iam_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1288,9 +1290,9 @@ def test_list_service_accounts_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_service_accounts - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_service_accounts] = ( + mock_rpc + ) request = {} client.list_service_accounts(request) @@ -1847,9 +1849,9 @@ def test_get_service_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_service_account] = ( + mock_rpc + ) request = {} client.get_service_account(request) @@ -2219,9 +2221,9 @@ def test_create_service_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_service_account] = ( + mock_rpc + ) request = {} client.create_service_account(request) @@ -2621,9 +2623,9 @@ def test_update_service_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_service_account] = ( + mock_rpc + ) request = {} client.update_service_account(request) @@ -2903,9 +2905,9 @@ def test_patch_service_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.patch_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.patch_service_account] = ( + mock_rpc + ) request = {} client.patch_service_account(request) @@ -3170,9 +3172,9 @@ def test_delete_service_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_service_account] = ( + mock_rpc + ) request = {} client.delete_service_account(request) @@ -3750,9 +3752,9 @@ def test_enable_service_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.enable_service_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.enable_service_account] = ( + mock_rpc + ) request = {} client.enable_service_account(request) @@ -7995,9 +7997,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -8369,9 +8371,9 @@ def test_query_grantable_roles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_grantable_roles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_grantable_roles] = ( + mock_rpc + ) request = {} client.query_grantable_roles(request) @@ -13017,11 +13019,14 @@ def test_iam_base_transport(): def test_iam_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.iam_admin_v1.services.iam.transports.IAMTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.iam_admin_v1.services.iam.transports.IAMTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IAMTransport( @@ -13038,9 +13043,12 @@ def test_iam_base_transport_with_credentials_file(): def test_iam_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.iam_admin_v1.services.iam.transports.IAMTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.iam_admin_v1.services.iam.transports.IAMTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IAMTransport() @@ -13111,11 +13119,12 @@ def test_iam_transport_auth_gdch_credentials(transport_class): def test_iam_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_credentials_v1/test_iam_credentials.py b/packages/google-cloud-iam/tests/unit/gapic/iam_credentials_v1/test_iam_credentials.py index ec664bf9557b..6d4f72e3dbd1 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_credentials_v1/test_iam_credentials.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_credentials_v1/test_iam_credentials.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.iam_credentials_v1.services.iam_credentials import ( IAMCredentialsAsyncClient, @@ -946,10 +951,9 @@ def test_iam_credentials_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -994,10 +998,9 @@ def test_iam_credentials_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1036,9 @@ def test_iam_credentials_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1279,13 +1281,13 @@ def test_iam_credentials_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1399,9 +1401,9 @@ def test_generate_access_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_access_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_access_token] = ( + mock_rpc + ) request = {} client.generate_access_token(request) @@ -1770,9 +1772,9 @@ def test_generate_id_token_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_id_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_id_token] = ( + mock_rpc + ) request = {} client.generate_id_token(request) @@ -2766,9 +2768,9 @@ def test_generate_access_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_access_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_access_token] = ( + mock_rpc + ) request = {} client.generate_access_token(request) @@ -2965,9 +2967,9 @@ def test_generate_id_token_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_id_token - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_id_token] = ( + mock_rpc + ) request = {} client.generate_id_token(request) @@ -3869,8 +3871,9 @@ def test_generate_access_token_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3933,18 +3936,20 @@ def test_generate_access_token_rest_interceptors(null_interceptor): ) client = IAMCredentialsClient(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.IAMCredentialsRestInterceptor, "post_generate_access_token" - ) as post, mock.patch.object( - transports.IAMCredentialsRestInterceptor, - "post_generate_access_token_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IAMCredentialsRestInterceptor, "pre_generate_access_token" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IAMCredentialsRestInterceptor, "post_generate_access_token" + ) as post, + mock.patch.object( + transports.IAMCredentialsRestInterceptor, + "post_generate_access_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IAMCredentialsRestInterceptor, "pre_generate_access_token" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3997,8 +4002,9 @@ def test_generate_id_token_rest_bad_request(request_type=common.GenerateIdTokenR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4061,17 +4067,20 @@ def test_generate_id_token_rest_interceptors(null_interceptor): ) client = IAMCredentialsClient(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.IAMCredentialsRestInterceptor, "post_generate_id_token" - ) as post, mock.patch.object( - transports.IAMCredentialsRestInterceptor, "post_generate_id_token_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IAMCredentialsRestInterceptor, "pre_generate_id_token" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IAMCredentialsRestInterceptor, "post_generate_id_token" + ) as post, + mock.patch.object( + transports.IAMCredentialsRestInterceptor, + "post_generate_id_token_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IAMCredentialsRestInterceptor, "pre_generate_id_token" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4122,8 +4131,9 @@ def test_sign_blob_rest_bad_request(request_type=common.SignBlobRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4188,17 +4198,19 @@ def test_sign_blob_rest_interceptors(null_interceptor): ) client = IAMCredentialsClient(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.IAMCredentialsRestInterceptor, "post_sign_blob" - ) as post, mock.patch.object( - transports.IAMCredentialsRestInterceptor, "post_sign_blob_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IAMCredentialsRestInterceptor, "pre_sign_blob" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IAMCredentialsRestInterceptor, "post_sign_blob" + ) as post, + mock.patch.object( + transports.IAMCredentialsRestInterceptor, "post_sign_blob_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IAMCredentialsRestInterceptor, "pre_sign_blob" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4247,8 +4259,9 @@ def test_sign_jwt_rest_bad_request(request_type=common.SignJwtRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4313,17 +4326,19 @@ def test_sign_jwt_rest_interceptors(null_interceptor): ) client = IAMCredentialsClient(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.IAMCredentialsRestInterceptor, "post_sign_jwt" - ) as post, mock.patch.object( - transports.IAMCredentialsRestInterceptor, "post_sign_jwt_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IAMCredentialsRestInterceptor, "pre_sign_jwt" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IAMCredentialsRestInterceptor, "post_sign_jwt" + ) as post, + mock.patch.object( + transports.IAMCredentialsRestInterceptor, "post_sign_jwt_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.IAMCredentialsRestInterceptor, "pre_sign_jwt" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4510,11 +4525,14 @@ def test_iam_credentials_base_transport(): def test_iam_credentials_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.iam_credentials_v1.services.iam_credentials.transports.IAMCredentialsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.iam_credentials_v1.services.iam_credentials.transports.IAMCredentialsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IAMCredentialsTransport( @@ -4531,9 +4549,12 @@ def test_iam_credentials_base_transport_with_credentials_file(): def test_iam_credentials_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.iam_credentials_v1.services.iam_credentials.transports.IAMCredentialsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.iam_credentials_v1.services.iam_credentials.transports.IAMCredentialsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IAMCredentialsTransport() @@ -4605,11 +4626,12 @@ def test_iam_credentials_transport_auth_gdch_credentials(transport_class): def test_iam_credentials_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_v2/test_policies.py b/packages/google-cloud-iam/tests/unit/gapic/iam_v2/test_policies.py index f3a7ad862952..434541bdc6e3 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_v2/test_policies.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_v2/test_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +57,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.iam_v2.services.policies import ( PoliciesAsyncClient, @@ -70,8 +70,7 @@ pagers, transports, ) -from google.cloud.iam_v2.types import deny -from google.cloud.iam_v2.types import policy +from google.cloud.iam_v2.types import deny, policy from google.cloud.iam_v2.types import policy as gi_policy CRED_INFO_JSON = { @@ -921,10 +920,9 @@ def test_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +967,9 @@ def test_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1005,9 @@ def test_policies_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1236,13 +1232,13 @@ def test_policies_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4316,8 +4312,9 @@ def test_list_policies_rest_bad_request(request_type=policy.ListPoliciesRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4378,17 +4375,19 @@ def test_list_policies_rest_interceptors(null_interceptor): ) client = PoliciesClient(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.PoliciesRestInterceptor, "post_list_policies" - ) as post, mock.patch.object( - transports.PoliciesRestInterceptor, "post_list_policies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PoliciesRestInterceptor, "pre_list_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PoliciesRestInterceptor, "post_list_policies" + ) as post, + mock.patch.object( + transports.PoliciesRestInterceptor, "post_list_policies_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PoliciesRestInterceptor, "pre_list_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4439,8 +4438,9 @@ def test_get_policy_rest_bad_request(request_type=policy.GetPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4511,17 +4511,17 @@ def test_get_policy_rest_interceptors(null_interceptor): ) client = PoliciesClient(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.PoliciesRestInterceptor, "post_get_policy" - ) as post, mock.patch.object( - transports.PoliciesRestInterceptor, "post_get_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PoliciesRestInterceptor, "pre_get_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PoliciesRestInterceptor, "post_get_policy" + ) as post, + mock.patch.object( + transports.PoliciesRestInterceptor, "post_get_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.PoliciesRestInterceptor, "pre_get_policy") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4570,8 +4570,9 @@ def test_create_policy_rest_bad_request(request_type=gi_policy.CreatePolicyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4734,19 +4735,20 @@ def test_create_policy_rest_interceptors(null_interceptor): ) client = PoliciesClient(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.PoliciesRestInterceptor, "post_create_policy" - ) as post, mock.patch.object( - transports.PoliciesRestInterceptor, "post_create_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PoliciesRestInterceptor, "pre_create_policy" - ) as pre: + 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.PoliciesRestInterceptor, "post_create_policy" + ) as post, + mock.patch.object( + transports.PoliciesRestInterceptor, "post_create_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PoliciesRestInterceptor, "pre_create_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4795,8 +4797,9 @@ def test_update_policy_rest_bad_request(request_type=policy.UpdatePolicyRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4959,19 +4962,20 @@ def test_update_policy_rest_interceptors(null_interceptor): ) client = PoliciesClient(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.PoliciesRestInterceptor, "post_update_policy" - ) as post, mock.patch.object( - transports.PoliciesRestInterceptor, "post_update_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PoliciesRestInterceptor, "pre_update_policy" - ) as pre: + 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.PoliciesRestInterceptor, "post_update_policy" + ) as post, + mock.patch.object( + transports.PoliciesRestInterceptor, "post_update_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PoliciesRestInterceptor, "pre_update_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5020,8 +5024,9 @@ def test_delete_policy_rest_bad_request(request_type=policy.DeletePolicyRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5076,19 +5081,20 @@ def test_delete_policy_rest_interceptors(null_interceptor): ) client = PoliciesClient(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.PoliciesRestInterceptor, "post_delete_policy" - ) as post, mock.patch.object( - transports.PoliciesRestInterceptor, "post_delete_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PoliciesRestInterceptor, "pre_delete_policy" - ) as pre: + 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.PoliciesRestInterceptor, "post_delete_policy" + ) as post, + mock.patch.object( + transports.PoliciesRestInterceptor, "post_delete_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.PoliciesRestInterceptor, "pre_delete_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5141,8 +5147,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5377,11 +5384,14 @@ def test_policies_base_transport(): def test_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.iam_v2.services.policies.transports.PoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.iam_v2.services.policies.transports.PoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PoliciesTransport( @@ -5398,9 +5408,12 @@ def test_policies_base_transport_with_credentials_file(): def test_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.iam_v2.services.policies.transports.PoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.iam_v2.services.policies.transports.PoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PoliciesTransport() @@ -5472,11 +5485,12 @@ def test_policies_transport_auth_gdch_credentials(transport_class): def test_policies_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_v2beta/test_policies.py b/packages/google-cloud-iam/tests/unit/gapic/iam_v2beta/test_policies.py index 4362f62bee35..ab876dfeb672 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_v2beta/test_policies.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_v2beta/test_policies.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,17 +53,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.iam_v2beta.services.policies import ( PoliciesAsyncClient, @@ -66,8 +66,7 @@ pagers, transports, ) -from google.cloud.iam_v2beta.types import deny -from google.cloud.iam_v2beta.types import policy +from google.cloud.iam_v2beta.types import deny, policy from google.cloud.iam_v2beta.types import policy as gi_policy CRED_INFO_JSON = { @@ -902,10 +901,9 @@ def test_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -950,10 +948,9 @@ def test_policies_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -989,10 +986,9 @@ def test_policies_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1215,13 +1211,13 @@ def test_policies_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3434,11 +3430,14 @@ def test_policies_base_transport(): def test_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.iam_v2beta.services.policies.transports.PoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.iam_v2beta.services.policies.transports.PoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PoliciesTransport( @@ -3455,9 +3454,12 @@ def test_policies_base_transport_with_credentials_file(): def test_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.iam_v2beta.services.policies.transports.PoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.iam_v2beta.services.policies.transports.PoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PoliciesTransport() @@ -3528,11 +3530,12 @@ def test_policies_transport_auth_gdch_credentials(transport_class): def test_policies_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_policy_bindings.py b/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_policy_bindings.py index 44db696b24e7..41814ee596c0 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_policy_bindings.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_policy_bindings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.iam_v3.services.policy_bindings import ( PolicyBindingsAsyncClient, @@ -964,10 +964,9 @@ def test_policy_bindings_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1011,9 @@ def test_policy_bindings_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1051,10 +1049,9 @@ def test_policy_bindings_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1297,13 +1294,13 @@ def test_policy_bindings_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1416,9 +1413,9 @@ def test_create_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_policy_binding] = ( + mock_rpc + ) request = {} client.create_policy_binding(request) @@ -1800,9 +1797,9 @@ def test_get_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_policy_binding] = ( + mock_rpc + ) request = {} client.get_policy_binding(request) @@ -2151,9 +2148,9 @@ def test_update_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_policy_binding] = ( + mock_rpc + ) request = {} client.update_policy_binding(request) @@ -2510,9 +2507,9 @@ def test_delete_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_policy_binding] = ( + mock_rpc + ) request = {} client.delete_policy_binding(request) @@ -2863,9 +2860,9 @@ def test_list_policy_bindings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_policy_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_policy_bindings] = ( + mock_rpc + ) request = {} client.list_policy_bindings(request) @@ -3909,9 +3906,9 @@ def test_create_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_policy_binding] = ( + mock_rpc + ) request = {} client.create_policy_binding(request) @@ -4129,9 +4126,9 @@ def test_get_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_policy_binding] = ( + mock_rpc + ) request = {} client.get_policy_binding(request) @@ -4314,9 +4311,9 @@ def test_update_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_policy_binding] = ( + mock_rpc + ) request = {} client.update_policy_binding(request) @@ -4513,9 +4510,9 @@ def test_delete_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_policy_binding] = ( + mock_rpc + ) request = {} client.delete_policy_binding(request) @@ -4711,9 +4708,9 @@ def test_list_policy_bindings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_policy_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_policy_bindings] = ( + mock_rpc + ) request = {} client.list_policy_bindings(request) @@ -5701,8 +5698,9 @@ def test_create_policy_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5847,20 +5845,21 @@ def test_create_policy_binding_rest_interceptors(null_interceptor): ) client = PolicyBindingsClient(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.PolicyBindingsRestInterceptor, "post_create_policy_binding" - ) as post, mock.patch.object( - transports.PolicyBindingsRestInterceptor, - "post_create_policy_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PolicyBindingsRestInterceptor, "pre_create_policy_binding" - ) as pre: + 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.PolicyBindingsRestInterceptor, "post_create_policy_binding" + ) as post, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_create_policy_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "pre_create_policy_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5913,8 +5912,9 @@ def test_get_policy_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5992,18 +5992,20 @@ def test_get_policy_binding_rest_interceptors(null_interceptor): ) client = PolicyBindingsClient(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.PolicyBindingsRestInterceptor, "post_get_policy_binding" - ) as post, mock.patch.object( - transports.PolicyBindingsRestInterceptor, - "post_get_policy_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PolicyBindingsRestInterceptor, "pre_get_policy_binding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "post_get_policy_binding" + ) as post, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_get_policy_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "pre_get_policy_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6065,8 +6067,9 @@ def test_update_policy_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6215,20 +6218,21 @@ def test_update_policy_binding_rest_interceptors(null_interceptor): ) client = PolicyBindingsClient(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.PolicyBindingsRestInterceptor, "post_update_policy_binding" - ) as post, mock.patch.object( - transports.PolicyBindingsRestInterceptor, - "post_update_policy_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PolicyBindingsRestInterceptor, "pre_update_policy_binding" - ) as pre: + 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.PolicyBindingsRestInterceptor, "post_update_policy_binding" + ) as post, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_update_policy_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "pre_update_policy_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6281,8 +6285,9 @@ def test_delete_policy_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6339,20 +6344,21 @@ def test_delete_policy_binding_rest_interceptors(null_interceptor): ) client = PolicyBindingsClient(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.PolicyBindingsRestInterceptor, "post_delete_policy_binding" - ) as post, mock.patch.object( - transports.PolicyBindingsRestInterceptor, - "post_delete_policy_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PolicyBindingsRestInterceptor, "pre_delete_policy_binding" - ) as pre: + 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.PolicyBindingsRestInterceptor, "post_delete_policy_binding" + ) as post, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_delete_policy_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "pre_delete_policy_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6405,8 +6411,9 @@ def test_list_policy_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6471,18 +6478,20 @@ def test_list_policy_bindings_rest_interceptors(null_interceptor): ) client = PolicyBindingsClient(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.PolicyBindingsRestInterceptor, "post_list_policy_bindings" - ) as post, mock.patch.object( - transports.PolicyBindingsRestInterceptor, - "post_list_policy_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PolicyBindingsRestInterceptor, "pre_list_policy_bindings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "post_list_policy_bindings" + ) as post, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_list_policy_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "pre_list_policy_bindings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6540,8 +6549,9 @@ def test_search_target_policy_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6606,18 +6616,22 @@ def test_search_target_policy_bindings_rest_interceptors(null_interceptor): ) client = PolicyBindingsClient(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.PolicyBindingsRestInterceptor, "post_search_target_policy_bindings" - ) as post, mock.patch.object( - transports.PolicyBindingsRestInterceptor, - "post_search_target_policy_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PolicyBindingsRestInterceptor, "pre_search_target_policy_bindings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_search_target_policy_bindings", + ) as post, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_search_target_policy_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "pre_search_target_policy_bindings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6679,8 +6693,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6948,11 +6963,14 @@ def test_policy_bindings_base_transport(): def test_policy_bindings_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.iam_v3.services.policy_bindings.transports.PolicyBindingsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.iam_v3.services.policy_bindings.transports.PolicyBindingsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyBindingsTransport( @@ -6969,9 +6987,12 @@ def test_policy_bindings_base_transport_with_credentials_file(): def test_policy_bindings_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.iam_v3.services.policy_bindings.transports.PolicyBindingsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.iam_v3.services.policy_bindings.transports.PolicyBindingsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyBindingsTransport() @@ -7043,11 +7064,12 @@ def test_policy_bindings_transport_auth_gdch_credentials(transport_class): def test_policy_bindings_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_principal_access_boundary_policies.py b/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_principal_access_boundary_policies.py index b8e5923c4be8..0a8b7d21caad 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_principal_access_boundary_policies.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_v3/test_principal_access_boundary_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.iam_v3.services.principal_access_boundary_policies import ( PrincipalAccessBoundaryPoliciesAsyncClient, @@ -1078,10 +1078,9 @@ def test_principal_access_boundary_policies_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1126,10 +1125,9 @@ def test_principal_access_boundary_policies_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1165,10 +1163,9 @@ def test_principal_access_boundary_policies_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1429,13 +1426,13 @@ def test_principal_access_boundary_policies_client_create_channel_credentials_fi ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1485,9 +1482,7 @@ def test_create_principal_access_boundary_policy(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -1520,11 +1515,12 @@ def test_create_principal_access_boundary_policy_non_empty_request_with_auto_pop client.create_principal_access_boundary_policy(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest( - parent="parent_value", - principal_access_boundary_policy_id="principal_access_boundary_policy_id_value", + assert ( + args[0] + == principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest( + parent="parent_value", + principal_access_boundary_policy_id="principal_access_boundary_policy_id_value", + ) ) @@ -1647,9 +1643,7 @@ async def test_create_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -1668,9 +1662,7 @@ def test_create_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() request.parent = "parent_value" @@ -1702,9 +1694,7 @@ async def test_create_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() request.parent = "parent_value" @@ -1887,9 +1877,7 @@ def test_get_principal_access_boundary_policy(request_type, transport: str = "gr # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -1928,10 +1916,11 @@ def test_get_principal_access_boundary_policy_non_empty_request_with_auto_popula client.get_principal_access_boundary_policy(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest( - name="name_value", + assert ( + args[0] + == principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest( + name="name_value", + ) ) @@ -2049,9 +2038,7 @@ async def test_get_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2077,9 +2064,7 @@ def test_get_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -2113,9 +2098,7 @@ async def test_get_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -2259,9 +2242,7 @@ def test_update_principal_access_boundary_policy(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2279,9 +2260,7 @@ def test_update_principal_access_boundary_policy_non_empty_request_with_auto_pop # Populate all string fields in the request which are not UUID4 # since we want to check that UUID4 are populated automatically # if they meet the requirements of AIP 4235. - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -2418,9 +2397,7 @@ async def test_update_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2439,9 +2416,7 @@ def test_update_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() request.principal_access_boundary_policy.name = "name_value" @@ -2473,9 +2448,7 @@ async def test_update_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() request.principal_access_boundary_policy.name = "name_value" @@ -2641,9 +2614,7 @@ def test_delete_principal_access_boundary_policy(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2676,11 +2647,12 @@ def test_delete_principal_access_boundary_policy_non_empty_request_with_auto_pop client.delete_principal_access_boundary_policy(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest( - name="name_value", - etag="etag_value", + assert ( + args[0] + == principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest( + name="name_value", + etag="etag_value", + ) ) @@ -2803,9 +2775,7 @@ async def test_delete_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2824,9 +2794,7 @@ def test_delete_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -2858,9 +2826,7 @@ async def test_delete_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -3002,9 +2968,7 @@ def test_list_principal_access_boundary_policies(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3038,11 +3002,12 @@ def test_list_principal_access_boundary_policies_non_empty_request_with_auto_pop client.list_principal_access_boundary_policies(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest( - parent="parent_value", - page_token="page_token_value", + assert ( + args[0] + == principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest( + parent="parent_value", + page_token="page_token_value", + ) ) @@ -3157,9 +3122,7 @@ async def test_list_principal_access_boundary_policies_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3179,9 +3142,7 @@ def test_list_principal_access_boundary_policies_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() request.parent = "parent_value" @@ -3189,9 +3150,7 @@ def test_list_principal_access_boundary_policies_field_headers(): with mock.patch.object( type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() client.list_principal_access_boundary_policies(request) # Establish that the underlying gRPC stub method was called. @@ -3215,9 +3174,7 @@ async def test_list_principal_access_boundary_policies_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() request.parent = "parent_value" @@ -3253,9 +3210,7 @@ def test_list_principal_access_boundary_policies_flattened(): type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.list_principal_access_boundary_policies( @@ -3296,9 +3251,7 @@ async def test_list_principal_access_boundary_policies_flattened_async(): type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() @@ -3582,9 +3535,7 @@ def test_search_principal_access_boundary_policy_bindings( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3619,11 +3570,12 @@ def test_search_principal_access_boundary_policy_bindings_non_empty_request_with client.search_principal_access_boundary_policy_bindings(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest( - name="name_value", - page_token="page_token_value", + assert ( + args[0] + == principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest( + name="name_value", + page_token="page_token_value", + ) ) @@ -3741,9 +3693,7 @@ async def test_search_principal_access_boundary_policy_bindings_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3765,9 +3715,7 @@ def test_search_principal_access_boundary_policy_bindings_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() request.name = "name_value" @@ -3776,9 +3724,7 @@ def test_search_principal_access_boundary_policy_bindings_field_headers(): type(client.transport.search_principal_access_boundary_policy_bindings), "__call__", ) as call: - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() client.search_principal_access_boundary_policy_bindings(request) # Establish that the underlying gRPC stub method was called. @@ -3802,9 +3748,7 @@ async def test_search_principal_access_boundary_policy_bindings_field_headers_as # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() request.name = "name_value" @@ -3842,9 +3786,7 @@ def test_search_principal_access_boundary_policy_bindings_flattened(): "__call__", ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.search_principal_access_boundary_policy_bindings( @@ -3886,9 +3828,7 @@ async def test_search_principal_access_boundary_policy_bindings_flattened_async( "__call__", ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() @@ -4216,9 +4156,9 @@ def test_create_principal_access_boundary_policy_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "principalAccessBoundaryPolicyId" - ] = "principal_access_boundary_policy_id_value" + jsonified_request["principalAccessBoundaryPolicyId"] = ( + "principal_access_boundary_policy_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -5091,9 +5031,7 @@ def test_list_principal_access_boundary_policies_rest_required_fields( request = request_type(**request_init) # Designate an appropriate value for the returned response. - return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() # Mock the http request call within the method and fake a response. with mock.patch.object(Session, "request") as req: # We need to mock transcode() because providing default values @@ -5158,9 +5096,7 @@ def test_list_principal_access_boundary_policies_rest_flattened(): # 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 = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() # get arguments that satisfy an http rule for this method sample_request = {"parent": "organizations/sample1/locations/sample2"} @@ -5379,9 +5315,7 @@ def test_search_principal_access_boundary_policy_bindings_rest_required_fields( request = request_type(**request_init) # Designate an appropriate value for the returned response. - return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() # Mock the http request call within the method and fake a response. with mock.patch.object(Session, "request") as req: # We need to mock transcode() because providing default values @@ -5446,9 +5380,7 @@ def test_search_principal_access_boundary_policy_bindings_rest_flattened(): # 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 = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() # get arguments that satisfy an http rule for this method sample_request = { @@ -5705,9 +5637,7 @@ def test_create_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5732,9 +5662,7 @@ def test_get_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5757,9 +5685,7 @@ def test_update_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5782,9 +5708,7 @@ def test_delete_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5801,17 +5725,13 @@ def test_list_principal_access_boundary_policies_empty_call_grpc(): with mock.patch.object( type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() client.list_principal_access_boundary_policies(request=None) # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request_msg = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request_msg @@ -5829,17 +5749,13 @@ def test_search_principal_access_boundary_policy_bindings_empty_call_grpc(): type(client.transport.search_principal_access_boundary_policy_bindings), "__call__", ) as call: - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() client.search_principal_access_boundary_policy_bindings(request=None) # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request_msg = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request_msg @@ -5880,9 +5796,7 @@ async def test_create_principal_access_boundary_policy_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5914,9 +5828,7 @@ async def test_get_principal_access_boundary_policy_empty_call_grpc_asyncio(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5943,9 +5855,7 @@ async def test_update_principal_access_boundary_policy_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5972,9 +5882,7 @@ async def test_delete_principal_access_boundary_policy_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -6003,9 +5911,7 @@ async def test_list_principal_access_boundary_policies_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request_msg = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request_msg @@ -6035,9 +5941,7 @@ async def test_search_principal_access_boundary_policy_bindings_empty_call_grpc_ # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request_msg = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request_msg @@ -6060,8 +5964,9 @@ def test_create_principal_access_boundary_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6212,22 +6117,23 @@ def test_create_principal_access_boundary_policy_rest_interceptors(null_intercep ) client = PrincipalAccessBoundaryPoliciesClient(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.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_create_principal_access_boundary_policy", - ) as post, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_create_principal_access_boundary_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "pre_create_principal_access_boundary_policy", - ) as pre: + 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.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_create_principal_access_boundary_policy", + ) as post, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_create_principal_access_boundary_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "pre_create_principal_access_boundary_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6247,9 +6153,7 @@ def test_create_principal_access_boundary_policy_rest_interceptors(null_intercep return_value = json_format.MessageToJson(operations_pb2.Operation()) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6284,8 +6188,9 @@ def test_get_principal_access_boundary_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6365,20 +6270,22 @@ def test_get_principal_access_boundary_policy_rest_interceptors(null_interceptor ) client = PrincipalAccessBoundaryPoliciesClient(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.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_get_principal_access_boundary_policy", - ) as post, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_get_principal_access_boundary_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "pre_get_principal_access_boundary_policy", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_get_principal_access_boundary_policy", + ) as post, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_get_principal_access_boundary_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "pre_get_principal_access_boundary_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6400,9 +6307,7 @@ def test_get_principal_access_boundary_policy_rest_interceptors(null_interceptor ) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6444,8 +6349,9 @@ def test_update_principal_access_boundary_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6600,22 +6506,23 @@ def test_update_principal_access_boundary_policy_rest_interceptors(null_intercep ) client = PrincipalAccessBoundaryPoliciesClient(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.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_update_principal_access_boundary_policy", - ) as post, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_update_principal_access_boundary_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "pre_update_principal_access_boundary_policy", - ) as pre: + 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.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_update_principal_access_boundary_policy", + ) as post, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_update_principal_access_boundary_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "pre_update_principal_access_boundary_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6635,9 +6542,7 @@ def test_update_principal_access_boundary_policy_rest_interceptors(null_intercep return_value = json_format.MessageToJson(operations_pb2.Operation()) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6672,8 +6577,9 @@ def test_delete_principal_access_boundary_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6732,22 +6638,23 @@ def test_delete_principal_access_boundary_policy_rest_interceptors(null_intercep ) client = PrincipalAccessBoundaryPoliciesClient(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.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_delete_principal_access_boundary_policy", - ) as post, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_delete_principal_access_boundary_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "pre_delete_principal_access_boundary_policy", - ) as pre: + 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.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_delete_principal_access_boundary_policy", + ) as post, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_delete_principal_access_boundary_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "pre_delete_principal_access_boundary_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6767,9 +6674,7 @@ def test_delete_principal_access_boundary_policy_rest_interceptors(null_intercep return_value = json_format.MessageToJson(operations_pb2.Operation()) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6802,8 +6707,9 @@ def test_list_principal_access_boundary_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6868,20 +6774,22 @@ def test_list_principal_access_boundary_policies_rest_interceptors(null_intercep ) client = PrincipalAccessBoundaryPoliciesClient(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.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_list_principal_access_boundary_policies", - ) as post, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_list_principal_access_boundary_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "pre_list_principal_access_boundary_policies", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_list_principal_access_boundary_policies", + ) as post, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_list_principal_access_boundary_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "pre_list_principal_access_boundary_policies", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6903,17 +6811,13 @@ def test_list_principal_access_boundary_policies_rest_interceptors(null_intercep ) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), ] pre.return_value = request, metadata - post.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + post.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() post_with_metadata.return_value = ( principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse(), metadata, @@ -6945,8 +6849,9 @@ def test_search_principal_access_boundary_policy_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7017,20 +6922,22 @@ def test_search_principal_access_boundary_policy_bindings_rest_interceptors( ) client = PrincipalAccessBoundaryPoliciesClient(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.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_search_principal_access_boundary_policy_bindings", - ) as post, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_search_principal_access_boundary_policy_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "pre_search_principal_access_boundary_policy_bindings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_search_principal_access_boundary_policy_bindings", + ) as post, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_search_principal_access_boundary_policy_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "pre_search_principal_access_boundary_policy_bindings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7052,17 +6959,13 @@ def test_search_principal_access_boundary_policy_bindings_rest_interceptors( ) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), ] pre.return_value = request, metadata - post.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + post.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() post_with_metadata.return_value = ( principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse(), metadata, @@ -7094,8 +6997,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7167,9 +7071,7 @@ def test_create_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7191,9 +7093,7 @@ def test_get_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7215,9 +7115,7 @@ def test_update_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7239,9 +7137,7 @@ def test_delete_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7263,9 +7159,7 @@ def test_list_principal_access_boundary_policies_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request_msg = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request_msg @@ -7288,9 +7182,7 @@ def test_search_principal_access_boundary_policy_bindings_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request_msg = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request_msg @@ -7376,11 +7268,14 @@ def test_principal_access_boundary_policies_base_transport(): def test_principal_access_boundary_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.iam_v3.services.principal_access_boundary_policies.transports.PrincipalAccessBoundaryPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.iam_v3.services.principal_access_boundary_policies.transports.PrincipalAccessBoundaryPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PrincipalAccessBoundaryPoliciesTransport( @@ -7397,9 +7292,12 @@ def test_principal_access_boundary_policies_base_transport_with_credentials_file def test_principal_access_boundary_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.iam_v3.services.principal_access_boundary_policies.transports.PrincipalAccessBoundaryPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.iam_v3.services.principal_access_boundary_policies.transports.PrincipalAccessBoundaryPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PrincipalAccessBoundaryPoliciesTransport() @@ -7478,11 +7376,12 @@ def test_principal_access_boundary_policies_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_policy_bindings.py b/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_policy_bindings.py index 46649853bc65..0550d388c308 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_policy_bindings.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_policy_bindings.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.iam_v3beta.services.policy_bindings import ( PolicyBindingsAsyncClient, @@ -964,10 +964,9 @@ def test_policy_bindings_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1011,9 @@ def test_policy_bindings_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1051,10 +1049,9 @@ def test_policy_bindings_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1297,13 +1294,13 @@ def test_policy_bindings_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1416,9 +1413,9 @@ def test_create_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_policy_binding] = ( + mock_rpc + ) request = {} client.create_policy_binding(request) @@ -1800,9 +1797,9 @@ def test_get_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_policy_binding] = ( + mock_rpc + ) request = {} client.get_policy_binding(request) @@ -2151,9 +2148,9 @@ def test_update_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_policy_binding] = ( + mock_rpc + ) request = {} client.update_policy_binding(request) @@ -2510,9 +2507,9 @@ def test_delete_policy_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_policy_binding] = ( + mock_rpc + ) request = {} client.delete_policy_binding(request) @@ -2863,9 +2860,9 @@ def test_list_policy_bindings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_policy_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_policy_bindings] = ( + mock_rpc + ) request = {} client.list_policy_bindings(request) @@ -3909,9 +3906,9 @@ def test_create_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_policy_binding] = ( + mock_rpc + ) request = {} client.create_policy_binding(request) @@ -4129,9 +4126,9 @@ def test_get_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_policy_binding] = ( + mock_rpc + ) request = {} client.get_policy_binding(request) @@ -4314,9 +4311,9 @@ def test_update_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_policy_binding] = ( + mock_rpc + ) request = {} client.update_policy_binding(request) @@ -4513,9 +4510,9 @@ def test_delete_policy_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_policy_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_policy_binding] = ( + mock_rpc + ) request = {} client.delete_policy_binding(request) @@ -4711,9 +4708,9 @@ def test_list_policy_bindings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_policy_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_policy_bindings] = ( + mock_rpc + ) request = {} client.list_policy_bindings(request) @@ -5701,8 +5698,9 @@ def test_create_policy_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5847,20 +5845,21 @@ def test_create_policy_binding_rest_interceptors(null_interceptor): ) client = PolicyBindingsClient(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.PolicyBindingsRestInterceptor, "post_create_policy_binding" - ) as post, mock.patch.object( - transports.PolicyBindingsRestInterceptor, - "post_create_policy_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PolicyBindingsRestInterceptor, "pre_create_policy_binding" - ) as pre: + 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.PolicyBindingsRestInterceptor, "post_create_policy_binding" + ) as post, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_create_policy_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "pre_create_policy_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5913,8 +5912,9 @@ def test_get_policy_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5992,18 +5992,20 @@ def test_get_policy_binding_rest_interceptors(null_interceptor): ) client = PolicyBindingsClient(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.PolicyBindingsRestInterceptor, "post_get_policy_binding" - ) as post, mock.patch.object( - transports.PolicyBindingsRestInterceptor, - "post_get_policy_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PolicyBindingsRestInterceptor, "pre_get_policy_binding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "post_get_policy_binding" + ) as post, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_get_policy_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "pre_get_policy_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6065,8 +6067,9 @@ def test_update_policy_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6215,20 +6218,21 @@ def test_update_policy_binding_rest_interceptors(null_interceptor): ) client = PolicyBindingsClient(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.PolicyBindingsRestInterceptor, "post_update_policy_binding" - ) as post, mock.patch.object( - transports.PolicyBindingsRestInterceptor, - "post_update_policy_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PolicyBindingsRestInterceptor, "pre_update_policy_binding" - ) as pre: + 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.PolicyBindingsRestInterceptor, "post_update_policy_binding" + ) as post, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_update_policy_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "pre_update_policy_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6281,8 +6285,9 @@ def test_delete_policy_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6339,20 +6344,21 @@ def test_delete_policy_binding_rest_interceptors(null_interceptor): ) client = PolicyBindingsClient(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.PolicyBindingsRestInterceptor, "post_delete_policy_binding" - ) as post, mock.patch.object( - transports.PolicyBindingsRestInterceptor, - "post_delete_policy_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PolicyBindingsRestInterceptor, "pre_delete_policy_binding" - ) as pre: + 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.PolicyBindingsRestInterceptor, "post_delete_policy_binding" + ) as post, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_delete_policy_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "pre_delete_policy_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6405,8 +6411,9 @@ def test_list_policy_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6471,18 +6478,20 @@ def test_list_policy_bindings_rest_interceptors(null_interceptor): ) client = PolicyBindingsClient(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.PolicyBindingsRestInterceptor, "post_list_policy_bindings" - ) as post, mock.patch.object( - transports.PolicyBindingsRestInterceptor, - "post_list_policy_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PolicyBindingsRestInterceptor, "pre_list_policy_bindings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "post_list_policy_bindings" + ) as post, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_list_policy_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, "pre_list_policy_bindings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6540,8 +6549,9 @@ def test_search_target_policy_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6606,18 +6616,22 @@ def test_search_target_policy_bindings_rest_interceptors(null_interceptor): ) client = PolicyBindingsClient(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.PolicyBindingsRestInterceptor, "post_search_target_policy_bindings" - ) as post, mock.patch.object( - transports.PolicyBindingsRestInterceptor, - "post_search_target_policy_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PolicyBindingsRestInterceptor, "pre_search_target_policy_bindings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_search_target_policy_bindings", + ) as post, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "post_search_target_policy_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PolicyBindingsRestInterceptor, + "pre_search_target_policy_bindings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6679,8 +6693,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6948,11 +6963,14 @@ def test_policy_bindings_base_transport(): def test_policy_bindings_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.iam_v3beta.services.policy_bindings.transports.PolicyBindingsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.iam_v3beta.services.policy_bindings.transports.PolicyBindingsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyBindingsTransport( @@ -6969,9 +6987,12 @@ def test_policy_bindings_base_transport_with_credentials_file(): def test_policy_bindings_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.iam_v3beta.services.policy_bindings.transports.PolicyBindingsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.iam_v3beta.services.policy_bindings.transports.PolicyBindingsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyBindingsTransport() @@ -7043,11 +7064,12 @@ def test_policy_bindings_transport_auth_gdch_credentials(transport_class): def test_policy_bindings_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_principal_access_boundary_policies.py b/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_principal_access_boundary_policies.py index 36bcf5a9c3ee..61bac7eee164 100644 --- a/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_principal_access_boundary_policies.py +++ b/packages/google-cloud-iam/tests/unit/gapic/iam_v3beta/test_principal_access_boundary_policies.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.iam_v3beta.services.principal_access_boundary_policies import ( PrincipalAccessBoundaryPoliciesAsyncClient, @@ -1078,10 +1078,9 @@ def test_principal_access_boundary_policies_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1126,10 +1125,9 @@ def test_principal_access_boundary_policies_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1165,10 +1163,9 @@ def test_principal_access_boundary_policies_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1429,13 +1426,13 @@ def test_principal_access_boundary_policies_client_create_channel_credentials_fi ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1485,9 +1482,7 @@ def test_create_principal_access_boundary_policy(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -1520,11 +1515,12 @@ def test_create_principal_access_boundary_policy_non_empty_request_with_auto_pop client.create_principal_access_boundary_policy(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest( - parent="parent_value", - principal_access_boundary_policy_id="principal_access_boundary_policy_id_value", + assert ( + args[0] + == principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest( + parent="parent_value", + principal_access_boundary_policy_id="principal_access_boundary_policy_id_value", + ) ) @@ -1647,9 +1643,7 @@ async def test_create_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -1668,9 +1662,7 @@ def test_create_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() request.parent = "parent_value" @@ -1702,9 +1694,7 @@ async def test_create_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() request.parent = "parent_value" @@ -1887,9 +1877,7 @@ def test_get_principal_access_boundary_policy(request_type, transport: str = "gr # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -1928,10 +1916,11 @@ def test_get_principal_access_boundary_policy_non_empty_request_with_auto_popula client.get_principal_access_boundary_policy(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest( - name="name_value", + assert ( + args[0] + == principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest( + name="name_value", + ) ) @@ -2049,9 +2038,7 @@ async def test_get_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2077,9 +2064,7 @@ def test_get_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -2113,9 +2098,7 @@ async def test_get_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -2259,9 +2242,7 @@ def test_update_principal_access_boundary_policy(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2279,9 +2260,7 @@ def test_update_principal_access_boundary_policy_non_empty_request_with_auto_pop # Populate all string fields in the request which are not UUID4 # since we want to check that UUID4 are populated automatically # if they meet the requirements of AIP 4235. - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -2418,9 +2397,7 @@ async def test_update_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2439,9 +2416,7 @@ def test_update_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() request.principal_access_boundary_policy.name = "name_value" @@ -2473,9 +2448,7 @@ async def test_update_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() request.principal_access_boundary_policy.name = "name_value" @@ -2641,9 +2614,7 @@ def test_delete_principal_access_boundary_policy(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2676,11 +2647,12 @@ def test_delete_principal_access_boundary_policy_non_empty_request_with_auto_pop client.delete_principal_access_boundary_policy(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest( - name="name_value", - etag="etag_value", + assert ( + args[0] + == principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest( + name="name_value", + etag="etag_value", + ) ) @@ -2803,9 +2775,7 @@ async def test_delete_principal_access_boundary_policy_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -2824,9 +2794,7 @@ def test_delete_principal_access_boundary_policy_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -2858,9 +2826,7 @@ async def test_delete_principal_access_boundary_policy_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() request.name = "name_value" @@ -3002,9 +2968,7 @@ def test_list_principal_access_boundary_policies(request_type, transport: str = # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3038,11 +3002,12 @@ def test_list_principal_access_boundary_policies_non_empty_request_with_auto_pop client.list_principal_access_boundary_policies(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest( - parent="parent_value", - page_token="page_token_value", + assert ( + args[0] + == principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest( + parent="parent_value", + page_token="page_token_value", + ) ) @@ -3157,9 +3122,7 @@ async def test_list_principal_access_boundary_policies_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3179,9 +3142,7 @@ def test_list_principal_access_boundary_policies_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() request.parent = "parent_value" @@ -3189,9 +3150,7 @@ def test_list_principal_access_boundary_policies_field_headers(): with mock.patch.object( type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() client.list_principal_access_boundary_policies(request) # Establish that the underlying gRPC stub method was called. @@ -3215,9 +3174,7 @@ async def test_list_principal_access_boundary_policies_field_headers_async(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() request.parent = "parent_value" @@ -3253,9 +3210,7 @@ def test_list_principal_access_boundary_policies_flattened(): type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.list_principal_access_boundary_policies( @@ -3296,9 +3251,7 @@ async def test_list_principal_access_boundary_policies_flattened_async(): type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() @@ -3582,9 +3535,7 @@ def test_search_principal_access_boundary_policy_bindings( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) == 1 _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3619,11 +3570,12 @@ def test_search_principal_access_boundary_policy_bindings_non_empty_request_with client.search_principal_access_boundary_policy_bindings(request=request) call.assert_called() _, args, _ = call.mock_calls[0] - assert args[ - 0 - ] == principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest( - name="name_value", - page_token="page_token_value", + assert ( + args[0] + == principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest( + name="name_value", + page_token="page_token_value", + ) ) @@ -3741,9 +3693,7 @@ async def test_search_principal_access_boundary_policy_bindings_async( # Establish that the underlying gRPC stub method was called. assert len(call.mock_calls) _, args, _ = call.mock_calls[0] - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request # Establish that the response is the type that we expect. @@ -3765,9 +3715,7 @@ def test_search_principal_access_boundary_policy_bindings_field_headers(): # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() request.name = "name_value" @@ -3776,9 +3724,7 @@ def test_search_principal_access_boundary_policy_bindings_field_headers(): type(client.transport.search_principal_access_boundary_policy_bindings), "__call__", ) as call: - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() client.search_principal_access_boundary_policy_bindings(request) # Establish that the underlying gRPC stub method was called. @@ -3802,9 +3748,7 @@ async def test_search_principal_access_boundary_policy_bindings_field_headers_as # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() request.name = "name_value" @@ -3842,9 +3786,7 @@ def test_search_principal_access_boundary_policy_bindings_flattened(): "__call__", ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.search_principal_access_boundary_policy_bindings( @@ -3886,9 +3828,7 @@ async def test_search_principal_access_boundary_policy_bindings_flattened_async( "__call__", ) as call: # Designate an appropriate return value for the call. - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() @@ -4216,9 +4156,9 @@ def test_create_principal_access_boundary_policy_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "principalAccessBoundaryPolicyId" - ] = "principal_access_boundary_policy_id_value" + jsonified_request["principalAccessBoundaryPolicyId"] = ( + "principal_access_boundary_policy_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -5091,9 +5031,7 @@ def test_list_principal_access_boundary_policies_rest_required_fields( request = request_type(**request_init) # Designate an appropriate value for the returned response. - return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() # Mock the http request call within the method and fake a response. with mock.patch.object(Session, "request") as req: # We need to mock transcode() because providing default values @@ -5158,9 +5096,7 @@ def test_list_principal_access_boundary_policies_rest_flattened(): # 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 = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() # get arguments that satisfy an http rule for this method sample_request = {"parent": "organizations/sample1/locations/sample2"} @@ -5379,9 +5315,7 @@ def test_search_principal_access_boundary_policy_bindings_rest_required_fields( request = request_type(**request_init) # Designate an appropriate value for the returned response. - return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() # Mock the http request call within the method and fake a response. with mock.patch.object(Session, "request") as req: # We need to mock transcode() because providing default values @@ -5446,9 +5380,7 @@ def test_search_principal_access_boundary_policy_bindings_rest_flattened(): # 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 = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() # get arguments that satisfy an http rule for this method sample_request = { @@ -5705,9 +5637,7 @@ def test_create_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5732,9 +5662,7 @@ def test_get_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5757,9 +5685,7 @@ def test_update_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5782,9 +5708,7 @@ def test_delete_principal_access_boundary_policy_empty_call_grpc(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5801,17 +5725,13 @@ def test_list_principal_access_boundary_policies_empty_call_grpc(): with mock.patch.object( type(client.transport.list_principal_access_boundary_policies), "__call__" ) as call: - call.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + call.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() client.list_principal_access_boundary_policies(request=None) # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request_msg = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request_msg @@ -5829,17 +5749,13 @@ def test_search_principal_access_boundary_policy_bindings_empty_call_grpc(): type(client.transport.search_principal_access_boundary_policy_bindings), "__call__", ) as call: - call.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + call.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() client.search_principal_access_boundary_policy_bindings(request=None) # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request_msg = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request_msg @@ -5880,9 +5796,7 @@ async def test_create_principal_access_boundary_policy_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5914,9 +5828,7 @@ async def test_get_principal_access_boundary_policy_empty_call_grpc_asyncio(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5943,9 +5855,7 @@ async def test_update_principal_access_boundary_policy_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -5972,9 +5882,7 @@ async def test_delete_principal_access_boundary_policy_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -6003,9 +5911,7 @@ async def test_list_principal_access_boundary_policies_empty_call_grpc_asyncio() # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request_msg = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request_msg @@ -6035,9 +5941,7 @@ async def test_search_principal_access_boundary_policy_bindings_empty_call_grpc_ # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request_msg = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request_msg @@ -6060,8 +5964,9 @@ def test_create_principal_access_boundary_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6212,22 +6117,23 @@ def test_create_principal_access_boundary_policy_rest_interceptors(null_intercep ) client = PrincipalAccessBoundaryPoliciesClient(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.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_create_principal_access_boundary_policy", - ) as post, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_create_principal_access_boundary_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "pre_create_principal_access_boundary_policy", - ) as pre: + 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.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_create_principal_access_boundary_policy", + ) as post, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_create_principal_access_boundary_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "pre_create_principal_access_boundary_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6247,9 +6153,7 @@ def test_create_principal_access_boundary_policy_rest_interceptors(null_intercep return_value = json_format.MessageToJson(operations_pb2.Operation()) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6284,8 +6188,9 @@ def test_get_principal_access_boundary_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6365,20 +6270,22 @@ def test_get_principal_access_boundary_policy_rest_interceptors(null_interceptor ) client = PrincipalAccessBoundaryPoliciesClient(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.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_get_principal_access_boundary_policy", - ) as post, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_get_principal_access_boundary_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "pre_get_principal_access_boundary_policy", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_get_principal_access_boundary_policy", + ) as post, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_get_principal_access_boundary_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "pre_get_principal_access_boundary_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6400,9 +6307,7 @@ def test_get_principal_access_boundary_policy_rest_interceptors(null_interceptor ) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6444,8 +6349,9 @@ def test_update_principal_access_boundary_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6600,22 +6506,23 @@ def test_update_principal_access_boundary_policy_rest_interceptors(null_intercep ) client = PrincipalAccessBoundaryPoliciesClient(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.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_update_principal_access_boundary_policy", - ) as post, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_update_principal_access_boundary_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "pre_update_principal_access_boundary_policy", - ) as pre: + 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.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_update_principal_access_boundary_policy", + ) as post, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_update_principal_access_boundary_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "pre_update_principal_access_boundary_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6635,9 +6542,7 @@ def test_update_principal_access_boundary_policy_rest_interceptors(null_intercep return_value = json_format.MessageToJson(operations_pb2.Operation()) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6672,8 +6577,9 @@ def test_delete_principal_access_boundary_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6732,22 +6638,23 @@ def test_delete_principal_access_boundary_policy_rest_interceptors(null_intercep ) client = PrincipalAccessBoundaryPoliciesClient(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.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_delete_principal_access_boundary_policy", - ) as post, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_delete_principal_access_boundary_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "pre_delete_principal_access_boundary_policy", - ) as pre: + 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.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_delete_principal_access_boundary_policy", + ) as post, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_delete_principal_access_boundary_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "pre_delete_principal_access_boundary_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6767,9 +6674,7 @@ def test_delete_principal_access_boundary_policy_rest_interceptors(null_intercep return_value = json_format.MessageToJson(operations_pb2.Operation()) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), @@ -6802,8 +6707,9 @@ def test_list_principal_access_boundary_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6868,20 +6774,22 @@ def test_list_principal_access_boundary_policies_rest_interceptors(null_intercep ) client = PrincipalAccessBoundaryPoliciesClient(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.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_list_principal_access_boundary_policies", - ) as post, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_list_principal_access_boundary_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "pre_list_principal_access_boundary_policies", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_list_principal_access_boundary_policies", + ) as post, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_list_principal_access_boundary_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "pre_list_principal_access_boundary_policies", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6903,17 +6811,13 @@ def test_list_principal_access_boundary_policies_rest_interceptors(null_intercep ) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), ] pre.return_value = request, metadata - post.return_value = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() - ) + post.return_value = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse() post_with_metadata.return_value = ( principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesResponse(), metadata, @@ -6945,8 +6849,9 @@ def test_search_principal_access_boundary_policy_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7017,20 +6922,22 @@ def test_search_principal_access_boundary_policy_bindings_rest_interceptors( ) client = PrincipalAccessBoundaryPoliciesClient(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.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_search_principal_access_boundary_policy_bindings", - ) as post, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "post_search_principal_access_boundary_policy_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrincipalAccessBoundaryPoliciesRestInterceptor, - "pre_search_principal_access_boundary_policy_bindings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_search_principal_access_boundary_policy_bindings", + ) as post, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "post_search_principal_access_boundary_policy_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrincipalAccessBoundaryPoliciesRestInterceptor, + "pre_search_principal_access_boundary_policy_bindings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7052,17 +6959,13 @@ def test_search_principal_access_boundary_policy_bindings_rest_interceptors( ) req.return_value.content = return_value - request = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() metadata = [ ("key", "val"), ("cephalopod", "squid"), ] pre.return_value = request, metadata - post.return_value = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() - ) + post.return_value = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse() post_with_metadata.return_value = ( principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsResponse(), metadata, @@ -7094,8 +6997,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7167,9 +7071,7 @@ def test_create_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.CreatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7191,9 +7093,7 @@ def test_get_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.GetPrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7215,9 +7115,7 @@ def test_update_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.UpdatePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7239,9 +7137,7 @@ def test_delete_principal_access_boundary_policy_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() - ) + request_msg = principal_access_boundary_policies_service.DeletePrincipalAccessBoundaryPolicyRequest() assert args[0] == request_msg @@ -7263,9 +7159,7 @@ def test_list_principal_access_boundary_policies_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() - ) + request_msg = principal_access_boundary_policies_service.ListPrincipalAccessBoundaryPoliciesRequest() assert args[0] == request_msg @@ -7288,9 +7182,7 @@ def test_search_principal_access_boundary_policy_bindings_empty_call_rest(): # Establish that the underlying stub method was called. call.assert_called() _, args, _ = call.mock_calls[0] - request_msg = ( - principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() - ) + request_msg = principal_access_boundary_policies_service.SearchPrincipalAccessBoundaryPolicyBindingsRequest() assert args[0] == request_msg @@ -7376,11 +7268,14 @@ def test_principal_access_boundary_policies_base_transport(): def test_principal_access_boundary_policies_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.iam_v3beta.services.principal_access_boundary_policies.transports.PrincipalAccessBoundaryPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.iam_v3beta.services.principal_access_boundary_policies.transports.PrincipalAccessBoundaryPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PrincipalAccessBoundaryPoliciesTransport( @@ -7397,9 +7292,12 @@ def test_principal_access_boundary_policies_base_transport_with_credentials_file def test_principal_access_boundary_policies_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.iam_v3beta.services.principal_access_boundary_policies.transports.PrincipalAccessBoundaryPoliciesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.iam_v3beta.services.principal_access_boundary_policies.transports.PrincipalAccessBoundaryPoliciesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PrincipalAccessBoundaryPoliciesTransport() @@ -7478,11 +7376,12 @@ def test_principal_access_boundary_policies_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-iap/docs/conf.py b/packages/google-cloud-iap/docs/conf.py index 741fd38a002d..e7b86fb553fc 100644 --- a/packages/google-cloud-iap/docs/conf.py +++ b/packages/google-cloud-iap/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-iap documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/__init__.py b/packages/google-cloud-iap/google/cloud/iap_v1/__init__.py index 094c4d798e0c..6eced41f6386 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/__init__.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.identity_aware_proxy_admin_service import ( IdentityAwareProxyAdminServiceAsyncClient, IdentityAwareProxyAdminServiceClient, diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py index 8c3c38eaa00f..4b0fdfb4dd55 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iap_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.iap_v1.services.identity_aware_proxy_admin_service import pagers from google.cloud.iap_v1.types import service @@ -138,7 +138,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IdentityAwareProxyAdminServiceAsyncClient: The constructed client. """ - return IdentityAwareProxyAdminServiceClient.from_service_account_info.__func__(IdentityAwareProxyAdminServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IdentityAwareProxyAdminServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + IdentityAwareProxyAdminServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +159,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IdentityAwareProxyAdminServiceAsyncClient: The constructed client. """ - return IdentityAwareProxyAdminServiceClient.from_service_account_file.__func__(IdentityAwareProxyAdminServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IdentityAwareProxyAdminServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + IdentityAwareProxyAdminServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -192,7 +202,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return IdentityAwareProxyAdminServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return IdentityAwareProxyAdminServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> IdentityAwareProxyAdminServiceTransport: @@ -339,7 +351,7 @@ async def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import iap_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_set_iam_policy(): # Create a client @@ -458,7 +470,7 @@ async def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import iap_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_get_iam_policy(): # Create a client @@ -577,7 +589,7 @@ async def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import iap_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore async def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py index f2ed79d8df73..ab2e92b8e836 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iap_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.iap_v1.services.identity_aware_proxy_admin_service import pagers from google.cloud.iap_v1.types import service @@ -85,13 +85,11 @@ class IdentityAwareProxyAdminServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IdentityAwareProxyAdminServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IdentityAwareProxyAdminServiceTransport]] _transport_registry["grpc"] = IdentityAwareProxyAdminServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = IdentityAwareProxyAdminServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + IdentityAwareProxyAdminServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = IdentityAwareProxyAdminServiceRestTransport def get_transport_class( @@ -660,11 +658,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IdentityAwareProxyAdminServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IdentityAwareProxyAdminServiceClient._read_environment_variables() + ) self._client_cert_source = ( IdentityAwareProxyAdminServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -705,8 +701,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IdentityAwareProxyAdminServiceTransport, transport) self._api_endpoint = self._transport.host @@ -800,7 +795,7 @@ def set_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import iap_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_set_iam_policy(): # Create a client @@ -918,7 +913,7 @@ def get_iam_policy( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import iap_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_get_iam_policy(): # Create a client @@ -1036,7 +1031,7 @@ def test_iam_permissions( # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import iap_v1 - from google.iam.v1 import iam_policy_pb2 # type: ignore + import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore def sample_test_iam_permissions(): # Create a client diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/pagers.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/pagers.py index 81da253c87c8..6b8e85bb728b 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/pagers.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/__init__.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/__init__.py index d60fc8b6a338..cbd5c1a134f8 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/__init__.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[IdentityAwareProxyAdminServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[IdentityAwareProxyAdminServiceTransport]] _transport_registry["grpc"] = IdentityAwareProxyAdminServiceGrpcTransport _transport_registry["grpc_asyncio"] = IdentityAwareProxyAdminServiceGrpcAsyncIOTransport _transport_registry["rest"] = IdentityAwareProxyAdminServiceRestTransport diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py index 05e9eaa38915..8e00a0db708b 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.iap_v1 import gapic_version as package_version from google.cloud.iap_v1.types import service diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc.py index 49494d65a0e3..b3c9d4c0e2ec 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.iap_v1.types import service @@ -494,12 +494,12 @@ def validate_iap_attribute_expression( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "validate_iap_attribute_expression" not in self._stubs: - self._stubs[ - "validate_iap_attribute_expression" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyAdminService/ValidateIapAttributeExpression", - request_serializer=service.ValidateIapAttributeExpressionRequest.serialize, - response_deserializer=service.ValidateIapAttributeExpressionResponse.deserialize, + self._stubs["validate_iap_attribute_expression"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyAdminService/ValidateIapAttributeExpression", + request_serializer=service.ValidateIapAttributeExpressionRequest.serialize, + response_deserializer=service.ValidateIapAttributeExpressionResponse.deserialize, + ) ) return self._stubs["validate_iap_attribute_expression"] diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py index ef21745943c7..844c72bd568a 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iap_v1.types import service @@ -502,12 +502,12 @@ def validate_iap_attribute_expression( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "validate_iap_attribute_expression" not in self._stubs: - self._stubs[ - "validate_iap_attribute_expression" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyAdminService/ValidateIapAttributeExpression", - request_serializer=service.ValidateIapAttributeExpressionRequest.serialize, - response_deserializer=service.ValidateIapAttributeExpressionResponse.deserialize, + self._stubs["validate_iap_attribute_expression"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyAdminService/ValidateIapAttributeExpression", + request_serializer=service.ValidateIapAttributeExpressionRequest.serialize, + response_deserializer=service.ValidateIapAttributeExpressionResponse.deserialize, + ) ) return self._stubs["validate_iap_attribute_expression"] diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest.py index 7ec5e7b8f4bf..2b911fe856d0 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -813,9 +813,7 @@ def __call__( A TunnelDestGroup. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseCreateTunnelDestGroup._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseCreateTunnelDestGroup._get_http_options() request, metadata = self._interceptor.pre_create_tunnel_dest_group( request, metadata @@ -963,9 +961,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseDeleteTunnelDestGroup._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseDeleteTunnelDestGroup._get_http_options() request, metadata = self._interceptor.pre_delete_tunnel_dest_group( request, metadata @@ -987,7 +983,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1152,9 +1148,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1304,9 +1298,7 @@ def __call__( The IAP configurable settings. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetIapSettings._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetIapSettings._get_http_options() request, metadata = self._interceptor.pre_get_iap_settings( request, metadata @@ -1453,9 +1445,7 @@ def __call__( A TunnelDestGroup. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetTunnelDestGroup._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseGetTunnelDestGroup._get_http_options() request, metadata = self._interceptor.pre_get_tunnel_dest_group( request, metadata @@ -1604,9 +1594,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseListTunnelDestGroups._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseListTunnelDestGroups._get_http_options() request, metadata = self._interceptor.pre_list_tunnel_dest_groups( request, metadata @@ -1829,9 +1817,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -1984,9 +1970,7 @@ def __call__( Response message for ``TestIamPermissions`` method. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2138,9 +2122,7 @@ def __call__( The IAP configurable settings. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseUpdateIapSettings._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseUpdateIapSettings._get_http_options() request, metadata = self._interceptor.pre_update_iap_settings( request, metadata @@ -2293,9 +2275,7 @@ def __call__( A TunnelDestGroup. """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseUpdateTunnelDestGroup._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseUpdateTunnelDestGroup._get_http_options() request, metadata = self._interceptor.pre_update_tunnel_dest_group( request, metadata @@ -2451,9 +2431,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyAdminServiceRestTransport._BaseValidateIapAttributeExpression._get_http_options() - ) + http_options = _BaseIdentityAwareProxyAdminServiceRestTransport._BaseValidateIapAttributeExpression._get_http_options() request, metadata = self._interceptor.pre_validate_iap_attribute_expression( request, metadata @@ -2517,11 +2495,10 @@ def __call__( resp = self._interceptor.post_validate_iap_attribute_expression(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_validate_iap_attribute_expression_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_validate_iap_attribute_expression_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2642,7 +2619,9 @@ def validate_iap_attribute_expression( ]: # 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._ValidateIapAttributeExpression(self._session, self._host, self._interceptor) # type: ignore + return self._ValidateIapAttributeExpression( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest_base.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest_base.py index e0b7e6666e36..12ba3e312a08 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest_base.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_admin_service/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.iap_v1.types import service diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py index 509962b776e0..52cc0166b78f 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iap_v1 import gapic_version as package_version @@ -125,7 +125,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IdentityAwareProxyOAuthServiceAsyncClient: The constructed client. """ - return IdentityAwareProxyOAuthServiceClient.from_service_account_info.__func__(IdentityAwareProxyOAuthServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + IdentityAwareProxyOAuthServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + IdentityAwareProxyOAuthServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +146,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IdentityAwareProxyOAuthServiceAsyncClient: The constructed client. """ - return IdentityAwareProxyOAuthServiceClient.from_service_account_file.__func__(IdentityAwareProxyOAuthServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + IdentityAwareProxyOAuthServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + IdentityAwareProxyOAuthServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -179,7 +189,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return IdentityAwareProxyOAuthServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return IdentityAwareProxyOAuthServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> IdentityAwareProxyOAuthServiceTransport: diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py index d47945ba154c..72f267d7da1d 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.iap_v1 import gapic_version as package_version @@ -81,13 +81,11 @@ class IdentityAwareProxyOAuthServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IdentityAwareProxyOAuthServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IdentityAwareProxyOAuthServiceTransport]] _transport_registry["grpc"] = IdentityAwareProxyOAuthServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = IdentityAwareProxyOAuthServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + IdentityAwareProxyOAuthServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = IdentityAwareProxyOAuthServiceRestTransport def get_transport_class( @@ -618,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IdentityAwareProxyOAuthServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IdentityAwareProxyOAuthServiceClient._read_environment_variables() + ) self._client_cert_source = ( IdentityAwareProxyOAuthServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -663,8 +659,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IdentityAwareProxyOAuthServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/pagers.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/pagers.py index 82117175c84c..7f1cd784156b 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/pagers.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/__init__.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/__init__.py index 27b55fc6102e..088601776ffc 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/__init__.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[IdentityAwareProxyOAuthServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[IdentityAwareProxyOAuthServiceTransport]] _transport_registry["grpc"] = IdentityAwareProxyOAuthServiceGrpcTransport _transport_registry["grpc_asyncio"] = IdentityAwareProxyOAuthServiceGrpcAsyncIOTransport _transport_registry["rest"] = IdentityAwareProxyOAuthServiceRestTransport diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py index eb3d3fa7f1a1..eee9a40f6d8b 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.iap_v1 import gapic_version as package_version from google.cloud.iap_v1.types import service diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc.py index 5bcda4d42dd5..59388695ac51 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.iap_v1.types import service @@ -435,12 +435,12 @@ def create_identity_aware_proxy_client( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_identity_aware_proxy_client" not in self._stubs: - self._stubs[ - "create_identity_aware_proxy_client" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/CreateIdentityAwareProxyClient", - request_serializer=service.CreateIdentityAwareProxyClientRequest.serialize, - response_deserializer=service.IdentityAwareProxyClient.deserialize, + self._stubs["create_identity_aware_proxy_client"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/CreateIdentityAwareProxyClient", + request_serializer=service.CreateIdentityAwareProxyClientRequest.serialize, + response_deserializer=service.IdentityAwareProxyClient.deserialize, + ) ) return self._stubs["create_identity_aware_proxy_client"] @@ -467,12 +467,12 @@ def list_identity_aware_proxy_clients( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_identity_aware_proxy_clients" not in self._stubs: - self._stubs[ - "list_identity_aware_proxy_clients" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ListIdentityAwareProxyClients", - request_serializer=service.ListIdentityAwareProxyClientsRequest.serialize, - response_deserializer=service.ListIdentityAwareProxyClientsResponse.deserialize, + self._stubs["list_identity_aware_proxy_clients"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ListIdentityAwareProxyClients", + request_serializer=service.ListIdentityAwareProxyClientsRequest.serialize, + response_deserializer=service.ListIdentityAwareProxyClientsResponse.deserialize, + ) ) return self._stubs["list_identity_aware_proxy_clients"] @@ -499,12 +499,12 @@ def get_identity_aware_proxy_client( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_identity_aware_proxy_client" not in self._stubs: - self._stubs[ - "get_identity_aware_proxy_client" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/GetIdentityAwareProxyClient", - request_serializer=service.GetIdentityAwareProxyClientRequest.serialize, - response_deserializer=service.IdentityAwareProxyClient.deserialize, + self._stubs["get_identity_aware_proxy_client"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/GetIdentityAwareProxyClient", + request_serializer=service.GetIdentityAwareProxyClientRequest.serialize, + response_deserializer=service.IdentityAwareProxyClient.deserialize, + ) ) return self._stubs["get_identity_aware_proxy_client"] @@ -533,12 +533,12 @@ def reset_identity_aware_proxy_client_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "reset_identity_aware_proxy_client_secret" not in self._stubs: - self._stubs[ - "reset_identity_aware_proxy_client_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ResetIdentityAwareProxyClientSecret", - request_serializer=service.ResetIdentityAwareProxyClientSecretRequest.serialize, - response_deserializer=service.IdentityAwareProxyClient.deserialize, + self._stubs["reset_identity_aware_proxy_client_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ResetIdentityAwareProxyClientSecret", + request_serializer=service.ResetIdentityAwareProxyClientSecretRequest.serialize, + response_deserializer=service.IdentityAwareProxyClient.deserialize, + ) ) return self._stubs["reset_identity_aware_proxy_client_secret"] @@ -565,12 +565,12 @@ def delete_identity_aware_proxy_client( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_identity_aware_proxy_client" not in self._stubs: - self._stubs[ - "delete_identity_aware_proxy_client" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/DeleteIdentityAwareProxyClient", - request_serializer=service.DeleteIdentityAwareProxyClientRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_identity_aware_proxy_client"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/DeleteIdentityAwareProxyClient", + request_serializer=service.DeleteIdentityAwareProxyClientRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_identity_aware_proxy_client"] diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py index 7f86462bfbd3..e39dfe41ca15 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.iap_v1.types import service @@ -447,12 +447,12 @@ def create_identity_aware_proxy_client( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_identity_aware_proxy_client" not in self._stubs: - self._stubs[ - "create_identity_aware_proxy_client" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/CreateIdentityAwareProxyClient", - request_serializer=service.CreateIdentityAwareProxyClientRequest.serialize, - response_deserializer=service.IdentityAwareProxyClient.deserialize, + self._stubs["create_identity_aware_proxy_client"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/CreateIdentityAwareProxyClient", + request_serializer=service.CreateIdentityAwareProxyClientRequest.serialize, + response_deserializer=service.IdentityAwareProxyClient.deserialize, + ) ) return self._stubs["create_identity_aware_proxy_client"] @@ -479,12 +479,12 @@ def list_identity_aware_proxy_clients( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_identity_aware_proxy_clients" not in self._stubs: - self._stubs[ - "list_identity_aware_proxy_clients" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ListIdentityAwareProxyClients", - request_serializer=service.ListIdentityAwareProxyClientsRequest.serialize, - response_deserializer=service.ListIdentityAwareProxyClientsResponse.deserialize, + self._stubs["list_identity_aware_proxy_clients"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ListIdentityAwareProxyClients", + request_serializer=service.ListIdentityAwareProxyClientsRequest.serialize, + response_deserializer=service.ListIdentityAwareProxyClientsResponse.deserialize, + ) ) return self._stubs["list_identity_aware_proxy_clients"] @@ -512,12 +512,12 @@ def get_identity_aware_proxy_client( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_identity_aware_proxy_client" not in self._stubs: - self._stubs[ - "get_identity_aware_proxy_client" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/GetIdentityAwareProxyClient", - request_serializer=service.GetIdentityAwareProxyClientRequest.serialize, - response_deserializer=service.IdentityAwareProxyClient.deserialize, + self._stubs["get_identity_aware_proxy_client"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/GetIdentityAwareProxyClient", + request_serializer=service.GetIdentityAwareProxyClientRequest.serialize, + response_deserializer=service.IdentityAwareProxyClient.deserialize, + ) ) return self._stubs["get_identity_aware_proxy_client"] @@ -546,12 +546,12 @@ def reset_identity_aware_proxy_client_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "reset_identity_aware_proxy_client_secret" not in self._stubs: - self._stubs[ - "reset_identity_aware_proxy_client_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ResetIdentityAwareProxyClientSecret", - request_serializer=service.ResetIdentityAwareProxyClientSecretRequest.serialize, - response_deserializer=service.IdentityAwareProxyClient.deserialize, + self._stubs["reset_identity_aware_proxy_client_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/ResetIdentityAwareProxyClientSecret", + request_serializer=service.ResetIdentityAwareProxyClientSecretRequest.serialize, + response_deserializer=service.IdentityAwareProxyClient.deserialize, + ) ) return self._stubs["reset_identity_aware_proxy_client_secret"] @@ -580,12 +580,12 @@ def delete_identity_aware_proxy_client( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_identity_aware_proxy_client" not in self._stubs: - self._stubs[ - "delete_identity_aware_proxy_client" - ] = self._logged_channel.unary_unary( - "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/DeleteIdentityAwareProxyClient", - request_serializer=service.DeleteIdentityAwareProxyClientRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_identity_aware_proxy_client"] = ( + self._logged_channel.unary_unary( + "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/DeleteIdentityAwareProxyClient", + request_serializer=service.DeleteIdentityAwareProxyClientRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_identity_aware_proxy_client"] diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest.py index 2baf4124f97f..ee92c9e8a726 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -642,9 +642,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseCreateBrand._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseCreateBrand._get_http_options() request, metadata = self._interceptor.pre_create_brand(request, metadata) transcoded_request = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseCreateBrand._get_transcoded_request( @@ -801,15 +799,12 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseCreateIdentityAwareProxyClient._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseCreateIdentityAwareProxyClient._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_identity_aware_proxy_client( - request, metadata + request, metadata = ( + self._interceptor.pre_create_identity_aware_proxy_client( + request, metadata + ) ) transcoded_request = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseCreateIdentityAwareProxyClient._get_transcoded_request( http_options, request @@ -875,11 +870,10 @@ def __call__( resp = self._interceptor.post_create_identity_aware_proxy_client(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_identity_aware_proxy_client_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_identity_aware_proxy_client_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -961,15 +955,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseDeleteIdentityAwareProxyClient._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseDeleteIdentityAwareProxyClient._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_identity_aware_proxy_client( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_identity_aware_proxy_client( + request, metadata + ) ) transcoded_request = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseDeleteIdentityAwareProxyClient._get_transcoded_request( http_options, request @@ -988,7 +979,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1080,9 +1071,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseGetBrand._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseGetBrand._get_http_options() request, metadata = self._interceptor.pre_get_brand(request, metadata) transcoded_request = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseGetBrand._get_transcoded_request( @@ -1233,9 +1222,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseGetIdentityAwareProxyClient._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseGetIdentityAwareProxyClient._get_http_options() request, metadata = self._interceptor.pre_get_identity_aware_proxy_client( request, metadata @@ -1299,11 +1286,10 @@ def __call__( resp = self._interceptor.post_get_identity_aware_proxy_client(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_identity_aware_proxy_client_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_identity_aware_proxy_client_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1385,9 +1371,7 @@ def __call__( Response message for ListBrands. """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseListBrands._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseListBrands._get_http_options() request, metadata = self._interceptor.pre_list_brands(request, metadata) transcoded_request = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseListBrands._get_transcoded_request( @@ -1538,9 +1522,7 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseListIdentityAwareProxyClients._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseListIdentityAwareProxyClients._get_http_options() request, metadata = self._interceptor.pre_list_identity_aware_proxy_clients( request, metadata @@ -1604,11 +1586,10 @@ def __call__( resp = self._interceptor.post_list_identity_aware_proxy_clients(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_identity_aware_proxy_clients_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_identity_aware_proxy_clients_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1697,15 +1678,12 @@ def __call__( """ - http_options = ( - _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseResetIdentityAwareProxyClientSecret._get_http_options() - ) + http_options = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseResetIdentityAwareProxyClientSecret._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_reset_identity_aware_proxy_client_secret( - request, metadata + request, metadata = ( + self._interceptor.pre_reset_identity_aware_proxy_client_secret( + request, metadata + ) ) transcoded_request = _BaseIdentityAwareProxyOAuthServiceRestTransport._BaseResetIdentityAwareProxyClientSecret._get_transcoded_request( http_options, request @@ -1771,11 +1749,10 @@ def __call__( resp = self._interceptor.post_reset_identity_aware_proxy_client_secret(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_reset_identity_aware_proxy_client_secret_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_reset_identity_aware_proxy_client_secret_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1817,7 +1794,9 @@ def create_identity_aware_proxy_client( ]: # 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._CreateIdentityAwareProxyClient(self._session, self._host, self._interceptor) # type: ignore + return self._CreateIdentityAwareProxyClient( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_identity_aware_proxy_client( @@ -1825,7 +1804,9 @@ def delete_identity_aware_proxy_client( ) -> Callable[[service.DeleteIdentityAwareProxyClientRequest], empty_pb2.Empty]: # 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._DeleteIdentityAwareProxyClient(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteIdentityAwareProxyClient( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_brand(self) -> Callable[[service.GetBrandRequest], service.Brand]: @@ -1841,7 +1822,9 @@ def get_identity_aware_proxy_client( ]: # 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._GetIdentityAwareProxyClient(self._session, self._host, self._interceptor) # type: ignore + return self._GetIdentityAwareProxyClient( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_brands( @@ -1860,7 +1843,9 @@ def list_identity_aware_proxy_clients( ]: # 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._ListIdentityAwareProxyClients(self._session, self._host, self._interceptor) # type: ignore + return self._ListIdentityAwareProxyClients( + self._session, self._host, self._interceptor + ) # type: ignore @property def reset_identity_aware_proxy_client_secret( @@ -1871,7 +1856,9 @@ def reset_identity_aware_proxy_client_secret( ]: # 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._ResetIdentityAwareProxyClientSecret(self._session, self._host, self._interceptor) # type: ignore + return self._ResetIdentityAwareProxyClientSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest_base.py b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest_base.py index bf8f180cdf6f..27323320e2be 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest_base.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/services/identity_aware_proxy_o_auth_service/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.iap_v1.types import service diff --git a/packages/google-cloud-iap/google/cloud/iap_v1/types/service.py b/packages/google-cloud-iap/google/cloud/iap_v1/types/service.py index f9a9bc3bdbb1..7c5db05fc493 100644 --- a/packages/google-cloud-iap/google/cloud/iap_v1/types/service.py +++ b/packages/google-cloud-iap/google/cloud/iap_v1/types/service.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -376,6 +376,7 @@ class IdentitySource(proto.Enum): Use external identities set up on Google Cloud Workforce Identity Federation. """ + IDENTITY_SOURCE_UNSPECIFIED = 0 WORKFORCE_IDENTITY_FEDERATION = 3 @@ -584,6 +585,7 @@ class Method(proto.Enum): ENROLLED_SECOND_FACTORS (4): User can use any enabled 2nd factor. """ + METHOD_UNSPECIFIED = 0 LOGIN = 1 PASSWORD = 2 @@ -604,6 +606,7 @@ class PolicyType(proto.Enum): This policy acts as a default if no other reauth policy is set. """ + POLICY_TYPE_UNSPECIFIED = 0 MINIMUM = 1 DEFAULT = 2 @@ -835,6 +838,7 @@ class OutputCredentials(proto.Enum): Propagate attributes in the RCToken of the form: ``"additional_claims": { "my_attribute": ["value1", "value2"] }`` """ + OUTPUT_CREDENTIALS_UNSPECIFIED = 0 HEADER = 1 JWT = 2 @@ -1005,12 +1009,12 @@ class ListIdentityAwareProxyClientsResponse(proto.Message): def raw_page(self): return self - identity_aware_proxy_clients: MutableSequence[ - "IdentityAwareProxyClient" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="IdentityAwareProxyClient", + identity_aware_proxy_clients: MutableSequence["IdentityAwareProxyClient"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="IdentityAwareProxyClient", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-iap/noxfile.py b/packages/google-cloud-iap/noxfile.py index 6d4ee0ad99ff..84c51f82fd01 100644 --- a/packages/google-cloud-iap/noxfile.py +++ b/packages/google-cloud-iap/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_async.py b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_async.py index b59d35f10160..2127d4c72047 100644 --- a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_async.py +++ b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iap -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START iap_v1_generated_IdentityAwareProxyAdminService_GetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iap_v1 diff --git a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_sync.py b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_sync.py index 96517ebae257..d7d383abec87 100644 --- a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_sync.py +++ b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_get_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iap -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START iap_v1_generated_IdentityAwareProxyAdminService_GetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iap_v1 diff --git a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_async.py b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_async.py index ae459cfceb39..b6b4b9633050 100644 --- a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_async.py +++ b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iap -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START iap_v1_generated_IdentityAwareProxyAdminService_SetIamPolicy_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iap_v1 diff --git a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_sync.py b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_sync.py index 5b7c4df8caab..d684b6046c50 100644 --- a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_sync.py +++ b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_set_iam_policy_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iap -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START iap_v1_generated_IdentityAwareProxyAdminService_SetIamPolicy_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iap_v1 diff --git a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_async.py b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_async.py index 0453537241ae..910c8d75dd47 100644 --- a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_async.py +++ b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_async.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iap -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START iap_v1_generated_IdentityAwareProxyAdminService_TestIamPermissions_async] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iap_v1 diff --git a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_sync.py b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_sync.py index 28d3d21a8e38..b2743d9fd242 100644 --- a/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_sync.py +++ b/packages/google-cloud-iap/samples/generated_samples/iap_v1_generated_identity_aware_proxy_admin_service_test_iam_permissions_sync.py @@ -23,8 +23,6 @@ # python3 -m pip install google-cloud-iap -from google.iam.v1 import iam_policy_pb2 # type: ignore - # [START iap_v1_generated_IdentityAwareProxyAdminService_TestIamPermissions_sync] # This snippet has been automatically generated and should be regarded as a # code template only. @@ -33,6 +31,8 @@ # - It may require specifying regional endpoints when creating the service # client as shown in: # https://googleapis.dev/python/google-api-core/latest/client_options.html +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore + from google.cloud import iap_v1 diff --git a/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py b/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py index 18c517d40891..d4c5555ca346 100644 --- a/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py +++ b/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_admin_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,21 +43,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.iam_policy_pb2 as iam_policy_pb2 # type: ignore +import google.iam.v1.options_pb2 as options_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.iap_v1.services.identity_aware_proxy_admin_service import ( IdentityAwareProxyAdminServiceAsyncClient, @@ -1059,10 +1064,9 @@ def test_identity_aware_proxy_admin_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1107,10 +1111,9 @@ def test_identity_aware_proxy_admin_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1146,10 +1149,9 @@ def test_identity_aware_proxy_admin_service_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1410,13 +1412,13 @@ def test_identity_aware_proxy_admin_service_client_create_channel_credentials_fi ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2050,9 +2052,9 @@ def test_test_iam_permissions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -2319,9 +2321,9 @@ def test_get_iap_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_iap_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_iap_settings] = ( + mock_rpc + ) request = {} client.get_iap_settings(request) @@ -2562,9 +2564,9 @@ def test_update_iap_settings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_iap_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_iap_settings] = ( + mock_rpc + ) request = {} client.update_iap_settings(request) @@ -3991,9 +3993,9 @@ def test_get_tunnel_dest_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tunnel_dest_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tunnel_dest_group] = ( + mock_rpc + ) request = {} client.get_tunnel_dest_group(request) @@ -5200,9 +5202,9 @@ def test_test_iam_permissions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.test_iam_permissions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.test_iam_permissions] = ( + mock_rpc + ) request = {} client.test_iam_permissions(request) @@ -5333,9 +5335,9 @@ def test_get_iap_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_iap_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_iap_settings] = ( + mock_rpc + ) request = {} client.get_iap_settings(request) @@ -5457,9 +5459,9 @@ def test_update_iap_settings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_iap_settings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_iap_settings] = ( + mock_rpc + ) request = {} client.update_iap_settings(request) @@ -6207,9 +6209,9 @@ def test_get_tunnel_dest_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_tunnel_dest_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_tunnel_dest_group] = ( + mock_rpc + ) request = {} client.get_tunnel_dest_group(request) @@ -7435,8 +7437,9 @@ def test_set_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7498,18 +7501,22 @@ def test_set_iam_policy_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyAdminServiceClient(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.IdentityAwareProxyAdminServiceRestInterceptor, "post_set_iam_policy" - ) as post, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "post_set_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, "pre_set_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_set_iam_policy", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_set_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "pre_set_iam_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7560,8 +7567,9 @@ def test_get_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7623,18 +7631,22 @@ def test_get_iam_policy_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyAdminServiceClient(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.IdentityAwareProxyAdminServiceRestInterceptor, "post_get_iam_policy" - ) as post, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "post_get_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, "pre_get_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_get_iam_policy", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_get_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "pre_get_iam_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7685,8 +7697,9 @@ def test_test_iam_permissions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7746,20 +7759,22 @@ def test_test_iam_permissions_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyAdminServiceClient(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.IdentityAwareProxyAdminServiceRestInterceptor, - "post_test_iam_permissions", - ) as post, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "post_test_iam_permissions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "pre_test_iam_permissions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_test_iam_permissions", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_test_iam_permissions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "pre_test_iam_permissions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7813,8 +7828,9 @@ def test_get_iap_settings_rest_bad_request(request_type=service.GetIapSettingsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7877,19 +7893,22 @@ def test_get_iap_settings_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyAdminServiceClient(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.IdentityAwareProxyAdminServiceRestInterceptor, - "post_get_iap_settings", - ) as post, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "post_get_iap_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, "pre_get_iap_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_get_iap_settings", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_get_iap_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "pre_get_iap_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7940,8 +7959,9 @@ def test_update_iap_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8120,20 +8140,22 @@ def test_update_iap_settings_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyAdminServiceClient(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.IdentityAwareProxyAdminServiceRestInterceptor, - "post_update_iap_settings", - ) as post, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "post_update_iap_settings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "pre_update_iap_settings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_update_iap_settings", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_update_iap_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "pre_update_iap_settings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8186,8 +8208,9 @@ def test_validate_iap_attribute_expression_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8247,20 +8270,22 @@ def test_validate_iap_attribute_expression_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyAdminServiceClient(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.IdentityAwareProxyAdminServiceRestInterceptor, - "post_validate_iap_attribute_expression", - ) as post, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "post_validate_iap_attribute_expression_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "pre_validate_iap_attribute_expression", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_validate_iap_attribute_expression", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_validate_iap_attribute_expression_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "pre_validate_iap_attribute_expression", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8318,8 +8343,9 @@ def test_list_tunnel_dest_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8382,20 +8408,22 @@ def test_list_tunnel_dest_groups_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyAdminServiceClient(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.IdentityAwareProxyAdminServiceRestInterceptor, - "post_list_tunnel_dest_groups", - ) as post, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "post_list_tunnel_dest_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "pre_list_tunnel_dest_groups", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_list_tunnel_dest_groups", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_list_tunnel_dest_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "pre_list_tunnel_dest_groups", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8453,8 +8481,9 @@ def test_create_tunnel_dest_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8593,20 +8622,22 @@ def test_create_tunnel_dest_group_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyAdminServiceClient(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.IdentityAwareProxyAdminServiceRestInterceptor, - "post_create_tunnel_dest_group", - ) as post, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "post_create_tunnel_dest_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "pre_create_tunnel_dest_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_create_tunnel_dest_group", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_create_tunnel_dest_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "pre_create_tunnel_dest_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8661,8 +8692,9 @@ def test_get_tunnel_dest_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8731,20 +8763,22 @@ def test_get_tunnel_dest_group_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyAdminServiceClient(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.IdentityAwareProxyAdminServiceRestInterceptor, - "post_get_tunnel_dest_group", - ) as post, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "post_get_tunnel_dest_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "pre_get_tunnel_dest_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_get_tunnel_dest_group", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_get_tunnel_dest_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "pre_get_tunnel_dest_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8799,8 +8833,9 @@ def test_delete_tunnel_dest_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8859,14 +8894,14 @@ def test_delete_tunnel_dest_group_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyAdminServiceClient(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.IdentityAwareProxyAdminServiceRestInterceptor, - "pre_delete_tunnel_dest_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "pre_delete_tunnel_dest_group", + ) as pre, + ): pre.assert_not_called() pb_message = service.DeleteTunnelDestGroupRequest.pb( service.DeleteTunnelDestGroupRequest() @@ -8915,8 +8950,9 @@ def test_update_tunnel_dest_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9059,20 +9095,22 @@ def test_update_tunnel_dest_group_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyAdminServiceClient(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.IdentityAwareProxyAdminServiceRestInterceptor, - "post_update_tunnel_dest_group", - ) as post, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "post_update_tunnel_dest_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyAdminServiceRestInterceptor, - "pre_update_tunnel_dest_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_update_tunnel_dest_group", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "post_update_tunnel_dest_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyAdminServiceRestInterceptor, + "pre_update_tunnel_dest_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9420,11 +9458,14 @@ def test_identity_aware_proxy_admin_service_base_transport(): def test_identity_aware_proxy_admin_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.iap_v1.services.identity_aware_proxy_admin_service.transports.IdentityAwareProxyAdminServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.iap_v1.services.identity_aware_proxy_admin_service.transports.IdentityAwareProxyAdminServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IdentityAwareProxyAdminServiceTransport( @@ -9441,9 +9482,12 @@ def test_identity_aware_proxy_admin_service_base_transport_with_credentials_file def test_identity_aware_proxy_admin_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.iap_v1.services.identity_aware_proxy_admin_service.transports.IdentityAwareProxyAdminServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.iap_v1.services.identity_aware_proxy_admin_service.transports.IdentityAwareProxyAdminServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IdentityAwareProxyAdminServiceTransport() @@ -9522,11 +9566,12 @@ def test_identity_aware_proxy_admin_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py b/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py index fbb1dda8127a..648da1eabc0f 100644 --- a/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py +++ b/packages/google-cloud-iap/tests/unit/gapic/iap_v1/test_identity_aware_proxy_o_auth_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -1052,10 +1057,9 @@ def test_identity_aware_proxy_o_auth_service_client_get_mtls_endpoint_and_cert_s client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1104,9 @@ def test_identity_aware_proxy_o_auth_service_client_get_mtls_endpoint_and_cert_s client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1139,10 +1142,9 @@ def test_identity_aware_proxy_o_auth_service_client_get_mtls_endpoint_and_cert_s "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1403,13 +1405,13 @@ def test_identity_aware_proxy_o_auth_service_client_create_channel_credentials_f ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5312,8 +5314,9 @@ def test_list_brands_rest_bad_request(request_type=service.ListBrandsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5373,18 +5376,20 @@ def test_list_brands_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyOAuthServiceClient(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.IdentityAwareProxyOAuthServiceRestInterceptor, "post_list_brands" - ) as post, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, - "post_list_brands_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, "pre_list_brands" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, "post_list_brands" + ) as post, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "post_list_brands_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, "pre_list_brands" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5433,8 +5438,9 @@ def test_create_brand_rest_bad_request(request_type=service.CreateBrandRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5576,18 +5582,21 @@ def test_create_brand_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyOAuthServiceClient(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.IdentityAwareProxyOAuthServiceRestInterceptor, "post_create_brand" - ) as post, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, - "post_create_brand_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, "pre_create_brand" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "post_create_brand", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "post_create_brand_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, "pre_create_brand" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5636,8 +5645,9 @@ def test_get_brand_rest_bad_request(request_type=service.GetBrandRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5706,18 +5716,20 @@ def test_get_brand_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyOAuthServiceClient(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.IdentityAwareProxyOAuthServiceRestInterceptor, "post_get_brand" - ) as post, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, - "post_get_brand_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, "pre_get_brand" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, "post_get_brand" + ) as post, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "post_get_brand_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, "pre_get_brand" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5768,8 +5780,9 @@ def test_create_identity_aware_proxy_client_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5914,20 +5927,22 @@ def test_create_identity_aware_proxy_client_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyOAuthServiceClient(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.IdentityAwareProxyOAuthServiceRestInterceptor, - "post_create_identity_aware_proxy_client", - ) as post, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, - "post_create_identity_aware_proxy_client_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, - "pre_create_identity_aware_proxy_client", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "post_create_identity_aware_proxy_client", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "post_create_identity_aware_proxy_client_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "pre_create_identity_aware_proxy_client", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5982,8 +5997,9 @@ def test_list_identity_aware_proxy_clients_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6046,20 +6062,22 @@ def test_list_identity_aware_proxy_clients_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyOAuthServiceClient(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.IdentityAwareProxyOAuthServiceRestInterceptor, - "post_list_identity_aware_proxy_clients", - ) as post, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, - "post_list_identity_aware_proxy_clients_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, - "pre_list_identity_aware_proxy_clients", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "post_list_identity_aware_proxy_clients", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "post_list_identity_aware_proxy_clients_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "pre_list_identity_aware_proxy_clients", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6119,8 +6137,9 @@ def test_get_identity_aware_proxy_client_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6189,20 +6208,22 @@ def test_get_identity_aware_proxy_client_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyOAuthServiceClient(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.IdentityAwareProxyOAuthServiceRestInterceptor, - "post_get_identity_aware_proxy_client", - ) as post, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, - "post_get_identity_aware_proxy_client_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, - "pre_get_identity_aware_proxy_client", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "post_get_identity_aware_proxy_client", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "post_get_identity_aware_proxy_client_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "pre_get_identity_aware_proxy_client", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6259,8 +6280,9 @@ def test_reset_identity_aware_proxy_client_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6329,20 +6351,22 @@ def test_reset_identity_aware_proxy_client_secret_rest_interceptors(null_interce ) client = IdentityAwareProxyOAuthServiceClient(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.IdentityAwareProxyOAuthServiceRestInterceptor, - "post_reset_identity_aware_proxy_client_secret", - ) as post, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, - "post_reset_identity_aware_proxy_client_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityAwareProxyOAuthServiceRestInterceptor, - "pre_reset_identity_aware_proxy_client_secret", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "post_reset_identity_aware_proxy_client_secret", + ) as post, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "post_reset_identity_aware_proxy_client_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "pre_reset_identity_aware_proxy_client_secret", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6399,8 +6423,9 @@ def test_delete_identity_aware_proxy_client_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6459,14 +6484,14 @@ def test_delete_identity_aware_proxy_client_rest_interceptors(null_interceptor): ) client = IdentityAwareProxyOAuthServiceClient(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.IdentityAwareProxyOAuthServiceRestInterceptor, - "pre_delete_identity_aware_proxy_client", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityAwareProxyOAuthServiceRestInterceptor, + "pre_delete_identity_aware_proxy_client", + ) as pre, + ): pre.assert_not_called() pb_message = service.DeleteIdentityAwareProxyClientRequest.pb( service.DeleteIdentityAwareProxyClientRequest() @@ -6737,11 +6762,14 @@ def test_identity_aware_proxy_o_auth_service_base_transport(): def test_identity_aware_proxy_o_auth_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.iap_v1.services.identity_aware_proxy_o_auth_service.transports.IdentityAwareProxyOAuthServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.iap_v1.services.identity_aware_proxy_o_auth_service.transports.IdentityAwareProxyOAuthServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IdentityAwareProxyOAuthServiceTransport( @@ -6758,9 +6786,12 @@ def test_identity_aware_proxy_o_auth_service_base_transport_with_credentials_fil def test_identity_aware_proxy_o_auth_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.iap_v1.services.identity_aware_proxy_o_auth_service.transports.IdentityAwareProxyOAuthServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.iap_v1.services.identity_aware_proxy_o_auth_service.transports.IdentityAwareProxyOAuthServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IdentityAwareProxyOAuthServiceTransport() @@ -6839,11 +6870,12 @@ def test_identity_aware_proxy_o_auth_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-ids/docs/conf.py b/packages/google-cloud-ids/docs/conf.py index 96dc96dfb7bc..91d3868e7e5e 100644 --- a/packages/google-cloud-ids/docs/conf.py +++ b/packages/google-cloud-ids/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-ids documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/__init__.py b/packages/google-cloud-ids/google/cloud/ids_v1/__init__.py index 5bee133ded7e..ba8ca02fee5e 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/__init__.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.ids import IDSAsyncClient, IDSClient from .types.ids import ( CreateEndpointRequest, diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/async_client.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/async_client.py index 888a82317ed4..b00ec9efe4dd 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/async_client.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.ids_v1 import gapic_version as package_version @@ -45,10 +45,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.ids_v1.services.ids import pagers from google.cloud.ids_v1.types import ids @@ -109,7 +109,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IDSAsyncClient: The constructed client. """ - return IDSClient.from_service_account_info.__func__(IDSAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = IDSClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(IDSAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -125,7 +126,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IDSAsyncClient: The constructed client. """ - return IDSClient.from_service_account_file.__func__(IDSAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = IDSClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(IDSAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/client.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/client.py index 65c76c26c547..5e049f0af09c 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/client.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.ids_v1 import gapic_version as package_version @@ -62,10 +62,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.ids_v1.services.ids import pagers from google.cloud.ids_v1.types import ids @@ -624,11 +624,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IDSClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IDSClient._read_environment_variables() + ) self._client_cert_source = IDSClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -663,8 +661,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IDSTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/pagers.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/pagers.py index 61f86810a0a3..757794e65887 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/pagers.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/base.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/base.py index e6ebc6d5cbcf..098d712a5b77 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/base.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.ids_v1 import gapic_version as package_version from google.cloud.ids_v1.types import ids diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc.py index ec028e549559..4ab8c06401dc 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.ids_v1.types import ids diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc_asyncio.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc_asyncio.py index 4fbd7f8180fe..d245f05b5894 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc_asyncio.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.ids_v1.types import ids diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/rest.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/rest.py index c50b6240bc59..6beb4c6f2585 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/rest.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -517,7 +517,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -663,7 +663,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/types/ids.py b/packages/google-cloud-ids/google/cloud/ids_v1/types/ids.py index 773bc5003e0f..49fc48d2bcdb 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/types/ids.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/types/ids.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -85,6 +85,7 @@ class Severity(proto.Enum): CRITICAL (5): Critical severity alerts. """ + SEVERITY_UNSPECIFIED = 0 INFORMATIONAL = 1 LOW = 2 @@ -105,6 +106,7 @@ class State(proto.Enum): DELETING (3): Being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 diff --git a/packages/google-cloud-ids/noxfile.py b/packages/google-cloud-ids/noxfile.py index 49b5f9cb54d1..1d4e9c9e00cd 100644 --- a/packages/google-cloud-ids/noxfile.py +++ b/packages/google-cloud-ids/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-ids/tests/unit/gapic/ids_v1/test_ids.py b/packages/google-cloud-ids/tests/unit/gapic/ids_v1/test_ids.py index 9c5f5f0611e3..abd27d488881 100644 --- a/packages/google-cloud-ids/tests/unit/gapic/ids_v1/test_ids.py +++ b/packages/google-cloud-ids/tests/unit/gapic/ids_v1/test_ids.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,17 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.ids_v1.services.ids import ( IDSAsyncClient, @@ -881,10 +881,9 @@ def test_ids_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -929,10 +928,9 @@ def test_ids_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +966,9 @@ def test_ids_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1194,13 +1191,13 @@ def test_ids_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3931,8 +3928,9 @@ def test_list_endpoints_rest_bad_request(request_type=ids.ListEndpointsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3995,17 +3993,15 @@ def test_list_endpoints_rest_interceptors(null_interceptor): ) client = IDSClient(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.IDSRestInterceptor, "post_list_endpoints" - ) as post, mock.patch.object( - transports.IDSRestInterceptor, "post_list_endpoints_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IDSRestInterceptor, "pre_list_endpoints" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.IDSRestInterceptor, "post_list_endpoints") as post, + mock.patch.object( + transports.IDSRestInterceptor, "post_list_endpoints_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.IDSRestInterceptor, "pre_list_endpoints") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4054,8 +4050,9 @@ def test_get_endpoint_rest_bad_request(request_type=ids.GetEndpointRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4130,17 +4127,15 @@ def test_get_endpoint_rest_interceptors(null_interceptor): ) client = IDSClient(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.IDSRestInterceptor, "post_get_endpoint" - ) as post, mock.patch.object( - transports.IDSRestInterceptor, "post_get_endpoint_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IDSRestInterceptor, "pre_get_endpoint" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.IDSRestInterceptor, "post_get_endpoint") as post, + mock.patch.object( + transports.IDSRestInterceptor, "post_get_endpoint_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.IDSRestInterceptor, "pre_get_endpoint") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4189,8 +4184,9 @@ def test_create_endpoint_rest_bad_request(request_type=ids.CreateEndpointRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4325,19 +4321,18 @@ def test_create_endpoint_rest_interceptors(null_interceptor): ) client = IDSClient(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.IDSRestInterceptor, "post_create_endpoint" - ) as post, mock.patch.object( - transports.IDSRestInterceptor, "post_create_endpoint_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IDSRestInterceptor, "pre_create_endpoint" - ) as pre: + 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.IDSRestInterceptor, "post_create_endpoint" + ) as post, + mock.patch.object( + transports.IDSRestInterceptor, "post_create_endpoint_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.IDSRestInterceptor, "pre_create_endpoint") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4386,8 +4381,9 @@ def test_delete_endpoint_rest_bad_request(request_type=ids.DeleteEndpointRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4442,19 +4438,18 @@ def test_delete_endpoint_rest_interceptors(null_interceptor): ) client = IDSClient(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.IDSRestInterceptor, "post_delete_endpoint" - ) as post, mock.patch.object( - transports.IDSRestInterceptor, "post_delete_endpoint_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.IDSRestInterceptor, "pre_delete_endpoint" - ) as pre: + 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.IDSRestInterceptor, "post_delete_endpoint" + ) as post, + mock.patch.object( + transports.IDSRestInterceptor, "post_delete_endpoint_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.IDSRestInterceptor, "pre_delete_endpoint") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4659,11 +4654,14 @@ def test_ids_base_transport(): def test_ids_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.ids_v1.services.ids.transports.IDSTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.ids_v1.services.ids.transports.IDSTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IDSTransport( @@ -4680,9 +4678,12 @@ def test_ids_base_transport_with_credentials_file(): def test_ids_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.ids_v1.services.ids.transports.IDSTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.ids_v1.services.ids.transports.IDSTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IDSTransport() @@ -4754,11 +4755,12 @@ def test_ids_transport_auth_gdch_credentials(transport_class): def test_ids_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-kms-inventory/docs/conf.py b/packages/google-cloud-kms-inventory/docs/conf.py index 5e652da2d39b..c274e4eb573b 100644 --- a/packages/google-cloud-kms-inventory/docs/conf.py +++ b/packages/google-cloud-kms-inventory/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-kms-inventory documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/__init__.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/__init__.py index f7f5cf214e12..c42fdd83a082 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/__init__.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.key_dashboard_service import ( KeyDashboardServiceAsyncClient, KeyDashboardServiceClient, diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/async_client.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/async_client.py index 1265f4cc0b6f..3073ca789502 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/async_client.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_inventory_v1 import gapic_version as package_version @@ -125,7 +125,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: KeyDashboardServiceAsyncClient: The constructed client. """ - return KeyDashboardServiceClient.from_service_account_info.__func__(KeyDashboardServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = KeyDashboardServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(KeyDashboardServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +142,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: KeyDashboardServiceAsyncClient: The constructed client. """ - return KeyDashboardServiceClient.from_service_account_file.__func__(KeyDashboardServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = KeyDashboardServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(KeyDashboardServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -179,7 +181,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return KeyDashboardServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return KeyDashboardServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> KeyDashboardServiceTransport: diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/client.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/client.py index c8388a3a559f..5806a8e39835 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/client.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_inventory_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class KeyDashboardServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[KeyDashboardServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[KeyDashboardServiceTransport]] _transport_registry["grpc"] = KeyDashboardServiceGrpcTransport _transport_registry["grpc_asyncio"] = KeyDashboardServiceGrpcAsyncIOTransport _transport_registry["rest"] = KeyDashboardServiceRestTransport @@ -656,11 +654,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = KeyDashboardServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + KeyDashboardServiceClient._read_environment_variables() + ) self._client_cert_source = KeyDashboardServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -695,8 +691,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(KeyDashboardServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/pagers.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/pagers.py index 70f65f5351e6..cc2990dd6b45 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/pagers.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/pagers.py @@ -69,7 +69,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/__init__.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/__init__.py index 4d2babaf1df2..ec7a4be11c1e 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/__init__.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import KeyDashboardServiceRestInterceptor, KeyDashboardServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[KeyDashboardServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[KeyDashboardServiceTransport]] _transport_registry["grpc"] = KeyDashboardServiceGrpcTransport _transport_registry["grpc_asyncio"] = KeyDashboardServiceGrpcAsyncIOTransport _transport_registry["rest"] = KeyDashboardServiceRestTransport diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/base.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/base.py index eac83c97793b..f5479548f6f4 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/base.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_inventory_v1 import gapic_version as package_version from google.cloud.kms_inventory_v1.types import key_dashboard_service diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc.py index 5ac80383b31c..ef33b871ce3d 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.kms_inventory_v1.types import key_dashboard_service diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc_asyncio.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc_asyncio.py index 205eff91e547..3d9078c264b1 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_inventory_v1.types import key_dashboard_service diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/rest.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/rest.py index 7a33ef3ee2c2..82639373a614 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/rest.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_dashboard_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -285,9 +285,7 @@ def __call__( """ - http_options = ( - _BaseKeyDashboardServiceRestTransport._BaseListCryptoKeys._get_http_options() - ) + http_options = _BaseKeyDashboardServiceRestTransport._BaseListCryptoKeys._get_http_options() request, metadata = self._interceptor.pre_list_crypto_keys( request, metadata diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/async_client.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/async_client.py index 15da5e3918f7..8e21d613e60a 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/async_client.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_inventory_v1 import gapic_version as package_version @@ -127,7 +127,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: KeyTrackingServiceAsyncClient: The constructed client. """ - return KeyTrackingServiceClient.from_service_account_info.__func__(KeyTrackingServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = KeyTrackingServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(KeyTrackingServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: KeyTrackingServiceAsyncClient: The constructed client. """ - return KeyTrackingServiceClient.from_service_account_file.__func__(KeyTrackingServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = KeyTrackingServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(KeyTrackingServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -181,7 +183,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return KeyTrackingServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return KeyTrackingServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> KeyTrackingServiceTransport: diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/client.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/client.py index f6c5306efb89..f62c9ed37eb0 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/client.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_inventory_v1 import gapic_version as package_version @@ -78,9 +78,7 @@ class KeyTrackingServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[KeyTrackingServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[KeyTrackingServiceTransport]] _transport_registry["grpc"] = KeyTrackingServiceGrpcTransport _transport_registry["grpc_asyncio"] = KeyTrackingServiceGrpcAsyncIOTransport _transport_registry["rest"] = KeyTrackingServiceRestTransport @@ -665,11 +663,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = KeyTrackingServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + KeyTrackingServiceClient._read_environment_variables() + ) self._client_cert_source = KeyTrackingServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -704,8 +700,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(KeyTrackingServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/pagers.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/pagers.py index c8b7d91c2578..3af1e71c02d5 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/pagers.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/__init__.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/__init__.py index 6885548188e8..b45f8e5a0f50 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/__init__.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import KeyTrackingServiceRestInterceptor, KeyTrackingServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[KeyTrackingServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[KeyTrackingServiceTransport]] _transport_registry["grpc"] = KeyTrackingServiceGrpcTransport _transport_registry["grpc_asyncio"] = KeyTrackingServiceGrpcAsyncIOTransport _transport_registry["rest"] = KeyTrackingServiceRestTransport diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/base.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/base.py index 99e512ec6276..b523f397c504 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/base.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_inventory_v1 import gapic_version as package_version from google.cloud.kms_inventory_v1.types import key_tracking_service diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc.py index 07ad07f64131..0a83aa6d0ecd 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.kms_inventory_v1.types import key_tracking_service @@ -349,12 +349,12 @@ def get_protected_resources_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_protected_resources_summary" not in self._stubs: - self._stubs[ - "get_protected_resources_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.inventory.v1.KeyTrackingService/GetProtectedResourcesSummary", - request_serializer=key_tracking_service.GetProtectedResourcesSummaryRequest.serialize, - response_deserializer=key_tracking_service.ProtectedResourcesSummary.deserialize, + self._stubs["get_protected_resources_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.inventory.v1.KeyTrackingService/GetProtectedResourcesSummary", + request_serializer=key_tracking_service.GetProtectedResourcesSummaryRequest.serialize, + response_deserializer=key_tracking_service.ProtectedResourcesSummary.deserialize, + ) ) return self._stubs["get_protected_resources_summary"] @@ -382,12 +382,12 @@ def search_protected_resources( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_protected_resources" not in self._stubs: - self._stubs[ - "search_protected_resources" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.inventory.v1.KeyTrackingService/SearchProtectedResources", - request_serializer=key_tracking_service.SearchProtectedResourcesRequest.serialize, - response_deserializer=key_tracking_service.SearchProtectedResourcesResponse.deserialize, + self._stubs["search_protected_resources"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.inventory.v1.KeyTrackingService/SearchProtectedResources", + request_serializer=key_tracking_service.SearchProtectedResourcesRequest.serialize, + response_deserializer=key_tracking_service.SearchProtectedResourcesResponse.deserialize, + ) ) return self._stubs["search_protected_resources"] diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc_asyncio.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc_asyncio.py index 11f264dd00c4..31bc5c107099 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_inventory_v1.types import key_tracking_service @@ -357,12 +357,12 @@ def get_protected_resources_summary( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_protected_resources_summary" not in self._stubs: - self._stubs[ - "get_protected_resources_summary" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.inventory.v1.KeyTrackingService/GetProtectedResourcesSummary", - request_serializer=key_tracking_service.GetProtectedResourcesSummaryRequest.serialize, - response_deserializer=key_tracking_service.ProtectedResourcesSummary.deserialize, + self._stubs["get_protected_resources_summary"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.inventory.v1.KeyTrackingService/GetProtectedResourcesSummary", + request_serializer=key_tracking_service.GetProtectedResourcesSummaryRequest.serialize, + response_deserializer=key_tracking_service.ProtectedResourcesSummary.deserialize, + ) ) return self._stubs["get_protected_resources_summary"] @@ -390,12 +390,12 @@ def search_protected_resources( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "search_protected_resources" not in self._stubs: - self._stubs[ - "search_protected_resources" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.inventory.v1.KeyTrackingService/SearchProtectedResources", - request_serializer=key_tracking_service.SearchProtectedResourcesRequest.serialize, - response_deserializer=key_tracking_service.SearchProtectedResourcesResponse.deserialize, + self._stubs["search_protected_resources"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.inventory.v1.KeyTrackingService/SearchProtectedResources", + request_serializer=key_tracking_service.SearchProtectedResourcesRequest.serialize, + response_deserializer=key_tracking_service.SearchProtectedResourcesResponse.deserialize, + ) ) return self._stubs["search_protected_resources"] diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/rest.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/rest.py index ad9e0a8631e0..2f3adb2620d1 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/rest.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/services/key_tracking_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -348,9 +348,7 @@ def __call__( """ - http_options = ( - _BaseKeyTrackingServiceRestTransport._BaseGetProtectedResourcesSummary._get_http_options() - ) + http_options = _BaseKeyTrackingServiceRestTransport._BaseGetProtectedResourcesSummary._get_http_options() request, metadata = self._interceptor.pre_get_protected_resources_summary( request, metadata @@ -414,11 +412,10 @@ def __call__( resp = self._interceptor.post_get_protected_resources_summary(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_protected_resources_summary_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_protected_resources_summary_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -504,9 +501,7 @@ def __call__( """ - http_options = ( - _BaseKeyTrackingServiceRestTransport._BaseSearchProtectedResources._get_http_options() - ) + http_options = _BaseKeyTrackingServiceRestTransport._BaseSearchProtectedResources._get_http_options() request, metadata = self._interceptor.pre_search_protected_resources( request, metadata @@ -611,7 +606,9 @@ def get_protected_resources_summary( ]: # 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._GetProtectedResourcesSummary(self._session, self._host, self._interceptor) # type: ignore + return self._GetProtectedResourcesSummary( + self._session, self._host, self._interceptor + ) # type: ignore @property def search_protected_resources( @@ -622,7 +619,9 @@ def search_protected_resources( ]: # 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._SearchProtectedResources(self._session, self._host, self._interceptor) # type: ignore + return self._SearchProtectedResources( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/__init__.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/__init__.py index 76f11b5eb4f3..6adabccaa191 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/__init__.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .key_dashboard_service import ListCryptoKeysRequest, ListCryptoKeysResponse +from .key_dashboard_service import ( + ListCryptoKeysRequest, + ListCryptoKeysResponse, +) from .key_tracking_service import ( GetProtectedResourcesSummaryRequest, ProtectedResource, diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/key_dashboard_service.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/key_dashboard_service.py index da4dd9d3c5e9..0b576891be2c 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/key_dashboard_service.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/key_dashboard_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.cloud.kms_v1.types import resources import proto # type: ignore +from google.cloud.kms_v1.types import resources __protobuf__ = proto.module( package="google.cloud.kms.inventory.v1", diff --git a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/key_tracking_service.py b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/key_tracking_service.py index 4729380e9420..b77beb6dd56d 100644 --- a/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/key_tracking_service.py +++ b/packages/google-cloud-kms-inventory/google/cloud/kms_inventory_v1/types/key_tracking_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-kms-inventory/noxfile.py b/packages/google-cloud-kms-inventory/noxfile.py index faed902abea9..07d7b2829191 100644 --- a/packages/google-cloud-kms-inventory/noxfile.py +++ b/packages/google-cloud-kms-inventory/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_dashboard_service.py b/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_dashboard_service.py index 06d773014833..41203309b572 100644 --- a/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_dashboard_service.py +++ b/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_dashboard_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.kms_v1.types import resources @@ -993,10 +998,9 @@ def test_key_dashboard_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1045,9 @@ def test_key_dashboard_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1083,9 @@ def test_key_dashboard_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1339,13 +1341,13 @@ def test_key_dashboard_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1454,9 +1456,9 @@ def test_list_crypto_keys_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_crypto_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_crypto_keys] = ( + mock_rpc + ) request = {} client.list_crypto_keys(request) @@ -1910,9 +1912,9 @@ def test_list_crypto_keys_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_crypto_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_crypto_keys] = ( + mock_rpc + ) request = {} client.list_crypto_keys(request) @@ -2331,8 +2333,9 @@ def test_list_crypto_keys_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2395,18 +2398,20 @@ def test_list_crypto_keys_rest_interceptors(null_interceptor): ) client = KeyDashboardServiceClient(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.KeyDashboardServiceRestInterceptor, "post_list_crypto_keys" - ) as post, mock.patch.object( - transports.KeyDashboardServiceRestInterceptor, - "post_list_crypto_keys_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyDashboardServiceRestInterceptor, "pre_list_crypto_keys" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyDashboardServiceRestInterceptor, "post_list_crypto_keys" + ) as post, + mock.patch.object( + transports.KeyDashboardServiceRestInterceptor, + "post_list_crypto_keys_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyDashboardServiceRestInterceptor, "pre_list_crypto_keys" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2531,11 +2536,14 @@ def test_key_dashboard_service_base_transport(): def test_key_dashboard_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.kms_inventory_v1.services.key_dashboard_service.transports.KeyDashboardServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.kms_inventory_v1.services.key_dashboard_service.transports.KeyDashboardServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.KeyDashboardServiceTransport( @@ -2552,9 +2560,12 @@ def test_key_dashboard_service_base_transport_with_credentials_file(): def test_key_dashboard_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.kms_inventory_v1.services.key_dashboard_service.transports.KeyDashboardServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.kms_inventory_v1.services.key_dashboard_service.transports.KeyDashboardServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.KeyDashboardServiceTransport() @@ -2626,11 +2637,12 @@ def test_key_dashboard_service_transport_auth_gdch_credentials(transport_class): def test_key_dashboard_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_tracking_service.py b/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_tracking_service.py index 751f2b3d2ab6..f7e885b23007 100644 --- a/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_tracking_service.py +++ b/packages/google-cloud-kms-inventory/tests/unit/gapic/kms_inventory_v1/test_key_tracking_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -982,10 +987,9 @@ def test_key_tracking_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1030,10 +1034,9 @@ def test_key_tracking_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1072,9 @@ def test_key_tracking_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1320,13 +1322,13 @@ def test_key_tracking_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2991,8 +2993,9 @@ def test_get_protected_resources_summary_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3061,20 +3064,22 @@ def test_get_protected_resources_summary_rest_interceptors(null_interceptor): ) client = KeyTrackingServiceClient(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.KeyTrackingServiceRestInterceptor, - "post_get_protected_resources_summary", - ) as post, mock.patch.object( - transports.KeyTrackingServiceRestInterceptor, - "post_get_protected_resources_summary_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyTrackingServiceRestInterceptor, - "pre_get_protected_resources_summary", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyTrackingServiceRestInterceptor, + "post_get_protected_resources_summary", + ) as post, + mock.patch.object( + transports.KeyTrackingServiceRestInterceptor, + "post_get_protected_resources_summary_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyTrackingServiceRestInterceptor, + "pre_get_protected_resources_summary", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3132,8 +3137,9 @@ def test_search_protected_resources_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3198,18 +3204,22 @@ def test_search_protected_resources_rest_interceptors(null_interceptor): ) client = KeyTrackingServiceClient(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.KeyTrackingServiceRestInterceptor, "post_search_protected_resources" - ) as post, mock.patch.object( - transports.KeyTrackingServiceRestInterceptor, - "post_search_protected_resources_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyTrackingServiceRestInterceptor, "pre_search_protected_resources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyTrackingServiceRestInterceptor, + "post_search_protected_resources", + ) as post, + mock.patch.object( + transports.KeyTrackingServiceRestInterceptor, + "post_search_protected_resources_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyTrackingServiceRestInterceptor, + "pre_search_protected_resources", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3361,11 +3371,14 @@ def test_key_tracking_service_base_transport(): def test_key_tracking_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.kms_inventory_v1.services.key_tracking_service.transports.KeyTrackingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.kms_inventory_v1.services.key_tracking_service.transports.KeyTrackingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.KeyTrackingServiceTransport( @@ -3382,9 +3395,12 @@ def test_key_tracking_service_base_transport_with_credentials_file(): def test_key_tracking_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.kms_inventory_v1.services.key_tracking_service.transports.KeyTrackingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.kms_inventory_v1.services.key_tracking_service.transports.KeyTrackingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.KeyTrackingServiceTransport() @@ -3456,11 +3472,12 @@ def test_key_tracking_service_transport_auth_gdch_credentials(transport_class): def test_key_tracking_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-kms/docs/conf.py b/packages/google-cloud-kms/docs/conf.py index 626ba35d98c5..a893d82a8376 100644 --- a/packages/google-cloud-kms/docs/conf.py +++ b/packages/google-cloud-kms/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-kms documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/__init__.py b/packages/google-cloud-kms/google/cloud/kms_v1/__init__.py index c0d6c2ba0736..9979c1a22145 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/__init__.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.autokey import AutokeyAsyncClient, AutokeyClient from .services.autokey_admin import AutokeyAdminAsyncClient, AutokeyAdminClient from .services.ekm_service import EkmServiceAsyncClient, EkmServiceClient diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/async_client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/async_client.py index 7c089bc09b79..0fe3a885aa11 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/async_client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -44,11 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.kms_v1.services.autokey import pagers @@ -133,7 +135,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AutokeyAsyncClient: The constructed client. """ - return AutokeyClient.from_service_account_info.__func__(AutokeyAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AutokeyClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AutokeyAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +152,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AutokeyAsyncClient: The constructed client. """ - return AutokeyClient.from_service_account_file.__func__(AutokeyAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AutokeyClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AutokeyAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/client.py index 980caf095396..e25ab1860929 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -61,11 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.cloud.kms_v1.services.autokey import pagers @@ -668,11 +670,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutokeyClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutokeyClient._read_environment_variables() + ) self._client_cert_source = AutokeyClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -707,8 +707,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutokeyTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/pagers.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/pagers.py index ea05adf77870..7d34d7102cee 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/pagers.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/base.py index 407a7b0235d2..eca91a4262b7 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version from google.cloud.kms_v1.types import autokey diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc.py index e3546890b1ab..de1d7dcc4825 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import autokey diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc_asyncio.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc_asyncio.py index 015cc9c8f787..d3685df1bcd3 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import autokey diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest.py index 77369efa5f8f..facbd9cbdf4b 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -623,7 +625,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest_base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest_base.py index 2dbf59119ee4..170f9d6f52eb 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest_base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/async_client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/async_client.py index 6d86b61c2be2..01aa93a2850d 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/async_client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -44,11 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.kms_v1.types import autokey_admin @@ -125,7 +127,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AutokeyAdminAsyncClient: The constructed client. """ - return AutokeyAdminClient.from_service_account_info.__func__(AutokeyAdminAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AutokeyAdminClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AutokeyAdminAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +144,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AutokeyAdminAsyncClient: The constructed client. """ - return AutokeyAdminClient.from_service_account_file.__func__(AutokeyAdminAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AutokeyAdminClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AutokeyAdminAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/client.py index ea0eba11988e..2363f9f29071 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -61,11 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.kms_v1.types import autokey_admin @@ -625,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AutokeyAdminClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AutokeyAdminClient._read_environment_variables() + ) self._client_cert_source = AutokeyAdminClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -664,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AutokeyAdminTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/base.py index 4a02a2d05683..3bd926bfb804 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version from google.cloud.kms_v1.types import autokey_admin diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc.py index 7c74a5d8b92f..ba2b16085a0a 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import autokey_admin @@ -419,12 +421,12 @@ def show_effective_autokey_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "show_effective_autokey_config" not in self._stubs: - self._stubs[ - "show_effective_autokey_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.AutokeyAdmin/ShowEffectiveAutokeyConfig", - request_serializer=autokey_admin.ShowEffectiveAutokeyConfigRequest.serialize, - response_deserializer=autokey_admin.ShowEffectiveAutokeyConfigResponse.deserialize, + self._stubs["show_effective_autokey_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.AutokeyAdmin/ShowEffectiveAutokeyConfig", + request_serializer=autokey_admin.ShowEffectiveAutokeyConfigRequest.serialize, + response_deserializer=autokey_admin.ShowEffectiveAutokeyConfigResponse.deserialize, + ) ) return self._stubs["show_effective_autokey_config"] diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc_asyncio.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc_asyncio.py index 5df7dd62d0e8..5795a8d27ab2 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import autokey_admin @@ -430,12 +432,12 @@ def show_effective_autokey_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "show_effective_autokey_config" not in self._stubs: - self._stubs[ - "show_effective_autokey_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.AutokeyAdmin/ShowEffectiveAutokeyConfig", - request_serializer=autokey_admin.ShowEffectiveAutokeyConfigRequest.serialize, - response_deserializer=autokey_admin.ShowEffectiveAutokeyConfigResponse.deserialize, + self._stubs["show_effective_autokey_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.AutokeyAdmin/ShowEffectiveAutokeyConfig", + request_serializer=autokey_admin.ShowEffectiveAutokeyConfigRequest.serialize, + response_deserializer=autokey_admin.ShowEffectiveAutokeyConfigResponse.deserialize, + ) ) return self._stubs["show_effective_autokey_config"] diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest.py index d6e6b91f19f2..624dbd768e92 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -706,9 +708,7 @@ def __call__( """ - http_options = ( - _BaseAutokeyAdminRestTransport._BaseShowEffectiveAutokeyConfig._get_http_options() - ) + http_options = _BaseAutokeyAdminRestTransport._BaseShowEffectiveAutokeyConfig._get_http_options() request, metadata = self._interceptor.pre_show_effective_autokey_config( request, metadata @@ -774,11 +774,10 @@ def __call__( resp = self._interceptor.post_show_effective_autokey_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_show_effective_autokey_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_show_effective_autokey_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -865,9 +864,7 @@ def __call__( """ - http_options = ( - _BaseAutokeyAdminRestTransport._BaseUpdateAutokeyConfig._get_http_options() - ) + http_options = _BaseAutokeyAdminRestTransport._BaseUpdateAutokeyConfig._get_http_options() request, metadata = self._interceptor.pre_update_autokey_config( request, metadata @@ -979,7 +976,9 @@ def show_effective_autokey_config( ]: # 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._ShowEffectiveAutokeyConfig(self._session, self._host, self._interceptor) # type: ignore + return self._ShowEffectiveAutokeyConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_autokey_config( @@ -1625,9 +1624,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseAutokeyAdminRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAutokeyAdminRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest_base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest_base.py index 7a05103d4187..9e61f4cbe3e1 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest_base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/autokey_admin/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/async_client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/async_client.py index 6878c0a0ec48..40b1b4b6a50a 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/async_client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -44,12 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.kms_v1.services.ekm_service import pagers from google.cloud.kms_v1.types import ekm_service @@ -124,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EkmServiceAsyncClient: The constructed client. """ - return EkmServiceClient.from_service_account_info.__func__(EkmServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EkmServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EkmServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EkmServiceAsyncClient: The constructed client. """ - return EkmServiceClient.from_service_account_file.__func__(EkmServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EkmServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EkmServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/client.py index f3bd9ee4bbcc..b9d3563133d5 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -61,12 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.kms_v1.services.ekm_service import pagers from google.cloud.kms_v1.types import ekm_service @@ -674,11 +676,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EkmServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EkmServiceClient._read_environment_variables() + ) self._client_cert_source = EkmServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -713,8 +713,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EkmServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/pagers.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/pagers.py index 571042cec93f..bfb80848f2a0 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/pagers.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/base.py index b7f9c8852efc..b5cfc6f258a9 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version from google.cloud.kms_v1.types import ekm_service diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc.py index 0dd5b58430d9..9b6d010d000f 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import ekm_service diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc_asyncio.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc_asyncio.py index 89f2f2ae83b2..5f57fcdb1443 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import ekm_service diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest.py index ff9f7ecbbd6c..44fc0a4cfc22 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -786,9 +788,7 @@ def __call__( """ - http_options = ( - _BaseEkmServiceRestTransport._BaseCreateEkmConnection._get_http_options() - ) + http_options = _BaseEkmServiceRestTransport._BaseCreateEkmConnection._get_http_options() request, metadata = self._interceptor.pre_create_ekm_connection( request, metadata @@ -1583,9 +1583,7 @@ def __call__( """ - http_options = ( - _BaseEkmServiceRestTransport._BaseUpdateEkmConnection._get_http_options() - ) + http_options = _BaseEkmServiceRestTransport._BaseUpdateEkmConnection._get_http_options() request, metadata = self._interceptor.pre_update_ekm_connection( request, metadata diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest_base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest_base.py index 839aa836355d..069b63c5249c 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest_base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/ekm_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/async_client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/async_client.py index d3bf94dc949e..a63839785b89 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/async_client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -44,14 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.kms_v1.services.hsm_management import pagers from google.cloud.kms_v1.types import hsm_management @@ -140,7 +142,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: HsmManagementAsyncClient: The constructed client. """ - return HsmManagementClient.from_service_account_info.__func__(HsmManagementAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = HsmManagementClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(HsmManagementAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -156,7 +159,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: HsmManagementAsyncClient: The constructed client. """ - return HsmManagementClient.from_service_account_file.__func__(HsmManagementAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = HsmManagementClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(HsmManagementAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/client.py index 6bdbc7b018ce..4f4df1b2694d 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.kms_v1.services.hsm_management import pagers from google.cloud.kms_v1.types import hsm_management @@ -659,11 +661,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = HsmManagementClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + HsmManagementClient._read_environment_variables() + ) self._client_cert_source = HsmManagementClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -698,8 +698,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(HsmManagementTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/pagers.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/pagers.py index 8ddb79e3b47e..724fef8b16eb 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/pagers.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/base.py index 34f50543d662..18e5ee97abb5 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/base.py @@ -17,18 +17,20 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.kms_v1 import gapic_version as package_version from google.cloud.kms_v1.types import hsm_management diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc.py index b312dbccb779..a5f3a3d90f10 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc.py @@ -16,22 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import hsm_management @@ -374,12 +376,12 @@ def list_single_tenant_hsm_instances( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_single_tenant_hsm_instances" not in self._stubs: - self._stubs[ - "list_single_tenant_hsm_instances" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstances", - request_serializer=hsm_management.ListSingleTenantHsmInstancesRequest.serialize, - response_deserializer=hsm_management.ListSingleTenantHsmInstancesResponse.deserialize, + self._stubs["list_single_tenant_hsm_instances"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstances", + request_serializer=hsm_management.ListSingleTenantHsmInstancesRequest.serialize, + response_deserializer=hsm_management.ListSingleTenantHsmInstancesResponse.deserialize, + ) ) return self._stubs["list_single_tenant_hsm_instances"] @@ -406,12 +408,12 @@ def get_single_tenant_hsm_instance( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_single_tenant_hsm_instance" not in self._stubs: - self._stubs[ - "get_single_tenant_hsm_instance" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstance", - request_serializer=hsm_management.GetSingleTenantHsmInstanceRequest.serialize, - response_deserializer=hsm_management.SingleTenantHsmInstance.deserialize, + self._stubs["get_single_tenant_hsm_instance"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstance", + request_serializer=hsm_management.GetSingleTenantHsmInstanceRequest.serialize, + response_deserializer=hsm_management.SingleTenantHsmInstance.deserialize, + ) ) return self._stubs["get_single_tenant_hsm_instance"] @@ -441,12 +443,12 @@ def create_single_tenant_hsm_instance( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_single_tenant_hsm_instance" not in self._stubs: - self._stubs[ - "create_single_tenant_hsm_instance" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstance", - request_serializer=hsm_management.CreateSingleTenantHsmInstanceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_single_tenant_hsm_instance"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstance", + request_serializer=hsm_management.CreateSingleTenantHsmInstanceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_single_tenant_hsm_instance"] @@ -476,12 +478,12 @@ def create_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "create_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.CreateSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.CreateSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_single_tenant_hsm_instance_proposal"] @@ -514,12 +516,12 @@ def approve_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "approve_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "approve_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ApproveSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=hsm_management.ApproveSingleTenantHsmInstanceProposalResponse.deserialize, + self._stubs["approve_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ApproveSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=hsm_management.ApproveSingleTenantHsmInstanceProposalResponse.deserialize, + ) ) return self._stubs["approve_single_tenant_hsm_instance_proposal"] @@ -552,12 +554,12 @@ def execute_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "execute_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "execute_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ExecuteSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.ExecuteSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["execute_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ExecuteSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.ExecuteSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["execute_single_tenant_hsm_instance_proposal"] @@ -585,12 +587,12 @@ def get_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "get_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.GetSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=hsm_management.SingleTenantHsmInstanceProposal.deserialize, + self._stubs["get_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.GetSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=hsm_management.SingleTenantHsmInstanceProposal.deserialize, + ) ) return self._stubs["get_single_tenant_hsm_instance_proposal"] @@ -618,12 +620,12 @@ def list_single_tenant_hsm_instance_proposals( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_single_tenant_hsm_instance_proposals" not in self._stubs: - self._stubs[ - "list_single_tenant_hsm_instance_proposals" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstanceProposals", - request_serializer=hsm_management.ListSingleTenantHsmInstanceProposalsRequest.serialize, - response_deserializer=hsm_management.ListSingleTenantHsmInstanceProposalsResponse.deserialize, + self._stubs["list_single_tenant_hsm_instance_proposals"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstanceProposals", + request_serializer=hsm_management.ListSingleTenantHsmInstanceProposalsRequest.serialize, + response_deserializer=hsm_management.ListSingleTenantHsmInstanceProposalsResponse.deserialize, + ) ) return self._stubs["list_single_tenant_hsm_instance_proposals"] @@ -650,12 +652,12 @@ def delete_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "delete_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/DeleteSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.DeleteSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/DeleteSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.DeleteSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_single_tenant_hsm_instance_proposal"] diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc_asyncio.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc_asyncio.py index 5bb0785931b0..4ce8d3b2f0da 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/grpc_asyncio.py @@ -17,24 +17,26 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import hsm_management @@ -382,12 +384,12 @@ def list_single_tenant_hsm_instances( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_single_tenant_hsm_instances" not in self._stubs: - self._stubs[ - "list_single_tenant_hsm_instances" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstances", - request_serializer=hsm_management.ListSingleTenantHsmInstancesRequest.serialize, - response_deserializer=hsm_management.ListSingleTenantHsmInstancesResponse.deserialize, + self._stubs["list_single_tenant_hsm_instances"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstances", + request_serializer=hsm_management.ListSingleTenantHsmInstancesRequest.serialize, + response_deserializer=hsm_management.ListSingleTenantHsmInstancesResponse.deserialize, + ) ) return self._stubs["list_single_tenant_hsm_instances"] @@ -414,12 +416,12 @@ def get_single_tenant_hsm_instance( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_single_tenant_hsm_instance" not in self._stubs: - self._stubs[ - "get_single_tenant_hsm_instance" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstance", - request_serializer=hsm_management.GetSingleTenantHsmInstanceRequest.serialize, - response_deserializer=hsm_management.SingleTenantHsmInstance.deserialize, + self._stubs["get_single_tenant_hsm_instance"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstance", + request_serializer=hsm_management.GetSingleTenantHsmInstanceRequest.serialize, + response_deserializer=hsm_management.SingleTenantHsmInstance.deserialize, + ) ) return self._stubs["get_single_tenant_hsm_instance"] @@ -450,12 +452,12 @@ def create_single_tenant_hsm_instance( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_single_tenant_hsm_instance" not in self._stubs: - self._stubs[ - "create_single_tenant_hsm_instance" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstance", - request_serializer=hsm_management.CreateSingleTenantHsmInstanceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_single_tenant_hsm_instance"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstance", + request_serializer=hsm_management.CreateSingleTenantHsmInstanceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_single_tenant_hsm_instance"] @@ -485,12 +487,12 @@ def create_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "create_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.CreateSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/CreateSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.CreateSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_single_tenant_hsm_instance_proposal"] @@ -523,12 +525,12 @@ def approve_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "approve_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "approve_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ApproveSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=hsm_management.ApproveSingleTenantHsmInstanceProposalResponse.deserialize, + self._stubs["approve_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ApproveSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=hsm_management.ApproveSingleTenantHsmInstanceProposalResponse.deserialize, + ) ) return self._stubs["approve_single_tenant_hsm_instance_proposal"] @@ -561,12 +563,12 @@ def execute_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "execute_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "execute_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ExecuteSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.ExecuteSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["execute_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ExecuteSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.ExecuteSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["execute_single_tenant_hsm_instance_proposal"] @@ -594,12 +596,12 @@ def get_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "get_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.GetSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=hsm_management.SingleTenantHsmInstanceProposal.deserialize, + self._stubs["get_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/GetSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.GetSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=hsm_management.SingleTenantHsmInstanceProposal.deserialize, + ) ) return self._stubs["get_single_tenant_hsm_instance_proposal"] @@ -627,12 +629,12 @@ def list_single_tenant_hsm_instance_proposals( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_single_tenant_hsm_instance_proposals" not in self._stubs: - self._stubs[ - "list_single_tenant_hsm_instance_proposals" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstanceProposals", - request_serializer=hsm_management.ListSingleTenantHsmInstanceProposalsRequest.serialize, - response_deserializer=hsm_management.ListSingleTenantHsmInstanceProposalsResponse.deserialize, + self._stubs["list_single_tenant_hsm_instance_proposals"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/ListSingleTenantHsmInstanceProposals", + request_serializer=hsm_management.ListSingleTenantHsmInstanceProposalsRequest.serialize, + response_deserializer=hsm_management.ListSingleTenantHsmInstanceProposalsResponse.deserialize, + ) ) return self._stubs["list_single_tenant_hsm_instance_proposals"] @@ -660,12 +662,12 @@ def delete_single_tenant_hsm_instance_proposal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_single_tenant_hsm_instance_proposal" not in self._stubs: - self._stubs[ - "delete_single_tenant_hsm_instance_proposal" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.HsmManagement/DeleteSingleTenantHsmInstanceProposal", - request_serializer=hsm_management.DeleteSingleTenantHsmInstanceProposalRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_single_tenant_hsm_instance_proposal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.HsmManagement/DeleteSingleTenantHsmInstanceProposal", + request_serializer=hsm_management.DeleteSingleTenantHsmInstanceProposalRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_single_tenant_hsm_instance_proposal"] diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest.py index 77ffd16034e6..ec800cab6d96 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest.py @@ -16,20 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -911,15 +913,12 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseApproveSingleTenantHsmInstanceProposal._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseApproveSingleTenantHsmInstanceProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_approve_single_tenant_hsm_instance_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_approve_single_tenant_hsm_instance_proposal( + request, metadata + ) ) transcoded_request = _BaseHsmManagementRestTransport._BaseApproveSingleTenantHsmInstanceProposal._get_transcoded_request( http_options, request @@ -989,11 +988,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_approve_single_tenant_hsm_instance_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_approve_single_tenant_hsm_instance_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1081,9 +1079,7 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseCreateSingleTenantHsmInstance._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseCreateSingleTenantHsmInstance._get_http_options() request, metadata = self._interceptor.pre_create_single_tenant_hsm_instance( request, metadata @@ -1109,7 +1105,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1152,11 +1148,10 @@ def __call__( resp = self._interceptor.post_create_single_tenant_hsm_instance(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_single_tenant_hsm_instance_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_single_tenant_hsm_instance_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1244,15 +1239,12 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseCreateSingleTenantHsmInstanceProposal._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseCreateSingleTenantHsmInstanceProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_single_tenant_hsm_instance_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_create_single_tenant_hsm_instance_proposal( + request, metadata + ) ) transcoded_request = _BaseHsmManagementRestTransport._BaseCreateSingleTenantHsmInstanceProposal._get_transcoded_request( http_options, request @@ -1275,7 +1267,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1318,11 +1310,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_single_tenant_hsm_instance_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_single_tenant_hsm_instance_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1402,15 +1393,12 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseHsmManagementRestTransport._BaseDeleteSingleTenantHsmInstanceProposal._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseDeleteSingleTenantHsmInstanceProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_single_tenant_hsm_instance_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_single_tenant_hsm_instance_proposal( + request, metadata + ) ) transcoded_request = _BaseHsmManagementRestTransport._BaseDeleteSingleTenantHsmInstanceProposal._get_transcoded_request( http_options, request @@ -1429,7 +1417,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1526,15 +1514,12 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseExecuteSingleTenantHsmInstanceProposal._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseExecuteSingleTenantHsmInstanceProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_execute_single_tenant_hsm_instance_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_execute_single_tenant_hsm_instance_proposal( + request, metadata + ) ) transcoded_request = _BaseHsmManagementRestTransport._BaseExecuteSingleTenantHsmInstanceProposal._get_transcoded_request( http_options, request @@ -1557,7 +1542,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1600,11 +1585,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_execute_single_tenant_hsm_instance_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_execute_single_tenant_hsm_instance_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1697,9 +1681,7 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseGetSingleTenantHsmInstance._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseGetSingleTenantHsmInstance._get_http_options() request, metadata = self._interceptor.pre_get_single_tenant_hsm_instance( request, metadata @@ -1765,11 +1747,10 @@ def __call__( resp = self._interceptor.post_get_single_tenant_hsm_instance(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_single_tenant_hsm_instance_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_single_tenant_hsm_instance_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1857,15 +1838,12 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseGetSingleTenantHsmInstanceProposal._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseGetSingleTenantHsmInstanceProposal._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_single_tenant_hsm_instance_proposal( - request, metadata + request, metadata = ( + self._interceptor.pre_get_single_tenant_hsm_instance_proposal( + request, metadata + ) ) transcoded_request = _BaseHsmManagementRestTransport._BaseGetSingleTenantHsmInstanceProposal._get_transcoded_request( http_options, request @@ -1926,11 +1904,10 @@ def __call__( resp = self._interceptor.post_get_single_tenant_hsm_instance_proposal(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_single_tenant_hsm_instance_proposal_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_single_tenant_hsm_instance_proposal_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2018,15 +1995,12 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseListSingleTenantHsmInstanceProposals._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseListSingleTenantHsmInstanceProposals._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_single_tenant_hsm_instance_proposals( - request, metadata + request, metadata = ( + self._interceptor.pre_list_single_tenant_hsm_instance_proposals( + request, metadata + ) ) transcoded_request = _BaseHsmManagementRestTransport._BaseListSingleTenantHsmInstanceProposals._get_transcoded_request( http_options, request @@ -2091,11 +2065,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_single_tenant_hsm_instance_proposals_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_single_tenant_hsm_instance_proposals_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2181,9 +2154,7 @@ def __call__( """ - http_options = ( - _BaseHsmManagementRestTransport._BaseListSingleTenantHsmInstances._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseListSingleTenantHsmInstances._get_http_options() request, metadata = self._interceptor.pre_list_single_tenant_hsm_instances( request, metadata @@ -2249,11 +2220,10 @@ def __call__( resp = self._interceptor.post_list_single_tenant_hsm_instances(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_single_tenant_hsm_instances_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_single_tenant_hsm_instances_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2291,7 +2261,9 @@ def approve_single_tenant_hsm_instance_proposal( ]: # 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._ApproveSingleTenantHsmInstanceProposal(self._session, self._host, self._interceptor) # type: ignore + return self._ApproveSingleTenantHsmInstanceProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_single_tenant_hsm_instance( @@ -2301,7 +2273,9 @@ def create_single_tenant_hsm_instance( ]: # 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._CreateSingleTenantHsmInstance(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSingleTenantHsmInstance( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_single_tenant_hsm_instance_proposal( @@ -2312,7 +2286,9 @@ def create_single_tenant_hsm_instance_proposal( ]: # 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._CreateSingleTenantHsmInstanceProposal(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSingleTenantHsmInstanceProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_single_tenant_hsm_instance_proposal( @@ -2322,7 +2298,9 @@ def delete_single_tenant_hsm_instance_proposal( ]: # 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._DeleteSingleTenantHsmInstanceProposal(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSingleTenantHsmInstanceProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def execute_single_tenant_hsm_instance_proposal( @@ -2333,7 +2311,9 @@ def execute_single_tenant_hsm_instance_proposal( ]: # 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._ExecuteSingleTenantHsmInstanceProposal(self._session, self._host, self._interceptor) # type: ignore + return self._ExecuteSingleTenantHsmInstanceProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_single_tenant_hsm_instance( @@ -2344,7 +2324,9 @@ def get_single_tenant_hsm_instance( ]: # 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._GetSingleTenantHsmInstance(self._session, self._host, self._interceptor) # type: ignore + return self._GetSingleTenantHsmInstance( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_single_tenant_hsm_instance_proposal( @@ -2355,7 +2337,9 @@ def get_single_tenant_hsm_instance_proposal( ]: # 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._GetSingleTenantHsmInstanceProposal(self._session, self._host, self._interceptor) # type: ignore + return self._GetSingleTenantHsmInstanceProposal( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_single_tenant_hsm_instance_proposals( @@ -2366,7 +2350,9 @@ def list_single_tenant_hsm_instance_proposals( ]: # 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._ListSingleTenantHsmInstanceProposals(self._session, self._host, self._interceptor) # type: ignore + return self._ListSingleTenantHsmInstanceProposals( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_single_tenant_hsm_instances( @@ -2377,7 +2363,9 @@ def list_single_tenant_hsm_instances( ]: # 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._ListSingleTenantHsmInstances(self._session, self._host, self._interceptor) # type: ignore + return self._ListSingleTenantHsmInstances( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -3005,9 +2993,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseHsmManagementRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseHsmManagementRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest_base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest_base.py index d8e5ca4a23a4..48ca59615bcc 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest_base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/hsm_management/transports/rest_base.py @@ -17,12 +17,14 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.kms_v1.types import hsm_management diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/async_client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/async_client.py index b3450f8d89d8..33517166e5c6 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/async_client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -44,14 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.kms_v1.services.key_management_service import pagers from google.cloud.kms_v1.types import resources, service @@ -152,7 +154,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: KeyManagementServiceAsyncClient: The constructed client. """ - return KeyManagementServiceClient.from_service_account_info.__func__(KeyManagementServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = KeyManagementServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(KeyManagementServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -168,7 +171,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: KeyManagementServiceAsyncClient: The constructed client. """ - return KeyManagementServiceClient.from_service_account_file.__func__(KeyManagementServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = KeyManagementServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(KeyManagementServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -206,7 +210,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return KeyManagementServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return KeyManagementServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> KeyManagementServiceTransport: diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/client.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/client.py index dbb236f716d9..9537e63dd855 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/client.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.kms_v1.services.key_management_service import pagers from google.cloud.kms_v1.types import resources, service @@ -87,9 +89,7 @@ class KeyManagementServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[KeyManagementServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[KeyManagementServiceTransport]] _transport_registry["grpc"] = KeyManagementServiceGrpcTransport _transport_registry["grpc_asyncio"] = KeyManagementServiceGrpcAsyncIOTransport _transport_registry["rest"] = KeyManagementServiceRestTransport @@ -745,11 +745,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = KeyManagementServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + KeyManagementServiceClient._read_environment_variables() + ) self._client_cert_source = KeyManagementServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -784,8 +782,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(KeyManagementServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/pagers.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/pagers.py index ca1df0009940..2b2fc51a7f33 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/pagers.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/__init__.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/__init__.py index c1465b157cbb..90199bc4b838 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/__init__.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import KeyManagementServiceRestInterceptor, KeyManagementServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[KeyManagementServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[KeyManagementServiceTransport]] _transport_registry["grpc"] = KeyManagementServiceGrpcTransport _transport_registry["grpc_asyncio"] = KeyManagementServiceGrpcAsyncIOTransport _transport_registry["rest"] = KeyManagementServiceRestTransport diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/base.py index a3b748efb138..eea688ab8010 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.kms_v1 import gapic_version as package_version from google.cloud.kms_v1.types import resources, service diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc.py index 69e29d87f76d..280f3463d765 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import resources, service @@ -828,12 +830,12 @@ def update_crypto_key_primary_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_crypto_key_primary_version" not in self._stubs: - self._stubs[ - "update_crypto_key_primary_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKeyPrimaryVersion", - request_serializer=service.UpdateCryptoKeyPrimaryVersionRequest.serialize, - response_deserializer=resources.CryptoKey.deserialize, + self._stubs["update_crypto_key_primary_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKeyPrimaryVersion", + request_serializer=service.UpdateCryptoKeyPrimaryVersionRequest.serialize, + response_deserializer=resources.CryptoKey.deserialize, + ) ) return self._stubs["update_crypto_key_primary_version"] @@ -878,12 +880,12 @@ def destroy_crypto_key_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "destroy_crypto_key_version" not in self._stubs: - self._stubs[ - "destroy_crypto_key_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.KeyManagementService/DestroyCryptoKeyVersion", - request_serializer=service.DestroyCryptoKeyVersionRequest.serialize, - response_deserializer=resources.CryptoKeyVersion.deserialize, + self._stubs["destroy_crypto_key_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.KeyManagementService/DestroyCryptoKeyVersion", + request_serializer=service.DestroyCryptoKeyVersionRequest.serialize, + response_deserializer=resources.CryptoKeyVersion.deserialize, + ) ) return self._stubs["destroy_crypto_key_version"] @@ -917,12 +919,12 @@ def restore_crypto_key_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restore_crypto_key_version" not in self._stubs: - self._stubs[ - "restore_crypto_key_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.KeyManagementService/RestoreCryptoKeyVersion", - request_serializer=service.RestoreCryptoKeyVersionRequest.serialize, - response_deserializer=resources.CryptoKeyVersion.deserialize, + self._stubs["restore_crypto_key_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.KeyManagementService/RestoreCryptoKeyVersion", + request_serializer=service.RestoreCryptoKeyVersionRequest.serialize, + response_deserializer=resources.CryptoKeyVersion.deserialize, + ) ) return self._stubs["restore_crypto_key_version"] diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py index 2a0796c3ea7b..65676dd7a063 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.kms_v1.types import resources, service @@ -855,12 +857,12 @@ def update_crypto_key_primary_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_crypto_key_primary_version" not in self._stubs: - self._stubs[ - "update_crypto_key_primary_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKeyPrimaryVersion", - request_serializer=service.UpdateCryptoKeyPrimaryVersionRequest.serialize, - response_deserializer=resources.CryptoKey.deserialize, + self._stubs["update_crypto_key_primary_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.KeyManagementService/UpdateCryptoKeyPrimaryVersion", + request_serializer=service.UpdateCryptoKeyPrimaryVersionRequest.serialize, + response_deserializer=resources.CryptoKey.deserialize, + ) ) return self._stubs["update_crypto_key_primary_version"] @@ -907,12 +909,12 @@ def destroy_crypto_key_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "destroy_crypto_key_version" not in self._stubs: - self._stubs[ - "destroy_crypto_key_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.KeyManagementService/DestroyCryptoKeyVersion", - request_serializer=service.DestroyCryptoKeyVersionRequest.serialize, - response_deserializer=resources.CryptoKeyVersion.deserialize, + self._stubs["destroy_crypto_key_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.KeyManagementService/DestroyCryptoKeyVersion", + request_serializer=service.DestroyCryptoKeyVersionRequest.serialize, + response_deserializer=resources.CryptoKeyVersion.deserialize, + ) ) return self._stubs["destroy_crypto_key_version"] @@ -948,12 +950,12 @@ def restore_crypto_key_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restore_crypto_key_version" not in self._stubs: - self._stubs[ - "restore_crypto_key_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.kms.v1.KeyManagementService/RestoreCryptoKeyVersion", - request_serializer=service.RestoreCryptoKeyVersionRequest.serialize, - response_deserializer=resources.CryptoKeyVersion.deserialize, + self._stubs["restore_crypto_key_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.kms.v1.KeyManagementService/RestoreCryptoKeyVersion", + request_serializer=service.RestoreCryptoKeyVersionRequest.serialize, + response_deserializer=resources.CryptoKeyVersion.deserialize, + ) ) return self._stubs["restore_crypto_key_version"] diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest.py index 7aa860c37cd2..c5430dd19657 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1970,9 +1972,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseAsymmetricDecrypt._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseAsymmetricDecrypt._get_http_options() request, metadata = self._interceptor.pre_asymmetric_decrypt( request, metadata @@ -2130,9 +2130,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseAsymmetricSign._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseAsymmetricSign._get_http_options() request, metadata = self._interceptor.pre_asymmetric_sign(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseAsymmetricSign._get_transcoded_request( @@ -2291,9 +2289,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseCreateCryptoKey._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseCreateCryptoKey._get_http_options() request, metadata = self._interceptor.pre_create_crypto_key( request, metadata @@ -2460,9 +2456,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseCreateCryptoKeyVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseCreateCryptoKeyVersion._get_http_options() request, metadata = self._interceptor.pre_create_crypto_key_version( request, metadata @@ -2661,9 +2655,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseCreateImportJob._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseCreateImportJob._get_http_options() request, metadata = self._interceptor.pre_create_import_job( request, metadata @@ -2818,9 +2810,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseCreateKeyRing._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseCreateKeyRing._get_http_options() request, metadata = self._interceptor.pre_create_key_ring(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseCreateKeyRing._get_transcoded_request( @@ -2972,9 +2962,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseDecapsulate._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseDecapsulate._get_http_options() request, metadata = self._interceptor.pre_decapsulate(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseDecapsulate._get_transcoded_request( @@ -3294,9 +3282,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseDestroyCryptoKeyVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseDestroyCryptoKeyVersion._get_http_options() request, metadata = self._interceptor.pre_destroy_crypto_key_version( request, metadata @@ -3604,9 +3590,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGenerateRandomBytes._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGenerateRandomBytes._get_http_options() request, metadata = self._interceptor.pre_generate_random_bytes( request, metadata @@ -3770,9 +3754,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetCryptoKey._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetCryptoKey._get_http_options() request, metadata = self._interceptor.pre_get_crypto_key(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetCryptoKey._get_transcoded_request( @@ -3931,9 +3913,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetCryptoKeyVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetCryptoKeyVersion._get_http_options() request, metadata = self._interceptor.pre_get_crypto_key_version( request, metadata @@ -4126,9 +4106,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetImportJob._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetImportJob._get_http_options() request, metadata = self._interceptor.pre_get_import_job(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetImportJob._get_transcoded_request( @@ -4275,9 +4253,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetKeyRing._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetKeyRing._get_http_options() request, metadata = self._interceptor.pre_get_key_ring(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetKeyRing._get_transcoded_request( @@ -4425,9 +4401,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetPublicKey._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetPublicKey._get_http_options() request, metadata = self._interceptor.pre_get_public_key(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetPublicKey._get_transcoded_request( @@ -4587,9 +4561,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseImportCryptoKeyVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseImportCryptoKeyVersion._get_http_options() request, metadata = self._interceptor.pre_import_crypto_key_version( request, metadata @@ -4744,9 +4716,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseListCryptoKeys._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseListCryptoKeys._get_http_options() request, metadata = self._interceptor.pre_list_crypto_keys( request, metadata @@ -4894,9 +4864,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseListCryptoKeyVersions._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseListCryptoKeyVersions._get_http_options() request, metadata = self._interceptor.pre_list_crypto_key_versions( request, metadata @@ -5048,9 +5016,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseListImportJobs._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseListImportJobs._get_http_options() request, metadata = self._interceptor.pre_list_import_jobs( request, metadata @@ -5198,9 +5164,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseListKeyRings._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseListKeyRings._get_http_options() request, metadata = self._interceptor.pre_list_key_rings(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseListKeyRings._get_transcoded_request( @@ -5501,9 +5465,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseMacVerify._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseMacVerify._get_http_options() request, metadata = self._interceptor.pre_mac_verify(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseMacVerify._get_transcoded_request( @@ -5655,9 +5617,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseRawDecrypt._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseRawDecrypt._get_http_options() request, metadata = self._interceptor.pre_raw_decrypt(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseRawDecrypt._get_transcoded_request( @@ -5809,9 +5769,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseRawEncrypt._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseRawEncrypt._get_http_options() request, metadata = self._interceptor.pre_raw_encrypt(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseRawEncrypt._get_transcoded_request( @@ -5977,9 +5935,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseRestoreCryptoKeyVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseRestoreCryptoKeyVersion._get_http_options() request, metadata = self._interceptor.pre_restore_crypto_key_version( request, metadata @@ -6140,9 +6096,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseUpdateCryptoKey._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseUpdateCryptoKey._get_http_options() request, metadata = self._interceptor.pre_update_crypto_key( request, metadata @@ -6306,9 +6260,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseUpdateCryptoKeyPrimaryVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseUpdateCryptoKeyPrimaryVersion._get_http_options() request, metadata = self._interceptor.pre_update_crypto_key_primary_version( request, metadata @@ -6377,11 +6329,10 @@ def __call__( resp = self._interceptor.post_update_crypto_key_primary_version(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_crypto_key_primary_version_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_crypto_key_primary_version_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6478,9 +6429,7 @@ def __call__( """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseUpdateCryptoKeyVersion._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseUpdateCryptoKeyVersion._get_http_options() request, metadata = self._interceptor.pre_update_crypto_key_version( request, metadata @@ -6609,7 +6558,9 @@ def create_crypto_key_version( ) -> Callable[[service.CreateCryptoKeyVersionRequest], resources.CryptoKeyVersion]: # 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._CreateCryptoKeyVersion(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCryptoKeyVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_import_job( @@ -6647,7 +6598,9 @@ def destroy_crypto_key_version( ) -> Callable[[service.DestroyCryptoKeyVersionRequest], resources.CryptoKeyVersion]: # 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._DestroyCryptoKeyVersion(self._session, self._host, self._interceptor) # type: ignore + return self._DestroyCryptoKeyVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def encrypt(self) -> Callable[[service.EncryptRequest], service.EncryptResponse]: @@ -6709,7 +6662,9 @@ def import_crypto_key_version( ) -> Callable[[service.ImportCryptoKeyVersionRequest], resources.CryptoKeyVersion]: # 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._ImportCryptoKeyVersion(self._session, self._host, self._interceptor) # type: ignore + return self._ImportCryptoKeyVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_crypto_keys( @@ -6781,7 +6736,9 @@ def restore_crypto_key_version( ) -> Callable[[service.RestoreCryptoKeyVersionRequest], resources.CryptoKeyVersion]: # 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._RestoreCryptoKeyVersion(self._session, self._host, self._interceptor) # type: ignore + return self._RestoreCryptoKeyVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_crypto_key( @@ -6797,7 +6754,9 @@ def update_crypto_key_primary_version( ) -> Callable[[service.UpdateCryptoKeyPrimaryVersionRequest], resources.CryptoKey]: # 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._UpdateCryptoKeyPrimaryVersion(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCryptoKeyPrimaryVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_crypto_key_version( @@ -6805,7 +6764,9 @@ def update_crypto_key_version( ) -> Callable[[service.UpdateCryptoKeyVersionRequest], resources.CryptoKeyVersion]: # 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._UpdateCryptoKeyVersion(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCryptoKeyVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -6865,9 +6826,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -7006,9 +6965,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -7147,9 +7104,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -7289,9 +7244,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -7436,9 +7389,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -7586,9 +7537,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseKeyManagementServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseKeyManagementServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseKeyManagementServiceRestTransport._BaseGetOperation._get_transcoded_request( diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest_base.py b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest_base.py index 9b8ba9ad899b..34275601d66d 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest_base.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/services/key_management_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/types/autokey_admin.py b/packages/google-cloud-kms/google/cloud/kms_v1/types/autokey_admin.py index 43ff702ed885..804b0fe77684 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/types/autokey_admin.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/types/autokey_admin.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -126,6 +126,7 @@ class State(proto.Enum): has been reset to its default uninitialized state. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 KEY_PROJECT_DELETED = 2 diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/types/ekm_service.py b/packages/google-cloud-kms/google/cloud/kms_v1/types/ekm_service.py index 432553fe0b9b..1ab357b637d6 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/types/ekm_service.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/types/ekm_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -419,6 +419,7 @@ class KeyManagementMode(proto.Enum): [DestroyCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.DestroyCryptoKeyVersion]. - Automatic rotation of key material is supported. """ + KEY_MANAGEMENT_MODE_UNSPECIFIED = 0 MANUAL = 1 CLOUD_KMS = 2 diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/types/hsm_management.py b/packages/google-cloud-kms/google/cloud/kms_v1/types/hsm_management.py index 339ad96e4b64..0c926bb42141 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/types/hsm_management.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/types/hsm_management.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -147,6 +147,7 @@ class State(proto.Enum): [SingleTenantHsmInstance][google.cloud.kms.v1.SingleTenantHsmInstance] has failed and can not be recovered or used. """ + STATE_UNSPECIFIED = 0 CREATING = 1 PENDING_TWO_FACTOR_AUTH_REGISTRATION = 2 @@ -418,6 +419,7 @@ class State(proto.Enum): [SingleTenantHsmInstanceProposal][google.cloud.kms.v1.SingleTenantHsmInstanceProposal] has been deleted and will be purged after the purge_time. """ + STATE_UNSPECIFIED = 0 CREATING = 1 PENDING = 2 @@ -877,12 +879,12 @@ class ListSingleTenantHsmInstancesResponse(proto.Message): def raw_page(self): return self - single_tenant_hsm_instances: MutableSequence[ - "SingleTenantHsmInstance" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SingleTenantHsmInstance", + single_tenant_hsm_instances: MutableSequence["SingleTenantHsmInstance"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SingleTenantHsmInstance", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1091,19 +1093,19 @@ class RequiredActionQuorumReply(proto.Message): required_challenge_replies are provided. """ - required_challenge_replies: MutableSequence[ - "ChallengeReply" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ChallengeReply", + required_challenge_replies: MutableSequence["ChallengeReply"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ChallengeReply", + ) ) - quorum_challenge_replies: MutableSequence[ - "ChallengeReply" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="ChallengeReply", + quorum_challenge_replies: MutableSequence["ChallengeReply"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="ChallengeReply", + ) ) name: str = proto.Field( diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/types/resources.py b/packages/google-cloud-kms/google/cloud/kms_v1/types/resources.py index b4fc7dd9d9b3..17a9ac9d41cf 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/types/resources.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/types/resources.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -65,6 +65,7 @@ class ProtectionLevel(proto.Enum): Crypto operations are performed in a single-tenant HSM. """ + PROTECTION_LEVEL_UNSPECIFIED = 0 SOFTWARE = 1 HSM = 2 @@ -153,6 +154,7 @@ class AccessReason(proto.Enum): - Google-initiated support access to protect system reliability. """ + REASON_UNSPECIFIED = 0 CUSTOMER_INITIATED_SUPPORT = 1 GOOGLE_INITIATED_SERVICE = 2 @@ -379,6 +381,7 @@ class CryptoKeyPurpose(proto.Enum): and [Decapsulate][google.cloud.kms.v1.KeyManagementService.Decapsulate]. """ + CRYPTO_KEY_PURPOSE_UNSPECIFIED = 0 ENCRYPT_DECRYPT = 1 ASYMMETRIC_SIGN = 5 @@ -524,6 +527,7 @@ class AttestationFormat(proto.Enum): gzip. This is a new format introduced in Cavium's version 3.2-08. """ + ATTESTATION_FORMAT_UNSPECIFIED = 0 CAVIUM_V1_COMPRESSED = 3 CAVIUM_V2_COMPRESSED = 4 @@ -832,6 +836,7 @@ class CryptoKeyVersionAlgorithm(proto.Enum): signature algorithm, at security level 1. Randomized version. """ + CRYPTO_KEY_VERSION_ALGORITHM_UNSPECIFIED = 0 GOOGLE_SYMMETRIC_ENCRYPTION = 1 AES_128_GCM = 41 @@ -940,6 +945,7 @@ class CryptoKeyVersionState(proto.Enum): manager was destroyed. Additional details can be found in [CryptoKeyVersion.external_destruction_failure_reason][google.cloud.kms.v1.CryptoKeyVersion.external_destruction_failure_reason]. """ + CRYPTO_KEY_VERSION_STATE_UNSPECIFIED = 0 PENDING_GENERATION = 5 ENABLED = 1 @@ -974,6 +980,7 @@ class CryptoKeyVersionView(proto.Enum): including the [attestation][google.cloud.kms.v1.CryptoKeyVersion.attestation]. """ + CRYPTO_KEY_VERSION_VIEW_UNSPECIFIED = 0 FULL = 1 @@ -1187,6 +1194,7 @@ class PublicKeyFormat(proto.Enum): format defined in its standard https://datatracker.ietf.org/doc/draft-connolly-cfrg-xwing-kem. """ + PUBLIC_KEY_FORMAT_UNSPECIFIED = 0 PEM = 1 DER = 2 @@ -1379,6 +1387,7 @@ class ImportMethod(proto.Enum): this method cannot be used to wrap RSA keys for import. """ + IMPORT_METHOD_UNSPECIFIED = 0 RSA_OAEP_3072_SHA1_AES_256 = 1 RSA_OAEP_4096_SHA1_AES_256 = 2 @@ -1410,6 +1419,7 @@ class ImportJobState(proto.Enum): This job can no longer be used and may not leave this state once entered. """ + IMPORT_JOB_STATE_UNSPECIFIED = 0 PENDING_GENERATION = 1 ACTIVE = 2 diff --git a/packages/google-cloud-kms/google/cloud/kms_v1/types/service.py b/packages/google-cloud-kms/google/cloud/kms_v1/types/service.py index f364eebb8c6b..3568eb1b2ac7 100644 --- a/packages/google-cloud-kms/google/cloud/kms_v1/types/service.py +++ b/packages/google-cloud-kms/google/cloud/kms_v1/types/service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore from google.cloud.kms_v1.types import resources @@ -414,12 +414,12 @@ class ListCryptoKeyVersionsResponse(proto.Message): def raw_page(self): return self - crypto_key_versions: MutableSequence[ - resources.CryptoKeyVersion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.CryptoKeyVersion, + crypto_key_versions: MutableSequence[resources.CryptoKeyVersion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.CryptoKeyVersion, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-kms/noxfile.py b/packages/google-cloud-kms/noxfile.py index cf9b815c11d9..8e17513a6ad8 100644 --- a/packages/google-cloud-kms/noxfile.py +++ b/packages/google-cloud-kms/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_async.py b/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_async.py index 70646a6ef94e..6e34563cc007 100644 --- a/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_async.py +++ b/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_async.py @@ -40,9 +40,7 @@ async def sample_create_single_tenant_hsm_instance_proposal(): # Initialize request argument(s) single_tenant_hsm_instance_proposal = kms_v1.SingleTenantHsmInstanceProposal() - single_tenant_hsm_instance_proposal.register_two_factor_auth_keys.required_approver_count = ( - 2487 - ) + single_tenant_hsm_instance_proposal.register_two_factor_auth_keys.required_approver_count = 2487 single_tenant_hsm_instance_proposal.register_two_factor_auth_keys.two_factor_public_key_pems = [ "two_factor_public_key_pems_value1", "two_factor_public_key_pems_value2", diff --git a/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_sync.py b/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_sync.py index 3f3992a30e0d..b950272bb1ea 100644 --- a/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_sync.py +++ b/packages/google-cloud-kms/samples/generated_samples/cloudkms_v1_generated_hsm_management_create_single_tenant_hsm_instance_proposal_sync.py @@ -40,9 +40,7 @@ def sample_create_single_tenant_hsm_instance_proposal(): # Initialize request argument(s) single_tenant_hsm_instance_proposal = kms_v1.SingleTenantHsmInstanceProposal() - single_tenant_hsm_instance_proposal.register_two_factor_auth_keys.required_approver_count = ( - 2487 - ) + single_tenant_hsm_instance_proposal.register_two_factor_auth_keys.required_approver_count = 2487 single_tenant_hsm_instance_proposal.register_two_factor_auth_keys.two_factor_public_key_pems = [ "two_factor_public_key_pems_value1", "two_factor_public_key_pems_value2", diff --git a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey.py b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey.py index a74651823cc2..f3191f54567a 100644 --- a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey.py +++ b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,10 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +55,16 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -910,10 +912,9 @@ def test_autokey_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -958,10 +959,9 @@ def test_autokey_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -997,10 +997,9 @@ def test_autokey_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1225,13 +1224,13 @@ def test_autokey_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1344,9 +1343,9 @@ def test_create_key_handle_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_key_handle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_key_handle] = ( + mock_rpc + ) request = {} client.create_key_handle(request) @@ -2037,9 +2036,9 @@ def test_list_key_handles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_key_handles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_key_handles] = ( + mock_rpc + ) request = {} client.list_key_handles(request) @@ -2492,9 +2491,9 @@ def test_create_key_handle_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_key_handle - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_key_handle] = ( + mock_rpc + ) request = {} client.create_key_handle(request) @@ -2862,9 +2861,9 @@ def test_list_key_handles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_key_handles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_key_handles] = ( + mock_rpc + ) request = {} client.list_key_handles(request) @@ -3384,8 +3383,9 @@ def test_create_key_handle_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3512,19 +3512,20 @@ def test_create_key_handle_rest_interceptors(null_interceptor): ) client = AutokeyClient(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.AutokeyRestInterceptor, "post_create_key_handle" - ) as post, mock.patch.object( - transports.AutokeyRestInterceptor, "post_create_key_handle_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutokeyRestInterceptor, "pre_create_key_handle" - ) as pre: + 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.AutokeyRestInterceptor, "post_create_key_handle" + ) as post, + mock.patch.object( + transports.AutokeyRestInterceptor, "post_create_key_handle_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutokeyRestInterceptor, "pre_create_key_handle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3573,8 +3574,9 @@ def test_get_key_handle_rest_bad_request(request_type=autokey.GetKeyHandleReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3639,17 +3641,19 @@ def test_get_key_handle_rest_interceptors(null_interceptor): ) client = AutokeyClient(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.AutokeyRestInterceptor, "post_get_key_handle" - ) as post, mock.patch.object( - transports.AutokeyRestInterceptor, "post_get_key_handle_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutokeyRestInterceptor, "pre_get_key_handle" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutokeyRestInterceptor, "post_get_key_handle" + ) as post, + mock.patch.object( + transports.AutokeyRestInterceptor, "post_get_key_handle_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutokeyRestInterceptor, "pre_get_key_handle" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3698,8 +3702,9 @@ def test_list_key_handles_rest_bad_request(request_type=autokey.ListKeyHandlesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3760,17 +3765,19 @@ def test_list_key_handles_rest_interceptors(null_interceptor): ) client = AutokeyClient(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.AutokeyRestInterceptor, "post_list_key_handles" - ) as post, mock.patch.object( - transports.AutokeyRestInterceptor, "post_list_key_handles_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutokeyRestInterceptor, "pre_list_key_handles" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutokeyRestInterceptor, "post_list_key_handles" + ) as post, + mock.patch.object( + transports.AutokeyRestInterceptor, "post_list_key_handles_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.AutokeyRestInterceptor, "pre_list_key_handles" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3823,8 +3830,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3883,8 +3891,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3945,8 +3954,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4007,8 +4017,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4069,8 +4080,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4131,8 +4143,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4332,11 +4345,14 @@ def test_autokey_base_transport(): def test_autokey_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.kms_v1.services.autokey.transports.AutokeyTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.kms_v1.services.autokey.transports.AutokeyTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutokeyTransport( @@ -4356,9 +4372,12 @@ def test_autokey_base_transport_with_credentials_file(): def test_autokey_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.kms_v1.services.autokey.transports.AutokeyTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.kms_v1.services.autokey.transports.AutokeyTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutokeyTransport() @@ -4436,11 +4455,12 @@ def test_autokey_transport_auth_gdch_credentials(transport_class): def test_autokey_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey_admin.py b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey_admin.py index 95d04b5c8944..5c5445dd7d3c 100644 --- a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey_admin.py +++ b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_autokey_admin.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,20 +43,27 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.kms_v1.services.autokey_admin import ( AutokeyAdminAsyncClient, @@ -931,10 +938,9 @@ def test_autokey_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +985,9 @@ def test_autokey_admin_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1023,9 @@ def test_autokey_admin_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1260,13 +1264,13 @@ def test_autokey_admin_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1385,9 +1389,9 @@ def test_update_autokey_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_autokey_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_autokey_config] = ( + mock_rpc + ) request = {} client.update_autokey_config(request) @@ -1749,9 +1753,9 @@ def test_get_autokey_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_autokey_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_autokey_config] = ( + mock_rpc + ) request = {} client.get_autokey_config(request) @@ -2372,9 +2376,9 @@ def test_update_autokey_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_autokey_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_autokey_config] = ( + mock_rpc + ) request = {} client.update_autokey_config(request) @@ -2562,9 +2566,9 @@ def test_get_autokey_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_autokey_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_autokey_config] = ( + mock_rpc + ) request = {} client.get_autokey_config(request) @@ -3206,8 +3210,9 @@ def test_update_autokey_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3349,18 +3354,20 @@ def test_update_autokey_config_rest_interceptors(null_interceptor): ) client = AutokeyAdminClient(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.AutokeyAdminRestInterceptor, "post_update_autokey_config" - ) as post, mock.patch.object( - transports.AutokeyAdminRestInterceptor, - "post_update_autokey_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AutokeyAdminRestInterceptor, "pre_update_autokey_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutokeyAdminRestInterceptor, "post_update_autokey_config" + ) as post, + mock.patch.object( + transports.AutokeyAdminRestInterceptor, + "post_update_autokey_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutokeyAdminRestInterceptor, "pre_update_autokey_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3415,8 +3422,9 @@ def test_get_autokey_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3485,17 +3493,20 @@ def test_get_autokey_config_rest_interceptors(null_interceptor): ) client = AutokeyAdminClient(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.AutokeyAdminRestInterceptor, "post_get_autokey_config" - ) as post, mock.patch.object( - transports.AutokeyAdminRestInterceptor, "post_get_autokey_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AutokeyAdminRestInterceptor, "pre_get_autokey_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutokeyAdminRestInterceptor, "post_get_autokey_config" + ) as post, + mock.patch.object( + transports.AutokeyAdminRestInterceptor, + "post_get_autokey_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutokeyAdminRestInterceptor, "pre_get_autokey_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3550,8 +3561,9 @@ def test_show_effective_autokey_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3614,18 +3626,20 @@ def test_show_effective_autokey_config_rest_interceptors(null_interceptor): ) client = AutokeyAdminClient(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.AutokeyAdminRestInterceptor, "post_show_effective_autokey_config" - ) as post, mock.patch.object( - transports.AutokeyAdminRestInterceptor, - "post_show_effective_autokey_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AutokeyAdminRestInterceptor, "pre_show_effective_autokey_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AutokeyAdminRestInterceptor, "post_show_effective_autokey_config" + ) as post, + mock.patch.object( + transports.AutokeyAdminRestInterceptor, + "post_show_effective_autokey_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AutokeyAdminRestInterceptor, "pre_show_effective_autokey_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3683,8 +3697,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3743,8 +3758,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3805,8 +3821,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3867,8 +3884,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3929,8 +3947,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3991,8 +4010,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4174,11 +4194,14 @@ def test_autokey_admin_base_transport(): def test_autokey_admin_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.kms_v1.services.autokey_admin.transports.AutokeyAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.kms_v1.services.autokey_admin.transports.AutokeyAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutokeyAdminTransport( @@ -4198,9 +4221,12 @@ def test_autokey_admin_base_transport_with_credentials_file(): def test_autokey_admin_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.kms_v1.services.autokey_admin.transports.AutokeyAdminTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.kms_v1.services.autokey_admin.transports.AutokeyAdminTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AutokeyAdminTransport() @@ -4278,11 +4304,12 @@ def test_autokey_admin_transport_auth_gdch_credentials(transport_class): def test_autokey_admin_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_ekm_service.py b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_ekm_service.py index e8395a792a99..670a930c3732 100644 --- a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_ekm_service.py +++ b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_ekm_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,21 +43,28 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.kms_v1.services.ekm_service import ( EkmServiceAsyncClient, @@ -925,10 +932,9 @@ def test_ekm_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +979,9 @@ def test_ekm_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1017,9 @@ def test_ekm_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1244,13 +1248,13 @@ def test_ekm_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1374,9 +1378,9 @@ def test_list_ekm_connections_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ekm_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ekm_connections] = ( + mock_rpc + ) request = {} client.list_ekm_connections(request) @@ -1928,9 +1932,9 @@ def test_get_ekm_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ekm_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ekm_connection] = ( + mock_rpc + ) request = {} client.get_ekm_connection(request) @@ -2290,9 +2294,9 @@ def test_create_ekm_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ekm_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ekm_connection] = ( + mock_rpc + ) request = {} client.create_ekm_connection(request) @@ -2666,9 +2670,9 @@ def test_update_ekm_connection_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ekm_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ekm_connection] = ( + mock_rpc + ) request = {} client.update_ekm_connection(request) @@ -3349,9 +3353,9 @@ def test_update_ekm_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ekm_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ekm_config] = ( + mock_rpc + ) request = {} client.update_ekm_config(request) @@ -3699,9 +3703,9 @@ def test_verify_connectivity_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.verify_connectivity - ] = mock_rpc + client._transport._wrapped_methods[client._transport.verify_connectivity] = ( + mock_rpc + ) request = {} client.verify_connectivity(request) @@ -3969,9 +3973,9 @@ def test_list_ekm_connections_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_ekm_connections - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_ekm_connections] = ( + mock_rpc + ) request = {} client.list_ekm_connections(request) @@ -4233,9 +4237,9 @@ def test_get_ekm_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ekm_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ekm_connection] = ( + mock_rpc + ) request = {} client.get_ekm_connection(request) @@ -4418,9 +4422,9 @@ def test_create_ekm_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ekm_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ekm_connection] = ( + mock_rpc + ) request = {} client.create_ekm_connection(request) @@ -4630,9 +4634,9 @@ def test_update_ekm_connection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ekm_connection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ekm_connection] = ( + mock_rpc + ) request = {} client.update_ekm_connection(request) @@ -4999,9 +5003,9 @@ def test_update_ekm_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ekm_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ekm_config] = ( + mock_rpc + ) request = {} client.update_ekm_config(request) @@ -5191,9 +5195,9 @@ def test_verify_connectivity_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.verify_connectivity - ] = mock_rpc + client._transport._wrapped_methods[client._transport.verify_connectivity] = ( + mock_rpc + ) request = {} client.verify_connectivity(request) @@ -5860,8 +5864,9 @@ def test_list_ekm_connections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5926,17 +5931,20 @@ def test_list_ekm_connections_rest_interceptors(null_interceptor): ) client = EkmServiceClient(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.EkmServiceRestInterceptor, "post_list_ekm_connections" - ) as post, mock.patch.object( - transports.EkmServiceRestInterceptor, "post_list_ekm_connections_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EkmServiceRestInterceptor, "pre_list_ekm_connections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EkmServiceRestInterceptor, "post_list_ekm_connections" + ) as post, + mock.patch.object( + transports.EkmServiceRestInterceptor, + "post_list_ekm_connections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EkmServiceRestInterceptor, "pre_list_ekm_connections" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5994,8 +6002,9 @@ def test_get_ekm_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6067,17 +6076,20 @@ def test_get_ekm_connection_rest_interceptors(null_interceptor): ) client = EkmServiceClient(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.EkmServiceRestInterceptor, "post_get_ekm_connection" - ) as post, mock.patch.object( - transports.EkmServiceRestInterceptor, "post_get_ekm_connection_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EkmServiceRestInterceptor, "pre_get_ekm_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EkmServiceRestInterceptor, "post_get_ekm_connection" + ) as post, + mock.patch.object( + transports.EkmServiceRestInterceptor, + "post_get_ekm_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EkmServiceRestInterceptor, "pre_get_ekm_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6130,8 +6142,9 @@ def test_create_ekm_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6300,17 +6313,20 @@ def test_create_ekm_connection_rest_interceptors(null_interceptor): ) client = EkmServiceClient(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.EkmServiceRestInterceptor, "post_create_ekm_connection" - ) as post, mock.patch.object( - transports.EkmServiceRestInterceptor, "post_create_ekm_connection_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EkmServiceRestInterceptor, "pre_create_ekm_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EkmServiceRestInterceptor, "post_create_ekm_connection" + ) as post, + mock.patch.object( + transports.EkmServiceRestInterceptor, + "post_create_ekm_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EkmServiceRestInterceptor, "pre_create_ekm_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6367,8 +6383,9 @@ def test_update_ekm_connection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6541,17 +6558,20 @@ def test_update_ekm_connection_rest_interceptors(null_interceptor): ) client = EkmServiceClient(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.EkmServiceRestInterceptor, "post_update_ekm_connection" - ) as post, mock.patch.object( - transports.EkmServiceRestInterceptor, "post_update_ekm_connection_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EkmServiceRestInterceptor, "pre_update_ekm_connection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EkmServiceRestInterceptor, "post_update_ekm_connection" + ) as post, + mock.patch.object( + transports.EkmServiceRestInterceptor, + "post_update_ekm_connection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EkmServiceRestInterceptor, "pre_update_ekm_connection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6602,8 +6622,9 @@ def test_get_ekm_config_rest_bad_request(request_type=ekm_service.GetEkmConfigRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6668,17 +6689,19 @@ def test_get_ekm_config_rest_interceptors(null_interceptor): ) client = EkmServiceClient(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.EkmServiceRestInterceptor, "post_get_ekm_config" - ) as post, mock.patch.object( - transports.EkmServiceRestInterceptor, "post_get_ekm_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EkmServiceRestInterceptor, "pre_get_ekm_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EkmServiceRestInterceptor, "post_get_ekm_config" + ) as post, + mock.patch.object( + transports.EkmServiceRestInterceptor, "post_get_ekm_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EkmServiceRestInterceptor, "pre_get_ekm_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6733,8 +6756,9 @@ def test_update_ekm_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6872,17 +6896,19 @@ def test_update_ekm_config_rest_interceptors(null_interceptor): ) client = EkmServiceClient(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.EkmServiceRestInterceptor, "post_update_ekm_config" - ) as post, mock.patch.object( - transports.EkmServiceRestInterceptor, "post_update_ekm_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EkmServiceRestInterceptor, "pre_update_ekm_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EkmServiceRestInterceptor, "post_update_ekm_config" + ) as post, + mock.patch.object( + transports.EkmServiceRestInterceptor, "post_update_ekm_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EkmServiceRestInterceptor, "pre_update_ekm_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6935,8 +6961,9 @@ def test_verify_connectivity_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6996,17 +7023,20 @@ def test_verify_connectivity_rest_interceptors(null_interceptor): ) client = EkmServiceClient(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.EkmServiceRestInterceptor, "post_verify_connectivity" - ) as post, mock.patch.object( - transports.EkmServiceRestInterceptor, "post_verify_connectivity_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EkmServiceRestInterceptor, "pre_verify_connectivity" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EkmServiceRestInterceptor, "post_verify_connectivity" + ) as post, + mock.patch.object( + transports.EkmServiceRestInterceptor, + "post_verify_connectivity_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EkmServiceRestInterceptor, "pre_verify_connectivity" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7064,8 +7094,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7124,8 +7155,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7186,8 +7218,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7248,8 +7281,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7310,8 +7344,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7372,8 +7407,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7645,11 +7681,14 @@ def test_ekm_service_base_transport(): def test_ekm_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.kms_v1.services.ekm_service.transports.EkmServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.kms_v1.services.ekm_service.transports.EkmServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EkmServiceTransport( @@ -7669,9 +7708,12 @@ def test_ekm_service_base_transport_with_credentials_file(): def test_ekm_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.kms_v1.services.ekm_service.transports.EkmServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.kms_v1.services.ekm_service.transports.EkmServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EkmServiceTransport() @@ -7749,11 +7791,12 @@ def test_ekm_service_transport_auth_gdch_credentials(transport_class): def test_ekm_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_hsm_management.py b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_hsm_management.py index 32973c4bd748..d77ab84918c0 100644 --- a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_hsm_management.py +++ b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_hsm_management.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +57,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.kms_v1.services.hsm_management import ( HsmManagementAsyncClient, @@ -957,10 +959,9 @@ def test_hsm_management_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1005,10 +1006,9 @@ def test_hsm_management_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1044,9 @@ def test_hsm_management_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1290,13 +1289,13 @@ def test_hsm_management_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3279,12 +3278,15 @@ def test_approve_single_tenant_hsm_instance_proposal_flattened(): arg = args[0].name mock_val = "name_value" assert arg == mock_val - assert args[ - 0 - ].quorum_reply == hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.QuorumReply( - challenge_replies=[ - hsm_management.ChallengeReply(signed_challenge=b"signed_challenge_blob") - ] + assert ( + args[0].quorum_reply + == hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.QuorumReply( + challenge_replies=[ + hsm_management.ChallengeReply( + signed_challenge=b"signed_challenge_blob" + ) + ] + ) ) @@ -3347,12 +3349,15 @@ async def test_approve_single_tenant_hsm_instance_proposal_flattened_async(): arg = args[0].name mock_val = "name_value" assert arg == mock_val - assert args[ - 0 - ].quorum_reply == hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.QuorumReply( - challenge_replies=[ - hsm_management.ChallengeReply(signed_challenge=b"signed_challenge_blob") - ] + assert ( + args[0].quorum_reply + == hsm_management.ApproveSingleTenantHsmInstanceProposalRequest.QuorumReply( + challenge_replies=[ + hsm_management.ChallengeReply( + signed_challenge=b"signed_challenge_blob" + ) + ] + ) ) @@ -7561,8 +7566,9 @@ def test_list_single_tenant_hsm_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7629,18 +7635,22 @@ def test_list_single_tenant_hsm_instances_rest_interceptors(null_interceptor): ) client = HsmManagementClient(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.HsmManagementRestInterceptor, "post_list_single_tenant_hsm_instances" - ) as post, mock.patch.object( - transports.HsmManagementRestInterceptor, - "post_list_single_tenant_hsm_instances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HsmManagementRestInterceptor, "pre_list_single_tenant_hsm_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_list_single_tenant_hsm_instances", + ) as post, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_list_single_tenant_hsm_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "pre_list_single_tenant_hsm_instances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7700,8 +7710,9 @@ def test_get_single_tenant_hsm_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7768,18 +7779,22 @@ def test_get_single_tenant_hsm_instance_rest_interceptors(null_interceptor): ) client = HsmManagementClient(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.HsmManagementRestInterceptor, "post_get_single_tenant_hsm_instance" - ) as post, mock.patch.object( - transports.HsmManagementRestInterceptor, - "post_get_single_tenant_hsm_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HsmManagementRestInterceptor, "pre_get_single_tenant_hsm_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_get_single_tenant_hsm_instance", + ) as post, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_get_single_tenant_hsm_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "pre_get_single_tenant_hsm_instance", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7837,8 +7852,9 @@ def test_create_single_tenant_hsm_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7984,21 +8000,23 @@ def test_create_single_tenant_hsm_instance_rest_interceptors(null_interceptor): ) client = HsmManagementClient(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.HsmManagementRestInterceptor, - "post_create_single_tenant_hsm_instance", - ) as post, mock.patch.object( - transports.HsmManagementRestInterceptor, - "post_create_single_tenant_hsm_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HsmManagementRestInterceptor, "pre_create_single_tenant_hsm_instance" - ) as pre: + 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.HsmManagementRestInterceptor, + "post_create_single_tenant_hsm_instance", + ) as post, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_create_single_tenant_hsm_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "pre_create_single_tenant_hsm_instance", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8053,8 +8071,9 @@ def test_create_single_tenant_hsm_instance_proposal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8239,22 +8258,23 @@ def test_create_single_tenant_hsm_instance_proposal_rest_interceptors(null_inter ) client = HsmManagementClient(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.HsmManagementRestInterceptor, - "post_create_single_tenant_hsm_instance_proposal", - ) as post, mock.patch.object( - transports.HsmManagementRestInterceptor, - "post_create_single_tenant_hsm_instance_proposal_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HsmManagementRestInterceptor, - "pre_create_single_tenant_hsm_instance_proposal", - ) as pre: + 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.HsmManagementRestInterceptor, + "post_create_single_tenant_hsm_instance_proposal", + ) as post, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_create_single_tenant_hsm_instance_proposal_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "pre_create_single_tenant_hsm_instance_proposal", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8309,8 +8329,9 @@ def test_approve_single_tenant_hsm_instance_proposal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8378,20 +8399,22 @@ def test_approve_single_tenant_hsm_instance_proposal_rest_interceptors( ) client = HsmManagementClient(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.HsmManagementRestInterceptor, - "post_approve_single_tenant_hsm_instance_proposal", - ) as post, mock.patch.object( - transports.HsmManagementRestInterceptor, - "post_approve_single_tenant_hsm_instance_proposal_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HsmManagementRestInterceptor, - "pre_approve_single_tenant_hsm_instance_proposal", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_approve_single_tenant_hsm_instance_proposal", + ) as post, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_approve_single_tenant_hsm_instance_proposal_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "pre_approve_single_tenant_hsm_instance_proposal", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8455,8 +8478,9 @@ def test_execute_single_tenant_hsm_instance_proposal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8517,22 +8541,23 @@ def test_execute_single_tenant_hsm_instance_proposal_rest_interceptors( ) client = HsmManagementClient(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.HsmManagementRestInterceptor, - "post_execute_single_tenant_hsm_instance_proposal", - ) as post, mock.patch.object( - transports.HsmManagementRestInterceptor, - "post_execute_single_tenant_hsm_instance_proposal_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HsmManagementRestInterceptor, - "pre_execute_single_tenant_hsm_instance_proposal", - ) as pre: + 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.HsmManagementRestInterceptor, + "post_execute_single_tenant_hsm_instance_proposal", + ) as post, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_execute_single_tenant_hsm_instance_proposal_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "pre_execute_single_tenant_hsm_instance_proposal", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8587,8 +8612,9 @@ def test_get_single_tenant_hsm_instance_proposal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8659,20 +8685,22 @@ def test_get_single_tenant_hsm_instance_proposal_rest_interceptors(null_intercep ) client = HsmManagementClient(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.HsmManagementRestInterceptor, - "post_get_single_tenant_hsm_instance_proposal", - ) as post, mock.patch.object( - transports.HsmManagementRestInterceptor, - "post_get_single_tenant_hsm_instance_proposal_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HsmManagementRestInterceptor, - "pre_get_single_tenant_hsm_instance_proposal", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_get_single_tenant_hsm_instance_proposal", + ) as post, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_get_single_tenant_hsm_instance_proposal_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "pre_get_single_tenant_hsm_instance_proposal", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8732,8 +8760,9 @@ def test_list_single_tenant_hsm_instance_proposals_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8802,20 +8831,22 @@ def test_list_single_tenant_hsm_instance_proposals_rest_interceptors(null_interc ) client = HsmManagementClient(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.HsmManagementRestInterceptor, - "post_list_single_tenant_hsm_instance_proposals", - ) as post, mock.patch.object( - transports.HsmManagementRestInterceptor, - "post_list_single_tenant_hsm_instance_proposals_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.HsmManagementRestInterceptor, - "pre_list_single_tenant_hsm_instance_proposals", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_list_single_tenant_hsm_instance_proposals", + ) as post, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "post_list_single_tenant_hsm_instance_proposals_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "pre_list_single_tenant_hsm_instance_proposals", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8879,8 +8910,9 @@ def test_delete_single_tenant_hsm_instance_proposal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8939,14 +8971,14 @@ def test_delete_single_tenant_hsm_instance_proposal_rest_interceptors(null_inter ) client = HsmManagementClient(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.HsmManagementRestInterceptor, - "pre_delete_single_tenant_hsm_instance_proposal", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.HsmManagementRestInterceptor, + "pre_delete_single_tenant_hsm_instance_proposal", + ) as pre, + ): pre.assert_not_called() pb_message = hsm_management.DeleteSingleTenantHsmInstanceProposalRequest.pb( hsm_management.DeleteSingleTenantHsmInstanceProposalRequest() @@ -8991,8 +9023,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9051,8 +9084,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9113,8 +9147,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9175,8 +9210,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9237,8 +9273,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9299,8 +9336,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9642,11 +9680,14 @@ def test_hsm_management_base_transport(): def test_hsm_management_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.kms_v1.services.hsm_management.transports.HsmManagementTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.kms_v1.services.hsm_management.transports.HsmManagementTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HsmManagementTransport( @@ -9666,9 +9707,12 @@ def test_hsm_management_base_transport_with_credentials_file(): def test_hsm_management_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.kms_v1.services.hsm_management.transports.HsmManagementTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.kms_v1.services.hsm_management.transports.HsmManagementTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HsmManagementTransport() @@ -9746,11 +9790,12 @@ def test_hsm_management_transport_auth_gdch_credentials(transport_class): def test_hsm_management_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_key_management_service.py b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_key_management_service.py index feae20edd619..eae862b45d9a 100644 --- a/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_key_management_service.py +++ b/packages/google-cloud-kms/tests/unit/gapic/kms_v1/test_key_management_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,23 +43,30 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.kms_v1.services.key_management_service import ( KeyManagementServiceAsyncClient, @@ -1001,10 +1008,9 @@ def test_key_management_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1049,10 +1055,9 @@ def test_key_management_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1088,10 +1093,9 @@ def test_key_management_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1347,13 +1351,13 @@ def test_key_management_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1998,9 +2002,9 @@ def test_list_crypto_keys_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_crypto_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_crypto_keys] = ( + mock_rpc + ) request = {} client.list_crypto_keys(request) @@ -3083,9 +3087,9 @@ def test_list_import_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_import_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_import_jobs] = ( + mock_rpc + ) request = {} client.list_import_jobs(request) @@ -4286,9 +4290,9 @@ def test_get_crypto_key_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_crypto_key_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_crypto_key_version] = ( + mock_rpc + ) request = {} client.get_crypto_key_version(request) @@ -5681,9 +5685,9 @@ def test_create_crypto_key_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_crypto_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_crypto_key] = ( + mock_rpc + ) request = {} client.create_crypto_key(request) @@ -6767,9 +6771,9 @@ def test_create_import_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_import_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_import_job] = ( + mock_rpc + ) request = {} client.create_import_job(request) @@ -7135,9 +7139,9 @@ def test_update_crypto_key_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_crypto_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_crypto_key] = ( + mock_rpc + ) request = {} client.update_crypto_key(request) @@ -10598,9 +10602,9 @@ def test_asymmetric_decrypt_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.asymmetric_decrypt - ] = mock_rpc + client._transport._wrapped_methods[client._transport.asymmetric_decrypt] = ( + mock_rpc + ) request = {} client.asymmetric_decrypt(request) @@ -11915,9 +11919,9 @@ def test_generate_random_bytes_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_random_bytes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_random_bytes] = ( + mock_rpc + ) request = {} client.generate_random_bytes(request) @@ -12461,9 +12465,9 @@ def test_list_crypto_keys_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_crypto_keys - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_crypto_keys] = ( + mock_rpc + ) request = {} client.list_crypto_keys(request) @@ -12998,9 +13002,9 @@ def test_list_import_jobs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_import_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_import_jobs] = ( + mock_rpc + ) request = {} client.list_import_jobs(request) @@ -13618,9 +13622,9 @@ def test_get_crypto_key_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_crypto_key_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_crypto_key_version] = ( + mock_rpc + ) request = {} client.get_crypto_key_version(request) @@ -14364,9 +14368,9 @@ def test_create_crypto_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_crypto_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_crypto_key] = ( + mock_rpc + ) request = {} client.create_crypto_key(request) @@ -14920,9 +14924,9 @@ def test_create_import_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_import_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_import_job] = ( + mock_rpc + ) request = {} client.create_import_job(request) @@ -15131,9 +15135,9 @@ def test_update_crypto_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_crypto_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_crypto_key] = ( + mock_rpc + ) request = {} client.update_crypto_key(request) @@ -16932,9 +16936,9 @@ def test_asymmetric_decrypt_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.asymmetric_decrypt - ] = mock_rpc + client._transport._wrapped_methods[client._transport.asymmetric_decrypt] = ( + mock_rpc + ) request = {} client.asymmetric_decrypt(request) @@ -17656,9 +17660,9 @@ def test_generate_random_bytes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.generate_random_bytes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.generate_random_bytes] = ( + mock_rpc + ) request = {} client.generate_random_bytes(request) @@ -19426,8 +19430,9 @@ def test_list_key_rings_rest_bad_request(request_type=service.ListKeyRingsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19492,18 +19497,20 @@ def test_list_key_rings_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_list_key_rings" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_list_key_rings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_list_key_rings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_list_key_rings" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_list_key_rings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_list_key_rings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19554,8 +19561,9 @@ def test_list_crypto_keys_rest_bad_request(request_type=service.ListCryptoKeysRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19620,18 +19628,20 @@ def test_list_crypto_keys_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_list_crypto_keys" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_list_crypto_keys_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_list_crypto_keys" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_list_crypto_keys" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_list_crypto_keys_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_list_crypto_keys" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19686,8 +19696,9 @@ def test_list_crypto_key_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19754,18 +19765,22 @@ def test_list_crypto_key_versions_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_list_crypto_key_versions" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_list_crypto_key_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_list_crypto_key_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_list_crypto_key_versions", + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_list_crypto_key_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "pre_list_crypto_key_versions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19821,8 +19836,9 @@ def test_list_import_jobs_rest_bad_request(request_type=service.ListImportJobsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19887,18 +19903,20 @@ def test_list_import_jobs_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_list_import_jobs" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_list_import_jobs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_list_import_jobs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_list_import_jobs" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_list_import_jobs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_list_import_jobs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19949,8 +19967,9 @@ def test_get_key_ring_rest_bad_request(request_type=service.GetKeyRingRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20013,18 +20032,20 @@ def test_get_key_ring_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_get_key_ring" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_get_key_ring_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_get_key_ring" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_get_key_ring" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_get_key_ring_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_get_key_ring" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20075,8 +20096,9 @@ def test_get_crypto_key_rest_bad_request(request_type=service.GetCryptoKeyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20147,18 +20169,20 @@ def test_get_crypto_key_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_get_crypto_key" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_get_crypto_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_get_crypto_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_get_crypto_key" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_get_crypto_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_get_crypto_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20211,8 +20235,9 @@ def test_get_crypto_key_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20302,18 +20327,21 @@ def test_get_crypto_key_version_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_get_crypto_key_version" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_get_crypto_key_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_get_crypto_key_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_get_crypto_key_version", + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_get_crypto_key_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_get_crypto_key_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20366,8 +20394,9 @@ def test_get_public_key_rest_bad_request(request_type=service.GetPublicKeyReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20443,18 +20472,20 @@ def test_get_public_key_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_get_public_key" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_get_public_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_get_public_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_get_public_key" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_get_public_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_get_public_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20505,8 +20536,9 @@ def test_get_import_job_rest_bad_request(request_type=service.GetImportJobReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20582,18 +20614,20 @@ def test_get_import_job_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_get_import_job" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_get_import_job_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_get_import_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_get_import_job" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_get_import_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_get_import_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20642,8 +20676,9 @@ def test_create_key_ring_rest_bad_request(request_type=service.CreateKeyRingRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20777,18 +20812,20 @@ def test_create_key_ring_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_create_key_ring" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_create_key_ring_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_create_key_ring" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_create_key_ring" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_create_key_ring_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_create_key_ring" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20839,8 +20876,9 @@ def test_create_crypto_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21024,18 +21062,20 @@ def test_create_crypto_key_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_create_crypto_key" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_create_crypto_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_create_crypto_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_create_crypto_key" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_create_crypto_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_create_crypto_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21088,8 +21128,9 @@ def test_create_crypto_key_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21281,18 +21322,22 @@ def test_create_crypto_key_version_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_create_crypto_key_version" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_create_crypto_key_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_create_crypto_key_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_create_crypto_key_version", + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_create_crypto_key_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "pre_create_crypto_key_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21347,8 +21392,9 @@ def test_import_crypto_key_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21438,18 +21484,22 @@ def test_import_crypto_key_version_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_import_crypto_key_version" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_import_crypto_key_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_import_crypto_key_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_import_crypto_key_version", + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_import_crypto_key_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "pre_import_crypto_key_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21502,8 +21552,9 @@ def test_create_import_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21671,18 +21722,20 @@ def test_create_import_job_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_create_import_job" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_create_import_job_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_create_import_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_create_import_job" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_create_import_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_create_import_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21737,8 +21790,9 @@ def test_update_crypto_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21926,18 +21980,20 @@ def test_update_crypto_key_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_update_crypto_key" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_update_crypto_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_update_crypto_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_update_crypto_key" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_update_crypto_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_update_crypto_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21992,8 +22048,9 @@ def test_update_crypto_key_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22187,18 +22244,22 @@ def test_update_crypto_key_version_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_update_crypto_key_version" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_update_crypto_key_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_update_crypto_key_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_update_crypto_key_version", + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_update_crypto_key_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "pre_update_crypto_key_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22253,8 +22314,9 @@ def test_update_crypto_key_primary_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22325,20 +22387,22 @@ def test_update_crypto_key_primary_version_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, - "post_update_crypto_key_primary_version", - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_update_crypto_key_primary_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "pre_update_crypto_key_primary_version", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_update_crypto_key_primary_version", + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_update_crypto_key_primary_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "pre_update_crypto_key_primary_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22393,8 +22457,9 @@ def test_destroy_crypto_key_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22484,19 +22549,22 @@ def test_destroy_crypto_key_version_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, - "post_destroy_crypto_key_version", - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_destroy_crypto_key_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_destroy_crypto_key_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_destroy_crypto_key_version", + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_destroy_crypto_key_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "pre_destroy_crypto_key_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22551,8 +22619,9 @@ def test_restore_crypto_key_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22642,19 +22711,22 @@ def test_restore_crypto_key_version_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, - "post_restore_crypto_key_version", - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_restore_crypto_key_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_restore_crypto_key_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_restore_crypto_key_version", + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_restore_crypto_key_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "pre_restore_crypto_key_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22707,8 +22779,9 @@ def test_encrypt_rest_bad_request(request_type=service.EncryptRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22781,17 +22854,19 @@ def test_encrypt_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_encrypt" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "post_encrypt_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_encrypt" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_encrypt" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_encrypt_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_encrypt" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22842,8 +22917,9 @@ def test_decrypt_rest_bad_request(request_type=service.DecryptRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22912,17 +22988,19 @@ def test_decrypt_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_decrypt" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "post_decrypt_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_decrypt" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_decrypt" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_decrypt_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_decrypt" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22973,8 +23051,9 @@ def test_raw_encrypt_rest_bad_request(request_type=service.RawEncryptRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23053,17 +23132,20 @@ def test_raw_encrypt_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_raw_encrypt" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "post_raw_encrypt_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_raw_encrypt" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_raw_encrypt" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_raw_encrypt_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_raw_encrypt" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23114,8 +23196,9 @@ def test_raw_decrypt_rest_bad_request(request_type=service.RawDecryptRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23188,17 +23271,20 @@ def test_raw_decrypt_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_raw_decrypt" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "post_raw_decrypt_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_raw_decrypt" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_raw_decrypt" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_raw_decrypt_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_raw_decrypt" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23249,8 +23335,9 @@ def test_asymmetric_sign_rest_bad_request(request_type=service.AsymmetricSignReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23323,18 +23410,20 @@ def test_asymmetric_sign_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_asymmetric_sign" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_asymmetric_sign_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_asymmetric_sign" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_asymmetric_sign" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_asymmetric_sign_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_asymmetric_sign" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23389,8 +23478,9 @@ def test_asymmetric_decrypt_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23459,18 +23549,20 @@ def test_asymmetric_decrypt_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_asymmetric_decrypt" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_asymmetric_decrypt_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_asymmetric_decrypt" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_asymmetric_decrypt" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_asymmetric_decrypt_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_asymmetric_decrypt" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23525,8 +23617,9 @@ def test_mac_sign_rest_bad_request(request_type=service.MacSignRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23597,17 +23690,20 @@ def test_mac_sign_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_mac_sign" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "post_mac_sign_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_mac_sign" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_mac_sign" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_mac_sign_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_mac_sign" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23658,8 +23754,9 @@ def test_mac_verify_rest_bad_request(request_type=service.MacVerifyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23734,17 +23831,20 @@ def test_mac_verify_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_mac_verify" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "post_mac_verify_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_mac_verify" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_mac_verify" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_mac_verify_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_mac_verify" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23795,8 +23895,9 @@ def test_decapsulate_rest_bad_request(request_type=service.DecapsulateRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23869,17 +23970,20 @@ def test_decapsulate_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_decapsulate" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "post_decapsulate_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_decapsulate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_decapsulate" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_decapsulate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_decapsulate" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23932,8 +24036,9 @@ def test_generate_random_bytes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23996,18 +24101,20 @@ def test_generate_random_bytes_rest_interceptors(null_interceptor): ) client = KeyManagementServiceClient(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.KeyManagementServiceRestInterceptor, "post_generate_random_bytes" - ) as post, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, - "post_generate_random_bytes_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.KeyManagementServiceRestInterceptor, "pre_generate_random_bytes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "post_generate_random_bytes" + ) as post, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, + "post_generate_random_bytes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.KeyManagementServiceRestInterceptor, "pre_generate_random_bytes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24065,8 +24172,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24125,8 +24233,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24187,8 +24296,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24249,8 +24359,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24311,8 +24422,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -24373,8 +24485,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -25122,11 +25235,14 @@ def test_key_management_service_base_transport(): def test_key_management_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.kms_v1.services.key_management_service.transports.KeyManagementServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.kms_v1.services.key_management_service.transports.KeyManagementServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.KeyManagementServiceTransport( @@ -25146,9 +25262,12 @@ def test_key_management_service_base_transport_with_credentials_file(): def test_key_management_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.kms_v1.services.key_management_service.transports.KeyManagementServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.kms_v1.services.key_management_service.transports.KeyManagementServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.KeyManagementServiceTransport() @@ -25226,11 +25345,12 @@ def test_key_management_service_transport_auth_gdch_credentials(transport_class) def test_key_management_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-language/docs/conf.py b/packages/google-cloud-language/docs/conf.py index 52e4d8a5cd4c..fdd44858668b 100644 --- a/packages/google-cloud-language/docs/conf.py +++ b/packages/google-cloud-language/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-language documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-language/google/cloud/language_v1/__init__.py b/packages/google-cloud-language/google/cloud/language_v1/__init__.py index 35f37c76a388..5a6b3ac69d4d 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.language_service import LanguageServiceAsyncClient, LanguageServiceClient from .types.language_service import ( AnalyzeEntitiesRequest, diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/async_client.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/async_client.py index 604b436bcae2..383c7c17c169 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/async_client.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v1 import gapic_version as package_version @@ -112,7 +112,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LanguageServiceAsyncClient: The constructed client. """ - return LanguageServiceClient.from_service_account_info.__func__(LanguageServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = LanguageServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(LanguageServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +129,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LanguageServiceAsyncClient: The constructed client. """ - return LanguageServiceClient.from_service_account_file.__func__(LanguageServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = LanguageServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(LanguageServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/client.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/client.py index 11f77c44c275..77bae4803ec7 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/client.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v1 import gapic_version as package_version @@ -77,9 +77,7 @@ class LanguageServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LanguageServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LanguageServiceTransport]] _transport_registry["grpc"] = LanguageServiceGrpcTransport _transport_registry["grpc_asyncio"] = LanguageServiceGrpcAsyncIOTransport _transport_registry["rest"] = LanguageServiceRestTransport @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LanguageServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LanguageServiceClient._read_environment_variables() + ) self._client_cert_source = LanguageServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LanguageServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/base.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/base.py index 652ba8d31814..d630e3631cf7 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/base.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v1 import gapic_version as package_version from google.cloud.language_v1.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc.py index 41be62d85c04..119597f4af99 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.language_v1.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc_asyncio.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc_asyncio.py index 75ad3954766b..e4590b1f6334 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.language_v1.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/rest.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/rest.py index dd88782c87e4..1a965757f7a8 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/rest.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -633,9 +633,7 @@ def __call__( The entity analysis response message. """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeEntities._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeEntities._get_http_options() request, metadata = self._interceptor.pre_analyze_entities( request, metadata @@ -791,9 +789,7 @@ def __call__( """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeEntitySentiment._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeEntitySentiment._get_http_options() request, metadata = self._interceptor.pre_analyze_entity_sentiment( request, metadata @@ -952,9 +948,7 @@ def __call__( """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeSentiment._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeSentiment._get_http_options() request, metadata = self._interceptor.pre_analyze_sentiment( request, metadata @@ -1690,7 +1684,9 @@ def analyze_entity_sentiment( ]: # 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._AnalyzeEntitySentiment(self._session, self._host, self._interceptor) # type: ignore + return self._AnalyzeEntitySentiment( + self._session, self._host, self._interceptor + ) # type: ignore @property def analyze_sentiment( diff --git a/packages/google-cloud-language/google/cloud/language_v1/types/language_service.py b/packages/google-cloud-language/google/cloud/language_v1/types/language_service.py index 64994ab8bc8c..b46f6479e6db 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/types/language_service.py +++ b/packages/google-cloud-language/google/cloud/language_v1/types/language_service.py @@ -80,6 +80,7 @@ class EncodingType(proto.Enum): is an example of a language that uses this encoding natively. """ + NONE = 0 UTF8 = 1 UTF16 = 2 @@ -136,6 +137,7 @@ class Type(proto.Enum): HTML (2): HTML """ + TYPE_UNSPECIFIED = 0 PLAIN_TEXT = 1 HTML = 2 @@ -293,6 +295,7 @@ class Type(proto.Enum): The metadata identifies the ``value`` and ``currency``. """ + UNKNOWN = 0 PERSON = 1 LOCATION = 2 @@ -462,6 +465,7 @@ class Tag(proto.Enum): AFFIX (13): Affix """ + UNKNOWN = 0 ADJ = 1 ADP = 2 @@ -492,6 +496,7 @@ class Aspect(proto.Enum): PROGRESSIVE (3): Progressive """ + ASPECT_UNKNOWN = 0 PERFECTIVE = 1 IMPERFECTIVE = 2 @@ -536,6 +541,7 @@ class Case(proto.Enum): VOCATIVE (14): Vocative """ + CASE_UNKNOWN = 0 ACCUSATIVE = 1 ADVERBIAL = 2 @@ -586,6 +592,7 @@ class Form(proto.Enum): SPECIFIC (11): Specific form """ + FORM_UNKNOWN = 0 ADNOMIAL = 1 AUXILIARY = 2 @@ -614,6 +621,7 @@ class Gender(proto.Enum): NEUTER (3): Neuter """ + GENDER_UNKNOWN = 0 FEMININE = 1 MASCULINE = 2 @@ -640,6 +648,7 @@ class Mood(proto.Enum): SUBJUNCTIVE (6): Subjunctive """ + MOOD_UNKNOWN = 0 CONDITIONAL_MOOD = 1 IMPERATIVE = 2 @@ -662,6 +671,7 @@ class Number(proto.Enum): DUAL (3): Dual """ + NUMBER_UNKNOWN = 0 SINGULAR = 1 PLURAL = 2 @@ -684,6 +694,7 @@ class Person(proto.Enum): REFLEXIVE_PERSON (4): Reflexive """ + PERSON_UNKNOWN = 0 FIRST = 1 SECOND = 2 @@ -702,6 +713,7 @@ class Proper(proto.Enum): NOT_PROPER (2): Not proper """ + PROPER_UNKNOWN = 0 PROPER = 1 NOT_PROPER = 2 @@ -718,6 +730,7 @@ class Reciprocity(proto.Enum): NON_RECIPROCAL (2): Non-reciprocal """ + RECIPROCITY_UNKNOWN = 0 RECIPROCAL = 1 NON_RECIPROCAL = 2 @@ -742,6 +755,7 @@ class Tense(proto.Enum): PLUPERFECT (6): Pluperfect """ + TENSE_UNKNOWN = 0 CONDITIONAL_TENSE = 1 FUTURE = 2 @@ -765,6 +779,7 @@ class Voice(proto.Enum): PASSIVE (3): Passive """ + VOICE_UNKNOWN = 0 ACTIVE = 1 CAUSATIVE = 2 @@ -1025,6 +1040,7 @@ class Label(proto.Enum): NCOMP (82): Nominal complement of a noun """ + UNKNOWN = 0 ABBREV = 1 ACOMP = 2 @@ -1148,6 +1164,7 @@ class Type(proto.Enum): COMMON (2): Common noun (or noun compound) """ + TYPE_UNKNOWN = 0 PROPER = 1 COMMON = 2 @@ -1266,6 +1283,7 @@ class ContentCategoriesVersion(proto.Enum): V2 (2): Updated content categories in 2022. """ + CONTENT_CATEGORIES_VERSION_UNSPECIFIED = 0 V1 = 1 V2 = 2 @@ -1562,12 +1580,12 @@ class ModerateTextResponse(proto.Message): the input document. """ - moderation_categories: MutableSequence[ - "ClassificationCategory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ClassificationCategory", + moderation_categories: MutableSequence["ClassificationCategory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ClassificationCategory", + ) ) @@ -1721,12 +1739,12 @@ class AnnotateTextResponse(proto.Message): number=6, message="ClassificationCategory", ) - moderation_categories: MutableSequence[ - "ClassificationCategory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="ClassificationCategory", + moderation_categories: MutableSequence["ClassificationCategory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="ClassificationCategory", + ) ) diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/__init__.py b/packages/google-cloud-language/google/cloud/language_v1beta2/__init__.py index 5fc6e884ffad..08b77eab2f12 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.language_service import LanguageServiceAsyncClient, LanguageServiceClient from .types.language_service import ( AnalyzeEntitiesRequest, diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/async_client.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/async_client.py index 90788be4c3e3..f4e409b1de5f 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/async_client.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v1beta2 import gapic_version as package_version @@ -112,7 +112,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LanguageServiceAsyncClient: The constructed client. """ - return LanguageServiceClient.from_service_account_info.__func__(LanguageServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = LanguageServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(LanguageServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +129,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LanguageServiceAsyncClient: The constructed client. """ - return LanguageServiceClient.from_service_account_file.__func__(LanguageServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = LanguageServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(LanguageServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/client.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/client.py index 02e839260c7d..6429a5c16ef9 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/client.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v1beta2 import gapic_version as package_version @@ -77,9 +77,7 @@ class LanguageServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LanguageServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LanguageServiceTransport]] _transport_registry["grpc"] = LanguageServiceGrpcTransport _transport_registry["grpc_asyncio"] = LanguageServiceGrpcAsyncIOTransport _transport_registry["rest"] = LanguageServiceRestTransport @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LanguageServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LanguageServiceClient._read_environment_variables() + ) self._client_cert_source = LanguageServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LanguageServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/base.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/base.py index d2f3ef846d65..4fa4d5e49a27 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/base.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v1beta2 import gapic_version as package_version from google.cloud.language_v1beta2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc.py index a1b1024bd3fc..e8e9e0c5456d 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.language_v1beta2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc_asyncio.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc_asyncio.py index 650af7d270fb..a27cd776a646 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.language_v1beta2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/rest.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/rest.py index 73e1571fd611..75ab8665949c 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/rest.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -633,9 +633,7 @@ def __call__( The entity analysis response message. """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeEntities._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeEntities._get_http_options() request, metadata = self._interceptor.pre_analyze_entities( request, metadata @@ -791,9 +789,7 @@ def __call__( """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeEntitySentiment._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeEntitySentiment._get_http_options() request, metadata = self._interceptor.pre_analyze_entity_sentiment( request, metadata @@ -952,9 +948,7 @@ def __call__( """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeSentiment._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeSentiment._get_http_options() request, metadata = self._interceptor.pre_analyze_sentiment( request, metadata @@ -1690,7 +1684,9 @@ def analyze_entity_sentiment( ]: # 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._AnalyzeEntitySentiment(self._session, self._host, self._interceptor) # type: ignore + return self._AnalyzeEntitySentiment( + self._session, self._host, self._interceptor + ) # type: ignore @property def analyze_sentiment( diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/types/language_service.py b/packages/google-cloud-language/google/cloud/language_v1beta2/types/language_service.py index 7be1d2a2ab6d..41f4f9dc83a9 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/types/language_service.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/types/language_service.py @@ -80,6 +80,7 @@ class EncodingType(proto.Enum): is an example of a language that uses this encoding natively. """ + NONE = 0 UTF8 = 1 UTF16 = 2 @@ -146,6 +147,7 @@ class Type(proto.Enum): HTML (2): HTML """ + TYPE_UNSPECIFIED = 0 PLAIN_TEXT = 1 HTML = 2 @@ -163,6 +165,7 @@ class BoilerplateHandling(proto.Enum): KEEP_BOILERPLATE (2): Treat boilerplate the same as content. """ + BOILERPLATE_HANDLING_UNSPECIFIED = 0 SKIP_BOILERPLATE = 1 KEEP_BOILERPLATE = 2 @@ -329,6 +332,7 @@ class Type(proto.Enum): The metadata identifies the ``value`` and ``currency``. """ + UNKNOWN = 0 PERSON = 1 LOCATION = 2 @@ -497,6 +501,7 @@ class Tag(proto.Enum): AFFIX (13): Affix """ + UNKNOWN = 0 ADJ = 1 ADP = 2 @@ -527,6 +532,7 @@ class Aspect(proto.Enum): PROGRESSIVE (3): Progressive """ + ASPECT_UNKNOWN = 0 PERFECTIVE = 1 IMPERFECTIVE = 2 @@ -571,6 +577,7 @@ class Case(proto.Enum): VOCATIVE (14): Vocative """ + CASE_UNKNOWN = 0 ACCUSATIVE = 1 ADVERBIAL = 2 @@ -621,6 +628,7 @@ class Form(proto.Enum): SPECIFIC (11): Specific form """ + FORM_UNKNOWN = 0 ADNOMIAL = 1 AUXILIARY = 2 @@ -649,6 +657,7 @@ class Gender(proto.Enum): NEUTER (3): Neuter """ + GENDER_UNKNOWN = 0 FEMININE = 1 MASCULINE = 2 @@ -675,6 +684,7 @@ class Mood(proto.Enum): SUBJUNCTIVE (6): Subjunctive """ + MOOD_UNKNOWN = 0 CONDITIONAL_MOOD = 1 IMPERATIVE = 2 @@ -697,6 +707,7 @@ class Number(proto.Enum): DUAL (3): Dual """ + NUMBER_UNKNOWN = 0 SINGULAR = 1 PLURAL = 2 @@ -719,6 +730,7 @@ class Person(proto.Enum): REFLEXIVE_PERSON (4): Reflexive """ + PERSON_UNKNOWN = 0 FIRST = 1 SECOND = 2 @@ -737,6 +749,7 @@ class Proper(proto.Enum): NOT_PROPER (2): Not proper """ + PROPER_UNKNOWN = 0 PROPER = 1 NOT_PROPER = 2 @@ -753,6 +766,7 @@ class Reciprocity(proto.Enum): NON_RECIPROCAL (2): Non-reciprocal """ + RECIPROCITY_UNKNOWN = 0 RECIPROCAL = 1 NON_RECIPROCAL = 2 @@ -777,6 +791,7 @@ class Tense(proto.Enum): PLUPERFECT (6): Pluperfect """ + TENSE_UNKNOWN = 0 CONDITIONAL_TENSE = 1 FUTURE = 2 @@ -800,6 +815,7 @@ class Voice(proto.Enum): PASSIVE (3): Passive """ + VOICE_UNKNOWN = 0 ACTIVE = 1 CAUSATIVE = 2 @@ -1058,6 +1074,7 @@ class Label(proto.Enum): NCOMP (82): Nominal complement of a noun """ + UNKNOWN = 0 ABBREV = 1 ACOMP = 2 @@ -1181,6 +1198,7 @@ class Type(proto.Enum): COMMON (2): Common noun (or noun compound) """ + TYPE_UNKNOWN = 0 PROPER = 1 COMMON = 2 @@ -1299,6 +1317,7 @@ class ContentCategoriesVersion(proto.Enum): V2 (2): Updated content categories in 2022. """ + CONTENT_CATEGORIES_VERSION_UNSPECIFIED = 0 V1 = 1 V2 = 2 @@ -1596,12 +1615,12 @@ class ModerateTextResponse(proto.Message): the input document. """ - moderation_categories: MutableSequence[ - "ClassificationCategory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ClassificationCategory", + moderation_categories: MutableSequence["ClassificationCategory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ClassificationCategory", + ) ) @@ -1758,12 +1777,12 @@ class AnnotateTextResponse(proto.Message): number=6, message="ClassificationCategory", ) - moderation_categories: MutableSequence[ - "ClassificationCategory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message="ClassificationCategory", + moderation_categories: MutableSequence["ClassificationCategory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message="ClassificationCategory", + ) ) diff --git a/packages/google-cloud-language/google/cloud/language_v2/__init__.py b/packages/google-cloud-language/google/cloud/language_v2/__init__.py index 5e0e470bd2d2..6f90d4ce26de 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.language_service import LanguageServiceAsyncClient, LanguageServiceClient from .types.language_service import ( AnalyzeEntitiesRequest, diff --git a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/async_client.py b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/async_client.py index 6626a4411ee2..95e22b40bd15 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/async_client.py +++ b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v2 import gapic_version as package_version @@ -112,7 +112,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LanguageServiceAsyncClient: The constructed client. """ - return LanguageServiceClient.from_service_account_info.__func__(LanguageServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = LanguageServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(LanguageServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -128,7 +129,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LanguageServiceAsyncClient: The constructed client. """ - return LanguageServiceClient.from_service_account_file.__func__(LanguageServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = LanguageServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(LanguageServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/client.py b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/client.py index 2bb46b6baeb9..2fd04191a594 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/client.py +++ b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v2 import gapic_version as package_version @@ -77,9 +77,7 @@ class LanguageServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LanguageServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LanguageServiceTransport]] _transport_registry["grpc"] = LanguageServiceGrpcTransport _transport_registry["grpc_asyncio"] = LanguageServiceGrpcAsyncIOTransport _transport_registry["rest"] = LanguageServiceRestTransport @@ -601,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LanguageServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LanguageServiceClient._read_environment_variables() + ) self._client_cert_source = LanguageServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LanguageServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/base.py b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/base.py index cda739ff3f5d..cc05f0c42c09 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/base.py +++ b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.language_v2 import gapic_version as package_version from google.cloud.language_v2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc.py b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc.py index 42eeb1d5a5ba..839d35bd45de 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc.py +++ b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.language_v2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc_asyncio.py b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc_asyncio.py index 539e1396ea3b..6e1ff3d978b3 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.language_v2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/rest.py b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/rest.py index 53c8ce95b1e1..9b3ca98e498d 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/rest.py +++ b/packages/google-cloud-language/google/cloud/language_v2/services/language_service/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -515,9 +515,7 @@ def __call__( The entity analysis response message. """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeEntities._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeEntities._get_http_options() request, metadata = self._interceptor.pre_analyze_entities( request, metadata @@ -672,9 +670,7 @@ def __call__( """ - http_options = ( - _BaseLanguageServiceRestTransport._BaseAnalyzeSentiment._get_http_options() - ) + http_options = _BaseLanguageServiceRestTransport._BaseAnalyzeSentiment._get_http_options() request, metadata = self._interceptor.pre_analyze_sentiment( request, metadata diff --git a/packages/google-cloud-language/google/cloud/language_v2/types/language_service.py b/packages/google-cloud-language/google/cloud/language_v2/types/language_service.py index 54fc5a85156d..d422df78b887 100644 --- a/packages/google-cloud-language/google/cloud/language_v2/types/language_service.py +++ b/packages/google-cloud-language/google/cloud/language_v2/types/language_service.py @@ -72,6 +72,7 @@ class EncodingType(proto.Enum): is an example of a language that uses this encoding natively. """ + NONE = 0 UTF8 = 1 UTF16 = 2 @@ -128,6 +129,7 @@ class Type(proto.Enum): HTML (2): HTML """ + TYPE_UNSPECIFIED = 0 PLAIN_TEXT = 1 HTML = 2 @@ -275,6 +277,7 @@ class Type(proto.Enum): The metadata identifies the ``value`` and ``currency``. """ + UNKNOWN = 0 PERSON = 1 LOCATION = 2 @@ -372,6 +375,7 @@ class Type(proto.Enum): COMMON (2): Common noun (or noun compound) """ + TYPE_UNKNOWN = 0 PROPER = 1 COMMON = 2 @@ -651,6 +655,7 @@ class ModelVersion(proto.Enum): returns severity score for a subset of the categories. """ + MODEL_VERSION_UNSPECIFIED = 0 MODEL_VERSION_1 = 1 MODEL_VERSION_2 = 2 @@ -686,12 +691,12 @@ class ModerateTextResponse(proto.Message): effort basis. """ - moderation_categories: MutableSequence[ - "ClassificationCategory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ClassificationCategory", + moderation_categories: MutableSequence["ClassificationCategory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ClassificationCategory", + ) ) language_code: str = proto.Field( proto.STRING, @@ -828,12 +833,12 @@ class AnnotateTextResponse(proto.Message): number=5, message="ClassificationCategory", ) - moderation_categories: MutableSequence[ - "ClassificationCategory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="ClassificationCategory", + moderation_categories: MutableSequence["ClassificationCategory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="ClassificationCategory", + ) ) language_supported: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-language/noxfile.py b/packages/google-cloud-language/noxfile.py index d670857c0c09..22f5195e8ce4 100644 --- a/packages/google-cloud-language/noxfile.py +++ b/packages/google-cloud-language/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-language/tests/unit/gapic/language_v1/test_language_service.py b/packages/google-cloud-language/tests/unit/gapic/language_v1/test_language_service.py index e5e5b3125756..1a48f6c4f609 100644 --- a/packages/google-cloud-language/tests/unit/gapic/language_v1/test_language_service.py +++ b/packages/google-cloud-language/tests/unit/gapic/language_v1/test_language_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -968,10 +973,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1020,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1055,10 +1058,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1301,13 +1303,13 @@ def test_language_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1417,9 +1419,9 @@ def test_analyze_sentiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_sentiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_sentiment] = ( + mock_rpc + ) request = {} client.analyze_sentiment(request) @@ -1706,9 +1708,9 @@ def test_analyze_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_entities] = ( + mock_rpc + ) request = {} client.analyze_entities(request) @@ -3323,9 +3325,9 @@ def test_analyze_sentiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_sentiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_sentiment] = ( + mock_rpc + ) request = {} client.analyze_sentiment(request) @@ -3503,9 +3505,9 @@ def test_analyze_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_entities] = ( + mock_rpc + ) request = {} client.analyze_entities(request) @@ -5043,8 +5045,9 @@ def test_analyze_sentiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5107,18 +5110,20 @@ def test_analyze_sentiment_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_analyze_sentiment" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, - "post_analyze_sentiment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_analyze_sentiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_analyze_sentiment" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_analyze_sentiment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_analyze_sentiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5176,8 +5181,9 @@ def test_analyze_entities_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5240,17 +5246,20 @@ def test_analyze_entities_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_analyze_entities" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_analyze_entities_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_analyze_entities" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_analyze_entities" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_analyze_entities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_analyze_entities" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5308,8 +5317,9 @@ def test_analyze_entity_sentiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5372,18 +5382,20 @@ def test_analyze_entity_sentiment_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_analyze_entity_sentiment" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, - "post_analyze_entity_sentiment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_analyze_entity_sentiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_analyze_entity_sentiment" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_analyze_entity_sentiment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_analyze_entity_sentiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5441,8 +5453,9 @@ def test_analyze_syntax_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5505,17 +5518,20 @@ def test_analyze_syntax_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_analyze_syntax" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_analyze_syntax_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_analyze_syntax" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_analyze_syntax" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_analyze_syntax_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_analyze_syntax" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5573,8 +5589,9 @@ def test_classify_text_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5634,17 +5651,20 @@ def test_classify_text_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_classify_text" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_classify_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_classify_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_classify_text" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_classify_text_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_classify_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5702,8 +5722,9 @@ def test_moderate_text_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5763,17 +5784,20 @@ def test_moderate_text_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_moderate_text" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_moderate_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_moderate_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_moderate_text" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_moderate_text_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_moderate_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5831,8 +5855,9 @@ def test_annotate_text_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5895,17 +5920,20 @@ def test_annotate_text_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_annotate_text" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_annotate_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_annotate_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_annotate_text" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_annotate_text_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_annotate_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6162,11 +6190,14 @@ def test_language_service_base_transport(): def test_language_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.language_v1.services.language_service.transports.LanguageServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.language_v1.services.language_service.transports.LanguageServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LanguageServiceTransport( @@ -6186,9 +6217,12 @@ def test_language_service_base_transport_with_credentials_file(): def test_language_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.language_v1.services.language_service.transports.LanguageServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.language_v1.services.language_service.transports.LanguageServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LanguageServiceTransport() @@ -6266,11 +6300,12 @@ def test_language_service_transport_auth_gdch_credentials(transport_class): def test_language_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-language/tests/unit/gapic/language_v1beta2/test_language_service.py b/packages/google-cloud-language/tests/unit/gapic/language_v1beta2/test_language_service.py index 213af1c57113..da8d8d8e1d45 100644 --- a/packages/google-cloud-language/tests/unit/gapic/language_v1beta2/test_language_service.py +++ b/packages/google-cloud-language/tests/unit/gapic/language_v1beta2/test_language_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -968,10 +973,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1020,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1055,10 +1058,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1301,13 +1303,13 @@ def test_language_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1417,9 +1419,9 @@ def test_analyze_sentiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_sentiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_sentiment] = ( + mock_rpc + ) request = {} client.analyze_sentiment(request) @@ -1706,9 +1708,9 @@ def test_analyze_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_entities] = ( + mock_rpc + ) request = {} client.analyze_entities(request) @@ -3323,9 +3325,9 @@ def test_analyze_sentiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_sentiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_sentiment] = ( + mock_rpc + ) request = {} client.analyze_sentiment(request) @@ -3503,9 +3505,9 @@ def test_analyze_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_entities] = ( + mock_rpc + ) request = {} client.analyze_entities(request) @@ -5044,8 +5046,9 @@ def test_analyze_sentiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5108,18 +5111,20 @@ def test_analyze_sentiment_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_analyze_sentiment" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, - "post_analyze_sentiment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_analyze_sentiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_analyze_sentiment" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_analyze_sentiment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_analyze_sentiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5177,8 +5182,9 @@ def test_analyze_entities_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5241,17 +5247,20 @@ def test_analyze_entities_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_analyze_entities" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_analyze_entities_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_analyze_entities" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_analyze_entities" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_analyze_entities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_analyze_entities" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5309,8 +5318,9 @@ def test_analyze_entity_sentiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5373,18 +5383,20 @@ def test_analyze_entity_sentiment_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_analyze_entity_sentiment" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, - "post_analyze_entity_sentiment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_analyze_entity_sentiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_analyze_entity_sentiment" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_analyze_entity_sentiment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_analyze_entity_sentiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5442,8 +5454,9 @@ def test_analyze_syntax_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5506,17 +5519,20 @@ def test_analyze_syntax_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_analyze_syntax" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_analyze_syntax_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_analyze_syntax" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_analyze_syntax" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_analyze_syntax_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_analyze_syntax" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5574,8 +5590,9 @@ def test_classify_text_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5635,17 +5652,20 @@ def test_classify_text_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_classify_text" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_classify_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_classify_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_classify_text" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_classify_text_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_classify_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5703,8 +5723,9 @@ def test_moderate_text_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5764,17 +5785,20 @@ def test_moderate_text_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_moderate_text" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_moderate_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_moderate_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_moderate_text" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_moderate_text_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_moderate_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5832,8 +5856,9 @@ def test_annotate_text_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5896,17 +5921,20 @@ def test_annotate_text_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_annotate_text" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_annotate_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_annotate_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_annotate_text" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_annotate_text_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_annotate_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6163,11 +6191,14 @@ def test_language_service_base_transport(): def test_language_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.language_v1beta2.services.language_service.transports.LanguageServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.language_v1beta2.services.language_service.transports.LanguageServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LanguageServiceTransport( @@ -6187,9 +6218,12 @@ def test_language_service_base_transport_with_credentials_file(): def test_language_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.language_v1beta2.services.language_service.transports.LanguageServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.language_v1beta2.services.language_service.transports.LanguageServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LanguageServiceTransport() @@ -6267,11 +6301,12 @@ def test_language_service_transport_auth_gdch_credentials(transport_class): def test_language_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-language/tests/unit/gapic/language_v2/test_language_service.py b/packages/google-cloud-language/tests/unit/gapic/language_v2/test_language_service.py index 573e03eac222..dada1904bce9 100644 --- a/packages/google-cloud-language/tests/unit/gapic/language_v2/test_language_service.py +++ b/packages/google-cloud-language/tests/unit/gapic/language_v2/test_language_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -968,10 +973,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1016,10 +1020,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1055,10 +1058,9 @@ def test_language_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1301,13 +1303,13 @@ def test_language_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1419,9 +1421,9 @@ def test_analyze_sentiment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_sentiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_sentiment] = ( + mock_rpc + ) request = {} client.analyze_sentiment(request) @@ -1712,9 +1714,9 @@ def test_analyze_entities_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_entities] = ( + mock_rpc + ) request = {} client.analyze_entities(request) @@ -2787,9 +2789,9 @@ def test_analyze_sentiment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_sentiment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_sentiment] = ( + mock_rpc + ) request = {} client.analyze_sentiment(request) @@ -2967,9 +2969,9 @@ def test_analyze_entities_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.analyze_entities - ] = mock_rpc + client._transport._wrapped_methods[client._transport.analyze_entities] = ( + mock_rpc + ) request = {} client.analyze_entities(request) @@ -4057,8 +4059,9 @@ def test_analyze_sentiment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4123,18 +4126,20 @@ def test_analyze_sentiment_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_analyze_sentiment" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, - "post_analyze_sentiment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_analyze_sentiment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_analyze_sentiment" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_analyze_sentiment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_analyze_sentiment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4192,8 +4197,9 @@ def test_analyze_entities_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4258,17 +4264,20 @@ def test_analyze_entities_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_analyze_entities" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_analyze_entities_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_analyze_entities" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_analyze_entities" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_analyze_entities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_analyze_entities" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4326,8 +4335,9 @@ def test_classify_text_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4392,17 +4402,20 @@ def test_classify_text_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_classify_text" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_classify_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_classify_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_classify_text" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_classify_text_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_classify_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4460,8 +4473,9 @@ def test_moderate_text_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4526,17 +4540,20 @@ def test_moderate_text_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_moderate_text" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_moderate_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_moderate_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_moderate_text" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_moderate_text_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_moderate_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4594,8 +4611,9 @@ def test_annotate_text_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4660,17 +4678,20 @@ def test_annotate_text_rest_interceptors(null_interceptor): ) client = LanguageServiceClient(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.LanguageServiceRestInterceptor, "post_annotate_text" - ) as post, mock.patch.object( - transports.LanguageServiceRestInterceptor, "post_annotate_text_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LanguageServiceRestInterceptor, "pre_annotate_text" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "post_annotate_text" + ) as post, + mock.patch.object( + transports.LanguageServiceRestInterceptor, + "post_annotate_text_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LanguageServiceRestInterceptor, "pre_annotate_text" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4883,11 +4904,14 @@ def test_language_service_base_transport(): def test_language_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.language_v2.services.language_service.transports.LanguageServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.language_v2.services.language_service.transports.LanguageServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LanguageServiceTransport( @@ -4907,9 +4931,12 @@ def test_language_service_base_transport_with_credentials_file(): def test_language_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.language_v2.services.language_service.transports.LanguageServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.language_v2.services.language_service.transports.LanguageServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LanguageServiceTransport() @@ -4987,11 +5014,12 @@ def test_language_service_transport_auth_gdch_credentials(transport_class): def test_language_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-licensemanager/docs/conf.py b/packages/google-cloud-licensemanager/docs/conf.py index f2b1e5970039..f8d4b20405ef 100644 --- a/packages/google-cloud-licensemanager/docs/conf.py +++ b/packages/google-cloud-licensemanager/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-licensemanager documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/__init__.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/__init__.py index 4a70dff8313a..cce0a59c655c 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/__init__.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.license_manager import LicenseManagerAsyncClient, LicenseManagerClient from .types.api_entities import ( ActivationState, diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/async_client.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/async_client.py index 6f1c5103bea2..291d7dafd2fe 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/async_client.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.licensemanager_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.licensemanager_v1.services.license_manager import pagers from google.cloud.licensemanager_v1.types import api_entities, licensemanager @@ -131,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LicenseManagerAsyncClient: The constructed client. """ - return LicenseManagerClient.from_service_account_info.__func__(LicenseManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = LicenseManagerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(LicenseManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LicenseManagerAsyncClient: The constructed client. """ - return LicenseManagerClient.from_service_account_file.__func__(LicenseManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = LicenseManagerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(LicenseManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/client.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/client.py index de0e7a019727..a55568045bf9 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/client.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.licensemanager_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.licensemanager_v1.services.license_manager import pagers from google.cloud.licensemanager_v1.types import api_entities, licensemanager @@ -86,9 +86,7 @@ class LicenseManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[LicenseManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[LicenseManagerTransport]] _transport_registry["grpc"] = LicenseManagerGrpcTransport _transport_registry["grpc_asyncio"] = LicenseManagerGrpcAsyncIOTransport _transport_registry["rest"] = LicenseManagerRestTransport @@ -694,11 +692,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LicenseManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LicenseManagerClient._read_environment_variables() + ) self._client_cert_source = LicenseManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -733,8 +729,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LicenseManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/pagers.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/pagers.py index b5d8b4203776..06bb1c29594d 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/pagers.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/base.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/base.py index 76cc23e04536..7b93ebc4ba0b 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/base.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.licensemanager_v1 import gapic_version as package_version from google.cloud.licensemanager_v1.types import api_entities, licensemanager @@ -468,13 +468,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc.py index ca49b931d28b..7d6c1117fd34 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.licensemanager_v1.types import api_entities, licensemanager @@ -613,12 +613,12 @@ def query_configuration_license_usage( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_configuration_license_usage" not in self._stubs: - self._stubs[ - "query_configuration_license_usage" - ] = self._logged_channel.unary_unary( - "/google.cloud.licensemanager.v1.LicenseManager/QueryConfigurationLicenseUsage", - request_serializer=licensemanager.QueryConfigurationLicenseUsageRequest.serialize, - response_deserializer=licensemanager.QueryConfigurationLicenseUsageResponse.deserialize, + self._stubs["query_configuration_license_usage"] = ( + self._logged_channel.unary_unary( + "/google.cloud.licensemanager.v1.LicenseManager/QueryConfigurationLicenseUsage", + request_serializer=licensemanager.QueryConfigurationLicenseUsageRequest.serialize, + response_deserializer=licensemanager.QueryConfigurationLicenseUsageResponse.deserialize, + ) ) return self._stubs["query_configuration_license_usage"] diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc_asyncio.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc_asyncio.py index b2d54fbd3d3c..1d1b1eba32e9 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.licensemanager_v1.types import api_entities, licensemanager @@ -628,12 +628,12 @@ def query_configuration_license_usage( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_configuration_license_usage" not in self._stubs: - self._stubs[ - "query_configuration_license_usage" - ] = self._logged_channel.unary_unary( - "/google.cloud.licensemanager.v1.LicenseManager/QueryConfigurationLicenseUsage", - request_serializer=licensemanager.QueryConfigurationLicenseUsageRequest.serialize, - response_deserializer=licensemanager.QueryConfigurationLicenseUsageResponse.deserialize, + self._stubs["query_configuration_license_usage"] = ( + self._logged_channel.unary_unary( + "/google.cloud.licensemanager.v1.LicenseManager/QueryConfigurationLicenseUsage", + request_serializer=licensemanager.QueryConfigurationLicenseUsageRequest.serialize, + response_deserializer=licensemanager.QueryConfigurationLicenseUsageResponse.deserialize, + ) ) return self._stubs["query_configuration_license_usage"] diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/rest.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/rest.py index c4aabeb3a2b8..67f60406b987 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/rest.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/services/license_manager/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1321,9 +1321,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseCreateConfiguration._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseCreateConfiguration._get_http_options() request, metadata = self._interceptor.pre_create_configuration( request, metadata @@ -1349,7 +1347,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1476,9 +1474,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseDeactivateConfiguration._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseDeactivateConfiguration._get_http_options() request, metadata = self._interceptor.pre_deactivate_configuration( request, metadata @@ -1504,7 +1500,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1631,9 +1627,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseDeleteConfiguration._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseDeleteConfiguration._get_http_options() request, metadata = self._interceptor.pre_delete_configuration( request, metadata @@ -1655,7 +1649,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1777,9 +1771,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseGetConfiguration._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseGetConfiguration._get_http_options() request, metadata = self._interceptor.pre_get_configuration( request, metadata @@ -2216,9 +2208,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseListConfigurations._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseListConfigurations._get_http_options() request, metadata = self._interceptor.pre_list_configurations( request, metadata @@ -2667,9 +2657,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseQueryConfigurationLicenseUsage._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseQueryConfigurationLicenseUsage._get_http_options() request, metadata = self._interceptor.pre_query_configuration_license_usage( request, metadata @@ -2733,11 +2721,10 @@ def __call__( resp = self._interceptor.post_query_configuration_license_usage(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_configuration_license_usage_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_configuration_license_usage_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2825,9 +2812,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseReactivateConfiguration._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseReactivateConfiguration._get_http_options() request, metadata = self._interceptor.pre_reactivate_configuration( request, metadata @@ -2853,7 +2838,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2981,9 +2966,7 @@ def __call__( """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseUpdateConfiguration._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseUpdateConfiguration._get_http_options() request, metadata = self._interceptor.pre_update_configuration( request, metadata @@ -3009,7 +2992,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3104,7 +3087,9 @@ def deactivate_configuration( ]: # 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._DeactivateConfiguration(self._session, self._host, self._interceptor) # type: ignore + return self._DeactivateConfiguration( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_configuration( @@ -3180,7 +3165,9 @@ def query_configuration_license_usage( ]: # 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._QueryConfigurationLicenseUsage(self._session, self._host, self._interceptor) # type: ignore + return self._QueryConfigurationLicenseUsage( + self._session, self._host, self._interceptor + ) # type: ignore @property def reactivate_configuration( @@ -3190,7 +3177,9 @@ def reactivate_configuration( ]: # 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._ReactivateConfiguration(self._session, self._host, self._interceptor) # type: ignore + return self._ReactivateConfiguration( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_configuration( @@ -3537,9 +3526,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3656,9 +3643,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseLicenseManagerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseLicenseManagerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/types/api_entities.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/types/api_entities.py index 2ba3cdf7ce57..5141ffef0e83 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/types/api_entities.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/types/api_entities.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -48,6 +48,7 @@ class LicenseType(proto.Enum): LICENSE_TYPE_BRING_YOUR_OWN_LICENSE (2): Bring your own license. """ + LICENSE_TYPE_UNSPECIFIED = 0 LICENSE_TYPE_PER_MONTH_PER_USER = 1 LICENSE_TYPE_BRING_YOUR_OWN_LICENSE = 2 @@ -76,6 +77,7 @@ class ActivationState(proto.Enum): License Key activation failed on the instance. """ + ACTIVATION_STATE_UNSPECIFIED = 0 ACTIVATION_STATE_KEY_REQUESTED = 1 ACTIVATION_STATE_ACTIVATING = 2 @@ -129,6 +131,7 @@ class State(proto.Enum): STATE_DELETED (3): Configuration is in deleted state. """ + STATE_UNSPECIFIED = 0 STATE_ACTIVE = 1 STATE_SUSPENDED = 2 @@ -287,6 +290,7 @@ class State(proto.Enum): STATE_TERMINATED (4): The product has been terminated. """ + STATE_UNSPECIFIED = 0 STATE_PROVISIONING = 1 STATE_RUNNING = 2 @@ -377,6 +381,7 @@ class State(proto.Enum): REPAIRING (7): The instance is in repair. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 STAGING = 2 diff --git a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/types/licensemanager.py b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/types/licensemanager.py index fa48e2759ecc..d05e412fd01c 100644 --- a/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/types/licensemanager.py +++ b/packages/google-cloud-licensemanager/google/cloud/licensemanager_v1/types/licensemanager.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.licensemanager_v1.types import api_entities diff --git a/packages/google-cloud-licensemanager/noxfile.py b/packages/google-cloud-licensemanager/noxfile.py index 2e40cbaf4cd0..1a2a0eb5b96a 100644 --- a/packages/google-cloud-licensemanager/noxfile.py +++ b/packages/google-cloud-licensemanager/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-licensemanager/tests/unit/gapic/licensemanager_v1/test_license_manager.py b/packages/google-cloud-licensemanager/tests/unit/gapic/licensemanager_v1/test_license_manager.py index 97cfb3bd541d..c51572ef0859 100644 --- a/packages/google-cloud-licensemanager/tests/unit/gapic/licensemanager_v1/test_license_manager.py +++ b/packages/google-cloud-licensemanager/tests/unit/gapic/licensemanager_v1/test_license_manager.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.licensemanager_v1.services.license_manager import ( LicenseManagerAsyncClient, @@ -959,10 +959,9 @@ def test_license_manager_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1007,10 +1006,9 @@ def test_license_manager_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1044,9 @@ def test_license_manager_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1292,13 +1289,13 @@ def test_license_manager_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1419,9 +1416,9 @@ def test_list_configurations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_configurations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_configurations] = ( + mock_rpc + ) request = {} client.list_configurations(request) @@ -1974,9 +1971,9 @@ def test_get_configuration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_configuration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_configuration] = ( + mock_rpc + ) request = {} client.get_configuration(request) @@ -2325,9 +2322,9 @@ def test_create_configuration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_configuration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_configuration] = ( + mock_rpc + ) request = {} client.create_configuration(request) @@ -2687,9 +2684,9 @@ def test_update_configuration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_configuration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_configuration] = ( + mock_rpc + ) request = {} client.update_configuration(request) @@ -3043,9 +3040,9 @@ def test_delete_configuration_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_configuration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_configuration] = ( + mock_rpc + ) request = {} client.delete_configuration(request) @@ -6662,9 +6659,9 @@ def test_list_configurations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_configurations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_configurations] = ( + mock_rpc + ) request = {} client.list_configurations(request) @@ -6924,9 +6921,9 @@ def test_get_configuration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_configuration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_configuration] = ( + mock_rpc + ) request = {} client.get_configuration(request) @@ -7108,9 +7105,9 @@ def test_create_configuration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_configuration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_configuration] = ( + mock_rpc + ) request = {} client.create_configuration(request) @@ -7328,9 +7325,9 @@ def test_update_configuration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_configuration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_configuration] = ( + mock_rpc + ) request = {} client.update_configuration(request) @@ -7526,9 +7523,9 @@ def test_delete_configuration_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_configuration - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_configuration] = ( + mock_rpc + ) request = {} client.delete_configuration(request) @@ -10228,8 +10225,9 @@ def test_list_configurations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10294,18 +10292,20 @@ def test_list_configurations_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, "post_list_configurations" - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, - "post_list_configurations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, "pre_list_configurations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "post_list_configurations" + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, + "post_list_configurations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "pre_list_configurations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10363,8 +10363,9 @@ def test_get_configuration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10438,17 +10439,20 @@ def test_get_configuration_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, "post_get_configuration" - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, "post_get_configuration_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, "pre_get_configuration" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "post_get_configuration" + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, + "post_get_configuration_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "pre_get_configuration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10501,8 +10505,9 @@ def test_create_configuration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10642,20 +10647,21 @@ def test_create_configuration_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, "post_create_configuration" - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, - "post_create_configuration_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, "pre_create_configuration" - ) as pre: + 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.LicenseManagerRestInterceptor, "post_create_configuration" + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, + "post_create_configuration_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "pre_create_configuration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10712,8 +10718,9 @@ def test_update_configuration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10857,20 +10864,21 @@ def test_update_configuration_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, "post_update_configuration" - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, - "post_update_configuration_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, "pre_update_configuration" - ) as pre: + 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.LicenseManagerRestInterceptor, "post_update_configuration" + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, + "post_update_configuration_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "pre_update_configuration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10923,8 +10931,9 @@ def test_delete_configuration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10981,20 +10990,21 @@ def test_delete_configuration_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, "post_delete_configuration" - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, - "post_delete_configuration_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, "pre_delete_configuration" - ) as pre: + 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.LicenseManagerRestInterceptor, "post_delete_configuration" + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, + "post_delete_configuration_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "pre_delete_configuration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11047,8 +11057,9 @@ def test_list_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11113,17 +11124,20 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, + "post_list_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11179,8 +11193,9 @@ def test_get_instance_rest_bad_request(request_type=licensemanager.GetInstanceRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11251,17 +11266,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11314,8 +11331,9 @@ def test_deactivate_configuration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11372,20 +11390,21 @@ def test_deactivate_configuration_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, "post_deactivate_configuration" - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, - "post_deactivate_configuration_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, "pre_deactivate_configuration" - ) as pre: + 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.LicenseManagerRestInterceptor, "post_deactivate_configuration" + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, + "post_deactivate_configuration_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "pre_deactivate_configuration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11438,8 +11457,9 @@ def test_reactivate_configuration_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11496,20 +11516,21 @@ def test_reactivate_configuration_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, "post_reactivate_configuration" - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, - "post_reactivate_configuration_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, "pre_reactivate_configuration" - ) as pre: + 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.LicenseManagerRestInterceptor, "post_reactivate_configuration" + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, + "post_reactivate_configuration_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "pre_reactivate_configuration" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11562,8 +11583,9 @@ def test_query_configuration_license_usage_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11625,20 +11647,22 @@ def test_query_configuration_license_usage_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, - "post_query_configuration_license_usage", - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, - "post_query_configuration_license_usage_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, - "pre_query_configuration_license_usage", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagerRestInterceptor, + "post_query_configuration_license_usage", + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, + "post_query_configuration_license_usage_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, + "pre_query_configuration_license_usage", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11696,8 +11720,9 @@ def test_aggregate_usage_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11762,17 +11787,20 @@ def test_aggregate_usage_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, "post_aggregate_usage" - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, "post_aggregate_usage_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, "pre_aggregate_usage" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "post_aggregate_usage" + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, + "post_aggregate_usage_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "pre_aggregate_usage" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11830,8 +11858,9 @@ def test_list_products_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11896,17 +11925,19 @@ def test_list_products_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, "post_list_products" - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, "post_list_products_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, "pre_list_products" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "post_list_products" + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "post_list_products_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "pre_list_products" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11962,8 +11993,9 @@ def test_get_product_rest_bad_request(request_type=licensemanager.GetProductRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12038,17 +12070,19 @@ def test_get_product_rest_interceptors(null_interceptor): ) client = LicenseManagerClient(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.LicenseManagerRestInterceptor, "post_get_product" - ) as post, mock.patch.object( - transports.LicenseManagerRestInterceptor, "post_get_product_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LicenseManagerRestInterceptor, "pre_get_product" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "post_get_product" + ) as post, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "post_get_product_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LicenseManagerRestInterceptor, "pre_get_product" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12101,8 +12135,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12161,8 +12196,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12223,8 +12259,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12285,8 +12322,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12347,8 +12385,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12409,8 +12448,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12834,11 +12874,14 @@ def test_license_manager_base_transport(): def test_license_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.licensemanager_v1.services.license_manager.transports.LicenseManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.licensemanager_v1.services.license_manager.transports.LicenseManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LicenseManagerTransport( @@ -12855,9 +12898,12 @@ def test_license_manager_base_transport_with_credentials_file(): def test_license_manager_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.licensemanager_v1.services.license_manager.transports.LicenseManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.licensemanager_v1.services.license_manager.transports.LicenseManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LicenseManagerTransport() @@ -12929,11 +12975,12 @@ def test_license_manager_transport_auth_gdch_credentials(transport_class): def test_license_manager_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-life-sciences/docs/conf.py b/packages/google-cloud-life-sciences/docs/conf.py index bd19ec795e7b..54062d81709d 100644 --- a/packages/google-cloud-life-sciences/docs/conf.py +++ b/packages/google-cloud-life-sciences/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-life-sciences documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/__init__.py b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/__init__.py index 3baae92ed6d5..ad041166f070 100644 --- a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/__init__.py +++ b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.workflows_service_v2_beta import ( WorkflowsServiceV2BetaAsyncClient, WorkflowsServiceV2BetaClient, diff --git a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/async_client.py b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/async_client.py index 0b02206156e3..4cec1f9c53d2 100644 --- a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/async_client.py +++ b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.lifesciences_v2beta import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -119,7 +119,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: WorkflowsServiceV2BetaAsyncClient: The constructed client. """ - return WorkflowsServiceV2BetaClient.from_service_account_info.__func__(WorkflowsServiceV2BetaAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = WorkflowsServiceV2BetaClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(WorkflowsServiceV2BetaAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: WorkflowsServiceV2BetaAsyncClient: The constructed client. """ - return WorkflowsServiceV2BetaClient.from_service_account_file.__func__(WorkflowsServiceV2BetaAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = WorkflowsServiceV2BetaClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + WorkflowsServiceV2BetaAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -173,7 +177,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return WorkflowsServiceV2BetaClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return WorkflowsServiceV2BetaClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> WorkflowsServiceV2BetaTransport: diff --git a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/client.py b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/client.py index 1528f4d4bae6..cc581ff0440e 100644 --- a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/client.py +++ b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.lifesciences_v2beta import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore @@ -82,9 +82,7 @@ class WorkflowsServiceV2BetaClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[WorkflowsServiceV2BetaTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[WorkflowsServiceV2BetaTransport]] _transport_registry["grpc"] = WorkflowsServiceV2BetaGrpcTransport _transport_registry["grpc_asyncio"] = WorkflowsServiceV2BetaGrpcAsyncIOTransport _transport_registry["rest"] = WorkflowsServiceV2BetaRestTransport @@ -610,11 +608,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = WorkflowsServiceV2BetaClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + WorkflowsServiceV2BetaClient._read_environment_variables() + ) self._client_cert_source = WorkflowsServiceV2BetaClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -649,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(WorkflowsServiceV2BetaTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/__init__.py b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/__init__.py index 183aea486d44..1c7a8e68cadf 100644 --- a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/__init__.py +++ b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[WorkflowsServiceV2BetaTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[WorkflowsServiceV2BetaTransport]] _transport_registry["grpc"] = WorkflowsServiceV2BetaGrpcTransport _transport_registry["grpc_asyncio"] = WorkflowsServiceV2BetaGrpcAsyncIOTransport _transport_registry["rest"] = WorkflowsServiceV2BetaRestTransport diff --git a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/base.py b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/base.py index 17f4e11154fc..a2cca157d306 100644 --- a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/base.py +++ b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.lifesciences_v2beta import gapic_version as package_version from google.cloud.lifesciences_v2beta.types import workflows @@ -217,7 +217,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/grpc.py b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/grpc.py index 55d48a3dd118..1e76c8602e45 100644 --- a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/grpc.py +++ b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.lifesciences_v2beta.types import workflows diff --git a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/grpc_asyncio.py b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/grpc_asyncio.py index 6aac29b3f57b..f26151f55832 100644 --- a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/grpc_asyncio.py +++ b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.lifesciences_v2beta.types import workflows diff --git a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/rest.py b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/rest.py index 0c1351e03b23..6db499bcca4e 100644 --- a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/rest.py +++ b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/services/workflows_service_v2_beta/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -456,9 +456,7 @@ def __call__( """ - http_options = ( - _BaseWorkflowsServiceV2BetaRestTransport._BaseRunPipeline._get_http_options() - ) + http_options = _BaseWorkflowsServiceV2BetaRestTransport._BaseRunPipeline._get_http_options() request, metadata = self._interceptor.pre_run_pipeline(request, metadata) transcoded_request = _BaseWorkflowsServiceV2BetaRestTransport._BaseRunPipeline._get_transcoded_request( @@ -482,7 +480,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -615,9 +613,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseWorkflowsServiceV2BetaRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseWorkflowsServiceV2BetaRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseWorkflowsServiceV2BetaRestTransport._BaseGetLocation._get_transcoded_request( @@ -756,9 +752,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseWorkflowsServiceV2BetaRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseWorkflowsServiceV2BetaRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseWorkflowsServiceV2BetaRestTransport._BaseListLocations._get_transcoded_request( @@ -895,9 +889,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseWorkflowsServiceV2BetaRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseWorkflowsServiceV2BetaRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1020,9 +1012,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseWorkflowsServiceV2BetaRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseWorkflowsServiceV2BetaRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseWorkflowsServiceV2BetaRestTransport._BaseGetOperation._get_transcoded_request( @@ -1161,9 +1151,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseWorkflowsServiceV2BetaRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseWorkflowsServiceV2BetaRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseWorkflowsServiceV2BetaRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/types/workflows.py b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/types/workflows.py index 71d7e1082c85..70939a09ebf1 100644 --- a/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/types/workflows.py +++ b/packages/google-cloud-life-sciences/google/cloud/lifesciences_v2beta/types/workflows.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import code_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-life-sciences/noxfile.py b/packages/google-cloud-life-sciences/noxfile.py index 56c6f278d3d8..e7eb6862216a 100644 --- a/packages/google-cloud-life-sciences/noxfile.py +++ b/packages/google-cloud-life-sciences/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-life-sciences/tests/unit/gapic/lifesciences_v2beta/test_workflows_service_v2_beta.py b/packages/google-cloud-life-sciences/tests/unit/gapic/lifesciences_v2beta/test_workflows_service_v2_beta.py index abc15f08a07f..0bc87a2d92c1 100644 --- a/packages/google-cloud-life-sciences/tests/unit/gapic/lifesciences_v2beta/test_workflows_service_v2_beta.py +++ b/packages/google-cloud-life-sciences/tests/unit/gapic/lifesciences_v2beta/test_workflows_service_v2_beta.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,11 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,17 +56,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore from google.cloud.lifesciences_v2beta.services.workflows_service_v2_beta import ( WorkflowsServiceV2BetaAsyncClient, @@ -1009,10 +1009,9 @@ def test_workflows_service_v2_beta_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1056,9 @@ def test_workflows_service_v2_beta_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1096,10 +1094,9 @@ def test_workflows_service_v2_beta_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1355,13 +1352,13 @@ def test_workflows_service_v2_beta_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1927,8 +1924,9 @@ def test_run_pipeline_rest_bad_request(request_type=workflows.RunPipelineRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1985,20 +1983,21 @@ def test_run_pipeline_rest_interceptors(null_interceptor): ) client = WorkflowsServiceV2BetaClient(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.WorkflowsServiceV2BetaRestInterceptor, "post_run_pipeline" - ) as post, mock.patch.object( - transports.WorkflowsServiceV2BetaRestInterceptor, - "post_run_pipeline_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.WorkflowsServiceV2BetaRestInterceptor, "pre_run_pipeline" - ) as pre: + 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.WorkflowsServiceV2BetaRestInterceptor, "post_run_pipeline" + ) as post, + mock.patch.object( + transports.WorkflowsServiceV2BetaRestInterceptor, + "post_run_pipeline_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.WorkflowsServiceV2BetaRestInterceptor, "pre_run_pipeline" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2049,8 +2048,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2109,8 +2109,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2171,8 +2172,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2233,8 +2235,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2295,8 +2298,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2451,11 +2455,14 @@ def test_workflows_service_v2_beta_base_transport(): def test_workflows_service_v2_beta_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.lifesciences_v2beta.services.workflows_service_v2_beta.transports.WorkflowsServiceV2BetaTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.lifesciences_v2beta.services.workflows_service_v2_beta.transports.WorkflowsServiceV2BetaTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.WorkflowsServiceV2BetaTransport( @@ -2472,9 +2479,12 @@ def test_workflows_service_v2_beta_base_transport_with_credentials_file(): def test_workflows_service_v2_beta_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.lifesciences_v2beta.services.workflows_service_v2_beta.transports.WorkflowsServiceV2BetaTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.lifesciences_v2beta.services.workflows_service_v2_beta.transports.WorkflowsServiceV2BetaTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.WorkflowsServiceV2BetaTransport() @@ -2548,11 +2558,12 @@ def test_workflows_service_v2_beta_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-locationfinder/docs/conf.py b/packages/google-cloud-locationfinder/docs/conf.py index fdef0dd8212e..13ae5fd8ad44 100644 --- a/packages/google-cloud-locationfinder/docs/conf.py +++ b/packages/google-cloud-locationfinder/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-locationfinder documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/__init__.py b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/__init__.py index ba9532632fd1..fe7981e09eb5 100644 --- a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/__init__.py +++ b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_location_finder import ( CloudLocationFinderAsyncClient, CloudLocationFinderClient, diff --git a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/async_client.py b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/async_client.py index f8430e28e1b1..e863d2fdcd41 100644 --- a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/async_client.py +++ b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.locationfinder_v1 import gapic_version as package_version @@ -117,7 +117,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudLocationFinderAsyncClient: The constructed client. """ - return CloudLocationFinderClient.from_service_account_info.__func__(CloudLocationFinderAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudLocationFinderClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudLocationFinderAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +134,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudLocationFinderAsyncClient: The constructed client. """ - return CloudLocationFinderClient.from_service_account_file.__func__(CloudLocationFinderAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudLocationFinderClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CloudLocationFinderAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -171,7 +173,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CloudLocationFinderClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CloudLocationFinderClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CloudLocationFinderTransport: diff --git a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/client.py b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/client.py index e7b1ada9b052..6cefe41e4a19 100644 --- a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/client.py +++ b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.locationfinder_v1 import gapic_version as package_version @@ -80,9 +80,7 @@ class CloudLocationFinderClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CloudLocationFinderTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CloudLocationFinderTransport]] _transport_registry["grpc"] = CloudLocationFinderGrpcTransport _transport_registry["grpc_asyncio"] = CloudLocationFinderGrpcAsyncIOTransport _transport_registry["rest"] = CloudLocationFinderRestTransport @@ -626,11 +624,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudLocationFinderClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudLocationFinderClient._read_environment_variables() + ) self._client_cert_source = CloudLocationFinderClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -665,8 +661,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudLocationFinderTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/pagers.py b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/pagers.py index 4609a71fa88b..faee49dc465d 100644 --- a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/pagers.py +++ b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/__init__.py b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/__init__.py index 711ab15c46c7..cc5f701650b6 100644 --- a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/__init__.py +++ b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import CloudLocationFinderRestInterceptor, CloudLocationFinderRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CloudLocationFinderTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CloudLocationFinderTransport]] _transport_registry["grpc"] = CloudLocationFinderGrpcTransport _transport_registry["grpc_asyncio"] = CloudLocationFinderGrpcAsyncIOTransport _transport_registry["rest"] = CloudLocationFinderRestTransport diff --git a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/base.py b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/base.py index 02b94fddd9f4..6c2ddb777674 100644 --- a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/base.py +++ b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.locationfinder_v1 import gapic_version as package_version from google.cloud.locationfinder_v1.types import cloud_location diff --git a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/grpc.py b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/grpc.py index 45a3a7d2e7c4..1f1f16a36f28 100644 --- a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/grpc.py +++ b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.locationfinder_v1.types import cloud_location diff --git a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/grpc_asyncio.py b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/grpc_asyncio.py index 5de29c312793..69408a4e6b2b 100644 --- a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/grpc_asyncio.py +++ b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.locationfinder_v1.types import cloud_location diff --git a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/rest.py b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/rest.py index 994be6f0f047..b4916025f50a 100644 --- a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/rest.py +++ b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/services/cloud_location_finder/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -448,9 +448,7 @@ def __call__( Represents resource cloud locations. """ - http_options = ( - _BaseCloudLocationFinderRestTransport._BaseGetCloudLocation._get_http_options() - ) + http_options = _BaseCloudLocationFinderRestTransport._BaseGetCloudLocation._get_http_options() request, metadata = self._interceptor.pre_get_cloud_location( request, metadata @@ -598,9 +596,7 @@ def __call__( """ - http_options = ( - _BaseCloudLocationFinderRestTransport._BaseListCloudLocations._get_http_options() - ) + http_options = _BaseCloudLocationFinderRestTransport._BaseListCloudLocations._get_http_options() request, metadata = self._interceptor.pre_list_cloud_locations( request, metadata @@ -752,9 +748,7 @@ def __call__( """ - http_options = ( - _BaseCloudLocationFinderRestTransport._BaseSearchCloudLocations._get_http_options() - ) + http_options = _BaseCloudLocationFinderRestTransport._BaseSearchCloudLocations._get_http_options() request, metadata = self._interceptor.pre_search_cloud_locations( request, metadata @@ -938,9 +932,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseCloudLocationFinderRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseCloudLocationFinderRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseCloudLocationFinderRestTransport._BaseGetLocation._get_transcoded_request( @@ -1079,9 +1071,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseCloudLocationFinderRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseCloudLocationFinderRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseCloudLocationFinderRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/types/cloud_location.py b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/types/cloud_location.py index ce8d8f27d226..f8a01ff31d86 100644 --- a/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/types/cloud_location.py +++ b/packages/google-cloud-locationfinder/google/cloud/locationfinder_v1/types/cloud_location.py @@ -93,6 +93,7 @@ class CloudProvider(proto.Enum): CLOUD_PROVIDER_OCI (4): Cloud provider type for OCI. """ + CLOUD_PROVIDER_UNSPECIFIED = 0 CLOUD_PROVIDER_GCP = 1 CLOUD_PROVIDER_AWS = 2 @@ -116,6 +117,7 @@ class CloudLocationType(proto.Enum): CloudLocation type for Google Distributed Cloud Connected Zone. """ + CLOUD_LOCATION_TYPE_UNSPECIFIED = 0 CLOUD_LOCATION_TYPE_REGION = 1 CLOUD_LOCATION_TYPE_ZONE = 2 diff --git a/packages/google-cloud-locationfinder/noxfile.py b/packages/google-cloud-locationfinder/noxfile.py index 25d8e07a89ad..f60a2a2e37d4 100644 --- a/packages/google-cloud-locationfinder/noxfile.py +++ b/packages/google-cloud-locationfinder/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-locationfinder/tests/unit/gapic/locationfinder_v1/test_cloud_location_finder.py b/packages/google-cloud-locationfinder/tests/unit/gapic/locationfinder_v1/test_cloud_location_finder.py index e63ba1534676..c80906ca2860 100644 --- a/packages/google-cloud-locationfinder/tests/unit/gapic/locationfinder_v1/test_cloud_location_finder.py +++ b/packages/google-cloud-locationfinder/tests/unit/gapic/locationfinder_v1/test_cloud_location_finder.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 @@ -993,10 +998,9 @@ def test_cloud_location_finder_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1041,10 +1045,9 @@ def test_cloud_location_finder_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1083,9 @@ def test_cloud_location_finder_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1339,13 +1341,13 @@ def test_cloud_location_finder_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1462,9 +1464,9 @@ def test_list_cloud_locations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cloud_locations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cloud_locations] = ( + mock_rpc + ) request = {} client.list_cloud_locations(request) @@ -2026,9 +2028,9 @@ def test_get_cloud_location_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cloud_location - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cloud_location] = ( + mock_rpc + ) request = {} client.get_cloud_location(request) @@ -2394,9 +2396,9 @@ def test_search_cloud_locations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_cloud_locations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_cloud_locations] = ( + mock_rpc + ) request = {} client.search_cloud_locations(request) @@ -2890,9 +2892,9 @@ def test_list_cloud_locations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cloud_locations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cloud_locations] = ( + mock_rpc + ) request = {} client.list_cloud_locations(request) @@ -3152,9 +3154,9 @@ def test_get_cloud_location_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cloud_location - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cloud_location] = ( + mock_rpc + ) request = {} client.get_cloud_location(request) @@ -3337,9 +3339,9 @@ def test_search_cloud_locations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_cloud_locations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_cloud_locations] = ( + mock_rpc + ) request = {} client.search_cloud_locations(request) @@ -3903,8 +3905,9 @@ def test_list_cloud_locations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3967,18 +3970,20 @@ def test_list_cloud_locations_rest_interceptors(null_interceptor): ) client = CloudLocationFinderClient(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.CloudLocationFinderRestInterceptor, "post_list_cloud_locations" - ) as post, mock.patch.object( - transports.CloudLocationFinderRestInterceptor, - "post_list_cloud_locations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudLocationFinderRestInterceptor, "pre_list_cloud_locations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudLocationFinderRestInterceptor, "post_list_cloud_locations" + ) as post, + mock.patch.object( + transports.CloudLocationFinderRestInterceptor, + "post_list_cloud_locations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudLocationFinderRestInterceptor, "pre_list_cloud_locations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4036,8 +4041,9 @@ def test_get_cloud_location_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4120,18 +4126,20 @@ def test_get_cloud_location_rest_interceptors(null_interceptor): ) client = CloudLocationFinderClient(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.CloudLocationFinderRestInterceptor, "post_get_cloud_location" - ) as post, mock.patch.object( - transports.CloudLocationFinderRestInterceptor, - "post_get_cloud_location_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudLocationFinderRestInterceptor, "pre_get_cloud_location" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudLocationFinderRestInterceptor, "post_get_cloud_location" + ) as post, + mock.patch.object( + transports.CloudLocationFinderRestInterceptor, + "post_get_cloud_location_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudLocationFinderRestInterceptor, "pre_get_cloud_location" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4186,8 +4194,9 @@ def test_search_cloud_locations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4250,18 +4259,20 @@ def test_search_cloud_locations_rest_interceptors(null_interceptor): ) client = CloudLocationFinderClient(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.CloudLocationFinderRestInterceptor, "post_search_cloud_locations" - ) as post, mock.patch.object( - transports.CloudLocationFinderRestInterceptor, - "post_search_cloud_locations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudLocationFinderRestInterceptor, "pre_search_cloud_locations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudLocationFinderRestInterceptor, "post_search_cloud_locations" + ) as post, + mock.patch.object( + transports.CloudLocationFinderRestInterceptor, + "post_search_cloud_locations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudLocationFinderRestInterceptor, "pre_search_cloud_locations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4319,8 +4330,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4379,8 +4391,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4558,11 +4571,14 @@ def test_cloud_location_finder_base_transport(): def test_cloud_location_finder_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.locationfinder_v1.services.cloud_location_finder.transports.CloudLocationFinderTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.locationfinder_v1.services.cloud_location_finder.transports.CloudLocationFinderTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudLocationFinderTransport( @@ -4579,9 +4595,12 @@ def test_cloud_location_finder_base_transport_with_credentials_file(): def test_cloud_location_finder_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.locationfinder_v1.services.cloud_location_finder.transports.CloudLocationFinderTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.locationfinder_v1.services.cloud_location_finder.transports.CloudLocationFinderTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudLocationFinderTransport() @@ -4653,11 +4672,12 @@ def test_cloud_location_finder_transport_auth_gdch_credentials(transport_class): def test_cloud_location_finder_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-lustre/docs/conf.py b/packages/google-cloud-lustre/docs/conf.py index c457622e27b3..71920dfe40dd 100644 --- a/packages/google-cloud-lustre/docs/conf.py +++ b/packages/google-cloud-lustre/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-lustre documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-lustre/google/cloud/lustre_v1/__init__.py b/packages/google-cloud-lustre/google/cloud/lustre_v1/__init__.py index 755003710dd4..20a48b8820ae 100644 --- a/packages/google-cloud-lustre/google/cloud/lustre_v1/__init__.py +++ b/packages/google-cloud-lustre/google/cloud/lustre_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.lustre import LustreAsyncClient, LustreClient from .types.instance import ( CreateInstanceRequest, diff --git a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/async_client.py b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/async_client.py index ef2651e0e266..ac0390b76b68 100644 --- a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/async_client.py +++ b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.lustre_v1 import gapic_version as package_version @@ -44,18 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.lustre_v1.services.lustre import pagers -from google.cloud.lustre_v1.types import instance +from google.cloud.lustre_v1.types import instance, transfer from google.cloud.lustre_v1.types import instance as gcl_instance -from google.cloud.lustre_v1.types import transfer from .client import LustreClient from .transports.base import DEFAULT_CLIENT_INFO, LustreTransport @@ -117,7 +116,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: LustreAsyncClient: The constructed client. """ - return LustreClient.from_service_account_info.__func__(LustreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = LustreClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(LustreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +133,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: LustreAsyncClient: The constructed client. """ - return LustreClient.from_service_account_file.__func__(LustreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = LustreClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(LustreAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/client.py b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/client.py index f52a8c19d9df..94cb2903b97a 100644 --- a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/client.py +++ b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.lustre_v1 import gapic_version as package_version @@ -61,18 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.lustre_v1.services.lustre import pagers -from google.cloud.lustre_v1.types import instance +from google.cloud.lustre_v1.types import instance, transfer from google.cloud.lustre_v1.types import instance as gcl_instance -from google.cloud.lustre_v1.types import transfer from .transports.base import DEFAULT_CLIENT_INFO, LustreTransport from .transports.grpc import LustreGrpcTransport @@ -667,11 +666,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = LustreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + LustreClient._read_environment_variables() + ) self._client_cert_source = LustreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -706,8 +703,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(LustreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/pagers.py b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/pagers.py index edb39e9b28b8..2c8120314231 100644 --- a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/pagers.py +++ b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/base.py b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/base.py index 03c524262cb5..14a5099d28c0 100644 --- a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/base.py +++ b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.lustre_v1 import gapic_version as package_version -from google.cloud.lustre_v1.types import instance +from google.cloud.lustre_v1.types import instance, transfer from google.cloud.lustre_v1.types import instance as gcl_instance -from google.cloud.lustre_v1.types import transfer DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -310,13 +309,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/grpc.py b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/grpc.py index 233a2e3b5f09..2148a78195af 100644 --- a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/grpc.py +++ b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.lustre_v1.types import instance +from google.cloud.lustre_v1.types import instance, transfer from google.cloud.lustre_v1.types import instance as gcl_instance -from google.cloud.lustre_v1.types import transfer from .base import DEFAULT_CLIENT_INFO, LustreTransport diff --git a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/grpc_asyncio.py b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/grpc_asyncio.py index 1551e285109f..57b7ab652927 100644 --- a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/grpc_asyncio.py +++ b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,14 +31,10 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.lustre_v1.types import instance +from google.cloud.lustre_v1.types import instance, transfer from google.cloud.lustre_v1.types import instance as gcl_instance -from google.cloud.lustre_v1.types import transfer from .base import DEFAULT_CLIENT_INFO, LustreTransport from .grpc import LustreGrpcTransport diff --git a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/rest.py b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/rest.py index 00dd9809731f..8dc9bcac654f 100644 --- a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/rest.py +++ b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/rest.py @@ -16,23 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.lustre_v1.types import instance +from google.cloud.lustre_v1.types import instance, transfer from google.cloud.lustre_v1.types import instance as gcl_instance -from google.cloud.lustre_v1.types import transfer from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseLustreRestTransport @@ -835,7 +834,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -983,7 +982,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1134,7 +1133,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1429,7 +1428,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1731,7 +1730,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/rest_base.py b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/rest_base.py index 29f41b672f37..131204f8639e 100644 --- a/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/rest_base.py +++ b/packages/google-cloud-lustre/google/cloud/lustre_v1/services/lustre/transports/rest_base.py @@ -22,9 +22,8 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.lustre_v1.types import instance +from google.cloud.lustre_v1.types import instance, transfer from google.cloud.lustre_v1.types import instance as gcl_instance -from google.cloud.lustre_v1.types import transfer from .base import DEFAULT_CLIENT_INFO, LustreTransport diff --git a/packages/google-cloud-lustre/google/cloud/lustre_v1/types/instance.py b/packages/google-cloud-lustre/google/cloud/lustre_v1/types/instance.py index c3a0cc16ed9c..672c69e57670 100644 --- a/packages/google-cloud-lustre/google/cloud/lustre_v1/types/instance.py +++ b/packages/google-cloud-lustre/google/cloud/lustre_v1/types/instance.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -104,6 +104,7 @@ class State(proto.Enum): UPDATING (7): The instance is being updated. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 CREATING = 2 diff --git a/packages/google-cloud-lustre/google/cloud/lustre_v1/types/transfer.py b/packages/google-cloud-lustre/google/cloud/lustre_v1/types/transfer.py index d6853c639318..fe020b7aa0b6 100644 --- a/packages/google-cloud-lustre/google/cloud/lustre_v1/types/transfer.py +++ b/packages/google-cloud-lustre/google/cloud/lustre_v1/types/transfer.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import code_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -52,6 +52,7 @@ class TransferType(proto.Enum): EXPORT (2): Exports from Lustre. """ + TRANSFER_TYPE_UNSPECIFIED = 0 IMPORT = 1 EXPORT = 2 diff --git a/packages/google-cloud-lustre/noxfile.py b/packages/google-cloud-lustre/noxfile.py index 9c0a49993af9..014fda85e31c 100644 --- a/packages/google-cloud-lustre/noxfile.py +++ b/packages/google-cloud-lustre/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-lustre/tests/unit/gapic/lustre_v1/test_lustre.py b/packages/google-cloud-lustre/tests/unit/gapic/lustre_v1/test_lustre.py index 90beb4b7737d..f766b232b3f1 100644 --- a/packages/google-cloud-lustre/tests/unit/gapic/lustre_v1/test_lustre.py +++ b/packages/google-cloud-lustre/tests/unit/gapic/lustre_v1/test_lustre.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.lustre_v1.services.lustre import ( LustreAsyncClient, @@ -72,9 +72,8 @@ pagers, transports, ) -from google.cloud.lustre_v1.types import instance +from google.cloud.lustre_v1.types import instance, transfer from google.cloud.lustre_v1.types import instance as gcl_instance -from google.cloud.lustre_v1.types import transfer CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -911,10 +910,9 @@ def test_lustre_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -959,10 +957,9 @@ def test_lustre_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +995,9 @@ def test_lustre_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1226,13 +1222,13 @@ def test_lustre_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5507,8 +5503,9 @@ def test_list_instances_rest_bad_request(request_type=instance.ListInstancesRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5571,17 +5568,19 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = LustreClient(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.LustreRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.LustreRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LustreRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LustreRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.LustreRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LustreRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5632,8 +5631,9 @@ def test_get_instance_rest_bad_request(request_type=instance.GetInstanceRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5710,17 +5710,17 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = LustreClient(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.LustreRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.LustreRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LustreRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.LustreRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.LustreRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LustreRestInterceptor, "pre_get_instance") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5771,8 +5771,9 @@ def test_create_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5908,19 +5909,20 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = LustreClient(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.LustreRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.LustreRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LustreRestInterceptor, "pre_create_instance" - ) as pre: + 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.LustreRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.LustreRestInterceptor, "post_create_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LustreRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5975,8 +5977,9 @@ def test_update_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6114,19 +6117,20 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = LustreClient(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.LustreRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.LustreRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LustreRestInterceptor, "pre_update_instance" - ) as pre: + 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.LustreRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.LustreRestInterceptor, "post_update_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LustreRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6177,8 +6181,9 @@ def test_delete_instance_rest_bad_request(request_type=instance.DeleteInstanceRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6233,19 +6238,20 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = LustreClient(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.LustreRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.LustreRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LustreRestInterceptor, "pre_delete_instance" - ) as pre: + 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.LustreRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.LustreRestInterceptor, "post_delete_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.LustreRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6294,8 +6300,9 @@ def test_import_data_rest_bad_request(request_type=transfer.ImportDataRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6350,19 +6357,16 @@ def test_import_data_rest_interceptors(null_interceptor): ) client = LustreClient(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.LustreRestInterceptor, "post_import_data" - ) as post, mock.patch.object( - transports.LustreRestInterceptor, "post_import_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LustreRestInterceptor, "pre_import_data" - ) as pre: + 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.LustreRestInterceptor, "post_import_data") as post, + mock.patch.object( + transports.LustreRestInterceptor, "post_import_data_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LustreRestInterceptor, "pre_import_data") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6411,8 +6415,9 @@ def test_export_data_rest_bad_request(request_type=transfer.ExportDataRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6467,19 +6472,16 @@ def test_export_data_rest_interceptors(null_interceptor): ) client = LustreClient(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.LustreRestInterceptor, "post_export_data" - ) as post, mock.patch.object( - transports.LustreRestInterceptor, "post_export_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.LustreRestInterceptor, "pre_export_data" - ) as pre: + 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.LustreRestInterceptor, "post_export_data") as post, + mock.patch.object( + transports.LustreRestInterceptor, "post_export_data_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.LustreRestInterceptor, "pre_export_data") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6530,8 +6532,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6590,8 +6593,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6652,8 +6656,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6714,8 +6719,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6776,8 +6782,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6838,8 +6845,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7121,11 +7129,14 @@ def test_lustre_base_transport(): def test_lustre_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.lustre_v1.services.lustre.transports.LustreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.lustre_v1.services.lustre.transports.LustreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LustreTransport( @@ -7142,9 +7153,12 @@ def test_lustre_base_transport_with_credentials_file(): def test_lustre_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.lustre_v1.services.lustre.transports.LustreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.lustre_v1.services.lustre.transports.LustreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.LustreTransport() @@ -7216,11 +7230,12 @@ def test_lustre_transport_auth_gdch_credentials(transport_class): def test_lustre_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-maintenance-api/docs/conf.py b/packages/google-cloud-maintenance-api/docs/conf.py index 5e34a7b5f053..f6802d9ab8ef 100644 --- a/packages/google-cloud-maintenance-api/docs/conf.py +++ b/packages/google-cloud-maintenance-api/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-maintenance-api documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/__init__.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/__init__.py index 7edf998db5f1..8b71c4fea283 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/__init__.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.maintenance import MaintenanceAsyncClient, MaintenanceClient from .types.maintenance_service import ( GetResourceMaintenanceRequest, diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/async_client.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/async_client.py index 7d3625619a51..ec4f1bcec763 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/async_client.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.maintenance_api_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.maintenance_api_v1.services.maintenance import pagers from google.cloud.maintenance_api_v1.types import maintenance_service @@ -116,7 +116,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MaintenanceAsyncClient: The constructed client. """ - return MaintenanceClient.from_service_account_info.__func__(MaintenanceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MaintenanceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(MaintenanceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +133,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MaintenanceAsyncClient: The constructed client. """ - return MaintenanceClient.from_service_account_file.__func__(MaintenanceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MaintenanceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(MaintenanceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/client.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/client.py index abd13ba6e0f9..e9c3e0fd87b6 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/client.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.maintenance_api_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.maintenance_api_v1.services.maintenance import pagers from google.cloud.maintenance_api_v1.types import maintenance_service @@ -621,11 +621,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MaintenanceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MaintenanceClient._read_environment_variables() + ) self._client_cert_source = MaintenanceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -660,8 +658,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MaintenanceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/pagers.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/pagers.py index b5b9385c8461..6eb17158f4c5 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/pagers.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/base.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/base.py index 45aacc43f545..105749c142b0 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/base.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.maintenance_api_v1 import gapic_version as package_version from google.cloud.maintenance_api_v1.types import maintenance_service diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/grpc.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/grpc.py index 4343fb9697a0..a8298e9b1a81 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/grpc.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.maintenance_api_v1.types import maintenance_service @@ -373,12 +373,12 @@ def list_resource_maintenances( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_resource_maintenances" not in self._stubs: - self._stubs[ - "list_resource_maintenances" - ] = self._logged_channel.unary_unary( - "/google.cloud.maintenance.api.v1.Maintenance/ListResourceMaintenances", - request_serializer=maintenance_service.ListResourceMaintenancesRequest.serialize, - response_deserializer=maintenance_service.ListResourceMaintenancesResponse.deserialize, + self._stubs["list_resource_maintenances"] = ( + self._logged_channel.unary_unary( + "/google.cloud.maintenance.api.v1.Maintenance/ListResourceMaintenances", + request_serializer=maintenance_service.ListResourceMaintenancesRequest.serialize, + response_deserializer=maintenance_service.ListResourceMaintenancesResponse.deserialize, + ) ) return self._stubs["list_resource_maintenances"] diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/grpc_asyncio.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/grpc_asyncio.py index 60128334919b..769a8c5a2546 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/grpc_asyncio.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.maintenance_api_v1.types import maintenance_service @@ -381,12 +381,12 @@ def list_resource_maintenances( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_resource_maintenances" not in self._stubs: - self._stubs[ - "list_resource_maintenances" - ] = self._logged_channel.unary_unary( - "/google.cloud.maintenance.api.v1.Maintenance/ListResourceMaintenances", - request_serializer=maintenance_service.ListResourceMaintenancesRequest.serialize, - response_deserializer=maintenance_service.ListResourceMaintenancesResponse.deserialize, + self._stubs["list_resource_maintenances"] = ( + self._logged_channel.unary_unary( + "/google.cloud.maintenance.api.v1.Maintenance/ListResourceMaintenances", + request_serializer=maintenance_service.ListResourceMaintenancesRequest.serialize, + response_deserializer=maintenance_service.ListResourceMaintenancesResponse.deserialize, + ) ) return self._stubs["list_resource_maintenances"] diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/rest.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/rest.py index 3694ffe1f420..81c3ea6fc342 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/rest.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/services/maintenance/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -454,9 +454,7 @@ def __call__( """ - http_options = ( - _BaseMaintenanceRestTransport._BaseGetResourceMaintenance._get_http_options() - ) + http_options = _BaseMaintenanceRestTransport._BaseGetResourceMaintenance._get_http_options() request, metadata = self._interceptor.pre_get_resource_maintenance( request, metadata @@ -606,9 +604,7 @@ def __call__( """ - http_options = ( - _BaseMaintenanceRestTransport._BaseListResourceMaintenances._get_http_options() - ) + http_options = _BaseMaintenanceRestTransport._BaseListResourceMaintenances._get_http_options() request, metadata = self._interceptor.pre_list_resource_maintenances( request, metadata @@ -759,9 +755,7 @@ def __call__( """ - http_options = ( - _BaseMaintenanceRestTransport._BaseSummarizeMaintenances._get_http_options() - ) + http_options = _BaseMaintenanceRestTransport._BaseSummarizeMaintenances._get_http_options() request, metadata = self._interceptor.pre_summarize_maintenances( request, metadata @@ -864,7 +858,9 @@ def get_resource_maintenance( ]: # 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._GetResourceMaintenance(self._session, self._host, self._interceptor) # type: ignore + return self._GetResourceMaintenance( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_resource_maintenances( @@ -875,7 +871,9 @@ def list_resource_maintenances( ]: # 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._ListResourceMaintenances(self._session, self._host, self._interceptor) # type: ignore + return self._ListResourceMaintenances( + self._session, self._host, self._interceptor + ) # type: ignore @property def summarize_maintenances( diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/types/maintenance_service.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/types/maintenance_service.py index 65b59b197d1c..523cd040aed7 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/types/maintenance_service.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1/types/maintenance_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -61,6 +61,7 @@ class MaintenanceCategory(proto.Enum): these maintenance events using maintenance windows and/or deny maintenance features. """ + MAINTENANCE_CATEGORY_UNSPECIFIED = 0 INFRASTRUCTURE = 1 SERVICE_UPDATE = 3 @@ -215,12 +216,12 @@ class Stats(proto.Message): proto.STRING, number=1, ) - aggregates: MutableSequence[ - "MaintenanceSummary.Aggregate" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="MaintenanceSummary.Aggregate", + aggregates: MutableSequence["MaintenanceSummary.Aggregate"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="MaintenanceSummary.Aggregate", + ) ) class Aggregate(proto.Message): @@ -395,6 +396,7 @@ class State(proto.Enum): SUCCEEDED (4): Successfully completed. """ + STATE_UNSPECIFIED = 0 SCHEDULED = 1 RUNNING = 2 @@ -583,6 +585,7 @@ class Control(proto.Enum): RESCHEDULE (3): Reschedule control. """ + CONTROL_UNSPECIFIED = 0 APPLY = 1 MANAGE_POLICY = 2 diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/__init__.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/__init__.py index af9167203d45..3c29a4ab79fd 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/__init__.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.maintenance import MaintenanceAsyncClient, MaintenanceClient from .types.maintenance_service import ( GetResourceMaintenanceRequest, diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/async_client.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/async_client.py index 83e52b256300..7189c148e6e8 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/async_client.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.maintenance_api_v1beta import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.maintenance_api_v1beta.services.maintenance import pagers from google.cloud.maintenance_api_v1beta.types import maintenance_service @@ -116,7 +116,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MaintenanceAsyncClient: The constructed client. """ - return MaintenanceClient.from_service_account_info.__func__(MaintenanceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MaintenanceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(MaintenanceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -132,7 +133,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MaintenanceAsyncClient: The constructed client. """ - return MaintenanceClient.from_service_account_file.__func__(MaintenanceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MaintenanceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(MaintenanceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/client.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/client.py index 2002c08ccfe9..5b2853980ec5 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/client.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.maintenance_api_v1beta import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.maintenance_api_v1beta.services.maintenance import pagers from google.cloud.maintenance_api_v1beta.types import maintenance_service @@ -621,11 +621,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MaintenanceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MaintenanceClient._read_environment_variables() + ) self._client_cert_source = MaintenanceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -660,8 +658,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MaintenanceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/pagers.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/pagers.py index d45a4ad4b738..6f7ad6423cc5 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/pagers.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/base.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/base.py index cb39923ad47d..8da0afcf87cb 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/base.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.maintenance_api_v1beta import gapic_version as package_version from google.cloud.maintenance_api_v1beta.types import maintenance_service diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/grpc.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/grpc.py index 61e70fab548e..3b3b29417850 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/grpc.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.maintenance_api_v1beta.types import maintenance_service @@ -373,12 +373,12 @@ def list_resource_maintenances( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_resource_maintenances" not in self._stubs: - self._stubs[ - "list_resource_maintenances" - ] = self._logged_channel.unary_unary( - "/google.cloud.maintenance.api.v1beta.Maintenance/ListResourceMaintenances", - request_serializer=maintenance_service.ListResourceMaintenancesRequest.serialize, - response_deserializer=maintenance_service.ListResourceMaintenancesResponse.deserialize, + self._stubs["list_resource_maintenances"] = ( + self._logged_channel.unary_unary( + "/google.cloud.maintenance.api.v1beta.Maintenance/ListResourceMaintenances", + request_serializer=maintenance_service.ListResourceMaintenancesRequest.serialize, + response_deserializer=maintenance_service.ListResourceMaintenancesResponse.deserialize, + ) ) return self._stubs["list_resource_maintenances"] diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/grpc_asyncio.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/grpc_asyncio.py index b7777736a847..714c71e61581 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/grpc_asyncio.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.maintenance_api_v1beta.types import maintenance_service @@ -381,12 +381,12 @@ def list_resource_maintenances( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_resource_maintenances" not in self._stubs: - self._stubs[ - "list_resource_maintenances" - ] = self._logged_channel.unary_unary( - "/google.cloud.maintenance.api.v1beta.Maintenance/ListResourceMaintenances", - request_serializer=maintenance_service.ListResourceMaintenancesRequest.serialize, - response_deserializer=maintenance_service.ListResourceMaintenancesResponse.deserialize, + self._stubs["list_resource_maintenances"] = ( + self._logged_channel.unary_unary( + "/google.cloud.maintenance.api.v1beta.Maintenance/ListResourceMaintenances", + request_serializer=maintenance_service.ListResourceMaintenancesRequest.serialize, + response_deserializer=maintenance_service.ListResourceMaintenancesResponse.deserialize, + ) ) return self._stubs["list_resource_maintenances"] diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/rest.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/rest.py index 2bd950da83c4..1eb42ef86fd0 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/rest.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/services/maintenance/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -454,9 +454,7 @@ def __call__( """ - http_options = ( - _BaseMaintenanceRestTransport._BaseGetResourceMaintenance._get_http_options() - ) + http_options = _BaseMaintenanceRestTransport._BaseGetResourceMaintenance._get_http_options() request, metadata = self._interceptor.pre_get_resource_maintenance( request, metadata @@ -606,9 +604,7 @@ def __call__( """ - http_options = ( - _BaseMaintenanceRestTransport._BaseListResourceMaintenances._get_http_options() - ) + http_options = _BaseMaintenanceRestTransport._BaseListResourceMaintenances._get_http_options() request, metadata = self._interceptor.pre_list_resource_maintenances( request, metadata @@ -759,9 +755,7 @@ def __call__( """ - http_options = ( - _BaseMaintenanceRestTransport._BaseSummarizeMaintenances._get_http_options() - ) + http_options = _BaseMaintenanceRestTransport._BaseSummarizeMaintenances._get_http_options() request, metadata = self._interceptor.pre_summarize_maintenances( request, metadata @@ -864,7 +858,9 @@ def get_resource_maintenance( ]: # 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._GetResourceMaintenance(self._session, self._host, self._interceptor) # type: ignore + return self._GetResourceMaintenance( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_resource_maintenances( @@ -875,7 +871,9 @@ def list_resource_maintenances( ]: # 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._ListResourceMaintenances(self._session, self._host, self._interceptor) # type: ignore + return self._ListResourceMaintenances( + self._session, self._host, self._interceptor + ) # type: ignore @property def summarize_maintenances( diff --git a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/types/maintenance_service.py b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/types/maintenance_service.py index 7fb8690ab623..0e687093cc63 100644 --- a/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/types/maintenance_service.py +++ b/packages/google-cloud-maintenance-api/google/cloud/maintenance_api_v1beta/types/maintenance_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -61,6 +61,7 @@ class MaintenanceCategory(proto.Enum): these maintenance events using maintenance windows and/or deny maintenance features. """ + MAINTENANCE_CATEGORY_UNSPECIFIED = 0 INFRASTRUCTURE = 1 SERVICE_UPDATE = 3 @@ -228,12 +229,12 @@ class Stats(proto.Message): proto.STRING, number=1, ) - aggregates: MutableSequence[ - "MaintenanceSummary.Aggregate" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="MaintenanceSummary.Aggregate", + aggregates: MutableSequence["MaintenanceSummary.Aggregate"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="MaintenanceSummary.Aggregate", + ) ) class Aggregate(proto.Message): @@ -408,6 +409,7 @@ class State(proto.Enum): SUCCEEDED (4): Successfully completed. """ + STATE_UNSPECIFIED = 0 SCHEDULED = 1 RUNNING = 2 @@ -596,6 +598,7 @@ class Control(proto.Enum): RESCHEDULE (3): Reschedule control. """ + CONTROL_UNSPECIFIED = 0 APPLY = 1 MANAGE_POLICY = 2 diff --git a/packages/google-cloud-maintenance-api/noxfile.py b/packages/google-cloud-maintenance-api/noxfile.py index 13fc8d207596..e2005ff96967 100644 --- a/packages/google-cloud-maintenance-api/noxfile.py +++ b/packages/google-cloud-maintenance-api/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-maintenance-api/tests/unit/gapic/maintenance_api_v1/test_maintenance.py b/packages/google-cloud-maintenance-api/tests/unit/gapic/maintenance_api_v1/test_maintenance.py index 9afab7a4eff0..46d9adfd24ae 100644 --- a/packages/google-cloud-maintenance-api/tests/unit/gapic/maintenance_api_v1/test_maintenance.py +++ b/packages/google-cloud-maintenance-api/tests/unit/gapic/maintenance_api_v1/test_maintenance.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.maintenance_api_v1.services.maintenance import ( MaintenanceAsyncClient, @@ -924,10 +929,9 @@ def test_maintenance_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +976,9 @@ def test_maintenance_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1011,10 +1014,9 @@ def test_maintenance_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1243,13 +1245,13 @@ def test_maintenance_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1371,9 +1373,9 @@ def test_summarize_maintenances_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.summarize_maintenances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.summarize_maintenances] = ( + mock_rpc + ) request = {} client.summarize_maintenances(request) @@ -2774,9 +2776,9 @@ def test_summarize_maintenances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.summarize_maintenances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.summarize_maintenances] = ( + mock_rpc + ) request = {} client.summarize_maintenances(request) @@ -3779,8 +3781,9 @@ def test_summarize_maintenances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3847,18 +3850,20 @@ def test_summarize_maintenances_rest_interceptors(null_interceptor): ) client = MaintenanceClient(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.MaintenanceRestInterceptor, "post_summarize_maintenances" - ) as post, mock.patch.object( - transports.MaintenanceRestInterceptor, - "post_summarize_maintenances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MaintenanceRestInterceptor, "pre_summarize_maintenances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MaintenanceRestInterceptor, "post_summarize_maintenances" + ) as post, + mock.patch.object( + transports.MaintenanceRestInterceptor, + "post_summarize_maintenances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MaintenanceRestInterceptor, "pre_summarize_maintenances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3916,8 +3921,9 @@ def test_list_resource_maintenances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3984,18 +3990,20 @@ def test_list_resource_maintenances_rest_interceptors(null_interceptor): ) client = MaintenanceClient(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.MaintenanceRestInterceptor, "post_list_resource_maintenances" - ) as post, mock.patch.object( - transports.MaintenanceRestInterceptor, - "post_list_resource_maintenances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MaintenanceRestInterceptor, "pre_list_resource_maintenances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MaintenanceRestInterceptor, "post_list_resource_maintenances" + ) as post, + mock.patch.object( + transports.MaintenanceRestInterceptor, + "post_list_resource_maintenances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MaintenanceRestInterceptor, "pre_list_resource_maintenances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4055,8 +4063,9 @@ def test_get_resource_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4129,18 +4138,20 @@ def test_get_resource_maintenance_rest_interceptors(null_interceptor): ) client = MaintenanceClient(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.MaintenanceRestInterceptor, "post_get_resource_maintenance" - ) as post, mock.patch.object( - transports.MaintenanceRestInterceptor, - "post_get_resource_maintenance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MaintenanceRestInterceptor, "pre_get_resource_maintenance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MaintenanceRestInterceptor, "post_get_resource_maintenance" + ) as post, + mock.patch.object( + transports.MaintenanceRestInterceptor, + "post_get_resource_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MaintenanceRestInterceptor, "pre_get_resource_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4198,8 +4209,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4258,8 +4270,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4437,11 +4450,14 @@ def test_maintenance_base_transport(): def test_maintenance_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.maintenance_api_v1.services.maintenance.transports.MaintenanceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.maintenance_api_v1.services.maintenance.transports.MaintenanceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MaintenanceTransport( @@ -4458,9 +4474,12 @@ def test_maintenance_base_transport_with_credentials_file(): def test_maintenance_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.maintenance_api_v1.services.maintenance.transports.MaintenanceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.maintenance_api_v1.services.maintenance.transports.MaintenanceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MaintenanceTransport() @@ -4532,11 +4551,12 @@ def test_maintenance_transport_auth_gdch_credentials(transport_class): def test_maintenance_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-maintenance-api/tests/unit/gapic/maintenance_api_v1beta/test_maintenance.py b/packages/google-cloud-maintenance-api/tests/unit/gapic/maintenance_api_v1beta/test_maintenance.py index 6f4f47997b4f..d466a84e395b 100644 --- a/packages/google-cloud-maintenance-api/tests/unit/gapic/maintenance_api_v1beta/test_maintenance.py +++ b/packages/google-cloud-maintenance-api/tests/unit/gapic/maintenance_api_v1beta/test_maintenance.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,16 +43,21 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.maintenance_api_v1beta.services.maintenance import ( MaintenanceAsyncClient, @@ -924,10 +929,9 @@ def test_maintenance_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -972,10 +976,9 @@ def test_maintenance_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1011,10 +1014,9 @@ def test_maintenance_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1243,13 +1245,13 @@ def test_maintenance_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1371,9 +1373,9 @@ def test_summarize_maintenances_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.summarize_maintenances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.summarize_maintenances] = ( + mock_rpc + ) request = {} client.summarize_maintenances(request) @@ -2774,9 +2776,9 @@ def test_summarize_maintenances_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.summarize_maintenances - ] = mock_rpc + client._transport._wrapped_methods[client._transport.summarize_maintenances] = ( + mock_rpc + ) request = {} client.summarize_maintenances(request) @@ -3779,8 +3781,9 @@ def test_summarize_maintenances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3847,18 +3850,20 @@ def test_summarize_maintenances_rest_interceptors(null_interceptor): ) client = MaintenanceClient(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.MaintenanceRestInterceptor, "post_summarize_maintenances" - ) as post, mock.patch.object( - transports.MaintenanceRestInterceptor, - "post_summarize_maintenances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MaintenanceRestInterceptor, "pre_summarize_maintenances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MaintenanceRestInterceptor, "post_summarize_maintenances" + ) as post, + mock.patch.object( + transports.MaintenanceRestInterceptor, + "post_summarize_maintenances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MaintenanceRestInterceptor, "pre_summarize_maintenances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3916,8 +3921,9 @@ def test_list_resource_maintenances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3984,18 +3990,20 @@ def test_list_resource_maintenances_rest_interceptors(null_interceptor): ) client = MaintenanceClient(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.MaintenanceRestInterceptor, "post_list_resource_maintenances" - ) as post, mock.patch.object( - transports.MaintenanceRestInterceptor, - "post_list_resource_maintenances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MaintenanceRestInterceptor, "pre_list_resource_maintenances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MaintenanceRestInterceptor, "post_list_resource_maintenances" + ) as post, + mock.patch.object( + transports.MaintenanceRestInterceptor, + "post_list_resource_maintenances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MaintenanceRestInterceptor, "pre_list_resource_maintenances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4055,8 +4063,9 @@ def test_get_resource_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4129,18 +4138,20 @@ def test_get_resource_maintenance_rest_interceptors(null_interceptor): ) client = MaintenanceClient(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.MaintenanceRestInterceptor, "post_get_resource_maintenance" - ) as post, mock.patch.object( - transports.MaintenanceRestInterceptor, - "post_get_resource_maintenance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MaintenanceRestInterceptor, "pre_get_resource_maintenance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MaintenanceRestInterceptor, "post_get_resource_maintenance" + ) as post, + mock.patch.object( + transports.MaintenanceRestInterceptor, + "post_get_resource_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MaintenanceRestInterceptor, "pre_get_resource_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4198,8 +4209,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4258,8 +4270,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4437,11 +4450,14 @@ def test_maintenance_base_transport(): def test_maintenance_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.maintenance_api_v1beta.services.maintenance.transports.MaintenanceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.maintenance_api_v1beta.services.maintenance.transports.MaintenanceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MaintenanceTransport( @@ -4458,9 +4474,12 @@ def test_maintenance_base_transport_with_credentials_file(): def test_maintenance_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.maintenance_api_v1beta.services.maintenance.transports.MaintenanceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.maintenance_api_v1beta.services.maintenance.transports.MaintenanceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MaintenanceTransport() @@ -4532,11 +4551,12 @@ def test_maintenance_transport_auth_gdch_credentials(transport_class): def test_maintenance_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-managed-identities/docs/conf.py b/packages/google-cloud-managed-identities/docs/conf.py index b2fc55e69e8b..58fb7f8e3086 100644 --- a/packages/google-cloud-managed-identities/docs/conf.py +++ b/packages/google-cloud-managed-identities/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-managed-identities documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/__init__.py b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/__init__.py index 387409fd1061..69326d7c6897 100644 --- a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/__init__.py +++ b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.managed_identities_service import ( ManagedIdentitiesServiceAsyncClient, ManagedIdentitiesServiceClient, diff --git a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/async_client.py b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/async_client.py index 784a2d470a1c..c689e8fe1f99 100644 --- a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/async_client.py +++ b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.managedidentities_v1 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.managedidentities_v1.services.managed_identities_service import pagers from google.cloud.managedidentities_v1.types import managed_identities_service, resource @@ -159,7 +159,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ManagedIdentitiesServiceAsyncClient: The constructed client. """ - return ManagedIdentitiesServiceClient.from_service_account_info.__func__(ManagedIdentitiesServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ManagedIdentitiesServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ManagedIdentitiesServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -175,7 +176,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ManagedIdentitiesServiceAsyncClient: The constructed client. """ - return ManagedIdentitiesServiceClient.from_service_account_file.__func__(ManagedIdentitiesServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ManagedIdentitiesServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + ManagedIdentitiesServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -213,7 +217,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ManagedIdentitiesServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ManagedIdentitiesServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ManagedIdentitiesServiceTransport: diff --git a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/client.py b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/client.py index 3aa09ccc43ff..e5644bc66330 100644 --- a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/client.py +++ b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.managedidentities_v1 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.managedidentities_v1.services.managed_identities_service import pagers from google.cloud.managedidentities_v1.types import managed_identities_service, resource @@ -83,9 +83,7 @@ class ManagedIdentitiesServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ManagedIdentitiesServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ManagedIdentitiesServiceTransport]] _transport_registry["grpc"] = ManagedIdentitiesServiceGrpcTransport _transport_registry["grpc_asyncio"] = ManagedIdentitiesServiceGrpcAsyncIOTransport @@ -664,11 +662,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ManagedIdentitiesServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ManagedIdentitiesServiceClient._read_environment_variables() + ) self._client_cert_source = ( ManagedIdentitiesServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -705,8 +701,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ManagedIdentitiesServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/pagers.py b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/pagers.py index 40dc5f0b4f34..72efd023e398 100644 --- a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/pagers.py +++ b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/__init__.py b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/__init__.py index b242d61b071e..d741b9e42f6d 100644 --- a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/__init__.py +++ b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import ManagedIdentitiesServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ManagedIdentitiesServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ManagedIdentitiesServiceTransport]] _transport_registry["grpc"] = ManagedIdentitiesServiceGrpcTransport _transport_registry["grpc_asyncio"] = ManagedIdentitiesServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/base.py b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/base.py index 6048ed21dad1..182acada71b3 100644 --- a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/base.py +++ b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.managedidentities_v1 import gapic_version as package_version from google.cloud.managedidentities_v1.types import managed_identities_service, resource diff --git a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc.py b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc.py index 6c17e81d2a76..468c3912d59d 100644 --- a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc.py +++ b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.managedidentities_v1.types import managed_identities_service, resource @@ -394,12 +394,12 @@ def create_microsoft_ad_domain( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_microsoft_ad_domain" not in self._stubs: - self._stubs[ - "create_microsoft_ad_domain" - ] = self._logged_channel.unary_unary( - "/google.cloud.managedidentities.v1.ManagedIdentitiesService/CreateMicrosoftAdDomain", - request_serializer=managed_identities_service.CreateMicrosoftAdDomainRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_microsoft_ad_domain"] = ( + self._logged_channel.unary_unary( + "/google.cloud.managedidentities.v1.ManagedIdentitiesService/CreateMicrosoftAdDomain", + request_serializer=managed_identities_service.CreateMicrosoftAdDomainRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_microsoft_ad_domain"] diff --git a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc_asyncio.py b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc_asyncio.py index d7e5d99ce5f2..dd742a583149 100644 --- a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/services/managed_identities_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.managedidentities_v1.types import managed_identities_service, resource @@ -402,12 +402,12 @@ def create_microsoft_ad_domain( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_microsoft_ad_domain" not in self._stubs: - self._stubs[ - "create_microsoft_ad_domain" - ] = self._logged_channel.unary_unary( - "/google.cloud.managedidentities.v1.ManagedIdentitiesService/CreateMicrosoftAdDomain", - request_serializer=managed_identities_service.CreateMicrosoftAdDomainRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_microsoft_ad_domain"] = ( + self._logged_channel.unary_unary( + "/google.cloud.managedidentities.v1.ManagedIdentitiesService/CreateMicrosoftAdDomain", + request_serializer=managed_identities_service.CreateMicrosoftAdDomainRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_microsoft_ad_domain"] diff --git a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/types/__init__.py b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/types/__init__.py index a03721da0703..da8f002096d2 100644 --- a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/types/__init__.py +++ b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/types/__init__.py @@ -28,7 +28,10 @@ UpdateDomainRequest, ValidateTrustRequest, ) -from .resource import Domain, Trust +from .resource import ( + Domain, + Trust, +) __all__ = ( "AttachTrustRequest", diff --git a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/types/managed_identities_service.py b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/types/managed_identities_service.py index 076e1e169b66..287909c682e2 100644 --- a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/types/managed_identities_service.py +++ b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/types/managed_identities_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.managedidentities_v1.types import resource diff --git a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/types/resource.py b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/types/resource.py index 64c4bdc69fc0..f1976fb3ab7e 100644 --- a/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/types/resource.py +++ b/packages/google-cloud-managed-identities/google/cloud/managedidentities_v1/types/resource.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -105,6 +105,7 @@ class State(proto.Enum): UNAVAILABLE (7): The domain is not serving requests. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -231,6 +232,7 @@ class State(proto.Enum): DISCONNECTED (5): The domain trust is disconnected. """ + STATE_UNSPECIFIED = 0 CREATING = 1 UPDATING = 2 @@ -249,6 +251,7 @@ class TrustType(proto.Enum): EXTERNAL (2): The external domain trust. """ + TRUST_TYPE_UNSPECIFIED = 0 FOREST = 1 EXTERNAL = 2 @@ -271,6 +274,7 @@ class TrustDirection(proto.Enum): The bidirectional direction represents the trusted / trusting side. """ + TRUST_DIRECTION_UNSPECIFIED = 0 INBOUND = 1 OUTBOUND = 2 diff --git a/packages/google-cloud-managed-identities/noxfile.py b/packages/google-cloud-managed-identities/noxfile.py index 776710e3d887..61532c984118 100644 --- a/packages/google-cloud-managed-identities/noxfile.py +++ b/packages/google-cloud-managed-identities/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-managed-identities/tests/unit/gapic/managedidentities_v1/test_managed_identities_service.py b/packages/google-cloud-managed-identities/tests/unit/gapic/managedidentities_v1/test_managed_identities_service.py index 251f92d5b9d8..b0783d17bbac 100644 --- a/packages/google-cloud-managed-identities/tests/unit/gapic/managedidentities_v1/test_managed_identities_service.py +++ b/packages/google-cloud-managed-identities/tests/unit/gapic/managedidentities_v1/test_managed_identities_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,18 +54,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.managedidentities_v1.services.managed_identities_service import ( ManagedIdentitiesServiceAsyncClient, @@ -983,10 +983,9 @@ def test_managed_identities_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1031,10 +1030,9 @@ def test_managed_identities_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1070,10 +1068,9 @@ def test_managed_identities_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1319,13 +1316,13 @@ def test_managed_identities_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1807,9 +1804,9 @@ def test_reset_admin_password_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reset_admin_password - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reset_admin_password] = ( + mock_rpc + ) request = {} client.reset_admin_password(request) @@ -4020,9 +4017,9 @@ def test_reconfigure_trust_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reconfigure_trust - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reconfigure_trust] = ( + mock_rpc + ) request = {} client.reconfigure_trust(request) @@ -5646,11 +5643,14 @@ def test_managed_identities_service_base_transport(): def test_managed_identities_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.managedidentities_v1.services.managed_identities_service.transports.ManagedIdentitiesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.managedidentities_v1.services.managed_identities_service.transports.ManagedIdentitiesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ManagedIdentitiesServiceTransport( @@ -5667,9 +5667,12 @@ def test_managed_identities_service_base_transport_with_credentials_file(): def test_managed_identities_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.managedidentities_v1.services.managed_identities_service.transports.ManagedIdentitiesServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.managedidentities_v1.services.managed_identities_service.transports.ManagedIdentitiesServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ManagedIdentitiesServiceTransport() @@ -5742,11 +5745,12 @@ def test_managed_identities_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-managedkafka-schemaregistry/docs/conf.py b/packages/google-cloud-managedkafka-schemaregistry/docs/conf.py index 0a63749c4518..dcb4b672e39d 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/docs/conf.py +++ b/packages/google-cloud-managedkafka-schemaregistry/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-managedkafka-schemaregistry documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/__init__.py b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/__init__.py index b7f8a3db4698..f9653017c3c4 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/__init__.py +++ b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.managed_schema_registry import ( ManagedSchemaRegistryAsyncClient, ManagedSchemaRegistryClient, diff --git a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/async_client.py b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/async_client.py index 6571127e97d1..c792fa69cb64 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/async_client.py +++ b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.managedkafka_schemaregistry_v1 import gapic_version as package_version @@ -44,16 +44,18 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import any_pb2 # type: ignore +from google.cloud.managedkafka_schemaregistry_v1.types import ( + schema_registry, + schema_registry_resources, +) from google.cloud.managedkafka_schemaregistry_v1.types import ( schema_registry as gcms_schema_registry, ) -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry_resources -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry from .client import ManagedSchemaRegistryClient from .transports.base import DEFAULT_CLIENT_INFO, ManagedSchemaRegistryTransport @@ -201,7 +203,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ManagedSchemaRegistryAsyncClient: The constructed client. """ - return ManagedSchemaRegistryClient.from_service_account_info.__func__(ManagedSchemaRegistryAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ManagedSchemaRegistryClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ManagedSchemaRegistryAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -217,7 +220,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ManagedSchemaRegistryAsyncClient: The constructed client. """ - return ManagedSchemaRegistryClient.from_service_account_file.__func__(ManagedSchemaRegistryAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ManagedSchemaRegistryClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ManagedSchemaRegistryAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -255,7 +259,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ManagedSchemaRegistryClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ManagedSchemaRegistryClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ManagedSchemaRegistryTransport: diff --git a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/client.py b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/client.py index 0990830b880d..bf4a8276b318 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/client.py +++ b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.managedkafka_schemaregistry_v1 import gapic_version as package_version @@ -61,16 +61,18 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.any_pb2 as any_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import any_pb2 # type: ignore +from google.cloud.managedkafka_schemaregistry_v1.types import ( + schema_registry, + schema_registry_resources, +) from google.cloud.managedkafka_schemaregistry_v1.types import ( schema_registry as gcms_schema_registry, ) -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry_resources -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry from .transports.base import DEFAULT_CLIENT_INFO, ManagedSchemaRegistryTransport from .transports.grpc import ManagedSchemaRegistryGrpcTransport @@ -86,9 +88,7 @@ class ManagedSchemaRegistryClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ManagedSchemaRegistryTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ManagedSchemaRegistryTransport]] _transport_registry["grpc"] = ManagedSchemaRegistryGrpcTransport _transport_registry["grpc_asyncio"] = ManagedSchemaRegistryGrpcAsyncIOTransport _transport_registry["rest"] = ManagedSchemaRegistryRestTransport @@ -828,11 +828,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ManagedSchemaRegistryClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ManagedSchemaRegistryClient._read_environment_variables() + ) self._client_cert_source = ManagedSchemaRegistryClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -867,8 +865,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ManagedSchemaRegistryTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/__init__.py b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/__init__.py index f2af2df09a2d..c06dbf6cfcd4 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/__init__.py +++ b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ManagedSchemaRegistryTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ManagedSchemaRegistryTransport]] _transport_registry["grpc"] = ManagedSchemaRegistryGrpcTransport _transport_registry["grpc_asyncio"] = ManagedSchemaRegistryGrpcAsyncIOTransport _transport_registry["rest"] = ManagedSchemaRegistryRestTransport diff --git a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/base.py b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/base.py index 59e82f4c47e0..b2259025e69b 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/base.py +++ b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/base.py @@ -16,25 +16,27 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.managedkafka_schemaregistry_v1 import gapic_version as package_version +from google.cloud.managedkafka_schemaregistry_v1.types import ( + schema_registry, + schema_registry_resources, +) from google.cloud.managedkafka_schemaregistry_v1.types import ( schema_registry as gcms_schema_registry, ) -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry_resources -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -632,13 +634,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/grpc.py b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/grpc.py index 223fdd86df54..8a06ac2d797f 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/grpc.py +++ b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/grpc.py @@ -16,27 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.managedkafka_schemaregistry_v1.types import ( + schema_registry, + schema_registry_resources, +) from google.cloud.managedkafka_schemaregistry_v1.types import ( schema_registry as gcms_schema_registry, ) -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry_resources -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry from .base import DEFAULT_CLIENT_INFO, ManagedSchemaRegistryTransport @@ -705,12 +707,12 @@ def list_subjects_by_schema_id( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_subjects_by_schema_id" not in self._stubs: - self._stubs[ - "list_subjects_by_schema_id" - ] = self._logged_channel.unary_unary( - "/google.cloud.managedkafka.schemaregistry.v1.ManagedSchemaRegistry/ListSubjectsBySchemaId", - request_serializer=schema_registry.ListSubjectsBySchemaIdRequest.serialize, - response_deserializer=httpbody_pb2.HttpBody.FromString, + self._stubs["list_subjects_by_schema_id"] = ( + self._logged_channel.unary_unary( + "/google.cloud.managedkafka.schemaregistry.v1.ManagedSchemaRegistry/ListSubjectsBySchemaId", + request_serializer=schema_registry.ListSubjectsBySchemaIdRequest.serialize, + response_deserializer=httpbody_pb2.HttpBody.FromString, + ) ) return self._stubs["list_subjects_by_schema_id"] diff --git a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/grpc_asyncio.py b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/grpc_asyncio.py index a17606746335..74e3cfe552d6 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/grpc_asyncio.py +++ b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/grpc_asyncio.py @@ -17,10 +17,14 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -28,18 +32,16 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.managedkafka_schemaregistry_v1.types import ( + schema_registry, + schema_registry_resources, +) from google.cloud.managedkafka_schemaregistry_v1.types import ( schema_registry as gcms_schema_registry, ) -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry_resources -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry from .base import DEFAULT_CLIENT_INFO, ManagedSchemaRegistryTransport from .grpc import ManagedSchemaRegistryGrpcTransport @@ -727,12 +729,12 @@ def list_subjects_by_schema_id( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_subjects_by_schema_id" not in self._stubs: - self._stubs[ - "list_subjects_by_schema_id" - ] = self._logged_channel.unary_unary( - "/google.cloud.managedkafka.schemaregistry.v1.ManagedSchemaRegistry/ListSubjectsBySchemaId", - request_serializer=schema_registry.ListSubjectsBySchemaIdRequest.serialize, - response_deserializer=httpbody_pb2.HttpBody.FromString, + self._stubs["list_subjects_by_schema_id"] = ( + self._logged_channel.unary_unary( + "/google.cloud.managedkafka.schemaregistry.v1.ManagedSchemaRegistry/ListSubjectsBySchemaId", + request_serializer=schema_registry.ListSubjectsBySchemaIdRequest.serialize, + response_deserializer=httpbody_pb2.HttpBody.FromString, + ) ) return self._stubs["list_subjects_by_schema_id"] diff --git a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/rest.py b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/rest.py index b80c7c2ccc65..e93ea8af321f 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/rest.py +++ b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/rest.py @@ -16,10 +16,12 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries @@ -27,16 +29,16 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.managedkafka_schemaregistry_v1.types import ( + schema_registry, + schema_registry_resources, +) from google.cloud.managedkafka_schemaregistry_v1.types import ( schema_registry as gcms_schema_registry, ) -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry_resources -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseManagedSchemaRegistryRestTransport @@ -1945,9 +1947,7 @@ def __call__( Response for CheckCompatibility. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseCheckCompatibility._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseCheckCompatibility._get_http_options() request, metadata = self._interceptor.pre_check_compatibility( request, metadata @@ -2105,9 +2105,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseCreateSchemaRegistry._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseCreateSchemaRegistry._get_http_options() request, metadata = self._interceptor.pre_create_schema_registry( request, metadata @@ -2262,9 +2260,7 @@ def __call__( Response for CreateVersion. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseCreateVersion._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseCreateVersion._get_http_options() request, metadata = self._interceptor.pre_create_version(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseCreateVersion._get_transcoded_request( @@ -2417,9 +2413,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseDeleteSchemaConfig._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseDeleteSchemaConfig._get_http_options() request, metadata = self._interceptor.pre_delete_schema_config( request, metadata @@ -2580,9 +2574,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseDeleteSchemaMode._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseDeleteSchemaMode._get_http_options() request, metadata = self._interceptor.pre_delete_schema_mode( request, metadata @@ -2727,9 +2719,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseDeleteSchemaRegistry._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseDeleteSchemaRegistry._get_http_options() request, metadata = self._interceptor.pre_delete_schema_registry( request, metadata @@ -2751,7 +2741,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2891,9 +2881,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseDeleteSubject._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseDeleteSubject._get_http_options() request, metadata = self._interceptor.pre_delete_subject(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseDeleteSubject._get_transcoded_request( @@ -2913,7 +2901,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3085,9 +3073,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseDeleteVersion._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseDeleteVersion._get_http_options() request, metadata = self._interceptor.pre_delete_version(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseDeleteVersion._get_transcoded_request( @@ -3107,7 +3093,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3233,9 +3219,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseGetContext._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseGetContext._get_http_options() request, metadata = self._interceptor.pre_get_context(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseGetContext._get_transcoded_request( @@ -3429,9 +3413,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseGetRawSchema._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseGetRawSchema._get_http_options() request, metadata = self._interceptor.pre_get_raw_schema(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseGetRawSchema._get_transcoded_request( @@ -3451,7 +3433,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3623,9 +3605,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseGetRawSchemaVersion._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseGetRawSchemaVersion._get_http_options() request, metadata = self._interceptor.pre_get_raw_schema_version( request, metadata @@ -3647,7 +3627,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3772,9 +3752,7 @@ def __call__( Schema for a Kafka message. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseGetSchema._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseGetSchema._get_http_options() request, metadata = self._interceptor.pre_get_schema(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseGetSchema._get_transcoded_request( @@ -3922,9 +3900,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseGetSchemaConfig._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseGetSchemaConfig._get_http_options() request, metadata = self._interceptor.pre_get_schema_config( request, metadata @@ -4086,9 +4062,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseGetSchemaMode._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseGetSchemaMode._get_http_options() request, metadata = self._interceptor.pre_get_schema_mode(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseGetSchemaMode._get_transcoded_request( @@ -4235,9 +4209,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseGetSchemaRegistry._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseGetSchemaRegistry._get_http_options() request, metadata = self._interceptor.pre_get_schema_registry( request, metadata @@ -4386,9 +4358,7 @@ def __call__( Version of a schema. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseGetVersion._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseGetVersion._get_http_options() request, metadata = self._interceptor.pre_get_version(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseGetVersion._get_transcoded_request( @@ -4582,9 +4552,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseListContexts._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseListContexts._get_http_options() request, metadata = self._interceptor.pre_list_contexts(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseListContexts._get_transcoded_request( @@ -4604,7 +4572,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4776,9 +4744,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseListReferencedSchemas._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseListReferencedSchemas._get_http_options() request, metadata = self._interceptor.pre_list_referenced_schemas( request, metadata @@ -4800,7 +4766,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4925,9 +4891,7 @@ def __call__( Request for ListSchemaRegistries. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseListSchemaRegistries._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseListSchemaRegistries._get_http_options() request, metadata = self._interceptor.pre_list_schema_registries( request, metadata @@ -5125,9 +5089,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseListSchemaTypes._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseListSchemaTypes._get_http_options() request, metadata = self._interceptor.pre_list_schema_types( request, metadata @@ -5149,7 +5111,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5323,9 +5285,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseListSchemaVersions._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseListSchemaVersions._get_http_options() request, metadata = self._interceptor.pre_list_schema_versions( request, metadata @@ -5347,7 +5307,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5521,9 +5481,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseListSubjects._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseListSubjects._get_http_options() request, metadata = self._interceptor.pre_list_subjects(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseListSubjects._get_transcoded_request( @@ -5543,7 +5501,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5716,9 +5674,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseListSubjectsBySchemaId._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseListSubjectsBySchemaId._get_http_options() request, metadata = self._interceptor.pre_list_subjects_by_schema_id( request, metadata @@ -5740,7 +5696,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5912,9 +5868,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseListVersions._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseListVersions._get_http_options() request, metadata = self._interceptor.pre_list_versions(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseListVersions._get_transcoded_request( @@ -5934,7 +5888,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6058,9 +6012,7 @@ def __call__( Version of a schema. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseLookupVersion._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseLookupVersion._get_http_options() request, metadata = self._interceptor.pre_lookup_version(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseLookupVersion._get_transcoded_request( @@ -6217,9 +6169,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseUpdateSchemaConfig._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseUpdateSchemaConfig._get_http_options() request, metadata = self._interceptor.pre_update_schema_config( request, metadata @@ -6387,9 +6337,7 @@ def __call__( """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseUpdateSchemaMode._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseUpdateSchemaMode._get_http_options() request, metadata = self._interceptor.pre_update_schema_mode( request, metadata @@ -6701,7 +6649,9 @@ def list_subjects_by_schema_id( ]: # 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._ListSubjectsBySchemaId(self._session, self._host, self._interceptor) # type: ignore + return self._ListSubjectsBySchemaId( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_versions( @@ -6800,9 +6750,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseGetLocation._get_transcoded_request( @@ -6941,9 +6889,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseListLocations._get_transcoded_request( @@ -7080,9 +7026,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -7202,9 +7146,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -7322,9 +7264,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseGetOperation._get_transcoded_request( @@ -7463,9 +7403,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseManagedSchemaRegistryRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseManagedSchemaRegistryRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseManagedSchemaRegistryRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/rest_base.py b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/rest_base.py index 4b754c0a56ac..ca6486435507 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/rest_base.py +++ b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/services/managed_schema_registry/transports/rest_base.py @@ -17,18 +17,20 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.managedkafka_schemaregistry_v1.types import ( + schema_registry, + schema_registry_resources, +) from google.cloud.managedkafka_schemaregistry_v1.types import ( schema_registry as gcms_schema_registry, ) -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry_resources -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry from .base import DEFAULT_CLIENT_INFO, ManagedSchemaRegistryTransport diff --git a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/types/schema_registry.py b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/types/schema_registry.py index 8eda57ad8d75..21afe5cd9ad4 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/types/schema_registry.py +++ b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/types/schema_registry.py @@ -96,12 +96,12 @@ class ListSchemaRegistriesResponse(proto.Message): The schema registry instances. """ - schema_registries: MutableSequence[ - schema_registry_resources.SchemaRegistry - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=schema_registry_resources.SchemaRegistry, + schema_registries: MutableSequence[schema_registry_resources.SchemaRegistry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=schema_registry_resources.SchemaRegistry, + ) ) @@ -528,12 +528,12 @@ class CreateVersionRequest(proto.Message): proto.STRING, number=5, ) - references: MutableSequence[ - schema_registry_resources.Schema.SchemaReference - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=schema_registry_resources.Schema.SchemaReference, + references: MutableSequence[schema_registry_resources.Schema.SchemaReference] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=schema_registry_resources.Schema.SchemaReference, + ) ) normalize: bool = proto.Field( proto.BOOL, @@ -607,12 +607,12 @@ class LookupVersionRequest(proto.Message): proto.STRING, number=3, ) - references: MutableSequence[ - schema_registry_resources.Schema.SchemaReference - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=schema_registry_resources.Schema.SchemaReference, + references: MutableSequence[schema_registry_resources.Schema.SchemaReference] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=schema_registry_resources.Schema.SchemaReference, + ) ) normalize: bool = proto.Field( proto.BOOL, @@ -727,12 +727,12 @@ class CheckCompatibilityRequest(proto.Message): proto.STRING, number=3, ) - references: MutableSequence[ - schema_registry_resources.Schema.SchemaReference - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=schema_registry_resources.Schema.SchemaReference, + references: MutableSequence[schema_registry_resources.Schema.SchemaReference] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=schema_registry_resources.Schema.SchemaReference, + ) ) verbose: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/types/schema_registry_resources.py b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/types/schema_registry_resources.py index 5053083fc78b..a2b36d38be2d 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/types/schema_registry_resources.py +++ b/packages/google-cloud-managedkafka-schemaregistry/google/cloud/managedkafka_schemaregistry_v1/types/schema_registry_resources.py @@ -116,6 +116,7 @@ class SchemaType(proto.Enum): PROTOBUF (3): Protobuf schema type. """ + SCHEMA_TYPE_UNSPECIFIED = 0 AVRO = 1 JSON = 2 @@ -298,6 +299,7 @@ class CompatibilityType(proto.Enum): Backwards and forwards compatible with all previous versions. """ + NONE = 0 BACKWARD = 1 BACKWARD_TRANSITIVE = 2 @@ -360,6 +362,7 @@ class ModeType(proto.Enum): IMPORT (3): IMPORT mode. """ + NONE = 0 READONLY = 1 READWRITE = 2 diff --git a/packages/google-cloud-managedkafka-schemaregistry/noxfile.py b/packages/google-cloud-managedkafka-schemaregistry/noxfile.py index f3d6e69a685b..9ffaee2f8cdf 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/noxfile.py +++ b/packages/google-cloud-managedkafka-schemaregistry/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-managedkafka-schemaregistry/tests/unit/gapic/managedkafka_schemaregistry_v1/test_managed_schema_registry.py b/packages/google-cloud-managedkafka-schemaregistry/tests/unit/gapic/managedkafka_schemaregistry_v1/test_managed_schema_registry.py index db13423e0f4c..892e8632528e 100644 --- a/packages/google-cloud-managedkafka-schemaregistry/tests/unit/gapic/managedkafka_schemaregistry_v1/test_managed_schema_registry.py +++ b/packages/google-cloud-managedkafka-schemaregistry/tests/unit/gapic/managedkafka_schemaregistry_v1/test_managed_schema_registry.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,29 +43,36 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.api.httpbody_pb2 as httpbody_pb2 # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore from google.cloud.managedkafka_schemaregistry_v1.services.managed_schema_registry import ( ManagedSchemaRegistryAsyncClient, ManagedSchemaRegistryClient, transports, ) +from google.cloud.managedkafka_schemaregistry_v1.types import ( + schema_registry, + schema_registry_resources, +) from google.cloud.managedkafka_schemaregistry_v1.types import ( schema_registry as gcms_schema_registry, ) -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry_resources -from google.cloud.managedkafka_schemaregistry_v1.types import schema_registry CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1001,10 +1008,9 @@ def test_managed_schema_registry_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1049,10 +1055,9 @@ def test_managed_schema_registry_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1088,10 +1093,9 @@ def test_managed_schema_registry_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1347,13 +1351,13 @@ def test_managed_schema_registry_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1468,9 +1472,9 @@ def test_get_schema_registry_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_schema_registry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_schema_registry] = ( + mock_rpc + ) request = {} client.get_schema_registry(request) @@ -1810,9 +1814,9 @@ def test_list_schema_registries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_schema_registries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_schema_registries] = ( + mock_rpc + ) request = {} client.list_schema_registries(request) @@ -2154,9 +2158,9 @@ def test_create_schema_registry_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_schema_registry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_schema_registry] = ( + mock_rpc + ) request = {} client.create_schema_registry(request) @@ -2506,9 +2510,9 @@ def test_delete_schema_registry_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_schema_registry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_schema_registry] = ( + mock_rpc + ) request = {} client.delete_schema_registry(request) @@ -4153,9 +4157,9 @@ def test_list_schema_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_schema_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_schema_versions] = ( + mock_rpc + ) request = {} client.list_schema_versions(request) @@ -4497,9 +4501,9 @@ def test_list_schema_types_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_schema_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_schema_types] = ( + mock_rpc + ) request = {} client.list_schema_types(request) @@ -6578,9 +6582,9 @@ def test_get_raw_schema_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_raw_schema_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_raw_schema_version] = ( + mock_rpc + ) request = {} client.get_raw_schema_version(request) @@ -8319,9 +8323,9 @@ def test_check_compatibility_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.check_compatibility - ] = mock_rpc + client._transport._wrapped_methods[client._transport.check_compatibility] = ( + mock_rpc + ) request = {} client.check_compatibility(request) @@ -8678,9 +8682,9 @@ def test_get_schema_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_schema_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_schema_config] = ( + mock_rpc + ) request = {} client.get_schema_config(request) @@ -9033,9 +9037,9 @@ def test_update_schema_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_schema_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_schema_config] = ( + mock_rpc + ) request = {} client.update_schema_config(request) @@ -9399,9 +9403,9 @@ def test_delete_schema_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_schema_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_schema_config] = ( + mock_rpc + ) request = {} client.delete_schema_config(request) @@ -10071,9 +10075,9 @@ def test_update_schema_mode_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_schema_mode - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_schema_mode] = ( + mock_rpc + ) request = {} client.update_schema_mode(request) @@ -10423,9 +10427,9 @@ def test_delete_schema_mode_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_schema_mode - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_schema_mode] = ( + mock_rpc + ) request = {} client.delete_schema_mode(request) @@ -10697,9 +10701,9 @@ def test_get_schema_registry_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_schema_registry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_schema_registry] = ( + mock_rpc + ) request = {} client.get_schema_registry(request) @@ -10882,9 +10886,9 @@ def test_list_schema_registries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_schema_registries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_schema_registries] = ( + mock_rpc + ) request = {} client.list_schema_registries(request) @@ -11065,9 +11069,9 @@ def test_create_schema_registry_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_schema_registry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_schema_registry] = ( + mock_rpc + ) request = {} client.create_schema_registry(request) @@ -11264,9 +11268,9 @@ def test_delete_schema_registry_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_schema_registry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_schema_registry] = ( + mock_rpc + ) request = {} client.delete_schema_registry(request) @@ -12157,9 +12161,9 @@ def test_list_schema_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_schema_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_schema_versions] = ( + mock_rpc + ) request = {} client.list_schema_versions(request) @@ -12350,9 +12354,9 @@ def test_list_schema_types_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_schema_types - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_schema_types] = ( + mock_rpc + ) request = {} client.list_schema_types(request) @@ -13481,9 +13485,9 @@ def test_get_raw_schema_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_raw_schema_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_raw_schema_version] = ( + mock_rpc + ) request = {} client.get_raw_schema_version(request) @@ -14409,9 +14413,9 @@ def test_check_compatibility_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.check_compatibility - ] = mock_rpc + client._transport._wrapped_methods[client._transport.check_compatibility] = ( + mock_rpc + ) request = {} client.check_compatibility(request) @@ -14606,9 +14610,9 @@ def test_get_schema_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_schema_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_schema_config] = ( + mock_rpc + ) request = {} client.get_schema_config(request) @@ -14792,9 +14796,9 @@ def test_update_schema_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_schema_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_schema_config] = ( + mock_rpc + ) request = {} client.update_schema_config(request) @@ -14987,9 +14991,9 @@ def test_delete_schema_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_schema_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_schema_config] = ( + mock_rpc + ) request = {} client.delete_schema_config(request) @@ -15351,9 +15355,9 @@ def test_update_schema_mode_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_schema_mode - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_schema_mode] = ( + mock_rpc + ) request = {} client.update_schema_mode(request) @@ -15546,9 +15550,9 @@ def test_delete_schema_mode_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_schema_mode - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_schema_mode] = ( + mock_rpc + ) request = {} client.delete_schema_mode(request) @@ -17227,8 +17231,9 @@ def test_get_schema_registry_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17295,18 +17300,20 @@ def test_get_schema_registry_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_get_schema_registry" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_get_schema_registry_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_get_schema_registry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_get_schema_registry" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_get_schema_registry_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_get_schema_registry" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17364,8 +17371,9 @@ def test_list_schema_registries_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17425,18 +17433,22 @@ def test_list_schema_registries_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_list_schema_registries" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_list_schema_registries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_list_schema_registries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_list_schema_registries", + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_list_schema_registries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "pre_list_schema_registries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17494,8 +17506,9 @@ def test_create_schema_registry_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17560,18 +17573,22 @@ def test_create_schema_registry_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_create_schema_registry" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_create_schema_registry_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_create_schema_registry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_create_schema_registry", + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_create_schema_registry_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "pre_create_schema_registry", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17631,8 +17648,9 @@ def test_delete_schema_registry_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17691,13 +17709,14 @@ def test_delete_schema_registry_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "pre_delete_schema_registry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "pre_delete_schema_registry", + ) as pre, + ): pre.assert_not_called() pb_message = schema_registry.DeleteSchemaRegistryRequest.pb( schema_registry.DeleteSchemaRegistryRequest() @@ -17742,8 +17761,9 @@ def test_get_context_rest_bad_request(request_type=schema_registry.GetContextReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17810,18 +17830,20 @@ def test_get_context_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_get_context" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_get_context_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_get_context" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_get_context" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_get_context_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_get_context" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17878,8 +17900,9 @@ def test_list_contexts_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17943,18 +17966,20 @@ def test_list_contexts_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_list_contexts" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_list_contexts_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_list_contexts" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_list_contexts" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_list_contexts_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_list_contexts" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18007,8 +18032,9 @@ def test_get_schema_rest_bad_request(request_type=schema_registry.GetSchemaReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18075,17 +18101,20 @@ def test_get_schema_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_get_schema" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "post_get_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_get_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_get_schema" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_get_schema_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_get_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18140,8 +18169,9 @@ def test_get_raw_schema_rest_bad_request(request_type=schema_registry.GetSchemaR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18205,18 +18235,20 @@ def test_get_raw_schema_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_get_raw_schema" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_get_raw_schema_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_get_raw_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_get_raw_schema" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_get_raw_schema_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_get_raw_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18271,8 +18303,9 @@ def test_list_schema_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18336,18 +18369,20 @@ def test_list_schema_versions_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_list_schema_versions" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_list_schema_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_list_schema_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_list_schema_versions" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_list_schema_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_list_schema_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18402,8 +18437,9 @@ def test_list_schema_types_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18467,18 +18503,20 @@ def test_list_schema_types_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_list_schema_types" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_list_schema_types_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_list_schema_types" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_list_schema_types" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_list_schema_types_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_list_schema_types" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18533,8 +18571,9 @@ def test_list_subjects_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18598,18 +18637,20 @@ def test_list_subjects_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_list_subjects" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_list_subjects_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_list_subjects" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_list_subjects" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_list_subjects_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_list_subjects" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18664,8 +18705,9 @@ def test_list_subjects_by_schema_id_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18729,20 +18771,22 @@ def test_list_subjects_by_schema_id_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, - "post_list_subjects_by_schema_id", - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_list_subjects_by_schema_id_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "pre_list_subjects_by_schema_id", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_list_subjects_by_schema_id", + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_list_subjects_by_schema_id_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "pre_list_subjects_by_schema_id", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18797,8 +18841,9 @@ def test_delete_subject_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18862,18 +18907,20 @@ def test_delete_subject_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_delete_subject" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_delete_subject_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_delete_subject" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_delete_subject" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_delete_subject_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_delete_subject" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18928,8 +18975,9 @@ def test_lookup_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19002,18 +19050,20 @@ def test_lookup_version_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_lookup_version" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_lookup_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_lookup_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_lookup_version" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_lookup_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_lookup_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19071,8 +19121,9 @@ def test_get_version_rest_bad_request(request_type=schema_registry.GetVersionReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19145,18 +19196,20 @@ def test_get_version_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_get_version" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_get_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_get_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_get_version" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_get_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_get_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19216,8 +19269,9 @@ def test_get_raw_schema_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19281,18 +19335,22 @@ def test_get_raw_schema_version_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_get_raw_schema_version" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_get_raw_schema_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_get_raw_schema_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_get_raw_schema_version", + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_get_raw_schema_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "pre_get_raw_schema_version", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19347,8 +19405,9 @@ def test_list_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19412,18 +19471,20 @@ def test_list_versions_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_list_versions" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_list_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_list_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_list_versions" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_list_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_list_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19478,8 +19539,9 @@ def test_create_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19544,18 +19606,20 @@ def test_create_version_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_create_version" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_create_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_create_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_create_version" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_create_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_create_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19615,8 +19679,9 @@ def test_delete_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19680,18 +19745,20 @@ def test_delete_version_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_delete_version" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_delete_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_delete_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_delete_version" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_delete_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_delete_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19746,8 +19813,9 @@ def test_list_referenced_schemas_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19811,18 +19879,22 @@ def test_list_referenced_schemas_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_list_referenced_schemas" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_list_referenced_schemas_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_list_referenced_schemas" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_list_referenced_schemas", + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_list_referenced_schemas_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "pre_list_referenced_schemas", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -19877,8 +19949,9 @@ def test_check_compatibility_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -19945,18 +20018,20 @@ def test_check_compatibility_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_check_compatibility" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_check_compatibility_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_check_compatibility" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_check_compatibility" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_check_compatibility_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_check_compatibility" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20016,8 +20091,9 @@ def test_get_schema_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20089,18 +20165,20 @@ def test_get_schema_config_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_get_schema_config" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_get_schema_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_get_schema_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_get_schema_config" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_get_schema_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_get_schema_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20160,8 +20238,9 @@ def test_update_schema_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20233,18 +20312,20 @@ def test_update_schema_config_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_update_schema_config" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_update_schema_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_update_schema_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_update_schema_config" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_update_schema_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_update_schema_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20304,8 +20385,9 @@ def test_delete_schema_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20377,18 +20459,20 @@ def test_delete_schema_config_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_delete_schema_config" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_delete_schema_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_delete_schema_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_delete_schema_config" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_delete_schema_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_delete_schema_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20448,8 +20532,9 @@ def test_get_schema_mode_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20514,18 +20599,20 @@ def test_get_schema_mode_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_get_schema_mode" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_get_schema_mode_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_get_schema_mode" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_get_schema_mode" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_get_schema_mode_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_get_schema_mode" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20585,8 +20672,9 @@ def test_update_schema_mode_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20651,18 +20739,20 @@ def test_update_schema_mode_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_update_schema_mode" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_update_schema_mode_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_update_schema_mode" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_update_schema_mode" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_update_schema_mode_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_update_schema_mode" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20722,8 +20812,9 @@ def test_delete_schema_mode_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20788,18 +20879,20 @@ def test_delete_schema_mode_rest_interceptors(null_interceptor): ) client = ManagedSchemaRegistryClient(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.ManagedSchemaRegistryRestInterceptor, "post_delete_schema_mode" - ) as post, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, - "post_delete_schema_mode_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedSchemaRegistryRestInterceptor, "pre_delete_schema_mode" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "post_delete_schema_mode" + ) as post, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, + "post_delete_schema_mode_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedSchemaRegistryRestInterceptor, "pre_delete_schema_mode" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20857,8 +20950,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -20917,8 +21011,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -20979,8 +21074,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21041,8 +21137,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21103,8 +21200,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21165,8 +21263,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -21876,11 +21975,14 @@ def test_managed_schema_registry_base_transport(): def test_managed_schema_registry_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.managedkafka_schemaregistry_v1.services.managed_schema_registry.transports.ManagedSchemaRegistryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.managedkafka_schemaregistry_v1.services.managed_schema_registry.transports.ManagedSchemaRegistryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ManagedSchemaRegistryTransport( @@ -21897,9 +21999,12 @@ def test_managed_schema_registry_base_transport_with_credentials_file(): def test_managed_schema_registry_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.managedkafka_schemaregistry_v1.services.managed_schema_registry.transports.ManagedSchemaRegistryTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.managedkafka_schemaregistry_v1.services.managed_schema_registry.transports.ManagedSchemaRegistryTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ManagedSchemaRegistryTransport() @@ -21973,11 +22078,12 @@ def test_managed_schema_registry_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-managedkafka/docs/conf.py b/packages/google-cloud-managedkafka/docs/conf.py index 64319e7dfa28..8b5c86bc07be 100644 --- a/packages/google-cloud-managedkafka/docs/conf.py +++ b/packages/google-cloud-managedkafka/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-managedkafka documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/__init__.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/__init__.py index 3bcbfb00c176..60d0181186ab 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/__init__.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.managed_kafka import ManagedKafkaAsyncClient, ManagedKafkaClient from .services.managed_kafka_connect import ( ManagedKafkaConnectAsyncClient, diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/async_client.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/async_client.py index f534f6365653..4709d6978441 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/async_client.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.managedkafka_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.managedkafka_v1.services.managed_kafka import pagers from google.cloud.managedkafka_v1.types import managed_kafka, resources @@ -131,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ManagedKafkaAsyncClient: The constructed client. """ - return ManagedKafkaClient.from_service_account_info.__func__(ManagedKafkaAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ManagedKafkaClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ManagedKafkaAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ManagedKafkaAsyncClient: The constructed client. """ - return ManagedKafkaClient.from_service_account_file.__func__(ManagedKafkaAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ManagedKafkaClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ManagedKafkaAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/client.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/client.py index 80a08cde4322..ec7a37dff834 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/client.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.managedkafka_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.managedkafka_v1.services.managed_kafka import pagers from google.cloud.managedkafka_v1.types import managed_kafka, resources @@ -746,11 +746,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ManagedKafkaClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ManagedKafkaClient._read_environment_variables() + ) self._client_cert_source = ManagedKafkaClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -785,8 +783,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ManagedKafkaTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/pagers.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/pagers.py index 9a18c103afd5..6a89480a5b0a 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/pagers.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/base.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/base.py index 34688b91a7ab..9a0a02ca53ad 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/base.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.managedkafka_v1 import gapic_version as package_version from google.cloud.managedkafka_v1.types import managed_kafka, resources @@ -571,13 +571,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/grpc.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/grpc.py index e63f12692f41..d0da8f7427db 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/grpc.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.managedkafka_v1.types import managed_kafka, resources diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/grpc_asyncio.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/grpc_asyncio.py index ba77c3465d6c..877971f9e40a 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/grpc_asyncio.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.managedkafka_v1.types import managed_kafka, resources diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/rest.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/rest.py index a77809ecafde..002afcfc58b3 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/rest.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1812,7 +1812,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2111,7 +2111,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2224,7 +2224,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2340,9 +2340,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseManagedKafkaRestTransport._BaseDeleteConsumerGroup._get_http_options() - ) + http_options = _BaseManagedKafkaRestTransport._BaseDeleteConsumerGroup._get_http_options() request, metadata = self._interceptor.pre_delete_consumer_group( request, metadata @@ -2364,7 +2362,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2474,7 +2472,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3449,9 +3447,7 @@ def __call__( Response for ListConsumerGroups. """ - http_options = ( - _BaseManagedKafkaRestTransport._BaseListConsumerGroups._get_http_options() - ) + http_options = _BaseManagedKafkaRestTransport._BaseListConsumerGroups._get_http_options() request, metadata = self._interceptor.pre_list_consumer_groups( request, metadata @@ -4088,7 +4084,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4212,9 +4208,7 @@ def __call__( """ - http_options = ( - _BaseManagedKafkaRestTransport._BaseUpdateConsumerGroup._get_http_options() - ) + http_options = _BaseManagedKafkaRestTransport._BaseUpdateConsumerGroup._get_http_options() request, metadata = self._interceptor.pre_update_consumer_group( request, metadata diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/rest_base.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/rest_base.py index 20eeb49af462..97cca4841107 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/rest_base.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.managedkafka_v1.types import managed_kafka, resources diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/async_client.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/async_client.py index 72d5f62cc6b1..994ed73c3f3e 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/async_client.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.managedkafka_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.managedkafka_v1.services.managed_kafka_connect import pagers from google.cloud.managedkafka_v1.types import managed_kafka_connect, resources @@ -131,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ManagedKafkaConnectAsyncClient: The constructed client. """ - return ManagedKafkaConnectClient.from_service_account_info.__func__(ManagedKafkaConnectAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ManagedKafkaConnectClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ManagedKafkaConnectAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ManagedKafkaConnectAsyncClient: The constructed client. """ - return ManagedKafkaConnectClient.from_service_account_file.__func__(ManagedKafkaConnectAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ManagedKafkaConnectClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ManagedKafkaConnectAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -185,7 +187,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ManagedKafkaConnectClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ManagedKafkaConnectClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ManagedKafkaConnectTransport: diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/client.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/client.py index 175ddbd387dc..ffe4c01a304e 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/client.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.managedkafka_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.managedkafka_v1.services.managed_kafka_connect import pagers from google.cloud.managedkafka_v1.types import managed_kafka_connect, resources @@ -86,9 +86,7 @@ class ManagedKafkaConnectClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ManagedKafkaConnectTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ManagedKafkaConnectTransport]] _transport_registry["grpc"] = ManagedKafkaConnectGrpcTransport _transport_registry["grpc_asyncio"] = ManagedKafkaConnectGrpcAsyncIOTransport _transport_registry["rest"] = ManagedKafkaConnectRestTransport @@ -680,11 +678,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ManagedKafkaConnectClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ManagedKafkaConnectClient._read_environment_variables() + ) self._client_cert_source = ManagedKafkaConnectClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -719,8 +715,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ManagedKafkaConnectTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/pagers.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/pagers.py index 6e48bdbac85e..a553c57727a0 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/pagers.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/__init__.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/__init__.py index 1feffd3ad1da..0a005c692f05 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/__init__.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ManagedKafkaConnectRestInterceptor, ManagedKafkaConnectRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ManagedKafkaConnectTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ManagedKafkaConnectTransport]] _transport_registry["grpc"] = ManagedKafkaConnectGrpcTransport _transport_registry["grpc_asyncio"] = ManagedKafkaConnectGrpcAsyncIOTransport _transport_registry["rest"] = ManagedKafkaConnectRestTransport diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/base.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/base.py index a25e6f43b851..bb6af2a9f1c5 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/base.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.managedkafka_v1 import gapic_version as package_version from google.cloud.managedkafka_v1.types import managed_kafka_connect, resources @@ -459,13 +459,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/grpc.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/grpc.py index 933c8c4baa01..64c2d03de6da 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/grpc.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.managedkafka_v1.types import managed_kafka_connect, resources diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/grpc_asyncio.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/grpc_asyncio.py index 831c4a6c3f99..a71c4b70ad92 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/grpc_asyncio.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.managedkafka_v1.types import managed_kafka_connect, resources diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/rest.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/rest.py index 905b70859b06..ea0781d7be2c 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/rest.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1205,9 +1205,7 @@ def __call__( """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseCreateConnectCluster._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseCreateConnectCluster._get_http_options() request, metadata = self._interceptor.pre_create_connect_cluster( request, metadata @@ -1233,7 +1231,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1360,9 +1358,7 @@ def __call__( """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseCreateConnector._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseCreateConnector._get_http_options() request, metadata = self._interceptor.pre_create_connector( request, metadata @@ -1515,9 +1511,7 @@ def __call__( """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseDeleteConnectCluster._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseDeleteConnectCluster._get_http_options() request, metadata = self._interceptor.pre_delete_connect_cluster( request, metadata @@ -1539,7 +1533,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1658,9 +1652,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseDeleteConnector._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseDeleteConnector._get_http_options() request, metadata = self._interceptor.pre_delete_connector( request, metadata @@ -1682,7 +1674,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1773,9 +1765,7 @@ def __call__( """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseGetConnectCluster._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseGetConnectCluster._get_http_options() request, metadata = self._interceptor.pre_get_connect_cluster( request, metadata @@ -1924,9 +1914,7 @@ def __call__( """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseGetConnector._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseGetConnector._get_http_options() request, metadata = self._interceptor.pre_get_connector(request, metadata) transcoded_request = _BaseManagedKafkaConnectRestTransport._BaseGetConnector._get_transcoded_request( @@ -2069,9 +2057,7 @@ def __call__( Response for ListConnectClusters. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseListConnectClusters._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseListConnectClusters._get_http_options() request, metadata = self._interceptor.pre_list_connect_clusters( request, metadata @@ -2222,9 +2208,7 @@ def __call__( Response for ListConnectors. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseListConnectors._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseListConnectors._get_http_options() request, metadata = self._interceptor.pre_list_connectors(request, metadata) transcoded_request = _BaseManagedKafkaConnectRestTransport._BaseListConnectors._get_transcoded_request( @@ -2370,9 +2354,7 @@ def __call__( Response for PauseConnector. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BasePauseConnector._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BasePauseConnector._get_http_options() request, metadata = self._interceptor.pre_pause_connector(request, metadata) transcoded_request = _BaseManagedKafkaConnectRestTransport._BasePauseConnector._get_transcoded_request( @@ -2523,9 +2505,7 @@ def __call__( Response for RestartConnector. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseRestartConnector._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseRestartConnector._get_http_options() request, metadata = self._interceptor.pre_restart_connector( request, metadata @@ -2678,9 +2658,7 @@ def __call__( Response for ResumeConnector. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseResumeConnector._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseResumeConnector._get_http_options() request, metadata = self._interceptor.pre_resume_connector( request, metadata @@ -2833,9 +2811,7 @@ def __call__( Response for StopConnector. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseStopConnector._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseStopConnector._get_http_options() request, metadata = self._interceptor.pre_stop_connector(request, metadata) transcoded_request = _BaseManagedKafkaConnectRestTransport._BaseStopConnector._get_transcoded_request( @@ -2989,9 +2965,7 @@ def __call__( """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseUpdateConnectCluster._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseUpdateConnectCluster._get_http_options() request, metadata = self._interceptor.pre_update_connect_cluster( request, metadata @@ -3017,7 +2991,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3144,9 +3118,7 @@ def __call__( """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseUpdateConnector._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseUpdateConnector._get_http_options() request, metadata = self._interceptor.pre_update_connector( request, metadata @@ -3437,9 +3409,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseManagedKafkaConnectRestTransport._BaseGetLocation._get_transcoded_request( @@ -3578,9 +3548,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseManagedKafkaConnectRestTransport._BaseListLocations._get_transcoded_request( @@ -3717,9 +3685,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3837,9 +3803,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3955,9 +3919,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseManagedKafkaConnectRestTransport._BaseGetOperation._get_transcoded_request( @@ -4096,9 +4058,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseManagedKafkaConnectRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseManagedKafkaConnectRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseManagedKafkaConnectRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/rest_base.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/rest_base.py index 20a587b9324f..b52be33b65a8 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/rest_base.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/services/managed_kafka_connect/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.managedkafka_v1.types import managed_kafka_connect, resources diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/types/managed_kafka.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/types/managed_kafka.py index b7dceb624e9e..fac95016a42f 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/types/managed_kafka.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/types/managed_kafka.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.managedkafka_v1.types import resources diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/types/managed_kafka_connect.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/types/managed_kafka_connect.py index 8f27349fb3ca..53846be0bfa3 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/types/managed_kafka_connect.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/types/managed_kafka_connect.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.managedkafka_v1.types import resources diff --git a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/types/resources.py b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/types/resources.py index 26a4f1e740a1..3cf700152200 100644 --- a/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/types/resources.py +++ b/packages/google-cloud-managedkafka/google/cloud/managedkafka_v1/types/resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -106,6 +106,7 @@ class State(proto.Enum): DELETING (3): The cluster is being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -213,6 +214,7 @@ class Mode(proto.Enum): Automatically rebalance topic partitions among brokers when the cluster is scaled up. """ + MODE_UNSPECIFIED = 0 NO_REBALANCE = 1 AUTO_REBALANCE_ON_SCALE_UP = 2 @@ -350,12 +352,12 @@ class CertificateAuthorityServiceConfig(proto.Message): number=1, ) - cas_configs: MutableSequence[ - CertificateAuthorityServiceConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=CertificateAuthorityServiceConfig, + cas_configs: MutableSequence[CertificateAuthorityServiceConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=CertificateAuthorityServiceConfig, + ) ) @@ -594,6 +596,7 @@ class State(proto.Enum): DELETING (3): The cluster is being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -784,6 +787,7 @@ class State(proto.Enum): STOPPED (6): The connector has been stopped. """ + STATE_UNSPECIFIED = 0 UNASSIGNED = 1 RUNNING = 2 diff --git a/packages/google-cloud-managedkafka/noxfile.py b/packages/google-cloud-managedkafka/noxfile.py index 1e0d23b9bec9..b4b64a214896 100644 --- a/packages/google-cloud-managedkafka/noxfile.py +++ b/packages/google-cloud-managedkafka/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-managedkafka/tests/unit/gapic/managedkafka_v1/test_managed_kafka.py b/packages/google-cloud-managedkafka/tests/unit/gapic/managedkafka_v1/test_managed_kafka.py index c240fa60f1bb..406eaa7994a5 100644 --- a/packages/google-cloud-managedkafka/tests/unit/gapic/managedkafka_v1/test_managed_kafka.py +++ b/packages/google-cloud-managedkafka/tests/unit/gapic/managedkafka_v1/test_managed_kafka.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.managedkafka_v1.services.managed_kafka import ( ManagedKafkaAsyncClient, @@ -940,10 +940,9 @@ def test_managed_kafka_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -988,10 +987,9 @@ def test_managed_kafka_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1025,9 @@ def test_managed_kafka_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1269,13 +1266,13 @@ def test_managed_kafka_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5166,9 +5163,9 @@ def test_list_consumer_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_consumer_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_consumer_groups] = ( + mock_rpc + ) request = {} client.list_consumer_groups(request) @@ -5710,9 +5707,9 @@ def test_get_consumer_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_consumer_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_consumer_group] = ( + mock_rpc + ) request = {} client.get_consumer_group(request) @@ -6048,9 +6045,9 @@ def test_update_consumer_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_consumer_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_consumer_group] = ( + mock_rpc + ) request = {} client.update_consumer_group(request) @@ -6398,9 +6395,9 @@ def test_delete_consumer_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_consumer_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_consumer_group] = ( + mock_rpc + ) request = {} client.delete_consumer_group(request) @@ -8910,9 +8907,9 @@ def test_remove_acl_entry_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_acl_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_acl_entry] = ( + mock_rpc + ) request = {} client.remove_acl_entry(request) @@ -11236,9 +11233,9 @@ def test_list_consumer_groups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_consumer_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_consumer_groups] = ( + mock_rpc + ) request = {} client.list_consumer_groups(request) @@ -11500,9 +11497,9 @@ def test_get_consumer_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_consumer_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_consumer_group] = ( + mock_rpc + ) request = {} client.get_consumer_group(request) @@ -11685,9 +11682,9 @@ def test_update_consumer_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_consumer_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_consumer_group] = ( + mock_rpc + ) request = {} client.update_consumer_group(request) @@ -11880,9 +11877,9 @@ def test_delete_consumer_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_consumer_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_consumer_group] = ( + mock_rpc + ) request = {} client.delete_consumer_group(request) @@ -13242,9 +13239,9 @@ def test_remove_acl_entry_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.remove_acl_entry - ] = mock_rpc + client._transport._wrapped_methods[client._transport.remove_acl_entry] = ( + mock_rpc + ) request = {} client.remove_acl_entry(request) @@ -14576,8 +14573,9 @@ def test_list_clusters_rest_bad_request(request_type=managed_kafka.ListClustersR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14642,17 +14640,19 @@ def test_list_clusters_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_list_clusters" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_list_clusters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_list_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_list_clusters" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_list_clusters_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_list_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14705,8 +14705,9 @@ def test_get_cluster_rest_bad_request(request_type=managed_kafka.GetClusterReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14775,17 +14776,19 @@ def test_get_cluster_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_get_cluster" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_get_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_get_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_get_cluster" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_get_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_get_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14838,8 +14841,9 @@ def test_create_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14982,19 +14986,20 @@ def test_create_cluster_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_create_cluster" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_create_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_create_cluster" - ) as pre: + 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.ManagedKafkaRestInterceptor, "post_create_cluster" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_create_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_create_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15049,8 +15054,9 @@ def test_update_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15195,19 +15201,20 @@ def test_update_cluster_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_update_cluster" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_update_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_update_cluster" - ) as pre: + 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.ManagedKafkaRestInterceptor, "post_update_cluster" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_update_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_update_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15260,8 +15267,9 @@ def test_delete_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15318,19 +15326,20 @@ def test_delete_cluster_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_delete_cluster" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_delete_cluster_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_delete_cluster" - ) as pre: + 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.ManagedKafkaRestInterceptor, "post_delete_cluster" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_delete_cluster_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_delete_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15381,8 +15390,9 @@ def test_list_topics_rest_bad_request(request_type=managed_kafka.ListTopicsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15445,17 +15455,19 @@ def test_list_topics_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_list_topics" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_list_topics_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_list_topics" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_list_topics" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_list_topics_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_list_topics" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15510,8 +15522,9 @@ def test_get_topic_rest_bad_request(request_type=managed_kafka.GetTopicRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15580,17 +15593,19 @@ def test_get_topic_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_get_topic" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_get_topic_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_get_topic" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_get_topic" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_get_topic_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_get_topic" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15639,8 +15654,9 @@ def test_create_topic_rest_bad_request(request_type=managed_kafka.CreateTopicReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15780,17 +15796,19 @@ def test_create_topic_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_create_topic" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_create_topic_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_create_topic" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_create_topic" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_create_topic_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_create_topic" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15845,8 +15863,9 @@ def test_update_topic_rest_bad_request(request_type=managed_kafka.UpdateTopicReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15990,17 +16009,19 @@ def test_update_topic_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_update_topic" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_update_topic_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_update_topic" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_update_topic" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_update_topic_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_update_topic" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16053,8 +16074,9 @@ def test_delete_topic_rest_bad_request(request_type=managed_kafka.DeleteTopicReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16113,13 +16135,13 @@ def test_delete_topic_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "pre_delete_topic" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_delete_topic" + ) as pre, + ): pre.assert_not_called() pb_message = managed_kafka.DeleteTopicRequest.pb( managed_kafka.DeleteTopicRequest() @@ -16164,8 +16186,9 @@ def test_list_consumer_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16228,18 +16251,20 @@ def test_list_consumer_groups_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_list_consumer_groups" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, - "post_list_consumer_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_list_consumer_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_list_consumer_groups" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, + "post_list_consumer_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_list_consumer_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16299,8 +16324,9 @@ def test_get_consumer_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16365,17 +16391,20 @@ def test_get_consumer_group_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_get_consumer_group" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_get_consumer_group_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_get_consumer_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_get_consumer_group" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, + "post_get_consumer_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_get_consumer_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16432,8 +16461,9 @@ def test_update_consumer_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16571,18 +16601,20 @@ def test_update_consumer_group_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_update_consumer_group" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, - "post_update_consumer_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_update_consumer_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_update_consumer_group" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, + "post_update_consumer_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_update_consumer_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16637,8 +16669,9 @@ def test_delete_consumer_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16697,13 +16730,13 @@ def test_delete_consumer_group_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "pre_delete_consumer_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_delete_consumer_group" + ) as pre, + ): pre.assert_not_called() pb_message = managed_kafka.DeleteConsumerGroupRequest.pb( managed_kafka.DeleteConsumerGroupRequest() @@ -16746,8 +16779,9 @@ def test_list_acls_rest_bad_request(request_type=managed_kafka.ListAclsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16810,17 +16844,19 @@ def test_list_acls_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_list_acls" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_list_acls_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_list_acls" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_list_acls" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_list_acls_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_list_acls" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16873,8 +16909,9 @@ def test_get_acl_rest_bad_request(request_type=managed_kafka.GetAclRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16947,17 +16984,17 @@ def test_get_acl_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_get_acl" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_get_acl_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_get_acl" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_get_acl" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_get_acl_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.ManagedKafkaRestInterceptor, "pre_get_acl") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17006,8 +17043,9 @@ def test_create_acl_rest_bad_request(request_type=managed_kafka.CreateAclRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17160,17 +17198,19 @@ def test_create_acl_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_create_acl" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_create_acl_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_create_acl" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_create_acl" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_create_acl_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_create_acl" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17223,8 +17263,9 @@ def test_update_acl_rest_bad_request(request_type=managed_kafka.UpdateAclRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17381,17 +17422,19 @@ def test_update_acl_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_update_acl" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_update_acl_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_update_acl" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_update_acl" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_update_acl_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_update_acl" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17442,8 +17485,9 @@ def test_delete_acl_rest_bad_request(request_type=managed_kafka.DeleteAclRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17502,13 +17546,13 @@ def test_delete_acl_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "pre_delete_acl" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_delete_acl" + ) as pre, + ): pre.assert_not_called() pb_message = managed_kafka.DeleteAclRequest.pb(managed_kafka.DeleteAclRequest()) transcode.return_value = { @@ -17551,8 +17595,9 @@ def test_add_acl_entry_rest_bad_request(request_type=managed_kafka.AddAclEntryRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17690,17 +17735,19 @@ def test_add_acl_entry_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_add_acl_entry" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_add_acl_entry_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_add_acl_entry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_add_acl_entry" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_add_acl_entry_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_add_acl_entry" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17757,8 +17804,9 @@ def test_remove_acl_entry_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17895,17 +17943,20 @@ def test_remove_acl_entry_rest_interceptors(null_interceptor): ) client = ManagedKafkaClient(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.ManagedKafkaRestInterceptor, "post_remove_acl_entry" - ) as post, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "post_remove_acl_entry_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaRestInterceptor, "pre_remove_acl_entry" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "post_remove_acl_entry" + ) as post, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, + "post_remove_acl_entry_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaRestInterceptor, "pre_remove_acl_entry" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17963,8 +18014,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18023,8 +18075,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18085,8 +18138,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18147,8 +18201,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18209,8 +18264,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18271,8 +18327,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18856,11 +18913,14 @@ def test_managed_kafka_base_transport(): def test_managed_kafka_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.managedkafka_v1.services.managed_kafka.transports.ManagedKafkaTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.managedkafka_v1.services.managed_kafka.transports.ManagedKafkaTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ManagedKafkaTransport( @@ -18877,9 +18937,12 @@ def test_managed_kafka_base_transport_with_credentials_file(): def test_managed_kafka_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.managedkafka_v1.services.managed_kafka.transports.ManagedKafkaTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.managedkafka_v1.services.managed_kafka.transports.ManagedKafkaTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ManagedKafkaTransport() @@ -18951,11 +19014,12 @@ def test_managed_kafka_transport_auth_gdch_credentials(transport_class): def test_managed_kafka_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-managedkafka/tests/unit/gapic/managedkafka_v1/test_managed_kafka_connect.py b/packages/google-cloud-managedkafka/tests/unit/gapic/managedkafka_v1/test_managed_kafka_connect.py index 1b973f4b4c5a..6faad5086dc3 100644 --- a/packages/google-cloud-managedkafka/tests/unit/gapic/managedkafka_v1/test_managed_kafka_connect.py +++ b/packages/google-cloud-managedkafka/tests/unit/gapic/managedkafka_v1/test_managed_kafka_connect.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.managedkafka_v1.services.managed_kafka_connect import ( ManagedKafkaConnectAsyncClient, @@ -1007,10 +1007,9 @@ def test_managed_kafka_connect_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1055,10 +1054,9 @@ def test_managed_kafka_connect_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1094,10 +1092,9 @@ def test_managed_kafka_connect_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1353,13 +1350,13 @@ def test_managed_kafka_connect_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1481,9 +1478,9 @@ def test_list_connect_clusters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connect_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connect_clusters] = ( + mock_rpc + ) request = {} client.list_connect_clusters(request) @@ -2031,9 +2028,9 @@ def test_get_connect_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connect_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connect_cluster] = ( + mock_rpc + ) request = {} client.get_connect_cluster(request) @@ -2377,9 +2374,9 @@ def test_create_connect_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connect_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connect_cluster] = ( + mock_rpc + ) request = {} client.create_connect_cluster(request) @@ -2800,9 +2797,9 @@ def test_update_connect_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connect_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connect_cluster] = ( + mock_rpc + ) request = {} client.update_connect_cluster(request) @@ -3217,9 +3214,9 @@ def test_delete_connect_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connect_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connect_cluster] = ( + mock_rpc + ) request = {} client.delete_connect_cluster(request) @@ -4408,9 +4405,9 @@ def test_create_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connector] = ( + mock_rpc + ) request = {} client.create_connector(request) @@ -4774,9 +4771,9 @@ def test_update_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connector] = ( + mock_rpc + ) request = {} client.update_connector(request) @@ -5129,9 +5126,9 @@ def test_delete_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connector] = ( + mock_rpc + ) request = {} client.delete_connector(request) @@ -5761,9 +5758,9 @@ def test_resume_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_connector] = ( + mock_rpc + ) request = {} client.resume_connector(request) @@ -6085,9 +6082,9 @@ def test_restart_connector_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_connector] = ( + mock_rpc + ) request = {} client.restart_connector(request) @@ -6675,9 +6672,9 @@ def test_list_connect_clusters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_connect_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_connect_clusters] = ( + mock_rpc + ) request = {} client.list_connect_clusters(request) @@ -6944,9 +6941,9 @@ def test_get_connect_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connect_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connect_cluster] = ( + mock_rpc + ) request = {} client.get_connect_cluster(request) @@ -7129,9 +7126,9 @@ def test_create_connect_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connect_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connect_cluster] = ( + mock_rpc + ) request = {} client.create_connect_cluster(request) @@ -7370,9 +7367,9 @@ def test_update_connect_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connect_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connect_cluster] = ( + mock_rpc + ) request = {} client.update_connect_cluster(request) @@ -7594,9 +7591,9 @@ def test_delete_connect_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connect_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connect_cluster] = ( + mock_rpc + ) request = {} client.delete_connect_cluster(request) @@ -8217,9 +8214,9 @@ def test_create_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_connector] = ( + mock_rpc + ) request = {} client.create_connector(request) @@ -8436,9 +8433,9 @@ def test_update_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_connector] = ( + mock_rpc + ) request = {} client.update_connector(request) @@ -8636,9 +8633,9 @@ def test_delete_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_connector] = ( + mock_rpc + ) request = {} client.delete_connector(request) @@ -8994,9 +8991,9 @@ def test_resume_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_connector] = ( + mock_rpc + ) request = {} client.resume_connector(request) @@ -9179,9 +9176,9 @@ def test_restart_connector_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_connector - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_connector] = ( + mock_rpc + ) request = {} client.restart_connector(request) @@ -10346,8 +10343,9 @@ def test_list_connect_clusters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10414,18 +10412,20 @@ def test_list_connect_clusters_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_list_connect_clusters" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_list_connect_clusters_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_list_connect_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "post_list_connect_clusters" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_list_connect_clusters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_list_connect_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10485,8 +10485,9 @@ def test_get_connect_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10555,18 +10556,20 @@ def test_get_connect_cluster_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_get_connect_cluster" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_get_connect_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_get_connect_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "post_get_connect_cluster" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_get_connect_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_get_connect_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10619,8 +10622,9 @@ def test_create_connect_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10774,20 +10778,21 @@ def test_create_connect_cluster_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_create_connect_cluster" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_create_connect_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_create_connect_cluster" - ) as pre: + 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.ManagedKafkaConnectRestInterceptor, "post_create_connect_cluster" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_create_connect_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_create_connect_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10844,8 +10849,9 @@ def test_update_connect_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11003,20 +11009,21 @@ def test_update_connect_cluster_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_update_connect_cluster" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_update_connect_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_update_connect_cluster" - ) as pre: + 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.ManagedKafkaConnectRestInterceptor, "post_update_connect_cluster" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_update_connect_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_update_connect_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11071,8 +11078,9 @@ def test_delete_connect_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11131,20 +11139,21 @@ def test_delete_connect_cluster_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_delete_connect_cluster" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_delete_connect_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_delete_connect_cluster" - ) as pre: + 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.ManagedKafkaConnectRestInterceptor, "post_delete_connect_cluster" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_delete_connect_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_delete_connect_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11199,8 +11208,9 @@ def test_list_connectors_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11265,18 +11275,20 @@ def test_list_connectors_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_list_connectors" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_list_connectors_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_list_connectors" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "post_list_connectors" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_list_connectors_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_list_connectors" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11336,8 +11348,9 @@ def test_get_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11404,18 +11417,20 @@ def test_get_connector_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_get_connector" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_get_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_get_connector" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "post_get_connector" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_get_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_get_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11470,8 +11485,9 @@ def test_create_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11614,18 +11630,20 @@ def test_create_connector_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_create_connector" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_create_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_create_connector" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "post_create_connector" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_create_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_create_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11682,8 +11700,9 @@ def test_update_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11828,18 +11847,20 @@ def test_update_connector_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_update_connector" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_update_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_update_connector" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "post_update_connector" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_update_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_update_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11894,8 +11915,9 @@ def test_delete_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11954,13 +11976,13 @@ def test_delete_connector_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "pre_delete_connector" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_delete_connector" + ) as pre, + ): pre.assert_not_called() pb_message = managed_kafka_connect.DeleteConnectorRequest.pb( managed_kafka_connect.DeleteConnectorRequest() @@ -12007,8 +12029,9 @@ def test_pause_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12070,18 +12093,20 @@ def test_pause_connector_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_pause_connector" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_pause_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_pause_connector" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "post_pause_connector" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_pause_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_pause_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12141,8 +12166,9 @@ def test_resume_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12204,18 +12230,20 @@ def test_resume_connector_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_resume_connector" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_resume_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_resume_connector" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "post_resume_connector" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_resume_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_resume_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12275,8 +12303,9 @@ def test_restart_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12338,18 +12367,20 @@ def test_restart_connector_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_restart_connector" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_restart_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_restart_connector" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "post_restart_connector" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_restart_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_restart_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12409,8 +12440,9 @@ def test_stop_connector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12472,18 +12504,20 @@ def test_stop_connector_rest_interceptors(null_interceptor): ) client = ManagedKafkaConnectClient(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.ManagedKafkaConnectRestInterceptor, "post_stop_connector" - ) as post, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, - "post_stop_connector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ManagedKafkaConnectRestInterceptor, "pre_stop_connector" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "post_stop_connector" + ) as post, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, + "post_stop_connector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ManagedKafkaConnectRestInterceptor, "pre_stop_connector" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12541,8 +12575,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12601,8 +12636,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12663,8 +12699,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12725,8 +12762,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12787,8 +12825,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12849,8 +12888,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13291,11 +13331,14 @@ def test_managed_kafka_connect_base_transport(): def test_managed_kafka_connect_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.managedkafka_v1.services.managed_kafka_connect.transports.ManagedKafkaConnectTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.managedkafka_v1.services.managed_kafka_connect.transports.ManagedKafkaConnectTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ManagedKafkaConnectTransport( @@ -13312,9 +13355,12 @@ def test_managed_kafka_connect_base_transport_with_credentials_file(): def test_managed_kafka_connect_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.managedkafka_v1.services.managed_kafka_connect.transports.ManagedKafkaConnectTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.managedkafka_v1.services.managed_kafka_connect.transports.ManagedKafkaConnectTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ManagedKafkaConnectTransport() @@ -13386,11 +13432,12 @@ def test_managed_kafka_connect_transport_auth_gdch_credentials(transport_class): def test_managed_kafka_connect_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-media-translation/docs/conf.py b/packages/google-cloud-media-translation/docs/conf.py index cc1012d90cc8..7d9fbff2e155 100644 --- a/packages/google-cloud-media-translation/docs/conf.py +++ b/packages/google-cloud-media-translation/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-media-translation documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/__init__.py b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/__init__.py index 3a37dab97e2e..a2245d0d839a 100644 --- a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/__init__.py +++ b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.speech_translation_service import ( SpeechTranslationServiceAsyncClient, SpeechTranslationServiceClient, diff --git a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/async_client.py b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/async_client.py index e0faf1763168..1b7243ebb388 100644 --- a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/async_client.py +++ b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( AsyncIterable, AsyncIterator, @@ -32,13 +32,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.mediatranslation_v1beta1 import gapic_version as package_version @@ -47,7 +47,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.mediatranslation_v1beta1.types import media_translation @@ -121,7 +121,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SpeechTranslationServiceAsyncClient: The constructed client. """ - return SpeechTranslationServiceClient.from_service_account_info.__func__(SpeechTranslationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SpeechTranslationServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SpeechTranslationServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +138,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SpeechTranslationServiceAsyncClient: The constructed client. """ - return SpeechTranslationServiceClient.from_service_account_file.__func__(SpeechTranslationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SpeechTranslationServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + SpeechTranslationServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -175,7 +179,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SpeechTranslationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SpeechTranslationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SpeechTranslationServiceTransport: diff --git a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/client.py b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/client.py index 12801e660538..646cb73ce351 100644 --- a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/client.py +++ b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -34,8 +35,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -45,7 +46,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.mediatranslation_v1beta1 import gapic_version as package_version @@ -63,7 +63,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.mediatranslation_v1beta1.types import media_translation @@ -80,9 +80,7 @@ class SpeechTranslationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SpeechTranslationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SpeechTranslationServiceTransport]] _transport_registry["grpc"] = SpeechTranslationServiceGrpcTransport _transport_registry["grpc_asyncio"] = SpeechTranslationServiceGrpcAsyncIOTransport @@ -605,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SpeechTranslationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SpeechTranslationServiceClient._read_environment_variables() + ) self._client_cert_source = ( SpeechTranslationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -646,8 +642,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SpeechTranslationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/__init__.py b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/__init__.py index fac829617154..5d2e3c102163 100644 --- a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/__init__.py +++ b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import SpeechTranslationServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SpeechTranslationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SpeechTranslationServiceTransport]] _transport_registry["grpc"] = SpeechTranslationServiceGrpcTransport _transport_registry["grpc_asyncio"] = SpeechTranslationServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/base.py b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/base.py index 88ba5a6ac492..65e0dbacee35 100644 --- a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/base.py +++ b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.mediatranslation_v1beta1 import gapic_version as package_version from google.cloud.mediatranslation_v1beta1.types import media_translation diff --git a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/grpc.py b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/grpc.py index 3cfcea2356cf..aacdc1088881 100644 --- a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/grpc.py +++ b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.mediatranslation_v1beta1.types import media_translation @@ -345,12 +345,12 @@ def streaming_translate_speech( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "streaming_translate_speech" not in self._stubs: - self._stubs[ - "streaming_translate_speech" - ] = self._logged_channel.stream_stream( - "/google.cloud.mediatranslation.v1beta1.SpeechTranslationService/StreamingTranslateSpeech", - request_serializer=media_translation.StreamingTranslateSpeechRequest.serialize, - response_deserializer=media_translation.StreamingTranslateSpeechResponse.deserialize, + self._stubs["streaming_translate_speech"] = ( + self._logged_channel.stream_stream( + "/google.cloud.mediatranslation.v1beta1.SpeechTranslationService/StreamingTranslateSpeech", + request_serializer=media_translation.StreamingTranslateSpeechRequest.serialize, + response_deserializer=media_translation.StreamingTranslateSpeechResponse.deserialize, + ) ) return self._stubs["streaming_translate_speech"] diff --git a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/grpc_asyncio.py b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/grpc_asyncio.py index 4dbf74417af8..d6431d0e5dec 100644 --- a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/services/speech_translation_service/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.mediatranslation_v1beta1.types import media_translation @@ -353,12 +353,12 @@ def streaming_translate_speech( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "streaming_translate_speech" not in self._stubs: - self._stubs[ - "streaming_translate_speech" - ] = self._logged_channel.stream_stream( - "/google.cloud.mediatranslation.v1beta1.SpeechTranslationService/StreamingTranslateSpeech", - request_serializer=media_translation.StreamingTranslateSpeechRequest.serialize, - response_deserializer=media_translation.StreamingTranslateSpeechResponse.deserialize, + self._stubs["streaming_translate_speech"] = ( + self._logged_channel.stream_stream( + "/google.cloud.mediatranslation.v1beta1.SpeechTranslationService/StreamingTranslateSpeech", + request_serializer=media_translation.StreamingTranslateSpeechRequest.serialize, + response_deserializer=media_translation.StreamingTranslateSpeechResponse.deserialize, + ) ) return self._stubs["streaming_translate_speech"] diff --git a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/types/media_translation.py b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/types/media_translation.py index 6867020a1cb5..33be9064658e 100644 --- a/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/types/media_translation.py +++ b/packages/google-cloud-media-translation/google/cloud/mediatranslation_v1beta1/types/media_translation.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -299,6 +299,7 @@ class SpeechEventType(proto.Enum): ``single_utterance`` was set to ``true``, and is not used otherwise. """ + SPEECH_EVENT_TYPE_UNSPECIFIED = 0 END_OF_SINGLE_UTTERANCE = 1 diff --git a/packages/google-cloud-media-translation/noxfile.py b/packages/google-cloud-media-translation/noxfile.py index 8008615c9367..5e222afde524 100644 --- a/packages/google-cloud-media-translation/noxfile.py +++ b/packages/google-cloud-media-translation/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-media-translation/tests/unit/gapic/mediatranslation_v1beta1/test_speech_translation_service.py b/packages/google-cloud-media-translation/tests/unit/gapic/mediatranslation_v1beta1/test_speech_translation_service.py index d22a76c1c827..9b183c0254bd 100644 --- a/packages/google-cloud-media-translation/tests/unit/gapic/mediatranslation_v1beta1/test_speech_translation_service.py +++ b/packages/google-cloud-media-translation/tests/unit/gapic/mediatranslation_v1beta1/test_speech_translation_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,15 +39,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.rpc import status_pb2 # type: ignore from google.cloud.mediatranslation_v1beta1.services.speech_translation_service import ( SpeechTranslationServiceAsyncClient, @@ -970,10 +975,9 @@ def test_speech_translation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1022,9 @@ def test_speech_translation_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1057,10 +1060,9 @@ def test_speech_translation_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1306,13 +1308,13 @@ def test_speech_translation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1663,11 +1665,14 @@ def test_speech_translation_service_base_transport(): def test_speech_translation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.mediatranslation_v1beta1.services.speech_translation_service.transports.SpeechTranslationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.mediatranslation_v1beta1.services.speech_translation_service.transports.SpeechTranslationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SpeechTranslationServiceTransport( @@ -1684,9 +1689,12 @@ def test_speech_translation_service_base_transport_with_credentials_file(): def test_speech_translation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.mediatranslation_v1beta1.services.speech_translation_service.transports.SpeechTranslationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.mediatranslation_v1beta1.services.speech_translation_service.transports.SpeechTranslationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SpeechTranslationServiceTransport() @@ -1759,11 +1767,12 @@ def test_speech_translation_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-memcache/docs/conf.py b/packages/google-cloud-memcache/docs/conf.py index 374a7cfb7ab9..1ff490ee5dcd 100644 --- a/packages/google-cloud-memcache/docs/conf.py +++ b/packages/google-cloud-memcache/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-memcache documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1/__init__.py b/packages/google-cloud-memcache/google/cloud/memcache_v1/__init__.py index 2a8e9d80e9e7..91a8807227d1 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1/__init__.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_memcache import CloudMemcacheAsyncClient, CloudMemcacheClient from .types.cloud_memcache import ( ApplyParametersRequest, diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/async_client.py b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/async_client.py index 01010e78d3bc..8949e78a731a 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/async_client.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.memcache_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.memcache_v1.services.cloud_memcache import pagers from google.cloud.memcache_v1.types import cloud_memcache @@ -140,7 +140,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudMemcacheAsyncClient: The constructed client. """ - return CloudMemcacheClient.from_service_account_info.__func__(CloudMemcacheAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudMemcacheClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudMemcacheAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -156,7 +157,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudMemcacheAsyncClient: The constructed client. """ - return CloudMemcacheClient.from_service_account_file.__func__(CloudMemcacheAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudMemcacheClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CloudMemcacheAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/client.py b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/client.py index db914703a746..69230ce5de43 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/client.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.memcache_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.memcache_v1.services.cloud_memcache import pagers from google.cloud.memcache_v1.types import cloud_memcache @@ -645,11 +645,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudMemcacheClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudMemcacheClient._read_environment_variables() + ) self._client_cert_source = CloudMemcacheClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -684,8 +682,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudMemcacheTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/pagers.py b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/pagers.py index e8ba5fcb4b24..09aa42b3c49d 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/pagers.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/base.py b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/base.py index 6fc74b722f31..1d06e3d2caaa 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/base.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.memcache_v1 import gapic_version as package_version from google.cloud.memcache_v1.types import cloud_memcache @@ -323,13 +323,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc.py b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc.py index b45eb304e862..9ae6307a18dc 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.memcache_v1.types import cloud_memcache diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc_asyncio.py b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc_asyncio.py index 0e9397564cd7..6aaa3bb7ae04 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc_asyncio.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.memcache_v1.types import cloud_memcache diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/rest.py b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/rest.py index e89458da8cad..c3883dc15e7d 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/rest.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1/services/cloud_memcache/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -924,7 +924,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1076,7 +1076,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1223,7 +1223,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1645,9 +1645,7 @@ def __call__( """ - http_options = ( - _BaseCloudMemcacheRestTransport._BaseRescheduleMaintenance._get_http_options() - ) + http_options = _BaseCloudMemcacheRestTransport._BaseRescheduleMaintenance._get_http_options() request, metadata = self._interceptor.pre_reschedule_maintenance( request, metadata @@ -1673,7 +1671,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1825,7 +1823,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1951,9 +1949,7 @@ def __call__( """ - http_options = ( - _BaseCloudMemcacheRestTransport._BaseUpdateParameters._get_http_options() - ) + http_options = _BaseCloudMemcacheRestTransport._BaseUpdateParameters._get_http_options() request, metadata = self._interceptor.pre_update_parameters( request, metadata @@ -1979,7 +1975,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1/types/cloud_memcache.py b/packages/google-cloud-memcache/google/cloud/memcache_v1/types/cloud_memcache.py index e14a2e9a3b63..47f0a019b0a0 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1/types/cloud_memcache.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1/types/cloud_memcache.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -58,6 +58,7 @@ class MemcacheVersion(proto.Enum): MEMCACHE_1_5 (1): Memcached 1.5 version. """ + MEMCACHE_VERSION_UNSPECIFIED = 0 MEMCACHE_1_5 = 1 @@ -166,6 +167,7 @@ class State(proto.Enum): Memcached instance is going through maintenance, e.g. data plane rollout. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -234,6 +236,7 @@ class State(proto.Enum): UPDATING (4): Node is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -288,6 +291,7 @@ class Code(proto.Enum): ZONE_DISTRIBUTION_UNBALANCED (1): Memcached nodes are distributed unevenly. """ + CODE_UNSPECIFIED = 0 ZONE_DISTRIBUTION_UNBALANCED = 1 @@ -421,12 +425,12 @@ class MaintenancePolicy(proto.Message): proto.STRING, number=3, ) - weekly_maintenance_window: MutableSequence[ - "WeeklyMaintenanceWindow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="WeeklyMaintenanceWindow", + weekly_maintenance_window: MutableSequence["WeeklyMaintenanceWindow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="WeeklyMaintenanceWindow", + ) ) @@ -528,6 +532,7 @@ class RescheduleType(proto.Enum): If the user wants to reschedule the maintenance to a specific time. """ + RESCHEDULE_TYPE_UNSPECIFIED = 0 IMMEDIATE = 1 NEXT_AVAILABLE_WINDOW = 2 diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/__init__.py b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/__init__.py index a46dece67c81..623f758ab2a1 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/__init__.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_memcache import CloudMemcacheAsyncClient, CloudMemcacheClient from .types.cloud_memcache import ( ApplyParametersRequest, diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/async_client.py b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/async_client.py index 18b33315bc05..29fccb7af21f 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/async_client.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.memcache_v1beta2 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.memcache_v1beta2.services.cloud_memcache import pagers from google.cloud.memcache_v1beta2.types import cloud_memcache @@ -140,7 +140,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudMemcacheAsyncClient: The constructed client. """ - return CloudMemcacheClient.from_service_account_info.__func__(CloudMemcacheAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudMemcacheClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudMemcacheAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -156,7 +157,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudMemcacheAsyncClient: The constructed client. """ - return CloudMemcacheClient.from_service_account_file.__func__(CloudMemcacheAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudMemcacheClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CloudMemcacheAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/client.py b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/client.py index 4e254665c012..8fdf9b7bdfc9 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/client.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.memcache_v1beta2 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.memcache_v1beta2.services.cloud_memcache import pagers from google.cloud.memcache_v1beta2.types import cloud_memcache @@ -645,11 +645,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudMemcacheClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudMemcacheClient._read_environment_variables() + ) self._client_cert_source = CloudMemcacheClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -684,8 +682,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudMemcacheTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/pagers.py b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/pagers.py index 02b9fbad5037..fbbd1a3e50c9 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/pagers.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/base.py b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/base.py index e711822ffb10..04c1892deced 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/base.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.memcache_v1beta2 import gapic_version as package_version from google.cloud.memcache_v1beta2.types import cloud_memcache @@ -337,13 +337,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc.py b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc.py index 5efbe818a8e0..2aca9a2b215b 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.memcache_v1beta2.types import cloud_memcache diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc_asyncio.py b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc_asyncio.py index f2854caa237e..3481da01e6ae 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc_asyncio.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.memcache_v1beta2.types import cloud_memcache diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/rest.py b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/rest.py index 71572a9517b9..1e9246944532 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/rest.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/services/cloud_memcache/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -981,7 +981,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1107,9 +1107,7 @@ def __call__( """ - http_options = ( - _BaseCloudMemcacheRestTransport._BaseApplySoftwareUpdate._get_http_options() - ) + http_options = _BaseCloudMemcacheRestTransport._BaseApplySoftwareUpdate._get_http_options() request, metadata = self._interceptor.pre_apply_software_update( request, metadata @@ -1135,7 +1133,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1287,7 +1285,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1434,7 +1432,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1856,9 +1854,7 @@ def __call__( """ - http_options = ( - _BaseCloudMemcacheRestTransport._BaseRescheduleMaintenance._get_http_options() - ) + http_options = _BaseCloudMemcacheRestTransport._BaseRescheduleMaintenance._get_http_options() request, metadata = self._interceptor.pre_reschedule_maintenance( request, metadata @@ -1884,7 +1880,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2036,7 +2032,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2162,9 +2158,7 @@ def __call__( """ - http_options = ( - _BaseCloudMemcacheRestTransport._BaseUpdateParameters._get_http_options() - ) + http_options = _BaseCloudMemcacheRestTransport._BaseUpdateParameters._get_http_options() request, metadata = self._interceptor.pre_update_parameters( request, metadata @@ -2190,7 +2184,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/types/cloud_memcache.py b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/types/cloud_memcache.py index 401c5fe6872b..bdd9ac70d82c 100644 --- a/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/types/cloud_memcache.py +++ b/packages/google-cloud-memcache/google/cloud/memcache_v1beta2/types/cloud_memcache.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -59,6 +59,7 @@ class MemcacheVersion(proto.Enum): MEMCACHE_1_5 (1): Memcached 1.5 version. """ + MEMCACHE_VERSION_UNSPECIFIED = 0 MEMCACHE_1_5 = 1 @@ -171,6 +172,7 @@ class State(proto.Enum): Memcached instance is going through maintenance, e.g. data plane rollout. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -242,6 +244,7 @@ class State(proto.Enum): UPDATING (4): Node is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -300,6 +303,7 @@ class Code(proto.Enum): ZONE_DISTRIBUTION_UNBALANCED (1): Memcached nodes are distributed unevenly. """ + CODE_UNSPECIFIED = 0 ZONE_DISTRIBUTION_UNBALANCED = 1 @@ -437,12 +441,12 @@ class MaintenancePolicy(proto.Message): proto.STRING, number=3, ) - weekly_maintenance_window: MutableSequence[ - "WeeklyMaintenanceWindow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="WeeklyMaintenanceWindow", + weekly_maintenance_window: MutableSequence["WeeklyMaintenanceWindow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="WeeklyMaintenanceWindow", + ) ) @@ -735,6 +739,7 @@ class RescheduleType(proto.Enum): If the user wants to reschedule the maintenance to a specific time. """ + RESCHEDULE_TYPE_UNSPECIFIED = 0 IMMEDIATE = 1 NEXT_AVAILABLE_WINDOW = 2 diff --git a/packages/google-cloud-memcache/noxfile.py b/packages/google-cloud-memcache/noxfile.py index 997292a602c2..864e31622785 100644 --- a/packages/google-cloud-memcache/noxfile.py +++ b/packages/google-cloud-memcache/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-memcache/tests/unit/gapic/memcache_v1/test_cloud_memcache.py b/packages/google-cloud-memcache/tests/unit/gapic/memcache_v1/test_cloud_memcache.py index 92285c24a0c1..f3e0f1d3caef 100644 --- a/packages/google-cloud-memcache/tests/unit/gapic/memcache_v1/test_cloud_memcache.py +++ b/packages/google-cloud-memcache/tests/unit/gapic/memcache_v1/test_cloud_memcache.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.memcache_v1.services.cloud_memcache import ( CloudMemcacheAsyncClient, @@ -958,10 +958,9 @@ def test_cloud_memcache_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1005,9 @@ def test_cloud_memcache_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1043,9 @@ def test_cloud_memcache_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1291,13 +1288,13 @@ def test_cloud_memcache_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2969,9 +2966,9 @@ def test_update_parameters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_parameters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_parameters] = ( + mock_rpc + ) request = {} client.update_parameters(request) @@ -3655,9 +3652,9 @@ def test_apply_parameters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.apply_parameters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.apply_parameters] = ( + mock_rpc + ) request = {} client.apply_parameters(request) @@ -4011,9 +4008,9 @@ def test_reschedule_maintenance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reschedule_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reschedule_maintenance] = ( + mock_rpc + ) request = {} client.reschedule_maintenance(request) @@ -5140,9 +5137,9 @@ def test_update_parameters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_parameters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_parameters] = ( + mock_rpc + ) request = {} client.update_parameters(request) @@ -5512,9 +5509,9 @@ def test_apply_parameters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.apply_parameters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.apply_parameters] = ( + mock_rpc + ) request = {} client.apply_parameters(request) @@ -5701,9 +5698,9 @@ def test_reschedule_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reschedule_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reschedule_maintenance] = ( + mock_rpc + ) request = {} client.reschedule_maintenance(request) @@ -6401,8 +6398,9 @@ def test_list_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6467,17 +6465,19 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6533,8 +6533,9 @@ def test_get_instance_rest_bad_request(request_type=cloud_memcache.GetInstanceRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6613,17 +6614,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6676,8 +6679,9 @@ def test_create_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6850,19 +6854,21 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_create_instance" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_create_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6917,8 +6923,9 @@ def test_update_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7093,19 +7100,21 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_update_instance" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_update_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7158,8 +7167,9 @@ def test_update_parameters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7216,19 +7226,21 @@ def test_update_parameters_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_update_parameters" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_update_parameters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_update_parameters" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_update_parameters" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_update_parameters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_update_parameters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7281,8 +7293,9 @@ def test_delete_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7339,19 +7352,21 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_delete_instance" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_delete_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7404,8 +7419,9 @@ def test_apply_parameters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7462,19 +7478,21 @@ def test_apply_parameters_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_apply_parameters" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_apply_parameters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_apply_parameters" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_apply_parameters" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_apply_parameters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_apply_parameters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7527,8 +7545,9 @@ def test_reschedule_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7585,20 +7604,21 @@ def test_reschedule_maintenance_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_reschedule_maintenance" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, - "post_reschedule_maintenance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_reschedule_maintenance" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_reschedule_maintenance" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_reschedule_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_reschedule_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7651,8 +7671,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7711,8 +7732,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7773,8 +7795,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7835,8 +7858,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7897,8 +7921,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7959,8 +7984,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8267,11 +8293,14 @@ def test_cloud_memcache_base_transport(): def test_cloud_memcache_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.memcache_v1.services.cloud_memcache.transports.CloudMemcacheTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.memcache_v1.services.cloud_memcache.transports.CloudMemcacheTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudMemcacheTransport( @@ -8288,9 +8317,12 @@ def test_cloud_memcache_base_transport_with_credentials_file(): def test_cloud_memcache_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.memcache_v1.services.cloud_memcache.transports.CloudMemcacheTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.memcache_v1.services.cloud_memcache.transports.CloudMemcacheTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudMemcacheTransport() @@ -8362,11 +8394,12 @@ def test_cloud_memcache_transport_auth_gdch_credentials(transport_class): def test_cloud_memcache_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-memcache/tests/unit/gapic/memcache_v1beta2/test_cloud_memcache.py b/packages/google-cloud-memcache/tests/unit/gapic/memcache_v1beta2/test_cloud_memcache.py index b3c9606b8dec..d5b36986dfbb 100644 --- a/packages/google-cloud-memcache/tests/unit/gapic/memcache_v1beta2/test_cloud_memcache.py +++ b/packages/google-cloud-memcache/tests/unit/gapic/memcache_v1beta2/test_cloud_memcache.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.memcache_v1beta2.services.cloud_memcache import ( CloudMemcacheAsyncClient, @@ -958,10 +958,9 @@ def test_cloud_memcache_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1006,10 +1005,9 @@ def test_cloud_memcache_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1045,10 +1043,9 @@ def test_cloud_memcache_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1291,13 +1288,13 @@ def test_cloud_memcache_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2973,9 +2970,9 @@ def test_update_parameters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_parameters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_parameters] = ( + mock_rpc + ) request = {} client.update_parameters(request) @@ -3659,9 +3656,9 @@ def test_apply_parameters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.apply_parameters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.apply_parameters] = ( + mock_rpc + ) request = {} client.apply_parameters(request) @@ -4015,9 +4012,9 @@ def test_apply_software_update_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.apply_software_update - ] = mock_rpc + client._transport._wrapped_methods[client._transport.apply_software_update] = ( + mock_rpc + ) request = {} client.apply_software_update(request) @@ -4382,9 +4379,9 @@ def test_reschedule_maintenance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reschedule_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reschedule_maintenance] = ( + mock_rpc + ) request = {} client.reschedule_maintenance(request) @@ -5514,9 +5511,9 @@ def test_update_parameters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_parameters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_parameters] = ( + mock_rpc + ) request = {} client.update_parameters(request) @@ -5887,9 +5884,9 @@ def test_apply_parameters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.apply_parameters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.apply_parameters] = ( + mock_rpc + ) request = {} client.apply_parameters(request) @@ -6076,9 +6073,9 @@ def test_apply_software_update_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.apply_software_update - ] = mock_rpc + client._transport._wrapped_methods[client._transport.apply_software_update] = ( + mock_rpc + ) request = {} client.apply_software_update(request) @@ -6265,9 +6262,9 @@ def test_reschedule_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reschedule_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reschedule_maintenance] = ( + mock_rpc + ) request = {} client.reschedule_maintenance(request) @@ -7016,8 +7013,9 @@ def test_list_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7082,17 +7080,19 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7148,8 +7148,9 @@ def test_get_instance_rest_bad_request(request_type=cloud_memcache.GetInstanceRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7230,17 +7231,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7293,8 +7296,9 @@ def test_create_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7469,19 +7473,21 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_create_instance" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_create_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7536,8 +7542,9 @@ def test_update_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7714,19 +7721,21 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_update_instance" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_update_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7779,8 +7788,9 @@ def test_update_parameters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7837,19 +7847,21 @@ def test_update_parameters_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_update_parameters" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_update_parameters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_update_parameters" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_update_parameters" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_update_parameters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_update_parameters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7902,8 +7914,9 @@ def test_delete_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7960,19 +7973,21 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_delete_instance" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_delete_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8025,8 +8040,9 @@ def test_apply_parameters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8083,19 +8099,21 @@ def test_apply_parameters_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_apply_parameters" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "post_apply_parameters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_apply_parameters" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_apply_parameters" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_apply_parameters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_apply_parameters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8148,8 +8166,9 @@ def test_apply_software_update_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8206,20 +8225,21 @@ def test_apply_software_update_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_apply_software_update" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, - "post_apply_software_update_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_apply_software_update" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_apply_software_update" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_apply_software_update_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_apply_software_update" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8272,8 +8292,9 @@ def test_reschedule_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8330,20 +8351,21 @@ def test_reschedule_maintenance_rest_interceptors(null_interceptor): ) client = CloudMemcacheClient(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.CloudMemcacheRestInterceptor, "post_reschedule_maintenance" - ) as post, mock.patch.object( - transports.CloudMemcacheRestInterceptor, - "post_reschedule_maintenance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudMemcacheRestInterceptor, "pre_reschedule_maintenance" - ) as pre: + 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.CloudMemcacheRestInterceptor, "post_reschedule_maintenance" + ) as post, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, + "post_reschedule_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudMemcacheRestInterceptor, "pre_reschedule_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8396,8 +8418,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8456,8 +8479,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8518,8 +8542,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8580,8 +8605,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8642,8 +8668,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8704,8 +8731,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9035,11 +9063,14 @@ def test_cloud_memcache_base_transport(): def test_cloud_memcache_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.memcache_v1beta2.services.cloud_memcache.transports.CloudMemcacheTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.memcache_v1beta2.services.cloud_memcache.transports.CloudMemcacheTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudMemcacheTransport( @@ -9056,9 +9087,12 @@ def test_cloud_memcache_base_transport_with_credentials_file(): def test_cloud_memcache_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.memcache_v1beta2.services.cloud_memcache.transports.CloudMemcacheTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.memcache_v1beta2.services.cloud_memcache.transports.CloudMemcacheTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudMemcacheTransport() @@ -9130,11 +9164,12 @@ def test_cloud_memcache_transport_auth_gdch_credentials(transport_class): def test_cloud_memcache_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-memorystore/docs/conf.py b/packages/google-cloud-memorystore/docs/conf.py index a60b8fc192bd..05a117328a19 100644 --- a/packages/google-cloud-memorystore/docs/conf.py +++ b/packages/google-cloud-memorystore/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-memorystore documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-memorystore/google/cloud/memorystore_v1/__init__.py b/packages/google-cloud-memorystore/google/cloud/memorystore_v1/__init__.py index 80838d2d333e..772ac5482f40 100644 --- a/packages/google-cloud-memorystore/google/cloud/memorystore_v1/__init__.py +++ b/packages/google-cloud-memorystore/google/cloud/memorystore_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.memorystore import MemorystoreClient from .types.memorystore import ( AutomatedBackupConfig, diff --git a/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/client.py b/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/client.py index 3d22fb6c40da..fc9ee19c65e5 100644 --- a/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/client.py +++ b/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.memorystore_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.memorystore_v1.services.memorystore import pagers from google.cloud.memorystore_v1.types import memorystore @@ -803,11 +803,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MemorystoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MemorystoreClient._read_environment_variables() + ) self._client_cert_source = MemorystoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -842,8 +840,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MemorystoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/pagers.py b/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/pagers.py index 57f957b57e5b..fdbe8bcef935 100644 --- a/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/pagers.py +++ b/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -219,7 +219,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/transports/base.py b/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/transports/base.py index 0d49d930cbc2..f0502cefbd1e 100644 --- a/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/transports/base.py +++ b/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.memorystore_v1 import gapic_version as package_version from google.cloud.memorystore_v1.types import memorystore @@ -442,13 +442,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/transports/rest.py b/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/transports/rest.py index e82594e72571..87ed546469c5 100644 --- a/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/transports/rest.py +++ b/packages/google-cloud-memorystore/google/cloud/memorystore_v1/services/memorystore/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1237,7 +1237,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1388,7 +1388,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1538,7 +1538,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1683,7 +1683,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1839,7 +1839,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2106,9 +2106,7 @@ def __call__( BackupCollection of an instance. """ - http_options = ( - _BaseMemorystoreRestTransport._BaseGetBackupCollection._get_http_options() - ) + http_options = _BaseMemorystoreRestTransport._BaseGetBackupCollection._get_http_options() request, metadata = self._interceptor.pre_get_backup_collection( request, metadata @@ -2254,9 +2252,7 @@ def __call__( """ - http_options = ( - _BaseMemorystoreRestTransport._BaseGetCertificateAuthority._get_http_options() - ) + http_options = _BaseMemorystoreRestTransport._BaseGetCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_get_certificate_authority( request, metadata @@ -2550,9 +2546,7 @@ def __call__( Response for [ListBackupCollections]. """ - http_options = ( - _BaseMemorystoreRestTransport._BaseListBackupCollections._get_http_options() - ) + http_options = _BaseMemorystoreRestTransport._BaseListBackupCollections._get_http_options() request, metadata = self._interceptor.pre_list_backup_collections( request, metadata @@ -2999,9 +2993,7 @@ def __call__( """ - http_options = ( - _BaseMemorystoreRestTransport._BaseRescheduleMaintenance._get_http_options() - ) + http_options = _BaseMemorystoreRestTransport._BaseRescheduleMaintenance._get_http_options() request, metadata = self._interceptor.pre_reschedule_maintenance( request, metadata @@ -3027,7 +3019,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3178,7 +3170,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3311,7 +3303,9 @@ def get_certificate_authority( ]: # 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._GetCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._GetCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_instance( diff --git a/packages/google-cloud-memorystore/google/cloud/memorystore_v1/types/memorystore.py b/packages/google-cloud-memorystore/google/cloud/memorystore_v1/types/memorystore.py index 7b68815bbac0..bceadfb8d8d3 100644 --- a/packages/google-cloud-memorystore/google/cloud/memorystore_v1/types/memorystore.py +++ b/packages/google-cloud-memorystore/google/cloud/memorystore_v1/types/memorystore.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -80,6 +80,7 @@ class PscConnectionStatus(proto.Enum): NOT_FOUND (2): Connection not found """ + PSC_CONNECTION_STATUS_UNSPECIFIED = 0 ACTIVE = 1 NOT_FOUND = 2 @@ -101,6 +102,7 @@ class ConnectionType(proto.Enum): Connection that will be used as reader endpoint to access replicas. """ + CONNECTION_TYPE_UNSPECIFIED = 0 CONNECTION_TYPE_DISCOVERY = 1 CONNECTION_TYPE_PRIMARY = 2 @@ -297,6 +299,7 @@ class State(proto.Enum): DELETING (4): Instance is being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -314,6 +317,7 @@ class AuthorizationMode(proto.Enum): IAM_AUTH (2): IAM basic authorization. """ + AUTHORIZATION_MODE_UNSPECIFIED = 0 AUTH_DISABLED = 1 IAM_AUTH = 2 @@ -330,6 +334,7 @@ class TransitEncryptionMode(proto.Enum): Server-managed encryption is used for in-transit encryption. """ + TRANSIT_ENCRYPTION_MODE_UNSPECIFIED = 0 TRANSIT_ENCRYPTION_DISABLED = 1 SERVER_AUTHENTICATION = 2 @@ -351,6 +356,7 @@ class NodeType(proto.Enum): STANDARD_SMALL (4): Standard small. """ + NODE_TYPE_UNSPECIFIED = 0 SHARED_CORE_NANO = 1 HIGHMEM_MEDIUM = 2 @@ -371,6 +377,7 @@ class Mode(proto.Enum): CLUSTER_DISABLED (4): Cluster mode is disabled for the instance. """ + MODE_UNSPECIFIED = 0 STANDALONE = 1 CLUSTER = 2 @@ -645,12 +652,12 @@ class ConnectionDetail(proto.Message): number=20, message="PscAutoConnection", ) - psc_attachment_details: MutableSequence[ - "PscAttachmentDetail" - ] = proto.RepeatedField( - proto.MESSAGE, - number=21, - message="PscAttachmentDetail", + psc_attachment_details: MutableSequence["PscAttachmentDetail"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=21, + message="PscAttachmentDetail", + ) ) endpoints: MutableSequence[InstanceEndpoint] = proto.RepeatedField( proto.MESSAGE, @@ -776,6 +783,7 @@ class AutomatedBackupMode(proto.Enum): ENABLED (2): Automated backup config enabled. """ + AUTOMATED_BACKUP_MODE_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -951,6 +959,7 @@ class BackupType(proto.Enum): AUTOMATED (2): Automated backup. """ + BACKUP_TYPE_UNSPECIFIED = 0 ON_DEMAND = 1 AUTOMATED = 2 @@ -972,6 +981,7 @@ class State(proto.Enum): reasons like project deletion, billing account closure, etc. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -1136,6 +1146,7 @@ class InstanceRole(proto.Enum): A instance that allows only reads and replicates data from a primary instance. """ + INSTANCE_ROLE_UNSPECIFIED = 0 NONE = 1 PRIMARY = 2 @@ -1244,12 +1255,12 @@ class MaintenancePolicy(proto.Message): number=2, message=timestamp_pb2.Timestamp, ) - weekly_maintenance_window: MutableSequence[ - "WeeklyMaintenanceWindow" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="WeeklyMaintenanceWindow", + weekly_maintenance_window: MutableSequence["WeeklyMaintenanceWindow"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="WeeklyMaintenanceWindow", + ) ) @@ -1554,6 +1565,7 @@ class PersistenceMode(proto.Enum): AOF (3): AOF based persistence is enabled. """ + PERSISTENCE_MODE_UNSPECIFIED = 0 DISABLED = 1 RDB = 2 @@ -1587,6 +1599,7 @@ class SnapshotPeriod(proto.Enum): TWENTY_FOUR_HOURS (4): Twenty four hours. """ + SNAPSHOT_PERIOD_UNSPECIFIED = 0 ONE_HOUR = 1 SIX_HOURS = 2 @@ -1630,6 +1643,7 @@ class AppendFsync(proto.Enum): appended to the AOF. The best data loss protection at the cost of performance. """ + APPEND_FSYNC_UNSPECIFIED = 0 NEVER = 1 EVERY_SEC = 2 @@ -1698,6 +1712,7 @@ class ZoneDistributionMode(proto.Enum): Provision resources in a single zone. Zone field must be specified. """ + ZONE_DISTRIBUTION_MODE_UNSPECIFIED = 0 MULTI_ZONE = 1 SINGLE_ZONE = 2 @@ -1743,6 +1758,7 @@ class RescheduleType(proto.Enum): If the user wants to reschedule the maintenance to a specific time. """ + RESCHEDULE_TYPE_UNSPECIFIED = 0 IMMEDIATE = 1 SPECIFIC_TIME = 3 @@ -2451,6 +2467,7 @@ class Type(proto.Enum): is managed by the customer. KMS key versions will be populated. """ + TYPE_UNSPECIFIED = 0 GOOGLE_DEFAULT_ENCRYPTION = 1 CUSTOMER_MANAGED_ENCRYPTION = 2 @@ -2480,6 +2497,7 @@ class KmsKeyState(proto.Enum): UNKNOWN_FAILURE (8): All other unknown failures. """ + KMS_KEY_STATE_UNSPECIFIED = 0 ENABLED = 1 PERMISSION_DENIED = 2 diff --git a/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/__init__.py b/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/__init__.py index 498f97d826d5..97deabfae555 100644 --- a/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/__init__.py +++ b/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.memorystore import MemorystoreClient from .types.memorystore import ( CertificateAuthority, diff --git a/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/client.py b/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/client.py index 05919c625f91..6afa4a8d5f54 100644 --- a/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/client.py +++ b/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.memorystore_v1beta import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.memorystore_v1beta.services.memorystore import pagers from google.cloud.memorystore_v1beta.types import memorystore @@ -707,11 +707,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MemorystoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MemorystoreClient._read_environment_variables() + ) self._client_cert_source = MemorystoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -746,8 +744,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MemorystoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/pagers.py b/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/pagers.py index f81756e68c87..4411f1f2a021 100644 --- a/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/pagers.py +++ b/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. diff --git a/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/transports/base.py b/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/transports/base.py index 8c3db1e0d591..72561d80a33f 100644 --- a/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/transports/base.py +++ b/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.memorystore_v1beta import gapic_version as package_version from google.cloud.memorystore_v1beta.types import memorystore @@ -325,13 +325,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/transports/rest.py b/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/transports/rest.py index 897f3c040504..7f96a4a1c023 100644 --- a/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/transports/rest.py +++ b/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/services/memorystore/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -788,7 +788,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -934,7 +934,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1056,9 +1056,7 @@ def __call__( """ - http_options = ( - _BaseMemorystoreRestTransport._BaseGetCertificateAuthority._get_http_options() - ) + http_options = _BaseMemorystoreRestTransport._BaseGetCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_get_certificate_authority( request, metadata @@ -1530,7 +1528,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1621,7 +1619,9 @@ def get_certificate_authority( ]: # 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._GetCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._GetCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_instance( diff --git a/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/types/memorystore.py b/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/types/memorystore.py index 958fb29694c2..1ea094b0a8d8 100644 --- a/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/types/memorystore.py +++ b/packages/google-cloud-memorystore/google/cloud/memorystore_v1beta/types/memorystore.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -57,6 +57,7 @@ class PscConnectionStatus(proto.Enum): NOT_FOUND (2): Connection not found """ + PSC_CONNECTION_STATUS_UNSPECIFIED = 0 ACTIVE = 1 NOT_FOUND = 2 @@ -78,6 +79,7 @@ class ConnectionType(proto.Enum): Connection that will be used as reader endpoint to access replicas. """ + CONNECTION_TYPE_UNSPECIFIED = 0 CONNECTION_TYPE_DISCOVERY = 1 CONNECTION_TYPE_PRIMARY = 2 @@ -176,6 +178,7 @@ class State(proto.Enum): DELETING (4): Instance is being deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -193,6 +196,7 @@ class AuthorizationMode(proto.Enum): IAM_AUTH (2): IAM basic authorization. """ + AUTHORIZATION_MODE_UNSPECIFIED = 0 AUTH_DISABLED = 1 IAM_AUTH = 2 @@ -209,6 +213,7 @@ class TransitEncryptionMode(proto.Enum): Server-managed encryption is used for in-transit encryption. """ + TRANSIT_ENCRYPTION_MODE_UNSPECIFIED = 0 TRANSIT_ENCRYPTION_DISABLED = 1 SERVER_AUTHENTICATION = 2 @@ -230,6 +235,7 @@ class NodeType(proto.Enum): STANDARD_SMALL (4): Standard small. """ + NODE_TYPE_UNSPECIFIED = 0 SHARED_CORE_NANO = 1 HIGHMEM_MEDIUM = 2 @@ -250,6 +256,7 @@ class Mode(proto.Enum): CLUSTER_DISABLED (4): Cluster mode is disabled for the instance. """ + MODE_UNSPECIFIED = 0 STANDALONE = 1 CLUSTER = 2 @@ -686,6 +693,7 @@ class PersistenceMode(proto.Enum): AOF (3): AOF based persistence is enabled. """ + PERSISTENCE_MODE_UNSPECIFIED = 0 DISABLED = 1 RDB = 2 @@ -719,6 +727,7 @@ class SnapshotPeriod(proto.Enum): TWENTY_FOUR_HOURS (4): Twenty four hours. """ + SNAPSHOT_PERIOD_UNSPECIFIED = 0 ONE_HOUR = 1 SIX_HOURS = 2 @@ -762,6 +771,7 @@ class AppendFsync(proto.Enum): appended to the AOF. The best data loss protection at the cost of performance. """ + APPEND_FSYNC_UNSPECIFIED = 0 NEVER = 1 EVERY_SEC = 2 @@ -830,6 +840,7 @@ class ZoneDistributionMode(proto.Enum): Provision resources in a single zone. Zone field must be specified. """ + ZONE_DISTRIBUTION_MODE_UNSPECIFIED = 0 MULTI_ZONE = 1 SINGLE_ZONE = 2 diff --git a/packages/google-cloud-memorystore/noxfile.py b/packages/google-cloud-memorystore/noxfile.py index 2423f6ab8f49..b378a4d6d079 100644 --- a/packages/google-cloud-memorystore/noxfile.py +++ b/packages/google-cloud-memorystore/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-memorystore/tests/unit/gapic/memorystore_v1/test_memorystore.py b/packages/google-cloud-memorystore/tests/unit/gapic/memorystore_v1/test_memorystore.py index 799a8e7d0a50..f7a78e4ea2b4 100644 --- a/packages/google-cloud-memorystore/tests/unit/gapic/memorystore_v1/test_memorystore.py +++ b/packages/google-cloud-memorystore/tests/unit/gapic/memorystore_v1/test_memorystore.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.memorystore_v1.services.memorystore import ( MemorystoreClient, @@ -891,10 +891,9 @@ def test_memorystore_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -939,10 +938,9 @@ def test_memorystore_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -978,10 +976,9 @@ def test_memorystore_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2375,9 +2372,9 @@ def test_reschedule_maintenance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reschedule_maintenance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reschedule_maintenance] = ( + mock_rpc + ) request = {} client.reschedule_maintenance(request) @@ -2833,9 +2830,9 @@ def test_get_backup_collection_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_collection - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_collection] = ( + mock_rpc + ) request = {} client.get_backup_collection(request) @@ -4002,8 +3999,9 @@ def test_list_instances_rest_bad_request(request_type=memorystore.ListInstancesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4068,17 +4066,19 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4131,8 +4131,9 @@ def test_get_instance_rest_bad_request(request_type=memorystore.GetInstanceReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4247,17 +4248,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4308,8 +4311,9 @@ def test_create_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4554,19 +4558,20 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_create_instance" - ) as pre: + 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.MemorystoreRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_create_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4621,8 +4626,9 @@ def test_update_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4869,19 +4875,20 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_update_instance" - ) as pre: + 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.MemorystoreRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_update_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4934,8 +4941,9 @@ def test_delete_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4992,19 +5000,20 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_delete_instance" - ) as pre: + 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.MemorystoreRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_delete_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5057,8 +5066,9 @@ def test_get_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5121,18 +5131,20 @@ def test_get_certificate_authority_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_get_certificate_authority" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, - "post_get_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_get_certificate_authority" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_get_certificate_authority" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, + "post_get_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_get_certificate_authority" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5187,8 +5199,9 @@ def test_reschedule_maintenance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5245,20 +5258,21 @@ def test_reschedule_maintenance_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_reschedule_maintenance" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, - "post_reschedule_maintenance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_reschedule_maintenance" - ) as pre: + 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.MemorystoreRestInterceptor, "post_reschedule_maintenance" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, + "post_reschedule_maintenance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_reschedule_maintenance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5311,8 +5325,9 @@ def test_list_backup_collections_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5377,18 +5392,20 @@ def test_list_backup_collections_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_list_backup_collections" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, - "post_list_backup_collections_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_list_backup_collections" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_list_backup_collections" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, + "post_list_backup_collections_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_list_backup_collections" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5448,8 +5465,9 @@ def test_get_backup_collection_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5526,18 +5544,20 @@ def test_get_backup_collection_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_get_backup_collection" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, - "post_get_backup_collection_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_get_backup_collection" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_get_backup_collection" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, + "post_get_backup_collection_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_get_backup_collection" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5592,8 +5612,9 @@ def test_list_backups_rest_bad_request(request_type=memorystore.ListBackupsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5660,17 +5681,19 @@ def test_list_backups_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_list_backups" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_list_backups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_list_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_list_backups" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_list_backups_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_list_backups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5723,8 +5746,9 @@ def test_get_backup_rest_bad_request(request_type=memorystore.GetBackupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5809,17 +5833,19 @@ def test_get_backup_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_get_backup" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_get_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_get_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_get_backup" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_get_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_get_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5870,8 +5896,9 @@ def test_delete_backup_rest_bad_request(request_type=memorystore.DeleteBackupReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5930,19 +5957,20 @@ def test_delete_backup_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_delete_backup" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_delete_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_delete_backup" - ) as pre: + 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.MemorystoreRestInterceptor, "post_delete_backup" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_delete_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_delete_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5995,8 +6023,9 @@ def test_export_backup_rest_bad_request(request_type=memorystore.ExportBackupReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6055,19 +6084,20 @@ def test_export_backup_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_export_backup" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_export_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_export_backup" - ) as pre: + 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.MemorystoreRestInterceptor, "post_export_backup" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_export_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_export_backup" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6120,8 +6150,9 @@ def test_backup_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6178,19 +6209,20 @@ def test_backup_instance_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_backup_instance" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_backup_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_backup_instance" - ) as pre: + 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.MemorystoreRestInterceptor, "post_backup_instance" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_backup_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_backup_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6243,8 +6275,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6303,8 +6336,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6365,8 +6399,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6427,8 +6462,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6489,8 +6525,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6551,8 +6588,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6978,11 +7016,14 @@ def test_memorystore_base_transport(): def test_memorystore_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.memorystore_v1.services.memorystore.transports.MemorystoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.memorystore_v1.services.memorystore.transports.MemorystoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MemorystoreTransport( @@ -6999,9 +7040,12 @@ def test_memorystore_base_transport_with_credentials_file(): def test_memorystore_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.memorystore_v1.services.memorystore.transports.MemorystoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.memorystore_v1.services.memorystore.transports.MemorystoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MemorystoreTransport() diff --git a/packages/google-cloud-memorystore/tests/unit/gapic/memorystore_v1beta/test_memorystore.py b/packages/google-cloud-memorystore/tests/unit/gapic/memorystore_v1beta/test_memorystore.py index d01f4d52cf6b..1fc027ac8880 100644 --- a/packages/google-cloud-memorystore/tests/unit/gapic/memorystore_v1beta/test_memorystore.py +++ b/packages/google-cloud-memorystore/tests/unit/gapic/memorystore_v1beta/test_memorystore.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.memorystore_v1beta.services.memorystore import ( MemorystoreClient, @@ -888,10 +888,9 @@ def test_memorystore_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -936,10 +935,9 @@ def test_memorystore_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -975,10 +973,9 @@ def test_memorystore_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -2435,8 +2432,9 @@ def test_list_instances_rest_bad_request(request_type=memorystore.ListInstancesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2501,17 +2499,19 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2564,8 +2564,9 @@ def test_get_instance_rest_bad_request(request_type=memorystore.GetInstanceReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2654,17 +2655,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2715,8 +2718,9 @@ def test_create_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2902,19 +2906,20 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_create_instance" - ) as pre: + 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.MemorystoreRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_create_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2969,8 +2974,9 @@ def test_update_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3158,19 +3164,20 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_update_instance" - ) as pre: + 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.MemorystoreRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_update_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3223,8 +3230,9 @@ def test_delete_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3281,19 +3289,20 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_delete_instance" - ) as pre: + 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.MemorystoreRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_delete_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3346,8 +3355,9 @@ def test_get_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3410,18 +3420,20 @@ def test_get_certificate_authority_rest_interceptors(null_interceptor): ) client = MemorystoreClient(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.MemorystoreRestInterceptor, "post_get_certificate_authority" - ) as post, mock.patch.object( - transports.MemorystoreRestInterceptor, - "post_get_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MemorystoreRestInterceptor, "pre_get_certificate_authority" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MemorystoreRestInterceptor, "post_get_certificate_authority" + ) as post, + mock.patch.object( + transports.MemorystoreRestInterceptor, + "post_get_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MemorystoreRestInterceptor, "pre_get_certificate_authority" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3476,8 +3488,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3536,8 +3549,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3598,8 +3612,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3660,8 +3675,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3722,8 +3738,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3784,8 +3801,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4037,11 +4055,14 @@ def test_memorystore_base_transport(): def test_memorystore_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.memorystore_v1beta.services.memorystore.transports.MemorystoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.memorystore_v1beta.services.memorystore.transports.MemorystoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MemorystoreTransport( @@ -4058,9 +4079,12 @@ def test_memorystore_base_transport_with_credentials_file(): def test_memorystore_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.memorystore_v1beta.services.memorystore.transports.MemorystoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.memorystore_v1beta.services.memorystore.transports.MemorystoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MemorystoreTransport() diff --git a/packages/google-cloud-migrationcenter/docs/conf.py b/packages/google-cloud-migrationcenter/docs/conf.py index 8b689002ec5e..a0a9cee53248 100644 --- a/packages/google-cloud-migrationcenter/docs/conf.py +++ b/packages/google-cloud-migrationcenter/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-migrationcenter documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/__init__.py b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/__init__.py index 5a20568c62d6..8a75d7a8253b 100644 --- a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/__init__.py +++ b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.migration_center import MigrationCenterAsyncClient, MigrationCenterClient from .types.migrationcenter import ( AddAssetsToGroupRequest, diff --git a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/async_client.py b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/async_client.py index abd74d330d11..d4ae7357c774 100644 --- a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/async_client.py +++ b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.migrationcenter_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.migrationcenter_v1.services.migration_center import pagers from google.cloud.migrationcenter_v1.types import migrationcenter @@ -145,7 +145,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MigrationCenterAsyncClient: The constructed client. """ - return MigrationCenterClient.from_service_account_info.__func__(MigrationCenterAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MigrationCenterClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(MigrationCenterAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -161,7 +162,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MigrationCenterAsyncClient: The constructed client. """ - return MigrationCenterClient.from_service_account_file.__func__(MigrationCenterAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MigrationCenterClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(MigrationCenterAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/client.py b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/client.py index 3bf0d7b4135d..60b2280f23f3 100644 --- a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/client.py +++ b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.migrationcenter_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.migrationcenter_v1.services.migration_center import pagers from google.cloud.migrationcenter_v1.types import migrationcenter @@ -86,9 +86,7 @@ class MigrationCenterClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[MigrationCenterTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[MigrationCenterTransport]] _transport_registry["grpc"] = MigrationCenterGrpcTransport _transport_registry["grpc_asyncio"] = MigrationCenterGrpcAsyncIOTransport _transport_registry["rest"] = MigrationCenterRestTransport @@ -831,11 +829,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MigrationCenterClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MigrationCenterClient._read_environment_variables() + ) self._client_cert_source = MigrationCenterClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -870,8 +866,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MigrationCenterTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/pagers.py b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/pagers.py index 8e41ae2bb089..c46a00ed931c 100644 --- a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/pagers.py +++ b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1159,7 +1159,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1235,7 +1235,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1315,7 +1315,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1391,7 +1391,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/base.py b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/base.py index ba3be6dd6268..6b9c194a1af8 100644 --- a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/base.py +++ b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.migrationcenter_v1 import gapic_version as package_version from google.cloud.migrationcenter_v1.types import migrationcenter @@ -919,13 +919,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/grpc.py b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/grpc.py index 2e672acddd20..0f31d5ac3c16 100644 --- a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/grpc.py +++ b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.migrationcenter_v1.types import migrationcenter diff --git a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/grpc_asyncio.py b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/grpc_asyncio.py index 8e9d04070935..c04ce739deb5 100644 --- a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/grpc_asyncio.py +++ b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/grpc_asyncio.py @@ -17,9 +17,13 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,12 +31,8 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.migrationcenter_v1.types import migrationcenter diff --git a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/rest.py b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/rest.py index 373fab1666c3..10c29ff31e67 100644 --- a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/rest.py +++ b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/rest.py @@ -16,18 +16,18 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -3082,9 +3082,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseAddAssetsToGroup._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseAddAssetsToGroup._get_http_options() request, metadata = self._interceptor.pre_add_assets_to_group( request, metadata @@ -3110,7 +3108,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3236,9 +3234,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseAggregateAssetsValues._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseAggregateAssetsValues._get_http_options() request, metadata = self._interceptor.pre_aggregate_assets_values( request, metadata @@ -3389,9 +3385,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseBatchDeleteAssets._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseBatchDeleteAssets._get_http_options() request, metadata = self._interceptor.pre_batch_delete_assets( request, metadata @@ -3417,7 +3411,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3510,9 +3504,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseBatchUpdateAssets._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseBatchUpdateAssets._get_http_options() request, metadata = self._interceptor.pre_batch_update_assets( request, metadata @@ -3693,7 +3685,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3819,9 +3811,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseCreateImportDataFile._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseCreateImportDataFile._get_http_options() request, metadata = self._interceptor.pre_create_import_data_file( request, metadata @@ -3847,7 +3837,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3972,9 +3962,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseCreateImportJob._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseCreateImportJob._get_http_options() request, metadata = self._interceptor.pre_create_import_job( request, metadata @@ -4000,7 +3988,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4126,9 +4114,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseCreatePreferenceSet._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseCreatePreferenceSet._get_http_options() request, metadata = self._interceptor.pre_create_preference_set( request, metadata @@ -4154,7 +4140,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4305,7 +4291,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4431,9 +4417,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseCreateReportConfig._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseCreateReportConfig._get_http_options() request, metadata = self._interceptor.pre_create_report_config( request, metadata @@ -4459,7 +4443,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4610,7 +4594,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4749,7 +4733,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4862,7 +4846,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4986,9 +4970,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseDeleteImportDataFile._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseDeleteImportDataFile._get_http_options() request, metadata = self._interceptor.pre_delete_import_data_file( request, metadata @@ -5010,7 +4992,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5133,9 +5115,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseDeleteImportJob._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseDeleteImportJob._get_http_options() request, metadata = self._interceptor.pre_delete_import_job( request, metadata @@ -5157,7 +5137,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5281,9 +5261,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseDeletePreferenceSet._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseDeletePreferenceSet._get_http_options() request, metadata = self._interceptor.pre_delete_preference_set( request, metadata @@ -5305,7 +5283,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5450,7 +5428,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5574,9 +5552,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseDeleteReportConfig._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseDeleteReportConfig._get_http_options() request, metadata = self._interceptor.pre_delete_report_config( request, metadata @@ -5598,7 +5574,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5743,7 +5719,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6317,9 +6293,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseGetImportDataFile._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseGetImportDataFile._get_http_options() request, metadata = self._interceptor.pre_get_import_data_file( request, metadata @@ -6612,9 +6586,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseGetPreferenceSet._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseGetPreferenceSet._get_http_options() request, metadata = self._interceptor.pre_get_preference_set( request, metadata @@ -6908,9 +6880,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseGetReportConfig._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseGetReportConfig._get_http_options() request, metadata = self._interceptor.pre_get_report_config( request, metadata @@ -7497,9 +7467,7 @@ def __call__( A response for listing error frames. """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseListErrorFrames._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseListErrorFrames._get_http_options() request, metadata = self._interceptor.pre_list_error_frames( request, metadata @@ -7795,9 +7763,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseListImportDataFiles._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseListImportDataFiles._get_http_options() request, metadata = self._interceptor.pre_list_import_data_files( request, metadata @@ -7943,9 +7909,7 @@ def __call__( A response for listing import jobs. """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseListImportJobs._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseListImportJobs._get_http_options() request, metadata = self._interceptor.pre_list_import_jobs( request, metadata @@ -8094,9 +8058,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseListPreferenceSets._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseListPreferenceSets._get_http_options() request, metadata = self._interceptor.pre_list_preference_sets( request, metadata @@ -8245,9 +8207,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseListReportConfigs._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseListReportConfigs._get_http_options() request, metadata = self._interceptor.pre_list_report_configs( request, metadata @@ -8691,9 +8651,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseRemoveAssetsFromGroup._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseRemoveAssetsFromGroup._get_http_options() request, metadata = self._interceptor.pre_remove_assets_from_group( request, metadata @@ -8719,7 +8677,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8845,9 +8803,7 @@ def __call__( A response to a call to ``ReportAssetFrame``. """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseReportAssetFrames._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseReportAssetFrames._get_http_options() request, metadata = self._interceptor.pre_report_asset_frames( request, metadata @@ -9028,7 +8984,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9332,7 +9288,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9457,9 +9413,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseUpdateImportJob._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseUpdateImportJob._get_http_options() request, metadata = self._interceptor.pre_update_import_job( request, metadata @@ -9485,7 +9439,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9611,9 +9565,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseUpdatePreferenceSet._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseUpdatePreferenceSet._get_http_options() request, metadata = self._interceptor.pre_update_preference_set( request, metadata @@ -9639,7 +9591,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9764,9 +9716,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseUpdateSettings._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseUpdateSettings._get_http_options() request, metadata = self._interceptor.pre_update_settings(request, metadata) transcoded_request = _BaseMigrationCenterRestTransport._BaseUpdateSettings._get_transcoded_request( @@ -9790,7 +9740,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9941,7 +9891,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -10067,9 +10017,7 @@ def __call__( """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseValidateImportJob._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseValidateImportJob._get_http_options() request, metadata = self._interceptor.pre_validate_import_job( request, metadata @@ -10095,7 +10043,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -10934,9 +10882,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -11053,9 +10999,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -11310,9 +11254,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseMigrationCenterRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseMigrationCenterRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseMigrationCenterRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/rest_base.py b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/rest_base.py index a996c18996ea..f71797b51377 100644 --- a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/rest_base.py +++ b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/services/migration_center/transports/rest_base.py @@ -17,10 +17,10 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.migrationcenter_v1.types import migrationcenter diff --git a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/types/migrationcenter.py b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/types/migrationcenter.py index af4f9fe400cd..3bab301d9e9f 100644 --- a/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/types/migrationcenter.py +++ b/packages/google-cloud-migrationcenter/google/cloud/migrationcenter_v1/types/migrationcenter.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import money_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -203,6 +203,7 @@ class AssetView(proto.Enum): The asset view includes all the metadata of an asset and performance data. """ + ASSET_VIEW_UNSPECIFIED = 0 ASSET_VIEW_BASIC = 1 ASSET_VIEW_FULL = 2 @@ -221,6 +222,7 @@ class OperatingSystemFamily(proto.Enum): OS_FAMILY_UNIX (3): Non-Linux Unix flavors. """ + OS_FAMILY_UNKNOWN = 0 OS_FAMILY_WINDOWS = 1 OS_FAMILY_LINUX = 2 @@ -249,6 +251,7 @@ class ImportJobFormat(proto.Enum): upload data tables][https://cloud.google.com/migrate/stratozone/docs/import-data-portal]. """ + IMPORT_JOB_FORMAT_UNSPECIFIED = 0 IMPORT_JOB_FORMAT_RVTOOLS_XLSX = 1 IMPORT_JOB_FORMAT_RVTOOLS_CSV = 2 @@ -273,6 +276,7 @@ class ImportJobView(proto.Enum): The import job view includes all metadata of an import job. """ + IMPORT_JOB_VIEW_UNSPECIFIED = 0 IMPORT_JOB_VIEW_BASIC = 1 IMPORT_JOB_VIEW_FULL = 2 @@ -293,6 +297,7 @@ class ErrorFrameView(proto.Enum): ERROR_FRAME_VIEW_FULL (2): Include everything. """ + ERROR_FRAME_VIEW_UNSPECIFIED = 0 ERROR_FRAME_VIEW_BASIC = 1 ERROR_FRAME_VIEW_FULL = 2 @@ -315,6 +320,7 @@ class PersistentDiskType(proto.Enum): PERSISTENT_DISK_TYPE_SSD (3): SSD Persistent Disk. """ + PERSISTENT_DISK_TYPE_UNSPECIFIED = 0 PERSISTENT_DISK_TYPE_STANDARD = 1 PERSISTENT_DISK_TYPE_BALANCED = 2 @@ -336,6 +342,7 @@ class LicenseType(proto.Enum): Bring-your-own-license (BYOL) plan. User provides the OS license. """ + LICENSE_TYPE_UNSPECIFIED = 0 LICENSE_TYPE_DEFAULT = 1 LICENSE_TYPE_BRING_YOUR_OWN_LICENSE = 2 @@ -364,6 +371,7 @@ class SizingOptimizationStrategy(proto.Enum): reported usage, with little slack. Using this option can help reduce costs. """ + SIZING_OPTIMIZATION_STRATEGY_UNSPECIFIED = 0 SIZING_OPTIMIZATION_STRATEGY_SAME_AS_SOURCE = 1 SIZING_OPTIMIZATION_STRATEGY_MODERATE = 2 @@ -384,6 +392,7 @@ class CommitmentPlan(proto.Enum): COMMITMENT_PLAN_THREE_YEARS (3): 3 years commitment. """ + COMMITMENT_PLAN_UNSPECIFIED = 0 COMMITMENT_PLAN_NONE = 1 COMMITMENT_PLAN_ONE_YEAR = 2 @@ -406,6 +415,7 @@ class ComputeMigrationTargetProduct(proto.Enum): Prefer to migrate to Google Cloud Sole Tenant Nodes. """ + COMPUTE_MIGRATION_TARGET_PRODUCT_UNSPECIFIED = 0 COMPUTE_MIGRATION_TARGET_PRODUCT_COMPUTE_ENGINE = 1 COMPUTE_MIGRATION_TARGET_PRODUCT_VMWARE_ENGINE = 2 @@ -430,6 +440,7 @@ class ReportView(proto.Enum): The report view includes the standard metadata of an report. Useful for detail view. """ + REPORT_VIEW_UNSPECIFIED = 0 REPORT_VIEW_BASIC = 1 REPORT_VIEW_FULL = 2 @@ -641,6 +652,7 @@ class ImportJobState(proto.Enum): The validation of the job completed with no blocking errors. """ + IMPORT_JOB_STATE_UNSPECIFIED = 0 IMPORT_JOB_STATE_PENDING = 1 IMPORT_JOB_STATE_RUNNING = 2 @@ -738,6 +750,7 @@ class State(proto.Enum): ACTIVE (2): The data file completed initialization. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -914,6 +927,7 @@ class SourceType(proto.Enum): SOURCE_TYPE_CUSTOM (4): Third-party owned sources. """ + SOURCE_TYPE_UNKNOWN = 0 SOURCE_TYPE_UPLOAD = 1 SOURCE_TYPE_GUEST_OS_SCAN = 2 @@ -934,6 +948,7 @@ class State(proto.Enum): Source is in an invalid state. Asset frames reported to it will be ignored. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 DELETING = 2 @@ -1053,12 +1068,12 @@ class GroupPreferenceSetAssignment(proto.Message): proto.STRING, number=5, ) - group_preferenceset_assignments: MutableSequence[ - GroupPreferenceSetAssignment - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=GroupPreferenceSetAssignment, + group_preferenceset_assignments: MutableSequence[GroupPreferenceSetAssignment] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=GroupPreferenceSetAssignment, + ) ) @@ -1095,6 +1110,7 @@ class Type(proto.Enum): TOTAL_COST_OF_OWNERSHIP (1): Total cost of ownership Report type. """ + TYPE_UNSPECIFIED = 0 TOTAL_COST_OF_OWNERSHIP = 1 @@ -1111,6 +1127,7 @@ class State(proto.Enum): FAILED (3): Failed to create Report. """ + STATE_UNSPECIFIED = 0 PENDING = 1 SUCCEEDED = 2 @@ -3574,6 +3591,7 @@ class PowerState(proto.Enum): The machine is deleted from the hosting platform. """ + POWER_STATE_UNSPECIFIED = 0 PENDING = 1 ACTIVE = 2 @@ -3672,6 +3690,7 @@ class FirmwareType(proto.Enum): EFI (2): EFI firmware. """ + FIRMWARE_TYPE_UNSPECIFIED = 0 BIOS = 1 EFI = 2 @@ -3687,6 +3706,7 @@ class CpuHyperThreading(proto.Enum): ENABLED (2): Hyper-threading is enabled. """ + CPU_HYPER_THREADING_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -3893,6 +3913,7 @@ class AddressAssignment(proto.Enum): ADDRESS_ASSIGNMENT_DHCP (2): Dynamically assigned IP (DHCP). """ + ADDRESS_ASSIGNMENT_UNSPECIFIED = 0 ADDRESS_ASSIGNMENT_STATIC = 1 ADDRESS_ASSIGNMENT_DHCP = 2 @@ -4009,6 +4030,7 @@ class InterfaceType(proto.Enum): ISCSI (7): iSCSI interface type. """ + INTERFACE_TYPE_UNSPECIFIED = 0 IDE = 1 SATA = 2 @@ -4162,6 +4184,7 @@ class BackingType(proto.Enum): BACKING_TYPE_SESPARSE_V2 (8): SEsparse v1. """ + BACKING_TYPE_UNSPECIFIED = 0 BACKING_TYPE_FLAT_V1 = 1 BACKING_TYPE_FLAT_V2 = 2 @@ -4185,6 +4208,7 @@ class VmdkMode(proto.Enum): INDEPENDENT_NONPERSISTENT (3): Independent - Nonpersistent disk mode. """ + VMDK_MODE_UNSPECIFIED = 0 DEPENDENT = 1 INDEPENDENT_PERSISTENT = 2 @@ -4201,6 +4225,7 @@ class RdmCompatibility(proto.Enum): VIRTUAL_COMPATIBILITY (2): Virtual compatibility mode. """ + RDM_COMPATIBILITY_UNSPECIFIED = 0 PHYSICAL_COMPATIBILITY = 1 VIRTUAL_COMPATIBILITY = 2 @@ -4296,6 +4321,7 @@ class SeLinuxMode(proto.Enum): SE_LINUX_MODE_ENFORCING (3): SELinux enforcing mode. """ + SE_LINUX_MODE_UNSPECIFIED = 0 SE_LINUX_MODE_DISABLED = 1 SE_LINUX_MODE_PERMISSIVE = 2 @@ -4571,6 +4597,7 @@ class State(proto.Enum): STOPPED (3): Service is stopped. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 PAUSED = 2 @@ -4597,6 +4624,7 @@ class StartMode(proto.Enum): DISABLED (5): The service is disabled. """ + START_MODE_UNSPECIFIED = 0 BOOT = 1 SYSTEM = 2 @@ -4762,6 +4790,7 @@ class State(proto.Enum): CLOSED (5): The connection is closed. """ + STATE_UNSPECIFIED = 0 OPENING = 1 OPEN = 2 @@ -5596,6 +5625,7 @@ class FitLevel(proto.Enum): REQUIRES_EFFORT (3): Fit with effort. """ + FIT_LEVEL_UNSPECIFIED = 0 FIT = 1 NO_FIT = 2 @@ -5794,12 +5824,12 @@ class Bucket(proto.Message): number=3, ) - buckets: MutableSequence[ - "AggregationResult.Histogram.Bucket" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AggregationResult.Histogram.Bucket", + buckets: MutableSequence["AggregationResult.Histogram.Bucket"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AggregationResult.Histogram.Bucket", + ) ) class Frequency(proto.Message): @@ -5959,6 +5989,7 @@ class Severity(proto.Enum): INFO (3): No description available. """ + SEVERITY_UNSPECIFIED = 0 ERROR = 1 WARNING = 2 @@ -6267,6 +6298,7 @@ class CommitmentPlan(proto.Enum): COMMITMENT_3_YEAR_UPFRONT_PAYMENT (5): 3 years commitment (upfront payment). """ + COMMITMENT_PLAN_UNSPECIFIED = 0 ON_DEMAND = 1 COMMITMENT_1_YEAR_MONTHLY_PAYMENTS = 2 @@ -6329,6 +6361,7 @@ class HostMaintenancePolicy(proto.Enum): Migrate within node group host maintenance policy. """ + HOST_MAINTENANCE_POLICY_UNSPECIFIED = 0 HOST_MAINTENANCE_POLICY_DEFAULT = 1 HOST_MAINTENANCE_POLICY_RESTART_IN_PLACE = 2 @@ -6347,6 +6380,7 @@ class CommitmentPlan(proto.Enum): COMMITMENT_3_YEAR (3): 3 years commitment. """ + COMMITMENT_PLAN_UNSPECIFIED = 0 ON_DEMAND = 1 COMMITMENT_1_YEAR = 2 @@ -6473,12 +6507,12 @@ class DataPoint(proto.Message): number=2, ) - data_points: MutableSequence[ - "ReportSummary.ChartData.DataPoint" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ReportSummary.ChartData.DataPoint", + data_points: MutableSequence["ReportSummary.ChartData.DataPoint"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ReportSummary.ChartData.DataPoint", + ) ) class UtilizationChartData(proto.Message): @@ -6544,12 +6578,12 @@ class Bucket(proto.Message): number=3, ) - buckets: MutableSequence[ - "ReportSummary.HistogramChartData.Bucket" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ReportSummary.HistogramChartData.Bucket", + buckets: MutableSequence["ReportSummary.HistogramChartData.Bucket"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ReportSummary.HistogramChartData.Bucket", + ) ) class AssetAggregateStats(proto.Message): @@ -6687,12 +6721,12 @@ class ComputeEngineFinding(proto.Message): number=3, message="ReportSummary.MachineSeriesAllocation", ) - allocated_disk_types: MutableSequence[ - "PersistentDiskType" - ] = proto.RepeatedField( - proto.ENUM, - number=4, - enum="PersistentDiskType", + allocated_disk_types: MutableSequence["PersistentDiskType"] = ( + proto.RepeatedField( + proto.ENUM, + number=4, + enum="PersistentDiskType", + ) ) class VmwareEngineFinding(proto.Message): @@ -6717,12 +6751,12 @@ class VmwareEngineFinding(proto.Message): proto.INT64, number=2, ) - node_allocations: MutableSequence[ - "ReportSummary.VmwareNodeAllocation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="ReportSummary.VmwareNodeAllocation", + node_allocations: MutableSequence["ReportSummary.VmwareNodeAllocation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="ReportSummary.VmwareNodeAllocation", + ) ) class VmwareNodeAllocation(proto.Message): @@ -6789,12 +6823,12 @@ class SoleTenantFinding(proto.Message): proto.INT64, number=2, ) - node_allocations: MutableSequence[ - "ReportSummary.SoleTenantNodeAllocation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="ReportSummary.SoleTenantNodeAllocation", + node_allocations: MutableSequence["ReportSummary.SoleTenantNodeAllocation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="ReportSummary.SoleTenantNodeAllocation", + ) ) class SoleTenantNodeAllocation(proto.Message): diff --git a/packages/google-cloud-migrationcenter/noxfile.py b/packages/google-cloud-migrationcenter/noxfile.py index 3a365595eb5b..c42ea141c0d7 100644 --- a/packages/google-cloud-migrationcenter/noxfile.py +++ b/packages/google-cloud-migrationcenter/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-migrationcenter/tests/unit/gapic/migrationcenter_v1/test_migration_center.py b/packages/google-cloud-migrationcenter/tests/unit/gapic/migrationcenter_v1/test_migration_center.py index 94849646a731..2593adc27416 100644 --- a/packages/google-cloud-migrationcenter/tests/unit/gapic/migrationcenter_v1/test_migration_center.py +++ b/packages/google-cloud-migrationcenter/tests/unit/gapic/migrationcenter_v1/test_migration_center.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.money_pb2 as money_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +60,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore -from google.type import money_pb2 # type: ignore from google.cloud.migrationcenter_v1.services.migration_center import ( MigrationCenterAsyncClient, @@ -985,10 +985,9 @@ def test_migration_center_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1032,9 @@ def test_migration_center_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1072,10 +1070,9 @@ def test_migration_center_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1318,13 +1315,13 @@ def test_migration_center_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2631,9 +2628,9 @@ def test_batch_update_assets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_assets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_assets] = ( + mock_rpc + ) request = {} client.batch_update_assets(request) @@ -3314,9 +3311,9 @@ def test_batch_delete_assets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_assets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_assets] = ( + mock_rpc + ) request = {} client.batch_delete_assets(request) @@ -3656,9 +3653,9 @@ def test_report_asset_frames_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_asset_frames - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_asset_frames] = ( + mock_rpc + ) request = {} client.report_asset_frames(request) @@ -4161,9 +4158,9 @@ def test_create_import_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_import_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_import_job] = ( + mock_rpc + ) request = {} client.create_import_job(request) @@ -4531,9 +4528,9 @@ def test_list_import_jobs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_import_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_import_jobs] = ( + mock_rpc + ) request = {} client.list_import_jobs(request) @@ -5396,9 +5393,9 @@ def test_delete_import_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_import_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_import_job] = ( + mock_rpc + ) request = {} client.delete_import_job(request) @@ -5739,9 +5736,9 @@ def test_update_import_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_import_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_import_job] = ( + mock_rpc + ) request = {} client.update_import_job(request) @@ -6096,9 +6093,9 @@ def test_validate_import_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.validate_import_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.validate_import_job] = ( + mock_rpc + ) request = {} client.validate_import_job(request) @@ -6783,9 +6780,9 @@ def test_get_import_data_file_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_import_data_file - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_import_data_file] = ( + mock_rpc + ) request = {} client.get_import_data_file(request) @@ -7143,9 +7140,9 @@ def test_list_import_data_files_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_import_data_files - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_import_data_files] = ( + mock_rpc + ) request = {} client.list_import_data_files(request) @@ -10281,9 +10278,9 @@ def test_add_assets_to_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_assets_to_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_assets_to_group] = ( + mock_rpc + ) request = {} client.add_assets_to_group(request) @@ -10981,9 +10978,9 @@ def test_list_error_frames_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_error_frames - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_error_frames] = ( + mock_rpc + ) request = {} client.list_error_frames(request) @@ -13752,9 +13749,9 @@ def test_list_preference_sets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_preference_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_preference_sets] = ( + mock_rpc + ) request = {} client.list_preference_sets(request) @@ -14302,9 +14299,9 @@ def test_get_preference_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_preference_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_preference_set] = ( + mock_rpc + ) request = {} client.get_preference_set(request) @@ -14650,9 +14647,9 @@ def test_create_preference_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_preference_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_preference_set] = ( + mock_rpc + ) request = {} client.create_preference_set(request) @@ -15017,9 +15014,9 @@ def test_update_preference_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_preference_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_preference_set] = ( + mock_rpc + ) request = {} client.update_preference_set(request) @@ -15376,9 +15373,9 @@ def test_delete_preference_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_preference_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_preference_set] = ( + mock_rpc + ) request = {} client.delete_preference_set(request) @@ -16390,9 +16387,9 @@ def test_create_report_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_report_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_report_config] = ( + mock_rpc + ) request = {} client.create_report_config(request) @@ -16761,9 +16758,9 @@ def test_get_report_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_report_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_report_config] = ( + mock_rpc + ) request = {} client.get_report_config(request) @@ -17114,9 +17111,9 @@ def test_list_report_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_report_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_report_configs] = ( + mock_rpc + ) request = {} client.list_report_configs(request) @@ -17659,9 +17656,9 @@ def test_delete_report_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_report_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_report_config] = ( + mock_rpc + ) request = {} client.delete_report_config(request) @@ -20120,9 +20117,9 @@ def test_batch_update_assets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_update_assets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_update_assets] = ( + mock_rpc + ) request = {} client.batch_update_assets(request) @@ -20495,9 +20492,9 @@ def test_batch_delete_assets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_delete_assets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_delete_assets] = ( + mock_rpc + ) request = {} client.batch_delete_assets(request) @@ -20687,9 +20684,9 @@ def test_report_asset_frames_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_asset_frames - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_asset_frames] = ( + mock_rpc + ) request = {} client.report_asset_frames(request) @@ -20961,9 +20958,9 @@ def test_create_import_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_import_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_import_job] = ( + mock_rpc + ) request = {} client.create_import_job(request) @@ -21178,9 +21175,9 @@ def test_list_import_jobs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_import_jobs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_import_jobs] = ( + mock_rpc + ) request = {} client.list_import_jobs(request) @@ -21622,9 +21619,9 @@ def test_delete_import_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_import_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_import_job] = ( + mock_rpc + ) request = {} client.delete_import_job(request) @@ -21817,9 +21814,9 @@ def test_update_import_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_import_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_import_job] = ( + mock_rpc + ) request = {} client.update_import_job(request) @@ -22020,9 +22017,9 @@ def test_validate_import_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.validate_import_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.validate_import_job] = ( + mock_rpc + ) request = {} client.validate_import_job(request) @@ -22384,9 +22381,9 @@ def test_get_import_data_file_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_import_data_file - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_import_data_file] = ( + mock_rpc + ) request = {} client.get_import_data_file(request) @@ -22569,9 +22566,9 @@ def test_list_import_data_files_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_import_data_files - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_import_data_files] = ( + mock_rpc + ) request = {} client.list_import_data_files(request) @@ -24270,9 +24267,9 @@ def test_add_assets_to_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.add_assets_to_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.add_assets_to_group] = ( + mock_rpc + ) request = {} client.add_assets_to_group(request) @@ -24649,9 +24646,9 @@ def test_list_error_frames_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_error_frames - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_error_frames] = ( + mock_rpc + ) request = {} client.list_error_frames(request) @@ -26121,9 +26118,9 @@ def test_list_preference_sets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_preference_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_preference_sets] = ( + mock_rpc + ) request = {} client.list_preference_sets(request) @@ -26383,9 +26380,9 @@ def test_get_preference_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_preference_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_preference_set] = ( + mock_rpc + ) request = {} client.get_preference_set(request) @@ -26568,9 +26565,9 @@ def test_create_preference_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_preference_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_preference_set] = ( + mock_rpc + ) request = {} client.create_preference_set(request) @@ -26789,9 +26786,9 @@ def test_update_preference_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_preference_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_preference_set] = ( + mock_rpc + ) request = {} client.update_preference_set(request) @@ -26993,9 +26990,9 @@ def test_delete_preference_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_preference_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_preference_set] = ( + mock_rpc + ) request = {} client.delete_preference_set(request) @@ -27552,9 +27549,9 @@ def test_create_report_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_report_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_report_config] = ( + mock_rpc + ) request = {} client.create_report_config(request) @@ -27770,9 +27767,9 @@ def test_get_report_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_report_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_report_config] = ( + mock_rpc + ) request = {} client.get_report_config(request) @@ -27954,9 +27951,9 @@ def test_list_report_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_report_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_report_configs] = ( + mock_rpc + ) request = {} client.list_report_configs(request) @@ -28218,9 +28215,9 @@ def test_delete_report_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_report_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_report_config] = ( + mock_rpc + ) request = {} client.delete_report_config(request) @@ -31752,8 +31749,9 @@ def test_list_assets_rest_bad_request(request_type=migrationcenter.ListAssetsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31818,17 +31816,19 @@ def test_list_assets_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_list_assets" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_list_assets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_list_assets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_assets" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_assets_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_list_assets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31881,8 +31881,9 @@ def test_get_asset_rest_bad_request(request_type=migrationcenter.GetAssetRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31949,17 +31950,19 @@ def test_get_asset_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_get_asset" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_get_asset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_get_asset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_asset" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_asset_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_get_asset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32012,8 +32015,9 @@ def test_update_asset_rest_bad_request(request_type=migrationcenter.UpdateAssetR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32415,17 +32419,19 @@ def test_update_asset_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_update_asset" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_update_asset_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_update_asset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_update_asset" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_update_asset_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_update_asset" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32478,8 +32484,9 @@ def test_batch_update_assets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32539,18 +32546,20 @@ def test_batch_update_assets_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_batch_update_assets" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_batch_update_assets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_batch_update_assets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_batch_update_assets" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_batch_update_assets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_batch_update_assets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32606,8 +32615,9 @@ def test_delete_asset_rest_bad_request(request_type=migrationcenter.DeleteAssetR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32664,13 +32674,13 @@ def test_delete_asset_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "pre_delete_asset" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_delete_asset" + ) as pre, + ): pre.assert_not_called() pb_message = migrationcenter.DeleteAssetRequest.pb( migrationcenter.DeleteAssetRequest() @@ -32715,8 +32725,9 @@ def test_batch_delete_assets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32773,13 +32784,13 @@ def test_batch_delete_assets_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "pre_batch_delete_assets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_batch_delete_assets" + ) as pre, + ): pre.assert_not_called() pb_message = migrationcenter.BatchDeleteAssetsRequest.pb( migrationcenter.BatchDeleteAssetsRequest() @@ -32824,8 +32835,9 @@ def test_report_asset_frames_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33185,18 +33197,20 @@ def test_report_asset_frames_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_report_asset_frames" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_report_asset_frames_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_report_asset_frames" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_report_asset_frames" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_report_asset_frames_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_report_asset_frames" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33254,8 +33268,9 @@ def test_aggregate_assets_values_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33315,18 +33330,20 @@ def test_aggregate_assets_values_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_aggregate_assets_values" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_aggregate_assets_values_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_aggregate_assets_values" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_aggregate_assets_values" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_aggregate_assets_values_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_aggregate_assets_values" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33384,8 +33401,9 @@ def test_create_import_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33544,20 +33562,21 @@ def test_create_import_job_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_create_import_job" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_create_import_job_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_create_import_job" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_create_import_job" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_create_import_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_create_import_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33610,8 +33629,9 @@ def test_list_import_jobs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33676,17 +33696,20 @@ def test_list_import_jobs_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_list_import_jobs" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_list_import_jobs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_list_import_jobs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_import_jobs" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_list_import_jobs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_list_import_jobs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33744,8 +33767,9 @@ def test_get_import_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33817,17 +33841,20 @@ def test_get_import_job_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_get_import_job" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_get_import_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_get_import_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_import_job" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_get_import_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_get_import_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33880,8 +33907,9 @@ def test_delete_import_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33938,20 +33966,21 @@ def test_delete_import_job_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_delete_import_job" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_delete_import_job_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_delete_import_job" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_delete_import_job" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_delete_import_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_delete_import_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34006,8 +34035,9 @@ def test_update_import_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34168,20 +34198,21 @@ def test_update_import_job_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_update_import_job" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_update_import_job_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_update_import_job" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_update_import_job" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_update_import_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_update_import_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34234,8 +34265,9 @@ def test_validate_import_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34292,20 +34324,21 @@ def test_validate_import_job_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_validate_import_job" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_validate_import_job_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_validate_import_job" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_validate_import_job" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_validate_import_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_validate_import_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34358,8 +34391,9 @@ def test_run_import_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34416,19 +34450,21 @@ def test_run_import_job_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_run_import_job" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_run_import_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_run_import_job" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_run_import_job" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_run_import_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_run_import_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34483,8 +34519,9 @@ def test_get_import_data_file_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34558,18 +34595,20 @@ def test_get_import_data_file_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_get_import_data_file" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_get_import_data_file_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_get_import_data_file" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_import_data_file" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_get_import_data_file_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_get_import_data_file" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34624,8 +34663,9 @@ def test_list_import_data_files_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34690,18 +34730,20 @@ def test_list_import_data_files_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_list_import_data_files" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_list_import_data_files_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_list_import_data_files" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_import_data_files" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_list_import_data_files_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_list_import_data_files" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34759,8 +34801,9 @@ def test_create_import_data_file_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34898,20 +34941,21 @@ def test_create_import_data_file_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_create_import_data_file" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_create_import_data_file_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_create_import_data_file" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_create_import_data_file" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_create_import_data_file_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_create_import_data_file" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34966,8 +35010,9 @@ def test_delete_import_data_file_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35026,20 +35071,21 @@ def test_delete_import_data_file_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_delete_import_data_file" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_delete_import_data_file_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_delete_import_data_file" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_delete_import_data_file" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_delete_import_data_file_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_delete_import_data_file" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35090,8 +35136,9 @@ def test_list_groups_rest_bad_request(request_type=migrationcenter.ListGroupsReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35156,17 +35203,19 @@ def test_list_groups_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_list_groups" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_list_groups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_list_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_groups" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_groups_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_list_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35219,8 +35268,9 @@ def test_get_group_rest_bad_request(request_type=migrationcenter.GetGroupRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35287,17 +35337,19 @@ def test_get_group_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_get_group" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_get_group_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_get_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_group" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_group_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_get_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35348,8 +35400,9 @@ def test_create_group_rest_bad_request(request_type=migrationcenter.CreateGroupR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35481,19 +35534,20 @@ def test_create_group_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_create_group" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_create_group_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_create_group" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_create_group" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_create_group_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_create_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35546,8 +35600,9 @@ def test_update_group_rest_bad_request(request_type=migrationcenter.UpdateGroupR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35681,19 +35736,20 @@ def test_update_group_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_update_group" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_update_group_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_update_group" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_update_group" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_update_group_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_update_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35744,8 +35800,9 @@ def test_delete_group_rest_bad_request(request_type=migrationcenter.DeleteGroupR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35802,19 +35859,20 @@ def test_delete_group_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_delete_group" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_delete_group_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_delete_group" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_delete_group" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_delete_group_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_delete_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35867,8 +35925,9 @@ def test_add_assets_to_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35925,20 +35984,21 @@ def test_add_assets_to_group_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_add_assets_to_group" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_add_assets_to_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_add_assets_to_group" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_add_assets_to_group" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_add_assets_to_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_add_assets_to_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35991,8 +36051,9 @@ def test_remove_assets_from_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36049,20 +36110,21 @@ def test_remove_assets_from_group_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_remove_assets_from_group" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_remove_assets_from_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_remove_assets_from_group" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_remove_assets_from_group" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_remove_assets_from_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_remove_assets_from_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36115,8 +36177,9 @@ def test_list_error_frames_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36181,18 +36244,20 @@ def test_list_error_frames_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_list_error_frames" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_list_error_frames_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_list_error_frames" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_error_frames" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_list_error_frames_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_list_error_frames" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36252,8 +36317,9 @@ def test_get_error_frame_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36318,17 +36384,20 @@ def test_get_error_frame_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_get_error_frame" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_get_error_frame_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_get_error_frame" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_error_frame" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_get_error_frame_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_get_error_frame" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36379,8 +36448,9 @@ def test_list_sources_rest_bad_request(request_type=migrationcenter.ListSourcesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36445,17 +36515,19 @@ def test_list_sources_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_list_sources" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_list_sources_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_list_sources" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_sources" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_sources_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_list_sources" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36511,8 +36583,9 @@ def test_get_source_rest_bad_request(request_type=migrationcenter.GetSourceReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36591,17 +36664,19 @@ def test_get_source_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_get_source" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_get_source_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_get_source" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_source" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_source_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_get_source" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36654,8 +36729,9 @@ def test_create_source_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36792,19 +36868,21 @@ def test_create_source_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_create_source" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_create_source_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_create_source" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_create_source" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_create_source_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_create_source" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36859,8 +36937,9 @@ def test_update_source_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36999,19 +37078,21 @@ def test_update_source_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_update_source" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_update_source_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_update_source" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_update_source" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_update_source_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_update_source" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37064,8 +37145,9 @@ def test_delete_source_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37122,19 +37204,21 @@ def test_delete_source_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_delete_source" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_delete_source_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_delete_source" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_delete_source" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_delete_source_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_delete_source" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37187,8 +37271,9 @@ def test_list_preference_sets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37253,18 +37338,20 @@ def test_list_preference_sets_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_list_preference_sets" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_list_preference_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_list_preference_sets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_preference_sets" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_list_preference_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_list_preference_sets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37322,8 +37409,9 @@ def test_get_preference_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37390,18 +37478,20 @@ def test_get_preference_set_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_get_preference_set" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_get_preference_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_get_preference_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_preference_set" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_get_preference_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_get_preference_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37456,8 +37546,9 @@ def test_create_preference_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37619,20 +37710,21 @@ def test_create_preference_set_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_create_preference_set" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_create_preference_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_create_preference_set" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_create_preference_set" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_create_preference_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_create_preference_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37689,8 +37781,9 @@ def test_update_preference_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37856,20 +37949,21 @@ def test_update_preference_set_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_update_preference_set" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_update_preference_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_update_preference_set" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_update_preference_set" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_update_preference_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_update_preference_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37922,8 +38016,9 @@ def test_delete_preference_set_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37980,20 +38075,21 @@ def test_delete_preference_set_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_delete_preference_set" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_delete_preference_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_delete_preference_set" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_delete_preference_set" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_delete_preference_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_delete_preference_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38044,8 +38140,9 @@ def test_get_settings_rest_bad_request(request_type=migrationcenter.GetSettingsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38110,17 +38207,19 @@ def test_get_settings_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_get_settings" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_get_settings_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_get_settings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_settings" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_settings_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_get_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38173,8 +38272,9 @@ def test_update_settings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38302,19 +38402,21 @@ def test_update_settings_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_update_settings" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_update_settings_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_update_settings" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_update_settings" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_update_settings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_update_settings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38367,8 +38469,9 @@ def test_create_report_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38502,20 +38605,21 @@ def test_create_report_config_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_create_report_config" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_create_report_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_create_report_config" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_create_report_config" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_create_report_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_create_report_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38568,8 +38672,9 @@ def test_get_report_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38636,18 +38741,20 @@ def test_get_report_config_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_get_report_config" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_get_report_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_get_report_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_report_config" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_get_report_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_get_report_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38702,8 +38809,9 @@ def test_list_report_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38768,18 +38876,20 @@ def test_list_report_configs_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_list_report_configs" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_list_report_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_list_report_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_report_configs" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_list_report_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_list_report_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38837,8 +38947,9 @@ def test_delete_report_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38895,20 +39006,21 @@ def test_delete_report_config_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_delete_report_config" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, - "post_delete_report_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_delete_report_config" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_delete_report_config" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_delete_report_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_delete_report_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38963,8 +39075,9 @@ def test_create_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39216,19 +39329,21 @@ def test_create_report_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_create_report" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_create_report_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_create_report" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_create_report" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_create_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_create_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39281,8 +39396,9 @@ def test_get_report_rest_bad_request(request_type=migrationcenter.GetReportReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39355,17 +39471,19 @@ def test_get_report_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_get_report" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_get_report_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_get_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_report" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_get_report_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_get_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39418,8 +39536,9 @@ def test_list_reports_rest_bad_request(request_type=migrationcenter.ListReportsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39486,17 +39605,19 @@ def test_list_reports_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_list_reports" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_list_reports_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_list_reports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_reports" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "post_list_reports_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_list_reports" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39556,8 +39677,9 @@ def test_delete_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39616,19 +39738,21 @@ def test_delete_report_rest_interceptors(null_interceptor): ) client = MigrationCenterClient(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.MigrationCenterRestInterceptor, "post_delete_report" - ) as post, mock.patch.object( - transports.MigrationCenterRestInterceptor, "post_delete_report_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.MigrationCenterRestInterceptor, "pre_delete_report" - ) as pre: + 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.MigrationCenterRestInterceptor, "post_delete_report" + ) as post, + mock.patch.object( + transports.MigrationCenterRestInterceptor, + "post_delete_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MigrationCenterRestInterceptor, "pre_delete_report" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39681,8 +39805,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39741,8 +39866,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39803,8 +39929,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39865,8 +39992,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39927,8 +40055,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39989,8 +40118,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -41181,11 +41311,14 @@ def test_migration_center_base_transport(): def test_migration_center_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.migrationcenter_v1.services.migration_center.transports.MigrationCenterTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.migrationcenter_v1.services.migration_center.transports.MigrationCenterTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MigrationCenterTransport( @@ -41202,9 +41335,12 @@ def test_migration_center_base_transport_with_credentials_file(): def test_migration_center_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.migrationcenter_v1.services.migration_center.transports.MigrationCenterTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.migrationcenter_v1.services.migration_center.transports.MigrationCenterTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MigrationCenterTransport() @@ -41276,11 +41412,12 @@ def test_migration_center_transport_auth_gdch_credentials(transport_class): def test_migration_center_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-modelarmor/docs/conf.py b/packages/google-cloud-modelarmor/docs/conf.py index f29698adbd35..3f8e0e240fc6 100644 --- a/packages/google-cloud-modelarmor/docs/conf.py +++ b/packages/google-cloud-modelarmor/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-modelarmor documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/__init__.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/__init__.py index c38da87560c1..fa8aaea80109 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/__init__.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.model_armor import ModelArmorAsyncClient, ModelArmorClient from .types.service import ( AiPlatformFloorSetting, diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/async_client.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/async_client.py index df279d3d00cb..d2794dc64699 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/async_client.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.modelarmor_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.modelarmor_v1.services.model_armor import pagers from google.cloud.modelarmor_v1.types import service @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ModelArmorAsyncClient: The constructed client. """ - return ModelArmorClient.from_service_account_info.__func__(ModelArmorAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ModelArmorClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ModelArmorAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ModelArmorAsyncClient: The constructed client. """ - return ModelArmorClient.from_service_account_file.__func__(ModelArmorAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ModelArmorClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ModelArmorAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/client.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/client.py index e3c31d4f0344..f8bd751af526 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/client.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.modelarmor_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.modelarmor_v1.services.model_armor import pagers from google.cloud.modelarmor_v1.types import service @@ -642,11 +642,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ModelArmorClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ModelArmorClient._read_environment_variables() + ) self._client_cert_source = ModelArmorClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -681,8 +679,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ModelArmorTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/pagers.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/pagers.py index 6dbc4e28750a..83fe67ca1d4b 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/pagers.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/base.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/base.py index 1c61aeec9395..168237284cdc 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/base.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.modelarmor_v1 import gapic_version as package_version from google.cloud.modelarmor_v1.types import service diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/grpc.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/grpc.py index 2cba673e06be..627b3c2221db 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/grpc.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.modelarmor_v1.types import service diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/grpc_asyncio.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/grpc_asyncio.py index 11dc0894825d..d086c6a071d9 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/grpc_asyncio.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.modelarmor_v1.types import service diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/rest.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/rest.py index f3cbb1de27b2..482f4edc1f11 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/rest.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -898,7 +898,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1434,9 +1434,7 @@ def __call__( Sanitized Model Response Response. """ - http_options = ( - _BaseModelArmorRestTransport._BaseSanitizeModelResponse._get_http_options() - ) + http_options = _BaseModelArmorRestTransport._BaseSanitizeModelResponse._get_http_options() request, metadata = self._interceptor.pre_sanitize_model_response( request, metadata diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/rest_base.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/rest_base.py index 0d491acf2df7..0345b3698344 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/rest_base.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/services/model_armor/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.modelarmor_v1.types import service diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/types/service.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/types/service.py index 0c7cb5e489f8..7275d07c4e59 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/types/service.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/types/service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -85,6 +85,7 @@ class FilterMatchState(proto.Enum): MATCH_FOUND (2): Matching criteria is achieved for the filter. """ + FILTER_MATCH_STATE_UNSPECIFIED = 0 NO_MATCH_FOUND = 1 MATCH_FOUND = 2 @@ -103,6 +104,7 @@ class FilterExecutionState(proto.Enum): Filter execution was skipped. This can happen due to server-side error or permission issue. """ + FILTER_EXECUTION_STATE_UNSPECIFIED = 0 EXECUTION_SUCCESS = 1 EXECUTION_SKIPPED = 2 @@ -123,6 +125,7 @@ class RaiFilterType(proto.Enum): DANGEROUS (17): Danger """ + RAI_FILTER_TYPE_UNSPECIFIED = 0 SEXUALLY_EXPLICIT = 2 HATE_SPEECH = 3 @@ -145,6 +148,7 @@ class DetectionConfidenceLevel(proto.Enum): HIGH (3): Low chance of false positives. """ + DETECTION_CONFIDENCE_LEVEL_UNSPECIFIED = 0 LOW_AND_ABOVE = 1 MEDIUM_AND_ABOVE = 2 @@ -171,6 +175,7 @@ class SdpFindingLikelihood(proto.Enum): Confidence level is high. Lowest chance of a false positive. """ + SDP_FINDING_LIKELIHOOD_UNSPECIFIED = 0 VERY_UNLIKELY = 1 UNLIKELY = 2 @@ -193,6 +198,7 @@ class InvocationResult(proto.Enum): FAILURE (3): All filters were skipped or failed. """ + INVOCATION_RESULT_UNSPECIFIED = 0 SUCCESS = 1 PARTIAL = 2 @@ -269,6 +275,7 @@ class EnforcementType(proto.Enum): block mode. Requests that trip Model Armor filters will be blocked. """ + ENFORCEMENT_TYPE_UNSPECIFIED = 0 INSPECT_ONLY = 1 INSPECT_AND_BLOCK = 2 @@ -397,6 +404,7 @@ class IntegratedService(proto.Enum): AI_PLATFORM (1): AI Platform. """ + INTEGRATED_SERVICE_UNSPECIFIED = 0 AI_PLATFORM = 1 @@ -855,6 +863,7 @@ class PiAndJailbreakFilterEnforcement(proto.Enum): DISABLED (2): Enabled """ + PI_AND_JAILBREAK_FILTER_ENFORCEMENT_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -892,6 +901,7 @@ class MaliciousUriFilterEnforcement(proto.Enum): DISABLED (2): Disabled """ + MALICIOUS_URI_FILTER_ENFORCEMENT_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -1011,6 +1021,7 @@ class SdpBasicConfigEnforcement(proto.Enum): DISABLED (2): Disabled """ + SDP_BASIC_CONFIG_ENFORCEMENT_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -1580,6 +1591,7 @@ class ByteItemType(proto.Enum): CSV (7): CSV """ + BYTE_ITEM_TYPE_UNSPECIFIED = 0 PLAINTEXT_UTF8 = 1 PDF = 2 @@ -1818,12 +1830,12 @@ class MaliciousUriMatchedItem(proto.Message): number=3, enum="FilterMatchState", ) - malicious_uri_matched_items: MutableSequence[ - MaliciousUriMatchedItem - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=MaliciousUriMatchedItem, + malicious_uri_matched_items: MutableSequence[MaliciousUriMatchedItem] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=MaliciousUriMatchedItem, + ) ) @@ -1871,6 +1883,7 @@ class ScannedContentType(proto.Enum): PDF Scanning for only PDF is supported. """ + SCANNED_CONTENT_TYPE_UNSPECIFIED = 0 UNKNOWN = 1 PLAINTEXT = 2 @@ -1939,6 +1952,7 @@ class ThreatType(proto.Enum): POTENTIALLY_UNWANTED_CONTENT (5): Potentially unwanted content. E.g. Adware. """ + THREAT_TYPE_UNSPECIFIED = 0 UNKNOWN = 1 VIRUS_OR_WORM = 2 @@ -2019,6 +2033,7 @@ class MessageType(proto.Enum): ERROR (3): Error message. """ + MESSAGE_TYPE_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/__init__.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/__init__.py index 578c7d1bad4b..7569e6d78783 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/__init__.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.model_armor import ModelArmorAsyncClient, ModelArmorClient from .types.service import ( AiPlatformFloorSetting, diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/async_client.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/async_client.py index 55d578ce0c9c..c6ff7017918c 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/async_client.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.modelarmor_v1beta import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.modelarmor_v1beta.services.model_armor import pagers from google.cloud.modelarmor_v1beta.types import service @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ModelArmorAsyncClient: The constructed client. """ - return ModelArmorClient.from_service_account_info.__func__(ModelArmorAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ModelArmorClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ModelArmorAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ModelArmorAsyncClient: The constructed client. """ - return ModelArmorClient.from_service_account_file.__func__(ModelArmorAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ModelArmorClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ModelArmorAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/client.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/client.py index 94afb30d4a74..475adf522e65 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/client.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.modelarmor_v1beta import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.modelarmor_v1beta.services.model_armor import pagers from google.cloud.modelarmor_v1beta.types import service @@ -642,11 +642,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ModelArmorClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ModelArmorClient._read_environment_variables() + ) self._client_cert_source = ModelArmorClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -681,8 +679,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ModelArmorTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/pagers.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/pagers.py index 2104abde3694..f75c286f8b8e 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/pagers.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/base.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/base.py index 0e79f106894f..e6601d1986d4 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/base.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.modelarmor_v1beta import gapic_version as package_version from google.cloud.modelarmor_v1beta.types import service diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/grpc.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/grpc.py index dcb0a59e1a6a..2e7e220be68f 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/grpc.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.modelarmor_v1beta.types import service diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/grpc_asyncio.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/grpc_asyncio.py index 2d7b492fba57..3be45418ccd2 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/grpc_asyncio.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.modelarmor_v1beta.types import service diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/rest.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/rest.py index 17084157d4a6..c7c6bf2c3948 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/rest.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -898,7 +898,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1434,9 +1434,7 @@ def __call__( Sanitized Model Response Response. """ - http_options = ( - _BaseModelArmorRestTransport._BaseSanitizeModelResponse._get_http_options() - ) + http_options = _BaseModelArmorRestTransport._BaseSanitizeModelResponse._get_http_options() request, metadata = self._interceptor.pre_sanitize_model_response( request, metadata diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/rest_base.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/rest_base.py index 4c650025d5af..57689b39a61e 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/rest_base.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/services/model_armor/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.modelarmor_v1beta.types import service diff --git a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/types/service.py b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/types/service.py index f35bbaaea3a5..7a62d26439c3 100644 --- a/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/types/service.py +++ b/packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/types/service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -85,6 +85,7 @@ class FilterMatchState(proto.Enum): MATCH_FOUND (2): Matching criteria is achieved for the filter. """ + FILTER_MATCH_STATE_UNSPECIFIED = 0 NO_MATCH_FOUND = 1 MATCH_FOUND = 2 @@ -103,6 +104,7 @@ class FilterExecutionState(proto.Enum): Filter execution was skipped. This can happen due to server-side error or permission issue. """ + FILTER_EXECUTION_STATE_UNSPECIFIED = 0 EXECUTION_SUCCESS = 1 EXECUTION_SKIPPED = 2 @@ -123,6 +125,7 @@ class RaiFilterType(proto.Enum): DANGEROUS (17): Danger """ + RAI_FILTER_TYPE_UNSPECIFIED = 0 SEXUALLY_EXPLICIT = 2 HATE_SPEECH = 3 @@ -145,6 +148,7 @@ class DetectionConfidenceLevel(proto.Enum): HIGH (3): Low chance of false positives. """ + DETECTION_CONFIDENCE_LEVEL_UNSPECIFIED = 0 LOW_AND_ABOVE = 1 MEDIUM_AND_ABOVE = 2 @@ -171,6 +175,7 @@ class SdpFindingLikelihood(proto.Enum): Confidence level is high. Lowest chance of a false positive. """ + SDP_FINDING_LIKELIHOOD_UNSPECIFIED = 0 VERY_UNLIKELY = 1 UNLIKELY = 2 @@ -193,6 +198,7 @@ class InvocationResult(proto.Enum): FAILURE (3): All filters were skipped or failed. """ + INVOCATION_RESULT_UNSPECIFIED = 0 SUCCESS = 1 PARTIAL = 2 @@ -269,6 +275,7 @@ class EnforcementType(proto.Enum): block mode. Requests that trip Model Armor filters will be blocked. """ + ENFORCEMENT_TYPE_UNSPECIFIED = 0 INSPECT_ONLY = 1 INSPECT_AND_BLOCK = 2 @@ -397,6 +404,7 @@ class IntegratedService(proto.Enum): AI_PLATFORM (1): AI Platform. """ + INTEGRATED_SERVICE_UNSPECIFIED = 0 AI_PLATFORM = 1 @@ -855,6 +863,7 @@ class PiAndJailbreakFilterEnforcement(proto.Enum): DISABLED (2): Enabled """ + PI_AND_JAILBREAK_FILTER_ENFORCEMENT_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -892,6 +901,7 @@ class MaliciousUriFilterEnforcement(proto.Enum): DISABLED (2): Disabled """ + MALICIOUS_URI_FILTER_ENFORCEMENT_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -1011,6 +1021,7 @@ class SdpBasicConfigEnforcement(proto.Enum): DISABLED (2): Disabled """ + SDP_BASIC_CONFIG_ENFORCEMENT_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -1580,6 +1591,7 @@ class ByteItemType(proto.Enum): CSV (7): CSV """ + BYTE_ITEM_TYPE_UNSPECIFIED = 0 PLAINTEXT_UTF8 = 1 PDF = 2 @@ -1818,12 +1830,12 @@ class MaliciousUriMatchedItem(proto.Message): number=3, enum="FilterMatchState", ) - malicious_uri_matched_items: MutableSequence[ - MaliciousUriMatchedItem - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message=MaliciousUriMatchedItem, + malicious_uri_matched_items: MutableSequence[MaliciousUriMatchedItem] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message=MaliciousUriMatchedItem, + ) ) @@ -1871,6 +1883,7 @@ class ScannedContentType(proto.Enum): PDF Scanning for only PDF is supported. """ + SCANNED_CONTENT_TYPE_UNSPECIFIED = 0 UNKNOWN = 1 PLAINTEXT = 2 @@ -1939,6 +1952,7 @@ class ThreatType(proto.Enum): POTENTIALLY_UNWANTED_CONTENT (5): Potentially unwanted content. E.g. Adware. """ + THREAT_TYPE_UNSPECIFIED = 0 UNKNOWN = 1 VIRUS_OR_WORM = 2 @@ -2019,6 +2033,7 @@ class MessageType(proto.Enum): ERROR (3): Error message. """ + MESSAGE_TYPE_UNSPECIFIED = 0 INFO = 1 WARNING = 2 diff --git a/packages/google-cloud-modelarmor/noxfile.py b/packages/google-cloud-modelarmor/noxfile.py index ea3d054d3dff..a041ad7bf1c1 100644 --- a/packages/google-cloud-modelarmor/noxfile.py +++ b/packages/google-cloud-modelarmor/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-modelarmor/tests/unit/gapic/modelarmor_v1/test_model_armor.py b/packages/google-cloud-modelarmor/tests/unit/gapic/modelarmor_v1/test_model_armor.py index 910c6e06f500..f571df36d338 100644 --- a/packages/google-cloud-modelarmor/tests/unit/gapic/modelarmor_v1/test_model_armor.py +++ b/packages/google-cloud-modelarmor/tests/unit/gapic/modelarmor_v1/test_model_armor.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.modelarmor_v1.services.model_armor import ( ModelArmorAsyncClient, @@ -921,10 +926,9 @@ def test_model_armor_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_model_armor_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_model_armor_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,13 +1242,13 @@ def test_model_armor_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3186,9 +3188,9 @@ def test_get_floor_setting_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_floor_setting - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_floor_setting] = ( + mock_rpc + ) request = {} client.get_floor_setting(request) @@ -3537,9 +3539,9 @@ def test_update_floor_setting_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_floor_setting - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_floor_setting] = ( + mock_rpc + ) request = {} client.update_floor_setting(request) @@ -3893,9 +3895,9 @@ def test_sanitize_user_prompt_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.sanitize_user_prompt - ] = mock_rpc + client._transport._wrapped_methods[client._transport.sanitize_user_prompt] = ( + mock_rpc + ) request = {} client.sanitize_user_prompt(request) @@ -5349,9 +5351,9 @@ def test_get_floor_setting_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_floor_setting - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_floor_setting] = ( + mock_rpc + ) request = {} client.get_floor_setting(request) @@ -5530,9 +5532,9 @@ def test_update_floor_setting_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_floor_setting - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_floor_setting] = ( + mock_rpc + ) request = {} client.update_floor_setting(request) @@ -5714,9 +5716,9 @@ def test_sanitize_user_prompt_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.sanitize_user_prompt - ] = mock_rpc + client._transport._wrapped_methods[client._transport.sanitize_user_prompt] = ( + mock_rpc + ) request = {} client.sanitize_user_prompt(request) @@ -6543,8 +6545,9 @@ def test_list_templates_rest_bad_request(request_type=service.ListTemplatesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6609,17 +6612,19 @@ def test_list_templates_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_list_templates" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_list_templates_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_list_templates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_list_templates" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_list_templates_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_list_templates" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6670,8 +6675,9 @@ def test_get_template_rest_bad_request(request_type=service.GetTemplateRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6734,17 +6740,19 @@ def test_get_template_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_get_template" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_get_template_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_get_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_get_template" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_get_template_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_get_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6793,8 +6801,9 @@ def test_create_template_rest_bad_request(request_type=service.CreateTemplateReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6958,17 +6967,19 @@ def test_create_template_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_create_template" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_create_template_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_create_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_create_template" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_create_template_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_create_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7019,8 +7030,9 @@ def test_update_template_rest_bad_request(request_type=service.UpdateTemplateReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7186,17 +7198,19 @@ def test_update_template_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_update_template" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_update_template_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_update_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_update_template" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_update_template_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_update_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7245,8 +7259,9 @@ def test_delete_template_rest_bad_request(request_type=service.DeleteTemplateReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7303,13 +7318,13 @@ def test_delete_template_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "pre_delete_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_delete_template" + ) as pre, + ): pre.assert_not_called() pb_message = service.DeleteTemplateRequest.pb(service.DeleteTemplateRequest()) transcode.return_value = { @@ -7352,8 +7367,9 @@ def test_get_floor_setting_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7422,17 +7438,19 @@ def test_get_floor_setting_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_get_floor_setting" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_get_floor_setting_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_get_floor_setting" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_get_floor_setting" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_get_floor_setting_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_get_floor_setting" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7485,8 +7503,9 @@ def test_update_floor_setting_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7656,17 +7675,20 @@ def test_update_floor_setting_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_update_floor_setting" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_update_floor_setting_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_update_floor_setting" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_update_floor_setting" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, + "post_update_floor_setting_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_update_floor_setting" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7719,8 +7741,9 @@ def test_sanitize_user_prompt_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7780,17 +7803,20 @@ def test_sanitize_user_prompt_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_sanitize_user_prompt" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_sanitize_user_prompt_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_sanitize_user_prompt" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_sanitize_user_prompt" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, + "post_sanitize_user_prompt_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_sanitize_user_prompt" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7845,8 +7871,9 @@ def test_sanitize_model_response_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7906,18 +7933,20 @@ def test_sanitize_model_response_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_sanitize_model_response" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, - "post_sanitize_model_response_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_sanitize_model_response" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_sanitize_model_response" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, + "post_sanitize_model_response_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_sanitize_model_response" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7975,8 +8004,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8035,8 +8065,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8342,11 +8373,14 @@ def test_model_armor_base_transport(): def test_model_armor_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.modelarmor_v1.services.model_armor.transports.ModelArmorTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.modelarmor_v1.services.model_armor.transports.ModelArmorTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelArmorTransport( @@ -8363,9 +8397,12 @@ def test_model_armor_base_transport_with_credentials_file(): def test_model_armor_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.modelarmor_v1.services.model_armor.transports.ModelArmorTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.modelarmor_v1.services.model_armor.transports.ModelArmorTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelArmorTransport() @@ -8437,11 +8474,12 @@ def test_model_armor_transport_auth_gdch_credentials(transport_class): def test_model_armor_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-modelarmor/tests/unit/gapic/modelarmor_v1beta/test_model_armor.py b/packages/google-cloud-modelarmor/tests/unit/gapic/modelarmor_v1beta/test_model_armor.py index 1672f0832a7b..7d5451e193c3 100644 --- a/packages/google-cloud-modelarmor/tests/unit/gapic/modelarmor_v1beta/test_model_armor.py +++ b/packages/google-cloud-modelarmor/tests/unit/gapic/modelarmor_v1beta/test_model_armor.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.modelarmor_v1beta.services.model_armor import ( ModelArmorAsyncClient, @@ -921,10 +926,9 @@ def test_model_armor_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -969,10 +973,9 @@ def test_model_armor_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1008,10 +1011,9 @@ def test_model_armor_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,13 +1242,13 @@ def test_model_armor_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3186,9 +3188,9 @@ def test_get_floor_setting_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_floor_setting - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_floor_setting] = ( + mock_rpc + ) request = {} client.get_floor_setting(request) @@ -3537,9 +3539,9 @@ def test_update_floor_setting_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_floor_setting - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_floor_setting] = ( + mock_rpc + ) request = {} client.update_floor_setting(request) @@ -3893,9 +3895,9 @@ def test_sanitize_user_prompt_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.sanitize_user_prompt - ] = mock_rpc + client._transport._wrapped_methods[client._transport.sanitize_user_prompt] = ( + mock_rpc + ) request = {} client.sanitize_user_prompt(request) @@ -5353,9 +5355,9 @@ def test_get_floor_setting_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_floor_setting - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_floor_setting] = ( + mock_rpc + ) request = {} client.get_floor_setting(request) @@ -5535,9 +5537,9 @@ def test_update_floor_setting_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_floor_setting - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_floor_setting] = ( + mock_rpc + ) request = {} client.update_floor_setting(request) @@ -5719,9 +5721,9 @@ def test_sanitize_user_prompt_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.sanitize_user_prompt - ] = mock_rpc + client._transport._wrapped_methods[client._transport.sanitize_user_prompt] = ( + mock_rpc + ) request = {} client.sanitize_user_prompt(request) @@ -6548,8 +6550,9 @@ def test_list_templates_rest_bad_request(request_type=service.ListTemplatesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6614,17 +6617,19 @@ def test_list_templates_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_list_templates" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_list_templates_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_list_templates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_list_templates" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_list_templates_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_list_templates" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6675,8 +6680,9 @@ def test_get_template_rest_bad_request(request_type=service.GetTemplateRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6739,17 +6745,19 @@ def test_get_template_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_get_template" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_get_template_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_get_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_get_template" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_get_template_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_get_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6798,8 +6806,9 @@ def test_create_template_rest_bad_request(request_type=service.CreateTemplateReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6963,17 +6972,19 @@ def test_create_template_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_create_template" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_create_template_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_create_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_create_template" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_create_template_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_create_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7024,8 +7035,9 @@ def test_update_template_rest_bad_request(request_type=service.UpdateTemplateReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7191,17 +7203,19 @@ def test_update_template_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_update_template" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_update_template_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_update_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_update_template" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_update_template_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_update_template" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7250,8 +7264,9 @@ def test_delete_template_rest_bad_request(request_type=service.DeleteTemplateReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7308,13 +7323,13 @@ def test_delete_template_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "pre_delete_template" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_delete_template" + ) as pre, + ): pre.assert_not_called() pb_message = service.DeleteTemplateRequest.pb(service.DeleteTemplateRequest()) transcode.return_value = { @@ -7357,8 +7372,9 @@ def test_get_floor_setting_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7427,17 +7443,19 @@ def test_get_floor_setting_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_get_floor_setting" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_get_floor_setting_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_get_floor_setting" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_get_floor_setting" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_get_floor_setting_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_get_floor_setting" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7490,8 +7508,9 @@ def test_update_floor_setting_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7661,17 +7680,20 @@ def test_update_floor_setting_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_update_floor_setting" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_update_floor_setting_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_update_floor_setting" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_update_floor_setting" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, + "post_update_floor_setting_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_update_floor_setting" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7724,8 +7746,9 @@ def test_sanitize_user_prompt_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7785,17 +7808,20 @@ def test_sanitize_user_prompt_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_sanitize_user_prompt" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, "post_sanitize_user_prompt_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_sanitize_user_prompt" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_sanitize_user_prompt" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, + "post_sanitize_user_prompt_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_sanitize_user_prompt" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7850,8 +7876,9 @@ def test_sanitize_model_response_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7911,18 +7938,20 @@ def test_sanitize_model_response_rest_interceptors(null_interceptor): ) client = ModelArmorClient(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.ModelArmorRestInterceptor, "post_sanitize_model_response" - ) as post, mock.patch.object( - transports.ModelArmorRestInterceptor, - "post_sanitize_model_response_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ModelArmorRestInterceptor, "pre_sanitize_model_response" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ModelArmorRestInterceptor, "post_sanitize_model_response" + ) as post, + mock.patch.object( + transports.ModelArmorRestInterceptor, + "post_sanitize_model_response_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ModelArmorRestInterceptor, "pre_sanitize_model_response" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7980,8 +8009,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8040,8 +8070,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8347,11 +8378,14 @@ def test_model_armor_base_transport(): def test_model_armor_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.modelarmor_v1beta.services.model_armor.transports.ModelArmorTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.modelarmor_v1beta.services.model_armor.transports.ModelArmorTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelArmorTransport( @@ -8368,9 +8402,12 @@ def test_model_armor_base_transport_with_credentials_file(): def test_model_armor_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.modelarmor_v1beta.services.model_armor.transports.ModelArmorTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.modelarmor_v1beta.services.model_armor.transports.ModelArmorTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ModelArmorTransport() @@ -8442,11 +8479,12 @@ def test_model_armor_transport_auth_gdch_credentials(transport_class): def test_model_armor_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-monitoring-dashboards/docs/conf.py b/packages/google-cloud-monitoring-dashboards/docs/conf.py index 249d108ffdac..4d2aeec21b53 100644 --- a/packages/google-cloud-monitoring-dashboards/docs/conf.py +++ b/packages/google-cloud-monitoring-dashboards/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-monitoring-dashboards documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/__init__.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/__init__.py index 0dbcea224cde..624de5b2e9cb 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/__init__.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dashboards_service import ( DashboardsServiceAsyncClient, DashboardsServiceClient, diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/async_client.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/async_client.py index 9411f3deac3e..fe3b2e0a025c 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/async_client.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_dashboard_v1 import gapic_version as package_version @@ -46,12 +46,12 @@ from google.cloud.monitoring_dashboard_v1.services.dashboards_service import pagers from google.cloud.monitoring_dashboard_v1.types import ( + dashboard, dashboard_filter, dashboards_service, layouts, ) from google.cloud.monitoring_dashboard_v1.types import dashboard as gmd_dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboard from .client import DashboardsServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DashboardsServiceTransport @@ -125,7 +125,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DashboardsServiceAsyncClient: The constructed client. """ - return DashboardsServiceClient.from_service_account_info.__func__(DashboardsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DashboardsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DashboardsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +142,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DashboardsServiceAsyncClient: The constructed client. """ - return DashboardsServiceClient.from_service_account_file.__func__(DashboardsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DashboardsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DashboardsServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/client.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/client.py index afd624c3aac7..3e7b05554219 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/client.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_dashboard_v1 import gapic_version as package_version @@ -63,12 +63,12 @@ from google.cloud.monitoring_dashboard_v1.services.dashboards_service import pagers from google.cloud.monitoring_dashboard_v1.types import ( + dashboard, dashboard_filter, dashboards_service, layouts, ) from google.cloud.monitoring_dashboard_v1.types import dashboard as gmd_dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboard from .transports.base import DEFAULT_CLIENT_INFO, DashboardsServiceTransport from .transports.grpc import DashboardsServiceGrpcTransport @@ -84,9 +84,7 @@ class DashboardsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DashboardsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DashboardsServiceTransport]] _transport_registry["grpc"] = DashboardsServiceGrpcTransport _transport_registry["grpc_asyncio"] = DashboardsServiceGrpcAsyncIOTransport _transport_registry["rest"] = DashboardsServiceRestTransport @@ -646,11 +644,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DashboardsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DashboardsServiceClient._read_environment_variables() + ) self._client_cert_source = DashboardsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -685,8 +681,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DashboardsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/pagers.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/pagers.py index 66e64b882f9a..4f3f98e73563 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/pagers.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/base.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/base.py index 331782df8766..25b47e6381ed 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/base.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/base.py @@ -17,19 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.monitoring_dashboard_v1 import gapic_version as package_version +from google.cloud.monitoring_dashboard_v1.types import dashboard, dashboards_service from google.cloud.monitoring_dashboard_v1.types import dashboard as gmd_dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboards_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/grpc.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/grpc.py index e270f778ee90..f39f50ea249c 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/grpc.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/grpc.py @@ -16,22 +16,21 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson +from google.cloud.monitoring_dashboard_v1.types import dashboard, dashboards_service from google.cloud.monitoring_dashboard_v1.types import dashboard as gmd_dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboards_service from .base import DEFAULT_CLIENT_INFO, DashboardsServiceTransport diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/grpc_asyncio.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/grpc_asyncio.py index 1ffff03ac625..d1989a6e57bf 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/grpc_asyncio.py @@ -17,24 +17,23 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.monitoring_dashboard_v1.types import dashboard, dashboards_service from google.cloud.monitoring_dashboard_v1.types import dashboard as gmd_dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboards_service from .base import DEFAULT_CLIENT_INFO, DashboardsServiceTransport from .grpc import DashboardsServiceGrpcTransport diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/rest.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/rest.py index 3cdc1c70ace5..efff8c4a9c42 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/rest.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/rest.py @@ -16,22 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.monitoring_dashboard_v1.types import dashboard, dashboards_service from google.cloud.monitoring_dashboard_v1.types import dashboard as gmd_dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboards_service from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDashboardsServiceRestTransport @@ -477,9 +476,7 @@ def __call__( """ - http_options = ( - _BaseDashboardsServiceRestTransport._BaseCreateDashboard._get_http_options() - ) + http_options = _BaseDashboardsServiceRestTransport._BaseCreateDashboard._get_http_options() request, metadata = self._interceptor.pre_create_dashboard( request, metadata @@ -625,9 +622,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDashboardsServiceRestTransport._BaseDeleteDashboard._get_http_options() - ) + http_options = _BaseDashboardsServiceRestTransport._BaseDeleteDashboard._get_http_options() request, metadata = self._interceptor.pre_delete_dashboard( request, metadata @@ -649,7 +644,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -741,9 +736,7 @@ def __call__( """ - http_options = ( - _BaseDashboardsServiceRestTransport._BaseGetDashboard._get_http_options() - ) + http_options = _BaseDashboardsServiceRestTransport._BaseGetDashboard._get_http_options() request, metadata = self._interceptor.pre_get_dashboard(request, metadata) transcoded_request = _BaseDashboardsServiceRestTransport._BaseGetDashboard._get_transcoded_request( @@ -886,9 +879,7 @@ def __call__( The ``ListDashboards`` request. """ - http_options = ( - _BaseDashboardsServiceRestTransport._BaseListDashboards._get_http_options() - ) + http_options = _BaseDashboardsServiceRestTransport._BaseListDashboards._get_http_options() request, metadata = self._interceptor.pre_list_dashboards(request, metadata) transcoded_request = _BaseDashboardsServiceRestTransport._BaseListDashboards._get_transcoded_request( @@ -1038,9 +1029,7 @@ def __call__( """ - http_options = ( - _BaseDashboardsServiceRestTransport._BaseUpdateDashboard._get_http_options() - ) + http_options = _BaseDashboardsServiceRestTransport._BaseUpdateDashboard._get_http_options() request, metadata = self._interceptor.pre_update_dashboard( request, metadata diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/rest_base.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/rest_base.py index ab668005857c..9a63d2303805 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/rest_base.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/services/dashboards_service/transports/rest_base.py @@ -17,13 +17,12 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.monitoring_dashboard_v1.types import dashboard, dashboards_service from google.cloud.monitoring_dashboard_v1.types import dashboard as gmd_dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboards_service from .base import DEFAULT_CLIENT_INFO, DashboardsServiceTransport diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/__init__.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/__init__.py index 8d165d4a3fca..ba7ab534dce1 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/__init__.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/__init__.py @@ -13,11 +13,23 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .alertchart import AlertChart -from .collapsible_group import CollapsibleGroup -from .common import Aggregation, PickTimeSeriesFilter, StatisticalTimeSeriesFilter -from .dashboard import Dashboard -from .dashboard_filter import DashboardFilter +from .alertchart import ( + AlertChart, +) +from .collapsible_group import ( + CollapsibleGroup, +) +from .common import ( + Aggregation, + PickTimeSeriesFilter, + StatisticalTimeSeriesFilter, +) +from .dashboard import ( + Dashboard, +) +from .dashboard_filter import ( + DashboardFilter, +) from .dashboards_service import ( CreateDashboardRequest, DeleteDashboardRequest, @@ -26,10 +38,21 @@ ListDashboardsResponse, UpdateDashboardRequest, ) -from .error_reporting_panel import ErrorReportingPanel -from .incident_list import IncidentList -from .layouts import ColumnLayout, GridLayout, MosaicLayout, RowLayout -from .logs_panel import LogsPanel +from .error_reporting_panel import ( + ErrorReportingPanel, +) +from .incident_list import ( + IncidentList, +) +from .layouts import ( + ColumnLayout, + GridLayout, + MosaicLayout, + RowLayout, +) +from .logs_panel import ( + LogsPanel, +) from .metrics import ( SparkChartType, Threshold, @@ -37,15 +60,34 @@ TimeSeriesFilterRatio, TimeSeriesQuery, ) -from .piechart import PieChart -from .scorecard import Scorecard -from .section_header import SectionHeader -from .single_view_group import SingleViewGroup -from .table import TimeSeriesTable -from .table_display_options import TableDisplayOptions -from .text import Text -from .widget import Widget -from .xychart import ChartOptions, XyChart +from .piechart import ( + PieChart, +) +from .scorecard import ( + Scorecard, +) +from .section_header import ( + SectionHeader, +) +from .single_view_group import ( + SingleViewGroup, +) +from .table import ( + TimeSeriesTable, +) +from .table_display_options import ( + TableDisplayOptions, +) +from .text import ( + Text, +) +from .widget import ( + Widget, +) +from .xychart import ( + ChartOptions, + XyChart, +) __all__ = ( "AlertChart", diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/common.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/common.py index 1f886b8d7938..a5e824fcccc6 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/common.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/common.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -295,6 +295,7 @@ class Aligner(proto.Enum): that the values for the metric will always be positive. The output is a ``GAUGE`` metric with ``value_type`` ``DOUBLE``. """ + ALIGN_NONE = 0 ALIGN_DELTA = 1 ALIGN_RATE = 2 @@ -410,6 +411,7 @@ class Reducer(proto.Enum): numeric and distribution type. The value of the output is ``DOUBLE``. """ + REDUCE_NONE = 0 REDUCE_MEAN = 1 REDUCE_MIN = 2 @@ -492,6 +494,7 @@ class Method(proto.Enum): METHOD_LATEST (5): Select the most recent value. """ + METHOD_UNSPECIFIED = 0 METHOD_MEAN = 1 METHOD_MAX = 2 @@ -511,6 +514,7 @@ class Direction(proto.Enum): BOTTOM (2): Pass the lowest ``num_time_series`` ranking inputs. """ + DIRECTION_UNSPECIFIED = 0 TOP = 1 BOTTOM = 2 @@ -563,6 +567,7 @@ class Method(proto.Enum): METHOD_CLUSTER_OUTLIER (1): Compute the outlier score of each stream. """ + METHOD_UNSPECIFIED = 0 METHOD_CLUSTER_OUTLIER = 1 diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/dashboard.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/dashboard.py index f47e9ed39cc0..bffd05e3146b 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/dashboard.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/dashboard.py @@ -120,12 +120,12 @@ class Dashboard(proto.Message): oneof="layout", message=layouts.ColumnLayout, ) - dashboard_filters: MutableSequence[ - dashboard_filter.DashboardFilter - ] = proto.RepeatedField( - proto.MESSAGE, - number=11, - message=dashboard_filter.DashboardFilter, + dashboard_filters: MutableSequence[dashboard_filter.DashboardFilter] = ( + proto.RepeatedField( + proto.MESSAGE, + number=11, + message=dashboard_filter.DashboardFilter, + ) ) labels: MutableMapping[str, str] = proto.MapField( proto.STRING, diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/dashboard_filter.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/dashboard_filter.py index 054465b7baf1..7cf9a407e0f5 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/dashboard_filter.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/dashboard_filter.py @@ -68,6 +68,7 @@ class FilterType(proto.Enum): GROUP (5): Filter on a group id """ + FILTER_TYPE_UNSPECIFIED = 0 RESOURCE_LABEL = 1 METRIC_LABEL = 2 diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/incident_list.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/incident_list.py index 42cee4d2b135..2c3be79373a6 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/incident_list.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/incident_list.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.api import monitored_resource_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -45,12 +45,12 @@ class IncidentList(proto.Message): policy name. For example, use ``alertPolicies/utilization``. """ - monitored_resources: MutableSequence[ - monitored_resource_pb2.MonitoredResource - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=monitored_resource_pb2.MonitoredResource, + monitored_resources: MutableSequence[monitored_resource_pb2.MonitoredResource] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=monitored_resource_pb2.MonitoredResource, + ) ) policy_names: MutableSequence[str] = proto.RepeatedField( proto.STRING, diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/metrics.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/metrics.py index 968735313a7e..f98b32947a5c 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/metrics.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/metrics.py @@ -47,6 +47,7 @@ class SparkChartType(proto.Enum): The sparkbar will be rendered as a small bar chart. """ + SPARK_CHART_TYPE_UNSPECIFIED = 0 SPARK_LINE = 1 SPARK_BAR = 2 @@ -324,6 +325,7 @@ class Color(proto.Enum): Crossing the threshold is "emergency" behavior. """ + COLOR_UNSPECIFIED = 0 YELLOW = 4 RED = 6 @@ -342,6 +344,7 @@ class Direction(proto.Enum): The threshold will be considered crossed if the actual value is below the threshold value. """ + DIRECTION_UNSPECIFIED = 0 ABOVE = 1 BELOW = 2 @@ -358,6 +361,7 @@ class TargetAxis(proto.Enum): Y2 (2): The y2_axis (the left axis of chart). """ + TARGET_AXIS_UNSPECIFIED = 0 Y1 = 1 Y2 = 2 diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/piechart.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/piechart.py index 0f378b3ac100..30f4b88382af 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/piechart.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/piechart.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_dashboard_v1.types import metrics @@ -57,6 +57,7 @@ class PieChartType(proto.Enum): Similar to PIE, but the DONUT type PieChart has a hole in the middle. """ + PIE_CHART_TYPE_UNSPECIFIED = 0 PIE = 1 DONUT = 2 diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/scorecard.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/scorecard.py index 250f95775ba3..50b8558ba540 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/scorecard.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/scorecard.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_dashboard_v1.types import metrics diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/table.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/table.py index 96568e0c481e..f0e76d2b052d 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/table.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/table.py @@ -17,13 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore +from google.cloud.monitoring_dashboard_v1.types import metrics from google.cloud.monitoring_dashboard_v1.types import ( table_display_options as gmd_table_display_options, ) -from google.cloud.monitoring_dashboard_v1.types import metrics __protobuf__ = proto.module( package="google.monitoring.dashboard.v1", @@ -57,6 +57,7 @@ class MetricVisualization(proto.Enum): BAR (2): Horizontal bar rendering """ + METRIC_VISUALIZATION_UNSPECIFIED = 0 NUMBER = 1 BAR = 2 diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/text.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/text.py index 90de024370e0..4f631a3df36f 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/text.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/text.py @@ -50,6 +50,7 @@ class Format(proto.Enum): RAW (2): The text contains no special formatting. """ + FORMAT_UNSPECIFIED = 0 MARKDOWN = 1 RAW = 2 @@ -96,6 +97,7 @@ class HorizontalAlignment(proto.Enum): H_RIGHT (3): Right-align """ + HORIZONTAL_ALIGNMENT_UNSPECIFIED = 0 H_LEFT = 1 H_CENTER = 2 @@ -115,6 +117,7 @@ class VerticalAlignment(proto.Enum): V_BOTTOM (3): Bottom-align """ + VERTICAL_ALIGNMENT_UNSPECIFIED = 0 V_TOP = 1 V_CENTER = 2 @@ -137,6 +140,7 @@ class PaddingSize(proto.Enum): P_EXTRA_LARGE (5): Extra large padding """ + PADDING_SIZE_UNSPECIFIED = 0 P_EXTRA_SMALL = 1 P_SMALL = 2 @@ -162,6 +166,7 @@ class FontSize(proto.Enum): FS_EXTRA_LARGE (5): Extra large font size """ + FONT_SIZE_UNSPECIFIED = 0 FS_EXTRA_SMALL = 1 FS_SMALL = 2 @@ -212,6 +217,7 @@ class PointerLocation(proto.Enum): Placed on the top of the left side of the widget """ + POINTER_LOCATION_UNSPECIFIED = 0 PL_TOP = 1 PL_RIGHT = 2 diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/widget.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/widget.py index 79e912a15fa6..2642e4655b4c 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/widget.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/widget.py @@ -17,9 +17,15 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import empty_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import proto # type: ignore +from google.cloud.monitoring_dashboard_v1.types import ( + alertchart, + piechart, + table, + xychart, +) from google.cloud.monitoring_dashboard_v1.types import ( collapsible_group as gmd_collapsible_group, ) @@ -37,11 +43,7 @@ from google.cloud.monitoring_dashboard_v1.types import ( single_view_group as gmd_single_view_group, ) -from google.cloud.monitoring_dashboard_v1.types import alertchart -from google.cloud.monitoring_dashboard_v1.types import piechart -from google.cloud.monitoring_dashboard_v1.types import table from google.cloud.monitoring_dashboard_v1.types import text as gmd_text -from google.cloud.monitoring_dashboard_v1.types import xychart __protobuf__ = proto.module( package="google.monitoring.dashboard.v1", diff --git a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/xychart.py b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/xychart.py index c8470488940e..eb0f999f5882 100644 --- a/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/xychart.py +++ b/packages/google-cloud-monitoring-dashboards/google/cloud/monitoring_dashboard_v1/types/xychart.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_dashboard_v1.types import metrics @@ -116,6 +116,7 @@ class PlotType(proto.Enum): type is not currently available in the Stackdriver Monitoring application. """ + PLOT_TYPE_UNSPECIFIED = 0 LINE = 1 STACKED_AREA = 2 @@ -134,6 +135,7 @@ class TargetAxis(proto.Enum): Y2 (2): The y2_axis (the left axis of chart). """ + TARGET_AXIS_UNSPECIFIED = 0 Y1 = 1 Y2 = 2 @@ -185,6 +187,7 @@ class Scale(proto.Enum): LOG10 (2): Logarithmic scale (base 10). """ + SCALE_UNSPECIFIED = 0 LINEAR = 1 LOG10 = 2 @@ -262,6 +265,7 @@ class Mode(proto.Enum): The chart displays statistics such as average, median, 95th percentile, and more. """ + MODE_UNSPECIFIED = 0 COLOR = 1 X_RAY = 2 diff --git a/packages/google-cloud-monitoring-dashboards/noxfile.py b/packages/google-cloud-monitoring-dashboards/noxfile.py index 205486f869ce..d070c49d27bf 100644 --- a/packages/google-cloud-monitoring-dashboards/noxfile.py +++ b/packages/google-cloud-monitoring-dashboards/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-monitoring-dashboards/tests/unit/gapic/monitoring_dashboard_v1/test_dashboards_service.py b/packages/google-cloud-monitoring-dashboards/tests/unit/gapic/monitoring_dashboard_v1/test_dashboards_service.py index bc8316f1ee2d..8e88800d6ac3 100644 --- a/packages/google-cloud-monitoring-dashboards/tests/unit/gapic/monitoring_dashboard_v1/test_dashboards_service.py +++ b/packages/google-cloud-monitoring-dashboards/tests/unit/gapic/monitoring_dashboard_v1/test_dashboards_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,19 +43,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import monitored_resource_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.interval_pb2 as interval_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import interval_pb2 # type: ignore from google.cloud.monitoring_dashboard_v1.services.dashboards_service import ( DashboardsServiceAsyncClient, @@ -67,8 +72,7 @@ alertchart, collapsible_group, common, -) -from google.cloud.monitoring_dashboard_v1.types import ( + dashboard, dashboard_filter, dashboards_service, error_reporting_panel, @@ -87,7 +91,6 @@ xychart, ) from google.cloud.monitoring_dashboard_v1.types import dashboard as gmd_dashboard -from google.cloud.monitoring_dashboard_v1.types import dashboard CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1007,10 +1010,9 @@ def test_dashboards_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1055,10 +1057,9 @@ def test_dashboards_service_client_get_mtls_endpoint_and_cert_source(client_clas client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1094,10 +1095,9 @@ def test_dashboards_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1345,13 +1345,13 @@ def test_dashboards_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1467,9 +1467,9 @@ def test_create_dashboard_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_dashboard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_dashboard] = ( + mock_rpc + ) request = {} client.create_dashboard(request) @@ -2651,9 +2651,9 @@ def test_delete_dashboard_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_dashboard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_dashboard] = ( + mock_rpc + ) request = {} client.delete_dashboard(request) @@ -2968,9 +2968,9 @@ def test_update_dashboard_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_dashboard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_dashboard] = ( + mock_rpc + ) request = {} client.update_dashboard(request) @@ -3150,9 +3150,9 @@ def test_create_dashboard_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_dashboard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_dashboard] = ( + mock_rpc + ) request = {} client.create_dashboard(request) @@ -3771,9 +3771,9 @@ def test_delete_dashboard_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_dashboard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_dashboard] = ( + mock_rpc + ) request = {} client.delete_dashboard(request) @@ -3944,9 +3944,9 @@ def test_update_dashboard_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_dashboard - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_dashboard] = ( + mock_rpc + ) request = {} client.update_dashboard(request) @@ -4423,8 +4423,9 @@ def test_create_dashboard_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4741,18 +4742,20 @@ def test_create_dashboard_rest_interceptors(null_interceptor): ) client = DashboardsServiceClient(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.DashboardsServiceRestInterceptor, "post_create_dashboard" - ) as post, mock.patch.object( - transports.DashboardsServiceRestInterceptor, - "post_create_dashboard_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DashboardsServiceRestInterceptor, "pre_create_dashboard" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, "post_create_dashboard" + ) as post, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, + "post_create_dashboard_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, "pre_create_dashboard" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4805,8 +4808,9 @@ def test_list_dashboards_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4869,18 +4873,20 @@ def test_list_dashboards_rest_interceptors(null_interceptor): ) client = DashboardsServiceClient(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.DashboardsServiceRestInterceptor, "post_list_dashboards" - ) as post, mock.patch.object( - transports.DashboardsServiceRestInterceptor, - "post_list_dashboards_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DashboardsServiceRestInterceptor, "pre_list_dashboards" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, "post_list_dashboards" + ) as post, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, + "post_list_dashboards_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, "pre_list_dashboards" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4938,8 +4944,9 @@ def test_get_dashboard_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5006,17 +5013,20 @@ def test_get_dashboard_rest_interceptors(null_interceptor): ) client = DashboardsServiceClient(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.DashboardsServiceRestInterceptor, "post_get_dashboard" - ) as post, mock.patch.object( - transports.DashboardsServiceRestInterceptor, "post_get_dashboard_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DashboardsServiceRestInterceptor, "pre_get_dashboard" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, "post_get_dashboard" + ) as post, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, + "post_get_dashboard_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, "pre_get_dashboard" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5069,8 +5079,9 @@ def test_delete_dashboard_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5127,13 +5138,13 @@ def test_delete_dashboard_rest_interceptors(null_interceptor): ) client = DashboardsServiceClient(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.DashboardsServiceRestInterceptor, "pre_delete_dashboard" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, "pre_delete_dashboard" + ) as pre, + ): pre.assert_not_called() pb_message = dashboards_service.DeleteDashboardRequest.pb( dashboards_service.DeleteDashboardRequest() @@ -5178,8 +5189,9 @@ def test_update_dashboard_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5496,18 +5508,20 @@ def test_update_dashboard_rest_interceptors(null_interceptor): ) client = DashboardsServiceClient(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.DashboardsServiceRestInterceptor, "post_update_dashboard" - ) as post, mock.patch.object( - transports.DashboardsServiceRestInterceptor, - "post_update_dashboard_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DashboardsServiceRestInterceptor, "pre_update_dashboard" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, "post_update_dashboard" + ) as post, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, + "post_update_dashboard_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DashboardsServiceRestInterceptor, "pre_update_dashboard" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5713,11 +5727,14 @@ def test_dashboards_service_base_transport(): def test_dashboards_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.monitoring_dashboard_v1.services.dashboards_service.transports.DashboardsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.monitoring_dashboard_v1.services.dashboards_service.transports.DashboardsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DashboardsServiceTransport( @@ -5739,9 +5756,12 @@ def test_dashboards_service_base_transport_with_credentials_file(): def test_dashboards_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.monitoring_dashboard_v1.services.dashboards_service.transports.DashboardsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.monitoring_dashboard_v1.services.dashboards_service.transports.DashboardsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DashboardsServiceTransport() @@ -5823,11 +5843,12 @@ def test_dashboards_service_transport_auth_gdch_credentials(transport_class): def test_dashboards_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-monitoring-metrics-scopes/docs/conf.py b/packages/google-cloud-monitoring-metrics-scopes/docs/conf.py index 35dbbc1e4420..6b4149e9534c 100644 --- a/packages/google-cloud-monitoring-metrics-scopes/docs/conf.py +++ b/packages/google-cloud-monitoring-metrics-scopes/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-monitoring-metrics-scopes documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/__init__.py b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/__init__.py index 18bb391492f9..422446729d8a 100644 --- a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/__init__.py +++ b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.metrics_scopes import MetricsScopesAsyncClient, MetricsScopesClient from .types.metrics_scope import MetricsScope, MonitoredProject from .types.metrics_scopes import ( diff --git a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/async_client.py b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/async_client.py index 8abdc74ad079..2ff29251b266 100644 --- a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/async_client.py +++ b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_metrics_scope_v1 import gapic_version as package_version @@ -45,10 +45,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope, metrics_scopes @@ -126,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetricsScopesAsyncClient: The constructed client. """ - return MetricsScopesClient.from_service_account_info.__func__(MetricsScopesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MetricsScopesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(MetricsScopesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetricsScopesAsyncClient: The constructed client. """ - return MetricsScopesClient.from_service_account_file.__func__(MetricsScopesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MetricsScopesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(MetricsScopesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/client.py b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/client.py index 8a8b0c5d2d9a..17a6f2962c8c 100644 --- a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/client.py +++ b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_metrics_scope_v1 import gapic_version as package_version @@ -62,10 +62,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope, metrics_scopes @@ -638,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetricsScopesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetricsScopesClient._read_environment_variables() + ) self._client_cert_source = MetricsScopesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetricsScopesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/base.py b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/base.py index 001803a9a841..38deee170026 100644 --- a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/base.py +++ b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_metrics_scope_v1 import gapic_version as package_version from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope, metrics_scopes diff --git a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc.py b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc.py index 736ddd80bdb0..93eb68985b64 100644 --- a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc.py +++ b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope, metrics_scopes @@ -392,12 +392,12 @@ def list_metrics_scopes_by_monitored_project( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_metrics_scopes_by_monitored_project" not in self._stubs: - self._stubs[ - "list_metrics_scopes_by_monitored_project" - ] = self._logged_channel.unary_unary( - "/google.monitoring.metricsscope.v1.MetricsScopes/ListMetricsScopesByMonitoredProject", - request_serializer=metrics_scopes.ListMetricsScopesByMonitoredProjectRequest.serialize, - response_deserializer=metrics_scopes.ListMetricsScopesByMonitoredProjectResponse.deserialize, + self._stubs["list_metrics_scopes_by_monitored_project"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.metricsscope.v1.MetricsScopes/ListMetricsScopesByMonitoredProject", + request_serializer=metrics_scopes.ListMetricsScopesByMonitoredProjectRequest.serialize, + response_deserializer=metrics_scopes.ListMetricsScopesByMonitoredProjectResponse.deserialize, + ) ) return self._stubs["list_metrics_scopes_by_monitored_project"] diff --git a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc_asyncio.py b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc_asyncio.py index 9974dcd68cba..be55121b7f7a 100644 --- a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc_asyncio.py +++ b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope, metrics_scopes @@ -402,12 +402,12 @@ def list_metrics_scopes_by_monitored_project( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_metrics_scopes_by_monitored_project" not in self._stubs: - self._stubs[ - "list_metrics_scopes_by_monitored_project" - ] = self._logged_channel.unary_unary( - "/google.monitoring.metricsscope.v1.MetricsScopes/ListMetricsScopesByMonitoredProject", - request_serializer=metrics_scopes.ListMetricsScopesByMonitoredProjectRequest.serialize, - response_deserializer=metrics_scopes.ListMetricsScopesByMonitoredProjectResponse.deserialize, + self._stubs["list_metrics_scopes_by_monitored_project"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.metricsscope.v1.MetricsScopes/ListMetricsScopesByMonitoredProject", + request_serializer=metrics_scopes.ListMetricsScopesByMonitoredProjectRequest.serialize, + response_deserializer=metrics_scopes.ListMetricsScopesByMonitoredProjectResponse.deserialize, + ) ) return self._stubs["list_metrics_scopes_by_monitored_project"] diff --git a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/__init__.py b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/__init__.py index 9fd518b815a8..e6f5fb37591e 100644 --- a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/__init__.py +++ b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .metrics_scope import MetricsScope, MonitoredProject +from .metrics_scope import ( + MetricsScope, + MonitoredProject, +) from .metrics_scopes import ( CreateMonitoredProjectRequest, DeleteMonitoredProjectRequest, diff --git a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/metrics_scope.py b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/metrics_scope.py index aed0df4b2aed..c4c45f1b0519 100644 --- a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/metrics_scope.py +++ b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/metrics_scope.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/metrics_scopes.py b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/metrics_scopes.py index caf46d6a8f7a..57cfb35feca8 100644 --- a/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/metrics_scopes.py +++ b/packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/metrics_scopes.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope @@ -160,6 +160,7 @@ class State(proto.Enum): CANCELLED (4): The batch processing was cancelled. """ + STATE_UNSPECIFIED = 0 CREATED = 1 RUNNING = 2 diff --git a/packages/google-cloud-monitoring-metrics-scopes/noxfile.py b/packages/google-cloud-monitoring-metrics-scopes/noxfile.py index 1b3c66b27d72..3895d2ffbe2d 100644 --- a/packages/google-cloud-monitoring-metrics-scopes/noxfile.py +++ b/packages/google-cloud-monitoring-metrics-scopes/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-monitoring-metrics-scopes/tests/unit/gapic/monitoring_metrics_scope_v1/test_metrics_scopes.py b/packages/google-cloud-monitoring-metrics-scopes/tests/unit/gapic/monitoring_metrics_scope_v1/test_metrics_scopes.py index 536c70d20c95..e3b4fd2bbb7b 100644 --- a/packages/google-cloud-monitoring-metrics-scopes/tests/unit/gapic/monitoring_metrics_scope_v1/test_metrics_scopes.py +++ b/packages/google-cloud-monitoring-metrics-scopes/tests/unit/gapic/monitoring_metrics_scope_v1/test_metrics_scopes.py @@ -26,12 +26,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -40,7 +40,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -49,17 +54,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.monitoring_metrics_scope_v1.services.metrics_scopes import ( MetricsScopesAsyncClient, @@ -934,10 +934,9 @@ def test_metrics_scopes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +981,9 @@ def test_metrics_scopes_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1019,9 @@ def test_metrics_scopes_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1265,13 +1262,13 @@ def test_metrics_scopes_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1387,9 +1384,9 @@ def test_get_metrics_scope_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metrics_scope - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metrics_scope] = ( + mock_rpc + ) request = {} client.get_metrics_scope(request) @@ -2915,11 +2912,14 @@ def test_metrics_scopes_base_transport(): def test_metrics_scopes_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.monitoring_metrics_scope_v1.services.metrics_scopes.transports.MetricsScopesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.monitoring_metrics_scope_v1.services.metrics_scopes.transports.MetricsScopesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetricsScopesTransport( @@ -2941,9 +2941,12 @@ def test_metrics_scopes_base_transport_with_credentials_file(): def test_metrics_scopes_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.monitoring_metrics_scope_v1.services.metrics_scopes.transports.MetricsScopesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.monitoring_metrics_scope_v1.services.metrics_scopes.transports.MetricsScopesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetricsScopesTransport() @@ -3024,11 +3027,12 @@ def test_metrics_scopes_transport_auth_gdch_credentials(transport_class): def test_metrics_scopes_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-monitoring/docs/conf.py b/packages/google-cloud-monitoring/docs/conf.py index c360bdd0bd2d..0f577cbffaee 100644 --- a/packages/google-cloud-monitoring/docs/conf.py +++ b/packages/google-cloud-monitoring/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-monitoring documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/__init__.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/__init__.py index c0f26a3031d9..8f7e8df64e39 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/__init__.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.alert_policy_service import ( AlertPolicyServiceAsyncClient, AlertPolicyServiceClient, diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/async_client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/async_client.py index fe0992d10c44..bfb595a22446 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/async_client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.monitoring_v3.services.alert_policy_service import pagers from google.cloud.monitoring_v3.types import alert, alert_service, mutation_record @@ -135,7 +135,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AlertPolicyServiceAsyncClient: The constructed client. """ - return AlertPolicyServiceClient.from_service_account_info.__func__(AlertPolicyServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AlertPolicyServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AlertPolicyServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -151,7 +152,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AlertPolicyServiceAsyncClient: The constructed client. """ - return AlertPolicyServiceClient.from_service_account_file.__func__(AlertPolicyServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AlertPolicyServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AlertPolicyServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -189,7 +191,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AlertPolicyServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AlertPolicyServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AlertPolicyServiceTransport: diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/client.py index 4f8f43afb8ab..8857695e0a62 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.monitoring_v3.services.alert_policy_service import pagers from google.cloud.monitoring_v3.types import alert, alert_service, mutation_record @@ -82,9 +82,7 @@ class AlertPolicyServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AlertPolicyServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AlertPolicyServiceTransport]] _transport_registry["grpc"] = AlertPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = AlertPolicyServiceGrpcAsyncIOTransport @@ -655,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AlertPolicyServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AlertPolicyServiceClient._read_environment_variables() + ) self._client_cert_source = AlertPolicyServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +690,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AlertPolicyServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/pagers.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/pagers.py index 95e4813b1c05..09f7362890e2 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/pagers.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/__init__.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/__init__.py index 3f93f9961a66..8dc4061e69cf 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/__init__.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import AlertPolicyServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AlertPolicyServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AlertPolicyServiceTransport]] _transport_registry["grpc"] = AlertPolicyServiceGrpcTransport _transport_registry["grpc_asyncio"] = AlertPolicyServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/base.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/base.py index cc0d79436d5b..61bb83d7da9c 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/base.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.monitoring_v3 import gapic_version as package_version from google.cloud.monitoring_v3.types import alert, alert_service diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/grpc.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/grpc.py index a4895aac62d9..ca15f1b479da 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/grpc.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.monitoring_v3.types import alert, alert_service diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/grpc_asyncio.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/grpc_asyncio.py index 862925e130e1..61792ca3a117 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.monitoring_v3.types import alert, alert_service diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/async_client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/async_client.py index ec18d53ce86b..ae826db28086 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/async_client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -44,13 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api import monitored_resource_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.cloud.monitoring_v3.services.group_service import pagers -from google.cloud.monitoring_v3.types import group +from google.cloud.monitoring_v3.types import group, group_service from google.cloud.monitoring_v3.types import group as gm_group -from google.cloud.monitoring_v3.types import group_service from .client import GroupServiceClient from .transports.base import DEFAULT_CLIENT_INFO, GroupServiceTransport @@ -126,7 +125,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GroupServiceAsyncClient: The constructed client. """ - return GroupServiceClient.from_service_account_info.__func__(GroupServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = GroupServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(GroupServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +142,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GroupServiceAsyncClient: The constructed client. """ - return GroupServiceClient.from_service_account_file.__func__(GroupServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = GroupServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(GroupServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/client.py index a478a047eda4..5bed50bc38f0 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -61,13 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api import monitored_resource_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.cloud.monitoring_v3.services.group_service import pagers -from google.cloud.monitoring_v3.types import group +from google.cloud.monitoring_v3.types import group, group_service from google.cloud.monitoring_v3.types import group as gm_group -from google.cloud.monitoring_v3.types import group_service from .transports.base import DEFAULT_CLIENT_INFO, GroupServiceTransport from .transports.grpc import GroupServiceGrpcTransport @@ -628,11 +627,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GroupServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GroupServiceClient._read_environment_variables() + ) self._client_cert_source = GroupServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -667,8 +664,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GroupServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/pagers.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/pagers.py index d48b3306df9f..f553677e6950 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/pagers.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/pagers.py @@ -38,7 +38,7 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.api import monitored_resource_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore from google.cloud.monitoring_v3.types import group, group_service @@ -69,7 +69,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -225,7 +225,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/transports/base.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/transports/base.py index 3e78c3bbe1c7..97ada120e5b3 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/transports/base.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.monitoring_v3 import gapic_version as package_version -from google.cloud.monitoring_v3.types import group +from google.cloud.monitoring_v3.types import group, group_service from google.cloud.monitoring_v3.types import group as gm_group -from google.cloud.monitoring_v3.types import group_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/transports/grpc.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/transports/grpc.py index 6c12265e6bb7..f95a29544d8f 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/transports/grpc.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.monitoring_v3.types import group +from google.cloud.monitoring_v3.types import group, group_service from google.cloud.monitoring_v3.types import group as gm_group -from google.cloud.monitoring_v3.types import group_service from .base import DEFAULT_CLIENT_INFO, GroupServiceTransport diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/transports/grpc_asyncio.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/transports/grpc_asyncio.py index 7411544dcce5..4015a2d2d5d8 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.monitoring_v3.types import group +from google.cloud.monitoring_v3.types import group, group_service from google.cloud.monitoring_v3.types import group as gm_group -from google.cloud.monitoring_v3.types import group_service from .base import DEFAULT_CLIENT_INFO, GroupServiceTransport from .grpc import GroupServiceGrpcTransport diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/async_client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/async_client.py index 3ac1dbcb83dc..f0301342a787 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/async_client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -44,16 +44,15 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api import label_pb2 # type: ignore -from google.api import launch_stage_pb2 # type: ignore -from google.api import metric_pb2 # type: ignore -from google.api import monitored_resource_pb2 # type: ignore +import google.api.label_pb2 as label_pb2 # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.api.metric_pb2 as metric_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.cloud.monitoring_v3.services.metric_service import pagers -from google.cloud.monitoring_v3.types import common +from google.cloud.monitoring_v3.types import common, metric_service from google.cloud.monitoring_v3.types import metric as gm_metric -from google.cloud.monitoring_v3.types import metric_service from .client import MetricServiceClient from .transports.base import DEFAULT_CLIENT_INFO, MetricServiceTransport @@ -133,7 +132,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MetricServiceAsyncClient: The constructed client. """ - return MetricServiceClient.from_service_account_info.__func__(MetricServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MetricServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(MetricServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +149,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MetricServiceAsyncClient: The constructed client. """ - return MetricServiceClient.from_service_account_file.__func__(MetricServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MetricServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(MetricServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/client.py index 48b2eb47a7ad..8386901d72bc 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -61,16 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api import label_pb2 # type: ignore -from google.api import launch_stage_pb2 # type: ignore -from google.api import metric_pb2 # type: ignore -from google.api import monitored_resource_pb2 # type: ignore +import google.api.label_pb2 as label_pb2 # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.api.metric_pb2 as metric_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.cloud.monitoring_v3.services.metric_service import pagers -from google.cloud.monitoring_v3.types import common +from google.cloud.monitoring_v3.types import common, metric_service from google.cloud.monitoring_v3.types import metric as gm_metric -from google.cloud.monitoring_v3.types import metric_service from .transports.base import DEFAULT_CLIENT_INFO, MetricServiceTransport from .transports.grpc import MetricServiceGrpcTransport @@ -663,11 +662,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MetricServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MetricServiceClient._read_environment_variables() + ) self._client_cert_source = MetricServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -702,8 +699,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MetricServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/pagers.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/pagers.py index 37e68f83aa97..7f9cb18a1ed2 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/pagers.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/pagers.py @@ -38,8 +38,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.api import metric_pb2 # type: ignore -from google.api import monitored_resource_pb2 # type: ignore +import google.api.metric_pb2 as metric_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore from google.cloud.monitoring_v3.types import metric as gm_metric from google.cloud.monitoring_v3.types import metric_service @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -235,7 +235,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -393,7 +393,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -469,7 +469,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/transports/base.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/transports/base.py index e7d0a74d12bb..e778c7def097 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/transports/base.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/transports/base.py @@ -16,18 +16,18 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.api import metric_pb2 # type: ignore -from google.api import monitored_resource_pb2 # type: ignore +import google.api.metric_pb2 as metric_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.monitoring_v3 import gapic_version as package_version from google.cloud.monitoring_v3.types import metric_service diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/transports/grpc.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/transports/grpc.py index d09d6fa51848..bf1a94e433f4 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/transports/grpc.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/transports/grpc.py @@ -16,21 +16,21 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import metric_pb2 # type: ignore -from google.api import monitored_resource_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers +import google.api.metric_pb2 as metric_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.monitoring_v3.types import metric_service @@ -350,12 +350,12 @@ def list_monitored_resource_descriptors( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_monitored_resource_descriptors" not in self._stubs: - self._stubs[ - "list_monitored_resource_descriptors" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.MetricService/ListMonitoredResourceDescriptors", - request_serializer=metric_service.ListMonitoredResourceDescriptorsRequest.serialize, - response_deserializer=metric_service.ListMonitoredResourceDescriptorsResponse.deserialize, + self._stubs["list_monitored_resource_descriptors"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.MetricService/ListMonitoredResourceDescriptors", + request_serializer=metric_service.ListMonitoredResourceDescriptorsRequest.serialize, + response_deserializer=metric_service.ListMonitoredResourceDescriptorsResponse.deserialize, + ) ) return self._stubs["list_monitored_resource_descriptors"] @@ -382,12 +382,12 @@ def get_monitored_resource_descriptor( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_monitored_resource_descriptor" not in self._stubs: - self._stubs[ - "get_monitored_resource_descriptor" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.MetricService/GetMonitoredResourceDescriptor", - request_serializer=metric_service.GetMonitoredResourceDescriptorRequest.serialize, - response_deserializer=monitored_resource_pb2.MonitoredResourceDescriptor.FromString, + self._stubs["get_monitored_resource_descriptor"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.MetricService/GetMonitoredResourceDescriptor", + request_serializer=metric_service.GetMonitoredResourceDescriptorRequest.serialize, + response_deserializer=monitored_resource_pb2.MonitoredResourceDescriptor.FromString, + ) ) return self._stubs["get_monitored_resource_descriptor"] @@ -594,12 +594,12 @@ def create_service_time_series( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_time_series" not in self._stubs: - self._stubs[ - "create_service_time_series" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.MetricService/CreateServiceTimeSeries", - request_serializer=metric_service.CreateTimeSeriesRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["create_service_time_series"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.MetricService/CreateServiceTimeSeries", + request_serializer=metric_service.CreateTimeSeriesRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["create_service_time_series"] diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/transports/grpc_asyncio.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/transports/grpc_asyncio.py index 13e8e723db54..b834ddf195d7 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/transports/grpc_asyncio.py @@ -17,23 +17,23 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import metric_pb2 # type: ignore -from google.api import monitored_resource_pb2 # type: ignore +import google.api.metric_pb2 as metric_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.monitoring_v3.types import metric_service @@ -358,12 +358,12 @@ def list_monitored_resource_descriptors( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_monitored_resource_descriptors" not in self._stubs: - self._stubs[ - "list_monitored_resource_descriptors" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.MetricService/ListMonitoredResourceDescriptors", - request_serializer=metric_service.ListMonitoredResourceDescriptorsRequest.serialize, - response_deserializer=metric_service.ListMonitoredResourceDescriptorsResponse.deserialize, + self._stubs["list_monitored_resource_descriptors"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.MetricService/ListMonitoredResourceDescriptors", + request_serializer=metric_service.ListMonitoredResourceDescriptorsRequest.serialize, + response_deserializer=metric_service.ListMonitoredResourceDescriptorsResponse.deserialize, + ) ) return self._stubs["list_monitored_resource_descriptors"] @@ -390,12 +390,12 @@ def get_monitored_resource_descriptor( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_monitored_resource_descriptor" not in self._stubs: - self._stubs[ - "get_monitored_resource_descriptor" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.MetricService/GetMonitoredResourceDescriptor", - request_serializer=metric_service.GetMonitoredResourceDescriptorRequest.serialize, - response_deserializer=monitored_resource_pb2.MonitoredResourceDescriptor.FromString, + self._stubs["get_monitored_resource_descriptor"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.MetricService/GetMonitoredResourceDescriptor", + request_serializer=metric_service.GetMonitoredResourceDescriptorRequest.serialize, + response_deserializer=monitored_resource_pb2.MonitoredResourceDescriptor.FromString, + ) ) return self._stubs["get_monitored_resource_descriptor"] @@ -607,12 +607,12 @@ def create_service_time_series( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_time_series" not in self._stubs: - self._stubs[ - "create_service_time_series" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.MetricService/CreateServiceTimeSeries", - request_serializer=metric_service.CreateTimeSeriesRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["create_service_time_series"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.MetricService/CreateServiceTimeSeries", + request_serializer=metric_service.CreateTimeSeriesRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["create_service_time_series"] diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/async_client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/async_client.py index 0847fcc2941b..ca2b908e7680 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/async_client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -44,12 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api import label_pb2 # type: ignore -from google.api import launch_stage_pb2 # type: ignore +import google.api.label_pb2 as label_pb2 # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.monitoring_v3.services.notification_channel_service import pagers from google.cloud.monitoring_v3.types import ( @@ -145,7 +145,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: NotificationChannelServiceAsyncClient: The constructed client. """ - return NotificationChannelServiceClient.from_service_account_info.__func__(NotificationChannelServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + NotificationChannelServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + NotificationChannelServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -161,7 +166,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: NotificationChannelServiceAsyncClient: The constructed client. """ - return NotificationChannelServiceClient.from_service_account_file.__func__(NotificationChannelServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + NotificationChannelServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + NotificationChannelServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -199,7 +209,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return NotificationChannelServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return NotificationChannelServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> NotificationChannelServiceTransport: diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/client.py index 5e6e5b639c2c..dd24c8a2df33 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -61,12 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api import label_pb2 # type: ignore -from google.api import launch_stage_pb2 # type: ignore +import google.api.label_pb2 as label_pb2 # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.monitoring_v3.services.notification_channel_service import pagers from google.cloud.monitoring_v3.types import ( @@ -89,9 +89,7 @@ class NotificationChannelServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NotificationChannelServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NotificationChannelServiceTransport]] _transport_registry["grpc"] = NotificationChannelServiceGrpcTransport _transport_registry["grpc_asyncio"] = NotificationChannelServiceGrpcAsyncIOTransport @@ -656,11 +654,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NotificationChannelServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NotificationChannelServiceClient._read_environment_variables() + ) self._client_cert_source = ( NotificationChannelServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -697,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NotificationChannelServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/pagers.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/pagers.py index cfe7269e3890..4455e621dbc0 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/pagers.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/pagers.py @@ -69,7 +69,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -152,7 +152,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -236,7 +236,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -314,7 +314,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/__init__.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/__init__.py index 90f7a8e7c748..6938dc43b081 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/__init__.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import NotificationChannelServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[NotificationChannelServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[NotificationChannelServiceTransport]] _transport_registry["grpc"] = NotificationChannelServiceGrpcTransport _transport_registry["grpc_asyncio"] = NotificationChannelServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/base.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/base.py index c4a2b89b0508..a3e45d3a9eab 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/base.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.monitoring_v3 import gapic_version as package_version from google.cloud.monitoring_v3.types import notification, notification_service diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/grpc.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/grpc.py index 1a0b1f1de99b..201bb458f192 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/grpc.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.monitoring_v3.types import notification, notification_service @@ -349,12 +349,12 @@ def list_notification_channel_descriptors( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_notification_channel_descriptors" not in self._stubs: - self._stubs[ - "list_notification_channel_descriptors" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/ListNotificationChannelDescriptors", - request_serializer=notification_service.ListNotificationChannelDescriptorsRequest.serialize, - response_deserializer=notification_service.ListNotificationChannelDescriptorsResponse.deserialize, + self._stubs["list_notification_channel_descriptors"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/ListNotificationChannelDescriptors", + request_serializer=notification_service.ListNotificationChannelDescriptorsRequest.serialize, + response_deserializer=notification_service.ListNotificationChannelDescriptorsResponse.deserialize, + ) ) return self._stubs["list_notification_channel_descriptors"] @@ -383,12 +383,12 @@ def get_notification_channel_descriptor( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_notification_channel_descriptor" not in self._stubs: - self._stubs[ - "get_notification_channel_descriptor" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/GetNotificationChannelDescriptor", - request_serializer=notification_service.GetNotificationChannelDescriptorRequest.serialize, - response_deserializer=notification.NotificationChannelDescriptor.deserialize, + self._stubs["get_notification_channel_descriptor"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/GetNotificationChannelDescriptor", + request_serializer=notification_service.GetNotificationChannelDescriptorRequest.serialize, + response_deserializer=notification.NotificationChannelDescriptor.deserialize, + ) ) return self._stubs["get_notification_channel_descriptor"] @@ -417,12 +417,12 @@ def list_notification_channels( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_notification_channels" not in self._stubs: - self._stubs[ - "list_notification_channels" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/ListNotificationChannels", - request_serializer=notification_service.ListNotificationChannelsRequest.serialize, - response_deserializer=notification_service.ListNotificationChannelsResponse.deserialize, + self._stubs["list_notification_channels"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/ListNotificationChannels", + request_serializer=notification_service.ListNotificationChannelsRequest.serialize, + response_deserializer=notification_service.ListNotificationChannelsResponse.deserialize, + ) ) return self._stubs["list_notification_channels"] @@ -491,12 +491,12 @@ def create_notification_channel( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_notification_channel" not in self._stubs: - self._stubs[ - "create_notification_channel" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/CreateNotificationChannel", - request_serializer=notification_service.CreateNotificationChannelRequest.serialize, - response_deserializer=notification.NotificationChannel.deserialize, + self._stubs["create_notification_channel"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/CreateNotificationChannel", + request_serializer=notification_service.CreateNotificationChannelRequest.serialize, + response_deserializer=notification.NotificationChannel.deserialize, + ) ) return self._stubs["create_notification_channel"] @@ -529,12 +529,12 @@ def update_notification_channel( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_notification_channel" not in self._stubs: - self._stubs[ - "update_notification_channel" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/UpdateNotificationChannel", - request_serializer=notification_service.UpdateNotificationChannelRequest.serialize, - response_deserializer=notification.NotificationChannel.deserialize, + self._stubs["update_notification_channel"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/UpdateNotificationChannel", + request_serializer=notification_service.UpdateNotificationChannelRequest.serialize, + response_deserializer=notification.NotificationChannel.deserialize, + ) ) return self._stubs["update_notification_channel"] @@ -565,12 +565,12 @@ def delete_notification_channel( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_notification_channel" not in self._stubs: - self._stubs[ - "delete_notification_channel" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/DeleteNotificationChannel", - request_serializer=notification_service.DeleteNotificationChannelRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_notification_channel"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/DeleteNotificationChannel", + request_serializer=notification_service.DeleteNotificationChannelRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_notification_channel"] @@ -599,12 +599,12 @@ def send_notification_channel_verification_code( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "send_notification_channel_verification_code" not in self._stubs: - self._stubs[ - "send_notification_channel_verification_code" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/SendNotificationChannelVerificationCode", - request_serializer=notification_service.SendNotificationChannelVerificationCodeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["send_notification_channel_verification_code"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/SendNotificationChannelVerificationCode", + request_serializer=notification_service.SendNotificationChannelVerificationCodeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["send_notification_channel_verification_code"] @@ -658,12 +658,12 @@ def get_notification_channel_verification_code( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_notification_channel_verification_code" not in self._stubs: - self._stubs[ - "get_notification_channel_verification_code" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/GetNotificationChannelVerificationCode", - request_serializer=notification_service.GetNotificationChannelVerificationCodeRequest.serialize, - response_deserializer=notification_service.GetNotificationChannelVerificationCodeResponse.deserialize, + self._stubs["get_notification_channel_verification_code"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/GetNotificationChannelVerificationCode", + request_serializer=notification_service.GetNotificationChannelVerificationCodeRequest.serialize, + response_deserializer=notification_service.GetNotificationChannelVerificationCodeResponse.deserialize, + ) ) return self._stubs["get_notification_channel_verification_code"] @@ -691,12 +691,12 @@ def verify_notification_channel( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "verify_notification_channel" not in self._stubs: - self._stubs[ - "verify_notification_channel" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/VerifyNotificationChannel", - request_serializer=notification_service.VerifyNotificationChannelRequest.serialize, - response_deserializer=notification.NotificationChannel.deserialize, + self._stubs["verify_notification_channel"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/VerifyNotificationChannel", + request_serializer=notification_service.VerifyNotificationChannelRequest.serialize, + response_deserializer=notification.NotificationChannel.deserialize, + ) ) return self._stubs["verify_notification_channel"] diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/grpc_asyncio.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/grpc_asyncio.py index e02cdb094259..4d39f8698253 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/notification_channel_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.monitoring_v3.types import notification, notification_service @@ -359,12 +359,12 @@ def list_notification_channel_descriptors( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_notification_channel_descriptors" not in self._stubs: - self._stubs[ - "list_notification_channel_descriptors" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/ListNotificationChannelDescriptors", - request_serializer=notification_service.ListNotificationChannelDescriptorsRequest.serialize, - response_deserializer=notification_service.ListNotificationChannelDescriptorsResponse.deserialize, + self._stubs["list_notification_channel_descriptors"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/ListNotificationChannelDescriptors", + request_serializer=notification_service.ListNotificationChannelDescriptorsRequest.serialize, + response_deserializer=notification_service.ListNotificationChannelDescriptorsResponse.deserialize, + ) ) return self._stubs["list_notification_channel_descriptors"] @@ -393,12 +393,12 @@ def get_notification_channel_descriptor( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_notification_channel_descriptor" not in self._stubs: - self._stubs[ - "get_notification_channel_descriptor" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/GetNotificationChannelDescriptor", - request_serializer=notification_service.GetNotificationChannelDescriptorRequest.serialize, - response_deserializer=notification.NotificationChannelDescriptor.deserialize, + self._stubs["get_notification_channel_descriptor"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/GetNotificationChannelDescriptor", + request_serializer=notification_service.GetNotificationChannelDescriptorRequest.serialize, + response_deserializer=notification.NotificationChannelDescriptor.deserialize, + ) ) return self._stubs["get_notification_channel_descriptor"] @@ -427,12 +427,12 @@ def list_notification_channels( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_notification_channels" not in self._stubs: - self._stubs[ - "list_notification_channels" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/ListNotificationChannels", - request_serializer=notification_service.ListNotificationChannelsRequest.serialize, - response_deserializer=notification_service.ListNotificationChannelsResponse.deserialize, + self._stubs["list_notification_channels"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/ListNotificationChannels", + request_serializer=notification_service.ListNotificationChannelsRequest.serialize, + response_deserializer=notification_service.ListNotificationChannelsResponse.deserialize, + ) ) return self._stubs["list_notification_channels"] @@ -501,12 +501,12 @@ def create_notification_channel( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_notification_channel" not in self._stubs: - self._stubs[ - "create_notification_channel" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/CreateNotificationChannel", - request_serializer=notification_service.CreateNotificationChannelRequest.serialize, - response_deserializer=notification.NotificationChannel.deserialize, + self._stubs["create_notification_channel"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/CreateNotificationChannel", + request_serializer=notification_service.CreateNotificationChannelRequest.serialize, + response_deserializer=notification.NotificationChannel.deserialize, + ) ) return self._stubs["create_notification_channel"] @@ -539,12 +539,12 @@ def update_notification_channel( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_notification_channel" not in self._stubs: - self._stubs[ - "update_notification_channel" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/UpdateNotificationChannel", - request_serializer=notification_service.UpdateNotificationChannelRequest.serialize, - response_deserializer=notification.NotificationChannel.deserialize, + self._stubs["update_notification_channel"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/UpdateNotificationChannel", + request_serializer=notification_service.UpdateNotificationChannelRequest.serialize, + response_deserializer=notification.NotificationChannel.deserialize, + ) ) return self._stubs["update_notification_channel"] @@ -576,12 +576,12 @@ def delete_notification_channel( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_notification_channel" not in self._stubs: - self._stubs[ - "delete_notification_channel" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/DeleteNotificationChannel", - request_serializer=notification_service.DeleteNotificationChannelRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_notification_channel"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/DeleteNotificationChannel", + request_serializer=notification_service.DeleteNotificationChannelRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_notification_channel"] @@ -610,12 +610,12 @@ def send_notification_channel_verification_code( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "send_notification_channel_verification_code" not in self._stubs: - self._stubs[ - "send_notification_channel_verification_code" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/SendNotificationChannelVerificationCode", - request_serializer=notification_service.SendNotificationChannelVerificationCodeRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["send_notification_channel_verification_code"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/SendNotificationChannelVerificationCode", + request_serializer=notification_service.SendNotificationChannelVerificationCodeRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["send_notification_channel_verification_code"] @@ -669,12 +669,12 @@ def get_notification_channel_verification_code( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_notification_channel_verification_code" not in self._stubs: - self._stubs[ - "get_notification_channel_verification_code" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/GetNotificationChannelVerificationCode", - request_serializer=notification_service.GetNotificationChannelVerificationCodeRequest.serialize, - response_deserializer=notification_service.GetNotificationChannelVerificationCodeResponse.deserialize, + self._stubs["get_notification_channel_verification_code"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/GetNotificationChannelVerificationCode", + request_serializer=notification_service.GetNotificationChannelVerificationCodeRequest.serialize, + response_deserializer=notification_service.GetNotificationChannelVerificationCodeResponse.deserialize, + ) ) return self._stubs["get_notification_channel_verification_code"] @@ -702,12 +702,12 @@ def verify_notification_channel( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "verify_notification_channel" not in self._stubs: - self._stubs[ - "verify_notification_channel" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.NotificationChannelService/VerifyNotificationChannel", - request_serializer=notification_service.VerifyNotificationChannelRequest.serialize, - response_deserializer=notification.NotificationChannel.deserialize, + self._stubs["verify_notification_channel"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.NotificationChannelService/VerifyNotificationChannel", + request_serializer=notification_service.VerifyNotificationChannelRequest.serialize, + response_deserializer=notification.NotificationChannel.deserialize, + ) ) return self._stubs["verify_notification_channel"] diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/async_client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/async_client.py index 0d01378674f6..5d8bca98dc89 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/async_client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -113,7 +113,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: QueryServiceAsyncClient: The constructed client. """ - return QueryServiceClient.from_service_account_info.__func__(QueryServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = QueryServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(QueryServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: QueryServiceAsyncClient: The constructed client. """ - return QueryServiceClient.from_service_account_file.__func__(QueryServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = QueryServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(QueryServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/client.py index 666bd0b63b8d..94fde587cb7b 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -599,11 +599,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = QueryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + QueryServiceClient._read_environment_variables() + ) self._client_cert_source = QueryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -638,8 +636,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(QueryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/pagers.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/pagers.py index 73b59a0e409d..22a5c64f0cf1 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/pagers.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/transports/base.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/transports/base.py index cc6132e530c4..68b0e56f9532 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/transports/base.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version from google.cloud.monitoring_v3.types import metric_service diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/transports/grpc.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/transports/grpc.py index 399e4b7fbcdc..8bbefec44f4f 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/transports/grpc.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.monitoring_v3.types import metric_service diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/transports/grpc_asyncio.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/transports/grpc_asyncio.py index 78fa9549596e..d12946900e72 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.monitoring_v3.types import metric_service diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/async_client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/async_client.py index 4a1ea4b1169e..adb7d5f94093 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/async_client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -44,14 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.type.calendar_period_pb2 as calendar_period_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.type import calendar_period_pb2 # type: ignore from google.cloud.monitoring_v3.services.service_monitoring_service import pagers -from google.cloud.monitoring_v3.types import service +from google.cloud.monitoring_v3.types import service, service_service from google.cloud.monitoring_v3.types import service as gm_service -from google.cloud.monitoring_v3.types import service_service from .client import ServiceMonitoringServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ServiceMonitoringServiceTransport @@ -136,7 +135,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ServiceMonitoringServiceAsyncClient: The constructed client. """ - return ServiceMonitoringServiceClient.from_service_account_info.__func__(ServiceMonitoringServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ServiceMonitoringServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ServiceMonitoringServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -152,7 +152,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ServiceMonitoringServiceAsyncClient: The constructed client. """ - return ServiceMonitoringServiceClient.from_service_account_file.__func__(ServiceMonitoringServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ServiceMonitoringServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + ServiceMonitoringServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -190,7 +193,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ServiceMonitoringServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ServiceMonitoringServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ServiceMonitoringServiceTransport: diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/client.py index f2f671920902..f8b0f5c44b62 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -61,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.type.calendar_period_pb2 as calendar_period_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.type import calendar_period_pb2 # type: ignore from google.cloud.monitoring_v3.services.service_monitoring_service import pagers -from google.cloud.monitoring_v3.types import service +from google.cloud.monitoring_v3.types import service, service_service from google.cloud.monitoring_v3.types import service as gm_service -from google.cloud.monitoring_v3.types import service_service from .transports.base import DEFAULT_CLIENT_INFO, ServiceMonitoringServiceTransport from .transports.grpc import ServiceMonitoringServiceGrpcTransport @@ -83,9 +82,7 @@ class ServiceMonitoringServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServiceMonitoringServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServiceMonitoringServiceTransport]] _transport_registry["grpc"] = ServiceMonitoringServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServiceMonitoringServiceGrpcAsyncIOTransport @@ -652,11 +649,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServiceMonitoringServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServiceMonitoringServiceClient._read_environment_variables() + ) self._client_cert_source = ( ServiceMonitoringServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -693,8 +688,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServiceMonitoringServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/pagers.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/pagers.py index cbbd5903efe2..eb281d86dc3f 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/pagers.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/__init__.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/__init__.py index 159eb6490cfa..ba246cc42b8f 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/__init__.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import ServiceMonitoringServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServiceMonitoringServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServiceMonitoringServiceTransport]] _transport_registry["grpc"] = ServiceMonitoringServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServiceMonitoringServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/base.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/base.py index e7aa3f1585e2..685f89634397 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/base.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/base.py @@ -17,20 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.monitoring_v3 import gapic_version as package_version -from google.cloud.monitoring_v3.types import service +from google.cloud.monitoring_v3.types import service, service_service from google.cloud.monitoring_v3.types import service as gm_service -from google.cloud.monitoring_v3.types import service_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/grpc.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/grpc.py index 1251e723d748..2314a30b27a3 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/grpc.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/grpc.py @@ -16,23 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.monitoring_v3.types import service +from google.cloud.monitoring_v3.types import service, service_service from google.cloud.monitoring_v3.types import service as gm_service -from google.cloud.monitoring_v3.types import service_service from .base import DEFAULT_CLIENT_INFO, ServiceMonitoringServiceTransport @@ -483,12 +482,12 @@ def create_service_level_objective( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_level_objective" not in self._stubs: - self._stubs[ - "create_service_level_objective" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.ServiceMonitoringService/CreateServiceLevelObjective", - request_serializer=service_service.CreateServiceLevelObjectiveRequest.serialize, - response_deserializer=service.ServiceLevelObjective.deserialize, + self._stubs["create_service_level_objective"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.ServiceMonitoringService/CreateServiceLevelObjective", + request_serializer=service_service.CreateServiceLevelObjectiveRequest.serialize, + response_deserializer=service.ServiceLevelObjective.deserialize, + ) ) return self._stubs["create_service_level_objective"] @@ -513,12 +512,12 @@ def get_service_level_objective( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_service_level_objective" not in self._stubs: - self._stubs[ - "get_service_level_objective" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.ServiceMonitoringService/GetServiceLevelObjective", - request_serializer=service_service.GetServiceLevelObjectiveRequest.serialize, - response_deserializer=service.ServiceLevelObjective.deserialize, + self._stubs["get_service_level_objective"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.ServiceMonitoringService/GetServiceLevelObjective", + request_serializer=service_service.GetServiceLevelObjectiveRequest.serialize, + response_deserializer=service.ServiceLevelObjective.deserialize, + ) ) return self._stubs["get_service_level_objective"] @@ -544,12 +543,12 @@ def list_service_level_objectives( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_service_level_objectives" not in self._stubs: - self._stubs[ - "list_service_level_objectives" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.ServiceMonitoringService/ListServiceLevelObjectives", - request_serializer=service_service.ListServiceLevelObjectivesRequest.serialize, - response_deserializer=service_service.ListServiceLevelObjectivesResponse.deserialize, + self._stubs["list_service_level_objectives"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.ServiceMonitoringService/ListServiceLevelObjectives", + request_serializer=service_service.ListServiceLevelObjectivesRequest.serialize, + response_deserializer=service_service.ListServiceLevelObjectivesResponse.deserialize, + ) ) return self._stubs["list_service_level_objectives"] @@ -575,12 +574,12 @@ def update_service_level_objective( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_service_level_objective" not in self._stubs: - self._stubs[ - "update_service_level_objective" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.ServiceMonitoringService/UpdateServiceLevelObjective", - request_serializer=service_service.UpdateServiceLevelObjectiveRequest.serialize, - response_deserializer=service.ServiceLevelObjective.deserialize, + self._stubs["update_service_level_objective"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.ServiceMonitoringService/UpdateServiceLevelObjective", + request_serializer=service_service.UpdateServiceLevelObjectiveRequest.serialize, + response_deserializer=service.ServiceLevelObjective.deserialize, + ) ) return self._stubs["update_service_level_objective"] @@ -605,12 +604,12 @@ def delete_service_level_objective( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_level_objective" not in self._stubs: - self._stubs[ - "delete_service_level_objective" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.ServiceMonitoringService/DeleteServiceLevelObjective", - request_serializer=service_service.DeleteServiceLevelObjectiveRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_service_level_objective"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.ServiceMonitoringService/DeleteServiceLevelObjective", + request_serializer=service_service.DeleteServiceLevelObjectiveRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_service_level_objective"] diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/grpc_asyncio.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/grpc_asyncio.py index 1d164f89a00c..d31d36eeefd6 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/transports/grpc_asyncio.py @@ -17,25 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.monitoring_v3.types import service +from google.cloud.monitoring_v3.types import service, service_service from google.cloud.monitoring_v3.types import service as gm_service -from google.cloud.monitoring_v3.types import service_service from .base import DEFAULT_CLIENT_INFO, ServiceMonitoringServiceTransport from .grpc import ServiceMonitoringServiceGrpcTransport @@ -496,12 +495,12 @@ def create_service_level_objective( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_level_objective" not in self._stubs: - self._stubs[ - "create_service_level_objective" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.ServiceMonitoringService/CreateServiceLevelObjective", - request_serializer=service_service.CreateServiceLevelObjectiveRequest.serialize, - response_deserializer=service.ServiceLevelObjective.deserialize, + self._stubs["create_service_level_objective"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.ServiceMonitoringService/CreateServiceLevelObjective", + request_serializer=service_service.CreateServiceLevelObjectiveRequest.serialize, + response_deserializer=service.ServiceLevelObjective.deserialize, + ) ) return self._stubs["create_service_level_objective"] @@ -527,12 +526,12 @@ def get_service_level_objective( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_service_level_objective" not in self._stubs: - self._stubs[ - "get_service_level_objective" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.ServiceMonitoringService/GetServiceLevelObjective", - request_serializer=service_service.GetServiceLevelObjectiveRequest.serialize, - response_deserializer=service.ServiceLevelObjective.deserialize, + self._stubs["get_service_level_objective"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.ServiceMonitoringService/GetServiceLevelObjective", + request_serializer=service_service.GetServiceLevelObjectiveRequest.serialize, + response_deserializer=service.ServiceLevelObjective.deserialize, + ) ) return self._stubs["get_service_level_objective"] @@ -558,12 +557,12 @@ def list_service_level_objectives( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_service_level_objectives" not in self._stubs: - self._stubs[ - "list_service_level_objectives" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.ServiceMonitoringService/ListServiceLevelObjectives", - request_serializer=service_service.ListServiceLevelObjectivesRequest.serialize, - response_deserializer=service_service.ListServiceLevelObjectivesResponse.deserialize, + self._stubs["list_service_level_objectives"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.ServiceMonitoringService/ListServiceLevelObjectives", + request_serializer=service_service.ListServiceLevelObjectivesRequest.serialize, + response_deserializer=service_service.ListServiceLevelObjectivesResponse.deserialize, + ) ) return self._stubs["list_service_level_objectives"] @@ -589,12 +588,12 @@ def update_service_level_objective( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_service_level_objective" not in self._stubs: - self._stubs[ - "update_service_level_objective" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.ServiceMonitoringService/UpdateServiceLevelObjective", - request_serializer=service_service.UpdateServiceLevelObjectiveRequest.serialize, - response_deserializer=service.ServiceLevelObjective.deserialize, + self._stubs["update_service_level_objective"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.ServiceMonitoringService/UpdateServiceLevelObjective", + request_serializer=service_service.UpdateServiceLevelObjectiveRequest.serialize, + response_deserializer=service.ServiceLevelObjective.deserialize, + ) ) return self._stubs["update_service_level_objective"] @@ -619,12 +618,12 @@ def delete_service_level_objective( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_level_objective" not in self._stubs: - self._stubs[ - "delete_service_level_objective" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.ServiceMonitoringService/DeleteServiceLevelObjective", - request_serializer=service_service.DeleteServiceLevelObjectiveRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_service_level_objective"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.ServiceMonitoringService/DeleteServiceLevelObjective", + request_serializer=service_service.DeleteServiceLevelObjectiveRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_service_level_objective"] diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/async_client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/async_client.py index afc78e8795b6..71b7337ecb92 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/async_client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -44,14 +44,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.monitoring_v3.services.snooze_service import pagers -from google.cloud.monitoring_v3.types import common -from google.cloud.monitoring_v3.types import snooze +from google.cloud.monitoring_v3.types import common, snooze, snooze_service from google.cloud.monitoring_v3.types import snooze as gm_snooze -from google.cloud.monitoring_v3.types import snooze_service from .client import SnoozeServiceClient from .transports.base import DEFAULT_CLIENT_INFO, SnoozeServiceTransport @@ -125,7 +123,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SnoozeServiceAsyncClient: The constructed client. """ - return SnoozeServiceClient.from_service_account_info.__func__(SnoozeServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SnoozeServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SnoozeServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +140,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SnoozeServiceAsyncClient: The constructed client. """ - return SnoozeServiceClient.from_service_account_file.__func__(SnoozeServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SnoozeServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SnoozeServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/client.py index d26ea506f638..5175cbfe2b79 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -61,14 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.monitoring_v3.services.snooze_service import pagers -from google.cloud.monitoring_v3.types import common -from google.cloud.monitoring_v3.types import snooze +from google.cloud.monitoring_v3.types import common, snooze, snooze_service from google.cloud.monitoring_v3.types import snooze as gm_snooze -from google.cloud.monitoring_v3.types import snooze_service from .transports.base import DEFAULT_CLIENT_INFO, SnoozeServiceTransport from .transports.grpc import SnoozeServiceGrpcTransport @@ -640,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SnoozeServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SnoozeServiceClient._read_environment_variables() + ) self._client_cert_source = SnoozeServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -679,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SnoozeServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/pagers.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/pagers.py index e681333e562b..470cf4aa5d47 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/pagers.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/transports/base.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/transports/base.py index c77ad054da07..325b47433dcb 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/transports/base.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/transports/base.py @@ -17,19 +17,18 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version -from google.cloud.monitoring_v3.types import snooze +from google.cloud.monitoring_v3.types import snooze, snooze_service from google.cloud.monitoring_v3.types import snooze as gm_snooze -from google.cloud.monitoring_v3.types import snooze_service DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/transports/grpc.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/transports/grpc.py index 02aaae987211..89118b2056a3 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/transports/grpc.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/transports/grpc.py @@ -16,22 +16,21 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.monitoring_v3.types import snooze +from google.cloud.monitoring_v3.types import snooze, snooze_service from google.cloud.monitoring_v3.types import snooze as gm_snooze -from google.cloud.monitoring_v3.types import snooze_service from .base import DEFAULT_CLIENT_INFO, SnoozeServiceTransport diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/transports/grpc_asyncio.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/transports/grpc_asyncio.py index b759f95251eb..869ed22c6e81 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,14 +30,10 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.monitoring_v3.types import snooze +from google.cloud.monitoring_v3.types import snooze, snooze_service from google.cloud.monitoring_v3.types import snooze as gm_snooze -from google.cloud.monitoring_v3.types import snooze_service from .base import DEFAULT_CLIENT_INFO, SnoozeServiceTransport from .grpc import SnoozeServiceGrpcTransport diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/async_client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/async_client.py index 218ea30f215c..7a6fb1ad07d1 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/async_client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api import monitored_resource_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore from google.cloud.monitoring_v3.services.uptime_check_service import pagers from google.cloud.monitoring_v3.types import uptime, uptime_service @@ -131,7 +131,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UptimeCheckServiceAsyncClient: The constructed client. """ - return UptimeCheckServiceClient.from_service_account_info.__func__(UptimeCheckServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = UptimeCheckServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(UptimeCheckServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UptimeCheckServiceAsyncClient: The constructed client. """ - return UptimeCheckServiceClient.from_service_account_file.__func__(UptimeCheckServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = UptimeCheckServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(UptimeCheckServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -185,7 +187,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return UptimeCheckServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return UptimeCheckServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> UptimeCheckServiceTransport: diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/client.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/client.py index f3626f6ad6f4..9eb718332ddf 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/client.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.monitoring_v3 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api import monitored_resource_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore from google.cloud.monitoring_v3.services.uptime_check_service import pagers from google.cloud.monitoring_v3.types import uptime, uptime_service @@ -81,9 +81,7 @@ class UptimeCheckServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UptimeCheckServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UptimeCheckServiceTransport]] _transport_registry["grpc"] = UptimeCheckServiceGrpcTransport _transport_registry["grpc_asyncio"] = UptimeCheckServiceGrpcAsyncIOTransport @@ -654,11 +652,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UptimeCheckServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UptimeCheckServiceClient._read_environment_variables() + ) self._client_cert_source = UptimeCheckServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -693,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UptimeCheckServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/pagers.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/pagers.py index 5fe9d92dd0a1..f735d7cc7d87 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/pagers.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -225,7 +225,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/__init__.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/__init__.py index ce081904948e..647e038f0469 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/__init__.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import UptimeCheckServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[UptimeCheckServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[UptimeCheckServiceTransport]] _transport_registry["grpc"] = UptimeCheckServiceGrpcTransport _transport_registry["grpc_asyncio"] = UptimeCheckServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/base.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/base.py index 014c8021253b..d821e90c617c 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/base.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.monitoring_v3 import gapic_version as package_version from google.cloud.monitoring_v3.types import uptime, uptime_service diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/grpc.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/grpc.py index 6defd4dbd310..36d7273cf8fc 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/grpc.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.monitoring_v3.types import uptime, uptime_service @@ -410,12 +410,12 @@ def create_uptime_check_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_uptime_check_config" not in self._stubs: - self._stubs[ - "create_uptime_check_config" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.UptimeCheckService/CreateUptimeCheckConfig", - request_serializer=uptime_service.CreateUptimeCheckConfigRequest.serialize, - response_deserializer=uptime.UptimeCheckConfig.deserialize, + self._stubs["create_uptime_check_config"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.UptimeCheckService/CreateUptimeCheckConfig", + request_serializer=uptime_service.CreateUptimeCheckConfigRequest.serialize, + response_deserializer=uptime.UptimeCheckConfig.deserialize, + ) ) return self._stubs["create_uptime_check_config"] @@ -444,12 +444,12 @@ def update_uptime_check_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_uptime_check_config" not in self._stubs: - self._stubs[ - "update_uptime_check_config" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.UptimeCheckService/UpdateUptimeCheckConfig", - request_serializer=uptime_service.UpdateUptimeCheckConfigRequest.serialize, - response_deserializer=uptime.UptimeCheckConfig.deserialize, + self._stubs["update_uptime_check_config"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.UptimeCheckService/UpdateUptimeCheckConfig", + request_serializer=uptime_service.UpdateUptimeCheckConfigRequest.serialize, + response_deserializer=uptime.UptimeCheckConfig.deserialize, + ) ) return self._stubs["update_uptime_check_config"] @@ -475,12 +475,12 @@ def delete_uptime_check_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_uptime_check_config" not in self._stubs: - self._stubs[ - "delete_uptime_check_config" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.UptimeCheckService/DeleteUptimeCheckConfig", - request_serializer=uptime_service.DeleteUptimeCheckConfigRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_uptime_check_config"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.UptimeCheckService/DeleteUptimeCheckConfig", + request_serializer=uptime_service.DeleteUptimeCheckConfigRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_uptime_check_config"] diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/grpc_asyncio.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/grpc_asyncio.py index 3a64d9e78cff..4199188076a3 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.monitoring_v3.types import uptime, uptime_service @@ -420,12 +420,12 @@ def create_uptime_check_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_uptime_check_config" not in self._stubs: - self._stubs[ - "create_uptime_check_config" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.UptimeCheckService/CreateUptimeCheckConfig", - request_serializer=uptime_service.CreateUptimeCheckConfigRequest.serialize, - response_deserializer=uptime.UptimeCheckConfig.deserialize, + self._stubs["create_uptime_check_config"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.UptimeCheckService/CreateUptimeCheckConfig", + request_serializer=uptime_service.CreateUptimeCheckConfigRequest.serialize, + response_deserializer=uptime.UptimeCheckConfig.deserialize, + ) ) return self._stubs["create_uptime_check_config"] @@ -455,12 +455,12 @@ def update_uptime_check_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_uptime_check_config" not in self._stubs: - self._stubs[ - "update_uptime_check_config" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.UptimeCheckService/UpdateUptimeCheckConfig", - request_serializer=uptime_service.UpdateUptimeCheckConfigRequest.serialize, - response_deserializer=uptime.UptimeCheckConfig.deserialize, + self._stubs["update_uptime_check_config"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.UptimeCheckService/UpdateUptimeCheckConfig", + request_serializer=uptime_service.UpdateUptimeCheckConfigRequest.serialize, + response_deserializer=uptime.UptimeCheckConfig.deserialize, + ) ) return self._stubs["update_uptime_check_config"] @@ -488,12 +488,12 @@ def delete_uptime_check_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_uptime_check_config" not in self._stubs: - self._stubs[ - "delete_uptime_check_config" - ] = self._logged_channel.unary_unary( - "/google.monitoring.v3.UptimeCheckService/DeleteUptimeCheckConfig", - request_serializer=uptime_service.DeleteUptimeCheckConfigRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_uptime_check_config"] = ( + self._logged_channel.unary_unary( + "/google.monitoring.v3.UptimeCheckService/DeleteUptimeCheckConfig", + request_serializer=uptime_service.DeleteUptimeCheckConfigRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_uptime_check_config"] diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/__init__.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/__init__.py index 07e671360fe7..2c1f27f5c206 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/__init__.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .alert import AlertPolicy +from .alert import ( + AlertPolicy, +) from .alert_service import ( CreateAlertPolicyRequest, DeleteAlertPolicyRequest, @@ -22,9 +24,19 @@ ListAlertPoliciesResponse, UpdateAlertPolicyRequest, ) -from .common import Aggregation, ComparisonType, ServiceTier, TimeInterval, TypedValue -from .dropped_labels import DroppedLabels -from .group import Group +from .common import ( + Aggregation, + ComparisonType, + ServiceTier, + TimeInterval, + TypedValue, +) +from .dropped_labels import ( + DroppedLabels, +) +from .group import ( + Group, +) from .group_service import ( CreateGroupRequest, DeleteGroupRequest, @@ -62,8 +74,13 @@ QueryTimeSeriesRequest, QueryTimeSeriesResponse, ) -from .mutation_record import MutationRecord -from .notification import NotificationChannel, NotificationChannelDescriptor +from .mutation_record import ( + MutationRecord, +) +from .notification import ( + NotificationChannel, + NotificationChannelDescriptor, +) from .notification_service import ( CreateNotificationChannelRequest, DeleteNotificationChannelRequest, @@ -104,7 +121,9 @@ UpdateServiceLevelObjectiveRequest, UpdateServiceRequest, ) -from .snooze import Snooze +from .snooze import ( + Snooze, +) from .snooze_service import ( CreateSnoozeRequest, GetSnoozeRequest, @@ -112,7 +131,9 @@ ListSnoozesResponse, UpdateSnoozeRequest, ) -from .span_context import SpanContext +from .span_context import ( + SpanContext, +) from .uptime import ( GroupResourceType, InternalChecker, diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/alert.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/alert.py index 30931c33aa14..d08bef579c63 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/alert.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/alert.py @@ -17,14 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore -from google.cloud.monitoring_v3.types import mutation_record as gm_mutation_record from google.cloud.monitoring_v3.types import common +from google.cloud.monitoring_v3.types import mutation_record as gm_mutation_record __protobuf__ = proto.module( package="google.monitoring.v3", @@ -178,6 +178,7 @@ class ConditionCombinerType(proto.Enum): only if all conditions are met simultaneously on at least one resource. """ + COMBINE_UNSPECIFIED = 0 AND = 1 OR = 2 @@ -205,6 +206,7 @@ class Severity(proto.Enum): downtime, but could potentially lead to a problem in the future. """ + SEVERITY_UNSPECIFIED = 0 CRITICAL = 1 ERROR = 2 @@ -395,6 +397,7 @@ class EvaluationMissingData(proto.Enum): Do not evaluate the condition to any value if there is no data. """ + EVALUATION_MISSING_DATA_UNSPECIFIED = 0 EVALUATION_MISSING_DATA_INACTIVE = 1 EVALUATION_MISSING_DATA_ACTIVE = 2 @@ -572,12 +575,12 @@ class ForecastOptions(proto.Message): proto.STRING, number=9, ) - denominator_aggregations: MutableSequence[ - common.Aggregation - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message=common.Aggregation, + denominator_aggregations: MutableSequence[common.Aggregation] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message=common.Aggregation, + ) ) forecast_options: "AlertPolicy.Condition.MetricThreshold.ForecastOptions" = proto.Field( proto.MESSAGE, @@ -1206,6 +1209,7 @@ class NotificationPrompt(proto.Enum): CLOSED (3): Notify when an incident is closed. """ + NOTIFICATION_PROMPT_UNSPECIFIED = 0 OPENED = 1 CLOSED = 3 diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/alert_service.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/alert_service.py index afa5b5f2b7c9..f2f42e822982 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/alert_service.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/alert_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_v3.types import alert diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/common.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/common.py index 54a025209b25..4f35bde57593 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/common.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/common.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.api import distribution_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api.distribution_pb2 as distribution_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -60,6 +60,7 @@ class ComparisonType(proto.Enum): True if the left argument is not equal to the right argument. """ + COMPARISON_UNSPECIFIED = 0 COMPARISON_GT = 1 COMPARISON_GE = 2 @@ -94,6 +95,7 @@ class ServiceTier(proto.Enum): details, see `the service tiers documentation `__. """ + _pb_options = {"deprecated": True} SERVICE_TIER_UNSPECIFIED = 0 SERVICE_TIER_BASIC = 1 @@ -493,6 +495,7 @@ class Aligner(proto.Enum): that the values for the metric will always be positive. The output is a ``GAUGE`` metric with ``value_type`` ``DOUBLE``. """ + ALIGN_NONE = 0 ALIGN_DELTA = 1 ALIGN_RATE = 2 @@ -608,6 +611,7 @@ class Reducer(proto.Enum): numeric and distribution type. The value of the output is ``DOUBLE``. """ + REDUCE_NONE = 0 REDUCE_MEAN = 1 REDUCE_MIN = 2 diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/group_service.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/group_service.py index d5ca200fcda8..da672c484555 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/group_service.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/group_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.api import monitored_resource_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_v3.types import common @@ -351,12 +351,12 @@ class ListGroupMembersResponse(proto.Message): def raw_page(self): return self - members: MutableSequence[ - monitored_resource_pb2.MonitoredResource - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=monitored_resource_pb2.MonitoredResource, + members: MutableSequence[monitored_resource_pb2.MonitoredResource] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=monitored_resource_pb2.MonitoredResource, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/metric.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/metric.py index 416326af4785..abf3929d0136 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/metric.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/metric.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.api import label_pb2 # type: ignore -from google.api import metric_pb2 # type: ignore -from google.api import monitored_resource_pb2 # type: ignore +import google.api.label_pb2 as label_pb2 # type: ignore +import google.api.metric_pb2 as metric_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_v3.types import common diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/metric_service.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/metric_service.py index 65400dd5b7e2..0b1f9c77ccaf 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/metric_service.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/metric_service.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.api import metric_pb2 # type: ignore -from google.api import monitored_resource_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.api.metric_pb2 as metric_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_v3.types import common @@ -247,12 +247,12 @@ class ListMetricDescriptorsResponse(proto.Message): def raw_page(self): return self - metric_descriptors: MutableSequence[ - metric_pb2.MetricDescriptor - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=metric_pb2.MetricDescriptor, + metric_descriptors: MutableSequence[metric_pb2.MetricDescriptor] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=metric_pb2.MetricDescriptor, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -405,6 +405,7 @@ class TimeSeriesView(proto.Enum): time series resource, but not the time series data. """ + FULL = 0 HEADERS = 1 diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/mutation_record.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/mutation_record.py index e9842b8b816f..ea409e8ad6c9 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/mutation_record.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/mutation_record.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/notification.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/notification.py index 071c5959c84d..696d8bf8a89c 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/notification.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/notification.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.api import label_pb2 # type: ignore -from google.api import launch_stage_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.api.label_pb2 as label_pb2 # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_v3.types import common, mutation_record @@ -234,6 +234,7 @@ class VerificationStatus(proto.Enum): someone on the project has access to messages that are delivered to that channel. """ + VERIFICATION_STATUS_UNSPECIFIED = 0 UNVERIFIED = 1 VERIFIED = 2 @@ -279,12 +280,12 @@ class VerificationStatus(proto.Enum): number=12, message=mutation_record.MutationRecord, ) - mutation_records: MutableSequence[ - mutation_record.MutationRecord - ] = proto.RepeatedField( - proto.MESSAGE, - number=13, - message=mutation_record.MutationRecord, + mutation_records: MutableSequence[mutation_record.MutationRecord] = ( + proto.RepeatedField( + proto.MESSAGE, + number=13, + message=mutation_record.MutationRecord, + ) ) diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/notification_service.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/notification_service.py index dadfcaa76efb..1f34e2692537 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/notification_service.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/notification_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_v3.types import notification @@ -105,12 +105,12 @@ class ListNotificationChannelDescriptorsResponse(proto.Message): def raw_page(self): return self - channel_descriptors: MutableSequence[ - notification.NotificationChannelDescriptor - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=notification.NotificationChannelDescriptor, + channel_descriptors: MutableSequence[notification.NotificationChannelDescriptor] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=notification.NotificationChannelDescriptor, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -261,12 +261,12 @@ class ListNotificationChannelsResponse(proto.Message): def raw_page(self): return self - notification_channels: MutableSequence[ - notification.NotificationChannel - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=notification.NotificationChannel, + notification_channels: MutableSequence[notification.NotificationChannel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=notification.NotificationChannel, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/service.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/service.py index 412552e58d16..d881db12ed58 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/service.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.type import calendar_period_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.type.calendar_period_pb2 as calendar_period_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -641,6 +641,7 @@ class View(proto.Enum): ``RequestBasedSli`` or ``WindowsBasedSli``, return the ``ServiceLevelIndicator`` as it was provided. """ + VIEW_UNSPECIFIED = 0 FULL = 2 EXPLICIT = 1 diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/service_service.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/service_service.py index e7176a725850..fc7a641e242b 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/service_service.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/service_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_v3.types import service as gm_service @@ -374,12 +374,12 @@ class ListServiceLevelObjectivesResponse(proto.Message): def raw_page(self): return self - service_level_objectives: MutableSequence[ - gm_service.ServiceLevelObjective - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gm_service.ServiceLevelObjective, + service_level_objectives: MutableSequence[gm_service.ServiceLevelObjective] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gm_service.ServiceLevelObjective, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/snooze_service.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/snooze_service.py index bc3748a4e12d..bd7919579097 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/snooze_service.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/snooze_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_v3.types import snooze as gm_snooze diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/uptime.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/uptime.py index 0faae7506737..b53cc1087e76 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/uptime.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/uptime.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.api import monitored_resource_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -64,6 +64,7 @@ class UptimeCheckRegion(proto.Enum): Allows checks to run from locations within the eastern United States of America """ + REGION_UNSPECIFIED = 0 USA = 1 EUROPE = 2 @@ -90,6 +91,7 @@ class GroupResourceType(proto.Enum): AWS_ELB_LOAD_BALANCER (2): A group of Amazon ELB load balancers. """ + RESOURCE_TYPE_UNSPECIFIED = 0 INSTANCE = 1 AWS_ELB_LOAD_BALANCER = 2 @@ -158,6 +160,7 @@ class State(proto.Enum): neither visible nor usable, so there is no "deleting" or "down" state. """ + UNSPECIFIED = 0 CREATING = 1 RUNNING = 2 @@ -365,6 +368,7 @@ class CheckerType(proto.Enum): When using ``VPC_CHECKERS``, the monitored resource type must be ``servicedirectory_service``. """ + CHECKER_TYPE_UNSPECIFIED = 0 STATIC_IP_CHECKERS = 1 VPC_CHECKERS = 3 @@ -526,6 +530,7 @@ class RequestMethod(proto.Enum): POST (2): POST request. """ + METHOD_UNSPECIFIED = 0 GET = 1 POST = 2 @@ -546,6 +551,7 @@ class ContentType(proto.Enum): setting the ``Content-Type`` to the contents of ``custom_content_type`` in the HTTP request. """ + TYPE_UNSPECIFIED = 0 URL_ENCODED = 1 USER_PROVIDED = 2 @@ -620,6 +626,7 @@ class StatusClass(proto.Enum): STATUS_CLASS_ANY (1000): The class of all status codes. """ + STATUS_CLASS_UNSPECIFIED = 0 STATUS_CLASS_1XX = 100 STATUS_CLASS_2XX = 200 @@ -663,6 +670,7 @@ class ServiceAgentAuthenticationType(proto.Enum): OIDC_TOKEN (1): OIDC Authentication """ + SERVICE_AGENT_AUTHENTICATION_TYPE_UNSPECIFIED = 0 OIDC_TOKEN = 1 @@ -824,6 +832,7 @@ class ContentMatcherOption(proto.Enum): does *NOT* match as specified. JSONPath is only supported for HTTP/HTTPS checks. """ + CONTENT_MATCHER_OPTION_UNSPECIFIED = 0 CONTAINS_STRING = 1 NOT_CONTAINS_STRING = 2 @@ -862,6 +871,7 @@ class JsonPathMatcherOption(proto.Enum): the content at the ``json_path`` within the output matches the regular expression specified in the ``content`` string. """ + JSON_PATH_MATCHER_OPTION_UNSPECIFIED = 0 EXACT_MATCH = 1 REGEX_MATCH = 2 diff --git a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/uptime_service.py b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/uptime_service.py index a73ce8d40b0c..7cce0ac66fce 100644 --- a/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/uptime_service.py +++ b/packages/google-cloud-monitoring/google/cloud/monitoring_v3/types/uptime_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.monitoring_v3.types import uptime @@ -109,12 +109,12 @@ class ListUptimeCheckConfigsResponse(proto.Message): def raw_page(self): return self - uptime_check_configs: MutableSequence[ - uptime.UptimeCheckConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=uptime.UptimeCheckConfig, + uptime_check_configs: MutableSequence[uptime.UptimeCheckConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=uptime.UptimeCheckConfig, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-monitoring/noxfile.py b/packages/google-cloud-monitoring/noxfile.py index 8364b2c75d85..1244ac9ca604 100644 --- a/packages/google-cloud-monitoring/noxfile.py +++ b/packages/google-cloud-monitoring/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_alert_policy_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_alert_policy_service.py index 366e1313805d..729bebfb15c7 100644 --- a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_alert_policy_service.py +++ b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_alert_policy_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,22 +39,27 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.monitoring_v3.services.alert_policy_service import ( AlertPolicyServiceAsyncClient, @@ -966,10 +971,9 @@ def test_alert_policy_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1018,9 @@ def test_alert_policy_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1053,10 +1056,9 @@ def test_alert_policy_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1297,13 +1299,13 @@ def test_alert_policy_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1428,9 +1430,9 @@ def test_list_alert_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_alert_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_alert_policies] = ( + mock_rpc + ) request = {} client.list_alert_policies(request) @@ -1975,9 +1977,9 @@ def test_get_alert_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_alert_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_alert_policy] = ( + mock_rpc + ) request = {} client.get_alert_policy(request) @@ -2318,9 +2320,9 @@ def test_create_alert_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_alert_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_alert_policy] = ( + mock_rpc + ) request = {} client.create_alert_policy(request) @@ -2670,9 +2672,9 @@ def test_delete_alert_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_alert_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_alert_policy] = ( + mock_rpc + ) request = {} client.delete_alert_policy(request) @@ -3006,9 +3008,9 @@ def test_update_alert_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_alert_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_alert_policy] = ( + mock_rpc + ) request = {} client.update_alert_policy(request) @@ -3711,11 +3713,14 @@ def test_alert_policy_service_base_transport(): def test_alert_policy_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.monitoring_v3.services.alert_policy_service.transports.AlertPolicyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.monitoring_v3.services.alert_policy_service.transports.AlertPolicyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlertPolicyServiceTransport( @@ -3736,9 +3741,12 @@ def test_alert_policy_service_base_transport_with_credentials_file(): def test_alert_policy_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.monitoring_v3.services.alert_policy_service.transports.AlertPolicyServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.monitoring_v3.services.alert_policy_service.transports.AlertPolicyServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AlertPolicyServiceTransport() @@ -3817,11 +3825,12 @@ def test_alert_policy_service_transport_auth_gdch_credentials(transport_class): def test_alert_policy_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_group_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_group_service.py index 66dd8bff0523..5a296dd31580 100644 --- a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_group_service.py +++ b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_group_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,17 +39,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import monitored_resource_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore +import google.auth +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.monitoring_v3.services.group_service import ( GroupServiceAsyncClient, @@ -57,10 +62,8 @@ pagers, transports, ) -from google.cloud.monitoring_v3.types import common -from google.cloud.monitoring_v3.types import group +from google.cloud.monitoring_v3.types import common, group, group_service from google.cloud.monitoring_v3.types import group as gm_group -from google.cloud.monitoring_v3.types import group_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -913,10 +916,9 @@ def test_group_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -961,10 +963,9 @@ def test_group_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1000,10 +1001,9 @@ def test_group_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1240,13 +1240,13 @@ def test_group_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3214,9 +3214,9 @@ def test_list_group_members_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_group_members - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_group_members] = ( + mock_rpc + ) request = {} client.list_group_members(request) @@ -4150,11 +4150,14 @@ def test_group_service_base_transport(): def test_group_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.monitoring_v3.services.group_service.transports.GroupServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.monitoring_v3.services.group_service.transports.GroupServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroupServiceTransport( @@ -4175,9 +4178,12 @@ def test_group_service_base_transport_with_credentials_file(): def test_group_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.monitoring_v3.services.group_service.transports.GroupServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.monitoring_v3.services.group_service.transports.GroupServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroupServiceTransport() @@ -4256,11 +4262,12 @@ def test_group_service_transport_auth_gdch_credentials(transport_class): def test_group_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_metric_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_metric_service.py index c28a86344b01..74fbcacd85c0 100644 --- a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_metric_service.py +++ b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_metric_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,24 +39,29 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import distribution_pb2 # type: ignore -from google.api import label_pb2 # type: ignore -from google.api import launch_stage_pb2 # type: ignore -from google.api import metric_pb2 # type: ignore -from google.api import monitored_resource_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.api.distribution_pb2 as distribution_pb2 # type: ignore +import google.api.label_pb2 as label_pb2 # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.api.metric_pb2 as metric_pb2 # type: ignore +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.monitoring_v3.services.metric_service import ( MetricServiceAsyncClient, @@ -64,9 +69,8 @@ pagers, transports, ) -from google.cloud.monitoring_v3.types import common +from google.cloud.monitoring_v3.types import common, metric_service from google.cloud.monitoring_v3.types import metric as gm_metric -from google.cloud.monitoring_v3.types import metric_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -934,10 +938,9 @@ def test_metric_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -982,10 +985,9 @@ def test_metric_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1021,10 +1023,9 @@ def test_metric_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1265,13 +1266,13 @@ def test_metric_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2871,9 +2872,9 @@ def test_get_metric_descriptor_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_metric_descriptor - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_metric_descriptor] = ( + mock_rpc + ) request = {} client.get_metric_descriptor(request) @@ -3947,9 +3948,9 @@ def test_list_time_series_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_time_series - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_time_series] = ( + mock_rpc + ) request = {} client.list_time_series(request) @@ -4501,9 +4502,9 @@ def test_create_time_series_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_time_series - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_time_series] = ( + mock_rpc + ) request = {} client.create_time_series(request) @@ -5761,11 +5762,14 @@ def test_metric_service_base_transport(): def test_metric_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.monitoring_v3.services.metric_service.transports.MetricServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.monitoring_v3.services.metric_service.transports.MetricServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetricServiceTransport( @@ -5787,9 +5791,12 @@ def test_metric_service_base_transport_with_credentials_file(): def test_metric_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.monitoring_v3.services.metric_service.transports.MetricServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.monitoring_v3.services.metric_service.transports.MetricServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MetricServiceTransport() @@ -5870,11 +5877,12 @@ def test_metric_service_transport_auth_gdch_credentials(transport_class): def test_metric_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_notification_channel_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_notification_channel_service.py index e85b9aa73b8f..f078f1b104a3 100644 --- a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_notification_channel_service.py +++ b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_notification_channel_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,20 +39,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import label_pb2 # type: ignore -from google.api import launch_stage_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.api.label_pb2 as label_pb2 # type: ignore +import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.monitoring_v3.services.notification_channel_service import ( NotificationChannelServiceAsyncClient, @@ -998,10 +1003,9 @@ def test_notification_channel_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1046,10 +1050,9 @@ def test_notification_channel_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1085,10 +1088,9 @@ def test_notification_channel_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1336,13 +1338,13 @@ def test_notification_channel_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6101,11 +6103,14 @@ def test_notification_channel_service_base_transport(): def test_notification_channel_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.monitoring_v3.services.notification_channel_service.transports.NotificationChannelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.monitoring_v3.services.notification_channel_service.transports.NotificationChannelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NotificationChannelServiceTransport( @@ -6126,9 +6131,12 @@ def test_notification_channel_service_base_transport_with_credentials_file(): def test_notification_channel_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.monitoring_v3.services.notification_channel_service.transports.NotificationChannelServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.monitoring_v3.services.notification_channel_service.transports.NotificationChannelServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NotificationChannelServiceTransport() @@ -6209,11 +6217,12 @@ def test_notification_channel_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_query_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_query_service.py index 1960be7996e9..d5a251ac9a3d 100644 --- a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_query_service.py +++ b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_query_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,11 +39,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -908,10 +913,9 @@ def test_query_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -956,10 +960,9 @@ def test_query_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -995,10 +998,9 @@ def test_query_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1235,13 +1237,13 @@ def test_query_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1360,9 +1362,9 @@ def test_query_time_series_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_time_series - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_time_series] = ( + mock_rpc + ) request = {} client.query_time_series(request) @@ -1948,11 +1950,14 @@ def test_query_service_base_transport(): def test_query_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.monitoring_v3.services.query_service.transports.QueryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.monitoring_v3.services.query_service.transports.QueryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.QueryServiceTransport( @@ -1973,9 +1978,12 @@ def test_query_service_base_transport_with_credentials_file(): def test_query_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.monitoring_v3.services.query_service.transports.QueryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.monitoring_v3.services.query_service.transports.QueryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.QueryServiceTransport() @@ -2054,11 +2062,12 @@ def test_query_service_transport_auth_gdch_credentials(transport_class): def test_query_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_service_monitoring_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_service_monitoring_service.py index 794c9fa199bb..907f41ea5e44 100644 --- a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_service_monitoring_service.py +++ b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_service_monitoring_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,18 +39,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.type.calendar_period_pb2 as calendar_period_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.type import calendar_period_pb2 # type: ignore from google.cloud.monitoring_v3.services.service_monitoring_service import ( ServiceMonitoringServiceAsyncClient, @@ -58,9 +63,8 @@ pagers, transports, ) -from google.cloud.monitoring_v3.types import service +from google.cloud.monitoring_v3.types import service, service_service from google.cloud.monitoring_v3.types import service as gm_service -from google.cloud.monitoring_v3.types import service_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -976,10 +980,9 @@ def test_service_monitoring_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1027,9 @@ def test_service_monitoring_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1065,9 @@ def test_service_monitoring_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1312,13 +1313,13 @@ def test_service_monitoring_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5781,11 +5782,14 @@ def test_service_monitoring_service_base_transport(): def test_service_monitoring_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.monitoring_v3.services.service_monitoring_service.transports.ServiceMonitoringServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.monitoring_v3.services.service_monitoring_service.transports.ServiceMonitoringServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServiceMonitoringServiceTransport( @@ -5806,9 +5810,12 @@ def test_service_monitoring_service_base_transport_with_credentials_file(): def test_service_monitoring_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.monitoring_v3.services.service_monitoring_service.transports.ServiceMonitoringServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.monitoring_v3.services.service_monitoring_service.transports.ServiceMonitoringServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServiceMonitoringServiceTransport() @@ -5889,11 +5896,12 @@ def test_service_monitoring_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_snooze_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_snooze_service.py index f0047dfa9bdf..eb5ff092a46a 100644 --- a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_snooze_service.py +++ b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_snooze_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,17 +39,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.monitoring_v3.services.snooze_service import ( SnoozeServiceAsyncClient, @@ -57,10 +62,8 @@ pagers, transports, ) -from google.cloud.monitoring_v3.types import common -from google.cloud.monitoring_v3.types import snooze +from google.cloud.monitoring_v3.types import common, snooze, snooze_service from google.cloud.monitoring_v3.types import snooze as gm_snooze -from google.cloud.monitoring_v3.types import snooze_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -928,10 +931,9 @@ def test_snooze_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +978,9 @@ def test_snooze_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1016,9 @@ def test_snooze_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1259,13 +1259,13 @@ def test_snooze_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3165,11 +3165,14 @@ def test_snooze_service_base_transport(): def test_snooze_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.monitoring_v3.services.snooze_service.transports.SnoozeServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.monitoring_v3.services.snooze_service.transports.SnoozeServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SnoozeServiceTransport( @@ -3190,9 +3193,12 @@ def test_snooze_service_base_transport_with_credentials_file(): def test_snooze_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.monitoring_v3.services.snooze_service.transports.SnoozeServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.monitoring_v3.services.snooze_service.transports.SnoozeServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SnoozeServiceTransport() @@ -3271,11 +3277,12 @@ def test_snooze_service_transport_auth_gdch_credentials(transport_class): def test_snooze_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_uptime_check_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_uptime_check_service.py index f05f13828099..5b050cc82293 100644 --- a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_uptime_check_service.py +++ b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_uptime_check_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,18 +39,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api import monitored_resource_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore from google.cloud.monitoring_v3.services.uptime_check_service import ( UptimeCheckServiceAsyncClient, @@ -957,10 +962,9 @@ def test_uptime_check_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1005,10 +1009,9 @@ def test_uptime_check_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1044,10 +1047,9 @@ def test_uptime_check_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1288,13 +1290,13 @@ def test_uptime_check_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3393,9 +3395,9 @@ def test_list_uptime_check_ips_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_uptime_check_ips - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_uptime_check_ips] = ( + mock_rpc + ) request = {} client.list_uptime_check_ips(request) @@ -4190,11 +4192,14 @@ def test_uptime_check_service_base_transport(): def test_uptime_check_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.monitoring_v3.services.uptime_check_service.transports.UptimeCheckServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.monitoring_v3.services.uptime_check_service.transports.UptimeCheckServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UptimeCheckServiceTransport( @@ -4215,9 +4220,12 @@ def test_uptime_check_service_base_transport_with_credentials_file(): def test_uptime_check_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.monitoring_v3.services.uptime_check_service.transports.UptimeCheckServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.monitoring_v3.services.uptime_check_service.transports.UptimeCheckServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UptimeCheckServiceTransport() @@ -4296,11 +4304,12 @@ def test_uptime_check_service_transport_auth_gdch_credentials(transport_class): def test_uptime_check_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-netapp/docs/conf.py b/packages/google-cloud-netapp/docs/conf.py index 8479dd00f2a3..8437de85beb6 100644 --- a/packages/google-cloud-netapp/docs/conf.py +++ b/packages/google-cloud-netapp/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-netapp documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/__init__.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/__init__.py index c8538bb711c0..c5c56d07791a 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/__init__.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.net_app import NetAppAsyncClient, NetAppClient from .types.active_directory import ( ActiveDirectory, diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/async_client.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/async_client.py index bfa2632a22e8..75417fab3365 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/async_client.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.netapp_v1 import gapic_version as package_version @@ -44,36 +44,39 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.netapp_v1.services.net_app import pagers +from google.cloud.netapp_v1.types import ( + active_directory, + backup, + backup_policy, + backup_vault, + cloud_netapp_service, + common, + host_group, + kms, + quota_rule, + replication, + snapshot, + storage_pool, + volume, +) from google.cloud.netapp_v1.types import active_directory as gcn_active_directory -from google.cloud.netapp_v1.types import active_directory -from google.cloud.netapp_v1.types import backup from google.cloud.netapp_v1.types import backup as gcn_backup -from google.cloud.netapp_v1.types import backup_policy from google.cloud.netapp_v1.types import backup_policy as gcn_backup_policy -from google.cloud.netapp_v1.types import backup_vault from google.cloud.netapp_v1.types import backup_vault as gcn_backup_vault -from google.cloud.netapp_v1.types import cloud_netapp_service, common -from google.cloud.netapp_v1.types import host_group from google.cloud.netapp_v1.types import host_group as gcn_host_group -from google.cloud.netapp_v1.types import kms -from google.cloud.netapp_v1.types import quota_rule from google.cloud.netapp_v1.types import quota_rule as gcn_quota_rule -from google.cloud.netapp_v1.types import replication from google.cloud.netapp_v1.types import replication as gcn_replication -from google.cloud.netapp_v1.types import snapshot from google.cloud.netapp_v1.types import snapshot as gcn_snapshot -from google.cloud.netapp_v1.types import storage_pool from google.cloud.netapp_v1.types import storage_pool as gcn_storage_pool -from google.cloud.netapp_v1.types import volume from google.cloud.netapp_v1.types import volume as gcn_volume from .client import NetAppClient @@ -154,7 +157,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: NetAppAsyncClient: The constructed client. """ - return NetAppClient.from_service_account_info.__func__(NetAppAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = NetAppClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(NetAppAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -170,7 +174,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: NetAppAsyncClient: The constructed client. """ - return NetAppClient.from_service_account_file.__func__(NetAppAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = NetAppClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(NetAppAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/client.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/client.py index e842865d9cec..6f8cc1f68bdb 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/client.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.netapp_v1 import gapic_version as package_version @@ -61,36 +61,39 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.netapp_v1.services.net_app import pagers +from google.cloud.netapp_v1.types import ( + active_directory, + backup, + backup_policy, + backup_vault, + cloud_netapp_service, + common, + host_group, + kms, + quota_rule, + replication, + snapshot, + storage_pool, + volume, +) from google.cloud.netapp_v1.types import active_directory as gcn_active_directory -from google.cloud.netapp_v1.types import active_directory -from google.cloud.netapp_v1.types import backup from google.cloud.netapp_v1.types import backup as gcn_backup -from google.cloud.netapp_v1.types import backup_policy from google.cloud.netapp_v1.types import backup_policy as gcn_backup_policy -from google.cloud.netapp_v1.types import backup_vault from google.cloud.netapp_v1.types import backup_vault as gcn_backup_vault -from google.cloud.netapp_v1.types import cloud_netapp_service, common -from google.cloud.netapp_v1.types import host_group from google.cloud.netapp_v1.types import host_group as gcn_host_group -from google.cloud.netapp_v1.types import kms -from google.cloud.netapp_v1.types import quota_rule from google.cloud.netapp_v1.types import quota_rule as gcn_quota_rule -from google.cloud.netapp_v1.types import replication from google.cloud.netapp_v1.types import replication as gcn_replication -from google.cloud.netapp_v1.types import snapshot from google.cloud.netapp_v1.types import snapshot as gcn_snapshot -from google.cloud.netapp_v1.types import storage_pool from google.cloud.netapp_v1.types import storage_pool as gcn_storage_pool -from google.cloud.netapp_v1.types import volume from google.cloud.netapp_v1.types import volume as gcn_volume from .transports.base import DEFAULT_CLIENT_INFO, NetAppTransport @@ -894,11 +897,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetAppClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetAppClient._read_environment_variables() + ) self._client_cert_source = NetAppClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -933,8 +934,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetAppTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/pagers.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/pagers.py index 743a0cdd7c24..a621d2fb4f13 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/pagers.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/pagers.py @@ -79,7 +79,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -155,7 +155,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -235,7 +235,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -391,7 +391,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -467,7 +467,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -547,7 +547,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -625,7 +625,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -707,7 +707,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -783,7 +783,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -863,7 +863,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -939,7 +939,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1019,7 +1019,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1095,7 +1095,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1175,7 +1175,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1251,7 +1251,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1331,7 +1331,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1407,7 +1407,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1487,7 +1487,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1563,7 +1563,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1643,7 +1643,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1719,7 +1719,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/base.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/base.py index 2e1340424b25..e987f9b73fed 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/base.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/base.py @@ -17,37 +17,39 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.netapp_v1 import gapic_version as package_version +from google.cloud.netapp_v1.types import ( + active_directory, + backup, + backup_policy, + backup_vault, + host_group, + kms, + quota_rule, + replication, + snapshot, + storage_pool, + volume, +) from google.cloud.netapp_v1.types import active_directory as gcn_active_directory -from google.cloud.netapp_v1.types import active_directory -from google.cloud.netapp_v1.types import backup from google.cloud.netapp_v1.types import backup as gcn_backup -from google.cloud.netapp_v1.types import backup_policy from google.cloud.netapp_v1.types import backup_policy as gcn_backup_policy -from google.cloud.netapp_v1.types import backup_vault from google.cloud.netapp_v1.types import backup_vault as gcn_backup_vault -from google.cloud.netapp_v1.types import host_group from google.cloud.netapp_v1.types import host_group as gcn_host_group -from google.cloud.netapp_v1.types import kms -from google.cloud.netapp_v1.types import quota_rule from google.cloud.netapp_v1.types import quota_rule as gcn_quota_rule -from google.cloud.netapp_v1.types import replication from google.cloud.netapp_v1.types import replication as gcn_replication -from google.cloud.netapp_v1.types import snapshot from google.cloud.netapp_v1.types import snapshot as gcn_snapshot -from google.cloud.netapp_v1.types import storage_pool from google.cloud.netapp_v1.types import storage_pool as gcn_storage_pool -from google.cloud.netapp_v1.types import volume from google.cloud.netapp_v1.types import volume as gcn_volume DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -1337,13 +1339,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/grpc.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/grpc.py index 46f149b9c7c0..9dd740c8facd 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/grpc.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/grpc.py @@ -16,40 +16,42 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.netapp_v1.types import ( + active_directory, + backup, + backup_policy, + backup_vault, + host_group, + kms, + quota_rule, + replication, + snapshot, + storage_pool, + volume, +) from google.cloud.netapp_v1.types import active_directory as gcn_active_directory -from google.cloud.netapp_v1.types import active_directory -from google.cloud.netapp_v1.types import backup from google.cloud.netapp_v1.types import backup as gcn_backup -from google.cloud.netapp_v1.types import backup_policy from google.cloud.netapp_v1.types import backup_policy as gcn_backup_policy -from google.cloud.netapp_v1.types import backup_vault from google.cloud.netapp_v1.types import backup_vault as gcn_backup_vault -from google.cloud.netapp_v1.types import host_group from google.cloud.netapp_v1.types import host_group as gcn_host_group -from google.cloud.netapp_v1.types import kms -from google.cloud.netapp_v1.types import quota_rule from google.cloud.netapp_v1.types import quota_rule as gcn_quota_rule -from google.cloud.netapp_v1.types import replication from google.cloud.netapp_v1.types import replication as gcn_replication -from google.cloud.netapp_v1.types import snapshot from google.cloud.netapp_v1.types import snapshot as gcn_snapshot -from google.cloud.netapp_v1.types import storage_pool from google.cloud.netapp_v1.types import storage_pool as gcn_storage_pool -from google.cloud.netapp_v1.types import volume from google.cloud.netapp_v1.types import volume as gcn_volume from .base import DEFAULT_CLIENT_INFO, NetAppTransport @@ -523,12 +525,12 @@ def validate_directory_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "validate_directory_service" not in self._stubs: - self._stubs[ - "validate_directory_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.netapp.v1.NetApp/ValidateDirectoryService", - request_serializer=storage_pool.ValidateDirectoryServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["validate_directory_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.netapp.v1.NetApp/ValidateDirectoryService", + request_serializer=storage_pool.ValidateDirectoryServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["validate_directory_service"] @@ -554,12 +556,12 @@ def switch_active_replica_zone( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "switch_active_replica_zone" not in self._stubs: - self._stubs[ - "switch_active_replica_zone" - ] = self._logged_channel.unary_unary( - "/google.cloud.netapp.v1.NetApp/SwitchActiveReplicaZone", - request_serializer=storage_pool.SwitchActiveReplicaZoneRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["switch_active_replica_zone"] = ( + self._logged_channel.unary_unary( + "/google.cloud.netapp.v1.NetApp/SwitchActiveReplicaZone", + request_serializer=storage_pool.SwitchActiveReplicaZoneRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["switch_active_replica_zone"] @@ -1382,12 +1384,12 @@ def reverse_replication_direction( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "reverse_replication_direction" not in self._stubs: - self._stubs[ - "reverse_replication_direction" - ] = self._logged_channel.unary_unary( - "/google.cloud.netapp.v1.NetApp/ReverseReplicationDirection", - request_serializer=replication.ReverseReplicationDirectionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["reverse_replication_direction"] = ( + self._logged_channel.unary_unary( + "/google.cloud.netapp.v1.NetApp/ReverseReplicationDirection", + request_serializer=replication.ReverseReplicationDirectionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["reverse_replication_direction"] diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/grpc_asyncio.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/grpc_asyncio.py index 11f2220722fd..350e6824ef69 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/grpc_asyncio.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,31 +31,30 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.netapp_v1.types import ( + active_directory, + backup, + backup_policy, + backup_vault, + host_group, + kms, + quota_rule, + replication, + snapshot, + storage_pool, + volume, +) from google.cloud.netapp_v1.types import active_directory as gcn_active_directory -from google.cloud.netapp_v1.types import active_directory -from google.cloud.netapp_v1.types import backup from google.cloud.netapp_v1.types import backup as gcn_backup -from google.cloud.netapp_v1.types import backup_policy from google.cloud.netapp_v1.types import backup_policy as gcn_backup_policy -from google.cloud.netapp_v1.types import backup_vault from google.cloud.netapp_v1.types import backup_vault as gcn_backup_vault -from google.cloud.netapp_v1.types import host_group from google.cloud.netapp_v1.types import host_group as gcn_host_group -from google.cloud.netapp_v1.types import kms -from google.cloud.netapp_v1.types import quota_rule from google.cloud.netapp_v1.types import quota_rule as gcn_quota_rule -from google.cloud.netapp_v1.types import replication from google.cloud.netapp_v1.types import replication as gcn_replication -from google.cloud.netapp_v1.types import snapshot from google.cloud.netapp_v1.types import snapshot as gcn_snapshot -from google.cloud.netapp_v1.types import storage_pool from google.cloud.netapp_v1.types import storage_pool as gcn_storage_pool -from google.cloud.netapp_v1.types import volume from google.cloud.netapp_v1.types import volume as gcn_volume from .base import DEFAULT_CLIENT_INFO, NetAppTransport @@ -537,12 +539,12 @@ def validate_directory_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "validate_directory_service" not in self._stubs: - self._stubs[ - "validate_directory_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.netapp.v1.NetApp/ValidateDirectoryService", - request_serializer=storage_pool.ValidateDirectoryServiceRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["validate_directory_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.netapp.v1.NetApp/ValidateDirectoryService", + request_serializer=storage_pool.ValidateDirectoryServiceRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["validate_directory_service"] @@ -569,12 +571,12 @@ def switch_active_replica_zone( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "switch_active_replica_zone" not in self._stubs: - self._stubs[ - "switch_active_replica_zone" - ] = self._logged_channel.unary_unary( - "/google.cloud.netapp.v1.NetApp/SwitchActiveReplicaZone", - request_serializer=storage_pool.SwitchActiveReplicaZoneRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["switch_active_replica_zone"] = ( + self._logged_channel.unary_unary( + "/google.cloud.netapp.v1.NetApp/SwitchActiveReplicaZone", + request_serializer=storage_pool.SwitchActiveReplicaZoneRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["switch_active_replica_zone"] @@ -1431,12 +1433,12 @@ def reverse_replication_direction( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "reverse_replication_direction" not in self._stubs: - self._stubs[ - "reverse_replication_direction" - ] = self._logged_channel.unary_unary( - "/google.cloud.netapp.v1.NetApp/ReverseReplicationDirection", - request_serializer=replication.ReverseReplicationDirectionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["reverse_replication_direction"] = ( + self._logged_channel.unary_unary( + "/google.cloud.netapp.v1.NetApp/ReverseReplicationDirection", + request_serializer=replication.ReverseReplicationDirectionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["reverse_replication_direction"] diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/rest.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/rest.py index d3a58553ba06..f110055041f8 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/rest.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/rest.py @@ -16,40 +16,42 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.netapp_v1.types import ( + active_directory, + backup, + backup_policy, + backup_vault, + host_group, + kms, + quota_rule, + replication, + snapshot, + storage_pool, + volume, +) from google.cloud.netapp_v1.types import active_directory as gcn_active_directory -from google.cloud.netapp_v1.types import active_directory -from google.cloud.netapp_v1.types import backup from google.cloud.netapp_v1.types import backup as gcn_backup -from google.cloud.netapp_v1.types import backup_policy from google.cloud.netapp_v1.types import backup_policy as gcn_backup_policy -from google.cloud.netapp_v1.types import backup_vault from google.cloud.netapp_v1.types import backup_vault as gcn_backup_vault -from google.cloud.netapp_v1.types import host_group from google.cloud.netapp_v1.types import host_group as gcn_host_group -from google.cloud.netapp_v1.types import kms -from google.cloud.netapp_v1.types import quota_rule from google.cloud.netapp_v1.types import quota_rule as gcn_quota_rule -from google.cloud.netapp_v1.types import replication from google.cloud.netapp_v1.types import replication as gcn_replication -from google.cloud.netapp_v1.types import snapshot from google.cloud.netapp_v1.types import snapshot as gcn_snapshot -from google.cloud.netapp_v1.types import storage_pool from google.cloud.netapp_v1.types import storage_pool as gcn_storage_pool -from google.cloud.netapp_v1.types import volume from google.cloud.netapp_v1.types import volume as gcn_volume from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -4145,7 +4147,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4298,7 +4300,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4456,7 +4458,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4616,7 +4618,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4774,7 +4776,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4932,7 +4934,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5090,7 +5092,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5250,7 +5252,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5404,7 +5406,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5564,7 +5566,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5717,7 +5719,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5866,7 +5868,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6013,7 +6015,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6163,7 +6165,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6315,7 +6317,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6467,7 +6469,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6619,7 +6621,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6771,7 +6773,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6923,7 +6925,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7071,7 +7073,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7223,7 +7225,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7370,7 +7372,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7523,7 +7525,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7684,7 +7686,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11157,7 +11159,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11317,7 +11319,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11446,9 +11448,7 @@ def __call__( """ - http_options = ( - _BaseNetAppRestTransport._BaseReverseReplicationDirection._get_http_options() - ) + http_options = _BaseNetAppRestTransport._BaseReverseReplicationDirection._get_http_options() request, metadata = self._interceptor.pre_reverse_replication_direction( request, metadata @@ -11474,7 +11474,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11515,11 +11515,10 @@ def __call__( resp = self._interceptor.post_reverse_replication_direction(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_reverse_replication_direction_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_reverse_replication_direction_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -11631,7 +11630,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11789,7 +11788,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11917,9 +11916,7 @@ def __call__( """ - http_options = ( - _BaseNetAppRestTransport._BaseSwitchActiveReplicaZone._get_http_options() - ) + http_options = _BaseNetAppRestTransport._BaseSwitchActiveReplicaZone._get_http_options() request, metadata = self._interceptor.pre_switch_active_replica_zone( request, metadata @@ -11945,7 +11942,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12103,7 +12100,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12257,7 +12254,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12411,7 +12408,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12569,7 +12566,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12730,7 +12727,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12888,7 +12885,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -13046,7 +13043,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -13204,7 +13201,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -13365,7 +13362,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -13520,7 +13517,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -13680,7 +13677,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -13833,7 +13830,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -13961,9 +13958,7 @@ def __call__( """ - http_options = ( - _BaseNetAppRestTransport._BaseValidateDirectoryService._get_http_options() - ) + http_options = _BaseNetAppRestTransport._BaseValidateDirectoryService._get_http_options() request, metadata = self._interceptor.pre_validate_directory_service( request, metadata @@ -13989,7 +13984,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -14630,7 +14625,9 @@ def reverse_replication_direction( ]: # 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._ReverseReplicationDirection(self._session, self._host, self._interceptor) # type: ignore + return self._ReverseReplicationDirection( + self._session, self._host, self._interceptor + ) # type: ignore @property def revert_volume( @@ -14656,7 +14653,9 @@ def switch_active_replica_zone( ]: # 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._SwitchActiveReplicaZone(self._session, self._host, self._interceptor) # type: ignore + return self._SwitchActiveReplicaZone( + self._session, self._host, self._interceptor + ) # type: ignore @property def sync_replication( @@ -14770,7 +14769,9 @@ def validate_directory_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._ValidateDirectoryService(self._session, self._host, self._interceptor) # type: ignore + return self._ValidateDirectoryService( + self._session, self._host, self._interceptor + ) # type: ignore @property def verify_kms_config( diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/rest_base.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/rest_base.py index b7a36c25a296..c1c5b77222a0 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/rest_base.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/services/net_app/transports/rest_base.py @@ -22,26 +22,28 @@ from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.netapp_v1.types import ( + active_directory, + backup, + backup_policy, + backup_vault, + host_group, + kms, + quota_rule, + replication, + snapshot, + storage_pool, + volume, +) from google.cloud.netapp_v1.types import active_directory as gcn_active_directory -from google.cloud.netapp_v1.types import active_directory -from google.cloud.netapp_v1.types import backup from google.cloud.netapp_v1.types import backup as gcn_backup -from google.cloud.netapp_v1.types import backup_policy from google.cloud.netapp_v1.types import backup_policy as gcn_backup_policy -from google.cloud.netapp_v1.types import backup_vault from google.cloud.netapp_v1.types import backup_vault as gcn_backup_vault -from google.cloud.netapp_v1.types import host_group from google.cloud.netapp_v1.types import host_group as gcn_host_group -from google.cloud.netapp_v1.types import kms -from google.cloud.netapp_v1.types import quota_rule from google.cloud.netapp_v1.types import quota_rule as gcn_quota_rule -from google.cloud.netapp_v1.types import replication from google.cloud.netapp_v1.types import replication as gcn_replication -from google.cloud.netapp_v1.types import snapshot from google.cloud.netapp_v1.types import snapshot as gcn_snapshot -from google.cloud.netapp_v1.types import storage_pool from google.cloud.netapp_v1.types import storage_pool as gcn_storage_pool -from google.cloud.netapp_v1.types import volume from google.cloud.netapp_v1.types import volume as gcn_volume from .base import DEFAULT_CLIENT_INFO, NetAppTransport diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/__init__.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/__init__.py index 2b2d623c3e6c..6741c6f7b657 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/__init__.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/__init__.py @@ -49,7 +49,9 @@ ListBackupVaultsResponse, UpdateBackupVaultRequest, ) -from .cloud_netapp_service import OperationMetadata +from .cloud_netapp_service import ( + OperationMetadata, +) from .common import ( DirectoryServiceType, EncryptionType, diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/active_directory.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/active_directory.py index db6ee70666b1..fe4c01008208 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/active_directory.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/active_directory.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -295,6 +295,7 @@ class State(proto.Enum): DIAGNOSING (7): Active Directory State is Diagnosing. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/backup.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/backup.py index 7d6704d8f5c1..8b783e94c3fc 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/backup.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/backup.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -120,6 +120,7 @@ class State(proto.Enum): UPDATING (6): Backup is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 UPLOADING = 2 @@ -139,6 +140,7 @@ class Type(proto.Enum): SCHEDULED (2): Scheduled backup type. """ + TYPE_UNSPECIFIED = 0 MANUAL = 1 SCHEDULED = 2 diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/backup_policy.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/backup_policy.py index 27e6a0014c47..2e6ccf213d8f 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/backup_policy.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/backup_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -105,6 +105,7 @@ class State(proto.Enum): UPDATING (5): BackupPolicy is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/backup_vault.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/backup_vault.py index f6d25d1da347..55326847ed54 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/backup_vault.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/backup_vault.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -101,6 +101,7 @@ class State(proto.Enum): UPDATING (5): BackupVault is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -119,6 +120,7 @@ class BackupVaultType(proto.Enum): CROSS_REGION (2): BackupVault type is CROSS_REGION. """ + BACKUP_VAULT_TYPE_UNSPECIFIED = 0 IN_REGION = 1 CROSS_REGION = 2 @@ -139,6 +141,7 @@ class EncryptionState(proto.Enum): ENCRYPTION_STATE_FAILED (4): Encryption has failed. """ + ENCRYPTION_STATE_UNSPECIFIED = 0 ENCRYPTION_STATE_PENDING = 1 ENCRYPTION_STATE_COMPLETED = 2 diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/cloud_netapp_service.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/cloud_netapp_service.py index 1bfbec42d2f2..a3d5c31d7d58 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/cloud_netapp_service.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/cloud_netapp_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/common.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/common.py index 6d8c8762d4b2..61c11981c7f3 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/common.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/common.py @@ -51,6 +51,7 @@ class ServiceLevel(proto.Enum): FLEX (4): Flex service level. """ + SERVICE_LEVEL_UNSPECIFIED = 0 PREMIUM = 1 EXTREME = 2 @@ -69,6 +70,7 @@ class FlexPerformance(proto.Enum): FLEX_PERFORMANCE_CUSTOM (2): Flex Storage Pool with custom performance. """ + FLEX_PERFORMANCE_UNSPECIFIED = 0 FLEX_PERFORMANCE_DEFAULT = 1 FLEX_PERFORMANCE_CUSTOM = 2 @@ -87,6 +89,7 @@ class EncryptionType(proto.Enum): Customer managed encryption key, which is stored in KMS. """ + ENCRYPTION_TYPE_UNSPECIFIED = 0 SERVICE_MANAGED = 1 CLOUD_KMS = 2 @@ -102,6 +105,7 @@ class DirectoryServiceType(proto.Enum): Active directory policy attached to the storage pool. """ + DIRECTORY_SERVICE_TYPE_UNSPECIFIED = 0 ACTIVE_DIRECTORY = 1 @@ -119,6 +123,7 @@ class StoragePoolType(proto.Enum): UNIFIED_LARGE_CAPACITY (3): Storage pool type is unified large capacity. """ + STORAGE_POOL_TYPE_UNSPECIFIED = 0 FILE = 1 UNIFIED = 2 @@ -140,6 +145,7 @@ class HybridReplicationSchedule(proto.Enum): DAILY (3): Replication happens once every day. """ + HYBRID_REPLICATION_SCHEDULE_UNSPECIFIED = 0 EVERY_10_MINUTES = 1 HOURLY = 2 @@ -157,6 +163,7 @@ class QosType(proto.Enum): MANUAL (2): QoS Type is Manual """ + QOS_TYPE_UNSPECIFIED = 0 AUTO = 1 MANUAL = 2 @@ -175,6 +182,7 @@ class OsType(proto.Enum): ESXI (3): OS Type is VMware ESXi """ + OS_TYPE_UNSPECIFIED = 0 LINUX = 1 WINDOWS = 2 @@ -205,12 +213,12 @@ class LocationMetadata(proto.Message): number=1, enum="ServiceLevel", ) - supported_flex_performance: MutableSequence[ - "FlexPerformance" - ] = proto.RepeatedField( - proto.ENUM, - number=2, - enum="FlexPerformance", + supported_flex_performance: MutableSequence["FlexPerformance"] = ( + proto.RepeatedField( + proto.ENUM, + number=2, + enum="FlexPerformance", + ) ) has_vcp: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/host_group.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/host_group.py index f8008f4c4aca..1342e2cc438e 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/host_group.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/host_group.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.netapp_v1.types import common @@ -238,6 +238,7 @@ class Type(proto.Enum): ISCSI_INITIATOR (1): iSCSI initiator host group. """ + TYPE_UNSPECIFIED = 0 ISCSI_INITIATOR = 1 @@ -258,6 +259,7 @@ class State(proto.Enum): DISABLED (5): Host group is disabled. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/kms.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/kms.py index 36185f6285be..99a6cc051968 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/kms.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/kms.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -324,6 +324,7 @@ class State(proto.Enum): The existing volumes are migrating from SMEK to CMEK. """ + STATE_UNSPECIFIED = 0 READY = 1 CREATING = 2 diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/quota_rule.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/quota_rule.py index 240885e5c88b..fbb0fed84368 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/quota_rule.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/quota_rule.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -245,6 +245,7 @@ class Type(proto.Enum): DEFAULT_GROUP_QUOTA (4): Default group quota rule """ + TYPE_UNSPECIFIED = 0 INDIVIDUAL_USER_QUOTA = 1 INDIVIDUAL_GROUP_QUOTA = 2 @@ -268,6 +269,7 @@ class State(proto.Enum): ERROR (5): Quota rule is in error state. """ + STATE_UNSPECIFIED = 0 CREATING = 1 UPDATING = 2 diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/replication.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/replication.py index 7344c79630d7..8a2685ea66a0 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/replication.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/replication.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.netapp_v1.types import common, volume @@ -243,6 +243,7 @@ class State(proto.Enum): Onprem ONTAP is destination and Replication can only be managed from Onprem. """ + STATE_UNSPECIFIED = 0 CREATING = 1 READY = 2 @@ -266,6 +267,7 @@ class ReplicationRole(proto.Enum): DESTINATION (2): Indicates Destination volume. """ + REPLICATION_ROLE_UNSPECIFIED = 0 SOURCE = 1 DESTINATION = 2 @@ -285,6 +287,7 @@ class ReplicationSchedule(proto.Enum): DAILY (3): Replication happens once every day. """ + REPLICATION_SCHEDULE_UNSPECIFIED = 0 EVERY_10_MINUTES = 1 HOURLY = 2 @@ -317,6 +320,7 @@ class MirrorState(proto.Enum): PENDING_PEERING (8): Peering is yet to be established. """ + MIRROR_STATE_UNSPECIFIED = 0 PREPARING = 1 MIRRORED = 2 @@ -346,6 +350,7 @@ class HybridReplicationType(proto.Enum): Transfer in the reverse direction (GCNV is source and Onprem is destination) """ + HYBRID_REPLICATION_TYPE_UNSPECIFIED = 0 MIGRATION = 1 CONTINUOUS_REPLICATION = 2 diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/snapshot.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/snapshot.py index 9f18e5c0fbad..7b2105d69fb2 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/snapshot.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/snapshot.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -245,6 +245,7 @@ class State(proto.Enum): ERROR (6): Snapshot State is Error """ + STATE_UNSPECIFIED = 0 READY = 1 CREATING = 2 diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/storage_pool.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/storage_pool.py index cd5576f44efe..1862e5b4fd67 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/storage_pool.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/storage_pool.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.netapp_v1.types import common @@ -358,6 +358,7 @@ class State(proto.Enum): ERROR (7): Storage Pool State is Error """ + STATE_UNSPECIFIED = 0 READY = 1 CREATING = 2 diff --git a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/volume.py b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/volume.py index e59d08ae8123..c56a147da664 100644 --- a/packages/google-cloud-netapp/google/cloud/netapp_v1/types/volume.py +++ b/packages/google-cloud-netapp/google/cloud/netapp_v1/types/volume.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.netapp_v1.types import common @@ -77,6 +77,7 @@ class Protocols(proto.Enum): ISCSI (4): ISCSI protocol """ + PROTOCOLS_UNSPECIFIED = 0 NFSV3 = 1 NFSV4 = 2 @@ -98,6 +99,7 @@ class AccessType(proto.Enum): READ_NONE (3): None """ + ACCESS_TYPE_UNSPECIFIED = 0 READ_ONLY = 1 READ_WRITE = 2 @@ -131,6 +133,7 @@ class SMBSettings(proto.Enum): CONTINUOUSLY_AVAILABLE (9): Continuously available enumeration """ + SMB_SETTINGS_UNSPECIFIED = 0 ENCRYPT_DATA = 1 BROWSABLE = 2 @@ -154,6 +157,7 @@ class SecurityStyle(proto.Enum): UNIX (2): SecurityStyle uses UNIX """ + SECURITY_STYLE_UNSPECIFIED = 0 NTFS = 1 UNIX = 2 @@ -169,6 +173,7 @@ class RestrictedAction(proto.Enum): Prevent volume from being deleted when mounted. """ + RESTRICTED_ACTION_UNSPECIFIED = 0 DELETE = 1 @@ -524,6 +529,7 @@ class State(proto.Enum): READ_ONLY (9): Volume State is Read Only """ + STATE_UNSPECIFIED = 0 READY = 1 CREATING = 2 @@ -851,6 +857,7 @@ class SquashMode(proto.Enum): ALL_SQUASH (3): All users are squashed to anonymous user ID. """ + SQUASH_MODE_UNSPECIFIED = 0 NO_ROOT_SQUASH = 1 ROOT_SQUASH = 2 @@ -1328,6 +1335,7 @@ class TierAction(proto.Enum): new data. Existing data stays tiered until accessed. """ + TIER_ACTION_UNSPECIFIED = 0 ENABLED = 1 PAUSED = 2 @@ -1408,6 +1416,7 @@ class VolumeHybridReplicationType(proto.Enum): New field for reversible OnPrem replication, to be used for data protection. """ + VOLUME_HYBRID_REPLICATION_TYPE_UNSPECIFIED = 0 MIGRATION = 1 CONTINUOUS_REPLICATION = 2 @@ -1523,6 +1532,7 @@ class CacheState(proto.Enum): Terminal state wherein peering with origin volume's ONTAP cluster has failed. """ + CACHE_STATE_UNSPECIFIED = 0 PENDING_CLUSTER_PEERING = 1 PENDING_SVM_PEERING = 2 @@ -1628,6 +1638,7 @@ class CachePrePopulateState(proto.Enum): update request requested a prepopulation job but the prepopulate job failed. """ + CACHE_PRE_POPULATE_STATE_UNSPECIFIED = 0 NOT_NEEDED = 1 IN_PROGRESS = 2 diff --git a/packages/google-cloud-netapp/noxfile.py b/packages/google-cloud-netapp/noxfile.py index 8110599a8438..5a0affac13df 100644 --- a/packages/google-cloud-netapp/noxfile.py +++ b/packages/google-cloud-netapp/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-netapp/tests/unit/gapic/netapp_v1/test_net_app.py b/packages/google-cloud-netapp/tests/unit/gapic/netapp_v1/test_net_app.py index 6265ab7c8f30..c00cc32fb28c 100644 --- a/packages/google-cloud-netapp/tests/unit/gapic/netapp_v1/test_net_app.py +++ b/packages/google-cloud-netapp/tests/unit/gapic/netapp_v1/test_net_app.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,20 +59,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.netapp_v1.services.net_app import ( NetAppAsyncClient, @@ -73,27 +73,30 @@ pagers, transports, ) +from google.cloud.netapp_v1.types import ( + active_directory, + backup, + backup_policy, + backup_vault, + cloud_netapp_service, + common, + host_group, + kms, + quota_rule, + replication, + snapshot, + storage_pool, + volume, +) from google.cloud.netapp_v1.types import active_directory as gcn_active_directory -from google.cloud.netapp_v1.types import active_directory -from google.cloud.netapp_v1.types import backup from google.cloud.netapp_v1.types import backup as gcn_backup -from google.cloud.netapp_v1.types import backup_policy from google.cloud.netapp_v1.types import backup_policy as gcn_backup_policy -from google.cloud.netapp_v1.types import backup_vault from google.cloud.netapp_v1.types import backup_vault as gcn_backup_vault -from google.cloud.netapp_v1.types import cloud_netapp_service, common -from google.cloud.netapp_v1.types import host_group from google.cloud.netapp_v1.types import host_group as gcn_host_group -from google.cloud.netapp_v1.types import kms -from google.cloud.netapp_v1.types import quota_rule from google.cloud.netapp_v1.types import quota_rule as gcn_quota_rule -from google.cloud.netapp_v1.types import replication from google.cloud.netapp_v1.types import replication as gcn_replication -from google.cloud.netapp_v1.types import snapshot from google.cloud.netapp_v1.types import snapshot as gcn_snapshot -from google.cloud.netapp_v1.types import storage_pool from google.cloud.netapp_v1.types import storage_pool as gcn_storage_pool -from google.cloud.netapp_v1.types import volume from google.cloud.netapp_v1.types import volume as gcn_volume CRED_INFO_JSON = { @@ -931,10 +934,9 @@ def test_net_app_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +981,9 @@ def test_net_app_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1019,9 @@ def test_net_app_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1246,13 +1246,13 @@ def test_net_app_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1373,9 +1373,9 @@ def test_list_storage_pools_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_storage_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_storage_pools] = ( + mock_rpc + ) request = {} client.list_storage_pools(request) @@ -1917,9 +1917,9 @@ def test_create_storage_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_storage_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_storage_pool] = ( + mock_rpc + ) request = {} client.create_storage_pool(request) @@ -2338,9 +2338,9 @@ def test_get_storage_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_storage_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_storage_pool] = ( + mock_rpc + ) request = {} client.get_storage_pool(request) @@ -2720,9 +2720,9 @@ def test_update_storage_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_storage_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_storage_pool] = ( + mock_rpc + ) request = {} client.update_storage_pool(request) @@ -3076,9 +3076,9 @@ def test_delete_storage_pool_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_storage_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_storage_pool] = ( + mock_rpc + ) request = {} client.delete_storage_pool(request) @@ -8630,9 +8630,9 @@ def test_get_active_directory_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_active_directory - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_active_directory] = ( + mock_rpc + ) request = {} client.get_active_directory(request) @@ -10081,9 +10081,9 @@ def test_list_kms_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_kms_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_kms_configs] = ( + mock_rpc + ) request = {} client.list_kms_configs(request) @@ -10605,9 +10605,9 @@ def test_create_kms_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_kms_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_kms_config] = ( + mock_rpc + ) request = {} client.create_kms_config(request) @@ -11307,9 +11307,9 @@ def test_update_kms_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_kms_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_kms_config] = ( + mock_rpc + ) request = {} client.update_kms_config(request) @@ -11912,9 +11912,9 @@ def test_verify_kms_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.verify_kms_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.verify_kms_config] = ( + mock_rpc + ) request = {} client.verify_kms_config(request) @@ -12166,9 +12166,9 @@ def test_delete_kms_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_kms_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_kms_config] = ( + mock_rpc + ) request = {} client.delete_kms_config(request) @@ -12520,9 +12520,9 @@ def test_list_replications_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_replications - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_replications] = ( + mock_rpc + ) request = {} client.list_replications(request) @@ -13443,9 +13443,9 @@ def test_create_replication_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_replication] = ( + mock_rpc + ) request = {} client.create_replication(request) @@ -13809,9 +13809,9 @@ def test_delete_replication_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_replication] = ( + mock_rpc + ) request = {} client.delete_replication(request) @@ -14150,9 +14150,9 @@ def test_update_replication_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_replication] = ( + mock_rpc + ) request = {} client.update_replication(request) @@ -14500,9 +14500,9 @@ def test_stop_replication_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_replication] = ( + mock_rpc + ) request = {} client.stop_replication(request) @@ -14753,9 +14753,9 @@ def test_resume_replication_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_replication] = ( + mock_rpc + ) request = {} client.resume_replication(request) @@ -15277,9 +15277,9 @@ def test_establish_peering_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.establish_peering - ] = mock_rpc + client._transport._wrapped_methods[client._transport.establish_peering] = ( + mock_rpc + ) request = {} client.establish_peering(request) @@ -15530,9 +15530,9 @@ def test_sync_replication_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.sync_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.sync_replication] = ( + mock_rpc + ) request = {} client.sync_replication(request) @@ -15785,9 +15785,9 @@ def test_create_backup_vault_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_vault] = ( + mock_rpc + ) request = {} client.create_backup_vault(request) @@ -16173,9 +16173,9 @@ def test_get_backup_vault_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_vault] = ( + mock_rpc + ) request = {} client.get_backup_vault(request) @@ -16537,9 +16537,9 @@ def test_list_backup_vaults_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_vaults - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_vaults] = ( + mock_rpc + ) request = {} client.list_backup_vaults(request) @@ -17075,9 +17075,9 @@ def test_update_backup_vault_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_vault] = ( + mock_rpc + ) request = {} client.update_backup_vault(request) @@ -17431,9 +17431,9 @@ def test_delete_backup_vault_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_vault] = ( + mock_rpc + ) request = {} client.delete_backup_vault(request) @@ -19675,9 +19675,9 @@ def test_create_backup_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_policy] = ( + mock_rpc + ) request = {} client.create_backup_policy(request) @@ -20056,9 +20056,9 @@ def test_get_backup_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_policy] = ( + mock_rpc + ) request = {} client.get_backup_policy(request) @@ -20419,9 +20419,9 @@ def test_list_backup_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_policies] = ( + mock_rpc + ) request = {} client.list_backup_policies(request) @@ -20958,9 +20958,9 @@ def test_update_backup_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_policy] = ( + mock_rpc + ) request = {} client.update_backup_policy(request) @@ -21314,9 +21314,9 @@ def test_delete_backup_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_policy] = ( + mock_rpc + ) request = {} client.delete_backup_policy(request) @@ -21665,9 +21665,9 @@ def test_list_quota_rules_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_quota_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_quota_rules] = ( + mock_rpc + ) request = {} client.list_quota_rules(request) @@ -22536,9 +22536,9 @@ def test_create_quota_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_quota_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_quota_rule] = ( + mock_rpc + ) request = {} client.create_quota_rule(request) @@ -22895,9 +22895,9 @@ def test_update_quota_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_quota_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_quota_rule] = ( + mock_rpc + ) request = {} client.update_quota_rule(request) @@ -23248,9 +23248,9 @@ def test_delete_quota_rule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_quota_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_quota_rule] = ( + mock_rpc + ) request = {} client.delete_quota_rule(request) @@ -23597,9 +23597,9 @@ def test_restore_backup_files_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_backup_files - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_backup_files] = ( + mock_rpc + ) request = {} client.restore_backup_files(request) @@ -23861,9 +23861,9 @@ def test_list_host_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_host_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_host_groups] = ( + mock_rpc + ) request = {} client.list_host_groups(request) @@ -24728,9 +24728,9 @@ def test_create_host_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_host_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_host_group] = ( + mock_rpc + ) request = {} client.create_host_group(request) @@ -25087,9 +25087,9 @@ def test_update_host_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_host_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_host_group] = ( + mock_rpc + ) request = {} client.update_host_group(request) @@ -25440,9 +25440,9 @@ def test_delete_host_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_host_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_host_group] = ( + mock_rpc + ) request = {} client.delete_host_group(request) @@ -25720,9 +25720,9 @@ def test_list_storage_pools_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_storage_pools - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_storage_pools] = ( + mock_rpc + ) request = {} client.list_storage_pools(request) @@ -25984,9 +25984,9 @@ def test_create_storage_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_storage_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_storage_pool] = ( + mock_rpc + ) request = {} client.create_storage_pool(request) @@ -26192,9 +26192,9 @@ def test_get_storage_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_storage_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_storage_pool] = ( + mock_rpc + ) request = {} client.get_storage_pool(request) @@ -26376,9 +26376,9 @@ def test_update_storage_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_storage_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_storage_pool] = ( + mock_rpc + ) request = {} client.update_storage_pool(request) @@ -26569,9 +26569,9 @@ def test_delete_storage_pool_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_storage_pool - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_storage_pool] = ( + mock_rpc + ) request = {} client.delete_storage_pool(request) @@ -29419,9 +29419,9 @@ def test_get_active_directory_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_active_directory - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_active_directory] = ( + mock_rpc + ) request = {} client.get_active_directory(request) @@ -30190,9 +30190,9 @@ def test_list_kms_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_kms_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_kms_configs] = ( + mock_rpc + ) request = {} client.list_kms_configs(request) @@ -30447,9 +30447,9 @@ def test_create_kms_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_kms_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_kms_config] = ( + mock_rpc + ) request = {} client.create_kms_config(request) @@ -30831,9 +30831,9 @@ def test_update_kms_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_kms_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_kms_config] = ( + mock_rpc + ) request = {} client.update_kms_config(request) @@ -31142,9 +31142,9 @@ def test_verify_kms_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.verify_kms_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.verify_kms_config] = ( + mock_rpc + ) request = {} client.verify_kms_config(request) @@ -31265,9 +31265,9 @@ def test_delete_kms_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_kms_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_kms_config] = ( + mock_rpc + ) request = {} client.delete_kms_config(request) @@ -31445,9 +31445,9 @@ def test_list_replications_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_replications - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_replications] = ( + mock_rpc + ) request = {} client.list_replications(request) @@ -31893,9 +31893,9 @@ def test_create_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_replication] = ( + mock_rpc + ) request = {} client.create_replication(request) @@ -32105,9 +32105,9 @@ def test_delete_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_replication] = ( + mock_rpc + ) request = {} client.delete_replication(request) @@ -32288,9 +32288,9 @@ def test_update_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_replication] = ( + mock_rpc + ) request = {} client.update_replication(request) @@ -32479,9 +32479,9 @@ def test_stop_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_replication] = ( + mock_rpc + ) request = {} client.stop_replication(request) @@ -32605,9 +32605,9 @@ def test_resume_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.resume_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.resume_replication] = ( + mock_rpc + ) request = {} client.resume_replication(request) @@ -32858,9 +32858,9 @@ def test_establish_peering_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.establish_peering - ] = mock_rpc + client._transport._wrapped_methods[client._transport.establish_peering] = ( + mock_rpc + ) request = {} client.establish_peering(request) @@ -33004,9 +33004,9 @@ def test_sync_replication_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.sync_replication - ] = mock_rpc + client._transport._wrapped_methods[client._transport.sync_replication] = ( + mock_rpc + ) request = {} client.sync_replication(request) @@ -33130,9 +33130,9 @@ def test_create_backup_vault_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_vault] = ( + mock_rpc + ) request = {} client.create_backup_vault(request) @@ -33338,9 +33338,9 @@ def test_get_backup_vault_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_vault] = ( + mock_rpc + ) request = {} client.get_backup_vault(request) @@ -33522,9 +33522,9 @@ def test_list_backup_vaults_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_vaults - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_vaults] = ( + mock_rpc + ) request = {} client.list_backup_vaults(request) @@ -33786,9 +33786,9 @@ def test_update_backup_vault_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_vault] = ( + mock_rpc + ) request = {} client.update_backup_vault(request) @@ -33979,9 +33979,9 @@ def test_delete_backup_vault_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_vault - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_vault] = ( + mock_rpc + ) request = {} client.delete_backup_vault(request) @@ -35174,9 +35174,9 @@ def test_create_backup_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_backup_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_backup_policy] = ( + mock_rpc + ) request = {} client.create_backup_policy(request) @@ -35382,9 +35382,9 @@ def test_get_backup_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_backup_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_backup_policy] = ( + mock_rpc + ) request = {} client.get_backup_policy(request) @@ -35566,9 +35566,9 @@ def test_list_backup_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_backup_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_backup_policies] = ( + mock_rpc + ) request = {} client.list_backup_policies(request) @@ -35830,9 +35830,9 @@ def test_update_backup_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_backup_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_backup_policy] = ( + mock_rpc + ) request = {} client.update_backup_policy(request) @@ -36023,9 +36023,9 @@ def test_delete_backup_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_backup_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_backup_policy] = ( + mock_rpc + ) request = {} client.delete_backup_policy(request) @@ -36204,9 +36204,9 @@ def test_list_quota_rules_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_quota_rules - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_quota_rules] = ( + mock_rpc + ) request = {} client.list_quota_rules(request) @@ -36648,9 +36648,9 @@ def test_create_quota_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_quota_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_quota_rule] = ( + mock_rpc + ) request = {} client.create_quota_rule(request) @@ -36858,9 +36858,9 @@ def test_update_quota_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_quota_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_quota_rule] = ( + mock_rpc + ) request = {} client.update_quota_rule(request) @@ -37041,9 +37041,9 @@ def test_delete_quota_rule_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_quota_rule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_quota_rule] = ( + mock_rpc + ) request = {} client.delete_quota_rule(request) @@ -37224,9 +37224,9 @@ def test_restore_backup_files_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restore_backup_files - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restore_backup_files] = ( + mock_rpc + ) request = {} client.restore_backup_files(request) @@ -37365,9 +37365,9 @@ def test_list_host_groups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_host_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_host_groups] = ( + mock_rpc + ) request = {} client.list_host_groups(request) @@ -37803,9 +37803,9 @@ def test_create_host_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_host_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_host_group] = ( + mock_rpc + ) request = {} client.create_host_group(request) @@ -38010,9 +38010,9 @@ def test_update_host_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_host_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_host_group] = ( + mock_rpc + ) request = {} client.update_host_group(request) @@ -38193,9 +38193,9 @@ def test_delete_host_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_host_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_host_group] = ( + mock_rpc + ) request = {} client.delete_host_group(request) @@ -41875,8 +41875,9 @@ def test_list_storage_pools_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41939,17 +41940,19 @@ def test_list_storage_pools_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_list_storage_pools" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_list_storage_pools_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_list_storage_pools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_storage_pools" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_storage_pools_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_list_storage_pools" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42007,8 +42010,9 @@ def test_create_storage_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42164,19 +42168,20 @@ def test_create_storage_pool_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_create_storage_pool" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_create_storage_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_create_storage_pool" - ) as pre: + 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.NetAppRestInterceptor, "post_create_storage_pool" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_create_storage_pool_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_create_storage_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42229,8 +42234,9 @@ def test_get_storage_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42349,17 +42355,19 @@ def test_get_storage_pool_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_get_storage_pool" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_get_storage_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_get_storage_pool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_storage_pool" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_storage_pool_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_get_storage_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42416,8 +42424,9 @@ def test_update_storage_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42577,19 +42586,20 @@ def test_update_storage_pool_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_update_storage_pool" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_update_storage_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_update_storage_pool" - ) as pre: + 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.NetAppRestInterceptor, "post_update_storage_pool" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_update_storage_pool_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_update_storage_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42642,8 +42652,9 @@ def test_delete_storage_pool_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42698,19 +42709,20 @@ def test_delete_storage_pool_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_delete_storage_pool" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_delete_storage_pool_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_delete_storage_pool" - ) as pre: + 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.NetAppRestInterceptor, "post_delete_storage_pool" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_delete_storage_pool_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_delete_storage_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42763,8 +42775,9 @@ def test_validate_directory_service_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42819,20 +42832,21 @@ def test_validate_directory_service_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_validate_directory_service" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, - "post_validate_directory_service_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_validate_directory_service" - ) as pre: + 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.NetAppRestInterceptor, "post_validate_directory_service" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, + "post_validate_directory_service_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_validate_directory_service" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42885,8 +42899,9 @@ def test_switch_active_replica_zone_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42941,20 +42956,21 @@ def test_switch_active_replica_zone_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_switch_active_replica_zone" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, - "post_switch_active_replica_zone_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_switch_active_replica_zone" - ) as pre: + 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.NetAppRestInterceptor, "post_switch_active_replica_zone" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, + "post_switch_active_replica_zone_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_switch_active_replica_zone" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43005,8 +43021,9 @@ def test_list_volumes_rest_bad_request(request_type=volume.ListVolumesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43069,17 +43086,17 @@ def test_list_volumes_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_list_volumes" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_list_volumes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_list_volumes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_volumes" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_volumes_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetAppRestInterceptor, "pre_list_volumes") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43128,8 +43145,9 @@ def test_get_volume_rest_bad_request(request_type=volume.GetVolumeRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43250,17 +43268,15 @@ def test_get_volume_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_get_volume" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_get_volume_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_get_volume" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NetAppRestInterceptor, "post_get_volume") as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_volume_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetAppRestInterceptor, "pre_get_volume") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43309,8 +43325,9 @@ def test_create_volume_rest_bad_request(request_type=gcn_volume.CreateVolumeRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43587,19 +43604,18 @@ def test_create_volume_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_create_volume" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_create_volume_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_create_volume" - ) as pre: + 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.NetAppRestInterceptor, "post_create_volume" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_create_volume_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetAppRestInterceptor, "pre_create_volume") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43650,8 +43666,9 @@ def test_update_volume_rest_bad_request(request_type=gcn_volume.UpdateVolumeRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43930,19 +43947,18 @@ def test_update_volume_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_update_volume" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_update_volume_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_update_volume" - ) as pre: + 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.NetAppRestInterceptor, "post_update_volume" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_update_volume_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetAppRestInterceptor, "pre_update_volume") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43991,8 +44007,9 @@ def test_delete_volume_rest_bad_request(request_type=volume.DeleteVolumeRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44047,19 +44064,18 @@ def test_delete_volume_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_delete_volume" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_delete_volume_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_delete_volume" - ) as pre: + 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.NetAppRestInterceptor, "post_delete_volume" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_delete_volume_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetAppRestInterceptor, "pre_delete_volume") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44108,8 +44124,9 @@ def test_revert_volume_rest_bad_request(request_type=volume.RevertVolumeRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44164,19 +44181,18 @@ def test_revert_volume_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_revert_volume" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_revert_volume_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_revert_volume" - ) as pre: + 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.NetAppRestInterceptor, "post_revert_volume" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_revert_volume_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetAppRestInterceptor, "pre_revert_volume") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44225,8 +44241,9 @@ def test_list_snapshots_rest_bad_request(request_type=snapshot.ListSnapshotsRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44289,17 +44306,19 @@ def test_list_snapshots_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_list_snapshots" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_list_snapshots_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_list_snapshots" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_snapshots" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_snapshots_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_list_snapshots" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44352,8 +44371,9 @@ def test_get_snapshot_rest_bad_request(request_type=snapshot.GetSnapshotRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44424,17 +44444,17 @@ def test_get_snapshot_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_get_snapshot" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_get_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_get_snapshot" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_snapshot" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_snapshot_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetAppRestInterceptor, "pre_get_snapshot") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44485,8 +44505,9 @@ def test_create_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44617,19 +44638,20 @@ def test_create_snapshot_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_create_snapshot" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_create_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_create_snapshot" - ) as pre: + 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.NetAppRestInterceptor, "post_create_snapshot" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_create_snapshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_create_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44682,8 +44704,9 @@ def test_delete_snapshot_rest_bad_request(request_type=snapshot.DeleteSnapshotRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44740,19 +44763,20 @@ def test_delete_snapshot_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_delete_snapshot" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_delete_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_delete_snapshot" - ) as pre: + 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.NetAppRestInterceptor, "post_delete_snapshot" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_delete_snapshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_delete_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44807,8 +44831,9 @@ def test_update_snapshot_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44943,19 +44968,20 @@ def test_update_snapshot_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_update_snapshot" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_update_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_update_snapshot" - ) as pre: + 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.NetAppRestInterceptor, "post_update_snapshot" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_update_snapshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_update_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45008,8 +45034,9 @@ def test_list_active_directories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45072,17 +45099,20 @@ def test_list_active_directories_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_list_active_directories" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_list_active_directories_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_list_active_directories" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_active_directories" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, + "post_list_active_directories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_list_active_directories" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45142,8 +45172,9 @@ def test_get_active_directory_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45244,17 +45275,19 @@ def test_get_active_directory_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_get_active_directory" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_get_active_directory_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_get_active_directory" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_active_directory" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_active_directory_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_get_active_directory" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45309,8 +45342,9 @@ def test_create_active_directory_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45461,19 +45495,21 @@ def test_create_active_directory_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_create_active_directory" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_create_active_directory_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_create_active_directory" - ) as pre: + 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.NetAppRestInterceptor, "post_create_active_directory" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, + "post_create_active_directory_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_create_active_directory" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45530,8 +45566,9 @@ def test_update_active_directory_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45686,19 +45723,21 @@ def test_update_active_directory_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_update_active_directory" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_update_active_directory_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_update_active_directory" - ) as pre: + 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.NetAppRestInterceptor, "post_update_active_directory" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, + "post_update_active_directory_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_update_active_directory" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45753,8 +45792,9 @@ def test_delete_active_directory_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45811,19 +45851,21 @@ def test_delete_active_directory_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_delete_active_directory" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_delete_active_directory_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_delete_active_directory" - ) as pre: + 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.NetAppRestInterceptor, "post_delete_active_directory" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, + "post_delete_active_directory_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_delete_active_directory" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45874,8 +45916,9 @@ def test_list_kms_configs_rest_bad_request(request_type=kms.ListKmsConfigsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45938,17 +45981,19 @@ def test_list_kms_configs_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_list_kms_configs" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_list_kms_configs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_list_kms_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_kms_configs" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_kms_configs_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_list_kms_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45997,8 +46042,9 @@ def test_create_kms_config_rest_bad_request(request_type=kms.CreateKmsConfigRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46131,19 +46177,20 @@ def test_create_kms_config_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_create_kms_config" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_create_kms_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_create_kms_config" - ) as pre: + 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.NetAppRestInterceptor, "post_create_kms_config" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_create_kms_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_create_kms_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46192,8 +46239,9 @@ def test_get_kms_config_rest_bad_request(request_type=kms.GetKmsConfigRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46266,17 +46314,19 @@ def test_get_kms_config_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_get_kms_config" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_get_kms_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_get_kms_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_kms_config" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_kms_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_get_kms_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46327,8 +46377,9 @@ def test_update_kms_config_rest_bad_request(request_type=kms.UpdateKmsConfigRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46463,19 +46514,20 @@ def test_update_kms_config_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_update_kms_config" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_update_kms_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_update_kms_config" - ) as pre: + 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.NetAppRestInterceptor, "post_update_kms_config" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_update_kms_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_update_kms_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46524,8 +46576,9 @@ def test_encrypt_volumes_rest_bad_request(request_type=kms.EncryptVolumesRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46580,19 +46633,20 @@ def test_encrypt_volumes_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_encrypt_volumes" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_encrypt_volumes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_encrypt_volumes" - ) as pre: + 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.NetAppRestInterceptor, "post_encrypt_volumes" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_encrypt_volumes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_encrypt_volumes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46641,8 +46695,9 @@ def test_verify_kms_config_rest_bad_request(request_type=kms.VerifyKmsConfigRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46707,17 +46762,19 @@ def test_verify_kms_config_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_verify_kms_config" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_verify_kms_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_verify_kms_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_verify_kms_config" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_verify_kms_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_verify_kms_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46768,8 +46825,9 @@ def test_delete_kms_config_rest_bad_request(request_type=kms.DeleteKmsConfigRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46824,19 +46882,20 @@ def test_delete_kms_config_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_delete_kms_config" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_delete_kms_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_delete_kms_config" - ) as pre: + 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.NetAppRestInterceptor, "post_delete_kms_config" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_delete_kms_config_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_delete_kms_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46887,8 +46946,9 @@ def test_list_replications_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46951,17 +47011,19 @@ def test_list_replications_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_list_replications" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_list_replications_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_list_replications" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_replications" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_replications_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_list_replications" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47021,8 +47083,9 @@ def test_get_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47113,17 +47176,19 @@ def test_get_replication_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_get_replication" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_get_replication_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_get_replication" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_replication" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_replication_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_get_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47176,8 +47241,9 @@ def test_create_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47348,19 +47414,20 @@ def test_create_replication_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_create_replication" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_create_replication_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_create_replication" - ) as pre: + 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.NetAppRestInterceptor, "post_create_replication" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_create_replication_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_create_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47415,8 +47482,9 @@ def test_delete_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47473,19 +47541,20 @@ def test_delete_replication_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_delete_replication" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_delete_replication_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_delete_replication" - ) as pre: + 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.NetAppRestInterceptor, "post_delete_replication" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_delete_replication_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_delete_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47542,8 +47611,9 @@ def test_update_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47718,19 +47788,20 @@ def test_update_replication_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_update_replication" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_update_replication_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_update_replication" - ) as pre: + 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.NetAppRestInterceptor, "post_update_replication" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_update_replication_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_update_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47785,8 +47856,9 @@ def test_stop_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47843,19 +47915,20 @@ def test_stop_replication_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_stop_replication" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_stop_replication_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_stop_replication" - ) as pre: + 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.NetAppRestInterceptor, "post_stop_replication" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_stop_replication_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_stop_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47910,8 +47983,9 @@ def test_resume_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47968,19 +48042,20 @@ def test_resume_replication_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_resume_replication" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_resume_replication_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_resume_replication" - ) as pre: + 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.NetAppRestInterceptor, "post_resume_replication" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_resume_replication_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_resume_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48035,8 +48110,9 @@ def test_reverse_replication_direction_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48093,20 +48169,21 @@ def test_reverse_replication_direction_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_reverse_replication_direction" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, - "post_reverse_replication_direction_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_reverse_replication_direction" - ) as pre: + 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.NetAppRestInterceptor, "post_reverse_replication_direction" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, + "post_reverse_replication_direction_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_reverse_replication_direction" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48161,8 +48238,9 @@ def test_establish_peering_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48219,19 +48297,20 @@ def test_establish_peering_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_establish_peering" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_establish_peering_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_establish_peering" - ) as pre: + 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.NetAppRestInterceptor, "post_establish_peering" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_establish_peering_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_establish_peering" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48286,8 +48365,9 @@ def test_sync_replication_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48344,19 +48424,20 @@ def test_sync_replication_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_sync_replication" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_sync_replication_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_sync_replication" - ) as pre: + 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.NetAppRestInterceptor, "post_sync_replication" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_sync_replication_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_sync_replication" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48409,8 +48490,9 @@ def test_create_backup_vault_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48554,19 +48636,20 @@ def test_create_backup_vault_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_create_backup_vault" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_create_backup_vault_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_create_backup_vault" - ) as pre: + 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.NetAppRestInterceptor, "post_create_backup_vault" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_create_backup_vault_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_create_backup_vault" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48619,8 +48702,9 @@ def test_get_backup_vault_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48706,17 +48790,19 @@ def test_get_backup_vault_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_get_backup_vault" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_get_backup_vault_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_get_backup_vault" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_backup_vault" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_backup_vault_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_get_backup_vault" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48769,8 +48855,9 @@ def test_list_backup_vaults_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48833,17 +48920,19 @@ def test_list_backup_vaults_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_list_backup_vaults" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_list_backup_vaults_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_list_backup_vaults" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_backup_vaults" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_backup_vaults_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_list_backup_vaults" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48905,8 +48994,9 @@ def test_update_backup_vault_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49054,19 +49144,20 @@ def test_update_backup_vault_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_update_backup_vault" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_update_backup_vault_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_update_backup_vault" - ) as pre: + 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.NetAppRestInterceptor, "post_update_backup_vault" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_update_backup_vault_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_update_backup_vault" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49119,8 +49210,9 @@ def test_delete_backup_vault_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49175,19 +49267,20 @@ def test_delete_backup_vault_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_delete_backup_vault" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_delete_backup_vault_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_delete_backup_vault" - ) as pre: + 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.NetAppRestInterceptor, "post_delete_backup_vault" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_delete_backup_vault_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_delete_backup_vault" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49238,8 +49331,9 @@ def test_create_backup_rest_bad_request(request_type=gcn_backup.CreateBackupRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49378,19 +49472,18 @@ def test_create_backup_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_create_backup" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_create_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_create_backup" - ) as pre: + 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.NetAppRestInterceptor, "post_create_backup" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_create_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetAppRestInterceptor, "pre_create_backup") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49441,8 +49534,9 @@ def test_get_backup_rest_bad_request(request_type=backup.GetBackupRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49527,17 +49621,15 @@ def test_get_backup_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_get_backup" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_get_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_get_backup" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.NetAppRestInterceptor, "post_get_backup") as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetAppRestInterceptor, "pre_get_backup") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49586,8 +49678,9 @@ def test_list_backups_rest_bad_request(request_type=backup.ListBackupsRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49650,17 +49743,17 @@ def test_list_backups_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_list_backups" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_list_backups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_list_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_backups" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_backups_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetAppRestInterceptor, "pre_list_backups") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49711,8 +49804,9 @@ def test_delete_backup_rest_bad_request(request_type=backup.DeleteBackupRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49769,19 +49863,18 @@ def test_delete_backup_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_delete_backup" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_delete_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_delete_backup" - ) as pre: + 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.NetAppRestInterceptor, "post_delete_backup" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_delete_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetAppRestInterceptor, "pre_delete_backup") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49834,8 +49927,9 @@ def test_update_backup_rest_bad_request(request_type=gcn_backup.UpdateBackupRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49978,19 +50072,18 @@ def test_update_backup_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_update_backup" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_update_backup_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_update_backup" - ) as pre: + 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.NetAppRestInterceptor, "post_update_backup" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_update_backup_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.NetAppRestInterceptor, "pre_update_backup") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50041,8 +50134,9 @@ def test_create_backup_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50178,19 +50272,20 @@ def test_create_backup_policy_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_create_backup_policy" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_create_backup_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_create_backup_policy" - ) as pre: + 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.NetAppRestInterceptor, "post_create_backup_policy" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_create_backup_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_create_backup_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50243,8 +50338,9 @@ def test_get_backup_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50319,17 +50415,19 @@ def test_get_backup_policy_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_get_backup_policy" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_get_backup_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_get_backup_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_backup_policy" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_backup_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_get_backup_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50382,8 +50480,9 @@ def test_list_backup_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50446,17 +50545,19 @@ def test_list_backup_policies_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_list_backup_policies" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_list_backup_policies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_list_backup_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_backup_policies" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_backup_policies_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_list_backup_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50518,8 +50619,9 @@ def test_update_backup_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50659,19 +50761,20 @@ def test_update_backup_policy_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_update_backup_policy" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_update_backup_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_update_backup_policy" - ) as pre: + 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.NetAppRestInterceptor, "post_update_backup_policy" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_update_backup_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_update_backup_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50724,8 +50827,9 @@ def test_delete_backup_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50780,19 +50884,20 @@ def test_delete_backup_policy_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_delete_backup_policy" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_delete_backup_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_delete_backup_policy" - ) as pre: + 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.NetAppRestInterceptor, "post_delete_backup_policy" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_delete_backup_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_delete_backup_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50845,8 +50950,9 @@ def test_list_quota_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50909,17 +51015,19 @@ def test_list_quota_rules_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_list_quota_rules" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_list_quota_rules_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_list_quota_rules" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_quota_rules" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_quota_rules_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_list_quota_rules" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50974,8 +51082,9 @@ def test_get_quota_rule_rest_bad_request(request_type=quota_rule.GetQuotaRuleReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51050,17 +51159,19 @@ def test_get_quota_rule_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_get_quota_rule" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_get_quota_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_get_quota_rule" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_quota_rule" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_quota_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_get_quota_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51111,8 +51222,9 @@ def test_create_quota_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51245,19 +51357,20 @@ def test_create_quota_rule_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_create_quota_rule" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_create_quota_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_create_quota_rule" - ) as pre: + 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.NetAppRestInterceptor, "post_create_quota_rule" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_create_quota_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_create_quota_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51314,8 +51427,9 @@ def test_update_quota_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51452,19 +51566,20 @@ def test_update_quota_rule_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_update_quota_rule" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_update_quota_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_update_quota_rule" - ) as pre: + 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.NetAppRestInterceptor, "post_update_quota_rule" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_update_quota_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_update_quota_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51519,8 +51634,9 @@ def test_delete_quota_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51577,19 +51693,20 @@ def test_delete_quota_rule_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_delete_quota_rule" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_delete_quota_rule_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_delete_quota_rule" - ) as pre: + 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.NetAppRestInterceptor, "post_delete_quota_rule" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_delete_quota_rule_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_delete_quota_rule" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51642,8 +51759,9 @@ def test_restore_backup_files_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51698,19 +51816,20 @@ def test_restore_backup_files_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_restore_backup_files" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_restore_backup_files_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_restore_backup_files" - ) as pre: + 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.NetAppRestInterceptor, "post_restore_backup_files" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_restore_backup_files_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_restore_backup_files" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51763,8 +51882,9 @@ def test_list_host_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51827,17 +51947,19 @@ def test_list_host_groups_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_list_host_groups" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_list_host_groups_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_list_host_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_host_groups" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_list_host_groups_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_list_host_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51890,8 +52012,9 @@ def test_get_host_group_rest_bad_request(request_type=host_group.GetHostGroupReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51962,17 +52085,19 @@ def test_get_host_group_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_get_host_group" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_get_host_group_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_get_host_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_host_group" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_get_host_group_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_get_host_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -52023,8 +52148,9 @@ def test_create_host_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -52156,19 +52282,20 @@ def test_create_host_group_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_create_host_group" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_create_host_group_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_create_host_group" - ) as pre: + 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.NetAppRestInterceptor, "post_create_host_group" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_create_host_group_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_create_host_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -52223,8 +52350,9 @@ def test_update_host_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -52358,19 +52486,20 @@ def test_update_host_group_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_update_host_group" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_update_host_group_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_update_host_group" - ) as pre: + 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.NetAppRestInterceptor, "post_update_host_group" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_update_host_group_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_update_host_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -52423,8 +52552,9 @@ def test_delete_host_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -52479,19 +52609,20 @@ def test_delete_host_group_rest_interceptors(null_interceptor): ) client = NetAppClient(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.NetAppRestInterceptor, "post_delete_host_group" - ) as post, mock.patch.object( - transports.NetAppRestInterceptor, "post_delete_host_group_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetAppRestInterceptor, "pre_delete_host_group" - ) as pre: + 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.NetAppRestInterceptor, "post_delete_host_group" + ) as post, + mock.patch.object( + transports.NetAppRestInterceptor, "post_delete_host_group_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetAppRestInterceptor, "pre_delete_host_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -52544,8 +52675,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -52604,8 +52736,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -52666,8 +52799,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -52728,8 +52862,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -52790,8 +52925,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -52852,8 +52988,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -54450,11 +54587,14 @@ def test_net_app_base_transport(): def test_net_app_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.netapp_v1.services.net_app.transports.NetAppTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.netapp_v1.services.net_app.transports.NetAppTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetAppTransport( @@ -54471,9 +54611,12 @@ def test_net_app_base_transport_with_credentials_file(): def test_net_app_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.netapp_v1.services.net_app.transports.NetAppTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.netapp_v1.services.net_app.transports.NetAppTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetAppTransport() @@ -54545,11 +54688,12 @@ def test_net_app_transport_auth_gdch_credentials(transport_class): def test_net_app_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-connectivity/docs/conf.py b/packages/google-cloud-network-connectivity/docs/conf.py index 859b25338b76..232e0ae3b4fa 100644 --- a/packages/google-cloud-network-connectivity/docs/conf.py +++ b/packages/google-cloud-network-connectivity/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-network-connectivity documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/__init__.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/__init__.py index 4c3d090feed3..b3a552f27c18 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/__init__.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cross_network_automation_service import ( CrossNetworkAutomationServiceAsyncClient, CrossNetworkAutomationServiceClient, diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/async_client.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/async_client.py index e5c441b9455b..ff4360f225d5 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/async_client.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.cross_network_automation_service import ( pagers, @@ -173,7 +175,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CrossNetworkAutomationServiceAsyncClient: The constructed client. """ - return CrossNetworkAutomationServiceClient.from_service_account_info.__func__(CrossNetworkAutomationServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CrossNetworkAutomationServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + CrossNetworkAutomationServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -189,7 +196,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CrossNetworkAutomationServiceAsyncClient: The constructed client. """ - return CrossNetworkAutomationServiceClient.from_service_account_file.__func__(CrossNetworkAutomationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CrossNetworkAutomationServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + CrossNetworkAutomationServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -227,7 +239,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CrossNetworkAutomationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CrossNetworkAutomationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CrossNetworkAutomationServiceTransport: diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/client.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/client.py index 8128a687c678..5794f375e75e 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/client.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.cross_network_automation_service import ( pagers, @@ -89,13 +91,11 @@ class CrossNetworkAutomationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CrossNetworkAutomationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CrossNetworkAutomationServiceTransport]] _transport_registry["grpc"] = CrossNetworkAutomationServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = CrossNetworkAutomationServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + CrossNetworkAutomationServiceGrpcAsyncIOTransport + ) def get_transport_class( cls, @@ -788,11 +788,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CrossNetworkAutomationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CrossNetworkAutomationServiceClient._read_environment_variables() + ) self._client_cert_source = ( CrossNetworkAutomationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -833,8 +831,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CrossNetworkAutomationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/pagers.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/pagers.py index 4cf9b15b9ce2..074cf80f7d2d 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/pagers.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/pagers.py @@ -69,7 +69,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -237,7 +237,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -320,7 +320,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -406,7 +406,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -484,7 +484,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -568,7 +568,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -650,7 +650,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/__init__.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/__init__.py index f47ac8d182a0..83531068899a 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/__init__.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import CrossNetworkAutomationServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CrossNetworkAutomationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CrossNetworkAutomationServiceTransport]] _transport_registry["grpc"] = CrossNetworkAutomationServiceGrpcTransport _transport_registry["grpc_asyncio"] = CrossNetworkAutomationServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/base.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/base.py index d75ce5a35dfd..2cf958b56858 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/base.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version from google.cloud.networkconnectivity_v1.types import cross_network_automation @@ -501,13 +503,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/grpc.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/grpc.py index 470ad5d59e98..b597f134ec86 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/grpc.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.networkconnectivity_v1.types import cross_network_automation @@ -367,12 +369,12 @@ def list_service_connection_maps( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_service_connection_maps" not in self._stubs: - self._stubs[ - "list_service_connection_maps" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/ListServiceConnectionMaps", - request_serializer=cross_network_automation.ListServiceConnectionMapsRequest.serialize, - response_deserializer=cross_network_automation.ListServiceConnectionMapsResponse.deserialize, + self._stubs["list_service_connection_maps"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/ListServiceConnectionMaps", + request_serializer=cross_network_automation.ListServiceConnectionMapsRequest.serialize, + response_deserializer=cross_network_automation.ListServiceConnectionMapsResponse.deserialize, + ) ) return self._stubs["list_service_connection_maps"] @@ -398,12 +400,12 @@ def get_service_connection_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_service_connection_map" not in self._stubs: - self._stubs[ - "get_service_connection_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/GetServiceConnectionMap", - request_serializer=cross_network_automation.GetServiceConnectionMapRequest.serialize, - response_deserializer=cross_network_automation.ServiceConnectionMap.deserialize, + self._stubs["get_service_connection_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/GetServiceConnectionMap", + request_serializer=cross_network_automation.GetServiceConnectionMapRequest.serialize, + response_deserializer=cross_network_automation.ServiceConnectionMap.deserialize, + ) ) return self._stubs["get_service_connection_map"] @@ -430,12 +432,12 @@ def create_service_connection_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_connection_map" not in self._stubs: - self._stubs[ - "create_service_connection_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/CreateServiceConnectionMap", - request_serializer=cross_network_automation.CreateServiceConnectionMapRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_service_connection_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/CreateServiceConnectionMap", + request_serializer=cross_network_automation.CreateServiceConnectionMapRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_service_connection_map"] @@ -462,12 +464,12 @@ def update_service_connection_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_service_connection_map" not in self._stubs: - self._stubs[ - "update_service_connection_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/UpdateServiceConnectionMap", - request_serializer=cross_network_automation.UpdateServiceConnectionMapRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_service_connection_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/UpdateServiceConnectionMap", + request_serializer=cross_network_automation.UpdateServiceConnectionMapRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_service_connection_map"] @@ -493,12 +495,12 @@ def delete_service_connection_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_connection_map" not in self._stubs: - self._stubs[ - "delete_service_connection_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/DeleteServiceConnectionMap", - request_serializer=cross_network_automation.DeleteServiceConnectionMapRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_service_connection_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/DeleteServiceConnectionMap", + request_serializer=cross_network_automation.DeleteServiceConnectionMapRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_service_connection_map"] @@ -526,12 +528,12 @@ def list_service_connection_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_service_connection_policies" not in self._stubs: - self._stubs[ - "list_service_connection_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/ListServiceConnectionPolicies", - request_serializer=cross_network_automation.ListServiceConnectionPoliciesRequest.serialize, - response_deserializer=cross_network_automation.ListServiceConnectionPoliciesResponse.deserialize, + self._stubs["list_service_connection_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/ListServiceConnectionPolicies", + request_serializer=cross_network_automation.ListServiceConnectionPoliciesRequest.serialize, + response_deserializer=cross_network_automation.ListServiceConnectionPoliciesResponse.deserialize, + ) ) return self._stubs["list_service_connection_policies"] @@ -557,12 +559,12 @@ def get_service_connection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_service_connection_policy" not in self._stubs: - self._stubs[ - "get_service_connection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/GetServiceConnectionPolicy", - request_serializer=cross_network_automation.GetServiceConnectionPolicyRequest.serialize, - response_deserializer=cross_network_automation.ServiceConnectionPolicy.deserialize, + self._stubs["get_service_connection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/GetServiceConnectionPolicy", + request_serializer=cross_network_automation.GetServiceConnectionPolicyRequest.serialize, + response_deserializer=cross_network_automation.ServiceConnectionPolicy.deserialize, + ) ) return self._stubs["get_service_connection_policy"] @@ -590,12 +592,12 @@ def create_service_connection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_connection_policy" not in self._stubs: - self._stubs[ - "create_service_connection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/CreateServiceConnectionPolicy", - request_serializer=cross_network_automation.CreateServiceConnectionPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_service_connection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/CreateServiceConnectionPolicy", + request_serializer=cross_network_automation.CreateServiceConnectionPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_service_connection_policy"] @@ -623,12 +625,12 @@ def update_service_connection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_service_connection_policy" not in self._stubs: - self._stubs[ - "update_service_connection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/UpdateServiceConnectionPolicy", - request_serializer=cross_network_automation.UpdateServiceConnectionPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_service_connection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/UpdateServiceConnectionPolicy", + request_serializer=cross_network_automation.UpdateServiceConnectionPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_service_connection_policy"] @@ -655,12 +657,12 @@ def delete_service_connection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_connection_policy" not in self._stubs: - self._stubs[ - "delete_service_connection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/DeleteServiceConnectionPolicy", - request_serializer=cross_network_automation.DeleteServiceConnectionPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_service_connection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/DeleteServiceConnectionPolicy", + request_serializer=cross_network_automation.DeleteServiceConnectionPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_service_connection_policy"] @@ -800,12 +802,12 @@ def get_service_connection_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_service_connection_token" not in self._stubs: - self._stubs[ - "get_service_connection_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/GetServiceConnectionToken", - request_serializer=cross_network_automation.GetServiceConnectionTokenRequest.serialize, - response_deserializer=cross_network_automation.ServiceConnectionToken.deserialize, + self._stubs["get_service_connection_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/GetServiceConnectionToken", + request_serializer=cross_network_automation.GetServiceConnectionTokenRequest.serialize, + response_deserializer=cross_network_automation.ServiceConnectionToken.deserialize, + ) ) return self._stubs["get_service_connection_token"] @@ -832,12 +834,12 @@ def list_service_connection_tokens( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_service_connection_tokens" not in self._stubs: - self._stubs[ - "list_service_connection_tokens" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/ListServiceConnectionTokens", - request_serializer=cross_network_automation.ListServiceConnectionTokensRequest.serialize, - response_deserializer=cross_network_automation.ListServiceConnectionTokensResponse.deserialize, + self._stubs["list_service_connection_tokens"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/ListServiceConnectionTokens", + request_serializer=cross_network_automation.ListServiceConnectionTokensRequest.serialize, + response_deserializer=cross_network_automation.ListServiceConnectionTokensResponse.deserialize, + ) ) return self._stubs["list_service_connection_tokens"] @@ -865,12 +867,12 @@ def create_service_connection_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_connection_token" not in self._stubs: - self._stubs[ - "create_service_connection_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/CreateServiceConnectionToken", - request_serializer=cross_network_automation.CreateServiceConnectionTokenRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_service_connection_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/CreateServiceConnectionToken", + request_serializer=cross_network_automation.CreateServiceConnectionTokenRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_service_connection_token"] @@ -897,12 +899,12 @@ def delete_service_connection_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_connection_token" not in self._stubs: - self._stubs[ - "delete_service_connection_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/DeleteServiceConnectionToken", - request_serializer=cross_network_automation.DeleteServiceConnectionTokenRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_service_connection_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/DeleteServiceConnectionToken", + request_serializer=cross_network_automation.DeleteServiceConnectionTokenRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_service_connection_token"] diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/grpc_asyncio.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/grpc_asyncio.py index 0a2ccc5269b3..da2b45ea5ba6 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/cross_network_automation_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.networkconnectivity_v1.types import cross_network_automation @@ -375,12 +377,12 @@ def list_service_connection_maps( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_service_connection_maps" not in self._stubs: - self._stubs[ - "list_service_connection_maps" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/ListServiceConnectionMaps", - request_serializer=cross_network_automation.ListServiceConnectionMapsRequest.serialize, - response_deserializer=cross_network_automation.ListServiceConnectionMapsResponse.deserialize, + self._stubs["list_service_connection_maps"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/ListServiceConnectionMaps", + request_serializer=cross_network_automation.ListServiceConnectionMapsRequest.serialize, + response_deserializer=cross_network_automation.ListServiceConnectionMapsResponse.deserialize, + ) ) return self._stubs["list_service_connection_maps"] @@ -406,12 +408,12 @@ def get_service_connection_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_service_connection_map" not in self._stubs: - self._stubs[ - "get_service_connection_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/GetServiceConnectionMap", - request_serializer=cross_network_automation.GetServiceConnectionMapRequest.serialize, - response_deserializer=cross_network_automation.ServiceConnectionMap.deserialize, + self._stubs["get_service_connection_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/GetServiceConnectionMap", + request_serializer=cross_network_automation.GetServiceConnectionMapRequest.serialize, + response_deserializer=cross_network_automation.ServiceConnectionMap.deserialize, + ) ) return self._stubs["get_service_connection_map"] @@ -438,12 +440,12 @@ def create_service_connection_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_connection_map" not in self._stubs: - self._stubs[ - "create_service_connection_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/CreateServiceConnectionMap", - request_serializer=cross_network_automation.CreateServiceConnectionMapRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_service_connection_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/CreateServiceConnectionMap", + request_serializer=cross_network_automation.CreateServiceConnectionMapRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_service_connection_map"] @@ -470,12 +472,12 @@ def update_service_connection_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_service_connection_map" not in self._stubs: - self._stubs[ - "update_service_connection_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/UpdateServiceConnectionMap", - request_serializer=cross_network_automation.UpdateServiceConnectionMapRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_service_connection_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/UpdateServiceConnectionMap", + request_serializer=cross_network_automation.UpdateServiceConnectionMapRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_service_connection_map"] @@ -501,12 +503,12 @@ def delete_service_connection_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_connection_map" not in self._stubs: - self._stubs[ - "delete_service_connection_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/DeleteServiceConnectionMap", - request_serializer=cross_network_automation.DeleteServiceConnectionMapRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_service_connection_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/DeleteServiceConnectionMap", + request_serializer=cross_network_automation.DeleteServiceConnectionMapRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_service_connection_map"] @@ -534,12 +536,12 @@ def list_service_connection_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_service_connection_policies" not in self._stubs: - self._stubs[ - "list_service_connection_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/ListServiceConnectionPolicies", - request_serializer=cross_network_automation.ListServiceConnectionPoliciesRequest.serialize, - response_deserializer=cross_network_automation.ListServiceConnectionPoliciesResponse.deserialize, + self._stubs["list_service_connection_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/ListServiceConnectionPolicies", + request_serializer=cross_network_automation.ListServiceConnectionPoliciesRequest.serialize, + response_deserializer=cross_network_automation.ListServiceConnectionPoliciesResponse.deserialize, + ) ) return self._stubs["list_service_connection_policies"] @@ -565,12 +567,12 @@ def get_service_connection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_service_connection_policy" not in self._stubs: - self._stubs[ - "get_service_connection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/GetServiceConnectionPolicy", - request_serializer=cross_network_automation.GetServiceConnectionPolicyRequest.serialize, - response_deserializer=cross_network_automation.ServiceConnectionPolicy.deserialize, + self._stubs["get_service_connection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/GetServiceConnectionPolicy", + request_serializer=cross_network_automation.GetServiceConnectionPolicyRequest.serialize, + response_deserializer=cross_network_automation.ServiceConnectionPolicy.deserialize, + ) ) return self._stubs["get_service_connection_policy"] @@ -598,12 +600,12 @@ def create_service_connection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_connection_policy" not in self._stubs: - self._stubs[ - "create_service_connection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/CreateServiceConnectionPolicy", - request_serializer=cross_network_automation.CreateServiceConnectionPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_service_connection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/CreateServiceConnectionPolicy", + request_serializer=cross_network_automation.CreateServiceConnectionPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_service_connection_policy"] @@ -631,12 +633,12 @@ def update_service_connection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_service_connection_policy" not in self._stubs: - self._stubs[ - "update_service_connection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/UpdateServiceConnectionPolicy", - request_serializer=cross_network_automation.UpdateServiceConnectionPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_service_connection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/UpdateServiceConnectionPolicy", + request_serializer=cross_network_automation.UpdateServiceConnectionPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_service_connection_policy"] @@ -663,12 +665,12 @@ def delete_service_connection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_connection_policy" not in self._stubs: - self._stubs[ - "delete_service_connection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/DeleteServiceConnectionPolicy", - request_serializer=cross_network_automation.DeleteServiceConnectionPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_service_connection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/DeleteServiceConnectionPolicy", + request_serializer=cross_network_automation.DeleteServiceConnectionPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_service_connection_policy"] @@ -810,12 +812,12 @@ def get_service_connection_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_service_connection_token" not in self._stubs: - self._stubs[ - "get_service_connection_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/GetServiceConnectionToken", - request_serializer=cross_network_automation.GetServiceConnectionTokenRequest.serialize, - response_deserializer=cross_network_automation.ServiceConnectionToken.deserialize, + self._stubs["get_service_connection_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/GetServiceConnectionToken", + request_serializer=cross_network_automation.GetServiceConnectionTokenRequest.serialize, + response_deserializer=cross_network_automation.ServiceConnectionToken.deserialize, + ) ) return self._stubs["get_service_connection_token"] @@ -842,12 +844,12 @@ def list_service_connection_tokens( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_service_connection_tokens" not in self._stubs: - self._stubs[ - "list_service_connection_tokens" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/ListServiceConnectionTokens", - request_serializer=cross_network_automation.ListServiceConnectionTokensRequest.serialize, - response_deserializer=cross_network_automation.ListServiceConnectionTokensResponse.deserialize, + self._stubs["list_service_connection_tokens"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/ListServiceConnectionTokens", + request_serializer=cross_network_automation.ListServiceConnectionTokensRequest.serialize, + response_deserializer=cross_network_automation.ListServiceConnectionTokensResponse.deserialize, + ) ) return self._stubs["list_service_connection_tokens"] @@ -875,12 +877,12 @@ def create_service_connection_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_service_connection_token" not in self._stubs: - self._stubs[ - "create_service_connection_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/CreateServiceConnectionToken", - request_serializer=cross_network_automation.CreateServiceConnectionTokenRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_service_connection_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/CreateServiceConnectionToken", + request_serializer=cross_network_automation.CreateServiceConnectionTokenRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_service_connection_token"] @@ -907,12 +909,12 @@ def delete_service_connection_token( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_service_connection_token" not in self._stubs: - self._stubs[ - "delete_service_connection_token" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/DeleteServiceConnectionToken", - request_serializer=cross_network_automation.DeleteServiceConnectionTokenRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_service_connection_token"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.CrossNetworkAutomationService/DeleteServiceConnectionToken", + request_serializer=cross_network_automation.DeleteServiceConnectionTokenRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_service_connection_token"] diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/async_client.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/async_client.py index 97e79c6103ba..da60643d42b9 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/async_client.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.data_transfer_service import pagers from google.cloud.networkconnectivity_v1.types import common, data_transfer @@ -137,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataTransferServiceAsyncClient: The constructed client. """ - return DataTransferServiceClient.from_service_account_info.__func__(DataTransferServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DataTransferServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DataTransferServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -153,7 +156,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataTransferServiceAsyncClient: The constructed client. """ - return DataTransferServiceClient.from_service_account_file.__func__(DataTransferServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DataTransferServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DataTransferServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -191,7 +195,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DataTransferServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DataTransferServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DataTransferServiceTransport: diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/client.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/client.py index 53503c91f75a..bd86e31201f0 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/client.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.data_transfer_service import pagers from google.cloud.networkconnectivity_v1.types import common, data_transfer @@ -87,9 +89,7 @@ class DataTransferServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataTransferServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataTransferServiceTransport]] _transport_registry["grpc"] = DataTransferServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataTransferServiceGrpcAsyncIOTransport @@ -680,11 +680,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataTransferServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataTransferServiceClient._read_environment_variables() + ) self._client_cert_source = DataTransferServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -719,8 +717,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataTransferServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/pagers.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/pagers.py index 221d28d2b1ef..4c75fcb1e4c2 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/pagers.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -147,7 +147,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -387,7 +387,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -474,7 +474,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/__init__.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/__init__.py index 86cbc6718313..1602325bc941 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/__init__.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import DataTransferServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DataTransferServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DataTransferServiceTransport]] _transport_registry["grpc"] = DataTransferServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataTransferServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/base.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/base.py index 7025a91a38d1..a169823fede5 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/base.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version from google.cloud.networkconnectivity_v1.types import data_transfer @@ -410,13 +412,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/grpc.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/grpc.py index 9dfae539597e..df4d4b6f3462 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/grpc.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.networkconnectivity_v1.types import data_transfer @@ -366,12 +368,12 @@ def list_multicloud_data_transfer_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_multicloud_data_transfer_configs" not in self._stubs: - self._stubs[ - "list_multicloud_data_transfer_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/ListMulticloudDataTransferConfigs", - request_serializer=data_transfer.ListMulticloudDataTransferConfigsRequest.serialize, - response_deserializer=data_transfer.ListMulticloudDataTransferConfigsResponse.deserialize, + self._stubs["list_multicloud_data_transfer_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/ListMulticloudDataTransferConfigs", + request_serializer=data_transfer.ListMulticloudDataTransferConfigsRequest.serialize, + response_deserializer=data_transfer.ListMulticloudDataTransferConfigsResponse.deserialize, + ) ) return self._stubs["list_multicloud_data_transfer_configs"] @@ -398,12 +400,12 @@ def get_multicloud_data_transfer_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_multicloud_data_transfer_config" not in self._stubs: - self._stubs[ - "get_multicloud_data_transfer_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/GetMulticloudDataTransferConfig", - request_serializer=data_transfer.GetMulticloudDataTransferConfigRequest.serialize, - response_deserializer=data_transfer.MulticloudDataTransferConfig.deserialize, + self._stubs["get_multicloud_data_transfer_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/GetMulticloudDataTransferConfig", + request_serializer=data_transfer.GetMulticloudDataTransferConfigRequest.serialize, + response_deserializer=data_transfer.MulticloudDataTransferConfig.deserialize, + ) ) return self._stubs["get_multicloud_data_transfer_config"] @@ -431,12 +433,12 @@ def create_multicloud_data_transfer_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_multicloud_data_transfer_config" not in self._stubs: - self._stubs[ - "create_multicloud_data_transfer_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/CreateMulticloudDataTransferConfig", - request_serializer=data_transfer.CreateMulticloudDataTransferConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_multicloud_data_transfer_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/CreateMulticloudDataTransferConfig", + request_serializer=data_transfer.CreateMulticloudDataTransferConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_multicloud_data_transfer_config"] @@ -464,12 +466,12 @@ def update_multicloud_data_transfer_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_multicloud_data_transfer_config" not in self._stubs: - self._stubs[ - "update_multicloud_data_transfer_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/UpdateMulticloudDataTransferConfig", - request_serializer=data_transfer.UpdateMulticloudDataTransferConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_multicloud_data_transfer_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/UpdateMulticloudDataTransferConfig", + request_serializer=data_transfer.UpdateMulticloudDataTransferConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_multicloud_data_transfer_config"] @@ -496,12 +498,12 @@ def delete_multicloud_data_transfer_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_multicloud_data_transfer_config" not in self._stubs: - self._stubs[ - "delete_multicloud_data_transfer_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/DeleteMulticloudDataTransferConfig", - request_serializer=data_transfer.DeleteMulticloudDataTransferConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_multicloud_data_transfer_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/DeleteMulticloudDataTransferConfig", + request_serializer=data_transfer.DeleteMulticloudDataTransferConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_multicloud_data_transfer_config"] @@ -664,12 +666,12 @@ def get_multicloud_data_transfer_supported_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_multicloud_data_transfer_supported_service" not in self._stubs: - self._stubs[ - "get_multicloud_data_transfer_supported_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/GetMulticloudDataTransferSupportedService", - request_serializer=data_transfer.GetMulticloudDataTransferSupportedServiceRequest.serialize, - response_deserializer=data_transfer.MulticloudDataTransferSupportedService.deserialize, + self._stubs["get_multicloud_data_transfer_supported_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/GetMulticloudDataTransferSupportedService", + request_serializer=data_transfer.GetMulticloudDataTransferSupportedServiceRequest.serialize, + response_deserializer=data_transfer.MulticloudDataTransferSupportedService.deserialize, + ) ) return self._stubs["get_multicloud_data_transfer_supported_service"] @@ -697,12 +699,12 @@ def list_multicloud_data_transfer_supported_services( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_multicloud_data_transfer_supported_services" not in self._stubs: - self._stubs[ - "list_multicloud_data_transfer_supported_services" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/ListMulticloudDataTransferSupportedServices", - request_serializer=data_transfer.ListMulticloudDataTransferSupportedServicesRequest.serialize, - response_deserializer=data_transfer.ListMulticloudDataTransferSupportedServicesResponse.deserialize, + self._stubs["list_multicloud_data_transfer_supported_services"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/ListMulticloudDataTransferSupportedServices", + request_serializer=data_transfer.ListMulticloudDataTransferSupportedServicesRequest.serialize, + response_deserializer=data_transfer.ListMulticloudDataTransferSupportedServicesResponse.deserialize, + ) ) return self._stubs["list_multicloud_data_transfer_supported_services"] diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/grpc_asyncio.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/grpc_asyncio.py index b8dbd462f0b6..e3bfe2c54b95 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/data_transfer_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.networkconnectivity_v1.types import data_transfer @@ -374,12 +376,12 @@ def list_multicloud_data_transfer_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_multicloud_data_transfer_configs" not in self._stubs: - self._stubs[ - "list_multicloud_data_transfer_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/ListMulticloudDataTransferConfigs", - request_serializer=data_transfer.ListMulticloudDataTransferConfigsRequest.serialize, - response_deserializer=data_transfer.ListMulticloudDataTransferConfigsResponse.deserialize, + self._stubs["list_multicloud_data_transfer_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/ListMulticloudDataTransferConfigs", + request_serializer=data_transfer.ListMulticloudDataTransferConfigsRequest.serialize, + response_deserializer=data_transfer.ListMulticloudDataTransferConfigsResponse.deserialize, + ) ) return self._stubs["list_multicloud_data_transfer_configs"] @@ -406,12 +408,12 @@ def get_multicloud_data_transfer_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_multicloud_data_transfer_config" not in self._stubs: - self._stubs[ - "get_multicloud_data_transfer_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/GetMulticloudDataTransferConfig", - request_serializer=data_transfer.GetMulticloudDataTransferConfigRequest.serialize, - response_deserializer=data_transfer.MulticloudDataTransferConfig.deserialize, + self._stubs["get_multicloud_data_transfer_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/GetMulticloudDataTransferConfig", + request_serializer=data_transfer.GetMulticloudDataTransferConfigRequest.serialize, + response_deserializer=data_transfer.MulticloudDataTransferConfig.deserialize, + ) ) return self._stubs["get_multicloud_data_transfer_config"] @@ -439,12 +441,12 @@ def create_multicloud_data_transfer_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_multicloud_data_transfer_config" not in self._stubs: - self._stubs[ - "create_multicloud_data_transfer_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/CreateMulticloudDataTransferConfig", - request_serializer=data_transfer.CreateMulticloudDataTransferConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_multicloud_data_transfer_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/CreateMulticloudDataTransferConfig", + request_serializer=data_transfer.CreateMulticloudDataTransferConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_multicloud_data_transfer_config"] @@ -472,12 +474,12 @@ def update_multicloud_data_transfer_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_multicloud_data_transfer_config" not in self._stubs: - self._stubs[ - "update_multicloud_data_transfer_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/UpdateMulticloudDataTransferConfig", - request_serializer=data_transfer.UpdateMulticloudDataTransferConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_multicloud_data_transfer_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/UpdateMulticloudDataTransferConfig", + request_serializer=data_transfer.UpdateMulticloudDataTransferConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_multicloud_data_transfer_config"] @@ -504,12 +506,12 @@ def delete_multicloud_data_transfer_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_multicloud_data_transfer_config" not in self._stubs: - self._stubs[ - "delete_multicloud_data_transfer_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/DeleteMulticloudDataTransferConfig", - request_serializer=data_transfer.DeleteMulticloudDataTransferConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_multicloud_data_transfer_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/DeleteMulticloudDataTransferConfig", + request_serializer=data_transfer.DeleteMulticloudDataTransferConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_multicloud_data_transfer_config"] @@ -681,12 +683,12 @@ def get_multicloud_data_transfer_supported_service( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_multicloud_data_transfer_supported_service" not in self._stubs: - self._stubs[ - "get_multicloud_data_transfer_supported_service" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/GetMulticloudDataTransferSupportedService", - request_serializer=data_transfer.GetMulticloudDataTransferSupportedServiceRequest.serialize, - response_deserializer=data_transfer.MulticloudDataTransferSupportedService.deserialize, + self._stubs["get_multicloud_data_transfer_supported_service"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/GetMulticloudDataTransferSupportedService", + request_serializer=data_transfer.GetMulticloudDataTransferSupportedServiceRequest.serialize, + response_deserializer=data_transfer.MulticloudDataTransferSupportedService.deserialize, + ) ) return self._stubs["get_multicloud_data_transfer_supported_service"] @@ -714,12 +716,12 @@ def list_multicloud_data_transfer_supported_services( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_multicloud_data_transfer_supported_services" not in self._stubs: - self._stubs[ - "list_multicloud_data_transfer_supported_services" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkconnectivity.v1.DataTransferService/ListMulticloudDataTransferSupportedServices", - request_serializer=data_transfer.ListMulticloudDataTransferSupportedServicesRequest.serialize, - response_deserializer=data_transfer.ListMulticloudDataTransferSupportedServicesResponse.deserialize, + self._stubs["list_multicloud_data_transfer_supported_services"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkconnectivity.v1.DataTransferService/ListMulticloudDataTransferSupportedServices", + request_serializer=data_transfer.ListMulticloudDataTransferSupportedServicesRequest.serialize, + response_deserializer=data_transfer.ListMulticloudDataTransferSupportedServicesResponse.deserialize, + ) ) return self._stubs["list_multicloud_data_transfer_supported_services"] diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/async_client.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/async_client.py index 60512ecc5262..84040cc96431 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/async_client.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version @@ -44,19 +44,20 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.hub_service import pagers -from google.cloud.networkconnectivity_v1.types import common -from google.cloud.networkconnectivity_v1.types import hub +from google.cloud.networkconnectivity_v1.types import common, hub from google.cloud.networkconnectivity_v1.types import hub as gcn_hub from .client import HubServiceClient @@ -143,7 +144,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: HubServiceAsyncClient: The constructed client. """ - return HubServiceClient.from_service_account_info.__func__(HubServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = HubServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(HubServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +161,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: HubServiceAsyncClient: The constructed client. """ - return HubServiceClient.from_service_account_file.__func__(HubServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = HubServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(HubServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/client.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/client.py index c6f9af688a7c..023928a45b2d 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/client.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version @@ -61,19 +61,20 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.hub_service import pagers -from google.cloud.networkconnectivity_v1.types import common -from google.cloud.networkconnectivity_v1.types import hub +from google.cloud.networkconnectivity_v1.types import common, hub from google.cloud.networkconnectivity_v1.types import hub as gcn_hub from .transports.base import DEFAULT_CLIENT_INFO, HubServiceTransport @@ -804,11 +805,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = HubServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + HubServiceClient._read_environment_variables() + ) self._client_cert_source = HubServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -843,8 +842,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(HubServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/pagers.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/pagers.py index 7ec38d49c928..ba8963aef632 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/pagers.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -691,7 +691,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -767,7 +767,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -847,7 +847,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -923,7 +923,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1003,7 +1003,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1079,7 +1079,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/transports/base.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/transports/base.py index d981197e66c0..020c729e7c31 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/transports/base.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version from google.cloud.networkconnectivity_v1.types import hub @@ -535,13 +537,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/transports/grpc.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/transports/grpc.py index c6a86377e441..3e99c16316cb 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/transports/grpc.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.networkconnectivity_v1.types import hub from google.cloud.networkconnectivity_v1.types import hub as gcn_hub diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/transports/grpc_asyncio.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/transports/grpc_asyncio.py index 4c56883a949c..b6c2304028dd 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/hub_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.networkconnectivity_v1.types import hub from google.cloud.networkconnectivity_v1.types import hub as gcn_hub diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/async_client.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/async_client.py index d9e60763006c..291e4f2f54b6 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/async_client.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version @@ -44,22 +44,23 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.internal_range_service import pagers +from google.cloud.networkconnectivity_v1.types import common, internal_range from google.cloud.networkconnectivity_v1.types import ( internal_range as gcn_internal_range, ) -from google.cloud.networkconnectivity_v1.types import common -from google.cloud.networkconnectivity_v1.types import internal_range from .client import InternalRangeServiceClient from .transports.base import DEFAULT_CLIENT_INFO, InternalRangeServiceTransport @@ -131,7 +132,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: InternalRangeServiceAsyncClient: The constructed client. """ - return InternalRangeServiceClient.from_service_account_info.__func__(InternalRangeServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = InternalRangeServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(InternalRangeServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +149,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: InternalRangeServiceAsyncClient: The constructed client. """ - return InternalRangeServiceClient.from_service_account_file.__func__(InternalRangeServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = InternalRangeServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(InternalRangeServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -185,7 +188,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return InternalRangeServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return InternalRangeServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> InternalRangeServiceTransport: diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/client.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/client.py index 041c3a64faf9..0d49e19f345c 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/client.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version @@ -61,22 +61,23 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.internal_range_service import pagers +from google.cloud.networkconnectivity_v1.types import common, internal_range from google.cloud.networkconnectivity_v1.types import ( internal_range as gcn_internal_range, ) -from google.cloud.networkconnectivity_v1.types import common -from google.cloud.networkconnectivity_v1.types import internal_range from .transports.base import DEFAULT_CLIENT_INFO, InternalRangeServiceTransport from .transports.grpc import InternalRangeServiceGrpcTransport @@ -91,9 +92,7 @@ class InternalRangeServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[InternalRangeServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[InternalRangeServiceTransport]] _transport_registry["grpc"] = InternalRangeServiceGrpcTransport _transport_registry["grpc_asyncio"] = InternalRangeServiceGrpcAsyncIOTransport @@ -638,11 +637,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InternalRangeServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InternalRangeServiceClient._read_environment_variables() + ) self._client_cert_source = InternalRangeServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +674,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InternalRangeServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/pagers.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/pagers.py index da86b1382a2e..edab0b224e2e 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/pagers.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/__init__.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/__init__.py index f6a9db35df1c..150df450c2c0 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/__init__.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import InternalRangeServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[InternalRangeServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[InternalRangeServiceTransport]] _transport_registry["grpc"] = InternalRangeServiceGrpcTransport _transport_registry["grpc_asyncio"] = InternalRangeServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/base.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/base.py index 18ac9a89b56e..4e54f8b917c3 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/base.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/base.py @@ -17,23 +17,25 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version +from google.cloud.networkconnectivity_v1.types import internal_range from google.cloud.networkconnectivity_v1.types import ( internal_range as gcn_internal_range, ) -from google.cloud.networkconnectivity_v1.types import internal_range DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -301,13 +303,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/grpc.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/grpc.py index aa7be43bc0d7..6e36a9f9f652 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/grpc.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/grpc.py @@ -16,26 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.networkconnectivity_v1.types import internal_range from google.cloud.networkconnectivity_v1.types import ( internal_range as gcn_internal_range, ) -from google.cloud.networkconnectivity_v1.types import internal_range from .base import DEFAULT_CLIENT_INFO, InternalRangeServiceTransport diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/grpc_asyncio.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/grpc_asyncio.py index e2c1732efe5c..dd1d698f85b2 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/internal_range_service/transports/grpc_asyncio.py @@ -17,28 +17,30 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.networkconnectivity_v1.types import internal_range from google.cloud.networkconnectivity_v1.types import ( internal_range as gcn_internal_range, ) -from google.cloud.networkconnectivity_v1.types import internal_range from .base import DEFAULT_CLIENT_INFO, InternalRangeServiceTransport from .grpc import InternalRangeServiceGrpcTransport diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/async_client.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/async_client.py index df894ef71b89..26d4f98a8f55 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/async_client.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version @@ -44,14 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.policy_based_routing_service import ( pagers, @@ -143,7 +145,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PolicyBasedRoutingServiceAsyncClient: The constructed client. """ - return PolicyBasedRoutingServiceClient.from_service_account_info.__func__(PolicyBasedRoutingServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PolicyBasedRoutingServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func(PolicyBasedRoutingServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +164,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PolicyBasedRoutingServiceAsyncClient: The constructed client. """ - return PolicyBasedRoutingServiceClient.from_service_account_file.__func__(PolicyBasedRoutingServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PolicyBasedRoutingServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + PolicyBasedRoutingServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -197,7 +207,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return PolicyBasedRoutingServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return PolicyBasedRoutingServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> PolicyBasedRoutingServiceTransport: diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/client.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/client.py index 42ee088f787f..9e2cd784e991 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/client.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.policy_based_routing_service import ( pagers, @@ -88,9 +90,7 @@ class PolicyBasedRoutingServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PolicyBasedRoutingServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PolicyBasedRoutingServiceTransport]] _transport_registry["grpc"] = PolicyBasedRoutingServiceGrpcTransport _transport_registry["grpc_asyncio"] = PolicyBasedRoutingServiceGrpcAsyncIOTransport @@ -655,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PolicyBasedRoutingServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PolicyBasedRoutingServiceClient._read_environment_variables() + ) self._client_cert_source = ( PolicyBasedRoutingServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -696,8 +694,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PolicyBasedRoutingServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/pagers.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/pagers.py index 6d360a23240a..e9a4d18862c4 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/pagers.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/__init__.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/__init__.py index c2ab08f995bc..975d92a37c0b 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/__init__.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import PolicyBasedRoutingServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PolicyBasedRoutingServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PolicyBasedRoutingServiceTransport]] _transport_registry["grpc"] = PolicyBasedRoutingServiceGrpcTransport _transport_registry["grpc_asyncio"] = PolicyBasedRoutingServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/base.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/base.py index 14641a10d73b..b4ff14f98db7 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/base.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1 import gapic_version as package_version from google.cloud.networkconnectivity_v1.types import policy_based_routing @@ -287,13 +289,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/grpc.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/grpc.py index b18440bfa85e..94809e75e4c5 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/grpc.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.networkconnectivity_v1.types import policy_based_routing diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/grpc_asyncio.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/grpc_asyncio.py index 940df84dc9c8..f4b5a9350ed1 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/services/policy_based_routing_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.networkconnectivity_v1.types import policy_based_routing diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/__init__.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/__init__.py index ce3efa7c629f..3377be882055 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/__init__.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .common import OperationMetadata +from .common import ( + OperationMetadata, +) from .cross_network_automation import ( ConnectionErrorType, CreateServiceConnectionMapRequest, diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/common.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/common.py index 110c2cc16b88..97825da55cca 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/common.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/common.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/cross_network_automation.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/cross_network_automation.py index 57819f5920a5..31b18556e840 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/cross_network_automation.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/cross_network_automation.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import error_details_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -71,6 +71,7 @@ class Infrastructure(proto.Enum): Private Service Connect is used for connections. """ + INFRASTRUCTURE_UNSPECIFIED = 0 PSC = 1 @@ -92,6 +93,7 @@ class ConnectionErrorType(proto.Enum): The error is due to the setup on producer side. """ + CONNECTION_ERROR_TYPE_UNSPECIFIED = 0 ERROR_INTERNAL = 1 ERROR_CONSUMER_SIDE = 2 @@ -111,6 +113,7 @@ class IPVersion(proto.Enum): IPV6 (2): Will use IPv6 only. """ + IP_VERSION_UNSPECIFIED = 0 IPV4 = 1 IPV6 = 2 @@ -261,6 +264,7 @@ class State(proto.Enum): AllowedGoogleProducersResourceHierarchyLevels of the matching ServiceConnectionPolicy. """ + STATE_UNSPECIFIED = 0 VALID = 1 CONNECTION_POLICY_MISSING = 2 @@ -403,6 +407,7 @@ class State(proto.Enum): The connection is being repaired to complete deletion. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 FAILED = 2 @@ -525,12 +530,12 @@ class State(proto.Enum): number=10, message=ConsumerPscConfig, ) - consumer_psc_connections: MutableSequence[ - ConsumerPscConnection - ] = proto.RepeatedField( - proto.MESSAGE, - number=11, - message=ConsumerPscConnection, + consumer_psc_connections: MutableSequence[ConsumerPscConnection] = ( + proto.RepeatedField( + proto.MESSAGE, + number=11, + message=ConsumerPscConnection, + ) ) token: str = proto.Field( proto.STRING, @@ -602,12 +607,12 @@ class ListServiceConnectionMapsResponse(proto.Message): def raw_page(self): return self - service_connection_maps: MutableSequence[ - "ServiceConnectionMap" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ServiceConnectionMap", + service_connection_maps: MutableSequence["ServiceConnectionMap"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ServiceConnectionMap", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -880,6 +885,7 @@ class State(proto.Enum): The connection is being repaired to complete deletion. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 FAILED = 2 @@ -950,6 +956,7 @@ class ProducerInstanceLocation(proto.Enum): Producer instance must be within one of the values provided in allowed_google_producers_resource_hierarchy_level. """ + PRODUCER_INSTANCE_LOCATION_UNSPECIFIED = 0 CUSTOM_RESOURCE_HIERARCHY_LEVELS = 1 @@ -967,11 +974,11 @@ class ProducerInstanceLocation(proto.Enum): number=3, enum="ServiceConnectionPolicy.PscConfig.ProducerInstanceLocation", ) - allowed_google_producers_resource_hierarchy_level: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=4, + allowed_google_producers_resource_hierarchy_level: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=4, + ) ) class PscConnection(proto.Message): @@ -1206,12 +1213,12 @@ class ListServiceConnectionPoliciesResponse(proto.Message): def raw_page(self): return self - service_connection_policies: MutableSequence[ - "ServiceConnectionPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ServiceConnectionPolicy", + service_connection_policies: MutableSequence["ServiceConnectionPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ServiceConnectionPolicy", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1805,12 +1812,12 @@ class ListServiceConnectionTokensResponse(proto.Message): def raw_page(self): return self - service_connection_tokens: MutableSequence[ - "ServiceConnectionToken" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ServiceConnectionToken", + service_connection_tokens: MutableSequence["ServiceConnectionToken"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ServiceConnectionToken", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/data_transfer.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/data_transfer.py index 1222d65e25a2..4fc956665625 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/data_transfer.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/data_transfer.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -475,6 +475,7 @@ class State(proto.Enum): INVALID (2): The ``DestinationEndpoint`` resource is invalid. """ + STATE_UNSPECIFIED = 0 VALID = 1 INVALID = 2 @@ -825,6 +826,7 @@ class State(proto.Enum): SUSPENDED (5): The resource is suspended and not in use. """ + STATE_UNSPECIFIED = 0 ADDING = 1 ACTIVE = 2 @@ -905,6 +907,7 @@ class EligibilityCriteria(proto.Enum): Essentials configuration only for the regional endpoint. """ + ELIGIBILITY_CRITERIA_UNSPECIFIED = 0 NETWORK_SERVICE_TIER_PREMIUM_ONLY = 1 NETWORK_SERVICE_TIER_STANDARD_ONLY = 2 diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/hub.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/hub.py index 6ca92aaff284..74a1f9ed3084 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/hub.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/hub.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -103,6 +103,7 @@ class LocationFeature(proto.Enum): Site-to-site spokes are supported in this location """ + LOCATION_FEATURE_UNSPECIFIED = 0 SITE_TO_CLOUD_SPOKES = 1 SITE_TO_SITE_SPOKES = 2 @@ -128,6 +129,7 @@ class RouteType(proto.Enum): Gateway Protocol (BGP) advertisements received from an NCC hybrid spoke. """ + ROUTE_TYPE_UNSPECIFIED = 0 VPC_PRIMARY_SUBNET = 1 VPC_SECONDARY_SUBNET = 2 @@ -170,6 +172,7 @@ class State(proto.Enum): try to delete the resource later or contact support for help. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -202,6 +205,7 @@ class SpokeType(proto.Enum): Spokes that are backed by a producer VPC network. """ + SPOKE_TYPE_UNSPECIFIED = 0 VPN_TUNNEL = 1 INTERCONNECT_ATTACHMENT = 2 @@ -220,6 +224,7 @@ class PolicyMode(proto.Enum): PRESET (1): Hub uses one of the preset topologies. """ + POLICY_MODE_UNSPECIFIED = 0 PRESET = 1 @@ -240,6 +245,7 @@ class PresetTopology(proto.Enum): ``edge``, are automatically created along with hub creation. Spokes have to join one of the groups during creation. """ + PRESET_TOPOLOGY_UNSPECIFIED = 0 MESH = 2 STAR = 3 @@ -527,6 +533,7 @@ class Code(proto.Enum): Network Connectivity Center encountered errors while accepting the spoke update. """ + CODE_UNSPECIFIED = 0 PENDING_REVIEW = 1 REJECTED = 2 @@ -1235,6 +1242,7 @@ class SpokeView(proto.Enum): ``DETAILED`` view only when you set the ``spoke_locations`` field to ``[global]``. """ + SPOKE_VIEW_UNSPECIFIED = 0 BASIC = 1 DETAILED = 2 @@ -1503,6 +1511,7 @@ class Code(proto.Enum): because the ``PSC_PROPAGATED_CONNECTIONS_PER_VPC_NETWORK`` quota in the consumer VPC network has been exceeded. """ + CODE_UNSPECIFIED = 0 READY = 1 PROPAGATING = 2 @@ -2827,12 +2836,12 @@ class SpokeStateReasonCount(proto.Message): number=2, message=SpokeStateCount, ) - spoke_state_reason_counts: MutableSequence[ - SpokeStateReasonCount - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=SpokeStateReasonCount, + spoke_state_reason_counts: MutableSequence[SpokeStateReasonCount] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=SpokeStateReasonCount, + ) ) diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/internal_range.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/internal_range.py index e908356a5290..7f06f59f48a3 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/internal_range.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/internal_range.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -157,6 +157,7 @@ class Usage(proto.Enum): FOR_MIGRATION, the peering value has to be set to FOR_SELF or default to FOR_SELF when unset. """ + USAGE_UNSPECIFIED = 0 FOR_VPC = 1 EXTERNAL_TO_VPC = 2 @@ -194,6 +195,7 @@ class Peering(proto.Enum): is visible to this VPC, but can re-use this range as long as it is NOT_SHARED from the peer VPC, too. """ + PEERING_UNSPECIFIED = 0 FOR_SELF = 1 FOR_PEER = 2 @@ -212,6 +214,7 @@ class Overlap(proto.Enum): Allow creation of internal ranges that overlap with existing subnets. """ + OVERLAP_UNSPECIFIED = 0 OVERLAP_ROUTE_RANGE = 1 OVERLAP_EXISTING_SUBNET_RANGE = 2 @@ -249,6 +252,7 @@ class AllocationStrategy(proto.Enum): range. This deterministic strategy minimizes fragmentation of the address space. """ + ALLOCATION_STRATEGY_UNSPECIFIED = 0 RANDOM = 1 FIRST_AVAILABLE = 2 diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/policy_based_routing.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/policy_based_routing.py index 61f1feb537da..0bbef2d654d3 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/policy_based_routing.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1/types/policy_based_routing.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -127,6 +127,7 @@ class OtherRoutes(proto.Enum): effectively excludes matching packets being applied on other PBRs with a lower priority. """ + OTHER_ROUTES_UNSPECIFIED = 0 DEFAULT_ROUTING = 1 @@ -196,6 +197,7 @@ class ProtocolVersion(proto.Enum): The PBR is for IPv4 internet protocol traffic. """ + PROTOCOL_VERSION_UNSPECIFIED = 0 IPV4 = 1 @@ -254,6 +256,7 @@ class Code(proto.Enum): The policy-based route is being modified (e.g. created/deleted) at this time. """ + WARNING_UNSPECIFIED = 0 RESOURCE_NOT_ACTIVE = 1 RESOURCE_BEING_MODIFIED = 2 diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/__init__.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/__init__.py index 7cc84e9852ed..8b3bfd81bc28 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/__init__.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.hub_service import HubServiceAsyncClient, HubServiceClient from .types.common import OperationMetadata from .types.hub import ( diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/async_client.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/async_client.py index fff451945ae0..997d28109512 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/async_client.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1alpha1 import gapic_version as package_version @@ -44,15 +44,14 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1alpha1.services.hub_service import pagers -from google.cloud.networkconnectivity_v1alpha1.types import common -from google.cloud.networkconnectivity_v1alpha1.types import hub +from google.cloud.networkconnectivity_v1alpha1.types import common, hub from google.cloud.networkconnectivity_v1alpha1.types import hub as gcn_hub from .client import HubServiceClient @@ -131,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: HubServiceAsyncClient: The constructed client. """ - return HubServiceClient.from_service_account_info.__func__(HubServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = HubServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(HubServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +147,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: HubServiceAsyncClient: The constructed client. """ - return HubServiceClient.from_service_account_file.__func__(HubServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = HubServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(HubServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/client.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/client.py index ea145710f9fa..d88bdea0f4e1 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/client.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1alpha1 import gapic_version as package_version @@ -61,15 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1alpha1.services.hub_service import pagers -from google.cloud.networkconnectivity_v1alpha1.types import common -from google.cloud.networkconnectivity_v1alpha1.types import hub +from google.cloud.networkconnectivity_v1alpha1.types import common, hub from google.cloud.networkconnectivity_v1alpha1.types import hub as gcn_hub from .transports.base import DEFAULT_CLIENT_INFO, HubServiceTransport @@ -713,11 +712,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = HubServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + HubServiceClient._read_environment_variables() + ) self._client_cert_source = HubServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -752,8 +749,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(HubServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/pagers.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/pagers.py index 8ea9a7c4661a..14d6a68ab923 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/pagers.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/transports/base.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/transports/base.py index 11fa5db1998c..806854d0e94b 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/transports/base.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.networkconnectivity_v1alpha1 import gapic_version as package_version from google.cloud.networkconnectivity_v1alpha1.types import hub diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/transports/grpc.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/transports/grpc.py index 2d084f905562..ef336a259c2f 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/transports/grpc.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.networkconnectivity_v1alpha1.types import hub from google.cloud.networkconnectivity_v1alpha1.types import hub as gcn_hub diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/transports/grpc_asyncio.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/transports/grpc_asyncio.py index 64dc73db468b..20416aeabb75 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/services/hub_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.networkconnectivity_v1alpha1.types import hub from google.cloud.networkconnectivity_v1alpha1.types import hub as gcn_hub diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/types/__init__.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/types/__init__.py index 0587c57219fe..b142a7cfec4b 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/types/__init__.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/types/__init__.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .common import OperationMetadata +from .common import ( + OperationMetadata, +) from .hub import ( CreateHubRequest, CreateSpokeRequest, diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/types/common.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/types/common.py index b8336cdd08fb..a6f10f724e1b 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/types/common.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/types/common.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/types/hub.py b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/types/hub.py index ce7be88e7ff8..bf3b7660ea4b 100644 --- a/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/types/hub.py +++ b/packages/google-cloud-network-connectivity/google/cloud/networkconnectivity_v1alpha1/types/hub.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -60,6 +60,7 @@ class State(proto.Enum): The resource's Delete operation is in progress """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -206,12 +207,12 @@ class Spoke(proto.Message): proto.STRING, number=13, ) - linked_router_appliance_instances: MutableSequence[ - "RouterApplianceInstance" - ] = proto.RepeatedField( - proto.MESSAGE, - number=14, - message="RouterApplianceInstance", + linked_router_appliance_instances: MutableSequence["RouterApplianceInstance"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=14, + message="RouterApplianceInstance", + ) ) unique_id: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-connectivity/noxfile.py b/packages/google-cloud-network-connectivity/noxfile.py index a25feb2b480a..afa885fdf8cb 100644 --- a/packages/google-cloud-network-connectivity/noxfile.py +++ b/packages/google-cloud-network-connectivity/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_cross_network_automation_service.py b/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_cross_network_automation_service.py index 8266b2261366..ed791bb6cbde 100644 --- a/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_cross_network_automation_service.py +++ b/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_cross_network_automation_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.error_details_pb2 as error_details_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,25 +57,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import error_details_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.cross_network_automation_service import ( CrossNetworkAutomationServiceAsyncClient, @@ -1032,10 +1034,9 @@ def test_cross_network_automation_service_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1080,10 +1081,9 @@ def test_cross_network_automation_service_client_get_mtls_endpoint_and_cert_sour client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1119,10 +1119,9 @@ def test_cross_network_automation_service_client_get_mtls_endpoint_and_cert_sour "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1372,13 +1371,13 @@ def test_cross_network_automation_service_client_create_channel_credentials_file ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5553,9 +5552,9 @@ def test_list_service_classes_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_service_classes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_service_classes] = ( + mock_rpc + ) request = {} client.list_service_classes(request) @@ -6107,9 +6106,9 @@ def test_get_service_class_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_service_class - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_service_class] = ( + mock_rpc + ) request = {} client.get_service_class(request) @@ -6452,9 +6451,9 @@ def test_update_service_class_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_service_class - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_service_class] = ( + mock_rpc + ) request = {} client.update_service_class(request) @@ -6812,9 +6811,9 @@ def test_delete_service_class_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_service_class - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_service_class] = ( + mock_rpc + ) request = {} client.delete_service_class(request) @@ -9875,11 +9874,14 @@ def test_cross_network_automation_service_base_transport(): def test_cross_network_automation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.networkconnectivity_v1.services.cross_network_automation_service.transports.CrossNetworkAutomationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.networkconnectivity_v1.services.cross_network_automation_service.transports.CrossNetworkAutomationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CrossNetworkAutomationServiceTransport( @@ -9896,9 +9898,12 @@ def test_cross_network_automation_service_base_transport_with_credentials_file() def test_cross_network_automation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.networkconnectivity_v1.services.cross_network_automation_service.transports.CrossNetworkAutomationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.networkconnectivity_v1.services.cross_network_automation_service.transports.CrossNetworkAutomationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CrossNetworkAutomationServiceTransport() @@ -9976,11 +9981,12 @@ def test_cross_network_automation_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_data_transfer_service.py b/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_data_transfer_service.py index fc32ec9f783b..17299913833f 100644 --- a/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_data_transfer_service.py +++ b/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_data_transfer_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,22 +54,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.data_transfer_service import ( DataTransferServiceAsyncClient, @@ -976,10 +978,9 @@ def test_data_transfer_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1025,9 @@ def test_data_transfer_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1063,9 @@ def test_data_transfer_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1311,13 +1310,13 @@ def test_data_transfer_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3447,9 +3446,9 @@ def test_list_destinations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_destinations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_destinations] = ( + mock_rpc + ) request = {} client.list_destinations(request) @@ -4330,9 +4329,9 @@ def test_create_destination_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_destination - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_destination] = ( + mock_rpc + ) request = {} client.create_destination(request) @@ -4691,9 +4690,9 @@ def test_update_destination_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_destination - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_destination] = ( + mock_rpc + ) request = {} client.update_destination(request) @@ -5048,9 +5047,9 @@ def test_delete_destination_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_destination - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_destination] = ( + mock_rpc + ) request = {} client.delete_destination(request) @@ -7067,11 +7066,14 @@ def test_data_transfer_service_base_transport(): def test_data_transfer_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.networkconnectivity_v1.services.data_transfer_service.transports.DataTransferServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.networkconnectivity_v1.services.data_transfer_service.transports.DataTransferServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataTransferServiceTransport( @@ -7088,9 +7090,12 @@ def test_data_transfer_service_base_transport_with_credentials_file(): def test_data_transfer_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.networkconnectivity_v1.services.data_transfer_service.transports.DataTransferServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.networkconnectivity_v1.services.data_transfer_service.transports.DataTransferServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataTransferServiceTransport() @@ -7161,11 +7166,12 @@ def test_data_transfer_service_transport_auth_gdch_credentials(transport_class): def test_data_transfer_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_hub_service.py b/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_hub_service.py index 6e973a327984..e36e143455e2 100644 --- a/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_hub_service.py +++ b/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_hub_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,22 +54,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.hub_service import ( HubServiceAsyncClient, @@ -71,8 +73,7 @@ pagers, transports, ) -from google.cloud.networkconnectivity_v1.types import common -from google.cloud.networkconnectivity_v1.types import hub +from google.cloud.networkconnectivity_v1.types import common, hub from google.cloud.networkconnectivity_v1.types import hub as gcn_hub CRED_INFO_JSON = { @@ -918,10 +919,9 @@ def test_hub_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -966,10 +966,9 @@ def test_hub_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1005,10 +1004,9 @@ def test_hub_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1235,13 +1233,13 @@ def test_hub_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3764,9 +3762,9 @@ def test_query_hub_status_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.query_hub_status - ] = mock_rpc + client._transport._wrapped_methods[client._transport.query_hub_status] = ( + mock_rpc + ) request = {} client.query_hub_status(request) @@ -5850,9 +5848,9 @@ def test_reject_hub_spoke_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reject_hub_spoke - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reject_hub_spoke] = ( + mock_rpc + ) request = {} client.reject_hub_spoke(request) @@ -6193,9 +6191,9 @@ def test_accept_hub_spoke_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.accept_hub_spoke - ] = mock_rpc + client._transport._wrapped_methods[client._transport.accept_hub_spoke] = ( + mock_rpc + ) request = {} client.accept_hub_spoke(request) @@ -6542,9 +6540,9 @@ def test_accept_spoke_update_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.accept_spoke_update - ] = mock_rpc + client._transport._wrapped_methods[client._transport.accept_spoke_update] = ( + mock_rpc + ) request = {} client.accept_spoke_update(request) @@ -6913,9 +6911,9 @@ def test_reject_spoke_update_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.reject_spoke_update - ] = mock_rpc + client._transport._wrapped_methods[client._transport.reject_spoke_update] = ( + mock_rpc + ) request = {} client.reject_spoke_update(request) @@ -8823,9 +8821,9 @@ def test_list_route_tables_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_route_tables - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_route_tables] = ( + mock_rpc + ) request = {} client.list_route_tables(request) @@ -11812,11 +11810,14 @@ def test_hub_service_base_transport(): def test_hub_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.networkconnectivity_v1.services.hub_service.transports.HubServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.networkconnectivity_v1.services.hub_service.transports.HubServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HubServiceTransport( @@ -11833,9 +11834,12 @@ def test_hub_service_base_transport_with_credentials_file(): def test_hub_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.networkconnectivity_v1.services.hub_service.transports.HubServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.networkconnectivity_v1.services.hub_service.transports.HubServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HubServiceTransport() @@ -11906,11 +11910,12 @@ def test_hub_service_transport_auth_gdch_credentials(transport_class): def test_hub_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_internal_range_service.py b/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_internal_range_service.py index 341252f2e331..c79c3578037d 100644 --- a/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_internal_range_service.py +++ b/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_internal_range_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,22 +54,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.internal_range_service import ( InternalRangeServiceAsyncClient, @@ -71,11 +73,10 @@ pagers, transports, ) +from google.cloud.networkconnectivity_v1.types import common, internal_range from google.cloud.networkconnectivity_v1.types import ( internal_range as gcn_internal_range, ) -from google.cloud.networkconnectivity_v1.types import common -from google.cloud.networkconnectivity_v1.types import internal_range CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -980,10 +981,9 @@ def test_internal_range_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1028,10 +1028,9 @@ def test_internal_range_service_client_get_mtls_endpoint_and_cert_source(client_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1067,10 +1066,9 @@ def test_internal_range_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1315,13 +1313,13 @@ def test_internal_range_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1442,9 +1440,9 @@ def test_list_internal_ranges_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_internal_ranges - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_internal_ranges] = ( + mock_rpc + ) request = {} client.list_internal_ranges(request) @@ -2012,9 +2010,9 @@ def test_get_internal_range_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_internal_range - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_internal_range] = ( + mock_rpc + ) request = {} client.get_internal_range(request) @@ -2379,9 +2377,9 @@ def test_create_internal_range_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_internal_range - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_internal_range] = ( + mock_rpc + ) request = {} client.create_internal_range(request) @@ -2746,9 +2744,9 @@ def test_update_internal_range_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_internal_range - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_internal_range] = ( + mock_rpc + ) request = {} client.update_internal_range(request) @@ -3105,9 +3103,9 @@ def test_delete_internal_range_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_internal_range - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_internal_range] = ( + mock_rpc + ) request = {} client.delete_internal_range(request) @@ -3819,11 +3817,14 @@ def test_internal_range_service_base_transport(): def test_internal_range_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.networkconnectivity_v1.services.internal_range_service.transports.InternalRangeServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.networkconnectivity_v1.services.internal_range_service.transports.InternalRangeServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InternalRangeServiceTransport( @@ -3840,9 +3841,12 @@ def test_internal_range_service_base_transport_with_credentials_file(): def test_internal_range_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.networkconnectivity_v1.services.internal_range_service.transports.InternalRangeServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.networkconnectivity_v1.services.internal_range_service.transports.InternalRangeServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InternalRangeServiceTransport() @@ -3913,11 +3917,12 @@ def test_internal_range_service_transport_auth_gdch_credentials(transport_class) def test_internal_range_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_policy_based_routing_service.py b/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_policy_based_routing_service.py index 9d305a8af817..aeccc0854a96 100644 --- a/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_policy_based_routing_service.py +++ b/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1/test_policy_based_routing_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,21 +53,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1.services.policy_based_routing_service import ( PolicyBasedRoutingServiceAsyncClient, @@ -991,10 +993,9 @@ def test_policy_based_routing_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1039,10 +1040,9 @@ def test_policy_based_routing_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1078,10 +1078,9 @@ def test_policy_based_routing_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1329,13 +1328,13 @@ def test_policy_based_routing_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2021,9 +2020,9 @@ def test_get_policy_based_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_policy_based_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_policy_based_route] = ( + mock_rpc + ) request = {} client.get_policy_based_route(request) @@ -3425,11 +3424,14 @@ def test_policy_based_routing_service_base_transport(): def test_policy_based_routing_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.networkconnectivity_v1.services.policy_based_routing_service.transports.PolicyBasedRoutingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.networkconnectivity_v1.services.policy_based_routing_service.transports.PolicyBasedRoutingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyBasedRoutingServiceTransport( @@ -3446,9 +3448,12 @@ def test_policy_based_routing_service_base_transport_with_credentials_file(): def test_policy_based_routing_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.networkconnectivity_v1.services.policy_based_routing_service.transports.PolicyBasedRoutingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.networkconnectivity_v1.services.policy_based_routing_service.transports.PolicyBasedRoutingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PolicyBasedRoutingServiceTransport() @@ -3521,11 +3526,12 @@ def test_policy_based_routing_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1alpha1/test_hub_service.py b/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1alpha1/test_hub_service.py index deb3c2958422..3815574f6dad 100644 --- a/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1alpha1/test_hub_service.py +++ b/packages/google-cloud-network-connectivity/tests/unit/gapic/networkconnectivity_v1alpha1/test_hub_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,18 +54,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.networkconnectivity_v1alpha1.services.hub_service import ( HubServiceAsyncClient, @@ -67,8 +67,7 @@ pagers, transports, ) -from google.cloud.networkconnectivity_v1alpha1.types import common -from google.cloud.networkconnectivity_v1alpha1.types import hub +from google.cloud.networkconnectivity_v1alpha1.types import common, hub from google.cloud.networkconnectivity_v1alpha1.types import hub as gcn_hub CRED_INFO_JSON = { @@ -914,10 +913,9 @@ def test_hub_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -962,10 +960,9 @@ def test_hub_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1001,10 +998,9 @@ def test_hub_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1231,13 +1227,13 @@ def test_hub_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5687,11 +5683,14 @@ def test_hub_service_base_transport(): def test_hub_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.networkconnectivity_v1alpha1.services.hub_service.transports.HubServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.networkconnectivity_v1alpha1.services.hub_service.transports.HubServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HubServiceTransport( @@ -5708,9 +5707,12 @@ def test_hub_service_base_transport_with_credentials_file(): def test_hub_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.networkconnectivity_v1alpha1.services.hub_service.transports.HubServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.networkconnectivity_v1alpha1.services.hub_service.transports.HubServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.HubServiceTransport() @@ -5781,11 +5783,12 @@ def test_hub_service_transport_auth_gdch_credentials(transport_class): def test_hub_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-management/docs/conf.py b/packages/google-cloud-network-management/docs/conf.py index 874b8cc45086..cfe345628346 100644 --- a/packages/google-cloud-network-management/docs/conf.py +++ b/packages/google-cloud-network-management/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-network-management documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/__init__.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/__init__.py index 6a683df7470e..b4ed647bc98c 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/__init__.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.organization_vpc_flow_logs_service import ( OrganizationVpcFlowLogsServiceAsyncClient, OrganizationVpcFlowLogsServiceClient, diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/async_client.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/async_client.py index bd921d499f78..8945117ffe20 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/async_client.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_management_v1 import gapic_version as package_version @@ -44,24 +44,29 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_management_v1.services.organization_vpc_flow_logs_service import ( pagers, ) -from google.cloud.network_management_v1.types import reachability, vpc_flow_logs +from google.cloud.network_management_v1.types import ( + reachability, + vpc_flow_logs, + vpc_flow_logs_config, +) from google.cloud.network_management_v1.types import ( vpc_flow_logs_config as gcn_vpc_flow_logs_config, ) -from google.cloud.network_management_v1.types import vpc_flow_logs_config from .client import OrganizationVpcFlowLogsServiceClient from .transports.base import ( @@ -148,7 +153,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: OrganizationVpcFlowLogsServiceAsyncClient: The constructed client. """ - return OrganizationVpcFlowLogsServiceClient.from_service_account_info.__func__(OrganizationVpcFlowLogsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + OrganizationVpcFlowLogsServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + OrganizationVpcFlowLogsServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -164,7 +174,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: OrganizationVpcFlowLogsServiceAsyncClient: The constructed client. """ - return OrganizationVpcFlowLogsServiceClient.from_service_account_file.__func__(OrganizationVpcFlowLogsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + OrganizationVpcFlowLogsServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + OrganizationVpcFlowLogsServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -202,7 +217,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return OrganizationVpcFlowLogsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return OrganizationVpcFlowLogsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> OrganizationVpcFlowLogsServiceTransport: diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/client.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/client.py index 0a530a9d0470..90480a4646c1 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/client.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_management_v1 import gapic_version as package_version @@ -61,24 +61,29 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_management_v1.services.organization_vpc_flow_logs_service import ( pagers, ) -from google.cloud.network_management_v1.types import reachability, vpc_flow_logs +from google.cloud.network_management_v1.types import ( + reachability, + vpc_flow_logs, + vpc_flow_logs_config, +) from google.cloud.network_management_v1.types import ( vpc_flow_logs_config as gcn_vpc_flow_logs_config, ) -from google.cloud.network_management_v1.types import vpc_flow_logs_config from .transports.base import ( DEFAULT_CLIENT_INFO, @@ -97,13 +102,11 @@ class OrganizationVpcFlowLogsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OrganizationVpcFlowLogsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationVpcFlowLogsServiceTransport]] _transport_registry["grpc"] = OrganizationVpcFlowLogsServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = OrganizationVpcFlowLogsServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + OrganizationVpcFlowLogsServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = OrganizationVpcFlowLogsServiceRestTransport def get_transport_class( @@ -657,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OrganizationVpcFlowLogsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OrganizationVpcFlowLogsServiceClient._read_environment_variables() + ) self._client_cert_source = ( OrganizationVpcFlowLogsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -702,8 +703,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OrganizationVpcFlowLogsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/pagers.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/pagers.py index 6502a505d0ce..bbcdcda2188c 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/pagers.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/__init__.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/__init__.py index e0d64c882e70..3b86171dfc00 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/__init__.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OrganizationVpcFlowLogsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationVpcFlowLogsServiceTransport]] _transport_registry["grpc"] = OrganizationVpcFlowLogsServiceGrpcTransport _transport_registry["grpc_asyncio"] = OrganizationVpcFlowLogsServiceGrpcAsyncIOTransport _transport_registry["rest"] = OrganizationVpcFlowLogsServiceRestTransport diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/base.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/base.py index 7e3e5b9a59b7..d2c7424a9660 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/base.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_management_v1 import gapic_version as package_version from google.cloud.network_management_v1.types import vpc_flow_logs, vpc_flow_logs_config @@ -301,13 +303,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/grpc.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/grpc.py index 5af1c99eb49c..086c90864813 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/grpc.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.network_management_v1.types import vpc_flow_logs, vpc_flow_logs_config @@ -369,12 +371,12 @@ def list_vpc_flow_logs_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_vpc_flow_logs_configs" not in self._stubs: - self._stubs[ - "list_vpc_flow_logs_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/ListVpcFlowLogsConfigs", - request_serializer=vpc_flow_logs.ListVpcFlowLogsConfigsRequest.serialize, - response_deserializer=vpc_flow_logs.ListVpcFlowLogsConfigsResponse.deserialize, + self._stubs["list_vpc_flow_logs_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/ListVpcFlowLogsConfigs", + request_serializer=vpc_flow_logs.ListVpcFlowLogsConfigsRequest.serialize, + response_deserializer=vpc_flow_logs.ListVpcFlowLogsConfigsResponse.deserialize, + ) ) return self._stubs["list_vpc_flow_logs_configs"] @@ -442,12 +444,12 @@ def create_vpc_flow_logs_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_vpc_flow_logs_config" not in self._stubs: - self._stubs[ - "create_vpc_flow_logs_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/CreateVpcFlowLogsConfig", - request_serializer=vpc_flow_logs.CreateVpcFlowLogsConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_vpc_flow_logs_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/CreateVpcFlowLogsConfig", + request_serializer=vpc_flow_logs.CreateVpcFlowLogsConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_vpc_flow_logs_config"] @@ -486,12 +488,12 @@ def update_vpc_flow_logs_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_vpc_flow_logs_config" not in self._stubs: - self._stubs[ - "update_vpc_flow_logs_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/UpdateVpcFlowLogsConfig", - request_serializer=vpc_flow_logs.UpdateVpcFlowLogsConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_vpc_flow_logs_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/UpdateVpcFlowLogsConfig", + request_serializer=vpc_flow_logs.UpdateVpcFlowLogsConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_vpc_flow_logs_config"] @@ -516,12 +518,12 @@ def delete_vpc_flow_logs_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_vpc_flow_logs_config" not in self._stubs: - self._stubs[ - "delete_vpc_flow_logs_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/DeleteVpcFlowLogsConfig", - request_serializer=vpc_flow_logs.DeleteVpcFlowLogsConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_vpc_flow_logs_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/DeleteVpcFlowLogsConfig", + request_serializer=vpc_flow_logs.DeleteVpcFlowLogsConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_vpc_flow_logs_config"] diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/grpc_asyncio.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/grpc_asyncio.py index 4c40ab2ca76c..0cd0353d1ccc 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.network_management_v1.types import vpc_flow_logs, vpc_flow_logs_config @@ -377,12 +379,12 @@ def list_vpc_flow_logs_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_vpc_flow_logs_configs" not in self._stubs: - self._stubs[ - "list_vpc_flow_logs_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/ListVpcFlowLogsConfigs", - request_serializer=vpc_flow_logs.ListVpcFlowLogsConfigsRequest.serialize, - response_deserializer=vpc_flow_logs.ListVpcFlowLogsConfigsResponse.deserialize, + self._stubs["list_vpc_flow_logs_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/ListVpcFlowLogsConfigs", + request_serializer=vpc_flow_logs.ListVpcFlowLogsConfigsRequest.serialize, + response_deserializer=vpc_flow_logs.ListVpcFlowLogsConfigsResponse.deserialize, + ) ) return self._stubs["list_vpc_flow_logs_configs"] @@ -451,12 +453,12 @@ def create_vpc_flow_logs_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_vpc_flow_logs_config" not in self._stubs: - self._stubs[ - "create_vpc_flow_logs_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/CreateVpcFlowLogsConfig", - request_serializer=vpc_flow_logs.CreateVpcFlowLogsConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_vpc_flow_logs_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/CreateVpcFlowLogsConfig", + request_serializer=vpc_flow_logs.CreateVpcFlowLogsConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_vpc_flow_logs_config"] @@ -496,12 +498,12 @@ def update_vpc_flow_logs_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_vpc_flow_logs_config" not in self._stubs: - self._stubs[ - "update_vpc_flow_logs_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/UpdateVpcFlowLogsConfig", - request_serializer=vpc_flow_logs.UpdateVpcFlowLogsConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_vpc_flow_logs_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/UpdateVpcFlowLogsConfig", + request_serializer=vpc_flow_logs.UpdateVpcFlowLogsConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_vpc_flow_logs_config"] @@ -527,12 +529,12 @@ def delete_vpc_flow_logs_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_vpc_flow_logs_config" not in self._stubs: - self._stubs[ - "delete_vpc_flow_logs_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/DeleteVpcFlowLogsConfig", - request_serializer=vpc_flow_logs.DeleteVpcFlowLogsConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_vpc_flow_logs_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.OrganizationVpcFlowLogsService/DeleteVpcFlowLogsConfig", + request_serializer=vpc_flow_logs.DeleteVpcFlowLogsConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_vpc_flow_logs_config"] diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/rest.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/rest.py index 75677e1a177a..0dc75a916a15 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/rest.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -818,9 +820,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseCreateVpcFlowLogsConfig._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseCreateVpcFlowLogsConfig._get_http_options() request, metadata = self._interceptor.pre_create_vpc_flow_logs_config( request, metadata @@ -846,7 +846,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -974,9 +974,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseDeleteVpcFlowLogsConfig._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseDeleteVpcFlowLogsConfig._get_http_options() request, metadata = self._interceptor.pre_delete_vpc_flow_logs_config( request, metadata @@ -998,7 +996,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1123,9 +1121,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseGetVpcFlowLogsConfig._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseGetVpcFlowLogsConfig._get_http_options() request, metadata = self._interceptor.pre_get_vpc_flow_logs_config( request, metadata @@ -1275,9 +1271,7 @@ def __call__( Response for the ``ListVpcFlowLogsConfigs`` method. """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseListVpcFlowLogsConfigs._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseListVpcFlowLogsConfigs._get_http_options() request, metadata = self._interceptor.pre_list_vpc_flow_logs_configs( request, metadata @@ -1431,9 +1425,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseUpdateVpcFlowLogsConfig._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseUpdateVpcFlowLogsConfig._get_http_options() request, metadata = self._interceptor.pre_update_vpc_flow_logs_config( request, metadata @@ -1459,7 +1451,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1534,7 +1526,9 @@ def create_vpc_flow_logs_config( ]: # 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._CreateVpcFlowLogsConfig(self._session, self._host, self._interceptor) # type: ignore + return self._CreateVpcFlowLogsConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_vpc_flow_logs_config( @@ -1544,7 +1538,9 @@ def delete_vpc_flow_logs_config( ]: # 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._DeleteVpcFlowLogsConfig(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteVpcFlowLogsConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_vpc_flow_logs_config( @@ -1566,7 +1562,9 @@ def list_vpc_flow_logs_configs( ]: # 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._ListVpcFlowLogsConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListVpcFlowLogsConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_vpc_flow_logs_config( @@ -1576,7 +1574,9 @@ def update_vpc_flow_logs_config( ]: # 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._UpdateVpcFlowLogsConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateVpcFlowLogsConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1636,9 +1636,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1779,9 +1777,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1920,9 +1916,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2064,9 +2058,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2215,9 +2207,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2361,9 +2351,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2481,9 +2469,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2599,9 +2585,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2742,9 +2726,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseOrganizationVpcFlowLogsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/rest_base.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/rest_base.py index a5b70cc0dd95..cec1cdc5405c 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/rest_base.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/organization_vpc_flow_logs_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/async_client.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/async_client.py index 9dc90070f6a4..dd9447c472ce 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/async_client.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_management_v1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_management_v1.services.reachability_service import pagers from google.cloud.network_management_v1.types import connectivity_test, reachability @@ -137,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ReachabilityServiceAsyncClient: The constructed client. """ - return ReachabilityServiceClient.from_service_account_info.__func__(ReachabilityServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ReachabilityServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ReachabilityServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -153,7 +156,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ReachabilityServiceAsyncClient: The constructed client. """ - return ReachabilityServiceClient.from_service_account_file.__func__(ReachabilityServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ReachabilityServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ReachabilityServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -191,7 +195,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ReachabilityServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ReachabilityServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ReachabilityServiceTransport: diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/client.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/client.py index 463ecd0fad9e..d7709dd1693c 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/client.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_management_v1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_management_v1.services.reachability_service import pagers from google.cloud.network_management_v1.types import connectivity_test, reachability @@ -88,9 +90,7 @@ class ReachabilityServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ReachabilityServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ReachabilityServiceTransport]] _transport_registry["grpc"] = ReachabilityServiceGrpcTransport _transport_registry["grpc_asyncio"] = ReachabilityServiceGrpcAsyncIOTransport _transport_registry["rest"] = ReachabilityServiceRestTransport @@ -642,11 +642,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ReachabilityServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ReachabilityServiceClient._read_environment_variables() + ) self._client_cert_source = ReachabilityServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -681,8 +679,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ReachabilityServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/pagers.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/pagers.py index f370249b6630..46e7a16166d2 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/pagers.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/__init__.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/__init__.py index c39b46a59583..76d470e2699c 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/__init__.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import ReachabilityServiceRestInterceptor, ReachabilityServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ReachabilityServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ReachabilityServiceTransport]] _transport_registry["grpc"] = ReachabilityServiceGrpcTransport _transport_registry["grpc_asyncio"] = ReachabilityServiceGrpcAsyncIOTransport _transport_registry["rest"] = ReachabilityServiceRestTransport diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/base.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/base.py index 7789e5c55467..3980e0cd46b3 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/base.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_management_v1 import gapic_version as package_version from google.cloud.network_management_v1.types import connectivity_test, reachability @@ -315,13 +317,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/grpc.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/grpc.py index 001d5a967dbf..f447d8c0bd86 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/grpc.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.network_management_v1.types import connectivity_test, reachability diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/grpc_asyncio.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/grpc_asyncio.py index 20aac230d331..be9f484ecddf 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.network_management_v1.types import connectivity_test, reachability diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/rest.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/rest.py index 309dce5180f3..e742493045b9 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/rest.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -873,9 +875,7 @@ def __call__( """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseCreateConnectivityTest._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseCreateConnectivityTest._get_http_options() request, metadata = self._interceptor.pre_create_connectivity_test( request, metadata @@ -901,7 +901,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1028,9 +1028,7 @@ def __call__( """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseDeleteConnectivityTest._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseDeleteConnectivityTest._get_http_options() request, metadata = self._interceptor.pre_delete_connectivity_test( request, metadata @@ -1052,7 +1050,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1177,9 +1175,7 @@ def __call__( """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseGetConnectivityTest._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseGetConnectivityTest._get_http_options() request, metadata = self._interceptor.pre_get_connectivity_test( request, metadata @@ -1328,9 +1324,7 @@ def __call__( Response for the ``ListConnectivityTests`` method. """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseListConnectivityTests._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseListConnectivityTests._get_http_options() request, metadata = self._interceptor.pre_list_connectivity_tests( request, metadata @@ -1483,9 +1477,7 @@ def __call__( """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseRerunConnectivityTest._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseRerunConnectivityTest._get_http_options() request, metadata = self._interceptor.pre_rerun_connectivity_test( request, metadata @@ -1511,7 +1503,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1639,9 +1631,7 @@ def __call__( """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseUpdateConnectivityTest._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseUpdateConnectivityTest._get_http_options() request, metadata = self._interceptor.pre_update_connectivity_test( request, metadata @@ -1667,7 +1657,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1744,7 +1734,9 @@ def create_connectivity_test( ]: # 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._CreateConnectivityTest(self._session, self._host, self._interceptor) # type: ignore + return self._CreateConnectivityTest( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_connectivity_test( @@ -1754,7 +1746,9 @@ def delete_connectivity_test( ]: # 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._DeleteConnectivityTest(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteConnectivityTest( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_connectivity_test( @@ -1795,7 +1789,9 @@ def update_connectivity_test( ]: # 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._UpdateConnectivityTest(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateConnectivityTest( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1855,9 +1851,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseReachabilityServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1996,9 +1990,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseReachabilityServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -2137,9 +2129,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseReachabilityServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2279,9 +2269,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseReachabilityServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2426,9 +2414,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2574,9 +2560,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2694,9 +2678,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2812,9 +2794,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseReachabilityServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2953,9 +2933,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseReachabilityServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseReachabilityServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseReachabilityServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/rest_base.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/rest_base.py index a804159f01ab..0bcc46ef61e0 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/rest_base.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/reachability_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/async_client.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/async_client.py index 10eac965a289..e9126e07569a 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/async_client.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_management_v1 import gapic_version as package_version @@ -44,22 +44,27 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_management_v1.services.vpc_flow_logs_service import pagers -from google.cloud.network_management_v1.types import reachability, vpc_flow_logs +from google.cloud.network_management_v1.types import ( + reachability, + vpc_flow_logs, + vpc_flow_logs_config, +) from google.cloud.network_management_v1.types import ( vpc_flow_logs_config as gcn_vpc_flow_logs_config, ) -from google.cloud.network_management_v1.types import vpc_flow_logs_config from .client import VpcFlowLogsServiceClient from .transports.base import DEFAULT_CLIENT_INFO, VpcFlowLogsServiceTransport @@ -135,7 +140,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: VpcFlowLogsServiceAsyncClient: The constructed client. """ - return VpcFlowLogsServiceClient.from_service_account_info.__func__(VpcFlowLogsServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = VpcFlowLogsServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(VpcFlowLogsServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -151,7 +157,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: VpcFlowLogsServiceAsyncClient: The constructed client. """ - return VpcFlowLogsServiceClient.from_service_account_file.__func__(VpcFlowLogsServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = VpcFlowLogsServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(VpcFlowLogsServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -189,7 +196,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return VpcFlowLogsServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return VpcFlowLogsServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> VpcFlowLogsServiceTransport: diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/client.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/client.py index 045ae5cb6941..43db8ba043e5 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/client.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_management_v1 import gapic_version as package_version @@ -61,22 +61,27 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_management_v1.services.vpc_flow_logs_service import pagers -from google.cloud.network_management_v1.types import reachability, vpc_flow_logs +from google.cloud.network_management_v1.types import ( + reachability, + vpc_flow_logs, + vpc_flow_logs_config, +) from google.cloud.network_management_v1.types import ( vpc_flow_logs_config as gcn_vpc_flow_logs_config, ) -from google.cloud.network_management_v1.types import vpc_flow_logs_config from .transports.base import DEFAULT_CLIENT_INFO, VpcFlowLogsServiceTransport from .transports.grpc import VpcFlowLogsServiceGrpcTransport @@ -92,9 +97,7 @@ class VpcFlowLogsServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[VpcFlowLogsServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[VpcFlowLogsServiceTransport]] _transport_registry["grpc"] = VpcFlowLogsServiceGrpcTransport _transport_registry["grpc_asyncio"] = VpcFlowLogsServiceGrpcAsyncIOTransport _transport_registry["rest"] = VpcFlowLogsServiceRestTransport @@ -642,11 +645,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = VpcFlowLogsServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + VpcFlowLogsServiceClient._read_environment_variables() + ) self._client_cert_source = VpcFlowLogsServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -681,8 +682,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(VpcFlowLogsServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/pagers.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/pagers.py index d9a5c6117ec5..126bdeedd3f6 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/pagers.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -225,7 +225,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -385,7 +385,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -463,7 +463,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/__init__.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/__init__.py index ecd8f0390918..a514cf977ba6 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/__init__.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import VpcFlowLogsServiceRestInterceptor, VpcFlowLogsServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[VpcFlowLogsServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[VpcFlowLogsServiceTransport]] _transport_registry["grpc"] = VpcFlowLogsServiceGrpcTransport _transport_registry["grpc_asyncio"] = VpcFlowLogsServiceGrpcAsyncIOTransport _transport_registry["rest"] = VpcFlowLogsServiceRestTransport diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/base.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/base.py index 3d738c540125..4a7ca51dcf2a 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/base.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_management_v1 import gapic_version as package_version from google.cloud.network_management_v1.types import vpc_flow_logs, vpc_flow_logs_config @@ -335,13 +337,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/grpc.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/grpc.py index 856909cdbe8e..2f9970ee3db8 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/grpc.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.network_management_v1.types import vpc_flow_logs, vpc_flow_logs_config @@ -367,12 +369,12 @@ def list_vpc_flow_logs_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_vpc_flow_logs_configs" not in self._stubs: - self._stubs[ - "list_vpc_flow_logs_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.VpcFlowLogsService/ListVpcFlowLogsConfigs", - request_serializer=vpc_flow_logs.ListVpcFlowLogsConfigsRequest.serialize, - response_deserializer=vpc_flow_logs.ListVpcFlowLogsConfigsResponse.deserialize, + self._stubs["list_vpc_flow_logs_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.VpcFlowLogsService/ListVpcFlowLogsConfigs", + request_serializer=vpc_flow_logs.ListVpcFlowLogsConfigsRequest.serialize, + response_deserializer=vpc_flow_logs.ListVpcFlowLogsConfigsResponse.deserialize, + ) ) return self._stubs["list_vpc_flow_logs_configs"] @@ -440,12 +442,12 @@ def create_vpc_flow_logs_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_vpc_flow_logs_config" not in self._stubs: - self._stubs[ - "create_vpc_flow_logs_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.VpcFlowLogsService/CreateVpcFlowLogsConfig", - request_serializer=vpc_flow_logs.CreateVpcFlowLogsConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_vpc_flow_logs_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.VpcFlowLogsService/CreateVpcFlowLogsConfig", + request_serializer=vpc_flow_logs.CreateVpcFlowLogsConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_vpc_flow_logs_config"] @@ -484,12 +486,12 @@ def update_vpc_flow_logs_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_vpc_flow_logs_config" not in self._stubs: - self._stubs[ - "update_vpc_flow_logs_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.VpcFlowLogsService/UpdateVpcFlowLogsConfig", - request_serializer=vpc_flow_logs.UpdateVpcFlowLogsConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_vpc_flow_logs_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.VpcFlowLogsService/UpdateVpcFlowLogsConfig", + request_serializer=vpc_flow_logs.UpdateVpcFlowLogsConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_vpc_flow_logs_config"] @@ -514,12 +516,12 @@ def delete_vpc_flow_logs_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_vpc_flow_logs_config" not in self._stubs: - self._stubs[ - "delete_vpc_flow_logs_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.VpcFlowLogsService/DeleteVpcFlowLogsConfig", - request_serializer=vpc_flow_logs.DeleteVpcFlowLogsConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_vpc_flow_logs_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.VpcFlowLogsService/DeleteVpcFlowLogsConfig", + request_serializer=vpc_flow_logs.DeleteVpcFlowLogsConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_vpc_flow_logs_config"] @@ -548,12 +550,12 @@ def query_org_vpc_flow_logs_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_org_vpc_flow_logs_configs" not in self._stubs: - self._stubs[ - "query_org_vpc_flow_logs_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.VpcFlowLogsService/QueryOrgVpcFlowLogsConfigs", - request_serializer=vpc_flow_logs.QueryOrgVpcFlowLogsConfigsRequest.serialize, - response_deserializer=vpc_flow_logs.QueryOrgVpcFlowLogsConfigsResponse.deserialize, + self._stubs["query_org_vpc_flow_logs_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.VpcFlowLogsService/QueryOrgVpcFlowLogsConfigs", + request_serializer=vpc_flow_logs.QueryOrgVpcFlowLogsConfigsRequest.serialize, + response_deserializer=vpc_flow_logs.QueryOrgVpcFlowLogsConfigsResponse.deserialize, + ) ) return self._stubs["query_org_vpc_flow_logs_configs"] @@ -582,12 +584,12 @@ def show_effective_flow_logs_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "show_effective_flow_logs_configs" not in self._stubs: - self._stubs[ - "show_effective_flow_logs_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.VpcFlowLogsService/ShowEffectiveFlowLogsConfigs", - request_serializer=vpc_flow_logs.ShowEffectiveFlowLogsConfigsRequest.serialize, - response_deserializer=vpc_flow_logs.ShowEffectiveFlowLogsConfigsResponse.deserialize, + self._stubs["show_effective_flow_logs_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.VpcFlowLogsService/ShowEffectiveFlowLogsConfigs", + request_serializer=vpc_flow_logs.ShowEffectiveFlowLogsConfigsRequest.serialize, + response_deserializer=vpc_flow_logs.ShowEffectiveFlowLogsConfigsResponse.deserialize, + ) ) return self._stubs["show_effective_flow_logs_configs"] diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/grpc_asyncio.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/grpc_asyncio.py index 3f7070f95162..dd8dcb33a4bc 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.network_management_v1.types import vpc_flow_logs, vpc_flow_logs_config @@ -375,12 +377,12 @@ def list_vpc_flow_logs_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_vpc_flow_logs_configs" not in self._stubs: - self._stubs[ - "list_vpc_flow_logs_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.VpcFlowLogsService/ListVpcFlowLogsConfigs", - request_serializer=vpc_flow_logs.ListVpcFlowLogsConfigsRequest.serialize, - response_deserializer=vpc_flow_logs.ListVpcFlowLogsConfigsResponse.deserialize, + self._stubs["list_vpc_flow_logs_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.VpcFlowLogsService/ListVpcFlowLogsConfigs", + request_serializer=vpc_flow_logs.ListVpcFlowLogsConfigsRequest.serialize, + response_deserializer=vpc_flow_logs.ListVpcFlowLogsConfigsResponse.deserialize, + ) ) return self._stubs["list_vpc_flow_logs_configs"] @@ -449,12 +451,12 @@ def create_vpc_flow_logs_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_vpc_flow_logs_config" not in self._stubs: - self._stubs[ - "create_vpc_flow_logs_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.VpcFlowLogsService/CreateVpcFlowLogsConfig", - request_serializer=vpc_flow_logs.CreateVpcFlowLogsConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_vpc_flow_logs_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.VpcFlowLogsService/CreateVpcFlowLogsConfig", + request_serializer=vpc_flow_logs.CreateVpcFlowLogsConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_vpc_flow_logs_config"] @@ -494,12 +496,12 @@ def update_vpc_flow_logs_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_vpc_flow_logs_config" not in self._stubs: - self._stubs[ - "update_vpc_flow_logs_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.VpcFlowLogsService/UpdateVpcFlowLogsConfig", - request_serializer=vpc_flow_logs.UpdateVpcFlowLogsConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_vpc_flow_logs_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.VpcFlowLogsService/UpdateVpcFlowLogsConfig", + request_serializer=vpc_flow_logs.UpdateVpcFlowLogsConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_vpc_flow_logs_config"] @@ -525,12 +527,12 @@ def delete_vpc_flow_logs_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_vpc_flow_logs_config" not in self._stubs: - self._stubs[ - "delete_vpc_flow_logs_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.VpcFlowLogsService/DeleteVpcFlowLogsConfig", - request_serializer=vpc_flow_logs.DeleteVpcFlowLogsConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_vpc_flow_logs_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.VpcFlowLogsService/DeleteVpcFlowLogsConfig", + request_serializer=vpc_flow_logs.DeleteVpcFlowLogsConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_vpc_flow_logs_config"] @@ -559,12 +561,12 @@ def query_org_vpc_flow_logs_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "query_org_vpc_flow_logs_configs" not in self._stubs: - self._stubs[ - "query_org_vpc_flow_logs_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.VpcFlowLogsService/QueryOrgVpcFlowLogsConfigs", - request_serializer=vpc_flow_logs.QueryOrgVpcFlowLogsConfigsRequest.serialize, - response_deserializer=vpc_flow_logs.QueryOrgVpcFlowLogsConfigsResponse.deserialize, + self._stubs["query_org_vpc_flow_logs_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.VpcFlowLogsService/QueryOrgVpcFlowLogsConfigs", + request_serializer=vpc_flow_logs.QueryOrgVpcFlowLogsConfigsRequest.serialize, + response_deserializer=vpc_flow_logs.QueryOrgVpcFlowLogsConfigsResponse.deserialize, + ) ) return self._stubs["query_org_vpc_flow_logs_configs"] @@ -593,12 +595,12 @@ def show_effective_flow_logs_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "show_effective_flow_logs_configs" not in self._stubs: - self._stubs[ - "show_effective_flow_logs_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkmanagement.v1.VpcFlowLogsService/ShowEffectiveFlowLogsConfigs", - request_serializer=vpc_flow_logs.ShowEffectiveFlowLogsConfigsRequest.serialize, - response_deserializer=vpc_flow_logs.ShowEffectiveFlowLogsConfigsResponse.deserialize, + self._stubs["show_effective_flow_logs_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkmanagement.v1.VpcFlowLogsService/ShowEffectiveFlowLogsConfigs", + request_serializer=vpc_flow_logs.ShowEffectiveFlowLogsConfigsRequest.serialize, + response_deserializer=vpc_flow_logs.ShowEffectiveFlowLogsConfigsResponse.deserialize, + ) ) return self._stubs["show_effective_flow_logs_configs"] diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/rest.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/rest.py index d0cc56cc0885..64947410e2b3 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/rest.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -932,9 +934,7 @@ def __call__( """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseCreateVpcFlowLogsConfig._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseCreateVpcFlowLogsConfig._get_http_options() request, metadata = self._interceptor.pre_create_vpc_flow_logs_config( request, metadata @@ -960,7 +960,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1088,9 +1088,7 @@ def __call__( """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseDeleteVpcFlowLogsConfig._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseDeleteVpcFlowLogsConfig._get_http_options() request, metadata = self._interceptor.pre_delete_vpc_flow_logs_config( request, metadata @@ -1112,7 +1110,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1237,9 +1235,7 @@ def __call__( """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseGetVpcFlowLogsConfig._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseGetVpcFlowLogsConfig._get_http_options() request, metadata = self._interceptor.pre_get_vpc_flow_logs_config( request, metadata @@ -1389,9 +1385,7 @@ def __call__( Response for the ``ListVpcFlowLogsConfigs`` method. """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseListVpcFlowLogsConfigs._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseListVpcFlowLogsConfigs._get_http_options() request, metadata = self._interceptor.pre_list_vpc_flow_logs_configs( request, metadata @@ -1541,9 +1535,7 @@ def __call__( Response for the ``QueryVpcFlowLogsConfigs`` method. """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseQueryOrgVpcFlowLogsConfigs._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseQueryOrgVpcFlowLogsConfigs._get_http_options() request, metadata = self._interceptor.pre_query_org_vpc_flow_logs_configs( request, metadata @@ -1607,11 +1599,10 @@ def __call__( resp = self._interceptor.post_query_org_vpc_flow_logs_configs(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_query_org_vpc_flow_logs_configs_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_query_org_vpc_flow_logs_configs_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1698,9 +1689,7 @@ def __call__( """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseShowEffectiveFlowLogsConfigs._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseShowEffectiveFlowLogsConfigs._get_http_options() request, metadata = self._interceptor.pre_show_effective_flow_logs_configs( request, metadata @@ -1764,11 +1753,10 @@ def __call__( resp = self._interceptor.post_show_effective_flow_logs_configs(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_show_effective_flow_logs_configs_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_show_effective_flow_logs_configs_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1857,9 +1845,7 @@ def __call__( """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseUpdateVpcFlowLogsConfig._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseUpdateVpcFlowLogsConfig._get_http_options() request, metadata = self._interceptor.pre_update_vpc_flow_logs_config( request, metadata @@ -1885,7 +1871,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1962,7 +1948,9 @@ def create_vpc_flow_logs_config( ]: # 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._CreateVpcFlowLogsConfig(self._session, self._host, self._interceptor) # type: ignore + return self._CreateVpcFlowLogsConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_vpc_flow_logs_config( @@ -1972,7 +1960,9 @@ def delete_vpc_flow_logs_config( ]: # 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._DeleteVpcFlowLogsConfig(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteVpcFlowLogsConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_vpc_flow_logs_config( @@ -1994,7 +1984,9 @@ def list_vpc_flow_logs_configs( ]: # 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._ListVpcFlowLogsConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListVpcFlowLogsConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def query_org_vpc_flow_logs_configs( @@ -2005,7 +1997,9 @@ def query_org_vpc_flow_logs_configs( ]: # 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._QueryOrgVpcFlowLogsConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._QueryOrgVpcFlowLogsConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def show_effective_flow_logs_configs( @@ -2016,7 +2010,9 @@ def show_effective_flow_logs_configs( ]: # 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._ShowEffectiveFlowLogsConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ShowEffectiveFlowLogsConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_vpc_flow_logs_config( @@ -2026,7 +2022,9 @@ def update_vpc_flow_logs_config( ]: # 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._UpdateVpcFlowLogsConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateVpcFlowLogsConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -2086,9 +2084,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseVpcFlowLogsServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -2227,9 +2223,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseVpcFlowLogsServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -2368,9 +2362,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseVpcFlowLogsServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2510,9 +2502,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseVpcFlowLogsServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2657,9 +2647,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2805,9 +2793,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2925,9 +2911,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3043,9 +3027,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseVpcFlowLogsServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3184,9 +3166,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseVpcFlowLogsServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseVpcFlowLogsServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseVpcFlowLogsServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/rest_base.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/rest_base.py index 444ae7b9b828..1f590bb9423f 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/rest_base.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/services/vpc_flow_logs_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/__init__.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/__init__.py index 969ad5cb0aae..fd4153430f2d 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/__init__.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/__init__.py @@ -82,7 +82,10 @@ ShowEffectiveFlowLogsConfigsResponse, UpdateVpcFlowLogsConfigRequest, ) -from .vpc_flow_logs_config import EffectiveVpcFlowLogsConfig, VpcFlowLogsConfig +from .vpc_flow_logs_config import ( + EffectiveVpcFlowLogsConfig, + VpcFlowLogsConfig, +) __all__ = ( "ConnectivityTest", diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/connectivity_test.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/connectivity_test.py index 90bd907285bf..1dda57350fd2 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/connectivity_test.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/connectivity_test.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.network_management_v1.types import trace @@ -309,6 +309,7 @@ class NetworkType(proto.Enum): internet-routable external IP addresses or IP addresses for global Google APIs and services. """ + NETWORK_TYPE_UNSPECIFIED = 0 GCP_NETWORK = 1 NON_GCP_NETWORK = 2 @@ -333,6 +334,7 @@ class ForwardingRuleTarget(proto.Enum): Forwarding Rule is a Private Service Connect endpoint. """ + FORWARDING_RULE_TARGET_UNSPECIFIED = 0 INSTANCE = 1 LOAD_BALANCER = 2 @@ -542,6 +544,7 @@ class Result(proto.Enum): - The analyzer received an invalid or unsupported argument or was unable to identify a known endpoint. """ + RESULT_UNSPECIFIED = 0 REACHABLE = 1 UNREACHABLE = 2 @@ -672,6 +675,7 @@ class ProbingResult(proto.Enum): request. - An internal error occurred. """ + PROBING_RESULT_UNSPECIFIED = 0 REACHABLE = 1 UNREACHABLE = 2 @@ -691,6 +695,7 @@ class ProbingAbortCause(proto.Enum): No valid source endpoint could be derived from the request. """ + PROBING_ABORT_CAUSE_UNSPECIFIED = 0 PERMISSION_DENIED = 1 NO_SOURCE_LOCATION = 2 diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/reachability.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/reachability.py index d60927ca4f9e..c712b698ea54 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/reachability.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/reachability.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.network_management_v1.types import connectivity_test @@ -115,12 +115,12 @@ class ListConnectivityTestsResponse(proto.Message): def raw_page(self): return self - resources: MutableSequence[ - connectivity_test.ConnectivityTest - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=connectivity_test.ConnectivityTest, + resources: MutableSequence[connectivity_test.ConnectivityTest] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=connectivity_test.ConnectivityTest, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/trace.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/trace.py index 68fd92694eab..c35cc9974d55 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/trace.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/trace.py @@ -96,6 +96,7 @@ class LoadBalancerType(proto.Enum): TCP_UDP_INTERNAL_LOAD_BALANCER (10): Internal TCP/UDP load balancer. """ + LOAD_BALANCER_TYPE_UNSPECIFIED = 0 HTTPS_ADVANCED_LOAD_BALANCER = 1 HTTPS_LOAD_BALANCER = 2 @@ -492,6 +493,7 @@ class State(proto.Enum): not have permission to see the configuration in this step. """ + STATE_UNSPECIFIED = 0 START_FROM_INSTANCE = 1 START_FROM_INTERNET = 2 @@ -795,6 +797,7 @@ class Status(proto.Enum): The instance has any status other than "RUNNING". """ + STATUS_UNSPECIFIED = 0 RUNNING = 1 NOT_RUNNING = 2 @@ -990,6 +993,7 @@ class FirewallRuleType(proto.Enum): executing Connectivity Test in the BypassFirewallChecks mode """ + FIREWALL_RULE_TYPE_UNSPECIFIED = 0 HIERARCHICAL_FIREWALL_POLICY_RULE = 1 VPC_FIREWALL_RULE = 2 @@ -1017,6 +1021,7 @@ class TargetType(proto.Enum): Firewall rule applies to internal managed load balancers. """ + TARGET_TYPE_UNSPECIFIED = 0 INSTANCES = 1 INTERNAL_MANAGED_LB = 2 @@ -1198,6 +1203,7 @@ class RouteType(proto.Enum): StartFromPrivateNetwork state in Connectivity tests. """ + ROUTE_TYPE_UNSPECIFIED = 0 SUBNET = 1 STATIC = 2 @@ -1255,6 +1261,7 @@ class NextHopType(proto.Enum): SECURE_WEB_PROXY_GATEWAY (13): Next hop is Secure Web Proxy Gateway. """ + NEXT_HOP_TYPE_UNSPECIFIED = 0 NEXT_HOP_IP = 1 NEXT_HOP_INSTANCE = 2 @@ -1282,6 +1289,7 @@ class RouteScope(proto.Enum): Route is applicable to packets using NCC Hub's routing table. """ + ROUTE_SCOPE_UNSPECIFIED = 0 NETWORK = 1 NCC_HUB = 2 @@ -1439,6 +1447,7 @@ class GoogleServiceType(proto.Enum): Google API via Serverless VPC Access. https://cloud.google.com/vpc/docs/serverless-vpc-access """ + GOOGLE_SERVICE_TYPE_UNSPECIFIED = 0 IAP = 1 GFE_PROXY_OR_HEALTH_CHECK_PROBER = 2 @@ -1579,6 +1588,7 @@ class LoadBalancerType(proto.Enum): SSL_PROXY (5): SSL proxy load balancer. """ + LOAD_BALANCER_TYPE_UNSPECIFIED = 0 INTERNAL_TCP_UDP = 1 NETWORK_TCP_UDP = 2 @@ -1602,6 +1612,7 @@ class BackendType(proto.Enum): Target Instance as the load balancer's backend. """ + BACKEND_TYPE_UNSPECIFIED = 0 BACKEND_SERVICE = 1 TARGET_POOL = 2 @@ -1673,6 +1684,7 @@ class HealthCheckFirewallState(proto.Enum): marked unhealthy and will not receive traffic sent to the load balancer. """ + HEALTH_CHECK_FIREWALL_STATE_UNSPECIFIED = 0 CONFIGURED = 1 MISCONFIGURED = 2 @@ -1821,6 +1833,7 @@ class RoutingType(proto.Enum): DYNAMIC (3): Dynamic (BGP) routing. """ + ROUTING_TYPE_UNSPECIFIED = 0 ROUTE_BASED = 1 POLICY_BASED = 2 @@ -1908,6 +1921,7 @@ class Type(proto.Enum): Attachment to a L2 interconnect, created by the customer. """ + TYPE_UNSPECIFIED = 0 DEDICATED = 1 PARTNER = 2 @@ -2084,6 +2098,7 @@ class Target(proto.Enum): GKE_POD (19): Target is a GKE Pod. """ + TARGET_UNSPECIFIED = 0 INSTANCE = 1 INTERNET = 2 @@ -2134,6 +2149,7 @@ class GoogleServiceType(proto.Enum): Google API via Serverless VPC Access. https://cloud.google.com/vpc/docs/serverless-vpc-access """ + GOOGLE_SERVICE_TYPE_UNSPECIFIED = 0 IAP = 1 GFE_PROXY_OR_HEALTH_CHECK_PROBER = 2 @@ -2213,6 +2229,7 @@ class Target(proto.Enum): SECURE_WEB_PROXY_GATEWAY (10): Forwarded to a Secure Web Proxy Gateway. """ + TARGET_UNSPECIFIED = 0 PEERING_VPC = 1 VPN_GATEWAY = 2 @@ -2429,6 +2446,7 @@ class Cause(proto.Enum): "Pending" Pods, which don't have assigned IP addresses yet. """ + CAUSE_UNSPECIFIED = 0 UNKNOWN_NETWORK = 1 UNKNOWN_PROJECT = 3 @@ -2912,6 +2930,7 @@ class Cause(proto.Enum): Packet is dropped because no matching route was found in the hybrid subnet. """ + CAUSE_UNSPECIFIED = 0 UNKNOWN_EXTERNAL_ADDRESS = 1 FOREIGN_IP_DISALLOWED = 2 @@ -3165,6 +3184,7 @@ class Reason(proto.Enum): Masquerading not applied because the packet is a return packet. """ + REASON_UNSPECIFIED = 0 DESTINATION_IP_IN_CONFIGURED_NON_MASQUERADE_RANGE = 1 DESTINATION_IP_IN_DEFAULT_NON_MASQUERADE_RANGE = 2 @@ -3577,6 +3597,7 @@ class Type(proto.Enum): GKE_POD_IP_MASQUERADING (5): GKE Pod IP address masquerading. """ + TYPE_UNSPECIFIED = 0 INTERNAL_TO_EXTERNAL = 1 EXTERNAL_TO_INTERNAL = 2 @@ -3601,6 +3622,7 @@ class CloudNatGatewayType(proto.Enum): PRIVATE_NAT64 (5): Private NAT64 gateway. """ + CLOUD_NAT_GATEWAY_TYPE_UNSPECIFIED = 0 PUBLIC_NAT44 = 1 PUBLIC_NAT64 = 2 @@ -3827,6 +3849,7 @@ class HealthCheckFirewallsConfigState(proto.Enum): https://cloud.google.com/network-intelligence-center/docs/connectivity-tests/concepts/overview#unsupported-configs """ + HEALTH_CHECK_FIREWALLS_CONFIG_STATE_UNSPECIFIED = 0 FIREWALLS_CONFIGURED = 1 FIREWALLS_PARTIALLY_CONFIGURED = 2 diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/vpc_flow_logs.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/vpc_flow_logs.py index 77142ee28e61..0ff4446c7dce 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/vpc_flow_logs.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/vpc_flow_logs.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.network_management_v1.types import ( diff --git a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/vpc_flow_logs_config.py b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/vpc_flow_logs_config.py index 9007f989019f..294e1ca11af1 100644 --- a/packages/google-cloud-network-management/google/cloud/network_management_v1/types/vpc_flow_logs_config.py +++ b/packages/google-cloud-network-management/google/cloud/network_management_v1/types/vpc_flow_logs_config.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -150,6 +150,7 @@ class State(proto.Enum): When DISABLED, this configuration will not generate logs. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -174,6 +175,7 @@ class AggregationInterval(proto.Enum): INTERVAL_15_MIN (6): Aggregate logs in 15m intervals. """ + AGGREGATION_INTERVAL_UNSPECIFIED = 0 INTERVAL_5_SEC = 1 INTERVAL_30_SEC = 2 @@ -195,6 +197,7 @@ class Metadata(proto.Enum): CUSTOM_METADATA (3): Include only custom fields (specified in metadata_fields). """ + METADATA_UNSPECIFIED = 0 INCLUDE_ALL_METADATA = 1 EXCLUDE_ALL_METADATA = 2 @@ -216,6 +219,7 @@ class CrossProjectMetadata(proto.Enum): When CROSS_PROJECT_METADATA_DISABLED, metadata from other projects will not be included in the logs. """ + CROSS_PROJECT_METADATA_UNSPECIFIED = 0 CROSS_PROJECT_METADATA_ENABLED = 1 CROSS_PROJECT_METADATA_DISABLED = 2 @@ -233,6 +237,7 @@ class TargetResourceState(proto.Enum): Indicates that the target resource does not exist. """ + TARGET_RESOURCE_STATE_UNSPECIFIED = 0 TARGET_RESOURCE_EXISTS = 1 TARGET_RESOURCE_DOES_NOT_EXIST = 2 @@ -448,6 +453,7 @@ class Scope(proto.Enum): Configuration applies to an entire organization. """ + SCOPE_UNSPECIFIED = 0 SUBNET = 1 COMPUTE_API_SUBNET = 2 diff --git a/packages/google-cloud-network-management/noxfile.py b/packages/google-cloud-network-management/noxfile.py index 214697943dbf..228b64132b92 100644 --- a/packages/google-cloud-network-management/noxfile.py +++ b/packages/google-cloud-network-management/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_organization_vpc_flow_logs_service.py b/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_organization_vpc_flow_logs_service.py index f4d07ffc7694..71b900b07543 100644 --- a/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_organization_vpc_flow_logs_service.py +++ b/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_organization_vpc_flow_logs_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_management_v1.services.organization_vpc_flow_logs_service import ( OrganizationVpcFlowLogsServiceAsyncClient, @@ -75,11 +77,14 @@ pagers, transports, ) -from google.cloud.network_management_v1.types import reachability, vpc_flow_logs +from google.cloud.network_management_v1.types import ( + reachability, + vpc_flow_logs, + vpc_flow_logs_config, +) from google.cloud.network_management_v1.types import ( vpc_flow_logs_config as gcn_vpc_flow_logs_config, ) -from google.cloud.network_management_v1.types import vpc_flow_logs_config CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1073,10 +1078,9 @@ def test_organization_vpc_flow_logs_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1121,10 +1125,9 @@ def test_organization_vpc_flow_logs_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1160,10 +1163,9 @@ def test_organization_vpc_flow_logs_service_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1424,13 +1426,13 @@ def test_organization_vpc_flow_logs_service_client_create_channel_credentials_fi ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4956,8 +4958,9 @@ def test_list_vpc_flow_logs_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5022,20 +5025,22 @@ def test_list_vpc_flow_logs_configs_rest_interceptors(null_interceptor): ) client = OrganizationVpcFlowLogsServiceClient(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.OrganizationVpcFlowLogsServiceRestInterceptor, - "post_list_vpc_flow_logs_configs", - ) as post, mock.patch.object( - transports.OrganizationVpcFlowLogsServiceRestInterceptor, - "post_list_vpc_flow_logs_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationVpcFlowLogsServiceRestInterceptor, - "pre_list_vpc_flow_logs_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationVpcFlowLogsServiceRestInterceptor, + "post_list_vpc_flow_logs_configs", + ) as post, + mock.patch.object( + transports.OrganizationVpcFlowLogsServiceRestInterceptor, + "post_list_vpc_flow_logs_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationVpcFlowLogsServiceRestInterceptor, + "pre_list_vpc_flow_logs_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5095,8 +5100,9 @@ def test_get_vpc_flow_logs_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5192,20 +5198,22 @@ def test_get_vpc_flow_logs_config_rest_interceptors(null_interceptor): ) client = OrganizationVpcFlowLogsServiceClient(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.OrganizationVpcFlowLogsServiceRestInterceptor, - "post_get_vpc_flow_logs_config", - ) as post, mock.patch.object( - transports.OrganizationVpcFlowLogsServiceRestInterceptor, - "post_get_vpc_flow_logs_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationVpcFlowLogsServiceRestInterceptor, - "pre_get_vpc_flow_logs_config", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationVpcFlowLogsServiceRestInterceptor, + "post_get_vpc_flow_logs_config", + ) as post, + mock.patch.object( + transports.OrganizationVpcFlowLogsServiceRestInterceptor, + "post_get_vpc_flow_logs_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationVpcFlowLogsServiceRestInterceptor, + "pre_get_vpc_flow_logs_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5263,8 +5271,9 @@ def test_create_vpc_flow_logs_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5411,22 +5420,23 @@ def test_create_vpc_flow_logs_config_rest_interceptors(null_interceptor): ) client = OrganizationVpcFlowLogsServiceClient(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.OrganizationVpcFlowLogsServiceRestInterceptor, - "post_create_vpc_flow_logs_config", - ) as post, mock.patch.object( - transports.OrganizationVpcFlowLogsServiceRestInterceptor, - "post_create_vpc_flow_logs_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationVpcFlowLogsServiceRestInterceptor, - "pre_create_vpc_flow_logs_config", - ) as pre: + 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.OrganizationVpcFlowLogsServiceRestInterceptor, + "post_create_vpc_flow_logs_config", + ) as post, + mock.patch.object( + transports.OrganizationVpcFlowLogsServiceRestInterceptor, + "post_create_vpc_flow_logs_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationVpcFlowLogsServiceRestInterceptor, + "pre_create_vpc_flow_logs_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5483,8 +5493,9 @@ def test_update_vpc_flow_logs_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5635,22 +5646,23 @@ def test_update_vpc_flow_logs_config_rest_interceptors(null_interceptor): ) client = OrganizationVpcFlowLogsServiceClient(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.OrganizationVpcFlowLogsServiceRestInterceptor, - "post_update_vpc_flow_logs_config", - ) as post, mock.patch.object( - transports.OrganizationVpcFlowLogsServiceRestInterceptor, - "post_update_vpc_flow_logs_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationVpcFlowLogsServiceRestInterceptor, - "pre_update_vpc_flow_logs_config", - ) as pre: + 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.OrganizationVpcFlowLogsServiceRestInterceptor, + "post_update_vpc_flow_logs_config", + ) as post, + mock.patch.object( + transports.OrganizationVpcFlowLogsServiceRestInterceptor, + "post_update_vpc_flow_logs_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationVpcFlowLogsServiceRestInterceptor, + "pre_update_vpc_flow_logs_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5705,8 +5717,9 @@ def test_delete_vpc_flow_logs_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5765,22 +5778,23 @@ def test_delete_vpc_flow_logs_config_rest_interceptors(null_interceptor): ) client = OrganizationVpcFlowLogsServiceClient(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.OrganizationVpcFlowLogsServiceRestInterceptor, - "post_delete_vpc_flow_logs_config", - ) as post, mock.patch.object( - transports.OrganizationVpcFlowLogsServiceRestInterceptor, - "post_delete_vpc_flow_logs_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationVpcFlowLogsServiceRestInterceptor, - "pre_delete_vpc_flow_logs_config", - ) as pre: + 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.OrganizationVpcFlowLogsServiceRestInterceptor, + "post_delete_vpc_flow_logs_config", + ) as post, + mock.patch.object( + transports.OrganizationVpcFlowLogsServiceRestInterceptor, + "post_delete_vpc_flow_logs_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationVpcFlowLogsServiceRestInterceptor, + "pre_delete_vpc_flow_logs_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5833,8 +5847,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5893,8 +5908,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5956,8 +5972,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6021,8 +6038,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6086,8 +6104,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6150,8 +6169,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6212,8 +6232,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6274,8 +6295,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6336,8 +6358,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6590,11 +6613,14 @@ def test_organization_vpc_flow_logs_service_base_transport(): def test_organization_vpc_flow_logs_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_management_v1.services.organization_vpc_flow_logs_service.transports.OrganizationVpcFlowLogsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_management_v1.services.organization_vpc_flow_logs_service.transports.OrganizationVpcFlowLogsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrganizationVpcFlowLogsServiceTransport( @@ -6611,9 +6637,12 @@ def test_organization_vpc_flow_logs_service_base_transport_with_credentials_file def test_organization_vpc_flow_logs_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_management_v1.services.organization_vpc_flow_logs_service.transports.OrganizationVpcFlowLogsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_management_v1.services.organization_vpc_flow_logs_service.transports.OrganizationVpcFlowLogsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrganizationVpcFlowLogsServiceTransport() @@ -6692,11 +6721,12 @@ def test_organization_vpc_flow_logs_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_reachability_service.py b/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_reachability_service.py index 918186623677..8789f9e97d98 100644 --- a/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_reachability_service.py +++ b/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_reachability_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +60,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.network_management_v1.services.reachability_service import ( ReachabilityServiceAsyncClient, @@ -1015,10 +1017,9 @@ def test_reachability_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1064,9 @@ def test_reachability_service_client_get_mtls_endpoint_and_cert_source(client_cl client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1102,10 +1102,9 @@ def test_reachability_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,13 +1360,13 @@ def test_reachability_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2048,9 +2047,9 @@ def test_get_connectivity_test_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connectivity_test - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connectivity_test] = ( + mock_rpc + ) request = {} client.get_connectivity_test(request) @@ -3930,9 +3929,9 @@ def test_get_connectivity_test_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_connectivity_test - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_connectivity_test] = ( + mock_rpc + ) request = {} client.get_connectivity_test(request) @@ -5256,8 +5255,9 @@ def test_list_connectivity_tests_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5322,18 +5322,21 @@ def test_list_connectivity_tests_rest_interceptors(null_interceptor): ) client = ReachabilityServiceClient(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.ReachabilityServiceRestInterceptor, "post_list_connectivity_tests" - ) as post, mock.patch.object( - transports.ReachabilityServiceRestInterceptor, - "post_list_connectivity_tests_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReachabilityServiceRestInterceptor, "pre_list_connectivity_tests" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, + "post_list_connectivity_tests", + ) as post, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, + "post_list_connectivity_tests_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, "pre_list_connectivity_tests" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5393,8 +5396,9 @@ def test_get_connectivity_test_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5471,18 +5475,20 @@ def test_get_connectivity_test_rest_interceptors(null_interceptor): ) client = ReachabilityServiceClient(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.ReachabilityServiceRestInterceptor, "post_get_connectivity_test" - ) as post, mock.patch.object( - transports.ReachabilityServiceRestInterceptor, - "post_get_connectivity_test_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReachabilityServiceRestInterceptor, "pre_get_connectivity_test" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, "post_get_connectivity_test" + ) as post, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, + "post_get_connectivity_test_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, "pre_get_connectivity_test" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5537,8 +5543,9 @@ def test_create_connectivity_test_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6061,20 +6068,23 @@ def test_create_connectivity_test_rest_interceptors(null_interceptor): ) client = ReachabilityServiceClient(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.ReachabilityServiceRestInterceptor, "post_create_connectivity_test" - ) as post, mock.patch.object( - transports.ReachabilityServiceRestInterceptor, - "post_create_connectivity_test_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReachabilityServiceRestInterceptor, "pre_create_connectivity_test" - ) as pre: + 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.ReachabilityServiceRestInterceptor, + "post_create_connectivity_test", + ) as post, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, + "post_create_connectivity_test_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, + "pre_create_connectivity_test", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6131,8 +6141,9 @@ def test_update_connectivity_test_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6659,20 +6670,23 @@ def test_update_connectivity_test_rest_interceptors(null_interceptor): ) client = ReachabilityServiceClient(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.ReachabilityServiceRestInterceptor, "post_update_connectivity_test" - ) as post, mock.patch.object( - transports.ReachabilityServiceRestInterceptor, - "post_update_connectivity_test_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReachabilityServiceRestInterceptor, "pre_update_connectivity_test" - ) as pre: + 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.ReachabilityServiceRestInterceptor, + "post_update_connectivity_test", + ) as post, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, + "post_update_connectivity_test_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, + "pre_update_connectivity_test", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6727,8 +6741,9 @@ def test_rerun_connectivity_test_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6787,20 +6802,22 @@ def test_rerun_connectivity_test_rest_interceptors(null_interceptor): ) client = ReachabilityServiceClient(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.ReachabilityServiceRestInterceptor, "post_rerun_connectivity_test" - ) as post, mock.patch.object( - transports.ReachabilityServiceRestInterceptor, - "post_rerun_connectivity_test_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReachabilityServiceRestInterceptor, "pre_rerun_connectivity_test" - ) as pre: + 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.ReachabilityServiceRestInterceptor, + "post_rerun_connectivity_test", + ) as post, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, + "post_rerun_connectivity_test_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, "pre_rerun_connectivity_test" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6855,8 +6872,9 @@ def test_delete_connectivity_test_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6915,20 +6933,23 @@ def test_delete_connectivity_test_rest_interceptors(null_interceptor): ) client = ReachabilityServiceClient(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.ReachabilityServiceRestInterceptor, "post_delete_connectivity_test" - ) as post, mock.patch.object( - transports.ReachabilityServiceRestInterceptor, - "post_delete_connectivity_test_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ReachabilityServiceRestInterceptor, "pre_delete_connectivity_test" - ) as pre: + 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.ReachabilityServiceRestInterceptor, + "post_delete_connectivity_test", + ) as post, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, + "post_delete_connectivity_test_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ReachabilityServiceRestInterceptor, + "pre_delete_connectivity_test", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6981,8 +7002,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7041,8 +7063,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7104,8 +7127,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7169,8 +7193,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7234,8 +7259,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7298,8 +7324,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7360,8 +7387,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7422,8 +7450,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7484,8 +7513,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7761,11 +7791,14 @@ def test_reachability_service_base_transport(): def test_reachability_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_management_v1.services.reachability_service.transports.ReachabilityServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_management_v1.services.reachability_service.transports.ReachabilityServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReachabilityServiceTransport( @@ -7782,9 +7815,12 @@ def test_reachability_service_base_transport_with_credentials_file(): def test_reachability_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_management_v1.services.reachability_service.transports.ReachabilityServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_management_v1.services.reachability_service.transports.ReachabilityServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ReachabilityServiceTransport() @@ -7856,11 +7892,12 @@ def test_reachability_service_transport_auth_gdch_credentials(transport_class): def test_reachability_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_vpc_flow_logs_service.py b/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_vpc_flow_logs_service.py index d0205f6be535..8c0a4505d4c6 100644 --- a/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_vpc_flow_logs_service.py +++ b/packages/google-cloud-network-management/tests/unit/gapic/network_management_v1/test_vpc_flow_logs_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_management_v1.services.vpc_flow_logs_service import ( VpcFlowLogsServiceAsyncClient, @@ -75,11 +77,14 @@ pagers, transports, ) -from google.cloud.network_management_v1.types import reachability, vpc_flow_logs +from google.cloud.network_management_v1.types import ( + reachability, + vpc_flow_logs, + vpc_flow_logs_config, +) from google.cloud.network_management_v1.types import ( vpc_flow_logs_config as gcn_vpc_flow_logs_config, ) -from google.cloud.network_management_v1.types import vpc_flow_logs_config CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1003,10 +1008,9 @@ def test_vpc_flow_logs_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1051,10 +1055,9 @@ def test_vpc_flow_logs_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1090,10 +1093,9 @@ def test_vpc_flow_logs_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1341,13 +1343,13 @@ def test_vpc_flow_logs_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6378,8 +6380,9 @@ def test_list_vpc_flow_logs_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6444,18 +6447,22 @@ def test_list_vpc_flow_logs_configs_rest_interceptors(null_interceptor): ) client = VpcFlowLogsServiceClient(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.VpcFlowLogsServiceRestInterceptor, "post_list_vpc_flow_logs_configs" - ) as post, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, - "post_list_vpc_flow_logs_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, "pre_list_vpc_flow_logs_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "post_list_vpc_flow_logs_configs", + ) as post, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "post_list_vpc_flow_logs_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "pre_list_vpc_flow_logs_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6515,8 +6522,9 @@ def test_get_vpc_flow_logs_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6612,18 +6620,21 @@ def test_get_vpc_flow_logs_config_rest_interceptors(null_interceptor): ) client = VpcFlowLogsServiceClient(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.VpcFlowLogsServiceRestInterceptor, "post_get_vpc_flow_logs_config" - ) as post, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, - "post_get_vpc_flow_logs_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, "pre_get_vpc_flow_logs_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "post_get_vpc_flow_logs_config", + ) as post, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "post_get_vpc_flow_logs_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, "pre_get_vpc_flow_logs_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6681,8 +6692,9 @@ def test_create_vpc_flow_logs_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6829,20 +6841,23 @@ def test_create_vpc_flow_logs_config_rest_interceptors(null_interceptor): ) client = VpcFlowLogsServiceClient(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.VpcFlowLogsServiceRestInterceptor, "post_create_vpc_flow_logs_config" - ) as post, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, - "post_create_vpc_flow_logs_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, "pre_create_vpc_flow_logs_config" - ) as pre: + 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.VpcFlowLogsServiceRestInterceptor, + "post_create_vpc_flow_logs_config", + ) as post, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "post_create_vpc_flow_logs_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "pre_create_vpc_flow_logs_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6899,8 +6914,9 @@ def test_update_vpc_flow_logs_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7051,20 +7067,23 @@ def test_update_vpc_flow_logs_config_rest_interceptors(null_interceptor): ) client = VpcFlowLogsServiceClient(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.VpcFlowLogsServiceRestInterceptor, "post_update_vpc_flow_logs_config" - ) as post, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, - "post_update_vpc_flow_logs_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, "pre_update_vpc_flow_logs_config" - ) as pre: + 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.VpcFlowLogsServiceRestInterceptor, + "post_update_vpc_flow_logs_config", + ) as post, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "post_update_vpc_flow_logs_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "pre_update_vpc_flow_logs_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7119,8 +7138,9 @@ def test_delete_vpc_flow_logs_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7179,20 +7199,23 @@ def test_delete_vpc_flow_logs_config_rest_interceptors(null_interceptor): ) client = VpcFlowLogsServiceClient(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.VpcFlowLogsServiceRestInterceptor, "post_delete_vpc_flow_logs_config" - ) as post, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, - "post_delete_vpc_flow_logs_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, "pre_delete_vpc_flow_logs_config" - ) as pre: + 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.VpcFlowLogsServiceRestInterceptor, + "post_delete_vpc_flow_logs_config", + ) as post, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "post_delete_vpc_flow_logs_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "pre_delete_vpc_flow_logs_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7245,8 +7268,9 @@ def test_query_org_vpc_flow_logs_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7311,20 +7335,22 @@ def test_query_org_vpc_flow_logs_configs_rest_interceptors(null_interceptor): ) client = VpcFlowLogsServiceClient(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.VpcFlowLogsServiceRestInterceptor, - "post_query_org_vpc_flow_logs_configs", - ) as post, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, - "post_query_org_vpc_flow_logs_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, - "pre_query_org_vpc_flow_logs_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "post_query_org_vpc_flow_logs_configs", + ) as post, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "post_query_org_vpc_flow_logs_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "pre_query_org_vpc_flow_logs_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7382,8 +7408,9 @@ def test_show_effective_flow_logs_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7450,20 +7477,22 @@ def test_show_effective_flow_logs_configs_rest_interceptors(null_interceptor): ) client = VpcFlowLogsServiceClient(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.VpcFlowLogsServiceRestInterceptor, - "post_show_effective_flow_logs_configs", - ) as post, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, - "post_show_effective_flow_logs_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.VpcFlowLogsServiceRestInterceptor, - "pre_show_effective_flow_logs_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "post_show_effective_flow_logs_configs", + ) as post, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "post_show_effective_flow_logs_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.VpcFlowLogsServiceRestInterceptor, + "pre_show_effective_flow_logs_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7521,8 +7550,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7581,8 +7611,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7644,8 +7675,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7709,8 +7741,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7774,8 +7807,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7838,8 +7872,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7900,8 +7935,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7962,8 +7998,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8024,8 +8061,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8324,11 +8362,14 @@ def test_vpc_flow_logs_service_base_transport(): def test_vpc_flow_logs_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_management_v1.services.vpc_flow_logs_service.transports.VpcFlowLogsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_management_v1.services.vpc_flow_logs_service.transports.VpcFlowLogsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VpcFlowLogsServiceTransport( @@ -8345,9 +8386,12 @@ def test_vpc_flow_logs_service_base_transport_with_credentials_file(): def test_vpc_flow_logs_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_management_v1.services.vpc_flow_logs_service.transports.VpcFlowLogsServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_management_v1.services.vpc_flow_logs_service.transports.VpcFlowLogsServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.VpcFlowLogsServiceTransport() @@ -8419,11 +8463,12 @@ def test_vpc_flow_logs_service_transport_auth_gdch_credentials(transport_class): def test_vpc_flow_logs_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/docs/conf.py b/packages/google-cloud-network-security/docs/conf.py index 38d901c1cbeb..53d67b8e61f9 100644 --- a/packages/google-cloud-network-security/docs/conf.py +++ b/packages/google-cloud-network-security/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-network-security documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/__init__.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/__init__.py index 7efc6dbbef94..8700ec222bbb 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/__init__.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.address_group_service import ( AddressGroupServiceAsyncClient, AddressGroupServiceClient, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/async_client.py index 43d3268b1e84..e08084c4629c 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1 import gapic_version as package_version @@ -44,20 +44,21 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1.services.address_group_service import pagers +from google.cloud.network_security_v1.types import address_group, common from google.cloud.network_security_v1.types import address_group as gcn_address_group -from google.cloud.network_security_v1.types import address_group -from google.cloud.network_security_v1.types import common from .client import AddressGroupServiceClient from .transports.base import DEFAULT_CLIENT_INFO, AddressGroupServiceTransport @@ -131,7 +132,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AddressGroupServiceAsyncClient: The constructed client. """ - return AddressGroupServiceClient.from_service_account_info.__func__(AddressGroupServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = AddressGroupServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(AddressGroupServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +149,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AddressGroupServiceAsyncClient: The constructed client. """ - return AddressGroupServiceClient.from_service_account_file.__func__(AddressGroupServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = AddressGroupServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(AddressGroupServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -185,7 +188,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return AddressGroupServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return AddressGroupServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> AddressGroupServiceTransport: diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/client.py index 69a0309ad7a0..edd08d4410f7 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1 import gapic_version as package_version @@ -61,20 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1.services.address_group_service import pagers +from google.cloud.network_security_v1.types import address_group, common from google.cloud.network_security_v1.types import address_group as gcn_address_group -from google.cloud.network_security_v1.types import address_group -from google.cloud.network_security_v1.types import common from .transports.base import DEFAULT_CLIENT_INFO, AddressGroupServiceTransport from .transports.grpc import AddressGroupServiceGrpcTransport @@ -90,9 +91,7 @@ class AddressGroupServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AddressGroupServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AddressGroupServiceTransport]] _transport_registry["grpc"] = AddressGroupServiceGrpcTransport _transport_registry["grpc_asyncio"] = AddressGroupServiceGrpcAsyncIOTransport _transport_registry["rest"] = AddressGroupServiceRestTransport @@ -640,11 +639,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AddressGroupServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AddressGroupServiceClient._read_environment_variables() + ) self._client_cert_source = AddressGroupServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -679,8 +676,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AddressGroupServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/pagers.py index 1798baeb1630..37440ddf6c84 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/pagers.py @@ -38,8 +38,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.network_security_v1.types import address_group as gcn_address_group from google.cloud.network_security_v1.types import address_group +from google.cloud.network_security_v1.types import address_group as gcn_address_group class ListAddressGroupsPager: @@ -68,7 +68,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -144,7 +144,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -224,7 +224,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -306,7 +306,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/__init__.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/__init__.py index ab668b3c302c..3dddafbf9275 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/__init__.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import AddressGroupServiceRestInterceptor, AddressGroupServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[AddressGroupServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[AddressGroupServiceTransport]] _transport_registry["grpc"] = AddressGroupServiceGrpcTransport _transport_registry["grpc_asyncio"] = AddressGroupServiceGrpcAsyncIOTransport _transport_registry["rest"] = AddressGroupServiceRestTransport diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/base.py index 4602571907a9..3f0a3c26e100 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/base.py @@ -17,21 +17,23 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1 import gapic_version as package_version -from google.cloud.network_security_v1.types import address_group as gcn_address_group from google.cloud.network_security_v1.types import address_group +from google.cloud.network_security_v1.types import address_group as gcn_address_group DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -358,13 +360,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/grpc.py index 6c3814516b7f..e75ab855867a 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/grpc.py @@ -16,24 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.network_security_v1.types import address_group as gcn_address_group from google.cloud.network_security_v1.types import address_group +from google.cloud.network_security_v1.types import address_group as gcn_address_group from .base import DEFAULT_CLIENT_INFO, AddressGroupServiceTransport @@ -507,12 +509,12 @@ def remove_address_group_items( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "remove_address_group_items" not in self._stubs: - self._stubs[ - "remove_address_group_items" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.AddressGroupService/RemoveAddressGroupItems", - request_serializer=gcn_address_group.RemoveAddressGroupItemsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["remove_address_group_items"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.AddressGroupService/RemoveAddressGroupItems", + request_serializer=gcn_address_group.RemoveAddressGroupItemsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["remove_address_group_items"] @@ -592,12 +594,12 @@ def list_address_group_references( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_address_group_references" not in self._stubs: - self._stubs[ - "list_address_group_references" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.AddressGroupService/ListAddressGroupReferences", - request_serializer=gcn_address_group.ListAddressGroupReferencesRequest.serialize, - response_deserializer=gcn_address_group.ListAddressGroupReferencesResponse.deserialize, + self._stubs["list_address_group_references"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.AddressGroupService/ListAddressGroupReferences", + request_serializer=gcn_address_group.ListAddressGroupReferencesRequest.serialize, + response_deserializer=gcn_address_group.ListAddressGroupReferencesResponse.deserialize, + ) ) return self._stubs["list_address_group_references"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/grpc_asyncio.py index 804b41cabde5..47df735e5a35 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/grpc_asyncio.py @@ -17,26 +17,28 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.network_security_v1.types import address_group as gcn_address_group from google.cloud.network_security_v1.types import address_group +from google.cloud.network_security_v1.types import address_group as gcn_address_group from .base import DEFAULT_CLIENT_INFO, AddressGroupServiceTransport from .grpc import AddressGroupServiceGrpcTransport @@ -521,12 +523,12 @@ def remove_address_group_items( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "remove_address_group_items" not in self._stubs: - self._stubs[ - "remove_address_group_items" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.AddressGroupService/RemoveAddressGroupItems", - request_serializer=gcn_address_group.RemoveAddressGroupItemsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["remove_address_group_items"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.AddressGroupService/RemoveAddressGroupItems", + request_serializer=gcn_address_group.RemoveAddressGroupItemsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["remove_address_group_items"] @@ -609,12 +611,12 @@ def list_address_group_references( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_address_group_references" not in self._stubs: - self._stubs[ - "list_address_group_references" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.AddressGroupService/ListAddressGroupReferences", - request_serializer=gcn_address_group.ListAddressGroupReferencesRequest.serialize, - response_deserializer=gcn_address_group.ListAddressGroupReferencesResponse.deserialize, + self._stubs["list_address_group_references"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.AddressGroupService/ListAddressGroupReferences", + request_serializer=gcn_address_group.ListAddressGroupReferencesRequest.serialize, + response_deserializer=gcn_address_group.ListAddressGroupReferencesResponse.deserialize, + ) ) return self._stubs["list_address_group_references"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/rest.py index d526392f81db..d99aa7823076 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/rest.py @@ -16,24 +16,26 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.network_security_v1.types import address_group as gcn_address_group from google.cloud.network_security_v1.types import address_group +from google.cloud.network_security_v1.types import address_group as gcn_address_group from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAddressGroupServiceRestTransport @@ -1038,9 +1040,7 @@ def __call__( """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseAddAddressGroupItems._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseAddAddressGroupItems._get_http_options() request, metadata = self._interceptor.pre_add_address_group_items( request, metadata @@ -1066,7 +1066,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1195,9 +1195,7 @@ def __call__( """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseCloneAddressGroupItems._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseCloneAddressGroupItems._get_http_options() request, metadata = self._interceptor.pre_clone_address_group_items( request, metadata @@ -1223,7 +1221,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1352,9 +1350,7 @@ def __call__( """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseCreateAddressGroup._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseCreateAddressGroup._get_http_options() request, metadata = self._interceptor.pre_create_address_group( request, metadata @@ -1380,7 +1376,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1508,9 +1504,7 @@ def __call__( """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseDeleteAddressGroup._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseDeleteAddressGroup._get_http_options() request, metadata = self._interceptor.pre_delete_address_group( request, metadata @@ -1532,7 +1526,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1659,9 +1653,7 @@ def __call__( """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseGetAddressGroup._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseGetAddressGroup._get_http_options() request, metadata = self._interceptor.pre_get_address_group( request, metadata @@ -1810,9 +1802,7 @@ def __call__( """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseListAddressGroupReferences._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseListAddressGroupReferences._get_http_options() request, metadata = self._interceptor.pre_list_address_group_references( request, metadata @@ -1876,11 +1866,10 @@ def __call__( resp = self._interceptor.post_list_address_group_references(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_address_group_references_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_address_group_references_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1967,9 +1956,7 @@ def __call__( """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseListAddressGroups._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseListAddressGroups._get_http_options() request, metadata = self._interceptor.pre_list_address_groups( request, metadata @@ -2124,9 +2111,7 @@ def __call__( """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseRemoveAddressGroupItems._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseRemoveAddressGroupItems._get_http_options() request, metadata = self._interceptor.pre_remove_address_group_items( request, metadata @@ -2152,7 +2137,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2281,9 +2266,7 @@ def __call__( """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseUpdateAddressGroup._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseUpdateAddressGroup._get_http_options() request, metadata = self._interceptor.pre_update_address_group( request, metadata @@ -2309,7 +2292,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2396,7 +2379,9 @@ def clone_address_group_items( ]: # 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._CloneAddressGroupItems(self._session, self._host, self._interceptor) # type: ignore + return self._CloneAddressGroupItems( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_address_group( @@ -2433,7 +2418,9 @@ def list_address_group_references( ]: # 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._ListAddressGroupReferences(self._session, self._host, self._interceptor) # type: ignore + return self._ListAddressGroupReferences( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_address_groups( @@ -2454,7 +2441,9 @@ def remove_address_group_items( ]: # 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._RemoveAddressGroupItems(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveAddressGroupItems( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_address_group( @@ -2524,9 +2513,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseAddressGroupServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -2665,9 +2652,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseAddressGroupServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -2806,9 +2791,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseAddressGroupServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2948,9 +2931,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseAddressGroupServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -3095,9 +3076,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3243,9 +3222,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3363,9 +3340,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3481,9 +3456,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseAddressGroupServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3622,9 +3595,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAddressGroupServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAddressGroupServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAddressGroupServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/rest_base.py index b2b7dd0d0130..635a685e87e2 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/address_group_service/transports/rest_base.py @@ -19,13 +19,15 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.network_security_v1.types import address_group as gcn_address_group from google.cloud.network_security_v1.types import address_group +from google.cloud.network_security_v1.types import address_group as gcn_address_group from .base import DEFAULT_CLIENT_INFO, AddressGroupServiceTransport diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/async_client.py index ffd1a4d4c1e9..23ed7c6d0013 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1 import gapic_version as package_version @@ -44,17 +44,26 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1.services.network_security import pagers +from google.cloud.network_security_v1.types import ( + authorization_policy, + client_tls_policy, + common, + server_tls_policy, + tls, +) from google.cloud.network_security_v1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -64,11 +73,6 @@ from google.cloud.network_security_v1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1.types import authorization_policy -from google.cloud.network_security_v1.types import client_tls_policy -from google.cloud.network_security_v1.types import common -from google.cloud.network_security_v1.types import server_tls_policy -from google.cloud.network_security_v1.types import tls from .client import NetworkSecurityClient from .transports.base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport @@ -151,7 +155,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: NetworkSecurityAsyncClient: The constructed client. """ - return NetworkSecurityClient.from_service_account_info.__func__(NetworkSecurityAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = NetworkSecurityClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(NetworkSecurityAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -167,7 +172,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: NetworkSecurityAsyncClient: The constructed client. """ - return NetworkSecurityClient.from_service_account_file.__func__(NetworkSecurityAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = NetworkSecurityClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(NetworkSecurityAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/client.py index d0cc0175a526..fde4d862e48c 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1 import gapic_version as package_version @@ -61,17 +61,26 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1.services.network_security import pagers +from google.cloud.network_security_v1.types import ( + authorization_policy, + client_tls_policy, + common, + server_tls_policy, + tls, +) from google.cloud.network_security_v1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -81,11 +90,6 @@ from google.cloud.network_security_v1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1.types import authorization_policy -from google.cloud.network_security_v1.types import client_tls_policy -from google.cloud.network_security_v1.types import common -from google.cloud.network_security_v1.types import server_tls_policy -from google.cloud.network_security_v1.types import tls from .transports.base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport from .transports.grpc import NetworkSecurityGrpcTransport @@ -101,9 +105,7 @@ class NetworkSecurityClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkSecurityTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkSecurityTransport]] _transport_registry["grpc"] = NetworkSecurityGrpcTransport _transport_registry["grpc_asyncio"] = NetworkSecurityGrpcAsyncIOTransport _transport_registry["rest"] = NetworkSecurityRestTransport @@ -692,11 +694,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkSecurityClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkSecurityClient._read_environment_variables() + ) self._client_cert_source = NetworkSecurityClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -731,8 +731,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkSecurityTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/pagers.py index 44388fc078c6..69bb2ebe25c4 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -149,7 +149,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -231,7 +231,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -309,7 +309,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -391,7 +391,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -469,7 +469,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/base.py index 1c0b4cafd2fe..601eb79e2cd3 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/base.py @@ -17,19 +17,26 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1 import gapic_version as package_version +from google.cloud.network_security_v1.types import ( + authorization_policy, + client_tls_policy, + server_tls_policy, +) from google.cloud.network_security_v1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -39,9 +46,6 @@ from google.cloud.network_security_v1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1.types import authorization_policy -from google.cloud.network_security_v1.types import client_tls_policy -from google.cloud.network_security_v1.types import server_tls_policy DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -464,13 +468,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/grpc.py index b7c2d2023901..d8735f4c474b 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/grpc.py @@ -16,22 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.network_security_v1.types import ( + authorization_policy, + client_tls_policy, + server_tls_policy, +) from google.cloud.network_security_v1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -41,9 +48,6 @@ from google.cloud.network_security_v1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1.types import authorization_policy -from google.cloud.network_security_v1.types import client_tls_policy -from google.cloud.network_security_v1.types import server_tls_policy from .base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport @@ -378,12 +382,12 @@ def list_authorization_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_authorization_policies" not in self._stubs: - self._stubs[ - "list_authorization_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.NetworkSecurity/ListAuthorizationPolicies", - request_serializer=authorization_policy.ListAuthorizationPoliciesRequest.serialize, - response_deserializer=authorization_policy.ListAuthorizationPoliciesResponse.deserialize, + self._stubs["list_authorization_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.NetworkSecurity/ListAuthorizationPolicies", + request_serializer=authorization_policy.ListAuthorizationPoliciesRequest.serialize, + response_deserializer=authorization_policy.ListAuthorizationPoliciesResponse.deserialize, + ) ) return self._stubs["list_authorization_policies"] @@ -439,12 +443,12 @@ def create_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_authorization_policy" not in self._stubs: - self._stubs[ - "create_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.NetworkSecurity/CreateAuthorizationPolicy", - request_serializer=gcn_authorization_policy.CreateAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.NetworkSecurity/CreateAuthorizationPolicy", + request_serializer=gcn_authorization_policy.CreateAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_authorization_policy"] @@ -471,12 +475,12 @@ def update_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_authorization_policy" not in self._stubs: - self._stubs[ - "update_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.NetworkSecurity/UpdateAuthorizationPolicy", - request_serializer=gcn_authorization_policy.UpdateAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.NetworkSecurity/UpdateAuthorizationPolicy", + request_serializer=gcn_authorization_policy.UpdateAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_authorization_policy"] @@ -502,12 +506,12 @@ def delete_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_authorization_policy" not in self._stubs: - self._stubs[ - "delete_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.NetworkSecurity/DeleteAuthorizationPolicy", - request_serializer=authorization_policy.DeleteAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.NetworkSecurity/DeleteAuthorizationPolicy", + request_serializer=authorization_policy.DeleteAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_authorization_policy"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/grpc_asyncio.py index 99408dcbde3b..79a8be851040 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/grpc_asyncio.py @@ -17,24 +17,31 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.network_security_v1.types import ( + authorization_policy, + client_tls_policy, + server_tls_policy, +) from google.cloud.network_security_v1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -44,9 +51,6 @@ from google.cloud.network_security_v1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1.types import authorization_policy -from google.cloud.network_security_v1.types import client_tls_policy -from google.cloud.network_security_v1.types import server_tls_policy from .base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport from .grpc import NetworkSecurityGrpcTransport @@ -386,12 +390,12 @@ def list_authorization_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_authorization_policies" not in self._stubs: - self._stubs[ - "list_authorization_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.NetworkSecurity/ListAuthorizationPolicies", - request_serializer=authorization_policy.ListAuthorizationPoliciesRequest.serialize, - response_deserializer=authorization_policy.ListAuthorizationPoliciesResponse.deserialize, + self._stubs["list_authorization_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.NetworkSecurity/ListAuthorizationPolicies", + request_serializer=authorization_policy.ListAuthorizationPoliciesRequest.serialize, + response_deserializer=authorization_policy.ListAuthorizationPoliciesResponse.deserialize, + ) ) return self._stubs["list_authorization_policies"] @@ -447,12 +451,12 @@ def create_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_authorization_policy" not in self._stubs: - self._stubs[ - "create_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.NetworkSecurity/CreateAuthorizationPolicy", - request_serializer=gcn_authorization_policy.CreateAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.NetworkSecurity/CreateAuthorizationPolicy", + request_serializer=gcn_authorization_policy.CreateAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_authorization_policy"] @@ -479,12 +483,12 @@ def update_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_authorization_policy" not in self._stubs: - self._stubs[ - "update_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.NetworkSecurity/UpdateAuthorizationPolicy", - request_serializer=gcn_authorization_policy.UpdateAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.NetworkSecurity/UpdateAuthorizationPolicy", + request_serializer=gcn_authorization_policy.UpdateAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_authorization_policy"] @@ -510,12 +514,12 @@ def delete_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_authorization_policy" not in self._stubs: - self._stubs[ - "delete_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.NetworkSecurity/DeleteAuthorizationPolicy", - request_serializer=authorization_policy.DeleteAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.NetworkSecurity/DeleteAuthorizationPolicy", + request_serializer=authorization_policy.DeleteAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_authorization_policy"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/rest.py index 9739338ba065..648defdb341d 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/rest.py @@ -16,22 +16,29 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.network_security_v1.types import ( + authorization_policy, + client_tls_policy, + server_tls_policy, +) from google.cloud.network_security_v1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -41,9 +48,6 @@ from google.cloud.network_security_v1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1.types import authorization_policy -from google.cloud.network_security_v1.types import client_tls_policy -from google.cloud.network_security_v1.types import server_tls_policy from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseNetworkSecurityRestTransport @@ -1404,9 +1408,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateAuthorizationPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateAuthorizationPolicy._get_http_options() request, metadata = self._interceptor.pre_create_authorization_policy( request, metadata @@ -1432,7 +1434,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1561,9 +1563,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateClientTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateClientTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_create_client_tls_policy( request, metadata @@ -1589,7 +1589,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1718,9 +1718,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateServerTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateServerTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_create_server_tls_policy( request, metadata @@ -1746,7 +1744,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1875,9 +1873,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteAuthorizationPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteAuthorizationPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_authorization_policy( request, metadata @@ -1899,7 +1895,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2026,9 +2022,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteClientTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteClientTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_client_tls_policy( request, metadata @@ -2050,7 +2044,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2177,9 +2171,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteServerTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteServerTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_server_tls_policy( request, metadata @@ -2201,7 +2193,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2332,9 +2324,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetAuthorizationPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetAuthorizationPolicy._get_http_options() request, metadata = self._interceptor.pre_get_authorization_policy( request, metadata @@ -2490,9 +2480,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetClientTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetClientTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_get_client_tls_policy( request, metadata @@ -2647,9 +2635,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetServerTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetServerTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_get_server_tls_policy( request, metadata @@ -2800,9 +2786,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListAuthorizationPolicies._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListAuthorizationPolicies._get_http_options() request, metadata = self._interceptor.pre_list_authorization_policies( request, metadata @@ -2956,9 +2940,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListClientTlsPolicies._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListClientTlsPolicies._get_http_options() request, metadata = self._interceptor.pre_list_client_tls_policies( request, metadata @@ -3112,9 +3094,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListServerTlsPolicies._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListServerTlsPolicies._get_http_options() request, metadata = self._interceptor.pre_list_server_tls_policies( request, metadata @@ -3271,9 +3251,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateAuthorizationPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateAuthorizationPolicy._get_http_options() request, metadata = self._interceptor.pre_update_authorization_policy( request, metadata @@ -3299,7 +3277,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3428,9 +3406,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateClientTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateClientTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_update_client_tls_policy( request, metadata @@ -3456,7 +3432,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3585,9 +3561,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateServerTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateServerTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_update_server_tls_policy( request, metadata @@ -3613,7 +3587,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3691,7 +3665,9 @@ def create_authorization_policy( ]: # 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._CreateAuthorizationPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._CreateAuthorizationPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_client_tls_policy( @@ -3722,7 +3698,9 @@ def delete_authorization_policy( ]: # 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._DeleteAuthorizationPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAuthorizationPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_client_tls_policy( @@ -3753,7 +3731,9 @@ def get_authorization_policy( ]: # 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._GetAuthorizationPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._GetAuthorizationPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_client_tls_policy( @@ -3784,7 +3764,9 @@ def list_authorization_policies( ]: # 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._ListAuthorizationPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._ListAuthorizationPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_client_tls_policies( @@ -3817,7 +3799,9 @@ def update_authorization_policy( ]: # 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._UpdateAuthorizationPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAuthorizationPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_client_tls_policy( @@ -4464,9 +4448,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -4609,9 +4591,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -4728,9 +4708,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -4985,9 +4963,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseNetworkSecurityRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/rest_base.py index 755583cd4433..16d1c757e7ed 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/network_security/transports/rest_base.py @@ -19,11 +19,18 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.network_security_v1.types import ( + authorization_policy, + client_tls_policy, + server_tls_policy, +) from google.cloud.network_security_v1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -33,9 +40,6 @@ from google.cloud.network_security_v1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1.types import authorization_policy -from google.cloud.network_security_v1.types import client_tls_policy -from google.cloud.network_security_v1.types import server_tls_policy from .base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/async_client.py index 8935020b7b0d..51ce4ea062b7 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1 import gapic_version as package_version @@ -44,22 +44,23 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1.services.organization_address_group_service import ( pagers, ) +from google.cloud.network_security_v1.types import address_group, common from google.cloud.network_security_v1.types import address_group as gcn_address_group -from google.cloud.network_security_v1.types import address_group -from google.cloud.network_security_v1.types import common from .client import OrganizationAddressGroupServiceClient from .transports.base import ( @@ -145,7 +146,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: OrganizationAddressGroupServiceAsyncClient: The constructed client. """ - return OrganizationAddressGroupServiceClient.from_service_account_info.__func__(OrganizationAddressGroupServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + OrganizationAddressGroupServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + OrganizationAddressGroupServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -161,7 +167,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: OrganizationAddressGroupServiceAsyncClient: The constructed client. """ - return OrganizationAddressGroupServiceClient.from_service_account_file.__func__(OrganizationAddressGroupServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + OrganizationAddressGroupServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + OrganizationAddressGroupServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -199,7 +210,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return OrganizationAddressGroupServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return OrganizationAddressGroupServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> OrganizationAddressGroupServiceTransport: diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/client.py index eca63a951d85..14ab5306921d 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1 import gapic_version as package_version @@ -61,22 +61,23 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1.services.organization_address_group_service import ( pagers, ) +from google.cloud.network_security_v1.types import address_group, common from google.cloud.network_security_v1.types import address_group as gcn_address_group -from google.cloud.network_security_v1.types import address_group -from google.cloud.network_security_v1.types import common from .transports.base import ( DEFAULT_CLIENT_INFO, @@ -95,13 +96,11 @@ class OrganizationAddressGroupServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OrganizationAddressGroupServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationAddressGroupServiceTransport]] _transport_registry["grpc"] = OrganizationAddressGroupServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = OrganizationAddressGroupServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + OrganizationAddressGroupServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = OrganizationAddressGroupServiceRestTransport def get_transport_class( @@ -654,11 +653,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OrganizationAddressGroupServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OrganizationAddressGroupServiceClient._read_environment_variables() + ) self._client_cert_source = ( OrganizationAddressGroupServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -699,8 +696,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OrganizationAddressGroupServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/pagers.py index 1798baeb1630..37440ddf6c84 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/pagers.py @@ -38,8 +38,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.network_security_v1.types import address_group as gcn_address_group from google.cloud.network_security_v1.types import address_group +from google.cloud.network_security_v1.types import address_group as gcn_address_group class ListAddressGroupsPager: @@ -68,7 +68,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -144,7 +144,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -224,7 +224,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -306,7 +306,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/__init__.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/__init__.py index 5ac24e1c75ff..0ef6deee37e3 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/__init__.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OrganizationAddressGroupServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationAddressGroupServiceTransport]] _transport_registry["grpc"] = OrganizationAddressGroupServiceGrpcTransport -_transport_registry[ - "grpc_asyncio" -] = OrganizationAddressGroupServiceGrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + OrganizationAddressGroupServiceGrpcAsyncIOTransport +) _transport_registry["rest"] = OrganizationAddressGroupServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/base.py index 41bc4ed395ad..2c64c2283be8 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/base.py @@ -17,21 +17,23 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1 import gapic_version as package_version -from google.cloud.network_security_v1.types import address_group as gcn_address_group from google.cloud.network_security_v1.types import address_group +from google.cloud.network_security_v1.types import address_group as gcn_address_group DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -358,13 +360,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/grpc.py index e9cbf3b60b7a..bf5e33a9f353 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/grpc.py @@ -16,24 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore -from google.cloud.network_security_v1.types import address_group as gcn_address_group from google.cloud.network_security_v1.types import address_group +from google.cloud.network_security_v1.types import address_group as gcn_address_group from .base import DEFAULT_CLIENT_INFO, OrganizationAddressGroupServiceTransport @@ -508,12 +510,12 @@ def remove_address_group_items( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "remove_address_group_items" not in self._stubs: - self._stubs[ - "remove_address_group_items" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.OrganizationAddressGroupService/RemoveAddressGroupItems", - request_serializer=gcn_address_group.RemoveAddressGroupItemsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["remove_address_group_items"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.OrganizationAddressGroupService/RemoveAddressGroupItems", + request_serializer=gcn_address_group.RemoveAddressGroupItemsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["remove_address_group_items"] @@ -593,12 +595,12 @@ def list_address_group_references( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_address_group_references" not in self._stubs: - self._stubs[ - "list_address_group_references" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.OrganizationAddressGroupService/ListAddressGroupReferences", - request_serializer=gcn_address_group.ListAddressGroupReferencesRequest.serialize, - response_deserializer=gcn_address_group.ListAddressGroupReferencesResponse.deserialize, + self._stubs["list_address_group_references"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.OrganizationAddressGroupService/ListAddressGroupReferences", + request_serializer=gcn_address_group.ListAddressGroupReferencesRequest.serialize, + response_deserializer=gcn_address_group.ListAddressGroupReferencesResponse.deserialize, + ) ) return self._stubs["list_address_group_references"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/grpc_asyncio.py index 5021cea77eb5..80e4dbd6a6fc 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/grpc_asyncio.py @@ -17,26 +17,28 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.network_security_v1.types import address_group as gcn_address_group from google.cloud.network_security_v1.types import address_group +from google.cloud.network_security_v1.types import address_group as gcn_address_group from .base import DEFAULT_CLIENT_INFO, OrganizationAddressGroupServiceTransport from .grpc import OrganizationAddressGroupServiceGrpcTransport @@ -522,12 +524,12 @@ def remove_address_group_items( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "remove_address_group_items" not in self._stubs: - self._stubs[ - "remove_address_group_items" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.OrganizationAddressGroupService/RemoveAddressGroupItems", - request_serializer=gcn_address_group.RemoveAddressGroupItemsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["remove_address_group_items"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.OrganizationAddressGroupService/RemoveAddressGroupItems", + request_serializer=gcn_address_group.RemoveAddressGroupItemsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["remove_address_group_items"] @@ -610,12 +612,12 @@ def list_address_group_references( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_address_group_references" not in self._stubs: - self._stubs[ - "list_address_group_references" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1.OrganizationAddressGroupService/ListAddressGroupReferences", - request_serializer=gcn_address_group.ListAddressGroupReferencesRequest.serialize, - response_deserializer=gcn_address_group.ListAddressGroupReferencesResponse.deserialize, + self._stubs["list_address_group_references"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1.OrganizationAddressGroupService/ListAddressGroupReferences", + request_serializer=gcn_address_group.ListAddressGroupReferencesRequest.serialize, + response_deserializer=gcn_address_group.ListAddressGroupReferencesResponse.deserialize, + ) ) return self._stubs["list_address_group_references"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/rest.py index 1af9a994dbe1..c1b88613ce65 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/rest.py @@ -16,24 +16,26 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.network_security_v1.types import address_group as gcn_address_group from google.cloud.network_security_v1.types import address_group +from google.cloud.network_security_v1.types import address_group as gcn_address_group from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseOrganizationAddressGroupServiceRestTransport @@ -1043,9 +1045,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseAddAddressGroupItems._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseAddAddressGroupItems._get_http_options() request, metadata = self._interceptor.pre_add_address_group_items( request, metadata @@ -1071,7 +1071,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1200,9 +1200,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseCloneAddressGroupItems._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseCloneAddressGroupItems._get_http_options() request, metadata = self._interceptor.pre_clone_address_group_items( request, metadata @@ -1228,7 +1226,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1357,9 +1355,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseCreateAddressGroup._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseCreateAddressGroup._get_http_options() request, metadata = self._interceptor.pre_create_address_group( request, metadata @@ -1385,7 +1381,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1513,9 +1509,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseDeleteAddressGroup._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseDeleteAddressGroup._get_http_options() request, metadata = self._interceptor.pre_delete_address_group( request, metadata @@ -1537,7 +1531,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1662,9 +1656,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseGetAddressGroup._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseGetAddressGroup._get_http_options() request, metadata = self._interceptor.pre_get_address_group( request, metadata @@ -1815,9 +1807,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseListAddressGroupReferences._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseListAddressGroupReferences._get_http_options() request, metadata = self._interceptor.pre_list_address_group_references( request, metadata @@ -1881,11 +1871,10 @@ def __call__( resp = self._interceptor.post_list_address_group_references(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_address_group_references_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_address_group_references_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1974,9 +1963,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseListAddressGroups._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseListAddressGroups._get_http_options() request, metadata = self._interceptor.pre_list_address_groups( request, metadata @@ -2131,9 +2118,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseRemoveAddressGroupItems._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseRemoveAddressGroupItems._get_http_options() request, metadata = self._interceptor.pre_remove_address_group_items( request, metadata @@ -2159,7 +2144,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2288,9 +2273,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseUpdateAddressGroup._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseUpdateAddressGroup._get_http_options() request, metadata = self._interceptor.pre_update_address_group( request, metadata @@ -2316,7 +2299,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2401,7 +2384,9 @@ def clone_address_group_items( ]: # 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._CloneAddressGroupItems(self._session, self._host, self._interceptor) # type: ignore + return self._CloneAddressGroupItems( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_address_group( @@ -2438,7 +2423,9 @@ def list_address_group_references( ]: # 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._ListAddressGroupReferences(self._session, self._host, self._interceptor) # type: ignore + return self._ListAddressGroupReferences( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_address_groups( @@ -2459,7 +2446,9 @@ def remove_address_group_items( ]: # 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._RemoveAddressGroupItems(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveAddressGroupItems( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_address_group( @@ -2529,9 +2518,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseOrganizationAddressGroupServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -2672,9 +2659,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseOrganizationAddressGroupServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -2813,9 +2798,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseOrganizationAddressGroupServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2955,9 +2938,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseOrganizationAddressGroupServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -3104,9 +3085,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3250,9 +3229,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3370,9 +3347,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3488,9 +3463,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseOrganizationAddressGroupServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3629,9 +3602,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseOrganizationAddressGroupServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseOrganizationAddressGroupServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseOrganizationAddressGroupServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/rest_base.py index 88b931fdd237..dcd99c5bd791 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/services/organization_address_group_service/transports/rest_base.py @@ -19,13 +19,15 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format -from google.cloud.network_security_v1.types import address_group as gcn_address_group from google.cloud.network_security_v1.types import address_group +from google.cloud.network_security_v1.types import address_group as gcn_address_group from .base import DEFAULT_CLIENT_INFO, OrganizationAddressGroupServiceTransport diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/types/__init__.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/types/__init__.py index 7204c563ea40..31e2c14e8ba8 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/types/__init__.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/types/__init__.py @@ -45,7 +45,9 @@ ListClientTlsPoliciesResponse, UpdateClientTlsPolicyRequest, ) -from .common import OperationMetadata +from .common import ( + OperationMetadata, +) from .server_tls_policy import ( CreateServerTlsPolicyRequest, DeleteServerTlsPolicyRequest, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/types/address_group.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/types/address_group.py index 31801b15812e..6008e6254cc1 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/types/address_group.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/types/address_group.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -87,6 +87,7 @@ class Type(proto.Enum): IPV6 (2): IP v6 ranges. """ + TYPE_UNSPECIFIED = 0 IPV4 = 1 IPV6 = 2 @@ -104,6 +105,7 @@ class Purpose(proto.Enum): CLOUD_ARMOR (2): Address Group is usable in Cloud Armor. """ + PURPOSE_UNSPECIFIED = 0 DEFAULT = 1 CLOUD_ARMOR = 2 @@ -610,12 +612,12 @@ class AddressGroupReference(proto.Message): def raw_page(self): return self - address_group_references: MutableSequence[ - AddressGroupReference - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=AddressGroupReference, + address_group_references: MutableSequence[AddressGroupReference] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=AddressGroupReference, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/types/authorization_policy.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/types/authorization_policy.py index e087fc7130a4..d11e40929d5b 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/types/authorization_policy.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/types/authorization_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -84,6 +84,7 @@ class Action(proto.Enum): Deny rules should be avoided unless they are used to provide a default "deny all" fallback. """ + ACTION_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -221,19 +222,19 @@ class HttpHeaderMatch(proto.Message): message="AuthorizationPolicy.Rule.Destination.HttpHeaderMatch", ) - sources: MutableSequence[ - "AuthorizationPolicy.Rule.Source" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AuthorizationPolicy.Rule.Source", + sources: MutableSequence["AuthorizationPolicy.Rule.Source"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AuthorizationPolicy.Rule.Source", + ) ) - destinations: MutableSequence[ - "AuthorizationPolicy.Rule.Destination" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="AuthorizationPolicy.Rule.Destination", + destinations: MutableSequence["AuthorizationPolicy.Rule.Destination"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="AuthorizationPolicy.Rule.Destination", + ) ) name: str = proto.Field( @@ -321,12 +322,12 @@ class ListAuthorizationPoliciesResponse(proto.Message): def raw_page(self): return self - authorization_policies: MutableSequence[ - "AuthorizationPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AuthorizationPolicy", + authorization_policies: MutableSequence["AuthorizationPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AuthorizationPolicy", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/types/client_tls_policy.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/types/client_tls_policy.py index 5ff3188ecb1d..7f3bf6673d15 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/types/client_tls_policy.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/types/client_tls_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.network_security_v1.types import tls diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/types/common.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/types/common.py index e1785e20ef80..5e30e04fa08d 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/types/common.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/types/common.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1/types/server_tls_policy.py b/packages/google-cloud-network-security/google/cloud/network_security_v1/types/server_tls_policy.py index 1e3cd26fe600..d9f85d79a354 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1/types/server_tls_policy.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1/types/server_tls_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.network_security_v1.types import tls diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/__init__.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/__init__.py index fdf1e336b105..7283e92a7b45 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/__init__.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dns_threat_detector_service import ( DnsThreatDetectorServiceAsyncClient, DnsThreatDetectorServiceClient, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/async_client.py index 7aa21c9b3f15..ff3f5f48abac 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -44,20 +44,22 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.dns_threat_detector_service import ( pagers, ) +from google.cloud.network_security_v1alpha1.types import dns_threat_detector from google.cloud.network_security_v1alpha1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1alpha1.types import dns_threat_detector from .client import DnsThreatDetectorServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DnsThreatDetectorServiceTransport @@ -137,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DnsThreatDetectorServiceAsyncClient: The constructed client. """ - return DnsThreatDetectorServiceClient.from_service_account_info.__func__(DnsThreatDetectorServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DnsThreatDetectorServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DnsThreatDetectorServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -153,7 +156,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DnsThreatDetectorServiceAsyncClient: The constructed client. """ - return DnsThreatDetectorServiceClient.from_service_account_file.__func__(DnsThreatDetectorServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DnsThreatDetectorServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + DnsThreatDetectorServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -191,7 +197,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DnsThreatDetectorServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DnsThreatDetectorServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DnsThreatDetectorServiceTransport: diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/client.py index 1fce795b11ee..42fc1ae0420f 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -61,20 +61,22 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.dns_threat_detector_service import ( pagers, ) +from google.cloud.network_security_v1alpha1.types import dns_threat_detector from google.cloud.network_security_v1alpha1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1alpha1.types import dns_threat_detector from .transports.base import DEFAULT_CLIENT_INFO, DnsThreatDetectorServiceTransport from .transports.grpc import DnsThreatDetectorServiceGrpcTransport @@ -90,9 +92,7 @@ class DnsThreatDetectorServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DnsThreatDetectorServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DnsThreatDetectorServiceTransport]] _transport_registry["grpc"] = DnsThreatDetectorServiceGrpcTransport _transport_registry["grpc_asyncio"] = DnsThreatDetectorServiceGrpcAsyncIOTransport _transport_registry["rest"] = DnsThreatDetectorServiceRestTransport @@ -657,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DnsThreatDetectorServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DnsThreatDetectorServiceClient._read_environment_variables() + ) self._client_cert_source = ( DnsThreatDetectorServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -698,8 +696,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DnsThreatDetectorServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/pagers.py index e30ae2f5b64c..7f794144a20d 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/__init__.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/__init__.py index 963a0f444a76..4dae0d73e1c0 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/__init__.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DnsThreatDetectorServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DnsThreatDetectorServiceTransport]] _transport_registry["grpc"] = DnsThreatDetectorServiceGrpcTransport _transport_registry["grpc_asyncio"] = DnsThreatDetectorServiceGrpcAsyncIOTransport _transport_registry["rest"] = DnsThreatDetectorServiceRestTransport diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/base.py index 47e6195f4093..88f8de33d72c 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/base.py @@ -17,24 +17,26 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.network_security_v1alpha1 import gapic_version as package_version +from google.cloud.network_security_v1alpha1.types import dns_threat_detector from google.cloud.network_security_v1alpha1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1alpha1.types import dns_threat_detector DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -306,13 +308,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/grpc.py index 0f578b9b0a2f..c00461c80c46 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/grpc.py @@ -16,27 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.network_security_v1alpha1.types import dns_threat_detector from google.cloud.network_security_v1alpha1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1alpha1.types import dns_threat_detector from .base import DEFAULT_CLIENT_INFO, DnsThreatDetectorServiceTransport @@ -411,12 +413,12 @@ def create_dns_threat_detector( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_dns_threat_detector" not in self._stubs: - self._stubs[ - "create_dns_threat_detector" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.DnsThreatDetectorService/CreateDnsThreatDetector", - request_serializer=gcn_dns_threat_detector.CreateDnsThreatDetectorRequest.serialize, - response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + self._stubs["create_dns_threat_detector"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.DnsThreatDetectorService/CreateDnsThreatDetector", + request_serializer=gcn_dns_threat_detector.CreateDnsThreatDetectorRequest.serialize, + response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + ) ) return self._stubs["create_dns_threat_detector"] @@ -442,12 +444,12 @@ def update_dns_threat_detector( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_dns_threat_detector" not in self._stubs: - self._stubs[ - "update_dns_threat_detector" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.DnsThreatDetectorService/UpdateDnsThreatDetector", - request_serializer=gcn_dns_threat_detector.UpdateDnsThreatDetectorRequest.serialize, - response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + self._stubs["update_dns_threat_detector"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.DnsThreatDetectorService/UpdateDnsThreatDetector", + request_serializer=gcn_dns_threat_detector.UpdateDnsThreatDetectorRequest.serialize, + response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + ) ) return self._stubs["update_dns_threat_detector"] @@ -472,12 +474,12 @@ def delete_dns_threat_detector( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_dns_threat_detector" not in self._stubs: - self._stubs[ - "delete_dns_threat_detector" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.DnsThreatDetectorService/DeleteDnsThreatDetector", - request_serializer=dns_threat_detector.DeleteDnsThreatDetectorRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_dns_threat_detector"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.DnsThreatDetectorService/DeleteDnsThreatDetector", + request_serializer=dns_threat_detector.DeleteDnsThreatDetectorRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_dns_threat_detector"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/grpc_asyncio.py index 069ed5f5bebd..c16a7a379d54 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/grpc_asyncio.py @@ -17,29 +17,31 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.network_security_v1alpha1.types import dns_threat_detector from google.cloud.network_security_v1alpha1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1alpha1.types import dns_threat_detector from .base import DEFAULT_CLIENT_INFO, DnsThreatDetectorServiceTransport from .grpc import DnsThreatDetectorServiceGrpcTransport @@ -419,12 +421,12 @@ def create_dns_threat_detector( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_dns_threat_detector" not in self._stubs: - self._stubs[ - "create_dns_threat_detector" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.DnsThreatDetectorService/CreateDnsThreatDetector", - request_serializer=gcn_dns_threat_detector.CreateDnsThreatDetectorRequest.serialize, - response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + self._stubs["create_dns_threat_detector"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.DnsThreatDetectorService/CreateDnsThreatDetector", + request_serializer=gcn_dns_threat_detector.CreateDnsThreatDetectorRequest.serialize, + response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + ) ) return self._stubs["create_dns_threat_detector"] @@ -450,12 +452,12 @@ def update_dns_threat_detector( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_dns_threat_detector" not in self._stubs: - self._stubs[ - "update_dns_threat_detector" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.DnsThreatDetectorService/UpdateDnsThreatDetector", - request_serializer=gcn_dns_threat_detector.UpdateDnsThreatDetectorRequest.serialize, - response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + self._stubs["update_dns_threat_detector"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.DnsThreatDetectorService/UpdateDnsThreatDetector", + request_serializer=gcn_dns_threat_detector.UpdateDnsThreatDetectorRequest.serialize, + response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + ) ) return self._stubs["update_dns_threat_detector"] @@ -480,12 +482,12 @@ def delete_dns_threat_detector( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_dns_threat_detector" not in self._stubs: - self._stubs[ - "delete_dns_threat_detector" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.DnsThreatDetectorService/DeleteDnsThreatDetector", - request_serializer=dns_threat_detector.DeleteDnsThreatDetectorRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_dns_threat_detector"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.DnsThreatDetectorService/DeleteDnsThreatDetector", + request_serializer=dns_threat_detector.DeleteDnsThreatDetectorRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_dns_threat_detector"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/rest.py index 0e08e18e6968..6665ecf0886a 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/rest.py @@ -16,27 +16,29 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.network_security_v1alpha1.types import dns_threat_detector from google.cloud.network_security_v1alpha1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1alpha1.types import dns_threat_detector from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDnsThreatDetectorServiceRestTransport @@ -713,9 +715,7 @@ def __call__( """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseCreateDnsThreatDetector._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseCreateDnsThreatDetector._get_http_options() request, metadata = self._interceptor.pre_create_dns_threat_detector( request, metadata @@ -865,9 +865,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseDeleteDnsThreatDetector._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseDeleteDnsThreatDetector._get_http_options() request, metadata = self._interceptor.pre_delete_dns_threat_detector( request, metadata @@ -889,7 +887,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -984,9 +982,7 @@ def __call__( """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseGetDnsThreatDetector._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseGetDnsThreatDetector._get_http_options() request, metadata = self._interceptor.pre_get_dns_threat_detector( request, metadata @@ -1136,9 +1132,7 @@ def __call__( """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseListDnsThreatDetectors._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseListDnsThreatDetectors._get_http_options() request, metadata = self._interceptor.pre_list_dns_threat_detectors( request, metadata @@ -1295,9 +1289,7 @@ def __call__( """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseUpdateDnsThreatDetector._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseUpdateDnsThreatDetector._get_http_options() request, metadata = self._interceptor.pre_update_dns_threat_detector( request, metadata @@ -1403,7 +1395,9 @@ def create_dns_threat_detector( ]: # 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._CreateDnsThreatDetector(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDnsThreatDetector( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_dns_threat_detector( @@ -1413,7 +1407,9 @@ def delete_dns_threat_detector( ]: # 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._DeleteDnsThreatDetector(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDnsThreatDetector( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_dns_threat_detector( @@ -1435,7 +1431,9 @@ def list_dns_threat_detectors( ]: # 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._ListDnsThreatDetectors(self._session, self._host, self._interceptor) # type: ignore + return self._ListDnsThreatDetectors( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_dns_threat_detector( @@ -1446,7 +1444,9 @@ def update_dns_threat_detector( ]: # 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._UpdateDnsThreatDetector(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDnsThreatDetector( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1506,9 +1506,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDnsThreatDetectorServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1647,9 +1645,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDnsThreatDetectorServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1790,9 +1786,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDnsThreatDetectorServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1934,9 +1928,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDnsThreatDetectorServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2083,9 +2075,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2231,9 +2221,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2353,9 +2341,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2473,9 +2459,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDnsThreatDetectorServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2616,9 +2600,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDnsThreatDetectorServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/rest_base.py index 351daab4c7d7..5830f37edceb 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/dns_threat_detector_service/transports/rest_base.py @@ -17,18 +17,20 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.network_security_v1alpha1.types import dns_threat_detector from google.cloud.network_security_v1alpha1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1alpha1.types import dns_threat_detector from .base import DEFAULT_CLIENT_INFO, DnsThreatDetectorServiceTransport diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/async_client.py index f5d1962e7d0b..5648da7dc074 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.firewall_activation import pagers from google.cloud.network_security_v1alpha1.types import common, firewall_activation @@ -141,7 +143,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FirewallActivationAsyncClient: The constructed client. """ - return FirewallActivationClient.from_service_account_info.__func__(FirewallActivationAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = FirewallActivationClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(FirewallActivationAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +160,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FirewallActivationAsyncClient: The constructed client. """ - return FirewallActivationClient.from_service_account_file.__func__(FirewallActivationAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = FirewallActivationClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(FirewallActivationAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -195,7 +199,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return FirewallActivationClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return FirewallActivationClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> FirewallActivationTransport: diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/client.py index f93c85250b27..414785768d74 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.firewall_activation import pagers from google.cloud.network_security_v1alpha1.types import common, firewall_activation @@ -88,9 +90,7 @@ class FirewallActivationClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[FirewallActivationTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[FirewallActivationTransport]] _transport_registry["grpc"] = FirewallActivationGrpcTransport _transport_registry["grpc_asyncio"] = FirewallActivationGrpcAsyncIOTransport _transport_registry["rest"] = FirewallActivationRestTransport @@ -697,11 +697,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FirewallActivationClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FirewallActivationClient._read_environment_variables() + ) self._client_cert_source = FirewallActivationClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -736,8 +734,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FirewallActivationTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/pagers.py index 04f2a4d09b95..ad11a2e98d1b 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +311,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/__init__.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/__init__.py index 7de09082beee..779a53321f93 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/__init__.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import FirewallActivationRestInterceptor, FirewallActivationRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[FirewallActivationTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[FirewallActivationTransport]] _transport_registry["grpc"] = FirewallActivationGrpcTransport _transport_registry["grpc_asyncio"] = FirewallActivationGrpcAsyncIOTransport _transport_registry["rest"] = FirewallActivationRestTransport diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/base.py index 394ba63ea44d..92f868d6745b 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version from google.cloud.network_security_v1alpha1.types import firewall_activation @@ -377,13 +379,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/grpc.py index 0803591459be..4557464754dc 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.network_security_v1alpha1.types import firewall_activation @@ -509,12 +511,12 @@ def list_firewall_endpoint_associations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_firewall_endpoint_associations" not in self._stubs: - self._stubs[ - "list_firewall_endpoint_associations" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.FirewallActivation/ListFirewallEndpointAssociations", - request_serializer=firewall_activation.ListFirewallEndpointAssociationsRequest.serialize, - response_deserializer=firewall_activation.ListFirewallEndpointAssociationsResponse.deserialize, + self._stubs["list_firewall_endpoint_associations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.FirewallActivation/ListFirewallEndpointAssociations", + request_serializer=firewall_activation.ListFirewallEndpointAssociationsRequest.serialize, + response_deserializer=firewall_activation.ListFirewallEndpointAssociationsResponse.deserialize, + ) ) return self._stubs["list_firewall_endpoint_associations"] @@ -541,12 +543,12 @@ def get_firewall_endpoint_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_firewall_endpoint_association" not in self._stubs: - self._stubs[ - "get_firewall_endpoint_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.FirewallActivation/GetFirewallEndpointAssociation", - request_serializer=firewall_activation.GetFirewallEndpointAssociationRequest.serialize, - response_deserializer=firewall_activation.FirewallEndpointAssociation.deserialize, + self._stubs["get_firewall_endpoint_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.FirewallActivation/GetFirewallEndpointAssociation", + request_serializer=firewall_activation.GetFirewallEndpointAssociationRequest.serialize, + response_deserializer=firewall_activation.FirewallEndpointAssociation.deserialize, + ) ) return self._stubs["get_firewall_endpoint_association"] @@ -574,12 +576,12 @@ def create_firewall_endpoint_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_firewall_endpoint_association" not in self._stubs: - self._stubs[ - "create_firewall_endpoint_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.FirewallActivation/CreateFirewallEndpointAssociation", - request_serializer=firewall_activation.CreateFirewallEndpointAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_firewall_endpoint_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.FirewallActivation/CreateFirewallEndpointAssociation", + request_serializer=firewall_activation.CreateFirewallEndpointAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_firewall_endpoint_association"] @@ -606,12 +608,12 @@ def delete_firewall_endpoint_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_firewall_endpoint_association" not in self._stubs: - self._stubs[ - "delete_firewall_endpoint_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.FirewallActivation/DeleteFirewallEndpointAssociation", - request_serializer=firewall_activation.DeleteFirewallEndpointAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_firewall_endpoint_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.FirewallActivation/DeleteFirewallEndpointAssociation", + request_serializer=firewall_activation.DeleteFirewallEndpointAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_firewall_endpoint_association"] @@ -638,12 +640,12 @@ def update_firewall_endpoint_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_firewall_endpoint_association" not in self._stubs: - self._stubs[ - "update_firewall_endpoint_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.FirewallActivation/UpdateFirewallEndpointAssociation", - request_serializer=firewall_activation.UpdateFirewallEndpointAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_firewall_endpoint_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.FirewallActivation/UpdateFirewallEndpointAssociation", + request_serializer=firewall_activation.UpdateFirewallEndpointAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_firewall_endpoint_association"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/grpc_asyncio.py index 2bd7fdbb5d8d..b045235aa305 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.network_security_v1alpha1.types import firewall_activation @@ -520,12 +522,12 @@ def list_firewall_endpoint_associations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_firewall_endpoint_associations" not in self._stubs: - self._stubs[ - "list_firewall_endpoint_associations" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.FirewallActivation/ListFirewallEndpointAssociations", - request_serializer=firewall_activation.ListFirewallEndpointAssociationsRequest.serialize, - response_deserializer=firewall_activation.ListFirewallEndpointAssociationsResponse.deserialize, + self._stubs["list_firewall_endpoint_associations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.FirewallActivation/ListFirewallEndpointAssociations", + request_serializer=firewall_activation.ListFirewallEndpointAssociationsRequest.serialize, + response_deserializer=firewall_activation.ListFirewallEndpointAssociationsResponse.deserialize, + ) ) return self._stubs["list_firewall_endpoint_associations"] @@ -552,12 +554,12 @@ def get_firewall_endpoint_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_firewall_endpoint_association" not in self._stubs: - self._stubs[ - "get_firewall_endpoint_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.FirewallActivation/GetFirewallEndpointAssociation", - request_serializer=firewall_activation.GetFirewallEndpointAssociationRequest.serialize, - response_deserializer=firewall_activation.FirewallEndpointAssociation.deserialize, + self._stubs["get_firewall_endpoint_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.FirewallActivation/GetFirewallEndpointAssociation", + request_serializer=firewall_activation.GetFirewallEndpointAssociationRequest.serialize, + response_deserializer=firewall_activation.FirewallEndpointAssociation.deserialize, + ) ) return self._stubs["get_firewall_endpoint_association"] @@ -585,12 +587,12 @@ def create_firewall_endpoint_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_firewall_endpoint_association" not in self._stubs: - self._stubs[ - "create_firewall_endpoint_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.FirewallActivation/CreateFirewallEndpointAssociation", - request_serializer=firewall_activation.CreateFirewallEndpointAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_firewall_endpoint_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.FirewallActivation/CreateFirewallEndpointAssociation", + request_serializer=firewall_activation.CreateFirewallEndpointAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_firewall_endpoint_association"] @@ -617,12 +619,12 @@ def delete_firewall_endpoint_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_firewall_endpoint_association" not in self._stubs: - self._stubs[ - "delete_firewall_endpoint_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.FirewallActivation/DeleteFirewallEndpointAssociation", - request_serializer=firewall_activation.DeleteFirewallEndpointAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_firewall_endpoint_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.FirewallActivation/DeleteFirewallEndpointAssociation", + request_serializer=firewall_activation.DeleteFirewallEndpointAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_firewall_endpoint_association"] @@ -649,12 +651,12 @@ def update_firewall_endpoint_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_firewall_endpoint_association" not in self._stubs: - self._stubs[ - "update_firewall_endpoint_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.FirewallActivation/UpdateFirewallEndpointAssociation", - request_serializer=firewall_activation.UpdateFirewallEndpointAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_firewall_endpoint_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.FirewallActivation/UpdateFirewallEndpointAssociation", + request_serializer=firewall_activation.UpdateFirewallEndpointAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_firewall_endpoint_association"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/rest.py index cb5a16e86fc7..677e8e73a98e 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1099,9 +1101,7 @@ def __call__( """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseCreateFirewallEndpoint._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseCreateFirewallEndpoint._get_http_options() request, metadata = self._interceptor.pre_create_firewall_endpoint( request, metadata @@ -1127,7 +1127,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1258,15 +1258,12 @@ def __call__( """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseCreateFirewallEndpointAssociation._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseCreateFirewallEndpointAssociation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_firewall_endpoint_association( - request, metadata + request, metadata = ( + self._interceptor.pre_create_firewall_endpoint_association( + request, metadata + ) ) transcoded_request = _BaseFirewallActivationRestTransport._BaseCreateFirewallEndpointAssociation._get_transcoded_request( http_options, request @@ -1289,7 +1286,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1330,11 +1327,10 @@ def __call__( resp = self._interceptor.post_create_firewall_endpoint_association(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_firewall_endpoint_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_firewall_endpoint_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1417,9 +1413,7 @@ def __call__( """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseDeleteFirewallEndpoint._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseDeleteFirewallEndpoint._get_http_options() request, metadata = self._interceptor.pre_delete_firewall_endpoint( request, metadata @@ -1441,7 +1435,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1570,15 +1564,12 @@ def __call__( """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseDeleteFirewallEndpointAssociation._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseDeleteFirewallEndpointAssociation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_firewall_endpoint_association( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_firewall_endpoint_association( + request, metadata + ) ) transcoded_request = _BaseFirewallActivationRestTransport._BaseDeleteFirewallEndpointAssociation._get_transcoded_request( http_options, request @@ -1597,7 +1588,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1637,11 +1628,10 @@ def __call__( resp = self._interceptor.post_delete_firewall_endpoint_association(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_firewall_endpoint_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_firewall_endpoint_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1721,9 +1711,7 @@ def __call__( Message describing Endpoint object. """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseGetFirewallEndpoint._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseGetFirewallEndpoint._get_http_options() request, metadata = self._interceptor.pre_get_firewall_endpoint( request, metadata @@ -1875,9 +1863,7 @@ def __call__( Message describing Association object """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseGetFirewallEndpointAssociation._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseGetFirewallEndpointAssociation._get_http_options() request, metadata = self._interceptor.pre_get_firewall_endpoint_association( request, metadata @@ -1941,11 +1927,10 @@ def __call__( resp = self._interceptor.post_get_firewall_endpoint_association(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_firewall_endpoint_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_firewall_endpoint_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2035,15 +2020,12 @@ def __call__( """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseListFirewallEndpointAssociations._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseListFirewallEndpointAssociations._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_firewall_endpoint_associations( - request, metadata + request, metadata = ( + self._interceptor.pre_list_firewall_endpoint_associations( + request, metadata + ) ) transcoded_request = _BaseFirewallActivationRestTransport._BaseListFirewallEndpointAssociations._get_transcoded_request( http_options, request @@ -2106,11 +2088,10 @@ def __call__( resp = self._interceptor.post_list_firewall_endpoint_associations(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_firewall_endpoint_associations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_firewall_endpoint_associations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2195,9 +2176,7 @@ def __call__( """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseListFirewallEndpoints._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseListFirewallEndpoints._get_http_options() request, metadata = self._interceptor.pre_list_firewall_endpoints( request, metadata @@ -2352,9 +2331,7 @@ def __call__( """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseUpdateFirewallEndpoint._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseUpdateFirewallEndpoint._get_http_options() request, metadata = self._interceptor.pre_update_firewall_endpoint( request, metadata @@ -2380,7 +2357,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2511,15 +2488,12 @@ def __call__( """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseUpdateFirewallEndpointAssociation._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseUpdateFirewallEndpointAssociation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_firewall_endpoint_association( - request, metadata + request, metadata = ( + self._interceptor.pre_update_firewall_endpoint_association( + request, metadata + ) ) transcoded_request = _BaseFirewallActivationRestTransport._BaseUpdateFirewallEndpointAssociation._get_transcoded_request( http_options, request @@ -2542,7 +2516,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2583,11 +2557,10 @@ def __call__( resp = self._interceptor.post_update_firewall_endpoint_association(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_firewall_endpoint_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_firewall_endpoint_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2620,7 +2593,9 @@ def create_firewall_endpoint( ]: # 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._CreateFirewallEndpoint(self._session, self._host, self._interceptor) # type: ignore + return self._CreateFirewallEndpoint( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_firewall_endpoint_association( @@ -2631,7 +2606,9 @@ def create_firewall_endpoint_association( ]: # 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._CreateFirewallEndpointAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateFirewallEndpointAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_firewall_endpoint( @@ -2641,7 +2618,9 @@ def delete_firewall_endpoint( ]: # 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._DeleteFirewallEndpoint(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteFirewallEndpoint( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_firewall_endpoint_association( @@ -2652,7 +2631,9 @@ def delete_firewall_endpoint_association( ]: # 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._DeleteFirewallEndpointAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteFirewallEndpointAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_firewall_endpoint( @@ -2674,7 +2655,9 @@ def get_firewall_endpoint_association( ]: # 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._GetFirewallEndpointAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._GetFirewallEndpointAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_firewall_endpoint_associations( @@ -2685,7 +2668,9 @@ def list_firewall_endpoint_associations( ]: # 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._ListFirewallEndpointAssociations(self._session, self._host, self._interceptor) # type: ignore + return self._ListFirewallEndpointAssociations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_firewall_endpoints( @@ -2706,7 +2691,9 @@ def update_firewall_endpoint( ]: # 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._UpdateFirewallEndpoint(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateFirewallEndpoint( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_firewall_endpoint_association( @@ -2717,7 +2704,9 @@ def update_firewall_endpoint_association( ]: # 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._UpdateFirewallEndpointAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateFirewallEndpointAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -2777,9 +2766,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseFirewallActivationRestTransport._BaseGetLocation._get_transcoded_request( @@ -2918,9 +2905,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseFirewallActivationRestTransport._BaseListLocations._get_transcoded_request( @@ -3059,9 +3044,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseFirewallActivationRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -3201,9 +3184,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseFirewallActivationRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -3348,9 +3329,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3496,9 +3475,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3616,9 +3593,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3734,9 +3709,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseFirewallActivationRestTransport._BaseGetOperation._get_transcoded_request( @@ -3875,9 +3848,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseFirewallActivationRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseFirewallActivationRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseFirewallActivationRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/rest_base.py index 067e68f72077..0b4aab41e496 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/firewall_activation/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/async_client.py index c7a1f997f435..109ece921c8f 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.intercept import pagers from google.cloud.network_security_v1alpha1.types import common, intercept @@ -146,7 +148,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: InterceptAsyncClient: The constructed client. """ - return InterceptClient.from_service_account_info.__func__(InterceptAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = InterceptClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(InterceptAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -162,7 +165,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: InterceptAsyncClient: The constructed client. """ - return InterceptClient.from_service_account_file.__func__(InterceptAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = InterceptClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(InterceptAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/client.py index 027f7472b98e..7b200e2f7d6e 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.intercept import pagers from google.cloud.network_security_v1alpha1.types import common, intercept @@ -736,11 +738,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = InterceptClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + InterceptClient._read_environment_variables() + ) self._client_cert_source = InterceptClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -775,8 +775,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(InterceptTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/pagers.py index 500056d81836..92a9e34f9525 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -225,7 +225,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -387,7 +387,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -465,7 +465,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -547,7 +547,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -623,7 +623,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/base.py index d8c15a36e9d2..932f57837794 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version from google.cloud.network_security_v1alpha1.types import intercept @@ -526,13 +528,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/grpc.py index 3245bd4b5a21..dde3f699bd0f 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.network_security_v1alpha1.types import intercept @@ -367,12 +369,12 @@ def list_intercept_endpoint_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_intercept_endpoint_groups" not in self._stubs: - self._stubs[ - "list_intercept_endpoint_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptEndpointGroups", - request_serializer=intercept.ListInterceptEndpointGroupsRequest.serialize, - response_deserializer=intercept.ListInterceptEndpointGroupsResponse.deserialize, + self._stubs["list_intercept_endpoint_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptEndpointGroups", + request_serializer=intercept.ListInterceptEndpointGroupsRequest.serialize, + response_deserializer=intercept.ListInterceptEndpointGroupsResponse.deserialize, + ) ) return self._stubs["list_intercept_endpoint_groups"] @@ -398,12 +400,12 @@ def get_intercept_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_intercept_endpoint_group" not in self._stubs: - self._stubs[ - "get_intercept_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/GetInterceptEndpointGroup", - request_serializer=intercept.GetInterceptEndpointGroupRequest.serialize, - response_deserializer=intercept.InterceptEndpointGroup.deserialize, + self._stubs["get_intercept_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/GetInterceptEndpointGroup", + request_serializer=intercept.GetInterceptEndpointGroupRequest.serialize, + response_deserializer=intercept.InterceptEndpointGroup.deserialize, + ) ) return self._stubs["get_intercept_endpoint_group"] @@ -430,12 +432,12 @@ def create_intercept_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_intercept_endpoint_group" not in self._stubs: - self._stubs[ - "create_intercept_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptEndpointGroup", - request_serializer=intercept.CreateInterceptEndpointGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_intercept_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptEndpointGroup", + request_serializer=intercept.CreateInterceptEndpointGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_intercept_endpoint_group"] @@ -462,12 +464,12 @@ def update_intercept_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_intercept_endpoint_group" not in self._stubs: - self._stubs[ - "update_intercept_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptEndpointGroup", - request_serializer=intercept.UpdateInterceptEndpointGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_intercept_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptEndpointGroup", + request_serializer=intercept.UpdateInterceptEndpointGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_intercept_endpoint_group"] @@ -494,12 +496,12 @@ def delete_intercept_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_intercept_endpoint_group" not in self._stubs: - self._stubs[ - "delete_intercept_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptEndpointGroup", - request_serializer=intercept.DeleteInterceptEndpointGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_intercept_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptEndpointGroup", + request_serializer=intercept.DeleteInterceptEndpointGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_intercept_endpoint_group"] @@ -527,12 +529,12 @@ def list_intercept_endpoint_group_associations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_intercept_endpoint_group_associations" not in self._stubs: - self._stubs[ - "list_intercept_endpoint_group_associations" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptEndpointGroupAssociations", - request_serializer=intercept.ListInterceptEndpointGroupAssociationsRequest.serialize, - response_deserializer=intercept.ListInterceptEndpointGroupAssociationsResponse.deserialize, + self._stubs["list_intercept_endpoint_group_associations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptEndpointGroupAssociations", + request_serializer=intercept.ListInterceptEndpointGroupAssociationsRequest.serialize, + response_deserializer=intercept.ListInterceptEndpointGroupAssociationsResponse.deserialize, + ) ) return self._stubs["list_intercept_endpoint_group_associations"] @@ -560,12 +562,12 @@ def get_intercept_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_intercept_endpoint_group_association" not in self._stubs: - self._stubs[ - "get_intercept_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/GetInterceptEndpointGroupAssociation", - request_serializer=intercept.GetInterceptEndpointGroupAssociationRequest.serialize, - response_deserializer=intercept.InterceptEndpointGroupAssociation.deserialize, + self._stubs["get_intercept_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/GetInterceptEndpointGroupAssociation", + request_serializer=intercept.GetInterceptEndpointGroupAssociationRequest.serialize, + response_deserializer=intercept.InterceptEndpointGroupAssociation.deserialize, + ) ) return self._stubs["get_intercept_endpoint_group_association"] @@ -593,12 +595,12 @@ def create_intercept_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_intercept_endpoint_group_association" not in self._stubs: - self._stubs[ - "create_intercept_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptEndpointGroupAssociation", - request_serializer=intercept.CreateInterceptEndpointGroupAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_intercept_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptEndpointGroupAssociation", + request_serializer=intercept.CreateInterceptEndpointGroupAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_intercept_endpoint_group_association"] @@ -626,12 +628,12 @@ def update_intercept_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_intercept_endpoint_group_association" not in self._stubs: - self._stubs[ - "update_intercept_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptEndpointGroupAssociation", - request_serializer=intercept.UpdateInterceptEndpointGroupAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_intercept_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptEndpointGroupAssociation", + request_serializer=intercept.UpdateInterceptEndpointGroupAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_intercept_endpoint_group_association"] @@ -659,12 +661,12 @@ def delete_intercept_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_intercept_endpoint_group_association" not in self._stubs: - self._stubs[ - "delete_intercept_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptEndpointGroupAssociation", - request_serializer=intercept.DeleteInterceptEndpointGroupAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_intercept_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptEndpointGroupAssociation", + request_serializer=intercept.DeleteInterceptEndpointGroupAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_intercept_endpoint_group_association"] @@ -692,12 +694,12 @@ def list_intercept_deployment_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_intercept_deployment_groups" not in self._stubs: - self._stubs[ - "list_intercept_deployment_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptDeploymentGroups", - request_serializer=intercept.ListInterceptDeploymentGroupsRequest.serialize, - response_deserializer=intercept.ListInterceptDeploymentGroupsResponse.deserialize, + self._stubs["list_intercept_deployment_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptDeploymentGroups", + request_serializer=intercept.ListInterceptDeploymentGroupsRequest.serialize, + response_deserializer=intercept.ListInterceptDeploymentGroupsResponse.deserialize, + ) ) return self._stubs["list_intercept_deployment_groups"] @@ -724,12 +726,12 @@ def get_intercept_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_intercept_deployment_group" not in self._stubs: - self._stubs[ - "get_intercept_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/GetInterceptDeploymentGroup", - request_serializer=intercept.GetInterceptDeploymentGroupRequest.serialize, - response_deserializer=intercept.InterceptDeploymentGroup.deserialize, + self._stubs["get_intercept_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/GetInterceptDeploymentGroup", + request_serializer=intercept.GetInterceptDeploymentGroupRequest.serialize, + response_deserializer=intercept.InterceptDeploymentGroup.deserialize, + ) ) return self._stubs["get_intercept_deployment_group"] @@ -756,12 +758,12 @@ def create_intercept_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_intercept_deployment_group" not in self._stubs: - self._stubs[ - "create_intercept_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptDeploymentGroup", - request_serializer=intercept.CreateInterceptDeploymentGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_intercept_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptDeploymentGroup", + request_serializer=intercept.CreateInterceptDeploymentGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_intercept_deployment_group"] @@ -788,12 +790,12 @@ def update_intercept_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_intercept_deployment_group" not in self._stubs: - self._stubs[ - "update_intercept_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptDeploymentGroup", - request_serializer=intercept.UpdateInterceptDeploymentGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_intercept_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptDeploymentGroup", + request_serializer=intercept.UpdateInterceptDeploymentGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_intercept_deployment_group"] @@ -820,12 +822,12 @@ def delete_intercept_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_intercept_deployment_group" not in self._stubs: - self._stubs[ - "delete_intercept_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptDeploymentGroup", - request_serializer=intercept.DeleteInterceptDeploymentGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_intercept_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptDeploymentGroup", + request_serializer=intercept.DeleteInterceptDeploymentGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_intercept_deployment_group"] @@ -852,12 +854,12 @@ def list_intercept_deployments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_intercept_deployments" not in self._stubs: - self._stubs[ - "list_intercept_deployments" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptDeployments", - request_serializer=intercept.ListInterceptDeploymentsRequest.serialize, - response_deserializer=intercept.ListInterceptDeploymentsResponse.deserialize, + self._stubs["list_intercept_deployments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptDeployments", + request_serializer=intercept.ListInterceptDeploymentsRequest.serialize, + response_deserializer=intercept.ListInterceptDeploymentsResponse.deserialize, + ) ) return self._stubs["list_intercept_deployments"] @@ -912,12 +914,12 @@ def create_intercept_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_intercept_deployment" not in self._stubs: - self._stubs[ - "create_intercept_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptDeployment", - request_serializer=intercept.CreateInterceptDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_intercept_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptDeployment", + request_serializer=intercept.CreateInterceptDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_intercept_deployment"] @@ -943,12 +945,12 @@ def update_intercept_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_intercept_deployment" not in self._stubs: - self._stubs[ - "update_intercept_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptDeployment", - request_serializer=intercept.UpdateInterceptDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_intercept_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptDeployment", + request_serializer=intercept.UpdateInterceptDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_intercept_deployment"] @@ -974,12 +976,12 @@ def delete_intercept_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_intercept_deployment" not in self._stubs: - self._stubs[ - "delete_intercept_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptDeployment", - request_serializer=intercept.DeleteInterceptDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_intercept_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptDeployment", + request_serializer=intercept.DeleteInterceptDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_intercept_deployment"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/grpc_asyncio.py index d8345c26ea9f..87ae90e4b468 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.network_security_v1alpha1.types import intercept @@ -375,12 +377,12 @@ def list_intercept_endpoint_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_intercept_endpoint_groups" not in self._stubs: - self._stubs[ - "list_intercept_endpoint_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptEndpointGroups", - request_serializer=intercept.ListInterceptEndpointGroupsRequest.serialize, - response_deserializer=intercept.ListInterceptEndpointGroupsResponse.deserialize, + self._stubs["list_intercept_endpoint_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptEndpointGroups", + request_serializer=intercept.ListInterceptEndpointGroupsRequest.serialize, + response_deserializer=intercept.ListInterceptEndpointGroupsResponse.deserialize, + ) ) return self._stubs["list_intercept_endpoint_groups"] @@ -407,12 +409,12 @@ def get_intercept_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_intercept_endpoint_group" not in self._stubs: - self._stubs[ - "get_intercept_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/GetInterceptEndpointGroup", - request_serializer=intercept.GetInterceptEndpointGroupRequest.serialize, - response_deserializer=intercept.InterceptEndpointGroup.deserialize, + self._stubs["get_intercept_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/GetInterceptEndpointGroup", + request_serializer=intercept.GetInterceptEndpointGroupRequest.serialize, + response_deserializer=intercept.InterceptEndpointGroup.deserialize, + ) ) return self._stubs["get_intercept_endpoint_group"] @@ -440,12 +442,12 @@ def create_intercept_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_intercept_endpoint_group" not in self._stubs: - self._stubs[ - "create_intercept_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptEndpointGroup", - request_serializer=intercept.CreateInterceptEndpointGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_intercept_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptEndpointGroup", + request_serializer=intercept.CreateInterceptEndpointGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_intercept_endpoint_group"] @@ -473,12 +475,12 @@ def update_intercept_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_intercept_endpoint_group" not in self._stubs: - self._stubs[ - "update_intercept_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptEndpointGroup", - request_serializer=intercept.UpdateInterceptEndpointGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_intercept_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptEndpointGroup", + request_serializer=intercept.UpdateInterceptEndpointGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_intercept_endpoint_group"] @@ -506,12 +508,12 @@ def delete_intercept_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_intercept_endpoint_group" not in self._stubs: - self._stubs[ - "delete_intercept_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptEndpointGroup", - request_serializer=intercept.DeleteInterceptEndpointGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_intercept_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptEndpointGroup", + request_serializer=intercept.DeleteInterceptEndpointGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_intercept_endpoint_group"] @@ -539,12 +541,12 @@ def list_intercept_endpoint_group_associations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_intercept_endpoint_group_associations" not in self._stubs: - self._stubs[ - "list_intercept_endpoint_group_associations" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptEndpointGroupAssociations", - request_serializer=intercept.ListInterceptEndpointGroupAssociationsRequest.serialize, - response_deserializer=intercept.ListInterceptEndpointGroupAssociationsResponse.deserialize, + self._stubs["list_intercept_endpoint_group_associations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptEndpointGroupAssociations", + request_serializer=intercept.ListInterceptEndpointGroupAssociationsRequest.serialize, + response_deserializer=intercept.ListInterceptEndpointGroupAssociationsResponse.deserialize, + ) ) return self._stubs["list_intercept_endpoint_group_associations"] @@ -572,12 +574,12 @@ def get_intercept_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_intercept_endpoint_group_association" not in self._stubs: - self._stubs[ - "get_intercept_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/GetInterceptEndpointGroupAssociation", - request_serializer=intercept.GetInterceptEndpointGroupAssociationRequest.serialize, - response_deserializer=intercept.InterceptEndpointGroupAssociation.deserialize, + self._stubs["get_intercept_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/GetInterceptEndpointGroupAssociation", + request_serializer=intercept.GetInterceptEndpointGroupAssociationRequest.serialize, + response_deserializer=intercept.InterceptEndpointGroupAssociation.deserialize, + ) ) return self._stubs["get_intercept_endpoint_group_association"] @@ -605,12 +607,12 @@ def create_intercept_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_intercept_endpoint_group_association" not in self._stubs: - self._stubs[ - "create_intercept_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptEndpointGroupAssociation", - request_serializer=intercept.CreateInterceptEndpointGroupAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_intercept_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptEndpointGroupAssociation", + request_serializer=intercept.CreateInterceptEndpointGroupAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_intercept_endpoint_group_association"] @@ -638,12 +640,12 @@ def update_intercept_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_intercept_endpoint_group_association" not in self._stubs: - self._stubs[ - "update_intercept_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptEndpointGroupAssociation", - request_serializer=intercept.UpdateInterceptEndpointGroupAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_intercept_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptEndpointGroupAssociation", + request_serializer=intercept.UpdateInterceptEndpointGroupAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_intercept_endpoint_group_association"] @@ -671,12 +673,12 @@ def delete_intercept_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_intercept_endpoint_group_association" not in self._stubs: - self._stubs[ - "delete_intercept_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptEndpointGroupAssociation", - request_serializer=intercept.DeleteInterceptEndpointGroupAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_intercept_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptEndpointGroupAssociation", + request_serializer=intercept.DeleteInterceptEndpointGroupAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_intercept_endpoint_group_association"] @@ -704,12 +706,12 @@ def list_intercept_deployment_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_intercept_deployment_groups" not in self._stubs: - self._stubs[ - "list_intercept_deployment_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptDeploymentGroups", - request_serializer=intercept.ListInterceptDeploymentGroupsRequest.serialize, - response_deserializer=intercept.ListInterceptDeploymentGroupsResponse.deserialize, + self._stubs["list_intercept_deployment_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptDeploymentGroups", + request_serializer=intercept.ListInterceptDeploymentGroupsRequest.serialize, + response_deserializer=intercept.ListInterceptDeploymentGroupsResponse.deserialize, + ) ) return self._stubs["list_intercept_deployment_groups"] @@ -736,12 +738,12 @@ def get_intercept_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_intercept_deployment_group" not in self._stubs: - self._stubs[ - "get_intercept_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/GetInterceptDeploymentGroup", - request_serializer=intercept.GetInterceptDeploymentGroupRequest.serialize, - response_deserializer=intercept.InterceptDeploymentGroup.deserialize, + self._stubs["get_intercept_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/GetInterceptDeploymentGroup", + request_serializer=intercept.GetInterceptDeploymentGroupRequest.serialize, + response_deserializer=intercept.InterceptDeploymentGroup.deserialize, + ) ) return self._stubs["get_intercept_deployment_group"] @@ -769,12 +771,12 @@ def create_intercept_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_intercept_deployment_group" not in self._stubs: - self._stubs[ - "create_intercept_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptDeploymentGroup", - request_serializer=intercept.CreateInterceptDeploymentGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_intercept_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptDeploymentGroup", + request_serializer=intercept.CreateInterceptDeploymentGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_intercept_deployment_group"] @@ -802,12 +804,12 @@ def update_intercept_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_intercept_deployment_group" not in self._stubs: - self._stubs[ - "update_intercept_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptDeploymentGroup", - request_serializer=intercept.UpdateInterceptDeploymentGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_intercept_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptDeploymentGroup", + request_serializer=intercept.UpdateInterceptDeploymentGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_intercept_deployment_group"] @@ -835,12 +837,12 @@ def delete_intercept_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_intercept_deployment_group" not in self._stubs: - self._stubs[ - "delete_intercept_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptDeploymentGroup", - request_serializer=intercept.DeleteInterceptDeploymentGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_intercept_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptDeploymentGroup", + request_serializer=intercept.DeleteInterceptDeploymentGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_intercept_deployment_group"] @@ -867,12 +869,12 @@ def list_intercept_deployments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_intercept_deployments" not in self._stubs: - self._stubs[ - "list_intercept_deployments" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptDeployments", - request_serializer=intercept.ListInterceptDeploymentsRequest.serialize, - response_deserializer=intercept.ListInterceptDeploymentsResponse.deserialize, + self._stubs["list_intercept_deployments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/ListInterceptDeployments", + request_serializer=intercept.ListInterceptDeploymentsRequest.serialize, + response_deserializer=intercept.ListInterceptDeploymentsResponse.deserialize, + ) ) return self._stubs["list_intercept_deployments"] @@ -929,12 +931,12 @@ def create_intercept_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_intercept_deployment" not in self._stubs: - self._stubs[ - "create_intercept_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptDeployment", - request_serializer=intercept.CreateInterceptDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_intercept_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/CreateInterceptDeployment", + request_serializer=intercept.CreateInterceptDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_intercept_deployment"] @@ -961,12 +963,12 @@ def update_intercept_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_intercept_deployment" not in self._stubs: - self._stubs[ - "update_intercept_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptDeployment", - request_serializer=intercept.UpdateInterceptDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_intercept_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/UpdateInterceptDeployment", + request_serializer=intercept.UpdateInterceptDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_intercept_deployment"] @@ -993,12 +995,12 @@ def delete_intercept_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_intercept_deployment" not in self._stubs: - self._stubs[ - "delete_intercept_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptDeployment", - request_serializer=intercept.DeleteInterceptDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_intercept_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Intercept/DeleteInterceptDeployment", + request_serializer=intercept.DeleteInterceptDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_intercept_deployment"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/rest.py index 2dc3a9383234..e511605c1576 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1679,9 +1681,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseCreateInterceptDeployment._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseCreateInterceptDeployment._get_http_options() request, metadata = self._interceptor.pre_create_intercept_deployment( request, metadata @@ -1707,7 +1707,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1835,9 +1835,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseCreateInterceptDeploymentGroup._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseCreateInterceptDeploymentGroup._get_http_options() request, metadata = self._interceptor.pre_create_intercept_deployment_group( request, metadata @@ -1863,7 +1861,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1906,11 +1904,10 @@ def __call__( resp = self._interceptor.post_create_intercept_deployment_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_intercept_deployment_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_intercept_deployment_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1995,9 +1992,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseCreateInterceptEndpointGroup._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseCreateInterceptEndpointGroup._get_http_options() request, metadata = self._interceptor.pre_create_intercept_endpoint_group( request, metadata @@ -2023,7 +2018,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2066,11 +2061,10 @@ def __call__( resp = self._interceptor.post_create_intercept_endpoint_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_intercept_endpoint_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_intercept_endpoint_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2158,15 +2152,12 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseCreateInterceptEndpointGroupAssociation._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseCreateInterceptEndpointGroupAssociation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_intercept_endpoint_group_association( - request, metadata + request, metadata = ( + self._interceptor.pre_create_intercept_endpoint_group_association( + request, metadata + ) ) transcoded_request = _BaseInterceptRestTransport._BaseCreateInterceptEndpointGroupAssociation._get_transcoded_request( http_options, request @@ -2189,7 +2180,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2232,11 +2223,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_intercept_endpoint_group_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_intercept_endpoint_group_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2320,9 +2310,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseDeleteInterceptDeployment._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseDeleteInterceptDeployment._get_http_options() request, metadata = self._interceptor.pre_delete_intercept_deployment( request, metadata @@ -2344,7 +2332,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2470,9 +2458,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseDeleteInterceptDeploymentGroup._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseDeleteInterceptDeploymentGroup._get_http_options() request, metadata = self._interceptor.pre_delete_intercept_deployment_group( request, metadata @@ -2494,7 +2480,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2536,11 +2522,10 @@ def __call__( resp = self._interceptor.post_delete_intercept_deployment_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_intercept_deployment_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_intercept_deployment_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2624,9 +2609,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseDeleteInterceptEndpointGroup._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseDeleteInterceptEndpointGroup._get_http_options() request, metadata = self._interceptor.pre_delete_intercept_endpoint_group( request, metadata @@ -2648,7 +2631,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2690,11 +2673,10 @@ def __call__( resp = self._interceptor.post_delete_intercept_endpoint_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_intercept_endpoint_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_intercept_endpoint_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2781,15 +2763,12 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseDeleteInterceptEndpointGroupAssociation._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseDeleteInterceptEndpointGroupAssociation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_intercept_endpoint_group_association( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_intercept_endpoint_group_association( + request, metadata + ) ) transcoded_request = _BaseInterceptRestTransport._BaseDeleteInterceptEndpointGroupAssociation._get_transcoded_request( http_options, request @@ -2808,7 +2787,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2850,11 +2829,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_intercept_endpoint_group_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_intercept_endpoint_group_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2942,9 +2920,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseGetInterceptDeployment._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseGetInterceptDeployment._get_http_options() request, metadata = self._interceptor.pre_get_intercept_deployment( request, metadata @@ -3095,9 +3071,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseGetInterceptDeploymentGroup._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseGetInterceptDeploymentGroup._get_http_options() request, metadata = self._interceptor.pre_get_intercept_deployment_group( request, metadata @@ -3163,11 +3137,10 @@ def __call__( resp = self._interceptor.post_get_intercept_deployment_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_intercept_deployment_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_intercept_deployment_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3262,9 +3235,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseGetInterceptEndpointGroup._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseGetInterceptEndpointGroup._get_http_options() request, metadata = self._interceptor.pre_get_intercept_endpoint_group( request, metadata @@ -3425,15 +3396,12 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseGetInterceptEndpointGroupAssociation._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseGetInterceptEndpointGroupAssociation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_intercept_endpoint_group_association( - request, metadata + request, metadata = ( + self._interceptor.pre_get_intercept_endpoint_group_association( + request, metadata + ) ) transcoded_request = _BaseInterceptRestTransport._BaseGetInterceptEndpointGroupAssociation._get_transcoded_request( http_options, request @@ -3494,11 +3462,10 @@ def __call__( resp = self._interceptor.post_get_intercept_endpoint_group_association(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_intercept_endpoint_group_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_intercept_endpoint_group_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3584,9 +3551,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseListInterceptDeploymentGroups._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseListInterceptDeploymentGroups._get_http_options() request, metadata = self._interceptor.pre_list_intercept_deployment_groups( request, metadata @@ -3652,11 +3617,10 @@ def __call__( resp = self._interceptor.post_list_intercept_deployment_groups(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_intercept_deployment_groups_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_intercept_deployment_groups_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3743,9 +3707,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseListInterceptDeployments._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseListInterceptDeployments._get_http_options() request, metadata = self._interceptor.pre_list_intercept_deployments( request, metadata @@ -3896,15 +3858,12 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseListInterceptEndpointGroupAssociations._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseListInterceptEndpointGroupAssociations._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_intercept_endpoint_group_associations( - request, metadata + request, metadata = ( + self._interceptor.pre_list_intercept_endpoint_group_associations( + request, metadata + ) ) transcoded_request = _BaseInterceptRestTransport._BaseListInterceptEndpointGroupAssociations._get_transcoded_request( http_options, request @@ -3967,11 +3926,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_intercept_endpoint_group_associations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_intercept_endpoint_group_associations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4056,9 +4014,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseListInterceptEndpointGroups._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseListInterceptEndpointGroups._get_http_options() request, metadata = self._interceptor.pre_list_intercept_endpoint_groups( request, metadata @@ -4124,11 +4080,10 @@ def __call__( resp = self._interceptor.post_list_intercept_endpoint_groups(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_intercept_endpoint_groups_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_intercept_endpoint_groups_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4215,9 +4170,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseUpdateInterceptDeployment._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseUpdateInterceptDeployment._get_http_options() request, metadata = self._interceptor.pre_update_intercept_deployment( request, metadata @@ -4243,7 +4196,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4371,9 +4324,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseUpdateInterceptDeploymentGroup._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseUpdateInterceptDeploymentGroup._get_http_options() request, metadata = self._interceptor.pre_update_intercept_deployment_group( request, metadata @@ -4399,7 +4350,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4442,11 +4393,10 @@ def __call__( resp = self._interceptor.post_update_intercept_deployment_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_intercept_deployment_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_intercept_deployment_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4531,9 +4481,7 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseUpdateInterceptEndpointGroup._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseUpdateInterceptEndpointGroup._get_http_options() request, metadata = self._interceptor.pre_update_intercept_endpoint_group( request, metadata @@ -4559,7 +4507,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4602,11 +4550,10 @@ def __call__( resp = self._interceptor.post_update_intercept_endpoint_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_intercept_endpoint_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_intercept_endpoint_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4694,15 +4641,12 @@ def __call__( """ - http_options = ( - _BaseInterceptRestTransport._BaseUpdateInterceptEndpointGroupAssociation._get_http_options() - ) + http_options = _BaseInterceptRestTransport._BaseUpdateInterceptEndpointGroupAssociation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_intercept_endpoint_group_association( - request, metadata + request, metadata = ( + self._interceptor.pre_update_intercept_endpoint_group_association( + request, metadata + ) ) transcoded_request = _BaseInterceptRestTransport._BaseUpdateInterceptEndpointGroupAssociation._get_transcoded_request( http_options, request @@ -4725,7 +4669,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4768,11 +4712,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_intercept_endpoint_group_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_intercept_endpoint_group_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4805,7 +4748,9 @@ def create_intercept_deployment( ]: # 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._CreateInterceptDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateInterceptDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_intercept_deployment_group( @@ -4815,7 +4760,9 @@ def create_intercept_deployment_group( ]: # 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._CreateInterceptDeploymentGroup(self._session, self._host, self._interceptor) # type: ignore + return self._CreateInterceptDeploymentGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_intercept_endpoint_group( @@ -4825,7 +4772,9 @@ def create_intercept_endpoint_group( ]: # 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._CreateInterceptEndpointGroup(self._session, self._host, self._interceptor) # type: ignore + return self._CreateInterceptEndpointGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_intercept_endpoint_group_association( @@ -4836,7 +4785,9 @@ def create_intercept_endpoint_group_association( ]: # 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._CreateInterceptEndpointGroupAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateInterceptEndpointGroupAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_intercept_deployment( @@ -4846,7 +4797,9 @@ def delete_intercept_deployment( ]: # 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._DeleteInterceptDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteInterceptDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_intercept_deployment_group( @@ -4856,7 +4809,9 @@ def delete_intercept_deployment_group( ]: # 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._DeleteInterceptDeploymentGroup(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteInterceptDeploymentGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_intercept_endpoint_group( @@ -4866,7 +4821,9 @@ def delete_intercept_endpoint_group( ]: # 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._DeleteInterceptEndpointGroup(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteInterceptEndpointGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_intercept_endpoint_group_association( @@ -4877,7 +4834,9 @@ def delete_intercept_endpoint_group_association( ]: # 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._DeleteInterceptEndpointGroupAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteInterceptEndpointGroupAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_intercept_deployment( @@ -4887,7 +4846,9 @@ def get_intercept_deployment( ]: # 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._GetInterceptDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._GetInterceptDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_intercept_deployment_group( @@ -4898,7 +4859,9 @@ def get_intercept_deployment_group( ]: # 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._GetInterceptDeploymentGroup(self._session, self._host, self._interceptor) # type: ignore + return self._GetInterceptDeploymentGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_intercept_endpoint_group( @@ -4908,7 +4871,9 @@ def get_intercept_endpoint_group( ]: # 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._GetInterceptEndpointGroup(self._session, self._host, self._interceptor) # type: ignore + return self._GetInterceptEndpointGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_intercept_endpoint_group_association( @@ -4919,7 +4884,9 @@ def get_intercept_endpoint_group_association( ]: # 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._GetInterceptEndpointGroupAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._GetInterceptEndpointGroupAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_intercept_deployment_groups( @@ -4930,7 +4897,9 @@ def list_intercept_deployment_groups( ]: # 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._ListInterceptDeploymentGroups(self._session, self._host, self._interceptor) # type: ignore + return self._ListInterceptDeploymentGroups( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_intercept_deployments( @@ -4941,7 +4910,9 @@ def list_intercept_deployments( ]: # 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._ListInterceptDeployments(self._session, self._host, self._interceptor) # type: ignore + return self._ListInterceptDeployments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_intercept_endpoint_group_associations( @@ -4952,7 +4923,9 @@ def list_intercept_endpoint_group_associations( ]: # 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._ListInterceptEndpointGroupAssociations(self._session, self._host, self._interceptor) # type: ignore + return self._ListInterceptEndpointGroupAssociations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_intercept_endpoint_groups( @@ -4963,7 +4936,9 @@ def list_intercept_endpoint_groups( ]: # 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._ListInterceptEndpointGroups(self._session, self._host, self._interceptor) # type: ignore + return self._ListInterceptEndpointGroups( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_intercept_deployment( @@ -4973,7 +4948,9 @@ def update_intercept_deployment( ]: # 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._UpdateInterceptDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateInterceptDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_intercept_deployment_group( @@ -4983,7 +4960,9 @@ def update_intercept_deployment_group( ]: # 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._UpdateInterceptDeploymentGroup(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateInterceptDeploymentGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_intercept_endpoint_group( @@ -4993,7 +4972,9 @@ def update_intercept_endpoint_group( ]: # 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._UpdateInterceptEndpointGroup(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateInterceptEndpointGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_intercept_endpoint_group_association( @@ -5004,7 +4985,9 @@ def update_intercept_endpoint_group_association( ]: # 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._UpdateInterceptEndpointGroupAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateInterceptEndpointGroupAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/rest_base.py index 46aebf2bb875..d2b09765e6e1 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/intercept/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/async_client.py index 6a0c3b5b6935..30de2f907f6d 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.mirroring import pagers from google.cloud.network_security_v1alpha1.types import common, mirroring @@ -145,7 +147,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: MirroringAsyncClient: The constructed client. """ - return MirroringClient.from_service_account_info.__func__(MirroringAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = MirroringClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(MirroringAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -161,7 +164,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: MirroringAsyncClient: The constructed client. """ - return MirroringClient.from_service_account_file.__func__(MirroringAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = MirroringClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(MirroringAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/client.py index aafeeff7daa2..32711fc20219 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.mirroring import pagers from google.cloud.network_security_v1alpha1.types import common, mirroring @@ -735,11 +737,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = MirroringClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + MirroringClient._read_environment_variables() + ) self._client_cert_source = MirroringClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -774,8 +774,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(MirroringTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/pagers.py index f7cab1cba2ff..9f99db15e2cb 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -225,7 +225,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -387,7 +387,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -465,7 +465,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -547,7 +547,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -623,7 +623,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/base.py index 8e3dece6c379..f0083c7ca954 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version from google.cloud.network_security_v1alpha1.types import mirroring @@ -526,13 +528,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/grpc.py index 9c61bdad78c9..6a0eb9dfbc1b 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.network_security_v1alpha1.types import mirroring @@ -366,12 +368,12 @@ def list_mirroring_endpoint_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_mirroring_endpoint_groups" not in self._stubs: - self._stubs[ - "list_mirroring_endpoint_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringEndpointGroups", - request_serializer=mirroring.ListMirroringEndpointGroupsRequest.serialize, - response_deserializer=mirroring.ListMirroringEndpointGroupsResponse.deserialize, + self._stubs["list_mirroring_endpoint_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringEndpointGroups", + request_serializer=mirroring.ListMirroringEndpointGroupsRequest.serialize, + response_deserializer=mirroring.ListMirroringEndpointGroupsResponse.deserialize, + ) ) return self._stubs["list_mirroring_endpoint_groups"] @@ -397,12 +399,12 @@ def get_mirroring_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_mirroring_endpoint_group" not in self._stubs: - self._stubs[ - "get_mirroring_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/GetMirroringEndpointGroup", - request_serializer=mirroring.GetMirroringEndpointGroupRequest.serialize, - response_deserializer=mirroring.MirroringEndpointGroup.deserialize, + self._stubs["get_mirroring_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/GetMirroringEndpointGroup", + request_serializer=mirroring.GetMirroringEndpointGroupRequest.serialize, + response_deserializer=mirroring.MirroringEndpointGroup.deserialize, + ) ) return self._stubs["get_mirroring_endpoint_group"] @@ -429,12 +431,12 @@ def create_mirroring_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_mirroring_endpoint_group" not in self._stubs: - self._stubs[ - "create_mirroring_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringEndpointGroup", - request_serializer=mirroring.CreateMirroringEndpointGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_mirroring_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringEndpointGroup", + request_serializer=mirroring.CreateMirroringEndpointGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_mirroring_endpoint_group"] @@ -461,12 +463,12 @@ def update_mirroring_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_mirroring_endpoint_group" not in self._stubs: - self._stubs[ - "update_mirroring_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringEndpointGroup", - request_serializer=mirroring.UpdateMirroringEndpointGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_mirroring_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringEndpointGroup", + request_serializer=mirroring.UpdateMirroringEndpointGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_mirroring_endpoint_group"] @@ -493,12 +495,12 @@ def delete_mirroring_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_mirroring_endpoint_group" not in self._stubs: - self._stubs[ - "delete_mirroring_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringEndpointGroup", - request_serializer=mirroring.DeleteMirroringEndpointGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_mirroring_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringEndpointGroup", + request_serializer=mirroring.DeleteMirroringEndpointGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_mirroring_endpoint_group"] @@ -526,12 +528,12 @@ def list_mirroring_endpoint_group_associations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_mirroring_endpoint_group_associations" not in self._stubs: - self._stubs[ - "list_mirroring_endpoint_group_associations" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringEndpointGroupAssociations", - request_serializer=mirroring.ListMirroringEndpointGroupAssociationsRequest.serialize, - response_deserializer=mirroring.ListMirroringEndpointGroupAssociationsResponse.deserialize, + self._stubs["list_mirroring_endpoint_group_associations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringEndpointGroupAssociations", + request_serializer=mirroring.ListMirroringEndpointGroupAssociationsRequest.serialize, + response_deserializer=mirroring.ListMirroringEndpointGroupAssociationsResponse.deserialize, + ) ) return self._stubs["list_mirroring_endpoint_group_associations"] @@ -559,12 +561,12 @@ def get_mirroring_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_mirroring_endpoint_group_association" not in self._stubs: - self._stubs[ - "get_mirroring_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/GetMirroringEndpointGroupAssociation", - request_serializer=mirroring.GetMirroringEndpointGroupAssociationRequest.serialize, - response_deserializer=mirroring.MirroringEndpointGroupAssociation.deserialize, + self._stubs["get_mirroring_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/GetMirroringEndpointGroupAssociation", + request_serializer=mirroring.GetMirroringEndpointGroupAssociationRequest.serialize, + response_deserializer=mirroring.MirroringEndpointGroupAssociation.deserialize, + ) ) return self._stubs["get_mirroring_endpoint_group_association"] @@ -592,12 +594,12 @@ def create_mirroring_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_mirroring_endpoint_group_association" not in self._stubs: - self._stubs[ - "create_mirroring_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringEndpointGroupAssociation", - request_serializer=mirroring.CreateMirroringEndpointGroupAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_mirroring_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringEndpointGroupAssociation", + request_serializer=mirroring.CreateMirroringEndpointGroupAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_mirroring_endpoint_group_association"] @@ -625,12 +627,12 @@ def update_mirroring_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_mirroring_endpoint_group_association" not in self._stubs: - self._stubs[ - "update_mirroring_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringEndpointGroupAssociation", - request_serializer=mirroring.UpdateMirroringEndpointGroupAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_mirroring_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringEndpointGroupAssociation", + request_serializer=mirroring.UpdateMirroringEndpointGroupAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_mirroring_endpoint_group_association"] @@ -658,12 +660,12 @@ def delete_mirroring_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_mirroring_endpoint_group_association" not in self._stubs: - self._stubs[ - "delete_mirroring_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringEndpointGroupAssociation", - request_serializer=mirroring.DeleteMirroringEndpointGroupAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_mirroring_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringEndpointGroupAssociation", + request_serializer=mirroring.DeleteMirroringEndpointGroupAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_mirroring_endpoint_group_association"] @@ -691,12 +693,12 @@ def list_mirroring_deployment_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_mirroring_deployment_groups" not in self._stubs: - self._stubs[ - "list_mirroring_deployment_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringDeploymentGroups", - request_serializer=mirroring.ListMirroringDeploymentGroupsRequest.serialize, - response_deserializer=mirroring.ListMirroringDeploymentGroupsResponse.deserialize, + self._stubs["list_mirroring_deployment_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringDeploymentGroups", + request_serializer=mirroring.ListMirroringDeploymentGroupsRequest.serialize, + response_deserializer=mirroring.ListMirroringDeploymentGroupsResponse.deserialize, + ) ) return self._stubs["list_mirroring_deployment_groups"] @@ -723,12 +725,12 @@ def get_mirroring_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_mirroring_deployment_group" not in self._stubs: - self._stubs[ - "get_mirroring_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/GetMirroringDeploymentGroup", - request_serializer=mirroring.GetMirroringDeploymentGroupRequest.serialize, - response_deserializer=mirroring.MirroringDeploymentGroup.deserialize, + self._stubs["get_mirroring_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/GetMirroringDeploymentGroup", + request_serializer=mirroring.GetMirroringDeploymentGroupRequest.serialize, + response_deserializer=mirroring.MirroringDeploymentGroup.deserialize, + ) ) return self._stubs["get_mirroring_deployment_group"] @@ -755,12 +757,12 @@ def create_mirroring_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_mirroring_deployment_group" not in self._stubs: - self._stubs[ - "create_mirroring_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringDeploymentGroup", - request_serializer=mirroring.CreateMirroringDeploymentGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_mirroring_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringDeploymentGroup", + request_serializer=mirroring.CreateMirroringDeploymentGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_mirroring_deployment_group"] @@ -787,12 +789,12 @@ def update_mirroring_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_mirroring_deployment_group" not in self._stubs: - self._stubs[ - "update_mirroring_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringDeploymentGroup", - request_serializer=mirroring.UpdateMirroringDeploymentGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_mirroring_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringDeploymentGroup", + request_serializer=mirroring.UpdateMirroringDeploymentGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_mirroring_deployment_group"] @@ -819,12 +821,12 @@ def delete_mirroring_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_mirroring_deployment_group" not in self._stubs: - self._stubs[ - "delete_mirroring_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringDeploymentGroup", - request_serializer=mirroring.DeleteMirroringDeploymentGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_mirroring_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringDeploymentGroup", + request_serializer=mirroring.DeleteMirroringDeploymentGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_mirroring_deployment_group"] @@ -851,12 +853,12 @@ def list_mirroring_deployments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_mirroring_deployments" not in self._stubs: - self._stubs[ - "list_mirroring_deployments" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringDeployments", - request_serializer=mirroring.ListMirroringDeploymentsRequest.serialize, - response_deserializer=mirroring.ListMirroringDeploymentsResponse.deserialize, + self._stubs["list_mirroring_deployments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringDeployments", + request_serializer=mirroring.ListMirroringDeploymentsRequest.serialize, + response_deserializer=mirroring.ListMirroringDeploymentsResponse.deserialize, + ) ) return self._stubs["list_mirroring_deployments"] @@ -911,12 +913,12 @@ def create_mirroring_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_mirroring_deployment" not in self._stubs: - self._stubs[ - "create_mirroring_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringDeployment", - request_serializer=mirroring.CreateMirroringDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_mirroring_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringDeployment", + request_serializer=mirroring.CreateMirroringDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_mirroring_deployment"] @@ -942,12 +944,12 @@ def update_mirroring_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_mirroring_deployment" not in self._stubs: - self._stubs[ - "update_mirroring_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringDeployment", - request_serializer=mirroring.UpdateMirroringDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_mirroring_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringDeployment", + request_serializer=mirroring.UpdateMirroringDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_mirroring_deployment"] @@ -973,12 +975,12 @@ def delete_mirroring_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_mirroring_deployment" not in self._stubs: - self._stubs[ - "delete_mirroring_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringDeployment", - request_serializer=mirroring.DeleteMirroringDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_mirroring_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringDeployment", + request_serializer=mirroring.DeleteMirroringDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_mirroring_deployment"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/grpc_asyncio.py index 9e1f30608971..643915184a42 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.network_security_v1alpha1.types import mirroring @@ -374,12 +376,12 @@ def list_mirroring_endpoint_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_mirroring_endpoint_groups" not in self._stubs: - self._stubs[ - "list_mirroring_endpoint_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringEndpointGroups", - request_serializer=mirroring.ListMirroringEndpointGroupsRequest.serialize, - response_deserializer=mirroring.ListMirroringEndpointGroupsResponse.deserialize, + self._stubs["list_mirroring_endpoint_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringEndpointGroups", + request_serializer=mirroring.ListMirroringEndpointGroupsRequest.serialize, + response_deserializer=mirroring.ListMirroringEndpointGroupsResponse.deserialize, + ) ) return self._stubs["list_mirroring_endpoint_groups"] @@ -406,12 +408,12 @@ def get_mirroring_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_mirroring_endpoint_group" not in self._stubs: - self._stubs[ - "get_mirroring_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/GetMirroringEndpointGroup", - request_serializer=mirroring.GetMirroringEndpointGroupRequest.serialize, - response_deserializer=mirroring.MirroringEndpointGroup.deserialize, + self._stubs["get_mirroring_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/GetMirroringEndpointGroup", + request_serializer=mirroring.GetMirroringEndpointGroupRequest.serialize, + response_deserializer=mirroring.MirroringEndpointGroup.deserialize, + ) ) return self._stubs["get_mirroring_endpoint_group"] @@ -439,12 +441,12 @@ def create_mirroring_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_mirroring_endpoint_group" not in self._stubs: - self._stubs[ - "create_mirroring_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringEndpointGroup", - request_serializer=mirroring.CreateMirroringEndpointGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_mirroring_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringEndpointGroup", + request_serializer=mirroring.CreateMirroringEndpointGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_mirroring_endpoint_group"] @@ -472,12 +474,12 @@ def update_mirroring_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_mirroring_endpoint_group" not in self._stubs: - self._stubs[ - "update_mirroring_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringEndpointGroup", - request_serializer=mirroring.UpdateMirroringEndpointGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_mirroring_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringEndpointGroup", + request_serializer=mirroring.UpdateMirroringEndpointGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_mirroring_endpoint_group"] @@ -505,12 +507,12 @@ def delete_mirroring_endpoint_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_mirroring_endpoint_group" not in self._stubs: - self._stubs[ - "delete_mirroring_endpoint_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringEndpointGroup", - request_serializer=mirroring.DeleteMirroringEndpointGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_mirroring_endpoint_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringEndpointGroup", + request_serializer=mirroring.DeleteMirroringEndpointGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_mirroring_endpoint_group"] @@ -538,12 +540,12 @@ def list_mirroring_endpoint_group_associations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_mirroring_endpoint_group_associations" not in self._stubs: - self._stubs[ - "list_mirroring_endpoint_group_associations" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringEndpointGroupAssociations", - request_serializer=mirroring.ListMirroringEndpointGroupAssociationsRequest.serialize, - response_deserializer=mirroring.ListMirroringEndpointGroupAssociationsResponse.deserialize, + self._stubs["list_mirroring_endpoint_group_associations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringEndpointGroupAssociations", + request_serializer=mirroring.ListMirroringEndpointGroupAssociationsRequest.serialize, + response_deserializer=mirroring.ListMirroringEndpointGroupAssociationsResponse.deserialize, + ) ) return self._stubs["list_mirroring_endpoint_group_associations"] @@ -571,12 +573,12 @@ def get_mirroring_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_mirroring_endpoint_group_association" not in self._stubs: - self._stubs[ - "get_mirroring_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/GetMirroringEndpointGroupAssociation", - request_serializer=mirroring.GetMirroringEndpointGroupAssociationRequest.serialize, - response_deserializer=mirroring.MirroringEndpointGroupAssociation.deserialize, + self._stubs["get_mirroring_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/GetMirroringEndpointGroupAssociation", + request_serializer=mirroring.GetMirroringEndpointGroupAssociationRequest.serialize, + response_deserializer=mirroring.MirroringEndpointGroupAssociation.deserialize, + ) ) return self._stubs["get_mirroring_endpoint_group_association"] @@ -604,12 +606,12 @@ def create_mirroring_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_mirroring_endpoint_group_association" not in self._stubs: - self._stubs[ - "create_mirroring_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringEndpointGroupAssociation", - request_serializer=mirroring.CreateMirroringEndpointGroupAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_mirroring_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringEndpointGroupAssociation", + request_serializer=mirroring.CreateMirroringEndpointGroupAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_mirroring_endpoint_group_association"] @@ -637,12 +639,12 @@ def update_mirroring_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_mirroring_endpoint_group_association" not in self._stubs: - self._stubs[ - "update_mirroring_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringEndpointGroupAssociation", - request_serializer=mirroring.UpdateMirroringEndpointGroupAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_mirroring_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringEndpointGroupAssociation", + request_serializer=mirroring.UpdateMirroringEndpointGroupAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_mirroring_endpoint_group_association"] @@ -670,12 +672,12 @@ def delete_mirroring_endpoint_group_association( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_mirroring_endpoint_group_association" not in self._stubs: - self._stubs[ - "delete_mirroring_endpoint_group_association" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringEndpointGroupAssociation", - request_serializer=mirroring.DeleteMirroringEndpointGroupAssociationRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_mirroring_endpoint_group_association"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringEndpointGroupAssociation", + request_serializer=mirroring.DeleteMirroringEndpointGroupAssociationRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_mirroring_endpoint_group_association"] @@ -703,12 +705,12 @@ def list_mirroring_deployment_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_mirroring_deployment_groups" not in self._stubs: - self._stubs[ - "list_mirroring_deployment_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringDeploymentGroups", - request_serializer=mirroring.ListMirroringDeploymentGroupsRequest.serialize, - response_deserializer=mirroring.ListMirroringDeploymentGroupsResponse.deserialize, + self._stubs["list_mirroring_deployment_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringDeploymentGroups", + request_serializer=mirroring.ListMirroringDeploymentGroupsRequest.serialize, + response_deserializer=mirroring.ListMirroringDeploymentGroupsResponse.deserialize, + ) ) return self._stubs["list_mirroring_deployment_groups"] @@ -735,12 +737,12 @@ def get_mirroring_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_mirroring_deployment_group" not in self._stubs: - self._stubs[ - "get_mirroring_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/GetMirroringDeploymentGroup", - request_serializer=mirroring.GetMirroringDeploymentGroupRequest.serialize, - response_deserializer=mirroring.MirroringDeploymentGroup.deserialize, + self._stubs["get_mirroring_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/GetMirroringDeploymentGroup", + request_serializer=mirroring.GetMirroringDeploymentGroupRequest.serialize, + response_deserializer=mirroring.MirroringDeploymentGroup.deserialize, + ) ) return self._stubs["get_mirroring_deployment_group"] @@ -768,12 +770,12 @@ def create_mirroring_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_mirroring_deployment_group" not in self._stubs: - self._stubs[ - "create_mirroring_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringDeploymentGroup", - request_serializer=mirroring.CreateMirroringDeploymentGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_mirroring_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringDeploymentGroup", + request_serializer=mirroring.CreateMirroringDeploymentGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_mirroring_deployment_group"] @@ -801,12 +803,12 @@ def update_mirroring_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_mirroring_deployment_group" not in self._stubs: - self._stubs[ - "update_mirroring_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringDeploymentGroup", - request_serializer=mirroring.UpdateMirroringDeploymentGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_mirroring_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringDeploymentGroup", + request_serializer=mirroring.UpdateMirroringDeploymentGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_mirroring_deployment_group"] @@ -834,12 +836,12 @@ def delete_mirroring_deployment_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_mirroring_deployment_group" not in self._stubs: - self._stubs[ - "delete_mirroring_deployment_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringDeploymentGroup", - request_serializer=mirroring.DeleteMirroringDeploymentGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_mirroring_deployment_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringDeploymentGroup", + request_serializer=mirroring.DeleteMirroringDeploymentGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_mirroring_deployment_group"] @@ -866,12 +868,12 @@ def list_mirroring_deployments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_mirroring_deployments" not in self._stubs: - self._stubs[ - "list_mirroring_deployments" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringDeployments", - request_serializer=mirroring.ListMirroringDeploymentsRequest.serialize, - response_deserializer=mirroring.ListMirroringDeploymentsResponse.deserialize, + self._stubs["list_mirroring_deployments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/ListMirroringDeployments", + request_serializer=mirroring.ListMirroringDeploymentsRequest.serialize, + response_deserializer=mirroring.ListMirroringDeploymentsResponse.deserialize, + ) ) return self._stubs["list_mirroring_deployments"] @@ -928,12 +930,12 @@ def create_mirroring_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_mirroring_deployment" not in self._stubs: - self._stubs[ - "create_mirroring_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringDeployment", - request_serializer=mirroring.CreateMirroringDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_mirroring_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/CreateMirroringDeployment", + request_serializer=mirroring.CreateMirroringDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_mirroring_deployment"] @@ -960,12 +962,12 @@ def update_mirroring_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_mirroring_deployment" not in self._stubs: - self._stubs[ - "update_mirroring_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringDeployment", - request_serializer=mirroring.UpdateMirroringDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_mirroring_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/UpdateMirroringDeployment", + request_serializer=mirroring.UpdateMirroringDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_mirroring_deployment"] @@ -992,12 +994,12 @@ def delete_mirroring_deployment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_mirroring_deployment" not in self._stubs: - self._stubs[ - "delete_mirroring_deployment" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringDeployment", - request_serializer=mirroring.DeleteMirroringDeploymentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_mirroring_deployment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.Mirroring/DeleteMirroringDeployment", + request_serializer=mirroring.DeleteMirroringDeploymentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_mirroring_deployment"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/rest.py index ae1b803298e7..9f6deb6b9b10 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1678,9 +1680,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseCreateMirroringDeployment._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseCreateMirroringDeployment._get_http_options() request, metadata = self._interceptor.pre_create_mirroring_deployment( request, metadata @@ -1706,7 +1706,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1834,9 +1834,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseCreateMirroringDeploymentGroup._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseCreateMirroringDeploymentGroup._get_http_options() request, metadata = self._interceptor.pre_create_mirroring_deployment_group( request, metadata @@ -1862,7 +1860,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1905,11 +1903,10 @@ def __call__( resp = self._interceptor.post_create_mirroring_deployment_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_mirroring_deployment_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_mirroring_deployment_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1994,9 +1991,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseCreateMirroringEndpointGroup._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseCreateMirroringEndpointGroup._get_http_options() request, metadata = self._interceptor.pre_create_mirroring_endpoint_group( request, metadata @@ -2022,7 +2017,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2065,11 +2060,10 @@ def __call__( resp = self._interceptor.post_create_mirroring_endpoint_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_mirroring_endpoint_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_mirroring_endpoint_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2157,15 +2151,12 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseCreateMirroringEndpointGroupAssociation._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseCreateMirroringEndpointGroupAssociation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_mirroring_endpoint_group_association( - request, metadata + request, metadata = ( + self._interceptor.pre_create_mirroring_endpoint_group_association( + request, metadata + ) ) transcoded_request = _BaseMirroringRestTransport._BaseCreateMirroringEndpointGroupAssociation._get_transcoded_request( http_options, request @@ -2188,7 +2179,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2231,11 +2222,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_mirroring_endpoint_group_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_mirroring_endpoint_group_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2319,9 +2309,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseDeleteMirroringDeployment._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseDeleteMirroringDeployment._get_http_options() request, metadata = self._interceptor.pre_delete_mirroring_deployment( request, metadata @@ -2343,7 +2331,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2469,9 +2457,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseDeleteMirroringDeploymentGroup._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseDeleteMirroringDeploymentGroup._get_http_options() request, metadata = self._interceptor.pre_delete_mirroring_deployment_group( request, metadata @@ -2493,7 +2479,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2535,11 +2521,10 @@ def __call__( resp = self._interceptor.post_delete_mirroring_deployment_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_mirroring_deployment_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_mirroring_deployment_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2623,9 +2608,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseDeleteMirroringEndpointGroup._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseDeleteMirroringEndpointGroup._get_http_options() request, metadata = self._interceptor.pre_delete_mirroring_endpoint_group( request, metadata @@ -2647,7 +2630,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2689,11 +2672,10 @@ def __call__( resp = self._interceptor.post_delete_mirroring_endpoint_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_mirroring_endpoint_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_mirroring_endpoint_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2780,15 +2762,12 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseDeleteMirroringEndpointGroupAssociation._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseDeleteMirroringEndpointGroupAssociation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_mirroring_endpoint_group_association( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_mirroring_endpoint_group_association( + request, metadata + ) ) transcoded_request = _BaseMirroringRestTransport._BaseDeleteMirroringEndpointGroupAssociation._get_transcoded_request( http_options, request @@ -2807,7 +2786,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2849,11 +2828,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_mirroring_endpoint_group_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_mirroring_endpoint_group_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2941,9 +2919,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseGetMirroringDeployment._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseGetMirroringDeployment._get_http_options() request, metadata = self._interceptor.pre_get_mirroring_deployment( request, metadata @@ -3094,9 +3070,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseGetMirroringDeploymentGroup._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseGetMirroringDeploymentGroup._get_http_options() request, metadata = self._interceptor.pre_get_mirroring_deployment_group( request, metadata @@ -3162,11 +3136,10 @@ def __call__( resp = self._interceptor.post_get_mirroring_deployment_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_mirroring_deployment_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_mirroring_deployment_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3261,9 +3234,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseGetMirroringEndpointGroup._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseGetMirroringEndpointGroup._get_http_options() request, metadata = self._interceptor.pre_get_mirroring_endpoint_group( request, metadata @@ -3424,15 +3395,12 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseGetMirroringEndpointGroupAssociation._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseGetMirroringEndpointGroupAssociation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_mirroring_endpoint_group_association( - request, metadata + request, metadata = ( + self._interceptor.pre_get_mirroring_endpoint_group_association( + request, metadata + ) ) transcoded_request = _BaseMirroringRestTransport._BaseGetMirroringEndpointGroupAssociation._get_transcoded_request( http_options, request @@ -3493,11 +3461,10 @@ def __call__( resp = self._interceptor.post_get_mirroring_endpoint_group_association(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_mirroring_endpoint_group_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_mirroring_endpoint_group_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3583,9 +3550,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseListMirroringDeploymentGroups._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseListMirroringDeploymentGroups._get_http_options() request, metadata = self._interceptor.pre_list_mirroring_deployment_groups( request, metadata @@ -3651,11 +3616,10 @@ def __call__( resp = self._interceptor.post_list_mirroring_deployment_groups(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_mirroring_deployment_groups_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_mirroring_deployment_groups_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3742,9 +3706,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseListMirroringDeployments._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseListMirroringDeployments._get_http_options() request, metadata = self._interceptor.pre_list_mirroring_deployments( request, metadata @@ -3895,15 +3857,12 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseListMirroringEndpointGroupAssociations._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseListMirroringEndpointGroupAssociations._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_mirroring_endpoint_group_associations( - request, metadata + request, metadata = ( + self._interceptor.pre_list_mirroring_endpoint_group_associations( + request, metadata + ) ) transcoded_request = _BaseMirroringRestTransport._BaseListMirroringEndpointGroupAssociations._get_transcoded_request( http_options, request @@ -3966,11 +3925,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_mirroring_endpoint_group_associations_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_mirroring_endpoint_group_associations_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4055,9 +4013,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseListMirroringEndpointGroups._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseListMirroringEndpointGroups._get_http_options() request, metadata = self._interceptor.pre_list_mirroring_endpoint_groups( request, metadata @@ -4123,11 +4079,10 @@ def __call__( resp = self._interceptor.post_list_mirroring_endpoint_groups(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_mirroring_endpoint_groups_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_mirroring_endpoint_groups_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4214,9 +4169,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseUpdateMirroringDeployment._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseUpdateMirroringDeployment._get_http_options() request, metadata = self._interceptor.pre_update_mirroring_deployment( request, metadata @@ -4242,7 +4195,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4370,9 +4323,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseUpdateMirroringDeploymentGroup._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseUpdateMirroringDeploymentGroup._get_http_options() request, metadata = self._interceptor.pre_update_mirroring_deployment_group( request, metadata @@ -4398,7 +4349,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4441,11 +4392,10 @@ def __call__( resp = self._interceptor.post_update_mirroring_deployment_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_mirroring_deployment_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_mirroring_deployment_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4530,9 +4480,7 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseUpdateMirroringEndpointGroup._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseUpdateMirroringEndpointGroup._get_http_options() request, metadata = self._interceptor.pre_update_mirroring_endpoint_group( request, metadata @@ -4558,7 +4506,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4601,11 +4549,10 @@ def __call__( resp = self._interceptor.post_update_mirroring_endpoint_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_mirroring_endpoint_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_mirroring_endpoint_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4693,15 +4640,12 @@ def __call__( """ - http_options = ( - _BaseMirroringRestTransport._BaseUpdateMirroringEndpointGroupAssociation._get_http_options() - ) + http_options = _BaseMirroringRestTransport._BaseUpdateMirroringEndpointGroupAssociation._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_mirroring_endpoint_group_association( - request, metadata + request, metadata = ( + self._interceptor.pre_update_mirroring_endpoint_group_association( + request, metadata + ) ) transcoded_request = _BaseMirroringRestTransport._BaseUpdateMirroringEndpointGroupAssociation._get_transcoded_request( http_options, request @@ -4724,7 +4668,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4767,11 +4711,10 @@ def __call__( resp ) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_mirroring_endpoint_group_association_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_mirroring_endpoint_group_association_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4804,7 +4747,9 @@ def create_mirroring_deployment( ]: # 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._CreateMirroringDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateMirroringDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_mirroring_deployment_group( @@ -4814,7 +4759,9 @@ def create_mirroring_deployment_group( ]: # 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._CreateMirroringDeploymentGroup(self._session, self._host, self._interceptor) # type: ignore + return self._CreateMirroringDeploymentGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_mirroring_endpoint_group( @@ -4824,7 +4771,9 @@ def create_mirroring_endpoint_group( ]: # 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._CreateMirroringEndpointGroup(self._session, self._host, self._interceptor) # type: ignore + return self._CreateMirroringEndpointGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_mirroring_endpoint_group_association( @@ -4835,7 +4784,9 @@ def create_mirroring_endpoint_group_association( ]: # 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._CreateMirroringEndpointGroupAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._CreateMirroringEndpointGroupAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_mirroring_deployment( @@ -4845,7 +4796,9 @@ def delete_mirroring_deployment( ]: # 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._DeleteMirroringDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteMirroringDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_mirroring_deployment_group( @@ -4855,7 +4808,9 @@ def delete_mirroring_deployment_group( ]: # 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._DeleteMirroringDeploymentGroup(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteMirroringDeploymentGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_mirroring_endpoint_group( @@ -4865,7 +4820,9 @@ def delete_mirroring_endpoint_group( ]: # 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._DeleteMirroringEndpointGroup(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteMirroringEndpointGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_mirroring_endpoint_group_association( @@ -4876,7 +4833,9 @@ def delete_mirroring_endpoint_group_association( ]: # 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._DeleteMirroringEndpointGroupAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteMirroringEndpointGroupAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_mirroring_deployment( @@ -4886,7 +4845,9 @@ def get_mirroring_deployment( ]: # 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._GetMirroringDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._GetMirroringDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_mirroring_deployment_group( @@ -4897,7 +4858,9 @@ def get_mirroring_deployment_group( ]: # 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._GetMirroringDeploymentGroup(self._session, self._host, self._interceptor) # type: ignore + return self._GetMirroringDeploymentGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_mirroring_endpoint_group( @@ -4907,7 +4870,9 @@ def get_mirroring_endpoint_group( ]: # 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._GetMirroringEndpointGroup(self._session, self._host, self._interceptor) # type: ignore + return self._GetMirroringEndpointGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_mirroring_endpoint_group_association( @@ -4918,7 +4883,9 @@ def get_mirroring_endpoint_group_association( ]: # 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._GetMirroringEndpointGroupAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._GetMirroringEndpointGroupAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_mirroring_deployment_groups( @@ -4929,7 +4896,9 @@ def list_mirroring_deployment_groups( ]: # 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._ListMirroringDeploymentGroups(self._session, self._host, self._interceptor) # type: ignore + return self._ListMirroringDeploymentGroups( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_mirroring_deployments( @@ -4940,7 +4909,9 @@ def list_mirroring_deployments( ]: # 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._ListMirroringDeployments(self._session, self._host, self._interceptor) # type: ignore + return self._ListMirroringDeployments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_mirroring_endpoint_group_associations( @@ -4951,7 +4922,9 @@ def list_mirroring_endpoint_group_associations( ]: # 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._ListMirroringEndpointGroupAssociations(self._session, self._host, self._interceptor) # type: ignore + return self._ListMirroringEndpointGroupAssociations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_mirroring_endpoint_groups( @@ -4962,7 +4935,9 @@ def list_mirroring_endpoint_groups( ]: # 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._ListMirroringEndpointGroups(self._session, self._host, self._interceptor) # type: ignore + return self._ListMirroringEndpointGroups( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_mirroring_deployment( @@ -4972,7 +4947,9 @@ def update_mirroring_deployment( ]: # 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._UpdateMirroringDeployment(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateMirroringDeployment( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_mirroring_deployment_group( @@ -4982,7 +4959,9 @@ def update_mirroring_deployment_group( ]: # 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._UpdateMirroringDeploymentGroup(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateMirroringDeploymentGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_mirroring_endpoint_group( @@ -4992,7 +4971,9 @@ def update_mirroring_endpoint_group( ]: # 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._UpdateMirroringEndpointGroup(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateMirroringEndpointGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_mirroring_endpoint_group_association( @@ -5003,7 +4984,9 @@ def update_mirroring_endpoint_group_association( ]: # 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._UpdateMirroringEndpointGroupAssociation(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateMirroringEndpointGroupAssociation( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/rest_base.py index 4caf6fd6636c..267b2d042286 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/mirroring/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/async_client.py index 6fb6d4323de1..ab90fc881143 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -44,35 +44,47 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.network_security import pagers +from google.cloud.network_security_v1alpha1.types import ( + authorization_policy, + authz_policy, + backend_authentication_config, + client_tls_policy, + common, + gateway_security_policy, + gateway_security_policy_rule, + server_tls_policy, + tls, + tls_inspection_policy, + url_list, +) from google.cloud.network_security_v1alpha1.types import ( authorization_policy as gcn_authorization_policy, ) from google.cloud.network_security_v1alpha1.types import ( authz_policy as gcn_authz_policy, ) -from google.cloud.network_security_v1alpha1.types import backend_authentication_config from google.cloud.network_security_v1alpha1.types import ( backend_authentication_config as gcn_backend_authentication_config, ) from google.cloud.network_security_v1alpha1.types import ( client_tls_policy as gcn_client_tls_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy as gcn_gateway_security_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy_rule from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy_rule as gcn_gateway_security_policy_rule, ) @@ -83,14 +95,6 @@ tls_inspection_policy as gcn_tls_inspection_policy, ) from google.cloud.network_security_v1alpha1.types import url_list as gcn_url_list -from google.cloud.network_security_v1alpha1.types import authorization_policy -from google.cloud.network_security_v1alpha1.types import authz_policy -from google.cloud.network_security_v1alpha1.types import client_tls_policy -from google.cloud.network_security_v1alpha1.types import common -from google.cloud.network_security_v1alpha1.types import server_tls_policy -from google.cloud.network_security_v1alpha1.types import tls -from google.cloud.network_security_v1alpha1.types import tls_inspection_policy -from google.cloud.network_security_v1alpha1.types import url_list from .client import NetworkSecurityClient from .transports.base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport @@ -211,7 +215,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: NetworkSecurityAsyncClient: The constructed client. """ - return NetworkSecurityClient.from_service_account_info.__func__(NetworkSecurityAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = NetworkSecurityClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(NetworkSecurityAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -227,7 +232,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: NetworkSecurityAsyncClient: The constructed client. """ - return NetworkSecurityClient.from_service_account_file.__func__(NetworkSecurityAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = NetworkSecurityClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(NetworkSecurityAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/client.py index 2c838e8ac4f2..57c8769b6ec4 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -61,35 +61,47 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.network_security import pagers +from google.cloud.network_security_v1alpha1.types import ( + authorization_policy, + authz_policy, + backend_authentication_config, + client_tls_policy, + common, + gateway_security_policy, + gateway_security_policy_rule, + server_tls_policy, + tls, + tls_inspection_policy, + url_list, +) from google.cloud.network_security_v1alpha1.types import ( authorization_policy as gcn_authorization_policy, ) from google.cloud.network_security_v1alpha1.types import ( authz_policy as gcn_authz_policy, ) -from google.cloud.network_security_v1alpha1.types import backend_authentication_config from google.cloud.network_security_v1alpha1.types import ( backend_authentication_config as gcn_backend_authentication_config, ) from google.cloud.network_security_v1alpha1.types import ( client_tls_policy as gcn_client_tls_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy as gcn_gateway_security_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy_rule from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy_rule as gcn_gateway_security_policy_rule, ) @@ -100,14 +112,6 @@ tls_inspection_policy as gcn_tls_inspection_policy, ) from google.cloud.network_security_v1alpha1.types import url_list as gcn_url_list -from google.cloud.network_security_v1alpha1.types import authorization_policy -from google.cloud.network_security_v1alpha1.types import authz_policy -from google.cloud.network_security_v1alpha1.types import client_tls_policy -from google.cloud.network_security_v1alpha1.types import common -from google.cloud.network_security_v1alpha1.types import server_tls_policy -from google.cloud.network_security_v1alpha1.types import tls -from google.cloud.network_security_v1alpha1.types import tls_inspection_policy -from google.cloud.network_security_v1alpha1.types import url_list from .transports.base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport from .transports.grpc import NetworkSecurityGrpcTransport @@ -123,9 +127,7 @@ class NetworkSecurityClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkSecurityTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkSecurityTransport]] _transport_registry["grpc"] = NetworkSecurityGrpcTransport _transport_registry["grpc_asyncio"] = NetworkSecurityGrpcAsyncIOTransport _transport_registry["rest"] = NetworkSecurityRestTransport @@ -916,11 +918,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkSecurityClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkSecurityClient._read_environment_variables() + ) self._client_cert_source = NetworkSecurityClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -955,8 +955,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkSecurityTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/pagers.py index 604a11a24c75..401f1bdb1852 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/pagers.py @@ -77,7 +77,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -155,7 +155,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -239,7 +239,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -330,7 +330,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -420,7 +420,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -498,7 +498,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -580,7 +580,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -658,7 +658,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -742,7 +742,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -824,7 +824,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -910,7 +910,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -997,7 +997,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1085,7 +1085,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1161,7 +1161,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1241,7 +1241,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1321,7 +1321,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1403,7 +1403,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1479,7 +1479,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/base.py index 02f908265ee8..092faac14364 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/base.py @@ -17,37 +17,47 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version +from google.cloud.network_security_v1alpha1.types import ( + authorization_policy, + authz_policy, + backend_authentication_config, + client_tls_policy, + gateway_security_policy, + gateway_security_policy_rule, + server_tls_policy, + tls_inspection_policy, + url_list, +) from google.cloud.network_security_v1alpha1.types import ( authorization_policy as gcn_authorization_policy, ) from google.cloud.network_security_v1alpha1.types import ( authz_policy as gcn_authz_policy, ) -from google.cloud.network_security_v1alpha1.types import backend_authentication_config from google.cloud.network_security_v1alpha1.types import ( backend_authentication_config as gcn_backend_authentication_config, ) from google.cloud.network_security_v1alpha1.types import ( client_tls_policy as gcn_client_tls_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy as gcn_gateway_security_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy_rule from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy_rule as gcn_gateway_security_policy_rule, ) @@ -58,12 +68,6 @@ tls_inspection_policy as gcn_tls_inspection_policy, ) from google.cloud.network_security_v1alpha1.types import url_list as gcn_url_list -from google.cloud.network_security_v1alpha1.types import authorization_policy -from google.cloud.network_security_v1alpha1.types import authz_policy -from google.cloud.network_security_v1alpha1.types import client_tls_policy -from google.cloud.network_security_v1alpha1.types import server_tls_policy -from google.cloud.network_security_v1alpha1.types import tls_inspection_policy -from google.cloud.network_security_v1alpha1.types import url_list DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -937,13 +941,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/grpc.py index 3e70d7dd0165..c79d6e299e53 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/grpc.py @@ -16,40 +16,50 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.network_security_v1alpha1.types import ( + authorization_policy, + authz_policy, + backend_authentication_config, + client_tls_policy, + gateway_security_policy, + gateway_security_policy_rule, + server_tls_policy, + tls_inspection_policy, + url_list, +) from google.cloud.network_security_v1alpha1.types import ( authorization_policy as gcn_authorization_policy, ) from google.cloud.network_security_v1alpha1.types import ( authz_policy as gcn_authz_policy, ) -from google.cloud.network_security_v1alpha1.types import backend_authentication_config from google.cloud.network_security_v1alpha1.types import ( backend_authentication_config as gcn_backend_authentication_config, ) from google.cloud.network_security_v1alpha1.types import ( client_tls_policy as gcn_client_tls_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy as gcn_gateway_security_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy_rule from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy_rule as gcn_gateway_security_policy_rule, ) @@ -60,12 +70,6 @@ tls_inspection_policy as gcn_tls_inspection_policy, ) from google.cloud.network_security_v1alpha1.types import url_list as gcn_url_list -from google.cloud.network_security_v1alpha1.types import authorization_policy -from google.cloud.network_security_v1alpha1.types import authz_policy -from google.cloud.network_security_v1alpha1.types import client_tls_policy -from google.cloud.network_security_v1alpha1.types import server_tls_policy -from google.cloud.network_security_v1alpha1.types import tls_inspection_policy -from google.cloud.network_security_v1alpha1.types import url_list from .base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport @@ -400,12 +404,12 @@ def list_authorization_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_authorization_policies" not in self._stubs: - self._stubs[ - "list_authorization_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListAuthorizationPolicies", - request_serializer=authorization_policy.ListAuthorizationPoliciesRequest.serialize, - response_deserializer=authorization_policy.ListAuthorizationPoliciesResponse.deserialize, + self._stubs["list_authorization_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListAuthorizationPolicies", + request_serializer=authorization_policy.ListAuthorizationPoliciesRequest.serialize, + response_deserializer=authorization_policy.ListAuthorizationPoliciesResponse.deserialize, + ) ) return self._stubs["list_authorization_policies"] @@ -461,12 +465,12 @@ def create_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_authorization_policy" not in self._stubs: - self._stubs[ - "create_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateAuthorizationPolicy", - request_serializer=gcn_authorization_policy.CreateAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateAuthorizationPolicy", + request_serializer=gcn_authorization_policy.CreateAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_authorization_policy"] @@ -493,12 +497,12 @@ def update_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_authorization_policy" not in self._stubs: - self._stubs[ - "update_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateAuthorizationPolicy", - request_serializer=gcn_authorization_policy.UpdateAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateAuthorizationPolicy", + request_serializer=gcn_authorization_policy.UpdateAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_authorization_policy"] @@ -524,12 +528,12 @@ def delete_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_authorization_policy" not in self._stubs: - self._stubs[ - "delete_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteAuthorizationPolicy", - request_serializer=authorization_policy.DeleteAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteAuthorizationPolicy", + request_serializer=authorization_policy.DeleteAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_authorization_policy"] @@ -557,12 +561,12 @@ def list_backend_authentication_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_backend_authentication_configs" not in self._stubs: - self._stubs[ - "list_backend_authentication_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListBackendAuthenticationConfigs", - request_serializer=backend_authentication_config.ListBackendAuthenticationConfigsRequest.serialize, - response_deserializer=backend_authentication_config.ListBackendAuthenticationConfigsResponse.deserialize, + self._stubs["list_backend_authentication_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListBackendAuthenticationConfigs", + request_serializer=backend_authentication_config.ListBackendAuthenticationConfigsRequest.serialize, + response_deserializer=backend_authentication_config.ListBackendAuthenticationConfigsResponse.deserialize, + ) ) return self._stubs["list_backend_authentication_configs"] @@ -590,12 +594,12 @@ def get_backend_authentication_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_backend_authentication_config" not in self._stubs: - self._stubs[ - "get_backend_authentication_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/GetBackendAuthenticationConfig", - request_serializer=backend_authentication_config.GetBackendAuthenticationConfigRequest.serialize, - response_deserializer=backend_authentication_config.BackendAuthenticationConfig.deserialize, + self._stubs["get_backend_authentication_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/GetBackendAuthenticationConfig", + request_serializer=backend_authentication_config.GetBackendAuthenticationConfigRequest.serialize, + response_deserializer=backend_authentication_config.BackendAuthenticationConfig.deserialize, + ) ) return self._stubs["get_backend_authentication_config"] @@ -623,12 +627,12 @@ def create_backend_authentication_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_backend_authentication_config" not in self._stubs: - self._stubs[ - "create_backend_authentication_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateBackendAuthenticationConfig", - request_serializer=gcn_backend_authentication_config.CreateBackendAuthenticationConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_backend_authentication_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateBackendAuthenticationConfig", + request_serializer=gcn_backend_authentication_config.CreateBackendAuthenticationConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_backend_authentication_config"] @@ -657,12 +661,12 @@ def update_backend_authentication_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_backend_authentication_config" not in self._stubs: - self._stubs[ - "update_backend_authentication_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateBackendAuthenticationConfig", - request_serializer=gcn_backend_authentication_config.UpdateBackendAuthenticationConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_backend_authentication_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateBackendAuthenticationConfig", + request_serializer=gcn_backend_authentication_config.UpdateBackendAuthenticationConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_backend_authentication_config"] @@ -690,12 +694,12 @@ def delete_backend_authentication_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_backend_authentication_config" not in self._stubs: - self._stubs[ - "delete_backend_authentication_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteBackendAuthenticationConfig", - request_serializer=backend_authentication_config.DeleteBackendAuthenticationConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_backend_authentication_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteBackendAuthenticationConfig", + request_serializer=backend_authentication_config.DeleteBackendAuthenticationConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_backend_authentication_config"] @@ -1008,12 +1012,12 @@ def list_gateway_security_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_gateway_security_policies" not in self._stubs: - self._stubs[ - "list_gateway_security_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListGatewaySecurityPolicies", - request_serializer=gateway_security_policy.ListGatewaySecurityPoliciesRequest.serialize, - response_deserializer=gateway_security_policy.ListGatewaySecurityPoliciesResponse.deserialize, + self._stubs["list_gateway_security_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListGatewaySecurityPolicies", + request_serializer=gateway_security_policy.ListGatewaySecurityPoliciesRequest.serialize, + response_deserializer=gateway_security_policy.ListGatewaySecurityPoliciesResponse.deserialize, + ) ) return self._stubs["list_gateway_security_policies"] @@ -1039,12 +1043,12 @@ def get_gateway_security_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_gateway_security_policy" not in self._stubs: - self._stubs[ - "get_gateway_security_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/GetGatewaySecurityPolicy", - request_serializer=gateway_security_policy.GetGatewaySecurityPolicyRequest.serialize, - response_deserializer=gateway_security_policy.GatewaySecurityPolicy.deserialize, + self._stubs["get_gateway_security_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/GetGatewaySecurityPolicy", + request_serializer=gateway_security_policy.GetGatewaySecurityPolicyRequest.serialize, + response_deserializer=gateway_security_policy.GatewaySecurityPolicy.deserialize, + ) ) return self._stubs["get_gateway_security_policy"] @@ -1071,12 +1075,12 @@ def create_gateway_security_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_gateway_security_policy" not in self._stubs: - self._stubs[ - "create_gateway_security_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateGatewaySecurityPolicy", - request_serializer=gcn_gateway_security_policy.CreateGatewaySecurityPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_gateway_security_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateGatewaySecurityPolicy", + request_serializer=gcn_gateway_security_policy.CreateGatewaySecurityPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_gateway_security_policy"] @@ -1103,12 +1107,12 @@ def update_gateway_security_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_gateway_security_policy" not in self._stubs: - self._stubs[ - "update_gateway_security_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateGatewaySecurityPolicy", - request_serializer=gcn_gateway_security_policy.UpdateGatewaySecurityPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_gateway_security_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateGatewaySecurityPolicy", + request_serializer=gcn_gateway_security_policy.UpdateGatewaySecurityPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_gateway_security_policy"] @@ -1134,12 +1138,12 @@ def delete_gateway_security_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_gateway_security_policy" not in self._stubs: - self._stubs[ - "delete_gateway_security_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteGatewaySecurityPolicy", - request_serializer=gateway_security_policy.DeleteGatewaySecurityPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_gateway_security_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteGatewaySecurityPolicy", + request_serializer=gateway_security_policy.DeleteGatewaySecurityPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_gateway_security_policy"] @@ -1167,12 +1171,12 @@ def list_gateway_security_policy_rules( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_gateway_security_policy_rules" not in self._stubs: - self._stubs[ - "list_gateway_security_policy_rules" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListGatewaySecurityPolicyRules", - request_serializer=gateway_security_policy_rule.ListGatewaySecurityPolicyRulesRequest.serialize, - response_deserializer=gateway_security_policy_rule.ListGatewaySecurityPolicyRulesResponse.deserialize, + self._stubs["list_gateway_security_policy_rules"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListGatewaySecurityPolicyRules", + request_serializer=gateway_security_policy_rule.ListGatewaySecurityPolicyRulesRequest.serialize, + response_deserializer=gateway_security_policy_rule.ListGatewaySecurityPolicyRulesResponse.deserialize, + ) ) return self._stubs["list_gateway_security_policy_rules"] @@ -1199,12 +1203,12 @@ def get_gateway_security_policy_rule( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_gateway_security_policy_rule" not in self._stubs: - self._stubs[ - "get_gateway_security_policy_rule" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/GetGatewaySecurityPolicyRule", - request_serializer=gateway_security_policy_rule.GetGatewaySecurityPolicyRuleRequest.serialize, - response_deserializer=gateway_security_policy_rule.GatewaySecurityPolicyRule.deserialize, + self._stubs["get_gateway_security_policy_rule"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/GetGatewaySecurityPolicyRule", + request_serializer=gateway_security_policy_rule.GetGatewaySecurityPolicyRuleRequest.serialize, + response_deserializer=gateway_security_policy_rule.GatewaySecurityPolicyRule.deserialize, + ) ) return self._stubs["get_gateway_security_policy_rule"] @@ -1232,12 +1236,12 @@ def create_gateway_security_policy_rule( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_gateway_security_policy_rule" not in self._stubs: - self._stubs[ - "create_gateway_security_policy_rule" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateGatewaySecurityPolicyRule", - request_serializer=gcn_gateway_security_policy_rule.CreateGatewaySecurityPolicyRuleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_gateway_security_policy_rule"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateGatewaySecurityPolicyRule", + request_serializer=gcn_gateway_security_policy_rule.CreateGatewaySecurityPolicyRuleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_gateway_security_policy_rule"] @@ -1265,12 +1269,12 @@ def update_gateway_security_policy_rule( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_gateway_security_policy_rule" not in self._stubs: - self._stubs[ - "update_gateway_security_policy_rule" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateGatewaySecurityPolicyRule", - request_serializer=gcn_gateway_security_policy_rule.UpdateGatewaySecurityPolicyRuleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_gateway_security_policy_rule"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateGatewaySecurityPolicyRule", + request_serializer=gcn_gateway_security_policy_rule.UpdateGatewaySecurityPolicyRuleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_gateway_security_policy_rule"] @@ -1297,12 +1301,12 @@ def delete_gateway_security_policy_rule( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_gateway_security_policy_rule" not in self._stubs: - self._stubs[ - "delete_gateway_security_policy_rule" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteGatewaySecurityPolicyRule", - request_serializer=gateway_security_policy_rule.DeleteGatewaySecurityPolicyRuleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_gateway_security_policy_rule"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteGatewaySecurityPolicyRule", + request_serializer=gateway_security_policy_rule.DeleteGatewaySecurityPolicyRuleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_gateway_security_policy_rule"] @@ -1458,12 +1462,12 @@ def list_tls_inspection_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_tls_inspection_policies" not in self._stubs: - self._stubs[ - "list_tls_inspection_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListTlsInspectionPolicies", - request_serializer=tls_inspection_policy.ListTlsInspectionPoliciesRequest.serialize, - response_deserializer=tls_inspection_policy.ListTlsInspectionPoliciesResponse.deserialize, + self._stubs["list_tls_inspection_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListTlsInspectionPolicies", + request_serializer=tls_inspection_policy.ListTlsInspectionPoliciesRequest.serialize, + response_deserializer=tls_inspection_policy.ListTlsInspectionPoliciesResponse.deserialize, + ) ) return self._stubs["list_tls_inspection_policies"] @@ -1519,12 +1523,12 @@ def create_tls_inspection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_tls_inspection_policy" not in self._stubs: - self._stubs[ - "create_tls_inspection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateTlsInspectionPolicy", - request_serializer=gcn_tls_inspection_policy.CreateTlsInspectionPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_tls_inspection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateTlsInspectionPolicy", + request_serializer=gcn_tls_inspection_policy.CreateTlsInspectionPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_tls_inspection_policy"] @@ -1551,12 +1555,12 @@ def update_tls_inspection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_tls_inspection_policy" not in self._stubs: - self._stubs[ - "update_tls_inspection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateTlsInspectionPolicy", - request_serializer=gcn_tls_inspection_policy.UpdateTlsInspectionPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_tls_inspection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateTlsInspectionPolicy", + request_serializer=gcn_tls_inspection_policy.UpdateTlsInspectionPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_tls_inspection_policy"] @@ -1582,12 +1586,12 @@ def delete_tls_inspection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_tls_inspection_policy" not in self._stubs: - self._stubs[ - "delete_tls_inspection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteTlsInspectionPolicy", - request_serializer=tls_inspection_policy.DeleteTlsInspectionPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_tls_inspection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteTlsInspectionPolicy", + request_serializer=tls_inspection_policy.DeleteTlsInspectionPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_tls_inspection_policy"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/grpc_asyncio.py index 19d329546621..e7ef25d2aa6b 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/grpc_asyncio.py @@ -17,42 +17,52 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.network_security_v1alpha1.types import ( + authorization_policy, + authz_policy, + backend_authentication_config, + client_tls_policy, + gateway_security_policy, + gateway_security_policy_rule, + server_tls_policy, + tls_inspection_policy, + url_list, +) from google.cloud.network_security_v1alpha1.types import ( authorization_policy as gcn_authorization_policy, ) from google.cloud.network_security_v1alpha1.types import ( authz_policy as gcn_authz_policy, ) -from google.cloud.network_security_v1alpha1.types import backend_authentication_config from google.cloud.network_security_v1alpha1.types import ( backend_authentication_config as gcn_backend_authentication_config, ) from google.cloud.network_security_v1alpha1.types import ( client_tls_policy as gcn_client_tls_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy as gcn_gateway_security_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy_rule from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy_rule as gcn_gateway_security_policy_rule, ) @@ -63,12 +73,6 @@ tls_inspection_policy as gcn_tls_inspection_policy, ) from google.cloud.network_security_v1alpha1.types import url_list as gcn_url_list -from google.cloud.network_security_v1alpha1.types import authorization_policy -from google.cloud.network_security_v1alpha1.types import authz_policy -from google.cloud.network_security_v1alpha1.types import client_tls_policy -from google.cloud.network_security_v1alpha1.types import server_tls_policy -from google.cloud.network_security_v1alpha1.types import tls_inspection_policy -from google.cloud.network_security_v1alpha1.types import url_list from .base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport from .grpc import NetworkSecurityGrpcTransport @@ -408,12 +412,12 @@ def list_authorization_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_authorization_policies" not in self._stubs: - self._stubs[ - "list_authorization_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListAuthorizationPolicies", - request_serializer=authorization_policy.ListAuthorizationPoliciesRequest.serialize, - response_deserializer=authorization_policy.ListAuthorizationPoliciesResponse.deserialize, + self._stubs["list_authorization_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListAuthorizationPolicies", + request_serializer=authorization_policy.ListAuthorizationPoliciesRequest.serialize, + response_deserializer=authorization_policy.ListAuthorizationPoliciesResponse.deserialize, + ) ) return self._stubs["list_authorization_policies"] @@ -469,12 +473,12 @@ def create_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_authorization_policy" not in self._stubs: - self._stubs[ - "create_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateAuthorizationPolicy", - request_serializer=gcn_authorization_policy.CreateAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateAuthorizationPolicy", + request_serializer=gcn_authorization_policy.CreateAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_authorization_policy"] @@ -501,12 +505,12 @@ def update_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_authorization_policy" not in self._stubs: - self._stubs[ - "update_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateAuthorizationPolicy", - request_serializer=gcn_authorization_policy.UpdateAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateAuthorizationPolicy", + request_serializer=gcn_authorization_policy.UpdateAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_authorization_policy"] @@ -532,12 +536,12 @@ def delete_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_authorization_policy" not in self._stubs: - self._stubs[ - "delete_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteAuthorizationPolicy", - request_serializer=authorization_policy.DeleteAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteAuthorizationPolicy", + request_serializer=authorization_policy.DeleteAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_authorization_policy"] @@ -567,12 +571,12 @@ def list_backend_authentication_configs( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_backend_authentication_configs" not in self._stubs: - self._stubs[ - "list_backend_authentication_configs" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListBackendAuthenticationConfigs", - request_serializer=backend_authentication_config.ListBackendAuthenticationConfigsRequest.serialize, - response_deserializer=backend_authentication_config.ListBackendAuthenticationConfigsResponse.deserialize, + self._stubs["list_backend_authentication_configs"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListBackendAuthenticationConfigs", + request_serializer=backend_authentication_config.ListBackendAuthenticationConfigsRequest.serialize, + response_deserializer=backend_authentication_config.ListBackendAuthenticationConfigsResponse.deserialize, + ) ) return self._stubs["list_backend_authentication_configs"] @@ -600,12 +604,12 @@ def get_backend_authentication_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_backend_authentication_config" not in self._stubs: - self._stubs[ - "get_backend_authentication_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/GetBackendAuthenticationConfig", - request_serializer=backend_authentication_config.GetBackendAuthenticationConfigRequest.serialize, - response_deserializer=backend_authentication_config.BackendAuthenticationConfig.deserialize, + self._stubs["get_backend_authentication_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/GetBackendAuthenticationConfig", + request_serializer=backend_authentication_config.GetBackendAuthenticationConfigRequest.serialize, + response_deserializer=backend_authentication_config.BackendAuthenticationConfig.deserialize, + ) ) return self._stubs["get_backend_authentication_config"] @@ -633,12 +637,12 @@ def create_backend_authentication_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_backend_authentication_config" not in self._stubs: - self._stubs[ - "create_backend_authentication_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateBackendAuthenticationConfig", - request_serializer=gcn_backend_authentication_config.CreateBackendAuthenticationConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_backend_authentication_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateBackendAuthenticationConfig", + request_serializer=gcn_backend_authentication_config.CreateBackendAuthenticationConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_backend_authentication_config"] @@ -667,12 +671,12 @@ def update_backend_authentication_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_backend_authentication_config" not in self._stubs: - self._stubs[ - "update_backend_authentication_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateBackendAuthenticationConfig", - request_serializer=gcn_backend_authentication_config.UpdateBackendAuthenticationConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_backend_authentication_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateBackendAuthenticationConfig", + request_serializer=gcn_backend_authentication_config.UpdateBackendAuthenticationConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_backend_authentication_config"] @@ -700,12 +704,12 @@ def delete_backend_authentication_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_backend_authentication_config" not in self._stubs: - self._stubs[ - "delete_backend_authentication_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteBackendAuthenticationConfig", - request_serializer=backend_authentication_config.DeleteBackendAuthenticationConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_backend_authentication_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteBackendAuthenticationConfig", + request_serializer=backend_authentication_config.DeleteBackendAuthenticationConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_backend_authentication_config"] @@ -1026,12 +1030,12 @@ def list_gateway_security_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_gateway_security_policies" not in self._stubs: - self._stubs[ - "list_gateway_security_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListGatewaySecurityPolicies", - request_serializer=gateway_security_policy.ListGatewaySecurityPoliciesRequest.serialize, - response_deserializer=gateway_security_policy.ListGatewaySecurityPoliciesResponse.deserialize, + self._stubs["list_gateway_security_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListGatewaySecurityPolicies", + request_serializer=gateway_security_policy.ListGatewaySecurityPoliciesRequest.serialize, + response_deserializer=gateway_security_policy.ListGatewaySecurityPoliciesResponse.deserialize, + ) ) return self._stubs["list_gateway_security_policies"] @@ -1057,12 +1061,12 @@ def get_gateway_security_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_gateway_security_policy" not in self._stubs: - self._stubs[ - "get_gateway_security_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/GetGatewaySecurityPolicy", - request_serializer=gateway_security_policy.GetGatewaySecurityPolicyRequest.serialize, - response_deserializer=gateway_security_policy.GatewaySecurityPolicy.deserialize, + self._stubs["get_gateway_security_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/GetGatewaySecurityPolicy", + request_serializer=gateway_security_policy.GetGatewaySecurityPolicyRequest.serialize, + response_deserializer=gateway_security_policy.GatewaySecurityPolicy.deserialize, + ) ) return self._stubs["get_gateway_security_policy"] @@ -1089,12 +1093,12 @@ def create_gateway_security_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_gateway_security_policy" not in self._stubs: - self._stubs[ - "create_gateway_security_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateGatewaySecurityPolicy", - request_serializer=gcn_gateway_security_policy.CreateGatewaySecurityPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_gateway_security_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateGatewaySecurityPolicy", + request_serializer=gcn_gateway_security_policy.CreateGatewaySecurityPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_gateway_security_policy"] @@ -1121,12 +1125,12 @@ def update_gateway_security_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_gateway_security_policy" not in self._stubs: - self._stubs[ - "update_gateway_security_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateGatewaySecurityPolicy", - request_serializer=gcn_gateway_security_policy.UpdateGatewaySecurityPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_gateway_security_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateGatewaySecurityPolicy", + request_serializer=gcn_gateway_security_policy.UpdateGatewaySecurityPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_gateway_security_policy"] @@ -1152,12 +1156,12 @@ def delete_gateway_security_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_gateway_security_policy" not in self._stubs: - self._stubs[ - "delete_gateway_security_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteGatewaySecurityPolicy", - request_serializer=gateway_security_policy.DeleteGatewaySecurityPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_gateway_security_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteGatewaySecurityPolicy", + request_serializer=gateway_security_policy.DeleteGatewaySecurityPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_gateway_security_policy"] @@ -1185,12 +1189,12 @@ def list_gateway_security_policy_rules( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_gateway_security_policy_rules" not in self._stubs: - self._stubs[ - "list_gateway_security_policy_rules" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListGatewaySecurityPolicyRules", - request_serializer=gateway_security_policy_rule.ListGatewaySecurityPolicyRulesRequest.serialize, - response_deserializer=gateway_security_policy_rule.ListGatewaySecurityPolicyRulesResponse.deserialize, + self._stubs["list_gateway_security_policy_rules"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListGatewaySecurityPolicyRules", + request_serializer=gateway_security_policy_rule.ListGatewaySecurityPolicyRulesRequest.serialize, + response_deserializer=gateway_security_policy_rule.ListGatewaySecurityPolicyRulesResponse.deserialize, + ) ) return self._stubs["list_gateway_security_policy_rules"] @@ -1217,12 +1221,12 @@ def get_gateway_security_policy_rule( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_gateway_security_policy_rule" not in self._stubs: - self._stubs[ - "get_gateway_security_policy_rule" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/GetGatewaySecurityPolicyRule", - request_serializer=gateway_security_policy_rule.GetGatewaySecurityPolicyRuleRequest.serialize, - response_deserializer=gateway_security_policy_rule.GatewaySecurityPolicyRule.deserialize, + self._stubs["get_gateway_security_policy_rule"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/GetGatewaySecurityPolicyRule", + request_serializer=gateway_security_policy_rule.GetGatewaySecurityPolicyRuleRequest.serialize, + response_deserializer=gateway_security_policy_rule.GatewaySecurityPolicyRule.deserialize, + ) ) return self._stubs["get_gateway_security_policy_rule"] @@ -1250,12 +1254,12 @@ def create_gateway_security_policy_rule( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_gateway_security_policy_rule" not in self._stubs: - self._stubs[ - "create_gateway_security_policy_rule" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateGatewaySecurityPolicyRule", - request_serializer=gcn_gateway_security_policy_rule.CreateGatewaySecurityPolicyRuleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_gateway_security_policy_rule"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateGatewaySecurityPolicyRule", + request_serializer=gcn_gateway_security_policy_rule.CreateGatewaySecurityPolicyRuleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_gateway_security_policy_rule"] @@ -1283,12 +1287,12 @@ def update_gateway_security_policy_rule( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_gateway_security_policy_rule" not in self._stubs: - self._stubs[ - "update_gateway_security_policy_rule" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateGatewaySecurityPolicyRule", - request_serializer=gcn_gateway_security_policy_rule.UpdateGatewaySecurityPolicyRuleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_gateway_security_policy_rule"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateGatewaySecurityPolicyRule", + request_serializer=gcn_gateway_security_policy_rule.UpdateGatewaySecurityPolicyRuleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_gateway_security_policy_rule"] @@ -1315,12 +1319,12 @@ def delete_gateway_security_policy_rule( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_gateway_security_policy_rule" not in self._stubs: - self._stubs[ - "delete_gateway_security_policy_rule" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteGatewaySecurityPolicyRule", - request_serializer=gateway_security_policy_rule.DeleteGatewaySecurityPolicyRuleRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_gateway_security_policy_rule"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteGatewaySecurityPolicyRule", + request_serializer=gateway_security_policy_rule.DeleteGatewaySecurityPolicyRuleRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_gateway_security_policy_rule"] @@ -1484,12 +1488,12 @@ def list_tls_inspection_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_tls_inspection_policies" not in self._stubs: - self._stubs[ - "list_tls_inspection_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListTlsInspectionPolicies", - request_serializer=tls_inspection_policy.ListTlsInspectionPoliciesRequest.serialize, - response_deserializer=tls_inspection_policy.ListTlsInspectionPoliciesResponse.deserialize, + self._stubs["list_tls_inspection_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/ListTlsInspectionPolicies", + request_serializer=tls_inspection_policy.ListTlsInspectionPoliciesRequest.serialize, + response_deserializer=tls_inspection_policy.ListTlsInspectionPoliciesResponse.deserialize, + ) ) return self._stubs["list_tls_inspection_policies"] @@ -1545,12 +1549,12 @@ def create_tls_inspection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_tls_inspection_policy" not in self._stubs: - self._stubs[ - "create_tls_inspection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateTlsInspectionPolicy", - request_serializer=gcn_tls_inspection_policy.CreateTlsInspectionPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_tls_inspection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/CreateTlsInspectionPolicy", + request_serializer=gcn_tls_inspection_policy.CreateTlsInspectionPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_tls_inspection_policy"] @@ -1577,12 +1581,12 @@ def update_tls_inspection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_tls_inspection_policy" not in self._stubs: - self._stubs[ - "update_tls_inspection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateTlsInspectionPolicy", - request_serializer=gcn_tls_inspection_policy.UpdateTlsInspectionPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_tls_inspection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/UpdateTlsInspectionPolicy", + request_serializer=gcn_tls_inspection_policy.UpdateTlsInspectionPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_tls_inspection_policy"] @@ -1608,12 +1612,12 @@ def delete_tls_inspection_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_tls_inspection_policy" not in self._stubs: - self._stubs[ - "delete_tls_inspection_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteTlsInspectionPolicy", - request_serializer=tls_inspection_policy.DeleteTlsInspectionPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_tls_inspection_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.NetworkSecurity/DeleteTlsInspectionPolicy", + request_serializer=tls_inspection_policy.DeleteTlsInspectionPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_tls_inspection_policy"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/rest.py index cc7806d9d748..929778a7006b 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/rest.py @@ -16,40 +16,50 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.network_security_v1alpha1.types import ( + authorization_policy, + authz_policy, + backend_authentication_config, + client_tls_policy, + gateway_security_policy, + gateway_security_policy_rule, + server_tls_policy, + tls_inspection_policy, + url_list, +) from google.cloud.network_security_v1alpha1.types import ( authorization_policy as gcn_authorization_policy, ) from google.cloud.network_security_v1alpha1.types import ( authz_policy as gcn_authz_policy, ) -from google.cloud.network_security_v1alpha1.types import backend_authentication_config from google.cloud.network_security_v1alpha1.types import ( backend_authentication_config as gcn_backend_authentication_config, ) from google.cloud.network_security_v1alpha1.types import ( client_tls_policy as gcn_client_tls_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy as gcn_gateway_security_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy_rule from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy_rule as gcn_gateway_security_policy_rule, ) @@ -60,12 +70,6 @@ tls_inspection_policy as gcn_tls_inspection_policy, ) from google.cloud.network_security_v1alpha1.types import url_list as gcn_url_list -from google.cloud.network_security_v1alpha1.types import authorization_policy -from google.cloud.network_security_v1alpha1.types import authz_policy -from google.cloud.network_security_v1alpha1.types import client_tls_policy -from google.cloud.network_security_v1alpha1.types import server_tls_policy -from google.cloud.network_security_v1alpha1.types import tls_inspection_policy -from google.cloud.network_security_v1alpha1.types import url_list from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseNetworkSecurityRestTransport @@ -3148,9 +3152,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateAuthorizationPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateAuthorizationPolicy._get_http_options() request, metadata = self._interceptor.pre_create_authorization_policy( request, metadata @@ -3176,7 +3178,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3304,9 +3306,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateAuthzPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateAuthzPolicy._get_http_options() request, metadata = self._interceptor.pre_create_authz_policy( request, metadata @@ -3332,7 +3332,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3463,15 +3463,12 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateBackendAuthenticationConfig._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateBackendAuthenticationConfig._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_backend_authentication_config( - request, metadata + request, metadata = ( + self._interceptor.pre_create_backend_authentication_config( + request, metadata + ) ) transcoded_request = _BaseNetworkSecurityRestTransport._BaseCreateBackendAuthenticationConfig._get_transcoded_request( http_options, request @@ -3494,7 +3491,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3535,11 +3532,10 @@ def __call__( resp = self._interceptor.post_create_backend_authentication_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_backend_authentication_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_backend_authentication_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3624,9 +3620,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateClientTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateClientTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_create_client_tls_policy( request, metadata @@ -3652,7 +3646,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3782,9 +3776,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateGatewaySecurityPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateGatewaySecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_create_gateway_security_policy( request, metadata @@ -3810,7 +3802,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3853,11 +3845,10 @@ def __call__( resp = self._interceptor.post_create_gateway_security_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_gateway_security_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_gateway_security_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3945,15 +3936,12 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateGatewaySecurityPolicyRule._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateGatewaySecurityPolicyRule._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_gateway_security_policy_rule( - request, metadata + request, metadata = ( + self._interceptor.pre_create_gateway_security_policy_rule( + request, metadata + ) ) transcoded_request = _BaseNetworkSecurityRestTransport._BaseCreateGatewaySecurityPolicyRule._get_transcoded_request( http_options, request @@ -3976,7 +3964,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4017,11 +4005,10 @@ def __call__( resp = self._interceptor.post_create_gateway_security_policy_rule(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_gateway_security_policy_rule_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_gateway_security_policy_rule_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4106,9 +4093,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateServerTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateServerTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_create_server_tls_policy( request, metadata @@ -4134,7 +4119,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4264,9 +4249,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateTlsInspectionPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateTlsInspectionPolicy._get_http_options() request, metadata = self._interceptor.pre_create_tls_inspection_policy( request, metadata @@ -4292,7 +4275,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4446,7 +4429,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4573,9 +4556,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteAuthorizationPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteAuthorizationPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_authorization_policy( request, metadata @@ -4597,7 +4578,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4723,9 +4704,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteAuthzPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteAuthzPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_authz_policy( request, metadata @@ -4747,7 +4726,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4876,15 +4855,12 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteBackendAuthenticationConfig._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteBackendAuthenticationConfig._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_backend_authentication_config( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_backend_authentication_config( + request, metadata + ) ) transcoded_request = _BaseNetworkSecurityRestTransport._BaseDeleteBackendAuthenticationConfig._get_transcoded_request( http_options, request @@ -4903,7 +4879,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4943,11 +4919,10 @@ def __call__( resp = self._interceptor.post_delete_backend_authentication_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_backend_authentication_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_backend_authentication_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5031,9 +5006,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteClientTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteClientTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_client_tls_policy( request, metadata @@ -5055,7 +5028,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5183,9 +5156,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteGatewaySecurityPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteGatewaySecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_gateway_security_policy( request, metadata @@ -5207,7 +5178,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5249,11 +5220,10 @@ def __call__( resp = self._interceptor.post_delete_gateway_security_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_gateway_security_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_gateway_security_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5338,15 +5308,12 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteGatewaySecurityPolicyRule._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteGatewaySecurityPolicyRule._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_gateway_security_policy_rule( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_gateway_security_policy_rule( + request, metadata + ) ) transcoded_request = _BaseNetworkSecurityRestTransport._BaseDeleteGatewaySecurityPolicyRule._get_transcoded_request( http_options, request @@ -5365,7 +5332,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5405,11 +5372,10 @@ def __call__( resp = self._interceptor.post_delete_gateway_security_policy_rule(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_gateway_security_policy_rule_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_gateway_security_policy_rule_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5493,9 +5459,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteServerTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteServerTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_server_tls_policy( request, metadata @@ -5517,7 +5481,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5645,9 +5609,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteTlsInspectionPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteTlsInspectionPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_tls_inspection_policy( request, metadata @@ -5669,7 +5631,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5817,7 +5779,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5946,9 +5908,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetAuthorizationPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetAuthorizationPolicy._get_http_options() request, metadata = self._interceptor.pre_get_authorization_policy( request, metadata @@ -6099,9 +6059,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetAuthzPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetAuthzPolicy._get_http_options() request, metadata = self._interceptor.pre_get_authz_policy( request, metadata @@ -6267,9 +6225,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetBackendAuthenticationConfig._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetBackendAuthenticationConfig._get_http_options() request, metadata = self._interceptor.pre_get_backend_authentication_config( request, metadata @@ -6333,11 +6289,10 @@ def __call__( resp = self._interceptor.post_get_backend_authentication_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_backend_authentication_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_backend_authentication_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6426,9 +6381,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetClientTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetClientTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_get_client_tls_policy( request, metadata @@ -6581,9 +6534,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetGatewaySecurityPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetGatewaySecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_get_gateway_security_policy( request, metadata @@ -6739,9 +6690,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetGatewaySecurityPolicyRule._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetGatewaySecurityPolicyRule._get_http_options() request, metadata = self._interceptor.pre_get_gateway_security_policy_rule( request, metadata @@ -6805,11 +6754,10 @@ def __call__( resp = self._interceptor.post_get_gateway_security_policy_rule(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_gateway_security_policy_rule_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_gateway_security_policy_rule_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6908,9 +6856,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetServerTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetServerTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_get_server_tls_policy( request, metadata @@ -7062,9 +7008,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetTlsInspectionPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetTlsInspectionPolicy._get_http_options() request, metadata = self._interceptor.pre_get_tls_inspection_policy( request, metadata @@ -7366,9 +7310,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListAuthorizationPolicies._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListAuthorizationPolicies._get_http_options() request, metadata = self._interceptor.pre_list_authorization_policies( request, metadata @@ -7522,9 +7464,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListAuthzPolicies._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListAuthzPolicies._get_http_options() request, metadata = self._interceptor.pre_list_authz_policies( request, metadata @@ -7675,15 +7615,12 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListBackendAuthenticationConfigs._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListBackendAuthenticationConfigs._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_backend_authentication_configs( - request, metadata + request, metadata = ( + self._interceptor.pre_list_backend_authentication_configs( + request, metadata + ) ) transcoded_request = _BaseNetworkSecurityRestTransport._BaseListBackendAuthenticationConfigs._get_transcoded_request( http_options, request @@ -7748,11 +7685,10 @@ def __call__( resp = self._interceptor.post_list_backend_authentication_configs(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_backend_authentication_configs_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_backend_authentication_configs_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -7837,9 +7773,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListClientTlsPolicies._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListClientTlsPolicies._get_http_options() request, metadata = self._interceptor.pre_list_client_tls_policies( request, metadata @@ -7994,9 +7928,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListGatewaySecurityPolicies._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListGatewaySecurityPolicies._get_http_options() request, metadata = self._interceptor.pre_list_gateway_security_policies( request, metadata @@ -8064,11 +7996,10 @@ def __call__( resp = self._interceptor.post_list_gateway_security_policies(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_gateway_security_policies_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_gateway_security_policies_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8154,15 +8085,12 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListGatewaySecurityPolicyRules._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListGatewaySecurityPolicyRules._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_gateway_security_policy_rules( - request, metadata + request, metadata = ( + self._interceptor.pre_list_gateway_security_policy_rules( + request, metadata + ) ) transcoded_request = _BaseNetworkSecurityRestTransport._BaseListGatewaySecurityPolicyRules._get_transcoded_request( http_options, request @@ -8227,11 +8155,10 @@ def __call__( resp = self._interceptor.post_list_gateway_security_policy_rules(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_gateway_security_policy_rules_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_gateway_security_policy_rules_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8316,9 +8243,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListServerTlsPolicies._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListServerTlsPolicies._get_http_options() request, metadata = self._interceptor.pre_list_server_tls_policies( request, metadata @@ -8473,9 +8398,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListTlsInspectionPolicies._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListTlsInspectionPolicies._get_http_options() request, metadata = self._interceptor.pre_list_tls_inspection_policies( request, metadata @@ -8779,9 +8702,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateAuthorizationPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateAuthorizationPolicy._get_http_options() request, metadata = self._interceptor.pre_update_authorization_policy( request, metadata @@ -8807,7 +8728,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -8935,9 +8856,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateAuthzPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateAuthzPolicy._get_http_options() request, metadata = self._interceptor.pre_update_authz_policy( request, metadata @@ -8963,7 +8882,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9094,15 +9013,12 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateBackendAuthenticationConfig._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateBackendAuthenticationConfig._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_backend_authentication_config( - request, metadata + request, metadata = ( + self._interceptor.pre_update_backend_authentication_config( + request, metadata + ) ) transcoded_request = _BaseNetworkSecurityRestTransport._BaseUpdateBackendAuthenticationConfig._get_transcoded_request( http_options, request @@ -9125,7 +9041,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9166,11 +9082,10 @@ def __call__( resp = self._interceptor.post_update_backend_authentication_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_backend_authentication_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_backend_authentication_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9255,9 +9170,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateClientTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateClientTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_update_client_tls_policy( request, metadata @@ -9283,7 +9196,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9413,9 +9326,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateGatewaySecurityPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateGatewaySecurityPolicy._get_http_options() request, metadata = self._interceptor.pre_update_gateway_security_policy( request, metadata @@ -9441,7 +9352,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9484,11 +9395,10 @@ def __call__( resp = self._interceptor.post_update_gateway_security_policy(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_gateway_security_policy_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_gateway_security_policy_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9574,15 +9484,12 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateGatewaySecurityPolicyRule._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateGatewaySecurityPolicyRule._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_gateway_security_policy_rule( - request, metadata + request, metadata = ( + self._interceptor.pre_update_gateway_security_policy_rule( + request, metadata + ) ) transcoded_request = _BaseNetworkSecurityRestTransport._BaseUpdateGatewaySecurityPolicyRule._get_transcoded_request( http_options, request @@ -9605,7 +9512,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9646,11 +9553,10 @@ def __call__( resp = self._interceptor.post_update_gateway_security_policy_rule(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_gateway_security_policy_rule_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_gateway_security_policy_rule_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9735,9 +9641,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateServerTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateServerTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_update_server_tls_policy( request, metadata @@ -9763,7 +9667,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -9893,9 +9797,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateTlsInspectionPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateTlsInspectionPolicy._get_http_options() request, metadata = self._interceptor.pre_update_tls_inspection_policy( request, metadata @@ -9921,7 +9823,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -10074,7 +9976,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -10150,7 +10052,9 @@ def create_authorization_policy( ]: # 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._CreateAuthorizationPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._CreateAuthorizationPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_authz_policy( @@ -10171,7 +10075,9 @@ def create_backend_authentication_config( ]: # 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._CreateBackendAuthenticationConfig(self._session, self._host, self._interceptor) # type: ignore + return self._CreateBackendAuthenticationConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_client_tls_policy( @@ -10192,7 +10098,9 @@ def create_gateway_security_policy( ]: # 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._CreateGatewaySecurityPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._CreateGatewaySecurityPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_gateway_security_policy_rule( @@ -10203,7 +10111,9 @@ def create_gateway_security_policy_rule( ]: # 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._CreateGatewaySecurityPolicyRule(self._session, self._host, self._interceptor) # type: ignore + return self._CreateGatewaySecurityPolicyRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_server_tls_policy( @@ -10224,7 +10134,9 @@ def create_tls_inspection_policy( ]: # 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._CreateTlsInspectionPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._CreateTlsInspectionPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_url_list( @@ -10243,7 +10155,9 @@ def delete_authorization_policy( ]: # 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._DeleteAuthorizationPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAuthorizationPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_authz_policy( @@ -10262,7 +10176,9 @@ def delete_backend_authentication_config( ]: # 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._DeleteBackendAuthenticationConfig(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteBackendAuthenticationConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_client_tls_policy( @@ -10283,7 +10199,9 @@ def delete_gateway_security_policy( ]: # 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._DeleteGatewaySecurityPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteGatewaySecurityPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_gateway_security_policy_rule( @@ -10294,7 +10212,9 @@ def delete_gateway_security_policy_rule( ]: # 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._DeleteGatewaySecurityPolicyRule(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteGatewaySecurityPolicyRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_server_tls_policy( @@ -10315,7 +10235,9 @@ def delete_tls_inspection_policy( ]: # 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._DeleteTlsInspectionPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteTlsInspectionPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_url_list( @@ -10334,7 +10256,9 @@ def get_authorization_policy( ]: # 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._GetAuthorizationPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._GetAuthorizationPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_authz_policy( @@ -10353,7 +10277,9 @@ def get_backend_authentication_config( ]: # 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._GetBackendAuthenticationConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetBackendAuthenticationConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_client_tls_policy( @@ -10374,7 +10300,9 @@ def get_gateway_security_policy( ]: # 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._GetGatewaySecurityPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._GetGatewaySecurityPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_gateway_security_policy_rule( @@ -10385,7 +10313,9 @@ def get_gateway_security_policy_rule( ]: # 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._GetGatewaySecurityPolicyRule(self._session, self._host, self._interceptor) # type: ignore + return self._GetGatewaySecurityPolicyRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_server_tls_policy( @@ -10406,7 +10336,9 @@ def get_tls_inspection_policy( ]: # 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._GetTlsInspectionPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._GetTlsInspectionPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_url_list(self) -> Callable[[url_list.GetUrlListRequest], url_list.UrlList]: @@ -10423,7 +10355,9 @@ def list_authorization_policies( ]: # 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._ListAuthorizationPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._ListAuthorizationPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_authz_policies( @@ -10444,7 +10378,9 @@ def list_backend_authentication_configs( ]: # 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._ListBackendAuthenticationConfigs(self._session, self._host, self._interceptor) # type: ignore + return self._ListBackendAuthenticationConfigs( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_client_tls_policies( @@ -10466,7 +10402,9 @@ def list_gateway_security_policies( ]: # 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._ListGatewaySecurityPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._ListGatewaySecurityPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_gateway_security_policy_rules( @@ -10477,7 +10415,9 @@ def list_gateway_security_policy_rules( ]: # 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._ListGatewaySecurityPolicyRules(self._session, self._host, self._interceptor) # type: ignore + return self._ListGatewaySecurityPolicyRules( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_server_tls_policies( @@ -10499,7 +10439,9 @@ def list_tls_inspection_policies( ]: # 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._ListTlsInspectionPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._ListTlsInspectionPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_url_lists( @@ -10518,7 +10460,9 @@ def update_authorization_policy( ]: # 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._UpdateAuthorizationPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAuthorizationPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_authz_policy( @@ -10539,7 +10483,9 @@ def update_backend_authentication_config( ]: # 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._UpdateBackendAuthenticationConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateBackendAuthenticationConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_client_tls_policy( @@ -10560,7 +10506,9 @@ def update_gateway_security_policy( ]: # 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._UpdateGatewaySecurityPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateGatewaySecurityPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_gateway_security_policy_rule( @@ -10571,7 +10519,9 @@ def update_gateway_security_policy_rule( ]: # 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._UpdateGatewaySecurityPolicyRule(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateGatewaySecurityPolicyRule( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_server_tls_policy( @@ -10592,7 +10542,9 @@ def update_tls_inspection_policy( ]: # 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._UpdateTlsInspectionPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateTlsInspectionPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_url_list( @@ -11227,9 +11179,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -11372,9 +11322,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -11491,9 +11439,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -11748,9 +11694,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseNetworkSecurityRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/rest_base.py index 3b50cfa7b838..109e8678314b 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/network_security/transports/rest_base.py @@ -19,29 +19,39 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.network_security_v1alpha1.types import ( + authorization_policy, + authz_policy, + backend_authentication_config, + client_tls_policy, + gateway_security_policy, + gateway_security_policy_rule, + server_tls_policy, + tls_inspection_policy, + url_list, +) from google.cloud.network_security_v1alpha1.types import ( authorization_policy as gcn_authorization_policy, ) from google.cloud.network_security_v1alpha1.types import ( authz_policy as gcn_authz_policy, ) -from google.cloud.network_security_v1alpha1.types import backend_authentication_config from google.cloud.network_security_v1alpha1.types import ( backend_authentication_config as gcn_backend_authentication_config, ) from google.cloud.network_security_v1alpha1.types import ( client_tls_policy as gcn_client_tls_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy as gcn_gateway_security_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy_rule from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy_rule as gcn_gateway_security_policy_rule, ) @@ -52,12 +62,6 @@ tls_inspection_policy as gcn_tls_inspection_policy, ) from google.cloud.network_security_v1alpha1.types import url_list as gcn_url_list -from google.cloud.network_security_v1alpha1.types import authorization_policy -from google.cloud.network_security_v1alpha1.types import authz_policy -from google.cloud.network_security_v1alpha1.types import client_tls_policy -from google.cloud.network_security_v1alpha1.types import server_tls_policy -from google.cloud.network_security_v1alpha1.types import tls_inspection_policy -from google.cloud.network_security_v1alpha1.types import url_list from .base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/async_client.py index 0c6e11b295fb..84d46d60154d 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -44,20 +44,24 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.organization_security_profile_group_service import ( pagers, ) from google.cloud.network_security_v1alpha1.types import ( + common, + security_profile_group, security_profile_group_intercept, security_profile_group_mirroring, security_profile_group_service, @@ -67,8 +71,6 @@ from google.cloud.network_security_v1alpha1.types import ( security_profile_group as gcn_security_profile_group, ) -from google.cloud.network_security_v1alpha1.types import common -from google.cloud.network_security_v1alpha1.types import security_profile_group from .client import OrganizationSecurityProfileGroupServiceClient from .transports.base import ( @@ -175,7 +177,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: OrganizationSecurityProfileGroupServiceAsyncClient: The constructed client. """ - return OrganizationSecurityProfileGroupServiceClient.from_service_account_info.__func__(OrganizationSecurityProfileGroupServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = OrganizationSecurityProfileGroupServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func( + OrganizationSecurityProfileGroupServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -191,7 +196,13 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: OrganizationSecurityProfileGroupServiceAsyncClient: The constructed client. """ - return OrganizationSecurityProfileGroupServiceClient.from_service_account_file.__func__(OrganizationSecurityProfileGroupServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = OrganizationSecurityProfileGroupServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + OrganizationSecurityProfileGroupServiceAsyncClient, + filename, + *args, + **kwargs, + ) from_service_account_json = from_service_account_file @@ -229,7 +240,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return OrganizationSecurityProfileGroupServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return OrganizationSecurityProfileGroupServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> OrganizationSecurityProfileGroupServiceTransport: diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/client.py index f13f72da824c..4e42204351b1 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -61,20 +61,24 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.organization_security_profile_group_service import ( pagers, ) from google.cloud.network_security_v1alpha1.types import ( + common, + security_profile_group, security_profile_group_intercept, security_profile_group_mirroring, security_profile_group_service, @@ -84,8 +88,6 @@ from google.cloud.network_security_v1alpha1.types import ( security_profile_group as gcn_security_profile_group, ) -from google.cloud.network_security_v1alpha1.types import common -from google.cloud.network_security_v1alpha1.types import security_profile_group from .transports.base import ( DEFAULT_CLIENT_INFO, @@ -106,13 +108,11 @@ class OrganizationSecurityProfileGroupServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OrganizationSecurityProfileGroupServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationSecurityProfileGroupServiceTransport]] _transport_registry["grpc"] = OrganizationSecurityProfileGroupServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = OrganizationSecurityProfileGroupServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + OrganizationSecurityProfileGroupServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = OrganizationSecurityProfileGroupServiceRestTransport def get_transport_class( @@ -734,11 +734,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OrganizationSecurityProfileGroupServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OrganizationSecurityProfileGroupServiceClient._read_environment_variables() + ) self._client_cert_source = ( OrganizationSecurityProfileGroupServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -779,8 +777,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast( OrganizationSecurityProfileGroupServiceTransport, transport diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/pagers.py index 5a6d9a3af7b6..9016bcd4ed3f 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -155,7 +155,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -243,7 +243,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -325,7 +325,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/__init__.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/__init__.py index cdb17f07f8b4..0b45bcbc7e58 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/__init__.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OrganizationSecurityProfileGroupServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OrganizationSecurityProfileGroupServiceTransport]] _transport_registry["grpc"] = OrganizationSecurityProfileGroupServiceGrpcTransport -_transport_registry[ - "grpc_asyncio" -] = OrganizationSecurityProfileGroupServiceGrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + OrganizationSecurityProfileGroupServiceGrpcAsyncIOTransport +) _transport_registry["rest"] = OrganizationSecurityProfileGroupServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/base.py index eb1a3665b29e..5d82156d7d6b 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version from google.cloud.network_security_v1alpha1.types import ( @@ -380,13 +382,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/grpc.py index d702ba9c84e8..559f405a9906 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.network_security_v1alpha1.types import ( security_profile_group, @@ -371,12 +373,12 @@ def list_security_profile_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_security_profile_groups" not in self._stubs: - self._stubs[ - "list_security_profile_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/ListSecurityProfileGroups", - request_serializer=security_profile_group_service.ListSecurityProfileGroupsRequest.serialize, - response_deserializer=security_profile_group_service.ListSecurityProfileGroupsResponse.deserialize, + self._stubs["list_security_profile_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/ListSecurityProfileGroups", + request_serializer=security_profile_group_service.ListSecurityProfileGroupsRequest.serialize, + response_deserializer=security_profile_group_service.ListSecurityProfileGroupsResponse.deserialize, + ) ) return self._stubs["list_security_profile_groups"] @@ -402,12 +404,12 @@ def get_security_profile_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_security_profile_group" not in self._stubs: - self._stubs[ - "get_security_profile_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/GetSecurityProfileGroup", - request_serializer=security_profile_group_service.GetSecurityProfileGroupRequest.serialize, - response_deserializer=security_profile_group.SecurityProfileGroup.deserialize, + self._stubs["get_security_profile_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/GetSecurityProfileGroup", + request_serializer=security_profile_group_service.GetSecurityProfileGroupRequest.serialize, + response_deserializer=security_profile_group.SecurityProfileGroup.deserialize, + ) ) return self._stubs["get_security_profile_group"] @@ -434,12 +436,12 @@ def create_security_profile_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_security_profile_group" not in self._stubs: - self._stubs[ - "create_security_profile_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/CreateSecurityProfileGroup", - request_serializer=security_profile_group_service.CreateSecurityProfileGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_security_profile_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/CreateSecurityProfileGroup", + request_serializer=security_profile_group_service.CreateSecurityProfileGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_security_profile_group"] @@ -466,12 +468,12 @@ def update_security_profile_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_security_profile_group" not in self._stubs: - self._stubs[ - "update_security_profile_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/UpdateSecurityProfileGroup", - request_serializer=security_profile_group_service.UpdateSecurityProfileGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_security_profile_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/UpdateSecurityProfileGroup", + request_serializer=security_profile_group_service.UpdateSecurityProfileGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_security_profile_group"] @@ -497,12 +499,12 @@ def delete_security_profile_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_security_profile_group" not in self._stubs: - self._stubs[ - "delete_security_profile_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/DeleteSecurityProfileGroup", - request_serializer=security_profile_group_service.DeleteSecurityProfileGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_security_profile_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/DeleteSecurityProfileGroup", + request_serializer=security_profile_group_service.DeleteSecurityProfileGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_security_profile_group"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/grpc_asyncio.py index 816a689973db..518658f195c1 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.network_security_v1alpha1.types import ( security_profile_group, @@ -379,12 +381,12 @@ def list_security_profile_groups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_security_profile_groups" not in self._stubs: - self._stubs[ - "list_security_profile_groups" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/ListSecurityProfileGroups", - request_serializer=security_profile_group_service.ListSecurityProfileGroupsRequest.serialize, - response_deserializer=security_profile_group_service.ListSecurityProfileGroupsResponse.deserialize, + self._stubs["list_security_profile_groups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/ListSecurityProfileGroups", + request_serializer=security_profile_group_service.ListSecurityProfileGroupsRequest.serialize, + response_deserializer=security_profile_group_service.ListSecurityProfileGroupsResponse.deserialize, + ) ) return self._stubs["list_security_profile_groups"] @@ -410,12 +412,12 @@ def get_security_profile_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_security_profile_group" not in self._stubs: - self._stubs[ - "get_security_profile_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/GetSecurityProfileGroup", - request_serializer=security_profile_group_service.GetSecurityProfileGroupRequest.serialize, - response_deserializer=security_profile_group.SecurityProfileGroup.deserialize, + self._stubs["get_security_profile_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/GetSecurityProfileGroup", + request_serializer=security_profile_group_service.GetSecurityProfileGroupRequest.serialize, + response_deserializer=security_profile_group.SecurityProfileGroup.deserialize, + ) ) return self._stubs["get_security_profile_group"] @@ -442,12 +444,12 @@ def create_security_profile_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_security_profile_group" not in self._stubs: - self._stubs[ - "create_security_profile_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/CreateSecurityProfileGroup", - request_serializer=security_profile_group_service.CreateSecurityProfileGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_security_profile_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/CreateSecurityProfileGroup", + request_serializer=security_profile_group_service.CreateSecurityProfileGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_security_profile_group"] @@ -474,12 +476,12 @@ def update_security_profile_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_security_profile_group" not in self._stubs: - self._stubs[ - "update_security_profile_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/UpdateSecurityProfileGroup", - request_serializer=security_profile_group_service.UpdateSecurityProfileGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_security_profile_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/UpdateSecurityProfileGroup", + request_serializer=security_profile_group_service.UpdateSecurityProfileGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_security_profile_group"] @@ -505,12 +507,12 @@ def delete_security_profile_group( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_security_profile_group" not in self._stubs: - self._stubs[ - "delete_security_profile_group" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/DeleteSecurityProfileGroup", - request_serializer=security_profile_group_service.DeleteSecurityProfileGroupRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_security_profile_group"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.OrganizationSecurityProfileGroupService/DeleteSecurityProfileGroup", + request_serializer=security_profile_group_service.DeleteSecurityProfileGroupRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_security_profile_group"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/rest.py index 468bb8e4dcfe..c756b03ce816 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1112,9 +1114,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseCreateSecurityProfile._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseCreateSecurityProfile._get_http_options() request, metadata = self._interceptor.pre_create_security_profile( request, metadata @@ -1140,7 +1140,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1270,9 +1270,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseCreateSecurityProfileGroup._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseCreateSecurityProfileGroup._get_http_options() request, metadata = self._interceptor.pre_create_security_profile_group( request, metadata @@ -1298,7 +1296,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1339,11 +1337,10 @@ def __call__( resp = self._interceptor.post_create_security_profile_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_security_profile_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_security_profile_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1429,9 +1426,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseDeleteSecurityProfile._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseDeleteSecurityProfile._get_http_options() request, metadata = self._interceptor.pre_delete_security_profile( request, metadata @@ -1453,7 +1448,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1581,9 +1576,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseDeleteSecurityProfileGroup._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseDeleteSecurityProfileGroup._get_http_options() request, metadata = self._interceptor.pre_delete_security_profile_group( request, metadata @@ -1605,7 +1598,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1645,11 +1638,10 @@ def __call__( resp = self._interceptor.post_delete_security_profile_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_security_profile_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_security_profile_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1735,9 +1727,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetSecurityProfile._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetSecurityProfile._get_http_options() request, metadata = self._interceptor.pre_get_security_profile( request, metadata @@ -1891,9 +1881,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetSecurityProfileGroup._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetSecurityProfileGroup._get_http_options() request, metadata = self._interceptor.pre_get_security_profile_group( request, metadata @@ -2046,9 +2034,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseListSecurityProfileGroups._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseListSecurityProfileGroups._get_http_options() request, metadata = self._interceptor.pre_list_security_profile_groups( request, metadata @@ -2204,9 +2190,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseListSecurityProfiles._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseListSecurityProfiles._get_http_options() request, metadata = self._interceptor.pre_list_security_profiles( request, metadata @@ -2362,9 +2346,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseUpdateSecurityProfile._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseUpdateSecurityProfile._get_http_options() request, metadata = self._interceptor.pre_update_security_profile( request, metadata @@ -2390,7 +2372,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2520,9 +2502,7 @@ def __call__( """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseUpdateSecurityProfileGroup._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseUpdateSecurityProfileGroup._get_http_options() request, metadata = self._interceptor.pre_update_security_profile_group( request, metadata @@ -2548,7 +2528,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2589,11 +2569,10 @@ def __call__( resp = self._interceptor.post_update_security_profile_group(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_security_profile_group_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_security_profile_group_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2638,7 +2617,9 @@ def create_security_profile_group( ]: # 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._CreateSecurityProfileGroup(self._session, self._host, self._interceptor) # type: ignore + return self._CreateSecurityProfileGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_security_profile( @@ -2660,7 +2641,9 @@ def delete_security_profile_group( ]: # 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._DeleteSecurityProfileGroup(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteSecurityProfileGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_security_profile( @@ -2682,7 +2665,9 @@ def get_security_profile_group( ]: # 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._GetSecurityProfileGroup(self._session, self._host, self._interceptor) # type: ignore + return self._GetSecurityProfileGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_security_profile_groups( @@ -2693,7 +2678,9 @@ def list_security_profile_groups( ]: # 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._ListSecurityProfileGroups(self._session, self._host, self._interceptor) # type: ignore + return self._ListSecurityProfileGroups( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_security_profiles( @@ -2726,7 +2713,9 @@ def update_security_profile_group( ]: # 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._UpdateSecurityProfileGroup(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateSecurityProfileGroup( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -2788,9 +2777,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -2931,9 +2918,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -3074,9 +3059,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -3218,9 +3201,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -3367,9 +3348,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3515,9 +3494,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3637,9 +3614,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3757,9 +3732,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3900,9 +3873,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseOrganizationSecurityProfileGroupServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/rest_base.py index 6269bda59509..b1dfdb2778fa 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/organization_security_profile_group_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/async_client.py index e345c20513c9..301895dae159 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -44,15 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.sse_gateway_service import pagers from google.cloud.network_security_v1alpha1.types import common, sse_gateway @@ -133,7 +135,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SSEGatewayServiceAsyncClient: The constructed client. """ - return SSEGatewayServiceClient.from_service_account_info.__func__(SSEGatewayServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SSEGatewayServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SSEGatewayServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +152,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SSEGatewayServiceAsyncClient: The constructed client. """ - return SSEGatewayServiceClient.from_service_account_file.__func__(SSEGatewayServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SSEGatewayServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SSEGatewayServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/client.py index ca09462b306e..b091114e7f13 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -61,15 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.sse_gateway_service import pagers from google.cloud.network_security_v1alpha1.types import common, sse_gateway @@ -88,9 +90,7 @@ class SSEGatewayServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SSEGatewayServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SSEGatewayServiceTransport]] _transport_registry["grpc"] = SSEGatewayServiceGrpcTransport _transport_registry["grpc_asyncio"] = SSEGatewayServiceGrpcAsyncIOTransport _transport_registry["rest"] = SSEGatewayServiceRestTransport @@ -656,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SSEGatewayServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SSEGatewayServiceClient._read_environment_variables() + ) self._client_cert_source = SSEGatewayServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -695,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SSEGatewayServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/pagers.py index 1b29424ff7d1..e09459eff7b5 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/base.py index f117cefeb40c..c90897c4eb90 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version from google.cloud.network_security_v1alpha1.types import sse_gateway @@ -331,13 +333,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/grpc.py index 9f460d8717e6..8b72fec430d4 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.network_security_v1alpha1.types import sse_gateway @@ -422,12 +424,12 @@ def create_partner_sse_gateway( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_partner_sse_gateway" not in self._stubs: - self._stubs[ - "create_partner_sse_gateway" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/CreatePartnerSSEGateway", - request_serializer=sse_gateway.CreatePartnerSSEGatewayRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_partner_sse_gateway"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/CreatePartnerSSEGateway", + request_serializer=sse_gateway.CreatePartnerSSEGatewayRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_partner_sse_gateway"] @@ -452,12 +454,12 @@ def delete_partner_sse_gateway( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_partner_sse_gateway" not in self._stubs: - self._stubs[ - "delete_partner_sse_gateway" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/DeletePartnerSSEGateway", - request_serializer=sse_gateway.DeletePartnerSSEGatewayRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_partner_sse_gateway"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/DeletePartnerSSEGateway", + request_serializer=sse_gateway.DeletePartnerSSEGatewayRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_partner_sse_gateway"] @@ -482,12 +484,12 @@ def update_partner_sse_gateway( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_partner_sse_gateway" not in self._stubs: - self._stubs[ - "update_partner_sse_gateway" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/UpdatePartnerSSEGateway", - request_serializer=sse_gateway.UpdatePartnerSSEGatewayRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_partner_sse_gateway"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/UpdatePartnerSSEGateway", + request_serializer=sse_gateway.UpdatePartnerSSEGatewayRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_partner_sse_gateway"] @@ -514,12 +516,12 @@ def list_sse_gateway_references( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_sse_gateway_references" not in self._stubs: - self._stubs[ - "list_sse_gateway_references" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/ListSSEGatewayReferences", - request_serializer=sse_gateway.ListSSEGatewayReferencesRequest.serialize, - response_deserializer=sse_gateway.ListSSEGatewayReferencesResponse.deserialize, + self._stubs["list_sse_gateway_references"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/ListSSEGatewayReferences", + request_serializer=sse_gateway.ListSSEGatewayReferencesRequest.serialize, + response_deserializer=sse_gateway.ListSSEGatewayReferencesResponse.deserialize, + ) ) return self._stubs["list_sse_gateway_references"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/grpc_asyncio.py index 99efe15f2a83..1de2de5ff3a3 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.network_security_v1alpha1.types import sse_gateway @@ -432,12 +434,12 @@ def create_partner_sse_gateway( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_partner_sse_gateway" not in self._stubs: - self._stubs[ - "create_partner_sse_gateway" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/CreatePartnerSSEGateway", - request_serializer=sse_gateway.CreatePartnerSSEGatewayRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_partner_sse_gateway"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/CreatePartnerSSEGateway", + request_serializer=sse_gateway.CreatePartnerSSEGatewayRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_partner_sse_gateway"] @@ -463,12 +465,12 @@ def delete_partner_sse_gateway( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_partner_sse_gateway" not in self._stubs: - self._stubs[ - "delete_partner_sse_gateway" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/DeletePartnerSSEGateway", - request_serializer=sse_gateway.DeletePartnerSSEGatewayRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_partner_sse_gateway"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/DeletePartnerSSEGateway", + request_serializer=sse_gateway.DeletePartnerSSEGatewayRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_partner_sse_gateway"] @@ -494,12 +496,12 @@ def update_partner_sse_gateway( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_partner_sse_gateway" not in self._stubs: - self._stubs[ - "update_partner_sse_gateway" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/UpdatePartnerSSEGateway", - request_serializer=sse_gateway.UpdatePartnerSSEGatewayRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_partner_sse_gateway"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/UpdatePartnerSSEGateway", + request_serializer=sse_gateway.UpdatePartnerSSEGatewayRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_partner_sse_gateway"] @@ -526,12 +528,12 @@ def list_sse_gateway_references( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_sse_gateway_references" not in self._stubs: - self._stubs[ - "list_sse_gateway_references" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/ListSSEGatewayReferences", - request_serializer=sse_gateway.ListSSEGatewayReferencesRequest.serialize, - response_deserializer=sse_gateway.ListSSEGatewayReferencesResponse.deserialize, + self._stubs["list_sse_gateway_references"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1alpha1.SSEGatewayService/ListSSEGatewayReferences", + request_serializer=sse_gateway.ListSSEGatewayReferencesRequest.serialize, + response_deserializer=sse_gateway.ListSSEGatewayReferencesResponse.deserialize, + ) ) return self._stubs["list_sse_gateway_references"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/rest.py index 3ddcd4987120..4fff3e326c0a 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -926,9 +928,7 @@ def __call__( """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseCreatePartnerSSEGateway._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseCreatePartnerSSEGateway._get_http_options() request, metadata = self._interceptor.pre_create_partner_sse_gateway( request, metadata @@ -954,7 +954,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1083,9 +1083,7 @@ def __call__( """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseDeletePartnerSSEGateway._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseDeletePartnerSSEGateway._get_http_options() request, metadata = self._interceptor.pre_delete_partner_sse_gateway( request, metadata @@ -1107,7 +1105,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1233,9 +1231,7 @@ def __call__( """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseGetPartnerSSEGateway._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseGetPartnerSSEGateway._get_http_options() request, metadata = self._interceptor.pre_get_partner_sse_gateway( request, metadata @@ -1385,9 +1381,7 @@ def __call__( """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseGetSSEGatewayReference._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseGetSSEGatewayReference._get_http_options() request, metadata = self._interceptor.pre_get_sse_gateway_reference( request, metadata @@ -1537,9 +1531,7 @@ def __call__( """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseListPartnerSSEGateways._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseListPartnerSSEGateways._get_http_options() request, metadata = self._interceptor.pre_list_partner_sse_gateways( request, metadata @@ -1692,9 +1684,7 @@ def __call__( """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseListSSEGatewayReferences._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseListSSEGatewayReferences._get_http_options() request, metadata = self._interceptor.pre_list_sse_gateway_references( request, metadata @@ -1849,9 +1839,7 @@ def __call__( """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseUpdatePartnerSSEGateway._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseUpdatePartnerSSEGateway._get_http_options() request, metadata = self._interceptor.pre_update_partner_sse_gateway( request, metadata @@ -1877,7 +1865,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1954,7 +1942,9 @@ def create_partner_sse_gateway( ]: # 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._CreatePartnerSSEGateway(self._session, self._host, self._interceptor) # type: ignore + return self._CreatePartnerSSEGateway( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_partner_sse_gateway( @@ -1964,7 +1954,9 @@ def delete_partner_sse_gateway( ]: # 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._DeletePartnerSSEGateway(self._session, self._host, self._interceptor) # type: ignore + return self._DeletePartnerSSEGateway( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_partner_sse_gateway( @@ -1984,7 +1976,9 @@ def get_sse_gateway_reference( ]: # 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._GetSSEGatewayReference(self._session, self._host, self._interceptor) # type: ignore + return self._GetSSEGatewayReference( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_partner_sse_gateways( @@ -1995,7 +1989,9 @@ def list_partner_sse_gateways( ]: # 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._ListPartnerSSEGateways(self._session, self._host, self._interceptor) # type: ignore + return self._ListPartnerSSEGateways( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_sse_gateway_references( @@ -2006,7 +2002,9 @@ def list_sse_gateway_references( ]: # 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._ListSSEGatewayReferences(self._session, self._host, self._interceptor) # type: ignore + return self._ListSSEGatewayReferences( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_partner_sse_gateway( @@ -2016,7 +2014,9 @@ def update_partner_sse_gateway( ]: # 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._UpdatePartnerSSEGateway(self._session, self._host, self._interceptor) # type: ignore + return self._UpdatePartnerSSEGateway( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -2216,9 +2216,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseSSEGatewayServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -2356,9 +2354,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseSSEGatewayServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -2497,9 +2493,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseSSEGatewayServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2644,9 +2638,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2790,9 +2782,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2910,9 +2900,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3027,9 +3015,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSSEGatewayServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3168,9 +3154,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSSEGatewayServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSSEGatewayServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSSEGatewayServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/rest_base.py index 7b1f571f953d..fd176e22eed2 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_gateway_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/async_client.py index ba7f064e255d..2afaefa92944 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -44,14 +44,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.sse_realm_service import pagers from google.cloud.network_security_v1alpha1.types import common, sse_realm @@ -130,7 +132,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SSERealmServiceAsyncClient: The constructed client. """ - return SSERealmServiceClient.from_service_account_info.__func__(SSERealmServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SSERealmServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SSERealmServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +149,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SSERealmServiceAsyncClient: The constructed client. """ - return SSERealmServiceClient.from_service_account_file.__func__(SSERealmServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SSERealmServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SSERealmServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/client.py index 5b72d6d218e0..2a9704b7052b 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.sse_realm_service import pagers from google.cloud.network_security_v1alpha1.types import common, sse_realm @@ -87,9 +89,7 @@ class SSERealmServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SSERealmServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SSERealmServiceTransport]] _transport_registry["grpc"] = SSERealmServiceGrpcTransport _transport_registry["grpc_asyncio"] = SSERealmServiceGrpcAsyncIOTransport _transport_registry["rest"] = SSERealmServiceRestTransport @@ -675,11 +675,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SSERealmServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SSERealmServiceClient._read_environment_variables() + ) self._client_cert_source = SSERealmServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -714,8 +712,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SSERealmServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/pagers.py index 04faa177134a..ea28c4c49607 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/base.py index 4967b73e2046..0b3c1645820c 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1alpha1 import gapic_version as package_version from google.cloud.network_security_v1alpha1.types import sse_realm @@ -401,13 +403,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/grpc.py index 3849fe96fdb4..eacd06b96a51 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.network_security_v1alpha1.types import sse_realm diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/grpc_asyncio.py index 80af49d10951..31290eb3b8b9 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.network_security_v1alpha1.types import sse_realm diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/rest.py index 1d8925bb7c90..08b79d5efa51 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1191,9 +1193,7 @@ def __call__( """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseCreatePartnerSSERealm._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseCreatePartnerSSERealm._get_http_options() request, metadata = self._interceptor.pre_create_partner_sse_realm( request, metadata @@ -1219,7 +1219,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1347,9 +1347,7 @@ def __call__( """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseCreateSACAttachment._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseCreateSACAttachment._get_http_options() request, metadata = self._interceptor.pre_create_sac_attachment( request, metadata @@ -1375,7 +1373,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1500,9 +1498,7 @@ def __call__( """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseCreateSACRealm._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseCreateSACRealm._get_http_options() request, metadata = self._interceptor.pre_create_sac_realm( request, metadata @@ -1528,7 +1524,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1654,9 +1650,7 @@ def __call__( """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseDeletePartnerSSERealm._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseDeletePartnerSSERealm._get_http_options() request, metadata = self._interceptor.pre_delete_partner_sse_realm( request, metadata @@ -1678,7 +1672,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1804,9 +1798,7 @@ def __call__( """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseDeleteSACAttachment._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseDeleteSACAttachment._get_http_options() request, metadata = self._interceptor.pre_delete_sac_attachment( request, metadata @@ -1828,7 +1820,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1951,9 +1943,7 @@ def __call__( """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseDeleteSACRealm._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseDeleteSACRealm._get_http_options() request, metadata = self._interceptor.pre_delete_sac_realm( request, metadata @@ -1975,7 +1965,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2098,9 +2088,7 @@ def __call__( """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseGetPartnerSSERealm._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseGetPartnerSSERealm._get_http_options() request, metadata = self._interceptor.pre_get_partner_sse_realm( request, metadata @@ -2249,9 +2237,7 @@ def __call__( """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseGetSACAttachment._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseGetSACAttachment._get_http_options() request, metadata = self._interceptor.pre_get_sac_attachment( request, metadata @@ -2548,9 +2534,7 @@ def __call__( """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseListPartnerSSERealms._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseListPartnerSSERealms._get_http_options() request, metadata = self._interceptor.pre_list_partner_sse_realms( request, metadata @@ -2697,9 +2681,7 @@ def __call__( Response for ``ListSACAttachments`` method. """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseListSACAttachments._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseListSACAttachments._get_http_options() request, metadata = self._interceptor.pre_list_sac_attachments( request, metadata @@ -3660,9 +3642,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3805,9 +3785,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3924,9 +3902,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -4181,9 +4157,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSSERealmServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSSERealmServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSSERealmServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/rest_base.py index ab48b435daae..7c207d6bd9cc 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/services/sse_realm_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/__init__.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/__init__.py index 9219ce6427c5..2ae9b9cc686d 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/__init__.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/__init__.py @@ -49,7 +49,9 @@ ListClientTlsPoliciesResponse, UpdateClientTlsPolicyRequest, ) -from .common import OperationMetadata +from .common import ( + OperationMetadata, +) from .dns_threat_detector import ( CreateDnsThreatDetectorRequest, DeleteDnsThreatDetectorRequest, @@ -155,9 +157,16 @@ UpdateMirroringEndpointGroupAssociationRequest, UpdateMirroringEndpointGroupRequest, ) -from .security_profile_group import SecurityProfile, SecurityProfileGroup -from .security_profile_group_intercept import CustomInterceptProfile -from .security_profile_group_mirroring import CustomMirroringProfile +from .security_profile_group import ( + SecurityProfile, + SecurityProfileGroup, +) +from .security_profile_group_intercept import ( + CustomInterceptProfile, +) +from .security_profile_group_mirroring import ( + CustomMirroringProfile, +) from .security_profile_group_service import ( CreateSecurityProfileGroupRequest, CreateSecurityProfileRequest, @@ -182,7 +191,10 @@ ThreatPreventionProfile, ThreatType, ) -from .security_profile_group_urlfiltering import UrlFilter, UrlFilteringProfile +from .security_profile_group_urlfiltering import ( + UrlFilter, + UrlFilteringProfile, +) from .server_tls_policy import ( CreateServerTlsPolicyRequest, DeleteServerTlsPolicyRequest, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/authorization_policy.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/authorization_policy.py index c73b8366f9d5..0f49c0c9aeec 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/authorization_policy.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/authorization_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -84,6 +84,7 @@ class Action(proto.Enum): Deny rules should be avoided unless they are used to provide a default "deny all" fallback. """ + ACTION_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -221,19 +222,19 @@ class HttpHeaderMatch(proto.Message): message="AuthorizationPolicy.Rule.Destination.HttpHeaderMatch", ) - sources: MutableSequence[ - "AuthorizationPolicy.Rule.Source" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AuthorizationPolicy.Rule.Source", + sources: MutableSequence["AuthorizationPolicy.Rule.Source"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AuthorizationPolicy.Rule.Source", + ) ) - destinations: MutableSequence[ - "AuthorizationPolicy.Rule.Destination" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="AuthorizationPolicy.Rule.Destination", + destinations: MutableSequence["AuthorizationPolicy.Rule.Destination"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="AuthorizationPolicy.Rule.Destination", + ) ) name: str = proto.Field( @@ -321,12 +322,12 @@ class ListAuthorizationPoliciesResponse(proto.Message): def raw_page(self): return self - authorization_policies: MutableSequence[ - "AuthorizationPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AuthorizationPolicy", + authorization_policies: MutableSequence["AuthorizationPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AuthorizationPolicy", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/authz_policy.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/authz_policy.py index d64b78a16ef4..3d149c5eadf2 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/authz_policy.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/authz_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -128,6 +128,7 @@ class LoadBalancingScheme(proto.Enum): Signifies that this is used for Cloud Service Mesh. Meant for use by CSM GKE controller only. """ + LOAD_BALANCING_SCHEME_UNSPECIFIED = 0 INTERNAL_MANAGED = 1 EXTERNAL_MANAGED = 2 @@ -149,6 +150,7 @@ class AuthzAction(proto.Enum): Delegate the authorization decision to an external authorization engine. """ + AUTHZ_ACTION_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -420,6 +422,7 @@ class PrincipalSelector(proto.Enum): CLIENT_CERT_COMMON_NAME is not supported for INTERNAL_SELF_MANAGED load balancing scheme. """ + PRINCIPAL_SELECTOR_UNSPECIFIED = 0 CLIENT_CERT_URI_SAN = 1 CLIENT_CERT_DNS_NAME_SAN = 2 @@ -493,41 +496,41 @@ class RequestSource(proto.Message): Authorization Policy. """ - principals: MutableSequence[ - "AuthzPolicy.AuthzRule.Principal" - ] = proto.RepeatedField( + principals: MutableSequence["AuthzPolicy.AuthzRule.Principal"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AuthzPolicy.AuthzRule.Principal", + ) + ) + ip_blocks: MutableSequence["AuthzPolicy.AuthzRule.IpBlock"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="AuthzPolicy.AuthzRule.IpBlock", + ) + ) + resources: MutableSequence["AuthzPolicy.AuthzRule.RequestResource"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="AuthzPolicy.AuthzRule.RequestResource", + ) + ) + + sources: MutableSequence["AuthzPolicy.AuthzRule.From.RequestSource"] = ( + proto.RepeatedField( proto.MESSAGE, number=1, - message="AuthzPolicy.AuthzRule.Principal", + message="AuthzPolicy.AuthzRule.From.RequestSource", ) - ip_blocks: MutableSequence[ - "AuthzPolicy.AuthzRule.IpBlock" - ] = proto.RepeatedField( + ) + not_sources: MutableSequence["AuthzPolicy.AuthzRule.From.RequestSource"] = ( + proto.RepeatedField( proto.MESSAGE, number=2, - message="AuthzPolicy.AuthzRule.IpBlock", - ) - resources: MutableSequence[ - "AuthzPolicy.AuthzRule.RequestResource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="AuthzPolicy.AuthzRule.RequestResource", + message="AuthzPolicy.AuthzRule.From.RequestSource", ) - - sources: MutableSequence[ - "AuthzPolicy.AuthzRule.From.RequestSource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AuthzPolicy.AuthzRule.From.RequestSource", - ) - not_sources: MutableSequence[ - "AuthzPolicy.AuthzRule.From.RequestSource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="AuthzPolicy.AuthzRule.From.RequestSource", ) class To(proto.Message): @@ -600,12 +603,12 @@ class HeaderSet(proto.Message): to 10 headers per Authorization Policy. """ - headers: MutableSequence[ - "AuthzPolicy.AuthzRule.HeaderMatch" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AuthzPolicy.AuthzRule.HeaderMatch", + headers: MutableSequence["AuthzPolicy.AuthzRule.HeaderMatch"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AuthzPolicy.AuthzRule.HeaderMatch", + ) ) header_set: "AuthzPolicy.AuthzRule.To.RequestOperation.HeaderSet" = ( @@ -615,31 +618,31 @@ class HeaderSet(proto.Message): message="AuthzPolicy.AuthzRule.To.RequestOperation.HeaderSet", ) ) - hosts: MutableSequence[ - "AuthzPolicy.AuthzRule.StringMatch" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="AuthzPolicy.AuthzRule.StringMatch", + hosts: MutableSequence["AuthzPolicy.AuthzRule.StringMatch"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="AuthzPolicy.AuthzRule.StringMatch", + ) ) - paths: MutableSequence[ - "AuthzPolicy.AuthzRule.StringMatch" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="AuthzPolicy.AuthzRule.StringMatch", + paths: MutableSequence["AuthzPolicy.AuthzRule.StringMatch"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="AuthzPolicy.AuthzRule.StringMatch", + ) ) methods: MutableSequence[str] = proto.RepeatedField( proto.STRING, number=4, ) - operations: MutableSequence[ - "AuthzPolicy.AuthzRule.To.RequestOperation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AuthzPolicy.AuthzRule.To.RequestOperation", + operations: MutableSequence["AuthzPolicy.AuthzRule.To.RequestOperation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AuthzPolicy.AuthzRule.To.RequestOperation", + ) ) not_operations: MutableSequence[ "AuthzPolicy.AuthzRule.To.RequestOperation" diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/backend_authentication_config.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/backend_authentication_config.py index 91b8f7932e4b..6a845ed2bb0d 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/backend_authentication_config.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/backend_authentication_config.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -122,6 +122,7 @@ class WellKnownRoots(proto.Enum): managed by Google. CAs in this set can be added or removed without notice. """ + WELL_KNOWN_ROOTS_UNSPECIFIED = 0 NONE = 1 PUBLIC_ROOTS = 2 @@ -222,12 +223,12 @@ class ListBackendAuthenticationConfigsResponse(proto.Message): def raw_page(self): return self - backend_authentication_configs: MutableSequence[ - "BackendAuthenticationConfig" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="BackendAuthenticationConfig", + backend_authentication_configs: MutableSequence["BackendAuthenticationConfig"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="BackendAuthenticationConfig", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/client_tls_policy.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/client_tls_policy.py index 57d844628032..4ad9468d45c7 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/client_tls_policy.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/client_tls_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.network_security_v1alpha1.types import tls diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/common.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/common.py index a4b632a31561..22cfa4ab9200 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/common.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/common.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/dns_threat_detector.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/dns_threat_detector.py index 795f304608cd..8e021e98d5c5 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/dns_threat_detector.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/dns_threat_detector.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -72,6 +72,7 @@ class Provider(proto.Enum): INFOBLOX (1): The Infoblox DNS threat detector provider. """ + PROVIDER_UNSPECIFIED = 0 INFOBLOX = 1 diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/firewall_activation.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/firewall_activation.py index 9e0c4557c7ae..fce00ce87c74 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/firewall_activation.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/firewall_activation.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -111,6 +111,7 @@ class State(proto.Enum): INACTIVE (4): Down or in an error state. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -501,6 +502,7 @@ class State(proto.Enum): The project that housed the association has been deleted. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -614,12 +616,12 @@ class ListFirewallEndpointAssociationsResponse(proto.Message): def raw_page(self): return self - firewall_endpoint_associations: MutableSequence[ - "FirewallEndpointAssociation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="FirewallEndpointAssociation", + firewall_endpoint_associations: MutableSequence["FirewallEndpointAssociation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="FirewallEndpointAssociation", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/gateway_security_policy.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/gateway_security_policy.py index 66866bc693c2..83ba62feaed0 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/gateway_security_policy.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/gateway_security_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -170,12 +170,12 @@ class ListGatewaySecurityPoliciesResponse(proto.Message): def raw_page(self): return self - gateway_security_policies: MutableSequence[ - "GatewaySecurityPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="GatewaySecurityPolicy", + gateway_security_policies: MutableSequence["GatewaySecurityPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="GatewaySecurityPolicy", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/gateway_security_policy_rule.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/gateway_security_policy_rule.py index 7cdea1a2eb7c..efdce6c32186 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/gateway_security_policy_rule.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/gateway_security_policy_rule.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -91,6 +91,7 @@ class BasicProfile(proto.Enum): DENY (2): Deny the matched traffic. """ + BASIC_PROFILE_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -272,12 +273,12 @@ class ListGatewaySecurityPolicyRulesResponse(proto.Message): def raw_page(self): return self - gateway_security_policy_rules: MutableSequence[ - "GatewaySecurityPolicyRule" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="GatewaySecurityPolicyRule", + gateway_security_policy_rules: MutableSequence["GatewaySecurityPolicyRule"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="GatewaySecurityPolicyRule", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/intercept.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/intercept.py index 2bec4797ab94..4ca92de1ad94 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/intercept.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/intercept.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -143,6 +143,7 @@ class State(proto.Enum): only permitted operation is to retry deleting the endpoint group. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 CLOSED = 2 @@ -326,12 +327,12 @@ class ListInterceptEndpointGroupsResponse(proto.Message): def raw_page(self): return self - intercept_endpoint_groups: MutableSequence[ - "InterceptEndpointGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="InterceptEndpointGroup", + intercept_endpoint_groups: MutableSequence["InterceptEndpointGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="InterceptEndpointGroup", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -540,6 +541,7 @@ class State(proto.Enum): The only permitted operation is to retry deleting the association. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 CREATING = 2 @@ -577,6 +579,7 @@ class State(proto.Enum): (e.g. an inaccessible location) and the system is expected to recover automatically. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 OUT_OF_SYNC = 2 @@ -906,6 +909,7 @@ class State(proto.Enum): DELETING (3): The deployment group is being deleted. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 CREATING = 2 @@ -973,12 +977,12 @@ class Deployment(proto.Message): proto.STRING, number=5, ) - connected_endpoint_groups: MutableSequence[ - ConnectedEndpointGroup - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=ConnectedEndpointGroup, + connected_endpoint_groups: MutableSequence[ConnectedEndpointGroup] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=ConnectedEndpointGroup, + ) ) nested_deployments: MutableSequence[Deployment] = proto.RepeatedField( proto.MESSAGE, @@ -1076,12 +1080,12 @@ class ListInterceptDeploymentGroupsResponse(proto.Message): def raw_page(self): return self - intercept_deployment_groups: MutableSequence[ - "InterceptDeploymentGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="InterceptDeploymentGroup", + intercept_deployment_groups: MutableSequence["InterceptDeploymentGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="InterceptDeploymentGroup", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1281,6 +1285,7 @@ class State(proto.Enum): permitted operation is to retry deleting the deployment. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 CREATING = 2 @@ -1557,6 +1562,7 @@ class State(proto.Enum): location) and the system is expected to recover automatically. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 OUT_OF_SYNC = 2 diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/mirroring.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/mirroring.py index 93177b499953..d95e3465240f 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/mirroring.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/mirroring.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -147,6 +147,7 @@ class State(proto.Enum): only permitted operation is to retry deleting the endpoint group. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 CLOSED = 2 @@ -165,6 +166,7 @@ class Type(proto.Enum): An endpoint group that sends packets to a single deployment group. """ + TYPE_UNSPECIFIED = 0 DIRECT = 1 @@ -248,12 +250,12 @@ class AssociationDetails(proto.Message): proto.STRING, number=5, ) - connected_deployment_groups: MutableSequence[ - ConnectedDeploymentGroup - ] = proto.RepeatedField( - proto.MESSAGE, - number=13, - message=ConnectedDeploymentGroup, + connected_deployment_groups: MutableSequence[ConnectedDeploymentGroup] = ( + proto.RepeatedField( + proto.MESSAGE, + number=13, + message=ConnectedDeploymentGroup, + ) ) state: State = proto.Field( proto.ENUM, @@ -350,12 +352,12 @@ class ListMirroringEndpointGroupsResponse(proto.Message): def raw_page(self): return self - mirroring_endpoint_groups: MutableSequence[ - "MirroringEndpointGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="MirroringEndpointGroup", + mirroring_endpoint_groups: MutableSequence["MirroringEndpointGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="MirroringEndpointGroup", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -564,6 +566,7 @@ class State(proto.Enum): The only permitted operation is to retry deleting the association. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 CREATING = 3 @@ -601,6 +604,7 @@ class State(proto.Enum): (e.g. an inaccessible location) and the system is expected to recover automatically. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 OUT_OF_SYNC = 2 @@ -933,6 +937,7 @@ class State(proto.Enum): The deployment group is being wiped out (project deleted). """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 CREATING = 2 @@ -1001,12 +1006,12 @@ class Deployment(proto.Message): proto.STRING, number=5, ) - connected_endpoint_groups: MutableSequence[ - ConnectedEndpointGroup - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message=ConnectedEndpointGroup, + connected_endpoint_groups: MutableSequence[ConnectedEndpointGroup] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message=ConnectedEndpointGroup, + ) ) nested_deployments: MutableSequence[Deployment] = proto.RepeatedField( proto.MESSAGE, @@ -1104,12 +1109,12 @@ class ListMirroringDeploymentGroupsResponse(proto.Message): def raw_page(self): return self - mirroring_deployment_groups: MutableSequence[ - "MirroringDeploymentGroup" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="MirroringDeploymentGroup", + mirroring_deployment_groups: MutableSequence["MirroringDeploymentGroup"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="MirroringDeploymentGroup", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1309,6 +1314,7 @@ class State(proto.Enum): permitted operation is to retry deleting the deployment. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 CREATING = 2 @@ -1585,6 +1591,7 @@ class State(proto.Enum): location) and the system is expected to recover automatically. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 OUT_OF_SYNC = 2 diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group.py index 768054cd7f7a..326d0d6ab105 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.network_security_v1alpha1.types import ( @@ -198,6 +198,7 @@ class ProfileType(proto.Enum): URL_FILTERING (5): Profile type for URL filtering. """ + PROFILE_TYPE_UNSPECIFIED = 0 THREAT_PREVENTION = 1 CUSTOM_MIRRORING = 2 diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group_service.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group_service.py index c4c4ca11bd8e..b92257362630 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group_service.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group_service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.network_security_v1alpha1.types import ( @@ -261,12 +261,12 @@ class ListSecurityProfilesResponse(proto.Message): def raw_page(self): return self - security_profiles: MutableSequence[ - gcn_security_profile_group.SecurityProfile - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcn_security_profile_group.SecurityProfile, + security_profiles: MutableSequence[gcn_security_profile_group.SecurityProfile] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcn_security_profile_group.SecurityProfile, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group_threatprevention.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group_threatprevention.py index bd28c675215d..129d02ff6e1c 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group_threatprevention.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group_threatprevention.py @@ -75,6 +75,7 @@ class Severity(proto.Enum): target does not need to be manipulated into performing any special functions. """ + SEVERITY_UNSPECIFIED = 0 INFORMATIONAL = 1 LOW = 2 @@ -108,6 +109,7 @@ class ThreatType(proto.Enum): DNS (5): Threats related to DNS. """ + THREAT_TYPE_UNSPECIFIED = 0 UNKNOWN = 1 VULNERABILITY = 2 @@ -135,6 +137,7 @@ class ThreatAction(proto.Enum): The packet matching this rule will be dropped, and a threat_log entry will be sent to the consumer project. """ + THREAT_ACTION_UNSPECIFIED = 0 DEFAULT_ACTION = 4 ALLOW = 1 @@ -163,6 +166,7 @@ class Protocol(proto.Enum): FTP (7): FTP protocol """ + PROTOCOL_UNSPECIFIED = 0 SMTP = 1 SMB = 2 diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group_urlfiltering.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group_urlfiltering.py index 478b0f7c7119..8648ada4ed31 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group_urlfiltering.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/security_profile_group_urlfiltering.py @@ -80,6 +80,7 @@ class UrlFilteringAction(proto.Enum): The connection matching this filter will be dropped. """ + URL_FILTERING_ACTION_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/server_tls_policy.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/server_tls_policy.py index 564036af6658..60d7b5fac36e 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/server_tls_policy.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/server_tls_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.network_security_v1alpha1.types import tls @@ -158,6 +158,7 @@ class ClientValidationMode(proto.Enum): If set, requires a reference to non-empty TrustConfig specified in ``client_validation_trust_config``. """ + CLIENT_VALIDATION_MODE_UNSPECIFIED = 0 ALLOW_INVALID_OR_MISSING_CLIENT_CERT = 1 REJECT_INVALID = 2 diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/sse_gateway.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/sse_gateway.py index 9322456241b6..a773a3f310cb 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/sse_gateway.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/sse_gateway.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -140,6 +140,7 @@ class State(proto.Enum): No longer attached to a customer. This state arises when the customer attachment is deleted. """ + STATE_UNSPECIFIED = 0 CUSTOMER_ATTACHED = 1 CUSTOMER_DETACHED = 2 @@ -613,12 +614,12 @@ class ListSSEGatewayReferencesResponse(proto.Message): def raw_page(self): return self - sse_gateway_references: MutableSequence[ - "SSEGatewayReference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SSEGatewayReference", + sse_gateway_references: MutableSequence["SSEGatewayReference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SSEGatewayReference", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/sse_realm.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/sse_realm.py index 44c7aebb0087..239c802c35c1 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/sse_realm.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/sse_realm.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -90,6 +90,7 @@ class SecurityService(proto.Enum): SYMANTEC_CLOUD_SWG (2): Symantec Cloud SWG. """ + SECURITY_SERVICE_UNSPECIFIED = 0 PALO_ALTO_PRISMA_ACCESS = 1 SYMANTEC_CLOUD_SWG = 2 @@ -113,6 +114,7 @@ class State(proto.Enum): expired pairing key. Used only for Prisma Access. """ + STATE_UNSPECIFIED = 0 PENDING_PARTNER_ATTACHMENT = 7 PARTNER_ATTACHED = 1 @@ -177,6 +179,7 @@ class SymantecConnectionState(proto.Enum): Symantec API due to an invalid API key or Symantec API unavailability. """ + SYMANTEC_CONNECTION_STATE_UNSPECIFIED = 0 SUCCEEDED = 1 READ_SECRET_FAILED = 2 @@ -484,6 +487,7 @@ class State(proto.Enum): Was once attached to a partner but has been detached. """ + STATE_UNSPECIFIED = 0 PENDING_PARTNER_ATTACHMENT = 1 PARTNER_ATTACHED = 2 @@ -807,6 +811,7 @@ class State(proto.Enum): a customer realm. This is the state when the customer realm is deleted. """ + STATE_UNSPECIFIED = 0 CUSTOMER_ATTACHED = 1 CUSTOMER_DETACHED = 2 diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/tls_inspection_policy.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/tls_inspection_policy.py index 35c271e0a30d..38201da86797 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/tls_inspection_policy.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/tls_inspection_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -134,6 +134,7 @@ class TlsVersion(proto.Enum): TLS_1_3 (4): TLS 1.3 """ + TLS_VERSION_UNSPECIFIED = 0 TLS_1_0 = 1 TLS_1_1 = 2 @@ -167,6 +168,7 @@ class Profile(proto.Enum): Custom profile. Allow only the set of allowed SSL features specified in the custom_features field of SslPolicy. """ + PROFILE_UNSPECIFIED = 0 PROFILE_COMPATIBLE = 1 PROFILE_MODERN = 2 @@ -306,12 +308,12 @@ class ListTlsInspectionPoliciesResponse(proto.Message): def raw_page(self): return self - tls_inspection_policies: MutableSequence[ - "TlsInspectionPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="TlsInspectionPolicy", + tls_inspection_policies: MutableSequence["TlsInspectionPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="TlsInspectionPolicy", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/url_list.py b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/url_list.py index 02bb87b89493..821b532c6b12 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/url_list.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1alpha1/types/url_list.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/__init__.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/__init__.py index d6662c66244d..70a9a6abe514 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/__init__.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dns_threat_detector_service import ( DnsThreatDetectorServiceAsyncClient, DnsThreatDetectorServiceClient, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/async_client.py index dcb64669dc24..1343fd7c4dec 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1beta1 import gapic_version as package_version @@ -44,20 +44,22 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1beta1.services.dns_threat_detector_service import ( pagers, ) +from google.cloud.network_security_v1beta1.types import dns_threat_detector from google.cloud.network_security_v1beta1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1beta1.types import dns_threat_detector from .client import DnsThreatDetectorServiceClient from .transports.base import DEFAULT_CLIENT_INFO, DnsThreatDetectorServiceTransport @@ -137,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DnsThreatDetectorServiceAsyncClient: The constructed client. """ - return DnsThreatDetectorServiceClient.from_service_account_info.__func__(DnsThreatDetectorServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DnsThreatDetectorServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DnsThreatDetectorServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -153,7 +156,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DnsThreatDetectorServiceAsyncClient: The constructed client. """ - return DnsThreatDetectorServiceClient.from_service_account_file.__func__(DnsThreatDetectorServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DnsThreatDetectorServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + DnsThreatDetectorServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -191,7 +197,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return DnsThreatDetectorServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return DnsThreatDetectorServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> DnsThreatDetectorServiceTransport: diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/client.py index 26597ebe28f9..f28c556bdd5b 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1beta1 import gapic_version as package_version @@ -61,20 +61,22 @@ _LOGGER = std_logging.getLogger(__name__) +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1beta1.services.dns_threat_detector_service import ( pagers, ) +from google.cloud.network_security_v1beta1.types import dns_threat_detector from google.cloud.network_security_v1beta1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1beta1.types import dns_threat_detector from .transports.base import DEFAULT_CLIENT_INFO, DnsThreatDetectorServiceTransport from .transports.grpc import DnsThreatDetectorServiceGrpcTransport @@ -90,9 +92,7 @@ class DnsThreatDetectorServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DnsThreatDetectorServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DnsThreatDetectorServiceTransport]] _transport_registry["grpc"] = DnsThreatDetectorServiceGrpcTransport _transport_registry["grpc_asyncio"] = DnsThreatDetectorServiceGrpcAsyncIOTransport _transport_registry["rest"] = DnsThreatDetectorServiceRestTransport @@ -657,11 +657,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DnsThreatDetectorServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DnsThreatDetectorServiceClient._read_environment_variables() + ) self._client_cert_source = ( DnsThreatDetectorServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -698,8 +696,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DnsThreatDetectorServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/pagers.py index a518120c5ae5..a021a03453a1 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/__init__.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/__init__.py index 963a0f444a76..4dae0d73e1c0 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/__init__.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[DnsThreatDetectorServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[DnsThreatDetectorServiceTransport]] _transport_registry["grpc"] = DnsThreatDetectorServiceGrpcTransport _transport_registry["grpc_asyncio"] = DnsThreatDetectorServiceGrpcAsyncIOTransport _transport_registry["rest"] = DnsThreatDetectorServiceRestTransport diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/base.py index acda00207d8b..1c779ae6e5c6 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/base.py @@ -17,24 +17,26 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.network_security_v1beta1 import gapic_version as package_version +from google.cloud.network_security_v1beta1.types import dns_threat_detector from google.cloud.network_security_v1beta1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1beta1.types import dns_threat_detector DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -306,13 +308,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/grpc.py index 2e726af62b69..32d96b2e04d1 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/grpc.py @@ -16,27 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.network_security_v1beta1.types import dns_threat_detector from google.cloud.network_security_v1beta1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1beta1.types import dns_threat_detector from .base import DEFAULT_CLIENT_INFO, DnsThreatDetectorServiceTransport @@ -411,12 +413,12 @@ def create_dns_threat_detector( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_dns_threat_detector" not in self._stubs: - self._stubs[ - "create_dns_threat_detector" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.DnsThreatDetectorService/CreateDnsThreatDetector", - request_serializer=gcn_dns_threat_detector.CreateDnsThreatDetectorRequest.serialize, - response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + self._stubs["create_dns_threat_detector"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.DnsThreatDetectorService/CreateDnsThreatDetector", + request_serializer=gcn_dns_threat_detector.CreateDnsThreatDetectorRequest.serialize, + response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + ) ) return self._stubs["create_dns_threat_detector"] @@ -442,12 +444,12 @@ def update_dns_threat_detector( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_dns_threat_detector" not in self._stubs: - self._stubs[ - "update_dns_threat_detector" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.DnsThreatDetectorService/UpdateDnsThreatDetector", - request_serializer=gcn_dns_threat_detector.UpdateDnsThreatDetectorRequest.serialize, - response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + self._stubs["update_dns_threat_detector"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.DnsThreatDetectorService/UpdateDnsThreatDetector", + request_serializer=gcn_dns_threat_detector.UpdateDnsThreatDetectorRequest.serialize, + response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + ) ) return self._stubs["update_dns_threat_detector"] @@ -472,12 +474,12 @@ def delete_dns_threat_detector( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_dns_threat_detector" not in self._stubs: - self._stubs[ - "delete_dns_threat_detector" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.DnsThreatDetectorService/DeleteDnsThreatDetector", - request_serializer=dns_threat_detector.DeleteDnsThreatDetectorRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_dns_threat_detector"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.DnsThreatDetectorService/DeleteDnsThreatDetector", + request_serializer=dns_threat_detector.DeleteDnsThreatDetectorRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_dns_threat_detector"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/grpc_asyncio.py index 3049f5cbd582..12cfb6dd702b 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/grpc_asyncio.py @@ -17,29 +17,31 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.network_security_v1beta1.types import dns_threat_detector from google.cloud.network_security_v1beta1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1beta1.types import dns_threat_detector from .base import DEFAULT_CLIENT_INFO, DnsThreatDetectorServiceTransport from .grpc import DnsThreatDetectorServiceGrpcTransport @@ -419,12 +421,12 @@ def create_dns_threat_detector( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_dns_threat_detector" not in self._stubs: - self._stubs[ - "create_dns_threat_detector" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.DnsThreatDetectorService/CreateDnsThreatDetector", - request_serializer=gcn_dns_threat_detector.CreateDnsThreatDetectorRequest.serialize, - response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + self._stubs["create_dns_threat_detector"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.DnsThreatDetectorService/CreateDnsThreatDetector", + request_serializer=gcn_dns_threat_detector.CreateDnsThreatDetectorRequest.serialize, + response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + ) ) return self._stubs["create_dns_threat_detector"] @@ -450,12 +452,12 @@ def update_dns_threat_detector( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_dns_threat_detector" not in self._stubs: - self._stubs[ - "update_dns_threat_detector" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.DnsThreatDetectorService/UpdateDnsThreatDetector", - request_serializer=gcn_dns_threat_detector.UpdateDnsThreatDetectorRequest.serialize, - response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + self._stubs["update_dns_threat_detector"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.DnsThreatDetectorService/UpdateDnsThreatDetector", + request_serializer=gcn_dns_threat_detector.UpdateDnsThreatDetectorRequest.serialize, + response_deserializer=gcn_dns_threat_detector.DnsThreatDetector.deserialize, + ) ) return self._stubs["update_dns_threat_detector"] @@ -480,12 +482,12 @@ def delete_dns_threat_detector( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_dns_threat_detector" not in self._stubs: - self._stubs[ - "delete_dns_threat_detector" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.DnsThreatDetectorService/DeleteDnsThreatDetector", - request_serializer=dns_threat_detector.DeleteDnsThreatDetectorRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_dns_threat_detector"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.DnsThreatDetectorService/DeleteDnsThreatDetector", + request_serializer=dns_threat_detector.DeleteDnsThreatDetectorRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_dns_threat_detector"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/rest.py index 4c9f289bee49..17b276d9ddc0 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/rest.py @@ -16,27 +16,29 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.network_security_v1beta1.types import dns_threat_detector from google.cloud.network_security_v1beta1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1beta1.types import dns_threat_detector from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDnsThreatDetectorServiceRestTransport @@ -713,9 +715,7 @@ def __call__( """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseCreateDnsThreatDetector._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseCreateDnsThreatDetector._get_http_options() request, metadata = self._interceptor.pre_create_dns_threat_detector( request, metadata @@ -865,9 +865,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseDeleteDnsThreatDetector._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseDeleteDnsThreatDetector._get_http_options() request, metadata = self._interceptor.pre_delete_dns_threat_detector( request, metadata @@ -889,7 +887,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -984,9 +982,7 @@ def __call__( """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseGetDnsThreatDetector._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseGetDnsThreatDetector._get_http_options() request, metadata = self._interceptor.pre_get_dns_threat_detector( request, metadata @@ -1136,9 +1132,7 @@ def __call__( """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseListDnsThreatDetectors._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseListDnsThreatDetectors._get_http_options() request, metadata = self._interceptor.pre_list_dns_threat_detectors( request, metadata @@ -1295,9 +1289,7 @@ def __call__( """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseUpdateDnsThreatDetector._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseUpdateDnsThreatDetector._get_http_options() request, metadata = self._interceptor.pre_update_dns_threat_detector( request, metadata @@ -1403,7 +1395,9 @@ def create_dns_threat_detector( ]: # 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._CreateDnsThreatDetector(self._session, self._host, self._interceptor) # type: ignore + return self._CreateDnsThreatDetector( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_dns_threat_detector( @@ -1413,7 +1407,9 @@ def delete_dns_threat_detector( ]: # 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._DeleteDnsThreatDetector(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteDnsThreatDetector( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_dns_threat_detector( @@ -1435,7 +1431,9 @@ def list_dns_threat_detectors( ]: # 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._ListDnsThreatDetectors(self._session, self._host, self._interceptor) # type: ignore + return self._ListDnsThreatDetectors( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_dns_threat_detector( @@ -1446,7 +1444,9 @@ def update_dns_threat_detector( ]: # 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._UpdateDnsThreatDetector(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDnsThreatDetector( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -1506,9 +1506,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseDnsThreatDetectorServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -1647,9 +1645,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseDnsThreatDetectorServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -1790,9 +1786,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseDnsThreatDetectorServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -1934,9 +1928,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseDnsThreatDetectorServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -2083,9 +2075,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -2231,9 +2221,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2353,9 +2341,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -2473,9 +2459,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseDnsThreatDetectorServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2616,9 +2600,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDnsThreatDetectorServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDnsThreatDetectorServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDnsThreatDetectorServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/rest_base.py index 10523101b2c5..85361356b5f3 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/dns_threat_detector_service/transports/rest_base.py @@ -17,18 +17,20 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.network_security_v1beta1.types import dns_threat_detector from google.cloud.network_security_v1beta1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1beta1.types import dns_threat_detector from .base import DEFAULT_CLIENT_INFO, DnsThreatDetectorServiceTransport diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/async_client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/async_client.py index b41cc9085495..ee06ca11e9b8 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/async_client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1beta1 import gapic_version as package_version @@ -44,17 +44,26 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1beta1.services.network_security import pagers +from google.cloud.network_security_v1beta1.types import ( + authorization_policy, + client_tls_policy, + common, + server_tls_policy, + tls, +) from google.cloud.network_security_v1beta1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -64,11 +73,6 @@ from google.cloud.network_security_v1beta1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1beta1.types import authorization_policy -from google.cloud.network_security_v1beta1.types import client_tls_policy -from google.cloud.network_security_v1beta1.types import common -from google.cloud.network_security_v1beta1.types import server_tls_policy -from google.cloud.network_security_v1beta1.types import tls from .client import NetworkSecurityClient from .transports.base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport @@ -151,7 +155,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: NetworkSecurityAsyncClient: The constructed client. """ - return NetworkSecurityClient.from_service_account_info.__func__(NetworkSecurityAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = NetworkSecurityClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(NetworkSecurityAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -167,7 +172,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: NetworkSecurityAsyncClient: The constructed client. """ - return NetworkSecurityClient.from_service_account_file.__func__(NetworkSecurityAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = NetworkSecurityClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(NetworkSecurityAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/client.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/client.py index 8202312b3e1e..56045b63bcfe 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/client.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1beta1 import gapic_version as package_version @@ -61,17 +61,26 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1beta1.services.network_security import pagers +from google.cloud.network_security_v1beta1.types import ( + authorization_policy, + client_tls_policy, + common, + server_tls_policy, + tls, +) from google.cloud.network_security_v1beta1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -81,11 +90,6 @@ from google.cloud.network_security_v1beta1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1beta1.types import authorization_policy -from google.cloud.network_security_v1beta1.types import client_tls_policy -from google.cloud.network_security_v1beta1.types import common -from google.cloud.network_security_v1beta1.types import server_tls_policy -from google.cloud.network_security_v1beta1.types import tls from .transports.base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport from .transports.grpc import NetworkSecurityGrpcTransport @@ -101,9 +105,7 @@ class NetworkSecurityClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkSecurityTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkSecurityTransport]] _transport_registry["grpc"] = NetworkSecurityGrpcTransport _transport_registry["grpc_asyncio"] = NetworkSecurityGrpcAsyncIOTransport _transport_registry["rest"] = NetworkSecurityRestTransport @@ -692,11 +694,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkSecurityClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkSecurityClient._read_environment_variables() + ) self._client_cert_source = NetworkSecurityClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -731,8 +731,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkSecurityTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/pagers.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/pagers.py index 5ad9aabf2ff9..ec22f4a89f98 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/pagers.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/pagers.py @@ -71,7 +71,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -149,7 +149,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -231,7 +231,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -309,7 +309,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -391,7 +391,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -469,7 +469,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/base.py index cd56040b2e9c..dfcba7d72022 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/base.py @@ -17,19 +17,26 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_security_v1beta1 import gapic_version as package_version +from google.cloud.network_security_v1beta1.types import ( + authorization_policy, + client_tls_policy, + server_tls_policy, +) from google.cloud.network_security_v1beta1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -39,9 +46,6 @@ from google.cloud.network_security_v1beta1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1beta1.types import authorization_policy -from google.cloud.network_security_v1beta1.types import client_tls_policy -from google.cloud.network_security_v1beta1.types import server_tls_policy DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -464,13 +468,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/grpc.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/grpc.py index 2267e4b0942c..628b4909fbc8 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/grpc.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/grpc.py @@ -16,22 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.network_security_v1beta1.types import ( + authorization_policy, + client_tls_policy, + server_tls_policy, +) from google.cloud.network_security_v1beta1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -41,9 +48,6 @@ from google.cloud.network_security_v1beta1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1beta1.types import authorization_policy -from google.cloud.network_security_v1beta1.types import client_tls_policy -from google.cloud.network_security_v1beta1.types import server_tls_policy from .base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport @@ -378,12 +382,12 @@ def list_authorization_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_authorization_policies" not in self._stubs: - self._stubs[ - "list_authorization_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.NetworkSecurity/ListAuthorizationPolicies", - request_serializer=authorization_policy.ListAuthorizationPoliciesRequest.serialize, - response_deserializer=authorization_policy.ListAuthorizationPoliciesResponse.deserialize, + self._stubs["list_authorization_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.NetworkSecurity/ListAuthorizationPolicies", + request_serializer=authorization_policy.ListAuthorizationPoliciesRequest.serialize, + response_deserializer=authorization_policy.ListAuthorizationPoliciesResponse.deserialize, + ) ) return self._stubs["list_authorization_policies"] @@ -439,12 +443,12 @@ def create_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_authorization_policy" not in self._stubs: - self._stubs[ - "create_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.NetworkSecurity/CreateAuthorizationPolicy", - request_serializer=gcn_authorization_policy.CreateAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.NetworkSecurity/CreateAuthorizationPolicy", + request_serializer=gcn_authorization_policy.CreateAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_authorization_policy"] @@ -471,12 +475,12 @@ def update_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_authorization_policy" not in self._stubs: - self._stubs[ - "update_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.NetworkSecurity/UpdateAuthorizationPolicy", - request_serializer=gcn_authorization_policy.UpdateAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.NetworkSecurity/UpdateAuthorizationPolicy", + request_serializer=gcn_authorization_policy.UpdateAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_authorization_policy"] @@ -502,12 +506,12 @@ def delete_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_authorization_policy" not in self._stubs: - self._stubs[ - "delete_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.NetworkSecurity/DeleteAuthorizationPolicy", - request_serializer=authorization_policy.DeleteAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.NetworkSecurity/DeleteAuthorizationPolicy", + request_serializer=authorization_policy.DeleteAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_authorization_policy"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/grpc_asyncio.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/grpc_asyncio.py index c1124c9d5d70..e3777c0b7dc6 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/grpc_asyncio.py @@ -17,24 +17,31 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.network_security_v1beta1.types import ( + authorization_policy, + client_tls_policy, + server_tls_policy, +) from google.cloud.network_security_v1beta1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -44,9 +51,6 @@ from google.cloud.network_security_v1beta1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1beta1.types import authorization_policy -from google.cloud.network_security_v1beta1.types import client_tls_policy -from google.cloud.network_security_v1beta1.types import server_tls_policy from .base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport from .grpc import NetworkSecurityGrpcTransport @@ -386,12 +390,12 @@ def list_authorization_policies( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_authorization_policies" not in self._stubs: - self._stubs[ - "list_authorization_policies" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.NetworkSecurity/ListAuthorizationPolicies", - request_serializer=authorization_policy.ListAuthorizationPoliciesRequest.serialize, - response_deserializer=authorization_policy.ListAuthorizationPoliciesResponse.deserialize, + self._stubs["list_authorization_policies"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.NetworkSecurity/ListAuthorizationPolicies", + request_serializer=authorization_policy.ListAuthorizationPoliciesRequest.serialize, + response_deserializer=authorization_policy.ListAuthorizationPoliciesResponse.deserialize, + ) ) return self._stubs["list_authorization_policies"] @@ -447,12 +451,12 @@ def create_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_authorization_policy" not in self._stubs: - self._stubs[ - "create_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.NetworkSecurity/CreateAuthorizationPolicy", - request_serializer=gcn_authorization_policy.CreateAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.NetworkSecurity/CreateAuthorizationPolicy", + request_serializer=gcn_authorization_policy.CreateAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_authorization_policy"] @@ -479,12 +483,12 @@ def update_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_authorization_policy" not in self._stubs: - self._stubs[ - "update_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.NetworkSecurity/UpdateAuthorizationPolicy", - request_serializer=gcn_authorization_policy.UpdateAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.NetworkSecurity/UpdateAuthorizationPolicy", + request_serializer=gcn_authorization_policy.UpdateAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_authorization_policy"] @@ -510,12 +514,12 @@ def delete_authorization_policy( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_authorization_policy" not in self._stubs: - self._stubs[ - "delete_authorization_policy" - ] = self._logged_channel.unary_unary( - "/google.cloud.networksecurity.v1beta1.NetworkSecurity/DeleteAuthorizationPolicy", - request_serializer=authorization_policy.DeleteAuthorizationPolicyRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_authorization_policy"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networksecurity.v1beta1.NetworkSecurity/DeleteAuthorizationPolicy", + request_serializer=authorization_policy.DeleteAuthorizationPolicyRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_authorization_policy"] diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/rest.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/rest.py index f4d42f4ab941..fcfe28485af8 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/rest.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/rest.py @@ -16,22 +16,29 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.network_security_v1beta1.types import ( + authorization_policy, + client_tls_policy, + server_tls_policy, +) from google.cloud.network_security_v1beta1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -41,9 +48,6 @@ from google.cloud.network_security_v1beta1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1beta1.types import authorization_policy -from google.cloud.network_security_v1beta1.types import client_tls_policy -from google.cloud.network_security_v1beta1.types import server_tls_policy from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseNetworkSecurityRestTransport @@ -1387,9 +1391,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateAuthorizationPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateAuthorizationPolicy._get_http_options() request, metadata = self._interceptor.pre_create_authorization_policy( request, metadata @@ -1415,7 +1417,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1544,9 +1546,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateClientTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateClientTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_create_client_tls_policy( request, metadata @@ -1572,7 +1572,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1701,9 +1701,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCreateServerTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCreateServerTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_create_server_tls_policy( request, metadata @@ -1729,7 +1727,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1858,9 +1856,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteAuthorizationPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteAuthorizationPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_authorization_policy( request, metadata @@ -1882,7 +1878,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2009,9 +2005,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteClientTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteClientTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_client_tls_policy( request, metadata @@ -2033,7 +2027,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2160,9 +2154,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteServerTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteServerTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_server_tls_policy( request, metadata @@ -2184,7 +2176,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2315,9 +2307,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetAuthorizationPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetAuthorizationPolicy._get_http_options() request, metadata = self._interceptor.pre_get_authorization_policy( request, metadata @@ -2473,9 +2463,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetClientTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetClientTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_get_client_tls_policy( request, metadata @@ -2630,9 +2618,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseGetServerTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseGetServerTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_get_server_tls_policy( request, metadata @@ -2783,9 +2769,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListAuthorizationPolicies._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListAuthorizationPolicies._get_http_options() request, metadata = self._interceptor.pre_list_authorization_policies( request, metadata @@ -2939,9 +2923,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListClientTlsPolicies._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListClientTlsPolicies._get_http_options() request, metadata = self._interceptor.pre_list_client_tls_policies( request, metadata @@ -3095,9 +3077,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListServerTlsPolicies._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListServerTlsPolicies._get_http_options() request, metadata = self._interceptor.pre_list_server_tls_policies( request, metadata @@ -3254,9 +3234,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateAuthorizationPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateAuthorizationPolicy._get_http_options() request, metadata = self._interceptor.pre_update_authorization_policy( request, metadata @@ -3282,7 +3260,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3411,9 +3389,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateClientTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateClientTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_update_client_tls_policy( request, metadata @@ -3439,7 +3415,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3568,9 +3544,7 @@ def __call__( """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseUpdateServerTlsPolicy._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseUpdateServerTlsPolicy._get_http_options() request, metadata = self._interceptor.pre_update_server_tls_policy( request, metadata @@ -3596,7 +3570,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3674,7 +3648,9 @@ def create_authorization_policy( ]: # 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._CreateAuthorizationPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._CreateAuthorizationPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_client_tls_policy( @@ -3705,7 +3681,9 @@ def delete_authorization_policy( ]: # 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._DeleteAuthorizationPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAuthorizationPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_client_tls_policy( @@ -3736,7 +3714,9 @@ def get_authorization_policy( ]: # 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._GetAuthorizationPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._GetAuthorizationPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_client_tls_policy( @@ -3767,7 +3747,9 @@ def list_authorization_policies( ]: # 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._ListAuthorizationPolicies(self._session, self._host, self._interceptor) # type: ignore + return self._ListAuthorizationPolicies( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_client_tls_policies( @@ -3800,7 +3782,9 @@ def update_authorization_policy( ]: # 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._UpdateAuthorizationPolicy(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAuthorizationPolicy( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_client_tls_policy( @@ -4447,9 +4431,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -4592,9 +4574,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -4711,9 +4691,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -4968,9 +4946,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseNetworkSecurityRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseNetworkSecurityRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseNetworkSecurityRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/rest_base.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/rest_base.py index 4ac12a4df1cf..cc49459f4804 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/rest_base.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/services/network_security/transports/rest_base.py @@ -19,11 +19,18 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.network_security_v1beta1.types import ( + authorization_policy, + client_tls_policy, + server_tls_policy, +) from google.cloud.network_security_v1beta1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -33,9 +40,6 @@ from google.cloud.network_security_v1beta1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1beta1.types import authorization_policy -from google.cloud.network_security_v1beta1.types import client_tls_policy -from google.cloud.network_security_v1beta1.types import server_tls_policy from .base import DEFAULT_CLIENT_INFO, NetworkSecurityTransport diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/__init__.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/__init__.py index 2abd2306932d..9754d209dd79 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/__init__.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/__init__.py @@ -31,7 +31,9 @@ ListClientTlsPoliciesResponse, UpdateClientTlsPolicyRequest, ) -from .common import OperationMetadata +from .common import ( + OperationMetadata, +) from .dns_threat_detector import ( CreateDnsThreatDetectorRequest, DeleteDnsThreatDetectorRequest, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/authorization_policy.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/authorization_policy.py index 180e08d896f1..9043b903de81 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/authorization_policy.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/authorization_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -84,6 +84,7 @@ class Action(proto.Enum): Deny rules should be avoided unless they are used to provide a default "deny all" fallback. """ + ACTION_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -221,19 +222,19 @@ class HttpHeaderMatch(proto.Message): message="AuthorizationPolicy.Rule.Destination.HttpHeaderMatch", ) - sources: MutableSequence[ - "AuthorizationPolicy.Rule.Source" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AuthorizationPolicy.Rule.Source", + sources: MutableSequence["AuthorizationPolicy.Rule.Source"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AuthorizationPolicy.Rule.Source", + ) ) - destinations: MutableSequence[ - "AuthorizationPolicy.Rule.Destination" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="AuthorizationPolicy.Rule.Destination", + destinations: MutableSequence["AuthorizationPolicy.Rule.Destination"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="AuthorizationPolicy.Rule.Destination", + ) ) name: str = proto.Field( @@ -321,12 +322,12 @@ class ListAuthorizationPoliciesResponse(proto.Message): def raw_page(self): return self - authorization_policies: MutableSequence[ - "AuthorizationPolicy" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="AuthorizationPolicy", + authorization_policies: MutableSequence["AuthorizationPolicy"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="AuthorizationPolicy", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/client_tls_policy.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/client_tls_policy.py index f0400fe6845c..8a67fd617b2d 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/client_tls_policy.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/client_tls_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.network_security_v1beta1.types import tls diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/common.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/common.py index ecd9a94a757a..c3d6e1e2ce85 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/common.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/common.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/dns_threat_detector.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/dns_threat_detector.py index 956e669f518f..a6a6b9e05481 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/dns_threat_detector.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/dns_threat_detector.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -72,6 +72,7 @@ class Provider(proto.Enum): INFOBLOX (1): The Infoblox DNS threat detector provider. """ + PROVIDER_UNSPECIFIED = 0 INFOBLOX = 1 diff --git a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/server_tls_policy.py b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/server_tls_policy.py index c793c2827aa4..dd1ea7a9efbf 100644 --- a/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/server_tls_policy.py +++ b/packages/google-cloud-network-security/google/cloud/network_security_v1beta1/types/server_tls_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.network_security_v1beta1.types import tls diff --git a/packages/google-cloud-network-security/noxfile.py b/packages/google-cloud-network-security/noxfile.py index 7cd9d41d22be..c0a1e3658473 100644 --- a/packages/google-cloud-network-security/noxfile.py +++ b/packages/google-cloud-network-security/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1/test_address_group_service.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1/test_address_group_service.py index 0e59fe23b636..b6fd84c609c6 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1/test_address_group_service.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1/test_address_group_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1.services.address_group_service import ( AddressGroupServiceAsyncClient, @@ -75,9 +77,8 @@ pagers, transports, ) +from google.cloud.network_security_v1.types import address_group, common from google.cloud.network_security_v1.types import address_group as gcn_address_group -from google.cloud.network_security_v1.types import address_group -from google.cloud.network_security_v1.types import common CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1011,10 +1012,9 @@ def test_address_group_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1059,10 +1059,9 @@ def test_address_group_service_client_get_mtls_endpoint_and_cert_source(client_c client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1098,10 +1097,9 @@ def test_address_group_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1357,13 +1355,13 @@ def test_address_group_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1480,9 +1478,9 @@ def test_list_address_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_address_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_address_groups] = ( + mock_rpc + ) request = {} client.list_address_groups(request) @@ -2035,9 +2033,9 @@ def test_get_address_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_address_group] = ( + mock_rpc + ) request = {} client.get_address_group(request) @@ -2389,9 +2387,9 @@ def test_create_address_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_address_group] = ( + mock_rpc + ) request = {} client.create_address_group(request) @@ -2755,9 +2753,9 @@ def test_update_address_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_address_group] = ( + mock_rpc + ) request = {} client.update_address_group(request) @@ -4192,9 +4190,9 @@ def test_delete_address_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_address_group] = ( + mock_rpc + ) request = {} client.delete_address_group(request) @@ -5034,9 +5032,9 @@ def test_list_address_groups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_address_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_address_groups] = ( + mock_rpc + ) request = {} client.list_address_groups(request) @@ -5294,9 +5292,9 @@ def test_get_address_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_address_group] = ( + mock_rpc + ) request = {} client.get_address_group(request) @@ -5478,9 +5476,9 @@ def test_create_address_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_address_group] = ( + mock_rpc + ) request = {} client.create_address_group(request) @@ -5698,9 +5696,9 @@ def test_update_address_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_address_group] = ( + mock_rpc + ) request = {} client.update_address_group(request) @@ -6493,9 +6491,9 @@ def test_delete_address_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_address_group] = ( + mock_rpc + ) request = {} client.delete_address_group(request) @@ -7534,8 +7532,9 @@ def test_list_address_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7600,18 +7599,20 @@ def test_list_address_groups_rest_interceptors(null_interceptor): ) client = AddressGroupServiceClient(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.AddressGroupServiceRestInterceptor, "post_list_address_groups" - ) as post, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, - "post_list_address_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, "pre_list_address_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, "post_list_address_groups" + ) as post, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "post_list_address_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, "pre_list_address_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7669,8 +7670,9 @@ def test_get_address_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7745,18 +7747,20 @@ def test_get_address_group_rest_interceptors(null_interceptor): ) client = AddressGroupServiceClient(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.AddressGroupServiceRestInterceptor, "post_get_address_group" - ) as post, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, - "post_get_address_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, "pre_get_address_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, "post_get_address_group" + ) as post, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "post_get_address_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, "pre_get_address_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7809,8 +7813,9 @@ def test_create_address_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7948,20 +7953,21 @@ def test_create_address_group_rest_interceptors(null_interceptor): ) client = AddressGroupServiceClient(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.AddressGroupServiceRestInterceptor, "post_create_address_group" - ) as post, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, - "post_create_address_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, "pre_create_address_group" - ) as pre: + 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.AddressGroupServiceRestInterceptor, "post_create_address_group" + ) as post, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "post_create_address_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, "pre_create_address_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8018,8 +8024,9 @@ def test_update_address_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8161,20 +8168,21 @@ def test_update_address_group_rest_interceptors(null_interceptor): ) client = AddressGroupServiceClient(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.AddressGroupServiceRestInterceptor, "post_update_address_group" - ) as post, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, - "post_update_address_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, "pre_update_address_group" - ) as pre: + 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.AddressGroupServiceRestInterceptor, "post_update_address_group" + ) as post, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "post_update_address_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, "pre_update_address_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8229,8 +8237,9 @@ def test_add_address_group_items_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8289,20 +8298,22 @@ def test_add_address_group_items_rest_interceptors(null_interceptor): ) client = AddressGroupServiceClient(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.AddressGroupServiceRestInterceptor, "post_add_address_group_items" - ) as post, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, - "post_add_address_group_items_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, "pre_add_address_group_items" - ) as pre: + 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.AddressGroupServiceRestInterceptor, + "post_add_address_group_items", + ) as post, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "post_add_address_group_items_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, "pre_add_address_group_items" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8357,8 +8368,9 @@ def test_remove_address_group_items_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8417,20 +8429,23 @@ def test_remove_address_group_items_rest_interceptors(null_interceptor): ) client = AddressGroupServiceClient(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.AddressGroupServiceRestInterceptor, "post_remove_address_group_items" - ) as post, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, - "post_remove_address_group_items_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, "pre_remove_address_group_items" - ) as pre: + 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.AddressGroupServiceRestInterceptor, + "post_remove_address_group_items", + ) as post, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "post_remove_address_group_items_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "pre_remove_address_group_items", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8485,8 +8500,9 @@ def test_clone_address_group_items_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8545,20 +8561,23 @@ def test_clone_address_group_items_rest_interceptors(null_interceptor): ) client = AddressGroupServiceClient(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.AddressGroupServiceRestInterceptor, "post_clone_address_group_items" - ) as post, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, - "post_clone_address_group_items_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, "pre_clone_address_group_items" - ) as pre: + 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.AddressGroupServiceRestInterceptor, + "post_clone_address_group_items", + ) as post, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "post_clone_address_group_items_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "pre_clone_address_group_items", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8611,8 +8630,9 @@ def test_delete_address_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8669,20 +8689,21 @@ def test_delete_address_group_rest_interceptors(null_interceptor): ) client = AddressGroupServiceClient(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.AddressGroupServiceRestInterceptor, "post_delete_address_group" - ) as post, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, - "post_delete_address_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, "pre_delete_address_group" - ) as pre: + 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.AddressGroupServiceRestInterceptor, "post_delete_address_group" + ) as post, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "post_delete_address_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, "pre_delete_address_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8737,8 +8758,9 @@ def test_list_address_group_references_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8805,20 +8827,22 @@ def test_list_address_group_references_rest_interceptors(null_interceptor): ) client = AddressGroupServiceClient(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.AddressGroupServiceRestInterceptor, - "post_list_address_group_references", - ) as post, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, - "post_list_address_group_references_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AddressGroupServiceRestInterceptor, - "pre_list_address_group_references", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "post_list_address_group_references", + ) as post, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "post_list_address_group_references_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AddressGroupServiceRestInterceptor, + "pre_list_address_group_references", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8876,8 +8900,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8936,8 +8961,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9001,8 +9027,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9068,8 +9095,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9135,8 +9163,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9199,8 +9228,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9261,8 +9291,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9323,8 +9354,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9385,8 +9417,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9731,11 +9764,14 @@ def test_address_group_service_base_transport(): def test_address_group_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1.services.address_group_service.transports.AddressGroupServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1.services.address_group_service.transports.AddressGroupServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AddressGroupServiceTransport( @@ -9752,9 +9788,12 @@ def test_address_group_service_base_transport_with_credentials_file(): def test_address_group_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1.services.address_group_service.transports.AddressGroupServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1.services.address_group_service.transports.AddressGroupServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AddressGroupServiceTransport() @@ -9826,11 +9865,12 @@ def test_address_group_service_transport_auth_gdch_credentials(transport_class): def test_address_group_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1/test_network_security.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1/test_network_security.py index 4d177a75b52d..582129fe1073 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1/test_network_security.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1/test_network_security.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1.services.network_security import ( NetworkSecurityAsyncClient, @@ -75,6 +77,13 @@ pagers, transports, ) +from google.cloud.network_security_v1.types import ( + authorization_policy, + client_tls_policy, + common, + server_tls_policy, + tls, +) from google.cloud.network_security_v1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -84,11 +93,6 @@ from google.cloud.network_security_v1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1.types import authorization_policy -from google.cloud.network_security_v1.types import client_tls_policy -from google.cloud.network_security_v1.types import common -from google.cloud.network_security_v1.types import server_tls_policy -from google.cloud.network_security_v1.types import tls CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -999,10 +1003,9 @@ def test_network_security_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1050,9 @@ def test_network_security_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1088,9 @@ def test_network_security_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1332,13 +1333,13 @@ def test_network_security_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3994,9 +3995,9 @@ def test_get_server_tls_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_tls_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_tls_policy] = ( + mock_rpc + ) request = {} client.get_server_tls_policy(request) @@ -5963,9 +5964,9 @@ def test_get_client_tls_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_client_tls_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_client_tls_policy] = ( + mock_rpc + ) request = {} client.get_client_tls_policy(request) @@ -8619,9 +8620,9 @@ def test_get_server_tls_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_tls_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_tls_policy] = ( + mock_rpc + ) request = {} client.get_server_tls_policy(request) @@ -9650,9 +9651,9 @@ def test_get_client_tls_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_client_tls_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_client_tls_policy] = ( + mock_rpc + ) request = {} client.get_client_tls_policy(request) @@ -11300,8 +11301,9 @@ def test_list_authorization_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11366,18 +11368,21 @@ def test_list_authorization_policies_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_authorization_policies" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_authorization_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_authorization_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_authorization_policies", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_authorization_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_list_authorization_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11437,8 +11442,9 @@ def test_get_authorization_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11507,18 +11513,20 @@ def test_get_authorization_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_authorization_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_authorization_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_authorization_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_authorization_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_authorization_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_authorization_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11576,8 +11584,9 @@ def test_create_authorization_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11734,20 +11743,22 @@ def test_create_authorization_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_authorization_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_authorization_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_authorization_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_create_authorization_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_authorization_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_create_authorization_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11804,8 +11815,9 @@ def test_update_authorization_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11966,20 +11978,22 @@ def test_update_authorization_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_authorization_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_authorization_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_authorization_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_update_authorization_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_authorization_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_update_authorization_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12034,8 +12048,9 @@ def test_delete_authorization_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12094,20 +12109,22 @@ def test_delete_authorization_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_authorization_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_authorization_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_authorization_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_delete_authorization_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_authorization_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_delete_authorization_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12160,8 +12177,9 @@ def test_list_server_tls_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12224,18 +12242,20 @@ def test_list_server_tls_policies_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_server_tls_policies" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_server_tls_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_server_tls_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_list_server_tls_policies" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_server_tls_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_list_server_tls_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12295,8 +12315,9 @@ def test_get_server_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12365,18 +12386,20 @@ def test_get_server_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_server_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_server_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_server_tls_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_server_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_server_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_server_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12431,8 +12454,9 @@ def test_create_server_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12577,20 +12601,21 @@ def test_create_server_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_server_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_server_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_server_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_create_server_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_server_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_create_server_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12647,8 +12672,9 @@ def test_update_server_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12797,20 +12823,21 @@ def test_update_server_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_server_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_server_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_server_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_update_server_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_server_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_update_server_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12865,8 +12892,9 @@ def test_delete_server_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12925,20 +12953,21 @@ def test_delete_server_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_server_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_server_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_server_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_delete_server_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_server_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_delete_server_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12991,8 +13020,9 @@ def test_list_client_tls_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13055,18 +13085,20 @@ def test_list_client_tls_policies_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_client_tls_policies" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_client_tls_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_client_tls_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_list_client_tls_policies" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_client_tls_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_list_client_tls_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13126,8 +13158,9 @@ def test_get_client_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13196,18 +13229,20 @@ def test_get_client_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_client_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_client_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_client_tls_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_client_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_client_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_client_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13262,8 +13297,9 @@ def test_create_client_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13406,20 +13442,21 @@ def test_create_client_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_client_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_client_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_client_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_create_client_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_client_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_create_client_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13476,8 +13513,9 @@ def test_update_client_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13624,20 +13662,21 @@ def test_update_client_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_client_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_client_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_client_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_update_client_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_client_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_update_client_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13692,8 +13731,9 @@ def test_delete_client_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13752,20 +13792,21 @@ def test_delete_client_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_client_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_client_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_client_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_delete_client_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_client_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_delete_client_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13818,8 +13859,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13878,8 +13920,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13943,8 +13986,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14010,8 +14054,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14077,8 +14122,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14141,8 +14187,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14203,8 +14250,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14265,8 +14313,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14327,8 +14376,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14811,11 +14861,14 @@ def test_network_security_base_transport(): def test_network_security_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1.services.network_security.transports.NetworkSecurityTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1.services.network_security.transports.NetworkSecurityTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkSecurityTransport( @@ -14832,9 +14885,12 @@ def test_network_security_base_transport_with_credentials_file(): def test_network_security_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1.services.network_security.transports.NetworkSecurityTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1.services.network_security.transports.NetworkSecurityTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkSecurityTransport() @@ -14906,11 +14962,12 @@ def test_network_security_transport_auth_gdch_credentials(transport_class): def test_network_security_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1/test_organization_address_group_service.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1/test_organization_address_group_service.py index 3303eef9f4ab..544745a7d3b0 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1/test_organization_address_group_service.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1/test_organization_address_group_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1.services.organization_address_group_service import ( OrganizationAddressGroupServiceAsyncClient, @@ -75,9 +77,8 @@ pagers, transports, ) +from google.cloud.network_security_v1.types import address_group, common from google.cloud.network_security_v1.types import address_group as gcn_address_group -from google.cloud.network_security_v1.types import address_group -from google.cloud.network_security_v1.types import common CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1078,10 +1079,9 @@ def test_organization_address_group_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1126,10 +1126,9 @@ def test_organization_address_group_service_client_get_mtls_endpoint_and_cert_so client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1165,10 +1164,9 @@ def test_organization_address_group_service_client_get_mtls_endpoint_and_cert_so "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1429,13 +1427,13 @@ def test_organization_address_group_service_client_create_channel_credentials_fi ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1552,9 +1550,9 @@ def test_list_address_groups_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_address_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_address_groups] = ( + mock_rpc + ) request = {} client.list_address_groups(request) @@ -2107,9 +2105,9 @@ def test_get_address_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_address_group] = ( + mock_rpc + ) request = {} client.get_address_group(request) @@ -2461,9 +2459,9 @@ def test_create_address_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_address_group] = ( + mock_rpc + ) request = {} client.create_address_group(request) @@ -2827,9 +2825,9 @@ def test_update_address_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_address_group] = ( + mock_rpc + ) request = {} client.update_address_group(request) @@ -4264,9 +4262,9 @@ def test_delete_address_group_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_address_group] = ( + mock_rpc + ) request = {} client.delete_address_group(request) @@ -5106,9 +5104,9 @@ def test_list_address_groups_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_address_groups - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_address_groups] = ( + mock_rpc + ) request = {} client.list_address_groups(request) @@ -5366,9 +5364,9 @@ def test_get_address_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_address_group] = ( + mock_rpc + ) request = {} client.get_address_group(request) @@ -5550,9 +5548,9 @@ def test_create_address_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_address_group] = ( + mock_rpc + ) request = {} client.create_address_group(request) @@ -5770,9 +5768,9 @@ def test_update_address_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_address_group] = ( + mock_rpc + ) request = {} client.update_address_group(request) @@ -6565,9 +6563,9 @@ def test_delete_address_group_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_address_group - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_address_group] = ( + mock_rpc + ) request = {} client.delete_address_group(request) @@ -7606,8 +7604,9 @@ def test_list_address_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7672,20 +7671,22 @@ def test_list_address_groups_rest_interceptors(null_interceptor): ) client = OrganizationAddressGroupServiceClient(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.OrganizationAddressGroupServiceRestInterceptor, - "post_list_address_groups", - ) as post, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "post_list_address_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "pre_list_address_groups", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "post_list_address_groups", + ) as post, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "post_list_address_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "pre_list_address_groups", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7745,8 +7746,9 @@ def test_get_address_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7823,20 +7825,22 @@ def test_get_address_group_rest_interceptors(null_interceptor): ) client = OrganizationAddressGroupServiceClient(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.OrganizationAddressGroupServiceRestInterceptor, - "post_get_address_group", - ) as post, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "post_get_address_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "pre_get_address_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "post_get_address_group", + ) as post, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "post_get_address_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "pre_get_address_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7889,8 +7893,9 @@ def test_create_address_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8028,22 +8033,23 @@ def test_create_address_group_rest_interceptors(null_interceptor): ) client = OrganizationAddressGroupServiceClient(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.OrganizationAddressGroupServiceRestInterceptor, - "post_create_address_group", - ) as post, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "post_create_address_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "pre_create_address_group", - ) as pre: + 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.OrganizationAddressGroupServiceRestInterceptor, + "post_create_address_group", + ) as post, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "post_create_address_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "pre_create_address_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8100,8 +8106,9 @@ def test_update_address_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8243,22 +8250,23 @@ def test_update_address_group_rest_interceptors(null_interceptor): ) client = OrganizationAddressGroupServiceClient(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.OrganizationAddressGroupServiceRestInterceptor, - "post_update_address_group", - ) as post, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "post_update_address_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "pre_update_address_group", - ) as pre: + 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.OrganizationAddressGroupServiceRestInterceptor, + "post_update_address_group", + ) as post, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "post_update_address_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "pre_update_address_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8313,8 +8321,9 @@ def test_add_address_group_items_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8373,22 +8382,23 @@ def test_add_address_group_items_rest_interceptors(null_interceptor): ) client = OrganizationAddressGroupServiceClient(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.OrganizationAddressGroupServiceRestInterceptor, - "post_add_address_group_items", - ) as post, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "post_add_address_group_items_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "pre_add_address_group_items", - ) as pre: + 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.OrganizationAddressGroupServiceRestInterceptor, + "post_add_address_group_items", + ) as post, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "post_add_address_group_items_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "pre_add_address_group_items", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8443,8 +8453,9 @@ def test_remove_address_group_items_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8503,22 +8514,23 @@ def test_remove_address_group_items_rest_interceptors(null_interceptor): ) client = OrganizationAddressGroupServiceClient(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.OrganizationAddressGroupServiceRestInterceptor, - "post_remove_address_group_items", - ) as post, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "post_remove_address_group_items_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "pre_remove_address_group_items", - ) as pre: + 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.OrganizationAddressGroupServiceRestInterceptor, + "post_remove_address_group_items", + ) as post, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "post_remove_address_group_items_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "pre_remove_address_group_items", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8573,8 +8585,9 @@ def test_clone_address_group_items_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8633,22 +8646,23 @@ def test_clone_address_group_items_rest_interceptors(null_interceptor): ) client = OrganizationAddressGroupServiceClient(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.OrganizationAddressGroupServiceRestInterceptor, - "post_clone_address_group_items", - ) as post, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "post_clone_address_group_items_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "pre_clone_address_group_items", - ) as pre: + 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.OrganizationAddressGroupServiceRestInterceptor, + "post_clone_address_group_items", + ) as post, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "post_clone_address_group_items_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "pre_clone_address_group_items", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8703,8 +8717,9 @@ def test_delete_address_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8763,22 +8778,23 @@ def test_delete_address_group_rest_interceptors(null_interceptor): ) client = OrganizationAddressGroupServiceClient(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.OrganizationAddressGroupServiceRestInterceptor, - "post_delete_address_group", - ) as post, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "post_delete_address_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "pre_delete_address_group", - ) as pre: + 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.OrganizationAddressGroupServiceRestInterceptor, + "post_delete_address_group", + ) as post, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "post_delete_address_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "pre_delete_address_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8833,8 +8849,9 @@ def test_list_address_group_references_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8901,20 +8918,22 @@ def test_list_address_group_references_rest_interceptors(null_interceptor): ) client = OrganizationAddressGroupServiceClient(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.OrganizationAddressGroupServiceRestInterceptor, - "post_list_address_group_references", - ) as post, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "post_list_address_group_references_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationAddressGroupServiceRestInterceptor, - "pre_list_address_group_references", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "post_list_address_group_references", + ) as post, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "post_list_address_group_references_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationAddressGroupServiceRestInterceptor, + "pre_list_address_group_references", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8972,8 +8991,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9032,8 +9052,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9097,8 +9118,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9164,8 +9186,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9231,8 +9254,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9295,8 +9319,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9357,8 +9382,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9419,8 +9445,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9481,8 +9508,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9827,11 +9855,14 @@ def test_organization_address_group_service_base_transport(): def test_organization_address_group_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1.services.organization_address_group_service.transports.OrganizationAddressGroupServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1.services.organization_address_group_service.transports.OrganizationAddressGroupServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrganizationAddressGroupServiceTransport( @@ -9848,9 +9879,12 @@ def test_organization_address_group_service_base_transport_with_credentials_file def test_organization_address_group_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1.services.organization_address_group_service.transports.OrganizationAddressGroupServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1.services.organization_address_group_service.transports.OrganizationAddressGroupServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrganizationAddressGroupServiceTransport() @@ -9929,11 +9963,12 @@ def test_organization_address_group_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_dns_threat_detector_service.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_dns_threat_detector_service.py index 614cd892f9c0..cfc03b048039 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_dns_threat_detector_service.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_dns_threat_detector_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,21 +43,28 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.dns_threat_detector_service import ( DnsThreatDetectorServiceAsyncClient, @@ -65,10 +72,10 @@ pagers, transports, ) +from google.cloud.network_security_v1alpha1.types import dns_threat_detector from google.cloud.network_security_v1alpha1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1alpha1.types import dns_threat_detector CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1013,10 +1020,9 @@ def test_dns_threat_detector_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1067,9 @@ def test_dns_threat_detector_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1105,9 @@ def test_dns_threat_detector_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,13 +1364,13 @@ def test_dns_threat_detector_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4808,8 +4812,9 @@ def test_list_dns_threat_detectors_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4876,20 +4881,22 @@ def test_list_dns_threat_detectors_rest_interceptors(null_interceptor): ) client = DnsThreatDetectorServiceClient(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.DnsThreatDetectorServiceRestInterceptor, - "post_list_dns_threat_detectors", - ) as post, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "post_list_dns_threat_detectors_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "pre_list_dns_threat_detectors", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_list_dns_threat_detectors", + ) as post, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_list_dns_threat_detectors_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "pre_list_dns_threat_detectors", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4949,8 +4956,9 @@ def test_get_dns_threat_detector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5019,20 +5027,22 @@ def test_get_dns_threat_detector_rest_interceptors(null_interceptor): ) client = DnsThreatDetectorServiceClient(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.DnsThreatDetectorServiceRestInterceptor, - "post_get_dns_threat_detector", - ) as post, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "post_get_dns_threat_detector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "pre_get_dns_threat_detector", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_get_dns_threat_detector", + ) as post, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_get_dns_threat_detector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "pre_get_dns_threat_detector", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5090,8 +5100,9 @@ def test_create_dns_threat_detector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5237,20 +5248,22 @@ def test_create_dns_threat_detector_rest_interceptors(null_interceptor): ) client = DnsThreatDetectorServiceClient(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.DnsThreatDetectorServiceRestInterceptor, - "post_create_dns_threat_detector", - ) as post, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "post_create_dns_threat_detector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "pre_create_dns_threat_detector", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_create_dns_threat_detector", + ) as post, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_create_dns_threat_detector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "pre_create_dns_threat_detector", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5312,8 +5325,9 @@ def test_update_dns_threat_detector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5463,20 +5477,22 @@ def test_update_dns_threat_detector_rest_interceptors(null_interceptor): ) client = DnsThreatDetectorServiceClient(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.DnsThreatDetectorServiceRestInterceptor, - "post_update_dns_threat_detector", - ) as post, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "post_update_dns_threat_detector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "pre_update_dns_threat_detector", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_update_dns_threat_detector", + ) as post, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_update_dns_threat_detector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "pre_update_dns_threat_detector", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5536,8 +5552,9 @@ def test_delete_dns_threat_detector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5596,14 +5613,14 @@ def test_delete_dns_threat_detector_rest_interceptors(null_interceptor): ) client = DnsThreatDetectorServiceClient(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.DnsThreatDetectorServiceRestInterceptor, - "pre_delete_dns_threat_detector", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "pre_delete_dns_threat_detector", + ) as pre, + ): pre.assert_not_called() pb_message = dns_threat_detector.DeleteDnsThreatDetectorRequest.pb( dns_threat_detector.DeleteDnsThreatDetectorRequest() @@ -5648,8 +5665,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5708,8 +5726,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5773,8 +5792,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5840,8 +5860,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5907,8 +5928,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5971,8 +5993,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6033,8 +6056,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6095,8 +6119,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6157,8 +6182,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6389,11 +6415,14 @@ def test_dns_threat_detector_service_base_transport(): def test_dns_threat_detector_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1alpha1.services.dns_threat_detector_service.transports.DnsThreatDetectorServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1alpha1.services.dns_threat_detector_service.transports.DnsThreatDetectorServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DnsThreatDetectorServiceTransport( @@ -6410,9 +6439,12 @@ def test_dns_threat_detector_service_base_transport_with_credentials_file(): def test_dns_threat_detector_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1alpha1.services.dns_threat_detector_service.transports.DnsThreatDetectorServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1alpha1.services.dns_threat_detector_service.transports.DnsThreatDetectorServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DnsThreatDetectorServiceTransport() @@ -6486,11 +6518,12 @@ def test_dns_threat_detector_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_firewall_activation.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_firewall_activation.py index fad13f045d87..4f2d7ae6ec8d 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_firewall_activation.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_firewall_activation.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.firewall_activation import ( FirewallActivationAsyncClient, @@ -999,10 +1001,9 @@ def test_firewall_activation_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1048,9 @@ def test_firewall_activation_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1086,9 @@ def test_firewall_activation_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1337,13 +1336,13 @@ def test_firewall_activation_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2028,9 +2027,9 @@ def test_get_firewall_endpoint_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_firewall_endpoint - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_firewall_endpoint] = ( + mock_rpc + ) request = {} client.get_firewall_endpoint(request) @@ -5699,9 +5698,9 @@ def test_get_firewall_endpoint_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_firewall_endpoint - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_firewall_endpoint] = ( + mock_rpc + ) request = {} client.get_firewall_endpoint(request) @@ -8225,8 +8224,9 @@ def test_list_firewall_endpoints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8293,18 +8293,20 @@ def test_list_firewall_endpoints_rest_interceptors(null_interceptor): ) client = FirewallActivationClient(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.FirewallActivationRestInterceptor, "post_list_firewall_endpoints" - ) as post, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "post_list_firewall_endpoints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallActivationRestInterceptor, "pre_list_firewall_endpoints" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallActivationRestInterceptor, "post_list_firewall_endpoints" + ) as post, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "post_list_firewall_endpoints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallActivationRestInterceptor, "pre_list_firewall_endpoints" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8364,8 +8366,9 @@ def test_get_firewall_endpoint_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8444,18 +8447,20 @@ def test_get_firewall_endpoint_rest_interceptors(null_interceptor): ) client = FirewallActivationClient(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.FirewallActivationRestInterceptor, "post_get_firewall_endpoint" - ) as post, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "post_get_firewall_endpoint_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallActivationRestInterceptor, "pre_get_firewall_endpoint" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallActivationRestInterceptor, "post_get_firewall_endpoint" + ) as post, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "post_get_firewall_endpoint_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallActivationRestInterceptor, "pre_get_firewall_endpoint" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8513,8 +8518,9 @@ def test_create_firewall_endpoint_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8658,20 +8664,22 @@ def test_create_firewall_endpoint_rest_interceptors(null_interceptor): ) client = FirewallActivationClient(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.FirewallActivationRestInterceptor, "post_create_firewall_endpoint" - ) as post, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "post_create_firewall_endpoint_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallActivationRestInterceptor, "pre_create_firewall_endpoint" - ) as pre: + 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.FirewallActivationRestInterceptor, + "post_create_firewall_endpoint", + ) as post, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "post_create_firewall_endpoint_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallActivationRestInterceptor, "pre_create_firewall_endpoint" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8726,8 +8734,9 @@ def test_delete_firewall_endpoint_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8786,20 +8795,22 @@ def test_delete_firewall_endpoint_rest_interceptors(null_interceptor): ) client = FirewallActivationClient(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.FirewallActivationRestInterceptor, "post_delete_firewall_endpoint" - ) as post, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "post_delete_firewall_endpoint_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallActivationRestInterceptor, "pre_delete_firewall_endpoint" - ) as pre: + 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.FirewallActivationRestInterceptor, + "post_delete_firewall_endpoint", + ) as post, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "post_delete_firewall_endpoint_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallActivationRestInterceptor, "pre_delete_firewall_endpoint" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8856,8 +8867,9 @@ def test_update_firewall_endpoint_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9005,20 +9017,22 @@ def test_update_firewall_endpoint_rest_interceptors(null_interceptor): ) client = FirewallActivationClient(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.FirewallActivationRestInterceptor, "post_update_firewall_endpoint" - ) as post, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "post_update_firewall_endpoint_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallActivationRestInterceptor, "pre_update_firewall_endpoint" - ) as pre: + 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.FirewallActivationRestInterceptor, + "post_update_firewall_endpoint", + ) as post, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "post_update_firewall_endpoint_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallActivationRestInterceptor, "pre_update_firewall_endpoint" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9071,8 +9085,9 @@ def test_list_firewall_endpoint_associations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9139,20 +9154,22 @@ def test_list_firewall_endpoint_associations_rest_interceptors(null_interceptor) ) client = FirewallActivationClient(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.FirewallActivationRestInterceptor, - "post_list_firewall_endpoint_associations", - ) as post, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "post_list_firewall_endpoint_associations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "pre_list_firewall_endpoint_associations", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "post_list_firewall_endpoint_associations", + ) as post, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "post_list_firewall_endpoint_associations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "pre_list_firewall_endpoint_associations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9216,8 +9233,9 @@ def test_get_firewall_endpoint_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9296,20 +9314,22 @@ def test_get_firewall_endpoint_association_rest_interceptors(null_interceptor): ) client = FirewallActivationClient(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.FirewallActivationRestInterceptor, - "post_get_firewall_endpoint_association", - ) as post, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "post_get_firewall_endpoint_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "pre_get_firewall_endpoint_association", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "post_get_firewall_endpoint_association", + ) as post, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "post_get_firewall_endpoint_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "pre_get_firewall_endpoint_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9367,8 +9387,9 @@ def test_create_firewall_endpoint_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9514,22 +9535,23 @@ def test_create_firewall_endpoint_association_rest_interceptors(null_interceptor ) client = FirewallActivationClient(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.FirewallActivationRestInterceptor, - "post_create_firewall_endpoint_association", - ) as post, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "post_create_firewall_endpoint_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "pre_create_firewall_endpoint_association", - ) as pre: + 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.FirewallActivationRestInterceptor, + "post_create_firewall_endpoint_association", + ) as post, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "post_create_firewall_endpoint_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "pre_create_firewall_endpoint_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9584,8 +9606,9 @@ def test_delete_firewall_endpoint_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9644,22 +9667,23 @@ def test_delete_firewall_endpoint_association_rest_interceptors(null_interceptor ) client = FirewallActivationClient(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.FirewallActivationRestInterceptor, - "post_delete_firewall_endpoint_association", - ) as post, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "post_delete_firewall_endpoint_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "pre_delete_firewall_endpoint_association", - ) as pre: + 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.FirewallActivationRestInterceptor, + "post_delete_firewall_endpoint_association", + ) as post, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "post_delete_firewall_endpoint_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "pre_delete_firewall_endpoint_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9716,8 +9740,9 @@ def test_update_firewall_endpoint_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9867,22 +9892,23 @@ def test_update_firewall_endpoint_association_rest_interceptors(null_interceptor ) client = FirewallActivationClient(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.FirewallActivationRestInterceptor, - "post_update_firewall_endpoint_association", - ) as post, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "post_update_firewall_endpoint_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FirewallActivationRestInterceptor, - "pre_update_firewall_endpoint_association", - ) as pre: + 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.FirewallActivationRestInterceptor, + "post_update_firewall_endpoint_association", + ) as post, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "post_update_firewall_endpoint_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FirewallActivationRestInterceptor, + "pre_update_firewall_endpoint_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9935,8 +9961,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9995,8 +10022,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10060,8 +10088,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10127,8 +10156,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10194,8 +10224,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10258,8 +10289,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10320,8 +10352,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10382,8 +10415,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10444,8 +10478,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10813,11 +10848,14 @@ def test_firewall_activation_base_transport(): def test_firewall_activation_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1alpha1.services.firewall_activation.transports.FirewallActivationTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1alpha1.services.firewall_activation.transports.FirewallActivationTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FirewallActivationTransport( @@ -10834,9 +10872,12 @@ def test_firewall_activation_base_transport_with_credentials_file(): def test_firewall_activation_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1alpha1.services.firewall_activation.transports.FirewallActivationTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1alpha1.services.firewall_activation.transports.FirewallActivationTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FirewallActivationTransport() @@ -10908,11 +10949,12 @@ def test_firewall_activation_transport_auth_gdch_credentials(transport_class): def test_firewall_activation_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_intercept.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_intercept.py index c785c58cdce7..10bed77e665a 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_intercept.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_intercept.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.intercept import ( InterceptAsyncClient, @@ -931,10 +933,9 @@ def test_intercept_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +980,9 @@ def test_intercept_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1018,9 @@ def test_intercept_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1250,13 +1249,13 @@ def test_intercept_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -11997,9 +11996,9 @@ def test_create_intercept_deployment_group_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "interceptDeploymentGroupId" - ] = "intercept_deployment_group_id_value" + jsonified_request["interceptDeploymentGroupId"] = ( + "intercept_deployment_group_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -14787,8 +14786,9 @@ def test_list_intercept_endpoint_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14849,18 +14849,20 @@ def test_list_intercept_endpoint_groups_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_list_intercept_endpoint_groups" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_list_intercept_endpoint_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_list_intercept_endpoint_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterceptRestInterceptor, "post_list_intercept_endpoint_groups" + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_list_intercept_endpoint_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_list_intercept_endpoint_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14920,8 +14922,9 @@ def test_get_intercept_endpoint_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14992,18 +14995,20 @@ def test_get_intercept_endpoint_group_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_get_intercept_endpoint_group" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_get_intercept_endpoint_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_get_intercept_endpoint_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterceptRestInterceptor, "post_get_intercept_endpoint_group" + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_get_intercept_endpoint_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_get_intercept_endpoint_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15058,8 +15063,9 @@ def test_create_intercept_endpoint_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15202,20 +15208,21 @@ def test_create_intercept_endpoint_group_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_create_intercept_endpoint_group" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_create_intercept_endpoint_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_create_intercept_endpoint_group" - ) as pre: + 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.InterceptRestInterceptor, "post_create_intercept_endpoint_group" + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_create_intercept_endpoint_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_create_intercept_endpoint_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15272,8 +15279,9 @@ def test_update_intercept_endpoint_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15420,20 +15428,21 @@ def test_update_intercept_endpoint_group_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_update_intercept_endpoint_group" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_update_intercept_endpoint_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_update_intercept_endpoint_group" - ) as pre: + 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.InterceptRestInterceptor, "post_update_intercept_endpoint_group" + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_update_intercept_endpoint_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_update_intercept_endpoint_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15488,8 +15497,9 @@ def test_delete_intercept_endpoint_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15546,20 +15556,21 @@ def test_delete_intercept_endpoint_group_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_delete_intercept_endpoint_group" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_delete_intercept_endpoint_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_delete_intercept_endpoint_group" - ) as pre: + 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.InterceptRestInterceptor, "post_delete_intercept_endpoint_group" + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_delete_intercept_endpoint_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_delete_intercept_endpoint_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15612,8 +15623,9 @@ def test_list_intercept_endpoint_group_associations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15676,20 +15688,22 @@ def test_list_intercept_endpoint_group_associations_rest_interceptors(null_inter ) client = InterceptClient(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.InterceptRestInterceptor, - "post_list_intercept_endpoint_group_associations", - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_list_intercept_endpoint_group_associations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, - "pre_list_intercept_endpoint_group_associations", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_list_intercept_endpoint_group_associations", + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_list_intercept_endpoint_group_associations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, + "pre_list_intercept_endpoint_group_associations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15749,8 +15763,9 @@ def test_get_intercept_endpoint_group_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15821,20 +15836,22 @@ def test_get_intercept_endpoint_group_association_rest_interceptors(null_interce ) client = InterceptClient(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.InterceptRestInterceptor, - "post_get_intercept_endpoint_group_association", - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_get_intercept_endpoint_group_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, - "pre_get_intercept_endpoint_group_association", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_get_intercept_endpoint_group_association", + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_get_intercept_endpoint_group_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, + "pre_get_intercept_endpoint_group_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15892,8 +15909,9 @@ def test_create_intercept_endpoint_group_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16039,22 +16057,23 @@ def test_create_intercept_endpoint_group_association_rest_interceptors( ) client = InterceptClient(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.InterceptRestInterceptor, - "post_create_intercept_endpoint_group_association", - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_create_intercept_endpoint_group_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, - "pre_create_intercept_endpoint_group_association", - ) as pre: + 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.InterceptRestInterceptor, + "post_create_intercept_endpoint_group_association", + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_create_intercept_endpoint_group_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, + "pre_create_intercept_endpoint_group_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16111,8 +16130,9 @@ def test_update_intercept_endpoint_group_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16262,22 +16282,23 @@ def test_update_intercept_endpoint_group_association_rest_interceptors( ) client = InterceptClient(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.InterceptRestInterceptor, - "post_update_intercept_endpoint_group_association", - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_update_intercept_endpoint_group_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, - "pre_update_intercept_endpoint_group_association", - ) as pre: + 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.InterceptRestInterceptor, + "post_update_intercept_endpoint_group_association", + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_update_intercept_endpoint_group_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, + "pre_update_intercept_endpoint_group_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16332,8 +16353,9 @@ def test_delete_intercept_endpoint_group_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16392,22 +16414,23 @@ def test_delete_intercept_endpoint_group_association_rest_interceptors( ) client = InterceptClient(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.InterceptRestInterceptor, - "post_delete_intercept_endpoint_group_association", - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_delete_intercept_endpoint_group_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, - "pre_delete_intercept_endpoint_group_association", - ) as pre: + 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.InterceptRestInterceptor, + "post_delete_intercept_endpoint_group_association", + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_delete_intercept_endpoint_group_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, + "pre_delete_intercept_endpoint_group_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16460,8 +16483,9 @@ def test_list_intercept_deployment_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16522,18 +16546,20 @@ def test_list_intercept_deployment_groups_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_list_intercept_deployment_groups" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_list_intercept_deployment_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_list_intercept_deployment_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterceptRestInterceptor, "post_list_intercept_deployment_groups" + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_list_intercept_deployment_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_list_intercept_deployment_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16593,8 +16619,9 @@ def test_get_intercept_deployment_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16665,18 +16692,20 @@ def test_get_intercept_deployment_group_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_get_intercept_deployment_group" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_get_intercept_deployment_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_get_intercept_deployment_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterceptRestInterceptor, "post_get_intercept_deployment_group" + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_get_intercept_deployment_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_get_intercept_deployment_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16731,8 +16760,9 @@ def test_create_intercept_deployment_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16873,20 +16903,22 @@ def test_create_intercept_deployment_group_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_create_intercept_deployment_group" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_create_intercept_deployment_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_create_intercept_deployment_group" - ) as pre: + 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.InterceptRestInterceptor, + "post_create_intercept_deployment_group", + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_create_intercept_deployment_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_create_intercept_deployment_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16943,8 +16975,9 @@ def test_update_intercept_deployment_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17089,20 +17122,22 @@ def test_update_intercept_deployment_group_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_update_intercept_deployment_group" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_update_intercept_deployment_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_update_intercept_deployment_group" - ) as pre: + 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.InterceptRestInterceptor, + "post_update_intercept_deployment_group", + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_update_intercept_deployment_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_update_intercept_deployment_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17157,8 +17192,9 @@ def test_delete_intercept_deployment_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17215,20 +17251,22 @@ def test_delete_intercept_deployment_group_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_delete_intercept_deployment_group" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_delete_intercept_deployment_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_delete_intercept_deployment_group" - ) as pre: + 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.InterceptRestInterceptor, + "post_delete_intercept_deployment_group", + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_delete_intercept_deployment_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_delete_intercept_deployment_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17281,8 +17319,9 @@ def test_list_intercept_deployments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17345,18 +17384,20 @@ def test_list_intercept_deployments_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_list_intercept_deployments" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_list_intercept_deployments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_list_intercept_deployments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterceptRestInterceptor, "post_list_intercept_deployments" + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_list_intercept_deployments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_list_intercept_deployments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17416,8 +17457,9 @@ def test_get_intercept_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17490,18 +17532,20 @@ def test_get_intercept_deployment_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_get_intercept_deployment" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_get_intercept_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_get_intercept_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.InterceptRestInterceptor, "post_get_intercept_deployment" + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_get_intercept_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_get_intercept_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17556,8 +17600,9 @@ def test_create_intercept_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17694,20 +17739,21 @@ def test_create_intercept_deployment_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_create_intercept_deployment" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_create_intercept_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_create_intercept_deployment" - ) as pre: + 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.InterceptRestInterceptor, "post_create_intercept_deployment" + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_create_intercept_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_create_intercept_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17764,8 +17810,9 @@ def test_update_intercept_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17906,20 +17953,21 @@ def test_update_intercept_deployment_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_update_intercept_deployment" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_update_intercept_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_update_intercept_deployment" - ) as pre: + 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.InterceptRestInterceptor, "post_update_intercept_deployment" + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_update_intercept_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_update_intercept_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17974,8 +18022,9 @@ def test_delete_intercept_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18032,20 +18081,21 @@ def test_delete_intercept_deployment_rest_interceptors(null_interceptor): ) client = InterceptClient(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.InterceptRestInterceptor, "post_delete_intercept_deployment" - ) as post, mock.patch.object( - transports.InterceptRestInterceptor, - "post_delete_intercept_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.InterceptRestInterceptor, "pre_delete_intercept_deployment" - ) as pre: + 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.InterceptRestInterceptor, "post_delete_intercept_deployment" + ) as post, + mock.patch.object( + transports.InterceptRestInterceptor, + "post_delete_intercept_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.InterceptRestInterceptor, "pre_delete_intercept_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18098,8 +18148,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18158,8 +18209,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18223,8 +18275,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18290,8 +18343,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18357,8 +18411,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18421,8 +18476,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18483,8 +18539,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18545,8 +18602,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18607,8 +18665,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -19206,11 +19265,14 @@ def test_intercept_base_transport(): def test_intercept_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1alpha1.services.intercept.transports.InterceptTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1alpha1.services.intercept.transports.InterceptTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterceptTransport( @@ -19227,9 +19289,12 @@ def test_intercept_base_transport_with_credentials_file(): def test_intercept_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1alpha1.services.intercept.transports.InterceptTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1alpha1.services.intercept.transports.InterceptTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InterceptTransport() @@ -19301,11 +19366,12 @@ def test_intercept_transport_auth_gdch_credentials(transport_class): def test_intercept_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_mirroring.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_mirroring.py index 151f8327711c..b78a1d741a75 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_mirroring.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_mirroring.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.mirroring import ( MirroringAsyncClient, @@ -931,10 +933,9 @@ def test_mirroring_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -979,10 +980,9 @@ def test_mirroring_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1018,10 +1018,9 @@ def test_mirroring_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1250,13 +1249,13 @@ def test_mirroring_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -12001,9 +12000,9 @@ def test_create_mirroring_deployment_group_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "mirroringDeploymentGroupId" - ] = "mirroring_deployment_group_id_value" + jsonified_request["mirroringDeploymentGroupId"] = ( + "mirroring_deployment_group_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -14792,8 +14791,9 @@ def test_list_mirroring_endpoint_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14854,18 +14854,20 @@ def test_list_mirroring_endpoint_groups_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_list_mirroring_endpoint_groups" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_list_mirroring_endpoint_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_list_mirroring_endpoint_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MirroringRestInterceptor, "post_list_mirroring_endpoint_groups" + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_list_mirroring_endpoint_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_list_mirroring_endpoint_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14925,8 +14927,9 @@ def test_get_mirroring_endpoint_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14999,18 +15002,20 @@ def test_get_mirroring_endpoint_group_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_get_mirroring_endpoint_group" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_get_mirroring_endpoint_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_get_mirroring_endpoint_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MirroringRestInterceptor, "post_get_mirroring_endpoint_group" + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_get_mirroring_endpoint_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_get_mirroring_endpoint_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15065,8 +15070,9 @@ def test_create_mirroring_endpoint_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15212,20 +15218,21 @@ def test_create_mirroring_endpoint_group_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_create_mirroring_endpoint_group" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_create_mirroring_endpoint_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_create_mirroring_endpoint_group" - ) as pre: + 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.MirroringRestInterceptor, "post_create_mirroring_endpoint_group" + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_create_mirroring_endpoint_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_create_mirroring_endpoint_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15282,8 +15289,9 @@ def test_update_mirroring_endpoint_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15433,20 +15441,21 @@ def test_update_mirroring_endpoint_group_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_update_mirroring_endpoint_group" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_update_mirroring_endpoint_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_update_mirroring_endpoint_group" - ) as pre: + 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.MirroringRestInterceptor, "post_update_mirroring_endpoint_group" + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_update_mirroring_endpoint_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_update_mirroring_endpoint_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15501,8 +15510,9 @@ def test_delete_mirroring_endpoint_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15559,20 +15569,21 @@ def test_delete_mirroring_endpoint_group_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_delete_mirroring_endpoint_group" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_delete_mirroring_endpoint_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_delete_mirroring_endpoint_group" - ) as pre: + 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.MirroringRestInterceptor, "post_delete_mirroring_endpoint_group" + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_delete_mirroring_endpoint_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_delete_mirroring_endpoint_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15625,8 +15636,9 @@ def test_list_mirroring_endpoint_group_associations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15689,20 +15701,22 @@ def test_list_mirroring_endpoint_group_associations_rest_interceptors(null_inter ) client = MirroringClient(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.MirroringRestInterceptor, - "post_list_mirroring_endpoint_group_associations", - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_list_mirroring_endpoint_group_associations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, - "pre_list_mirroring_endpoint_group_associations", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_list_mirroring_endpoint_group_associations", + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_list_mirroring_endpoint_group_associations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, + "pre_list_mirroring_endpoint_group_associations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15762,8 +15776,9 @@ def test_get_mirroring_endpoint_group_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15834,20 +15849,22 @@ def test_get_mirroring_endpoint_group_association_rest_interceptors(null_interce ) client = MirroringClient(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.MirroringRestInterceptor, - "post_get_mirroring_endpoint_group_association", - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_get_mirroring_endpoint_group_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, - "pre_get_mirroring_endpoint_group_association", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_get_mirroring_endpoint_group_association", + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_get_mirroring_endpoint_group_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, + "pre_get_mirroring_endpoint_group_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15905,8 +15922,9 @@ def test_create_mirroring_endpoint_group_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16052,22 +16070,23 @@ def test_create_mirroring_endpoint_group_association_rest_interceptors( ) client = MirroringClient(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.MirroringRestInterceptor, - "post_create_mirroring_endpoint_group_association", - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_create_mirroring_endpoint_group_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, - "pre_create_mirroring_endpoint_group_association", - ) as pre: + 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.MirroringRestInterceptor, + "post_create_mirroring_endpoint_group_association", + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_create_mirroring_endpoint_group_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, + "pre_create_mirroring_endpoint_group_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16124,8 +16143,9 @@ def test_update_mirroring_endpoint_group_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16275,22 +16295,23 @@ def test_update_mirroring_endpoint_group_association_rest_interceptors( ) client = MirroringClient(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.MirroringRestInterceptor, - "post_update_mirroring_endpoint_group_association", - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_update_mirroring_endpoint_group_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, - "pre_update_mirroring_endpoint_group_association", - ) as pre: + 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.MirroringRestInterceptor, + "post_update_mirroring_endpoint_group_association", + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_update_mirroring_endpoint_group_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, + "pre_update_mirroring_endpoint_group_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16345,8 +16366,9 @@ def test_delete_mirroring_endpoint_group_association_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16405,22 +16427,23 @@ def test_delete_mirroring_endpoint_group_association_rest_interceptors( ) client = MirroringClient(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.MirroringRestInterceptor, - "post_delete_mirroring_endpoint_group_association", - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_delete_mirroring_endpoint_group_association_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, - "pre_delete_mirroring_endpoint_group_association", - ) as pre: + 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.MirroringRestInterceptor, + "post_delete_mirroring_endpoint_group_association", + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_delete_mirroring_endpoint_group_association_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, + "pre_delete_mirroring_endpoint_group_association", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16473,8 +16496,9 @@ def test_list_mirroring_deployment_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16535,18 +16559,20 @@ def test_list_mirroring_deployment_groups_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_list_mirroring_deployment_groups" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_list_mirroring_deployment_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_list_mirroring_deployment_groups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MirroringRestInterceptor, "post_list_mirroring_deployment_groups" + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_list_mirroring_deployment_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_list_mirroring_deployment_groups" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16606,8 +16632,9 @@ def test_get_mirroring_deployment_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16678,18 +16705,20 @@ def test_get_mirroring_deployment_group_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_get_mirroring_deployment_group" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_get_mirroring_deployment_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_get_mirroring_deployment_group" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MirroringRestInterceptor, "post_get_mirroring_deployment_group" + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_get_mirroring_deployment_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_get_mirroring_deployment_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16744,8 +16773,9 @@ def test_create_mirroring_deployment_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16886,20 +16916,22 @@ def test_create_mirroring_deployment_group_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_create_mirroring_deployment_group" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_create_mirroring_deployment_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_create_mirroring_deployment_group" - ) as pre: + 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.MirroringRestInterceptor, + "post_create_mirroring_deployment_group", + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_create_mirroring_deployment_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_create_mirroring_deployment_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16956,8 +16988,9 @@ def test_update_mirroring_deployment_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17102,20 +17135,22 @@ def test_update_mirroring_deployment_group_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_update_mirroring_deployment_group" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_update_mirroring_deployment_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_update_mirroring_deployment_group" - ) as pre: + 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.MirroringRestInterceptor, + "post_update_mirroring_deployment_group", + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_update_mirroring_deployment_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_update_mirroring_deployment_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17170,8 +17205,9 @@ def test_delete_mirroring_deployment_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17228,20 +17264,22 @@ def test_delete_mirroring_deployment_group_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_delete_mirroring_deployment_group" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_delete_mirroring_deployment_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_delete_mirroring_deployment_group" - ) as pre: + 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.MirroringRestInterceptor, + "post_delete_mirroring_deployment_group", + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_delete_mirroring_deployment_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_delete_mirroring_deployment_group" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17294,8 +17332,9 @@ def test_list_mirroring_deployments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17358,18 +17397,20 @@ def test_list_mirroring_deployments_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_list_mirroring_deployments" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_list_mirroring_deployments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_list_mirroring_deployments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MirroringRestInterceptor, "post_list_mirroring_deployments" + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_list_mirroring_deployments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_list_mirroring_deployments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17429,8 +17470,9 @@ def test_get_mirroring_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17503,18 +17545,20 @@ def test_get_mirroring_deployment_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_get_mirroring_deployment" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_get_mirroring_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_get_mirroring_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.MirroringRestInterceptor, "post_get_mirroring_deployment" + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_get_mirroring_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_get_mirroring_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17569,8 +17613,9 @@ def test_create_mirroring_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17707,20 +17752,21 @@ def test_create_mirroring_deployment_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_create_mirroring_deployment" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_create_mirroring_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_create_mirroring_deployment" - ) as pre: + 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.MirroringRestInterceptor, "post_create_mirroring_deployment" + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_create_mirroring_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_create_mirroring_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17777,8 +17823,9 @@ def test_update_mirroring_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17919,20 +17966,21 @@ def test_update_mirroring_deployment_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_update_mirroring_deployment" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_update_mirroring_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_update_mirroring_deployment" - ) as pre: + 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.MirroringRestInterceptor, "post_update_mirroring_deployment" + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_update_mirroring_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_update_mirroring_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17987,8 +18035,9 @@ def test_delete_mirroring_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18045,20 +18094,21 @@ def test_delete_mirroring_deployment_rest_interceptors(null_interceptor): ) client = MirroringClient(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.MirroringRestInterceptor, "post_delete_mirroring_deployment" - ) as post, mock.patch.object( - transports.MirroringRestInterceptor, - "post_delete_mirroring_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.MirroringRestInterceptor, "pre_delete_mirroring_deployment" - ) as pre: + 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.MirroringRestInterceptor, "post_delete_mirroring_deployment" + ) as post, + mock.patch.object( + transports.MirroringRestInterceptor, + "post_delete_mirroring_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.MirroringRestInterceptor, "pre_delete_mirroring_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18111,8 +18161,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18171,8 +18222,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18236,8 +18288,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18303,8 +18356,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18370,8 +18424,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18434,8 +18489,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18496,8 +18552,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18558,8 +18615,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18620,8 +18678,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -19219,11 +19278,14 @@ def test_mirroring_base_transport(): def test_mirroring_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1alpha1.services.mirroring.transports.MirroringTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1alpha1.services.mirroring.transports.MirroringTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MirroringTransport( @@ -19240,9 +19302,12 @@ def test_mirroring_base_transport_with_credentials_file(): def test_mirroring_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1alpha1.services.mirroring.transports.MirroringTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1alpha1.services.mirroring.transports.MirroringTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.MirroringTransport() @@ -19314,11 +19379,12 @@ def test_mirroring_transport_auth_gdch_credentials(transport_class): def test_mirroring_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_network_security.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_network_security.py index 9edd6572e598..74f94a4d0016 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_network_security.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_network_security.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.network_security import ( NetworkSecurityAsyncClient, @@ -75,24 +77,34 @@ pagers, transports, ) +from google.cloud.network_security_v1alpha1.types import ( + authorization_policy, + authz_policy, + backend_authentication_config, + client_tls_policy, + common, + gateway_security_policy, + gateway_security_policy_rule, + server_tls_policy, + tls, + tls_inspection_policy, + url_list, +) from google.cloud.network_security_v1alpha1.types import ( authorization_policy as gcn_authorization_policy, ) from google.cloud.network_security_v1alpha1.types import ( authz_policy as gcn_authz_policy, ) -from google.cloud.network_security_v1alpha1.types import backend_authentication_config from google.cloud.network_security_v1alpha1.types import ( backend_authentication_config as gcn_backend_authentication_config, ) from google.cloud.network_security_v1alpha1.types import ( client_tls_policy as gcn_client_tls_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy as gcn_gateway_security_policy, ) -from google.cloud.network_security_v1alpha1.types import gateway_security_policy_rule from google.cloud.network_security_v1alpha1.types import ( gateway_security_policy_rule as gcn_gateway_security_policy_rule, ) @@ -103,14 +115,6 @@ tls_inspection_policy as gcn_tls_inspection_policy, ) from google.cloud.network_security_v1alpha1.types import url_list as gcn_url_list -from google.cloud.network_security_v1alpha1.types import authorization_policy -from google.cloud.network_security_v1alpha1.types import authz_policy -from google.cloud.network_security_v1alpha1.types import client_tls_policy -from google.cloud.network_security_v1alpha1.types import common -from google.cloud.network_security_v1alpha1.types import server_tls_policy -from google.cloud.network_security_v1alpha1.types import tls -from google.cloud.network_security_v1alpha1.types import tls_inspection_policy -from google.cloud.network_security_v1alpha1.types import url_list CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1021,10 +1025,9 @@ def test_network_security_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1069,10 +1072,9 @@ def test_network_security_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1108,10 +1110,9 @@ def test_network_security_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1354,13 +1355,13 @@ def test_network_security_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6094,9 +6095,9 @@ def test_get_server_tls_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_tls_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_tls_policy] = ( + mock_rpc + ) request = {} client.get_server_tls_policy(request) @@ -8063,9 +8064,9 @@ def test_get_client_tls_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_client_tls_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_client_tls_policy] = ( + mock_rpc + ) request = {} client.get_client_tls_policy(request) @@ -17422,9 +17423,9 @@ def test_list_authz_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_authz_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_authz_policies] = ( + mock_rpc + ) request = {} client.list_authz_policies(request) @@ -17965,9 +17966,9 @@ def test_get_authz_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_authz_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_authz_policy] = ( + mock_rpc + ) request = {} client.get_authz_policy(request) @@ -18299,9 +18300,9 @@ def test_create_authz_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_authz_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_authz_policy] = ( + mock_rpc + ) request = {} client.create_authz_policy(request) @@ -18661,9 +18662,9 @@ def test_update_authz_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_authz_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_authz_policy] = ( + mock_rpc + ) request = {} client.update_authz_policy(request) @@ -19017,9 +19018,9 @@ def test_delete_authz_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_authz_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_authz_policy] = ( + mock_rpc + ) request = {} client.delete_authz_policy(request) @@ -20870,9 +20871,9 @@ def test_create_backend_authentication_config_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "backendAuthenticationConfigId" - ] = "backend_authentication_config_id_value" + jsonified_request["backendAuthenticationConfigId"] = ( + "backend_authentication_config_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -21697,9 +21698,9 @@ def test_get_server_tls_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_tls_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_tls_policy] = ( + mock_rpc + ) request = {} client.get_server_tls_policy(request) @@ -22728,9 +22729,9 @@ def test_get_client_tls_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_client_tls_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_client_tls_policy] = ( + mock_rpc + ) request = {} client.get_client_tls_policy(request) @@ -27666,9 +27667,9 @@ def test_list_authz_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_authz_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_authz_policies] = ( + mock_rpc + ) request = {} client.list_authz_policies(request) @@ -27928,9 +27929,9 @@ def test_get_authz_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_authz_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_authz_policy] = ( + mock_rpc + ) request = {} client.get_authz_policy(request) @@ -28112,9 +28113,9 @@ def test_create_authz_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_authz_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_authz_policy] = ( + mock_rpc + ) request = {} client.create_authz_policy(request) @@ -28332,9 +28333,9 @@ def test_update_authz_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_authz_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_authz_policy] = ( + mock_rpc + ) request = {} client.update_authz_policy(request) @@ -28535,9 +28536,9 @@ def test_delete_authz_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_authz_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_authz_policy] = ( + mock_rpc + ) request = {} client.delete_authz_policy(request) @@ -31176,8 +31177,9 @@ def test_list_authorization_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31242,18 +31244,21 @@ def test_list_authorization_policies_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_authorization_policies" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_authorization_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_authorization_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_authorization_policies", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_authorization_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_list_authorization_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31313,8 +31318,9 @@ def test_get_authorization_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31383,18 +31389,20 @@ def test_get_authorization_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_authorization_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_authorization_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_authorization_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_authorization_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_authorization_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_authorization_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31452,8 +31460,9 @@ def test_create_authorization_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31610,20 +31619,22 @@ def test_create_authorization_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_authorization_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_authorization_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_authorization_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_create_authorization_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_authorization_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_create_authorization_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31680,8 +31691,9 @@ def test_update_authorization_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31842,20 +31854,22 @@ def test_update_authorization_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_authorization_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_authorization_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_authorization_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_update_authorization_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_authorization_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_update_authorization_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -31910,8 +31924,9 @@ def test_delete_authorization_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -31970,20 +31985,22 @@ def test_delete_authorization_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_authorization_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_authorization_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_authorization_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_delete_authorization_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_authorization_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_delete_authorization_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32036,8 +32053,9 @@ def test_list_backend_authentication_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32108,20 +32126,22 @@ def test_list_backend_authentication_configs_rest_interceptors(null_interceptor) ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, - "post_list_backend_authentication_configs", - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_backend_authentication_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "pre_list_backend_authentication_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_backend_authentication_configs", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_backend_authentication_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_list_backend_authentication_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32187,8 +32207,9 @@ def test_get_backend_authentication_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32270,20 +32291,22 @@ def test_get_backend_authentication_config_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, - "post_get_backend_authentication_config", - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_backend_authentication_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "pre_get_backend_authentication_config", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_backend_authentication_config", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_backend_authentication_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_get_backend_authentication_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32345,8 +32368,9 @@ def test_create_backend_authentication_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32489,22 +32513,23 @@ def test_create_backend_authentication_config_rest_interceptors(null_interceptor ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, - "post_create_backend_authentication_config", - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_backend_authentication_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "pre_create_backend_authentication_config", - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_create_backend_authentication_config", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_backend_authentication_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_create_backend_authentication_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32563,8 +32588,9 @@ def test_update_backend_authentication_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32711,22 +32737,23 @@ def test_update_backend_authentication_config_rest_interceptors(null_interceptor ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, - "post_update_backend_authentication_config", - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_backend_authentication_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "pre_update_backend_authentication_config", - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_update_backend_authentication_config", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_backend_authentication_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_update_backend_authentication_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32783,8 +32810,9 @@ def test_delete_backend_authentication_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32843,22 +32871,23 @@ def test_delete_backend_authentication_config_rest_interceptors(null_interceptor ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, - "post_delete_backend_authentication_config", - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_backend_authentication_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "pre_delete_backend_authentication_config", - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_delete_backend_authentication_config", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_backend_authentication_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_delete_backend_authentication_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -32915,8 +32944,9 @@ def test_list_server_tls_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -32981,18 +33011,20 @@ def test_list_server_tls_policies_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_server_tls_policies" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_server_tls_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_server_tls_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_list_server_tls_policies" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_server_tls_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_list_server_tls_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33052,8 +33084,9 @@ def test_get_server_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33122,18 +33155,20 @@ def test_get_server_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_server_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_server_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_server_tls_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_server_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_server_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_server_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33188,8 +33223,9 @@ def test_create_server_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33344,20 +33380,21 @@ def test_create_server_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_server_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_server_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_server_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_create_server_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_server_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_create_server_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33414,8 +33451,9 @@ def test_update_server_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33574,20 +33612,21 @@ def test_update_server_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_server_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_server_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_server_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_update_server_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_server_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_update_server_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33642,8 +33681,9 @@ def test_delete_server_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33702,20 +33742,21 @@ def test_delete_server_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_server_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_server_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_server_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_delete_server_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_server_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_delete_server_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33768,8 +33809,9 @@ def test_list_client_tls_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33832,18 +33874,20 @@ def test_list_client_tls_policies_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_client_tls_policies" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_client_tls_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_client_tls_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_list_client_tls_policies" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_client_tls_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_list_client_tls_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -33903,8 +33947,9 @@ def test_get_client_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -33973,18 +34018,20 @@ def test_get_client_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_client_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_client_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_client_tls_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_client_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_client_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_client_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34039,8 +34086,9 @@ def test_create_client_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34191,20 +34239,21 @@ def test_create_client_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_client_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_client_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_client_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_create_client_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_client_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_create_client_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34261,8 +34310,9 @@ def test_update_client_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34417,20 +34467,21 @@ def test_update_client_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_client_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_client_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_client_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_update_client_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_client_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_update_client_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34485,8 +34536,9 @@ def test_delete_client_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34545,20 +34597,21 @@ def test_delete_client_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_client_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_client_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_client_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_delete_client_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_client_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_delete_client_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34611,8 +34664,9 @@ def test_list_gateway_security_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34679,18 +34733,22 @@ def test_list_gateway_security_policies_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_gateway_security_policies" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_gateway_security_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_gateway_security_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_gateway_security_policies", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_gateway_security_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_list_gateway_security_policies", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34754,8 +34812,9 @@ def test_get_gateway_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -34824,18 +34883,21 @@ def test_get_gateway_security_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_gateway_security_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_gateway_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_gateway_security_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_gateway_security_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_gateway_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_gateway_security_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -34893,8 +34955,9 @@ def test_create_gateway_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35031,20 +35094,23 @@ def test_create_gateway_security_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_gateway_security_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_gateway_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_gateway_security_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_create_gateway_security_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_gateway_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_create_gateway_security_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35101,8 +35167,9 @@ def test_update_gateway_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35243,20 +35310,23 @@ def test_update_gateway_security_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_gateway_security_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_gateway_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_gateway_security_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_update_gateway_security_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_gateway_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_update_gateway_security_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35311,8 +35381,9 @@ def test_delete_gateway_security_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35371,20 +35442,23 @@ def test_delete_gateway_security_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_gateway_security_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_gateway_security_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_gateway_security_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_delete_gateway_security_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_gateway_security_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_delete_gateway_security_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35439,8 +35513,9 @@ def test_list_gateway_security_policy_rules_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35513,20 +35588,22 @@ def test_list_gateway_security_policy_rules_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, - "post_list_gateway_security_policy_rules", - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_gateway_security_policy_rules_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "pre_list_gateway_security_policy_rules", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_gateway_security_policy_rules", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_gateway_security_policy_rules_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_list_gateway_security_policy_rules", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35592,8 +35669,9 @@ def test_get_gateway_security_policy_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35673,20 +35751,22 @@ def test_get_gateway_security_policy_rule_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, - "post_get_gateway_security_policy_rule", - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_gateway_security_policy_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "pre_get_gateway_security_policy_rule", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_gateway_security_policy_rule", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_gateway_security_policy_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_get_gateway_security_policy_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35748,8 +35828,9 @@ def test_create_gateway_security_policy_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -35893,22 +35974,23 @@ def test_create_gateway_security_policy_rule_rest_interceptors(null_interceptor) ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, - "post_create_gateway_security_policy_rule", - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_gateway_security_policy_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "pre_create_gateway_security_policy_rule", - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_create_gateway_security_policy_rule", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_gateway_security_policy_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_create_gateway_security_policy_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -35967,8 +36049,9 @@ def test_update_gateway_security_policy_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36114,22 +36197,23 @@ def test_update_gateway_security_policy_rule_rest_interceptors(null_interceptor) ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, - "post_update_gateway_security_policy_rule", - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_gateway_security_policy_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "pre_update_gateway_security_policy_rule", - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_update_gateway_security_policy_rule", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_gateway_security_policy_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_update_gateway_security_policy_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36186,8 +36270,9 @@ def test_delete_gateway_security_policy_rule_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36246,22 +36331,23 @@ def test_delete_gateway_security_policy_rule_rest_interceptors(null_interceptor) ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, - "post_delete_gateway_security_policy_rule", - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_gateway_security_policy_rule_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "pre_delete_gateway_security_policy_rule", - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_delete_gateway_security_policy_rule", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_gateway_security_policy_rule_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_delete_gateway_security_policy_rule", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36314,8 +36400,9 @@ def test_list_url_lists_rest_bad_request(request_type=url_list.ListUrlListsReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36380,17 +36467,20 @@ def test_list_url_lists_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_url_lists" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "post_list_url_lists_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_url_lists" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_list_url_lists" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_url_lists_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_list_url_lists" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36441,8 +36531,9 @@ def test_get_url_list_rest_bad_request(request_type=url_list.GetUrlListRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36509,17 +36600,19 @@ def test_get_url_list_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_url_list" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "post_get_url_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_url_list" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_url_list" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_url_list_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_url_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36570,8 +36663,9 @@ def test_create_url_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36702,19 +36796,21 @@ def test_create_url_list_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_url_list" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "post_create_url_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_url_list" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_create_url_list" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_url_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_create_url_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36769,8 +36865,9 @@ def test_update_url_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -36903,19 +37000,21 @@ def test_update_url_list_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_url_list" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "post_update_url_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_url_list" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_update_url_list" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_url_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_update_url_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -36966,8 +37065,9 @@ def test_delete_url_list_rest_bad_request(request_type=url_list.DeleteUrlListReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37024,19 +37124,21 @@ def test_delete_url_list_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_url_list" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "post_delete_url_list_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_url_list" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_delete_url_list" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_url_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_delete_url_list" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37087,8 +37189,9 @@ def test_list_tls_inspection_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37155,18 +37258,22 @@ def test_list_tls_inspection_policies_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_tls_inspection_policies" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_tls_inspection_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_tls_inspection_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_tls_inspection_policies", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_tls_inspection_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_list_tls_inspection_policies", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37226,8 +37333,9 @@ def test_get_tls_inspection_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37312,18 +37420,20 @@ def test_get_tls_inspection_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_tls_inspection_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_tls_inspection_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_tls_inspection_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_tls_inspection_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_tls_inspection_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_tls_inspection_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37381,8 +37491,9 @@ def test_create_tls_inspection_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37525,20 +37636,23 @@ def test_create_tls_inspection_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_tls_inspection_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_tls_inspection_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_tls_inspection_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_create_tls_inspection_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_tls_inspection_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_create_tls_inspection_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37595,8 +37709,9 @@ def test_update_tls_inspection_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37743,20 +37858,23 @@ def test_update_tls_inspection_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_tls_inspection_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_tls_inspection_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_tls_inspection_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_update_tls_inspection_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_tls_inspection_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_update_tls_inspection_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37811,8 +37929,9 @@ def test_delete_tls_inspection_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -37871,20 +37990,23 @@ def test_delete_tls_inspection_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_tls_inspection_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_tls_inspection_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_tls_inspection_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_delete_tls_inspection_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_tls_inspection_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "pre_delete_tls_inspection_policy", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -37937,8 +38059,9 @@ def test_list_authz_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38003,18 +38126,20 @@ def test_list_authz_policies_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_authz_policies" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_authz_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_authz_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_list_authz_policies" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_authz_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_list_authz_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38072,8 +38197,9 @@ def test_get_authz_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38140,17 +38266,20 @@ def test_get_authz_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_authz_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "post_get_authz_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_authz_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_authz_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_authz_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_authz_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38203,8 +38332,9 @@ def test_create_authz_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38388,20 +38518,21 @@ def test_create_authz_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_authz_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_authz_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_authz_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_create_authz_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_authz_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_create_authz_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38458,8 +38589,9 @@ def test_update_authz_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38647,20 +38779,21 @@ def test_update_authz_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_authz_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_authz_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_authz_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_update_authz_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_authz_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_update_authz_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38713,8 +38846,9 @@ def test_delete_authz_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -38771,20 +38905,21 @@ def test_delete_authz_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_authz_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_authz_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_authz_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_delete_authz_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_authz_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_delete_authz_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -38837,8 +38972,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -38897,8 +39033,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -38962,8 +39099,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39029,8 +39167,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39096,8 +39235,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39160,8 +39300,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39222,8 +39363,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39284,8 +39426,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -39346,8 +39489,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -40526,11 +40670,14 @@ def test_network_security_base_transport(): def test_network_security_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1alpha1.services.network_security.transports.NetworkSecurityTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1alpha1.services.network_security.transports.NetworkSecurityTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkSecurityTransport( @@ -40547,9 +40694,12 @@ def test_network_security_base_transport_with_credentials_file(): def test_network_security_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1alpha1.services.network_security.transports.NetworkSecurityTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1alpha1.services.network_security.transports.NetworkSecurityTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkSecurityTransport() @@ -40621,11 +40771,12 @@ def test_network_security_transport_auth_gdch_credentials(transport_class): def test_network_security_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_organization_security_profile_group_service.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_organization_security_profile_group_service.py index 8edbc7ce76ac..b398bb856520 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_organization_security_profile_group_service.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_organization_security_profile_group_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.organization_security_profile_group_service import ( OrganizationSecurityProfileGroupServiceAsyncClient, @@ -76,6 +78,8 @@ transports, ) from google.cloud.network_security_v1alpha1.types import ( + common, + security_profile_group, security_profile_group_intercept, security_profile_group_mirroring, security_profile_group_service, @@ -85,8 +89,6 @@ from google.cloud.network_security_v1alpha1.types import ( security_profile_group as gcn_security_profile_group, ) -from google.cloud.network_security_v1alpha1.types import common -from google.cloud.network_security_v1alpha1.types import security_profile_group CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -208,10 +210,13 @@ def test__read_environment_variables(): == "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`" ) else: - assert OrganizationSecurityProfileGroupServiceClient._read_environment_variables() == ( - False, - "auto", - None, + assert ( + OrganizationSecurityProfileGroupServiceClient._read_environment_variables() + == ( + False, + "auto", + None, + ) ) with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): @@ -1095,10 +1100,9 @@ def test_organization_security_profile_group_service_client_get_mtls_endpoint_an client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1143,10 +1147,9 @@ def test_organization_security_profile_group_service_client_get_mtls_endpoint_an client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1182,10 +1185,9 @@ def test_organization_security_profile_group_service_client_get_mtls_endpoint_an "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1453,13 +1455,13 @@ def test_organization_security_profile_group_service_client_create_channel_crede ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3604,9 +3606,9 @@ def test_list_security_profiles_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_security_profiles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_security_profiles] = ( + mock_rpc + ) request = {} client.list_security_profiles(request) @@ -4167,9 +4169,9 @@ def test_get_security_profile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_security_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_security_profile] = ( + mock_rpc + ) request = {} client.get_security_profile(request) @@ -6687,9 +6689,9 @@ def test_list_security_profiles_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_security_profiles - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_security_profiles] = ( + mock_rpc + ) request = {} client.list_security_profiles(request) @@ -6956,9 +6958,9 @@ def test_get_security_profile_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_security_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_security_profile] = ( + mock_rpc + ) request = {} client.get_security_profile(request) @@ -8400,8 +8402,9 @@ def test_list_security_profile_groups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8468,20 +8471,22 @@ def test_list_security_profile_groups_rest_interceptors(null_interceptor): ) client = OrganizationSecurityProfileGroupServiceClient(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.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_list_security_profile_groups", - ) as post, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_list_security_profile_groups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "pre_list_security_profile_groups", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_list_security_profile_groups", + ) as post, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_list_security_profile_groups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "pre_list_security_profile_groups", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8545,8 +8550,9 @@ def test_get_security_profile_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8625,20 +8631,22 @@ def test_get_security_profile_group_rest_interceptors(null_interceptor): ) client = OrganizationSecurityProfileGroupServiceClient(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.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_get_security_profile_group", - ) as post, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_get_security_profile_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "pre_get_security_profile_group", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_get_security_profile_group", + ) as post, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_get_security_profile_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "pre_get_security_profile_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8696,8 +8704,9 @@ def test_create_security_profile_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8840,22 +8849,23 @@ def test_create_security_profile_group_rest_interceptors(null_interceptor): ) client = OrganizationSecurityProfileGroupServiceClient(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.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_create_security_profile_group", - ) as post, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_create_security_profile_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "pre_create_security_profile_group", - ) as pre: + 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.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_create_security_profile_group", + ) as post, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_create_security_profile_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "pre_create_security_profile_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8914,8 +8924,9 @@ def test_update_security_profile_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9062,22 +9073,23 @@ def test_update_security_profile_group_rest_interceptors(null_interceptor): ) client = OrganizationSecurityProfileGroupServiceClient(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.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_update_security_profile_group", - ) as post, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_update_security_profile_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "pre_update_security_profile_group", - ) as pre: + 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.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_update_security_profile_group", + ) as post, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_update_security_profile_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "pre_update_security_profile_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9134,8 +9146,9 @@ def test_delete_security_profile_group_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9194,22 +9207,23 @@ def test_delete_security_profile_group_rest_interceptors(null_interceptor): ) client = OrganizationSecurityProfileGroupServiceClient(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.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_delete_security_profile_group", - ) as post, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_delete_security_profile_group_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "pre_delete_security_profile_group", - ) as pre: + 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.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_delete_security_profile_group", + ) as post, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_delete_security_profile_group_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "pre_delete_security_profile_group", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9264,8 +9278,9 @@ def test_list_security_profiles_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9330,20 +9345,22 @@ def test_list_security_profiles_rest_interceptors(null_interceptor): ) client = OrganizationSecurityProfileGroupServiceClient(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.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_list_security_profiles", - ) as post, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_list_security_profiles_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "pre_list_security_profiles", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_list_security_profiles", + ) as post, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_list_security_profiles_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "pre_list_security_profiles", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9407,8 +9424,9 @@ def test_get_security_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9482,20 +9500,22 @@ def test_get_security_profile_rest_interceptors(null_interceptor): ) client = OrganizationSecurityProfileGroupServiceClient(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.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_get_security_profile", - ) as post, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_get_security_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "pre_get_security_profile", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_get_security_profile", + ) as post, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_get_security_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "pre_get_security_profile", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9553,8 +9573,9 @@ def test_create_security_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9713,22 +9734,23 @@ def test_create_security_profile_rest_interceptors(null_interceptor): ) client = OrganizationSecurityProfileGroupServiceClient(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.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_create_security_profile", - ) as post, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_create_security_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "pre_create_security_profile", - ) as pre: + 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.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_create_security_profile", + ) as post, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_create_security_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "pre_create_security_profile", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9785,8 +9807,9 @@ def test_update_security_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9949,22 +9972,23 @@ def test_update_security_profile_rest_interceptors(null_interceptor): ) client = OrganizationSecurityProfileGroupServiceClient(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.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_update_security_profile", - ) as post, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_update_security_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "pre_update_security_profile", - ) as pre: + 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.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_update_security_profile", + ) as post, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_update_security_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "pre_update_security_profile", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10019,8 +10043,9 @@ def test_delete_security_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10079,22 +10104,23 @@ def test_delete_security_profile_rest_interceptors(null_interceptor): ) client = OrganizationSecurityProfileGroupServiceClient(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.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_delete_security_profile", - ) as post, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "post_delete_security_profile_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrganizationSecurityProfileGroupServiceRestInterceptor, - "pre_delete_security_profile", - ) as pre: + 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.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_delete_security_profile", + ) as post, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "post_delete_security_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrganizationSecurityProfileGroupServiceRestInterceptor, + "pre_delete_security_profile", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10147,8 +10173,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10207,8 +10234,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10272,8 +10300,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10339,8 +10368,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10406,8 +10436,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10470,8 +10501,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10532,8 +10564,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10594,8 +10627,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10656,8 +10690,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11025,11 +11060,14 @@ def test_organization_security_profile_group_service_base_transport(): def test_organization_security_profile_group_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1alpha1.services.organization_security_profile_group_service.transports.OrganizationSecurityProfileGroupServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1alpha1.services.organization_security_profile_group_service.transports.OrganizationSecurityProfileGroupServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrganizationSecurityProfileGroupServiceTransport( @@ -11046,9 +11084,12 @@ def test_organization_security_profile_group_service_base_transport_with_credent def test_organization_security_profile_group_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1alpha1.services.organization_security_profile_group_service.transports.OrganizationSecurityProfileGroupServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1alpha1.services.organization_security_profile_group_service.transports.OrganizationSecurityProfileGroupServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrganizationSecurityProfileGroupServiceTransport() @@ -11129,11 +11170,12 @@ def test_organization_security_profile_group_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_sse_gateway_service.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_sse_gateway_service.py index 66cae64d1808..9871d0238aea 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_sse_gateway_service.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_sse_gateway_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.sse_gateway_service import ( SSEGatewayServiceAsyncClient, @@ -995,10 +997,9 @@ def test_sse_gateway_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1043,10 +1044,9 @@ def test_sse_gateway_service_client_get_mtls_endpoint_and_cert_source(client_cla client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1082,10 +1082,9 @@ def test_sse_gateway_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1333,13 +1332,13 @@ def test_sse_gateway_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6350,8 +6349,9 @@ def test_list_partner_sse_gateways_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6416,18 +6416,21 @@ def test_list_partner_sse_gateways_rest_interceptors(null_interceptor): ) client = SSEGatewayServiceClient(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.SSEGatewayServiceRestInterceptor, "post_list_partner_sse_gateways" - ) as post, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, - "post_list_partner_sse_gateways_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, "pre_list_partner_sse_gateways" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "post_list_partner_sse_gateways", + ) as post, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "post_list_partner_sse_gateways_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, "pre_list_partner_sse_gateways" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6487,8 +6490,9 @@ def test_get_partner_sse_gateway_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6591,18 +6595,20 @@ def test_get_partner_sse_gateway_rest_interceptors(null_interceptor): ) client = SSEGatewayServiceClient(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.SSEGatewayServiceRestInterceptor, "post_get_partner_sse_gateway" - ) as post, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, - "post_get_partner_sse_gateway_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, "pre_get_partner_sse_gateway" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, "post_get_partner_sse_gateway" + ) as post, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "post_get_partner_sse_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, "pre_get_partner_sse_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6657,8 +6663,9 @@ def test_create_partner_sse_gateway_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6817,20 +6824,23 @@ def test_create_partner_sse_gateway_rest_interceptors(null_interceptor): ) client = SSEGatewayServiceClient(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.SSEGatewayServiceRestInterceptor, "post_create_partner_sse_gateway" - ) as post, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, - "post_create_partner_sse_gateway_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, "pre_create_partner_sse_gateway" - ) as pre: + 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.SSEGatewayServiceRestInterceptor, + "post_create_partner_sse_gateway", + ) as post, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "post_create_partner_sse_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "pre_create_partner_sse_gateway", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6885,8 +6895,9 @@ def test_delete_partner_sse_gateway_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6945,20 +6956,23 @@ def test_delete_partner_sse_gateway_rest_interceptors(null_interceptor): ) client = SSEGatewayServiceClient(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.SSEGatewayServiceRestInterceptor, "post_delete_partner_sse_gateway" - ) as post, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, - "post_delete_partner_sse_gateway_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, "pre_delete_partner_sse_gateway" - ) as pre: + 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.SSEGatewayServiceRestInterceptor, + "post_delete_partner_sse_gateway", + ) as post, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "post_delete_partner_sse_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "pre_delete_partner_sse_gateway", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7015,8 +7029,9 @@ def test_update_partner_sse_gateway_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7179,20 +7194,23 @@ def test_update_partner_sse_gateway_rest_interceptors(null_interceptor): ) client = SSEGatewayServiceClient(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.SSEGatewayServiceRestInterceptor, "post_update_partner_sse_gateway" - ) as post, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, - "post_update_partner_sse_gateway_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, "pre_update_partner_sse_gateway" - ) as pre: + 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.SSEGatewayServiceRestInterceptor, + "post_update_partner_sse_gateway", + ) as post, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "post_update_partner_sse_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "pre_update_partner_sse_gateway", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7245,8 +7263,9 @@ def test_list_sse_gateway_references_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7311,18 +7330,22 @@ def test_list_sse_gateway_references_rest_interceptors(null_interceptor): ) client = SSEGatewayServiceClient(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.SSEGatewayServiceRestInterceptor, "post_list_sse_gateway_references" - ) as post, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, - "post_list_sse_gateway_references_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, "pre_list_sse_gateway_references" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "post_list_sse_gateway_references", + ) as post, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "post_list_sse_gateway_references_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "pre_list_sse_gateway_references", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7382,8 +7405,9 @@ def test_get_sse_gateway_reference_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7452,18 +7476,21 @@ def test_get_sse_gateway_reference_rest_interceptors(null_interceptor): ) client = SSEGatewayServiceClient(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.SSEGatewayServiceRestInterceptor, "post_get_sse_gateway_reference" - ) as post, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, - "post_get_sse_gateway_reference_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSEGatewayServiceRestInterceptor, "pre_get_sse_gateway_reference" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "post_get_sse_gateway_reference", + ) as post, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, + "post_get_sse_gateway_reference_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSEGatewayServiceRestInterceptor, "pre_get_sse_gateway_reference" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7518,8 +7545,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7578,8 +7606,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7643,8 +7672,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7710,8 +7740,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7777,8 +7808,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7841,8 +7873,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7903,8 +7936,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7965,8 +7999,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8027,8 +8062,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8327,11 +8363,14 @@ def test_sse_gateway_service_base_transport(): def test_sse_gateway_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1alpha1.services.sse_gateway_service.transports.SSEGatewayServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1alpha1.services.sse_gateway_service.transports.SSEGatewayServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SSEGatewayServiceTransport( @@ -8348,9 +8387,12 @@ def test_sse_gateway_service_base_transport_with_credentials_file(): def test_sse_gateway_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1alpha1.services.sse_gateway_service.transports.SSEGatewayServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1alpha1.services.sse_gateway_service.transports.SSEGatewayServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SSEGatewayServiceTransport() @@ -8422,11 +8464,12 @@ def test_sse_gateway_service_transport_auth_gdch_credentials(transport_class): def test_sse_gateway_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_sse_realm_service.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_sse_realm_service.py index 32ddde828529..f3fc110b7df1 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_sse_realm_service.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1alpha1/test_sse_realm_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +57,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1alpha1.services.sse_realm_service import ( SSERealmServiceAsyncClient, @@ -985,10 +987,9 @@ def test_sse_realm_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1034,9 @@ def test_sse_realm_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1072,10 +1072,9 @@ def test_sse_realm_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1318,13 +1317,13 @@ def test_sse_realm_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2290,9 +2289,9 @@ def test_create_sac_realm_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sac_realm - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sac_realm] = ( + mock_rpc + ) request = {} client.create_sac_realm(request) @@ -2639,9 +2638,9 @@ def test_delete_sac_realm_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sac_realm - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sac_realm] = ( + mock_rpc + ) request = {} client.delete_sac_realm(request) @@ -2985,9 +2984,9 @@ def test_list_sac_attachments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sac_attachments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sac_attachments] = ( + mock_rpc + ) request = {} client.list_sac_attachments(request) @@ -3540,9 +3539,9 @@ def test_get_sac_attachment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sac_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sac_attachment] = ( + mock_rpc + ) request = {} client.get_sac_attachment(request) @@ -3891,9 +3890,9 @@ def test_create_sac_attachment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sac_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sac_attachment] = ( + mock_rpc + ) request = {} client.create_sac_attachment(request) @@ -4257,9 +4256,9 @@ def test_delete_sac_attachment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sac_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sac_attachment] = ( + mock_rpc + ) request = {} client.delete_sac_attachment(request) @@ -5176,9 +5175,9 @@ def test_get_partner_sse_realm_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_partner_sse_realm - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_partner_sse_realm] = ( + mock_rpc + ) request = {} client.get_partner_sse_realm(request) @@ -6617,9 +6616,9 @@ def test_create_sac_realm_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sac_realm - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sac_realm] = ( + mock_rpc + ) request = {} client.create_sac_realm(request) @@ -6835,9 +6834,9 @@ def test_delete_sac_realm_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sac_realm - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sac_realm] = ( + mock_rpc + ) request = {} client.delete_sac_realm(request) @@ -7020,9 +7019,9 @@ def test_list_sac_attachments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sac_attachments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sac_attachments] = ( + mock_rpc + ) request = {} client.list_sac_attachments(request) @@ -7284,9 +7283,9 @@ def test_get_sac_attachment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sac_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sac_attachment] = ( + mock_rpc + ) request = {} client.get_sac_attachment(request) @@ -7469,9 +7468,9 @@ def test_create_sac_attachment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sac_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sac_attachment] = ( + mock_rpc + ) request = {} client.create_sac_attachment(request) @@ -7690,9 +7689,9 @@ def test_delete_sac_attachment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sac_attachment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sac_attachment] = ( + mock_rpc + ) request = {} client.delete_sac_attachment(request) @@ -8141,9 +8140,9 @@ def test_get_partner_sse_realm_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_partner_sse_realm - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_partner_sse_realm] = ( + mock_rpc + ) request = {} client.get_partner_sse_realm(request) @@ -9461,8 +9460,9 @@ def test_list_sac_realms_rest_bad_request(request_type=sse_realm.ListSACRealmsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9527,17 +9527,20 @@ def test_list_sac_realms_rest_interceptors(null_interceptor): ) client = SSERealmServiceClient(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.SSERealmServiceRestInterceptor, "post_list_sac_realms" - ) as post, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "post_list_sac_realms_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "pre_list_sac_realms" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "post_list_sac_realms" + ) as post, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, + "post_list_sac_realms_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "pre_list_sac_realms" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9588,8 +9591,9 @@ def test_get_sac_realm_rest_bad_request(request_type=sse_realm.GetSACRealmReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9659,17 +9663,20 @@ def test_get_sac_realm_rest_interceptors(null_interceptor): ) client = SSERealmServiceClient(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.SSERealmServiceRestInterceptor, "post_get_sac_realm" - ) as post, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "post_get_sac_realm_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "pre_get_sac_realm" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "post_get_sac_realm" + ) as post, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, + "post_get_sac_realm_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "pre_get_sac_realm" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9720,8 +9727,9 @@ def test_create_sac_realm_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9862,19 +9870,21 @@ def test_create_sac_realm_rest_interceptors(null_interceptor): ) client = SSERealmServiceClient(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.SSERealmServiceRestInterceptor, "post_create_sac_realm" - ) as post, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "post_create_sac_realm_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "pre_create_sac_realm" - ) as pre: + 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.SSERealmServiceRestInterceptor, "post_create_sac_realm" + ) as post, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, + "post_create_sac_realm_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "pre_create_sac_realm" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9927,8 +9937,9 @@ def test_delete_sac_realm_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9985,19 +9996,21 @@ def test_delete_sac_realm_rest_interceptors(null_interceptor): ) client = SSERealmServiceClient(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.SSERealmServiceRestInterceptor, "post_delete_sac_realm" - ) as post, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "post_delete_sac_realm_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "pre_delete_sac_realm" - ) as pre: + 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.SSERealmServiceRestInterceptor, "post_delete_sac_realm" + ) as post, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, + "post_delete_sac_realm_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "pre_delete_sac_realm" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10050,8 +10063,9 @@ def test_list_sac_attachments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10116,18 +10130,20 @@ def test_list_sac_attachments_rest_interceptors(null_interceptor): ) client = SSERealmServiceClient(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.SSERealmServiceRestInterceptor, "post_list_sac_attachments" - ) as post, mock.patch.object( - transports.SSERealmServiceRestInterceptor, - "post_list_sac_attachments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "pre_list_sac_attachments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "post_list_sac_attachments" + ) as post, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, + "post_list_sac_attachments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "pre_list_sac_attachments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10185,8 +10201,9 @@ def test_get_sac_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10259,18 +10276,20 @@ def test_get_sac_attachment_rest_interceptors(null_interceptor): ) client = SSERealmServiceClient(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.SSERealmServiceRestInterceptor, "post_get_sac_attachment" - ) as post, mock.patch.object( - transports.SSERealmServiceRestInterceptor, - "post_get_sac_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "pre_get_sac_attachment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "post_get_sac_attachment" + ) as post, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, + "post_get_sac_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "pre_get_sac_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10323,8 +10342,9 @@ def test_create_sac_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10463,20 +10483,21 @@ def test_create_sac_attachment_rest_interceptors(null_interceptor): ) client = SSERealmServiceClient(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.SSERealmServiceRestInterceptor, "post_create_sac_attachment" - ) as post, mock.patch.object( - transports.SSERealmServiceRestInterceptor, - "post_create_sac_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "pre_create_sac_attachment" - ) as pre: + 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.SSERealmServiceRestInterceptor, "post_create_sac_attachment" + ) as post, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, + "post_create_sac_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "pre_create_sac_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10529,8 +10550,9 @@ def test_delete_sac_attachment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10587,20 +10609,21 @@ def test_delete_sac_attachment_rest_interceptors(null_interceptor): ) client = SSERealmServiceClient(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.SSERealmServiceRestInterceptor, "post_delete_sac_attachment" - ) as post, mock.patch.object( - transports.SSERealmServiceRestInterceptor, - "post_delete_sac_attachment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "pre_delete_sac_attachment" - ) as pre: + 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.SSERealmServiceRestInterceptor, "post_delete_sac_attachment" + ) as post, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, + "post_delete_sac_attachment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "pre_delete_sac_attachment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10653,8 +10676,9 @@ def test_list_partner_sse_realms_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10719,18 +10743,20 @@ def test_list_partner_sse_realms_rest_interceptors(null_interceptor): ) client = SSERealmServiceClient(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.SSERealmServiceRestInterceptor, "post_list_partner_sse_realms" - ) as post, mock.patch.object( - transports.SSERealmServiceRestInterceptor, - "post_list_partner_sse_realms_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "pre_list_partner_sse_realms" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "post_list_partner_sse_realms" + ) as post, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, + "post_list_partner_sse_realms_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "pre_list_partner_sse_realms" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10790,8 +10816,9 @@ def test_get_partner_sse_realm_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10872,18 +10899,20 @@ def test_get_partner_sse_realm_rest_interceptors(null_interceptor): ) client = SSERealmServiceClient(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.SSERealmServiceRestInterceptor, "post_get_partner_sse_realm" - ) as post, mock.patch.object( - transports.SSERealmServiceRestInterceptor, - "post_get_partner_sse_realm_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "pre_get_partner_sse_realm" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "post_get_partner_sse_realm" + ) as post, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, + "post_get_partner_sse_realm_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "pre_get_partner_sse_realm" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10936,8 +10965,9 @@ def test_create_partner_sse_realm_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11079,20 +11109,21 @@ def test_create_partner_sse_realm_rest_interceptors(null_interceptor): ) client = SSERealmServiceClient(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.SSERealmServiceRestInterceptor, "post_create_partner_sse_realm" - ) as post, mock.patch.object( - transports.SSERealmServiceRestInterceptor, - "post_create_partner_sse_realm_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "pre_create_partner_sse_realm" - ) as pre: + 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.SSERealmServiceRestInterceptor, "post_create_partner_sse_realm" + ) as post, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, + "post_create_partner_sse_realm_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "pre_create_partner_sse_realm" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11147,8 +11178,9 @@ def test_delete_partner_sse_realm_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11207,20 +11239,21 @@ def test_delete_partner_sse_realm_rest_interceptors(null_interceptor): ) client = SSERealmServiceClient(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.SSERealmServiceRestInterceptor, "post_delete_partner_sse_realm" - ) as post, mock.patch.object( - transports.SSERealmServiceRestInterceptor, - "post_delete_partner_sse_realm_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SSERealmServiceRestInterceptor, "pre_delete_partner_sse_realm" - ) as pre: + 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.SSERealmServiceRestInterceptor, "post_delete_partner_sse_realm" + ) as post, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, + "post_delete_partner_sse_realm_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SSERealmServiceRestInterceptor, "pre_delete_partner_sse_realm" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11273,8 +11306,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11333,8 +11367,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11398,8 +11433,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11465,8 +11501,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11532,8 +11569,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11596,8 +11634,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11658,8 +11697,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11720,8 +11760,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11782,8 +11823,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12189,11 +12231,14 @@ def test_sse_realm_service_base_transport(): def test_sse_realm_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1alpha1.services.sse_realm_service.transports.SSERealmServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1alpha1.services.sse_realm_service.transports.SSERealmServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SSERealmServiceTransport( @@ -12210,9 +12255,12 @@ def test_sse_realm_service_base_transport_with_credentials_file(): def test_sse_realm_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1alpha1.services.sse_realm_service.transports.SSERealmServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1alpha1.services.sse_realm_service.transports.SSERealmServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SSERealmServiceTransport() @@ -12284,11 +12332,12 @@ def test_sse_realm_service_transport_auth_gdch_credentials(transport_class): def test_sse_realm_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1beta1/test_dns_threat_detector_service.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1beta1/test_dns_threat_detector_service.py index 86fbc2f10dc9..ee42ef48baed 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1beta1/test_dns_threat_detector_service.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1beta1/test_dns_threat_detector_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,21 +43,28 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1beta1.services.dns_threat_detector_service import ( DnsThreatDetectorServiceAsyncClient, @@ -65,10 +72,10 @@ pagers, transports, ) +from google.cloud.network_security_v1beta1.types import dns_threat_detector from google.cloud.network_security_v1beta1.types import ( dns_threat_detector as gcn_dns_threat_detector, ) -from google.cloud.network_security_v1beta1.types import dns_threat_detector CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -1013,10 +1020,9 @@ def test_dns_threat_detector_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1067,9 @@ def test_dns_threat_detector_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1105,9 @@ def test_dns_threat_detector_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1360,13 +1364,13 @@ def test_dns_threat_detector_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4808,8 +4812,9 @@ def test_list_dns_threat_detectors_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4876,20 +4881,22 @@ def test_list_dns_threat_detectors_rest_interceptors(null_interceptor): ) client = DnsThreatDetectorServiceClient(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.DnsThreatDetectorServiceRestInterceptor, - "post_list_dns_threat_detectors", - ) as post, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "post_list_dns_threat_detectors_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "pre_list_dns_threat_detectors", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_list_dns_threat_detectors", + ) as post, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_list_dns_threat_detectors_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "pre_list_dns_threat_detectors", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4949,8 +4956,9 @@ def test_get_dns_threat_detector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5019,20 +5027,22 @@ def test_get_dns_threat_detector_rest_interceptors(null_interceptor): ) client = DnsThreatDetectorServiceClient(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.DnsThreatDetectorServiceRestInterceptor, - "post_get_dns_threat_detector", - ) as post, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "post_get_dns_threat_detector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "pre_get_dns_threat_detector", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_get_dns_threat_detector", + ) as post, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_get_dns_threat_detector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "pre_get_dns_threat_detector", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5090,8 +5100,9 @@ def test_create_dns_threat_detector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5237,20 +5248,22 @@ def test_create_dns_threat_detector_rest_interceptors(null_interceptor): ) client = DnsThreatDetectorServiceClient(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.DnsThreatDetectorServiceRestInterceptor, - "post_create_dns_threat_detector", - ) as post, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "post_create_dns_threat_detector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "pre_create_dns_threat_detector", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_create_dns_threat_detector", + ) as post, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_create_dns_threat_detector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "pre_create_dns_threat_detector", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5312,8 +5325,9 @@ def test_update_dns_threat_detector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5463,20 +5477,22 @@ def test_update_dns_threat_detector_rest_interceptors(null_interceptor): ) client = DnsThreatDetectorServiceClient(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.DnsThreatDetectorServiceRestInterceptor, - "post_update_dns_threat_detector", - ) as post, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "post_update_dns_threat_detector_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DnsThreatDetectorServiceRestInterceptor, - "pre_update_dns_threat_detector", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_update_dns_threat_detector", + ) as post, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "post_update_dns_threat_detector_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "pre_update_dns_threat_detector", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5536,8 +5552,9 @@ def test_delete_dns_threat_detector_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5596,14 +5613,14 @@ def test_delete_dns_threat_detector_rest_interceptors(null_interceptor): ) client = DnsThreatDetectorServiceClient(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.DnsThreatDetectorServiceRestInterceptor, - "pre_delete_dns_threat_detector", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DnsThreatDetectorServiceRestInterceptor, + "pre_delete_dns_threat_detector", + ) as pre, + ): pre.assert_not_called() pb_message = dns_threat_detector.DeleteDnsThreatDetectorRequest.pb( dns_threat_detector.DeleteDnsThreatDetectorRequest() @@ -5648,8 +5665,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5708,8 +5726,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5773,8 +5792,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5840,8 +5860,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5907,8 +5928,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5971,8 +5993,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6033,8 +6056,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6095,8 +6119,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6157,8 +6182,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6389,11 +6415,14 @@ def test_dns_threat_detector_service_base_transport(): def test_dns_threat_detector_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1beta1.services.dns_threat_detector_service.transports.DnsThreatDetectorServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1beta1.services.dns_threat_detector_service.transports.DnsThreatDetectorServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DnsThreatDetectorServiceTransport( @@ -6410,9 +6439,12 @@ def test_dns_threat_detector_service_base_transport_with_credentials_file(): def test_dns_threat_detector_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1beta1.services.dns_threat_detector_service.transports.DnsThreatDetectorServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1beta1.services.dns_threat_detector_service.transports.DnsThreatDetectorServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DnsThreatDetectorServiceTransport() @@ -6486,11 +6518,12 @@ def test_dns_threat_detector_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1beta1/test_network_security.py b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1beta1/test_network_security.py index 18881ca48c69..560b92eae72e 100644 --- a/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1beta1/test_network_security.py +++ b/packages/google-cloud-network-security/tests/unit/gapic/network_security_v1beta1/test_network_security.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_security_v1beta1.services.network_security import ( NetworkSecurityAsyncClient, @@ -75,6 +77,13 @@ pagers, transports, ) +from google.cloud.network_security_v1beta1.types import ( + authorization_policy, + client_tls_policy, + common, + server_tls_policy, + tls, +) from google.cloud.network_security_v1beta1.types import ( authorization_policy as gcn_authorization_policy, ) @@ -84,11 +93,6 @@ from google.cloud.network_security_v1beta1.types import ( server_tls_policy as gcn_server_tls_policy, ) -from google.cloud.network_security_v1beta1.types import authorization_policy -from google.cloud.network_security_v1beta1.types import client_tls_policy -from google.cloud.network_security_v1beta1.types import common -from google.cloud.network_security_v1beta1.types import server_tls_policy -from google.cloud.network_security_v1beta1.types import tls CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -999,10 +1003,9 @@ def test_network_security_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1047,10 +1050,9 @@ def test_network_security_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1086,10 +1088,9 @@ def test_network_security_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1332,13 +1333,13 @@ def test_network_security_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3994,9 +3995,9 @@ def test_get_server_tls_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_tls_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_tls_policy] = ( + mock_rpc + ) request = {} client.get_server_tls_policy(request) @@ -5963,9 +5964,9 @@ def test_get_client_tls_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_client_tls_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_client_tls_policy] = ( + mock_rpc + ) request = {} client.get_client_tls_policy(request) @@ -8619,9 +8620,9 @@ def test_get_server_tls_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_server_tls_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_server_tls_policy] = ( + mock_rpc + ) request = {} client.get_server_tls_policy(request) @@ -9650,9 +9651,9 @@ def test_get_client_tls_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_client_tls_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_client_tls_policy] = ( + mock_rpc + ) request = {} client.get_client_tls_policy(request) @@ -11300,8 +11301,9 @@ def test_list_authorization_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11366,18 +11368,21 @@ def test_list_authorization_policies_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_authorization_policies" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_authorization_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_authorization_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_authorization_policies", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_authorization_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_list_authorization_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11437,8 +11442,9 @@ def test_get_authorization_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11507,18 +11513,20 @@ def test_get_authorization_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_authorization_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_authorization_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_authorization_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_authorization_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_authorization_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_authorization_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11576,8 +11584,9 @@ def test_create_authorization_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11734,20 +11743,22 @@ def test_create_authorization_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_authorization_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_authorization_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_authorization_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_create_authorization_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_authorization_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_create_authorization_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11804,8 +11815,9 @@ def test_update_authorization_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11966,20 +11978,22 @@ def test_update_authorization_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_authorization_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_authorization_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_authorization_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_update_authorization_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_authorization_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_update_authorization_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12034,8 +12048,9 @@ def test_delete_authorization_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12094,20 +12109,22 @@ def test_delete_authorization_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_authorization_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_authorization_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_authorization_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, + "post_delete_authorization_policy", + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_authorization_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_delete_authorization_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12160,8 +12177,9 @@ def test_list_server_tls_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12224,18 +12242,20 @@ def test_list_server_tls_policies_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_server_tls_policies" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_server_tls_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_server_tls_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_list_server_tls_policies" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_server_tls_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_list_server_tls_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12295,8 +12315,9 @@ def test_get_server_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12365,18 +12386,20 @@ def test_get_server_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_server_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_server_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_server_tls_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_server_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_server_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_server_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12431,8 +12454,9 @@ def test_create_server_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12577,20 +12601,21 @@ def test_create_server_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_server_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_server_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_server_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_create_server_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_server_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_create_server_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12647,8 +12672,9 @@ def test_update_server_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12797,20 +12823,21 @@ def test_update_server_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_server_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_server_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_server_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_update_server_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_server_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_update_server_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12865,8 +12892,9 @@ def test_delete_server_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12925,20 +12953,21 @@ def test_delete_server_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_server_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_server_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_server_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_delete_server_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_server_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_delete_server_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12991,8 +13020,9 @@ def test_list_client_tls_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13055,18 +13085,20 @@ def test_list_client_tls_policies_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_list_client_tls_policies" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_list_client_tls_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_list_client_tls_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_list_client_tls_policies" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_list_client_tls_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_list_client_tls_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13126,8 +13158,9 @@ def test_get_client_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13196,18 +13229,20 @@ def test_get_client_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_get_client_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_get_client_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_get_client_tls_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "post_get_client_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_get_client_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_get_client_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13262,8 +13297,9 @@ def test_create_client_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13406,20 +13442,21 @@ def test_create_client_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_create_client_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_create_client_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_create_client_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_create_client_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_create_client_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_create_client_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13476,8 +13513,9 @@ def test_update_client_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13624,20 +13662,21 @@ def test_update_client_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_update_client_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_update_client_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_update_client_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_update_client_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_update_client_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_update_client_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13692,8 +13731,9 @@ def test_delete_client_tls_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13752,20 +13792,21 @@ def test_delete_client_tls_policy_rest_interceptors(null_interceptor): ) client = NetworkSecurityClient(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.NetworkSecurityRestInterceptor, "post_delete_client_tls_policy" - ) as post, mock.patch.object( - transports.NetworkSecurityRestInterceptor, - "post_delete_client_tls_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkSecurityRestInterceptor, "pre_delete_client_tls_policy" - ) as pre: + 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.NetworkSecurityRestInterceptor, "post_delete_client_tls_policy" + ) as post, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, + "post_delete_client_tls_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkSecurityRestInterceptor, "pre_delete_client_tls_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13818,8 +13859,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13878,8 +13920,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13943,8 +13986,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14010,8 +14054,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14077,8 +14122,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14141,8 +14187,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14203,8 +14250,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14265,8 +14313,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14327,8 +14376,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -14811,11 +14861,14 @@ def test_network_security_base_transport(): def test_network_security_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_security_v1beta1.services.network_security.transports.NetworkSecurityTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_security_v1beta1.services.network_security.transports.NetworkSecurityTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkSecurityTransport( @@ -14832,9 +14885,12 @@ def test_network_security_base_transport_with_credentials_file(): def test_network_security_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_security_v1beta1.services.network_security.transports.NetworkSecurityTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_security_v1beta1.services.network_security.transports.NetworkSecurityTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkSecurityTransport() @@ -14906,11 +14962,12 @@ def test_network_security_transport_auth_gdch_credentials(transport_class): def test_network_security_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-services/docs/conf.py b/packages/google-cloud-network-services/docs/conf.py index 51b0110f05fd..67ee4eea2358 100644 --- a/packages/google-cloud-network-services/docs/conf.py +++ b/packages/google-cloud-network-services/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-network-services documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/__init__.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/__init__.py index 493f62af576b..f16d4ab23c8a 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/__init__.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.dep_service import DepServiceAsyncClient, DepServiceClient from .services.network_services import NetworkServicesAsyncClient, NetworkServicesClient from .types.common import ( diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/async_client.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/async_client.py index c6e3e32d31c8..8d5855402b08 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/async_client.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_services_v1 import gapic_version as package_version @@ -44,17 +44,19 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_services_v1.services.dep_service import pagers from google.cloud.network_services_v1.types import common, dep @@ -133,7 +135,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DepServiceAsyncClient: The constructed client. """ - return DepServiceClient.from_service_account_info.__func__(DepServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = DepServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(DepServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +152,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DepServiceAsyncClient: The constructed client. """ - return DepServiceClient.from_service_account_file.__func__(DepServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = DepServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(DepServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/client.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/client.py index 1842de605445..6f412f639553 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/client.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_services_v1 import gapic_version as package_version @@ -61,17 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_services_v1.services.dep_service import pagers from google.cloud.network_services_v1.types import common, dep @@ -696,11 +698,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DepServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DepServiceClient._read_environment_variables() + ) self._client_cert_source = DepServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -735,8 +735,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DepServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/pagers.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/pagers.py index ed2135bbb5db..e79073ce0947 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/pagers.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -611,7 +611,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/base.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/base.py index c49878d602fa..c999a1ddf614 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/base.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_services_v1 import gapic_version as package_version from google.cloud.network_services_v1.types import dep @@ -516,13 +518,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/grpc.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/grpc.py index 7960a1f97e97..b95f593ebe33 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/grpc.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.network_services_v1.types import dep @@ -364,12 +366,12 @@ def list_lb_traffic_extensions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_lb_traffic_extensions" not in self._stubs: - self._stubs[ - "list_lb_traffic_extensions" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkservices.v1.DepService/ListLbTrafficExtensions", - request_serializer=dep.ListLbTrafficExtensionsRequest.serialize, - response_deserializer=dep.ListLbTrafficExtensionsResponse.deserialize, + self._stubs["list_lb_traffic_extensions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkservices.v1.DepService/ListLbTrafficExtensions", + request_serializer=dep.ListLbTrafficExtensionsRequest.serialize, + response_deserializer=dep.ListLbTrafficExtensionsResponse.deserialize, + ) ) return self._stubs["list_lb_traffic_extensions"] @@ -419,12 +421,12 @@ def create_lb_traffic_extension( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_lb_traffic_extension" not in self._stubs: - self._stubs[ - "create_lb_traffic_extension" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkservices.v1.DepService/CreateLbTrafficExtension", - request_serializer=dep.CreateLbTrafficExtensionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_lb_traffic_extension"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkservices.v1.DepService/CreateLbTrafficExtension", + request_serializer=dep.CreateLbTrafficExtensionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_lb_traffic_extension"] @@ -448,12 +450,12 @@ def update_lb_traffic_extension( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_lb_traffic_extension" not in self._stubs: - self._stubs[ - "update_lb_traffic_extension" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkservices.v1.DepService/UpdateLbTrafficExtension", - request_serializer=dep.UpdateLbTrafficExtensionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_lb_traffic_extension"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkservices.v1.DepService/UpdateLbTrafficExtension", + request_serializer=dep.UpdateLbTrafficExtensionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_lb_traffic_extension"] @@ -476,12 +478,12 @@ def delete_lb_traffic_extension( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_lb_traffic_extension" not in self._stubs: - self._stubs[ - "delete_lb_traffic_extension" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkservices.v1.DepService/DeleteLbTrafficExtension", - request_serializer=dep.DeleteLbTrafficExtensionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_lb_traffic_extension"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkservices.v1.DepService/DeleteLbTrafficExtension", + request_serializer=dep.DeleteLbTrafficExtensionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_lb_traffic_extension"] diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/grpc_asyncio.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/grpc_asyncio.py index f8c68cb4d0cc..86b8797a7c21 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.network_services_v1.types import dep @@ -373,12 +375,12 @@ def list_lb_traffic_extensions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_lb_traffic_extensions" not in self._stubs: - self._stubs[ - "list_lb_traffic_extensions" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkservices.v1.DepService/ListLbTrafficExtensions", - request_serializer=dep.ListLbTrafficExtensionsRequest.serialize, - response_deserializer=dep.ListLbTrafficExtensionsResponse.deserialize, + self._stubs["list_lb_traffic_extensions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkservices.v1.DepService/ListLbTrafficExtensions", + request_serializer=dep.ListLbTrafficExtensionsRequest.serialize, + response_deserializer=dep.ListLbTrafficExtensionsResponse.deserialize, + ) ) return self._stubs["list_lb_traffic_extensions"] @@ -432,12 +434,12 @@ def create_lb_traffic_extension( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_lb_traffic_extension" not in self._stubs: - self._stubs[ - "create_lb_traffic_extension" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkservices.v1.DepService/CreateLbTrafficExtension", - request_serializer=dep.CreateLbTrafficExtensionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_lb_traffic_extension"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkservices.v1.DepService/CreateLbTrafficExtension", + request_serializer=dep.CreateLbTrafficExtensionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_lb_traffic_extension"] @@ -463,12 +465,12 @@ def update_lb_traffic_extension( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_lb_traffic_extension" not in self._stubs: - self._stubs[ - "update_lb_traffic_extension" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkservices.v1.DepService/UpdateLbTrafficExtension", - request_serializer=dep.UpdateLbTrafficExtensionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_lb_traffic_extension"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkservices.v1.DepService/UpdateLbTrafficExtension", + request_serializer=dep.UpdateLbTrafficExtensionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_lb_traffic_extension"] @@ -493,12 +495,12 @@ def delete_lb_traffic_extension( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_lb_traffic_extension" not in self._stubs: - self._stubs[ - "delete_lb_traffic_extension" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkservices.v1.DepService/DeleteLbTrafficExtension", - request_serializer=dep.DeleteLbTrafficExtensionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_lb_traffic_extension"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkservices.v1.DepService/DeleteLbTrafficExtension", + request_serializer=dep.DeleteLbTrafficExtensionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_lb_traffic_extension"] diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/rest.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/rest.py index 19b0d85ed2ad..af71c8d320d5 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/rest.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1620,9 +1622,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseCreateAuthzExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseCreateAuthzExtension._get_http_options() request, metadata = self._interceptor.pre_create_authz_extension( request, metadata @@ -1648,7 +1648,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1773,9 +1773,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseCreateLbEdgeExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseCreateLbEdgeExtension._get_http_options() request, metadata = self._interceptor.pre_create_lb_edge_extension( request, metadata @@ -1801,7 +1799,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1926,9 +1924,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseCreateLbRouteExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseCreateLbRouteExtension._get_http_options() request, metadata = self._interceptor.pre_create_lb_route_extension( request, metadata @@ -1954,7 +1950,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2080,9 +2076,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseCreateLbTrafficExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseCreateLbTrafficExtension._get_http_options() request, metadata = self._interceptor.pre_create_lb_traffic_extension( request, metadata @@ -2108,7 +2102,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2232,9 +2226,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseDeleteAuthzExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseDeleteAuthzExtension._get_http_options() request, metadata = self._interceptor.pre_delete_authz_extension( request, metadata @@ -2256,7 +2248,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2379,9 +2371,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseDeleteLbEdgeExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseDeleteLbEdgeExtension._get_http_options() request, metadata = self._interceptor.pre_delete_lb_edge_extension( request, metadata @@ -2403,7 +2393,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2526,9 +2516,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseDeleteLbRouteExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseDeleteLbRouteExtension._get_http_options() request, metadata = self._interceptor.pre_delete_lb_route_extension( request, metadata @@ -2550,7 +2538,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2674,9 +2662,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseDeleteLbTrafficExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseDeleteLbTrafficExtension._get_http_options() request, metadata = self._interceptor.pre_delete_lb_traffic_extension( request, metadata @@ -2698,7 +2684,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3119,9 +3105,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseGetLbRouteExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseGetLbRouteExtension._get_http_options() request, metadata = self._interceptor.pre_get_lb_route_extension( request, metadata @@ -3270,9 +3254,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseGetLbTrafficExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseGetLbTrafficExtension._get_http_options() request, metadata = self._interceptor.pre_get_lb_traffic_extension( request, metadata @@ -3419,9 +3401,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseListAuthzExtensions._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseListAuthzExtensions._get_http_options() request, metadata = self._interceptor.pre_list_authz_extensions( request, metadata @@ -3568,9 +3548,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseListLbEdgeExtensions._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseListLbEdgeExtensions._get_http_options() request, metadata = self._interceptor.pre_list_lb_edge_extensions( request, metadata @@ -3719,9 +3697,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseListLbRouteExtensions._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseListLbRouteExtensions._get_http_options() request, metadata = self._interceptor.pre_list_lb_route_extensions( request, metadata @@ -3871,9 +3847,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseListLbTrafficExtensions._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseListLbTrafficExtensions._get_http_options() request, metadata = self._interceptor.pre_list_lb_traffic_extensions( request, metadata @@ -4023,9 +3997,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseUpdateAuthzExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseUpdateAuthzExtension._get_http_options() request, metadata = self._interceptor.pre_update_authz_extension( request, metadata @@ -4051,7 +4023,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4176,9 +4148,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseUpdateLbEdgeExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseUpdateLbEdgeExtension._get_http_options() request, metadata = self._interceptor.pre_update_lb_edge_extension( request, metadata @@ -4204,7 +4174,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4329,9 +4299,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseUpdateLbRouteExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseUpdateLbRouteExtension._get_http_options() request, metadata = self._interceptor.pre_update_lb_route_extension( request, metadata @@ -4357,7 +4325,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4483,9 +4451,7 @@ def __call__( """ - http_options = ( - _BaseDepServiceRestTransport._BaseUpdateLbTrafficExtension._get_http_options() - ) + http_options = _BaseDepServiceRestTransport._BaseUpdateLbTrafficExtension._get_http_options() request, metadata = self._interceptor.pre_update_lb_traffic_extension( request, metadata @@ -4511,7 +4477,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4600,7 +4566,9 @@ def create_lb_route_extension( ) -> Callable[[dep.CreateLbRouteExtensionRequest], 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._CreateLbRouteExtension(self._session, self._host, self._interceptor) # type: ignore + return self._CreateLbRouteExtension( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_lb_traffic_extension( @@ -4608,7 +4576,9 @@ def create_lb_traffic_extension( ) -> Callable[[dep.CreateLbTrafficExtensionRequest], 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._CreateLbTrafficExtension(self._session, self._host, self._interceptor) # type: ignore + return self._CreateLbTrafficExtension( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_authz_extension( @@ -4632,7 +4602,9 @@ def delete_lb_route_extension( ) -> Callable[[dep.DeleteLbRouteExtensionRequest], 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._DeleteLbRouteExtension(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteLbRouteExtension( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_lb_traffic_extension( @@ -4640,7 +4612,9 @@ def delete_lb_traffic_extension( ) -> Callable[[dep.DeleteLbTrafficExtensionRequest], 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._DeleteLbTrafficExtension(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteLbTrafficExtension( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_authz_extension( @@ -4708,7 +4682,9 @@ def list_lb_traffic_extensions( ]: # 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._ListLbTrafficExtensions(self._session, self._host, self._interceptor) # type: ignore + return self._ListLbTrafficExtensions( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_authz_extension( @@ -4732,7 +4708,9 @@ def update_lb_route_extension( ) -> Callable[[dep.UpdateLbRouteExtensionRequest], 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._UpdateLbRouteExtension(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateLbRouteExtension( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_lb_traffic_extension( @@ -4740,7 +4718,9 @@ def update_lb_traffic_extension( ) -> Callable[[dep.UpdateLbTrafficExtensionRequest], 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._UpdateLbTrafficExtension(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateLbTrafficExtension( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/rest_base.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/rest_base.py index fb15b009e58a..29bc1ad99215 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/rest_base.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/dep_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/async_client.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/async_client.py index ab288167d44d..404272039663 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/async_client.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_services_v1 import gapic_version as package_version @@ -44,43 +44,47 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_services_v1.services.network_services import pagers +from google.cloud.network_services_v1.types import ( + common, + endpoint_policy, + extensibility, + gateway, + grpc_route, + http_route, + mesh, + route_view, + service_binding, + service_lb_policy, + tcp_route, + tls_route, +) from google.cloud.network_services_v1.types import ( endpoint_policy as gcn_endpoint_policy, ) +from google.cloud.network_services_v1.types import gateway as gcn_gateway +from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route +from google.cloud.network_services_v1.types import http_route as gcn_http_route +from google.cloud.network_services_v1.types import mesh as gcn_mesh from google.cloud.network_services_v1.types import ( service_binding as gcn_service_binding, ) from google.cloud.network_services_v1.types import ( service_lb_policy as gcn_service_lb_policy, ) -from google.cloud.network_services_v1.types import common -from google.cloud.network_services_v1.types import endpoint_policy -from google.cloud.network_services_v1.types import extensibility -from google.cloud.network_services_v1.types import gateway -from google.cloud.network_services_v1.types import gateway as gcn_gateway -from google.cloud.network_services_v1.types import grpc_route -from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route -from google.cloud.network_services_v1.types import http_route -from google.cloud.network_services_v1.types import http_route as gcn_http_route -from google.cloud.network_services_v1.types import mesh -from google.cloud.network_services_v1.types import mesh as gcn_mesh -from google.cloud.network_services_v1.types import route_view -from google.cloud.network_services_v1.types import service_binding -from google.cloud.network_services_v1.types import service_lb_policy -from google.cloud.network_services_v1.types import tcp_route from google.cloud.network_services_v1.types import tcp_route as gcn_tcp_route -from google.cloud.network_services_v1.types import tls_route from google.cloud.network_services_v1.types import tls_route as gcn_tls_route from .client import NetworkServicesClient @@ -223,7 +227,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: NetworkServicesAsyncClient: The constructed client. """ - return NetworkServicesClient.from_service_account_info.__func__(NetworkServicesAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = NetworkServicesClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(NetworkServicesAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -239,7 +244,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: NetworkServicesAsyncClient: The constructed client. """ - return NetworkServicesClient.from_service_account_file.__func__(NetworkServicesAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = NetworkServicesClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(NetworkServicesAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/client.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/client.py index 019dd3d86228..787c0befdea7 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/client.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_services_v1 import gapic_version as package_version @@ -61,43 +61,47 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_services_v1.services.network_services import pagers +from google.cloud.network_services_v1.types import ( + common, + endpoint_policy, + extensibility, + gateway, + grpc_route, + http_route, + mesh, + route_view, + service_binding, + service_lb_policy, + tcp_route, + tls_route, +) from google.cloud.network_services_v1.types import ( endpoint_policy as gcn_endpoint_policy, ) +from google.cloud.network_services_v1.types import gateway as gcn_gateway +from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route +from google.cloud.network_services_v1.types import http_route as gcn_http_route +from google.cloud.network_services_v1.types import mesh as gcn_mesh from google.cloud.network_services_v1.types import ( service_binding as gcn_service_binding, ) from google.cloud.network_services_v1.types import ( service_lb_policy as gcn_service_lb_policy, ) -from google.cloud.network_services_v1.types import common -from google.cloud.network_services_v1.types import endpoint_policy -from google.cloud.network_services_v1.types import extensibility -from google.cloud.network_services_v1.types import gateway -from google.cloud.network_services_v1.types import gateway as gcn_gateway -from google.cloud.network_services_v1.types import grpc_route -from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route -from google.cloud.network_services_v1.types import http_route -from google.cloud.network_services_v1.types import http_route as gcn_http_route -from google.cloud.network_services_v1.types import mesh -from google.cloud.network_services_v1.types import mesh as gcn_mesh -from google.cloud.network_services_v1.types import route_view -from google.cloud.network_services_v1.types import service_binding -from google.cloud.network_services_v1.types import service_lb_policy -from google.cloud.network_services_v1.types import tcp_route from google.cloud.network_services_v1.types import tcp_route as gcn_tcp_route -from google.cloud.network_services_v1.types import tls_route from google.cloud.network_services_v1.types import tls_route as gcn_tls_route from .transports.base import DEFAULT_CLIENT_INFO, NetworkServicesTransport @@ -114,9 +118,7 @@ class NetworkServicesClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NetworkServicesTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NetworkServicesTransport]] _transport_registry["grpc"] = NetworkServicesGrpcTransport _transport_registry["grpc_asyncio"] = NetworkServicesGrpcAsyncIOTransport _transport_registry["rest"] = NetworkServicesRestTransport @@ -1151,11 +1153,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NetworkServicesClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NetworkServicesClient._read_environment_variables() + ) self._client_cert_source = NetworkServicesClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1190,8 +1190,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NetworkServicesTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/pagers.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/pagers.py index 9450b19be529..cbacc4997dcd 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/pagers.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/pagers.py @@ -79,7 +79,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -155,7 +155,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -237,7 +237,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -313,7 +313,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -395,7 +395,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -471,7 +471,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -551,7 +551,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -627,7 +627,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -707,7 +707,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -783,7 +783,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -863,7 +863,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -939,7 +939,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1019,7 +1019,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1095,7 +1095,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1175,7 +1175,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1251,7 +1251,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1331,7 +1331,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1407,7 +1407,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1487,7 +1487,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1563,7 +1563,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1643,7 +1643,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1721,7 +1721,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1803,7 +1803,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1879,7 +1879,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1959,7 +1959,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2035,7 +2035,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/base.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/base.py index 87ea6a6507d6..2b12400c29ab 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/base.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/base.py @@ -17,44 +17,48 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.network_services_v1 import gapic_version as package_version +from google.cloud.network_services_v1.types import ( + endpoint_policy, + extensibility, + gateway, + grpc_route, + http_route, + mesh, + route_view, + service_binding, + service_lb_policy, + tcp_route, + tls_route, +) from google.cloud.network_services_v1.types import ( endpoint_policy as gcn_endpoint_policy, ) +from google.cloud.network_services_v1.types import gateway as gcn_gateway +from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route +from google.cloud.network_services_v1.types import http_route as gcn_http_route +from google.cloud.network_services_v1.types import mesh as gcn_mesh from google.cloud.network_services_v1.types import ( service_binding as gcn_service_binding, ) from google.cloud.network_services_v1.types import ( service_lb_policy as gcn_service_lb_policy, ) -from google.cloud.network_services_v1.types import endpoint_policy -from google.cloud.network_services_v1.types import extensibility -from google.cloud.network_services_v1.types import gateway -from google.cloud.network_services_v1.types import gateway as gcn_gateway -from google.cloud.network_services_v1.types import grpc_route -from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route -from google.cloud.network_services_v1.types import http_route -from google.cloud.network_services_v1.types import http_route as gcn_http_route -from google.cloud.network_services_v1.types import mesh -from google.cloud.network_services_v1.types import mesh as gcn_mesh -from google.cloud.network_services_v1.types import route_view -from google.cloud.network_services_v1.types import service_binding -from google.cloud.network_services_v1.types import service_lb_policy -from google.cloud.network_services_v1.types import tcp_route from google.cloud.network_services_v1.types import tcp_route as gcn_tcp_route -from google.cloud.network_services_v1.types import tls_route from google.cloud.network_services_v1.types import tls_route as gcn_tls_route DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -1098,13 +1102,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/grpc.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/grpc.py index ff3cf83d33eb..bc58a1811128 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/grpc.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/grpc.py @@ -16,47 +16,51 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore +from google.cloud.network_services_v1.types import ( + endpoint_policy, + extensibility, + gateway, + grpc_route, + http_route, + mesh, + route_view, + service_binding, + service_lb_policy, + tcp_route, + tls_route, +) from google.cloud.network_services_v1.types import ( endpoint_policy as gcn_endpoint_policy, ) +from google.cloud.network_services_v1.types import gateway as gcn_gateway +from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route +from google.cloud.network_services_v1.types import http_route as gcn_http_route +from google.cloud.network_services_v1.types import mesh as gcn_mesh from google.cloud.network_services_v1.types import ( service_binding as gcn_service_binding, ) from google.cloud.network_services_v1.types import ( service_lb_policy as gcn_service_lb_policy, ) -from google.cloud.network_services_v1.types import endpoint_policy -from google.cloud.network_services_v1.types import extensibility -from google.cloud.network_services_v1.types import gateway -from google.cloud.network_services_v1.types import gateway as gcn_gateway -from google.cloud.network_services_v1.types import grpc_route -from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route -from google.cloud.network_services_v1.types import http_route -from google.cloud.network_services_v1.types import http_route as gcn_http_route -from google.cloud.network_services_v1.types import mesh -from google.cloud.network_services_v1.types import mesh as gcn_mesh -from google.cloud.network_services_v1.types import route_view -from google.cloud.network_services_v1.types import service_binding -from google.cloud.network_services_v1.types import service_lb_policy -from google.cloud.network_services_v1.types import tcp_route from google.cloud.network_services_v1.types import tcp_route as gcn_tcp_route -from google.cloud.network_services_v1.types import tls_route from google.cloud.network_services_v1.types import tls_route as gcn_tls_route from .base import DEFAULT_CLIENT_INFO, NetworkServicesTransport @@ -590,12 +594,12 @@ def create_wasm_plugin_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_wasm_plugin_version" not in self._stubs: - self._stubs[ - "create_wasm_plugin_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkservices.v1.NetworkServices/CreateWasmPluginVersion", - request_serializer=extensibility.CreateWasmPluginVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_wasm_plugin_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkservices.v1.NetworkServices/CreateWasmPluginVersion", + request_serializer=extensibility.CreateWasmPluginVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_wasm_plugin_version"] @@ -620,12 +624,12 @@ def delete_wasm_plugin_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_wasm_plugin_version" not in self._stubs: - self._stubs[ - "delete_wasm_plugin_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkservices.v1.NetworkServices/DeleteWasmPluginVersion", - request_serializer=extensibility.DeleteWasmPluginVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_wasm_plugin_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkservices.v1.NetworkServices/DeleteWasmPluginVersion", + request_serializer=extensibility.DeleteWasmPluginVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_wasm_plugin_version"] diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/grpc_asyncio.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/grpc_asyncio.py index bc4b4ead7a30..9803409663c5 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/grpc_asyncio.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/grpc_asyncio.py @@ -17,49 +17,53 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.network_services_v1.types import ( + endpoint_policy, + extensibility, + gateway, + grpc_route, + http_route, + mesh, + route_view, + service_binding, + service_lb_policy, + tcp_route, + tls_route, +) from google.cloud.network_services_v1.types import ( endpoint_policy as gcn_endpoint_policy, ) +from google.cloud.network_services_v1.types import gateway as gcn_gateway +from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route +from google.cloud.network_services_v1.types import http_route as gcn_http_route +from google.cloud.network_services_v1.types import mesh as gcn_mesh from google.cloud.network_services_v1.types import ( service_binding as gcn_service_binding, ) from google.cloud.network_services_v1.types import ( service_lb_policy as gcn_service_lb_policy, ) -from google.cloud.network_services_v1.types import endpoint_policy -from google.cloud.network_services_v1.types import extensibility -from google.cloud.network_services_v1.types import gateway -from google.cloud.network_services_v1.types import gateway as gcn_gateway -from google.cloud.network_services_v1.types import grpc_route -from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route -from google.cloud.network_services_v1.types import http_route -from google.cloud.network_services_v1.types import http_route as gcn_http_route -from google.cloud.network_services_v1.types import mesh -from google.cloud.network_services_v1.types import mesh as gcn_mesh -from google.cloud.network_services_v1.types import route_view -from google.cloud.network_services_v1.types import service_binding -from google.cloud.network_services_v1.types import service_lb_policy -from google.cloud.network_services_v1.types import tcp_route from google.cloud.network_services_v1.types import tcp_route as gcn_tcp_route -from google.cloud.network_services_v1.types import tls_route from google.cloud.network_services_v1.types import tls_route as gcn_tls_route from .base import DEFAULT_CLIENT_INFO, NetworkServicesTransport @@ -604,12 +608,12 @@ def create_wasm_plugin_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_wasm_plugin_version" not in self._stubs: - self._stubs[ - "create_wasm_plugin_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkservices.v1.NetworkServices/CreateWasmPluginVersion", - request_serializer=extensibility.CreateWasmPluginVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_wasm_plugin_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkservices.v1.NetworkServices/CreateWasmPluginVersion", + request_serializer=extensibility.CreateWasmPluginVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_wasm_plugin_version"] @@ -635,12 +639,12 @@ def delete_wasm_plugin_version( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_wasm_plugin_version" not in self._stubs: - self._stubs[ - "delete_wasm_plugin_version" - ] = self._logged_channel.unary_unary( - "/google.cloud.networkservices.v1.NetworkServices/DeleteWasmPluginVersion", - request_serializer=extensibility.DeleteWasmPluginVersionRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_wasm_plugin_version"] = ( + self._logged_channel.unary_unary( + "/google.cloud.networkservices.v1.NetworkServices/DeleteWasmPluginVersion", + request_serializer=extensibility.DeleteWasmPluginVersionRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_wasm_plugin_version"] diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/rest.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/rest.py index 8f33b7732b13..088c9bbef63b 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/rest.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/rest.py @@ -16,47 +16,51 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.network_services_v1.types import ( + endpoint_policy, + extensibility, + gateway, + grpc_route, + http_route, + mesh, + route_view, + service_binding, + service_lb_policy, + tcp_route, + tls_route, +) from google.cloud.network_services_v1.types import ( endpoint_policy as gcn_endpoint_policy, ) +from google.cloud.network_services_v1.types import gateway as gcn_gateway +from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route +from google.cloud.network_services_v1.types import http_route as gcn_http_route +from google.cloud.network_services_v1.types import mesh as gcn_mesh from google.cloud.network_services_v1.types import ( service_binding as gcn_service_binding, ) from google.cloud.network_services_v1.types import ( service_lb_policy as gcn_service_lb_policy, ) -from google.cloud.network_services_v1.types import endpoint_policy -from google.cloud.network_services_v1.types import extensibility -from google.cloud.network_services_v1.types import gateway -from google.cloud.network_services_v1.types import gateway as gcn_gateway -from google.cloud.network_services_v1.types import grpc_route -from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route -from google.cloud.network_services_v1.types import http_route -from google.cloud.network_services_v1.types import http_route as gcn_http_route -from google.cloud.network_services_v1.types import mesh -from google.cloud.network_services_v1.types import mesh as gcn_mesh -from google.cloud.network_services_v1.types import route_view -from google.cloud.network_services_v1.types import service_binding -from google.cloud.network_services_v1.types import service_lb_policy -from google.cloud.network_services_v1.types import tcp_route from google.cloud.network_services_v1.types import tcp_route as gcn_tcp_route -from google.cloud.network_services_v1.types import tls_route from google.cloud.network_services_v1.types import tls_route as gcn_tls_route from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -3787,9 +3791,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseCreateEndpointPolicy._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseCreateEndpointPolicy._get_http_options() request, metadata = self._interceptor.pre_create_endpoint_policy( request, metadata @@ -3815,7 +3817,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3967,7 +3969,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4093,9 +4095,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseCreateGrpcRoute._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseCreateGrpcRoute._get_http_options() request, metadata = self._interceptor.pre_create_grpc_route( request, metadata @@ -4121,7 +4121,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4246,9 +4246,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseCreateHttpRoute._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseCreateHttpRoute._get_http_options() request, metadata = self._interceptor.pre_create_http_route( request, metadata @@ -4274,7 +4272,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4426,7 +4424,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4553,9 +4551,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseCreateServiceBinding._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseCreateServiceBinding._get_http_options() request, metadata = self._interceptor.pre_create_service_binding( request, metadata @@ -4581,7 +4577,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4708,9 +4704,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseCreateServiceLbPolicy._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseCreateServiceLbPolicy._get_http_options() request, metadata = self._interceptor.pre_create_service_lb_policy( request, metadata @@ -4736,7 +4730,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4863,9 +4857,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseCreateTcpRoute._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseCreateTcpRoute._get_http_options() request, metadata = self._interceptor.pre_create_tcp_route( request, metadata @@ -4891,7 +4883,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5016,9 +5008,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseCreateTlsRoute._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseCreateTlsRoute._get_http_options() request, metadata = self._interceptor.pre_create_tls_route( request, metadata @@ -5044,7 +5034,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5169,9 +5159,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseCreateWasmPlugin._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseCreateWasmPlugin._get_http_options() request, metadata = self._interceptor.pre_create_wasm_plugin( request, metadata @@ -5197,7 +5185,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5324,9 +5312,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseCreateWasmPluginVersion._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseCreateWasmPluginVersion._get_http_options() request, metadata = self._interceptor.pre_create_wasm_plugin_version( request, metadata @@ -5352,7 +5338,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5480,9 +5466,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseDeleteEndpointPolicy._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseDeleteEndpointPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_endpoint_policy( request, metadata @@ -5504,7 +5488,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5650,7 +5634,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5774,9 +5758,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseDeleteGrpcRoute._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseDeleteGrpcRoute._get_http_options() request, metadata = self._interceptor.pre_delete_grpc_route( request, metadata @@ -5798,7 +5780,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5922,9 +5904,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseDeleteHttpRoute._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseDeleteHttpRoute._get_http_options() request, metadata = self._interceptor.pre_delete_http_route( request, metadata @@ -5946,7 +5926,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6092,7 +6072,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6217,9 +6197,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseDeleteServiceBinding._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseDeleteServiceBinding._get_http_options() request, metadata = self._interceptor.pre_delete_service_binding( request, metadata @@ -6241,7 +6219,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6366,9 +6344,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseDeleteServiceLbPolicy._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseDeleteServiceLbPolicy._get_http_options() request, metadata = self._interceptor.pre_delete_service_lb_policy( request, metadata @@ -6390,7 +6366,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6516,9 +6492,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseDeleteTcpRoute._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseDeleteTcpRoute._get_http_options() request, metadata = self._interceptor.pre_delete_tcp_route( request, metadata @@ -6540,7 +6514,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6664,9 +6638,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseDeleteTlsRoute._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseDeleteTlsRoute._get_http_options() request, metadata = self._interceptor.pre_delete_tls_route( request, metadata @@ -6688,7 +6660,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6811,9 +6783,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseDeleteWasmPlugin._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseDeleteWasmPlugin._get_http_options() request, metadata = self._interceptor.pre_delete_wasm_plugin( request, metadata @@ -6835,7 +6805,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6960,9 +6930,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseDeleteWasmPluginVersion._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseDeleteWasmPluginVersion._get_http_options() request, metadata = self._interceptor.pre_delete_wasm_plugin_version( request, metadata @@ -6984,7 +6952,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -7114,9 +7082,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseGetEndpointPolicy._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseGetEndpointPolicy._get_http_options() request, metadata = self._interceptor.pre_get_endpoint_policy( request, metadata @@ -7417,9 +7383,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseGetGatewayRouteView._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseGetGatewayRouteView._get_http_options() request, metadata = self._interceptor.pre_get_gateway_route_view( request, metadata @@ -8016,9 +7980,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseGetMeshRouteView._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseGetMeshRouteView._get_http_options() request, metadata = self._interceptor.pre_get_mesh_route_view( request, metadata @@ -8176,9 +8138,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseGetServiceBinding._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseGetServiceBinding._get_http_options() request, metadata = self._interceptor.pre_get_service_binding( request, metadata @@ -8328,9 +8288,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseGetServiceLbPolicy._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseGetServiceLbPolicy._get_http_options() request, metadata = self._interceptor.pre_get_service_lb_policy( request, metadata @@ -8922,9 +8880,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseGetWasmPluginVersion._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseGetWasmPluginVersion._get_http_options() request, metadata = self._interceptor.pre_get_wasm_plugin_version( request, metadata @@ -9072,9 +9028,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseListEndpointPolicies._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseListEndpointPolicies._get_http_options() request, metadata = self._interceptor.pre_list_endpoint_policies( request, metadata @@ -9224,9 +9178,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseListGatewayRouteViews._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseListGatewayRouteViews._get_http_options() request, metadata = self._interceptor.pre_list_gateway_route_views( request, metadata @@ -9524,9 +9476,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseListGrpcRoutes._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseListGrpcRoutes._get_http_options() request, metadata = self._interceptor.pre_list_grpc_routes( request, metadata @@ -9675,9 +9625,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseListHttpRoutes._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseListHttpRoutes._get_http_options() request, metadata = self._interceptor.pre_list_http_routes( request, metadata @@ -9974,9 +9922,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseListMeshRouteViews._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseListMeshRouteViews._get_http_options() request, metadata = self._interceptor.pre_list_mesh_route_views( request, metadata @@ -10126,9 +10072,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseListServiceBindings._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseListServiceBindings._get_http_options() request, metadata = self._interceptor.pre_list_service_bindings( request, metadata @@ -10278,9 +10222,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseListServiceLbPolicies._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseListServiceLbPolicies._get_http_options() request, metadata = self._interceptor.pre_list_service_lb_policies( request, metadata @@ -10724,9 +10666,7 @@ def __call__( Response returned by the ``ListWasmPlugins`` method. """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseListWasmPlugins._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseListWasmPlugins._get_http_options() request, metadata = self._interceptor.pre_list_wasm_plugins( request, metadata @@ -10875,9 +10815,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseListWasmPluginVersions._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseListWasmPluginVersions._get_http_options() request, metadata = self._interceptor.pre_list_wasm_plugin_versions( request, metadata @@ -11031,9 +10969,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseUpdateEndpointPolicy._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseUpdateEndpointPolicy._get_http_options() request, metadata = self._interceptor.pre_update_endpoint_policy( request, metadata @@ -11059,7 +10995,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11211,7 +11147,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11337,9 +11273,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseUpdateGrpcRoute._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseUpdateGrpcRoute._get_http_options() request, metadata = self._interceptor.pre_update_grpc_route( request, metadata @@ -11365,7 +11299,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11491,9 +11425,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseUpdateHttpRoute._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseUpdateHttpRoute._get_http_options() request, metadata = self._interceptor.pre_update_http_route( request, metadata @@ -11519,7 +11451,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11671,7 +11603,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11798,9 +11730,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseUpdateServiceBinding._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseUpdateServiceBinding._get_http_options() request, metadata = self._interceptor.pre_update_service_binding( request, metadata @@ -11826,7 +11756,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11953,9 +11883,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseUpdateServiceLbPolicy._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseUpdateServiceLbPolicy._get_http_options() request, metadata = self._interceptor.pre_update_service_lb_policy( request, metadata @@ -11981,7 +11909,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12109,9 +12037,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseUpdateTcpRoute._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseUpdateTcpRoute._get_http_options() request, metadata = self._interceptor.pre_update_tcp_route( request, metadata @@ -12137,7 +12063,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12263,9 +12189,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseUpdateTlsRoute._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseUpdateTlsRoute._get_http_options() request, metadata = self._interceptor.pre_update_tls_route( request, metadata @@ -12291,7 +12215,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12416,9 +12340,7 @@ def __call__( """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseUpdateWasmPlugin._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseUpdateWasmPlugin._get_http_options() request, metadata = self._interceptor.pre_update_wasm_plugin( request, metadata @@ -12444,7 +12366,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12605,7 +12527,9 @@ def create_wasm_plugin_version( ]: # 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._CreateWasmPluginVersion(self._session, self._host, self._interceptor) # type: ignore + return self._CreateWasmPluginVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_endpoint_policy( @@ -12701,7 +12625,9 @@ def delete_wasm_plugin_version( ]: # 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._DeleteWasmPluginVersion(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteWasmPluginVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_endpoint_policy( @@ -12936,7 +12862,9 @@ def list_wasm_plugin_versions( ]: # 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._ListWasmPluginVersions(self._session, self._host, self._interceptor) # type: ignore + return self._ListWasmPluginVersions( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_endpoint_policy( @@ -13649,9 +13577,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -13794,9 +13720,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -13913,9 +13837,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -14170,9 +14092,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseNetworkServicesRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseNetworkServicesRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseNetworkServicesRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/rest_base.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/rest_base.py index b936fb256da0..4ddf4123517c 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/rest_base.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/services/network_services/transports/rest_base.py @@ -19,36 +19,40 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.network_services_v1.types import ( + endpoint_policy, + extensibility, + gateway, + grpc_route, + http_route, + mesh, + route_view, + service_binding, + service_lb_policy, + tcp_route, + tls_route, +) from google.cloud.network_services_v1.types import ( endpoint_policy as gcn_endpoint_policy, ) +from google.cloud.network_services_v1.types import gateway as gcn_gateway +from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route +from google.cloud.network_services_v1.types import http_route as gcn_http_route +from google.cloud.network_services_v1.types import mesh as gcn_mesh from google.cloud.network_services_v1.types import ( service_binding as gcn_service_binding, ) from google.cloud.network_services_v1.types import ( service_lb_policy as gcn_service_lb_policy, ) -from google.cloud.network_services_v1.types import endpoint_policy -from google.cloud.network_services_v1.types import extensibility -from google.cloud.network_services_v1.types import gateway -from google.cloud.network_services_v1.types import gateway as gcn_gateway -from google.cloud.network_services_v1.types import grpc_route -from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route -from google.cloud.network_services_v1.types import http_route -from google.cloud.network_services_v1.types import http_route as gcn_http_route -from google.cloud.network_services_v1.types import mesh -from google.cloud.network_services_v1.types import mesh as gcn_mesh -from google.cloud.network_services_v1.types import route_view -from google.cloud.network_services_v1.types import service_binding -from google.cloud.network_services_v1.types import service_lb_policy -from google.cloud.network_services_v1.types import tcp_route from google.cloud.network_services_v1.types import tcp_route as gcn_tcp_route -from google.cloud.network_services_v1.types import tls_route from google.cloud.network_services_v1.types import tls_route as gcn_tls_route from .base import DEFAULT_CLIENT_INFO, NetworkServicesTransport diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/common.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/common.py index 5a3b22cdb497..3e1a2bebcab3 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/common.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/common.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -47,6 +47,7 @@ class EnvoyHeaders(proto.Enum): x-envoy-original-path x-envoy-upstream-stream-duration-ms """ + ENVOY_HEADERS_UNSPECIFIED = 0 NONE = 1 DEBUG_HEADERS = 2 @@ -201,6 +202,7 @@ class MetadataLabelMatchCriteria(proto.Enum): The metadata presented by the xDS client should contain all of the labels specified here. """ + METADATA_LABEL_MATCH_CRITERIA_UNSPECIFIED = 0 MATCH_ANY = 1 MATCH_ALL = 2 diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/dep.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/dep.py index 35e96df7fcdd..05bcf0387942 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/dep.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/dep.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -88,6 +88,7 @@ class EventType(proto.Enum): If included in ``supported_events``, the extension is called when the HTTP response trailers arrives. """ + EVENT_TYPE_UNSPECIFIED = 0 REQUEST_HEADERS = 1 REQUEST_BODY = 2 @@ -113,6 +114,7 @@ class LoadBalancingScheme(proto.Enum): Signifies that this is used for External Managed HTTP(S) Load Balancing. """ + LOAD_BALANCING_SCHEME_UNSPECIFIED = 0 INTERNAL_MANAGED = 1 EXTERNAL_MANAGED = 2 @@ -131,6 +133,7 @@ class WireFormat(proto.Enum): HTTP2 or H2C as the protocol. All ``supported_events`` for a client request are sent as part of the same gRPC stream. """ + WIRE_FORMAT_UNSPECIFIED = 0 EXT_PROC_GRPC = 1 diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/endpoint_policy.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/endpoint_policy.py index 48f1cd8f4584..531c4d015639 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/endpoint_policy.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/endpoint_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.network_services_v1.types import common @@ -109,6 +109,7 @@ class EndpointPolicyType(proto.Enum): GRPC_SERVER (2): Represents a proxyless gRPC backend. """ + ENDPOINT_POLICY_TYPE_UNSPECIFIED = 0 SIDECAR_PROXY = 1 GRPC_SERVER = 2 diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/extensibility.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/extensibility.py index 0c60bc333d4d..8c86550def4d 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/extensibility.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/extensibility.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -58,6 +58,7 @@ class WasmPluginView(proto.Enum): resource, the server's response includes the ``WasmPlugin`` resource with all its versions. """ + WASM_PLUGIN_VIEW_UNSPECIFIED = 0 WASM_PLUGIN_VIEW_BASIC = 1 WASM_PLUGIN_VIEW_FULL = 2 @@ -286,6 +287,7 @@ class LogLevel(proto.Enum): CRITICAL (6): Report logs with CRITICAL level only. """ + LOG_LEVEL_UNSPECIFIED = 0 TRACE = 1 DEBUG = 2 diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/gateway.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/gateway.py index d7696b1f5712..89bca1ccd1bb 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/gateway.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/gateway.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.network_services_v1.types import common @@ -165,6 +165,7 @@ class Type(proto.Enum): The type of the customer managed gateway is SecureWebGateway (SWG). """ + TYPE_UNSPECIFIED = 0 OPEN_MESH = 1 SECURE_WEB_GATEWAY = 2 @@ -184,6 +185,7 @@ class IpVersion(proto.Enum): IPV6 (2): The type for IP version 6. """ + IP_VERSION_UNSPECIFIED = 0 IPV4 = 1 IPV6 = 2 @@ -209,6 +211,7 @@ class RoutingMode(proto.Enum): gateway then acts as a next-hop to the destination. """ + EXPLICIT_ROUTING_MODE = 0 NEXT_HOP_ROUTING_MODE = 1 diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/grpc_route.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/grpc_route.py index f3063f000d5d..caedc44bf496 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/grpc_route.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/grpc_route.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -160,6 +160,7 @@ class Type(proto.Enum): Will interpret grpc_method and grpc_service as regexes. RE2 syntax is supported. """ + TYPE_UNSPECIFIED = 0 EXACT = 1 REGULAR_EXPRESSION = 2 @@ -209,6 +210,7 @@ class Type(proto.Enum): Will match paths conforming to the prefix specified by value. RE2 syntax is supported. """ + TYPE_UNSPECIFIED = 0 EXACT = 1 REGULAR_EXPRESSION = 2 diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/http_route.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/http_route.py index 453e2018dbdb..7240ca99677b 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/http_route.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/http_route.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -363,12 +363,12 @@ class RouteMatch(proto.Message): number=5, message="HttpRoute.HeaderMatch", ) - query_parameters: MutableSequence[ - "HttpRoute.QueryParameterMatch" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="HttpRoute.QueryParameterMatch", + query_parameters: MutableSequence["HttpRoute.QueryParameterMatch"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="HttpRoute.QueryParameterMatch", + ) ) class Destination(proto.Message): @@ -497,6 +497,7 @@ class ResponseCode(proto.Enum): Corresponds to 308. In this case, the request method will be retained. """ + RESPONSE_CODE_UNSPECIFIED = 0 MOVED_PERMANENTLY_DEFAULT = 1 FOUND = 2 diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/mesh.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/mesh.py index 80d1644383d0..5a3c16705a36 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/mesh.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/mesh.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.network_services_v1.types import common diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/service_binding.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/service_binding.py index 7c5a0ee6e466..d4484c58a86b 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/service_binding.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/service_binding.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/service_lb_policy.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/service_lb_policy.py index e3293e6d091f..16ddbf956c45 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/service_lb_policy.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/service_lb_policy.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -98,6 +98,7 @@ class LoadBalancingAlgorithm(proto.Enum): closest to the client, before spilling over to other zones. """ + LOAD_BALANCING_ALGORITHM_UNSPECIFIED = 0 SPRAY_TO_WORLD = 3 SPRAY_TO_REGION = 4 @@ -116,6 +117,7 @@ class IsolationGranularity(proto.Enum): Traffic for this service will be isolated at the cloud region level. """ + ISOLATION_GRANULARITY_UNSPECIFIED = 0 REGION = 1 @@ -135,6 +137,7 @@ class IsolationMode(proto.Enum): available in the same region as the load balancer. """ + ISOLATION_MODE_UNSPECIFIED = 0 NEAREST = 1 STRICT = 2 diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/tcp_route.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/tcp_route.py index f79333ba18d1..822e428d04dd 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/tcp_route.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/tcp_route.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -171,12 +171,12 @@ class RouteAction(proto.Message): disabled. """ - destinations: MutableSequence[ - "TcpRoute.RouteDestination" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="TcpRoute.RouteDestination", + destinations: MutableSequence["TcpRoute.RouteDestination"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="TcpRoute.RouteDestination", + ) ) original_destination: bool = proto.Field( proto.BOOL, diff --git a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/tls_route.py b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/tls_route.py index edf3a02793ce..f8d9e8c37bff 100644 --- a/packages/google-cloud-network-services/google/cloud/network_services_v1/types/tls_route.py +++ b/packages/google-cloud-network-services/google/cloud/network_services_v1/types/tls_route.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -159,12 +159,12 @@ class RouteAction(proto.Message): disabled. """ - destinations: MutableSequence[ - "TlsRoute.RouteDestination" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="TlsRoute.RouteDestination", + destinations: MutableSequence["TlsRoute.RouteDestination"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="TlsRoute.RouteDestination", + ) ) idle_timeout: duration_pb2.Duration = proto.Field( proto.MESSAGE, diff --git a/packages/google-cloud-network-services/noxfile.py b/packages/google-cloud-network-services/noxfile.py index 15f4ec70c077..7ad891b89a4d 100644 --- a/packages/google-cloud-network-services/noxfile.py +++ b/packages/google-cloud-network-services/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-network-services/tests/unit/gapic/network_services_v1/test_dep_service.py b/packages/google-cloud-network-services/tests/unit/gapic/network_services_v1/test_dep_service.py index 4a67683371c9..23d4e22b4c09 100644 --- a/packages/google-cloud-network-services/tests/unit/gapic/network_services_v1/test_dep_service.py +++ b/packages/google-cloud-network-services/tests/unit/gapic/network_services_v1/test_dep_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +60,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_services_v1.services.dep_service import ( DepServiceAsyncClient, @@ -937,10 +939,9 @@ def test_dep_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -985,10 +986,9 @@ def test_dep_service_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1024,10 +1024,9 @@ def test_dep_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1256,13 +1255,13 @@ def test_dep_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3914,9 +3913,9 @@ def test_get_lb_route_extension_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_lb_route_extension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_lb_route_extension] = ( + mock_rpc + ) request = {} client.get_lb_route_extension(request) @@ -5888,9 +5887,9 @@ def test_get_lb_edge_extension_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_lb_edge_extension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_lb_edge_extension] = ( + mock_rpc + ) request = {} client.get_lb_edge_extension(request) @@ -7306,9 +7305,9 @@ def test_list_authz_extensions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_authz_extensions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_authz_extensions] = ( + mock_rpc + ) request = {} client.list_authz_extensions(request) @@ -7865,9 +7864,9 @@ def test_get_authz_extension_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_authz_extension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_authz_extension] = ( + mock_rpc + ) request = {} client.get_authz_extension(request) @@ -8216,9 +8215,9 @@ def test_create_authz_extension_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_authz_extension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_authz_extension] = ( + mock_rpc + ) request = {} client.create_authz_extension(request) @@ -8578,9 +8577,9 @@ def test_update_authz_extension_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_authz_extension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_authz_extension] = ( + mock_rpc + ) request = {} client.update_authz_extension(request) @@ -8934,9 +8933,9 @@ def test_delete_authz_extension_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_authz_extension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_authz_extension] = ( + mock_rpc + ) request = {} client.delete_authz_extension(request) @@ -10537,9 +10536,9 @@ def test_get_lb_route_extension_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_lb_route_extension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_lb_route_extension] = ( + mock_rpc + ) request = {} client.get_lb_route_extension(request) @@ -11593,9 +11592,9 @@ def test_get_lb_edge_extension_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_lb_edge_extension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_lb_edge_extension] = ( + mock_rpc + ) request = {} client.get_lb_edge_extension(request) @@ -12386,9 +12385,9 @@ def test_list_authz_extensions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_authz_extensions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_authz_extensions] = ( + mock_rpc + ) request = {} client.list_authz_extensions(request) @@ -12648,9 +12647,9 @@ def test_get_authz_extension_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_authz_extension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_authz_extension] = ( + mock_rpc + ) request = {} client.get_authz_extension(request) @@ -12833,9 +12832,9 @@ def test_create_authz_extension_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_authz_extension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_authz_extension] = ( + mock_rpc + ) request = {} client.create_authz_extension(request) @@ -13054,9 +13053,9 @@ def test_update_authz_extension_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_authz_extension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_authz_extension] = ( + mock_rpc + ) request = {} client.update_authz_extension(request) @@ -13258,9 +13257,9 @@ def test_delete_authz_extension_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_authz_extension - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_authz_extension] = ( + mock_rpc + ) request = {} client.delete_authz_extension(request) @@ -14594,8 +14593,9 @@ def test_list_lb_traffic_extensions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14660,18 +14660,20 @@ def test_list_lb_traffic_extensions_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_list_lb_traffic_extensions" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_list_lb_traffic_extensions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_list_lb_traffic_extensions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DepServiceRestInterceptor, "post_list_lb_traffic_extensions" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_list_lb_traffic_extensions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_list_lb_traffic_extensions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14731,8 +14733,9 @@ def test_get_lb_traffic_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14803,18 +14806,20 @@ def test_get_lb_traffic_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_get_lb_traffic_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_get_lb_traffic_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_get_lb_traffic_extension" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DepServiceRestInterceptor, "post_get_lb_traffic_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_get_lb_traffic_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_get_lb_traffic_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14867,8 +14872,9 @@ def test_create_lb_traffic_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15025,20 +15031,21 @@ def test_create_lb_traffic_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_create_lb_traffic_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_create_lb_traffic_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_create_lb_traffic_extension" - ) as pre: + 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.DepServiceRestInterceptor, "post_create_lb_traffic_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_create_lb_traffic_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_create_lb_traffic_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15095,8 +15102,9 @@ def test_update_lb_traffic_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15257,20 +15265,21 @@ def test_update_lb_traffic_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_update_lb_traffic_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_update_lb_traffic_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_update_lb_traffic_extension" - ) as pre: + 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.DepServiceRestInterceptor, "post_update_lb_traffic_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_update_lb_traffic_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_update_lb_traffic_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15325,8 +15334,9 @@ def test_delete_lb_traffic_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15385,20 +15395,21 @@ def test_delete_lb_traffic_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_delete_lb_traffic_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_delete_lb_traffic_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_delete_lb_traffic_extension" - ) as pre: + 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.DepServiceRestInterceptor, "post_delete_lb_traffic_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_delete_lb_traffic_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_delete_lb_traffic_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15451,8 +15462,9 @@ def test_list_lb_route_extensions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15517,18 +15529,20 @@ def test_list_lb_route_extensions_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_list_lb_route_extensions" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_list_lb_route_extensions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_list_lb_route_extensions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DepServiceRestInterceptor, "post_list_lb_route_extensions" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_list_lb_route_extensions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_list_lb_route_extensions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15585,8 +15599,9 @@ def test_get_lb_route_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15657,18 +15672,20 @@ def test_get_lb_route_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_get_lb_route_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_get_lb_route_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_get_lb_route_extension" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DepServiceRestInterceptor, "post_get_lb_route_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_get_lb_route_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_get_lb_route_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15719,8 +15736,9 @@ def test_create_lb_route_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15875,20 +15893,21 @@ def test_create_lb_route_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_create_lb_route_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_create_lb_route_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_create_lb_route_extension" - ) as pre: + 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.DepServiceRestInterceptor, "post_create_lb_route_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_create_lb_route_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_create_lb_route_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15945,8 +15964,9 @@ def test_update_lb_route_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16105,20 +16125,21 @@ def test_update_lb_route_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_update_lb_route_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_update_lb_route_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_update_lb_route_extension" - ) as pre: + 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.DepServiceRestInterceptor, "post_update_lb_route_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_update_lb_route_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_update_lb_route_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16173,8 +16194,9 @@ def test_delete_lb_route_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16233,20 +16255,21 @@ def test_delete_lb_route_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_delete_lb_route_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_delete_lb_route_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_delete_lb_route_extension" - ) as pre: + 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.DepServiceRestInterceptor, "post_delete_lb_route_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_delete_lb_route_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_delete_lb_route_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16299,8 +16322,9 @@ def test_list_lb_edge_extensions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16365,18 +16389,20 @@ def test_list_lb_edge_extensions_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_list_lb_edge_extensions" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_list_lb_edge_extensions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_list_lb_edge_extensions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DepServiceRestInterceptor, "post_list_lb_edge_extensions" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_list_lb_edge_extensions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_list_lb_edge_extensions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16433,8 +16459,9 @@ def test_get_lb_edge_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16505,17 +16532,20 @@ def test_get_lb_edge_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_get_lb_edge_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, "post_get_lb_edge_extension_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_get_lb_edge_extension" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DepServiceRestInterceptor, "post_get_lb_edge_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_get_lb_edge_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_get_lb_edge_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16566,8 +16596,9 @@ def test_create_lb_edge_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16721,20 +16752,21 @@ def test_create_lb_edge_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_create_lb_edge_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_create_lb_edge_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_create_lb_edge_extension" - ) as pre: + 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.DepServiceRestInterceptor, "post_create_lb_edge_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_create_lb_edge_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_create_lb_edge_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16791,8 +16823,9 @@ def test_update_lb_edge_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16950,20 +16983,21 @@ def test_update_lb_edge_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_update_lb_edge_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_update_lb_edge_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_update_lb_edge_extension" - ) as pre: + 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.DepServiceRestInterceptor, "post_update_lb_edge_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_update_lb_edge_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_update_lb_edge_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17018,8 +17052,9 @@ def test_delete_lb_edge_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17078,20 +17113,21 @@ def test_delete_lb_edge_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_delete_lb_edge_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_delete_lb_edge_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_delete_lb_edge_extension" - ) as pre: + 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.DepServiceRestInterceptor, "post_delete_lb_edge_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_delete_lb_edge_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_delete_lb_edge_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17144,8 +17180,9 @@ def test_list_authz_extensions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17210,17 +17247,20 @@ def test_list_authz_extensions_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_list_authz_extensions" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, "post_list_authz_extensions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_list_authz_extensions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DepServiceRestInterceptor, "post_list_authz_extensions" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_list_authz_extensions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_list_authz_extensions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17275,8 +17315,9 @@ def test_get_authz_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17355,17 +17396,20 @@ def test_get_authz_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_get_authz_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, "post_get_authz_extension_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_get_authz_extension" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DepServiceRestInterceptor, "post_get_authz_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_get_authz_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_get_authz_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17416,8 +17460,9 @@ def test_create_authz_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17556,20 +17601,21 @@ def test_create_authz_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_create_authz_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_create_authz_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_create_authz_extension" - ) as pre: + 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.DepServiceRestInterceptor, "post_create_authz_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_create_authz_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_create_authz_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17626,8 +17672,9 @@ def test_update_authz_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17770,20 +17817,21 @@ def test_update_authz_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_update_authz_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_update_authz_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_update_authz_extension" - ) as pre: + 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.DepServiceRestInterceptor, "post_update_authz_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_update_authz_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_update_authz_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17838,8 +17886,9 @@ def test_delete_authz_extension_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17898,20 +17947,21 @@ def test_delete_authz_extension_rest_interceptors(null_interceptor): ) client = DepServiceClient(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.DepServiceRestInterceptor, "post_delete_authz_extension" - ) as post, mock.patch.object( - transports.DepServiceRestInterceptor, - "post_delete_authz_extension_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DepServiceRestInterceptor, "pre_delete_authz_extension" - ) as pre: + 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.DepServiceRestInterceptor, "post_delete_authz_extension" + ) as post, + mock.patch.object( + transports.DepServiceRestInterceptor, + "post_delete_authz_extension_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DepServiceRestInterceptor, "pre_delete_authz_extension" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17964,8 +18014,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18024,8 +18075,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18087,8 +18139,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18152,8 +18205,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18217,8 +18271,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18281,8 +18336,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18343,8 +18399,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18405,8 +18462,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18467,8 +18525,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -19066,11 +19125,14 @@ def test_dep_service_base_transport(): def test_dep_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_services_v1.services.dep_service.transports.DepServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_services_v1.services.dep_service.transports.DepServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DepServiceTransport( @@ -19087,9 +19149,12 @@ def test_dep_service_base_transport_with_credentials_file(): def test_dep_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_services_v1.services.dep_service.transports.DepServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_services_v1.services.dep_service.transports.DepServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DepServiceTransport() @@ -19161,11 +19226,12 @@ def test_dep_service_transport_auth_gdch_credentials(transport_class): def test_dep_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-network-services/tests/unit/gapic/network_services_v1/test_network_services.py b/packages/google-cloud-network-services/tests/unit/gapic/network_services_v1/test_network_services.py index d3b95928242f..529892882494 100644 --- a/packages/google-cloud-network-services/tests/unit/gapic/network_services_v1/test_network_services.py +++ b/packages/google-cloud-network-services/tests/unit/gapic/network_services_v1/test_network_services.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,23 +59,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.network_services_v1.services.network_services import ( NetworkServicesAsyncClient, @@ -76,32 +78,34 @@ pagers, transports, ) +from google.cloud.network_services_v1.types import ( + common, + endpoint_policy, + extensibility, + gateway, + grpc_route, + http_route, + mesh, + route_view, + service_binding, + service_lb_policy, + tcp_route, + tls_route, +) from google.cloud.network_services_v1.types import ( endpoint_policy as gcn_endpoint_policy, ) +from google.cloud.network_services_v1.types import gateway as gcn_gateway +from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route +from google.cloud.network_services_v1.types import http_route as gcn_http_route +from google.cloud.network_services_v1.types import mesh as gcn_mesh from google.cloud.network_services_v1.types import ( service_binding as gcn_service_binding, ) from google.cloud.network_services_v1.types import ( service_lb_policy as gcn_service_lb_policy, ) -from google.cloud.network_services_v1.types import common -from google.cloud.network_services_v1.types import endpoint_policy -from google.cloud.network_services_v1.types import extensibility -from google.cloud.network_services_v1.types import gateway -from google.cloud.network_services_v1.types import gateway as gcn_gateway -from google.cloud.network_services_v1.types import grpc_route -from google.cloud.network_services_v1.types import grpc_route as gcn_grpc_route -from google.cloud.network_services_v1.types import http_route -from google.cloud.network_services_v1.types import http_route as gcn_http_route -from google.cloud.network_services_v1.types import mesh -from google.cloud.network_services_v1.types import mesh as gcn_mesh -from google.cloud.network_services_v1.types import route_view -from google.cloud.network_services_v1.types import service_binding -from google.cloud.network_services_v1.types import service_lb_policy -from google.cloud.network_services_v1.types import tcp_route from google.cloud.network_services_v1.types import tcp_route as gcn_tcp_route -from google.cloud.network_services_v1.types import tls_route from google.cloud.network_services_v1.types import tls_route as gcn_tls_route CRED_INFO_JSON = { @@ -1013,10 +1017,9 @@ def test_network_services_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1064,9 @@ def test_network_services_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1102,9 @@ def test_network_services_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1346,13 +1347,13 @@ def test_network_services_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1470,9 +1471,9 @@ def test_list_endpoint_policies_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_endpoint_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_endpoint_policies] = ( + mock_rpc + ) request = {} client.list_endpoint_policies(request) @@ -2029,9 +2030,9 @@ def test_get_endpoint_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_endpoint_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_endpoint_policy] = ( + mock_rpc + ) request = {} client.get_endpoint_policy(request) @@ -2384,9 +2385,9 @@ def test_create_endpoint_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_endpoint_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_endpoint_policy] = ( + mock_rpc + ) request = {} client.create_endpoint_policy(request) @@ -2747,9 +2748,9 @@ def test_update_endpoint_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_endpoint_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_endpoint_policy] = ( + mock_rpc + ) request = {} client.update_endpoint_policy(request) @@ -3104,9 +3105,9 @@ def test_delete_endpoint_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_endpoint_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_endpoint_policy] = ( + mock_rpc + ) request = {} client.delete_endpoint_policy(request) @@ -5096,9 +5097,9 @@ def test_list_wasm_plugins_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_wasm_plugins - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_wasm_plugins] = ( + mock_rpc + ) request = {} client.list_wasm_plugins(request) @@ -5971,9 +5972,9 @@ def test_create_wasm_plugin_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_wasm_plugin - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_wasm_plugin] = ( + mock_rpc + ) request = {} client.create_wasm_plugin(request) @@ -6332,9 +6333,9 @@ def test_update_wasm_plugin_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_wasm_plugin - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_wasm_plugin] = ( + mock_rpc + ) request = {} client.update_wasm_plugin(request) @@ -6687,9 +6688,9 @@ def test_delete_wasm_plugin_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_wasm_plugin - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_wasm_plugin] = ( + mock_rpc + ) request = {} client.delete_wasm_plugin(request) @@ -8940,9 +8941,9 @@ def test_list_grpc_routes_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_grpc_routes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_grpc_routes] = ( + mock_rpc + ) request = {} client.list_grpc_routes(request) @@ -9807,9 +9808,9 @@ def test_create_grpc_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_grpc_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_grpc_route] = ( + mock_rpc + ) request = {} client.create_grpc_route(request) @@ -10166,9 +10167,9 @@ def test_update_grpc_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_grpc_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_grpc_route] = ( + mock_rpc + ) request = {} client.update_grpc_route(request) @@ -10519,9 +10520,9 @@ def test_delete_grpc_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_grpc_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_grpc_route] = ( + mock_rpc + ) request = {} client.delete_grpc_route(request) @@ -10865,9 +10866,9 @@ def test_list_http_routes_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_http_routes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_http_routes] = ( + mock_rpc + ) request = {} client.list_http_routes(request) @@ -11732,9 +11733,9 @@ def test_create_http_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_http_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_http_route] = ( + mock_rpc + ) request = {} client.create_http_route(request) @@ -12091,9 +12092,9 @@ def test_update_http_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_http_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_http_route] = ( + mock_rpc + ) request = {} client.update_http_route(request) @@ -12444,9 +12445,9 @@ def test_delete_http_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_http_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_http_route] = ( + mock_rpc + ) request = {} client.delete_http_route(request) @@ -13643,9 +13644,9 @@ def test_create_tcp_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tcp_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tcp_route] = ( + mock_rpc + ) request = {} client.create_tcp_route(request) @@ -13988,9 +13989,9 @@ def test_update_tcp_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tcp_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tcp_route] = ( + mock_rpc + ) request = {} client.update_tcp_route(request) @@ -14327,9 +14328,9 @@ def test_delete_tcp_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tcp_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tcp_route] = ( + mock_rpc + ) request = {} client.delete_tcp_route(request) @@ -15516,9 +15517,9 @@ def test_create_tls_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tls_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tls_route] = ( + mock_rpc + ) request = {} client.create_tls_route(request) @@ -15861,9 +15862,9 @@ def test_update_tls_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tls_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tls_route] = ( + mock_rpc + ) request = {} client.update_tls_route(request) @@ -16200,9 +16201,9 @@ def test_delete_tls_route_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tls_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tls_route] = ( + mock_rpc + ) request = {} client.delete_tls_route(request) @@ -16543,9 +16544,9 @@ def test_list_service_bindings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_service_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_service_bindings] = ( + mock_rpc + ) request = {} client.list_service_bindings(request) @@ -17095,9 +17096,9 @@ def test_get_service_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_service_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_service_binding] = ( + mock_rpc + ) request = {} client.get_service_binding(request) @@ -17443,9 +17444,9 @@ def test_create_service_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_service_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_service_binding] = ( + mock_rpc + ) request = {} client.create_service_binding(request) @@ -17806,9 +17807,9 @@ def test_update_service_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_service_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_service_binding] = ( + mock_rpc + ) request = {} client.update_service_binding(request) @@ -18163,9 +18164,9 @@ def test_delete_service_binding_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_service_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_service_binding] = ( + mock_rpc + ) request = {} client.delete_service_binding(request) @@ -20938,9 +20939,9 @@ def test_get_service_lb_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_service_lb_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_service_lb_policy] = ( + mock_rpc + ) request = {} client.get_service_lb_policy(request) @@ -22365,9 +22366,9 @@ def test_get_gateway_route_view_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_gateway_route_view - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_gateway_route_view] = ( + mock_rpc + ) request = {} client.get_gateway_route_view(request) @@ -22722,9 +22723,9 @@ def test_get_mesh_route_view_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_mesh_route_view - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_mesh_route_view] = ( + mock_rpc + ) request = {} client.get_mesh_route_view(request) @@ -23629,9 +23630,9 @@ def test_list_mesh_route_views_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_mesh_route_views - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_mesh_route_views] = ( + mock_rpc + ) request = {} client.list_mesh_route_views(request) @@ -24107,9 +24108,9 @@ def test_list_endpoint_policies_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_endpoint_policies - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_endpoint_policies] = ( + mock_rpc + ) request = {} client.list_endpoint_policies(request) @@ -24369,9 +24370,9 @@ def test_get_endpoint_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_endpoint_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_endpoint_policy] = ( + mock_rpc + ) request = {} client.get_endpoint_policy(request) @@ -24554,9 +24555,9 @@ def test_create_endpoint_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_endpoint_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_endpoint_policy] = ( + mock_rpc + ) request = {} client.create_endpoint_policy(request) @@ -24765,9 +24766,9 @@ def test_update_endpoint_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_endpoint_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_endpoint_policy] = ( + mock_rpc + ) request = {} client.update_endpoint_policy(request) @@ -24951,9 +24952,9 @@ def test_delete_endpoint_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_endpoint_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_endpoint_policy] = ( + mock_rpc + ) request = {} client.delete_endpoint_policy(request) @@ -25986,9 +25987,9 @@ def test_list_wasm_plugins_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_wasm_plugins - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_wasm_plugins] = ( + mock_rpc + ) request = {} client.list_wasm_plugins(request) @@ -26428,9 +26429,9 @@ def test_create_wasm_plugin_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_wasm_plugin - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_wasm_plugin] = ( + mock_rpc + ) request = {} client.create_wasm_plugin(request) @@ -26638,9 +26639,9 @@ def test_update_wasm_plugin_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_wasm_plugin - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_wasm_plugin] = ( + mock_rpc + ) request = {} client.update_wasm_plugin(request) @@ -26823,9 +26824,9 @@ def test_delete_wasm_plugin_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_wasm_plugin - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_wasm_plugin] = ( + mock_rpc + ) request = {} client.delete_wasm_plugin(request) @@ -27988,9 +27989,9 @@ def test_list_grpc_routes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_grpc_routes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_grpc_routes] = ( + mock_rpc + ) request = {} client.list_grpc_routes(request) @@ -28424,9 +28425,9 @@ def test_create_grpc_route_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_grpc_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_grpc_route] = ( + mock_rpc + ) request = {} client.create_grpc_route(request) @@ -28631,9 +28632,9 @@ def test_update_grpc_route_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_grpc_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_grpc_route] = ( + mock_rpc + ) request = {} client.update_grpc_route(request) @@ -28814,9 +28815,9 @@ def test_delete_grpc_route_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_grpc_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_grpc_route] = ( + mock_rpc + ) request = {} client.delete_grpc_route(request) @@ -28994,9 +28995,9 @@ def test_list_http_routes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_http_routes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_http_routes] = ( + mock_rpc + ) request = {} client.list_http_routes(request) @@ -29430,9 +29431,9 @@ def test_create_http_route_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_http_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_http_route] = ( + mock_rpc + ) request = {} client.create_http_route(request) @@ -29637,9 +29638,9 @@ def test_update_http_route_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_http_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_http_route] = ( + mock_rpc + ) request = {} client.update_http_route(request) @@ -29820,9 +29821,9 @@ def test_delete_http_route_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_http_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_http_route] = ( + mock_rpc + ) request = {} client.delete_http_route(request) @@ -30432,9 +30433,9 @@ def test_create_tcp_route_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tcp_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tcp_route] = ( + mock_rpc + ) request = {} client.create_tcp_route(request) @@ -30639,9 +30640,9 @@ def test_update_tcp_route_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tcp_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tcp_route] = ( + mock_rpc + ) request = {} client.update_tcp_route(request) @@ -30822,9 +30823,9 @@ def test_delete_tcp_route_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tcp_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tcp_route] = ( + mock_rpc + ) request = {} client.delete_tcp_route(request) @@ -31434,9 +31435,9 @@ def test_create_tls_route_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_tls_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_tls_route] = ( + mock_rpc + ) request = {} client.create_tls_route(request) @@ -31641,9 +31642,9 @@ def test_update_tls_route_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_tls_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_tls_route] = ( + mock_rpc + ) request = {} client.update_tls_route(request) @@ -31824,9 +31825,9 @@ def test_delete_tls_route_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_tls_route - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_tls_route] = ( + mock_rpc + ) request = {} client.delete_tls_route(request) @@ -32007,9 +32008,9 @@ def test_list_service_bindings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_service_bindings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_service_bindings] = ( + mock_rpc + ) request = {} client.list_service_bindings(request) @@ -32267,9 +32268,9 @@ def test_get_service_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_service_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_service_binding] = ( + mock_rpc + ) request = {} client.get_service_binding(request) @@ -32452,9 +32453,9 @@ def test_create_service_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_service_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_service_binding] = ( + mock_rpc + ) request = {} client.create_service_binding(request) @@ -32663,9 +32664,9 @@ def test_update_service_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_service_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_service_binding] = ( + mock_rpc + ) request = {} client.update_service_binding(request) @@ -32849,9 +32850,9 @@ def test_delete_service_binding_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_service_binding - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_service_binding] = ( + mock_rpc + ) request = {} client.delete_service_binding(request) @@ -34278,9 +34279,9 @@ def test_get_service_lb_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_service_lb_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_service_lb_policy] = ( + mock_rpc + ) request = {} client.get_service_lb_policy(request) @@ -35046,9 +35047,9 @@ def test_get_gateway_route_view_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_gateway_route_view - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_gateway_route_view] = ( + mock_rpc + ) request = {} client.get_gateway_route_view(request) @@ -35230,9 +35231,9 @@ def test_get_mesh_route_view_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_mesh_route_view - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_mesh_route_view] = ( + mock_rpc + ) request = {} client.get_mesh_route_view(request) @@ -35680,9 +35681,9 @@ def test_list_mesh_route_views_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_mesh_route_views - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_mesh_route_views] = ( + mock_rpc + ) request = {} client.list_mesh_route_views(request) @@ -38980,8 +38981,9 @@ def test_list_endpoint_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39046,18 +39048,20 @@ def test_list_endpoint_policies_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_endpoint_policies" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_list_endpoint_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_endpoint_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_endpoint_policies" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_list_endpoint_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_endpoint_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39117,8 +39121,9 @@ def test_get_endpoint_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39196,18 +39201,20 @@ def test_get_endpoint_policy_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_endpoint_policy" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_get_endpoint_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_endpoint_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_endpoint_policy" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_get_endpoint_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_endpoint_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39262,8 +39269,9 @@ def test_create_endpoint_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39412,20 +39420,21 @@ def test_create_endpoint_policy_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_create_endpoint_policy" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_create_endpoint_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_create_endpoint_policy" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_create_endpoint_policy" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_create_endpoint_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_create_endpoint_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39482,8 +39491,9 @@ def test_update_endpoint_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39636,20 +39646,21 @@ def test_update_endpoint_policy_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_update_endpoint_policy" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_update_endpoint_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_update_endpoint_policy" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_update_endpoint_policy" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_update_endpoint_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_update_endpoint_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39704,8 +39715,9 @@ def test_delete_endpoint_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39764,20 +39776,21 @@ def test_delete_endpoint_policy_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_delete_endpoint_policy" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_delete_endpoint_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_delete_endpoint_policy" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_delete_endpoint_policy" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_delete_endpoint_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_delete_endpoint_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39830,8 +39843,9 @@ def test_list_wasm_plugin_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -39896,18 +39910,20 @@ def test_list_wasm_plugin_versions_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_wasm_plugin_versions" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_list_wasm_plugin_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_wasm_plugin_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_wasm_plugin_versions" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_list_wasm_plugin_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_wasm_plugin_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -39967,8 +39983,9 @@ def test_get_wasm_plugin_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40042,18 +40059,20 @@ def test_get_wasm_plugin_version_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_wasm_plugin_version" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_get_wasm_plugin_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_wasm_plugin_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_wasm_plugin_version" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_get_wasm_plugin_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_wasm_plugin_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40108,8 +40127,9 @@ def test_create_wasm_plugin_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40247,20 +40267,21 @@ def test_create_wasm_plugin_version_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_create_wasm_plugin_version" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_create_wasm_plugin_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_create_wasm_plugin_version" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_create_wasm_plugin_version" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_create_wasm_plugin_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_create_wasm_plugin_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40315,8 +40336,9 @@ def test_delete_wasm_plugin_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40375,20 +40397,21 @@ def test_delete_wasm_plugin_version_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_delete_wasm_plugin_version" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_delete_wasm_plugin_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_delete_wasm_plugin_version" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_delete_wasm_plugin_version" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_delete_wasm_plugin_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_delete_wasm_plugin_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40441,8 +40464,9 @@ def test_list_wasm_plugins_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40507,18 +40531,20 @@ def test_list_wasm_plugins_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_wasm_plugins" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_list_wasm_plugins_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_wasm_plugins" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_wasm_plugins" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_list_wasm_plugins_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_wasm_plugins" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40576,8 +40602,9 @@ def test_get_wasm_plugin_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40644,17 +40671,20 @@ def test_get_wasm_plugin_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_wasm_plugin" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_get_wasm_plugin_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_wasm_plugin" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_wasm_plugin" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_get_wasm_plugin_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_wasm_plugin" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40707,8 +40737,9 @@ def test_create_wasm_plugin_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -40843,20 +40874,21 @@ def test_create_wasm_plugin_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_create_wasm_plugin" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_create_wasm_plugin_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_create_wasm_plugin" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_create_wasm_plugin" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_create_wasm_plugin_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_create_wasm_plugin" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -40913,8 +40945,9 @@ def test_update_wasm_plugin_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41053,20 +41086,21 @@ def test_update_wasm_plugin_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_update_wasm_plugin" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_update_wasm_plugin_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_update_wasm_plugin" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_update_wasm_plugin" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_update_wasm_plugin_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_update_wasm_plugin" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41119,8 +41153,9 @@ def test_delete_wasm_plugin_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41177,20 +41212,21 @@ def test_delete_wasm_plugin_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_delete_wasm_plugin" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_delete_wasm_plugin_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_delete_wasm_plugin" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_delete_wasm_plugin" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_delete_wasm_plugin_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_delete_wasm_plugin" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41241,8 +41277,9 @@ def test_list_gateways_rest_bad_request(request_type=gateway.ListGatewaysRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41307,17 +41344,20 @@ def test_list_gateways_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_gateways" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_list_gateways_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_gateways" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_gateways" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_list_gateways_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_gateways" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41368,8 +41408,9 @@ def test_get_gateway_rest_bad_request(request_type=gateway.GetGatewayRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41460,17 +41501,19 @@ def test_get_gateway_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_gateway" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_get_gateway_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_gateway" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_gateway" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_gateway_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41519,8 +41562,9 @@ def test_create_gateway_rest_bad_request(request_type=gcn_gateway.CreateGatewayR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41664,19 +41708,21 @@ def test_create_gateway_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_create_gateway" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_create_gateway_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_create_gateway" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_create_gateway" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_create_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_create_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41729,8 +41775,9 @@ def test_update_gateway_rest_bad_request(request_type=gcn_gateway.UpdateGatewayR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41876,19 +41923,21 @@ def test_update_gateway_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_update_gateway" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_update_gateway_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_update_gateway" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_update_gateway" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_update_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_update_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -41939,8 +41988,9 @@ def test_delete_gateway_rest_bad_request(request_type=gateway.DeleteGatewayReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -41997,19 +42047,21 @@ def test_delete_gateway_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_delete_gateway" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_delete_gateway_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_delete_gateway" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_delete_gateway" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_delete_gateway_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_delete_gateway" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42060,8 +42112,9 @@ def test_list_grpc_routes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42126,17 +42179,20 @@ def test_list_grpc_routes_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_grpc_routes" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_list_grpc_routes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_grpc_routes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_grpc_routes" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_list_grpc_routes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_grpc_routes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42189,8 +42245,9 @@ def test_get_grpc_route_rest_bad_request(request_type=grpc_route.GetGrpcRouteReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42263,17 +42320,20 @@ def test_get_grpc_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_grpc_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_get_grpc_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_grpc_route" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_grpc_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_get_grpc_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_grpc_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42324,8 +42384,9 @@ def test_create_grpc_route_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42499,20 +42560,21 @@ def test_create_grpc_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_create_grpc_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_create_grpc_route_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_create_grpc_route" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_create_grpc_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_create_grpc_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_create_grpc_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42567,8 +42629,9 @@ def test_update_grpc_route_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42744,20 +42807,21 @@ def test_update_grpc_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_update_grpc_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_update_grpc_route_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_update_grpc_route" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_update_grpc_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_update_grpc_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_update_grpc_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42810,8 +42874,9 @@ def test_delete_grpc_route_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42868,20 +42933,21 @@ def test_delete_grpc_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_delete_grpc_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_delete_grpc_route_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_delete_grpc_route" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_delete_grpc_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_delete_grpc_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_delete_grpc_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42934,8 +43000,9 @@ def test_list_http_routes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43000,17 +43067,20 @@ def test_list_http_routes_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_http_routes" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_list_http_routes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_http_routes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_http_routes" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_list_http_routes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_http_routes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43063,8 +43133,9 @@ def test_get_http_route_rest_bad_request(request_type=http_route.GetHttpRouteReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43137,17 +43208,20 @@ def test_get_http_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_http_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_get_http_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_http_route" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_http_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_get_http_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_http_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43198,8 +43272,9 @@ def test_create_http_route_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43447,20 +43522,21 @@ def test_create_http_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_create_http_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_create_http_route_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_create_http_route" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_create_http_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_create_http_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_create_http_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43515,8 +43591,9 @@ def test_update_http_route_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43766,20 +43843,21 @@ def test_update_http_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_update_http_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_update_http_route_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_update_http_route" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_update_http_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_update_http_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_update_http_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43832,8 +43910,9 @@ def test_delete_http_route_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43890,20 +43969,21 @@ def test_delete_http_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_delete_http_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_delete_http_route_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_delete_http_route" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_delete_http_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_delete_http_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_delete_http_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43954,8 +44034,9 @@ def test_list_tcp_routes_rest_bad_request(request_type=tcp_route.ListTcpRoutesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44020,17 +44101,20 @@ def test_list_tcp_routes_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_tcp_routes" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_list_tcp_routes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_tcp_routes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_tcp_routes" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_list_tcp_routes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_tcp_routes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44081,8 +44165,9 @@ def test_get_tcp_route_rest_bad_request(request_type=tcp_route.GetTcpRouteReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44153,17 +44238,20 @@ def test_get_tcp_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_tcp_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_get_tcp_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_tcp_route" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_tcp_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_get_tcp_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_tcp_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44214,8 +44302,9 @@ def test_create_tcp_route_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44361,19 +44450,21 @@ def test_create_tcp_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_create_tcp_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_create_tcp_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_create_tcp_route" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_create_tcp_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_create_tcp_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_create_tcp_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44428,8 +44519,9 @@ def test_update_tcp_route_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44577,19 +44669,21 @@ def test_update_tcp_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_update_tcp_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_update_tcp_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_update_tcp_route" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_update_tcp_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_update_tcp_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_update_tcp_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44642,8 +44736,9 @@ def test_delete_tcp_route_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44700,19 +44795,21 @@ def test_delete_tcp_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_delete_tcp_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_delete_tcp_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_delete_tcp_route" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_delete_tcp_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_delete_tcp_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_delete_tcp_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44763,8 +44860,9 @@ def test_list_tls_routes_rest_bad_request(request_type=tls_route.ListTlsRoutesRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44829,17 +44927,20 @@ def test_list_tls_routes_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_tls_routes" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_list_tls_routes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_tls_routes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_tls_routes" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_list_tls_routes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_tls_routes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44890,8 +44991,9 @@ def test_get_tls_route_rest_bad_request(request_type=tls_route.GetTlsRouteReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44962,17 +45064,20 @@ def test_get_tls_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_tls_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_get_tls_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_tls_route" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_tls_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_get_tls_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_tls_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45023,8 +45128,9 @@ def test_create_tls_route_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45174,19 +45280,21 @@ def test_create_tls_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_create_tls_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_create_tls_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_create_tls_route" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_create_tls_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_create_tls_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_create_tls_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45241,8 +45349,9 @@ def test_update_tls_route_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45394,19 +45503,21 @@ def test_update_tls_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_update_tls_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_update_tls_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_update_tls_route" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_update_tls_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_update_tls_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_update_tls_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45459,8 +45570,9 @@ def test_delete_tls_route_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45517,19 +45629,21 @@ def test_delete_tls_route_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_delete_tls_route" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_delete_tls_route_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_delete_tls_route" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_delete_tls_route" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_delete_tls_route_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_delete_tls_route" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45582,8 +45696,9 @@ def test_list_service_bindings_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45648,18 +45763,20 @@ def test_list_service_bindings_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_service_bindings" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_list_service_bindings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_service_bindings" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_service_bindings" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_list_service_bindings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_service_bindings" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45719,8 +45836,9 @@ def test_get_service_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45791,18 +45909,20 @@ def test_get_service_binding_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_service_binding" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_get_service_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_service_binding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_service_binding" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_get_service_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_service_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45857,8 +45977,9 @@ def test_create_service_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45993,20 +46114,21 @@ def test_create_service_binding_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_create_service_binding" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_create_service_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_create_service_binding" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_create_service_binding" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_create_service_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_create_service_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46063,8 +46185,9 @@ def test_update_service_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46203,20 +46326,21 @@ def test_update_service_binding_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_update_service_binding" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_update_service_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_update_service_binding" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_update_service_binding" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_update_service_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_update_service_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46271,8 +46395,9 @@ def test_delete_service_binding_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46331,20 +46456,21 @@ def test_delete_service_binding_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_delete_service_binding" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_delete_service_binding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_delete_service_binding" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_delete_service_binding" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_delete_service_binding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_delete_service_binding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46395,8 +46521,9 @@ def test_list_meshes_rest_bad_request(request_type=mesh.ListMeshesRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46461,17 +46588,19 @@ def test_list_meshes_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_meshes" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_list_meshes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_meshes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_meshes" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_meshes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_meshes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46520,8 +46649,9 @@ def test_get_mesh_rest_bad_request(request_type=mesh.GetMeshRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46592,17 +46722,19 @@ def test_get_mesh_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_mesh" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_get_mesh_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_mesh" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_mesh" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_mesh_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_mesh" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46651,8 +46783,9 @@ def test_create_mesh_rest_bad_request(request_type=gcn_mesh.CreateMeshRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46786,19 +46919,20 @@ def test_create_mesh_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_create_mesh" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_create_mesh_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_create_mesh" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_create_mesh" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_create_mesh_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_create_mesh" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46849,8 +46983,9 @@ def test_update_mesh_rest_bad_request(request_type=gcn_mesh.UpdateMeshRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46986,19 +47121,20 @@ def test_update_mesh_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_update_mesh" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_update_mesh_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_update_mesh" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_update_mesh" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_update_mesh_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_update_mesh" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47047,8 +47183,9 @@ def test_delete_mesh_rest_bad_request(request_type=mesh.DeleteMeshRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47105,19 +47242,20 @@ def test_delete_mesh_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_delete_mesh" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, "post_delete_mesh_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_delete_mesh" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_delete_mesh" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_delete_mesh_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_delete_mesh" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47168,8 +47306,9 @@ def test_list_service_lb_policies_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47234,18 +47373,20 @@ def test_list_service_lb_policies_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_service_lb_policies" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_list_service_lb_policies_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_service_lb_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_service_lb_policies" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_list_service_lb_policies_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_service_lb_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47305,8 +47446,9 @@ def test_get_service_lb_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47378,18 +47520,20 @@ def test_get_service_lb_policy_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_service_lb_policy" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_get_service_lb_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_service_lb_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_service_lb_policy" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_get_service_lb_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_service_lb_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47444,8 +47588,9 @@ def test_create_service_lb_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47582,20 +47727,21 @@ def test_create_service_lb_policy_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_create_service_lb_policy" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_create_service_lb_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_create_service_lb_policy" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_create_service_lb_policy" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_create_service_lb_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_create_service_lb_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47652,8 +47798,9 @@ def test_update_service_lb_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47794,20 +47941,21 @@ def test_update_service_lb_policy_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_update_service_lb_policy" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_update_service_lb_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_update_service_lb_policy" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_update_service_lb_policy" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_update_service_lb_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_update_service_lb_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47862,8 +48010,9 @@ def test_delete_service_lb_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47922,20 +48071,21 @@ def test_delete_service_lb_policy_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_delete_service_lb_policy" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_delete_service_lb_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_delete_service_lb_policy" - ) as pre: + 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.NetworkServicesRestInterceptor, "post_delete_service_lb_policy" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_delete_service_lb_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_delete_service_lb_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47990,8 +48140,9 @@ def test_get_gateway_route_view_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48064,18 +48215,20 @@ def test_get_gateway_route_view_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_gateway_route_view" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_get_gateway_route_view_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_gateway_route_view" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_gateway_route_view" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_get_gateway_route_view_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_gateway_route_view" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48132,8 +48285,9 @@ def test_get_mesh_route_view_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48206,18 +48360,20 @@ def test_get_mesh_route_view_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_get_mesh_route_view" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_get_mesh_route_view_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_get_mesh_route_view" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_get_mesh_route_view" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_get_mesh_route_view_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_get_mesh_route_view" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48270,8 +48426,9 @@ def test_list_gateway_route_views_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48336,18 +48493,20 @@ def test_list_gateway_route_views_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_gateway_route_views" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_list_gateway_route_views_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_gateway_route_views" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_gateway_route_views" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_list_gateway_route_views_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_gateway_route_views" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48405,8 +48564,9 @@ def test_list_mesh_route_views_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48471,18 +48631,20 @@ def test_list_mesh_route_views_rest_interceptors(null_interceptor): ) client = NetworkServicesClient(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.NetworkServicesRestInterceptor, "post_list_mesh_route_views" - ) as post, mock.patch.object( - transports.NetworkServicesRestInterceptor, - "post_list_mesh_route_views_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NetworkServicesRestInterceptor, "pre_list_mesh_route_views" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "post_list_mesh_route_views" + ) as post, + mock.patch.object( + transports.NetworkServicesRestInterceptor, + "post_list_mesh_route_views_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NetworkServicesRestInterceptor, "pre_list_mesh_route_views" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48540,8 +48702,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -48600,8 +48763,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -48663,8 +48827,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -48728,8 +48893,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -48793,8 +48959,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -48857,8 +49024,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -48919,8 +49087,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -48981,8 +49150,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -49043,8 +49213,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -50466,11 +50637,14 @@ def test_network_services_base_transport(): def test_network_services_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.network_services_v1.services.network_services.transports.NetworkServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.network_services_v1.services.network_services.transports.NetworkServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkServicesTransport( @@ -50487,9 +50661,12 @@ def test_network_services_base_transport_with_credentials_file(): def test_network_services_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.network_services_v1.services.network_services.transports.NetworkServicesTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.network_services_v1.services.network_services.transports.NetworkServicesTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NetworkServicesTransport() @@ -50561,11 +50738,12 @@ def test_network_services_transport_auth_gdch_credentials(transport_class): def test_network_services_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-notebooks/docs/conf.py b/packages/google-cloud-notebooks/docs/conf.py index 269fe20719be..dee8d1d0ebbe 100644 --- a/packages/google-cloud-notebooks/docs/conf.py +++ b/packages/google-cloud-notebooks/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-notebooks documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/__init__.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/__init__.py index fc698405a780..a5a009691c91 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/__init__.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.managed_notebook_service import ( ManagedNotebookServiceAsyncClient, ManagedNotebookServiceClient, diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/async_client.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/async_client.py index 77ea3ee57311..b42b41b5f7bc 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/async_client.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.notebooks_v1 import gapic_version as package_version @@ -44,22 +44,22 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.notebooks_v1.services.managed_notebook_service import pagers from google.cloud.notebooks_v1.types import diagnostic_config as gcn_diagnostic_config -from google.cloud.notebooks_v1.types import managed_service -from google.cloud.notebooks_v1.types import runtime +from google.cloud.notebooks_v1.types import managed_service, runtime, service from google.cloud.notebooks_v1.types import runtime as gcn_runtime -from google.cloud.notebooks_v1.types import service from .client import ManagedNotebookServiceClient from .transports.base import DEFAULT_CLIENT_INFO, ManagedNotebookServiceTransport @@ -129,7 +129,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ManagedNotebookServiceAsyncClient: The constructed client. """ - return ManagedNotebookServiceClient.from_service_account_info.__func__(ManagedNotebookServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ManagedNotebookServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ManagedNotebookServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +146,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ManagedNotebookServiceAsyncClient: The constructed client. """ - return ManagedNotebookServiceClient.from_service_account_file.__func__(ManagedNotebookServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ManagedNotebookServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + ManagedNotebookServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -183,7 +187,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ManagedNotebookServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ManagedNotebookServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ManagedNotebookServiceTransport: diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/client.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/client.py index 0c2ee7785a55..933a27fad177 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/client.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.notebooks_v1 import gapic_version as package_version @@ -61,22 +61,22 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.notebooks_v1.services.managed_notebook_service import pagers from google.cloud.notebooks_v1.types import diagnostic_config as gcn_diagnostic_config -from google.cloud.notebooks_v1.types import managed_service -from google.cloud.notebooks_v1.types import runtime +from google.cloud.notebooks_v1.types import managed_service, runtime, service from google.cloud.notebooks_v1.types import runtime as gcn_runtime -from google.cloud.notebooks_v1.types import service from .transports.base import DEFAULT_CLIENT_INFO, ManagedNotebookServiceTransport from .transports.grpc import ManagedNotebookServiceGrpcTransport @@ -91,9 +91,7 @@ class ManagedNotebookServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ManagedNotebookServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ManagedNotebookServiceTransport]] _transport_registry["grpc"] = ManagedNotebookServiceGrpcTransport _transport_registry["grpc_asyncio"] = ManagedNotebookServiceGrpcAsyncIOTransport @@ -638,11 +636,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ManagedNotebookServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ManagedNotebookServiceClient._read_environment_variables() + ) self._client_cert_source = ManagedNotebookServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +673,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ManagedNotebookServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/pagers.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/pagers.py index 6be30183b5be..0c11b7a6392f 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/pagers.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/__init__.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/__init__.py index a96a0a81a638..02b4ef422d4a 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/__init__.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/__init__.py @@ -21,9 +21,7 @@ from .grpc_asyncio import ManagedNotebookServiceGrpcAsyncIOTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ManagedNotebookServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ManagedNotebookServiceTransport]] _transport_registry["grpc"] = ManagedNotebookServiceGrpcTransport _transport_registry["grpc_asyncio"] = ManagedNotebookServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/base.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/base.py index 6f9b13b10414..f2550cce7d9d 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/base.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.notebooks_v1 import gapic_version as package_version from google.cloud.notebooks_v1.types import managed_service, runtime @@ -413,13 +415,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/grpc.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/grpc.py index 21a9435b8959..ea1e947a8c01 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/grpc.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.notebooks_v1.types import managed_service, runtime @@ -669,12 +671,12 @@ def refresh_runtime_token_internal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "refresh_runtime_token_internal" not in self._stubs: - self._stubs[ - "refresh_runtime_token_internal" - ] = self._logged_channel.unary_unary( - "/google.cloud.notebooks.v1.ManagedNotebookService/RefreshRuntimeTokenInternal", - request_serializer=managed_service.RefreshRuntimeTokenInternalRequest.serialize, - response_deserializer=managed_service.RefreshRuntimeTokenInternalResponse.deserialize, + self._stubs["refresh_runtime_token_internal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.notebooks.v1.ManagedNotebookService/RefreshRuntimeTokenInternal", + request_serializer=managed_service.RefreshRuntimeTokenInternalRequest.serialize, + response_deserializer=managed_service.RefreshRuntimeTokenInternalResponse.deserialize, + ) ) return self._stubs["refresh_runtime_token_internal"] diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/grpc_asyncio.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/grpc_asyncio.py index 8acfd7597ce4..308c8f970958 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/managed_notebook_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.notebooks_v1.types import managed_service, runtime @@ -694,12 +696,12 @@ def refresh_runtime_token_internal( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "refresh_runtime_token_internal" not in self._stubs: - self._stubs[ - "refresh_runtime_token_internal" - ] = self._logged_channel.unary_unary( - "/google.cloud.notebooks.v1.ManagedNotebookService/RefreshRuntimeTokenInternal", - request_serializer=managed_service.RefreshRuntimeTokenInternalRequest.serialize, - response_deserializer=managed_service.RefreshRuntimeTokenInternalResponse.deserialize, + self._stubs["refresh_runtime_token_internal"] = ( + self._logged_channel.unary_unary( + "/google.cloud.notebooks.v1.ManagedNotebookService/RefreshRuntimeTokenInternal", + request_serializer=managed_service.RefreshRuntimeTokenInternalRequest.serialize, + response_deserializer=managed_service.RefreshRuntimeTokenInternalResponse.deserialize, + ) ) return self._stubs["refresh_runtime_token_internal"] diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/async_client.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/async_client.py index f34901264445..d4a2ba127089 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/async_client.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.notebooks_v1 import gapic_version as package_version @@ -44,26 +44,30 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.notebooks_v1.services.notebook_service import pagers from google.cloud.notebooks_v1.types import diagnostic_config as gcn_diagnostic_config -from google.cloud.notebooks_v1.types import environment +from google.cloud.notebooks_v1.types import ( + environment, + execution, + instance, + schedule, + service, +) from google.cloud.notebooks_v1.types import environment as gcn_environment -from google.cloud.notebooks_v1.types import execution from google.cloud.notebooks_v1.types import execution as gcn_execution -from google.cloud.notebooks_v1.types import instance from google.cloud.notebooks_v1.types import instance as gcn_instance -from google.cloud.notebooks_v1.types import schedule from google.cloud.notebooks_v1.types import schedule as gcn_schedule -from google.cloud.notebooks_v1.types import service from .client import NotebookServiceClient from .transports.base import DEFAULT_CLIENT_INFO, NotebookServiceTransport @@ -139,7 +143,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: NotebookServiceAsyncClient: The constructed client. """ - return NotebookServiceClient.from_service_account_info.__func__(NotebookServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = NotebookServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(NotebookServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +160,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: NotebookServiceAsyncClient: The constructed client. """ - return NotebookServiceClient.from_service_account_file.__func__(NotebookServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = NotebookServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(NotebookServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/client.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/client.py index f9de2ef426e9..b951177baaea 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/client.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.notebooks_v1 import gapic_version as package_version @@ -61,26 +61,30 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.notebooks_v1.services.notebook_service import pagers from google.cloud.notebooks_v1.types import diagnostic_config as gcn_diagnostic_config -from google.cloud.notebooks_v1.types import environment +from google.cloud.notebooks_v1.types import ( + environment, + execution, + instance, + schedule, + service, +) from google.cloud.notebooks_v1.types import environment as gcn_environment -from google.cloud.notebooks_v1.types import execution from google.cloud.notebooks_v1.types import execution as gcn_execution -from google.cloud.notebooks_v1.types import instance from google.cloud.notebooks_v1.types import instance as gcn_instance -from google.cloud.notebooks_v1.types import schedule from google.cloud.notebooks_v1.types import schedule as gcn_schedule -from google.cloud.notebooks_v1.types import service from .transports.base import DEFAULT_CLIENT_INFO, NotebookServiceTransport from .transports.grpc import NotebookServiceGrpcTransport @@ -95,9 +99,7 @@ class NotebookServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NotebookServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NotebookServiceTransport]] _transport_registry["grpc"] = NotebookServiceGrpcTransport _transport_registry["grpc_asyncio"] = NotebookServiceGrpcAsyncIOTransport @@ -720,11 +722,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NotebookServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NotebookServiceClient._read_environment_variables() + ) self._client_cert_source = NotebookServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -759,8 +759,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NotebookServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/pagers.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/pagers.py index 3826e93c79de..1ce3407d2944 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/pagers.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/pagers.py @@ -73,7 +73,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -149,7 +149,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -229,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -385,7 +385,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -461,7 +461,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -541,7 +541,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -617,7 +617,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/transports/base.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/transports/base.py index f577116f93ea..b3975bdb5bbf 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/transports/base.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.notebooks_v1 import gapic_version as package_version from google.cloud.notebooks_v1.types import ( @@ -721,13 +723,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/transports/grpc.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/transports/grpc.py index 5719ef42aa28..aa28cfe7f1c2 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/transports/grpc.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.notebooks_v1.types import ( environment, @@ -557,12 +559,12 @@ def update_shielded_instance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_shielded_instance_config" not in self._stubs: - self._stubs[ - "update_shielded_instance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.notebooks.v1.NotebookService/UpdateShieldedInstanceConfig", - request_serializer=service.UpdateShieldedInstanceConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_shielded_instance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.notebooks.v1.NotebookService/UpdateShieldedInstanceConfig", + request_serializer=service.UpdateShieldedInstanceConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_shielded_instance_config"] @@ -614,12 +616,12 @@ def update_instance_metadata_items( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_instance_metadata_items" not in self._stubs: - self._stubs[ - "update_instance_metadata_items" - ] = self._logged_channel.unary_unary( - "/google.cloud.notebooks.v1.NotebookService/UpdateInstanceMetadataItems", - request_serializer=service.UpdateInstanceMetadataItemsRequest.serialize, - response_deserializer=service.UpdateInstanceMetadataItemsResponse.deserialize, + self._stubs["update_instance_metadata_items"] = ( + self._logged_channel.unary_unary( + "/google.cloud.notebooks.v1.NotebookService/UpdateInstanceMetadataItems", + request_serializer=service.UpdateInstanceMetadataItemsRequest.serialize, + response_deserializer=service.UpdateInstanceMetadataItemsResponse.deserialize, + ) ) return self._stubs["update_instance_metadata_items"] diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/transports/grpc_asyncio.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/transports/grpc_asyncio.py index 45cb4b495b05..4e7649e89c6e 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/services/notebook_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.notebooks_v1.types import ( environment, @@ -578,12 +580,12 @@ def update_shielded_instance_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_shielded_instance_config" not in self._stubs: - self._stubs[ - "update_shielded_instance_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.notebooks.v1.NotebookService/UpdateShieldedInstanceConfig", - request_serializer=service.UpdateShieldedInstanceConfigRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_shielded_instance_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.notebooks.v1.NotebookService/UpdateShieldedInstanceConfig", + request_serializer=service.UpdateShieldedInstanceConfigRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_shielded_instance_config"] @@ -637,12 +639,12 @@ def update_instance_metadata_items( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_instance_metadata_items" not in self._stubs: - self._stubs[ - "update_instance_metadata_items" - ] = self._logged_channel.unary_unary( - "/google.cloud.notebooks.v1.NotebookService/UpdateInstanceMetadataItems", - request_serializer=service.UpdateInstanceMetadataItemsRequest.serialize, - response_deserializer=service.UpdateInstanceMetadataItemsResponse.deserialize, + self._stubs["update_instance_metadata_items"] = ( + self._logged_channel.unary_unary( + "/google.cloud.notebooks.v1.NotebookService/UpdateInstanceMetadataItems", + request_serializer=service.UpdateInstanceMetadataItemsRequest.serialize, + response_deserializer=service.UpdateInstanceMetadataItemsResponse.deserialize, + ) ) return self._stubs["update_instance_metadata_items"] diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/__init__.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/__init__.py index 62665f8f6225..bd578480495d 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/__init__.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/__init__.py @@ -13,12 +13,28 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .diagnostic_config import DiagnosticConfig -from .environment import ContainerImage, Environment, VmImage -from .event import Event -from .execution import Execution, ExecutionTemplate -from .instance import Instance, ReservationAffinity -from .instance_config import InstanceConfig +from .diagnostic_config import ( + DiagnosticConfig, +) +from .environment import ( + ContainerImage, + Environment, + VmImage, +) +from .event import ( + Event, +) +from .execution import ( + Execution, + ExecutionTemplate, +) +from .instance import ( + Instance, + ReservationAffinity, +) +from .instance_config import ( + InstanceConfig, +) from .managed_service import ( CreateRuntimeRequest, DeleteRuntimeRequest, @@ -49,7 +65,9 @@ VirtualMachine, VirtualMachineConfig, ) -from .schedule import Schedule +from .schedule import ( + Schedule, +) from .service import ( CreateEnvironmentRequest, CreateExecutionRequest, diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/environment.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/environment.py index 89b2b974abf4..e7e7adb52d00 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/environment.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/environment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/event.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/event.py index 9f1dacc64a8c..7ab714b0f2d5 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/event.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/event.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -64,6 +64,7 @@ class EventType(proto.Enum): Host maintenance information to Control Plane. https://cloud.google.com/compute/docs/gpus/gpu-host-maintenance """ + EVENT_TYPE_UNSPECIFIED = 0 IDLE = 1 HEARTBEAT = 2 diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/execution.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/execution.py index 46d5558d3bbe..b81f2bc6b932 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/execution.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/execution.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -188,6 +188,7 @@ class ScaleTier(proto.Enum): the type of machine to use for your master node. This is the only required setting. """ + SCALE_TIER_UNSPECIFIED = 0 BASIC = 1 STANDARD_1 = 2 @@ -220,6 +221,7 @@ class SchedulerAcceleratorType(proto.Enum): TPU_V3 (7): TPU v3. """ + SCHEDULER_ACCELERATOR_TYPE_UNSPECIFIED = 0 NVIDIA_TESLA_K80 = 1 NVIDIA_TESLA_P100 = 2 @@ -244,6 +246,7 @@ class JobType(proto.Enum): job. https://cloud.google.com/dataproc/docs/reference/rest/v1/projects.regions.jobs """ + JOB_TYPE_UNSPECIFIED = 0 VERTEX_AI = 1 DATAPROC = 2 @@ -453,6 +456,7 @@ class State(proto.Enum): INITIALIZING (10): The Execution is being created. """ + STATE_UNSPECIFIED = 0 QUEUED = 1 PREPARING = 2 diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/instance.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/instance.py index 31d22cec2555..167399563db6 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/instance.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/instance.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.notebooks_v1.types import environment @@ -61,6 +61,7 @@ class Type(proto.Enum): Must specify key value fields for specifying the reservations. """ + TYPE_UNSPECIFIED = 0 NO_RESERVATION = 1 ANY_RESERVATION = 2 @@ -280,6 +281,7 @@ class AcceleratorType(proto.Enum): TPU_V3 (7): (Coming soon) Accelerator type is TPU V3. """ + ACCELERATOR_TYPE_UNSPECIFIED = 0 NVIDIA_TESLA_K80 = 1 NVIDIA_TESLA_P100 = 2 @@ -324,6 +326,7 @@ class State(proto.Enum): SUSPENDED (11): The instance is suspended. """ + STATE_UNSPECIFIED = 0 STARTING = 1 PROVISIONING = 2 @@ -352,6 +355,7 @@ class DiskType(proto.Enum): PD_EXTREME (4): Extreme persistent disk type. """ + DISK_TYPE_UNSPECIFIED = 0 PD_STANDARD = 1 PD_SSD = 2 @@ -371,6 +375,7 @@ class DiskEncryption(proto.Enum): Use customer managed encryption keys to encrypt the boot disk. """ + DISK_ENCRYPTION_UNSPECIFIED = 0 GMEK = 1 CMEK = 2 @@ -386,6 +391,7 @@ class NicType(proto.Enum): GVNIC (2): GVNIC """ + UNSPECIFIED_NIC_TYPE = 0 VIRTIO_NET = 1 GVNIC = 2 @@ -525,12 +531,12 @@ class GuestOsFeature(proto.Message): proto.INT64, number=4, ) - guest_os_features: MutableSequence[ - "Instance.Disk.GuestOsFeature" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="Instance.Disk.GuestOsFeature", + guest_os_features: MutableSequence["Instance.Disk.GuestOsFeature"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="Instance.Disk.GuestOsFeature", + ) ) index: int = proto.Field( proto.INT64, @@ -648,6 +654,7 @@ class State(proto.Enum): FAILED (3): The instance upgrade is failed. """ + STATE_UNSPECIFIED = 0 STARTED = 1 SUCCEEDED = 2 @@ -664,6 +671,7 @@ class Action(proto.Enum): ROLLBACK (2): Rollback. """ + ACTION_UNSPECIFIED = 0 UPGRADE = 1 ROLLBACK = 2 diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/managed_service.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/managed_service.py index 60e3ccc1af17..acd272c41531 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/managed_service.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/managed_service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.notebooks_v1.types import diagnostic_config as gcn_diagnostic_config diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/runtime.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/runtime.py index 66119f0d9368..12bfaf45a212 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/runtime.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/runtime.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.notebooks_v1.types import environment @@ -102,6 +102,7 @@ class State(proto.Enum): The runtime is being created and set up. It is not ready for use. """ + STATE_UNSPECIFIED = 0 STARTING = 1 PROVISIONING = 2 @@ -133,6 +134,7 @@ class HealthState(proto.Enum): The runtime health monitoring agent is not running. Applies to ACTIVE state. """ + HEALTH_STATE_UNSPECIFIED = 0 HEALTHY = 1 UNHEALTHY = 2 @@ -239,6 +241,7 @@ class AcceleratorType(proto.Enum): Accelerator type is NVIDIA Tesla P4 Virtual Workstations. """ + ACCELERATOR_TYPE_UNSPECIFIED = 0 NVIDIA_TESLA_K80 = 1 NVIDIA_TESLA_P100 = 2 @@ -496,6 +499,7 @@ class DiskType(proto.Enum): PD_EXTREME (4): Extreme persistent disk type. """ + DISK_TYPE_UNSPECIFIED = 0 PD_STANDARD = 1 PD_SSD = 2 @@ -557,6 +561,7 @@ class RuntimeAccessType(proto.Enum): Users accessing the Runtime need ActAs (Service Account User) permission. """ + RUNTIME_ACCESS_TYPE_UNSPECIFIED = 0 SINGLE_USER = 1 SERVICE_ACCOUNT = 2 @@ -653,6 +658,7 @@ class PostStartupScriptBehavior(proto.Enum): Downloads and runs the provided post startup script at every start. """ + POST_STARTUP_SCRIPT_BEHAVIOR_UNSPECIFIED = 0 RUN_EVERY_START = 1 DOWNLOAD_AND_RUN_EVERY_START = 2 @@ -927,6 +933,7 @@ class NicType(proto.Enum): GVNIC (2): GVNIC """ + UNSPECIFIED_NIC_TYPE = 0 VIRTIO_NET = 1 GVNIC = 2 diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/schedule.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/schedule.py index edce9b900af3..174735785bc0 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/schedule.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/schedule.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.notebooks_v1.types import execution @@ -99,6 +99,7 @@ class State(proto.Enum): DELETING (6): The schedule resource is being deleted. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 PAUSED = 2 diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/service.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/service.py index b89817d290cf..736bf1e593e5 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/service.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1/types/service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.notebooks_v1.types import diagnostic_config as gcn_diagnostic_config @@ -93,6 +93,7 @@ class UpgradeType(proto.Enum): UPGRADE_ALL (4): Upgrade All (OS, Framework and CUDA). """ + UPGRADE_TYPE_UNSPECIFIED = 0 UPGRADE_FRAMEWORK = 1 UPGRADE_OS = 2 @@ -664,6 +665,7 @@ class HealthState(proto.Enum): The instance health monitoring agent is not running. Applies to ACTIVE state. """ + HEALTH_STATE_UNSPECIFIED = 0 HEALTHY = 1 UNHEALTHY = 2 diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/__init__.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/__init__.py index 7987ebaedf16..9d90888eeb9c 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/__init__.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.notebook_service import NotebookServiceAsyncClient, NotebookServiceClient from .types.environment import ContainerImage, Environment, VmImage from .types.instance import Instance, ReservationAffinity diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/async_client.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/async_client.py index 3fb2da554e15..290bbbc3ceeb 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/async_client.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.notebooks_v1beta1 import gapic_version as package_version @@ -45,14 +45,16 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.notebooks_v1beta1.services.notebook_service import pagers from google.cloud.notebooks_v1beta1.types import environment, instance, service @@ -125,7 +127,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: NotebookServiceAsyncClient: The constructed client. """ - return NotebookServiceClient.from_service_account_info.__func__(NotebookServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = NotebookServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(NotebookServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -141,7 +144,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: NotebookServiceAsyncClient: The constructed client. """ - return NotebookServiceClient.from_service_account_file.__func__(NotebookServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = NotebookServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(NotebookServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/client.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/client.py index ff46fb6d1470..b409623f9b73 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/client.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.notebooks_v1beta1 import gapic_version as package_version @@ -61,14 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.notebooks_v1beta1.services.notebook_service import pagers from google.cloud.notebooks_v1beta1.types import environment, instance, service @@ -87,9 +89,7 @@ class NotebookServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NotebookServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NotebookServiceTransport]] _transport_registry["grpc"] = NotebookServiceGrpcTransport _transport_registry["grpc_asyncio"] = NotebookServiceGrpcAsyncIOTransport _transport_registry["rest"] = NotebookServiceRestTransport @@ -645,11 +645,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NotebookServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NotebookServiceClient._read_environment_variables() + ) self._client_cert_source = NotebookServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -684,8 +682,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NotebookServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/pagers.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/pagers.py index 97d62765bcf4..5cc2a624fc49 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/pagers.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/base.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/base.py index 2b918bd75a21..511300b5448a 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/base.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.notebooks_v1beta1 import gapic_version as package_version from google.cloud.notebooks_v1beta1.types import environment, instance, service @@ -497,13 +499,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc.py index acd7c1e2c870..cb5d27097f5d 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.notebooks_v1beta1.types import environment, instance, service diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc_asyncio.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc_asyncio.py index 7434f359b8fa..e72bed055e94 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.notebooks_v1beta1.types import environment, instance, service diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/rest.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/rest.py index 6d166c131ad4..7d8fbe3c45d5 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/rest.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1550,9 +1552,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -1578,7 +1578,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1704,9 +1704,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseCreateInstance._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseCreateInstance._get_http_options() request, metadata = self._interceptor.pre_create_instance(request, metadata) transcoded_request = _BaseNotebookServiceRestTransport._BaseCreateInstance._get_transcoded_request( @@ -1730,7 +1728,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1856,9 +1854,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -1880,7 +1876,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2004,9 +2000,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseDeleteInstance._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseDeleteInstance._get_http_options() request, metadata = self._interceptor.pre_delete_instance(request, metadata) transcoded_request = _BaseNotebookServiceRestTransport._BaseDeleteInstance._get_transcoded_request( @@ -2026,7 +2020,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2150,9 +2144,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseGetEnvironment._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseGetEnvironment._get_http_options() request, metadata = self._interceptor.pre_get_environment(request, metadata) transcoded_request = _BaseNotebookServiceRestTransport._BaseGetEnvironment._get_transcoded_request( @@ -2445,9 +2437,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseIsInstanceUpgradeable._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseIsInstanceUpgradeable._get_http_options() request, metadata = self._interceptor.pre_is_instance_upgradeable( request, metadata @@ -2595,9 +2585,7 @@ def __call__( Response for listing environments. """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseListEnvironments._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseListEnvironments._get_http_options() request, metadata = self._interceptor.pre_list_environments( request, metadata @@ -2895,9 +2883,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseRegisterInstance._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseRegisterInstance._get_http_options() request, metadata = self._interceptor.pre_register_instance( request, metadata @@ -2923,7 +2909,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3050,9 +3036,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseReportInstanceInfo._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseReportInstanceInfo._get_http_options() request, metadata = self._interceptor.pre_report_instance_info( request, metadata @@ -3078,7 +3062,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3230,7 +3214,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3357,9 +3341,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseSetInstanceAccelerator._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseSetInstanceAccelerator._get_http_options() request, metadata = self._interceptor.pre_set_instance_accelerator( request, metadata @@ -3385,7 +3367,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3513,9 +3495,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseSetInstanceLabels._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseSetInstanceLabels._get_http_options() request, metadata = self._interceptor.pre_set_instance_labels( request, metadata @@ -3541,7 +3521,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3668,9 +3648,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseSetInstanceMachineType._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseSetInstanceMachineType._get_http_options() request, metadata = self._interceptor.pre_set_instance_machine_type( request, metadata @@ -3696,7 +3674,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3850,7 +3828,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4002,7 +3980,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4128,9 +4106,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseUpgradeInstance._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseUpgradeInstance._get_http_options() request, metadata = self._interceptor.pre_upgrade_instance( request, metadata @@ -4156,7 +4132,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4283,9 +4259,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseUpgradeInstanceInternal._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseUpgradeInstanceInternal._get_http_options() request, metadata = self._interceptor.pre_upgrade_instance_internal( request, metadata @@ -4311,7 +4285,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4482,7 +4456,9 @@ def set_instance_accelerator( ) -> Callable[[service.SetInstanceAcceleratorRequest], 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._SetInstanceAccelerator(self._session, self._host, self._interceptor) # type: ignore + return self._SetInstanceAccelerator( + self._session, self._host, self._interceptor + ) # type: ignore @property def set_instance_labels( @@ -4498,7 +4474,9 @@ def set_instance_machine_type( ) -> Callable[[service.SetInstanceMachineTypeRequest], 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._SetInstanceMachineType(self._session, self._host, self._interceptor) # type: ignore + return self._SetInstanceMachineType( + self._session, self._host, self._interceptor + ) # type: ignore @property def start_instance( @@ -4530,7 +4508,9 @@ def upgrade_instance_internal( ) -> Callable[[service.UpgradeInstanceInternalRequest], 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._UpgradeInstanceInternal(self._session, self._host, self._interceptor) # type: ignore + return self._UpgradeInstanceInternal( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -5157,9 +5137,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -5302,9 +5280,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -5421,9 +5397,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -5678,9 +5652,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseNotebookServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/rest_base.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/rest_base.py index 17f59e57f86b..24f6c5d09fe9 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/rest_base.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/services/notebook_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/__init__.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/__init__.py index f968c6527ca9..1c64d521e927 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/__init__.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/__init__.py @@ -13,8 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .environment import ContainerImage, Environment, VmImage -from .instance import Instance, ReservationAffinity +from .environment import ( + ContainerImage, + Environment, + VmImage, +) +from .instance import ( + Instance, + ReservationAffinity, +) from .service import ( CreateEnvironmentRequest, CreateInstanceRequest, diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/environment.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/environment.py index 95a25d6b289b..5ca34b839a19 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/environment.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/environment.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/instance.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/instance.py index 6a989522164a..2464a0791e95 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/instance.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/instance.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.notebooks_v1beta1.types import environment @@ -61,6 +61,7 @@ class Type(proto.Enum): Must specify key value fields for specifying the reservations. """ + TYPE_UNSPECIFIED = 0 NO_RESERVATION = 1 ANY_RESERVATION = 2 @@ -250,6 +251,7 @@ class AcceleratorType(proto.Enum): TPU_V3 (7): (Coming soon) Accelerator type is TPU V3. """ + ACCELERATOR_TYPE_UNSPECIFIED = 0 NVIDIA_TESLA_K80 = 1 NVIDIA_TESLA_P100 = 2 @@ -293,6 +295,7 @@ class State(proto.Enum): SUSPENDED (11): The instance is suspended. """ + STATE_UNSPECIFIED = 0 STARTING = 1 PROVISIONING = 2 @@ -319,6 +322,7 @@ class DiskType(proto.Enum): PD_BALANCED (3): Balanced persistent disk type. """ + DISK_TYPE_UNSPECIFIED = 0 PD_STANDARD = 1 PD_SSD = 2 @@ -337,6 +341,7 @@ class DiskEncryption(proto.Enum): Use customer managed encryption keys to encrypt the boot disk. """ + DISK_ENCRYPTION_UNSPECIFIED = 0 GMEK = 1 CMEK = 2 @@ -353,6 +358,7 @@ class NicType(proto.Enum): GVNIC. Alternative to VIRTIO. https://github.com/GoogleCloudPlatform/compute-virtual-ethernet-linux """ + UNSPECIFIED_NIC_TYPE = 0 VIRTIO_NET = 1 GVNIC = 2 diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/service.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/service.py index 63942cfadeae..1b200282ccaf 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/service.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v1beta1/types/service.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.notebooks_v1beta1.types import environment as gcn_environment diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/__init__.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/__init__.py index 3e029ed03444..b205e8139347 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/__init__.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.notebook_service import NotebookServiceAsyncClient, NotebookServiceClient from .types.diagnostic_config import DiagnosticConfig from .types.event import Event diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/async_client.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/async_client.py index 639f9278bda7..7b5c1cf98f59 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/async_client.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.notebooks_v2 import gapic_version as package_version @@ -44,22 +44,22 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.notebooks_v2.services.notebook_service import pagers from google.cloud.notebooks_v2.types import diagnostic_config as gcn_diagnostic_config -from google.cloud.notebooks_v2.types import gce_setup -from google.cloud.notebooks_v2.types import instance +from google.cloud.notebooks_v2.types import gce_setup, instance, service from google.cloud.notebooks_v2.types import instance as gcn_instance -from google.cloud.notebooks_v2.types import service from .client import NotebookServiceClient from .transports.base import DEFAULT_CLIENT_INFO, NotebookServiceTransport @@ -127,7 +127,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: NotebookServiceAsyncClient: The constructed client. """ - return NotebookServiceClient.from_service_account_info.__func__(NotebookServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = NotebookServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(NotebookServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: NotebookServiceAsyncClient: The constructed client. """ - return NotebookServiceClient.from_service_account_file.__func__(NotebookServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = NotebookServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(NotebookServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/client.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/client.py index d7c70fc3d1ca..79c07bf8e939 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/client.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.notebooks_v2 import gapic_version as package_version @@ -61,22 +61,22 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.notebooks_v2.services.notebook_service import pagers from google.cloud.notebooks_v2.types import diagnostic_config as gcn_diagnostic_config -from google.cloud.notebooks_v2.types import gce_setup -from google.cloud.notebooks_v2.types import instance +from google.cloud.notebooks_v2.types import gce_setup, instance, service from google.cloud.notebooks_v2.types import instance as gcn_instance -from google.cloud.notebooks_v2.types import service from .transports.base import DEFAULT_CLIENT_INFO, NotebookServiceTransport from .transports.grpc import NotebookServiceGrpcTransport @@ -92,9 +92,7 @@ class NotebookServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[NotebookServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[NotebookServiceTransport]] _transport_registry["grpc"] = NotebookServiceGrpcTransport _transport_registry["grpc_asyncio"] = NotebookServiceGrpcAsyncIOTransport _transport_registry["rest"] = NotebookServiceRestTransport @@ -636,11 +634,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = NotebookServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + NotebookServiceClient._read_environment_variables() + ) self._client_cert_source = NotebookServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -675,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(NotebookServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/pagers.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/pagers.py index bbe642813eef..62d8d3786094 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/pagers.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/base.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/base.py index f2620e730b36..c2249dc9ffde 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/base.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.notebooks_v2 import gapic_version as package_version from google.cloud.notebooks_v2.types import instance, service @@ -396,13 +398,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/grpc.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/grpc.py index 05b44facfccc..84f93791f39c 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/grpc.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.notebooks_v2.types import instance, service @@ -571,12 +573,12 @@ def check_instance_upgradability( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_instance_upgradability" not in self._stubs: - self._stubs[ - "check_instance_upgradability" - ] = self._logged_channel.unary_unary( - "/google.cloud.notebooks.v2.NotebookService/CheckInstanceUpgradability", - request_serializer=service.CheckInstanceUpgradabilityRequest.serialize, - response_deserializer=service.CheckInstanceUpgradabilityResponse.deserialize, + self._stubs["check_instance_upgradability"] = ( + self._logged_channel.unary_unary( + "/google.cloud.notebooks.v2.NotebookService/CheckInstanceUpgradability", + request_serializer=service.CheckInstanceUpgradabilityRequest.serialize, + response_deserializer=service.CheckInstanceUpgradabilityResponse.deserialize, + ) ) return self._stubs["check_instance_upgradability"] diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/grpc_asyncio.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/grpc_asyncio.py index a4e0ec30f2a9..f3be37e13269 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.notebooks_v2.types import instance, service @@ -583,12 +585,12 @@ def check_instance_upgradability( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "check_instance_upgradability" not in self._stubs: - self._stubs[ - "check_instance_upgradability" - ] = self._logged_channel.unary_unary( - "/google.cloud.notebooks.v2.NotebookService/CheckInstanceUpgradability", - request_serializer=service.CheckInstanceUpgradabilityRequest.serialize, - response_deserializer=service.CheckInstanceUpgradabilityResponse.deserialize, + self._stubs["check_instance_upgradability"] = ( + self._logged_channel.unary_unary( + "/google.cloud.notebooks.v2.NotebookService/CheckInstanceUpgradability", + request_serializer=service.CheckInstanceUpgradabilityRequest.serialize, + response_deserializer=service.CheckInstanceUpgradabilityResponse.deserialize, + ) ) return self._stubs["check_instance_upgradability"] diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/rest.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/rest.py index 760cdb55aa66..d31d1a70ea7e 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/rest.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1157,9 +1159,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseCheckInstanceUpgradability._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseCheckInstanceUpgradability._get_http_options() request, metadata = self._interceptor.pre_check_instance_upgradability( request, metadata @@ -1312,9 +1312,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseCreateInstance._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseCreateInstance._get_http_options() request, metadata = self._interceptor.pre_create_instance(request, metadata) transcoded_request = _BaseNotebookServiceRestTransport._BaseCreateInstance._get_transcoded_request( @@ -1338,7 +1336,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1463,9 +1461,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseDeleteInstance._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseDeleteInstance._get_http_options() request, metadata = self._interceptor.pre_delete_instance(request, metadata) transcoded_request = _BaseNotebookServiceRestTransport._BaseDeleteInstance._get_transcoded_request( @@ -1485,7 +1481,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1610,9 +1606,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseDiagnoseInstance._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseDiagnoseInstance._get_http_options() request, metadata = self._interceptor.pre_diagnose_instance( request, metadata @@ -1638,7 +1632,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2084,7 +2078,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2210,9 +2204,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseRollbackInstance._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseRollbackInstance._get_http_options() request, metadata = self._interceptor.pre_rollback_instance( request, metadata @@ -2238,7 +2230,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2390,7 +2382,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2542,7 +2534,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2668,9 +2660,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseUpdateInstance._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseUpdateInstance._get_http_options() request, metadata = self._interceptor.pre_update_instance(request, metadata) transcoded_request = _BaseNotebookServiceRestTransport._BaseUpdateInstance._get_transcoded_request( @@ -2694,7 +2684,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2820,9 +2810,7 @@ def __call__( """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseUpgradeInstance._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseUpgradeInstance._get_http_options() request, metadata = self._interceptor.pre_upgrade_instance( request, metadata @@ -2848,7 +2836,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2924,7 +2912,9 @@ def check_instance_upgradability( ]: # 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._CheckInstanceUpgradability(self._session, self._host, self._interceptor) # type: ignore + return self._CheckInstanceUpgradability( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_instance( @@ -3637,9 +3627,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -3782,9 +3770,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3901,9 +3887,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -4158,9 +4142,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseNotebookServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseNotebookServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseNotebookServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/rest_base.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/rest_base.py index a7afe38b10d3..f42b6f233cb3 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/rest_base.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/services/notebook_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/__init__.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/__init__.py index 851bb3729e4e..470ca0275502 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/__init__.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/__init__.py @@ -13,8 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .diagnostic_config import DiagnosticConfig -from .event import Event +from .diagnostic_config import ( + DiagnosticConfig, +) +from .event import ( + Event, +) from .gce_setup import ( AcceleratorConfig, BootDisk, @@ -29,7 +33,12 @@ ShieldedInstanceConfig, VmImage, ) -from .instance import HealthState, Instance, State, UpgradeHistoryEntry +from .instance import ( + HealthState, + Instance, + State, + UpgradeHistoryEntry, +) from .service import ( CheckInstanceUpgradabilityRequest, CheckInstanceUpgradabilityResponse, diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/event.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/event.py index 3db8d02c64e7..caa6aba4d8ae 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/event.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/event.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -68,6 +68,7 @@ class EventType(proto.Enum): This event indicates that the instance had metadata that needs to be modified. """ + EVENT_TYPE_UNSPECIFIED = 0 IDLE = 1 HEARTBEAT = 2 diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/gce_setup.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/gce_setup.py index 63a1180e6e94..5753b0cb6ac8 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/gce_setup.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/gce_setup.py @@ -51,6 +51,7 @@ class DiskEncryption(proto.Enum): Use customer managed encryption keys to encrypt the boot disk. """ + DISK_ENCRYPTION_UNSPECIFIED = 0 GMEK = 1 CMEK = 2 @@ -71,6 +72,7 @@ class DiskType(proto.Enum): PD_EXTREME (4): Extreme persistent disk type. """ + DISK_TYPE_UNSPECIFIED = 0 PD_STANDARD = 1 PD_SSD = 2 @@ -107,6 +109,7 @@ class NicType(proto.Enum): GVNIC (2): GVNIC """ + NIC_TYPE_UNSPECIFIED = 0 VIRTIO_NET = 1 GVNIC = 2 @@ -240,6 +243,7 @@ class AcceleratorType(proto.Enum): Accelerator type is NVIDIA Tesla P4 Virtual Workstations. """ + ACCELERATOR_TYPE_UNSPECIFIED = 0 NVIDIA_TESLA_P100 = 2 NVIDIA_TESLA_V100 = 3 diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/instance.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/instance.py index cc5a9380787d..c85e86e31966 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/instance.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/instance.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.notebooks_v2.types import gce_setup as gcn_gce_setup @@ -62,6 +62,7 @@ class State(proto.Enum): SUSPENDED (10): The instance is suspended. """ + STATE_UNSPECIFIED = 0 STARTING = 1 PROVISIONING = 2 @@ -96,6 +97,7 @@ class HealthState(proto.Enum): The instance health monitoring agent is not running. Applies to ACTIVE state. """ + HEALTH_STATE_UNSPECIFIED = 0 HEALTHY = 1 UNHEALTHY = 2 @@ -147,6 +149,7 @@ class State(proto.Enum): FAILED (3): The instance upgrade is failed. """ + STATE_UNSPECIFIED = 0 STARTED = 1 SUCCEEDED = 2 @@ -163,6 +166,7 @@ class Action(proto.Enum): ROLLBACK (2): Rollback. """ + ACTION_UNSPECIFIED = 0 UPGRADE = 1 ROLLBACK = 2 diff --git a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/service.py b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/service.py index 6af07f9cc0e1..c951b55749ae 100644 --- a/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/service.py +++ b/packages/google-cloud-notebooks/google/cloud/notebooks_v2/types/service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.notebooks_v2.types import diagnostic_config as gcn_diagnostic_config diff --git a/packages/google-cloud-notebooks/noxfile.py b/packages/google-cloud-notebooks/noxfile.py index 038e1f7bdb88..6d222eeb77dd 100644 --- a/packages/google-cloud-notebooks/noxfile.py +++ b/packages/google-cloud-notebooks/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v1/test_managed_notebook_service.py b/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v1/test_managed_notebook_service.py index 6323222791f8..fb4f8a350bdd 100644 --- a/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v1/test_managed_notebook_service.py +++ b/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v1/test_managed_notebook_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,22 +54,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.notebooks_v1.services.managed_notebook_service import ( ManagedNotebookServiceAsyncClient, @@ -72,10 +74,14 @@ transports, ) from google.cloud.notebooks_v1.types import diagnostic_config as gcn_diagnostic_config -from google.cloud.notebooks_v1.types import environment, event, managed_service -from google.cloud.notebooks_v1.types import runtime +from google.cloud.notebooks_v1.types import ( + environment, + event, + managed_service, + runtime, + service, +) from google.cloud.notebooks_v1.types import runtime as gcn_runtime -from google.cloud.notebooks_v1.types import service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -986,10 +992,9 @@ def test_managed_notebook_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1034,10 +1039,9 @@ def test_managed_notebook_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1073,10 +1077,9 @@ def test_managed_notebook_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1321,13 +1324,13 @@ def test_managed_notebook_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4953,9 +4956,9 @@ def test_report_runtime_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_runtime_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_runtime_event] = ( + mock_rpc + ) request = {} client.report_runtime_event(request) @@ -5648,9 +5651,9 @@ def test_diagnose_runtime_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_runtime - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_runtime] = ( + mock_rpc + ) request = {} client.diagnose_runtime(request) @@ -6726,11 +6729,14 @@ def test_managed_notebook_service_base_transport(): def test_managed_notebook_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.notebooks_v1.services.managed_notebook_service.transports.ManagedNotebookServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.notebooks_v1.services.managed_notebook_service.transports.ManagedNotebookServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ManagedNotebookServiceTransport( @@ -6747,9 +6753,12 @@ def test_managed_notebook_service_base_transport_with_credentials_file(): def test_managed_notebook_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.notebooks_v1.services.managed_notebook_service.transports.ManagedNotebookServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.notebooks_v1.services.managed_notebook_service.transports.ManagedNotebookServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ManagedNotebookServiceTransport() @@ -6822,11 +6831,12 @@ def test_managed_notebook_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v1/test_notebook_service.py b/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v1/test_notebook_service.py index 09724461d0c8..9779a83367c7 100644 --- a/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v1/test_notebook_service.py +++ b/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v1/test_notebook_service.py @@ -25,12 +25,12 @@ import json import math -from google.api_core import api_core_version import grpc +import pytest +from google.api_core import api_core_version from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest try: from google.auth.aio import credentials as ga_credentials_async @@ -39,7 +39,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -48,21 +53,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.notebooks_v1.services.notebook_service import ( NotebookServiceAsyncClient, @@ -71,16 +73,18 @@ transports, ) from google.cloud.notebooks_v1.types import diagnostic_config as gcn_diagnostic_config -from google.cloud.notebooks_v1.types import environment +from google.cloud.notebooks_v1.types import ( + environment, + execution, + instance, + instance_config, + schedule, + service, +) from google.cloud.notebooks_v1.types import environment as gcn_environment -from google.cloud.notebooks_v1.types import execution from google.cloud.notebooks_v1.types import execution as gcn_execution -from google.cloud.notebooks_v1.types import instance from google.cloud.notebooks_v1.types import instance as gcn_instance -from google.cloud.notebooks_v1.types import instance_config -from google.cloud.notebooks_v1.types import schedule from google.cloud.notebooks_v1.types import schedule as gcn_schedule -from google.cloud.notebooks_v1.types import service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -966,10 +970,9 @@ def test_notebook_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1014,10 +1017,9 @@ def test_notebook_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1053,10 +1055,9 @@ def test_notebook_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1297,13 +1298,13 @@ def test_notebook_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2700,9 +2701,9 @@ def test_register_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.register_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.register_instance] = ( + mock_rpc + ) request = {} client.register_instance(request) @@ -3482,9 +3483,9 @@ def test_update_instance_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_instance_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_instance_config] = ( + mock_rpc + ) request = {} client.update_instance_config(request) @@ -4002,9 +4003,9 @@ def test_set_instance_labels_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_labels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_labels] = ( + mock_rpc + ) request = {} client.set_instance_labels(request) @@ -5576,9 +5577,9 @@ def test_report_instance_info_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_instance_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_instance_info] = ( + mock_rpc + ) request = {} client.report_instance_info(request) @@ -6108,9 +6109,9 @@ def test_get_instance_health_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_instance_health - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_instance_health] = ( + mock_rpc + ) request = {} client.get_instance_health(request) @@ -6442,9 +6443,9 @@ def test_upgrade_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upgrade_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upgrade_instance] = ( + mock_rpc + ) request = {} client.upgrade_instance(request) @@ -6695,9 +6696,9 @@ def test_rollback_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rollback_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rollback_instance] = ( + mock_rpc + ) request = {} client.rollback_instance(request) @@ -6952,9 +6953,9 @@ def test_diagnose_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_instance] = ( + mock_rpc + ) request = {} client.diagnose_instance(request) @@ -7582,9 +7583,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -8461,9 +8462,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -8826,9 +8827,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -10707,9 +10708,9 @@ def test_trigger_schedule_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.trigger_schedule - ] = mock_rpc + client._transport._wrapped_methods[client._transport.trigger_schedule] = ( + mock_rpc + ) request = {} client.trigger_schedule(request) @@ -11820,9 +11821,9 @@ def test_delete_execution_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_execution - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_execution] = ( + mock_rpc + ) request = {} client.delete_execution(request) @@ -12151,9 +12152,9 @@ def test_create_execution_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_execution - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_execution] = ( + mock_rpc + ) request = {} client.create_execution(request) @@ -14353,11 +14354,14 @@ def test_notebook_service_base_transport(): def test_notebook_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.notebooks_v1.services.notebook_service.transports.NotebookServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.notebooks_v1.services.notebook_service.transports.NotebookServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NotebookServiceTransport( @@ -14374,9 +14378,12 @@ def test_notebook_service_base_transport_with_credentials_file(): def test_notebook_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.notebooks_v1.services.notebook_service.transports.NotebookServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.notebooks_v1.services.notebook_service.transports.NotebookServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NotebookServiceTransport() @@ -14447,11 +14454,12 @@ def test_notebook_service_transport_auth_gdch_credentials(transport_class): def test_notebook_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v1beta1/test_notebook_service.py b/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v1beta1/test_notebook_service.py index b88f314df779..86b7df0baba2 100644 --- a/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v1beta1/test_notebook_service.py +++ b/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v1beta1/test_notebook_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,12 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,21 +57,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.notebooks_v1beta1.services.notebook_service import ( NotebookServiceAsyncClient, @@ -985,10 +987,9 @@ def test_notebook_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1033,10 +1034,9 @@ def test_notebook_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1072,10 +1072,9 @@ def test_notebook_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1318,13 +1317,13 @@ def test_notebook_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2445,9 +2444,9 @@ def test_register_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.register_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.register_instance] = ( + mock_rpc + ) request = {} client.register_instance(request) @@ -3226,9 +3225,9 @@ def test_set_instance_labels_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_labels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_labels] = ( + mock_rpc + ) request = {} client.set_instance_labels(request) @@ -4467,9 +4466,9 @@ def test_report_instance_info_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_instance_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_instance_info] = ( + mock_rpc + ) request = {} client.report_instance_info(request) @@ -4988,9 +4987,9 @@ def test_upgrade_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upgrade_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upgrade_instance] = ( + mock_rpc + ) request = {} client.upgrade_instance(request) @@ -5508,9 +5507,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -6219,9 +6218,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -6478,9 +6477,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -7128,9 +7127,9 @@ def test_register_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.register_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.register_instance] = ( + mock_rpc + ) request = {} client.register_instance(request) @@ -7545,9 +7544,9 @@ def test_set_instance_labels_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.set_instance_labels - ] = mock_rpc + client._transport._wrapped_methods[client._transport.set_instance_labels] = ( + mock_rpc + ) request = {} client.set_instance_labels(request) @@ -8152,9 +8151,9 @@ def test_report_instance_info_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_instance_info - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_instance_info] = ( + mock_rpc + ) request = {} client.report_instance_info(request) @@ -8413,9 +8412,9 @@ def test_upgrade_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upgrade_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upgrade_instance] = ( + mock_rpc + ) request = {} client.upgrade_instance(request) @@ -8676,9 +8675,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -8996,9 +8995,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -9146,9 +9145,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -10337,8 +10336,9 @@ def test_list_instances_rest_bad_request(request_type=service.ListInstancesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10403,17 +10403,20 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_list_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10464,8 +10467,9 @@ def test_get_instance_rest_bad_request(request_type=service.GetInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10570,17 +10574,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10629,8 +10635,9 @@ def test_create_instance_rest_bad_request(request_type=service.CreateInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10794,19 +10801,21 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_create_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_create_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10857,8 +10866,9 @@ def test_register_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10915,20 +10925,21 @@ def test_register_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_register_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_register_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_register_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_register_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_register_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_register_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10981,8 +10992,9 @@ def test_set_instance_accelerator_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11039,20 +11051,21 @@ def test_set_instance_accelerator_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_set_instance_accelerator" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_set_instance_accelerator_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_set_instance_accelerator" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_set_instance_accelerator" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_set_instance_accelerator_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_set_instance_accelerator" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11105,8 +11118,9 @@ def test_set_instance_machine_type_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11163,20 +11177,21 @@ def test_set_instance_machine_type_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_set_instance_machine_type" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_set_instance_machine_type_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_set_instance_machine_type" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_set_instance_machine_type" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_set_instance_machine_type_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_set_instance_machine_type" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11229,8 +11244,9 @@ def test_set_instance_labels_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11287,20 +11303,21 @@ def test_set_instance_labels_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_set_instance_labels" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_set_instance_labels_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_set_instance_labels" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_set_instance_labels" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_set_instance_labels_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_set_instance_labels" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11351,8 +11368,9 @@ def test_delete_instance_rest_bad_request(request_type=service.DeleteInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11409,19 +11427,21 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_delete_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_delete_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11470,8 +11490,9 @@ def test_start_instance_rest_bad_request(request_type=service.StartInstanceReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11528,19 +11549,21 @@ def test_start_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_start_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_start_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_start_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_start_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_start_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_start_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11589,8 +11612,9 @@ def test_stop_instance_rest_bad_request(request_type=service.StopInstanceRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11647,19 +11671,21 @@ def test_stop_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_stop_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_stop_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_stop_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_stop_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_stop_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_stop_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11708,8 +11734,9 @@ def test_reset_instance_rest_bad_request(request_type=service.ResetInstanceReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11766,19 +11793,21 @@ def test_reset_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_reset_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_reset_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_reset_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_reset_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_reset_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_reset_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11829,8 +11858,9 @@ def test_report_instance_info_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11887,20 +11917,21 @@ def test_report_instance_info_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_report_instance_info" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_report_instance_info_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_report_instance_info" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_report_instance_info" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_report_instance_info_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_report_instance_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11955,8 +11986,9 @@ def test_is_instance_upgradeable_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12027,18 +12059,20 @@ def test_is_instance_upgradeable_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_is_instance_upgradeable" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_is_instance_upgradeable_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_is_instance_upgradeable" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "post_is_instance_upgradeable" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_is_instance_upgradeable_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_is_instance_upgradeable" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12094,8 +12128,9 @@ def test_upgrade_instance_rest_bad_request(request_type=service.UpgradeInstanceR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12152,19 +12187,21 @@ def test_upgrade_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_upgrade_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_upgrade_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_upgrade_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_upgrade_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_upgrade_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_upgrade_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12215,8 +12252,9 @@ def test_upgrade_instance_internal_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12273,20 +12311,21 @@ def test_upgrade_instance_internal_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_upgrade_instance_internal" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_upgrade_instance_internal_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_upgrade_instance_internal" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_upgrade_instance_internal" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_upgrade_instance_internal_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_upgrade_instance_internal" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12339,8 +12378,9 @@ def test_list_environments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12405,18 +12445,20 @@ def test_list_environments_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_list_environments" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_list_environments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_list_environments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "post_list_environments" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_list_environments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_list_environments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12469,8 +12511,9 @@ def test_get_environment_rest_bad_request(request_type=service.GetEnvironmentReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12539,17 +12582,20 @@ def test_get_environment_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_get_environment" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_get_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_get_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "post_get_environment" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_get_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_get_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12600,8 +12646,9 @@ def test_create_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12738,20 +12785,21 @@ def test_create_environment_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_create_environment" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_create_environment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_create_environment" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_create_environment" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_create_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_create_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12804,8 +12852,9 @@ def test_delete_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12862,20 +12911,21 @@ def test_delete_environment_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_delete_environment" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_delete_environment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_delete_environment" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_delete_environment" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_delete_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_delete_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12928,8 +12978,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12988,8 +13039,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13050,8 +13102,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13112,8 +13165,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13174,8 +13228,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13236,8 +13291,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13298,8 +13354,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13360,8 +13417,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13422,8 +13480,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -13980,11 +14039,14 @@ def test_notebook_service_base_transport(): def test_notebook_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.notebooks_v1beta1.services.notebook_service.transports.NotebookServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.notebooks_v1beta1.services.notebook_service.transports.NotebookServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NotebookServiceTransport( @@ -14001,9 +14063,12 @@ def test_notebook_service_base_transport_with_credentials_file(): def test_notebook_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.notebooks_v1beta1.services.notebook_service.transports.NotebookServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.notebooks_v1beta1.services.notebook_service.transports.NotebookServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NotebookServiceTransport() @@ -14075,11 +14140,12 @@ def test_notebook_service_transport_auth_gdch_credentials(transport_class): def test_notebook_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v2/test_notebook_service.py b/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v2/test_notebook_service.py index 37508e548121..6d814f11aa1c 100644 --- a/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v2/test_notebook_service.py +++ b/packages/google-cloud-notebooks/tests/unit/gapic/notebooks_v2/test_notebook_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,22 +58,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.notebooks_v2.services.notebook_service import ( NotebookServiceAsyncClient, @@ -76,10 +78,8 @@ transports, ) from google.cloud.notebooks_v2.types import diagnostic_config as gcn_diagnostic_config -from google.cloud.notebooks_v2.types import gce_setup -from google.cloud.notebooks_v2.types import instance +from google.cloud.notebooks_v2.types import gce_setup, instance, service from google.cloud.notebooks_v2.types import instance as gcn_instance -from google.cloud.notebooks_v2.types import service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -990,10 +990,9 @@ def test_notebook_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1038,10 +1037,9 @@ def test_notebook_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1077,10 +1075,9 @@ def test_notebook_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1323,13 +1320,13 @@ def test_notebook_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4328,9 +4325,9 @@ def test_upgrade_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upgrade_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upgrade_instance] = ( + mock_rpc + ) request = {} client.upgrade_instance(request) @@ -4583,9 +4580,9 @@ def test_rollback_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rollback_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rollback_instance] = ( + mock_rpc + ) request = {} client.rollback_instance(request) @@ -4840,9 +4837,9 @@ def test_diagnose_instance_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_instance] = ( + mock_rpc + ) request = {} client.diagnose_instance(request) @@ -6645,9 +6642,9 @@ def test_upgrade_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.upgrade_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.upgrade_instance] = ( + mock_rpc + ) request = {} client.upgrade_instance(request) @@ -6769,9 +6766,9 @@ def test_rollback_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.rollback_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.rollback_instance] = ( + mock_rpc + ) request = {} client.rollback_instance(request) @@ -6910,9 +6907,9 @@ def test_diagnose_instance_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.diagnose_instance - ] = mock_rpc + client._transport._wrapped_methods[client._transport.diagnose_instance] = ( + mock_rpc + ) request = {} client.diagnose_instance(request) @@ -7802,8 +7799,9 @@ def test_list_instances_rest_bad_request(request_type=service.ListInstancesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7868,17 +7866,20 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_list_instances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7929,8 +7930,9 @@ def test_get_instance_rest_bad_request(request_type=service.GetInstanceRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8007,17 +8009,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8066,8 +8070,9 @@ def test_create_instance_rest_bad_request(request_type=service.CreateInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8261,19 +8266,21 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_create_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_create_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8324,8 +8331,9 @@ def test_update_instance_rest_bad_request(request_type=service.UpdateInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8521,19 +8529,21 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_update_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_update_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8582,8 +8592,9 @@ def test_delete_instance_rest_bad_request(request_type=service.DeleteInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8640,19 +8651,21 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_delete_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_delete_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8701,8 +8714,9 @@ def test_start_instance_rest_bad_request(request_type=service.StartInstanceReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8759,19 +8773,21 @@ def test_start_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_start_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_start_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_start_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_start_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_start_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_start_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8820,8 +8836,9 @@ def test_stop_instance_rest_bad_request(request_type=service.StopInstanceRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8878,19 +8895,21 @@ def test_stop_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_stop_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_stop_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_stop_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_stop_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_stop_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_stop_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8939,8 +8958,9 @@ def test_reset_instance_rest_bad_request(request_type=service.ResetInstanceReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8997,19 +9017,21 @@ def test_reset_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_reset_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_reset_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_reset_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_reset_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_reset_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_reset_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9062,8 +9084,9 @@ def test_check_instance_upgradability_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9134,18 +9157,22 @@ def test_check_instance_upgradability_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_check_instance_upgradability" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_check_instance_upgradability_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_check_instance_upgradability" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_check_instance_upgradability", + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_check_instance_upgradability_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "pre_check_instance_upgradability", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9201,8 +9228,9 @@ def test_upgrade_instance_rest_bad_request(request_type=service.UpgradeInstanceR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9259,19 +9287,21 @@ def test_upgrade_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_upgrade_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, "post_upgrade_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_upgrade_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_upgrade_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_upgrade_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_upgrade_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9322,8 +9352,9 @@ def test_rollback_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9380,20 +9411,21 @@ def test_rollback_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_rollback_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_rollback_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_rollback_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_rollback_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_rollback_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_rollback_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9446,8 +9478,9 @@ def test_diagnose_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9504,20 +9537,21 @@ def test_diagnose_instance_rest_interceptors(null_interceptor): ) client = NotebookServiceClient(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.NotebookServiceRestInterceptor, "post_diagnose_instance" - ) as post, mock.patch.object( - transports.NotebookServiceRestInterceptor, - "post_diagnose_instance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.NotebookServiceRestInterceptor, "pre_diagnose_instance" - ) as pre: + 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.NotebookServiceRestInterceptor, "post_diagnose_instance" + ) as post, + mock.patch.object( + transports.NotebookServiceRestInterceptor, + "post_diagnose_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.NotebookServiceRestInterceptor, "pre_diagnose_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9570,8 +9604,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9630,8 +9665,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9692,8 +9728,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9754,8 +9791,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9816,8 +9854,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9878,8 +9917,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -9940,8 +9980,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10002,8 +10043,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10064,8 +10106,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10461,11 +10504,14 @@ def test_notebook_service_base_transport(): def test_notebook_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.notebooks_v2.services.notebook_service.transports.NotebookServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.notebooks_v2.services.notebook_service.transports.NotebookServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NotebookServiceTransport( @@ -10482,9 +10528,12 @@ def test_notebook_service_base_transport_with_credentials_file(): def test_notebook_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.notebooks_v2.services.notebook_service.transports.NotebookServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.notebooks_v2.services.notebook_service.transports.NotebookServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.NotebookServiceTransport() @@ -10556,11 +10605,12 @@ def test_notebook_service_transport_auth_gdch_credentials(transport_class): def test_notebook_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-optimization/docs/conf.py b/packages/google-cloud-optimization/docs/conf.py index d569d8602d06..4426a4e9128c 100644 --- a/packages/google-cloud-optimization/docs/conf.py +++ b/packages/google-cloud-optimization/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-optimization documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-optimization/google/cloud/optimization_v1/__init__.py b/packages/google-cloud-optimization/google/cloud/optimization_v1/__init__.py index 688b7609b66c..aa9a78ba8b02 100644 --- a/packages/google-cloud-optimization/google/cloud/optimization_v1/__init__.py +++ b/packages/google-cloud-optimization/google/cloud/optimization_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.fleet_routing import FleetRoutingAsyncClient, FleetRoutingClient from .types.async_model import ( AsyncModelMetadata, diff --git a/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/async_client.py b/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/async_client.py index 185566ce1a92..173649784051 100644 --- a/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/async_client.py +++ b/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.optimization_v1 import gapic_version as package_version @@ -45,8 +45,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.cloud.optimization_v1.types import async_model, fleet_routing @@ -133,7 +133,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: FleetRoutingAsyncClient: The constructed client. """ - return FleetRoutingClient.from_service_account_info.__func__(FleetRoutingAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = FleetRoutingClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(FleetRoutingAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -149,7 +150,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: FleetRoutingAsyncClient: The constructed client. """ - return FleetRoutingClient.from_service_account_file.__func__(FleetRoutingAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = FleetRoutingClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(FleetRoutingAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/client.py b/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/client.py index 95dcbebc1e78..759d153814b5 100644 --- a/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/client.py +++ b/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.optimization_v1 import gapic_version as package_version @@ -62,8 +62,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.cloud.optimization_v1.types import async_model, fleet_routing @@ -622,11 +622,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = FleetRoutingClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + FleetRoutingClient._read_environment_variables() + ) self._client_cert_source = FleetRoutingClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -661,8 +659,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(FleetRoutingTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/base.py b/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/base.py index 028d8953fa35..bb48317c11cf 100644 --- a/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/base.py +++ b/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.optimization_v1 import gapic_version as package_version from google.cloud.optimization_v1.types import fleet_routing diff --git a/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/grpc.py b/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/grpc.py index eafb8351b633..5fd012d523a0 100644 --- a/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/grpc.py +++ b/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.optimization_v1.types import fleet_routing diff --git a/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/grpc_asyncio.py b/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/grpc_asyncio.py index 00d2b6afdf44..25ed43f2e957 100644 --- a/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/grpc_asyncio.py +++ b/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.optimization_v1.types import fleet_routing diff --git a/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/rest.py b/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/rest.py index 6173a370b43b..5f422d0cda26 100644 --- a/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/rest.py +++ b/packages/google-cloud-optimization/google/cloud/optimization_v1/services/fleet_routing/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -430,9 +430,7 @@ def __call__( """ - http_options = ( - _BaseFleetRoutingRestTransport._BaseBatchOptimizeTours._get_http_options() - ) + http_options = _BaseFleetRoutingRestTransport._BaseBatchOptimizeTours._get_http_options() request, metadata = self._interceptor.pre_batch_optimize_tours( request, metadata @@ -458,7 +456,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-optimization/google/cloud/optimization_v1/types/async_model.py b/packages/google-cloud-optimization/google/cloud/optimization_v1/types/async_model.py index 2b7826042f18..999a0afd7671 100644 --- a/packages/google-cloud-optimization/google/cloud/optimization_v1/types/async_model.py +++ b/packages/google-cloud-optimization/google/cloud/optimization_v1/types/async_model.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -44,6 +44,7 @@ class DataFormat(proto.Enum): STRING (2): Input data in string format. """ + DATA_FORMAT_UNSPECIFIED = 0 JSON = 1 STRING = 2 @@ -172,6 +173,7 @@ class State(proto.Enum): FAILED (4): The operation has failed. """ + STATE_UNSPECIFIED = 0 RUNNING = 1 SUCCEEDED = 2 diff --git a/packages/google-cloud-optimization/google/cloud/optimization_v1/types/fleet_routing.py b/packages/google-cloud-optimization/google/cloud/optimization_v1/types/fleet_routing.py index f916b3868541..ea0418b93b3d 100644 --- a/packages/google-cloud-optimization/google/cloud/optimization_v1/types/fleet_routing.py +++ b/packages/google-cloud-optimization/google/cloud/optimization_v1/types/fleet_routing.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore import proto # type: ignore from google.cloud.optimization_v1.types import async_model @@ -317,6 +317,7 @@ class SolvingMode(proto.Enum): but only the ones that are detected as infeasible during preprocessing. """ + DEFAULT_SOLVE = 0 VALIDATE_ONLY = 1 DETECT_SOME_INFEASIBLE_SHIPMENTS = 2 @@ -336,6 +337,7 @@ class SearchMode(proto.Enum): Spend all the available time to search for better solutions. """ + SEARCH_MODE_UNSPECIFIED = 0 RETURN_FAST = 1 CONSUME_ALL_AVAILABLE_TIME = 2 @@ -364,12 +366,12 @@ class SearchMode(proto.Enum): number=6, enum=SearchMode, ) - injected_first_solution_routes: MutableSequence[ - "ShipmentRoute" - ] = proto.RepeatedField( - proto.MESSAGE, - number=7, - message="ShipmentRoute", + injected_first_solution_routes: MutableSequence["ShipmentRoute"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=7, + message="ShipmentRoute", + ) ) injected_solution_constraint: "InjectedSolutionConstraint" = proto.Field( proto.MESSAGE, @@ -547,12 +549,12 @@ class Metrics(proto.Message): number=4, message="SkippedShipment", ) - validation_errors: MutableSequence[ - "OptimizeToursValidationError" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="OptimizeToursValidationError", + validation_errors: MutableSequence["OptimizeToursValidationError"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="OptimizeToursValidationError", + ) ) metrics: Metrics = proto.Field( proto.MESSAGE, @@ -895,12 +897,12 @@ class Row(proto.Message): number=2, ) - rows: MutableSequence[ - "ShipmentModel.DurationDistanceMatrix.Row" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ShipmentModel.DurationDistanceMatrix.Row", + rows: MutableSequence["ShipmentModel.DurationDistanceMatrix.Row"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ShipmentModel.DurationDistanceMatrix.Row", + ) ) vehicle_start_tag: str = proto.Field( proto.STRING, @@ -1088,12 +1090,12 @@ class FrequencyConstraint(proto.Message): message=duration_pb2.Duration, ) - break_requests: MutableSequence[ - "ShipmentModel.BreakRule.BreakRequest" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ShipmentModel.BreakRule.BreakRequest", + break_requests: MutableSequence["ShipmentModel.BreakRule.BreakRequest"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ShipmentModel.BreakRule.BreakRequest", + ) ) frequency_constraints: MutableSequence[ "ShipmentModel.BreakRule.FrequencyConstraint" @@ -1132,12 +1134,12 @@ class FrequencyConstraint(proto.Message): proto.DOUBLE, number=7, ) - duration_distance_matrices: MutableSequence[ - DurationDistanceMatrix - ] = proto.RepeatedField( - proto.MESSAGE, - number=8, - message=DurationDistanceMatrix, + duration_distance_matrices: MutableSequence[DurationDistanceMatrix] = ( + proto.RepeatedField( + proto.MESSAGE, + number=8, + message=DurationDistanceMatrix, + ) ) duration_distance_matrix_src_tags: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -1147,26 +1149,26 @@ class FrequencyConstraint(proto.Message): proto.STRING, number=10, ) - transition_attributes: MutableSequence[ - "TransitionAttributes" - ] = proto.RepeatedField( - proto.MESSAGE, - number=11, - message="TransitionAttributes", + transition_attributes: MutableSequence["TransitionAttributes"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=11, + message="TransitionAttributes", + ) ) - shipment_type_incompatibilities: MutableSequence[ - "ShipmentTypeIncompatibility" - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message="ShipmentTypeIncompatibility", + shipment_type_incompatibilities: MutableSequence["ShipmentTypeIncompatibility"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message="ShipmentTypeIncompatibility", + ) ) - shipment_type_requirements: MutableSequence[ - "ShipmentTypeRequirement" - ] = proto.RepeatedField( - proto.MESSAGE, - number=13, - message="ShipmentTypeRequirement", + shipment_type_requirements: MutableSequence["ShipmentTypeRequirement"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=13, + message="ShipmentTypeRequirement", + ) ) precedence_rules: MutableSequence[PrecedenceRule] = proto.RepeatedField( proto.MESSAGE, @@ -1604,6 +1606,7 @@ class IncompatibilityMode(proto.Enum): the former shipment is delivered before the latter is picked up. """ + INCOMPATIBILITY_MODE_UNSPECIFIED = 0 NOT_PERFORMED_BY_SAME_VEHICLE = 1 NOT_IN_SAME_VEHICLE_SIMULTANEOUSLY = 2 @@ -1670,6 +1673,7 @@ class RequirementMode(proto.Enum): have a "required" shipment on their vehicle at the time of their *delivery*. """ + REQUIREMENT_MODE_UNSPECIFIED = 0 PERFORMED_BY_SAME_VEHICLE = 1 IN_SAME_VEHICLE_AT_PICKUP_TIME = 2 @@ -1977,6 +1981,7 @@ class TravelMode(proto.Enum): Travel mode corresponding to walking directions. """ + TRAVEL_MODE_UNSPECIFIED = 0 DRIVING = 1 WALKING = 2 @@ -1999,6 +2004,7 @@ class UnloadingPolicy(proto.Enum): Deliveries must occur in the same order as pickups """ + UNLOADING_POLICY_UNSPECIFIED = 0 LAST_IN_FIRST_OUT = 1 FIRST_IN_FIRST_OUT = 2 @@ -2287,13 +2293,13 @@ class DurationLimit(proto.Message): number=23, message="DistanceLimit", ) - extra_visit_duration_for_visit_type: MutableMapping[ - str, duration_pb2.Duration - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=24, - message=duration_pb2.Duration, + extra_visit_duration_for_visit_type: MutableMapping[str, duration_pb2.Duration] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=24, + message=duration_pb2.Duration, + ) ) break_rule: "BreakRule" = proto.Field( proto.MESSAGE, @@ -2317,19 +2323,19 @@ class DurationLimit(proto.Message): number=13, message="CapacityQuantity", ) - start_load_intervals: MutableSequence[ - "CapacityQuantityInterval" - ] = proto.RepeatedField( - proto.MESSAGE, - number=14, - message="CapacityQuantityInterval", + start_load_intervals: MutableSequence["CapacityQuantityInterval"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=14, + message="CapacityQuantityInterval", + ) ) - end_load_intervals: MutableSequence[ - "CapacityQuantityInterval" - ] = proto.RepeatedField( - proto.MESSAGE, - number=15, - message="CapacityQuantityInterval", + end_load_intervals: MutableSequence["CapacityQuantityInterval"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=15, + message="CapacityQuantityInterval", + ) ) @@ -3340,13 +3346,13 @@ class Transition(proto.Message): number=9, message="ShipmentRoute.EncodedPolyline", ) - vehicle_loads: MutableMapping[ - str, "ShipmentRoute.VehicleLoad" - ] = proto.MapField( - proto.STRING, - proto.MESSAGE, - number=11, - message="ShipmentRoute.VehicleLoad", + vehicle_loads: MutableMapping[str, "ShipmentRoute.VehicleLoad"] = ( + proto.MapField( + proto.STRING, + proto.MESSAGE, + number=11, + message="ShipmentRoute.VehicleLoad", + ) ) loads: MutableSequence["CapacityQuantity"] = proto.RepeatedField( proto.MESSAGE, @@ -3658,6 +3664,7 @@ class Code(proto.Enum): The ``allowed_vehicle_indices`` field of the shipment is not empty and this vehicle does not belong to it. """ + CODE_UNSPECIFIED = 0 NO_VEHICLE = 1 DEMAND_EXCEEDS_VEHICLE_CAPACITY = 2 @@ -3950,6 +3957,7 @@ class Level(proto.Enum): at or after the threshold time and can potentially become unperformed. """ + LEVEL_UNSPECIFIED = 0 RELAX_VISIT_TIMES_AFTER_THRESHOLD = 1 RELAX_VISIT_TIMES_AND_SEQUENCE_AFTER_THRESHOLD = 2 diff --git a/packages/google-cloud-optimization/noxfile.py b/packages/google-cloud-optimization/noxfile.py index 89f7d75cf5ba..4f001302f839 100644 --- a/packages/google-cloud-optimization/noxfile.py +++ b/packages/google-cloud-optimization/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-optimization/tests/unit/gapic/optimization_v1/test_fleet_routing.py b/packages/google-cloud-optimization/tests/unit/gapic/optimization_v1/test_fleet_routing.py index 64197bd9d6da..231110ee6aeb 100644 --- a/packages/google-cloud-optimization/tests/unit/gapic/optimization_v1/test_fleet_routing.py +++ b/packages/google-cloud-optimization/tests/unit/gapic/optimization_v1/test_fleet_routing.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.latlng_pb2 as latlng_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,18 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import latlng_pb2 # type: ignore from google.cloud.optimization_v1.services.fleet_routing import ( FleetRoutingAsyncClient, @@ -939,10 +939,9 @@ def test_fleet_routing_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +986,9 @@ def test_fleet_routing_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1024,9 @@ def test_fleet_routing_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1268,13 +1265,13 @@ def test_fleet_routing_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1631,9 +1628,9 @@ def test_batch_optimize_tours_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_optimize_tours - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_optimize_tours] = ( + mock_rpc + ) request = {} client.batch_optimize_tours(request) @@ -1947,9 +1944,9 @@ def test_batch_optimize_tours_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.batch_optimize_tours - ] = mock_rpc + client._transport._wrapped_methods[client._transport.batch_optimize_tours] = ( + mock_rpc + ) request = {} client.batch_optimize_tours(request) @@ -2295,8 +2292,9 @@ def test_optimize_tours_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2361,17 +2359,19 @@ def test_optimize_tours_rest_interceptors(null_interceptor): ) client = FleetRoutingClient(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.FleetRoutingRestInterceptor, "post_optimize_tours" - ) as post, mock.patch.object( - transports.FleetRoutingRestInterceptor, "post_optimize_tours_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.FleetRoutingRestInterceptor, "pre_optimize_tours" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.FleetRoutingRestInterceptor, "post_optimize_tours" + ) as post, + mock.patch.object( + transports.FleetRoutingRestInterceptor, "post_optimize_tours_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.FleetRoutingRestInterceptor, "pre_optimize_tours" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2429,8 +2429,9 @@ def test_batch_optimize_tours_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2487,20 +2488,21 @@ def test_batch_optimize_tours_rest_interceptors(null_interceptor): ) client = FleetRoutingClient(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.FleetRoutingRestInterceptor, "post_batch_optimize_tours" - ) as post, mock.patch.object( - transports.FleetRoutingRestInterceptor, - "post_batch_optimize_tours_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.FleetRoutingRestInterceptor, "pre_batch_optimize_tours" - ) as pre: + 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.FleetRoutingRestInterceptor, "post_batch_optimize_tours" + ) as post, + mock.patch.object( + transports.FleetRoutingRestInterceptor, + "post_batch_optimize_tours_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.FleetRoutingRestInterceptor, "pre_batch_optimize_tours" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2555,8 +2557,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2730,11 +2733,14 @@ def test_fleet_routing_base_transport(): def test_fleet_routing_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.optimization_v1.services.fleet_routing.transports.FleetRoutingTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.optimization_v1.services.fleet_routing.transports.FleetRoutingTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FleetRoutingTransport( @@ -2751,9 +2757,12 @@ def test_fleet_routing_base_transport_with_credentials_file(): def test_fleet_routing_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.optimization_v1.services.fleet_routing.transports.FleetRoutingTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.optimization_v1.services.fleet_routing.transports.FleetRoutingTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.FleetRoutingTransport() @@ -2825,11 +2834,12 @@ def test_fleet_routing_transport_auth_gdch_credentials(transport_class): def test_fleet_routing_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-oracledatabase/docs/conf.py b/packages/google-cloud-oracledatabase/docs/conf.py index 97a26e2478b0..de2933eb24db 100644 --- a/packages/google-cloud-oracledatabase/docs/conf.py +++ b/packages/google-cloud-oracledatabase/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-oracledatabase documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/__init__.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/__init__.py index 94c7cc3d23b5..637cdc486fda 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/__init__.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.oracle_database import OracleDatabaseAsyncClient, OracleDatabaseClient from .types.autonomous_database import ( AllConnectionStrings, diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/async_client.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/async_client.py index 6864aaf3cacf..0d405b8fa446 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/async_client.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.oracledatabase_v1 import gapic_version as package_version @@ -44,16 +44,17 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.oracledatabase_v1.services.oracle_database import pagers from google.cloud.oracledatabase_v1.types import ( + autonomous_database, autonomous_database_character_set, autonomous_db_backup, autonomous_db_version, @@ -62,15 +63,18 @@ database_character_set, db_node, db_server, -) -from google.cloud.oracledatabase_v1.types import ( + db_system, db_system_initial_storage_size, db_system_shape, db_version, entitlement, exadata_infra, -) -from google.cloud.oracledatabase_v1.types import ( + exadb_vm_cluster, + exascale_db_storage_vault, + gi_version, + minor_version, + odb_network, + odb_subnet, oracledatabase, pluggable_database, vm_cluster, @@ -78,21 +82,14 @@ from google.cloud.oracledatabase_v1.types import ( autonomous_database as gco_autonomous_database, ) +from google.cloud.oracledatabase_v1.types import db_system as gco_db_system from google.cloud.oracledatabase_v1.types import ( exadb_vm_cluster as gco_exadb_vm_cluster, ) from google.cloud.oracledatabase_v1.types import ( exascale_db_storage_vault as gco_exascale_db_storage_vault, ) -from google.cloud.oracledatabase_v1.types import autonomous_database -from google.cloud.oracledatabase_v1.types import db_system -from google.cloud.oracledatabase_v1.types import db_system as gco_db_system -from google.cloud.oracledatabase_v1.types import exadb_vm_cluster -from google.cloud.oracledatabase_v1.types import exascale_db_storage_vault -from google.cloud.oracledatabase_v1.types import gi_version, minor_version -from google.cloud.oracledatabase_v1.types import odb_network from google.cloud.oracledatabase_v1.types import odb_network as gco_odb_network -from google.cloud.oracledatabase_v1.types import odb_subnet from google.cloud.oracledatabase_v1.types import odb_subnet as gco_odb_subnet from .client import OracleDatabaseClient @@ -249,7 +246,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: OracleDatabaseAsyncClient: The constructed client. """ - return OracleDatabaseClient.from_service_account_info.__func__(OracleDatabaseAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = OracleDatabaseClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(OracleDatabaseAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -265,7 +263,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: OracleDatabaseAsyncClient: The constructed client. """ - return OracleDatabaseClient.from_service_account_file.__func__(OracleDatabaseAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = OracleDatabaseClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(OracleDatabaseAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/client.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/client.py index c9ab5c1942dd..8886840867cc 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/client.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.oracledatabase_v1 import gapic_version as package_version @@ -61,16 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.oracledatabase_v1.services.oracle_database import pagers from google.cloud.oracledatabase_v1.types import ( + autonomous_database, autonomous_database_character_set, autonomous_db_backup, autonomous_db_version, @@ -79,15 +80,18 @@ database_character_set, db_node, db_server, -) -from google.cloud.oracledatabase_v1.types import ( + db_system, db_system_initial_storage_size, db_system_shape, db_version, entitlement, exadata_infra, -) -from google.cloud.oracledatabase_v1.types import ( + exadb_vm_cluster, + exascale_db_storage_vault, + gi_version, + minor_version, + odb_network, + odb_subnet, oracledatabase, pluggable_database, vm_cluster, @@ -95,21 +99,14 @@ from google.cloud.oracledatabase_v1.types import ( autonomous_database as gco_autonomous_database, ) +from google.cloud.oracledatabase_v1.types import db_system as gco_db_system from google.cloud.oracledatabase_v1.types import ( exadb_vm_cluster as gco_exadb_vm_cluster, ) from google.cloud.oracledatabase_v1.types import ( exascale_db_storage_vault as gco_exascale_db_storage_vault, ) -from google.cloud.oracledatabase_v1.types import autonomous_database -from google.cloud.oracledatabase_v1.types import db_system -from google.cloud.oracledatabase_v1.types import db_system as gco_db_system -from google.cloud.oracledatabase_v1.types import exadb_vm_cluster -from google.cloud.oracledatabase_v1.types import exascale_db_storage_vault -from google.cloud.oracledatabase_v1.types import gi_version, minor_version -from google.cloud.oracledatabase_v1.types import odb_network from google.cloud.oracledatabase_v1.types import odb_network as gco_odb_network -from google.cloud.oracledatabase_v1.types import odb_subnet from google.cloud.oracledatabase_v1.types import odb_subnet as gco_odb_subnet from .transports.base import DEFAULT_CLIENT_INFO, OracleDatabaseTransport @@ -126,9 +123,7 @@ class OracleDatabaseClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OracleDatabaseTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OracleDatabaseTransport]] _transport_registry["grpc"] = OracleDatabaseGrpcTransport _transport_registry["grpc_asyncio"] = OracleDatabaseGrpcAsyncIOTransport _transport_registry["rest"] = OracleDatabaseRestTransport @@ -1185,11 +1180,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OracleDatabaseClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OracleDatabaseClient._read_environment_variables() + ) self._client_cert_source = OracleDatabaseClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -1224,8 +1217,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OracleDatabaseTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/pagers.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/pagers.py index 51c55b2109a0..09a024659662 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/pagers.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/pagers.py @@ -91,7 +91,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -169,7 +169,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -251,7 +251,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -327,7 +327,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -407,7 +407,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -483,7 +483,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -563,7 +563,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -639,7 +639,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -719,7 +719,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -795,7 +795,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -875,7 +875,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -951,7 +951,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1031,7 +1031,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1107,7 +1107,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1187,7 +1187,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1263,7 +1263,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1343,7 +1343,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1421,7 +1421,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1503,7 +1503,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1581,7 +1581,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1665,7 +1665,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1749,7 +1749,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1837,7 +1837,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -1915,7 +1915,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -1997,7 +1997,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2073,7 +2073,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2153,7 +2153,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2229,7 +2229,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2309,7 +2309,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2385,7 +2385,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2467,7 +2467,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2550,7 +2550,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2638,7 +2638,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2729,7 +2729,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2819,7 +2819,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -2895,7 +2895,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -2975,7 +2975,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3053,7 +3053,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3135,7 +3135,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3211,7 +3211,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3291,7 +3291,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3367,7 +3367,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -3447,7 +3447,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -3527,7 +3527,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/base.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/base.py index db3ebc9eb7c7..24c2d3e3709d 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/base.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/base.py @@ -17,43 +17,39 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.oracledatabase_v1 import gapic_version as package_version from google.cloud.oracledatabase_v1.types import ( + autonomous_database, + database, + database_character_set, + db_system, db_system_initial_storage_size, db_version, exadata_infra, exadb_vm_cluster, -) -from google.cloud.oracledatabase_v1.types import ( - autonomous_database, - database, - database_character_set, -) -from google.cloud.oracledatabase_v1.types import ( + exascale_db_storage_vault, + minor_version, + odb_network, + odb_subnet, oracledatabase, pluggable_database, vm_cluster, ) +from google.cloud.oracledatabase_v1.types import db_system as gco_db_system from google.cloud.oracledatabase_v1.types import ( exascale_db_storage_vault as gco_exascale_db_storage_vault, ) -from google.cloud.oracledatabase_v1.types import db_system -from google.cloud.oracledatabase_v1.types import db_system as gco_db_system -from google.cloud.oracledatabase_v1.types import exascale_db_storage_vault -from google.cloud.oracledatabase_v1.types import minor_version -from google.cloud.oracledatabase_v1.types import odb_network from google.cloud.oracledatabase_v1.types import odb_network as gco_odb_network -from google.cloud.oracledatabase_v1.types import odb_subnet from google.cloud.oracledatabase_v1.types import odb_subnet as gco_odb_subnet DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( @@ -1449,13 +1445,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/grpc.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/grpc.py index 804b87b72872..b6c93c544aaf 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/grpc.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/grpc.py @@ -16,46 +16,42 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.oracledatabase_v1.types import ( + autonomous_database, + database, + database_character_set, + db_system, db_system_initial_storage_size, db_version, exadata_infra, exadb_vm_cluster, -) -from google.cloud.oracledatabase_v1.types import ( - autonomous_database, - database, - database_character_set, -) -from google.cloud.oracledatabase_v1.types import ( + exascale_db_storage_vault, + minor_version, + odb_network, + odb_subnet, oracledatabase, pluggable_database, vm_cluster, ) +from google.cloud.oracledatabase_v1.types import db_system as gco_db_system from google.cloud.oracledatabase_v1.types import ( exascale_db_storage_vault as gco_exascale_db_storage_vault, ) -from google.cloud.oracledatabase_v1.types import db_system -from google.cloud.oracledatabase_v1.types import db_system as gco_db_system -from google.cloud.oracledatabase_v1.types import exascale_db_storage_vault -from google.cloud.oracledatabase_v1.types import minor_version -from google.cloud.oracledatabase_v1.types import odb_network from google.cloud.oracledatabase_v1.types import odb_network as gco_odb_network -from google.cloud.oracledatabase_v1.types import odb_subnet from google.cloud.oracledatabase_v1.types import odb_subnet as gco_odb_subnet from .base import DEFAULT_CLIENT_INFO, OracleDatabaseTransport @@ -390,12 +386,12 @@ def list_cloud_exadata_infrastructures( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_cloud_exadata_infrastructures" not in self._stubs: - self._stubs[ - "list_cloud_exadata_infrastructures" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListCloudExadataInfrastructures", - request_serializer=oracledatabase.ListCloudExadataInfrastructuresRequest.serialize, - response_deserializer=oracledatabase.ListCloudExadataInfrastructuresResponse.deserialize, + self._stubs["list_cloud_exadata_infrastructures"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListCloudExadataInfrastructures", + request_serializer=oracledatabase.ListCloudExadataInfrastructuresRequest.serialize, + response_deserializer=oracledatabase.ListCloudExadataInfrastructuresResponse.deserialize, + ) ) return self._stubs["list_cloud_exadata_infrastructures"] @@ -422,12 +418,12 @@ def get_cloud_exadata_infrastructure( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_cloud_exadata_infrastructure" not in self._stubs: - self._stubs[ - "get_cloud_exadata_infrastructure" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/GetCloudExadataInfrastructure", - request_serializer=oracledatabase.GetCloudExadataInfrastructureRequest.serialize, - response_deserializer=exadata_infra.CloudExadataInfrastructure.deserialize, + self._stubs["get_cloud_exadata_infrastructure"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/GetCloudExadataInfrastructure", + request_serializer=oracledatabase.GetCloudExadataInfrastructureRequest.serialize, + response_deserializer=exadata_infra.CloudExadataInfrastructure.deserialize, + ) ) return self._stubs["get_cloud_exadata_infrastructure"] @@ -455,12 +451,12 @@ def create_cloud_exadata_infrastructure( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_cloud_exadata_infrastructure" not in self._stubs: - self._stubs[ - "create_cloud_exadata_infrastructure" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/CreateCloudExadataInfrastructure", - request_serializer=oracledatabase.CreateCloudExadataInfrastructureRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_cloud_exadata_infrastructure"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/CreateCloudExadataInfrastructure", + request_serializer=oracledatabase.CreateCloudExadataInfrastructureRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_cloud_exadata_infrastructure"] @@ -487,12 +483,12 @@ def delete_cloud_exadata_infrastructure( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_cloud_exadata_infrastructure" not in self._stubs: - self._stubs[ - "delete_cloud_exadata_infrastructure" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/DeleteCloudExadataInfrastructure", - request_serializer=oracledatabase.DeleteCloudExadataInfrastructureRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_cloud_exadata_infrastructure"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/DeleteCloudExadataInfrastructure", + request_serializer=oracledatabase.DeleteCloudExadataInfrastructureRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_cloud_exadata_infrastructure"] @@ -865,12 +861,12 @@ def create_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_autonomous_database" not in self._stubs: - self._stubs[ - "create_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/CreateAutonomousDatabase", - request_serializer=oracledatabase.CreateAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/CreateAutonomousDatabase", + request_serializer=oracledatabase.CreateAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_autonomous_database"] @@ -896,12 +892,12 @@ def update_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_autonomous_database" not in self._stubs: - self._stubs[ - "update_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/UpdateAutonomousDatabase", - request_serializer=oracledatabase.UpdateAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/UpdateAutonomousDatabase", + request_serializer=oracledatabase.UpdateAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_autonomous_database"] @@ -926,12 +922,12 @@ def delete_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_autonomous_database" not in self._stubs: - self._stubs[ - "delete_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/DeleteAutonomousDatabase", - request_serializer=oracledatabase.DeleteAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/DeleteAutonomousDatabase", + request_serializer=oracledatabase.DeleteAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_autonomous_database"] @@ -956,12 +952,12 @@ def restore_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restore_autonomous_database" not in self._stubs: - self._stubs[ - "restore_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/RestoreAutonomousDatabase", - request_serializer=oracledatabase.RestoreAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["restore_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/RestoreAutonomousDatabase", + request_serializer=oracledatabase.RestoreAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["restore_autonomous_database"] @@ -988,12 +984,12 @@ def generate_autonomous_database_wallet( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_autonomous_database_wallet" not in self._stubs: - self._stubs[ - "generate_autonomous_database_wallet" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/GenerateAutonomousDatabaseWallet", - request_serializer=oracledatabase.GenerateAutonomousDatabaseWalletRequest.serialize, - response_deserializer=oracledatabase.GenerateAutonomousDatabaseWalletResponse.deserialize, + self._stubs["generate_autonomous_database_wallet"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/GenerateAutonomousDatabaseWallet", + request_serializer=oracledatabase.GenerateAutonomousDatabaseWalletRequest.serialize, + response_deserializer=oracledatabase.GenerateAutonomousDatabaseWalletResponse.deserialize, + ) ) return self._stubs["generate_autonomous_database_wallet"] @@ -1020,12 +1016,12 @@ def list_autonomous_db_versions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_autonomous_db_versions" not in self._stubs: - self._stubs[ - "list_autonomous_db_versions" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListAutonomousDbVersions", - request_serializer=oracledatabase.ListAutonomousDbVersionsRequest.serialize, - response_deserializer=oracledatabase.ListAutonomousDbVersionsResponse.deserialize, + self._stubs["list_autonomous_db_versions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListAutonomousDbVersions", + request_serializer=oracledatabase.ListAutonomousDbVersionsRequest.serialize, + response_deserializer=oracledatabase.ListAutonomousDbVersionsResponse.deserialize, + ) ) return self._stubs["list_autonomous_db_versions"] @@ -1053,12 +1049,12 @@ def list_autonomous_database_character_sets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_autonomous_database_character_sets" not in self._stubs: - self._stubs[ - "list_autonomous_database_character_sets" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListAutonomousDatabaseCharacterSets", - request_serializer=oracledatabase.ListAutonomousDatabaseCharacterSetsRequest.serialize, - response_deserializer=oracledatabase.ListAutonomousDatabaseCharacterSetsResponse.deserialize, + self._stubs["list_autonomous_database_character_sets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListAutonomousDatabaseCharacterSets", + request_serializer=oracledatabase.ListAutonomousDatabaseCharacterSetsRequest.serialize, + response_deserializer=oracledatabase.ListAutonomousDatabaseCharacterSetsResponse.deserialize, + ) ) return self._stubs["list_autonomous_database_character_sets"] @@ -1086,12 +1082,12 @@ def list_autonomous_database_backups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_autonomous_database_backups" not in self._stubs: - self._stubs[ - "list_autonomous_database_backups" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListAutonomousDatabaseBackups", - request_serializer=oracledatabase.ListAutonomousDatabaseBackupsRequest.serialize, - response_deserializer=oracledatabase.ListAutonomousDatabaseBackupsResponse.deserialize, + self._stubs["list_autonomous_database_backups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListAutonomousDatabaseBackups", + request_serializer=oracledatabase.ListAutonomousDatabaseBackupsRequest.serialize, + response_deserializer=oracledatabase.ListAutonomousDatabaseBackupsResponse.deserialize, + ) ) return self._stubs["list_autonomous_database_backups"] @@ -1172,12 +1168,12 @@ def restart_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restart_autonomous_database" not in self._stubs: - self._stubs[ - "restart_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/RestartAutonomousDatabase", - request_serializer=oracledatabase.RestartAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["restart_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/RestartAutonomousDatabase", + request_serializer=oracledatabase.RestartAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["restart_autonomous_database"] @@ -1203,12 +1199,12 @@ def switchover_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "switchover_autonomous_database" not in self._stubs: - self._stubs[ - "switchover_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/SwitchoverAutonomousDatabase", - request_serializer=oracledatabase.SwitchoverAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["switchover_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/SwitchoverAutonomousDatabase", + request_serializer=oracledatabase.SwitchoverAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["switchover_autonomous_database"] @@ -1234,12 +1230,12 @@ def failover_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "failover_autonomous_database" not in self._stubs: - self._stubs[ - "failover_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/FailoverAutonomousDatabase", - request_serializer=oracledatabase.FailoverAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["failover_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/FailoverAutonomousDatabase", + request_serializer=oracledatabase.FailoverAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["failover_autonomous_database"] @@ -1625,12 +1621,12 @@ def remove_virtual_machine_exadb_vm_cluster( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "remove_virtual_machine_exadb_vm_cluster" not in self._stubs: - self._stubs[ - "remove_virtual_machine_exadb_vm_cluster" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/RemoveVirtualMachineExadbVmCluster", - request_serializer=oracledatabase.RemoveVirtualMachineExadbVmClusterRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["remove_virtual_machine_exadb_vm_cluster"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/RemoveVirtualMachineExadbVmCluster", + request_serializer=oracledatabase.RemoveVirtualMachineExadbVmClusterRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["remove_virtual_machine_exadb_vm_cluster"] @@ -1658,12 +1654,12 @@ def list_exascale_db_storage_vaults( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_exascale_db_storage_vaults" not in self._stubs: - self._stubs[ - "list_exascale_db_storage_vaults" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListExascaleDbStorageVaults", - request_serializer=exascale_db_storage_vault.ListExascaleDbStorageVaultsRequest.serialize, - response_deserializer=exascale_db_storage_vault.ListExascaleDbStorageVaultsResponse.deserialize, + self._stubs["list_exascale_db_storage_vaults"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListExascaleDbStorageVaults", + request_serializer=exascale_db_storage_vault.ListExascaleDbStorageVaultsRequest.serialize, + response_deserializer=exascale_db_storage_vault.ListExascaleDbStorageVaultsResponse.deserialize, + ) ) return self._stubs["list_exascale_db_storage_vaults"] @@ -1689,12 +1685,12 @@ def get_exascale_db_storage_vault( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_exascale_db_storage_vault" not in self._stubs: - self._stubs[ - "get_exascale_db_storage_vault" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/GetExascaleDbStorageVault", - request_serializer=exascale_db_storage_vault.GetExascaleDbStorageVaultRequest.serialize, - response_deserializer=exascale_db_storage_vault.ExascaleDbStorageVault.deserialize, + self._stubs["get_exascale_db_storage_vault"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/GetExascaleDbStorageVault", + request_serializer=exascale_db_storage_vault.GetExascaleDbStorageVaultRequest.serialize, + response_deserializer=exascale_db_storage_vault.ExascaleDbStorageVault.deserialize, + ) ) return self._stubs["get_exascale_db_storage_vault"] @@ -1721,12 +1717,12 @@ def create_exascale_db_storage_vault( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_exascale_db_storage_vault" not in self._stubs: - self._stubs[ - "create_exascale_db_storage_vault" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/CreateExascaleDbStorageVault", - request_serializer=gco_exascale_db_storage_vault.CreateExascaleDbStorageVaultRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_exascale_db_storage_vault"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/CreateExascaleDbStorageVault", + request_serializer=gco_exascale_db_storage_vault.CreateExascaleDbStorageVaultRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_exascale_db_storage_vault"] @@ -1753,12 +1749,12 @@ def delete_exascale_db_storage_vault( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_exascale_db_storage_vault" not in self._stubs: - self._stubs[ - "delete_exascale_db_storage_vault" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/DeleteExascaleDbStorageVault", - request_serializer=exascale_db_storage_vault.DeleteExascaleDbStorageVaultRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_exascale_db_storage_vault"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/DeleteExascaleDbStorageVault", + request_serializer=exascale_db_storage_vault.DeleteExascaleDbStorageVaultRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_exascale_db_storage_vault"] @@ -1786,12 +1782,12 @@ def list_db_system_initial_storage_sizes( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_db_system_initial_storage_sizes" not in self._stubs: - self._stubs[ - "list_db_system_initial_storage_sizes" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListDbSystemInitialStorageSizes", - request_serializer=db_system_initial_storage_size.ListDbSystemInitialStorageSizesRequest.serialize, - response_deserializer=db_system_initial_storage_size.ListDbSystemInitialStorageSizesResponse.deserialize, + self._stubs["list_db_system_initial_storage_sizes"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListDbSystemInitialStorageSizes", + request_serializer=db_system_initial_storage_size.ListDbSystemInitialStorageSizesRequest.serialize, + response_deserializer=db_system_initial_storage_size.ListDbSystemInitialStorageSizesResponse.deserialize, + ) ) return self._stubs["list_db_system_initial_storage_sizes"] @@ -2064,12 +2060,12 @@ def list_database_character_sets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_database_character_sets" not in self._stubs: - self._stubs[ - "list_database_character_sets" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListDatabaseCharacterSets", - request_serializer=database_character_set.ListDatabaseCharacterSetsRequest.serialize, - response_deserializer=database_character_set.ListDatabaseCharacterSetsResponse.deserialize, + self._stubs["list_database_character_sets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListDatabaseCharacterSets", + request_serializer=database_character_set.ListDatabaseCharacterSetsRequest.serialize, + response_deserializer=database_character_set.ListDatabaseCharacterSetsResponse.deserialize, + ) ) return self._stubs["list_database_character_sets"] diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/grpc_asyncio.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/grpc_asyncio.py index 00d9615caa28..ec859884611d 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/grpc_asyncio.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,37 +31,30 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.oracledatabase_v1.types import ( + autonomous_database, + database, + database_character_set, + db_system, db_system_initial_storage_size, db_version, exadata_infra, exadb_vm_cluster, -) -from google.cloud.oracledatabase_v1.types import ( - autonomous_database, - database, - database_character_set, -) -from google.cloud.oracledatabase_v1.types import ( + exascale_db_storage_vault, + minor_version, + odb_network, + odb_subnet, oracledatabase, pluggable_database, vm_cluster, ) +from google.cloud.oracledatabase_v1.types import db_system as gco_db_system from google.cloud.oracledatabase_v1.types import ( exascale_db_storage_vault as gco_exascale_db_storage_vault, ) -from google.cloud.oracledatabase_v1.types import db_system -from google.cloud.oracledatabase_v1.types import db_system as gco_db_system -from google.cloud.oracledatabase_v1.types import exascale_db_storage_vault -from google.cloud.oracledatabase_v1.types import minor_version -from google.cloud.oracledatabase_v1.types import odb_network from google.cloud.oracledatabase_v1.types import odb_network as gco_odb_network -from google.cloud.oracledatabase_v1.types import odb_subnet from google.cloud.oracledatabase_v1.types import odb_subnet as gco_odb_subnet from .base import DEFAULT_CLIENT_INFO, OracleDatabaseTransport @@ -398,12 +394,12 @@ def list_cloud_exadata_infrastructures( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_cloud_exadata_infrastructures" not in self._stubs: - self._stubs[ - "list_cloud_exadata_infrastructures" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListCloudExadataInfrastructures", - request_serializer=oracledatabase.ListCloudExadataInfrastructuresRequest.serialize, - response_deserializer=oracledatabase.ListCloudExadataInfrastructuresResponse.deserialize, + self._stubs["list_cloud_exadata_infrastructures"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListCloudExadataInfrastructures", + request_serializer=oracledatabase.ListCloudExadataInfrastructuresRequest.serialize, + response_deserializer=oracledatabase.ListCloudExadataInfrastructuresResponse.deserialize, + ) ) return self._stubs["list_cloud_exadata_infrastructures"] @@ -430,12 +426,12 @@ def get_cloud_exadata_infrastructure( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_cloud_exadata_infrastructure" not in self._stubs: - self._stubs[ - "get_cloud_exadata_infrastructure" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/GetCloudExadataInfrastructure", - request_serializer=oracledatabase.GetCloudExadataInfrastructureRequest.serialize, - response_deserializer=exadata_infra.CloudExadataInfrastructure.deserialize, + self._stubs["get_cloud_exadata_infrastructure"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/GetCloudExadataInfrastructure", + request_serializer=oracledatabase.GetCloudExadataInfrastructureRequest.serialize, + response_deserializer=exadata_infra.CloudExadataInfrastructure.deserialize, + ) ) return self._stubs["get_cloud_exadata_infrastructure"] @@ -463,12 +459,12 @@ def create_cloud_exadata_infrastructure( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_cloud_exadata_infrastructure" not in self._stubs: - self._stubs[ - "create_cloud_exadata_infrastructure" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/CreateCloudExadataInfrastructure", - request_serializer=oracledatabase.CreateCloudExadataInfrastructureRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_cloud_exadata_infrastructure"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/CreateCloudExadataInfrastructure", + request_serializer=oracledatabase.CreateCloudExadataInfrastructureRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_cloud_exadata_infrastructure"] @@ -495,12 +491,12 @@ def delete_cloud_exadata_infrastructure( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_cloud_exadata_infrastructure" not in self._stubs: - self._stubs[ - "delete_cloud_exadata_infrastructure" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/DeleteCloudExadataInfrastructure", - request_serializer=oracledatabase.DeleteCloudExadataInfrastructureRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_cloud_exadata_infrastructure"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/DeleteCloudExadataInfrastructure", + request_serializer=oracledatabase.DeleteCloudExadataInfrastructureRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_cloud_exadata_infrastructure"] @@ -881,12 +877,12 @@ def create_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_autonomous_database" not in self._stubs: - self._stubs[ - "create_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/CreateAutonomousDatabase", - request_serializer=oracledatabase.CreateAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/CreateAutonomousDatabase", + request_serializer=oracledatabase.CreateAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_autonomous_database"] @@ -913,12 +909,12 @@ def update_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_autonomous_database" not in self._stubs: - self._stubs[ - "update_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/UpdateAutonomousDatabase", - request_serializer=oracledatabase.UpdateAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/UpdateAutonomousDatabase", + request_serializer=oracledatabase.UpdateAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_autonomous_database"] @@ -944,12 +940,12 @@ def delete_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_autonomous_database" not in self._stubs: - self._stubs[ - "delete_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/DeleteAutonomousDatabase", - request_serializer=oracledatabase.DeleteAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/DeleteAutonomousDatabase", + request_serializer=oracledatabase.DeleteAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_autonomous_database"] @@ -975,12 +971,12 @@ def restore_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restore_autonomous_database" not in self._stubs: - self._stubs[ - "restore_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/RestoreAutonomousDatabase", - request_serializer=oracledatabase.RestoreAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["restore_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/RestoreAutonomousDatabase", + request_serializer=oracledatabase.RestoreAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["restore_autonomous_database"] @@ -1007,12 +1003,12 @@ def generate_autonomous_database_wallet( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "generate_autonomous_database_wallet" not in self._stubs: - self._stubs[ - "generate_autonomous_database_wallet" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/GenerateAutonomousDatabaseWallet", - request_serializer=oracledatabase.GenerateAutonomousDatabaseWalletRequest.serialize, - response_deserializer=oracledatabase.GenerateAutonomousDatabaseWalletResponse.deserialize, + self._stubs["generate_autonomous_database_wallet"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/GenerateAutonomousDatabaseWallet", + request_serializer=oracledatabase.GenerateAutonomousDatabaseWalletRequest.serialize, + response_deserializer=oracledatabase.GenerateAutonomousDatabaseWalletResponse.deserialize, + ) ) return self._stubs["generate_autonomous_database_wallet"] @@ -1039,12 +1035,12 @@ def list_autonomous_db_versions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_autonomous_db_versions" not in self._stubs: - self._stubs[ - "list_autonomous_db_versions" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListAutonomousDbVersions", - request_serializer=oracledatabase.ListAutonomousDbVersionsRequest.serialize, - response_deserializer=oracledatabase.ListAutonomousDbVersionsResponse.deserialize, + self._stubs["list_autonomous_db_versions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListAutonomousDbVersions", + request_serializer=oracledatabase.ListAutonomousDbVersionsRequest.serialize, + response_deserializer=oracledatabase.ListAutonomousDbVersionsResponse.deserialize, + ) ) return self._stubs["list_autonomous_db_versions"] @@ -1072,12 +1068,12 @@ def list_autonomous_database_character_sets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_autonomous_database_character_sets" not in self._stubs: - self._stubs[ - "list_autonomous_database_character_sets" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListAutonomousDatabaseCharacterSets", - request_serializer=oracledatabase.ListAutonomousDatabaseCharacterSetsRequest.serialize, - response_deserializer=oracledatabase.ListAutonomousDatabaseCharacterSetsResponse.deserialize, + self._stubs["list_autonomous_database_character_sets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListAutonomousDatabaseCharacterSets", + request_serializer=oracledatabase.ListAutonomousDatabaseCharacterSetsRequest.serialize, + response_deserializer=oracledatabase.ListAutonomousDatabaseCharacterSetsResponse.deserialize, + ) ) return self._stubs["list_autonomous_database_character_sets"] @@ -1105,12 +1101,12 @@ def list_autonomous_database_backups( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_autonomous_database_backups" not in self._stubs: - self._stubs[ - "list_autonomous_database_backups" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListAutonomousDatabaseBackups", - request_serializer=oracledatabase.ListAutonomousDatabaseBackupsRequest.serialize, - response_deserializer=oracledatabase.ListAutonomousDatabaseBackupsResponse.deserialize, + self._stubs["list_autonomous_database_backups"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListAutonomousDatabaseBackups", + request_serializer=oracledatabase.ListAutonomousDatabaseBackupsRequest.serialize, + response_deserializer=oracledatabase.ListAutonomousDatabaseBackupsResponse.deserialize, + ) ) return self._stubs["list_autonomous_database_backups"] @@ -1194,12 +1190,12 @@ def restart_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restart_autonomous_database" not in self._stubs: - self._stubs[ - "restart_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/RestartAutonomousDatabase", - request_serializer=oracledatabase.RestartAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["restart_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/RestartAutonomousDatabase", + request_serializer=oracledatabase.RestartAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["restart_autonomous_database"] @@ -1226,12 +1222,12 @@ def switchover_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "switchover_autonomous_database" not in self._stubs: - self._stubs[ - "switchover_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/SwitchoverAutonomousDatabase", - request_serializer=oracledatabase.SwitchoverAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["switchover_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/SwitchoverAutonomousDatabase", + request_serializer=oracledatabase.SwitchoverAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["switchover_autonomous_database"] @@ -1258,12 +1254,12 @@ def failover_autonomous_database( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "failover_autonomous_database" not in self._stubs: - self._stubs[ - "failover_autonomous_database" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/FailoverAutonomousDatabase", - request_serializer=oracledatabase.FailoverAutonomousDatabaseRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["failover_autonomous_database"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/FailoverAutonomousDatabase", + request_serializer=oracledatabase.FailoverAutonomousDatabaseRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["failover_autonomous_database"] @@ -1664,12 +1660,12 @@ def remove_virtual_machine_exadb_vm_cluster( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "remove_virtual_machine_exadb_vm_cluster" not in self._stubs: - self._stubs[ - "remove_virtual_machine_exadb_vm_cluster" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/RemoveVirtualMachineExadbVmCluster", - request_serializer=oracledatabase.RemoveVirtualMachineExadbVmClusterRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["remove_virtual_machine_exadb_vm_cluster"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/RemoveVirtualMachineExadbVmCluster", + request_serializer=oracledatabase.RemoveVirtualMachineExadbVmClusterRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["remove_virtual_machine_exadb_vm_cluster"] @@ -1697,12 +1693,12 @@ def list_exascale_db_storage_vaults( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_exascale_db_storage_vaults" not in self._stubs: - self._stubs[ - "list_exascale_db_storage_vaults" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListExascaleDbStorageVaults", - request_serializer=exascale_db_storage_vault.ListExascaleDbStorageVaultsRequest.serialize, - response_deserializer=exascale_db_storage_vault.ListExascaleDbStorageVaultsResponse.deserialize, + self._stubs["list_exascale_db_storage_vaults"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListExascaleDbStorageVaults", + request_serializer=exascale_db_storage_vault.ListExascaleDbStorageVaultsRequest.serialize, + response_deserializer=exascale_db_storage_vault.ListExascaleDbStorageVaultsResponse.deserialize, + ) ) return self._stubs["list_exascale_db_storage_vaults"] @@ -1728,12 +1724,12 @@ def get_exascale_db_storage_vault( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_exascale_db_storage_vault" not in self._stubs: - self._stubs[ - "get_exascale_db_storage_vault" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/GetExascaleDbStorageVault", - request_serializer=exascale_db_storage_vault.GetExascaleDbStorageVaultRequest.serialize, - response_deserializer=exascale_db_storage_vault.ExascaleDbStorageVault.deserialize, + self._stubs["get_exascale_db_storage_vault"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/GetExascaleDbStorageVault", + request_serializer=exascale_db_storage_vault.GetExascaleDbStorageVaultRequest.serialize, + response_deserializer=exascale_db_storage_vault.ExascaleDbStorageVault.deserialize, + ) ) return self._stubs["get_exascale_db_storage_vault"] @@ -1760,12 +1756,12 @@ def create_exascale_db_storage_vault( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_exascale_db_storage_vault" not in self._stubs: - self._stubs[ - "create_exascale_db_storage_vault" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/CreateExascaleDbStorageVault", - request_serializer=gco_exascale_db_storage_vault.CreateExascaleDbStorageVaultRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_exascale_db_storage_vault"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/CreateExascaleDbStorageVault", + request_serializer=gco_exascale_db_storage_vault.CreateExascaleDbStorageVaultRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_exascale_db_storage_vault"] @@ -1792,12 +1788,12 @@ def delete_exascale_db_storage_vault( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_exascale_db_storage_vault" not in self._stubs: - self._stubs[ - "delete_exascale_db_storage_vault" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/DeleteExascaleDbStorageVault", - request_serializer=exascale_db_storage_vault.DeleteExascaleDbStorageVaultRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_exascale_db_storage_vault"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/DeleteExascaleDbStorageVault", + request_serializer=exascale_db_storage_vault.DeleteExascaleDbStorageVaultRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_exascale_db_storage_vault"] @@ -1827,12 +1823,12 @@ def list_db_system_initial_storage_sizes( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_db_system_initial_storage_sizes" not in self._stubs: - self._stubs[ - "list_db_system_initial_storage_sizes" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListDbSystemInitialStorageSizes", - request_serializer=db_system_initial_storage_size.ListDbSystemInitialStorageSizesRequest.serialize, - response_deserializer=db_system_initial_storage_size.ListDbSystemInitialStorageSizesResponse.deserialize, + self._stubs["list_db_system_initial_storage_sizes"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListDbSystemInitialStorageSizes", + request_serializer=db_system_initial_storage_size.ListDbSystemInitialStorageSizesRequest.serialize, + response_deserializer=db_system_initial_storage_size.ListDbSystemInitialStorageSizesResponse.deserialize, + ) ) return self._stubs["list_db_system_initial_storage_sizes"] @@ -2113,12 +2109,12 @@ def list_database_character_sets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_database_character_sets" not in self._stubs: - self._stubs[ - "list_database_character_sets" - ] = self._logged_channel.unary_unary( - "/google.cloud.oracledatabase.v1.OracleDatabase/ListDatabaseCharacterSets", - request_serializer=database_character_set.ListDatabaseCharacterSetsRequest.serialize, - response_deserializer=database_character_set.ListDatabaseCharacterSetsResponse.deserialize, + self._stubs["list_database_character_sets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.oracledatabase.v1.OracleDatabase/ListDatabaseCharacterSets", + request_serializer=database_character_set.ListDatabaseCharacterSetsRequest.serialize, + response_deserializer=database_character_set.ListDatabaseCharacterSetsResponse.deserialize, + ) ) return self._stubs["list_database_character_sets"] diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/rest.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/rest.py index ae0770e72e95..797e2d0bf2b4 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/rest.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/rest.py @@ -16,46 +16,42 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version from google.cloud.oracledatabase_v1.types import ( + autonomous_database, + database, + database_character_set, + db_system, db_system_initial_storage_size, db_version, exadata_infra, exadb_vm_cluster, -) -from google.cloud.oracledatabase_v1.types import ( - autonomous_database, - database, - database_character_set, -) -from google.cloud.oracledatabase_v1.types import ( + exascale_db_storage_vault, + minor_version, + odb_network, + odb_subnet, oracledatabase, pluggable_database, vm_cluster, ) +from google.cloud.oracledatabase_v1.types import db_system as gco_db_system from google.cloud.oracledatabase_v1.types import ( exascale_db_storage_vault as gco_exascale_db_storage_vault, ) -from google.cloud.oracledatabase_v1.types import db_system -from google.cloud.oracledatabase_v1.types import db_system as gco_db_system -from google.cloud.oracledatabase_v1.types import exascale_db_storage_vault -from google.cloud.oracledatabase_v1.types import minor_version -from google.cloud.oracledatabase_v1.types import odb_network from google.cloud.oracledatabase_v1.types import odb_network as gco_odb_network -from google.cloud.oracledatabase_v1.types import odb_subnet from google.cloud.oracledatabase_v1.types import odb_subnet as gco_odb_subnet from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -3794,9 +3790,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseCreateAutonomousDatabase._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseCreateAutonomousDatabase._get_http_options() request, metadata = self._interceptor.pre_create_autonomous_database( request, metadata @@ -3822,7 +3816,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3951,15 +3945,12 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseCreateCloudExadataInfrastructure._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseCreateCloudExadataInfrastructure._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_cloud_exadata_infrastructure( - request, metadata + request, metadata = ( + self._interceptor.pre_create_cloud_exadata_infrastructure( + request, metadata + ) ) transcoded_request = _BaseOracleDatabaseRestTransport._BaseCreateCloudExadataInfrastructure._get_transcoded_request( http_options, request @@ -3982,7 +3973,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4023,11 +4014,10 @@ def __call__( resp = self._interceptor.post_create_cloud_exadata_infrastructure(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_cloud_exadata_infrastructure_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_cloud_exadata_infrastructure_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4111,9 +4101,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseCreateCloudVmCluster._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseCreateCloudVmCluster._get_http_options() request, metadata = self._interceptor.pre_create_cloud_vm_cluster( request, metadata @@ -4139,7 +4127,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4292,7 +4280,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4418,9 +4406,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseCreateExadbVmCluster._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseCreateExadbVmCluster._get_http_options() request, metadata = self._interceptor.pre_create_exadb_vm_cluster( request, metadata @@ -4446,7 +4432,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4573,9 +4559,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseCreateExascaleDbStorageVault._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseCreateExascaleDbStorageVault._get_http_options() request, metadata = self._interceptor.pre_create_exascale_db_storage_vault( request, metadata @@ -4601,7 +4585,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4644,11 +4628,10 @@ def __call__( resp = self._interceptor.post_create_exascale_db_storage_vault(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_exascale_db_storage_vault_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_exascale_db_storage_vault_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4731,9 +4714,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseCreateOdbNetwork._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseCreateOdbNetwork._get_http_options() request, metadata = self._interceptor.pre_create_odb_network( request, metadata @@ -4759,7 +4740,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4884,9 +4865,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseCreateOdbSubnet._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseCreateOdbSubnet._get_http_options() request, metadata = self._interceptor.pre_create_odb_subnet( request, metadata @@ -4912,7 +4891,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5038,9 +5017,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseDeleteAutonomousDatabase._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseDeleteAutonomousDatabase._get_http_options() request, metadata = self._interceptor.pre_delete_autonomous_database( request, metadata @@ -5062,7 +5039,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5189,15 +5166,12 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseDeleteCloudExadataInfrastructure._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseDeleteCloudExadataInfrastructure._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_delete_cloud_exadata_infrastructure( - request, metadata + request, metadata = ( + self._interceptor.pre_delete_cloud_exadata_infrastructure( + request, metadata + ) ) transcoded_request = _BaseOracleDatabaseRestTransport._BaseDeleteCloudExadataInfrastructure._get_transcoded_request( http_options, request @@ -5216,7 +5190,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5256,11 +5230,10 @@ def __call__( resp = self._interceptor.post_delete_cloud_exadata_infrastructure(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_cloud_exadata_infrastructure_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_cloud_exadata_infrastructure_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5343,9 +5316,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseDeleteCloudVmCluster._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseDeleteCloudVmCluster._get_http_options() request, metadata = self._interceptor.pre_delete_cloud_vm_cluster( request, metadata @@ -5367,7 +5338,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5514,7 +5485,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5638,9 +5609,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseDeleteExadbVmCluster._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseDeleteExadbVmCluster._get_http_options() request, metadata = self._interceptor.pre_delete_exadb_vm_cluster( request, metadata @@ -5662,7 +5631,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5788,9 +5757,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseDeleteExascaleDbStorageVault._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseDeleteExascaleDbStorageVault._get_http_options() request, metadata = self._interceptor.pre_delete_exascale_db_storage_vault( request, metadata @@ -5812,7 +5779,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5854,11 +5821,10 @@ def __call__( resp = self._interceptor.post_delete_exascale_db_storage_vault(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_exascale_db_storage_vault_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_exascale_db_storage_vault_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5940,9 +5906,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseDeleteOdbNetwork._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseDeleteOdbNetwork._get_http_options() request, metadata = self._interceptor.pre_delete_odb_network( request, metadata @@ -5964,7 +5928,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6087,9 +6051,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseDeleteOdbSubnet._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseDeleteOdbSubnet._get_http_options() request, metadata = self._interceptor.pre_delete_odb_subnet( request, metadata @@ -6111,7 +6073,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6238,9 +6200,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseFailoverAutonomousDatabase._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseFailoverAutonomousDatabase._get_http_options() request, metadata = self._interceptor.pre_failover_autonomous_database( request, metadata @@ -6266,7 +6226,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6392,15 +6352,12 @@ def __call__( The response for ``AutonomousDatabase.GenerateWallet``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseGenerateAutonomousDatabaseWallet._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseGenerateAutonomousDatabaseWallet._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_generate_autonomous_database_wallet( - request, metadata + request, metadata = ( + self._interceptor.pre_generate_autonomous_database_wallet( + request, metadata + ) ) transcoded_request = _BaseOracleDatabaseRestTransport._BaseGenerateAutonomousDatabaseWallet._get_transcoded_request( http_options, request @@ -6466,11 +6423,10 @@ def __call__( resp = self._interceptor.post_generate_autonomous_database_wallet(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_generate_autonomous_database_wallet_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_generate_autonomous_database_wallet_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6557,9 +6513,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseGetAutonomousDatabase._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseGetAutonomousDatabase._get_http_options() request, metadata = self._interceptor.pre_get_autonomous_database( request, metadata @@ -6710,9 +6664,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseGetCloudExadataInfrastructure._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseGetCloudExadataInfrastructure._get_http_options() request, metadata = self._interceptor.pre_get_cloud_exadata_infrastructure( request, metadata @@ -6776,11 +6728,10 @@ def __call__( resp = self._interceptor.post_get_cloud_exadata_infrastructure(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_cloud_exadata_infrastructure_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_cloud_exadata_infrastructure_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6864,9 +6815,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseGetCloudVmCluster._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseGetCloudVmCluster._get_http_options() request, metadata = self._interceptor.pre_get_cloud_vm_cluster( request, metadata @@ -7307,9 +7256,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseGetExadbVmCluster._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseGetExadbVmCluster._get_http_options() request, metadata = self._interceptor.pre_get_exadb_vm_cluster( request, metadata @@ -7458,9 +7405,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseGetExascaleDbStorageVault._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseGetExascaleDbStorageVault._get_http_options() request, metadata = self._interceptor.pre_get_exascale_db_storage_vault( request, metadata @@ -7526,11 +7471,10 @@ def __call__( resp = self._interceptor.post_get_exascale_db_storage_vault(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_exascale_db_storage_vault_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_exascale_db_storage_vault_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -7904,9 +7848,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseGetPluggableDatabase._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseGetPluggableDatabase._get_http_options() request, metadata = self._interceptor.pre_get_pluggable_database( request, metadata @@ -8054,9 +7996,7 @@ def __call__( The response for ``AutonomousDatabaseBackup.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListAutonomousDatabaseBackups._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListAutonomousDatabaseBackups._get_http_options() request, metadata = self._interceptor.pre_list_autonomous_database_backups( request, metadata @@ -8120,11 +8060,10 @@ def __call__( resp = self._interceptor.post_list_autonomous_database_backups(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_autonomous_database_backups_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_autonomous_database_backups_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8213,15 +8152,12 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListAutonomousDatabaseCharacterSets._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListAutonomousDatabaseCharacterSets._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_autonomous_database_character_sets( - request, metadata + request, metadata = ( + self._interceptor.pre_list_autonomous_database_character_sets( + request, metadata + ) ) transcoded_request = _BaseOracleDatabaseRestTransport._BaseListAutonomousDatabaseCharacterSets._get_transcoded_request( http_options, request @@ -8284,11 +8220,10 @@ def __call__( resp = self._interceptor.post_list_autonomous_database_character_sets(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_autonomous_database_character_sets_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_autonomous_database_character_sets_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8370,9 +8305,7 @@ def __call__( The response for ``AutonomousDatabase.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListAutonomousDatabases._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListAutonomousDatabases._get_http_options() request, metadata = self._interceptor.pre_list_autonomous_databases( request, metadata @@ -8522,9 +8455,7 @@ def __call__( The response for ``AutonomousDbVersion.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListAutonomousDbVersions._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListAutonomousDbVersions._get_http_options() request, metadata = self._interceptor.pre_list_autonomous_db_versions( request, metadata @@ -8676,15 +8607,12 @@ def __call__( The response for ``CloudExadataInfrastructures.list``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListCloudExadataInfrastructures._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListCloudExadataInfrastructures._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_cloud_exadata_infrastructures( - request, metadata + request, metadata = ( + self._interceptor.pre_list_cloud_exadata_infrastructures( + request, metadata + ) ) transcoded_request = _BaseOracleDatabaseRestTransport._BaseListCloudExadataInfrastructures._get_transcoded_request( http_options, request @@ -8745,11 +8673,10 @@ def __call__( resp = self._interceptor.post_list_cloud_exadata_infrastructures(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_cloud_exadata_infrastructures_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_cloud_exadata_infrastructures_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -8833,9 +8760,7 @@ def __call__( The response for ``CloudVmCluster.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListCloudVmClusters._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListCloudVmClusters._get_http_options() request, metadata = self._interceptor.pre_list_cloud_vm_clusters( request, metadata @@ -8983,9 +8908,7 @@ def __call__( The response for ``DatabaseCharacterSet.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListDatabaseCharacterSets._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListDatabaseCharacterSets._get_http_options() request, metadata = self._interceptor.pre_list_database_character_sets( request, metadata @@ -9571,15 +9494,12 @@ def __call__( The response for ``DbSystemInitialStorageSizes.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListDbSystemInitialStorageSizes._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListDbSystemInitialStorageSizes._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_db_system_initial_storage_sizes( - request, metadata + request, metadata = ( + self._interceptor.pre_list_db_system_initial_storage_sizes( + request, metadata + ) ) transcoded_request = _BaseOracleDatabaseRestTransport._BaseListDbSystemInitialStorageSizes._get_transcoded_request( http_options, request @@ -9644,11 +9564,10 @@ def __call__( resp = self._interceptor.post_list_db_system_initial_storage_sizes(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_db_system_initial_storage_sizes_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_db_system_initial_storage_sizes_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -9873,9 +9792,7 @@ def __call__( The response for ``DbSystemShape.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListDbSystemShapes._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListDbSystemShapes._get_http_options() request, metadata = self._interceptor.pre_list_db_system_shapes( request, metadata @@ -10169,9 +10086,7 @@ def __call__( The response for ``Entitlement.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListEntitlements._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListEntitlements._get_http_options() request, metadata = self._interceptor.pre_list_entitlements( request, metadata @@ -10318,9 +10233,7 @@ def __call__( The response for ``ExadbVmCluster.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListExadbVmClusters._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListExadbVmClusters._get_http_options() request, metadata = self._interceptor.pre_list_exadb_vm_clusters( request, metadata @@ -10468,9 +10381,7 @@ def __call__( The response for ``ExascaleDbStorageVault.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListExascaleDbStorageVaults._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListExascaleDbStorageVaults._get_http_options() request, metadata = self._interceptor.pre_list_exascale_db_storage_vaults( request, metadata @@ -10538,11 +10449,10 @@ def __call__( resp = self._interceptor.post_list_exascale_db_storage_vaults(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_exascale_db_storage_vaults_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_exascale_db_storage_vaults_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -10771,9 +10681,7 @@ def __call__( The response for ``MinorVersion.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListMinorVersions._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListMinorVersions._get_http_options() request, metadata = self._interceptor.pre_list_minor_versions( request, metadata @@ -10919,9 +10827,7 @@ def __call__( The response for ``OdbNetwork.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListOdbNetworks._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListOdbNetworks._get_http_options() request, metadata = self._interceptor.pre_list_odb_networks( request, metadata @@ -11216,9 +11122,7 @@ def __call__( The response for ``PluggableDatabase.List``. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseListPluggableDatabases._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseListPluggableDatabases._get_http_options() request, metadata = self._interceptor.pre_list_pluggable_databases( request, metadata @@ -11376,15 +11280,12 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseRemoveVirtualMachineExadbVmCluster._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseRemoveVirtualMachineExadbVmCluster._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_remove_virtual_machine_exadb_vm_cluster( - request, metadata + request, metadata = ( + self._interceptor.pre_remove_virtual_machine_exadb_vm_cluster( + request, metadata + ) ) transcoded_request = _BaseOracleDatabaseRestTransport._BaseRemoveVirtualMachineExadbVmCluster._get_transcoded_request( http_options, request @@ -11407,7 +11308,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11448,11 +11349,10 @@ def __call__( resp = self._interceptor.post_remove_virtual_machine_exadb_vm_cluster(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_remove_virtual_machine_exadb_vm_cluster_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_remove_virtual_machine_exadb_vm_cluster_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -11537,9 +11437,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseRestartAutonomousDatabase._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseRestartAutonomousDatabase._get_http_options() request, metadata = self._interceptor.pre_restart_autonomous_database( request, metadata @@ -11565,7 +11463,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11694,9 +11592,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseRestoreAutonomousDatabase._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseRestoreAutonomousDatabase._get_http_options() request, metadata = self._interceptor.pre_restore_autonomous_database( request, metadata @@ -11722,7 +11618,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -11850,9 +11746,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseStartAutonomousDatabase._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseStartAutonomousDatabase._get_http_options() request, metadata = self._interceptor.pre_start_autonomous_database( request, metadata @@ -11878,7 +11772,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12006,9 +11900,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseStopAutonomousDatabase._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseStopAutonomousDatabase._get_http_options() request, metadata = self._interceptor.pre_stop_autonomous_database( request, metadata @@ -12034,7 +11926,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12164,9 +12056,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseSwitchoverAutonomousDatabase._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseSwitchoverAutonomousDatabase._get_http_options() request, metadata = self._interceptor.pre_switchover_autonomous_database( request, metadata @@ -12192,7 +12082,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12235,11 +12125,10 @@ def __call__( resp = self._interceptor.post_switchover_autonomous_database(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_switchover_autonomous_database_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_switchover_autonomous_database_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -12324,9 +12213,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseUpdateAutonomousDatabase._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseUpdateAutonomousDatabase._get_http_options() request, metadata = self._interceptor.pre_update_autonomous_database( request, metadata @@ -12352,7 +12239,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12483,9 +12370,7 @@ def __call__( """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseUpdateExadbVmCluster._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseUpdateExadbVmCluster._get_http_options() request, metadata = self._interceptor.pre_update_exadb_vm_cluster( request, metadata @@ -12511,7 +12396,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -12586,7 +12471,9 @@ def create_autonomous_database( ]: # 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._CreateAutonomousDatabase(self._session, self._host, self._interceptor) # type: ignore + return self._CreateAutonomousDatabase( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_cloud_exadata_infrastructure( @@ -12597,7 +12484,9 @@ def create_cloud_exadata_infrastructure( ]: # 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._CreateCloudExadataInfrastructure(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCloudExadataInfrastructure( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_cloud_vm_cluster( @@ -12636,7 +12525,9 @@ def create_exascale_db_storage_vault( ]: # 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._CreateExascaleDbStorageVault(self._session, self._host, self._interceptor) # type: ignore + return self._CreateExascaleDbStorageVault( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_odb_network( @@ -12662,7 +12553,9 @@ def delete_autonomous_database( ]: # 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._DeleteAutonomousDatabase(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteAutonomousDatabase( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_cloud_exadata_infrastructure( @@ -12673,7 +12566,9 @@ def delete_cloud_exadata_infrastructure( ]: # 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._DeleteCloudExadataInfrastructure(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCloudExadataInfrastructure( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_cloud_vm_cluster( @@ -12712,7 +12607,9 @@ def delete_exascale_db_storage_vault( ]: # 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._DeleteExascaleDbStorageVault(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteExascaleDbStorageVault( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_odb_network( @@ -12738,7 +12635,9 @@ def failover_autonomous_database( ]: # 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._FailoverAutonomousDatabase(self._session, self._host, self._interceptor) # type: ignore + return self._FailoverAutonomousDatabase( + self._session, self._host, self._interceptor + ) # type: ignore @property def generate_autonomous_database_wallet( @@ -12749,7 +12648,9 @@ def generate_autonomous_database_wallet( ]: # 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._GenerateAutonomousDatabaseWallet(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateAutonomousDatabaseWallet( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_autonomous_database( @@ -12771,7 +12672,9 @@ def get_cloud_exadata_infrastructure( ]: # 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._GetCloudExadataInfrastructure(self._session, self._host, self._interceptor) # type: ignore + return self._GetCloudExadataInfrastructure( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_cloud_vm_cluster( @@ -12816,7 +12719,9 @@ def get_exascale_db_storage_vault( ]: # 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._GetExascaleDbStorageVault(self._session, self._host, self._interceptor) # type: ignore + return self._GetExascaleDbStorageVault( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_odb_network( @@ -12854,7 +12759,9 @@ def list_autonomous_database_backups( ]: # 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._ListAutonomousDatabaseBackups(self._session, self._host, self._interceptor) # type: ignore + return self._ListAutonomousDatabaseBackups( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_autonomous_database_character_sets( @@ -12865,7 +12772,9 @@ def list_autonomous_database_character_sets( ]: # 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._ListAutonomousDatabaseCharacterSets(self._session, self._host, self._interceptor) # type: ignore + return self._ListAutonomousDatabaseCharacterSets( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_autonomous_databases( @@ -12876,7 +12785,9 @@ def list_autonomous_databases( ]: # 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._ListAutonomousDatabases(self._session, self._host, self._interceptor) # type: ignore + return self._ListAutonomousDatabases( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_autonomous_db_versions( @@ -12887,7 +12798,9 @@ def list_autonomous_db_versions( ]: # 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._ListAutonomousDbVersions(self._session, self._host, self._interceptor) # type: ignore + return self._ListAutonomousDbVersions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_cloud_exadata_infrastructures( @@ -12898,7 +12811,9 @@ def list_cloud_exadata_infrastructures( ]: # 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._ListCloudExadataInfrastructures(self._session, self._host, self._interceptor) # type: ignore + return self._ListCloudExadataInfrastructures( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_cloud_vm_clusters( @@ -12920,7 +12835,9 @@ def list_database_character_sets( ]: # 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._ListDatabaseCharacterSets(self._session, self._host, self._interceptor) # type: ignore + return self._ListDatabaseCharacterSets( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_databases( @@ -12959,7 +12876,9 @@ def list_db_system_initial_storage_sizes( ]: # 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._ListDbSystemInitialStorageSizes(self._session, self._host, self._interceptor) # type: ignore + return self._ListDbSystemInitialStorageSizes( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_db_systems( @@ -13021,7 +12940,9 @@ def list_exascale_db_storage_vaults( ]: # 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._ListExascaleDbStorageVaults(self._session, self._host, self._interceptor) # type: ignore + return self._ListExascaleDbStorageVaults( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_gi_versions( @@ -13073,7 +12994,9 @@ def list_pluggable_databases( ]: # 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._ListPluggableDatabases(self._session, self._host, self._interceptor) # type: ignore + return self._ListPluggableDatabases( + self._session, self._host, self._interceptor + ) # type: ignore @property def remove_virtual_machine_exadb_vm_cluster( @@ -13084,7 +13007,9 @@ def remove_virtual_machine_exadb_vm_cluster( ]: # 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._RemoveVirtualMachineExadbVmCluster(self._session, self._host, self._interceptor) # type: ignore + return self._RemoveVirtualMachineExadbVmCluster( + self._session, self._host, self._interceptor + ) # type: ignore @property def restart_autonomous_database( @@ -13094,7 +13019,9 @@ def restart_autonomous_database( ]: # 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._RestartAutonomousDatabase(self._session, self._host, self._interceptor) # type: ignore + return self._RestartAutonomousDatabase( + self._session, self._host, self._interceptor + ) # type: ignore @property def restore_autonomous_database( @@ -13104,7 +13031,9 @@ def restore_autonomous_database( ]: # 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._RestoreAutonomousDatabase(self._session, self._host, self._interceptor) # type: ignore + return self._RestoreAutonomousDatabase( + self._session, self._host, self._interceptor + ) # type: ignore @property def start_autonomous_database( @@ -13114,7 +13043,9 @@ def start_autonomous_database( ]: # 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._StartAutonomousDatabase(self._session, self._host, self._interceptor) # type: ignore + return self._StartAutonomousDatabase( + self._session, self._host, self._interceptor + ) # type: ignore @property def stop_autonomous_database( @@ -13124,7 +13055,9 @@ def stop_autonomous_database( ]: # 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._StopAutonomousDatabase(self._session, self._host, self._interceptor) # type: ignore + return self._StopAutonomousDatabase( + self._session, self._host, self._interceptor + ) # type: ignore @property def switchover_autonomous_database( @@ -13134,7 +13067,9 @@ def switchover_autonomous_database( ]: # 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._SwitchoverAutonomousDatabase(self._session, self._host, self._interceptor) # type: ignore + return self._SwitchoverAutonomousDatabase( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_autonomous_database( @@ -13144,7 +13079,9 @@ def update_autonomous_database( ]: # 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._UpdateAutonomousDatabase(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateAutonomousDatabase( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_exadb_vm_cluster( @@ -13491,9 +13428,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -13610,9 +13545,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseOracleDatabaseRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseOracleDatabaseRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/rest_base.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/rest_base.py index 89a149ddc106..59b8c1cef0ec 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/rest_base.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/services/oracle_database/transports/rest_base.py @@ -23,31 +23,27 @@ from google.protobuf import json_format from google.cloud.oracledatabase_v1.types import ( + autonomous_database, + database, + database_character_set, + db_system, db_system_initial_storage_size, db_version, exadata_infra, exadb_vm_cluster, -) -from google.cloud.oracledatabase_v1.types import ( - autonomous_database, - database, - database_character_set, -) -from google.cloud.oracledatabase_v1.types import ( + exascale_db_storage_vault, + minor_version, + odb_network, + odb_subnet, oracledatabase, pluggable_database, vm_cluster, ) +from google.cloud.oracledatabase_v1.types import db_system as gco_db_system from google.cloud.oracledatabase_v1.types import ( exascale_db_storage_vault as gco_exascale_db_storage_vault, ) -from google.cloud.oracledatabase_v1.types import db_system -from google.cloud.oracledatabase_v1.types import db_system as gco_db_system -from google.cloud.oracledatabase_v1.types import exascale_db_storage_vault -from google.cloud.oracledatabase_v1.types import minor_version -from google.cloud.oracledatabase_v1.types import odb_network from google.cloud.oracledatabase_v1.types import odb_network as gco_odb_network -from google.cloud.oracledatabase_v1.types import odb_subnet from google.cloud.oracledatabase_v1.types import odb_subnet as gco_odb_subnet from .base import DEFAULT_CLIENT_INFO, OracleDatabaseTransport diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/__init__.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/__init__.py index 00d55ee5dc0d..9f165e8c7035 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/__init__.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/__init__.py @@ -31,12 +31,16 @@ SourceConfig, State, ) -from .autonomous_database_character_set import AutonomousDatabaseCharacterSet +from .autonomous_database_character_set import ( + AutonomousDatabaseCharacterSet, +) from .autonomous_db_backup import ( AutonomousDatabaseBackup, AutonomousDatabaseBackupProperties, ) -from .autonomous_db_version import AutonomousDbVersion +from .autonomous_db_version import ( + AutonomousDbVersion, +) from .common import ( ComputeModel, CustomerContact, @@ -56,8 +60,14 @@ ListDatabaseCharacterSetsRequest, ListDatabaseCharacterSetsResponse, ) -from .db_node import DbNode, DbNodeProperties -from .db_server import DbServer, DbServerProperties +from .db_node import ( + DbNode, + DbNodeProperties, +) +from .db_server import ( + DbServer, + DbServerProperties, +) from .db_system import ( CreateDbSystemRequest, DataCollectionOptionsDbSystem, @@ -77,14 +87,19 @@ ListDbSystemInitialStorageSizesResponse, StorageSizeDetails, ) -from .db_system_shape import DbSystemShape +from .db_system_shape import ( + DbSystemShape, +) from .db_version import ( DbVersion, DbVersionProperties, ListDbVersionsRequest, ListDbVersionsResponse, ) -from .entitlement import CloudAccountDetails, Entitlement +from .entitlement import ( + CloudAccountDetails, + Entitlement, +) from .exadata_infra import ( CloudExadataInfrastructure, CloudExadataInfrastructureProperties, @@ -105,8 +120,12 @@ ListExascaleDbStorageVaultsRequest, ListExascaleDbStorageVaultsResponse, ) -from .gi_version import GiVersion -from .location_metadata import LocationMetadata +from .gi_version import ( + GiVersion, +) +from .location_metadata import ( + LocationMetadata, +) from .minor_version import ( ListMinorVersionsRequest, ListMinorVersionsResponse, @@ -188,7 +207,11 @@ PluggableDatabaseNodeLevelDetails, PluggableDatabaseProperties, ) -from .vm_cluster import CloudVmCluster, CloudVmClusterProperties, DataCollectionOptions +from .vm_cluster import ( + CloudVmCluster, + CloudVmClusterProperties, + DataCollectionOptions, +) __all__ = ( "AllConnectionStrings", diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/autonomous_database.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/autonomous_database.py index 75e1a65b8099..8e7e0125c15c 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/autonomous_database.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/autonomous_database.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore from google.cloud.oracledatabase_v1.types import common @@ -61,6 +61,7 @@ class GenerateType(proto.Enum): Used to generate wallet for a single database. """ + GENERATE_TYPE_UNSPECIFIED = 0 ALL = 1 SINGLE = 2 @@ -136,6 +137,7 @@ class State(proto.Enum): Indicates that the Autonomous Database is in standby state. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 AVAILABLE = 2 @@ -182,6 +184,7 @@ class OperationsInsightsState(proto.Enum): Failed disabling status for operation insights. """ + OPERATIONS_INSIGHTS_STATE_UNSPECIFIED = 0 ENABLING = 1 ENABLED = 2 @@ -208,6 +211,7 @@ class DBWorkload(proto.Enum): Autonomous Database with the Oracle APEX Application Development workload type. """ + DB_WORKLOAD_UNSPECIFIED = 0 OLTP = 1 DW = 2 @@ -612,6 +616,7 @@ class DatabaseEdition(proto.Enum): ENTERPRISE_EDITION (2): Enterprise Database Edition """ + DATABASE_EDITION_UNSPECIFIED = 0 STANDARD_EDITION = 1 ENTERPRISE_EDITION = 2 @@ -627,6 +632,7 @@ class LicenseType(proto.Enum): BRING_YOUR_OWN_LICENSE (2): Bring your own license """ + LICENSE_TYPE_UNSPECIFIED = 0 LICENSE_INCLUDED = 1 BRING_YOUR_OWN_LICENSE = 2 @@ -646,6 +652,7 @@ class MaintenanceScheduleType(proto.Enum): A REGULAR maintenance schedule follows the normal maintenance cycle. """ + MAINTENANCE_SCHEDULE_TYPE_UNSPECIFIED = 0 EARLY = 1 REGULAR = 2 @@ -662,6 +669,7 @@ class LocalDisasterRecoveryType(proto.Enum): BACKUP_BASED (2): Backup based recovery. """ + LOCAL_DISASTER_RECOVERY_TYPE_UNSPECIFIED = 0 ADG = 1 BACKUP_BASED = 2 @@ -684,6 +692,7 @@ class DataSafeState(proto.Enum): FAILED (5): Failed data safe state. """ + DATA_SAFE_STATE_UNSPECIFIED = 0 REGISTERING = 1 REGISTERED = 2 @@ -711,6 +720,7 @@ class DatabaseManagementState(proto.Enum): FAILED_DISABLING (6): Failed disabling Database Management state """ + DATABASE_MANAGEMENT_STATE_UNSPECIFIED = 0 ENABLING = 1 ENABLED = 2 @@ -730,6 +740,7 @@ class OpenMode(proto.Enum): READ_WRITE (2): Read Write Mode """ + OPEN_MODE_UNSPECIFIED = 0 READ_ONLY = 1 READ_WRITE = 2 @@ -746,6 +757,7 @@ class PermissionLevel(proto.Enum): UNRESTRICTED (2): Normal access. """ + PERMISSION_LEVEL_UNSPECIFIED = 0 RESTRICTED = 1 UNRESTRICTED = 2 @@ -765,6 +777,7 @@ class RefreshableMode(proto.Enum): manually refreshed with data from the source Autonomous Database. """ + REFRESHABLE_MODE_UNSPECIFIED = 0 AUTOMATIC = 1 MANUAL = 2 @@ -780,6 +793,7 @@ class RefreshableState(proto.Enum): NOT_REFRESHING (2): Not refreshed """ + REFRESHABLE_STATE_UNSPECIFIED = 0 REFRESHING = 1 NOT_REFRESHING = 2 @@ -801,6 +815,7 @@ class Role(proto.Enum): SNAPSHOT_STANDBY (5): Snapshot standby role """ + ROLE_UNSPECIFIED = 0 PRIMARY = 1 STANDBY = 2 @@ -1021,12 +1036,12 @@ class Role(proto.Enum): number=48, enum=Role, ) - scheduled_operation_details: MutableSequence[ - "ScheduledOperationDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=64, - message="ScheduledOperationDetails", + scheduled_operation_details: MutableSequence["ScheduledOperationDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=64, + message="ScheduledOperationDetails", + ) ) sql_web_developer_url: str = proto.Field( proto.STRING, @@ -1082,12 +1097,12 @@ class Role(proto.Enum): number=68, message="EncryptionKey", ) - encryption_key_history_entries: MutableSequence[ - "EncryptionKeyHistoryEntry" - ] = proto.RepeatedField( - proto.MESSAGE, - number=69, - message="EncryptionKeyHistoryEntry", + encryption_key_history_entries: MutableSequence["EncryptionKeyHistoryEntry"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=69, + message="EncryptionKeyHistoryEntry", + ) ) service_agent_email: str = proto.Field( proto.STRING, @@ -1147,6 +1162,7 @@ class Provider(proto.Enum): ORACLE_MANAGED (2): Oracle Managed. """ + PROVIDER_UNSPECIFIED = 0 GOOGLE_MANAGED = 1 ORACLE_MANAGED = 2 @@ -1298,6 +1314,7 @@ class ConsumerGroup(proto.Enum): TPURGENT (5): TPURGENT consumer group. """ + CONSUMER_GROUP_UNSPECIFIED = 0 HIGH = 1 MEDIUM = 2 @@ -1316,6 +1333,7 @@ class HostFormat(proto.Enum): IP (2): IP """ + HOST_FORMAT_UNSPECIFIED = 0 FQDN = 1 IP = 2 @@ -1331,6 +1349,7 @@ class Protocol(proto.Enum): TCPS (2): Tcps """ + PROTOCOL_UNSPECIFIED = 0 TCP = 1 TCPS = 2 @@ -1346,6 +1365,7 @@ class SessionMode(proto.Enum): INDIRECT (2): Indirect """ + SESSION_MODE_UNSPECIFIED = 0 DIRECT = 1 INDIRECT = 2 @@ -1363,6 +1383,7 @@ class SyntaxFormat(proto.Enum): EZCONNECTPLUS (3): Ezconnectplus """ + SYNTAX_FORMAT_UNSPECIFIED = 0 LONG = 1 EZCONNECT = 2 @@ -1380,6 +1401,7 @@ class TLSAuthentication(proto.Enum): MUTUAL (2): Mutual """ + TLS_AUTHENTICATION_UNSPECIFIED = 0 SERVER = 1 MUTUAL = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/autonomous_database_character_set.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/autonomous_database_character_set.py index f3f987f56c00..2a37aa1b1335 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/autonomous_database_character_set.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/autonomous_database_character_set.py @@ -56,6 +56,7 @@ class CharacterSetType(proto.Enum): NATIONAL (2): Character set type is set to national. """ + CHARACTER_SET_TYPE_UNSPECIFIED = 0 DATABASE = 1 NATIONAL = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/autonomous_db_backup.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/autonomous_db_backup.py index 13c1cd72fc64..a9c4a7513061 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/autonomous_db_backup.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/autonomous_db_backup.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -173,6 +173,7 @@ class State(proto.Enum): Indicates that the resource is in updating state. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -194,6 +195,7 @@ class Type(proto.Enum): LONG_TERM (3): Long term backups. """ + TYPE_UNSPECIFIED = 0 INCREMENTAL = 1 FULL = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/common.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/common.py index 02d089fa4f18..f3947f105196 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/common.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/common.py @@ -46,6 +46,7 @@ class ComputeModel(proto.Enum): Physical measure of compute resources. OCPUs are based on the physical core of a processor. """ + COMPUTE_MODEL_UNSPECIFIED = 0 COMPUTE_MODEL_ECPU = 1 COMPUTE_MODEL_OCPU = 2 @@ -101,6 +102,7 @@ class ConnectionState(proto.Enum): The identity pool connection is in an unknown state. """ + CONNECTION_STATE_UNSPECIFIED = 0 CONNECTED = 1 PARTIALLY_CONNECTED = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/database.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/database.py index a392586587db..fc702f90724a 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/database.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/database.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore import proto # type: ignore from google.cloud.oracledatabase_v1.types import pluggable_database @@ -112,6 +112,7 @@ class OperationsInsightsStatus(proto.Enum): Indicates that the operations insights failed to disable. """ + OPERATIONS_INSIGHTS_STATUS_UNSPECIFIED = 0 ENABLING = 1 ENABLED = 2 @@ -232,6 +233,7 @@ class DatabaseLifecycleState(proto.Enum): Indicates that the resource is in failed state. """ + DATABASE_LIFECYCLE_STATE_UNSPECIFIED = 0 PROVISIONING = 1 AVAILABLE = 2 @@ -320,6 +322,7 @@ class BackupDestinationType(proto.Enum): DBRS (5): Backup destination type is DBRS. """ + BACKUP_DESTINATION_TYPE_UNSPECIFIED = 0 NFS = 1 RECOVERY_APPLIANCE = 2 @@ -359,6 +362,7 @@ class BackupWindow(proto.Enum): SLOT_TWELVE (12): 10:00 PM - 12:00 AM """ + BACKUP_WINDOW_UNSPECIFIED = 0 SLOT_ONE = 1 SLOT_TWO = 2 @@ -387,6 +391,7 @@ class BackupDeletionPolicy(proto.Enum): Keeps the backups as per the policy defined for database backups. """ + BACKUP_DELETION_POLICY_UNSPECIFIED = 0 DELETE_IMMEDIATELY = 1 DELETE_AFTER_RETENTION_PERIOD = 2 @@ -410,12 +415,12 @@ class BackupDestinationDetails(proto.Message): proto.BOOL, number=1, ) - backup_destination_details: MutableSequence[ - BackupDestinationDetails - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=BackupDestinationDetails, + backup_destination_details: MutableSequence[BackupDestinationDetails] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=BackupDestinationDetails, + ) ) retention_period_days: int = proto.Field( proto.INT32, diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/database_character_set.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/database_character_set.py index a56e414b718b..729c40ac7761 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/database_character_set.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/database_character_set.py @@ -56,6 +56,7 @@ class CharacterSetType(proto.Enum): NATIONAL (2): Character set type is set to national. """ + CHARACTER_SET_TYPE_UNSPECIFIED = 0 DATABASE = 1 NATIONAL = 2 @@ -139,12 +140,12 @@ class ListDatabaseCharacterSetsResponse(proto.Message): def raw_page(self): return self - database_character_sets: MutableSequence[ - "DatabaseCharacterSet" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="DatabaseCharacterSet", + database_character_sets: MutableSequence["DatabaseCharacterSet"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="DatabaseCharacterSet", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_node.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_node.py index e8a0dbffb594..281819972179 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_node.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_node.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -113,6 +113,7 @@ class State(proto.Enum): Indicates that the resource is in failed state. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 AVAILABLE = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_server.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_server.py index 52630f7e40ed..70ff8c62c4f5 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_server.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_server.py @@ -110,6 +110,7 @@ class State(proto.Enum): Indicates that the resource is in deleted state. """ + STATE_UNSPECIFIED = 0 CREATING = 1 AVAILABLE = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_system.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_system.py index 110d3842bb27..528c51d89525 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_system.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_system.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore import proto # type: ignore from google.cloud.oracledatabase_v1.types import database as gco_database @@ -200,6 +200,7 @@ class DbSystemDatabaseEdition(proto.Enum): ENTERPRISE_EDITION_HIGH_PERFORMANCE (3): The database edition is Enterprise Edition. """ + DB_SYSTEM_DATABASE_EDITION_UNSPECIFIED = 0 STANDARD_EDITION = 1 ENTERPRISE_EDITION = 2 @@ -216,6 +217,7 @@ class LicenseModel(proto.Enum): BRING_YOUR_OWN_LICENSE (2): The license model is bring your own license. """ + LICENSE_MODEL_UNSPECIFIED = 0 LICENSE_INCLUDED = 1 BRING_YOUR_OWN_LICENSE = 2 @@ -255,6 +257,7 @@ class DbSystemLifecycleState(proto.Enum): UPGRADING (10): Indicates that the resource is upgrading. """ + DB_SYSTEM_LIFECYCLE_STATE_UNSPECIFIED = 0 PROVISIONING = 1 AVAILABLE = 2 @@ -278,6 +281,7 @@ class ComputeModel(proto.Enum): OCPU (2): The compute model is physical. """ + COMPUTE_MODEL_UNSPECIFIED = 0 ECPU = 1 OCPU = 2 @@ -418,6 +422,7 @@ class StorageManagement(proto.Enum): LVM (2): Logical Volume management. """ + STORAGE_MANAGEMENT_UNSPECIFIED = 0 ASM = 1 LVM = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_system_initial_storage_size.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_system_initial_storage_size.py index 4af1a31a0dab..6c8b4638b680 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_system_initial_storage_size.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/db_system_initial_storage_size.py @@ -80,6 +80,7 @@ class StorageManagement(proto.Enum): LVM (2): Logical Volume Management. """ + STORAGE_MANAGEMENT_UNSPECIFIED = 0 ASM = 1 LVM = 2 @@ -93,6 +94,7 @@ class ShapeType(proto.Enum): STANDARD_X86 (1): Standard X86. """ + SHAPE_TYPE_UNSPECIFIED = 0 STANDARD_X86 = 1 @@ -111,12 +113,12 @@ class ShapeType(proto.Enum): number=3, message="StorageSizeDetails", ) - launch_from_backup_storage_size_details: MutableSequence[ - "StorageSizeDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="StorageSizeDetails", + launch_from_backup_storage_size_details: MutableSequence["StorageSizeDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="StorageSizeDetails", + ) ) @@ -195,12 +197,12 @@ class ListDbSystemInitialStorageSizesResponse(proto.Message): def raw_page(self): return self - db_system_initial_storage_sizes: MutableSequence[ - "DbSystemInitialStorageSize" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="DbSystemInitialStorageSize", + db_system_initial_storage_sizes: MutableSequence["DbSystemInitialStorageSize"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="DbSystemInitialStorageSize", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/entitlement.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/entitlement.py index 118e3ce6b88d..c093251591a7 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/entitlement.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/entitlement.py @@ -63,6 +63,7 @@ class State(proto.Enum): Entitlement is not approved in private marketplace. """ + STATE_UNSPECIFIED = 0 ACCOUNT_NOT_LINKED = 1 ACCOUNT_NOT_ACTIVE = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exadata_infra.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exadata_infra.py index 1c7e1d1dff01..a5b6393cb382 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exadata_infra.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exadata_infra.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import month_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.month_pb2 as month_pb2 # type: ignore import proto # type: ignore from google.cloud.oracledatabase_v1.types import common @@ -225,6 +225,7 @@ class State(proto.Enum): MAINTENANCE_IN_PROGRESS (7): The Exadata Infrastructure is in maintenance. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 AVAILABLE = 2 @@ -426,6 +427,7 @@ class MaintenanceWindowPreference(proto.Enum): NO_PREFERENCE (2): No preference. """ + MAINTENANCE_WINDOW_PREFERENCE_UNSPECIFIED = 0 CUSTOM_PREFERENCE = 1 NO_PREFERENCE = 2 @@ -444,6 +446,7 @@ class PatchingMode(proto.Enum): updates your storage servers at the same time, then your database servers at the same time. """ + PATCHING_MODE_UNSPECIFIED = 0 ROLLING = 1 NON_ROLLING = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exadb_vm_cluster.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exadb_vm_cluster.py index b76f7238ffce..c61fa27d2526 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exadb_vm_cluster.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exadb_vm_cluster.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore import proto # type: ignore from google.cloud.oracledatabase_v1.types import common @@ -232,6 +232,7 @@ class LicenseModel(proto.Enum): BRING_YOUR_OWN_LICENSE (2): Bring your own license. """ + LICENSE_MODEL_UNSPECIFIED = 0 LICENSE_INCLUDED = 1 BRING_YOUR_OWN_LICENSE = 2 @@ -264,6 +265,7 @@ class ExadbVmClusterLifecycleState(proto.Enum): Indicates that the resource is in maintenance in progress state. """ + EXADB_VM_CLUSTER_LIFECYCLE_STATE_UNSPECIFIED = 0 PROVISIONING = 1 AVAILABLE = 2 @@ -288,6 +290,7 @@ class ShapeAttribute(proto.Enum): Indicates that the resource is in block storage. """ + SHAPE_ATTRIBUTE_UNSPECIFIED = 0 SMART_STORAGE = 1 BLOCK_STORAGE = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exascale_db_storage_vault.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exascale_db_storage_vault.py index c7efff98917f..74a0bfd65774 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exascale_db_storage_vault.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/exascale_db_storage_vault.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -167,6 +167,7 @@ class State(proto.Enum): FAILED (6): The ExascaleDbStorageVault has failed. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 AVAILABLE = 2 @@ -189,6 +190,7 @@ class ShapeAttribute(proto.Enum): Indicates that the resource is in block storage. """ + SHAPE_ATTRIBUTE_UNSPECIFIED = 0 SMART_STORAGE = 1 BLOCK_STORAGE = 2 @@ -350,12 +352,12 @@ class ListExascaleDbStorageVaultsResponse(proto.Message): def raw_page(self): return self - exascale_db_storage_vaults: MutableSequence[ - "ExascaleDbStorageVault" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ExascaleDbStorageVault", + exascale_db_storage_vaults: MutableSequence["ExascaleDbStorageVault"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ExascaleDbStorageVault", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/odb_network.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/odb_network.py index cd1a9ec8866c..fbeb62aa0eeb 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/odb_network.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/odb_network.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -82,6 +82,7 @@ class State(proto.Enum): Indicates that the resource is in failed state. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 AVAILABLE = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/odb_subnet.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/odb_subnet.py index 2295638104b9..4e20a664a31e 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/odb_subnet.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/odb_subnet.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -66,6 +66,7 @@ class Purpose(proto.Enum): BACKUP_SUBNET (2): Subnet to be used for backup. """ + PURPOSE_UNSPECIFIED = 0 CLIENT_SUBNET = 1 BACKUP_SUBNET = 2 @@ -89,6 +90,7 @@ class State(proto.Enum): Indicates that the resource is in failed state. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 AVAILABLE = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/oracledatabase.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/oracledatabase.py index 1f6eaed4819b..a1308448676d 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/oracledatabase.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/oracledatabase.py @@ -17,10 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.oracledatabase_v1.types import ( + autonomous_database as gco_autonomous_database, +) from google.cloud.oracledatabase_v1.types import ( autonomous_database_character_set, autonomous_db_backup, @@ -30,14 +33,12 @@ db_system_shape, entitlement, exadata_infra, -) -from google.cloud.oracledatabase_v1.types import ( - autonomous_database as gco_autonomous_database, + gi_version, + vm_cluster, ) from google.cloud.oracledatabase_v1.types import ( exadb_vm_cluster as gco_exadb_vm_cluster, ) -from google.cloud.oracledatabase_v1.types import gi_version, vm_cluster __protobuf__ = proto.module( package="google.cloud.oracledatabase.v1", @@ -748,12 +749,12 @@ class ListDbSystemShapesResponse(proto.Message): def raw_page(self): return self - db_system_shapes: MutableSequence[ - db_system_shape.DbSystemShape - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=db_system_shape.DbSystemShape, + db_system_shapes: MutableSequence[db_system_shape.DbSystemShape] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=db_system_shape.DbSystemShape, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1593,12 +1594,12 @@ class ListExadbVmClustersResponse(proto.Message): def raw_page(self): return self - exadb_vm_clusters: MutableSequence[ - gco_exadb_vm_cluster.ExadbVmCluster - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gco_exadb_vm_cluster.ExadbVmCluster, + exadb_vm_clusters: MutableSequence[gco_exadb_vm_cluster.ExadbVmCluster] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gco_exadb_vm_cluster.ExadbVmCluster, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/pluggable_database.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/pluggable_database.py index e149f4160d00..49ca7d8514f5 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/pluggable_database.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/pluggable_database.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -155,6 +155,7 @@ class PluggableDatabaseLifecycleState(proto.Enum): DISABLED (13): The pluggable database is disabled. """ + PLUGGABLE_DATABASE_LIFECYCLE_STATE_UNSPECIFIED = 0 PROVISIONING = 1 AVAILABLE = 2 @@ -189,6 +190,7 @@ class OperationsInsightsState(proto.Enum): FAILED_DISABLING (6): Operations Insights failed to disable. """ + OPERATIONS_INSIGHTS_STATE_UNSPECIFIED = 0 ENABLING = 1 ENABLED = 2 @@ -256,12 +258,12 @@ class DefinedTagValue(proto.Message): proto.STRING, number=10, ) - pdb_node_level_details: MutableSequence[ - "PluggableDatabaseNodeLevelDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=11, - message="PluggableDatabaseNodeLevelDetails", + pdb_node_level_details: MutableSequence["PluggableDatabaseNodeLevelDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=11, + message="PluggableDatabaseNodeLevelDetails", + ) ) database_management_config: "DatabaseManagementConfig" = proto.Field( proto.MESSAGE, @@ -337,6 +339,7 @@ class PluggableDatabaseOpenMode(proto.Enum): MIGRATE (4): The pluggable database is migrated. """ + PLUGGABLE_DATABASE_OPEN_MODE_UNSPECIFIED = 0 READ_ONLY = 1 READ_WRITE = 2 @@ -395,6 +398,7 @@ class ManagementState(proto.Enum): The Database Management service failed to update. """ + MANAGEMENT_STATE_UNSPECIFIED = 0 ENABLING = 1 ENABLED = 2 @@ -416,6 +420,7 @@ class ManagementType(proto.Enum): ADVANCED (2): Advanced Database Management. """ + MANAGEMENT_TYPE_UNSPECIFIED = 0 BASIC = 1 ADVANCED = 2 diff --git a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/vm_cluster.py b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/vm_cluster.py index 6a7766bebde3..9cb846c92361 100644 --- a/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/vm_cluster.py +++ b/packages/google-cloud-oracledatabase/google/cloud/oracledatabase_v1/types/vm_cluster.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore import proto # type: ignore from google.cloud.oracledatabase_v1.types import common @@ -253,6 +253,7 @@ class LicenseType(proto.Enum): BRING_YOUR_OWN_LICENSE (2): Bring your own license """ + LICENSE_TYPE_UNSPECIFIED = 0 LICENSE_INCLUDED = 1 BRING_YOUR_OWN_LICENSE = 2 @@ -268,6 +269,7 @@ class DiskRedundancy(proto.Enum): NORMAL (2): Normal - 2 way mirror. """ + DISK_REDUNDANCY_UNSPECIFIED = 0 HIGH = 1 NORMAL = 2 @@ -300,6 +302,7 @@ class State(proto.Enum): Indicates that the resource is in maintenance in progress state. """ + STATE_UNSPECIFIED = 0 PROVISIONING = 1 AVAILABLE = 2 diff --git a/packages/google-cloud-oracledatabase/noxfile.py b/packages/google-cloud-oracledatabase/noxfile.py index ef694a433e3d..7bf19d7e7e9b 100644 --- a/packages/google-cloud-oracledatabase/noxfile.py +++ b/packages/google-cloud-oracledatabase/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-oracledatabase/tests/unit/gapic/oracledatabase_v1/test_oracle_database.py b/packages/google-cloud-oracledatabase/tests/unit/gapic/oracledatabase_v1/test_oracle_database.py index 36bb15ade3d0..a8cd47329e61 100644 --- a/packages/google-cloud-oracledatabase/tests/unit/gapic/oracledatabase_v1/test_oracle_database.py +++ b/packages/google-cloud-oracledatabase/tests/unit/gapic/oracledatabase_v1/test_oracle_database.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,18 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.month_pb2 as month_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +63,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import month_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.oracledatabase_v1.services.oracle_database import ( OracleDatabaseAsyncClient, @@ -78,6 +78,7 @@ transports, ) from google.cloud.oracledatabase_v1.types import ( + autonomous_database, autonomous_database_character_set, autonomous_db_backup, autonomous_db_version, @@ -86,15 +87,18 @@ database_character_set, db_node, db_server, -) -from google.cloud.oracledatabase_v1.types import ( + db_system, db_system_initial_storage_size, db_system_shape, db_version, entitlement, exadata_infra, -) -from google.cloud.oracledatabase_v1.types import ( + exadb_vm_cluster, + exascale_db_storage_vault, + gi_version, + minor_version, + odb_network, + odb_subnet, oracledatabase, pluggable_database, vm_cluster, @@ -102,21 +106,14 @@ from google.cloud.oracledatabase_v1.types import ( autonomous_database as gco_autonomous_database, ) +from google.cloud.oracledatabase_v1.types import db_system as gco_db_system from google.cloud.oracledatabase_v1.types import ( exadb_vm_cluster as gco_exadb_vm_cluster, ) from google.cloud.oracledatabase_v1.types import ( exascale_db_storage_vault as gco_exascale_db_storage_vault, ) -from google.cloud.oracledatabase_v1.types import autonomous_database -from google.cloud.oracledatabase_v1.types import db_system -from google.cloud.oracledatabase_v1.types import db_system as gco_db_system -from google.cloud.oracledatabase_v1.types import exadb_vm_cluster -from google.cloud.oracledatabase_v1.types import exascale_db_storage_vault -from google.cloud.oracledatabase_v1.types import gi_version, minor_version -from google.cloud.oracledatabase_v1.types import odb_network from google.cloud.oracledatabase_v1.types import odb_network as gco_odb_network -from google.cloud.oracledatabase_v1.types import odb_subnet from google.cloud.oracledatabase_v1.types import odb_subnet as gco_odb_subnet CRED_INFO_JSON = { @@ -1004,10 +1001,9 @@ def test_oracle_database_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1052,10 +1048,9 @@ def test_oracle_database_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1091,10 +1086,9 @@ def test_oracle_database_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1337,13 +1331,13 @@ def test_oracle_database_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3097,9 +3091,9 @@ def test_list_cloud_vm_clusters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cloud_vm_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cloud_vm_clusters] = ( + mock_rpc + ) request = {} client.list_cloud_vm_clusters(request) @@ -3659,9 +3653,9 @@ def test_get_cloud_vm_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cloud_vm_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cloud_vm_cluster] = ( + mock_rpc + ) request = {} client.get_cloud_vm_cluster(request) @@ -4735,9 +4729,9 @@ def test_list_entitlements_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entitlements - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entitlements] = ( + mock_rpc + ) request = {} client.list_entitlements(request) @@ -6314,9 +6308,9 @@ def test_list_gi_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_gi_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_gi_versions] = ( + mock_rpc + ) request = {} client.list_gi_versions(request) @@ -6843,9 +6837,9 @@ def test_list_minor_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_minor_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_minor_versions] = ( + mock_rpc + ) request = {} client.list_minor_versions(request) @@ -7391,9 +7385,9 @@ def test_list_db_system_shapes_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_db_system_shapes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_db_system_shapes] = ( + mock_rpc + ) request = {} client.list_db_system_shapes(request) @@ -14136,9 +14130,9 @@ def test_list_odb_networks_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_odb_networks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_odb_networks] = ( + mock_rpc + ) request = {} client.list_odb_networks(request) @@ -15019,9 +15013,9 @@ def test_create_odb_network_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_odb_network - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_odb_network] = ( + mock_rpc + ) request = {} client.create_odb_network(request) @@ -15385,9 +15379,9 @@ def test_delete_odb_network_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_odb_network - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_odb_network] = ( + mock_rpc + ) request = {} client.delete_odb_network(request) @@ -15735,9 +15729,9 @@ def test_list_odb_subnets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_odb_subnets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_odb_subnets] = ( + mock_rpc + ) request = {} client.list_odb_subnets(request) @@ -16594,9 +16588,9 @@ def test_create_odb_subnet_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_odb_subnet - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_odb_subnet] = ( + mock_rpc + ) request = {} client.create_odb_subnet(request) @@ -16957,9 +16951,9 @@ def test_delete_odb_subnet_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_odb_subnet - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_odb_subnet] = ( + mock_rpc + ) request = {} client.delete_odb_subnet(request) @@ -17312,9 +17306,9 @@ def test_list_exadb_vm_clusters_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_exadb_vm_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_exadb_vm_clusters] = ( + mock_rpc + ) request = {} client.list_exadb_vm_clusters(request) @@ -17868,9 +17862,9 @@ def test_get_exadb_vm_cluster_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_exadb_vm_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_exadb_vm_cluster] = ( + mock_rpc + ) request = {} client.get_exadb_vm_cluster(request) @@ -23315,9 +23309,9 @@ def test_get_pluggable_database_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_pluggable_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_pluggable_database] = ( + mock_rpc + ) request = {} client.get_pluggable_database(request) @@ -24518,9 +24512,9 @@ def test_create_db_system_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_db_system - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_db_system] = ( + mock_rpc + ) request = {} client.create_db_system(request) @@ -24867,9 +24861,9 @@ def test_delete_db_system_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_db_system - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_db_system] = ( + mock_rpc + ) request = {} client.delete_db_system(request) @@ -25203,9 +25197,9 @@ def test_list_db_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_db_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_db_versions] = ( + mock_rpc + ) request = {} client.list_db_versions(request) @@ -26733,9 +26727,9 @@ def test_create_cloud_exadata_infrastructure_rest_required_fields( ) jsonified_request["parent"] = "parent_value" - jsonified_request[ - "cloudExadataInfrastructureId" - ] = "cloud_exadata_infrastructure_id_value" + jsonified_request["cloudExadataInfrastructureId"] = ( + "cloud_exadata_infrastructure_id_value" + ) unset_fields = transport_class( credentials=ga_credentials.AnonymousCredentials() @@ -27122,9 +27116,9 @@ def test_list_cloud_vm_clusters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cloud_vm_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cloud_vm_clusters] = ( + mock_rpc + ) request = {} client.list_cloud_vm_clusters(request) @@ -27384,9 +27378,9 @@ def test_get_cloud_vm_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_cloud_vm_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_cloud_vm_cluster] = ( + mock_rpc + ) request = {} client.get_cloud_vm_cluster(request) @@ -27986,9 +27980,9 @@ def test_list_entitlements_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entitlements - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entitlements] = ( + mock_rpc + ) request = {} client.list_entitlements(request) @@ -28764,9 +28758,9 @@ def test_list_gi_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_gi_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_gi_versions] = ( + mock_rpc + ) request = {} client.list_gi_versions(request) @@ -29025,9 +29019,9 @@ def test_list_minor_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_minor_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_minor_versions] = ( + mock_rpc + ) request = {} client.list_minor_versions(request) @@ -29292,9 +29286,9 @@ def test_list_db_system_shapes_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_db_system_shapes - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_db_system_shapes] = ( + mock_rpc + ) request = {} client.list_db_system_shapes(request) @@ -32814,9 +32808,9 @@ def test_list_odb_networks_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_odb_networks - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_odb_networks] = ( + mock_rpc + ) request = {} client.list_odb_networks(request) @@ -33258,9 +33252,9 @@ def test_create_odb_network_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_odb_network - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_odb_network] = ( + mock_rpc + ) request = {} client.create_odb_network(request) @@ -33478,9 +33472,9 @@ def test_delete_odb_network_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_odb_network - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_odb_network] = ( + mock_rpc + ) request = {} client.delete_odb_network(request) @@ -33661,9 +33655,9 @@ def test_list_odb_subnets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_odb_subnets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_odb_subnets] = ( + mock_rpc + ) request = {} client.list_odb_subnets(request) @@ -34105,9 +34099,9 @@ def test_create_odb_subnet_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_odb_subnet - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_odb_subnet] = ( + mock_rpc + ) request = {} client.create_odb_subnet(request) @@ -34325,9 +34319,9 @@ def test_delete_odb_subnet_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_odb_subnet - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_odb_subnet] = ( + mock_rpc + ) request = {} client.delete_odb_subnet(request) @@ -34511,9 +34505,9 @@ def test_list_exadb_vm_clusters_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_exadb_vm_clusters - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_exadb_vm_clusters] = ( + mock_rpc + ) request = {} client.list_exadb_vm_clusters(request) @@ -34775,9 +34769,9 @@ def test_get_exadb_vm_cluster_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_exadb_vm_cluster - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_exadb_vm_cluster] = ( + mock_rpc + ) request = {} client.get_exadb_vm_cluster(request) @@ -37645,9 +37639,9 @@ def test_get_pluggable_database_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_pluggable_database - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_pluggable_database] = ( + mock_rpc + ) request = {} client.get_pluggable_database(request) @@ -38261,9 +38255,9 @@ def test_create_db_system_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_db_system - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_db_system] = ( + mock_rpc + ) request = {} client.create_db_system(request) @@ -38478,9 +38472,9 @@ def test_delete_db_system_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_db_system - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_db_system] = ( + mock_rpc + ) request = {} client.delete_db_system(request) @@ -38660,9 +38654,9 @@ def test_list_db_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_db_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_db_versions] = ( + mock_rpc + ) request = {} client.list_db_versions(request) @@ -42290,8 +42284,9 @@ def test_list_cloud_exadata_infrastructures_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42356,20 +42351,22 @@ def test_list_cloud_exadata_infrastructures_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, - "post_list_cloud_exadata_infrastructures", - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_cloud_exadata_infrastructures_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "pre_list_cloud_exadata_infrastructures", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_cloud_exadata_infrastructures", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_cloud_exadata_infrastructures_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_list_cloud_exadata_infrastructures", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42429,8 +42426,9 @@ def test_get_cloud_exadata_infrastructure_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42501,19 +42499,22 @@ def test_get_cloud_exadata_infrastructure_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, - "post_get_cloud_exadata_infrastructure", - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_get_cloud_exadata_infrastructure_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_get_cloud_exadata_infrastructure" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_get_cloud_exadata_infrastructure", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_get_cloud_exadata_infrastructure_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_get_cloud_exadata_infrastructure", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42571,8 +42572,9 @@ def test_create_cloud_exadata_infrastructure_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42752,22 +42754,23 @@ def test_create_cloud_exadata_infrastructure_rest_interceptors(null_interceptor) ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, - "post_create_cloud_exadata_infrastructure", - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_create_cloud_exadata_infrastructure_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "pre_create_cloud_exadata_infrastructure", - ) as pre: + 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.OracleDatabaseRestInterceptor, + "post_create_cloud_exadata_infrastructure", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_create_cloud_exadata_infrastructure_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_create_cloud_exadata_infrastructure", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42822,8 +42825,9 @@ def test_delete_cloud_exadata_infrastructure_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -42882,22 +42886,23 @@ def test_delete_cloud_exadata_infrastructure_rest_interceptors(null_interceptor) ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, - "post_delete_cloud_exadata_infrastructure", - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_delete_cloud_exadata_infrastructure_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "pre_delete_cloud_exadata_infrastructure", - ) as pre: + 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.OracleDatabaseRestInterceptor, + "post_delete_cloud_exadata_infrastructure", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_delete_cloud_exadata_infrastructure_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_delete_cloud_exadata_infrastructure", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -42950,8 +42955,9 @@ def test_list_cloud_vm_clusters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43014,18 +43020,20 @@ def test_list_cloud_vm_clusters_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_cloud_vm_clusters" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_cloud_vm_clusters_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_cloud_vm_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_cloud_vm_clusters" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_cloud_vm_clusters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_cloud_vm_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43085,8 +43093,9 @@ def test_get_cloud_vm_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43169,18 +43178,20 @@ def test_get_cloud_vm_cluster_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_get_cloud_vm_cluster" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_get_cloud_vm_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_get_cloud_vm_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_get_cloud_vm_cluster" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_get_cloud_vm_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_get_cloud_vm_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43233,8 +43244,9 @@ def test_create_cloud_vm_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43417,20 +43429,21 @@ def test_create_cloud_vm_cluster_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_create_cloud_vm_cluster" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_create_cloud_vm_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_create_cloud_vm_cluster" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_create_cloud_vm_cluster" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_create_cloud_vm_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_create_cloud_vm_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43485,8 +43498,9 @@ def test_delete_cloud_vm_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43545,20 +43559,21 @@ def test_delete_cloud_vm_cluster_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_delete_cloud_vm_cluster" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_delete_cloud_vm_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_delete_cloud_vm_cluster" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_delete_cloud_vm_cluster" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_delete_cloud_vm_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_delete_cloud_vm_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43611,8 +43626,9 @@ def test_list_entitlements_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43675,17 +43691,20 @@ def test_list_entitlements_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_entitlements" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_list_entitlements_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_entitlements" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_entitlements" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_entitlements_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_entitlements" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43745,8 +43764,9 @@ def test_list_db_servers_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43811,17 +43831,20 @@ def test_list_db_servers_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_db_servers" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_list_db_servers_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_db_servers" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_db_servers" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_db_servers_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_db_servers" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -43879,8 +43902,9 @@ def test_list_db_nodes_rest_bad_request(request_type=oracledatabase.ListDbNodesR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -43945,17 +43969,19 @@ def test_list_db_nodes_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_db_nodes" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_list_db_nodes_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_db_nodes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_db_nodes" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_db_nodes_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_db_nodes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44010,8 +44036,9 @@ def test_list_gi_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44074,17 +44101,20 @@ def test_list_gi_versions_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_gi_versions" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_list_gi_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_gi_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_gi_versions" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_gi_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_gi_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44142,8 +44172,9 @@ def test_list_minor_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44206,18 +44237,20 @@ def test_list_minor_versions_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_minor_versions" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_minor_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_minor_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_minor_versions" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_minor_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_minor_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44275,8 +44308,9 @@ def test_list_db_system_shapes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44339,18 +44373,20 @@ def test_list_db_system_shapes_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_db_system_shapes" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_db_system_shapes_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_db_system_shapes" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_db_system_shapes" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_db_system_shapes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_db_system_shapes" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44408,8 +44444,9 @@ def test_list_autonomous_databases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44472,18 +44509,20 @@ def test_list_autonomous_databases_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_autonomous_databases" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_autonomous_databases_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_autonomous_databases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_autonomous_databases" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_autonomous_databases_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_autonomous_databases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44543,8 +44582,9 @@ def test_get_autonomous_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44633,18 +44673,20 @@ def test_get_autonomous_database_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_get_autonomous_database" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_get_autonomous_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_get_autonomous_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_get_autonomous_database" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_get_autonomous_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_get_autonomous_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -44702,8 +44744,9 @@ def test_create_autonomous_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -44979,20 +45022,21 @@ def test_create_autonomous_database_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_create_autonomous_database" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_create_autonomous_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_create_autonomous_database" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_create_autonomous_database" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_create_autonomous_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_create_autonomous_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45049,8 +45093,9 @@ def test_update_autonomous_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45330,20 +45375,21 @@ def test_update_autonomous_database_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_update_autonomous_database" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_update_autonomous_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_update_autonomous_database" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_update_autonomous_database" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_update_autonomous_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_update_autonomous_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45398,8 +45444,9 @@ def test_delete_autonomous_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45458,20 +45505,21 @@ def test_delete_autonomous_database_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_delete_autonomous_database" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_delete_autonomous_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_delete_autonomous_database" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_delete_autonomous_database" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_delete_autonomous_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_delete_autonomous_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45526,8 +45574,9 @@ def test_restore_autonomous_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45586,20 +45635,21 @@ def test_restore_autonomous_database_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_restore_autonomous_database" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_restore_autonomous_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_restore_autonomous_database" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_restore_autonomous_database" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_restore_autonomous_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_restore_autonomous_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45654,8 +45704,9 @@ def test_generate_autonomous_database_wallet_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45722,20 +45773,22 @@ def test_generate_autonomous_database_wallet_rest_interceptors(null_interceptor) ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, - "post_generate_autonomous_database_wallet", - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_generate_autonomous_database_wallet_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "pre_generate_autonomous_database_wallet", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_generate_autonomous_database_wallet", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_generate_autonomous_database_wallet_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_generate_autonomous_database_wallet", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45793,8 +45846,9 @@ def test_list_autonomous_db_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45857,18 +45911,20 @@ def test_list_autonomous_db_versions_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_autonomous_db_versions" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_autonomous_db_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_autonomous_db_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_autonomous_db_versions" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_autonomous_db_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_autonomous_db_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -45926,8 +45982,9 @@ def test_list_autonomous_database_character_sets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -45992,20 +46049,22 @@ def test_list_autonomous_database_character_sets_rest_interceptors(null_intercep ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, - "post_list_autonomous_database_character_sets", - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_autonomous_database_character_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "pre_list_autonomous_database_character_sets", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_autonomous_database_character_sets", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_autonomous_database_character_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_list_autonomous_database_character_sets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46065,8 +46124,9 @@ def test_list_autonomous_database_backups_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46131,19 +46191,22 @@ def test_list_autonomous_database_backups_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, - "post_list_autonomous_database_backups", - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_autonomous_database_backups_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_autonomous_database_backups" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_autonomous_database_backups", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_autonomous_database_backups_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_list_autonomous_database_backups", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46203,8 +46266,9 @@ def test_stop_autonomous_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46263,20 +46327,21 @@ def test_stop_autonomous_database_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_stop_autonomous_database" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_stop_autonomous_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_stop_autonomous_database" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_stop_autonomous_database" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_stop_autonomous_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_stop_autonomous_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46331,8 +46396,9 @@ def test_start_autonomous_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46391,20 +46457,21 @@ def test_start_autonomous_database_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_start_autonomous_database" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_start_autonomous_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_start_autonomous_database" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_start_autonomous_database" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_start_autonomous_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_start_autonomous_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46459,8 +46526,9 @@ def test_restart_autonomous_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46519,20 +46587,21 @@ def test_restart_autonomous_database_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_restart_autonomous_database" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_restart_autonomous_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_restart_autonomous_database" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_restart_autonomous_database" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_restart_autonomous_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_restart_autonomous_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46587,8 +46656,9 @@ def test_switchover_autonomous_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46647,20 +46717,23 @@ def test_switchover_autonomous_database_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_switchover_autonomous_database" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_switchover_autonomous_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_switchover_autonomous_database" - ) as pre: + 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.OracleDatabaseRestInterceptor, + "post_switchover_autonomous_database", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_switchover_autonomous_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_switchover_autonomous_database", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46715,8 +46788,9 @@ def test_failover_autonomous_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46775,20 +46849,22 @@ def test_failover_autonomous_database_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_failover_autonomous_database" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_failover_autonomous_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_failover_autonomous_database" - ) as pre: + 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.OracleDatabaseRestInterceptor, + "post_failover_autonomous_database", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_failover_autonomous_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_failover_autonomous_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46841,8 +46917,9 @@ def test_list_odb_networks_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -46907,17 +46984,20 @@ def test_list_odb_networks_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_odb_networks" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_list_odb_networks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_odb_networks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_odb_networks" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_odb_networks_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_odb_networks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -46975,8 +47055,9 @@ def test_get_odb_network_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47047,17 +47128,20 @@ def test_get_odb_network_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_get_odb_network" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_get_odb_network_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_get_odb_network" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_get_odb_network" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_get_odb_network_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_get_odb_network" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47110,8 +47194,9 @@ def test_create_odb_network_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47244,20 +47329,21 @@ def test_create_odb_network_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_create_odb_network" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_create_odb_network_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_create_odb_network" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_create_odb_network" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_create_odb_network_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_create_odb_network" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47310,8 +47396,9 @@ def test_delete_odb_network_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47368,20 +47455,21 @@ def test_delete_odb_network_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_delete_odb_network" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_delete_odb_network_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_delete_odb_network" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_delete_odb_network" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_delete_odb_network_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_delete_odb_network" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47434,8 +47522,9 @@ def test_list_odb_subnets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47500,17 +47589,20 @@ def test_list_odb_subnets_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_odb_subnets" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_list_odb_subnets_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_odb_subnets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_odb_subnets" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_odb_subnets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_odb_subnets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47565,8 +47657,9 @@ def test_get_odb_subnet_rest_bad_request(request_type=odb_subnet.GetOdbSubnetReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47637,17 +47730,20 @@ def test_get_odb_subnet_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_get_odb_subnet" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_get_odb_subnet_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_get_odb_subnet" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_get_odb_subnet" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_get_odb_subnet_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_get_odb_subnet" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47698,8 +47794,9 @@ def test_create_odb_subnet_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47831,19 +47928,21 @@ def test_create_odb_subnet_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_create_odb_subnet" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_create_odb_subnet_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_create_odb_subnet" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_create_odb_subnet" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_create_odb_subnet_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_create_odb_subnet" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -47898,8 +47997,9 @@ def test_delete_odb_subnet_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -47958,19 +48058,21 @@ def test_delete_odb_subnet_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_delete_odb_subnet" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_delete_odb_subnet_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_delete_odb_subnet" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_delete_odb_subnet" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_delete_odb_subnet_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_delete_odb_subnet" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48023,8 +48125,9 @@ def test_list_exadb_vm_clusters_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48087,18 +48190,20 @@ def test_list_exadb_vm_clusters_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_exadb_vm_clusters" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_exadb_vm_clusters_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_exadb_vm_clusters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_exadb_vm_clusters" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_exadb_vm_clusters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_exadb_vm_clusters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48158,8 +48263,9 @@ def test_get_exadb_vm_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48236,18 +48342,20 @@ def test_get_exadb_vm_cluster_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_get_exadb_vm_cluster" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_get_exadb_vm_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_get_exadb_vm_cluster" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_get_exadb_vm_cluster" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_get_exadb_vm_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_get_exadb_vm_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48302,8 +48410,9 @@ def test_create_exadb_vm_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48465,20 +48574,21 @@ def test_create_exadb_vm_cluster_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_create_exadb_vm_cluster" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_create_exadb_vm_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_create_exadb_vm_cluster" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_create_exadb_vm_cluster" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_create_exadb_vm_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_create_exadb_vm_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48533,8 +48643,9 @@ def test_delete_exadb_vm_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48593,20 +48704,21 @@ def test_delete_exadb_vm_cluster_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_delete_exadb_vm_cluster" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_delete_exadb_vm_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_delete_exadb_vm_cluster" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_delete_exadb_vm_cluster" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_delete_exadb_vm_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_delete_exadb_vm_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48663,8 +48775,9 @@ def test_update_exadb_vm_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48830,20 +48943,21 @@ def test_update_exadb_vm_cluster_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_update_exadb_vm_cluster" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_update_exadb_vm_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_update_exadb_vm_cluster" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_update_exadb_vm_cluster" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_update_exadb_vm_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_update_exadb_vm_cluster" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -48898,8 +49012,9 @@ def test_remove_virtual_machine_exadb_vm_cluster_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -48958,22 +49073,23 @@ def test_remove_virtual_machine_exadb_vm_cluster_rest_interceptors(null_intercep ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, - "post_remove_virtual_machine_exadb_vm_cluster", - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_remove_virtual_machine_exadb_vm_cluster_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "pre_remove_virtual_machine_exadb_vm_cluster", - ) as pre: + 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.OracleDatabaseRestInterceptor, + "post_remove_virtual_machine_exadb_vm_cluster", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_remove_virtual_machine_exadb_vm_cluster_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_remove_virtual_machine_exadb_vm_cluster", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49026,8 +49142,9 @@ def test_list_exascale_db_storage_vaults_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49092,18 +49209,22 @@ def test_list_exascale_db_storage_vaults_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_exascale_db_storage_vaults" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_exascale_db_storage_vaults_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_exascale_db_storage_vaults" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_exascale_db_storage_vaults", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_exascale_db_storage_vaults_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_list_exascale_db_storage_vaults", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49167,8 +49288,9 @@ def test_get_exascale_db_storage_vault_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49239,18 +49361,22 @@ def test_get_exascale_db_storage_vault_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_get_exascale_db_storage_vault" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_get_exascale_db_storage_vault_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_get_exascale_db_storage_vault" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_get_exascale_db_storage_vault", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_get_exascale_db_storage_vault_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_get_exascale_db_storage_vault", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49308,8 +49434,9 @@ def test_create_exascale_db_storage_vault_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49465,21 +49592,23 @@ def test_create_exascale_db_storage_vault_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, - "post_create_exascale_db_storage_vault", - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_create_exascale_db_storage_vault_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_create_exascale_db_storage_vault" - ) as pre: + 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.OracleDatabaseRestInterceptor, + "post_create_exascale_db_storage_vault", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_create_exascale_db_storage_vault_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_create_exascale_db_storage_vault", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49536,8 +49665,9 @@ def test_delete_exascale_db_storage_vault_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49596,21 +49726,23 @@ def test_delete_exascale_db_storage_vault_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, - "post_delete_exascale_db_storage_vault", - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_delete_exascale_db_storage_vault_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_delete_exascale_db_storage_vault" - ) as pre: + 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.OracleDatabaseRestInterceptor, + "post_delete_exascale_db_storage_vault", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_delete_exascale_db_storage_vault_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_delete_exascale_db_storage_vault", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49663,8 +49795,9 @@ def test_list_db_system_initial_storage_sizes_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49733,20 +49866,22 @@ def test_list_db_system_initial_storage_sizes_rest_interceptors(null_interceptor ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, - "post_list_db_system_initial_storage_sizes", - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_db_system_initial_storage_sizes_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "pre_list_db_system_initial_storage_sizes", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_db_system_initial_storage_sizes", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_db_system_initial_storage_sizes_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "pre_list_db_system_initial_storage_sizes", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49808,8 +49943,9 @@ def test_list_databases_rest_bad_request(request_type=database.ListDatabasesRequ 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -49872,17 +50008,20 @@ def test_list_databases_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_databases" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_list_databases_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_databases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_databases" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_databases_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_databases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -49933,8 +50072,9 @@ def test_get_database_rest_bad_request(request_type=database.GetDatabaseRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50022,17 +50162,19 @@ def test_get_database_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_get_database" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_get_database_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_get_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_get_database" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_get_database_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_get_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50083,8 +50225,9 @@ def test_list_pluggable_databases_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50149,18 +50292,20 @@ def test_list_pluggable_databases_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_pluggable_databases" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_pluggable_databases_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_pluggable_databases" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_pluggable_databases" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_pluggable_databases_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_pluggable_databases" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50220,8 +50365,9 @@ def test_get_pluggable_database_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50288,18 +50434,20 @@ def test_get_pluggable_database_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_get_pluggable_database" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_get_pluggable_database_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_get_pluggable_database" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_get_pluggable_database" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_get_pluggable_database_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_get_pluggable_database" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50355,8 +50503,9 @@ def test_list_db_systems_rest_bad_request(request_type=db_system.ListDbSystemsRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50419,17 +50568,20 @@ def test_list_db_systems_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_db_systems" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_list_db_systems_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_db_systems" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_db_systems" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_db_systems_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_db_systems" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50480,8 +50632,9 @@ def test_get_db_system_rest_bad_request(request_type=db_system.GetDbSystemReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50556,17 +50709,19 @@ def test_get_db_system_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_get_db_system" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_get_db_system_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_get_db_system" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_get_db_system" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_get_db_system_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_get_db_system" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50617,8 +50772,9 @@ def test_create_db_system_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50815,19 +50971,21 @@ def test_create_db_system_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_create_db_system" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_create_db_system_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_create_db_system" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_create_db_system" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_create_db_system_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_create_db_system" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -50880,8 +51038,9 @@ def test_delete_db_system_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -50938,19 +51097,21 @@ def test_delete_db_system_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_delete_db_system" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_delete_db_system_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_delete_db_system" - ) as pre: + 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.OracleDatabaseRestInterceptor, "post_delete_db_system" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_delete_db_system_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_delete_db_system" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51003,8 +51164,9 @@ def test_list_db_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51067,17 +51229,20 @@ def test_list_db_versions_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_db_versions" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "post_list_db_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_db_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "post_list_db_versions" + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_db_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_db_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51132,8 +51297,9 @@ def test_list_database_character_sets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -51198,18 +51364,21 @@ def test_list_database_character_sets_rest_interceptors(null_interceptor): ) client = OracleDatabaseClient(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.OracleDatabaseRestInterceptor, "post_list_database_character_sets" - ) as post, mock.patch.object( - transports.OracleDatabaseRestInterceptor, - "post_list_database_character_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OracleDatabaseRestInterceptor, "pre_list_database_character_sets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_database_character_sets", + ) as post, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, + "post_list_database_character_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OracleDatabaseRestInterceptor, "pre_list_database_character_sets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -51267,8 +51436,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -51327,8 +51497,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -51389,8 +51560,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -51451,8 +51623,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -51513,8 +51686,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -51575,8 +51749,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -53023,11 +53198,14 @@ def test_oracle_database_base_transport(): def test_oracle_database_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.oracledatabase_v1.services.oracle_database.transports.OracleDatabaseTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.oracledatabase_v1.services.oracle_database.transports.OracleDatabaseTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OracleDatabaseTransport( @@ -53044,9 +53222,12 @@ def test_oracle_database_base_transport_with_credentials_file(): def test_oracle_database_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.oracledatabase_v1.services.oracle_database.transports.OracleDatabaseTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.oracledatabase_v1.services.oracle_database.transports.OracleDatabaseTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OracleDatabaseTransport() @@ -53118,11 +53299,12 @@ def test_oracle_database_transport_auth_gdch_credentials(transport_class): def test_oracle_database_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-orchestration-airflow/docs/conf.py b/packages/google-cloud-orchestration-airflow/docs/conf.py index d7dc1221c705..86e8b2bc94f1 100644 --- a/packages/google-cloud-orchestration-airflow/docs/conf.py +++ b/packages/google-cloud-orchestration-airflow/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-orchestration-airflow documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/__init__.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/__init__.py index a7e9ce966fef..edf78e6a61c3 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/__init__.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/__init__.py @@ -30,6 +30,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.environments import EnvironmentsAsyncClient, EnvironmentsClient from .services.image_versions import ImageVersionsAsyncClient, ImageVersionsClient from .types.environments import ( diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/async_client.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/async_client.py index 531b0a542bbb..7a9ab8973056 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/async_client.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.orchestration.airflow.service_v1 import ( gapic_version as package_version, @@ -46,12 +46,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.orchestration.airflow.service_v1.services.environments import pagers from google.cloud.orchestration.airflow.service_v1.types import environments, operations @@ -130,7 +130,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_info.__func__(EnvironmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EnvironmentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EnvironmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +147,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_file.__func__(EnvironmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EnvironmentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EnvironmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/client.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/client.py index 3d939c38bddb..f0e3c6a60f8a 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/client.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.orchestration.airflow.service_v1 import ( gapic_version as package_version, @@ -63,12 +63,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.orchestration.airflow.service_v1.services.environments import pagers from google.cloud.orchestration.airflow.service_v1.types import environments, operations @@ -677,11 +677,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EnvironmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EnvironmentsClient._read_environment_variables() + ) self._client_cert_source = EnvironmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -716,8 +714,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EnvironmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/pagers.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/pagers.py index 3ca330343c4d..da4d76d2a02f 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/pagers.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -381,7 +381,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -539,7 +539,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -617,7 +617,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/base.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/base.py index cbdcf39b64a5..9026de3045a1 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/base.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.orchestration.airflow.service_v1 import ( gapic_version as package_version, @@ -573,7 +573,10 @@ def get_operation( @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/grpc.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/grpc.py index d54e7957c58d..547d0dd7d9d9 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/grpc.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.orchestration.airflow.service_v1.types import environments @@ -645,12 +645,12 @@ def create_user_workloads_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_user_workloads_secret" not in self._stubs: - self._stubs[ - "create_user_workloads_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/CreateUserWorkloadsSecret", - request_serializer=environments.CreateUserWorkloadsSecretRequest.serialize, - response_deserializer=environments.UserWorkloadsSecret.deserialize, + self._stubs["create_user_workloads_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/CreateUserWorkloadsSecret", + request_serializer=environments.CreateUserWorkloadsSecretRequest.serialize, + response_deserializer=environments.UserWorkloadsSecret.deserialize, + ) ) return self._stubs["create_user_workloads_secret"] @@ -711,12 +711,12 @@ def list_user_workloads_secrets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_user_workloads_secrets" not in self._stubs: - self._stubs[ - "list_user_workloads_secrets" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/ListUserWorkloadsSecrets", - request_serializer=environments.ListUserWorkloadsSecretsRequest.serialize, - response_deserializer=environments.ListUserWorkloadsSecretsResponse.deserialize, + self._stubs["list_user_workloads_secrets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/ListUserWorkloadsSecrets", + request_serializer=environments.ListUserWorkloadsSecretsRequest.serialize, + response_deserializer=environments.ListUserWorkloadsSecretsResponse.deserialize, + ) ) return self._stubs["list_user_workloads_secrets"] @@ -745,12 +745,12 @@ def update_user_workloads_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_user_workloads_secret" not in self._stubs: - self._stubs[ - "update_user_workloads_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/UpdateUserWorkloadsSecret", - request_serializer=environments.UpdateUserWorkloadsSecretRequest.serialize, - response_deserializer=environments.UserWorkloadsSecret.deserialize, + self._stubs["update_user_workloads_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/UpdateUserWorkloadsSecret", + request_serializer=environments.UpdateUserWorkloadsSecretRequest.serialize, + response_deserializer=environments.UserWorkloadsSecret.deserialize, + ) ) return self._stubs["update_user_workloads_secret"] @@ -776,12 +776,12 @@ def delete_user_workloads_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_user_workloads_secret" not in self._stubs: - self._stubs[ - "delete_user_workloads_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/DeleteUserWorkloadsSecret", - request_serializer=environments.DeleteUserWorkloadsSecretRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_user_workloads_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/DeleteUserWorkloadsSecret", + request_serializer=environments.DeleteUserWorkloadsSecretRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_user_workloads_secret"] @@ -811,12 +811,12 @@ def create_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_user_workloads_config_map" not in self._stubs: - self._stubs[ - "create_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/CreateUserWorkloadsConfigMap", - request_serializer=environments.CreateUserWorkloadsConfigMapRequest.serialize, - response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + self._stubs["create_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/CreateUserWorkloadsConfigMap", + request_serializer=environments.CreateUserWorkloadsConfigMapRequest.serialize, + response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + ) ) return self._stubs["create_user_workloads_config_map"] @@ -845,12 +845,12 @@ def get_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_user_workloads_config_map" not in self._stubs: - self._stubs[ - "get_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/GetUserWorkloadsConfigMap", - request_serializer=environments.GetUserWorkloadsConfigMapRequest.serialize, - response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + self._stubs["get_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/GetUserWorkloadsConfigMap", + request_serializer=environments.GetUserWorkloadsConfigMapRequest.serialize, + response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + ) ) return self._stubs["get_user_workloads_config_map"] @@ -880,12 +880,12 @@ def list_user_workloads_config_maps( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_user_workloads_config_maps" not in self._stubs: - self._stubs[ - "list_user_workloads_config_maps" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/ListUserWorkloadsConfigMaps", - request_serializer=environments.ListUserWorkloadsConfigMapsRequest.serialize, - response_deserializer=environments.ListUserWorkloadsConfigMapsResponse.deserialize, + self._stubs["list_user_workloads_config_maps"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/ListUserWorkloadsConfigMaps", + request_serializer=environments.ListUserWorkloadsConfigMapsRequest.serialize, + response_deserializer=environments.ListUserWorkloadsConfigMapsResponse.deserialize, + ) ) return self._stubs["list_user_workloads_config_maps"] @@ -915,12 +915,12 @@ def update_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_user_workloads_config_map" not in self._stubs: - self._stubs[ - "update_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/UpdateUserWorkloadsConfigMap", - request_serializer=environments.UpdateUserWorkloadsConfigMapRequest.serialize, - response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + self._stubs["update_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/UpdateUserWorkloadsConfigMap", + request_serializer=environments.UpdateUserWorkloadsConfigMapRequest.serialize, + response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + ) ) return self._stubs["update_user_workloads_config_map"] @@ -947,12 +947,12 @@ def delete_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_user_workloads_config_map" not in self._stubs: - self._stubs[ - "delete_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/DeleteUserWorkloadsConfigMap", - request_serializer=environments.DeleteUserWorkloadsConfigMapRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/DeleteUserWorkloadsConfigMap", + request_serializer=environments.DeleteUserWorkloadsConfigMapRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_user_workloads_config_map"] diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/grpc_asyncio.py index 2c3d9c15533a..7a0f2593e3c7 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.orchestration.airflow.service_v1.types import environments @@ -665,12 +665,12 @@ def create_user_workloads_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_user_workloads_secret" not in self._stubs: - self._stubs[ - "create_user_workloads_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/CreateUserWorkloadsSecret", - request_serializer=environments.CreateUserWorkloadsSecretRequest.serialize, - response_deserializer=environments.UserWorkloadsSecret.deserialize, + self._stubs["create_user_workloads_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/CreateUserWorkloadsSecret", + request_serializer=environments.CreateUserWorkloadsSecretRequest.serialize, + response_deserializer=environments.UserWorkloadsSecret.deserialize, + ) ) return self._stubs["create_user_workloads_secret"] @@ -732,12 +732,12 @@ def list_user_workloads_secrets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_user_workloads_secrets" not in self._stubs: - self._stubs[ - "list_user_workloads_secrets" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/ListUserWorkloadsSecrets", - request_serializer=environments.ListUserWorkloadsSecretsRequest.serialize, - response_deserializer=environments.ListUserWorkloadsSecretsResponse.deserialize, + self._stubs["list_user_workloads_secrets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/ListUserWorkloadsSecrets", + request_serializer=environments.ListUserWorkloadsSecretsRequest.serialize, + response_deserializer=environments.ListUserWorkloadsSecretsResponse.deserialize, + ) ) return self._stubs["list_user_workloads_secrets"] @@ -766,12 +766,12 @@ def update_user_workloads_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_user_workloads_secret" not in self._stubs: - self._stubs[ - "update_user_workloads_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/UpdateUserWorkloadsSecret", - request_serializer=environments.UpdateUserWorkloadsSecretRequest.serialize, - response_deserializer=environments.UserWorkloadsSecret.deserialize, + self._stubs["update_user_workloads_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/UpdateUserWorkloadsSecret", + request_serializer=environments.UpdateUserWorkloadsSecretRequest.serialize, + response_deserializer=environments.UserWorkloadsSecret.deserialize, + ) ) return self._stubs["update_user_workloads_secret"] @@ -799,12 +799,12 @@ def delete_user_workloads_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_user_workloads_secret" not in self._stubs: - self._stubs[ - "delete_user_workloads_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/DeleteUserWorkloadsSecret", - request_serializer=environments.DeleteUserWorkloadsSecretRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_user_workloads_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/DeleteUserWorkloadsSecret", + request_serializer=environments.DeleteUserWorkloadsSecretRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_user_workloads_secret"] @@ -834,12 +834,12 @@ def create_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_user_workloads_config_map" not in self._stubs: - self._stubs[ - "create_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/CreateUserWorkloadsConfigMap", - request_serializer=environments.CreateUserWorkloadsConfigMapRequest.serialize, - response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + self._stubs["create_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/CreateUserWorkloadsConfigMap", + request_serializer=environments.CreateUserWorkloadsConfigMapRequest.serialize, + response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + ) ) return self._stubs["create_user_workloads_config_map"] @@ -868,12 +868,12 @@ def get_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_user_workloads_config_map" not in self._stubs: - self._stubs[ - "get_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/GetUserWorkloadsConfigMap", - request_serializer=environments.GetUserWorkloadsConfigMapRequest.serialize, - response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + self._stubs["get_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/GetUserWorkloadsConfigMap", + request_serializer=environments.GetUserWorkloadsConfigMapRequest.serialize, + response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + ) ) return self._stubs["get_user_workloads_config_map"] @@ -903,12 +903,12 @@ def list_user_workloads_config_maps( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_user_workloads_config_maps" not in self._stubs: - self._stubs[ - "list_user_workloads_config_maps" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/ListUserWorkloadsConfigMaps", - request_serializer=environments.ListUserWorkloadsConfigMapsRequest.serialize, - response_deserializer=environments.ListUserWorkloadsConfigMapsResponse.deserialize, + self._stubs["list_user_workloads_config_maps"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/ListUserWorkloadsConfigMaps", + request_serializer=environments.ListUserWorkloadsConfigMapsRequest.serialize, + response_deserializer=environments.ListUserWorkloadsConfigMapsResponse.deserialize, + ) ) return self._stubs["list_user_workloads_config_maps"] @@ -938,12 +938,12 @@ def update_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_user_workloads_config_map" not in self._stubs: - self._stubs[ - "update_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/UpdateUserWorkloadsConfigMap", - request_serializer=environments.UpdateUserWorkloadsConfigMapRequest.serialize, - response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + self._stubs["update_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/UpdateUserWorkloadsConfigMap", + request_serializer=environments.UpdateUserWorkloadsConfigMapRequest.serialize, + response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + ) ) return self._stubs["update_user_workloads_config_map"] @@ -972,12 +972,12 @@ def delete_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_user_workloads_config_map" not in self._stubs: - self._stubs[ - "delete_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1.Environments/DeleteUserWorkloadsConfigMap", - request_serializer=environments.DeleteUserWorkloadsConfigMapRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1.Environments/DeleteUserWorkloadsConfigMap", + request_serializer=environments.DeleteUserWorkloadsConfigMapRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_user_workloads_config_map"] diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/rest.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/rest.py index 297290a65644..39ca88200319 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/rest.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1689,7 +1689,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1814,9 +1814,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -1842,7 +1840,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1970,9 +1968,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateUserWorkloadsConfigMap._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateUserWorkloadsConfigMap._get_http_options() request, metadata = self._interceptor.pre_create_user_workloads_config_map( request, metadata @@ -2043,11 +2039,10 @@ def __call__( resp = self._interceptor.post_create_user_workloads_config_map(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_user_workloads_config_map_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_user_workloads_config_map_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2134,9 +2129,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateUserWorkloadsSecret._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateUserWorkloadsSecret._get_http_options() request, metadata = self._interceptor.pre_create_user_workloads_secret( request, metadata @@ -2323,7 +2316,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2447,9 +2440,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -2471,7 +2462,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2590,9 +2581,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteUserWorkloadsConfigMap._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteUserWorkloadsConfigMap._get_http_options() request, metadata = self._interceptor.pre_delete_user_workloads_config_map( request, metadata @@ -2614,7 +2603,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2702,9 +2691,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteUserWorkloadsSecret._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteUserWorkloadsSecret._get_http_options() request, metadata = self._interceptor.pre_delete_user_workloads_secret( request, metadata @@ -2726,7 +2713,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2819,9 +2806,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseExecuteAirflowCommand._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseExecuteAirflowCommand._get_http_options() request, metadata = self._interceptor.pre_execute_airflow_command( request, metadata @@ -2976,9 +2961,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseFetchDatabaseProperties._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseFetchDatabaseProperties._get_http_options() request, metadata = self._interceptor.pre_fetch_database_properties( request, metadata @@ -3275,9 +3258,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseGetUserWorkloadsConfigMap._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseGetUserWorkloadsConfigMap._get_http_options() request, metadata = self._interceptor.pre_get_user_workloads_config_map( request, metadata @@ -3343,11 +3324,10 @@ def __call__( resp = self._interceptor.post_get_user_workloads_config_map(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_user_workloads_config_map_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_user_workloads_config_map_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3431,9 +3411,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseGetUserWorkloadsSecret._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseGetUserWorkloadsSecret._get_http_options() request, metadata = self._interceptor.pre_get_user_workloads_secret( request, metadata @@ -3735,9 +3713,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseListUserWorkloadsConfigMaps._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseListUserWorkloadsConfigMaps._get_http_options() request, metadata = self._interceptor.pre_list_user_workloads_config_maps( request, metadata @@ -3803,11 +3779,10 @@ def __call__( resp = self._interceptor.post_list_user_workloads_config_maps(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_user_workloads_config_maps_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_user_workloads_config_maps_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3894,9 +3869,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseListUserWorkloadsSecrets._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseListUserWorkloadsSecrets._get_http_options() request, metadata = self._interceptor.pre_list_user_workloads_secrets( request, metadata @@ -4226,7 +4199,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4350,9 +4323,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BasePollAirflowCommand._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BasePollAirflowCommand._get_http_options() request, metadata = self._interceptor.pre_poll_airflow_command( request, metadata @@ -4538,7 +4509,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4662,9 +4633,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseStopAirflowCommand._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseStopAirflowCommand._get_http_options() request, metadata = self._interceptor.pre_stop_airflow_command( request, metadata @@ -4819,9 +4788,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() request, metadata = self._interceptor.pre_update_environment( request, metadata @@ -4847,7 +4814,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4975,9 +4942,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateUserWorkloadsConfigMap._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateUserWorkloadsConfigMap._get_http_options() request, metadata = self._interceptor.pre_update_user_workloads_config_map( request, metadata @@ -5048,11 +5013,10 @@ def __call__( resp = self._interceptor.post_update_user_workloads_config_map(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_user_workloads_config_map_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_user_workloads_config_map_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5139,9 +5103,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateUserWorkloadsSecret._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateUserWorkloadsSecret._get_http_options() request, metadata = self._interceptor.pre_update_user_workloads_secret( request, metadata @@ -5265,7 +5227,9 @@ def create_user_workloads_config_map( ]: # 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._CreateUserWorkloadsConfigMap(self._session, self._host, self._interceptor) # type: ignore + return self._CreateUserWorkloadsConfigMap( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_user_workloads_secret( @@ -5276,7 +5240,9 @@ def create_user_workloads_secret( ]: # 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._CreateUserWorkloadsSecret(self._session, self._host, self._interceptor) # type: ignore + return self._CreateUserWorkloadsSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def database_failover( @@ -5300,7 +5266,9 @@ def delete_user_workloads_config_map( ) -> Callable[[environments.DeleteUserWorkloadsConfigMapRequest], empty_pb2.Empty]: # 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._DeleteUserWorkloadsConfigMap(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteUserWorkloadsConfigMap( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_user_workloads_secret( @@ -5308,7 +5276,9 @@ def delete_user_workloads_secret( ) -> Callable[[environments.DeleteUserWorkloadsSecretRequest], empty_pb2.Empty]: # 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._DeleteUserWorkloadsSecret(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteUserWorkloadsSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def execute_airflow_command( @@ -5330,7 +5300,9 @@ def fetch_database_properties( ]: # 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._FetchDatabaseProperties(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDatabaseProperties( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_environment( @@ -5349,7 +5321,9 @@ def get_user_workloads_config_map( ]: # 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._GetUserWorkloadsConfigMap(self._session, self._host, self._interceptor) # type: ignore + return self._GetUserWorkloadsConfigMap( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_user_workloads_secret( @@ -5359,7 +5333,9 @@ def get_user_workloads_secret( ]: # 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._GetUserWorkloadsSecret(self._session, self._host, self._interceptor) # type: ignore + return self._GetUserWorkloadsSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_environments( @@ -5380,7 +5356,9 @@ def list_user_workloads_config_maps( ]: # 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._ListUserWorkloadsConfigMaps(self._session, self._host, self._interceptor) # type: ignore + return self._ListUserWorkloadsConfigMaps( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_user_workloads_secrets( @@ -5391,7 +5369,9 @@ def list_user_workloads_secrets( ]: # 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._ListUserWorkloadsSecrets(self._session, self._host, self._interceptor) # type: ignore + return self._ListUserWorkloadsSecrets( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_workloads( @@ -5458,7 +5438,9 @@ def update_user_workloads_config_map( ]: # 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._UpdateUserWorkloadsConfigMap(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateUserWorkloadsConfigMap( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_user_workloads_secret( @@ -5469,7 +5451,9 @@ def update_user_workloads_secret( ]: # 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._UpdateUserWorkloadsSecret(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateUserWorkloadsSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_operation(self): diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/rest_base.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/rest_base.py index 273b2bd87647..61f629f3c291 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/rest_base.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/environments/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.orchestration.airflow.service_v1.types import environments diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/async_client.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/async_client.py index ad341fd462d9..2e741c887070 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/async_client.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.orchestration.airflow.service_v1 import ( gapic_version as package_version, @@ -115,7 +115,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ImageVersionsAsyncClient: The constructed client. """ - return ImageVersionsClient.from_service_account_info.__func__(ImageVersionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ImageVersionsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ImageVersionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -131,7 +132,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ImageVersionsAsyncClient: The constructed client. """ - return ImageVersionsClient.from_service_account_file.__func__(ImageVersionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ImageVersionsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ImageVersionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/client.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/client.py index f6de12d4b60e..2c244c7ad7c3 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/client.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.orchestration.airflow.service_v1 import ( gapic_version as package_version, @@ -600,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ImageVersionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ImageVersionsClient._read_environment_variables() + ) self._client_cert_source = ImageVersionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -639,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ImageVersionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/pagers.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/pagers.py index 65a6e544a797..f2e0a9a127e7 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/pagers.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/base.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/base.py index ed77c4076034..0363b4da549e 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/base.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.orchestration.airflow.service_v1 import ( gapic_version as package_version, @@ -206,7 +206,10 @@ def get_operation( @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/grpc.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/grpc.py index dab08c732c9f..1d07b61c8e1f 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/grpc.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.orchestration.airflow.service_v1.types import image_versions diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/grpc_asyncio.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/grpc_asyncio.py index 4208f6d4deb8..a578ddd71731 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.orchestration.airflow.service_v1.types import image_versions diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/rest.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/rest.py index bd31d9a06d83..360d90260910 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/rest.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/services/image_versions/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -356,9 +356,7 @@ def __call__( """ - http_options = ( - _BaseImageVersionsRestTransport._BaseListImageVersions._get_http_options() - ) + http_options = _BaseImageVersionsRestTransport._BaseListImageVersions._get_http_options() request, metadata = self._interceptor.pre_list_image_versions( request, metadata diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/__init__.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/__init__.py index 6fa36a5b263d..08402746edb0 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/__init__.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/__init__.py @@ -80,7 +80,9 @@ ListImageVersionsRequest, ListImageVersionsResponse, ) -from .operations import OperationMetadata +from .operations import ( + OperationMetadata, +) __all__ = ( "AirflowMetadataRetentionPolicyConfig", diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/environments.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/environments.py index c2a3daf144a9..ef82552c7761 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/environments.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/environments.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -900,12 +900,12 @@ class ListUserWorkloadsSecretsResponse(proto.Message): def raw_page(self): return self - user_workloads_secrets: MutableSequence[ - "UserWorkloadsSecret" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="UserWorkloadsSecret", + user_workloads_secrets: MutableSequence["UserWorkloadsSecret"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="UserWorkloadsSecret", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -960,12 +960,12 @@ class ListUserWorkloadsConfigMapsResponse(proto.Message): def raw_page(self): return self - user_workloads_config_maps: MutableSequence[ - "UserWorkloadsConfigMap" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="UserWorkloadsConfigMap", + user_workloads_config_maps: MutableSequence["UserWorkloadsConfigMap"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="UserWorkloadsConfigMap", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1050,6 +1050,7 @@ class ComposerWorkloadType(proto.Enum): REDIS (8): Redis. """ + COMPOSER_WORKLOAD_TYPE_UNSPECIFIED = 0 CELERY_WORKER = 1 KUBERNETES_WORKER = 2 @@ -1082,6 +1083,7 @@ class ComposerWorkloadState(proto.Enum): FAILED (6): Workload has finished execution with failure. """ + COMPOSER_WORKLOAD_STATE_UNSPECIFIED = 0 PENDING = 1 OK = 2 @@ -1470,6 +1472,7 @@ class EnvironmentSize(proto.Enum): ENVIRONMENT_SIZE_LARGE (3): The environment size is large. """ + ENVIRONMENT_SIZE_UNSPECIFIED = 0 ENVIRONMENT_SIZE_SMALL = 1 ENVIRONMENT_SIZE_MEDIUM = 2 @@ -1486,6 +1489,7 @@ class ResilienceMode(proto.Enum): Enabled High Resilience mode, including Cloud SQL HA. """ + RESILIENCE_MODE_UNSPECIFIED = 0 HIGH_RESILIENCE = 1 @@ -1871,6 +1875,7 @@ class WebServerPluginsMode(proto.Enum): PLUGINS_ENABLED (2): Web server plugins are supported. """ + WEB_SERVER_PLUGINS_MODE_UNSPECIFIED = 0 PLUGINS_DISABLED = 1 PLUGINS_ENABLED = 2 @@ -2280,6 +2285,7 @@ class ConnectionType(proto.Enum): Requests the use of Private Service Connect for connecting the Customer and Tenant projects. """ + CONNECTION_TYPE_UNSPECIFIED = 0 VPC_PEERING = 1 PRIVATE_SERVICE_CONNECT = 2 @@ -2826,6 +2832,7 @@ class State(proto.Enum): The environment has encountered an error and cannot be used. """ + STATE_UNSPECIFIED = 0 CREATING = 1 RUNNING = 2 @@ -2970,6 +2977,7 @@ class ConflictResult(proto.Enum): NO_CONFLICT (2): There were no python packages conflicts. """ + CONFLICT_RESULT_UNSPECIFIED = 0 CONFLICT = 1 NO_CONFLICT = 2 @@ -3047,6 +3055,7 @@ class TaskLogsStorageMode(proto.Enum): CLOUD_LOGGING_ONLY (2): Store task logs in Cloud Logging only. """ + TASK_LOGS_STORAGE_MODE_UNSPECIFIED = 0 CLOUD_LOGGING_AND_CLOUD_STORAGE = 1 CLOUD_LOGGING_ONLY = 2 @@ -3082,6 +3091,7 @@ class RetentionMode(proto.Enum): RETENTION_MODE_DISABLED (2): Retention policy is disabled. """ + RETENTION_MODE_UNSPECIFIED = 0 RETENTION_MODE_ENABLED = 1 RETENTION_MODE_DISABLED = 2 diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/image_versions.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/image_versions.py index 5da0e22b28f5..5c49e8e1e254 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/image_versions.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/image_versions.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.type import date_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/operations.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/operations.py index e077e8b614b2..f062e8345538 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/operations.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1/types/operations.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -73,6 +73,7 @@ class State(proto.Enum): The operation is no longer running but did not succeed. """ + _pb_options = {"allow_alias": True} STATE_UNSPECIFIED = 0 PENDING = 1 @@ -104,6 +105,7 @@ class Type(proto.Enum): instance (only for highly resilient environments). """ + TYPE_UNSPECIFIED = 0 CREATE = 1 DELETE = 2 diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/__init__.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/__init__.py index 63f93aa531e0..8f30761936d0 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/__init__.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/__init__.py @@ -30,6 +30,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.environments import EnvironmentsAsyncClient, EnvironmentsClient from .services.image_versions import ImageVersionsAsyncClient, ImageVersionsClient from .types.environments import ( @@ -106,7 +107,9 @@ api_core, "check_dependency_versions" ): # pragma: NO COVER api_core.check_python_version("google.cloud.orchestration.airflow.service_v1beta1") # type: ignore - api_core.check_dependency_versions("google.cloud.orchestration.airflow.service_v1beta1") # type: ignore + api_core.check_dependency_versions( + "google.cloud.orchestration.airflow.service_v1beta1" + ) # type: ignore else: # pragma: NO COVER # An older version of api_core is installed which does not define the # functions above. We do equivalent checks manually. diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/async_client.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/async_client.py index f5c5cc829e8e..817ca3565966 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/async_client.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.orchestration.airflow.service_v1beta1 import ( gapic_version as package_version, @@ -46,12 +46,12 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.orchestration.airflow.service_v1beta1.services.environments import ( pagers, @@ -135,7 +135,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_info.__func__(EnvironmentsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = EnvironmentsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(EnvironmentsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -151,7 +152,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EnvironmentsAsyncClient: The constructed client. """ - return EnvironmentsClient.from_service_account_file.__func__(EnvironmentsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = EnvironmentsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(EnvironmentsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/client.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/client.py index fd549473e339..f00d54c9b6bf 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/client.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.orchestration.airflow.service_v1beta1 import ( gapic_version as package_version, @@ -63,12 +63,12 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.orchestration.airflow.service_v1beta1.services.environments import ( pagers, @@ -682,11 +682,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EnvironmentsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EnvironmentsClient._read_environment_variables() + ) self._client_cert_source = EnvironmentsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -721,8 +719,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EnvironmentsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/pagers.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/pagers.py index 7c6172ecf929..d7ba7d58316d 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/pagers.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -381,7 +381,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -539,7 +539,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -617,7 +617,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/base.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/base.py index 8ce5d78bff18..581ff3787d95 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/base.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.orchestration.airflow.service_v1beta1 import ( gapic_version as package_version, @@ -587,7 +587,10 @@ def get_operation( @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc.py index ab9d56848c86..3c6e6d0d18fc 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.orchestration.airflow.service_v1beta1.types import environments @@ -671,12 +671,12 @@ def create_user_workloads_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_user_workloads_secret" not in self._stubs: - self._stubs[ - "create_user_workloads_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/CreateUserWorkloadsSecret", - request_serializer=environments.CreateUserWorkloadsSecretRequest.serialize, - response_deserializer=environments.UserWorkloadsSecret.deserialize, + self._stubs["create_user_workloads_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/CreateUserWorkloadsSecret", + request_serializer=environments.CreateUserWorkloadsSecretRequest.serialize, + response_deserializer=environments.UserWorkloadsSecret.deserialize, + ) ) return self._stubs["create_user_workloads_secret"] @@ -737,12 +737,12 @@ def list_user_workloads_secrets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_user_workloads_secrets" not in self._stubs: - self._stubs[ - "list_user_workloads_secrets" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/ListUserWorkloadsSecrets", - request_serializer=environments.ListUserWorkloadsSecretsRequest.serialize, - response_deserializer=environments.ListUserWorkloadsSecretsResponse.deserialize, + self._stubs["list_user_workloads_secrets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/ListUserWorkloadsSecrets", + request_serializer=environments.ListUserWorkloadsSecretsRequest.serialize, + response_deserializer=environments.ListUserWorkloadsSecretsResponse.deserialize, + ) ) return self._stubs["list_user_workloads_secrets"] @@ -771,12 +771,12 @@ def update_user_workloads_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_user_workloads_secret" not in self._stubs: - self._stubs[ - "update_user_workloads_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/UpdateUserWorkloadsSecret", - request_serializer=environments.UpdateUserWorkloadsSecretRequest.serialize, - response_deserializer=environments.UserWorkloadsSecret.deserialize, + self._stubs["update_user_workloads_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/UpdateUserWorkloadsSecret", + request_serializer=environments.UpdateUserWorkloadsSecretRequest.serialize, + response_deserializer=environments.UserWorkloadsSecret.deserialize, + ) ) return self._stubs["update_user_workloads_secret"] @@ -802,12 +802,12 @@ def delete_user_workloads_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_user_workloads_secret" not in self._stubs: - self._stubs[ - "delete_user_workloads_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/DeleteUserWorkloadsSecret", - request_serializer=environments.DeleteUserWorkloadsSecretRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_user_workloads_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/DeleteUserWorkloadsSecret", + request_serializer=environments.DeleteUserWorkloadsSecretRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_user_workloads_secret"] @@ -837,12 +837,12 @@ def create_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_user_workloads_config_map" not in self._stubs: - self._stubs[ - "create_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/CreateUserWorkloadsConfigMap", - request_serializer=environments.CreateUserWorkloadsConfigMapRequest.serialize, - response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + self._stubs["create_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/CreateUserWorkloadsConfigMap", + request_serializer=environments.CreateUserWorkloadsConfigMapRequest.serialize, + response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + ) ) return self._stubs["create_user_workloads_config_map"] @@ -871,12 +871,12 @@ def get_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_user_workloads_config_map" not in self._stubs: - self._stubs[ - "get_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/GetUserWorkloadsConfigMap", - request_serializer=environments.GetUserWorkloadsConfigMapRequest.serialize, - response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + self._stubs["get_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/GetUserWorkloadsConfigMap", + request_serializer=environments.GetUserWorkloadsConfigMapRequest.serialize, + response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + ) ) return self._stubs["get_user_workloads_config_map"] @@ -906,12 +906,12 @@ def list_user_workloads_config_maps( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_user_workloads_config_maps" not in self._stubs: - self._stubs[ - "list_user_workloads_config_maps" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/ListUserWorkloadsConfigMaps", - request_serializer=environments.ListUserWorkloadsConfigMapsRequest.serialize, - response_deserializer=environments.ListUserWorkloadsConfigMapsResponse.deserialize, + self._stubs["list_user_workloads_config_maps"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/ListUserWorkloadsConfigMaps", + request_serializer=environments.ListUserWorkloadsConfigMapsRequest.serialize, + response_deserializer=environments.ListUserWorkloadsConfigMapsResponse.deserialize, + ) ) return self._stubs["list_user_workloads_config_maps"] @@ -941,12 +941,12 @@ def update_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_user_workloads_config_map" not in self._stubs: - self._stubs[ - "update_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/UpdateUserWorkloadsConfigMap", - request_serializer=environments.UpdateUserWorkloadsConfigMapRequest.serialize, - response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + self._stubs["update_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/UpdateUserWorkloadsConfigMap", + request_serializer=environments.UpdateUserWorkloadsConfigMapRequest.serialize, + response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + ) ) return self._stubs["update_user_workloads_config_map"] @@ -973,12 +973,12 @@ def delete_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_user_workloads_config_map" not in self._stubs: - self._stubs[ - "delete_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/DeleteUserWorkloadsConfigMap", - request_serializer=environments.DeleteUserWorkloadsConfigMapRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/DeleteUserWorkloadsConfigMap", + request_serializer=environments.DeleteUserWorkloadsConfigMapRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_user_workloads_config_map"] diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc_asyncio.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc_asyncio.py index b543b45eddac..a291c136a173 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc_asyncio.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.orchestration.airflow.service_v1beta1.types import environments @@ -693,12 +693,12 @@ def create_user_workloads_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_user_workloads_secret" not in self._stubs: - self._stubs[ - "create_user_workloads_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/CreateUserWorkloadsSecret", - request_serializer=environments.CreateUserWorkloadsSecretRequest.serialize, - response_deserializer=environments.UserWorkloadsSecret.deserialize, + self._stubs["create_user_workloads_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/CreateUserWorkloadsSecret", + request_serializer=environments.CreateUserWorkloadsSecretRequest.serialize, + response_deserializer=environments.UserWorkloadsSecret.deserialize, + ) ) return self._stubs["create_user_workloads_secret"] @@ -760,12 +760,12 @@ def list_user_workloads_secrets( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_user_workloads_secrets" not in self._stubs: - self._stubs[ - "list_user_workloads_secrets" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/ListUserWorkloadsSecrets", - request_serializer=environments.ListUserWorkloadsSecretsRequest.serialize, - response_deserializer=environments.ListUserWorkloadsSecretsResponse.deserialize, + self._stubs["list_user_workloads_secrets"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/ListUserWorkloadsSecrets", + request_serializer=environments.ListUserWorkloadsSecretsRequest.serialize, + response_deserializer=environments.ListUserWorkloadsSecretsResponse.deserialize, + ) ) return self._stubs["list_user_workloads_secrets"] @@ -794,12 +794,12 @@ def update_user_workloads_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_user_workloads_secret" not in self._stubs: - self._stubs[ - "update_user_workloads_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/UpdateUserWorkloadsSecret", - request_serializer=environments.UpdateUserWorkloadsSecretRequest.serialize, - response_deserializer=environments.UserWorkloadsSecret.deserialize, + self._stubs["update_user_workloads_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/UpdateUserWorkloadsSecret", + request_serializer=environments.UpdateUserWorkloadsSecretRequest.serialize, + response_deserializer=environments.UserWorkloadsSecret.deserialize, + ) ) return self._stubs["update_user_workloads_secret"] @@ -827,12 +827,12 @@ def delete_user_workloads_secret( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_user_workloads_secret" not in self._stubs: - self._stubs[ - "delete_user_workloads_secret" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/DeleteUserWorkloadsSecret", - request_serializer=environments.DeleteUserWorkloadsSecretRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_user_workloads_secret"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/DeleteUserWorkloadsSecret", + request_serializer=environments.DeleteUserWorkloadsSecretRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_user_workloads_secret"] @@ -862,12 +862,12 @@ def create_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_user_workloads_config_map" not in self._stubs: - self._stubs[ - "create_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/CreateUserWorkloadsConfigMap", - request_serializer=environments.CreateUserWorkloadsConfigMapRequest.serialize, - response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + self._stubs["create_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/CreateUserWorkloadsConfigMap", + request_serializer=environments.CreateUserWorkloadsConfigMapRequest.serialize, + response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + ) ) return self._stubs["create_user_workloads_config_map"] @@ -896,12 +896,12 @@ def get_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_user_workloads_config_map" not in self._stubs: - self._stubs[ - "get_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/GetUserWorkloadsConfigMap", - request_serializer=environments.GetUserWorkloadsConfigMapRequest.serialize, - response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + self._stubs["get_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/GetUserWorkloadsConfigMap", + request_serializer=environments.GetUserWorkloadsConfigMapRequest.serialize, + response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + ) ) return self._stubs["get_user_workloads_config_map"] @@ -931,12 +931,12 @@ def list_user_workloads_config_maps( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_user_workloads_config_maps" not in self._stubs: - self._stubs[ - "list_user_workloads_config_maps" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/ListUserWorkloadsConfigMaps", - request_serializer=environments.ListUserWorkloadsConfigMapsRequest.serialize, - response_deserializer=environments.ListUserWorkloadsConfigMapsResponse.deserialize, + self._stubs["list_user_workloads_config_maps"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/ListUserWorkloadsConfigMaps", + request_serializer=environments.ListUserWorkloadsConfigMapsRequest.serialize, + response_deserializer=environments.ListUserWorkloadsConfigMapsResponse.deserialize, + ) ) return self._stubs["list_user_workloads_config_maps"] @@ -966,12 +966,12 @@ def update_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_user_workloads_config_map" not in self._stubs: - self._stubs[ - "update_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/UpdateUserWorkloadsConfigMap", - request_serializer=environments.UpdateUserWorkloadsConfigMapRequest.serialize, - response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + self._stubs["update_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/UpdateUserWorkloadsConfigMap", + request_serializer=environments.UpdateUserWorkloadsConfigMapRequest.serialize, + response_deserializer=environments.UserWorkloadsConfigMap.deserialize, + ) ) return self._stubs["update_user_workloads_config_map"] @@ -1000,12 +1000,12 @@ def delete_user_workloads_config_map( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_user_workloads_config_map" not in self._stubs: - self._stubs[ - "delete_user_workloads_config_map" - ] = self._logged_channel.unary_unary( - "/google.cloud.orchestration.airflow.service.v1beta1.Environments/DeleteUserWorkloadsConfigMap", - request_serializer=environments.DeleteUserWorkloadsConfigMapRequest.serialize, - response_deserializer=empty_pb2.Empty.FromString, + self._stubs["delete_user_workloads_config_map"] = ( + self._logged_channel.unary_unary( + "/google.cloud.orchestration.airflow.service.v1beta1.Environments/DeleteUserWorkloadsConfigMap", + request_serializer=environments.DeleteUserWorkloadsConfigMapRequest.serialize, + response_deserializer=empty_pb2.Empty.FromString, + ) ) return self._stubs["delete_user_workloads_config_map"] diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/rest.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/rest.py index e3ecc7e09ea8..8e4e136fb727 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/rest.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -1745,7 +1745,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1870,9 +1870,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateEnvironment._get_http_options() request, metadata = self._interceptor.pre_create_environment( request, metadata @@ -1898,7 +1896,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2026,9 +2024,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateUserWorkloadsConfigMap._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateUserWorkloadsConfigMap._get_http_options() request, metadata = self._interceptor.pre_create_user_workloads_config_map( request, metadata @@ -2099,11 +2095,10 @@ def __call__( resp = self._interceptor.post_create_user_workloads_config_map(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_user_workloads_config_map_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_user_workloads_config_map_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2190,9 +2185,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseCreateUserWorkloadsSecret._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseCreateUserWorkloadsSecret._get_http_options() request, metadata = self._interceptor.pre_create_user_workloads_secret( request, metadata @@ -2379,7 +2372,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2503,9 +2496,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteEnvironment._get_http_options() request, metadata = self._interceptor.pre_delete_environment( request, metadata @@ -2527,7 +2518,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2646,9 +2637,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteUserWorkloadsConfigMap._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteUserWorkloadsConfigMap._get_http_options() request, metadata = self._interceptor.pre_delete_user_workloads_config_map( request, metadata @@ -2670,7 +2659,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2758,9 +2747,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseDeleteUserWorkloadsSecret._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseDeleteUserWorkloadsSecret._get_http_options() request, metadata = self._interceptor.pre_delete_user_workloads_secret( request, metadata @@ -2782,7 +2769,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2875,9 +2862,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseExecuteAirflowCommand._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseExecuteAirflowCommand._get_http_options() request, metadata = self._interceptor.pre_execute_airflow_command( request, metadata @@ -3032,9 +3017,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseFetchDatabaseProperties._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseFetchDatabaseProperties._get_http_options() request, metadata = self._interceptor.pre_fetch_database_properties( request, metadata @@ -3331,9 +3314,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseGetUserWorkloadsConfigMap._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseGetUserWorkloadsConfigMap._get_http_options() request, metadata = self._interceptor.pre_get_user_workloads_config_map( request, metadata @@ -3399,11 +3380,10 @@ def __call__( resp = self._interceptor.post_get_user_workloads_config_map(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_user_workloads_config_map_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_user_workloads_config_map_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3487,9 +3467,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseGetUserWorkloadsSecret._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseGetUserWorkloadsSecret._get_http_options() request, metadata = self._interceptor.pre_get_user_workloads_secret( request, metadata @@ -3791,9 +3769,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseListUserWorkloadsConfigMaps._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseListUserWorkloadsConfigMaps._get_http_options() request, metadata = self._interceptor.pre_list_user_workloads_config_maps( request, metadata @@ -3859,11 +3835,10 @@ def __call__( resp = self._interceptor.post_list_user_workloads_config_maps(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_user_workloads_config_maps_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_user_workloads_config_maps_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3950,9 +3925,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseListUserWorkloadsSecrets._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseListUserWorkloadsSecrets._get_http_options() request, metadata = self._interceptor.pre_list_user_workloads_secrets( request, metadata @@ -4282,7 +4255,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4406,9 +4379,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BasePollAirflowCommand._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BasePollAirflowCommand._get_http_options() request, metadata = self._interceptor.pre_poll_airflow_command( request, metadata @@ -4591,7 +4562,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4747,7 +4718,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4871,9 +4842,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseStopAirflowCommand._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseStopAirflowCommand._get_http_options() request, metadata = self._interceptor.pre_stop_airflow_command( request, metadata @@ -5028,9 +4997,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateEnvironment._get_http_options() request, metadata = self._interceptor.pre_update_environment( request, metadata @@ -5056,7 +5023,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5184,9 +5151,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateUserWorkloadsConfigMap._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateUserWorkloadsConfigMap._get_http_options() request, metadata = self._interceptor.pre_update_user_workloads_config_map( request, metadata @@ -5257,11 +5222,10 @@ def __call__( resp = self._interceptor.post_update_user_workloads_config_map(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_user_workloads_config_map_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_user_workloads_config_map_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5348,9 +5312,7 @@ def __call__( """ - http_options = ( - _BaseEnvironmentsRestTransport._BaseUpdateUserWorkloadsSecret._get_http_options() - ) + http_options = _BaseEnvironmentsRestTransport._BaseUpdateUserWorkloadsSecret._get_http_options() request, metadata = self._interceptor.pre_update_user_workloads_secret( request, metadata @@ -5474,7 +5436,9 @@ def create_user_workloads_config_map( ]: # 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._CreateUserWorkloadsConfigMap(self._session, self._host, self._interceptor) # type: ignore + return self._CreateUserWorkloadsConfigMap( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_user_workloads_secret( @@ -5485,7 +5449,9 @@ def create_user_workloads_secret( ]: # 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._CreateUserWorkloadsSecret(self._session, self._host, self._interceptor) # type: ignore + return self._CreateUserWorkloadsSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def database_failover( @@ -5509,7 +5475,9 @@ def delete_user_workloads_config_map( ) -> Callable[[environments.DeleteUserWorkloadsConfigMapRequest], empty_pb2.Empty]: # 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._DeleteUserWorkloadsConfigMap(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteUserWorkloadsConfigMap( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_user_workloads_secret( @@ -5517,7 +5485,9 @@ def delete_user_workloads_secret( ) -> Callable[[environments.DeleteUserWorkloadsSecretRequest], empty_pb2.Empty]: # 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._DeleteUserWorkloadsSecret(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteUserWorkloadsSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def execute_airflow_command( @@ -5539,7 +5509,9 @@ def fetch_database_properties( ]: # 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._FetchDatabaseProperties(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDatabaseProperties( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_environment( @@ -5558,7 +5530,9 @@ def get_user_workloads_config_map( ]: # 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._GetUserWorkloadsConfigMap(self._session, self._host, self._interceptor) # type: ignore + return self._GetUserWorkloadsConfigMap( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_user_workloads_secret( @@ -5568,7 +5542,9 @@ def get_user_workloads_secret( ]: # 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._GetUserWorkloadsSecret(self._session, self._host, self._interceptor) # type: ignore + return self._GetUserWorkloadsSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_environments( @@ -5589,7 +5565,9 @@ def list_user_workloads_config_maps( ]: # 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._ListUserWorkloadsConfigMaps(self._session, self._host, self._interceptor) # type: ignore + return self._ListUserWorkloadsConfigMaps( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_user_workloads_secrets( @@ -5600,7 +5578,9 @@ def list_user_workloads_secrets( ]: # 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._ListUserWorkloadsSecrets(self._session, self._host, self._interceptor) # type: ignore + return self._ListUserWorkloadsSecrets( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_workloads( @@ -5675,7 +5655,9 @@ def update_user_workloads_config_map( ]: # 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._UpdateUserWorkloadsConfigMap(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateUserWorkloadsConfigMap( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_user_workloads_secret( @@ -5686,7 +5668,9 @@ def update_user_workloads_secret( ]: # 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._UpdateUserWorkloadsSecret(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateUserWorkloadsSecret( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_operation(self): diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/rest_base.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/rest_base.py index 2e1aea62e2c0..637a66df3139 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/rest_base.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/environments/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.orchestration.airflow.service_v1beta1.types import environments diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/async_client.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/async_client.py index 5c8ac9aa64be..f79fb724b91a 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/async_client.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.orchestration.airflow.service_v1beta1 import ( gapic_version as package_version, @@ -117,7 +117,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ImageVersionsAsyncClient: The constructed client. """ - return ImageVersionsClient.from_service_account_info.__func__(ImageVersionsAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ImageVersionsClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ImageVersionsAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -133,7 +134,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ImageVersionsAsyncClient: The constructed client. """ - return ImageVersionsClient.from_service_account_file.__func__(ImageVersionsAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ImageVersionsClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ImageVersionsAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/client.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/client.py index 642b26b3956b..4c4671d6517a 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/client.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.orchestration.airflow.service_v1beta1 import ( gapic_version as package_version, @@ -602,11 +602,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ImageVersionsClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ImageVersionsClient._read_environment_variables() + ) self._client_cert_source = ImageVersionsClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +639,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ImageVersionsTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/pagers.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/pagers.py index 2f876de7bcfd..48b632506ab4 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/pagers.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/base.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/base.py index 7b29a94aac49..9db9f2462560 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/base.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.orchestration.airflow.service_v1beta1 import ( gapic_version as package_version, @@ -206,7 +206,10 @@ def get_operation( @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/grpc.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/grpc.py index 54254cbddb74..441bfc15b093 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/grpc.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.orchestration.airflow.service_v1beta1.types import image_versions diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/grpc_asyncio.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/grpc_asyncio.py index fded09b08595..d281101e1388 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/grpc_asyncio.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.orchestration.airflow.service_v1beta1.types import image_versions diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/rest.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/rest.py index 79468d065475..9af09e0d92a5 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/rest.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/services/image_versions/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -356,9 +356,7 @@ def __call__( """ - http_options = ( - _BaseImageVersionsRestTransport._BaseListImageVersions._get_http_options() - ) + http_options = _BaseImageVersionsRestTransport._BaseListImageVersions._get_http_options() request, metadata = self._interceptor.pre_list_image_versions( request, metadata diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/__init__.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/__init__.py index 16a16e42445f..cd3ef27f6da0 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/__init__.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/__init__.py @@ -81,7 +81,9 @@ ListImageVersionsRequest, ListImageVersionsResponse, ) -from .operations import OperationMetadata +from .operations import ( + OperationMetadata, +) __all__ = ( "AirflowMetadataRetentionPolicyConfig", diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py index f31ff768695b..433e9626fd99 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -952,12 +952,12 @@ class ListUserWorkloadsSecretsResponse(proto.Message): def raw_page(self): return self - user_workloads_secrets: MutableSequence[ - "UserWorkloadsSecret" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="UserWorkloadsSecret", + user_workloads_secrets: MutableSequence["UserWorkloadsSecret"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="UserWorkloadsSecret", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1012,12 +1012,12 @@ class ListUserWorkloadsConfigMapsResponse(proto.Message): def raw_page(self): return self - user_workloads_config_maps: MutableSequence[ - "UserWorkloadsConfigMap" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="UserWorkloadsConfigMap", + user_workloads_config_maps: MutableSequence["UserWorkloadsConfigMap"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="UserWorkloadsConfigMap", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1102,6 +1102,7 @@ class ComposerWorkloadType(proto.Enum): REDIS (8): Redis. """ + COMPOSER_WORKLOAD_TYPE_UNSPECIFIED = 0 CELERY_WORKER = 1 KUBERNETES_WORKER = 2 @@ -1134,6 +1135,7 @@ class ComposerWorkloadState(proto.Enum): FAILED (6): Workload has finished execution with failure. """ + COMPOSER_WORKLOAD_STATE_UNSPECIFIED = 0 PENDING = 1 OK = 2 @@ -1510,6 +1512,7 @@ class EnvironmentSize(proto.Enum): ENVIRONMENT_SIZE_LARGE (3): The environment size is large. """ + ENVIRONMENT_SIZE_UNSPECIFIED = 0 ENVIRONMENT_SIZE_SMALL = 1 ENVIRONMENT_SIZE_MEDIUM = 2 @@ -1526,6 +1529,7 @@ class ResilienceMode(proto.Enum): Enabled High Resilience mode, including Cloud SQL HA. """ + RESILIENCE_MODE_UNSPECIFIED = 0 HIGH_RESILIENCE = 1 @@ -1791,6 +1795,7 @@ class WebServerPluginsMode(proto.Enum): PLUGINS_ENABLED (2): Web server plugins are supported. """ + WEB_SERVER_PLUGINS_MODE_UNSPECIFIED = 0 PLUGINS_DISABLED = 1 PLUGINS_ENABLED = 2 @@ -2208,6 +2213,7 @@ class ConnectionType(proto.Enum): Requests the use of Private Service Connect for connecting the Customer and Tenant projects. """ + CONNECTION_TYPE_UNSPECIFIED = 0 VPC_PEERING = 1 PRIVATE_SERVICE_CONNECT = 2 @@ -2744,6 +2750,7 @@ class TaskLogsStorageMode(proto.Enum): CLOUD_LOGGING_ONLY (2): Store task logs in Cloud Logging only. """ + TASK_LOGS_STORAGE_MODE_UNSPECIFIED = 0 CLOUD_LOGGING_AND_CLOUD_STORAGE = 1 CLOUD_LOGGING_ONLY = 2 @@ -2779,6 +2786,7 @@ class RetentionMode(proto.Enum): RETENTION_MODE_DISABLED (2): Retention policy is disabled. """ + RETENTION_MODE_UNSPECIFIED = 0 RETENTION_MODE_ENABLED = 1 RETENTION_MODE_DISABLED = 2 @@ -2998,6 +3006,7 @@ class State(proto.Enum): The environment has encountered an error and cannot be used. """ + STATE_UNSPECIFIED = 0 CREATING = 1 RUNNING = 2 @@ -3142,6 +3151,7 @@ class ConflictResult(proto.Enum): NO_CONFLICT (2): There were no python packages conflicts. """ + CONFLICT_RESULT_UNSPECIFIED = 0 CONFLICT = 1 NO_CONFLICT = 2 diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/image_versions.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/image_versions.py index 36b820ed3b46..052d7dab97e1 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/image_versions.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/image_versions.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.type import date_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( diff --git a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/operations.py b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/operations.py index ad3c4a86b8ba..7141d1e0ab1e 100644 --- a/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/operations.py +++ b/packages/google-cloud-orchestration-airflow/google/cloud/orchestration/airflow/service_v1beta1/types/operations.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -71,6 +71,7 @@ class State(proto.Enum): The operation is no longer running but did not succeed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 @@ -100,6 +101,7 @@ class Type(proto.Enum): instance (only for highly resilient environments). """ + TYPE_UNSPECIFIED = 0 CREATE = 1 DELETE = 2 diff --git a/packages/google-cloud-orchestration-airflow/noxfile.py b/packages/google-cloud-orchestration-airflow/noxfile.py index 0bdf14889893..a6c6f863caeb 100644 --- a/packages/google-cloud-orchestration-airflow/noxfile.py +++ b/packages/google-cloud-orchestration-airflow/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1/test_environments.py b/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1/test_environments.py index e51ee7f82a27..884c65a91a07 100644 --- a/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1/test_environments.py +++ b/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1/test_environments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.orchestration.airflow.service_v1.services.environments import ( EnvironmentsAsyncClient, @@ -939,10 +939,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -987,10 +986,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1026,10 +1024,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1268,13 +1265,13 @@ def test_environments_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1384,9 +1381,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -2081,9 +2078,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -2621,9 +2618,9 @@ def test_update_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -2986,9 +2983,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -3615,9 +3612,9 @@ def test_stop_airflow_command_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_airflow_command - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_airflow_command] = ( + mock_rpc + ) request = {} client.stop_airflow_command(request) @@ -3878,9 +3875,9 @@ def test_poll_airflow_command_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.poll_airflow_command - ] = mock_rpc + client._transport._wrapped_methods[client._transport.poll_airflow_command] = ( + mock_rpc + ) request = {} client.poll_airflow_command(request) @@ -9244,9 +9241,9 @@ def test_database_failover_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.database_failover - ] = mock_rpc + client._transport._wrapped_methods[client._transport.database_failover] = ( + mock_rpc + ) request = {} client.database_failover(request) @@ -9703,9 +9700,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -9899,9 +9896,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -10060,9 +10057,9 @@ def test_update_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -10166,9 +10163,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -10309,9 +10306,9 @@ def test_stop_airflow_command_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_airflow_command - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_airflow_command] = ( + mock_rpc + ) request = {} client.stop_airflow_command(request) @@ -10349,9 +10346,9 @@ def test_poll_airflow_command_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.poll_airflow_command - ] = mock_rpc + client._transport._wrapped_methods[client._transport.poll_airflow_command] = ( + mock_rpc + ) request = {} client.poll_airflow_command(request) @@ -12735,9 +12732,9 @@ def test_database_failover_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.database_failover - ] = mock_rpc + client._transport._wrapped_methods[client._transport.database_failover] = ( + mock_rpc + ) request = {} client.database_failover(request) @@ -14235,8 +14232,9 @@ def test_create_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14490,19 +14488,21 @@ def test_create_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_create_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_create_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_create_environment" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_create_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_create_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_create_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14555,8 +14555,9 @@ def test_get_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14627,17 +14628,19 @@ def test_get_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_get_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_get_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_get_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_get_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14690,8 +14693,9 @@ def test_list_environments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14754,17 +14758,20 @@ def test_list_environments_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_environments" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_list_environments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_environments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_environments" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_environments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_list_environments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14822,8 +14829,9 @@ def test_update_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15077,19 +15085,21 @@ def test_update_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_update_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_update_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_update_environment" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_update_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_update_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_update_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15142,8 +15152,9 @@ def test_delete_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15200,19 +15211,21 @@ def test_delete_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_delete_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_delete_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_delete_environment" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_delete_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_delete_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_delete_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15267,8 +15280,9 @@ def test_execute_airflow_command_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15339,18 +15353,20 @@ def test_execute_airflow_command_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_execute_airflow_command" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_execute_airflow_command_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_execute_airflow_command" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_execute_airflow_command" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_execute_airflow_command_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_execute_airflow_command" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15410,8 +15426,9 @@ def test_stop_airflow_command_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15478,18 +15495,20 @@ def test_stop_airflow_command_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_stop_airflow_command" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_stop_airflow_command_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_stop_airflow_command" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_stop_airflow_command" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_stop_airflow_command_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_stop_airflow_command" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15549,8 +15568,9 @@ def test_poll_airflow_command_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15615,18 +15635,20 @@ def test_poll_airflow_command_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_poll_airflow_command" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_poll_airflow_command_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_poll_airflow_command" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_poll_airflow_command" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_poll_airflow_command_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_poll_airflow_command" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15684,8 +15706,9 @@ def test_list_workloads_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15748,17 +15771,19 @@ def test_list_workloads_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_workloads" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_list_workloads_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_workloads" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_workloads" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_workloads_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_list_workloads" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15813,8 +15838,9 @@ def test_check_upgrade_rest_bad_request(request_type=environments.CheckUpgradeRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15873,19 +15899,20 @@ def test_check_upgrade_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_check_upgrade" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_check_upgrade_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_check_upgrade" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_check_upgrade" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_check_upgrade_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_check_upgrade" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15938,8 +15965,9 @@ def test_create_user_workloads_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16074,18 +16102,20 @@ def test_create_user_workloads_secret_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_create_user_workloads_secret" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_create_user_workloads_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_create_user_workloads_secret" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_create_user_workloads_secret" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_create_user_workloads_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_create_user_workloads_secret" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16142,8 +16172,9 @@ def test_get_user_workloads_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16208,18 +16239,20 @@ def test_get_user_workloads_secret_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_get_user_workloads_secret" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_get_user_workloads_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_get_user_workloads_secret" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_user_workloads_secret" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_get_user_workloads_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_get_user_workloads_secret" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16274,8 +16307,9 @@ def test_list_user_workloads_secrets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16338,18 +16372,20 @@ def test_list_user_workloads_secrets_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_user_workloads_secrets" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_list_user_workloads_secrets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_user_workloads_secrets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_user_workloads_secrets" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_user_workloads_secrets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_list_user_workloads_secrets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16411,8 +16447,9 @@ def test_update_user_workloads_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16554,18 +16591,20 @@ def test_update_user_workloads_secret_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_update_user_workloads_secret" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_update_user_workloads_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_update_user_workloads_secret" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_update_user_workloads_secret" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_update_user_workloads_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_update_user_workloads_secret" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16622,8 +16661,9 @@ def test_delete_user_workloads_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16682,13 +16722,13 @@ def test_delete_user_workloads_secret_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "pre_delete_user_workloads_secret" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_delete_user_workloads_secret" + ) as pre, + ): pre.assert_not_called() pb_message = environments.DeleteUserWorkloadsSecretRequest.pb( environments.DeleteUserWorkloadsSecretRequest() @@ -16733,8 +16773,9 @@ def test_create_user_workloads_config_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16871,18 +16912,22 @@ def test_create_user_workloads_config_map_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_create_user_workloads_config_map" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_create_user_workloads_config_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_create_user_workloads_config_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_create_user_workloads_config_map", + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_create_user_workloads_config_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "pre_create_user_workloads_config_map", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16942,8 +16987,9 @@ def test_get_user_workloads_config_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17008,18 +17054,20 @@ def test_get_user_workloads_config_map_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_get_user_workloads_config_map" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_get_user_workloads_config_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_get_user_workloads_config_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_user_workloads_config_map" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_get_user_workloads_config_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_get_user_workloads_config_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17077,8 +17125,9 @@ def test_list_user_workloads_config_maps_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17141,18 +17190,22 @@ def test_list_user_workloads_config_maps_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_user_workloads_config_maps" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_list_user_workloads_config_maps_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_user_workloads_config_maps" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_user_workloads_config_maps", + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_user_workloads_config_maps_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "pre_list_user_workloads_config_maps", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17214,8 +17267,9 @@ def test_update_user_workloads_config_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17359,18 +17413,22 @@ def test_update_user_workloads_config_map_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_update_user_workloads_config_map" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_update_user_workloads_config_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_update_user_workloads_config_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_update_user_workloads_config_map", + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_update_user_workloads_config_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "pre_update_user_workloads_config_map", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17430,8 +17488,9 @@ def test_delete_user_workloads_config_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17490,13 +17549,14 @@ def test_delete_user_workloads_config_map_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "pre_delete_user_workloads_config_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "pre_delete_user_workloads_config_map", + ) as pre, + ): pre.assert_not_called() pb_message = environments.DeleteUserWorkloadsConfigMapRequest.pb( environments.DeleteUserWorkloadsConfigMapRequest() @@ -17541,8 +17601,9 @@ def test_save_snapshot_rest_bad_request(request_type=environments.SaveSnapshotRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17601,19 +17662,20 @@ def test_save_snapshot_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_save_snapshot" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_save_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_save_snapshot" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_save_snapshot" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_save_snapshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_save_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17666,8 +17728,9 @@ def test_load_snapshot_rest_bad_request(request_type=environments.LoadSnapshotRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17726,19 +17789,20 @@ def test_load_snapshot_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_load_snapshot" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_load_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_load_snapshot" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_load_snapshot" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_load_snapshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_load_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17793,8 +17857,9 @@ def test_database_failover_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17853,19 +17918,21 @@ def test_database_failover_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_database_failover" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_database_failover_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_database_failover" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_database_failover" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_database_failover_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_database_failover" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17920,8 +17987,9 @@ def test_fetch_database_properties_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17990,18 +18058,20 @@ def test_fetch_database_properties_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_fetch_database_properties" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_fetch_database_properties_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_fetch_database_properties" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_fetch_database_properties" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_fetch_database_properties_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_fetch_database_properties" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18061,8 +18131,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18123,8 +18194,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18185,8 +18257,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18860,11 +18933,14 @@ def test_environments_base_transport(): def test_environments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.orchestration.airflow.service_v1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.orchestration.airflow.service_v1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnvironmentsTransport( @@ -18881,9 +18957,12 @@ def test_environments_base_transport_with_credentials_file(): def test_environments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.orchestration.airflow.service_v1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.orchestration.airflow.service_v1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnvironmentsTransport() @@ -18955,11 +19034,12 @@ def test_environments_transport_auth_gdch_credentials(transport_class): def test_environments_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1/test_image_versions.py b/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1/test_image_versions.py index 9a3ab7ae0fae..428d532a2baf 100644 --- a/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1/test_image_versions.py +++ b/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1/test_image_versions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -942,10 +947,9 @@ def test_image_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +994,9 @@ def test_image_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1029,10 +1032,9 @@ def test_image_versions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1275,13 +1277,13 @@ def test_image_versions_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1396,9 +1398,9 @@ def test_list_image_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_image_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_image_versions] = ( + mock_rpc + ) request = {} client.list_image_versions(request) @@ -1872,9 +1874,9 @@ def test_list_image_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_image_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_image_versions] = ( + mock_rpc + ) request = {} client.list_image_versions(request) @@ -2200,8 +2202,9 @@ def test_list_image_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2264,18 +2267,20 @@ def test_list_image_versions_rest_interceptors(null_interceptor): ) client = ImageVersionsClient(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.ImageVersionsRestInterceptor, "post_list_image_versions" - ) as post, mock.patch.object( - transports.ImageVersionsRestInterceptor, - "post_list_image_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ImageVersionsRestInterceptor, "pre_list_image_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ImageVersionsRestInterceptor, "post_list_image_versions" + ) as post, + mock.patch.object( + transports.ImageVersionsRestInterceptor, + "post_list_image_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ImageVersionsRestInterceptor, "pre_list_image_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2335,8 +2340,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2397,8 +2403,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2459,8 +2466,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2593,11 +2601,14 @@ def test_image_versions_base_transport(): def test_image_versions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.orchestration.airflow.service_v1.services.image_versions.transports.ImageVersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.orchestration.airflow.service_v1.services.image_versions.transports.ImageVersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ImageVersionsTransport( @@ -2614,9 +2625,12 @@ def test_image_versions_base_transport_with_credentials_file(): def test_image_versions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.orchestration.airflow.service_v1.services.image_versions.transports.ImageVersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.orchestration.airflow.service_v1.services.image_versions.transports.ImageVersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ImageVersionsTransport() @@ -2688,11 +2702,12 @@ def test_image_versions_transport_auth_gdch_credentials(transport_class): def test_image_versions_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1beta1/test_environments.py b/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1beta1/test_environments.py index cf61d458f1b6..31be6532d117 100644 --- a/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1beta1/test_environments.py +++ b/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1beta1/test_environments.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,18 +58,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.orchestration.airflow.service_v1beta1.services.environments import ( EnvironmentsAsyncClient, @@ -942,10 +942,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +989,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1029,10 +1027,9 @@ def test_environments_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1271,13 +1268,13 @@ def test_environments_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1387,9 +1384,9 @@ def test_create_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -2084,9 +2081,9 @@ def test_list_environments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -2624,9 +2621,9 @@ def test_update_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -2989,9 +2986,9 @@ def test_delete_environment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -3334,9 +3331,9 @@ def test_restart_web_server_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_web_server - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_web_server] = ( + mock_rpc + ) request = {} client.restart_web_server(request) @@ -4124,9 +4121,9 @@ def test_stop_airflow_command_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_airflow_command - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_airflow_command] = ( + mock_rpc + ) request = {} client.stop_airflow_command(request) @@ -4387,9 +4384,9 @@ def test_poll_airflow_command_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.poll_airflow_command - ] = mock_rpc + client._transport._wrapped_methods[client._transport.poll_airflow_command] = ( + mock_rpc + ) request = {} client.poll_airflow_command(request) @@ -9506,9 +9503,9 @@ def test_database_failover_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.database_failover - ] = mock_rpc + client._transport._wrapped_methods[client._transport.database_failover] = ( + mock_rpc + ) request = {} client.database_failover(request) @@ -9965,9 +9962,9 @@ def test_create_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_environment] = ( + mock_rpc + ) request = {} client.create_environment(request) @@ -10161,9 +10158,9 @@ def test_list_environments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_environments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_environments] = ( + mock_rpc + ) request = {} client.list_environments(request) @@ -10322,9 +10319,9 @@ def test_update_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_environment] = ( + mock_rpc + ) request = {} client.update_environment(request) @@ -10507,9 +10504,9 @@ def test_delete_environment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_environment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_environment] = ( + mock_rpc + ) request = {} client.delete_environment(request) @@ -10609,9 +10606,9 @@ def test_restart_web_server_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.restart_web_server - ] = mock_rpc + client._transport._wrapped_methods[client._transport.restart_web_server] = ( + mock_rpc + ) request = {} client.restart_web_server(request) @@ -10734,9 +10731,9 @@ def test_stop_airflow_command_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stop_airflow_command - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stop_airflow_command] = ( + mock_rpc + ) request = {} client.stop_airflow_command(request) @@ -10774,9 +10771,9 @@ def test_poll_airflow_command_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.poll_airflow_command - ] = mock_rpc + client._transport._wrapped_methods[client._transport.poll_airflow_command] = ( + mock_rpc + ) request = {} client.poll_airflow_command(request) @@ -13038,9 +13035,9 @@ def test_database_failover_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.database_failover - ] = mock_rpc + client._transport._wrapped_methods[client._transport.database_failover] = ( + mock_rpc + ) request = {} client.database_failover(request) @@ -14588,8 +14585,9 @@ def test_create_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14845,19 +14843,21 @@ def test_create_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_create_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_create_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_create_environment" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_create_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_create_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_create_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14910,8 +14910,9 @@ def test_get_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14982,17 +14983,19 @@ def test_get_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_get_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_get_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_get_environment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_environment_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_get_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15045,8 +15048,9 @@ def test_list_environments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15109,17 +15113,20 @@ def test_list_environments_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_environments" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_list_environments_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_environments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_environments" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_environments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_list_environments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15177,8 +15184,9 @@ def test_update_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15434,19 +15442,21 @@ def test_update_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_update_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_update_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_update_environment" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_update_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_update_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_update_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15499,8 +15509,9 @@ def test_delete_environment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15557,19 +15568,21 @@ def test_delete_environment_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_delete_environment" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_delete_environment_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_delete_environment" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_delete_environment" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_delete_environment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_delete_environment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15622,8 +15635,9 @@ def test_restart_web_server_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15680,19 +15694,21 @@ def test_restart_web_server_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_restart_web_server" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_restart_web_server_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_restart_web_server" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_restart_web_server" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_restart_web_server_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_restart_web_server" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15745,8 +15761,9 @@ def test_check_upgrade_rest_bad_request(request_type=environments.CheckUpgradeRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15805,19 +15822,20 @@ def test_check_upgrade_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_check_upgrade" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_check_upgrade_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_check_upgrade" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_check_upgrade" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_check_upgrade_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_check_upgrade" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15872,8 +15890,9 @@ def test_execute_airflow_command_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15944,18 +15963,20 @@ def test_execute_airflow_command_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_execute_airflow_command" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_execute_airflow_command_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_execute_airflow_command" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_execute_airflow_command" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_execute_airflow_command_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_execute_airflow_command" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16015,8 +16036,9 @@ def test_stop_airflow_command_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16083,18 +16105,20 @@ def test_stop_airflow_command_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_stop_airflow_command" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_stop_airflow_command_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_stop_airflow_command" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_stop_airflow_command" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_stop_airflow_command_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_stop_airflow_command" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16154,8 +16178,9 @@ def test_poll_airflow_command_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16220,18 +16245,20 @@ def test_poll_airflow_command_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_poll_airflow_command" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_poll_airflow_command_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_poll_airflow_command" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_poll_airflow_command" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_poll_airflow_command_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_poll_airflow_command" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16289,8 +16316,9 @@ def test_list_workloads_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16353,17 +16381,19 @@ def test_list_workloads_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_workloads" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_list_workloads_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_workloads" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_workloads" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_workloads_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_list_workloads" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16418,8 +16448,9 @@ def test_create_user_workloads_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16554,18 +16585,20 @@ def test_create_user_workloads_secret_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_create_user_workloads_secret" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_create_user_workloads_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_create_user_workloads_secret" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_create_user_workloads_secret" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_create_user_workloads_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_create_user_workloads_secret" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16622,8 +16655,9 @@ def test_get_user_workloads_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16688,18 +16722,20 @@ def test_get_user_workloads_secret_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_get_user_workloads_secret" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_get_user_workloads_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_get_user_workloads_secret" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_user_workloads_secret" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_get_user_workloads_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_get_user_workloads_secret" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16754,8 +16790,9 @@ def test_list_user_workloads_secrets_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16818,18 +16855,20 @@ def test_list_user_workloads_secrets_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_user_workloads_secrets" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_list_user_workloads_secrets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_user_workloads_secrets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_list_user_workloads_secrets" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_user_workloads_secrets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_list_user_workloads_secrets" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16891,8 +16930,9 @@ def test_update_user_workloads_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17034,18 +17074,20 @@ def test_update_user_workloads_secret_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_update_user_workloads_secret" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_update_user_workloads_secret_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_update_user_workloads_secret" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_update_user_workloads_secret" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_update_user_workloads_secret_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_update_user_workloads_secret" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17102,8 +17144,9 @@ def test_delete_user_workloads_secret_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17162,13 +17205,13 @@ def test_delete_user_workloads_secret_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "pre_delete_user_workloads_secret" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_delete_user_workloads_secret" + ) as pre, + ): pre.assert_not_called() pb_message = environments.DeleteUserWorkloadsSecretRequest.pb( environments.DeleteUserWorkloadsSecretRequest() @@ -17213,8 +17256,9 @@ def test_create_user_workloads_config_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17351,18 +17395,22 @@ def test_create_user_workloads_config_map_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_create_user_workloads_config_map" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_create_user_workloads_config_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_create_user_workloads_config_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_create_user_workloads_config_map", + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_create_user_workloads_config_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "pre_create_user_workloads_config_map", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17422,8 +17470,9 @@ def test_get_user_workloads_config_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17488,18 +17537,20 @@ def test_get_user_workloads_config_map_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_get_user_workloads_config_map" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_get_user_workloads_config_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_get_user_workloads_config_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_get_user_workloads_config_map" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_get_user_workloads_config_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_get_user_workloads_config_map" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17557,8 +17608,9 @@ def test_list_user_workloads_config_maps_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17621,18 +17673,22 @@ def test_list_user_workloads_config_maps_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_list_user_workloads_config_maps" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_list_user_workloads_config_maps_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_list_user_workloads_config_maps" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_user_workloads_config_maps", + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_list_user_workloads_config_maps_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "pre_list_user_workloads_config_maps", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17694,8 +17750,9 @@ def test_update_user_workloads_config_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17839,18 +17896,22 @@ def test_update_user_workloads_config_map_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_update_user_workloads_config_map" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_update_user_workloads_config_map_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_update_user_workloads_config_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_update_user_workloads_config_map", + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_update_user_workloads_config_map_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "pre_update_user_workloads_config_map", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17910,8 +17971,9 @@ def test_delete_user_workloads_config_map_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17970,13 +18032,14 @@ def test_delete_user_workloads_config_map_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "pre_delete_user_workloads_config_map" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "pre_delete_user_workloads_config_map", + ) as pre, + ): pre.assert_not_called() pb_message = environments.DeleteUserWorkloadsConfigMapRequest.pb( environments.DeleteUserWorkloadsConfigMapRequest() @@ -18021,8 +18084,9 @@ def test_save_snapshot_rest_bad_request(request_type=environments.SaveSnapshotRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18081,19 +18145,20 @@ def test_save_snapshot_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_save_snapshot" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_save_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_save_snapshot" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_save_snapshot" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_save_snapshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_save_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18146,8 +18211,9 @@ def test_load_snapshot_rest_bad_request(request_type=environments.LoadSnapshotRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18206,19 +18272,20 @@ def test_load_snapshot_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_load_snapshot" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_load_snapshot_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_load_snapshot" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_load_snapshot" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_load_snapshot_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_load_snapshot" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18273,8 +18340,9 @@ def test_database_failover_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18333,19 +18401,21 @@ def test_database_failover_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_database_failover" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, "post_database_failover_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_database_failover" - ) as pre: + 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.EnvironmentsRestInterceptor, "post_database_failover" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_database_failover_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_database_failover" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18400,8 +18470,9 @@ def test_fetch_database_properties_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18470,18 +18541,20 @@ def test_fetch_database_properties_rest_interceptors(null_interceptor): ) client = EnvironmentsClient(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.EnvironmentsRestInterceptor, "post_fetch_database_properties" - ) as post, mock.patch.object( - transports.EnvironmentsRestInterceptor, - "post_fetch_database_properties_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EnvironmentsRestInterceptor, "pre_fetch_database_properties" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "post_fetch_database_properties" + ) as post, + mock.patch.object( + transports.EnvironmentsRestInterceptor, + "post_fetch_database_properties_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EnvironmentsRestInterceptor, "pre_fetch_database_properties" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18541,8 +18614,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18603,8 +18677,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -18665,8 +18740,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -19363,11 +19439,14 @@ def test_environments_base_transport(): def test_environments_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.orchestration.airflow.service_v1beta1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.orchestration.airflow.service_v1beta1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnvironmentsTransport( @@ -19384,9 +19463,12 @@ def test_environments_base_transport_with_credentials_file(): def test_environments_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.orchestration.airflow.service_v1beta1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.orchestration.airflow.service_v1beta1.services.environments.transports.EnvironmentsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EnvironmentsTransport() @@ -19458,11 +19540,12 @@ def test_environments_transport_auth_gdch_credentials(transport_class): def test_environments_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1beta1/test_image_versions.py b/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1beta1/test_image_versions.py index 069dc52185d3..f41520d688e7 100644 --- a/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1beta1/test_image_versions.py +++ b/packages/google-cloud-orchestration-airflow/tests/unit/gapic/service_v1beta1/test_image_versions.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore @@ -942,10 +947,9 @@ def test_image_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -990,10 +994,9 @@ def test_image_versions_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1029,10 +1032,9 @@ def test_image_versions_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1275,13 +1277,13 @@ def test_image_versions_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1396,9 +1398,9 @@ def test_list_image_versions_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_image_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_image_versions] = ( + mock_rpc + ) request = {} client.list_image_versions(request) @@ -1872,9 +1874,9 @@ def test_list_image_versions_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_image_versions - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_image_versions] = ( + mock_rpc + ) request = {} client.list_image_versions(request) @@ -2200,8 +2202,9 @@ def test_list_image_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2264,18 +2267,20 @@ def test_list_image_versions_rest_interceptors(null_interceptor): ) client = ImageVersionsClient(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.ImageVersionsRestInterceptor, "post_list_image_versions" - ) as post, mock.patch.object( - transports.ImageVersionsRestInterceptor, - "post_list_image_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ImageVersionsRestInterceptor, "pre_list_image_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ImageVersionsRestInterceptor, "post_list_image_versions" + ) as post, + mock.patch.object( + transports.ImageVersionsRestInterceptor, + "post_list_image_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ImageVersionsRestInterceptor, "pre_list_image_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2335,8 +2340,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2397,8 +2403,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2459,8 +2466,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2593,11 +2601,14 @@ def test_image_versions_base_transport(): def test_image_versions_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.orchestration.airflow.service_v1beta1.services.image_versions.transports.ImageVersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.orchestration.airflow.service_v1beta1.services.image_versions.transports.ImageVersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ImageVersionsTransport( @@ -2614,9 +2625,12 @@ def test_image_versions_base_transport_with_credentials_file(): def test_image_versions_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.orchestration.airflow.service_v1beta1.services.image_versions.transports.ImageVersionsTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.orchestration.airflow.service_v1beta1.services.image_versions.transports.ImageVersionsTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ImageVersionsTransport() @@ -2688,11 +2702,12 @@ def test_image_versions_transport_auth_gdch_credentials(transport_class): def test_image_versions_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-org-policy/docs/conf.py b/packages/google-cloud-org-policy/docs/conf.py index e9fd4b1c4074..83e9691506ca 100644 --- a/packages/google-cloud-org-policy/docs/conf.py +++ b/packages/google-cloud-org-policy/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-org-policy documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy/v1/orgpolicy_pb2.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy/v1/orgpolicy_pb2.py index e6b247feea89..5f069682a301 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy/v1/orgpolicy_pb2.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy/v1/orgpolicy_pb2.py @@ -18,6 +18,7 @@ # source: google/cloud/orgpolicy/v1/orgpolicy.proto # Protobuf Python Version: 4.25.3 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy/v1/orgpolicy_pb2.pyi b/packages/google-cloud-org-policy/google/cloud/orgpolicy/v1/orgpolicy_pb2.pyi index fca3e252c246..9ca2336b701b 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy/v1/orgpolicy_pb2.pyi +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy/v1/orgpolicy_pb2.pyi @@ -36,7 +36,6 @@ class Policy(_message.Message): "boolean_policy", "restore_default", ) - class ListPolicy(_message.Message): __slots__ = ( "allowed_values", @@ -45,12 +44,12 @@ class Policy(_message.Message): "suggested_value", "inherit_from_parent", ) - class AllValues(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): __slots__ = () ALL_VALUES_UNSPECIFIED: _ClassVar[Policy.ListPolicy.AllValues] ALLOW: _ClassVar[Policy.ListPolicy.AllValues] DENY: _ClassVar[Policy.ListPolicy.AllValues] + ALL_VALUES_UNSPECIFIED: Policy.ListPolicy.AllValues ALLOW: Policy.ListPolicy.AllValues DENY: Policy.ListPolicy.AllValues @@ -82,6 +81,7 @@ class Policy(_message.Message): class RestoreDefault(_message.Message): __slots__ = () def __init__(self) -> None: ... + VERSION_FIELD_NUMBER: _ClassVar[int] CONSTRAINT_FIELD_NUMBER: _ClassVar[int] ETAG_FIELD_NUMBER: _ClassVar[int] diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/__init__.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/__init__.py index 71adbaf433d0..756b3bf983db 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/__init__.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.org_policy import OrgPolicyAsyncClient, OrgPolicyClient from .types.constraint import Constraint, CustomConstraint from .types.orgpolicy import ( diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/async_client.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/async_client.py index ffb1190fb862..67300cfa64a8 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/async_client.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.orgpolicy_v2 import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.orgpolicy_v2.services.org_policy import pagers from google.cloud.orgpolicy_v2.types import constraint, orgpolicy @@ -137,7 +137,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: OrgPolicyAsyncClient: The constructed client. """ - return OrgPolicyClient.from_service_account_info.__func__(OrgPolicyAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = OrgPolicyClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(OrgPolicyAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -153,7 +154,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: OrgPolicyAsyncClient: The constructed client. """ - return OrgPolicyClient.from_service_account_file.__func__(OrgPolicyAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = OrgPolicyClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(OrgPolicyAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/client.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/client.py index 1857817a8aff..74eaef129ce9 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/client.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.orgpolicy_v2 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.orgpolicy_v2.services.org_policy import pagers from google.cloud.orgpolicy_v2.types import constraint, orgpolicy @@ -678,11 +678,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OrgPolicyClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OrgPolicyClient._read_environment_variables() + ) self._client_cert_source = OrgPolicyClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -717,8 +715,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OrgPolicyTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/pagers.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/pagers.py index 09fe285e7578..cae0112258e4 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/pagers.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/base.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/base.py index d3eb3e5804f6..4f50d1f405f1 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/base.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.orgpolicy_v2 import gapic_version as package_version from google.cloud.orgpolicy_v2.types import constraint, orgpolicy diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/grpc.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/grpc.py index b7607c54b78b..46b3e1eaee6a 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/grpc.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.orgpolicy_v2.types import constraint, orgpolicy diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/grpc_asyncio.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/grpc_asyncio.py index cc4c246333d3..7b78f2b00fe9 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/grpc_asyncio.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.orgpolicy_v2.types import constraint, orgpolicy diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/rest.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/rest.py index 2879d9a4a618..8c6f52d0a44d 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/rest.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -835,9 +835,7 @@ def __call__( """ - http_options = ( - _BaseOrgPolicyRestTransport._BaseCreateCustomConstraint._get_http_options() - ) + http_options = _BaseOrgPolicyRestTransport._BaseCreateCustomConstraint._get_http_options() request, metadata = self._interceptor.pre_create_custom_constraint( request, metadata @@ -1144,9 +1142,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseOrgPolicyRestTransport._BaseDeleteCustomConstraint._get_http_options() - ) + http_options = _BaseOrgPolicyRestTransport._BaseDeleteCustomConstraint._get_http_options() request, metadata = self._interceptor.pre_delete_custom_constraint( request, metadata @@ -1168,7 +1164,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1280,7 +1276,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1988,9 +1984,7 @@ def __call__( """ - http_options = ( - _BaseOrgPolicyRestTransport._BaseListCustomConstraints._get_http_options() - ) + http_options = _BaseOrgPolicyRestTransport._BaseListCustomConstraints._get_http_options() request, metadata = self._interceptor.pre_list_custom_constraints( request, metadata @@ -2301,9 +2295,7 @@ def __call__( """ - http_options = ( - _BaseOrgPolicyRestTransport._BaseUpdateCustomConstraint._get_http_options() - ) + http_options = _BaseOrgPolicyRestTransport._BaseUpdateCustomConstraint._get_http_options() request, metadata = self._interceptor.pre_update_custom_constraint( request, metadata @@ -2566,7 +2558,9 @@ def create_custom_constraint( ]: # 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._CreateCustomConstraint(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCustomConstraint( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_policy( @@ -2582,7 +2576,9 @@ def delete_custom_constraint( ) -> Callable[[orgpolicy.DeleteCustomConstraintRequest], empty_pb2.Empty]: # 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._DeleteCustomConstraint(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCustomConstraint( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_policy( @@ -2651,7 +2647,9 @@ def update_custom_constraint( ]: # 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._UpdateCustomConstraint(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCustomConstraint( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_policy( diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/rest_base.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/rest_base.py index a3e98b3dc2dd..da510987e178 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/rest_base.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/services/org_policy/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.orgpolicy_v2.types import constraint, orgpolicy diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/types/__init__.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/types/__init__.py index f8bce5539b14..1e896af5045a 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/types/__init__.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .constraint import Constraint, CustomConstraint +from .constraint import ( + Constraint, + CustomConstraint, +) from .orgpolicy import ( AlternatePolicySpec, CreateCustomConstraintRequest, diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/types/constraint.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/types/constraint.py index a0af18565e56..ec96daaa44bc 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/types/constraint.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/types/constraint.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -121,6 +121,7 @@ class ConstraintDefault(proto.Enum): constraints. Indicate that enforcement is on for boolean constraints. """ + CONSTRAINT_DEFAULT_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -213,6 +214,7 @@ class MethodType(proto.Enum): Constraint applied when enforcing forced tagging. """ + METHOD_TYPE_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 @@ -233,6 +235,7 @@ class ActionType(proto.Enum): DENY (2): Deny action type. """ + ACTION_TYPE_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 @@ -275,6 +278,7 @@ class Type(proto.Enum): BOOLEAN (3): Boolean parameter type. """ + TYPE_UNSPECIFIED = 0 LIST = 1 STRING = 2 @@ -500,6 +504,7 @@ class MethodType(proto.Enum): Constraint applied when enforcing forced tagging. """ + METHOD_TYPE_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 @@ -520,6 +525,7 @@ class ActionType(proto.Enum): DENY (2): Deny action type. """ + ACTION_TYPE_UNSPECIFIED = 0 ALLOW = 1 DENY = 2 diff --git a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/types/orgpolicy.py b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/types/orgpolicy.py index 00c48b179929..3cfb8c498edd 100644 --- a/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/types/orgpolicy.py +++ b/packages/google-cloud-org-policy/google/cloud/orgpolicy_v2/types/orgpolicy.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore import proto # type: ignore from google.cloud.orgpolicy_v2.types import constraint @@ -692,12 +692,12 @@ class ListCustomConstraintsResponse(proto.Message): def raw_page(self): return self - custom_constraints: MutableSequence[ - constraint.CustomConstraint - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=constraint.CustomConstraint, + custom_constraints: MutableSequence[constraint.CustomConstraint] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=constraint.CustomConstraint, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-org-policy/noxfile.py b/packages/google-cloud-org-policy/noxfile.py index 566ed2617bba..eca5470e8962 100644 --- a/packages/google-cloud-org-policy/noxfile.py +++ b/packages/google-cloud-org-policy/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-org-policy/tests/unit/gapic/orgpolicy_v2/test_org_policy.py b/packages/google-cloud-org-policy/tests/unit/gapic/orgpolicy_v2/test_org_policy.py index 7448756238a8..b352d70b5b5a 100644 --- a/packages/google-cloud-org-policy/tests/unit/gapic/orgpolicy_v2/test_org_policy.py +++ b/packages/google-cloud-org-policy/tests/unit/gapic/orgpolicy_v2/test_org_policy.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.orgpolicy_v2.services.org_policy import ( OrgPolicyAsyncClient, @@ -920,10 +925,9 @@ def test_org_policy_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -968,10 +972,9 @@ def test_org_policy_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1007,10 +1010,9 @@ def test_org_policy_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1239,13 +1241,13 @@ def test_org_policy_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1354,9 +1356,9 @@ def test_list_constraints_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_constraints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_constraints] = ( + mock_rpc + ) request = {} client.list_constraints(request) @@ -2721,9 +2723,9 @@ def test_get_effective_policy_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_effective_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_effective_policy] = ( + mock_rpc + ) request = {} client.get_effective_policy(request) @@ -4778,9 +4780,9 @@ def test_get_custom_constraint_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_constraint - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_constraint] = ( + mock_rpc + ) request = {} client.get_custom_constraint(request) @@ -5938,9 +5940,9 @@ def test_list_constraints_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_constraints - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_constraints] = ( + mock_rpc + ) request = {} client.list_constraints(request) @@ -6618,9 +6620,9 @@ def test_get_effective_policy_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_effective_policy - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_effective_policy] = ( + mock_rpc + ) request = {} client.get_effective_policy(request) @@ -7706,9 +7708,9 @@ def test_get_custom_constraint_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_custom_constraint - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_custom_constraint] = ( + mock_rpc + ) request = {} client.get_custom_constraint(request) @@ -9053,8 +9055,9 @@ def test_list_constraints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9115,17 +9118,19 @@ def test_list_constraints_rest_interceptors(null_interceptor): ) client = OrgPolicyClient(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.OrgPolicyRestInterceptor, "post_list_constraints" - ) as post, mock.patch.object( - transports.OrgPolicyRestInterceptor, "post_list_constraints_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyRestInterceptor, "pre_list_constraints" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_list_constraints" + ) as post, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_list_constraints_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "pre_list_constraints" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9178,8 +9183,9 @@ def test_list_policies_rest_bad_request(request_type=orgpolicy.ListPoliciesReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9240,17 +9246,19 @@ def test_list_policies_rest_interceptors(null_interceptor): ) client = OrgPolicyClient(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.OrgPolicyRestInterceptor, "post_list_policies" - ) as post, mock.patch.object( - transports.OrgPolicyRestInterceptor, "post_list_policies_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyRestInterceptor, "pre_list_policies" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_list_policies" + ) as post, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_list_policies_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "pre_list_policies" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9301,8 +9309,9 @@ def test_get_policy_rest_bad_request(request_type=orgpolicy.GetPolicyRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9365,17 +9374,17 @@ def test_get_policy_rest_interceptors(null_interceptor): ) client = OrgPolicyClient(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.OrgPolicyRestInterceptor, "post_get_policy" - ) as post, mock.patch.object( - transports.OrgPolicyRestInterceptor, "post_get_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyRestInterceptor, "pre_get_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_get_policy" + ) as post, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_get_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.OrgPolicyRestInterceptor, "pre_get_policy") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9426,8 +9435,9 @@ def test_get_effective_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9490,17 +9500,20 @@ def test_get_effective_policy_rest_interceptors(null_interceptor): ) client = OrgPolicyClient(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.OrgPolicyRestInterceptor, "post_get_effective_policy" - ) as post, mock.patch.object( - transports.OrgPolicyRestInterceptor, "post_get_effective_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyRestInterceptor, "pre_get_effective_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_get_effective_policy" + ) as post, + mock.patch.object( + transports.OrgPolicyRestInterceptor, + "post_get_effective_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "pre_get_effective_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9551,8 +9564,9 @@ def test_create_policy_rest_bad_request(request_type=orgpolicy.CreatePolicyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9718,17 +9732,19 @@ def test_create_policy_rest_interceptors(null_interceptor): ) client = OrgPolicyClient(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.OrgPolicyRestInterceptor, "post_create_policy" - ) as post, mock.patch.object( - transports.OrgPolicyRestInterceptor, "post_create_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyRestInterceptor, "pre_create_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_create_policy" + ) as post, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_create_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "pre_create_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9777,8 +9793,9 @@ def test_update_policy_rest_bad_request(request_type=orgpolicy.UpdatePolicyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9944,17 +9961,19 @@ def test_update_policy_rest_interceptors(null_interceptor): ) client = OrgPolicyClient(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.OrgPolicyRestInterceptor, "post_update_policy" - ) as post, mock.patch.object( - transports.OrgPolicyRestInterceptor, "post_update_policy_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyRestInterceptor, "pre_update_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_update_policy" + ) as post, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_update_policy_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "pre_update_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10003,8 +10022,9 @@ def test_delete_policy_rest_bad_request(request_type=orgpolicy.DeletePolicyReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10059,13 +10079,13 @@ def test_delete_policy_rest_interceptors(null_interceptor): ) client = OrgPolicyClient(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.OrgPolicyRestInterceptor, "pre_delete_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "pre_delete_policy" + ) as pre, + ): pre.assert_not_called() pb_message = orgpolicy.DeletePolicyRequest.pb(orgpolicy.DeletePolicyRequest()) transcode.return_value = { @@ -10108,8 +10128,9 @@ def test_create_custom_constraint_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10261,18 +10282,20 @@ def test_create_custom_constraint_rest_interceptors(null_interceptor): ) client = OrgPolicyClient(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.OrgPolicyRestInterceptor, "post_create_custom_constraint" - ) as post, mock.patch.object( - transports.OrgPolicyRestInterceptor, - "post_create_custom_constraint_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyRestInterceptor, "pre_create_custom_constraint" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_create_custom_constraint" + ) as post, + mock.patch.object( + transports.OrgPolicyRestInterceptor, + "post_create_custom_constraint_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "pre_create_custom_constraint" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10329,8 +10352,9 @@ def test_update_custom_constraint_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10484,18 +10508,20 @@ def test_update_custom_constraint_rest_interceptors(null_interceptor): ) client = OrgPolicyClient(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.OrgPolicyRestInterceptor, "post_update_custom_constraint" - ) as post, mock.patch.object( - transports.OrgPolicyRestInterceptor, - "post_update_custom_constraint_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyRestInterceptor, "pre_update_custom_constraint" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_update_custom_constraint" + ) as post, + mock.patch.object( + transports.OrgPolicyRestInterceptor, + "post_update_custom_constraint_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "pre_update_custom_constraint" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10550,8 +10576,9 @@ def test_get_custom_constraint_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10624,17 +10651,20 @@ def test_get_custom_constraint_rest_interceptors(null_interceptor): ) client = OrgPolicyClient(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.OrgPolicyRestInterceptor, "post_get_custom_constraint" - ) as post, mock.patch.object( - transports.OrgPolicyRestInterceptor, "post_get_custom_constraint_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyRestInterceptor, "pre_get_custom_constraint" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_get_custom_constraint" + ) as post, + mock.patch.object( + transports.OrgPolicyRestInterceptor, + "post_get_custom_constraint_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "pre_get_custom_constraint" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10689,8 +10719,9 @@ def test_list_custom_constraints_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10751,18 +10782,20 @@ def test_list_custom_constraints_rest_interceptors(null_interceptor): ) client = OrgPolicyClient(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.OrgPolicyRestInterceptor, "post_list_custom_constraints" - ) as post, mock.patch.object( - transports.OrgPolicyRestInterceptor, - "post_list_custom_constraints_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyRestInterceptor, "pre_list_custom_constraints" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "post_list_custom_constraints" + ) as post, + mock.patch.object( + transports.OrgPolicyRestInterceptor, + "post_list_custom_constraints_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "pre_list_custom_constraints" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10820,8 +10853,9 @@ def test_delete_custom_constraint_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10876,13 +10910,13 @@ def test_delete_custom_constraint_rest_interceptors(null_interceptor): ) client = OrgPolicyClient(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.OrgPolicyRestInterceptor, "pre_delete_custom_constraint" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyRestInterceptor, "pre_delete_custom_constraint" + ) as pre, + ): pre.assert_not_called() pb_message = orgpolicy.DeleteCustomConstraintRequest.pb( orgpolicy.DeleteCustomConstraintRequest() @@ -11239,11 +11273,14 @@ def test_org_policy_base_transport(): def test_org_policy_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.orgpolicy_v2.services.org_policy.transports.OrgPolicyTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.orgpolicy_v2.services.org_policy.transports.OrgPolicyTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrgPolicyTransport( @@ -11260,9 +11297,12 @@ def test_org_policy_base_transport_with_credentials_file(): def test_org_policy_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.orgpolicy_v2.services.org_policy.transports.OrgPolicyTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.orgpolicy_v2.services.org_policy.transports.OrgPolicyTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrgPolicyTransport() @@ -11334,11 +11374,12 @@ def test_org_policy_transport_auth_gdch_credentials(transport_class): def test_org_policy_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-os-config/docs/conf.py b/packages/google-cloud-os-config/docs/conf.py index cb2d7131f731..a4e9f0998e9a 100644 --- a/packages/google-cloud-os-config/docs/conf.py +++ b/packages/google-cloud-os-config/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-os-config documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/__init__.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/__init__.py index e2a9ea6962a0..6b19961d3493 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/__init__.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.os_config_service import ( OsConfigServiceAsyncClient, OsConfigServiceClient, diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/async_client.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/async_client.py index 74c0b3c86dcf..6344a37b948a 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/async_client.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.osconfig_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.osconfig_v1.services.os_config_service import pagers from google.cloud.osconfig_v1.types import patch_deployments, patch_jobs @@ -128,7 +128,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: OsConfigServiceAsyncClient: The constructed client. """ - return OsConfigServiceClient.from_service_account_info.__func__(OsConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = OsConfigServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(OsConfigServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: OsConfigServiceAsyncClient: The constructed client. """ - return OsConfigServiceClient.from_service_account_file.__func__(OsConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = OsConfigServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(OsConfigServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/client.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/client.py index e5546d0f8803..1fd3d6a0975d 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/client.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.osconfig_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.osconfig_v1.services.os_config_service import pagers from google.cloud.osconfig_v1.types import patch_deployments, patch_jobs @@ -82,9 +82,7 @@ class OsConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OsConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OsConfigServiceTransport]] _transport_registry["grpc"] = OsConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = OsConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = OsConfigServiceRestTransport @@ -668,11 +666,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OsConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OsConfigServiceClient._read_environment_variables() + ) self._client_cert_source = OsConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -707,8 +703,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OsConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/pagers.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/pagers.py index 00246d5814fe..18c7fdaad90f 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/pagers.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -301,7 +301,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -383,7 +383,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -461,7 +461,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/base.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/base.py index f278c2f58f30..d54c8a6d0791 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/base.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.osconfig_v1 import gapic_version as package_version from google.cloud.osconfig_v1.types import patch_deployments, patch_jobs diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/grpc.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/grpc.py index e3d96862bf33..069a712174a9 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/grpc.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.osconfig_v1.types import patch_deployments, patch_jobs @@ -457,12 +457,12 @@ def list_patch_job_instance_details( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_patch_job_instance_details" not in self._stubs: - self._stubs[ - "list_patch_job_instance_details" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigService/ListPatchJobInstanceDetails", - request_serializer=patch_jobs.ListPatchJobInstanceDetailsRequest.serialize, - response_deserializer=patch_jobs.ListPatchJobInstanceDetailsResponse.deserialize, + self._stubs["list_patch_job_instance_details"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigService/ListPatchJobInstanceDetails", + request_serializer=patch_jobs.ListPatchJobInstanceDetailsRequest.serialize, + response_deserializer=patch_jobs.ListPatchJobInstanceDetailsResponse.deserialize, + ) ) return self._stubs["list_patch_job_instance_details"] diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/grpc_asyncio.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/grpc_asyncio.py index df980032b8a9..4587d1d8901b 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/grpc_asyncio.py @@ -17,20 +17,20 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.osconfig_v1.types import patch_deployments, patch_jobs @@ -467,12 +467,12 @@ def list_patch_job_instance_details( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_patch_job_instance_details" not in self._stubs: - self._stubs[ - "list_patch_job_instance_details" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigService/ListPatchJobInstanceDetails", - request_serializer=patch_jobs.ListPatchJobInstanceDetailsRequest.serialize, - response_deserializer=patch_jobs.ListPatchJobInstanceDetailsResponse.deserialize, + self._stubs["list_patch_job_instance_details"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigService/ListPatchJobInstanceDetails", + request_serializer=patch_jobs.ListPatchJobInstanceDetailsRequest.serialize, + response_deserializer=patch_jobs.ListPatchJobInstanceDetailsResponse.deserialize, + ) ) return self._stubs["list_patch_job_instance_details"] diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/rest.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/rest.py index d0f6231d0c68..3af686276967 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/rest.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -892,9 +892,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigServiceRestTransport._BaseCancelPatchJob._get_http_options() - ) + http_options = _BaseOsConfigServiceRestTransport._BaseCancelPatchJob._get_http_options() request, metadata = self._interceptor.pre_cancel_patch_job( request, metadata @@ -1052,9 +1050,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigServiceRestTransport._BaseCreatePatchDeployment._get_http_options() - ) + http_options = _BaseOsConfigServiceRestTransport._BaseCreatePatchDeployment._get_http_options() request, metadata = self._interceptor.pre_create_patch_deployment( request, metadata @@ -1205,9 +1201,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseOsConfigServiceRestTransport._BaseDeletePatchDeployment._get_http_options() - ) + http_options = _BaseOsConfigServiceRestTransport._BaseDeletePatchDeployment._get_http_options() request, metadata = self._interceptor.pre_delete_patch_deployment( request, metadata @@ -1229,7 +1223,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1332,9 +1326,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigServiceRestTransport._BaseExecutePatchJob._get_http_options() - ) + http_options = _BaseOsConfigServiceRestTransport._BaseExecutePatchJob._get_http_options() request, metadata = self._interceptor.pre_execute_patch_job( request, metadata @@ -1491,9 +1483,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigServiceRestTransport._BaseGetPatchDeployment._get_http_options() - ) + http_options = _BaseOsConfigServiceRestTransport._BaseGetPatchDeployment._get_http_options() request, metadata = self._interceptor.pre_get_patch_deployment( request, metadata @@ -1798,9 +1788,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigServiceRestTransport._BaseListPatchDeployments._get_http_options() - ) + http_options = _BaseOsConfigServiceRestTransport._BaseListPatchDeployments._get_http_options() request, metadata = self._interceptor.pre_list_patch_deployments( request, metadata @@ -1951,9 +1939,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigServiceRestTransport._BaseListPatchJobInstanceDetails._get_http_options() - ) + http_options = _BaseOsConfigServiceRestTransport._BaseListPatchJobInstanceDetails._get_http_options() request, metadata = self._interceptor.pre_list_patch_job_instance_details( request, metadata @@ -2019,11 +2005,10 @@ def __call__( resp = self._interceptor.post_list_patch_job_instance_details(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_patch_job_instance_details_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_patch_job_instance_details_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2262,9 +2247,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigServiceRestTransport._BasePausePatchDeployment._get_http_options() - ) + http_options = _BaseOsConfigServiceRestTransport._BasePausePatchDeployment._get_http_options() request, metadata = self._interceptor.pre_pause_patch_deployment( request, metadata @@ -2424,9 +2407,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigServiceRestTransport._BaseResumePatchDeployment._get_http_options() - ) + http_options = _BaseOsConfigServiceRestTransport._BaseResumePatchDeployment._get_http_options() request, metadata = self._interceptor.pre_resume_patch_deployment( request, metadata @@ -2588,9 +2569,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigServiceRestTransport._BaseUpdatePatchDeployment._get_http_options() - ) + http_options = _BaseOsConfigServiceRestTransport._BaseUpdatePatchDeployment._get_http_options() request, metadata = self._interceptor.pre_update_patch_deployment( request, metadata @@ -2762,7 +2741,9 @@ def list_patch_job_instance_details( ]: # 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._ListPatchJobInstanceDetails(self._session, self._host, self._interceptor) # type: ignore + return self._ListPatchJobInstanceDetails( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_patch_jobs( diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/rest_base.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/rest_base.py index d68719c53ca7..b1b4c5262680 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/rest_base.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/rest_base.py @@ -17,8 +17,8 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.osconfig_v1.types import patch_deployments, patch_jobs diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/async_client.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/async_client.py index a880d249c4f5..904d092dfef5 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/async_client.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.osconfig_v1 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.osconfig_v1.services.os_config_zonal_service import pagers from google.cloud.osconfig_v1.types import ( @@ -156,7 +156,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: OsConfigZonalServiceAsyncClient: The constructed client. """ - return OsConfigZonalServiceClient.from_service_account_info.__func__(OsConfigZonalServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = OsConfigZonalServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(OsConfigZonalServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -172,7 +173,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: OsConfigZonalServiceAsyncClient: The constructed client. """ - return OsConfigZonalServiceClient.from_service_account_file.__func__(OsConfigZonalServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = OsConfigZonalServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(OsConfigZonalServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -210,7 +212,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return OsConfigZonalServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return OsConfigZonalServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> OsConfigZonalServiceTransport: diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/client.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/client.py index 26b6bb8a8186..621445f86e02 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/client.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.osconfig_v1 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.osconfig_v1.services.os_config_zonal_service import pagers from google.cloud.osconfig_v1.types import ( @@ -90,9 +90,7 @@ class OsConfigZonalServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OsConfigZonalServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OsConfigZonalServiceTransport]] _transport_registry["grpc"] = OsConfigZonalServiceGrpcTransport _transport_registry["grpc_asyncio"] = OsConfigZonalServiceGrpcAsyncIOTransport _transport_registry["rest"] = OsConfigZonalServiceRestTransport @@ -755,11 +753,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OsConfigZonalServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OsConfigZonalServiceClient._read_environment_variables() + ) self._client_cert_source = OsConfigZonalServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -794,8 +790,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OsConfigZonalServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/pagers.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/pagers.py index 3b77b3779780..091a9bb019ac 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/pagers.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/pagers.py @@ -72,7 +72,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -150,7 +150,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -234,7 +234,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -317,7 +317,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -403,7 +403,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -490,7 +490,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -578,7 +578,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -654,7 +654,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -734,7 +734,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -812,7 +812,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/__init__.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/__init__.py index 67469044da33..666879f51708 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/__init__.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import OsConfigZonalServiceRestInterceptor, OsConfigZonalServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OsConfigZonalServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OsConfigZonalServiceTransport]] _transport_registry["grpc"] = OsConfigZonalServiceGrpcTransport _transport_registry["grpc_asyncio"] = OsConfigZonalServiceGrpcAsyncIOTransport _transport_registry["rest"] = OsConfigZonalServiceRestTransport diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/base.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/base.py index ba46b05d48c9..c3064244a1de 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/base.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.osconfig_v1 import gapic_version as package_version from google.cloud.osconfig_v1.types import ( diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/grpc.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/grpc.py index 33fac5adeda6..b03e11af9a90 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/grpc.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.osconfig_v1.types import ( inventory, @@ -380,12 +380,12 @@ def create_os_policy_assignment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_os_policy_assignment" not in self._stubs: - self._stubs[ - "create_os_policy_assignment" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/CreateOSPolicyAssignment", - request_serializer=os_policy_assignments.CreateOSPolicyAssignmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_os_policy_assignment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/CreateOSPolicyAssignment", + request_serializer=os_policy_assignments.CreateOSPolicyAssignmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_os_policy_assignment"] @@ -420,12 +420,12 @@ def update_os_policy_assignment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_os_policy_assignment" not in self._stubs: - self._stubs[ - "update_os_policy_assignment" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/UpdateOSPolicyAssignment", - request_serializer=os_policy_assignments.UpdateOSPolicyAssignmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_os_policy_assignment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/UpdateOSPolicyAssignment", + request_serializer=os_policy_assignments.UpdateOSPolicyAssignmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_os_policy_assignment"] @@ -487,12 +487,12 @@ def list_os_policy_assignments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_os_policy_assignments" not in self._stubs: - self._stubs[ - "list_os_policy_assignments" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/ListOSPolicyAssignments", - request_serializer=os_policy_assignments.ListOSPolicyAssignmentsRequest.serialize, - response_deserializer=os_policy_assignments.ListOSPolicyAssignmentsResponse.deserialize, + self._stubs["list_os_policy_assignments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/ListOSPolicyAssignments", + request_serializer=os_policy_assignments.ListOSPolicyAssignmentsRequest.serialize, + response_deserializer=os_policy_assignments.ListOSPolicyAssignmentsResponse.deserialize, + ) ) return self._stubs["list_os_policy_assignments"] @@ -520,12 +520,12 @@ def list_os_policy_assignment_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_os_policy_assignment_revisions" not in self._stubs: - self._stubs[ - "list_os_policy_assignment_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/ListOSPolicyAssignmentRevisions", - request_serializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsRequest.serialize, - response_deserializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsResponse.deserialize, + self._stubs["list_os_policy_assignment_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/ListOSPolicyAssignmentRevisions", + request_serializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsRequest.serialize, + response_deserializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsResponse.deserialize, + ) ) return self._stubs["list_os_policy_assignment_revisions"] @@ -563,12 +563,12 @@ def delete_os_policy_assignment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_os_policy_assignment" not in self._stubs: - self._stubs[ - "delete_os_policy_assignment" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/DeleteOSPolicyAssignment", - request_serializer=os_policy_assignments.DeleteOSPolicyAssignmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_os_policy_assignment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/DeleteOSPolicyAssignment", + request_serializer=os_policy_assignments.DeleteOSPolicyAssignmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_os_policy_assignment"] @@ -596,12 +596,12 @@ def get_os_policy_assignment_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_os_policy_assignment_report" not in self._stubs: - self._stubs[ - "get_os_policy_assignment_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/GetOSPolicyAssignmentReport", - request_serializer=os_policy_assignment_reports.GetOSPolicyAssignmentReportRequest.serialize, - response_deserializer=os_policy_assignment_reports.OSPolicyAssignmentReport.deserialize, + self._stubs["get_os_policy_assignment_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/GetOSPolicyAssignmentReport", + request_serializer=os_policy_assignment_reports.GetOSPolicyAssignmentReportRequest.serialize, + response_deserializer=os_policy_assignment_reports.OSPolicyAssignmentReport.deserialize, + ) ) return self._stubs["get_os_policy_assignment_report"] @@ -629,12 +629,12 @@ def list_os_policy_assignment_reports( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_os_policy_assignment_reports" not in self._stubs: - self._stubs[ - "list_os_policy_assignment_reports" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/ListOSPolicyAssignmentReports", - request_serializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsRequest.serialize, - response_deserializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsResponse.deserialize, + self._stubs["list_os_policy_assignment_reports"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/ListOSPolicyAssignmentReports", + request_serializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsRequest.serialize, + response_deserializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsResponse.deserialize, + ) ) return self._stubs["list_os_policy_assignment_reports"] @@ -747,12 +747,12 @@ def list_vulnerability_reports( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_vulnerability_reports" not in self._stubs: - self._stubs[ - "list_vulnerability_reports" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/ListVulnerabilityReports", - request_serializer=vulnerability.ListVulnerabilityReportsRequest.serialize, - response_deserializer=vulnerability.ListVulnerabilityReportsResponse.deserialize, + self._stubs["list_vulnerability_reports"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/ListVulnerabilityReports", + request_serializer=vulnerability.ListVulnerabilityReportsRequest.serialize, + response_deserializer=vulnerability.ListVulnerabilityReportsResponse.deserialize, + ) ) return self._stubs["list_vulnerability_reports"] diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/grpc_asyncio.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/grpc_asyncio.py index a3da537f9ad5..baab11336ff5 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.osconfig_v1.types import ( inventory, @@ -388,12 +388,12 @@ def create_os_policy_assignment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_os_policy_assignment" not in self._stubs: - self._stubs[ - "create_os_policy_assignment" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/CreateOSPolicyAssignment", - request_serializer=os_policy_assignments.CreateOSPolicyAssignmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_os_policy_assignment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/CreateOSPolicyAssignment", + request_serializer=os_policy_assignments.CreateOSPolicyAssignmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_os_policy_assignment"] @@ -428,12 +428,12 @@ def update_os_policy_assignment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_os_policy_assignment" not in self._stubs: - self._stubs[ - "update_os_policy_assignment" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/UpdateOSPolicyAssignment", - request_serializer=os_policy_assignments.UpdateOSPolicyAssignmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_os_policy_assignment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/UpdateOSPolicyAssignment", + request_serializer=os_policy_assignments.UpdateOSPolicyAssignmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_os_policy_assignment"] @@ -495,12 +495,12 @@ def list_os_policy_assignments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_os_policy_assignments" not in self._stubs: - self._stubs[ - "list_os_policy_assignments" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/ListOSPolicyAssignments", - request_serializer=os_policy_assignments.ListOSPolicyAssignmentsRequest.serialize, - response_deserializer=os_policy_assignments.ListOSPolicyAssignmentsResponse.deserialize, + self._stubs["list_os_policy_assignments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/ListOSPolicyAssignments", + request_serializer=os_policy_assignments.ListOSPolicyAssignmentsRequest.serialize, + response_deserializer=os_policy_assignments.ListOSPolicyAssignmentsResponse.deserialize, + ) ) return self._stubs["list_os_policy_assignments"] @@ -528,12 +528,12 @@ def list_os_policy_assignment_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_os_policy_assignment_revisions" not in self._stubs: - self._stubs[ - "list_os_policy_assignment_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/ListOSPolicyAssignmentRevisions", - request_serializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsRequest.serialize, - response_deserializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsResponse.deserialize, + self._stubs["list_os_policy_assignment_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/ListOSPolicyAssignmentRevisions", + request_serializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsRequest.serialize, + response_deserializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsResponse.deserialize, + ) ) return self._stubs["list_os_policy_assignment_revisions"] @@ -571,12 +571,12 @@ def delete_os_policy_assignment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_os_policy_assignment" not in self._stubs: - self._stubs[ - "delete_os_policy_assignment" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/DeleteOSPolicyAssignment", - request_serializer=os_policy_assignments.DeleteOSPolicyAssignmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_os_policy_assignment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/DeleteOSPolicyAssignment", + request_serializer=os_policy_assignments.DeleteOSPolicyAssignmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_os_policy_assignment"] @@ -604,12 +604,12 @@ def get_os_policy_assignment_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_os_policy_assignment_report" not in self._stubs: - self._stubs[ - "get_os_policy_assignment_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/GetOSPolicyAssignmentReport", - request_serializer=os_policy_assignment_reports.GetOSPolicyAssignmentReportRequest.serialize, - response_deserializer=os_policy_assignment_reports.OSPolicyAssignmentReport.deserialize, + self._stubs["get_os_policy_assignment_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/GetOSPolicyAssignmentReport", + request_serializer=os_policy_assignment_reports.GetOSPolicyAssignmentReportRequest.serialize, + response_deserializer=os_policy_assignment_reports.OSPolicyAssignmentReport.deserialize, + ) ) return self._stubs["get_os_policy_assignment_report"] @@ -637,12 +637,12 @@ def list_os_policy_assignment_reports( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_os_policy_assignment_reports" not in self._stubs: - self._stubs[ - "list_os_policy_assignment_reports" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/ListOSPolicyAssignmentReports", - request_serializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsRequest.serialize, - response_deserializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsResponse.deserialize, + self._stubs["list_os_policy_assignment_reports"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/ListOSPolicyAssignmentReports", + request_serializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsRequest.serialize, + response_deserializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsResponse.deserialize, + ) ) return self._stubs["list_os_policy_assignment_reports"] @@ -756,12 +756,12 @@ def list_vulnerability_reports( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_vulnerability_reports" not in self._stubs: - self._stubs[ - "list_vulnerability_reports" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1.OsConfigZonalService/ListVulnerabilityReports", - request_serializer=vulnerability.ListVulnerabilityReportsRequest.serialize, - response_deserializer=vulnerability.ListVulnerabilityReportsResponse.deserialize, + self._stubs["list_vulnerability_reports"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1.OsConfigZonalService/ListVulnerabilityReports", + request_serializer=vulnerability.ListVulnerabilityReportsRequest.serialize, + response_deserializer=vulnerability.ListVulnerabilityReportsResponse.deserialize, + ) ) return self._stubs["list_vulnerability_reports"] diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/rest.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/rest.py index 89d45862bcd9..61982b6d01f6 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/rest.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -980,9 +980,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseCreateOSPolicyAssignment._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseCreateOSPolicyAssignment._get_http_options() request, metadata = self._interceptor.pre_create_os_policy_assignment( request, metadata @@ -1008,7 +1006,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1135,9 +1133,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseDeleteOSPolicyAssignment._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseDeleteOSPolicyAssignment._get_http_options() request, metadata = self._interceptor.pre_delete_os_policy_assignment( request, metadata @@ -1159,7 +1155,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1291,9 +1287,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseGetInventory._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseGetInventory._get_http_options() request, metadata = self._interceptor.pre_get_inventory(request, metadata) transcoded_request = _BaseOsConfigZonalServiceRestTransport._BaseGetInventory._get_transcoded_request( @@ -1449,9 +1443,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseGetOSPolicyAssignment._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseGetOSPolicyAssignment._get_http_options() request, metadata = self._interceptor.pre_get_os_policy_assignment( request, metadata @@ -1604,9 +1596,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseGetOSPolicyAssignmentReport._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseGetOSPolicyAssignmentReport._get_http_options() request, metadata = self._interceptor.pre_get_os_policy_assignment_report( request, metadata @@ -1670,11 +1660,10 @@ def __call__( resp = self._interceptor.post_get_os_policy_assignment_report(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_os_policy_assignment_report_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_os_policy_assignment_report_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1766,9 +1755,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseGetVulnerabilityReport._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseGetVulnerabilityReport._get_http_options() request, metadata = self._interceptor.pre_get_vulnerability_report( request, metadata @@ -1922,9 +1909,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseListInventories._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseListInventories._get_http_options() request, metadata = self._interceptor.pre_list_inventories( request, metadata @@ -2078,9 +2063,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignmentReports._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignmentReports._get_http_options() request, metadata = self._interceptor.pre_list_os_policy_assignment_reports( request, metadata @@ -2148,11 +2131,10 @@ def __call__( resp = self._interceptor.post_list_os_policy_assignment_reports(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_os_policy_assignment_reports_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_os_policy_assignment_reports_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2240,15 +2222,12 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignmentRevisions._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignmentRevisions._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_os_policy_assignment_revisions( - request, metadata + request, metadata = ( + self._interceptor.pre_list_os_policy_assignment_revisions( + request, metadata + ) ) transcoded_request = _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignmentRevisions._get_transcoded_request( http_options, request @@ -2311,11 +2290,10 @@ def __call__( resp = self._interceptor.post_list_os_policy_assignment_revisions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_os_policy_assignment_revisions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_os_policy_assignment_revisions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2401,9 +2379,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignments._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignments._get_http_options() request, metadata = self._interceptor.pre_list_os_policy_assignments( request, metadata @@ -2558,9 +2534,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseListVulnerabilityReports._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseListVulnerabilityReports._get_http_options() request, metadata = self._interceptor.pre_list_vulnerability_reports( request, metadata @@ -2713,9 +2687,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseUpdateOSPolicyAssignment._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseUpdateOSPolicyAssignment._get_http_options() request, metadata = self._interceptor.pre_update_os_policy_assignment( request, metadata @@ -2741,7 +2713,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2817,7 +2789,9 @@ def create_os_policy_assignment( ]: # 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._CreateOSPolicyAssignment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateOSPolicyAssignment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_os_policy_assignment( @@ -2828,7 +2802,9 @@ def delete_os_policy_assignment( ]: # 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._DeleteOSPolicyAssignment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteOSPolicyAssignment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_inventory( @@ -2858,7 +2834,9 @@ def get_os_policy_assignment_report( ]: # 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._GetOSPolicyAssignmentReport(self._session, self._host, self._interceptor) # type: ignore + return self._GetOSPolicyAssignmentReport( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_vulnerability_report( @@ -2868,7 +2846,9 @@ def get_vulnerability_report( ]: # 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._GetVulnerabilityReport(self._session, self._host, self._interceptor) # type: ignore + return self._GetVulnerabilityReport( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_inventories( @@ -2889,7 +2869,9 @@ def list_os_policy_assignment_reports( ]: # 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._ListOSPolicyAssignmentReports(self._session, self._host, self._interceptor) # type: ignore + return self._ListOSPolicyAssignmentReports( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_os_policy_assignment_revisions( @@ -2900,7 +2882,9 @@ def list_os_policy_assignment_revisions( ]: # 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._ListOSPolicyAssignmentRevisions(self._session, self._host, self._interceptor) # type: ignore + return self._ListOSPolicyAssignmentRevisions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_os_policy_assignments( @@ -2911,7 +2895,9 @@ def list_os_policy_assignments( ]: # 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._ListOSPolicyAssignments(self._session, self._host, self._interceptor) # type: ignore + return self._ListOSPolicyAssignments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_vulnerability_reports( @@ -2922,7 +2908,9 @@ def list_vulnerability_reports( ]: # 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._ListVulnerabilityReports(self._session, self._host, self._interceptor) # type: ignore + return self._ListVulnerabilityReports( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_os_policy_assignment( @@ -2933,7 +2921,9 @@ def update_os_policy_assignment( ]: # 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._UpdateOSPolicyAssignment(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateOSPolicyAssignment( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/__init__.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/__init__.py index 461664e8121b..e9b54c18eaa1 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/__init__.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/__init__.py @@ -20,7 +20,9 @@ ListInventoriesRequest, ListInventoriesResponse, ) -from .os_policy import OSPolicy +from .os_policy import ( + OSPolicy, +) from .os_policy_assignment_reports import ( GetOSPolicyAssignmentReportRequest, ListOSPolicyAssignmentReportsRequest, @@ -39,7 +41,9 @@ OSPolicyAssignmentOperationMetadata, UpdateOSPolicyAssignmentRequest, ) -from .osconfig_common import FixedOrPercent +from .osconfig_common import ( + FixedOrPercent, +) from .patch_deployments import ( CreatePatchDeploymentRequest, DeletePatchDeploymentRequest, diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/inventory.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/inventory.py index 9a372bcea6d7..128314fae8e4 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/inventory.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/inventory.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -46,6 +46,7 @@ class InventoryView(proto.Enum): FULL (2): Returns all fields. """ + INVENTORY_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -187,6 +188,7 @@ class OriginType(proto.Enum): result of the agent reporting inventory via the reporting API. """ + ORIGIN_TYPE_UNSPECIFIED = 0 INVENTORY_REPORT = 1 @@ -203,6 +205,7 @@ class Type(proto.Enum): This represents an update that is available for a package. """ + TYPE_UNSPECIFIED = 0 INSTALLED_PACKAGE = 1 AVAILABLE_PACKAGE = 2 diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/os_policy.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/os_policy.py index da25f7f0b17e..b5288ffe7373 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/os_policy.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/os_policy.py @@ -82,6 +82,7 @@ class Mode(proto.Enum): resources in the policy are in their desired state, and if not, enforces the desired state. """ + MODE_UNSPECIFIED = 0 VALIDATION = 1 ENFORCEMENT = 2 @@ -314,6 +315,7 @@ class DesiredState(proto.Enum): The agent ensures that the package is not installed and uninstalls it if detected. """ + DESIRED_STATE_UNSPECIFIED = 0 INSTALLED = 1 REMOVED = 2 @@ -569,6 +571,7 @@ class ArchiveType(proto.Enum): Deb-src indicates that the archive contains source files. """ + ARCHIVE_TYPE_UNSPECIFIED = 0 DEB = 1 DEB_SRC = 2 @@ -818,6 +821,7 @@ class Interpreter(proto.Enum): Indicates that the script runs with PowerShell. """ + INTERPRETER_UNSPECIFIED = 0 NONE = 1 SHELL = 2 @@ -922,6 +926,7 @@ class DesiredState(proto.Enum): matches. If the file does not exist it will be created. """ + DESIRED_STATE_UNSPECIFIED = 0 PRESENT = 1 ABSENT = 2 @@ -1013,12 +1018,12 @@ class ResourceGroup(proto.Message): in the exact order specified here. """ - inventory_filters: MutableSequence[ - "OSPolicy.InventoryFilter" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="OSPolicy.InventoryFilter", + inventory_filters: MutableSequence["OSPolicy.InventoryFilter"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="OSPolicy.InventoryFilter", + ) ) resources: MutableSequence["OSPolicy.Resource"] = proto.RepeatedField( proto.MESSAGE, diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/os_policy_assignment_reports.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/os_policy_assignment_reports.py index 22b4fb9b1e64..7b5f792ffa9c 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/os_policy_assignment_reports.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/os_policy_assignment_reports.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -131,12 +131,12 @@ class ListOSPolicyAssignmentReportsResponse(proto.Message): def raw_page(self): return self - os_policy_assignment_reports: MutableSequence[ - "OSPolicyAssignmentReport" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="OSPolicyAssignmentReport", + os_policy_assignment_reports: MutableSequence["OSPolicyAssignmentReport"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="OSPolicyAssignmentReport", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -242,6 +242,7 @@ class ComplianceState(proto.Enum): The policy is non-compliant if one or more underlying resources are non-compliant. """ + UNKNOWN = 0 COMPLIANT = 1 NON_COMPLIANT = 2 @@ -296,6 +297,7 @@ class ComplianceState(proto.Enum): NON_COMPLIANT (2): Resource is non-compliant. """ + UNKNOWN = 0 COMPLIANT = 1 NON_COMPLIANT = 2 @@ -339,6 +341,7 @@ class Type(proto.Enum): desired state due to side effects from executing other resources. """ + TYPE_UNSPECIFIED = 0 VALIDATION = 1 DESIRED_STATE_CHECK = 2 diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/os_policy_assignments.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/os_policy_assignments.py index fc1aad902a00..17d55f891de6 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/os_policy_assignments.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/os_policy_assignments.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.osconfig_v1.types import os_policy, osconfig_common @@ -135,6 +135,7 @@ class RolloutState(proto.Enum): SUCCEEDED (4): The rollout has completed successfully. """ + ROLLOUT_STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 CANCELLING = 2 @@ -224,26 +225,26 @@ class Inventory(proto.Message): proto.BOOL, number=1, ) - inclusion_labels: MutableSequence[ - "OSPolicyAssignment.LabelSet" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="OSPolicyAssignment.LabelSet", + inclusion_labels: MutableSequence["OSPolicyAssignment.LabelSet"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="OSPolicyAssignment.LabelSet", + ) ) - exclusion_labels: MutableSequence[ - "OSPolicyAssignment.LabelSet" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="OSPolicyAssignment.LabelSet", + exclusion_labels: MutableSequence["OSPolicyAssignment.LabelSet"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="OSPolicyAssignment.LabelSet", + ) ) - inventories: MutableSequence[ - "OSPolicyAssignment.InstanceFilter.Inventory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="OSPolicyAssignment.InstanceFilter.Inventory", + inventories: MutableSequence["OSPolicyAssignment.InstanceFilter.Inventory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="OSPolicyAssignment.InstanceFilter.Inventory", + ) ) class Rollout(proto.Message): @@ -365,6 +366,7 @@ class APIMethod(proto.Enum): DELETE (3): Delete OS policy assignment API method """ + API_METHOD_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 @@ -385,6 +387,7 @@ class RolloutState(proto.Enum): SUCCEEDED (4): The rollout has completed successfully. """ + ROLLOUT_STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 CANCELLING = 2 diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/patch_deployments.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/patch_deployments.py index 5a7e902414f4..ed428feaa261 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/patch_deployments.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/patch_deployments.py @@ -17,12 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore import proto # type: ignore from google.cloud.osconfig_v1.types import patch_jobs @@ -126,6 +126,7 @@ class State(proto.Enum): not generate Patch jobs. Requires user action to move in and out from this state. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 PAUSED = 2 @@ -269,6 +270,7 @@ class Frequency(proto.Enum): Indicates that the frequency of recurrence should be expressed in terms of days. """ + FREQUENCY_UNSPECIFIED = 0 WEEKLY = 1 MONTHLY = 2 diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/patch_jobs.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/patch_jobs.py index 9ccba3ac6f53..b10428370b49 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/patch_jobs.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/patch_jobs.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.osconfig_v1.types import osconfig_common @@ -191,12 +191,12 @@ class ListPatchJobInstanceDetailsResponse(proto.Message): def raw_page(self): return self - patch_job_instance_details: MutableSequence[ - "PatchJobInstanceDetails" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="PatchJobInstanceDetails", + patch_job_instance_details: MutableSequence["PatchJobInstanceDetails"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="PatchJobInstanceDetails", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -389,6 +389,7 @@ class State(proto.Enum): TIMED_OUT (7): The patch job timed out. """ + STATE_UNSPECIFIED = 0 STARTED = 1 INSTANCE_LOOKUP = 2 @@ -628,6 +629,7 @@ class RebootConfig(proto.Enum): Never reboot the machine after the update completes. """ + REBOOT_CONFIG_UNSPECIFIED = 0 DEFAULT = 1 ALWAYS = 2 @@ -727,6 +729,7 @@ class PatchState(proto.Enum): installed, running, and able to communicate with the service. """ + PATCH_STATE_UNSPECIFIED = 0 PENDING = 1 INACTIVE = 2 @@ -792,6 +795,7 @@ class Type(proto.Enum): UPGRADE (2): Runs ``apt-get upgrade``. """ + TYPE_UNSPECIFIED = 0 DIST = 1 UPGRADE = 2 @@ -976,6 +980,7 @@ class Classification(proto.Enum): "A widely released fix for a specific problem. An update addresses a noncritical, non-security-related bug." [1] """ + CLASSIFICATION_UNSPECIFIED = 0 CRITICAL = 1 SECURITY = 2 @@ -1074,6 +1079,7 @@ class Interpreter(proto.Enum): ``-NonInteractive``, ``-NoProfile``, and ``-ExecutionPolicy Bypass``. """ + INTERPRETER_UNSPECIFIED = 0 SHELL = 1 POWERSHELL = 2 @@ -1266,6 +1272,7 @@ class Mode(proto.Enum): Patches are applied to VMs in all zones at the same time. """ + MODE_UNSPECIFIED = 0 ZONE_BY_ZONE = 1 CONCURRENT_ZONES = 2 diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/vulnerability.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/vulnerability.py index b7da6d68f5cc..e50d8ca89c78 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/vulnerability.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1/types/vulnerability.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -82,6 +82,7 @@ class VulnerabilitySeverityLevel(proto.Enum): Vulnerability severity level is critical. This is the highest severity level. """ + VULNERABILITY_SEVERITY_LEVEL_UNSPECIFIED = 0 NONE = 1 MINIMAL = 2 @@ -269,12 +270,12 @@ class Item(proto.Message): number=5, message=timestamp_pb2.Timestamp, ) - items: MutableSequence[ - "VulnerabilityReport.Vulnerability.Item" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="VulnerabilityReport.Vulnerability.Item", + items: MutableSequence["VulnerabilityReport.Vulnerability.Item"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="VulnerabilityReport.Vulnerability.Item", + ) ) name: str = proto.Field( @@ -483,6 +484,7 @@ class AttackVector(proto.Enum): physically touch or manipulate the vulnerable component. """ + ATTACK_VECTOR_UNSPECIFIED = 0 ATTACK_VECTOR_NETWORK = 1 ATTACK_VECTOR_ADJACENT = 2 @@ -510,6 +512,7 @@ class AttackComplexity(proto.Enum): or execution against the vulnerable component before a successful attack can be expected. """ + ATTACK_COMPLEXITY_UNSPECIFIED = 0 ATTACK_COMPLEXITY_LOW = 1 ATTACK_COMPLEXITY_HIGH = 2 @@ -539,6 +542,7 @@ class PrivilegesRequired(proto.Enum): the vulnerable component allowing access to component-wide settings and files. """ + PRIVILEGES_REQUIRED_UNSPECIFIED = 0 PRIVILEGES_REQUIRED_NONE = 1 PRIVILEGES_REQUIRED_LOW = 2 @@ -560,6 +564,7 @@ class UserInteraction(proto.Enum): requires a user to take some action before the vulnerability can be exploited. """ + USER_INTERACTION_UNSPECIFIED = 0 USER_INTERACTION_NONE = 1 USER_INTERACTION_REQUIRED = 2 @@ -582,6 +587,7 @@ class Scope(proto.Enum): the security authority of the vulnerable component. """ + SCOPE_UNSPECIFIED = 0 SCOPE_UNCHANGED = 1 SCOPE_CHANGED = 2 @@ -602,6 +608,7 @@ class Impact(proto.Enum): IMPACT_NONE (3): No impact. """ + IMPACT_UNSPECIFIED = 0 IMPACT_HIGH = 1 IMPACT_LOW = 2 diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/__init__.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/__init__.py index 73be4ae0efce..b4d277d3d51f 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/__init__.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.os_config_zonal_service import ( OsConfigZonalServiceAsyncClient, OsConfigZonalServiceClient, diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/async_client.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/async_client.py index fe4e14f9e820..2feec74b689f 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/async_client.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import warnings +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import warnings +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.osconfig_v1alpha import gapic_version as package_version @@ -45,11 +45,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.osconfig_v1alpha.services.os_config_zonal_service import pagers from google.cloud.osconfig_v1alpha.types import ( @@ -165,7 +165,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: OsConfigZonalServiceAsyncClient: The constructed client. """ - return OsConfigZonalServiceClient.from_service_account_info.__func__(OsConfigZonalServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = OsConfigZonalServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(OsConfigZonalServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -181,7 +182,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: OsConfigZonalServiceAsyncClient: The constructed client. """ - return OsConfigZonalServiceClient.from_service_account_file.__func__(OsConfigZonalServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = OsConfigZonalServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(OsConfigZonalServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file @@ -219,7 +221,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return OsConfigZonalServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return OsConfigZonalServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> OsConfigZonalServiceTransport: diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/client.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/client.py index 03366c377ecf..32addc25c132 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/client.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.osconfig_v1alpha import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.osconfig_v1alpha.services.os_config_zonal_service import pagers from google.cloud.osconfig_v1alpha.types import ( @@ -92,9 +92,7 @@ class OsConfigZonalServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OsConfigZonalServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OsConfigZonalServiceTransport]] _transport_registry["grpc"] = OsConfigZonalServiceGrpcTransport _transport_registry["grpc_asyncio"] = OsConfigZonalServiceGrpcAsyncIOTransport _transport_registry["rest"] = OsConfigZonalServiceRestTransport @@ -779,11 +777,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OsConfigZonalServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OsConfigZonalServiceClient._read_environment_variables() + ) self._client_cert_source = OsConfigZonalServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -818,8 +814,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OsConfigZonalServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/pagers.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/pagers.py index 31f97cfa8cc0..6147744ec963 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/pagers.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/pagers.py @@ -73,7 +73,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -235,7 +235,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -318,7 +318,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -405,7 +405,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -496,7 +496,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -588,7 +588,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -675,7 +675,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -763,7 +763,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -839,7 +839,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -919,7 +919,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -997,7 +997,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/__init__.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/__init__.py index 67469044da33..666879f51708 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/__init__.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/__init__.py @@ -22,9 +22,7 @@ from .rest import OsConfigZonalServiceRestInterceptor, OsConfigZonalServiceRestTransport # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OsConfigZonalServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OsConfigZonalServiceTransport]] _transport_registry["grpc"] = OsConfigZonalServiceGrpcTransport _transport_registry["grpc_asyncio"] = OsConfigZonalServiceGrpcAsyncIOTransport _transport_registry["rest"] = OsConfigZonalServiceRestTransport diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/base.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/base.py index c61cd8e06e96..7906543aea01 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/base.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.osconfig_v1alpha import gapic_version as package_version from google.cloud.osconfig_v1alpha.types import ( diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/grpc.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/grpc.py index 7bf87c9896df..7dc03dc8de16 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/grpc.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.osconfig_v1alpha.types import ( instance_os_policies_compliance, @@ -381,12 +381,12 @@ def create_os_policy_assignment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_os_policy_assignment" not in self._stubs: - self._stubs[ - "create_os_policy_assignment" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/CreateOSPolicyAssignment", - request_serializer=os_policy_assignments.CreateOSPolicyAssignmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_os_policy_assignment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/CreateOSPolicyAssignment", + request_serializer=os_policy_assignments.CreateOSPolicyAssignmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_os_policy_assignment"] @@ -421,12 +421,12 @@ def update_os_policy_assignment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_os_policy_assignment" not in self._stubs: - self._stubs[ - "update_os_policy_assignment" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/UpdateOSPolicyAssignment", - request_serializer=os_policy_assignments.UpdateOSPolicyAssignmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_os_policy_assignment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/UpdateOSPolicyAssignment", + request_serializer=os_policy_assignments.UpdateOSPolicyAssignmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_os_policy_assignment"] @@ -488,12 +488,12 @@ def list_os_policy_assignments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_os_policy_assignments" not in self._stubs: - self._stubs[ - "list_os_policy_assignments" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListOSPolicyAssignments", - request_serializer=os_policy_assignments.ListOSPolicyAssignmentsRequest.serialize, - response_deserializer=os_policy_assignments.ListOSPolicyAssignmentsResponse.deserialize, + self._stubs["list_os_policy_assignments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListOSPolicyAssignments", + request_serializer=os_policy_assignments.ListOSPolicyAssignmentsRequest.serialize, + response_deserializer=os_policy_assignments.ListOSPolicyAssignmentsResponse.deserialize, + ) ) return self._stubs["list_os_policy_assignments"] @@ -521,12 +521,12 @@ def list_os_policy_assignment_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_os_policy_assignment_revisions" not in self._stubs: - self._stubs[ - "list_os_policy_assignment_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListOSPolicyAssignmentRevisions", - request_serializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsRequest.serialize, - response_deserializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsResponse.deserialize, + self._stubs["list_os_policy_assignment_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListOSPolicyAssignmentRevisions", + request_serializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsRequest.serialize, + response_deserializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsResponse.deserialize, + ) ) return self._stubs["list_os_policy_assignment_revisions"] @@ -564,12 +564,12 @@ def delete_os_policy_assignment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_os_policy_assignment" not in self._stubs: - self._stubs[ - "delete_os_policy_assignment" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/DeleteOSPolicyAssignment", - request_serializer=os_policy_assignments.DeleteOSPolicyAssignmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_os_policy_assignment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/DeleteOSPolicyAssignment", + request_serializer=os_policy_assignments.DeleteOSPolicyAssignmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_os_policy_assignment"] @@ -597,12 +597,12 @@ def get_instance_os_policies_compliance( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_instance_os_policies_compliance" not in self._stubs: - self._stubs[ - "get_instance_os_policies_compliance" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/GetInstanceOSPoliciesCompliance", - request_serializer=instance_os_policies_compliance.GetInstanceOSPoliciesComplianceRequest.serialize, - response_deserializer=instance_os_policies_compliance.InstanceOSPoliciesCompliance.deserialize, + self._stubs["get_instance_os_policies_compliance"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/GetInstanceOSPoliciesCompliance", + request_serializer=instance_os_policies_compliance.GetInstanceOSPoliciesComplianceRequest.serialize, + response_deserializer=instance_os_policies_compliance.InstanceOSPoliciesCompliance.deserialize, + ) ) return self._stubs["get_instance_os_policies_compliance"] @@ -630,12 +630,12 @@ def list_instance_os_policies_compliances( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_instance_os_policies_compliances" not in self._stubs: - self._stubs[ - "list_instance_os_policies_compliances" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListInstanceOSPoliciesCompliances", - request_serializer=instance_os_policies_compliance.ListInstanceOSPoliciesCompliancesRequest.serialize, - response_deserializer=instance_os_policies_compliance.ListInstanceOSPoliciesCompliancesResponse.deserialize, + self._stubs["list_instance_os_policies_compliances"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListInstanceOSPoliciesCompliances", + request_serializer=instance_os_policies_compliance.ListInstanceOSPoliciesCompliancesRequest.serialize, + response_deserializer=instance_os_policies_compliance.ListInstanceOSPoliciesCompliancesResponse.deserialize, + ) ) return self._stubs["list_instance_os_policies_compliances"] @@ -663,12 +663,12 @@ def get_os_policy_assignment_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_os_policy_assignment_report" not in self._stubs: - self._stubs[ - "get_os_policy_assignment_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/GetOSPolicyAssignmentReport", - request_serializer=os_policy_assignment_reports.GetOSPolicyAssignmentReportRequest.serialize, - response_deserializer=os_policy_assignment_reports.OSPolicyAssignmentReport.deserialize, + self._stubs["get_os_policy_assignment_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/GetOSPolicyAssignmentReport", + request_serializer=os_policy_assignment_reports.GetOSPolicyAssignmentReportRequest.serialize, + response_deserializer=os_policy_assignment_reports.OSPolicyAssignmentReport.deserialize, + ) ) return self._stubs["get_os_policy_assignment_report"] @@ -696,12 +696,12 @@ def list_os_policy_assignment_reports( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_os_policy_assignment_reports" not in self._stubs: - self._stubs[ - "list_os_policy_assignment_reports" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListOSPolicyAssignmentReports", - request_serializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsRequest.serialize, - response_deserializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsResponse.deserialize, + self._stubs["list_os_policy_assignment_reports"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListOSPolicyAssignmentReports", + request_serializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsRequest.serialize, + response_deserializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsResponse.deserialize, + ) ) return self._stubs["list_os_policy_assignment_reports"] @@ -814,12 +814,12 @@ def list_vulnerability_reports( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_vulnerability_reports" not in self._stubs: - self._stubs[ - "list_vulnerability_reports" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListVulnerabilityReports", - request_serializer=vulnerability.ListVulnerabilityReportsRequest.serialize, - response_deserializer=vulnerability.ListVulnerabilityReportsResponse.deserialize, + self._stubs["list_vulnerability_reports"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListVulnerabilityReports", + request_serializer=vulnerability.ListVulnerabilityReportsRequest.serialize, + response_deserializer=vulnerability.ListVulnerabilityReportsResponse.deserialize, + ) ) return self._stubs["list_vulnerability_reports"] diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/grpc_asyncio.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/grpc_asyncio.py index bbfe1e495c42..89915d76e402 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.osconfig_v1alpha.types import ( instance_os_policies_compliance, @@ -389,12 +389,12 @@ def create_os_policy_assignment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_os_policy_assignment" not in self._stubs: - self._stubs[ - "create_os_policy_assignment" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/CreateOSPolicyAssignment", - request_serializer=os_policy_assignments.CreateOSPolicyAssignmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_os_policy_assignment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/CreateOSPolicyAssignment", + request_serializer=os_policy_assignments.CreateOSPolicyAssignmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_os_policy_assignment"] @@ -429,12 +429,12 @@ def update_os_policy_assignment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_os_policy_assignment" not in self._stubs: - self._stubs[ - "update_os_policy_assignment" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/UpdateOSPolicyAssignment", - request_serializer=os_policy_assignments.UpdateOSPolicyAssignmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_os_policy_assignment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/UpdateOSPolicyAssignment", + request_serializer=os_policy_assignments.UpdateOSPolicyAssignmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_os_policy_assignment"] @@ -496,12 +496,12 @@ def list_os_policy_assignments( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_os_policy_assignments" not in self._stubs: - self._stubs[ - "list_os_policy_assignments" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListOSPolicyAssignments", - request_serializer=os_policy_assignments.ListOSPolicyAssignmentsRequest.serialize, - response_deserializer=os_policy_assignments.ListOSPolicyAssignmentsResponse.deserialize, + self._stubs["list_os_policy_assignments"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListOSPolicyAssignments", + request_serializer=os_policy_assignments.ListOSPolicyAssignmentsRequest.serialize, + response_deserializer=os_policy_assignments.ListOSPolicyAssignmentsResponse.deserialize, + ) ) return self._stubs["list_os_policy_assignments"] @@ -529,12 +529,12 @@ def list_os_policy_assignment_revisions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_os_policy_assignment_revisions" not in self._stubs: - self._stubs[ - "list_os_policy_assignment_revisions" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListOSPolicyAssignmentRevisions", - request_serializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsRequest.serialize, - response_deserializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsResponse.deserialize, + self._stubs["list_os_policy_assignment_revisions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListOSPolicyAssignmentRevisions", + request_serializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsRequest.serialize, + response_deserializer=os_policy_assignments.ListOSPolicyAssignmentRevisionsResponse.deserialize, + ) ) return self._stubs["list_os_policy_assignment_revisions"] @@ -572,12 +572,12 @@ def delete_os_policy_assignment( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_os_policy_assignment" not in self._stubs: - self._stubs[ - "delete_os_policy_assignment" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/DeleteOSPolicyAssignment", - request_serializer=os_policy_assignments.DeleteOSPolicyAssignmentRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_os_policy_assignment"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/DeleteOSPolicyAssignment", + request_serializer=os_policy_assignments.DeleteOSPolicyAssignmentRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_os_policy_assignment"] @@ -605,12 +605,12 @@ def get_instance_os_policies_compliance( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_instance_os_policies_compliance" not in self._stubs: - self._stubs[ - "get_instance_os_policies_compliance" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/GetInstanceOSPoliciesCompliance", - request_serializer=instance_os_policies_compliance.GetInstanceOSPoliciesComplianceRequest.serialize, - response_deserializer=instance_os_policies_compliance.InstanceOSPoliciesCompliance.deserialize, + self._stubs["get_instance_os_policies_compliance"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/GetInstanceOSPoliciesCompliance", + request_serializer=instance_os_policies_compliance.GetInstanceOSPoliciesComplianceRequest.serialize, + response_deserializer=instance_os_policies_compliance.InstanceOSPoliciesCompliance.deserialize, + ) ) return self._stubs["get_instance_os_policies_compliance"] @@ -640,12 +640,12 @@ def list_instance_os_policies_compliances( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_instance_os_policies_compliances" not in self._stubs: - self._stubs[ - "list_instance_os_policies_compliances" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListInstanceOSPoliciesCompliances", - request_serializer=instance_os_policies_compliance.ListInstanceOSPoliciesCompliancesRequest.serialize, - response_deserializer=instance_os_policies_compliance.ListInstanceOSPoliciesCompliancesResponse.deserialize, + self._stubs["list_instance_os_policies_compliances"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListInstanceOSPoliciesCompliances", + request_serializer=instance_os_policies_compliance.ListInstanceOSPoliciesCompliancesRequest.serialize, + response_deserializer=instance_os_policies_compliance.ListInstanceOSPoliciesCompliancesResponse.deserialize, + ) ) return self._stubs["list_instance_os_policies_compliances"] @@ -673,12 +673,12 @@ def get_os_policy_assignment_report( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_os_policy_assignment_report" not in self._stubs: - self._stubs[ - "get_os_policy_assignment_report" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/GetOSPolicyAssignmentReport", - request_serializer=os_policy_assignment_reports.GetOSPolicyAssignmentReportRequest.serialize, - response_deserializer=os_policy_assignment_reports.OSPolicyAssignmentReport.deserialize, + self._stubs["get_os_policy_assignment_report"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/GetOSPolicyAssignmentReport", + request_serializer=os_policy_assignment_reports.GetOSPolicyAssignmentReportRequest.serialize, + response_deserializer=os_policy_assignment_reports.OSPolicyAssignmentReport.deserialize, + ) ) return self._stubs["get_os_policy_assignment_report"] @@ -706,12 +706,12 @@ def list_os_policy_assignment_reports( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_os_policy_assignment_reports" not in self._stubs: - self._stubs[ - "list_os_policy_assignment_reports" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListOSPolicyAssignmentReports", - request_serializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsRequest.serialize, - response_deserializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsResponse.deserialize, + self._stubs["list_os_policy_assignment_reports"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListOSPolicyAssignmentReports", + request_serializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsRequest.serialize, + response_deserializer=os_policy_assignment_reports.ListOSPolicyAssignmentReportsResponse.deserialize, + ) ) return self._stubs["list_os_policy_assignment_reports"] @@ -825,12 +825,12 @@ def list_vulnerability_reports( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_vulnerability_reports" not in self._stubs: - self._stubs[ - "list_vulnerability_reports" - ] = self._logged_channel.unary_unary( - "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListVulnerabilityReports", - request_serializer=vulnerability.ListVulnerabilityReportsRequest.serialize, - response_deserializer=vulnerability.ListVulnerabilityReportsResponse.deserialize, + self._stubs["list_vulnerability_reports"] = ( + self._logged_channel.unary_unary( + "/google.cloud.osconfig.v1alpha.OsConfigZonalService/ListVulnerabilityReports", + request_serializer=vulnerability.ListVulnerabilityReportsRequest.serialize, + response_deserializer=vulnerability.ListVulnerabilityReportsResponse.deserialize, + ) ) return self._stubs["list_vulnerability_reports"] diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/rest.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/rest.py index f4abd86facbc..4e7b2d5b8970 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/rest.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1102,9 +1102,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseCreateOSPolicyAssignment._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseCreateOSPolicyAssignment._get_http_options() request, metadata = self._interceptor.pre_create_os_policy_assignment( request, metadata @@ -1130,7 +1128,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1257,9 +1255,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseDeleteOSPolicyAssignment._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseDeleteOSPolicyAssignment._get_http_options() request, metadata = self._interceptor.pre_delete_os_policy_assignment( request, metadata @@ -1281,7 +1277,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1422,15 +1418,12 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseGetInstanceOSPoliciesCompliance._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseGetInstanceOSPoliciesCompliance._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_get_instance_os_policies_compliance( - request, metadata + request, metadata = ( + self._interceptor.pre_get_instance_os_policies_compliance( + request, metadata + ) ) transcoded_request = _BaseOsConfigZonalServiceRestTransport._BaseGetInstanceOSPoliciesCompliance._get_transcoded_request( http_options, request @@ -1493,11 +1486,10 @@ def __call__( resp = self._interceptor.post_get_instance_os_policies_compliance(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_instance_os_policies_compliance_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_instance_os_policies_compliance_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1590,9 +1582,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseGetInventory._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseGetInventory._get_http_options() request, metadata = self._interceptor.pre_get_inventory(request, metadata) transcoded_request = _BaseOsConfigZonalServiceRestTransport._BaseGetInventory._get_transcoded_request( @@ -1748,9 +1738,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseGetOSPolicyAssignment._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseGetOSPolicyAssignment._get_http_options() request, metadata = self._interceptor.pre_get_os_policy_assignment( request, metadata @@ -1903,9 +1891,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseGetOSPolicyAssignmentReport._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseGetOSPolicyAssignmentReport._get_http_options() request, metadata = self._interceptor.pre_get_os_policy_assignment_report( request, metadata @@ -1969,11 +1955,10 @@ def __call__( resp = self._interceptor.post_get_os_policy_assignment_report(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_os_policy_assignment_report_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_os_policy_assignment_report_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2065,9 +2050,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseGetVulnerabilityReport._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseGetVulnerabilityReport._get_http_options() request, metadata = self._interceptor.pre_get_vulnerability_report( request, metadata @@ -2224,15 +2207,12 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseListInstanceOSPoliciesCompliances._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseListInstanceOSPoliciesCompliances._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_instance_os_policies_compliances( - request, metadata + request, metadata = ( + self._interceptor.pre_list_instance_os_policies_compliances( + request, metadata + ) ) transcoded_request = _BaseOsConfigZonalServiceRestTransport._BaseListInstanceOSPoliciesCompliances._get_transcoded_request( http_options, request @@ -2286,9 +2266,7 @@ def __call__( raise core_exceptions.from_http_response(response) # Return the response - resp = ( - instance_os_policies_compliance.ListInstanceOSPoliciesCompliancesResponse() - ) + resp = instance_os_policies_compliance.ListInstanceOSPoliciesCompliancesResponse() pb_resp = instance_os_policies_compliance.ListInstanceOSPoliciesCompliancesResponse.pb( resp ) @@ -2297,11 +2275,10 @@ def __call__( resp = self._interceptor.post_list_instance_os_policies_compliances(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_instance_os_policies_compliances_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_instance_os_policies_compliances_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2388,9 +2365,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseListInventories._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseListInventories._get_http_options() request, metadata = self._interceptor.pre_list_inventories( request, metadata @@ -2544,9 +2519,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignmentReports._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignmentReports._get_http_options() request, metadata = self._interceptor.pre_list_os_policy_assignment_reports( request, metadata @@ -2614,11 +2587,10 @@ def __call__( resp = self._interceptor.post_list_os_policy_assignment_reports(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_os_policy_assignment_reports_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_os_policy_assignment_reports_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2706,15 +2678,12 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignmentRevisions._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignmentRevisions._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_os_policy_assignment_revisions( - request, metadata + request, metadata = ( + self._interceptor.pre_list_os_policy_assignment_revisions( + request, metadata + ) ) transcoded_request = _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignmentRevisions._get_transcoded_request( http_options, request @@ -2777,11 +2746,10 @@ def __call__( resp = self._interceptor.post_list_os_policy_assignment_revisions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_os_policy_assignment_revisions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_os_policy_assignment_revisions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2867,9 +2835,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignments._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseListOSPolicyAssignments._get_http_options() request, metadata = self._interceptor.pre_list_os_policy_assignments( request, metadata @@ -3024,9 +2990,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseListVulnerabilityReports._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseListVulnerabilityReports._get_http_options() request, metadata = self._interceptor.pre_list_vulnerability_reports( request, metadata @@ -3179,9 +3143,7 @@ def __call__( """ - http_options = ( - _BaseOsConfigZonalServiceRestTransport._BaseUpdateOSPolicyAssignment._get_http_options() - ) + http_options = _BaseOsConfigZonalServiceRestTransport._BaseUpdateOSPolicyAssignment._get_http_options() request, metadata = self._interceptor.pre_update_os_policy_assignment( request, metadata @@ -3207,7 +3169,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3283,7 +3245,9 @@ def create_os_policy_assignment( ]: # 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._CreateOSPolicyAssignment(self._session, self._host, self._interceptor) # type: ignore + return self._CreateOSPolicyAssignment( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_os_policy_assignment( @@ -3294,7 +3258,9 @@ def delete_os_policy_assignment( ]: # 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._DeleteOSPolicyAssignment(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteOSPolicyAssignment( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_instance_os_policies_compliance( @@ -3305,7 +3271,9 @@ def get_instance_os_policies_compliance( ]: # 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._GetInstanceOSPoliciesCompliance(self._session, self._host, self._interceptor) # type: ignore + return self._GetInstanceOSPoliciesCompliance( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_inventory( @@ -3335,7 +3303,9 @@ def get_os_policy_assignment_report( ]: # 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._GetOSPolicyAssignmentReport(self._session, self._host, self._interceptor) # type: ignore + return self._GetOSPolicyAssignmentReport( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_vulnerability_report( @@ -3345,7 +3315,9 @@ def get_vulnerability_report( ]: # 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._GetVulnerabilityReport(self._session, self._host, self._interceptor) # type: ignore + return self._GetVulnerabilityReport( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_instance_os_policies_compliances( @@ -3356,7 +3328,9 @@ def list_instance_os_policies_compliances( ]: # 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._ListInstanceOSPoliciesCompliances(self._session, self._host, self._interceptor) # type: ignore + return self._ListInstanceOSPoliciesCompliances( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_inventories( @@ -3377,7 +3351,9 @@ def list_os_policy_assignment_reports( ]: # 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._ListOSPolicyAssignmentReports(self._session, self._host, self._interceptor) # type: ignore + return self._ListOSPolicyAssignmentReports( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_os_policy_assignment_revisions( @@ -3388,7 +3364,9 @@ def list_os_policy_assignment_revisions( ]: # 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._ListOSPolicyAssignmentRevisions(self._session, self._host, self._interceptor) # type: ignore + return self._ListOSPolicyAssignmentRevisions( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_os_policy_assignments( @@ -3399,7 +3377,9 @@ def list_os_policy_assignments( ]: # 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._ListOSPolicyAssignments(self._session, self._host, self._interceptor) # type: ignore + return self._ListOSPolicyAssignments( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_vulnerability_reports( @@ -3410,7 +3390,9 @@ def list_vulnerability_reports( ]: # 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._ListVulnerabilityReports(self._session, self._host, self._interceptor) # type: ignore + return self._ListVulnerabilityReports( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_os_policy_assignment( @@ -3421,7 +3403,9 @@ def update_os_policy_assignment( ]: # 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._UpdateOSPolicyAssignment(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateOSPolicyAssignment( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/__init__.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/__init__.py index 5b189cbcc7a7..bfd521011f08 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/__init__.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/__init__.py @@ -31,7 +31,9 @@ ListInventoriesRequest, ListInventoriesResponse, ) -from .os_policy import OSPolicy +from .os_policy import ( + OSPolicy, +) from .os_policy_assignment_reports import ( GetOSPolicyAssignmentReportRequest, ListOSPolicyAssignmentReportsRequest, @@ -50,7 +52,9 @@ OSPolicyAssignmentOperationMetadata, UpdateOSPolicyAssignmentRequest, ) -from .osconfig_common import FixedOrPercent +from .osconfig_common import ( + FixedOrPercent, +) from .vulnerability import ( CVSSv3, GetVulnerabilityReportRequest, diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/config_common.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/config_common.py index e9fb11c6694b..ff85508f9f04 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/config_common.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/config_common.py @@ -46,6 +46,7 @@ class OSPolicyComplianceState(proto.Enum): instance. This state is only applicable to the instance. """ + _pb_options = {"deprecated": True} OS_POLICY_COMPLIANCE_STATE_UNSPECIFIED = 0 COMPLIANT = 1 @@ -96,6 +97,7 @@ class Type(proto.Enum): configuring other resources during the current configuration run. """ + _pb_options = {"deprecated": True} TYPE_UNSPECIFIED = 0 VALIDATION = 1 @@ -114,6 +116,7 @@ class Outcome(proto.Enum): FAILED (2): The step failed. """ + _pb_options = {"deprecated": True} OUTCOME_UNSPECIFIED = 0 SUCCEEDED = 1 diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/instance_os_policies_compliance.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/instance_os_policies_compliance.py index daf70028dee0..b27b4a1aa64d 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/instance_os_policies_compliance.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/instance_os_policies_compliance.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.osconfig_v1alpha.types import config_common diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/inventory.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/inventory.py index 622082d2670e..188014d9a3cb 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/inventory.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/inventory.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -46,6 +46,7 @@ class InventoryView(proto.Enum): FULL (2): Returns all fields. """ + INVENTORY_VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 @@ -187,6 +188,7 @@ class OriginType(proto.Enum): result of the agent reporting inventory via the reporting API. """ + ORIGIN_TYPE_UNSPECIFIED = 0 INVENTORY_REPORT = 1 @@ -203,6 +205,7 @@ class Type(proto.Enum): This represents an update that is available for a package. """ + TYPE_UNSPECIFIED = 0 INSTALLED_PACKAGE = 1 AVAILABLE_PACKAGE = 2 diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/os_policy.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/os_policy.py index 06742ece3999..f6c2212ae44b 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/os_policy.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/os_policy.py @@ -82,6 +82,7 @@ class Mode(proto.Enum): resources in the policy are in their desired state, and if not, enforces the desired state. """ + MODE_UNSPECIFIED = 0 VALIDATION = 1 ENFORCEMENT = 2 @@ -339,6 +340,7 @@ class DesiredState(proto.Enum): The agent ensures that the package is not installed and uninstalls it if detected. """ + DESIRED_STATE_UNSPECIFIED = 0 INSTALLED = 1 REMOVED = 2 @@ -594,6 +596,7 @@ class ArchiveType(proto.Enum): Deb-src indicates that the archive contains source files. """ + ARCHIVE_TYPE_UNSPECIFIED = 0 DEB = 1 DEB_SRC = 2 @@ -843,6 +846,7 @@ class Interpreter(proto.Enum): Indicates that the script runs with PowerShell. """ + INTERPRETER_UNSPECIFIED = 0 NONE = 1 SHELL = 2 @@ -947,6 +951,7 @@ class DesiredState(proto.Enum): matches. If the file does not exist it will be created. """ + DESIRED_STATE_UNSPECIFIED = 0 PRESENT = 1 ABSENT = 2 @@ -1046,12 +1051,12 @@ class ResourceGroup(proto.Message): number=1, message="OSPolicy.OSFilter", ) - inventory_filters: MutableSequence[ - "OSPolicy.InventoryFilter" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="OSPolicy.InventoryFilter", + inventory_filters: MutableSequence["OSPolicy.InventoryFilter"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="OSPolicy.InventoryFilter", + ) ) resources: MutableSequence["OSPolicy.Resource"] = proto.RepeatedField( proto.MESSAGE, diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/os_policy_assignment_reports.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/os_policy_assignment_reports.py index a8c43687a49f..60a79f9bea39 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/os_policy_assignment_reports.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/os_policy_assignment_reports.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -131,12 +131,12 @@ class ListOSPolicyAssignmentReportsResponse(proto.Message): def raw_page(self): return self - os_policy_assignment_reports: MutableSequence[ - "OSPolicyAssignmentReport" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="OSPolicyAssignmentReport", + os_policy_assignment_reports: MutableSequence["OSPolicyAssignmentReport"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="OSPolicyAssignmentReport", + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -242,6 +242,7 @@ class ComplianceState(proto.Enum): The policy is non-compliant if one or more underlying resources are non-compliant. """ + UNKNOWN = 0 COMPLIANT = 1 NON_COMPLIANT = 2 @@ -296,6 +297,7 @@ class ComplianceState(proto.Enum): NON_COMPLIANT (2): Resource is non-compliant. """ + UNKNOWN = 0 COMPLIANT = 1 NON_COMPLIANT = 2 @@ -339,6 +341,7 @@ class Type(proto.Enum): desired state due to side effects from executing other resources. """ + TYPE_UNSPECIFIED = 0 VALIDATION = 1 DESIRED_STATE_CHECK = 2 diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/os_policy_assignments.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/os_policy_assignments.py index c8751d71ab48..1bcfe5f4150d 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/os_policy_assignments.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/os_policy_assignments.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.osconfig_v1alpha.types import os_policy, osconfig_common @@ -135,6 +135,7 @@ class RolloutState(proto.Enum): SUCCEEDED (4): The rollout has completed successfully. """ + ROLLOUT_STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 CANCELLING = 2 @@ -232,26 +233,26 @@ class Inventory(proto.Message): proto.STRING, number=2, ) - inclusion_labels: MutableSequence[ - "OSPolicyAssignment.LabelSet" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="OSPolicyAssignment.LabelSet", + inclusion_labels: MutableSequence["OSPolicyAssignment.LabelSet"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="OSPolicyAssignment.LabelSet", + ) ) - exclusion_labels: MutableSequence[ - "OSPolicyAssignment.LabelSet" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="OSPolicyAssignment.LabelSet", + exclusion_labels: MutableSequence["OSPolicyAssignment.LabelSet"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="OSPolicyAssignment.LabelSet", + ) ) - inventories: MutableSequence[ - "OSPolicyAssignment.InstanceFilter.Inventory" - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message="OSPolicyAssignment.InstanceFilter.Inventory", + inventories: MutableSequence["OSPolicyAssignment.InstanceFilter.Inventory"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message="OSPolicyAssignment.InstanceFilter.Inventory", + ) ) class Rollout(proto.Message): @@ -373,6 +374,7 @@ class APIMethod(proto.Enum): DELETE (3): Delete OS policy assignment API method """ + API_METHOD_UNSPECIFIED = 0 CREATE = 1 UPDATE = 2 @@ -393,6 +395,7 @@ class RolloutState(proto.Enum): SUCCEEDED (4): The rollout has completed successfully. """ + ROLLOUT_STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 CANCELLING = 2 diff --git a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/vulnerability.py b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/vulnerability.py index 4f9f2bd459c8..4282b53b5ed3 100644 --- a/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/vulnerability.py +++ b/packages/google-cloud-os-config/google/cloud/osconfig_v1alpha/types/vulnerability.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -233,12 +233,12 @@ class Item(proto.Message): number=5, message=timestamp_pb2.Timestamp, ) - items: MutableSequence[ - "VulnerabilityReport.Vulnerability.Item" - ] = proto.RepeatedField( - proto.MESSAGE, - number=6, - message="VulnerabilityReport.Vulnerability.Item", + items: MutableSequence["VulnerabilityReport.Vulnerability.Item"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=6, + message="VulnerabilityReport.Vulnerability.Item", + ) ) name: str = proto.Field( @@ -427,6 +427,7 @@ class AttackVector(proto.Enum): physically touch or manipulate the vulnerable component. """ + ATTACK_VECTOR_UNSPECIFIED = 0 ATTACK_VECTOR_NETWORK = 1 ATTACK_VECTOR_ADJACENT = 2 @@ -454,6 +455,7 @@ class AttackComplexity(proto.Enum): or execution against the vulnerable component before a successful attack can be expected. """ + ATTACK_COMPLEXITY_UNSPECIFIED = 0 ATTACK_COMPLEXITY_LOW = 1 ATTACK_COMPLEXITY_HIGH = 2 @@ -483,6 +485,7 @@ class PrivilegesRequired(proto.Enum): the vulnerable component allowing access to component-wide settings and files. """ + PRIVILEGES_REQUIRED_UNSPECIFIED = 0 PRIVILEGES_REQUIRED_NONE = 1 PRIVILEGES_REQUIRED_LOW = 2 @@ -504,6 +507,7 @@ class UserInteraction(proto.Enum): requires a user to take some action before the vulnerability can be exploited. """ + USER_INTERACTION_UNSPECIFIED = 0 USER_INTERACTION_NONE = 1 USER_INTERACTION_REQUIRED = 2 @@ -526,6 +530,7 @@ class Scope(proto.Enum): the security authority of the vulnerable component. """ + SCOPE_UNSPECIFIED = 0 SCOPE_UNCHANGED = 1 SCOPE_CHANGED = 2 @@ -546,6 +551,7 @@ class Impact(proto.Enum): IMPACT_NONE (3): No impact. """ + IMPACT_UNSPECIFIED = 0 IMPACT_HIGH = 1 IMPACT_LOW = 2 diff --git a/packages/google-cloud-os-config/noxfile.py b/packages/google-cloud-os-config/noxfile.py index f169f167dd80..3b9bfce91f74 100644 --- a/packages/google-cloud-os-config/noxfile.py +++ b/packages/google-cloud-os-config/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1/test_os_config_service.py b/packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1/test_os_config_service.py index d75b1093dd5c..73bbdc900ff6 100644 --- a/packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1/test_os_config_service.py +++ b/packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1/test_os_config_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,20 +43,25 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.datetime_pb2 as datetime_pb2 # type: ignore +import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore +import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import datetime_pb2 # type: ignore -from google.type import dayofweek_pb2 # type: ignore -from google.type import timeofday_pb2 # type: ignore from google.cloud.osconfig_v1.services.os_config_service import ( OsConfigServiceAsyncClient, @@ -979,10 +984,9 @@ def test_os_config_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1027,10 +1031,9 @@ def test_os_config_service_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1066,10 +1069,9 @@ def test_os_config_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1312,13 +1314,13 @@ def test_os_config_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1447,9 +1449,9 @@ def test_execute_patch_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.execute_patch_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.execute_patch_job] = ( + mock_rpc + ) request = {} client.execute_patch_job(request) @@ -2069,9 +2071,9 @@ def test_cancel_patch_job_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_patch_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_patch_job] = ( + mock_rpc + ) request = {} client.cancel_patch_job(request) @@ -3779,9 +3781,9 @@ def test_get_patch_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_patch_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_patch_deployment] = ( + mock_rpc + ) request = {} client.get_patch_deployment(request) @@ -4128,9 +4130,9 @@ def test_list_patch_deployments_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_patch_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_patch_deployments] = ( + mock_rpc + ) request = {} client.list_patch_deployments(request) @@ -5365,9 +5367,9 @@ def test_pause_patch_deployment_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.pause_patch_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.pause_patch_deployment] = ( + mock_rpc + ) request = {} client.pause_patch_deployment(request) @@ -5992,9 +5994,9 @@ def test_execute_patch_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.execute_patch_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.execute_patch_job] = ( + mock_rpc + ) request = {} client.execute_patch_job(request) @@ -6297,9 +6299,9 @@ def test_cancel_patch_job_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.cancel_patch_job - ] = mock_rpc + client._transport._wrapped_methods[client._transport.cancel_patch_job] = ( + mock_rpc + ) request = {} client.cancel_patch_job(request) @@ -7156,9 +7158,9 @@ def test_get_patch_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_patch_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_patch_deployment] = ( + mock_rpc + ) request = {} client.get_patch_deployment(request) @@ -7338,9 +7340,9 @@ def test_list_patch_deployments_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_patch_deployments - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_patch_deployments] = ( + mock_rpc + ) request = {} client.list_patch_deployments(request) @@ -7962,9 +7964,9 @@ def test_pause_patch_deployment_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.pause_patch_deployment - ] = mock_rpc + client._transport._wrapped_methods[client._transport.pause_patch_deployment] = ( + mock_rpc + ) request = {} client.pause_patch_deployment(request) @@ -9082,8 +9084,9 @@ def test_execute_patch_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9160,18 +9163,20 @@ def test_execute_patch_job_rest_interceptors(null_interceptor): ) client = OsConfigServiceClient(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.OsConfigServiceRestInterceptor, "post_execute_patch_job" - ) as post, mock.patch.object( - transports.OsConfigServiceRestInterceptor, - "post_execute_patch_job_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "pre_execute_patch_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "post_execute_patch_job" + ) as post, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "post_execute_patch_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "pre_execute_patch_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9222,8 +9227,9 @@ def test_get_patch_job_rest_bad_request(request_type=patch_jobs.GetPatchJobReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9300,17 +9306,20 @@ def test_get_patch_job_rest_interceptors(null_interceptor): ) client = OsConfigServiceClient(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.OsConfigServiceRestInterceptor, "post_get_patch_job" - ) as post, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "post_get_patch_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "pre_get_patch_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "post_get_patch_job" + ) as post, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "post_get_patch_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "pre_get_patch_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9361,8 +9370,9 @@ def test_cancel_patch_job_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9439,17 +9449,20 @@ def test_cancel_patch_job_rest_interceptors(null_interceptor): ) client = OsConfigServiceClient(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.OsConfigServiceRestInterceptor, "post_cancel_patch_job" - ) as post, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "post_cancel_patch_job_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "pre_cancel_patch_job" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "post_cancel_patch_job" + ) as post, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "post_cancel_patch_job_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "pre_cancel_patch_job" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9500,8 +9513,9 @@ def test_list_patch_jobs_rest_bad_request(request_type=patch_jobs.ListPatchJobsR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9564,17 +9578,20 @@ def test_list_patch_jobs_rest_interceptors(null_interceptor): ) client = OsConfigServiceClient(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.OsConfigServiceRestInterceptor, "post_list_patch_jobs" - ) as post, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "post_list_patch_jobs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "pre_list_patch_jobs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "post_list_patch_jobs" + ) as post, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "post_list_patch_jobs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "pre_list_patch_jobs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9629,8 +9646,9 @@ def test_list_patch_job_instance_details_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9693,19 +9711,22 @@ def test_list_patch_job_instance_details_rest_interceptors(null_interceptor): ) client = OsConfigServiceClient(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.OsConfigServiceRestInterceptor, - "post_list_patch_job_instance_details", - ) as post, mock.patch.object( - transports.OsConfigServiceRestInterceptor, - "post_list_patch_job_instance_details_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "pre_list_patch_job_instance_details" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "post_list_patch_job_instance_details", + ) as post, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "post_list_patch_job_instance_details_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "pre_list_patch_job_instance_details", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9763,8 +9784,9 @@ def test_create_patch_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9994,18 +10016,20 @@ def test_create_patch_deployment_rest_interceptors(null_interceptor): ) client = OsConfigServiceClient(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.OsConfigServiceRestInterceptor, "post_create_patch_deployment" - ) as post, mock.patch.object( - transports.OsConfigServiceRestInterceptor, - "post_create_patch_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "pre_create_patch_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "post_create_patch_deployment" + ) as post, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "post_create_patch_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "pre_create_patch_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10060,8 +10084,9 @@ def test_get_patch_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10128,18 +10153,20 @@ def test_get_patch_deployment_rest_interceptors(null_interceptor): ) client = OsConfigServiceClient(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.OsConfigServiceRestInterceptor, "post_get_patch_deployment" - ) as post, mock.patch.object( - transports.OsConfigServiceRestInterceptor, - "post_get_patch_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "pre_get_patch_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "post_get_patch_deployment" + ) as post, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "post_get_patch_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "pre_get_patch_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10194,8 +10221,9 @@ def test_list_patch_deployments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10258,18 +10286,20 @@ def test_list_patch_deployments_rest_interceptors(null_interceptor): ) client = OsConfigServiceClient(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.OsConfigServiceRestInterceptor, "post_list_patch_deployments" - ) as post, mock.patch.object( - transports.OsConfigServiceRestInterceptor, - "post_list_patch_deployments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "pre_list_patch_deployments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "post_list_patch_deployments" + ) as post, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "post_list_patch_deployments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "pre_list_patch_deployments" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10327,8 +10357,9 @@ def test_delete_patch_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10385,13 +10416,13 @@ def test_delete_patch_deployment_rest_interceptors(null_interceptor): ) client = OsConfigServiceClient(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.OsConfigServiceRestInterceptor, "pre_delete_patch_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "pre_delete_patch_deployment" + ) as pre, + ): pre.assert_not_called() pb_message = patch_deployments.DeletePatchDeploymentRequest.pb( patch_deployments.DeletePatchDeploymentRequest() @@ -10438,8 +10469,9 @@ def test_update_patch_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10671,18 +10703,20 @@ def test_update_patch_deployment_rest_interceptors(null_interceptor): ) client = OsConfigServiceClient(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.OsConfigServiceRestInterceptor, "post_update_patch_deployment" - ) as post, mock.patch.object( - transports.OsConfigServiceRestInterceptor, - "post_update_patch_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "pre_update_patch_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "post_update_patch_deployment" + ) as post, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "post_update_patch_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "pre_update_patch_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10737,8 +10771,9 @@ def test_pause_patch_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10805,18 +10840,20 @@ def test_pause_patch_deployment_rest_interceptors(null_interceptor): ) client = OsConfigServiceClient(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.OsConfigServiceRestInterceptor, "post_pause_patch_deployment" - ) as post, mock.patch.object( - transports.OsConfigServiceRestInterceptor, - "post_pause_patch_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "pre_pause_patch_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "post_pause_patch_deployment" + ) as post, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "post_pause_patch_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "pre_pause_patch_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10871,8 +10908,9 @@ def test_resume_patch_deployment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10939,18 +10977,20 @@ def test_resume_patch_deployment_rest_interceptors(null_interceptor): ) client = OsConfigServiceClient(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.OsConfigServiceRestInterceptor, "post_resume_patch_deployment" - ) as post, mock.patch.object( - transports.OsConfigServiceRestInterceptor, - "post_resume_patch_deployment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigServiceRestInterceptor, "pre_resume_patch_deployment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "post_resume_patch_deployment" + ) as post, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, + "post_resume_patch_deployment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigServiceRestInterceptor, "pre_resume_patch_deployment" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11323,11 +11363,14 @@ def test_os_config_service_base_transport(): def test_os_config_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.osconfig_v1.services.os_config_service.transports.OsConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.osconfig_v1.services.os_config_service.transports.OsConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OsConfigServiceTransport( @@ -11344,9 +11387,12 @@ def test_os_config_service_base_transport_with_credentials_file(): def test_os_config_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.osconfig_v1.services.os_config_service.transports.OsConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.osconfig_v1.services.os_config_service.transports.OsConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OsConfigServiceTransport() @@ -11418,11 +11464,12 @@ def test_os_config_service_transport_auth_gdch_credentials(transport_class): def test_os_config_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1/test_os_config_zonal_service.py b/packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1/test_os_config_zonal_service.py index c5324aa1b394..a30c22ebd62f 100644 --- a/packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1/test_os_config_zonal_service.py +++ b/packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1/test_os_config_zonal_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.osconfig_v1.services.os_config_zonal_service import ( OsConfigZonalServiceAsyncClient, @@ -1013,10 +1013,9 @@ def test_os_config_zonal_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1060,9 @@ def test_os_config_zonal_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1100,10 +1098,9 @@ def test_os_config_zonal_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1359,13 +1356,13 @@ def test_os_config_zonal_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5299,9 +5296,9 @@ def test_list_inventories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_inventories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_inventories] = ( + mock_rpc + ) request = {} client.list_inventories(request) @@ -8643,9 +8640,9 @@ def test_list_inventories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_inventories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_inventories] = ( + mock_rpc + ) request = {} client.list_inventories(request) @@ -10108,8 +10105,9 @@ def test_create_os_policy_assignment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10366,22 +10364,23 @@ def test_create_os_policy_assignment_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_create_os_policy_assignment", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_create_os_policy_assignment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_create_os_policy_assignment", - ) as pre: + 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.OsConfigZonalServiceRestInterceptor, + "post_create_os_policy_assignment", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_create_os_policy_assignment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_create_os_policy_assignment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10438,8 +10437,9 @@ def test_update_os_policy_assignment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10700,22 +10700,23 @@ def test_update_os_policy_assignment_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_update_os_policy_assignment", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_update_os_policy_assignment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_update_os_policy_assignment", - ) as pre: + 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.OsConfigZonalServiceRestInterceptor, + "post_update_os_policy_assignment", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_update_os_policy_assignment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_update_os_policy_assignment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10770,8 +10771,9 @@ def test_get_os_policy_assignment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10855,18 +10857,22 @@ def test_get_os_policy_assignment_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, "post_get_os_policy_assignment" - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_get_os_policy_assignment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, "pre_get_os_policy_assignment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_os_policy_assignment", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_os_policy_assignment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_get_os_policy_assignment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10924,8 +10930,9 @@ def test_list_os_policy_assignments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10990,19 +10997,22 @@ def test_list_os_policy_assignments_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_list_os_policy_assignments", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_list_os_policy_assignments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, "pre_list_os_policy_assignments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_os_policy_assignments", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_os_policy_assignments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_list_os_policy_assignments", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11062,8 +11072,9 @@ def test_list_os_policy_assignment_revisions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11130,20 +11141,22 @@ def test_list_os_policy_assignment_revisions_rest_interceptors(null_interceptor) ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_list_os_policy_assignment_revisions", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_list_os_policy_assignment_revisions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_list_os_policy_assignment_revisions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_os_policy_assignment_revisions", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_os_policy_assignment_revisions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_list_os_policy_assignment_revisions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11207,8 +11220,9 @@ def test_delete_os_policy_assignment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11267,22 +11281,23 @@ def test_delete_os_policy_assignment_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_delete_os_policy_assignment", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_delete_os_policy_assignment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_delete_os_policy_assignment", - ) as pre: + 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.OsConfigZonalServiceRestInterceptor, + "post_delete_os_policy_assignment", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_delete_os_policy_assignment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_delete_os_policy_assignment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11337,8 +11352,9 @@ def test_get_os_policy_assignment_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11411,20 +11427,22 @@ def test_get_os_policy_assignment_report_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_get_os_policy_assignment_report", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_get_os_policy_assignment_report_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_get_os_policy_assignment_report", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_os_policy_assignment_report", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_os_policy_assignment_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_get_os_policy_assignment_report", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11484,8 +11502,9 @@ def test_list_os_policy_assignment_reports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11556,20 +11575,22 @@ def test_list_os_policy_assignment_reports_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_list_os_policy_assignment_reports", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_list_os_policy_assignment_reports_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_list_os_policy_assignment_reports", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_os_policy_assignment_reports", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_os_policy_assignment_reports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_list_os_policy_assignment_reports", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11633,8 +11654,9 @@ def test_get_inventory_rest_bad_request(request_type=inventory.GetInventoryReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11699,18 +11721,20 @@ def test_get_inventory_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, "post_get_inventory" - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_get_inventory_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, "pre_get_inventory" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, "post_get_inventory" + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_inventory_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, "pre_get_inventory" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11761,8 +11785,9 @@ def test_list_inventories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11825,18 +11850,20 @@ def test_list_inventories_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, "post_list_inventories" - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_list_inventories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, "pre_list_inventories" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, "post_list_inventories" + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_inventories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, "pre_list_inventories" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11893,8 +11920,9 @@ def test_get_vulnerability_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11964,18 +11992,22 @@ def test_get_vulnerability_report_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, "post_get_vulnerability_report" - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_get_vulnerability_report_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, "pre_get_vulnerability_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_vulnerability_report", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_vulnerability_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_get_vulnerability_report", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12030,8 +12062,9 @@ def test_list_vulnerability_reports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12094,19 +12127,22 @@ def test_list_vulnerability_reports_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_list_vulnerability_reports", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_list_vulnerability_reports_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, "pre_list_vulnerability_reports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_vulnerability_reports", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_vulnerability_reports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_list_vulnerability_reports", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12508,11 +12544,14 @@ def test_os_config_zonal_service_base_transport(): def test_os_config_zonal_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.osconfig_v1.services.os_config_zonal_service.transports.OsConfigZonalServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.osconfig_v1.services.os_config_zonal_service.transports.OsConfigZonalServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OsConfigZonalServiceTransport( @@ -12529,9 +12568,12 @@ def test_os_config_zonal_service_base_transport_with_credentials_file(): def test_os_config_zonal_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.osconfig_v1.services.os_config_zonal_service.transports.OsConfigZonalServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.osconfig_v1.services.os_config_zonal_service.transports.OsConfigZonalServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OsConfigZonalServiceTransport() @@ -12605,11 +12647,12 @@ def test_os_config_zonal_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1alpha/test_os_config_zonal_service.py b/packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1alpha/test_os_config_zonal_service.py index ad8c1ea060d3..aa8c5ca1cc74 100644 --- a/packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1alpha/test_os_config_zonal_service.py +++ b/packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1alpha/test_os_config_zonal_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.osconfig_v1alpha.services.os_config_zonal_service import ( OsConfigZonalServiceAsyncClient, @@ -1015,10 +1015,9 @@ def test_os_config_zonal_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1062,9 @@ def test_os_config_zonal_service_client_get_mtls_endpoint_and_cert_source(client client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1102,10 +1100,9 @@ def test_os_config_zonal_service_client_get_mtls_endpoint_and_cert_source(client "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,13 +1358,13 @@ def test_os_config_zonal_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6253,9 +6250,9 @@ def test_list_inventories_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_inventories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_inventories] = ( + mock_rpc + ) request = {} client.list_inventories(request) @@ -10069,9 +10066,9 @@ def test_list_inventories_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_inventories - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_inventories] = ( + mock_rpc + ) request = {} client.list_inventories(request) @@ -11654,8 +11651,9 @@ def test_create_os_policy_assignment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11917,22 +11915,23 @@ def test_create_os_policy_assignment_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_create_os_policy_assignment", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_create_os_policy_assignment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_create_os_policy_assignment", - ) as pre: + 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.OsConfigZonalServiceRestInterceptor, + "post_create_os_policy_assignment", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_create_os_policy_assignment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_create_os_policy_assignment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11989,8 +11988,9 @@ def test_update_os_policy_assignment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12256,22 +12256,23 @@ def test_update_os_policy_assignment_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_update_os_policy_assignment", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_update_os_policy_assignment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_update_os_policy_assignment", - ) as pre: + 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.OsConfigZonalServiceRestInterceptor, + "post_update_os_policy_assignment", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_update_os_policy_assignment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_update_os_policy_assignment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12326,8 +12327,9 @@ def test_get_os_policy_assignment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12411,18 +12413,22 @@ def test_get_os_policy_assignment_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, "post_get_os_policy_assignment" - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_get_os_policy_assignment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, "pre_get_os_policy_assignment" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_os_policy_assignment", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_os_policy_assignment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_get_os_policy_assignment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12480,8 +12486,9 @@ def test_list_os_policy_assignments_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12546,19 +12553,22 @@ def test_list_os_policy_assignments_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_list_os_policy_assignments", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_list_os_policy_assignments_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, "pre_list_os_policy_assignments" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_os_policy_assignments", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_os_policy_assignments_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_list_os_policy_assignments", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12618,8 +12628,9 @@ def test_list_os_policy_assignment_revisions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12686,20 +12697,22 @@ def test_list_os_policy_assignment_revisions_rest_interceptors(null_interceptor) ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_list_os_policy_assignment_revisions", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_list_os_policy_assignment_revisions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_list_os_policy_assignment_revisions", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_os_policy_assignment_revisions", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_os_policy_assignment_revisions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_list_os_policy_assignment_revisions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12763,8 +12776,9 @@ def test_delete_os_policy_assignment_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12823,22 +12837,23 @@ def test_delete_os_policy_assignment_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_delete_os_policy_assignment", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_delete_os_policy_assignment_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_delete_os_policy_assignment", - ) as pre: + 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.OsConfigZonalServiceRestInterceptor, + "post_delete_os_policy_assignment", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_delete_os_policy_assignment_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_delete_os_policy_assignment", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12893,8 +12908,9 @@ def test_get_instance_os_policies_compliance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12973,20 +12989,22 @@ def test_get_instance_os_policies_compliance_rest_interceptors(null_interceptor) ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_get_instance_os_policies_compliance", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_get_instance_os_policies_compliance_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_get_instance_os_policies_compliance", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_instance_os_policies_compliance", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_instance_os_policies_compliance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_get_instance_os_policies_compliance", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13052,8 +13070,9 @@ def test_list_instance_os_policies_compliances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13120,20 +13139,22 @@ def test_list_instance_os_policies_compliances_rest_interceptors(null_intercepto ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_list_instance_os_policies_compliances", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_list_instance_os_policies_compliances_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_list_instance_os_policies_compliances", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_instance_os_policies_compliances", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_instance_os_policies_compliances_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_list_instance_os_policies_compliances", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13197,8 +13218,9 @@ def test_get_os_policy_assignment_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13271,20 +13293,22 @@ def test_get_os_policy_assignment_report_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_get_os_policy_assignment_report", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_get_os_policy_assignment_report_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_get_os_policy_assignment_report", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_os_policy_assignment_report", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_os_policy_assignment_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_get_os_policy_assignment_report", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13344,8 +13368,9 @@ def test_list_os_policy_assignment_reports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13416,20 +13441,22 @@ def test_list_os_policy_assignment_reports_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_list_os_policy_assignment_reports", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_list_os_policy_assignment_reports_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "pre_list_os_policy_assignment_reports", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_os_policy_assignment_reports", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_os_policy_assignment_reports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_list_os_policy_assignment_reports", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13493,8 +13520,9 @@ def test_get_inventory_rest_bad_request(request_type=inventory.GetInventoryReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13559,18 +13587,20 @@ def test_get_inventory_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, "post_get_inventory" - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_get_inventory_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, "pre_get_inventory" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, "post_get_inventory" + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_inventory_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, "pre_get_inventory" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13621,8 +13651,9 @@ def test_list_inventories_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13685,18 +13716,20 @@ def test_list_inventories_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, "post_list_inventories" - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_list_inventories_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, "pre_list_inventories" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, "post_list_inventories" + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_inventories_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, "pre_list_inventories" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13753,8 +13786,9 @@ def test_get_vulnerability_report_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13819,18 +13853,22 @@ def test_get_vulnerability_report_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, "post_get_vulnerability_report" - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_get_vulnerability_report_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, "pre_get_vulnerability_report" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_vulnerability_report", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_get_vulnerability_report_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_get_vulnerability_report", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -13885,8 +13923,9 @@ def test_list_vulnerability_reports_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -13949,19 +13988,22 @@ def test_list_vulnerability_reports_rest_interceptors(null_interceptor): ) client = OsConfigZonalServiceClient(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.OsConfigZonalServiceRestInterceptor, - "post_list_vulnerability_reports", - ) as post, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, - "post_list_vulnerability_reports_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsConfigZonalServiceRestInterceptor, "pre_list_vulnerability_reports" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_vulnerability_reports", + ) as post, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "post_list_vulnerability_reports_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsConfigZonalServiceRestInterceptor, + "pre_list_vulnerability_reports", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14413,11 +14455,14 @@ def test_os_config_zonal_service_base_transport(): def test_os_config_zonal_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.osconfig_v1alpha.services.os_config_zonal_service.transports.OsConfigZonalServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.osconfig_v1alpha.services.os_config_zonal_service.transports.OsConfigZonalServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OsConfigZonalServiceTransport( @@ -14434,9 +14479,12 @@ def test_os_config_zonal_service_base_transport_with_credentials_file(): def test_os_config_zonal_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.osconfig_v1alpha.services.os_config_zonal_service.transports.OsConfigZonalServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.osconfig_v1alpha.services.os_config_zonal_service.transports.OsConfigZonalServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OsConfigZonalServiceTransport() @@ -14510,11 +14558,12 @@ def test_os_config_zonal_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-os-login/docs/conf.py b/packages/google-cloud-os-login/docs/conf.py index 3a07c044cb61..15ef5ab843ba 100644 --- a/packages/google-cloud-os-login/docs/conf.py +++ b/packages/google-cloud-os-login/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-os-login documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/__init__.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/__init__.py index 8ea7abab67cb..ffca22fbc5c7 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/__init__.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.os_login_service import OsLoginServiceAsyncClient, OsLoginServiceClient from .types.oslogin import ( CreateSshPublicKeyRequest, diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/async_client.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/async_client.py index 8a75cd29eb42..94c9910c4383 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/async_client.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.oslogin_v1 import gapic_version as package_version @@ -44,9 +44,9 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore - +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.oslogin_v1.common.types import common + from google.cloud.oslogin_v1.types import oslogin from .client import OsLoginServiceClient @@ -126,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: OsLoginServiceAsyncClient: The constructed client. """ - return OsLoginServiceClient.from_service_account_info.__func__(OsLoginServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = OsLoginServiceClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(OsLoginServiceAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: OsLoginServiceAsyncClient: The constructed client. """ - return OsLoginServiceClient.from_service_account_file.__func__(OsLoginServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = OsLoginServiceClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(OsLoginServiceAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/client.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/client.py index fb56255a1a27..1bedf0f551cc 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/client.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.oslogin_v1 import gapic_version as package_version @@ -61,9 +61,9 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore - +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore from google.cloud.oslogin_v1.common.types import common + from google.cloud.oslogin_v1.types import oslogin from .transports.base import DEFAULT_CLIENT_INFO, OsLoginServiceTransport @@ -80,9 +80,7 @@ class OsLoginServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OsLoginServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OsLoginServiceTransport]] _transport_registry["grpc"] = OsLoginServiceGrpcTransport _transport_registry["grpc_asyncio"] = OsLoginServiceGrpcAsyncIOTransport _transport_registry["rest"] = OsLoginServiceRestTransport @@ -639,11 +637,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OsLoginServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OsLoginServiceClient._read_environment_variables() + ) self._client_cert_source = OsLoginServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -678,8 +674,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(OsLoginServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/base.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/base.py index 145552878e3f..0cc9a21abda3 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/base.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/base.py @@ -17,16 +17,16 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore +from google.cloud.oslogin_v1.common.types import common from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1 import gapic_version as package_version from google.cloud.oslogin_v1.types import oslogin diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc.py index bab93399bef0..90c6218189d4 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc.py @@ -16,20 +16,20 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf.json_format import MessageToJson +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore import google.protobuf.message import grpc # type: ignore import proto # type: ignore - +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.oslogin_v1.common.types import common +from google.protobuf.json_format import MessageToJson + from google.cloud.oslogin_v1.types import oslogin from .base import DEFAULT_CLIENT_INFO, OsLoginServiceTransport diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc_asyncio.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc_asyncio.py index f73aa68c8852..ce79764d9028 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc_asyncio.py @@ -17,22 +17,22 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf import empty_pb2 # type: ignore +from google.cloud.oslogin_v1.common.types import common from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore -from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1.types import oslogin from .base import DEFAULT_CLIENT_INFO, OsLoginServiceTransport diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest.py index 9db2d5513757..b04197ed3eaf 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest.py @@ -16,20 +16,20 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore +from google.cloud.oslogin_v1.common.types import common from google.protobuf import json_format from requests import __version__ as requests_version -from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1.types import oslogin from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO @@ -544,9 +544,7 @@ def __call__( """ - http_options = ( - _BaseOsLoginServiceRestTransport._BaseCreateSshPublicKey._get_http_options() - ) + http_options = _BaseOsLoginServiceRestTransport._BaseCreateSshPublicKey._get_http_options() request, metadata = self._interceptor.pre_create_ssh_public_key( request, metadata @@ -692,9 +690,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseOsLoginServiceRestTransport._BaseDeletePosixAccount._get_http_options() - ) + http_options = _BaseOsLoginServiceRestTransport._BaseDeletePosixAccount._get_http_options() request, metadata = self._interceptor.pre_delete_posix_account( request, metadata @@ -716,7 +712,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -801,9 +797,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseOsLoginServiceRestTransport._BaseDeleteSshPublicKey._get_http_options() - ) + http_options = _BaseOsLoginServiceRestTransport._BaseDeleteSshPublicKey._get_http_options() request, metadata = self._interceptor.pre_delete_ssh_public_key( request, metadata @@ -825,7 +819,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -917,9 +911,7 @@ def __call__( """ - http_options = ( - _BaseOsLoginServiceRestTransport._BaseGetLoginProfile._get_http_options() - ) + http_options = _BaseOsLoginServiceRestTransport._BaseGetLoginProfile._get_http_options() request, metadata = self._interceptor.pre_get_login_profile( request, metadata @@ -1066,9 +1058,7 @@ def __call__( """ - http_options = ( - _BaseOsLoginServiceRestTransport._BaseGetSshPublicKey._get_http_options() - ) + http_options = _BaseOsLoginServiceRestTransport._BaseGetSshPublicKey._get_http_options() request, metadata = self._interceptor.pre_get_ssh_public_key( request, metadata @@ -1216,9 +1206,7 @@ def __call__( """ - http_options = ( - _BaseOsLoginServiceRestTransport._BaseImportSshPublicKey._get_http_options() - ) + http_options = _BaseOsLoginServiceRestTransport._BaseImportSshPublicKey._get_http_options() request, metadata = self._interceptor.pre_import_ssh_public_key( request, metadata @@ -1373,9 +1361,7 @@ def __call__( """ - http_options = ( - _BaseOsLoginServiceRestTransport._BaseUpdateSshPublicKey._get_http_options() - ) + http_options = _BaseOsLoginServiceRestTransport._BaseUpdateSshPublicKey._get_http_options() request, metadata = self._interceptor.pre_update_ssh_public_key( request, metadata diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest_base.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest_base.py index f106e2ed5ad5..42e72a780b9d 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest_base.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest_base.py @@ -17,11 +17,11 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.protobuf import empty_pb2 # type: ignore +from google.cloud.oslogin_v1.common.types import common from google.protobuf import json_format -from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1.types import oslogin from .base import DEFAULT_CLIENT_INFO, OsLoginServiceTransport diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/types/oslogin.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/types/oslogin.py index 96ce42146a7b..0a5ad23f2924 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/types/oslogin.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/types/oslogin.py @@ -17,9 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore - from google.cloud.oslogin_v1.common.types import common __protobuf__ = proto.module( diff --git a/packages/google-cloud-os-login/noxfile.py b/packages/google-cloud-os-login/noxfile.py index 81c7e1c455ed..df742443a591 100644 --- a/packages/google-cloud-os-login/noxfile.py +++ b/packages/google-cloud-os-login/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-os-login/tests/unit/gapic/oslogin_v1/test_os_login_service.py b/packages/google-cloud-os-login/tests/unit/gapic/oslogin_v1/test_os_login_service.py index cde0f2b12914..29e865b5e534 100644 --- a/packages/google-cloud-os-login/tests/unit/gapic/oslogin_v1/test_os_login_service.py +++ b/packages/google-cloud-os-login/tests/unit/gapic/oslogin_v1/test_os_login_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.oslogin_v1.common.types import common from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1.services.os_login_service import ( OsLoginServiceAsyncClient, OsLoginServiceClient, @@ -950,10 +955,9 @@ def test_os_login_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -998,10 +1002,9 @@ def test_os_login_service_client_get_mtls_endpoint_and_cert_source(client_class) client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1037,10 +1040,9 @@ def test_os_login_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1283,13 +1285,13 @@ def test_os_login_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1414,9 +1416,9 @@ def test_create_ssh_public_key_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ssh_public_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ssh_public_key] = ( + mock_rpc + ) request = {} client.create_ssh_public_key(request) @@ -1764,9 +1766,9 @@ def test_delete_posix_account_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_posix_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_posix_account] = ( + mock_rpc + ) request = {} client.delete_posix_account(request) @@ -2094,9 +2096,9 @@ def test_delete_ssh_public_key_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_ssh_public_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_ssh_public_key] = ( + mock_rpc + ) request = {} client.delete_ssh_public_key(request) @@ -2428,9 +2430,9 @@ def test_get_login_profile_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_login_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_login_profile] = ( + mock_rpc + ) request = {} client.get_login_profile(request) @@ -2775,9 +2777,9 @@ def test_get_ssh_public_key_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ssh_public_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ssh_public_key] = ( + mock_rpc + ) request = {} client.get_ssh_public_key(request) @@ -3121,9 +3123,9 @@ def test_import_ssh_public_key_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_ssh_public_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_ssh_public_key] = ( + mock_rpc + ) request = {} client.import_ssh_public_key(request) @@ -3489,9 +3491,9 @@ def test_update_ssh_public_key_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ssh_public_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ssh_public_key] = ( + mock_rpc + ) request = {} client.update_ssh_public_key(request) @@ -3785,9 +3787,9 @@ def test_create_ssh_public_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_ssh_public_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_ssh_public_key] = ( + mock_rpc + ) request = {} client.create_ssh_public_key(request) @@ -3976,9 +3978,9 @@ def test_delete_posix_account_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_posix_account - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_posix_account] = ( + mock_rpc + ) request = {} client.delete_posix_account(request) @@ -4152,9 +4154,9 @@ def test_delete_ssh_public_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_ssh_public_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_ssh_public_key] = ( + mock_rpc + ) request = {} client.delete_ssh_public_key(request) @@ -4325,9 +4327,9 @@ def test_get_login_profile_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_login_profile - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_login_profile] = ( + mock_rpc + ) request = {} client.get_login_profile(request) @@ -4520,9 +4522,9 @@ def test_get_ssh_public_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_ssh_public_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_ssh_public_key] = ( + mock_rpc + ) request = {} client.get_ssh_public_key(request) @@ -4701,9 +4703,9 @@ def test_import_ssh_public_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_ssh_public_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_ssh_public_key] = ( + mock_rpc + ) request = {} client.import_ssh_public_key(request) @@ -4903,9 +4905,9 @@ def test_update_ssh_public_key_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_ssh_public_key - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_ssh_public_key] = ( + mock_rpc + ) request = {} client.update_ssh_public_key(request) @@ -5578,8 +5580,9 @@ def test_create_ssh_public_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5721,18 +5724,20 @@ def test_create_ssh_public_key_rest_interceptors(null_interceptor): ) client = OsLoginServiceClient(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.OsLoginServiceRestInterceptor, "post_create_ssh_public_key" - ) as post, mock.patch.object( - transports.OsLoginServiceRestInterceptor, - "post_create_ssh_public_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsLoginServiceRestInterceptor, "pre_create_ssh_public_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, "post_create_ssh_public_key" + ) as post, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, + "post_create_ssh_public_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, "pre_create_ssh_public_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5785,8 +5790,9 @@ def test_delete_posix_account_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5843,13 +5849,13 @@ def test_delete_posix_account_rest_interceptors(null_interceptor): ) client = OsLoginServiceClient(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.OsLoginServiceRestInterceptor, "pre_delete_posix_account" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, "pre_delete_posix_account" + ) as pre, + ): pre.assert_not_called() pb_message = oslogin.DeletePosixAccountRequest.pb( oslogin.DeletePosixAccountRequest() @@ -5894,8 +5900,9 @@ def test_delete_ssh_public_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5952,13 +5959,13 @@ def test_delete_ssh_public_key_rest_interceptors(null_interceptor): ) client = OsLoginServiceClient(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.OsLoginServiceRestInterceptor, "pre_delete_ssh_public_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, "pre_delete_ssh_public_key" + ) as pre, + ): pre.assert_not_called() pb_message = oslogin.DeleteSshPublicKeyRequest.pb( oslogin.DeleteSshPublicKeyRequest() @@ -6003,8 +6010,9 @@ def test_get_login_profile_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6067,17 +6075,20 @@ def test_get_login_profile_rest_interceptors(null_interceptor): ) client = OsLoginServiceClient(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.OsLoginServiceRestInterceptor, "post_get_login_profile" - ) as post, mock.patch.object( - transports.OsLoginServiceRestInterceptor, "post_get_login_profile_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.OsLoginServiceRestInterceptor, "pre_get_login_profile" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, "post_get_login_profile" + ) as post, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, + "post_get_login_profile_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, "pre_get_login_profile" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6128,8 +6139,9 @@ def test_get_ssh_public_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6198,18 +6210,20 @@ def test_get_ssh_public_key_rest_interceptors(null_interceptor): ) client = OsLoginServiceClient(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.OsLoginServiceRestInterceptor, "post_get_ssh_public_key" - ) as post, mock.patch.object( - transports.OsLoginServiceRestInterceptor, - "post_get_ssh_public_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsLoginServiceRestInterceptor, "pre_get_ssh_public_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, "post_get_ssh_public_key" + ) as post, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, + "post_get_ssh_public_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, "pre_get_ssh_public_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6260,8 +6274,9 @@ def test_import_ssh_public_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6397,18 +6412,20 @@ def test_import_ssh_public_key_rest_interceptors(null_interceptor): ) client = OsLoginServiceClient(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.OsLoginServiceRestInterceptor, "post_import_ssh_public_key" - ) as post, mock.patch.object( - transports.OsLoginServiceRestInterceptor, - "post_import_ssh_public_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsLoginServiceRestInterceptor, "pre_import_ssh_public_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, "post_import_ssh_public_key" + ) as post, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, + "post_import_ssh_public_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, "pre_import_ssh_public_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6463,8 +6480,9 @@ def test_update_ssh_public_key_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6606,18 +6624,20 @@ def test_update_ssh_public_key_rest_interceptors(null_interceptor): ) client = OsLoginServiceClient(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.OsLoginServiceRestInterceptor, "post_update_ssh_public_key" - ) as post, mock.patch.object( - transports.OsLoginServiceRestInterceptor, - "post_update_ssh_public_key_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OsLoginServiceRestInterceptor, "pre_update_ssh_public_key" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, "post_update_ssh_public_key" + ) as post, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, + "post_update_ssh_public_key_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OsLoginServiceRestInterceptor, "pre_update_ssh_public_key" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6879,11 +6899,14 @@ def test_os_login_service_base_transport(): def test_os_login_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.oslogin_v1.services.os_login_service.transports.OsLoginServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.oslogin_v1.services.os_login_service.transports.OsLoginServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OsLoginServiceTransport( @@ -6905,9 +6928,12 @@ def test_os_login_service_base_transport_with_credentials_file(): def test_os_login_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.oslogin_v1.services.os_login_service.transports.OsLoginServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.oslogin_v1.services.os_login_service.transports.OsLoginServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OsLoginServiceTransport() @@ -6989,11 +7015,12 @@ def test_os_login_service_transport_auth_gdch_credentials(transport_class): def test_os_login_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-parallelstore/docs/conf.py b/packages/google-cloud-parallelstore/docs/conf.py index 5e5ec8a6f399..d1b1c6b6674f 100644 --- a/packages/google-cloud-parallelstore/docs/conf.py +++ b/packages/google-cloud-parallelstore/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-parallelstore documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/__init__.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/__init__.py index f7cc77681b57..68aeb32b5454 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/__init__.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.parallelstore import ParallelstoreAsyncClient, ParallelstoreClient from .types.parallelstore import ( CreateInstanceRequest, diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/async_client.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/async_client.py index cd11479b770a..f403dee0c077 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/async_client.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.parallelstore_v1 import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.parallelstore_v1.services.parallelstore import pagers from google.cloud.parallelstore_v1.types import parallelstore @@ -150,7 +150,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ParallelstoreAsyncClient: The constructed client. """ - return ParallelstoreClient.from_service_account_info.__func__(ParallelstoreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ParallelstoreClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ParallelstoreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -166,7 +167,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ParallelstoreAsyncClient: The constructed client. """ - return ParallelstoreClient.from_service_account_file.__func__(ParallelstoreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ParallelstoreClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ParallelstoreAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/client.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/client.py index 1a8cceb7659c..122e39d9dad7 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/client.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.parallelstore_v1 import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.parallelstore_v1.services.parallelstore import pagers from google.cloud.parallelstore_v1.types import parallelstore @@ -708,11 +708,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ParallelstoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ParallelstoreClient._read_environment_variables() + ) self._client_cert_source = ParallelstoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -747,8 +745,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ParallelstoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/pagers.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/pagers.py index 21f9391e5a63..27bce00404f0 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/pagers.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/base.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/base.py index 6827c1e83e2d..34af381366d8 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/base.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.parallelstore_v1 import gapic_version as package_version from google.cloud.parallelstore_v1.types import parallelstore @@ -309,13 +309,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/grpc.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/grpc.py index 14d7eabdffd2..0c0296b717a5 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/grpc.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.parallelstore_v1.types import parallelstore diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/grpc_asyncio.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/grpc_asyncio.py index 714ac7adedce..7f578dbf8108 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/grpc_asyncio.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.parallelstore_v1.types import parallelstore diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/rest.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/rest.py index 0841617ca2fd..5cdcdc92e13b 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/rest.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/services/parallelstore/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -866,7 +866,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1012,7 +1012,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1169,7 +1169,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1473,7 +1473,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1772,7 +1772,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/types/parallelstore.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/types/parallelstore.py index fa624f139be3..6dc0c7a3dd44 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/types/parallelstore.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1/types/parallelstore.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import code_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -67,6 +67,7 @@ class TransferType(proto.Enum): EXPORT (2): Exports from Parallelstore. """ + TRANSFER_TYPE_UNSPECIFIED = 0 IMPORT = 1 EXPORT = 2 @@ -86,6 +87,7 @@ class FileStripeLevel(proto.Enum): FILE_STRIPE_LEVEL_MAX (3): Maximum file striping """ + FILE_STRIPE_LEVEL_UNSPECIFIED = 0 FILE_STRIPE_LEVEL_MIN = 1 FILE_STRIPE_LEVEL_BALANCED = 2 @@ -106,6 +108,7 @@ class DirectoryStripeLevel(proto.Enum): DIRECTORY_STRIPE_LEVEL_MAX (3): Maximum directory striping """ + DIRECTORY_STRIPE_LEVEL_UNSPECIFIED = 0 DIRECTORY_STRIPE_LEVEL_MIN = 1 DIRECTORY_STRIPE_LEVEL_BALANCED = 2 @@ -124,6 +127,7 @@ class DeploymentType(proto.Enum): PERSISTENT (2): Persistent """ + DEPLOYMENT_TYPE_UNSPECIFIED = 0 SCRATCH = 1 PERSISTENT = 2 @@ -230,6 +234,7 @@ class State(proto.Enum): The instance is being repaired. This should only be used by instances using the ``PERSISTENT`` deployment type. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -331,6 +336,7 @@ class Uid(proto.Enum): Preserve UID that is in number format during a transfer job. """ + UID_UNSPECIFIED = 0 UID_SKIP = 1 UID_NUMBER_PRESERVE = 2 @@ -347,6 +353,7 @@ class Gid(proto.Enum): Preserve GID that is in number format during a transfer job. """ + GID_UNSPECIFIED = 0 GID_SKIP = 1 GID_NUMBER_PRESERVE = 2 @@ -362,6 +369,7 @@ class Mode(proto.Enum): MODE_PRESERVE (2): Preserve mode during a transfer job. """ + MODE_UNSPECIFIED = 0 MODE_SKIP = 1 MODE_PRESERVE = 2 diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/__init__.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/__init__.py index 0df4f66ae99a..e9c4db31b52c 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/__init__.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.parallelstore import ParallelstoreAsyncClient, ParallelstoreClient from .types.parallelstore import ( CreateInstanceRequest, diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/async_client.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/async_client.py index 5a896c210179..f32f95174d99 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/async_client.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.parallelstore_v1beta import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.parallelstore_v1beta.services.parallelstore import pagers from google.cloud.parallelstore_v1beta.types import parallelstore @@ -150,7 +150,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ParallelstoreAsyncClient: The constructed client. """ - return ParallelstoreClient.from_service_account_info.__func__(ParallelstoreAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ParallelstoreClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ParallelstoreAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -166,7 +167,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ParallelstoreAsyncClient: The constructed client. """ - return ParallelstoreClient.from_service_account_file.__func__(ParallelstoreAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ParallelstoreClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ParallelstoreAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/client.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/client.py index df7edf225b54..5d065f8fd16d 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/client.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.parallelstore_v1beta import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.parallelstore_v1beta.services.parallelstore import pagers from google.cloud.parallelstore_v1beta.types import parallelstore @@ -708,11 +708,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ParallelstoreClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ParallelstoreClient._read_environment_variables() + ) self._client_cert_source = ParallelstoreClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -747,8 +745,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ParallelstoreTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/pagers.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/pagers.py index af6460e241da..982b42be4020 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/pagers.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/base.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/base.py index 585173a1eb97..53cea1b2d73e 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/base.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.parallelstore_v1beta import gapic_version as package_version from google.cloud.parallelstore_v1beta.types import parallelstore @@ -309,13 +309,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/grpc.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/grpc.py index 30f8506a7f8b..45b26e692756 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/grpc.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.parallelstore_v1beta.types import parallelstore diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/grpc_asyncio.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/grpc_asyncio.py index d28fbda650c0..fab5afbc0f82 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/grpc_asyncio.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.parallelstore_v1beta.types import parallelstore diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/rest.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/rest.py index 5819a628e340..f8188e48231c 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/rest.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/services/parallelstore/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -865,7 +865,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1011,7 +1011,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1168,7 +1168,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1472,7 +1472,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1771,7 +1771,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/types/parallelstore.py b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/types/parallelstore.py index d470202de21a..6323898187ef 100644 --- a/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/types/parallelstore.py +++ b/packages/google-cloud-parallelstore/google/cloud/parallelstore_v1beta/types/parallelstore.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import code_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.code_pb2 as code_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -67,6 +67,7 @@ class TransferType(proto.Enum): EXPORT (2): Exports from Parallelstore. """ + TRANSFER_TYPE_UNSPECIFIED = 0 IMPORT = 1 EXPORT = 2 @@ -86,6 +87,7 @@ class FileStripeLevel(proto.Enum): FILE_STRIPE_LEVEL_MAX (3): Maximum file striping """ + FILE_STRIPE_LEVEL_UNSPECIFIED = 0 FILE_STRIPE_LEVEL_MIN = 1 FILE_STRIPE_LEVEL_BALANCED = 2 @@ -106,6 +108,7 @@ class DirectoryStripeLevel(proto.Enum): DIRECTORY_STRIPE_LEVEL_MAX (3): Maximum directory striping """ + DIRECTORY_STRIPE_LEVEL_UNSPECIFIED = 0 DIRECTORY_STRIPE_LEVEL_MIN = 1 DIRECTORY_STRIPE_LEVEL_BALANCED = 2 @@ -124,6 +127,7 @@ class DeploymentType(proto.Enum): PERSISTENT (2): Persistent """ + DEPLOYMENT_TYPE_UNSPECIFIED = 0 SCRATCH = 1 PERSISTENT = 2 @@ -230,6 +234,7 @@ class State(proto.Enum): The instance is being repaired. This should only be used by instances using the ``PERSISTENT`` deployment type. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -331,6 +336,7 @@ class Uid(proto.Enum): Preserve UID that is in number format during a transfer job. """ + UID_UNSPECIFIED = 0 UID_SKIP = 1 UID_NUMBER_PRESERVE = 2 @@ -347,6 +353,7 @@ class Gid(proto.Enum): Preserve GID that is in number format during a transfer job. """ + GID_UNSPECIFIED = 0 GID_SKIP = 1 GID_NUMBER_PRESERVE = 2 @@ -362,6 +369,7 @@ class Mode(proto.Enum): MODE_PRESERVE (2): Preserve mode during a transfer job. """ + MODE_UNSPECIFIED = 0 MODE_SKIP = 1 MODE_PRESERVE = 2 diff --git a/packages/google-cloud-parallelstore/noxfile.py b/packages/google-cloud-parallelstore/noxfile.py index 7afb87b0e2fd..8165ba522a36 100644 --- a/packages/google-cloud-parallelstore/noxfile.py +++ b/packages/google-cloud-parallelstore/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-parallelstore/tests/unit/gapic/parallelstore_v1/test_parallelstore.py b/packages/google-cloud-parallelstore/tests/unit/gapic/parallelstore_v1/test_parallelstore.py index 0f7026388eba..325729630edd 100644 --- a/packages/google-cloud-parallelstore/tests/unit/gapic/parallelstore_v1/test_parallelstore.py +++ b/packages/google-cloud-parallelstore/tests/unit/gapic/parallelstore_v1/test_parallelstore.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.parallelstore_v1.services.parallelstore import ( ParallelstoreAsyncClient, @@ -955,10 +955,9 @@ def test_parallelstore_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1002,9 @@ def test_parallelstore_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1040,9 @@ def test_parallelstore_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1288,13 +1285,13 @@ def test_parallelstore_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5479,8 +5476,9 @@ def test_list_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5545,17 +5543,19 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5611,8 +5611,9 @@ def test_get_instance_rest_bad_request(request_type=parallelstore.GetInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5703,17 +5704,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5766,8 +5769,9 @@ def test_create_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5908,19 +5912,21 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_create_instance" - ) as pre: + 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.ParallelstoreRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, + "post_create_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5975,8 +5981,9 @@ def test_update_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6119,19 +6126,21 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_update_instance" - ) as pre: + 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.ParallelstoreRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, + "post_update_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6184,8 +6193,9 @@ def test_delete_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6242,19 +6252,21 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_delete_instance" - ) as pre: + 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.ParallelstoreRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, + "post_delete_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6305,8 +6317,9 @@ def test_import_data_rest_bad_request(request_type=parallelstore.ImportDataReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6363,19 +6376,20 @@ def test_import_data_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_import_data" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_import_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_import_data" - ) as pre: + 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.ParallelstoreRestInterceptor, "post_import_data" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "post_import_data_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_import_data" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6426,8 +6440,9 @@ def test_export_data_rest_bad_request(request_type=parallelstore.ExportDataReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6484,19 +6499,20 @@ def test_export_data_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_export_data" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_export_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_export_data" - ) as pre: + 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.ParallelstoreRestInterceptor, "post_export_data" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "post_export_data_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_export_data" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6549,8 +6565,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6609,8 +6626,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6671,8 +6689,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6733,8 +6752,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6795,8 +6815,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6857,8 +6878,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7140,11 +7162,14 @@ def test_parallelstore_base_transport(): def test_parallelstore_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.parallelstore_v1.services.parallelstore.transports.ParallelstoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.parallelstore_v1.services.parallelstore.transports.ParallelstoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ParallelstoreTransport( @@ -7161,9 +7186,12 @@ def test_parallelstore_base_transport_with_credentials_file(): def test_parallelstore_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.parallelstore_v1.services.parallelstore.transports.ParallelstoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.parallelstore_v1.services.parallelstore.transports.ParallelstoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ParallelstoreTransport() @@ -7235,11 +7263,12 @@ def test_parallelstore_transport_auth_gdch_credentials(transport_class): def test_parallelstore_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-parallelstore/tests/unit/gapic/parallelstore_v1beta/test_parallelstore.py b/packages/google-cloud-parallelstore/tests/unit/gapic/parallelstore_v1beta/test_parallelstore.py index 7bf5d92f9f78..2af5af5e746f 100644 --- a/packages/google-cloud-parallelstore/tests/unit/gapic/parallelstore_v1beta/test_parallelstore.py +++ b/packages/google-cloud-parallelstore/tests/unit/gapic/parallelstore_v1beta/test_parallelstore.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +58,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.parallelstore_v1beta.services.parallelstore import ( ParallelstoreAsyncClient, @@ -955,10 +955,9 @@ def test_parallelstore_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1003,10 +1002,9 @@ def test_parallelstore_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1042,10 +1040,9 @@ def test_parallelstore_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1288,13 +1285,13 @@ def test_parallelstore_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5483,8 +5480,9 @@ def test_list_instances_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5549,17 +5547,19 @@ def test_list_instances_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_list_instances" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_list_instances_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_list_instances" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "post_list_instances" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "post_list_instances_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_list_instances" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5615,8 +5615,9 @@ def test_get_instance_rest_bad_request(request_type=parallelstore.GetInstanceReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5707,17 +5708,19 @@ def test_get_instance_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_get_instance" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_get_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_get_instance" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "post_get_instance" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "post_get_instance_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_get_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5770,8 +5773,9 @@ def test_create_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5912,19 +5916,21 @@ def test_create_instance_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_create_instance" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_create_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_create_instance" - ) as pre: + 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.ParallelstoreRestInterceptor, "post_create_instance" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, + "post_create_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_create_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5979,8 +5985,9 @@ def test_update_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6123,19 +6130,21 @@ def test_update_instance_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_update_instance" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_update_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_update_instance" - ) as pre: + 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.ParallelstoreRestInterceptor, "post_update_instance" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, + "post_update_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_update_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6188,8 +6197,9 @@ def test_delete_instance_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6246,19 +6256,21 @@ def test_delete_instance_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_delete_instance" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_delete_instance_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_delete_instance" - ) as pre: + 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.ParallelstoreRestInterceptor, "post_delete_instance" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, + "post_delete_instance_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_delete_instance" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6309,8 +6321,9 @@ def test_import_data_rest_bad_request(request_type=parallelstore.ImportDataReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6367,19 +6380,20 @@ def test_import_data_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_import_data" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_import_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_import_data" - ) as pre: + 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.ParallelstoreRestInterceptor, "post_import_data" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "post_import_data_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_import_data" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6430,8 +6444,9 @@ def test_export_data_rest_bad_request(request_type=parallelstore.ExportDataReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6488,19 +6503,20 @@ def test_export_data_rest_interceptors(null_interceptor): ) client = ParallelstoreClient(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.ParallelstoreRestInterceptor, "post_export_data" - ) as post, mock.patch.object( - transports.ParallelstoreRestInterceptor, "post_export_data_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParallelstoreRestInterceptor, "pre_export_data" - ) as pre: + 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.ParallelstoreRestInterceptor, "post_export_data" + ) as post, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "post_export_data_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ParallelstoreRestInterceptor, "pre_export_data" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6553,8 +6569,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6613,8 +6630,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6675,8 +6693,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6737,8 +6756,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6799,8 +6819,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6861,8 +6882,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7144,11 +7166,14 @@ def test_parallelstore_base_transport(): def test_parallelstore_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.parallelstore_v1beta.services.parallelstore.transports.ParallelstoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.parallelstore_v1beta.services.parallelstore.transports.ParallelstoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ParallelstoreTransport( @@ -7165,9 +7190,12 @@ def test_parallelstore_base_transport_with_credentials_file(): def test_parallelstore_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.parallelstore_v1beta.services.parallelstore.transports.ParallelstoreTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.parallelstore_v1beta.services.parallelstore.transports.ParallelstoreTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ParallelstoreTransport() @@ -7239,11 +7267,12 @@ def test_parallelstore_transport_auth_gdch_credentials(transport_class): def test_parallelstore_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-parametermanager/docs/conf.py b/packages/google-cloud-parametermanager/docs/conf.py index a6b79acd814f..3222a66e4773 100644 --- a/packages/google-cloud-parametermanager/docs/conf.py +++ b/packages/google-cloud-parametermanager/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-parametermanager documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/__init__.py b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/__init__.py index 0c74f1d17cd6..57bdd5d81faa 100644 --- a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/__init__.py +++ b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.parameter_manager import ( ParameterManagerAsyncClient, ParameterManagerClient, diff --git a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/async_client.py b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/async_client.py index e5b7c4d3f1b1..f6f1bc536646 100644 --- a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/async_client.py +++ b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.parametermanager_v1 import gapic_version as package_version @@ -44,10 +44,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +import google.iam.v1.resource_policy_member_pb2 as resource_policy_member_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import resource_policy_member_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.parametermanager_v1.services.parameter_manager import pagers from google.cloud.parametermanager_v1.types import service @@ -124,7 +124,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ParameterManagerAsyncClient: The constructed client. """ - return ParameterManagerClient.from_service_account_info.__func__(ParameterManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ParameterManagerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(ParameterManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -140,7 +141,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ParameterManagerAsyncClient: The constructed client. """ - return ParameterManagerClient.from_service_account_file.__func__(ParameterManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ParameterManagerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(ParameterManagerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/client.py b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/client.py index 7cbe62b242c8..3a18dabc7020 100644 --- a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/client.py +++ b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.parametermanager_v1 import gapic_version as package_version @@ -61,10 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +import google.iam.v1.resource_policy_member_pb2 as resource_policy_member_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import resource_policy_member_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.parametermanager_v1.services.parameter_manager import pagers from google.cloud.parametermanager_v1.types import service @@ -83,9 +83,7 @@ class ParameterManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ParameterManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ParameterManagerTransport]] _transport_registry["grpc"] = ParameterManagerGrpcTransport _transport_registry["grpc_asyncio"] = ParameterManagerGrpcAsyncIOTransport _transport_registry["rest"] = ParameterManagerRestTransport @@ -675,11 +673,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ParameterManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ParameterManagerClient._read_environment_variables() + ) self._client_cert_source = ParameterManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -714,8 +710,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ParameterManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/pagers.py b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/pagers.py index 93d0aa62a747..aebdb22b1871 100644 --- a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/pagers.py +++ b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/base.py b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/base.py index f5b243eaffdc..499a5c90e0b8 100644 --- a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/base.py +++ b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.cloud.parametermanager_v1 import gapic_version as package_version from google.cloud.parametermanager_v1.types import service diff --git a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/grpc.py b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/grpc.py index a1155f6d183e..b651459fdff6 100644 --- a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/grpc.py +++ b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.parametermanager_v1.types import service diff --git a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/grpc_asyncio.py b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/grpc_asyncio.py index 875e948a4567..87447e4a3afe 100644 --- a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/grpc_asyncio.py @@ -17,21 +17,21 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.parametermanager_v1.types import service diff --git a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/rest.py b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/rest.py index 3fd054260baf..ccf0aafa96da 100644 --- a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/rest.py +++ b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -import google.protobuf -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from requests import __version__ as requests_version @@ -802,9 +802,7 @@ def __call__( Message describing Parameter resource """ - http_options = ( - _BaseParameterManagerRestTransport._BaseCreateParameter._get_http_options() - ) + http_options = _BaseParameterManagerRestTransport._BaseCreateParameter._get_http_options() request, metadata = self._interceptor.pre_create_parameter( request, metadata @@ -958,9 +956,7 @@ def __call__( """ - http_options = ( - _BaseParameterManagerRestTransport._BaseCreateParameterVersion._get_http_options() - ) + http_options = _BaseParameterManagerRestTransport._BaseCreateParameterVersion._get_http_options() request, metadata = self._interceptor.pre_create_parameter_version( request, metadata @@ -1108,9 +1104,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseParameterManagerRestTransport._BaseDeleteParameter._get_http_options() - ) + http_options = _BaseParameterManagerRestTransport._BaseDeleteParameter._get_http_options() request, metadata = self._interceptor.pre_delete_parameter( request, metadata @@ -1132,7 +1126,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1218,9 +1212,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseParameterManagerRestTransport._BaseDeleteParameterVersion._get_http_options() - ) + http_options = _BaseParameterManagerRestTransport._BaseDeleteParameterVersion._get_http_options() request, metadata = self._interceptor.pre_delete_parameter_version( request, metadata @@ -1242,7 +1234,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1480,9 +1472,7 @@ def __call__( """ - http_options = ( - _BaseParameterManagerRestTransport._BaseGetParameterVersion._get_http_options() - ) + http_options = _BaseParameterManagerRestTransport._BaseGetParameterVersion._get_http_options() request, metadata = self._interceptor.pre_get_parameter_version( request, metadata @@ -1629,9 +1619,7 @@ def __call__( """ - http_options = ( - _BaseParameterManagerRestTransport._BaseListParameters._get_http_options() - ) + http_options = _BaseParameterManagerRestTransport._BaseListParameters._get_http_options() request, metadata = self._interceptor.pre_list_parameters(request, metadata) transcoded_request = _BaseParameterManagerRestTransport._BaseListParameters._get_transcoded_request( @@ -1777,9 +1765,7 @@ def __call__( """ - http_options = ( - _BaseParameterManagerRestTransport._BaseListParameterVersions._get_http_options() - ) + http_options = _BaseParameterManagerRestTransport._BaseListParameterVersions._get_http_options() request, metadata = self._interceptor.pre_list_parameter_versions( request, metadata @@ -1931,9 +1917,7 @@ def __call__( """ - http_options = ( - _BaseParameterManagerRestTransport._BaseRenderParameterVersion._get_http_options() - ) + http_options = _BaseParameterManagerRestTransport._BaseRenderParameterVersion._get_http_options() request, metadata = self._interceptor.pre_render_parameter_version( request, metadata @@ -2083,9 +2067,7 @@ def __call__( Message describing Parameter resource """ - http_options = ( - _BaseParameterManagerRestTransport._BaseUpdateParameter._get_http_options() - ) + http_options = _BaseParameterManagerRestTransport._BaseUpdateParameter._get_http_options() request, metadata = self._interceptor.pre_update_parameter( request, metadata @@ -2239,9 +2221,7 @@ def __call__( """ - http_options = ( - _BaseParameterManagerRestTransport._BaseUpdateParameterVersion._get_http_options() - ) + http_options = _BaseParameterManagerRestTransport._BaseUpdateParameterVersion._get_http_options() request, metadata = self._interceptor.pre_update_parameter_version( request, metadata @@ -2352,7 +2332,9 @@ def create_parameter_version( ) -> Callable[[service.CreateParameterVersionRequest], service.ParameterVersion]: # 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._CreateParameterVersion(self._session, self._host, self._interceptor) # type: ignore + return self._CreateParameterVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_parameter( @@ -2368,7 +2350,9 @@ def delete_parameter_version( ) -> Callable[[service.DeleteParameterVersionRequest], empty_pb2.Empty]: # 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._DeleteParameterVersion(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteParameterVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_parameter( @@ -2412,7 +2396,9 @@ def render_parameter_version( ]: # 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._RenderParameterVersion(self._session, self._host, self._interceptor) # type: ignore + return self._RenderParameterVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_parameter( @@ -2428,7 +2414,9 @@ def update_parameter_version( ) -> Callable[[service.UpdateParameterVersionRequest], service.ParameterVersion]: # 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._UpdateParameterVersion(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateParameterVersion( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -2627,9 +2615,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseParameterManagerRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseParameterManagerRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseParameterManagerRestTransport._BaseListLocations._get_transcoded_request( diff --git a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/rest_base.py b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/rest_base.py index 2d0b6a9c764f..8801f28c73df 100644 --- a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/rest_base.py +++ b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/services/parameter_manager/transports/rest_base.py @@ -17,9 +17,9 @@ import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf import json_format from google.cloud.parametermanager_v1.types import service diff --git a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/types/service.py b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/types/service.py index 5654c1977b4b..5878d2a95a0f 100644 --- a/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/types/service.py +++ b/packages/google-cloud-parametermanager/google/cloud/parametermanager_v1/types/service.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.iam.v1 import resource_policy_member_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.iam.v1.resource_policy_member_pb2 as resource_policy_member_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -64,6 +64,7 @@ class ParameterFormat(proto.Enum): JSON (3): JSON format. """ + PARAMETER_FORMAT_UNSPECIFIED = 0 UNFORMATTED = 1 YAML = 2 @@ -84,6 +85,7 @@ class View(proto.Enum): Include metadata & other relevant payload data as well. This is the default view. """ + VIEW_UNSPECIFIED = 0 BASIC = 1 FULL = 2 diff --git a/packages/google-cloud-parametermanager/noxfile.py b/packages/google-cloud-parametermanager/noxfile.py index 95ca4b6d55a2..77872de2747a 100644 --- a/packages/google-cloud-parametermanager/noxfile.py +++ b/packages/google-cloud-parametermanager/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-parametermanager/tests/unit/gapic/parametermanager_v1/test_parameter_manager.py b/packages/google-cloud-parametermanager/tests/unit/gapic/parametermanager_v1/test_parameter_manager.py index 4893e8fb910b..e8b46c76485c 100644 --- a/packages/google-cloud-parametermanager/tests/unit/gapic/parametermanager_v1/test_parameter_manager.py +++ b/packages/google-cloud-parametermanager/tests/unit/gapic/parametermanager_v1/test_parameter_manager.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,18 +43,23 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.iam.v1.resource_policy_member_pb2 as resource_policy_member_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import resource_policy_member_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.parametermanager_v1.services.parameter_manager import ( ParameterManagerAsyncClient, @@ -974,10 +979,9 @@ def test_parameter_manager_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1022,10 +1026,9 @@ def test_parameter_manager_client_get_mtls_endpoint_and_cert_source(client_class client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1061,10 +1064,9 @@ def test_parameter_manager_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1312,13 +1314,13 @@ def test_parameter_manager_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2285,9 +2287,9 @@ def test_create_parameter_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_parameter - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_parameter] = ( + mock_rpc + ) request = {} client.create_parameter(request) @@ -2630,9 +2632,9 @@ def test_update_parameter_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_parameter - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_parameter] = ( + mock_rpc + ) request = {} client.update_parameter(request) @@ -2962,9 +2964,9 @@ def test_delete_parameter_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_parameter - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_parameter] = ( + mock_rpc + ) request = {} client.delete_parameter(request) @@ -3843,9 +3845,9 @@ def test_get_parameter_version_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_parameter_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_parameter_version] = ( + mock_rpc + ) request = {} client.get_parameter_version(request) @@ -5956,9 +5958,9 @@ def test_create_parameter_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_parameter - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_parameter] = ( + mock_rpc + ) request = {} client.create_parameter(request) @@ -6174,9 +6176,9 @@ def test_update_parameter_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_parameter - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_parameter] = ( + mock_rpc + ) request = {} client.update_parameter(request) @@ -6371,9 +6373,9 @@ def test_delete_parameter_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_parameter - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_parameter] = ( + mock_rpc + ) request = {} client.delete_parameter(request) @@ -6821,9 +6823,9 @@ def test_get_parameter_version_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_parameter_version - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_parameter_version] = ( + mock_rpc + ) request = {} client.get_parameter_version(request) @@ -8472,8 +8474,9 @@ def test_list_parameters_rest_bad_request(request_type=service.ListParametersReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8538,17 +8541,20 @@ def test_list_parameters_rest_interceptors(null_interceptor): ) client = ParameterManagerClient(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.ParameterManagerRestInterceptor, "post_list_parameters" - ) as post, mock.patch.object( - transports.ParameterManagerRestInterceptor, "post_list_parameters_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParameterManagerRestInterceptor, "pre_list_parameters" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "post_list_parameters" + ) as post, + mock.patch.object( + transports.ParameterManagerRestInterceptor, + "post_list_parameters_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "pre_list_parameters" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8599,8 +8605,9 @@ def test_get_parameter_rest_bad_request(request_type=service.GetParameterRequest 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8667,17 +8674,20 @@ def test_get_parameter_rest_interceptors(null_interceptor): ) client = ParameterManagerClient(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.ParameterManagerRestInterceptor, "post_get_parameter" - ) as post, mock.patch.object( - transports.ParameterManagerRestInterceptor, "post_get_parameter_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ParameterManagerRestInterceptor, "pre_get_parameter" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "post_get_parameter" + ) as post, + mock.patch.object( + transports.ParameterManagerRestInterceptor, + "post_get_parameter_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "pre_get_parameter" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8726,8 +8736,9 @@ def test_create_parameter_rest_bad_request(request_type=service.CreateParameterR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8873,18 +8884,20 @@ def test_create_parameter_rest_interceptors(null_interceptor): ) client = ParameterManagerClient(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.ParameterManagerRestInterceptor, "post_create_parameter" - ) as post, mock.patch.object( - transports.ParameterManagerRestInterceptor, - "post_create_parameter_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ParameterManagerRestInterceptor, "pre_create_parameter" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "post_create_parameter" + ) as post, + mock.patch.object( + transports.ParameterManagerRestInterceptor, + "post_create_parameter_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "pre_create_parameter" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -8935,8 +8948,9 @@ def test_update_parameter_rest_bad_request(request_type=service.UpdateParameterR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9084,18 +9098,20 @@ def test_update_parameter_rest_interceptors(null_interceptor): ) client = ParameterManagerClient(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.ParameterManagerRestInterceptor, "post_update_parameter" - ) as post, mock.patch.object( - transports.ParameterManagerRestInterceptor, - "post_update_parameter_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ParameterManagerRestInterceptor, "pre_update_parameter" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "post_update_parameter" + ) as post, + mock.patch.object( + transports.ParameterManagerRestInterceptor, + "post_update_parameter_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "pre_update_parameter" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9144,8 +9160,9 @@ def test_delete_parameter_rest_bad_request(request_type=service.DeleteParameterR 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9202,13 +9219,13 @@ def test_delete_parameter_rest_interceptors(null_interceptor): ) client = ParameterManagerClient(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.ParameterManagerRestInterceptor, "pre_delete_parameter" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "pre_delete_parameter" + ) as pre, + ): pre.assert_not_called() pb_message = service.DeleteParameterRequest.pb(service.DeleteParameterRequest()) transcode.return_value = { @@ -9251,8 +9268,9 @@ def test_list_parameter_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9317,18 +9335,20 @@ def test_list_parameter_versions_rest_interceptors(null_interceptor): ) client = ParameterManagerClient(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.ParameterManagerRestInterceptor, "post_list_parameter_versions" - ) as post, mock.patch.object( - transports.ParameterManagerRestInterceptor, - "post_list_parameter_versions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ParameterManagerRestInterceptor, "pre_list_parameter_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "post_list_parameter_versions" + ) as post, + mock.patch.object( + transports.ParameterManagerRestInterceptor, + "post_list_parameter_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "pre_list_parameter_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9388,8 +9408,9 @@ def test_get_parameter_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9458,18 +9479,20 @@ def test_get_parameter_version_rest_interceptors(null_interceptor): ) client = ParameterManagerClient(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.ParameterManagerRestInterceptor, "post_get_parameter_version" - ) as post, mock.patch.object( - transports.ParameterManagerRestInterceptor, - "post_get_parameter_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ParameterManagerRestInterceptor, "pre_get_parameter_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "post_get_parameter_version" + ) as post, + mock.patch.object( + transports.ParameterManagerRestInterceptor, + "post_get_parameter_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "pre_get_parameter_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9524,8 +9547,9 @@ def test_render_parameter_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9592,18 +9616,20 @@ def test_render_parameter_version_rest_interceptors(null_interceptor): ) client = ParameterManagerClient(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.ParameterManagerRestInterceptor, "post_render_parameter_version" - ) as post, mock.patch.object( - transports.ParameterManagerRestInterceptor, - "post_render_parameter_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ParameterManagerRestInterceptor, "pre_render_parameter_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "post_render_parameter_version" + ) as post, + mock.patch.object( + transports.ParameterManagerRestInterceptor, + "post_render_parameter_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "pre_render_parameter_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9661,8 +9687,9 @@ def test_create_parameter_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9804,18 +9831,20 @@ def test_create_parameter_version_rest_interceptors(null_interceptor): ) client = ParameterManagerClient(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.ParameterManagerRestInterceptor, "post_create_parameter_version" - ) as post, mock.patch.object( - transports.ParameterManagerRestInterceptor, - "post_create_parameter_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ParameterManagerRestInterceptor, "pre_create_parameter_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "post_create_parameter_version" + ) as post, + mock.patch.object( + transports.ParameterManagerRestInterceptor, + "post_create_parameter_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "pre_create_parameter_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9872,8 +9901,9 @@ def test_update_parameter_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10019,18 +10049,20 @@ def test_update_parameter_version_rest_interceptors(null_interceptor): ) client = ParameterManagerClient(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.ParameterManagerRestInterceptor, "post_update_parameter_version" - ) as post, mock.patch.object( - transports.ParameterManagerRestInterceptor, - "post_update_parameter_version_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ParameterManagerRestInterceptor, "pre_update_parameter_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "post_update_parameter_version" + ) as post, + mock.patch.object( + transports.ParameterManagerRestInterceptor, + "post_update_parameter_version_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "pre_update_parameter_version" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10085,8 +10117,9 @@ def test_delete_parameter_version_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10145,13 +10178,13 @@ def test_delete_parameter_version_rest_interceptors(null_interceptor): ) client = ParameterManagerClient(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.ParameterManagerRestInterceptor, "pre_delete_parameter_version" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ParameterManagerRestInterceptor, "pre_delete_parameter_version" + ) as pre, + ): pre.assert_not_called() pb_message = service.DeleteParameterVersionRequest.pb( service.DeleteParameterVersionRequest() @@ -10196,8 +10229,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10256,8 +10290,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -10609,11 +10644,14 @@ def test_parameter_manager_base_transport(): def test_parameter_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.parametermanager_v1.services.parameter_manager.transports.ParameterManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.parametermanager_v1.services.parameter_manager.transports.ParameterManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ParameterManagerTransport( @@ -10630,9 +10668,12 @@ def test_parameter_manager_base_transport_with_credentials_file(): def test_parameter_manager_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.parametermanager_v1.services.parameter_manager.transports.ParameterManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.parametermanager_v1.services.parameter_manager.transports.ParameterManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ParameterManagerTransport() @@ -10704,11 +10745,12 @@ def test_parameter_manager_transport_auth_gdch_credentials(transport_class): def test_parameter_manager_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-phishing-protection/docs/conf.py b/packages/google-cloud-phishing-protection/docs/conf.py index 21a0cb2b730a..15f47b649a78 100644 --- a/packages/google-cloud-phishing-protection/docs/conf.py +++ b/packages/google-cloud-phishing-protection/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-phishing-protection documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/__init__.py b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/__init__.py index b105803ea1ee..24f653a491a3 100644 --- a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/__init__.py +++ b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.phishing_protection_service_v1_beta1 import ( PhishingProtectionServiceV1Beta1AsyncClient, PhishingProtectionServiceV1Beta1Client, diff --git a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/async_client.py b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/async_client.py index 793cfd2b3e63..9f83b32fc768 100644 --- a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/async_client.py +++ b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.phishingprotection_v1beta1 import gapic_version as package_version @@ -123,7 +123,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PhishingProtectionServiceV1Beta1AsyncClient: The constructed client. """ - return PhishingProtectionServiceV1Beta1Client.from_service_account_info.__func__(PhishingProtectionServiceV1Beta1AsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + PhishingProtectionServiceV1Beta1Client.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + PhishingProtectionServiceV1Beta1AsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +144,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PhishingProtectionServiceV1Beta1AsyncClient: The constructed client. """ - return PhishingProtectionServiceV1Beta1Client.from_service_account_file.__func__(PhishingProtectionServiceV1Beta1AsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + PhishingProtectionServiceV1Beta1Client.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + PhishingProtectionServiceV1Beta1AsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -177,7 +187,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return PhishingProtectionServiceV1Beta1Client.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return PhishingProtectionServiceV1Beta1Client.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> PhishingProtectionServiceV1Beta1Transport: diff --git a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/client.py b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/client.py index 0df774904cb0..3d80e34e762c 100644 --- a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/client.py +++ b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.phishingprotection_v1beta1 import gapic_version as package_version @@ -82,13 +82,11 @@ class PhishingProtectionServiceV1Beta1ClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PhishingProtectionServiceV1Beta1Transport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PhishingProtectionServiceV1Beta1Transport]] _transport_registry["grpc"] = PhishingProtectionServiceV1Beta1GrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = PhishingProtectionServiceV1Beta1GrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + PhishingProtectionServiceV1Beta1GrpcAsyncIOTransport + ) _transport_registry["rest"] = PhishingProtectionServiceV1Beta1RestTransport def get_transport_class( @@ -614,11 +612,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PhishingProtectionServiceV1Beta1Client._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PhishingProtectionServiceV1Beta1Client._read_environment_variables() + ) self._client_cert_source = ( PhishingProtectionServiceV1Beta1Client._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -659,8 +655,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PhishingProtectionServiceV1Beta1Transport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/__init__.py b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/__init__.py index 72d612cec89b..0f2e91c5c5db 100644 --- a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/__init__.py +++ b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PhishingProtectionServiceV1Beta1Transport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PhishingProtectionServiceV1Beta1Transport]] _transport_registry["grpc"] = PhishingProtectionServiceV1Beta1GrpcTransport -_transport_registry[ - "grpc_asyncio" -] = PhishingProtectionServiceV1Beta1GrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + PhishingProtectionServiceV1Beta1GrpcAsyncIOTransport +) _transport_registry["rest"] = PhishingProtectionServiceV1Beta1RestTransport __all__ = ( diff --git a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/base.py b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/base.py index f4e4d9535e62..ac101c628a21 100644 --- a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/base.py +++ b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.phishingprotection_v1beta1 import gapic_version as package_version from google.cloud.phishingprotection_v1beta1.types import phishingprotection diff --git a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/grpc.py b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/grpc.py index 1d495e1daac4..0abd36462916 100644 --- a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/grpc.py +++ b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.phishingprotection_v1beta1.types import phishingprotection diff --git a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/grpc_asyncio.py b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/grpc_asyncio.py index 42bd6645d410..374477876c11 100644 --- a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/grpc_asyncio.py +++ b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.phishingprotection_v1beta1.types import phishingprotection diff --git a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/rest.py b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/rest.py index 33288ace1a4e..5c40835ecb01 100644 --- a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/rest.py +++ b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/services/phishing_protection_service_v1_beta1/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -288,9 +288,7 @@ def __call__( """ - http_options = ( - _BasePhishingProtectionServiceV1Beta1RestTransport._BaseReportPhishing._get_http_options() - ) + http_options = _BasePhishingProtectionServiceV1Beta1RestTransport._BaseReportPhishing._get_http_options() request, metadata = self._interceptor.pre_report_phishing(request, metadata) transcoded_request = _BasePhishingProtectionServiceV1Beta1RestTransport._BaseReportPhishing._get_transcoded_request( diff --git a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/types/__init__.py b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/types/__init__.py index 09d0f3976f49..a6b2a409526d 100644 --- a/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/types/__init__.py +++ b/packages/google-cloud-phishing-protection/google/cloud/phishingprotection_v1beta1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .phishingprotection import ReportPhishingRequest, ReportPhishingResponse +from .phishingprotection import ( + ReportPhishingRequest, + ReportPhishingResponse, +) __all__ = ( "ReportPhishingRequest", diff --git a/packages/google-cloud-phishing-protection/noxfile.py b/packages/google-cloud-phishing-protection/noxfile.py index ae8b0c27acd5..a719cd4322b9 100644 --- a/packages/google-cloud-phishing-protection/noxfile.py +++ b/packages/google-cloud-phishing-protection/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-phishing-protection/tests/unit/gapic/phishingprotection_v1beta1/test_phishing_protection_service_v1_beta1.py b/packages/google-cloud-phishing-protection/tests/unit/gapic/phishingprotection_v1beta1/test_phishing_protection_service_v1_beta1.py index d581617b7d63..c48a345b8cc5 100644 --- a/packages/google-cloud-phishing-protection/tests/unit/gapic/phishingprotection_v1beta1/test_phishing_protection_service_v1_beta1.py +++ b/packages/google-cloud-phishing-protection/tests/unit/gapic/phishingprotection_v1beta1/test_phishing_protection_service_v1_beta1.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -1061,10 +1066,9 @@ def test_phishing_protection_service_v1_beta1_client_get_mtls_endpoint_and_cert_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1109,10 +1113,9 @@ def test_phishing_protection_service_v1_beta1_client_get_mtls_endpoint_and_cert_ client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1148,10 +1151,9 @@ def test_phishing_protection_service_v1_beta1_client_get_mtls_endpoint_and_cert_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1415,13 +1417,13 @@ def test_phishing_protection_service_v1_beta1_client_create_channel_credentials_ ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2149,8 +2151,9 @@ def test_report_phishing_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2210,20 +2213,22 @@ def test_report_phishing_rest_interceptors(null_interceptor): ) client = PhishingProtectionServiceV1Beta1Client(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.PhishingProtectionServiceV1Beta1RestInterceptor, - "post_report_phishing", - ) as post, mock.patch.object( - transports.PhishingProtectionServiceV1Beta1RestInterceptor, - "post_report_phishing_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PhishingProtectionServiceV1Beta1RestInterceptor, - "pre_report_phishing", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PhishingProtectionServiceV1Beta1RestInterceptor, + "post_report_phishing", + ) as post, + mock.patch.object( + transports.PhishingProtectionServiceV1Beta1RestInterceptor, + "post_report_phishing_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PhishingProtectionServiceV1Beta1RestInterceptor, + "pre_report_phishing", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2348,11 +2353,14 @@ def test_phishing_protection_service_v1_beta1_base_transport(): def test_phishing_protection_service_v1_beta1_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.phishingprotection_v1beta1.services.phishing_protection_service_v1_beta1.transports.PhishingProtectionServiceV1Beta1Transport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.phishingprotection_v1beta1.services.phishing_protection_service_v1_beta1.transports.PhishingProtectionServiceV1Beta1Transport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PhishingProtectionServiceV1Beta1Transport( @@ -2369,9 +2377,12 @@ def test_phishing_protection_service_v1_beta1_base_transport_with_credentials_fi def test_phishing_protection_service_v1_beta1_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.phishingprotection_v1beta1.services.phishing_protection_service_v1_beta1.transports.PhishingProtectionServiceV1Beta1Transport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.phishingprotection_v1beta1.services.phishing_protection_service_v1_beta1.transports.PhishingProtectionServiceV1Beta1Transport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PhishingProtectionServiceV1Beta1Transport() @@ -2450,11 +2461,12 @@ def test_phishing_protection_service_v1_beta1_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-policy-troubleshooter/docs/conf.py b/packages/google-cloud-policy-troubleshooter/docs/conf.py index ff6c563a49aa..6c29f21cab06 100644 --- a/packages/google-cloud-policy-troubleshooter/docs/conf.py +++ b/packages/google-cloud-policy-troubleshooter/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-policy-troubleshooter documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/__init__.py b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/__init__.py index b9c00056f3ac..53bef55f2e3f 100644 --- a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/__init__.py +++ b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.iam_checker import IamCheckerAsyncClient, IamCheckerClient from .types.checker import TroubleshootIamPolicyRequest, TroubleshootIamPolicyResponse from .types.explanations import ( diff --git a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/async_client.py b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/async_client.py index 6493359226dc..cc563787619b 100644 --- a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/async_client.py +++ b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.policytroubleshooter_v1 import gapic_version as package_version @@ -44,7 +44,7 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.policytroubleshooter_v1.types import checker, explanations @@ -110,7 +110,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IamCheckerAsyncClient: The constructed client. """ - return IamCheckerClient.from_service_account_info.__func__(IamCheckerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = IamCheckerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(IamCheckerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -126,7 +127,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IamCheckerAsyncClient: The constructed client. """ - return IamCheckerClient.from_service_account_file.__func__(IamCheckerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = IamCheckerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(IamCheckerAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/client.py b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/client.py index 8d62ede78aa2..bf4e4007f59c 100644 --- a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/client.py +++ b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.policytroubleshooter_v1 import gapic_version as package_version @@ -61,7 +61,7 @@ _LOGGER = std_logging.getLogger(__name__) -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.cloud.policytroubleshooter_v1.types import checker, explanations @@ -601,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IamCheckerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IamCheckerClient._read_environment_variables() + ) self._client_cert_source = IamCheckerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IamCheckerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/base.py b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/base.py index 4ec0d0666226..9a0dc39caa48 100644 --- a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/base.py +++ b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.policytroubleshooter_v1 import gapic_version as package_version from google.cloud.policytroubleshooter_v1.types import checker diff --git a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/grpc.py b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/grpc.py index 56b3056939a6..93a82ce21b35 100644 --- a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/grpc.py +++ b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.policytroubleshooter_v1.types import checker diff --git a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/grpc_asyncio.py b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/grpc_asyncio.py index 2868ef9e4cb3..c9948184006d 100644 --- a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/grpc_asyncio.py +++ b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.policytroubleshooter_v1.types import checker diff --git a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/rest.py b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/rest.py index 880b25c607ae..88627b73244a 100644 --- a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/rest.py +++ b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/services/iam_checker/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -285,9 +285,7 @@ def __call__( """ - http_options = ( - _BaseIamCheckerRestTransport._BaseTroubleshootIamPolicy._get_http_options() - ) + http_options = _BaseIamCheckerRestTransport._BaseTroubleshootIamPolicy._get_http_options() request, metadata = self._interceptor.pre_troubleshoot_iam_policy( request, metadata diff --git a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/types/__init__.py b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/types/__init__.py index 0c738678a51d..23eb2d362d93 100644 --- a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/types/__init__.py +++ b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/types/__init__.py @@ -13,7 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .checker import TroubleshootIamPolicyRequest, TroubleshootIamPolicyResponse +from .checker import ( + TroubleshootIamPolicyRequest, + TroubleshootIamPolicyResponse, +) from .explanations import ( AccessState, AccessTuple, diff --git a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/types/checker.py b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/types/checker.py index 08f085541b85..ac1b96659d65 100644 --- a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/types/checker.py +++ b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/types/checker.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.rpc import status_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore from google.cloud.policytroubleshooter_v1.types import explanations @@ -82,12 +82,12 @@ class TroubleshootIamPolicyResponse(proto.Message): number=1, enum=explanations.AccessState, ) - explained_policies: MutableSequence[ - explanations.ExplainedPolicy - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message=explanations.ExplainedPolicy, + explained_policies: MutableSequence[explanations.ExplainedPolicy] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message=explanations.ExplainedPolicy, + ) ) errors: MutableSequence[status_pb2.Status] = proto.RepeatedField( proto.MESSAGE, diff --git a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/types/explanations.py b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/types/explanations.py index 400c720d4965..28d9b3476b66 100644 --- a/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/types/explanations.py +++ b/packages/google-cloud-policy-troubleshooter/google/cloud/policytroubleshooter_v1/types/explanations.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.iam.v1 import policy_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -51,6 +51,7 @@ class AccessState(proto.Enum): access to all of the policies that Policy Troubleshooter needs to evaluate. """ + ACCESS_STATE_UNSPECIFIED = 0 GRANTED = 1 NOT_GRANTED = 2 @@ -75,6 +76,7 @@ class HeuristicRelevance(proto.Enum): result. Changing the data point is likely to affect the overall determination. """ + HEURISTIC_RELEVANCE_UNSPECIFIED = 0 NORMAL = 1 HIGH = 2 @@ -280,6 +282,7 @@ class RolePermission(proto.Enum): The sender of the request is not allowed to access the binding. """ + ROLE_PERMISSION_UNSPECIFIED = 0 ROLE_PERMISSION_INCLUDED = 1 ROLE_PERMISSION_NOT_INCLUDED = 2 @@ -310,6 +313,7 @@ class Membership(proto.Enum): Google Accounts and service accounts are supported. """ + MEMBERSHIP_UNSPECIFIED = 0 MEMBERSHIP_INCLUDED = 1 MEMBERSHIP_NOT_INCLUDED = 2 diff --git a/packages/google-cloud-policy-troubleshooter/noxfile.py b/packages/google-cloud-policy-troubleshooter/noxfile.py index 7a1c1c422164..b60e3c139c03 100644 --- a/packages/google-cloud-policy-troubleshooter/noxfile.py +++ b/packages/google-cloud-policy-troubleshooter/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-policy-troubleshooter/tests/unit/gapic/policytroubleshooter_v1/test_iam_checker.py b/packages/google-cloud-policy-troubleshooter/tests/unit/gapic/policytroubleshooter_v1/test_iam_checker.py index 7046762627db..7e916a083c14 100644 --- a/packages/google-cloud-policy-troubleshooter/tests/unit/gapic/policytroubleshooter_v1/test_iam_checker.py +++ b/packages/google-cloud-policy-troubleshooter/tests/unit/gapic/policytroubleshooter_v1/test_iam_checker.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,15 +43,20 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.rpc.status_pb2 as status_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.rpc import status_pb2 # type: ignore from google.cloud.policytroubleshooter_v1.services.iam_checker import ( IamCheckerAsyncClient, @@ -918,10 +923,9 @@ def test_iam_checker_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -966,10 +970,9 @@ def test_iam_checker_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1005,10 +1008,9 @@ def test_iam_checker_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1237,13 +1239,13 @@ def test_iam_checker_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1683,8 +1685,9 @@ def test_troubleshoot_iam_policy_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1747,18 +1750,20 @@ def test_troubleshoot_iam_policy_rest_interceptors(null_interceptor): ) client = IamCheckerClient(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.IamCheckerRestInterceptor, "post_troubleshoot_iam_policy" - ) as post, mock.patch.object( - transports.IamCheckerRestInterceptor, - "post_troubleshoot_iam_policy_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IamCheckerRestInterceptor, "pre_troubleshoot_iam_policy" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IamCheckerRestInterceptor, "post_troubleshoot_iam_policy" + ) as post, + mock.patch.object( + transports.IamCheckerRestInterceptor, + "post_troubleshoot_iam_policy_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IamCheckerRestInterceptor, "pre_troubleshoot_iam_policy" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1885,11 +1890,14 @@ def test_iam_checker_base_transport(): def test_iam_checker_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.policytroubleshooter_v1.services.iam_checker.transports.IamCheckerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.policytroubleshooter_v1.services.iam_checker.transports.IamCheckerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IamCheckerTransport( @@ -1906,9 +1914,12 @@ def test_iam_checker_base_transport_with_credentials_file(): def test_iam_checker_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.policytroubleshooter_v1.services.iam_checker.transports.IamCheckerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.policytroubleshooter_v1.services.iam_checker.transports.IamCheckerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IamCheckerTransport() @@ -1980,11 +1991,12 @@ def test_iam_checker_transport_auth_gdch_credentials(transport_class): def test_iam_checker_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-policysimulator/docs/conf.py b/packages/google-cloud-policysimulator/docs/conf.py index b90ad8dcad5a..dfe67163e2c2 100644 --- a/packages/google-cloud-policysimulator/docs/conf.py +++ b/packages/google-cloud-policysimulator/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-policysimulator documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/__init__.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/__init__.py index 4880b776ebae..e4c2fc1b9cfc 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/__init__.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.org_policy_violations_preview_service import ( OrgPolicyViolationsPreviewServiceAsyncClient, OrgPolicyViolationsPreviewServiceClient, diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/async_client.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/async_client.py index ace8fafb92ad..c24d9cda7360 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/async_client.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.policysimulator_v1 import gapic_version as package_version @@ -45,10 +45,10 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.policysimulator_v1.services.org_policy_violations_preview_service import ( pagers, @@ -168,7 +168,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: OrgPolicyViolationsPreviewServiceAsyncClient: The constructed client. """ - return OrgPolicyViolationsPreviewServiceClient.from_service_account_info.__func__(OrgPolicyViolationsPreviewServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + OrgPolicyViolationsPreviewServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + OrgPolicyViolationsPreviewServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -184,7 +189,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: OrgPolicyViolationsPreviewServiceAsyncClient: The constructed client. """ - return OrgPolicyViolationsPreviewServiceClient.from_service_account_file.__func__(OrgPolicyViolationsPreviewServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + OrgPolicyViolationsPreviewServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + OrgPolicyViolationsPreviewServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -222,7 +232,11 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return OrgPolicyViolationsPreviewServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ( + OrgPolicyViolationsPreviewServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) + ) # type: ignore @property def transport(self) -> OrgPolicyViolationsPreviewServiceTransport: diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/client.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/client.py index d3f147207244..907df364b239 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/client.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.policysimulator_v1 import gapic_version as package_version @@ -62,10 +62,10 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.policysimulator_v1.services.org_policy_violations_preview_service import ( pagers, @@ -91,13 +91,11 @@ class OrgPolicyViolationsPreviewServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[OrgPolicyViolationsPreviewServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[OrgPolicyViolationsPreviewServiceTransport]] _transport_registry["grpc"] = OrgPolicyViolationsPreviewServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = OrgPolicyViolationsPreviewServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + OrgPolicyViolationsPreviewServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = OrgPolicyViolationsPreviewServiceRestTransport def get_transport_class( @@ -722,11 +720,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = OrgPolicyViolationsPreviewServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + OrgPolicyViolationsPreviewServiceClient._read_environment_variables() + ) self._client_cert_source = ( OrgPolicyViolationsPreviewServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -767,8 +763,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast( OrgPolicyViolationsPreviewServiceTransport, transport diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/pagers.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/pagers.py index af1d455b6330..a16535aee3d5 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/pagers.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/__init__.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/__init__.py index e2d63be02579..762b3dd53a11 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/__init__.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/__init__.py @@ -25,13 +25,11 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[OrgPolicyViolationsPreviewServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[OrgPolicyViolationsPreviewServiceTransport]] _transport_registry["grpc"] = OrgPolicyViolationsPreviewServiceGrpcTransport -_transport_registry[ - "grpc_asyncio" -] = OrgPolicyViolationsPreviewServiceGrpcAsyncIOTransport +_transport_registry["grpc_asyncio"] = ( + OrgPolicyViolationsPreviewServiceGrpcAsyncIOTransport +) _transport_registry["rest"] = OrgPolicyViolationsPreviewServiceRestTransport __all__ = ( diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/base.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/base.py index 2463757c63e5..6f9a0028e30c 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/base.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.policysimulator_v1 import gapic_version as package_version from google.cloud.policysimulator_v1.types import orgpolicy as gcp_orgpolicy diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/grpc.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/grpc.py index 8f953cecc800..eb97d87f7d22 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/grpc.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.policysimulator_v1.types import orgpolicy as gcp_orgpolicy @@ -379,12 +379,12 @@ def list_org_policy_violations_previews( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_org_policy_violations_previews" not in self._stubs: - self._stubs[ - "list_org_policy_violations_previews" - ] = self._logged_channel.unary_unary( - "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/ListOrgPolicyViolationsPreviews", - request_serializer=gcp_orgpolicy.ListOrgPolicyViolationsPreviewsRequest.serialize, - response_deserializer=gcp_orgpolicy.ListOrgPolicyViolationsPreviewsResponse.deserialize, + self._stubs["list_org_policy_violations_previews"] = ( + self._logged_channel.unary_unary( + "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/ListOrgPolicyViolationsPreviews", + request_serializer=gcp_orgpolicy.ListOrgPolicyViolationsPreviewsRequest.serialize, + response_deserializer=gcp_orgpolicy.ListOrgPolicyViolationsPreviewsResponse.deserialize, + ) ) return self._stubs["list_org_policy_violations_previews"] @@ -415,12 +415,12 @@ def get_org_policy_violations_preview( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_org_policy_violations_preview" not in self._stubs: - self._stubs[ - "get_org_policy_violations_preview" - ] = self._logged_channel.unary_unary( - "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/GetOrgPolicyViolationsPreview", - request_serializer=gcp_orgpolicy.GetOrgPolicyViolationsPreviewRequest.serialize, - response_deserializer=gcp_orgpolicy.OrgPolicyViolationsPreview.deserialize, + self._stubs["get_org_policy_violations_preview"] = ( + self._logged_channel.unary_unary( + "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/GetOrgPolicyViolationsPreview", + request_serializer=gcp_orgpolicy.GetOrgPolicyViolationsPreviewRequest.serialize, + response_deserializer=gcp_orgpolicy.OrgPolicyViolationsPreview.deserialize, + ) ) return self._stubs["get_org_policy_violations_preview"] @@ -452,12 +452,12 @@ def create_org_policy_violations_preview( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_org_policy_violations_preview" not in self._stubs: - self._stubs[ - "create_org_policy_violations_preview" - ] = self._logged_channel.unary_unary( - "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/CreateOrgPolicyViolationsPreview", - request_serializer=gcp_orgpolicy.CreateOrgPolicyViolationsPreviewRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_org_policy_violations_preview"] = ( + self._logged_channel.unary_unary( + "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/CreateOrgPolicyViolationsPreview", + request_serializer=gcp_orgpolicy.CreateOrgPolicyViolationsPreviewRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_org_policy_violations_preview"] @@ -485,12 +485,12 @@ def list_org_policy_violations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_org_policy_violations" not in self._stubs: - self._stubs[ - "list_org_policy_violations" - ] = self._logged_channel.unary_unary( - "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/ListOrgPolicyViolations", - request_serializer=gcp_orgpolicy.ListOrgPolicyViolationsRequest.serialize, - response_deserializer=gcp_orgpolicy.ListOrgPolicyViolationsResponse.deserialize, + self._stubs["list_org_policy_violations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/ListOrgPolicyViolations", + request_serializer=gcp_orgpolicy.ListOrgPolicyViolationsRequest.serialize, + response_deserializer=gcp_orgpolicy.ListOrgPolicyViolationsResponse.deserialize, + ) ) return self._stubs["list_org_policy_violations"] diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/grpc_asyncio.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/grpc_asyncio.py index bdd4886ce856..673a288ed330 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.policysimulator_v1.types import orgpolicy as gcp_orgpolicy @@ -387,12 +387,12 @@ def list_org_policy_violations_previews( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_org_policy_violations_previews" not in self._stubs: - self._stubs[ - "list_org_policy_violations_previews" - ] = self._logged_channel.unary_unary( - "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/ListOrgPolicyViolationsPreviews", - request_serializer=gcp_orgpolicy.ListOrgPolicyViolationsPreviewsRequest.serialize, - response_deserializer=gcp_orgpolicy.ListOrgPolicyViolationsPreviewsResponse.deserialize, + self._stubs["list_org_policy_violations_previews"] = ( + self._logged_channel.unary_unary( + "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/ListOrgPolicyViolationsPreviews", + request_serializer=gcp_orgpolicy.ListOrgPolicyViolationsPreviewsRequest.serialize, + response_deserializer=gcp_orgpolicy.ListOrgPolicyViolationsPreviewsResponse.deserialize, + ) ) return self._stubs["list_org_policy_violations_previews"] @@ -423,12 +423,12 @@ def get_org_policy_violations_preview( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_org_policy_violations_preview" not in self._stubs: - self._stubs[ - "get_org_policy_violations_preview" - ] = self._logged_channel.unary_unary( - "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/GetOrgPolicyViolationsPreview", - request_serializer=gcp_orgpolicy.GetOrgPolicyViolationsPreviewRequest.serialize, - response_deserializer=gcp_orgpolicy.OrgPolicyViolationsPreview.deserialize, + self._stubs["get_org_policy_violations_preview"] = ( + self._logged_channel.unary_unary( + "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/GetOrgPolicyViolationsPreview", + request_serializer=gcp_orgpolicy.GetOrgPolicyViolationsPreviewRequest.serialize, + response_deserializer=gcp_orgpolicy.OrgPolicyViolationsPreview.deserialize, + ) ) return self._stubs["get_org_policy_violations_preview"] @@ -460,12 +460,12 @@ def create_org_policy_violations_preview( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_org_policy_violations_preview" not in self._stubs: - self._stubs[ - "create_org_policy_violations_preview" - ] = self._logged_channel.unary_unary( - "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/CreateOrgPolicyViolationsPreview", - request_serializer=gcp_orgpolicy.CreateOrgPolicyViolationsPreviewRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_org_policy_violations_preview"] = ( + self._logged_channel.unary_unary( + "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/CreateOrgPolicyViolationsPreview", + request_serializer=gcp_orgpolicy.CreateOrgPolicyViolationsPreviewRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_org_policy_violations_preview"] @@ -493,12 +493,12 @@ def list_org_policy_violations( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_org_policy_violations" not in self._stubs: - self._stubs[ - "list_org_policy_violations" - ] = self._logged_channel.unary_unary( - "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/ListOrgPolicyViolations", - request_serializer=gcp_orgpolicy.ListOrgPolicyViolationsRequest.serialize, - response_deserializer=gcp_orgpolicy.ListOrgPolicyViolationsResponse.deserialize, + self._stubs["list_org_policy_violations"] = ( + self._logged_channel.unary_unary( + "/google.cloud.policysimulator.v1.OrgPolicyViolationsPreviewService/ListOrgPolicyViolations", + request_serializer=gcp_orgpolicy.ListOrgPolicyViolationsRequest.serialize, + response_deserializer=gcp_orgpolicy.ListOrgPolicyViolationsResponse.deserialize, + ) ) return self._stubs["list_org_policy_violations"] diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/rest.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/rest.py index 7ede8c2bf743..e4ca49e84e12 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/rest.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/org_policy_violations_preview_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -622,15 +622,12 @@ def __call__( """ - http_options = ( - _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseCreateOrgPolicyViolationsPreview._get_http_options() - ) + http_options = _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseCreateOrgPolicyViolationsPreview._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_create_org_policy_violations_preview( - request, metadata + request, metadata = ( + self._interceptor.pre_create_org_policy_violations_preview( + request, metadata + ) ) transcoded_request = _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseCreateOrgPolicyViolationsPreview._get_transcoded_request( http_options, request @@ -653,7 +650,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -694,11 +691,10 @@ def __call__( resp = self._interceptor.post_create_org_policy_violations_preview(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_org_policy_violations_preview_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_org_policy_violations_preview_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -792,9 +788,7 @@ def __call__( """ - http_options = ( - _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseGetOrgPolicyViolationsPreview._get_http_options() - ) + http_options = _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseGetOrgPolicyViolationsPreview._get_http_options() request, metadata = self._interceptor.pre_get_org_policy_violations_preview( request, metadata @@ -858,11 +852,10 @@ def __call__( resp = self._interceptor.post_get_org_policy_violations_preview(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_org_policy_violations_preview_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_org_policy_violations_preview_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -952,9 +945,7 @@ def __call__( """ - http_options = ( - _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseListOrgPolicyViolations._get_http_options() - ) + http_options = _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseListOrgPolicyViolations._get_http_options() request, metadata = self._interceptor.pre_list_org_policy_violations( request, metadata @@ -1109,15 +1100,12 @@ def __call__( """ - http_options = ( - _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseListOrgPolicyViolationsPreviews._get_http_options() - ) + http_options = _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseListOrgPolicyViolationsPreviews._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_list_org_policy_violations_previews( - request, metadata + request, metadata = ( + self._interceptor.pre_list_org_policy_violations_previews( + request, metadata + ) ) transcoded_request = _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseListOrgPolicyViolationsPreviews._get_transcoded_request( http_options, request @@ -1178,11 +1166,10 @@ def __call__( resp = self._interceptor.post_list_org_policy_violations_previews(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_org_policy_violations_previews_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_org_policy_violations_previews_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1220,7 +1207,9 @@ def create_org_policy_violations_preview( ]: # 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._CreateOrgPolicyViolationsPreview(self._session, self._host, self._interceptor) # type: ignore + return self._CreateOrgPolicyViolationsPreview( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_org_policy_violations_preview( @@ -1231,7 +1220,9 @@ def get_org_policy_violations_preview( ]: # 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._GetOrgPolicyViolationsPreview(self._session, self._host, self._interceptor) # type: ignore + return self._GetOrgPolicyViolationsPreview( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_org_policy_violations( @@ -1242,7 +1233,9 @@ def list_org_policy_violations( ]: # 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._ListOrgPolicyViolations(self._session, self._host, self._interceptor) # type: ignore + return self._ListOrgPolicyViolations( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_org_policy_violations_previews( @@ -1253,7 +1246,9 @@ def list_org_policy_violations_previews( ]: # 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._ListOrgPolicyViolationsPreviews(self._session, self._host, self._interceptor) # type: ignore + return self._ListOrgPolicyViolationsPreviews( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_operation(self): @@ -1313,9 +1308,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1454,9 +1447,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseOrgPolicyViolationsPreviewServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/async_client.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/async_client.py index d2b4f347cd3f..445f6f7189a5 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/async_client.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.policysimulator_v1 import gapic_version as package_version @@ -45,8 +45,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.cloud.policysimulator_v1.services.simulator import pagers @@ -127,7 +127,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SimulatorAsyncClient: The constructed client. """ - return SimulatorClient.from_service_account_info.__func__(SimulatorAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = SimulatorClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(SimulatorAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SimulatorAsyncClient: The constructed client. """ - return SimulatorClient.from_service_account_file.__func__(SimulatorAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = SimulatorClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(SimulatorAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/client.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/client.py index 0638123b8b2e..fd27f03f7f99 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/client.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.policysimulator_v1 import gapic_version as package_version @@ -62,8 +62,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.cloud.policysimulator_v1.services.simulator import pagers @@ -660,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SimulatorClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SimulatorClient._read_environment_variables() + ) self._client_cert_source = SimulatorClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -699,8 +697,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SimulatorTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/pagers.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/pagers.py index 0765bbde4cb1..896c04d9ec5d 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/pagers.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/base.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/base.py index 8de771523a55..17cdeb61b3a7 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/base.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.policysimulator_v1 import gapic_version as package_version from google.cloud.policysimulator_v1.types import simulator diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/grpc.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/grpc.py index 00d9d0f4d389..066f9e108545 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/grpc.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.policysimulator_v1.types import simulator diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/grpc_asyncio.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/grpc_asyncio.py index 163fa193c288..527700874d4a 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/grpc_asyncio.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.policysimulator_v1.types import simulator diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/rest.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/rest.py index 6a1bfec4bcce..624780615337 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/rest.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/services/simulator/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -571,7 +571,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/types/explanations.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/types/explanations.py index 8150470efb7e..fd8b3ecb8368 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/types/explanations.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/types/explanations.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.iam.v1 import policy_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -52,6 +52,7 @@ class AccessState(proto.Enum): have access to all of the policies that Policy Simulator needs to evaluate. """ + ACCESS_STATE_UNSPECIFIED = 0 GRANTED = 1 NOT_GRANTED = 2 @@ -76,6 +77,7 @@ class HeuristicRelevance(proto.Enum): result. Changing the data point is likely to affect the overall determination. """ + HEURISTIC_RELEVANCE_UNSPECIFIED = 0 NORMAL = 1 HIGH = 2 @@ -286,6 +288,7 @@ class RolePermission(proto.Enum): [Replay][google.cloud.policysimulator.v1.Replay] is not allowed to access the binding. """ + ROLE_PERMISSION_UNSPECIFIED = 0 ROLE_PERMISSION_INCLUDED = 1 ROLE_PERMISSION_NOT_INCLUDED = 2 @@ -317,6 +320,7 @@ class Membership(proto.Enum): Google Accounts and service accounts are supported. """ + MEMBERSHIP_UNSPECIFIED = 0 MEMBERSHIP_INCLUDED = 1 MEMBERSHIP_NOT_INCLUDED = 2 diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/types/orgpolicy.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/types/orgpolicy.py index 6b142e369c8e..05b561a9d390 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/types/orgpolicy.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/types/orgpolicy.py @@ -17,11 +17,11 @@ from typing import MutableMapping, MutableSequence +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import proto # type: ignore from google.cloud.orgpolicy_v2.types import constraint from google.cloud.orgpolicy_v2.types import orgpolicy as gcov_orgpolicy -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -import proto # type: ignore __protobuf__ = proto.module( package="google.cloud.policysimulator.v1", @@ -66,6 +66,7 @@ class PreviewState(proto.Enum): [OrgPolicyViolationsPreview][google.cloud.policysimulator.v1.OrgPolicyViolationsPreview] creation failed with an error. """ + PREVIEW_STATE_UNSPECIFIED = 0 PREVIEW_PENDING = 1 PREVIEW_RUNNING = 2 @@ -484,12 +485,12 @@ class ListOrgPolicyViolationsPreviewsResponse(proto.Message): def raw_page(self): return self - org_policy_violations_previews: MutableSequence[ - "OrgPolicyViolationsPreview" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="OrgPolicyViolationsPreview", + org_policy_violations_previews: MutableSequence["OrgPolicyViolationsPreview"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="OrgPolicyViolationsPreview", + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/types/simulator.py b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/types/simulator.py index 78d84ba8c3bb..1787ea28f859 100644 --- a/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/types/simulator.py +++ b/packages/google-cloud-policysimulator/google/cloud/policysimulator_v1/types/simulator.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.iam.v1 import policy_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore -from google.type import date_pb2 # type: ignore +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore import proto # type: ignore from google.cloud.policysimulator_v1.types import explanations @@ -82,6 +82,7 @@ class State(proto.Enum): FAILED (4): The ``Replay`` has finished with an error. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 @@ -432,6 +433,7 @@ class LogSource(proto.Enum): logs may not include logs from the most recent 7 days. """ + LOG_SOURCE_UNSPECIFIED = 0 RECENT_ACCESSES = 1 @@ -545,6 +547,7 @@ class AccessChangeType(proto.Enum): ``UNKNOWN``, but they will have access after the proposed changes (``GRANTED``). """ + ACCESS_CHANGE_TYPE_UNSPECIFIED = 0 NO_CHANGE = 1 UNKNOWN_CHANGE = 2 diff --git a/packages/google-cloud-policysimulator/noxfile.py b/packages/google-cloud-policysimulator/noxfile.py index a49958bf8f43..16fd9513f982 100644 --- a/packages/google-cloud-policysimulator/noxfile.py +++ b/packages/google-cloud-policysimulator/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-policysimulator/tests/unit/gapic/policysimulator_v1/test_org_policy_violations_preview_service.py b/packages/google-cloud-policysimulator/tests/unit/gapic/policysimulator_v1/test_org_policy_violations_preview_service.py index 503d8e8a1a28..97dff07ea055 100644 --- a/packages/google-cloud-policysimulator/tests/unit/gapic/policysimulator_v1/test_org_policy_violations_preview_service.py +++ b/packages/google-cloud-policysimulator/tests/unit/gapic/policysimulator_v1/test_org_policy_violations_preview_service.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,20 +59,14 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.orgpolicy_v2.types import constraint from google.cloud.orgpolicy_v2.types import orgpolicy as gcov_orgpolicy from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.policysimulator_v1.services.org_policy_violations_preview_service import ( OrgPolicyViolationsPreviewServiceAsyncClient, @@ -1074,10 +1074,9 @@ def test_org_policy_violations_preview_service_client_get_mtls_endpoint_and_cert client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1122,10 +1121,9 @@ def test_org_policy_violations_preview_service_client_get_mtls_endpoint_and_cert client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1161,10 +1159,9 @@ def test_org_policy_violations_preview_service_client_get_mtls_endpoint_and_cert "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1428,13 +1425,13 @@ def test_org_policy_violations_preview_service_client_create_channel_credentials ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4572,8 +4569,9 @@ def test_list_org_policy_violations_previews_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4638,20 +4636,22 @@ def test_list_org_policy_violations_previews_rest_interceptors(null_interceptor) ) client = OrgPolicyViolationsPreviewServiceClient(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.OrgPolicyViolationsPreviewServiceRestInterceptor, - "post_list_org_policy_violations_previews", - ) as post, mock.patch.object( - transports.OrgPolicyViolationsPreviewServiceRestInterceptor, - "post_list_org_policy_violations_previews_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyViolationsPreviewServiceRestInterceptor, - "pre_list_org_policy_violations_previews", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyViolationsPreviewServiceRestInterceptor, + "post_list_org_policy_violations_previews", + ) as post, + mock.patch.object( + transports.OrgPolicyViolationsPreviewServiceRestInterceptor, + "post_list_org_policy_violations_previews_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyViolationsPreviewServiceRestInterceptor, + "pre_list_org_policy_violations_previews", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4711,8 +4711,9 @@ def test_get_org_policy_violations_preview_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4783,20 +4784,22 @@ def test_get_org_policy_violations_preview_rest_interceptors(null_interceptor): ) client = OrgPolicyViolationsPreviewServiceClient(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.OrgPolicyViolationsPreviewServiceRestInterceptor, - "post_get_org_policy_violations_preview", - ) as post, mock.patch.object( - transports.OrgPolicyViolationsPreviewServiceRestInterceptor, - "post_get_org_policy_violations_preview_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyViolationsPreviewServiceRestInterceptor, - "pre_get_org_policy_violations_preview", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyViolationsPreviewServiceRestInterceptor, + "post_get_org_policy_violations_preview", + ) as post, + mock.patch.object( + transports.OrgPolicyViolationsPreviewServiceRestInterceptor, + "post_get_org_policy_violations_preview_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyViolationsPreviewServiceRestInterceptor, + "pre_get_org_policy_violations_preview", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4854,8 +4857,9 @@ def test_create_org_policy_violations_preview_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5065,22 +5069,23 @@ def test_create_org_policy_violations_preview_rest_interceptors(null_interceptor ) client = OrgPolicyViolationsPreviewServiceClient(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.OrgPolicyViolationsPreviewServiceRestInterceptor, - "post_create_org_policy_violations_preview", - ) as post, mock.patch.object( - transports.OrgPolicyViolationsPreviewServiceRestInterceptor, - "post_create_org_policy_violations_preview_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyViolationsPreviewServiceRestInterceptor, - "pre_create_org_policy_violations_preview", - ) as pre: + 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.OrgPolicyViolationsPreviewServiceRestInterceptor, + "post_create_org_policy_violations_preview", + ) as post, + mock.patch.object( + transports.OrgPolicyViolationsPreviewServiceRestInterceptor, + "post_create_org_policy_violations_preview_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyViolationsPreviewServiceRestInterceptor, + "pre_create_org_policy_violations_preview", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5135,8 +5140,9 @@ def test_list_org_policy_violations_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5201,20 +5207,22 @@ def test_list_org_policy_violations_rest_interceptors(null_interceptor): ) client = OrgPolicyViolationsPreviewServiceClient(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.OrgPolicyViolationsPreviewServiceRestInterceptor, - "post_list_org_policy_violations", - ) as post, mock.patch.object( - transports.OrgPolicyViolationsPreviewServiceRestInterceptor, - "post_list_org_policy_violations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.OrgPolicyViolationsPreviewServiceRestInterceptor, - "pre_list_org_policy_violations", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.OrgPolicyViolationsPreviewServiceRestInterceptor, + "post_list_org_policy_violations", + ) as post, + mock.patch.object( + transports.OrgPolicyViolationsPreviewServiceRestInterceptor, + "post_list_org_policy_violations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.OrgPolicyViolationsPreviewServiceRestInterceptor, + "pre_list_org_policy_violations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5272,8 +5280,9 @@ def test_get_operation_rest_bad_request( request = json_format.ParseDict({"name": "operations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5332,8 +5341,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "operations"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5556,11 +5566,14 @@ def test_org_policy_violations_preview_service_base_transport(): def test_org_policy_violations_preview_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.policysimulator_v1.services.org_policy_violations_preview_service.transports.OrgPolicyViolationsPreviewServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.policysimulator_v1.services.org_policy_violations_preview_service.transports.OrgPolicyViolationsPreviewServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrgPolicyViolationsPreviewServiceTransport( @@ -5577,9 +5590,12 @@ def test_org_policy_violations_preview_service_base_transport_with_credentials_f def test_org_policy_violations_preview_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.policysimulator_v1.services.org_policy_violations_preview_service.transports.OrgPolicyViolationsPreviewServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.policysimulator_v1.services.org_policy_violations_preview_service.transports.OrgPolicyViolationsPreviewServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.OrgPolicyViolationsPreviewServiceTransport() @@ -5658,11 +5674,12 @@ def test_org_policy_violations_preview_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-policysimulator/tests/unit/gapic/policysimulator_v1/test_simulator.py b/packages/google-cloud-policysimulator/tests/unit/gapic/policysimulator_v1/test_simulator.py index f51c57c3bbec..e4466e95a9de 100644 --- a/packages/google-cloud-policysimulator/tests/unit/gapic/policysimulator_v1/test_simulator.py +++ b/packages/google-cloud-policysimulator/tests/unit/gapic/policysimulator_v1/test_simulator.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,13 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.iam.v1.policy_pb2 as policy_pb2 # type: ignore +import google.type.date_pb2 as date_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,18 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.type import date_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.policysimulator_v1.services.simulator import ( SimulatorAsyncClient, @@ -928,10 +928,9 @@ def test_simulator_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -976,10 +975,9 @@ def test_simulator_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1015,10 +1013,9 @@ def test_simulator_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1247,13 +1244,13 @@ def test_simulator_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2026,9 +2023,9 @@ def test_list_replay_results_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_replay_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_replay_results] = ( + mock_rpc + ) request = {} client.list_replay_results(request) @@ -2861,9 +2858,9 @@ def test_list_replay_results_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_replay_results - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_replay_results] = ( + mock_rpc + ) request = {} client.list_replay_results(request) @@ -3385,8 +3382,9 @@ def test_get_replay_rest_bad_request(request_type=simulator.GetReplayRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3449,17 +3447,17 @@ def test_get_replay_rest_interceptors(null_interceptor): ) client = SimulatorClient(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.SimulatorRestInterceptor, "post_get_replay" - ) as post, mock.patch.object( - transports.SimulatorRestInterceptor, "post_get_replay_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SimulatorRestInterceptor, "pre_get_replay" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SimulatorRestInterceptor, "post_get_replay" + ) as post, + mock.patch.object( + transports.SimulatorRestInterceptor, "post_get_replay_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SimulatorRestInterceptor, "pre_get_replay") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3508,8 +3506,9 @@ def test_create_replay_rest_bad_request(request_type=simulator.CreateReplayReque 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3644,19 +3643,20 @@ def test_create_replay_rest_interceptors(null_interceptor): ) client = SimulatorClient(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.SimulatorRestInterceptor, "post_create_replay" - ) as post, mock.patch.object( - transports.SimulatorRestInterceptor, "post_create_replay_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SimulatorRestInterceptor, "pre_create_replay" - ) as pre: + 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.SimulatorRestInterceptor, "post_create_replay" + ) as post, + mock.patch.object( + transports.SimulatorRestInterceptor, "post_create_replay_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SimulatorRestInterceptor, "pre_create_replay" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3707,8 +3707,9 @@ def test_list_replay_results_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3769,17 +3770,20 @@ def test_list_replay_results_rest_interceptors(null_interceptor): ) client = SimulatorClient(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.SimulatorRestInterceptor, "post_list_replay_results" - ) as post, mock.patch.object( - transports.SimulatorRestInterceptor, "post_list_replay_results_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SimulatorRestInterceptor, "pre_list_replay_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SimulatorRestInterceptor, "post_list_replay_results" + ) as post, + mock.patch.object( + transports.SimulatorRestInterceptor, + "post_list_replay_results_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SimulatorRestInterceptor, "pre_list_replay_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3837,8 +3841,9 @@ def test_get_operation_rest_bad_request( request = json_format.ParseDict({"name": "operations/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3897,8 +3902,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "operations"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4094,11 +4100,14 @@ def test_simulator_base_transport(): def test_simulator_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.policysimulator_v1.services.simulator.transports.SimulatorTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.policysimulator_v1.services.simulator.transports.SimulatorTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SimulatorTransport( @@ -4115,9 +4124,12 @@ def test_simulator_base_transport_with_credentials_file(): def test_simulator_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.policysimulator_v1.services.simulator.transports.SimulatorTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.policysimulator_v1.services.simulator.transports.SimulatorTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SimulatorTransport() @@ -4189,11 +4201,12 @@ def test_simulator_transport_auth_gdch_credentials(transport_class): def test_simulator_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-private-ca/docs/conf.py b/packages/google-cloud-private-ca/docs/conf.py index 42e5a2194c01..adb33f7a533c 100644 --- a/packages/google-cloud-private-ca/docs/conf.py +++ b/packages/google-cloud-private-ca/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-private-ca documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/__init__.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/__init__.py index 17f56aab96a3..addf23714af5 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/__init__.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.certificate_authority_service import ( CertificateAuthorityServiceAsyncClient, CertificateAuthorityServiceClient, diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/async_client.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/async_client.py index fe6d5774b9ea..c745d98f703c 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/async_client.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.security.privateca_v1 import gapic_version as package_version @@ -44,16 +44,18 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.security.privateca_v1.services.certificate_authority_service import ( pagers, @@ -161,7 +163,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CertificateAuthorityServiceAsyncClient: The constructed client. """ - return CertificateAuthorityServiceClient.from_service_account_info.__func__(CertificateAuthorityServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CertificateAuthorityServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + CertificateAuthorityServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -177,7 +184,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CertificateAuthorityServiceAsyncClient: The constructed client. """ - return CertificateAuthorityServiceClient.from_service_account_file.__func__(CertificateAuthorityServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CertificateAuthorityServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + CertificateAuthorityServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -215,7 +227,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CertificateAuthorityServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CertificateAuthorityServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CertificateAuthorityServiceTransport: diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/client.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/client.py index 28840aa6f9a9..6f0f01150a8c 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/client.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.security.privateca_v1 import gapic_version as package_version @@ -61,16 +61,18 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.security.privateca_v1.services.certificate_authority_service import ( pagers, @@ -91,13 +93,11 @@ class CertificateAuthorityServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CertificateAuthorityServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CertificateAuthorityServiceTransport]] _transport_registry["grpc"] = CertificateAuthorityServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = CertificateAuthorityServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + CertificateAuthorityServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = CertificateAuthorityServiceRestTransport def get_transport_class( @@ -742,11 +742,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CertificateAuthorityServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CertificateAuthorityServiceClient._read_environment_variables() + ) self._client_cert_source = ( CertificateAuthorityServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -783,8 +781,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CertificateAuthorityServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/pagers.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/pagers.py index d51e1ac069d6..f4b41690340c 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/pagers.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -535,7 +535,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -613,7 +613,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -695,7 +695,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -771,7 +771,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/__init__.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/__init__.py index 768cf0c444dc..1687ac2737e5 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/__init__.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CertificateAuthorityServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CertificateAuthorityServiceTransport]] _transport_registry["grpc"] = CertificateAuthorityServiceGrpcTransport _transport_registry["grpc_asyncio"] = CertificateAuthorityServiceGrpcAsyncIOTransport _transport_registry["rest"] = CertificateAuthorityServiceRestTransport diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/base.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/base.py index 3de778bd78ee..10b6e0bb6aae 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/base.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/base.py @@ -17,17 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.security.privateca_v1 import gapic_version as package_version from google.cloud.security.privateca_v1.types import resources, service @@ -650,13 +652,19 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc.py index 5807b0a387cd..c4aa74ab660f 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc.py @@ -16,21 +16,23 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.security.privateca_v1.types import resources, service @@ -514,12 +516,12 @@ def activate_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "activate_certificate_authority" not in self._stubs: - self._stubs[ - "activate_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/ActivateCertificateAuthority", - request_serializer=service.ActivateCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["activate_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/ActivateCertificateAuthority", + request_serializer=service.ActivateCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["activate_certificate_authority"] @@ -546,12 +548,12 @@ def create_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_authority" not in self._stubs: - self._stubs[ - "create_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/CreateCertificateAuthority", - request_serializer=service.CreateCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/CreateCertificateAuthority", + request_serializer=service.CreateCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_authority"] @@ -577,12 +579,12 @@ def disable_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_certificate_authority" not in self._stubs: - self._stubs[ - "disable_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/DisableCertificateAuthority", - request_serializer=service.DisableCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/DisableCertificateAuthority", + request_serializer=service.DisableCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_certificate_authority"] @@ -608,12 +610,12 @@ def enable_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_certificate_authority" not in self._stubs: - self._stubs[ - "enable_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/EnableCertificateAuthority", - request_serializer=service.EnableCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/EnableCertificateAuthority", + request_serializer=service.EnableCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_certificate_authority"] @@ -650,12 +652,12 @@ def fetch_certificate_authority_csr( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_certificate_authority_csr" not in self._stubs: - self._stubs[ - "fetch_certificate_authority_csr" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/FetchCertificateAuthorityCsr", - request_serializer=service.FetchCertificateAuthorityCsrRequest.serialize, - response_deserializer=service.FetchCertificateAuthorityCsrResponse.deserialize, + self._stubs["fetch_certificate_authority_csr"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/FetchCertificateAuthorityCsr", + request_serializer=service.FetchCertificateAuthorityCsrRequest.serialize, + response_deserializer=service.FetchCertificateAuthorityCsrResponse.deserialize, + ) ) return self._stubs["fetch_certificate_authority_csr"] @@ -711,12 +713,12 @@ def list_certificate_authorities( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_authorities" not in self._stubs: - self._stubs[ - "list_certificate_authorities" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/ListCertificateAuthorities", - request_serializer=service.ListCertificateAuthoritiesRequest.serialize, - response_deserializer=service.ListCertificateAuthoritiesResponse.deserialize, + self._stubs["list_certificate_authorities"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/ListCertificateAuthorities", + request_serializer=service.ListCertificateAuthoritiesRequest.serialize, + response_deserializer=service.ListCertificateAuthoritiesResponse.deserialize, + ) ) return self._stubs["list_certificate_authorities"] @@ -743,12 +745,12 @@ def undelete_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undelete_certificate_authority" not in self._stubs: - self._stubs[ - "undelete_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/UndeleteCertificateAuthority", - request_serializer=service.UndeleteCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undelete_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/UndeleteCertificateAuthority", + request_serializer=service.UndeleteCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undelete_certificate_authority"] @@ -774,12 +776,12 @@ def delete_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_certificate_authority" not in self._stubs: - self._stubs[ - "delete_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/DeleteCertificateAuthority", - request_serializer=service.DeleteCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/DeleteCertificateAuthority", + request_serializer=service.DeleteCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_certificate_authority"] @@ -805,12 +807,12 @@ def update_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_authority" not in self._stubs: - self._stubs[ - "update_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/UpdateCertificateAuthority", - request_serializer=service.UpdateCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/UpdateCertificateAuthority", + request_serializer=service.UpdateCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_authority"] @@ -995,12 +997,12 @@ def get_certificate_revocation_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_certificate_revocation_list" not in self._stubs: - self._stubs[ - "get_certificate_revocation_list" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/GetCertificateRevocationList", - request_serializer=service.GetCertificateRevocationListRequest.serialize, - response_deserializer=resources.CertificateRevocationList.deserialize, + self._stubs["get_certificate_revocation_list"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/GetCertificateRevocationList", + request_serializer=service.GetCertificateRevocationListRequest.serialize, + response_deserializer=resources.CertificateRevocationList.deserialize, + ) ) return self._stubs["get_certificate_revocation_list"] @@ -1028,12 +1030,12 @@ def list_certificate_revocation_lists( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_revocation_lists" not in self._stubs: - self._stubs[ - "list_certificate_revocation_lists" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/ListCertificateRevocationLists", - request_serializer=service.ListCertificateRevocationListsRequest.serialize, - response_deserializer=service.ListCertificateRevocationListsResponse.deserialize, + self._stubs["list_certificate_revocation_lists"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/ListCertificateRevocationLists", + request_serializer=service.ListCertificateRevocationListsRequest.serialize, + response_deserializer=service.ListCertificateRevocationListsResponse.deserialize, + ) ) return self._stubs["list_certificate_revocation_lists"] @@ -1060,12 +1062,12 @@ def update_certificate_revocation_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_revocation_list" not in self._stubs: - self._stubs[ - "update_certificate_revocation_list" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/UpdateCertificateRevocationList", - request_serializer=service.UpdateCertificateRevocationListRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_revocation_list"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/UpdateCertificateRevocationList", + request_serializer=service.UpdateCertificateRevocationListRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_revocation_list"] @@ -1090,12 +1092,12 @@ def create_certificate_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_template" not in self._stubs: - self._stubs[ - "create_certificate_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/CreateCertificateTemplate", - request_serializer=service.CreateCertificateTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/CreateCertificateTemplate", + request_serializer=service.CreateCertificateTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_template"] @@ -1119,12 +1121,12 @@ def delete_certificate_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_certificate_template" not in self._stubs: - self._stubs[ - "delete_certificate_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/DeleteCertificateTemplate", - request_serializer=service.DeleteCertificateTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_certificate_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/DeleteCertificateTemplate", + request_serializer=service.DeleteCertificateTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_certificate_template"] @@ -1180,12 +1182,12 @@ def list_certificate_templates( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_templates" not in self._stubs: - self._stubs[ - "list_certificate_templates" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/ListCertificateTemplates", - request_serializer=service.ListCertificateTemplatesRequest.serialize, - response_deserializer=service.ListCertificateTemplatesResponse.deserialize, + self._stubs["list_certificate_templates"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/ListCertificateTemplates", + request_serializer=service.ListCertificateTemplatesRequest.serialize, + response_deserializer=service.ListCertificateTemplatesResponse.deserialize, + ) ) return self._stubs["list_certificate_templates"] @@ -1209,12 +1211,12 @@ def update_certificate_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_template" not in self._stubs: - self._stubs[ - "update_certificate_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/UpdateCertificateTemplate", - request_serializer=service.UpdateCertificateTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/UpdateCertificateTemplate", + request_serializer=service.UpdateCertificateTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_template"] diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc_asyncio.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc_asyncio.py index 07c9996ee18b..d2d822aea8e4 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/grpc_asyncio.py @@ -17,23 +17,25 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.security.privateca_v1.types import resources, service @@ -527,12 +529,12 @@ def activate_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "activate_certificate_authority" not in self._stubs: - self._stubs[ - "activate_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/ActivateCertificateAuthority", - request_serializer=service.ActivateCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["activate_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/ActivateCertificateAuthority", + request_serializer=service.ActivateCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["activate_certificate_authority"] @@ -559,12 +561,12 @@ def create_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_authority" not in self._stubs: - self._stubs[ - "create_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/CreateCertificateAuthority", - request_serializer=service.CreateCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/CreateCertificateAuthority", + request_serializer=service.CreateCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_authority"] @@ -591,12 +593,12 @@ def disable_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_certificate_authority" not in self._stubs: - self._stubs[ - "disable_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/DisableCertificateAuthority", - request_serializer=service.DisableCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/DisableCertificateAuthority", + request_serializer=service.DisableCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_certificate_authority"] @@ -622,12 +624,12 @@ def enable_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_certificate_authority" not in self._stubs: - self._stubs[ - "enable_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/EnableCertificateAuthority", - request_serializer=service.EnableCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/EnableCertificateAuthority", + request_serializer=service.EnableCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_certificate_authority"] @@ -664,12 +666,12 @@ def fetch_certificate_authority_csr( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_certificate_authority_csr" not in self._stubs: - self._stubs[ - "fetch_certificate_authority_csr" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/FetchCertificateAuthorityCsr", - request_serializer=service.FetchCertificateAuthorityCsrRequest.serialize, - response_deserializer=service.FetchCertificateAuthorityCsrResponse.deserialize, + self._stubs["fetch_certificate_authority_csr"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/FetchCertificateAuthorityCsr", + request_serializer=service.FetchCertificateAuthorityCsrRequest.serialize, + response_deserializer=service.FetchCertificateAuthorityCsrResponse.deserialize, + ) ) return self._stubs["fetch_certificate_authority_csr"] @@ -726,12 +728,12 @@ def list_certificate_authorities( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_authorities" not in self._stubs: - self._stubs[ - "list_certificate_authorities" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/ListCertificateAuthorities", - request_serializer=service.ListCertificateAuthoritiesRequest.serialize, - response_deserializer=service.ListCertificateAuthoritiesResponse.deserialize, + self._stubs["list_certificate_authorities"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/ListCertificateAuthorities", + request_serializer=service.ListCertificateAuthoritiesRequest.serialize, + response_deserializer=service.ListCertificateAuthoritiesResponse.deserialize, + ) ) return self._stubs["list_certificate_authorities"] @@ -759,12 +761,12 @@ def undelete_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "undelete_certificate_authority" not in self._stubs: - self._stubs[ - "undelete_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/UndeleteCertificateAuthority", - request_serializer=service.UndeleteCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["undelete_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/UndeleteCertificateAuthority", + request_serializer=service.UndeleteCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["undelete_certificate_authority"] @@ -790,12 +792,12 @@ def delete_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_certificate_authority" not in self._stubs: - self._stubs[ - "delete_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/DeleteCertificateAuthority", - request_serializer=service.DeleteCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/DeleteCertificateAuthority", + request_serializer=service.DeleteCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_certificate_authority"] @@ -821,12 +823,12 @@ def update_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_authority" not in self._stubs: - self._stubs[ - "update_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/UpdateCertificateAuthority", - request_serializer=service.UpdateCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/UpdateCertificateAuthority", + request_serializer=service.UpdateCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_authority"] @@ -1015,12 +1017,12 @@ def get_certificate_revocation_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_certificate_revocation_list" not in self._stubs: - self._stubs[ - "get_certificate_revocation_list" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/GetCertificateRevocationList", - request_serializer=service.GetCertificateRevocationListRequest.serialize, - response_deserializer=resources.CertificateRevocationList.deserialize, + self._stubs["get_certificate_revocation_list"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/GetCertificateRevocationList", + request_serializer=service.GetCertificateRevocationListRequest.serialize, + response_deserializer=resources.CertificateRevocationList.deserialize, + ) ) return self._stubs["get_certificate_revocation_list"] @@ -1048,12 +1050,12 @@ def list_certificate_revocation_lists( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_revocation_lists" not in self._stubs: - self._stubs[ - "list_certificate_revocation_lists" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/ListCertificateRevocationLists", - request_serializer=service.ListCertificateRevocationListsRequest.serialize, - response_deserializer=service.ListCertificateRevocationListsResponse.deserialize, + self._stubs["list_certificate_revocation_lists"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/ListCertificateRevocationLists", + request_serializer=service.ListCertificateRevocationListsRequest.serialize, + response_deserializer=service.ListCertificateRevocationListsResponse.deserialize, + ) ) return self._stubs["list_certificate_revocation_lists"] @@ -1081,12 +1083,12 @@ def update_certificate_revocation_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_revocation_list" not in self._stubs: - self._stubs[ - "update_certificate_revocation_list" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/UpdateCertificateRevocationList", - request_serializer=service.UpdateCertificateRevocationListRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_revocation_list"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/UpdateCertificateRevocationList", + request_serializer=service.UpdateCertificateRevocationListRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_revocation_list"] @@ -1113,12 +1115,12 @@ def create_certificate_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_template" not in self._stubs: - self._stubs[ - "create_certificate_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/CreateCertificateTemplate", - request_serializer=service.CreateCertificateTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/CreateCertificateTemplate", + request_serializer=service.CreateCertificateTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_template"] @@ -1144,12 +1146,12 @@ def delete_certificate_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_certificate_template" not in self._stubs: - self._stubs[ - "delete_certificate_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/DeleteCertificateTemplate", - request_serializer=service.DeleteCertificateTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_certificate_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/DeleteCertificateTemplate", + request_serializer=service.DeleteCertificateTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_certificate_template"] @@ -1206,12 +1208,12 @@ def list_certificate_templates( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_templates" not in self._stubs: - self._stubs[ - "list_certificate_templates" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/ListCertificateTemplates", - request_serializer=service.ListCertificateTemplatesRequest.serialize, - response_deserializer=service.ListCertificateTemplatesResponse.deserialize, + self._stubs["list_certificate_templates"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/ListCertificateTemplates", + request_serializer=service.ListCertificateTemplatesRequest.serialize, + response_deserializer=service.ListCertificateTemplatesResponse.deserialize, + ) ) return self._stubs["list_certificate_templates"] @@ -1237,12 +1239,12 @@ def update_certificate_template( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_template" not in self._stubs: - self._stubs[ - "update_certificate_template" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1.CertificateAuthorityService/UpdateCertificateTemplate", - request_serializer=service.UpdateCertificateTemplateRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_template"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1.CertificateAuthorityService/UpdateCertificateTemplate", + request_serializer=service.UpdateCertificateTemplateRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_template"] diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/rest.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/rest.py index 076478c5ad5f..1f495927ceae 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/rest.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/rest.py @@ -16,19 +16,21 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -2148,9 +2150,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseActivateCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseActivateCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_activate_certificate_authority( request, metadata @@ -2176,7 +2176,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2217,11 +2217,10 @@ def __call__( resp = self._interceptor.post_activate_certificate_authority(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_activate_certificate_authority_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_activate_certificate_authority_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2306,9 +2305,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseCreateCaPool._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseCreateCaPool._get_http_options() request, metadata = self._interceptor.pre_create_ca_pool(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseCreateCaPool._get_transcoded_request( @@ -2332,7 +2329,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2462,9 +2459,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseCreateCertificate._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseCreateCertificate._get_http_options() request, metadata = self._interceptor.pre_create_certificate( request, metadata @@ -2622,9 +2617,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseCreateCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseCreateCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_create_certificate_authority( request, metadata @@ -2650,7 +2643,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2780,9 +2773,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseCreateCertificateTemplate._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseCreateCertificateTemplate._get_http_options() request, metadata = self._interceptor.pre_create_certificate_template( request, metadata @@ -2808,7 +2799,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2934,9 +2925,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseDeleteCaPool._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseDeleteCaPool._get_http_options() request, metadata = self._interceptor.pre_delete_ca_pool(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseDeleteCaPool._get_transcoded_request( @@ -2956,7 +2945,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3086,9 +3075,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseDeleteCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseDeleteCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_delete_certificate_authority( request, metadata @@ -3110,7 +3097,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3238,9 +3225,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseDeleteCertificateTemplate._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseDeleteCertificateTemplate._get_http_options() request, metadata = self._interceptor.pre_delete_certificate_template( request, metadata @@ -3262,7 +3247,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3391,9 +3376,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseDisableCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseDisableCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_disable_certificate_authority( request, metadata @@ -3419,7 +3402,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3460,11 +3443,10 @@ def __call__( resp = self._interceptor.post_disable_certificate_authority(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_disable_certificate_authority_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_disable_certificate_authority_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3552,9 +3534,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseEnableCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseEnableCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_enable_certificate_authority( request, metadata @@ -3580,7 +3560,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3706,9 +3686,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseFetchCaCerts._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseFetchCaCerts._get_http_options() request, metadata = self._interceptor.pre_fetch_ca_certs(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseFetchCaCerts._get_transcoded_request( @@ -3864,9 +3842,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseFetchCertificateAuthorityCsr._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseFetchCertificateAuthorityCsr._get_http_options() request, metadata = self._interceptor.pre_fetch_certificate_authority_csr( request, metadata @@ -3930,11 +3906,10 @@ def __call__( resp = self._interceptor.post_fetch_certificate_authority_csr(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_certificate_authority_csr_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_certificate_authority_csr_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4026,9 +4001,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseGetCaPool._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseGetCaPool._get_http_options() request, metadata = self._interceptor.pre_get_ca_pool(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseGetCaPool._get_transcoded_request( @@ -4178,9 +4151,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificate._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificate._get_http_options() request, metadata = self._interceptor.pre_get_certificate(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificate._get_transcoded_request( @@ -4334,9 +4305,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_get_certificate_authority( request, metadata @@ -4490,9 +4459,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificateRevocationList._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificateRevocationList._get_http_options() request, metadata = self._interceptor.pre_get_certificate_revocation_list( request, metadata @@ -4556,11 +4523,10 @@ def __call__( resp = self._interceptor.post_get_certificate_revocation_list(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_certificate_revocation_list_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_certificate_revocation_list_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4648,9 +4614,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificateTemplate._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificateTemplate._get_http_options() request, metadata = self._interceptor.pre_get_certificate_template( request, metadata @@ -4798,9 +4762,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseListCaPools._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseListCaPools._get_http_options() request, metadata = self._interceptor.pre_list_ca_pools(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseListCaPools._get_transcoded_request( @@ -4951,9 +4913,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseListCertificateAuthorities._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseListCertificateAuthorities._get_http_options() request, metadata = self._interceptor.pre_list_certificate_authorities( request, metadata @@ -5106,9 +5066,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseListCertificateRevocationLists._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseListCertificateRevocationLists._get_http_options() request, metadata = self._interceptor.pre_list_certificate_revocation_lists( request, metadata @@ -5172,11 +5130,10 @@ def __call__( resp = self._interceptor.post_list_certificate_revocation_lists(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_certificate_revocation_lists_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_certificate_revocation_lists_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5261,9 +5218,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseListCertificates._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseListCertificates._get_http_options() request, metadata = self._interceptor.pre_list_certificates( request, metadata @@ -5416,9 +5371,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseListCertificateTemplates._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseListCertificateTemplates._get_http_options() request, metadata = self._interceptor.pre_list_certificate_templates( request, metadata @@ -5571,9 +5524,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseRevokeCertificate._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseRevokeCertificate._get_http_options() request, metadata = self._interceptor.pre_revoke_certificate( request, metadata @@ -5731,9 +5682,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseUndeleteCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseUndeleteCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_undelete_certificate_authority( request, metadata @@ -5759,7 +5708,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -5800,11 +5749,10 @@ def __call__( resp = self._interceptor.post_undelete_certificate_authority(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_undelete_certificate_authority_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_undelete_certificate_authority_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -5889,9 +5837,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCaPool._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCaPool._get_http_options() request, metadata = self._interceptor.pre_update_ca_pool(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCaPool._get_transcoded_request( @@ -5915,7 +5861,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6045,9 +5991,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificate._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificate._get_http_options() request, metadata = self._interceptor.pre_update_certificate( request, metadata @@ -6205,9 +6149,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_update_certificate_authority( request, metadata @@ -6233,7 +6175,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6363,15 +6305,12 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificateRevocationList._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificateRevocationList._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_certificate_revocation_list( - request, metadata + request, metadata = ( + self._interceptor.pre_update_certificate_revocation_list( + request, metadata + ) ) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificateRevocationList._get_transcoded_request( http_options, request @@ -6394,7 +6333,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6435,11 +6374,10 @@ def __call__( resp = self._interceptor.post_update_certificate_revocation_list(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_certificate_revocation_list_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_certificate_revocation_list_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -6527,9 +6465,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificateTemplate._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificateTemplate._get_http_options() request, metadata = self._interceptor.pre_update_certificate_template( request, metadata @@ -6555,7 +6491,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -6630,7 +6566,9 @@ def activate_certificate_authority( ]: # 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._ActivateCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._ActivateCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_ca_pool( @@ -6656,7 +6594,9 @@ def create_certificate_authority( ]: # 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._CreateCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_certificate_template( @@ -6664,7 +6604,9 @@ def create_certificate_template( ) -> Callable[[service.CreateCertificateTemplateRequest], 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._CreateCertificateTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCertificateTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_ca_pool( @@ -6682,7 +6624,9 @@ def delete_certificate_authority( ]: # 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._DeleteCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_certificate_template( @@ -6690,7 +6634,9 @@ def delete_certificate_template( ) -> Callable[[service.DeleteCertificateTemplateRequest], 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._DeleteCertificateTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteCertificateTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def disable_certificate_authority( @@ -6700,7 +6646,9 @@ def disable_certificate_authority( ]: # 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._DisableCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._DisableCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_certificate_authority( @@ -6710,7 +6658,9 @@ def enable_certificate_authority( ]: # 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._EnableCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._EnableCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_ca_certs( @@ -6729,7 +6679,9 @@ def fetch_certificate_authority_csr( ]: # 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._FetchCertificateAuthorityCsr(self._session, self._host, self._interceptor) # type: ignore + return self._FetchCertificateAuthorityCsr( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_ca_pool(self) -> Callable[[service.GetCaPoolRequest], resources.CaPool]: @@ -6753,7 +6705,9 @@ def get_certificate_authority( ]: # 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._GetCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._GetCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_certificate_revocation_list( @@ -6764,7 +6718,9 @@ def get_certificate_revocation_list( ]: # 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._GetCertificateRevocationList(self._session, self._host, self._interceptor) # type: ignore + return self._GetCertificateRevocationList( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_certificate_template( @@ -6774,7 +6730,9 @@ def get_certificate_template( ]: # 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._GetCertificateTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._GetCertificateTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_ca_pools( @@ -6793,7 +6751,9 @@ def list_certificate_authorities( ]: # 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._ListCertificateAuthorities(self._session, self._host, self._interceptor) # type: ignore + return self._ListCertificateAuthorities( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_certificate_revocation_lists( @@ -6804,7 +6764,9 @@ def list_certificate_revocation_lists( ]: # 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._ListCertificateRevocationLists(self._session, self._host, self._interceptor) # type: ignore + return self._ListCertificateRevocationLists( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_certificates( @@ -6823,7 +6785,9 @@ def list_certificate_templates( ]: # 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._ListCertificateTemplates(self._session, self._host, self._interceptor) # type: ignore + return self._ListCertificateTemplates( + self._session, self._host, self._interceptor + ) # type: ignore @property def revoke_certificate( @@ -6841,7 +6805,9 @@ def undelete_certificate_authority( ]: # 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._UndeleteCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._UndeleteCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_ca_pool( @@ -6867,7 +6833,9 @@ def update_certificate_authority( ]: # 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._UpdateCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_certificate_revocation_list( @@ -6877,7 +6845,9 @@ def update_certificate_revocation_list( ]: # 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._UpdateCertificateRevocationList(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCertificateRevocationList( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_certificate_template( @@ -6885,7 +6855,9 @@ def update_certificate_template( ) -> Callable[[service.UpdateCertificateTemplateRequest], 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._UpdateCertificateTemplate(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCertificateTemplate( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_location(self): @@ -6945,9 +6917,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseGetLocation._get_transcoded_request( @@ -7088,9 +7058,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseListLocations._get_transcoded_request( @@ -7231,9 +7199,7 @@ def __call__( policy_pb2.Policy: Response from GetIamPolicy method. """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseGetIamPolicy._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseGetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_get_iam_policy(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseGetIamPolicy._get_transcoded_request( @@ -7375,9 +7341,7 @@ def __call__( policy_pb2.Policy: Response from SetIamPolicy method. """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseSetIamPolicy._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseSetIamPolicy._get_http_options() request, metadata = self._interceptor.pre_set_iam_policy(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseSetIamPolicy._get_transcoded_request( @@ -7524,9 +7488,7 @@ def __call__( iam_policy_pb2.TestIamPermissionsResponse: Response from TestIamPermissions method. """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseTestIamPermissions._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseTestIamPermissions._get_http_options() request, metadata = self._interceptor.pre_test_iam_permissions( request, metadata @@ -7670,9 +7632,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -7792,9 +7752,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -7912,9 +7870,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -8055,9 +8011,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/rest_base.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/rest_base.py index e473f9f5f62f..6e26a12e6862 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/rest_base.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/services/certificate_authority_service/transports/rest_base.py @@ -19,8 +19,10 @@ from google.api_core import gapic_v1, path_template from google.cloud.location import locations_pb2 # type: ignore -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/types/resources.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/types/resources.py index bda4da2946a5..a0e3054d0fd3 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/types/resources.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/types/resources.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -76,6 +76,7 @@ class AttributeType(proto.Enum): POSTAL_CODE (8): The postal code of the subject. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 COMMON_NAME = 1 COUNTRY_CODE = 2 @@ -136,6 +137,7 @@ class RevocationReason(proto.Enum): [Certificate][google.cloud.security.privateca.v1.Certificate] may have been compromised. """ + REVOCATION_REASON_UNSPECIFIED = 0 KEY_COMPROMISE = 1 CERTIFICATE_AUTHORITY_COMPROMISE = 2 @@ -188,6 +190,7 @@ class SubjectRequestMode(proto.Enum): have the ``privateca.certificates.createForSelf`` permission. """ + SUBJECT_REQUEST_MODE_UNSPECIFIED = 0 DEFAULT = 1 RDN_SEQUENCE = 3 @@ -321,6 +324,7 @@ class Type(proto.Enum): [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority] or an unmanaged CA. """ + TYPE_UNSPECIFIED = 0 SELF_SIGNED = 1 SUBORDINATE = 2 @@ -368,6 +372,7 @@ class State(proto.Enum): anchor, and will not be used to issue certificates from the [CaPool][google.cloud.security.privateca.v1.CaPool]. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -406,6 +411,7 @@ class SignHashAlgorithm(proto.Enum): EC_P384_SHA384 (5): maps to CryptoKeyVersionAlgorithm.EC_SIGN_P384_SHA384 """ + SIGN_HASH_ALGORITHM_UNSPECIFIED = 0 RSA_PSS_2048_SHA256 = 1 RSA_PSS_3072_SHA256 = 2 @@ -559,12 +565,12 @@ class UserDefinedAccessUrls(proto.Message): proto.STRING, number=9, ) - ca_certificate_descriptions: MutableSequence[ - "CertificateDescription" - ] = proto.RepeatedField( - proto.MESSAGE, - number=10, - message="CertificateDescription", + ca_certificate_descriptions: MutableSequence["CertificateDescription"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=10, + message="CertificateDescription", + ) ) gcs_bucket: str = proto.Field( proto.STRING, @@ -666,6 +672,7 @@ class Tier(proto.Enum): DEVOPS (2): DevOps tier. """ + TIER_UNSPECIFIED = 0 ENTERPRISE = 1 DEVOPS = 2 @@ -723,6 +730,7 @@ class EncodingFormat(proto.Enum): [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority]'s CA certificate and CRLs will be published in DER format. """ + ENCODING_FORMAT_UNSPECIFIED = 0 PEM = 1 DER = 2 @@ -908,6 +916,7 @@ class EcSignatureAlgorithm(proto.Enum): Algorithm over curve 25519, as described in RFC 8410. """ + EC_SIGNATURE_ALGORITHM_UNSPECIFIED = 0 ECDSA_P256 = 1 ECDSA_P384 = 2 @@ -962,12 +971,12 @@ class IssuanceModes(proto.Message): number=2, ) - allowed_key_types: MutableSequence[ - "CaPool.IssuancePolicy.AllowedKeyType" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="CaPool.IssuancePolicy.AllowedKeyType", + allowed_key_types: MutableSequence["CaPool.IssuancePolicy.AllowedKeyType"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="CaPool.IssuancePolicy.AllowedKeyType", + ) ) backdate_duration: duration_pb2.Duration = proto.Field( proto.MESSAGE, @@ -1088,6 +1097,7 @@ class State(proto.Enum): [CertificateRevocationList][google.cloud.security.privateca.v1.CertificateRevocationList] is no longer current. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUPERSEDED = 2 @@ -1769,6 +1779,7 @@ class KeyFormat(proto.Enum): `SubjectPublicKeyInfo `__ structure containing an algorithm identifier and a key. """ + KEY_FORMAT_UNSPECIFIED = 0 PEM = 1 @@ -2560,6 +2571,7 @@ class KnownCertificateExtension(proto.Enum): 5280 section 4.2.1.10 `__ """ + KNOWN_CERTIFICATE_EXTENSION_UNSPECIFIED = 0 BASE_KEY_USAGE = 1 EXTENDED_KEY_USAGE = 2 diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/types/service.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/types/service.py index 121a49834004..0ccdc30feb52 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/types/service.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1/types/service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.security.privateca_v1.types import resources @@ -725,12 +725,12 @@ class ListCertificateAuthoritiesResponse(proto.Message): def raw_page(self): return self - certificate_authorities: MutableSequence[ - resources.CertificateAuthority - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.CertificateAuthority, + certificate_authorities: MutableSequence[resources.CertificateAuthority] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.CertificateAuthority, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -1597,12 +1597,12 @@ class ListCertificateTemplatesResponse(proto.Message): def raw_page(self): return self - certificate_templates: MutableSequence[ - resources.CertificateTemplate - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.CertificateTemplate, + certificate_templates: MutableSequence[resources.CertificateTemplate] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.CertificateTemplate, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/__init__.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/__init__.py index 712e494af56a..81a0a4aa3ef5 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/__init__.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.certificate_authority_service import ( CertificateAuthorityServiceAsyncClient, CertificateAuthorityServiceClient, diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/async_client.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/async_client.py index 739c5a5a5343..7359cb44c63a 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/async_client.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.security.privateca_v1beta1 import gapic_version as package_version @@ -44,11 +44,11 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.security.privateca_v1beta1.services.certificate_authority_service import ( pagers, @@ -152,7 +152,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CertificateAuthorityServiceAsyncClient: The constructed client. """ - return CertificateAuthorityServiceClient.from_service_account_info.__func__(CertificateAuthorityServiceAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + CertificateAuthorityServiceClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + CertificateAuthorityServiceAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -168,7 +173,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CertificateAuthorityServiceAsyncClient: The constructed client. """ - return CertificateAuthorityServiceClient.from_service_account_file.__func__(CertificateAuthorityServiceAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + CertificateAuthorityServiceClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + CertificateAuthorityServiceAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -206,7 +216,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return CertificateAuthorityServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return CertificateAuthorityServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> CertificateAuthorityServiceTransport: diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/client.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/client.py index dcd5f73b2f41..bb234bf6492e 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/client.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.security.privateca_v1beta1 import gapic_version as package_version @@ -61,11 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.security.privateca_v1beta1.services.certificate_authority_service import ( pagers, @@ -86,13 +86,11 @@ class CertificateAuthorityServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CertificateAuthorityServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CertificateAuthorityServiceTransport]] _transport_registry["grpc"] = CertificateAuthorityServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = CertificateAuthorityServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + CertificateAuthorityServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = CertificateAuthorityServiceRestTransport def get_transport_class( @@ -711,11 +709,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CertificateAuthorityServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CertificateAuthorityServiceClient._read_environment_variables() + ) self._client_cert_source = ( CertificateAuthorityServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -752,8 +748,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CertificateAuthorityServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/pagers.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/pagers.py index e7c4aae9c2c9..79fd72cb961d 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/pagers.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -457,7 +457,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -539,7 +539,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -615,7 +615,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/__init__.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/__init__.py index 768cf0c444dc..1687ac2737e5 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/__init__.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[CertificateAuthorityServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[CertificateAuthorityServiceTransport]] _transport_registry["grpc"] = CertificateAuthorityServiceGrpcTransport _transport_registry["grpc_asyncio"] = CertificateAuthorityServiceGrpcAsyncIOTransport _transport_registry["rest"] = CertificateAuthorityServiceRestTransport diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/base.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/base.py index 9a5f151db5d4..7ec05e2c7fa2 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/base.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/base.py @@ -17,14 +17,14 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.security.privateca_v1beta1 import gapic_version as package_version from google.cloud.security.privateca_v1beta1.types import resources, service diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc.py index b09a6aaaf34d..3336ed8c81c5 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc.py @@ -16,18 +16,18 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.security.privateca_v1beta1.types import resources, service @@ -511,12 +511,12 @@ def activate_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "activate_certificate_authority" not in self._stubs: - self._stubs[ - "activate_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ActivateCertificateAuthority", - request_serializer=service.ActivateCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["activate_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ActivateCertificateAuthority", + request_serializer=service.ActivateCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["activate_certificate_authority"] @@ -543,12 +543,12 @@ def create_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_authority" not in self._stubs: - self._stubs[ - "create_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/CreateCertificateAuthority", - request_serializer=service.CreateCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/CreateCertificateAuthority", + request_serializer=service.CreateCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_authority"] @@ -574,12 +574,12 @@ def disable_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_certificate_authority" not in self._stubs: - self._stubs[ - "disable_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/DisableCertificateAuthority", - request_serializer=service.DisableCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/DisableCertificateAuthority", + request_serializer=service.DisableCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_certificate_authority"] @@ -605,12 +605,12 @@ def enable_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_certificate_authority" not in self._stubs: - self._stubs[ - "enable_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/EnableCertificateAuthority", - request_serializer=service.EnableCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/EnableCertificateAuthority", + request_serializer=service.EnableCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_certificate_authority"] @@ -647,12 +647,12 @@ def fetch_certificate_authority_csr( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_certificate_authority_csr" not in self._stubs: - self._stubs[ - "fetch_certificate_authority_csr" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/FetchCertificateAuthorityCsr", - request_serializer=service.FetchCertificateAuthorityCsrRequest.serialize, - response_deserializer=service.FetchCertificateAuthorityCsrResponse.deserialize, + self._stubs["fetch_certificate_authority_csr"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/FetchCertificateAuthorityCsr", + request_serializer=service.FetchCertificateAuthorityCsrRequest.serialize, + response_deserializer=service.FetchCertificateAuthorityCsrResponse.deserialize, + ) ) return self._stubs["fetch_certificate_authority_csr"] @@ -708,12 +708,12 @@ def list_certificate_authorities( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_authorities" not in self._stubs: - self._stubs[ - "list_certificate_authorities" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ListCertificateAuthorities", - request_serializer=service.ListCertificateAuthoritiesRequest.serialize, - response_deserializer=service.ListCertificateAuthoritiesResponse.deserialize, + self._stubs["list_certificate_authorities"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ListCertificateAuthorities", + request_serializer=service.ListCertificateAuthoritiesRequest.serialize, + response_deserializer=service.ListCertificateAuthoritiesResponse.deserialize, + ) ) return self._stubs["list_certificate_authorities"] @@ -740,12 +740,12 @@ def restore_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restore_certificate_authority" not in self._stubs: - self._stubs[ - "restore_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/RestoreCertificateAuthority", - request_serializer=service.RestoreCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["restore_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/RestoreCertificateAuthority", + request_serializer=service.RestoreCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["restore_certificate_authority"] @@ -773,12 +773,12 @@ def schedule_delete_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "schedule_delete_certificate_authority" not in self._stubs: - self._stubs[ - "schedule_delete_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ScheduleDeleteCertificateAuthority", - request_serializer=service.ScheduleDeleteCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["schedule_delete_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ScheduleDeleteCertificateAuthority", + request_serializer=service.ScheduleDeleteCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["schedule_delete_certificate_authority"] @@ -804,12 +804,12 @@ def update_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_authority" not in self._stubs: - self._stubs[ - "update_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/UpdateCertificateAuthority", - request_serializer=service.UpdateCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/UpdateCertificateAuthority", + request_serializer=service.UpdateCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_authority"] @@ -837,12 +837,12 @@ def get_certificate_revocation_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_certificate_revocation_list" not in self._stubs: - self._stubs[ - "get_certificate_revocation_list" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/GetCertificateRevocationList", - request_serializer=service.GetCertificateRevocationListRequest.serialize, - response_deserializer=resources.CertificateRevocationList.deserialize, + self._stubs["get_certificate_revocation_list"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/GetCertificateRevocationList", + request_serializer=service.GetCertificateRevocationListRequest.serialize, + response_deserializer=resources.CertificateRevocationList.deserialize, + ) ) return self._stubs["get_certificate_revocation_list"] @@ -870,12 +870,12 @@ def list_certificate_revocation_lists( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_revocation_lists" not in self._stubs: - self._stubs[ - "list_certificate_revocation_lists" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ListCertificateRevocationLists", - request_serializer=service.ListCertificateRevocationListsRequest.serialize, - response_deserializer=service.ListCertificateRevocationListsResponse.deserialize, + self._stubs["list_certificate_revocation_lists"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ListCertificateRevocationLists", + request_serializer=service.ListCertificateRevocationListsRequest.serialize, + response_deserializer=service.ListCertificateRevocationListsResponse.deserialize, + ) ) return self._stubs["list_certificate_revocation_lists"] @@ -902,12 +902,12 @@ def update_certificate_revocation_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_revocation_list" not in self._stubs: - self._stubs[ - "update_certificate_revocation_list" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/UpdateCertificateRevocationList", - request_serializer=service.UpdateCertificateRevocationListRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_revocation_list"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/UpdateCertificateRevocationList", + request_serializer=service.UpdateCertificateRevocationListRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_revocation_list"] diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc_asyncio.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc_asyncio.py index 320bc6fa9a2a..3a37a9495dab 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -27,10 +30,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.security.privateca_v1beta1.types import resources, service @@ -524,12 +524,12 @@ def activate_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "activate_certificate_authority" not in self._stubs: - self._stubs[ - "activate_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ActivateCertificateAuthority", - request_serializer=service.ActivateCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["activate_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ActivateCertificateAuthority", + request_serializer=service.ActivateCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["activate_certificate_authority"] @@ -556,12 +556,12 @@ def create_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_certificate_authority" not in self._stubs: - self._stubs[ - "create_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/CreateCertificateAuthority", - request_serializer=service.CreateCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["create_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/CreateCertificateAuthority", + request_serializer=service.CreateCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["create_certificate_authority"] @@ -588,12 +588,12 @@ def disable_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_certificate_authority" not in self._stubs: - self._stubs[ - "disable_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/DisableCertificateAuthority", - request_serializer=service.DisableCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/DisableCertificateAuthority", + request_serializer=service.DisableCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_certificate_authority"] @@ -619,12 +619,12 @@ def enable_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_certificate_authority" not in self._stubs: - self._stubs[ - "enable_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/EnableCertificateAuthority", - request_serializer=service.EnableCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/EnableCertificateAuthority", + request_serializer=service.EnableCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_certificate_authority"] @@ -661,12 +661,12 @@ def fetch_certificate_authority_csr( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_certificate_authority_csr" not in self._stubs: - self._stubs[ - "fetch_certificate_authority_csr" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/FetchCertificateAuthorityCsr", - request_serializer=service.FetchCertificateAuthorityCsrRequest.serialize, - response_deserializer=service.FetchCertificateAuthorityCsrResponse.deserialize, + self._stubs["fetch_certificate_authority_csr"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/FetchCertificateAuthorityCsr", + request_serializer=service.FetchCertificateAuthorityCsrRequest.serialize, + response_deserializer=service.FetchCertificateAuthorityCsrResponse.deserialize, + ) ) return self._stubs["fetch_certificate_authority_csr"] @@ -723,12 +723,12 @@ def list_certificate_authorities( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_authorities" not in self._stubs: - self._stubs[ - "list_certificate_authorities" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ListCertificateAuthorities", - request_serializer=service.ListCertificateAuthoritiesRequest.serialize, - response_deserializer=service.ListCertificateAuthoritiesResponse.deserialize, + self._stubs["list_certificate_authorities"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ListCertificateAuthorities", + request_serializer=service.ListCertificateAuthoritiesRequest.serialize, + response_deserializer=service.ListCertificateAuthoritiesResponse.deserialize, + ) ) return self._stubs["list_certificate_authorities"] @@ -756,12 +756,12 @@ def restore_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "restore_certificate_authority" not in self._stubs: - self._stubs[ - "restore_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/RestoreCertificateAuthority", - request_serializer=service.RestoreCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["restore_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/RestoreCertificateAuthority", + request_serializer=service.RestoreCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["restore_certificate_authority"] @@ -790,12 +790,12 @@ def schedule_delete_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "schedule_delete_certificate_authority" not in self._stubs: - self._stubs[ - "schedule_delete_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ScheduleDeleteCertificateAuthority", - request_serializer=service.ScheduleDeleteCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["schedule_delete_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ScheduleDeleteCertificateAuthority", + request_serializer=service.ScheduleDeleteCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["schedule_delete_certificate_authority"] @@ -821,12 +821,12 @@ def update_certificate_authority( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_authority" not in self._stubs: - self._stubs[ - "update_certificate_authority" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/UpdateCertificateAuthority", - request_serializer=service.UpdateCertificateAuthorityRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_authority"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/UpdateCertificateAuthority", + request_serializer=service.UpdateCertificateAuthorityRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_authority"] @@ -854,12 +854,12 @@ def get_certificate_revocation_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_certificate_revocation_list" not in self._stubs: - self._stubs[ - "get_certificate_revocation_list" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/GetCertificateRevocationList", - request_serializer=service.GetCertificateRevocationListRequest.serialize, - response_deserializer=resources.CertificateRevocationList.deserialize, + self._stubs["get_certificate_revocation_list"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/GetCertificateRevocationList", + request_serializer=service.GetCertificateRevocationListRequest.serialize, + response_deserializer=resources.CertificateRevocationList.deserialize, + ) ) return self._stubs["get_certificate_revocation_list"] @@ -887,12 +887,12 @@ def list_certificate_revocation_lists( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_certificate_revocation_lists" not in self._stubs: - self._stubs[ - "list_certificate_revocation_lists" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ListCertificateRevocationLists", - request_serializer=service.ListCertificateRevocationListsRequest.serialize, - response_deserializer=service.ListCertificateRevocationListsResponse.deserialize, + self._stubs["list_certificate_revocation_lists"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/ListCertificateRevocationLists", + request_serializer=service.ListCertificateRevocationListsRequest.serialize, + response_deserializer=service.ListCertificateRevocationListsResponse.deserialize, + ) ) return self._stubs["list_certificate_revocation_lists"] @@ -920,12 +920,12 @@ def update_certificate_revocation_list( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_certificate_revocation_list" not in self._stubs: - self._stubs[ - "update_certificate_revocation_list" - ] = self._logged_channel.unary_unary( - "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/UpdateCertificateRevocationList", - request_serializer=service.UpdateCertificateRevocationListRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["update_certificate_revocation_list"] = ( + self._logged_channel.unary_unary( + "/google.cloud.security.privateca.v1beta1.CertificateAuthorityService/UpdateCertificateRevocationList", + request_serializer=service.UpdateCertificateRevocationListRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["update_certificate_revocation_list"] diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/rest.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/rest.py index 8f7ec74461a9..05510fcb3be1 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/rest.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/services/certificate_authority_service/transports/rest.py @@ -16,16 +16,16 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1433,9 +1433,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseActivateCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseActivateCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_activate_certificate_authority( request, metadata @@ -1461,7 +1459,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1502,11 +1500,10 @@ def __call__( resp = self._interceptor.post_activate_certificate_authority(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_activate_certificate_authority_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_activate_certificate_authority_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1592,9 +1589,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseCreateCertificate._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseCreateCertificate._get_http_options() request, metadata = self._interceptor.pre_create_certificate( request, metadata @@ -1752,9 +1747,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseCreateCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseCreateCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_create_certificate_authority( request, metadata @@ -1780,7 +1773,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1910,9 +1903,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseDisableCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseDisableCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_disable_certificate_authority( request, metadata @@ -1938,7 +1929,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1979,11 +1970,10 @@ def __call__( resp = self._interceptor.post_disable_certificate_authority(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_disable_certificate_authority_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_disable_certificate_authority_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2071,9 +2061,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseEnableCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseEnableCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_enable_certificate_authority( request, metadata @@ -2099,7 +2087,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2227,9 +2215,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseFetchCertificateAuthorityCsr._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseFetchCertificateAuthorityCsr._get_http_options() request, metadata = self._interceptor.pre_fetch_certificate_authority_csr( request, metadata @@ -2293,11 +2279,10 @@ def __call__( resp = self._interceptor.post_fetch_certificate_authority_csr(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_certificate_authority_csr_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_certificate_authority_csr_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2384,9 +2369,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificate._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificate._get_http_options() request, metadata = self._interceptor.pre_get_certificate(request, metadata) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificate._get_transcoded_request( @@ -2540,9 +2523,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_get_certificate_authority( request, metadata @@ -2696,9 +2677,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificateRevocationList._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseGetCertificateRevocationList._get_http_options() request, metadata = self._interceptor.pre_get_certificate_revocation_list( request, metadata @@ -2762,11 +2741,10 @@ def __call__( resp = self._interceptor.post_get_certificate_revocation_list(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_certificate_revocation_list_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_certificate_revocation_list_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2857,9 +2835,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseGetReusableConfig._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseGetReusableConfig._get_http_options() request, metadata = self._interceptor.pre_get_reusable_config( request, metadata @@ -3010,9 +2986,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseListCertificateAuthorities._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseListCertificateAuthorities._get_http_options() request, metadata = self._interceptor.pre_list_certificate_authorities( request, metadata @@ -3165,9 +3139,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseListCertificateRevocationLists._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseListCertificateRevocationLists._get_http_options() request, metadata = self._interceptor.pre_list_certificate_revocation_lists( request, metadata @@ -3231,11 +3203,10 @@ def __call__( resp = self._interceptor.post_list_certificate_revocation_lists(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_list_certificate_revocation_lists_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_list_certificate_revocation_lists_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3320,9 +3291,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseListCertificates._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseListCertificates._get_http_options() request, metadata = self._interceptor.pre_list_certificates( request, metadata @@ -3472,9 +3441,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseListReusableConfigs._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseListReusableConfigs._get_http_options() request, metadata = self._interceptor.pre_list_reusable_configs( request, metadata @@ -3629,9 +3596,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseRestoreCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseRestoreCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_restore_certificate_authority( request, metadata @@ -3657,7 +3622,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3698,11 +3663,10 @@ def __call__( resp = self._interceptor.post_restore_certificate_authority(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_restore_certificate_authority_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_restore_certificate_authority_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3788,9 +3752,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseRevokeCertificate._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseRevokeCertificate._get_http_options() request, metadata = self._interceptor.pre_revoke_certificate( request, metadata @@ -3948,15 +3910,12 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseScheduleDeleteCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseScheduleDeleteCertificateAuthority._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_schedule_delete_certificate_authority( - request, metadata + request, metadata = ( + self._interceptor.pre_schedule_delete_certificate_authority( + request, metadata + ) ) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseScheduleDeleteCertificateAuthority._get_transcoded_request( http_options, request @@ -3979,7 +3938,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4020,11 +3979,10 @@ def __call__( resp = self._interceptor.post_schedule_delete_certificate_authority(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_schedule_delete_certificate_authority_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_schedule_delete_certificate_authority_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4110,9 +4068,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificate._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificate._get_http_options() request, metadata = self._interceptor.pre_update_certificate( request, metadata @@ -4270,9 +4226,7 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificateAuthority._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificateAuthority._get_http_options() request, metadata = self._interceptor.pre_update_certificate_authority( request, metadata @@ -4298,7 +4252,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4428,15 +4382,12 @@ def __call__( """ - http_options = ( - _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificateRevocationList._get_http_options() - ) + http_options = _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificateRevocationList._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_update_certificate_revocation_list( - request, metadata + request, metadata = ( + self._interceptor.pre_update_certificate_revocation_list( + request, metadata + ) ) transcoded_request = _BaseCertificateAuthorityServiceRestTransport._BaseUpdateCertificateRevocationList._get_transcoded_request( http_options, request @@ -4459,7 +4410,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -4500,11 +4451,10 @@ def __call__( resp = self._interceptor.post_update_certificate_revocation_list(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_certificate_revocation_list_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_certificate_revocation_list_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -4537,7 +4487,9 @@ def activate_certificate_authority( ]: # 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._ActivateCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._ActivateCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_certificate( @@ -4555,7 +4507,9 @@ def create_certificate_authority( ]: # 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._CreateCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._CreateCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def disable_certificate_authority( @@ -4565,7 +4519,9 @@ def disable_certificate_authority( ]: # 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._DisableCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._DisableCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_certificate_authority( @@ -4575,7 +4531,9 @@ def enable_certificate_authority( ]: # 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._EnableCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._EnableCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_certificate_authority_csr( @@ -4586,7 +4544,9 @@ def fetch_certificate_authority_csr( ]: # 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._FetchCertificateAuthorityCsr(self._session, self._host, self._interceptor) # type: ignore + return self._FetchCertificateAuthorityCsr( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_certificate( @@ -4604,7 +4564,9 @@ def get_certificate_authority( ]: # 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._GetCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._GetCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_certificate_revocation_list( @@ -4615,7 +4577,9 @@ def get_certificate_revocation_list( ]: # 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._GetCertificateRevocationList(self._session, self._host, self._interceptor) # type: ignore + return self._GetCertificateRevocationList( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_reusable_config( @@ -4634,7 +4598,9 @@ def list_certificate_authorities( ]: # 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._ListCertificateAuthorities(self._session, self._host, self._interceptor) # type: ignore + return self._ListCertificateAuthorities( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_certificate_revocation_lists( @@ -4645,7 +4611,9 @@ def list_certificate_revocation_lists( ]: # 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._ListCertificateRevocationLists(self._session, self._host, self._interceptor) # type: ignore + return self._ListCertificateRevocationLists( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_certificates( @@ -4673,7 +4641,9 @@ def restore_certificate_authority( ]: # 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._RestoreCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._RestoreCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def revoke_certificate( @@ -4691,7 +4661,9 @@ def schedule_delete_certificate_authority( ]: # 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._ScheduleDeleteCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._ScheduleDeleteCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_certificate( @@ -4709,7 +4681,9 @@ def update_certificate_authority( ]: # 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._UpdateCertificateAuthority(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCertificateAuthority( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_certificate_revocation_list( @@ -4719,7 +4693,9 @@ def update_certificate_revocation_list( ]: # 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._UpdateCertificateRevocationList(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateCertificateRevocationList( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/types/resources.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/types/resources.py index 8181af1d6778..193acfcfe714 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/types/resources.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/types/resources.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -94,6 +94,7 @@ class RevocationReason(proto.Enum): [Certificate][google.cloud.security.privateca.v1beta1.Certificate] may have been compromised. """ + REVOCATION_REASON_UNSPECIFIED = 0 KEY_COMPROMISE = 1 CERTIFICATE_AUTHORITY_COMPROMISE = 2 @@ -228,6 +229,7 @@ class Type(proto.Enum): [CertificateAuthority][google.cloud.security.privateca.v1beta1.CertificateAuthority] or an unmanaged CA. """ + TYPE_UNSPECIFIED = 0 SELF_SIGNED = 1 SUBORDINATE = 2 @@ -245,6 +247,7 @@ class Tier(proto.Enum): DEVOPS (2): DevOps tier. """ + TIER_UNSPECIFIED = 0 ENTERPRISE = 1 DEVOPS = 2 @@ -270,6 +273,7 @@ class State(proto.Enum): Certificates cannot be issued from this CA. CRLs will not be generated. """ + STATE_UNSPECIFIED = 0 ENABLED = 1 DISABLED = 2 @@ -307,6 +311,7 @@ class SignHashAlgorithm(proto.Enum): EC_P384_SHA384 (5): maps to CryptoKeyVersionAlgorithm.EC_SIGN_P384_SHA384 """ + SIGN_HASH_ALGORITHM_UNSPECIFIED = 0 RSA_PSS_2048_SHA256 = 1 RSA_PSS_3072_SHA256 = 2 @@ -445,12 +450,12 @@ class AllowedConfigList(proto.Message): field. """ - allowed_config_values: MutableSequence[ - "ReusableConfigWrapper" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="ReusableConfigWrapper", + allowed_config_values: MutableSequence["ReusableConfigWrapper"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="ReusableConfigWrapper", + ) ) class AllowedSubjectAltNames(proto.Message): @@ -561,12 +566,12 @@ class IssuanceModes(proto.Message): oneof="config_policy", message="ReusableConfigWrapper", ) - allowed_locations_and_organizations: MutableSequence[ - "Subject" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="Subject", + allowed_locations_and_organizations: MutableSequence["Subject"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="Subject", + ) ) allowed_common_names: MutableSequence[str] = proto.RepeatedField( proto.STRING, @@ -711,12 +716,12 @@ class KeyVersionSpec(proto.Message): proto.STRING, number=9, ) - ca_certificate_descriptions: MutableSequence[ - "CertificateDescription" - ] = proto.RepeatedField( - proto.MESSAGE, - number=12, - message="CertificateDescription", + ca_certificate_descriptions: MutableSequence["CertificateDescription"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=12, + message="CertificateDescription", + ) ) gcs_bucket: str = proto.Field( proto.STRING, @@ -806,6 +811,7 @@ class State(proto.Enum): [CertificateRevocationList][google.cloud.security.privateca.v1beta1.CertificateRevocationList] is no longer current. """ + STATE_UNSPECIFIED = 0 ACTIVE = 1 SUPERSEDED = 2 @@ -1304,6 +1310,7 @@ class KeyType(proto.Enum): A PEM-encoded compressed NIST P-256/secp256r1/prime256v1 or P-384 key. """ + KEY_TYPE_UNSPECIFIED = 0 PEM_RSA_KEY = 1 PEM_EC_KEY = 2 diff --git a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/types/service.py b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/types/service.py index 22b78f92d9f4..c7c708a54ad2 100644 --- a/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/types/service.py +++ b/packages/google-cloud-private-ca/google/cloud/security/privateca_v1beta1/types/service.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.security.privateca_v1beta1.types import resources @@ -660,12 +660,12 @@ class ListCertificateAuthoritiesResponse(proto.Message): def raw_page(self): return self - certificate_authorities: MutableSequence[ - resources.CertificateAuthority - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=resources.CertificateAuthority, + certificate_authorities: MutableSequence[resources.CertificateAuthority] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=resources.CertificateAuthority, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-private-ca/noxfile.py b/packages/google-cloud-private-ca/noxfile.py index d339ee227e8e..41becadc3975 100644 --- a/packages/google-cloud-private-ca/noxfile.py +++ b/packages/google-cloud-private-ca/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-private-ca/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py b/packages/google-cloud-private-ca/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py index 8801f20f794d..385facf68c41 100644 --- a/packages/google-cloud-private-ca/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py +++ b/packages/google-cloud-private-ca/tests/unit/gapic/privateca_v1/test_certificate_authority_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.empty_pb2 as empty_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.type.expr_pb2 as expr_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,24 +60,18 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import options_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore +from google.iam.v1 import ( + iam_policy_pb2, # type: ignore + options_pb2, # type: ignore + policy_pb2, # type: ignore +) from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import expr_pb2 # type: ignore from google.cloud.security.privateca_v1.services.certificate_authority_service import ( CertificateAuthorityServiceAsyncClient, @@ -1051,10 +1053,9 @@ def test_certificate_authority_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1099,10 +1100,9 @@ def test_certificate_authority_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1138,10 +1138,9 @@ def test_certificate_authority_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1400,13 +1399,13 @@ def test_certificate_authority_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1536,9 +1535,9 @@ def test_create_certificate_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_certificate] = ( + mock_rpc + ) request = {} client.create_certificate(request) @@ -2257,9 +2256,9 @@ def test_list_certificates_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_certificates] = ( + mock_rpc + ) request = {} client.list_certificates(request) @@ -2815,9 +2814,9 @@ def test_revoke_certificate_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.revoke_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.revoke_certificate] = ( + mock_rpc + ) request = {} client.revoke_certificate(request) @@ -3177,9 +3176,9 @@ def test_update_certificate_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_certificate] = ( + mock_rpc + ) request = {} client.update_certificate(request) @@ -12638,9 +12637,9 @@ def test_create_certificate_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_certificate] = ( + mock_rpc + ) request = {} client.create_certificate(request) @@ -13029,9 +13028,9 @@ def test_list_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_certificates] = ( + mock_rpc + ) request = {} client.list_certificates(request) @@ -13295,9 +13294,9 @@ def test_revoke_certificate_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.revoke_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.revoke_certificate] = ( + mock_rpc + ) request = {} client.revoke_certificate(request) @@ -13488,9 +13487,9 @@ def test_update_certificate_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_certificate] = ( + mock_rpc + ) request = {} client.update_certificate(request) @@ -20277,8 +20276,9 @@ def test_create_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20565,18 +20565,22 @@ def test_create_certificate_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_create_certificate" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_create_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_create_certificate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_create_certificate", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_create_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_create_certificate", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20629,8 +20633,9 @@ def test_get_certificate_rest_bad_request(request_type=service.GetCertificateReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20706,18 +20711,21 @@ def test_get_certificate_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_get_certificate" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_get_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_get_certificate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, "pre_get_certificate" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20768,8 +20776,9 @@ def test_list_certificates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20834,18 +20843,22 @@ def test_list_certificates_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_list_certificates" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_list_certificates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_list_certificates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificates", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_list_certificates", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -20902,8 +20915,9 @@ def test_revoke_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -20979,18 +20993,22 @@ def test_revoke_certificate_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_revoke_certificate" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_revoke_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_revoke_certificate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_revoke_certificate", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_revoke_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_revoke_certificate", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21047,8 +21065,9 @@ def test_update_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21339,18 +21358,22 @@ def test_update_certificate_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_update_certificate" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_update_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_update_certificate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_update_certificate", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21405,8 +21428,9 @@ def test_activate_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21465,22 +21489,23 @@ def test_activate_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_activate_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_activate_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_activate_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_activate_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_activate_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_activate_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21533,8 +21558,9 @@ def test_create_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21833,22 +21859,23 @@ def test_create_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_create_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_create_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_create_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_create_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_create_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_create_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -21903,8 +21930,9 @@ def test_disable_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -21963,22 +21991,23 @@ def test_disable_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_disable_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_disable_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_disable_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_disable_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_disable_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_disable_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22033,8 +22062,9 @@ def test_enable_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22093,22 +22123,23 @@ def test_enable_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_enable_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_enable_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_enable_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_enable_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_enable_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_enable_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22163,8 +22194,9 @@ def test_fetch_certificate_authority_csr_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22229,20 +22261,22 @@ def test_fetch_certificate_authority_csr_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_fetch_certificate_authority_csr", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_fetch_certificate_authority_csr_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_fetch_certificate_authority_csr", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_fetch_certificate_authority_csr", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_fetch_certificate_authority_csr_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_fetch_certificate_authority_csr", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22302,8 +22336,9 @@ def test_get_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22382,20 +22417,22 @@ def test_get_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_get_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_get_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_get_certificate_authority", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_get_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22450,8 +22487,9 @@ def test_list_certificate_authorities_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22516,20 +22554,22 @@ def test_list_certificate_authorities_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_list_certificate_authorities", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_list_certificate_authorities_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_list_certificate_authorities", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificate_authorities", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificate_authorities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_list_certificate_authorities", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22589,8 +22629,9 @@ def test_undelete_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22649,22 +22690,23 @@ def test_undelete_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_undelete_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_undelete_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_undelete_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_undelete_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_undelete_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_undelete_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22719,8 +22761,9 @@ def test_delete_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -22779,22 +22822,23 @@ def test_delete_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_delete_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_delete_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_delete_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_delete_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_delete_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_delete_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -22851,8 +22895,9 @@ def test_update_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23155,22 +23200,23 @@ def test_update_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_update_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_update_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_update_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_update_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23221,8 +23267,9 @@ def test_create_ca_pool_rest_bad_request(request_type=service.CreateCaPoolReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23449,20 +23496,21 @@ def test_create_ca_pool_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_create_ca_pool" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_create_ca_pool_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_create_ca_pool" - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, "post_create_ca_pool" + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_create_ca_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, "pre_create_ca_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23513,8 +23561,9 @@ def test_update_ca_pool_rest_bad_request(request_type=service.UpdateCaPoolReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23743,20 +23792,21 @@ def test_update_ca_pool_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_update_ca_pool" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_update_ca_pool_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_update_ca_pool" - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, "post_update_ca_pool" + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_update_ca_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, "pre_update_ca_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23805,8 +23855,9 @@ def test_get_ca_pool_rest_bad_request(request_type=service.GetCaPoolRequest): 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23871,18 +23922,20 @@ def test_get_ca_pool_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_get_ca_pool" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_get_ca_pool_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_get_ca_pool" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, "post_get_ca_pool" + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_ca_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, "pre_get_ca_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -23931,8 +23984,9 @@ def test_list_ca_pools_rest_bad_request(request_type=service.ListCaPoolsRequest) 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -23997,18 +24051,20 @@ def test_list_ca_pools_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_list_ca_pools" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_list_ca_pools_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_list_ca_pools" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, "post_list_ca_pools" + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_ca_pools_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, "pre_list_ca_pools" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24059,8 +24115,9 @@ def test_delete_ca_pool_rest_bad_request(request_type=service.DeleteCaPoolReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24117,20 +24174,21 @@ def test_delete_ca_pool_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_delete_ca_pool" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_delete_ca_pool_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_delete_ca_pool" - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, "post_delete_ca_pool" + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_delete_ca_pool_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, "pre_delete_ca_pool" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24179,8 +24237,9 @@ def test_fetch_ca_certs_rest_bad_request(request_type=service.FetchCaCertsReques 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24240,18 +24299,20 @@ def test_fetch_ca_certs_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_fetch_ca_certs" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_fetch_ca_certs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_fetch_ca_certs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, "post_fetch_ca_certs" + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_fetch_ca_certs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, "pre_fetch_ca_certs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24306,8 +24367,9 @@ def test_get_certificate_revocation_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24382,20 +24444,22 @@ def test_get_certificate_revocation_list_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_get_certificate_revocation_list", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_get_certificate_revocation_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_get_certificate_revocation_list", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate_revocation_list", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate_revocation_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_get_certificate_revocation_list", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24455,8 +24519,9 @@ def test_list_certificate_revocation_lists_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24523,20 +24588,22 @@ def test_list_certificate_revocation_lists_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_list_certificate_revocation_lists", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_list_certificate_revocation_lists_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_list_certificate_revocation_lists", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificate_revocation_lists", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificate_revocation_lists_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_list_certificate_revocation_lists", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24598,8 +24665,9 @@ def test_update_certificate_revocation_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -24751,22 +24819,23 @@ def test_update_certificate_revocation_list_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_update_certificate_revocation_list", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_update_certificate_revocation_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_update_certificate_revocation_list", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate_revocation_list", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate_revocation_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_update_certificate_revocation_list", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -24819,8 +24888,9 @@ def test_create_certificate_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25029,22 +25099,23 @@ def test_create_certificate_template_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_create_certificate_template", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_create_certificate_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_create_certificate_template", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_create_certificate_template", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_create_certificate_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_create_certificate_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25099,8 +25170,9 @@ def test_delete_certificate_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25159,22 +25231,23 @@ def test_delete_certificate_template_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_delete_certificate_template", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_delete_certificate_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_delete_certificate_template", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_delete_certificate_template", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_delete_certificate_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_delete_certificate_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25229,8 +25302,9 @@ def test_get_certificate_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25297,20 +25371,22 @@ def test_get_certificate_template_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_get_certificate_template", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_get_certificate_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_get_certificate_template", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate_template", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_get_certificate_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25365,8 +25441,9 @@ def test_list_certificate_templates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25431,20 +25508,22 @@ def test_list_certificate_templates_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_list_certificate_templates", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_list_certificate_templates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_list_certificate_templates", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificate_templates", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificate_templates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_list_certificate_templates", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25506,8 +25585,9 @@ def test_update_certificate_template_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -25720,22 +25800,23 @@ def test_update_certificate_template_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_update_certificate_template", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_update_certificate_template_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_update_certificate_template", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate_template", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate_template_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_update_certificate_template", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -25788,8 +25869,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -25848,8 +25930,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -25910,8 +25993,9 @@ def test_get_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -25972,8 +26056,9 @@ def test_set_iam_policy_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -26034,8 +26119,9 @@ def test_test_iam_permissions_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -26096,8 +26182,9 @@ def test_cancel_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -26158,8 +26245,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -26220,8 +26308,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -26282,8 +26371,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -27074,11 +27164,14 @@ def test_certificate_authority_service_base_transport(): def test_certificate_authority_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.security.privateca_v1.services.certificate_authority_service.transports.CertificateAuthorityServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.security.privateca_v1.services.certificate_authority_service.transports.CertificateAuthorityServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CertificateAuthorityServiceTransport( @@ -27095,9 +27188,12 @@ def test_certificate_authority_service_base_transport_with_credentials_file(): def test_certificate_authority_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.security.privateca_v1.services.certificate_authority_service.transports.CertificateAuthorityServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.security.privateca_v1.services.certificate_authority_service.transports.CertificateAuthorityServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CertificateAuthorityServiceTransport() @@ -27174,11 +27270,12 @@ def test_certificate_authority_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-private-ca/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py b/packages/google-cloud-private-ca/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py index 2a7e9102388c..ea9de36db647 100644 --- a/packages/google-cloud-private-ca/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py +++ b/packages/google-cloud-private-ca/tests/unit/gapic/privateca_v1beta1/test_certificate_authority_service.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,7 +43,14 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -52,19 +59,12 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.security.privateca_v1beta1.services.certificate_authority_service import ( CertificateAuthorityServiceAsyncClient, @@ -1046,10 +1046,9 @@ def test_certificate_authority_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1094,10 +1093,9 @@ def test_certificate_authority_service_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1133,10 +1131,9 @@ def test_certificate_authority_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1395,13 +1392,13 @@ def test_certificate_authority_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1523,9 +1520,9 @@ def test_create_certificate_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_certificate] = ( + mock_rpc + ) request = {} client.create_certificate(request) @@ -2226,9 +2223,9 @@ def test_list_certificates_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_certificates] = ( + mock_rpc + ) request = {} client.list_certificates(request) @@ -2778,9 +2775,9 @@ def test_revoke_certificate_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.revoke_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.revoke_certificate] = ( + mock_rpc + ) request = {} client.revoke_certificate(request) @@ -3128,9 +3125,9 @@ def test_update_certificate_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_certificate] = ( + mock_rpc + ) request = {} client.update_certificate(request) @@ -8505,9 +8502,9 @@ def test_get_reusable_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_reusable_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_reusable_config] = ( + mock_rpc + ) request = {} client.get_reusable_config(request) @@ -8857,9 +8854,9 @@ def test_list_reusable_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_reusable_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_reusable_configs] = ( + mock_rpc + ) request = {} client.list_reusable_configs(request) @@ -9334,9 +9331,9 @@ def test_create_certificate_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_certificate] = ( + mock_rpc + ) request = {} client.create_certificate(request) @@ -9721,9 +9718,9 @@ def test_list_certificates_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_certificates - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_certificates] = ( + mock_rpc + ) request = {} client.list_certificates(request) @@ -9987,9 +9984,9 @@ def test_revoke_certificate_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.revoke_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.revoke_certificate] = ( + mock_rpc + ) request = {} client.revoke_certificate(request) @@ -10180,9 +10177,9 @@ def test_update_certificate_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_certificate - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_certificate] = ( + mock_rpc + ) request = {} client.update_certificate(request) @@ -13079,9 +13076,9 @@ def test_get_reusable_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_reusable_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_reusable_config] = ( + mock_rpc + ) request = {} client.get_reusable_config(request) @@ -13264,9 +13261,9 @@ def test_list_reusable_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_reusable_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_reusable_configs] = ( + mock_rpc + ) request = {} client.list_reusable_configs(request) @@ -14687,8 +14684,9 @@ def test_create_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -14934,18 +14932,22 @@ def test_create_certificate_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_create_certificate" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_create_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_create_certificate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_create_certificate", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_create_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_create_certificate", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -14998,8 +15000,9 @@ def test_get_certificate_rest_bad_request(request_type=service.GetCertificateReq 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15069,18 +15072,21 @@ def test_get_certificate_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_get_certificate" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_get_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_get_certificate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, "pre_get_certificate" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15133,8 +15139,9 @@ def test_list_certificates_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15201,18 +15208,22 @@ def test_list_certificates_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_list_certificates" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_list_certificates_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_list_certificates" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificates", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificates_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_list_certificates", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15269,8 +15280,9 @@ def test_revoke_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15340,18 +15352,22 @@ def test_revoke_certificate_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_revoke_certificate" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_revoke_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_revoke_certificate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_revoke_certificate", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_revoke_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_revoke_certificate", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15408,8 +15424,9 @@ def test_update_certificate_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15657,18 +15674,22 @@ def test_update_certificate_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, "post_update_certificate" - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_update_certificate_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_update_certificate" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_update_certificate", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15723,8 +15744,9 @@ def test_activate_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -15783,22 +15805,23 @@ def test_activate_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_activate_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_activate_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_activate_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_activate_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_activate_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_activate_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -15851,8 +15874,9 @@ def test_create_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16139,22 +16163,23 @@ def test_create_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_create_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_create_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_create_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_create_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_create_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_create_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16209,8 +16234,9 @@ def test_disable_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16269,22 +16295,23 @@ def test_disable_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_disable_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_disable_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_disable_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_disable_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_disable_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_disable_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16339,8 +16366,9 @@ def test_enable_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16399,22 +16427,23 @@ def test_enable_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_enable_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_enable_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_enable_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_enable_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_enable_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_enable_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16469,8 +16498,9 @@ def test_fetch_certificate_authority_csr_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16535,20 +16565,22 @@ def test_fetch_certificate_authority_csr_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_fetch_certificate_authority_csr", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_fetch_certificate_authority_csr_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_fetch_certificate_authority_csr", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_fetch_certificate_authority_csr", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_fetch_certificate_authority_csr_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_fetch_certificate_authority_csr", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16608,8 +16640,9 @@ def test_get_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16684,20 +16717,22 @@ def test_get_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_get_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_get_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_get_certificate_authority", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_get_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16752,8 +16787,9 @@ def test_list_certificate_authorities_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16818,20 +16854,22 @@ def test_list_certificate_authorities_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_list_certificate_authorities", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_list_certificate_authorities_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_list_certificate_authorities", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificate_authorities", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificate_authorities_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_list_certificate_authorities", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -16891,8 +16929,9 @@ def test_restore_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -16951,22 +16990,23 @@ def test_restore_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_restore_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_restore_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_restore_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_restore_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_restore_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_restore_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17021,8 +17061,9 @@ def test_schedule_delete_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17081,22 +17122,23 @@ def test_schedule_delete_certificate_authority_rest_interceptors(null_intercepto ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_schedule_delete_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_schedule_delete_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_schedule_delete_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_schedule_delete_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_schedule_delete_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_schedule_delete_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17153,8 +17195,9 @@ def test_update_certificate_authority_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17445,22 +17488,23 @@ def test_update_certificate_authority_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_update_certificate_authority", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_update_certificate_authority_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_update_certificate_authority", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate_authority", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate_authority_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_update_certificate_authority", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17515,8 +17559,9 @@ def test_get_certificate_revocation_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17589,20 +17634,22 @@ def test_get_certificate_revocation_list_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_get_certificate_revocation_list", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_get_certificate_revocation_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_get_certificate_revocation_list", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate_revocation_list", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_certificate_revocation_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_get_certificate_revocation_list", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17662,8 +17709,9 @@ def test_list_certificate_revocation_lists_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17730,20 +17778,22 @@ def test_list_certificate_revocation_lists_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_list_certificate_revocation_lists", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_list_certificate_revocation_lists_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_list_certificate_revocation_lists", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificate_revocation_lists", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_certificate_revocation_lists_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_list_certificate_revocation_lists", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -17805,8 +17855,9 @@ def test_update_certificate_revocation_list_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -17957,22 +18008,23 @@ def test_update_certificate_revocation_list_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_update_certificate_revocation_list", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_update_certificate_revocation_list_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_update_certificate_revocation_list", - ) as pre: + 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.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate_revocation_list", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_update_certificate_revocation_list_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_update_certificate_revocation_list", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18027,8 +18079,9 @@ def test_get_reusable_config_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18095,19 +18148,22 @@ def test_get_reusable_config_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_get_reusable_config", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_get_reusable_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, "pre_get_reusable_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_reusable_config", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_get_reusable_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_get_reusable_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18160,8 +18216,9 @@ def test_list_reusable_configs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -18226,20 +18283,22 @@ def test_list_reusable_configs_rest_interceptors(null_interceptor): ) client = CertificateAuthorityServiceClient(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.CertificateAuthorityServiceRestInterceptor, - "post_list_reusable_configs", - ) as post, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "post_list_reusable_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CertificateAuthorityServiceRestInterceptor, - "pre_list_reusable_configs", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_reusable_configs", + ) as post, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "post_list_reusable_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CertificateAuthorityServiceRestInterceptor, + "pre_list_reusable_configs", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -18825,11 +18884,14 @@ def test_certificate_authority_service_base_transport(): def test_certificate_authority_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.security.privateca_v1beta1.services.certificate_authority_service.transports.CertificateAuthorityServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.security.privateca_v1beta1.services.certificate_authority_service.transports.CertificateAuthorityServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CertificateAuthorityServiceTransport( @@ -18846,9 +18908,12 @@ def test_certificate_authority_service_base_transport_with_credentials_file(): def test_certificate_authority_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.security.privateca_v1beta1.services.certificate_authority_service.transports.CertificateAuthorityServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.security.privateca_v1beta1.services.certificate_authority_service.transports.CertificateAuthorityServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CertificateAuthorityServiceTransport() @@ -18925,11 +18990,12 @@ def test_certificate_authority_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-private-catalog/docs/conf.py b/packages/google-cloud-private-catalog/docs/conf.py index 6acd1d63d92c..7d00d5a927f3 100644 --- a/packages/google-cloud-private-catalog/docs/conf.py +++ b/packages/google-cloud-private-catalog/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-private-catalog documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/__init__.py b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/__init__.py index c73383b1d19d..709cc71b01d8 100644 --- a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/__init__.py +++ b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.private_catalog import PrivateCatalogAsyncClient, PrivateCatalogClient from .types.private_catalog import ( AssetReference, diff --git a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/async_client.py b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/async_client.py index ba843abd538d..1adb048a11f1 100644 --- a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/async_client.py +++ b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.privatecatalog_v1beta1 import gapic_version as package_version @@ -139,7 +139,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PrivateCatalogAsyncClient: The constructed client. """ - return PrivateCatalogClient.from_service_account_info.__func__(PrivateCatalogAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PrivateCatalogClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PrivateCatalogAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +156,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PrivateCatalogAsyncClient: The constructed client. """ - return PrivateCatalogClient.from_service_account_file.__func__(PrivateCatalogAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PrivateCatalogClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(PrivateCatalogAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/client.py b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/client.py index a05a02a73c68..3c1965689ddc 100644 --- a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/client.py +++ b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.privatecatalog_v1beta1 import gapic_version as package_version @@ -78,9 +78,7 @@ class PrivateCatalogClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PrivateCatalogTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PrivateCatalogTransport]] _transport_registry["grpc"] = PrivateCatalogGrpcTransport _transport_registry["grpc_asyncio"] = PrivateCatalogGrpcAsyncIOTransport _transport_registry["rest"] = PrivateCatalogRestTransport @@ -672,11 +670,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PrivateCatalogClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PrivateCatalogClient._read_environment_variables() + ) self._client_cert_source = PrivateCatalogClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -711,8 +707,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PrivateCatalogTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/pagers.py b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/pagers.py index b67e3bdbdc48..fc1d22041fa4 100644 --- a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/pagers.py +++ b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -379,7 +379,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -455,7 +455,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/base.py b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/base.py index f32c5d052a3d..f0c9e5552df1 100644 --- a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/base.py +++ b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.privatecatalog_v1beta1 import gapic_version as package_version from google.cloud.privatecatalog_v1beta1.types import private_catalog diff --git a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/grpc.py b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/grpc.py index f34dff5171c8..cdaf8d8ba368 100644 --- a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/grpc.py +++ b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.privatecatalog_v1beta1.types import private_catalog diff --git a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/grpc_asyncio.py b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/grpc_asyncio.py index a5c0edf1fbcc..d9689c65bff1 100644 --- a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/grpc_asyncio.py +++ b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.privatecatalog_v1beta1.types import private_catalog diff --git a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/rest.py b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/rest.py index 6c89a151f72d..6c9523d8adc4 100644 --- a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/rest.py +++ b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/services/private_catalog/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version diff --git a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/types/private_catalog.py b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/types/private_catalog.py index e2956fb67e1b..375cb5dd6fca 100644 --- a/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/types/private_catalog.py +++ b/packages/google-cloud-private-catalog/google/cloud/privatecatalog_v1beta1/types/private_catalog.py @@ -17,9 +17,9 @@ from typing import MutableMapping, MutableSequence -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.longrunning.operations_pb2 as operations_pb2 # type: ignore +import google.protobuf.struct_pb2 as struct_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -599,6 +599,7 @@ class AssetValidationState(proto.Enum): The validation is done and the asset reference is invalid. """ + ASSET_VALIDATION_STATE_UNSPECIFIED = 0 PENDING = 1 VALID = 2 diff --git a/packages/google-cloud-private-catalog/noxfile.py b/packages/google-cloud-private-catalog/noxfile.py index c9f2270fa61e..5e22c771d2d6 100644 --- a/packages/google-cloud-private-catalog/noxfile.py +++ b/packages/google-cloud-private-catalog/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-private-catalog/tests/unit/gapic/privatecatalog_v1beta1/test_private_catalog.py b/packages/google-cloud-private-catalog/tests/unit/gapic/privatecatalog_v1beta1/test_private_catalog.py index 9975e97dcc3a..755bd7374e88 100644 --- a/packages/google-cloud-private-catalog/tests/unit/gapic/privatecatalog_v1beta1/test_private_catalog.py +++ b/packages/google-cloud-private-catalog/tests/unit/gapic/privatecatalog_v1beta1/test_private_catalog.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,11 +43,16 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account @@ -945,10 +950,9 @@ def test_private_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -993,10 +997,9 @@ def test_private_catalog_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1032,10 +1035,9 @@ def test_private_catalog_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1278,13 +1280,13 @@ def test_private_catalog_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3523,8 +3525,9 @@ def test_search_catalogs_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3587,17 +3590,20 @@ def test_search_catalogs_rest_interceptors(null_interceptor): ) client = PrivateCatalogClient(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.PrivateCatalogRestInterceptor, "post_search_catalogs" - ) as post, mock.patch.object( - transports.PrivateCatalogRestInterceptor, "post_search_catalogs_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PrivateCatalogRestInterceptor, "pre_search_catalogs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivateCatalogRestInterceptor, "post_search_catalogs" + ) as post, + mock.patch.object( + transports.PrivateCatalogRestInterceptor, + "post_search_catalogs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivateCatalogRestInterceptor, "pre_search_catalogs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3655,8 +3661,9 @@ def test_search_products_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3719,17 +3726,20 @@ def test_search_products_rest_interceptors(null_interceptor): ) client = PrivateCatalogClient(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.PrivateCatalogRestInterceptor, "post_search_products" - ) as post, mock.patch.object( - transports.PrivateCatalogRestInterceptor, "post_search_products_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PrivateCatalogRestInterceptor, "pre_search_products" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivateCatalogRestInterceptor, "post_search_products" + ) as post, + mock.patch.object( + transports.PrivateCatalogRestInterceptor, + "post_search_products_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivateCatalogRestInterceptor, "pre_search_products" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3787,8 +3797,9 @@ def test_search_versions_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3851,17 +3862,20 @@ def test_search_versions_rest_interceptors(null_interceptor): ) client = PrivateCatalogClient(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.PrivateCatalogRestInterceptor, "post_search_versions" - ) as post, mock.patch.object( - transports.PrivateCatalogRestInterceptor, "post_search_versions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.PrivateCatalogRestInterceptor, "pre_search_versions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivateCatalogRestInterceptor, "post_search_versions" + ) as post, + mock.patch.object( + transports.PrivateCatalogRestInterceptor, + "post_search_versions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivateCatalogRestInterceptor, "pre_search_versions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4030,11 +4044,14 @@ def test_private_catalog_base_transport(): def test_private_catalog_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.privatecatalog_v1beta1.services.private_catalog.transports.PrivateCatalogTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.privatecatalog_v1beta1.services.private_catalog.transports.PrivateCatalogTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PrivateCatalogTransport( @@ -4051,9 +4068,12 @@ def test_private_catalog_base_transport_with_credentials_file(): def test_private_catalog_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.privatecatalog_v1beta1.services.private_catalog.transports.PrivateCatalogTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.privatecatalog_v1beta1.services.private_catalog.transports.PrivateCatalogTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PrivateCatalogTransport() @@ -4125,11 +4145,12 @@ def test_private_catalog_transport_auth_gdch_credentials(transport_class): def test_private_catalog_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-privilegedaccessmanager/docs/conf.py b/packages/google-cloud-privilegedaccessmanager/docs/conf.py index 0f327aa792ea..68156a7f8aa9 100644 --- a/packages/google-cloud-privilegedaccessmanager/docs/conf.py +++ b/packages/google-cloud-privilegedaccessmanager/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-privilegedaccessmanager documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/__init__.py b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/__init__.py index d12009e79245..34c793e87072 100644 --- a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/__init__.py +++ b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.privileged_access_manager import ( PrivilegedAccessManagerAsyncClient, PrivilegedAccessManagerClient, diff --git a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/async_client.py b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/async_client.py index 53e3c43410bf..620beb7ac67f 100644 --- a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/async_client.py +++ b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/async_client.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +import uuid +from collections import OrderedDict from typing import ( Callable, Dict, @@ -28,15 +29,14 @@ Type, Union, ) -import uuid +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.privilegedaccessmanager_v1 import gapic_version as package_version @@ -45,13 +45,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.privilegedaccessmanager_v1.services.privileged_access_manager import ( pagers, @@ -156,7 +156,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: PrivilegedAccessManagerAsyncClient: The constructed client. """ - return PrivilegedAccessManagerClient.from_service_account_info.__func__(PrivilegedAccessManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = PrivilegedAccessManagerClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(PrivilegedAccessManagerAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -172,7 +173,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: PrivilegedAccessManagerAsyncClient: The constructed client. """ - return PrivilegedAccessManagerClient.from_service_account_file.__func__(PrivilegedAccessManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = PrivilegedAccessManagerClient.from_service_account_file.__func__ # type: ignore + return sa_file_func( + PrivilegedAccessManagerAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -210,7 +214,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return PrivilegedAccessManagerClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return PrivilegedAccessManagerClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> PrivilegedAccessManagerTransport: diff --git a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/client.py b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/client.py index 647d9af4dfe9..c6f6aabb562c 100644 --- a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/client.py +++ b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/client.py @@ -13,12 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import uuid +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,9 +34,8 @@ Union, cast, ) -import uuid -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -44,7 +45,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.privilegedaccessmanager_v1 import gapic_version as package_version @@ -62,13 +62,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.api_core import operation # type: ignore -from google.api_core import operation_async # type: ignore +import google.api_core.operation as operation # type: ignore +import google.api_core.operation_async as operation_async # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.privilegedaccessmanager_v1.services.privileged_access_manager import ( pagers, @@ -89,9 +89,7 @@ class PrivilegedAccessManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[PrivilegedAccessManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[PrivilegedAccessManagerTransport]] _transport_registry["grpc"] = PrivilegedAccessManagerGrpcTransport _transport_registry["grpc_asyncio"] = PrivilegedAccessManagerGrpcAsyncIOTransport _transport_registry["rest"] = PrivilegedAccessManagerRestTransport @@ -685,11 +683,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = PrivilegedAccessManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + PrivilegedAccessManagerClient._read_environment_variables() + ) self._client_cert_source = ( PrivilegedAccessManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -726,8 +722,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(PrivilegedAccessManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/pagers.py b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/pagers.py index f9cf2ee8c96a..15b8b25beb9d 100644 --- a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/pagers.py +++ b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -227,7 +227,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -305,7 +305,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -387,7 +387,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -463,7 +463,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -543,7 +543,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -619,7 +619,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/__init__.py b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/__init__.py index 9dc119eee8ff..2cdab6397bcb 100644 --- a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/__init__.py +++ b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[PrivilegedAccessManagerTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[PrivilegedAccessManagerTransport]] _transport_registry["grpc"] = PrivilegedAccessManagerGrpcTransport _transport_registry["grpc_asyncio"] = PrivilegedAccessManagerGrpcAsyncIOTransport _transport_registry["rest"] = PrivilegedAccessManagerRestTransport diff --git a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/base.py b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/base.py index 78bf4e48553a..9cb4c7444483 100644 --- a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/base.py +++ b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/base.py @@ -17,15 +17,15 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.privilegedaccessmanager_v1 import gapic_version as package_version from google.cloud.privilegedaccessmanager_v1.types import privilegedaccessmanager @@ -417,7 +417,10 @@ def get_operation( @property def delete_operation( self, - ) -> Callable[[operations_pb2.DeleteOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.DeleteOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/grpc.py b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/grpc.py index c77cd1a967c5..315812489198 100644 --- a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/grpc.py +++ b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/grpc.py @@ -16,19 +16,19 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore -import proto # type: ignore from google.cloud.privilegedaccessmanager_v1.types import privilegedaccessmanager diff --git a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/grpc_asyncio.py b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/grpc_asyncio.py index 9a9bc3972b30..f1507a9d9490 100644 --- a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/grpc_asyncio.py @@ -17,9 +17,12 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries @@ -28,10 +31,7 @@ from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.privilegedaccessmanager_v1.types import privilegedaccessmanager diff --git a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/rest.py b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/rest.py index 81836fac477d..21a6e1f7b2ea 100644 --- a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/rest.py +++ b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/services/privileged_access_manager/transports/rest.py @@ -16,17 +16,17 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +import google.protobuf from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -1256,9 +1256,7 @@ def __call__( """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseApproveGrant._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseApproveGrant._get_http_options() request, metadata = self._interceptor.pre_approve_grant(request, metadata) transcoded_request = _BasePrivilegedAccessManagerRestTransport._BaseApproveGrant._get_transcoded_request( @@ -1406,9 +1404,7 @@ def __call__( Response message for ``CheckOnboardingStatus`` method. """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseCheckOnboardingStatus._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseCheckOnboardingStatus._get_http_options() request, metadata = self._interceptor.pre_check_onboarding_status( request, metadata @@ -1561,9 +1557,7 @@ def __call__( """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseCreateEntitlement._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseCreateEntitlement._get_http_options() request, metadata = self._interceptor.pre_create_entitlement( request, metadata @@ -1589,7 +1583,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -1717,9 +1711,7 @@ def __call__( """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseCreateGrant._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseCreateGrant._get_http_options() request, metadata = self._interceptor.pre_create_grant(request, metadata) transcoded_request = _BasePrivilegedAccessManagerRestTransport._BaseCreateGrant._get_transcoded_request( @@ -1870,9 +1862,7 @@ def __call__( """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseDeleteEntitlement._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseDeleteEntitlement._get_http_options() request, metadata = self._interceptor.pre_delete_entitlement( request, metadata @@ -1894,7 +1884,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2021,9 +2011,7 @@ def __call__( """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseDenyGrant._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseDenyGrant._get_http_options() request, metadata = self._interceptor.pre_deny_grant(request, metadata) transcoded_request = _BasePrivilegedAccessManagerRestTransport._BaseDenyGrant._get_transcoded_request( @@ -2176,9 +2164,7 @@ def __call__( """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseGetEntitlement._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseGetEntitlement._get_http_options() request, metadata = self._interceptor.pre_get_entitlement(request, metadata) transcoded_request = _BasePrivilegedAccessManagerRestTransport._BaseGetEntitlement._get_transcoded_request( @@ -2328,9 +2314,7 @@ def __call__( """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseGetGrant._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseGetGrant._get_http_options() request, metadata = self._interceptor.pre_get_grant(request, metadata) transcoded_request = _BasePrivilegedAccessManagerRestTransport._BaseGetGrant._get_transcoded_request( @@ -2476,9 +2460,7 @@ def __call__( """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseListEntitlements._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseListEntitlements._get_http_options() request, metadata = self._interceptor.pre_list_entitlements( request, metadata @@ -2632,9 +2614,7 @@ def __call__( """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseListGrants._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseListGrants._get_http_options() request, metadata = self._interceptor.pre_list_grants(request, metadata) transcoded_request = _BasePrivilegedAccessManagerRestTransport._BaseListGrants._get_transcoded_request( @@ -2783,9 +2763,7 @@ def __call__( """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseRevokeGrant._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseRevokeGrant._get_http_options() request, metadata = self._interceptor.pre_revoke_grant(request, metadata) transcoded_request = _BasePrivilegedAccessManagerRestTransport._BaseRevokeGrant._get_transcoded_request( @@ -2809,7 +2787,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -2931,9 +2909,7 @@ def __call__( Response message for ``SearchEntitlements`` method. """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseSearchEntitlements._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseSearchEntitlements._get_http_options() request, metadata = self._interceptor.pre_search_entitlements( request, metadata @@ -3084,9 +3060,7 @@ def __call__( Response message for ``SearchGrants`` method. """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseSearchGrants._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseSearchGrants._get_http_options() request, metadata = self._interceptor.pre_search_grants(request, metadata) transcoded_request = _BasePrivilegedAccessManagerRestTransport._BaseSearchGrants._get_transcoded_request( @@ -3235,9 +3209,7 @@ def __call__( """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseUpdateEntitlement._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseUpdateEntitlement._get_http_options() request, metadata = self._interceptor.pre_update_entitlement( request, metadata @@ -3263,7 +3235,7 @@ def __call__( ) method = transcoded_request["method"] try: - request_payload = json_format.MessageToJson(request) + request_payload = type(request).to_json(request) except: request_payload = None http_request = { @@ -3536,9 +3508,7 @@ def __call__( locations_pb2.Location: Response from GetLocation method. """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseGetLocation._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseGetLocation._get_http_options() request, metadata = self._interceptor.pre_get_location(request, metadata) transcoded_request = _BasePrivilegedAccessManagerRestTransport._BaseGetLocation._get_transcoded_request( @@ -3677,9 +3647,7 @@ def __call__( locations_pb2.ListLocationsResponse: Response from ListLocations method. """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseListLocations._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseListLocations._get_http_options() request, metadata = self._interceptor.pre_list_locations(request, metadata) transcoded_request = _BasePrivilegedAccessManagerRestTransport._BaseListLocations._get_transcoded_request( @@ -3817,9 +3785,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseDeleteOperation._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseDeleteOperation._get_http_options() request, metadata = self._interceptor.pre_delete_operation( request, metadata @@ -3937,9 +3903,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BasePrivilegedAccessManagerRestTransport._BaseGetOperation._get_transcoded_request( @@ -4078,9 +4042,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BasePrivilegedAccessManagerRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BasePrivilegedAccessManagerRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BasePrivilegedAccessManagerRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/types/privilegedaccessmanager.py b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/types/privilegedaccessmanager.py index d14b74bc26cb..061e212e943c 100644 --- a/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/types/privilegedaccessmanager.py +++ b/packages/google-cloud-privilegedaccessmanager/google/cloud/privilegedaccessmanager_v1/types/privilegedaccessmanager.py @@ -17,10 +17,10 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -214,6 +214,7 @@ class State(proto.Enum): UPDATING (5): The entitlement is being updated. """ + STATE_UNSPECIFIED = 0 CREATING = 1 AVAILABLE = 2 @@ -537,12 +538,12 @@ class RoleBinding(proto.Message): proto.STRING, number=2, ) - role_bindings: MutableSequence[ - "PrivilegedAccess.GcpIamAccess.RoleBinding" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="PrivilegedAccess.GcpIamAccess.RoleBinding", + role_bindings: MutableSequence["PrivilegedAccess.GcpIamAccess.RoleBinding"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="PrivilegedAccess.GcpIamAccess.RoleBinding", + ) ) gcp_iam_access: GcpIamAccess = proto.Field( @@ -665,6 +666,7 @@ class CallerAccessType(proto.Enum): The user has access to approve/deny grants created under this entitlement. """ + CALLER_ACCESS_TYPE_UNSPECIFIED = 0 GRANT_REQUESTER = 1 GRANT_APPROVER = 2 @@ -973,6 +975,7 @@ class State(proto.Enum): Grant was withdrawn by the grant owner. This is a terminal state. """ + STATE_UNSPECIFIED = 0 APPROVAL_AWAITED = 1 DENIED = 3 @@ -1499,6 +1502,7 @@ class CallerRelationshipType(proto.Enum): The caller had successfully approved/denied this grant earlier. """ + CALLER_RELATIONSHIP_TYPE_UNSPECIFIED = 0 HAD_CREATED = 1 CAN_APPROVE = 2 diff --git a/packages/google-cloud-privilegedaccessmanager/noxfile.py b/packages/google-cloud-privilegedaccessmanager/noxfile.py index cdddf2e85519..91728417d0e7 100644 --- a/packages/google-cloud-privilegedaccessmanager/noxfile.py +++ b/packages/google-cloud-privilegedaccessmanager/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-privilegedaccessmanager/tests/unit/gapic/privilegedaccessmanager_v1/test_privileged_access_manager.py b/packages/google-cloud-privilegedaccessmanager/tests/unit/gapic/privilegedaccessmanager_v1/test_privileged_access_manager.py index a23e8def4477..1a4de7ee0771 100644 --- a/packages/google-cloud-privilegedaccessmanager/tests/unit/gapic/privilegedaccessmanager_v1/test_privileged_access_manager.py +++ b/packages/google-cloud-privilegedaccessmanager/tests/unit/gapic/privilegedaccessmanager_v1/test_privileged_access_manager.py @@ -23,17 +23,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -44,7 +44,15 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False +import google.api_core.operation_async as operation_async # type: ignore +import google.auth +import google.protobuf.any_pb2 as any_pb2 # type: ignore +import google.protobuf.duration_pb2 as duration_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.rpc.status_pb2 as status_pb2 # type: ignore from google.api_core import ( + client_options, future, gapic_v1, grpc_helpers, @@ -53,21 +61,13 @@ operations_v1, path_template, ) -from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import operation_async # type: ignore from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account -from google.protobuf import any_pb2 # type: ignore -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore from google.cloud.privilegedaccessmanager_v1.services.privileged_access_manager import ( PrivilegedAccessManagerAsyncClient, @@ -1015,10 +1015,9 @@ def test_privileged_access_manager_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1063,10 +1062,9 @@ def test_privileged_access_manager_client_get_mtls_endpoint_and_cert_source( client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1102,10 +1100,9 @@ def test_privileged_access_manager_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1361,13 +1358,13 @@ def test_privileged_access_manager_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1743,9 +1740,9 @@ def test_list_entitlements_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entitlements - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entitlements] = ( + mock_rpc + ) request = {} client.list_entitlements(request) @@ -2295,9 +2292,9 @@ def test_search_entitlements_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_entitlements - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_entitlements] = ( + mock_rpc + ) request = {} client.search_entitlements(request) @@ -3088,9 +3085,9 @@ def test_create_entitlement_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entitlement] = ( + mock_rpc + ) request = {} client.create_entitlement(request) @@ -3456,9 +3453,9 @@ def test_delete_entitlement_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entitlement] = ( + mock_rpc + ) request = {} client.delete_entitlement(request) @@ -3798,9 +3795,9 @@ def test_update_entitlement_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entitlement] = ( + mock_rpc + ) request = {} client.update_entitlement(request) @@ -6638,9 +6635,9 @@ def test_list_entitlements_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_entitlements - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_entitlements] = ( + mock_rpc + ) request = {} client.list_entitlements(request) @@ -6905,9 +6902,9 @@ def test_search_entitlements_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.search_entitlements - ] = mock_rpc + client._transport._wrapped_methods[client._transport.search_entitlements] = ( + mock_rpc + ) request = {} client.search_entitlements(request) @@ -7299,9 +7296,9 @@ def test_create_entitlement_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_entitlement] = ( + mock_rpc + ) request = {} client.create_entitlement(request) @@ -7519,9 +7516,9 @@ def test_delete_entitlement_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_entitlement] = ( + mock_rpc + ) request = {} client.delete_entitlement(request) @@ -7717,9 +7714,9 @@ def test_update_entitlement_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_entitlement - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_entitlement] = ( + mock_rpc + ) request = {} client.update_entitlement(request) @@ -9943,8 +9940,9 @@ def test_check_onboarding_status_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10009,19 +10007,22 @@ def test_check_onboarding_status_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, - "post_check_onboarding_status", - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_check_onboarding_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_check_onboarding_status" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_check_onboarding_status", + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_check_onboarding_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "pre_check_onboarding_status", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10079,8 +10080,9 @@ def test_list_entitlements_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10145,18 +10147,20 @@ def test_list_entitlements_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_list_entitlements" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_list_entitlements_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_list_entitlements" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "post_list_entitlements" + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_list_entitlements_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_list_entitlements" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10214,8 +10218,9 @@ def test_search_entitlements_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10280,18 +10285,21 @@ def test_search_entitlements_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_search_entitlements" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_search_entitlements_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_search_entitlements" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_search_entitlements", + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_search_entitlements_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_search_entitlements" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10349,8 +10357,9 @@ def test_get_entitlement_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10417,18 +10426,20 @@ def test_get_entitlement_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_get_entitlement" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_get_entitlement_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_get_entitlement" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "post_get_entitlement" + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_get_entitlement_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_get_entitlement" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10486,8 +10497,9 @@ def test_create_entitlement_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10660,20 +10672,21 @@ def test_create_entitlement_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_create_entitlement" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_create_entitlement_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_create_entitlement" - ) as pre: + 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.PrivilegedAccessManagerRestInterceptor, "post_create_entitlement" + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_create_entitlement_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_create_entitlement" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10726,8 +10739,9 @@ def test_delete_entitlement_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10784,20 +10798,21 @@ def test_delete_entitlement_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_delete_entitlement" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_delete_entitlement_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_delete_entitlement" - ) as pre: + 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.PrivilegedAccessManagerRestInterceptor, "post_delete_entitlement" + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_delete_entitlement_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_delete_entitlement" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10854,8 +10869,9 @@ def test_update_entitlement_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11032,20 +11048,21 @@ def test_update_entitlement_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_update_entitlement" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_update_entitlement_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_update_entitlement" - ) as pre: + 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.PrivilegedAccessManagerRestInterceptor, "post_update_entitlement" + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_update_entitlement_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_update_entitlement" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11098,8 +11115,9 @@ def test_list_grants_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11164,18 +11182,20 @@ def test_list_grants_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_list_grants" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_list_grants_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_list_grants" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "post_list_grants" + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_list_grants_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_list_grants" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11233,8 +11253,9 @@ def test_search_grants_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11297,18 +11318,20 @@ def test_search_grants_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_search_grants" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_search_grants_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_search_grants" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "post_search_grants" + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_search_grants_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_search_grants" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11368,8 +11391,9 @@ def test_get_grant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11442,18 +11466,20 @@ def test_get_grant_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_get_grant" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_get_grant_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_get_grant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "post_get_grant" + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_get_grant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_get_grant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11508,8 +11534,9 @@ def test_create_grant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11705,18 +11732,20 @@ def test_create_grant_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_create_grant" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_create_grant_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_create_grant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "post_create_grant" + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_create_grant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_create_grant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11773,8 +11802,9 @@ def test_approve_grant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11847,18 +11877,20 @@ def test_approve_grant_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_approve_grant" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_approve_grant_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_approve_grant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "post_approve_grant" + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_approve_grant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_approve_grant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11915,8 +11947,9 @@ def test_deny_grant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11989,18 +12022,20 @@ def test_deny_grant_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_deny_grant" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_deny_grant_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_deny_grant" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "post_deny_grant" + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_deny_grant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_deny_grant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12057,8 +12092,9 @@ def test_revoke_grant_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12117,20 +12153,21 @@ def test_revoke_grant_rest_interceptors(null_interceptor): ) client = PrivilegedAccessManagerClient(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.PrivilegedAccessManagerRestInterceptor, "post_revoke_grant" - ) as post, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, - "post_revoke_grant_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.PrivilegedAccessManagerRestInterceptor, "pre_revoke_grant" - ) as pre: + 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.PrivilegedAccessManagerRestInterceptor, "post_revoke_grant" + ) as post, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, + "post_revoke_grant_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.PrivilegedAccessManagerRestInterceptor, "pre_revoke_grant" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12183,8 +12220,9 @@ def test_get_location_rest_bad_request(request_type=locations_pb2.GetLocationReq ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12243,8 +12281,9 @@ def test_list_locations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12305,8 +12344,9 @@ def test_delete_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12367,8 +12407,9 @@ def test_get_operation_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12429,8 +12470,9 @@ def test_list_operations_rest_bad_request( ) # 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12870,11 +12912,14 @@ def test_privileged_access_manager_base_transport(): def test_privileged_access_manager_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.privilegedaccessmanager_v1.services.privileged_access_manager.transports.PrivilegedAccessManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.privilegedaccessmanager_v1.services.privileged_access_manager.transports.PrivilegedAccessManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PrivilegedAccessManagerTransport( @@ -12891,9 +12936,12 @@ def test_privileged_access_manager_base_transport_with_credentials_file(): def test_privileged_access_manager_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.privilegedaccessmanager_v1.services.privileged_access_manager.transports.PrivilegedAccessManagerTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.privilegedaccessmanager_v1.services.privileged_access_manager.transports.PrivilegedAccessManagerTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.PrivilegedAccessManagerTransport() @@ -12967,11 +13015,12 @@ def test_privileged_access_manager_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-quotas/docs/conf.py b/packages/google-cloud-quotas/docs/conf.py index 13edfd694087..64047fbc259b 100644 --- a/packages/google-cloud-quotas/docs/conf.py +++ b/packages/google-cloud-quotas/docs/conf.py @@ -12,8 +12,7 @@ # 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. -# -# +## # google-cloud-quotas documentation build configuration file # # This file is execfile()d with the current directory set to its @@ -25,9 +24,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import logging import os import shlex import sys +from typing import Any # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -383,3 +384,34 @@ napoleon_use_ivar = False napoleon_use_param = True napoleon_use_rtype = True + + +# Setup for sphinx behaviors such as warning filters. +class UnexpectedUnindentFilter(logging.Filter): + """Filter out warnings about unexpected unindentation following bullet lists.""" + + def filter(self, record: logging.LogRecord) -> bool: + """Filter the log record. + + Args: + record (logging.LogRecord): The log record. + + Returns: + bool: False to suppress the warning, True to allow it. + """ + msg = record.getMessage() + if "Bullet list ends without a blank line" in msg: + return False + return True + + +def setup(app: Any) -> None: + """Setup the Sphinx application. + + Args: + app (Any): The Sphinx application. + """ + # Sphinx's logger is hierarchical. Adding a filter to the + # root 'sphinx' logger will catch warnings from all sub-loggers. + logger = logging.getLogger("sphinx") + logger.addFilter(UnexpectedUnindentFilter()) diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/__init__.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/__init__.py index 10e5469c075a..e8a779ed5369 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/__init__.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_quotas import CloudQuotasAsyncClient, CloudQuotasClient from .types.cloudquotas import ( CreateQuotaPreferenceRequest, diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/async_client.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/async_client.py index fe549054604b..49a0244d56e2 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/async_client.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudquotas_v1 import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudquotas_v1.services.cloud_quotas import pagers from google.cloud.cloudquotas_v1.types import cloudquotas, resources @@ -126,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudQuotasAsyncClient: The constructed client. """ - return CloudQuotasClient.from_service_account_info.__func__(CloudQuotasAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudQuotasClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudQuotasAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudQuotasAsyncClient: The constructed client. """ - return CloudQuotasClient.from_service_account_file.__func__(CloudQuotasAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudQuotasClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CloudQuotasAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/client.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/client.py index 31eefed24d6f..26d49bcc55a0 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/client.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudquotas_v1 import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudquotas_v1.services.cloud_quotas import pagers from google.cloud.cloudquotas_v1.types import cloudquotas, resources @@ -655,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudQuotasClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudQuotasClient._read_environment_variables() + ) self._client_cert_source = CloudQuotasClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudQuotasTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/pagers.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/pagers.py index ac61aa3e3ff8..0740986c9586 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/pagers.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/base.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/base.py index 139ff9e8d554..effc528fe0fc 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/base.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudquotas_v1 import gapic_version as package_version from google.cloud.cloudquotas_v1.types import cloudquotas, resources diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/grpc.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/grpc.py index f129a159cf66..2241f18ca0e4 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/grpc.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.cloudquotas_v1.types import cloudquotas, resources diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/grpc_asyncio.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/grpc_asyncio.py index 58f128b8a662..82cb48e6fc25 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/grpc_asyncio.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudquotas_v1.types import cloudquotas, resources diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/rest.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/rest.py index 0e039dc3195a..8c28faf8ccc0 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/rest.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/services/cloud_quotas/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -578,9 +578,7 @@ def __call__( """ - http_options = ( - _BaseCloudQuotasRestTransport._BaseCreateQuotaPreference._get_http_options() - ) + http_options = _BaseCloudQuotasRestTransport._BaseCreateQuotaPreference._get_http_options() request, metadata = self._interceptor.pre_create_quota_preference( request, metadata @@ -886,9 +884,7 @@ def __call__( """ - http_options = ( - _BaseCloudQuotasRestTransport._BaseGetQuotaPreference._get_http_options() - ) + http_options = _BaseCloudQuotasRestTransport._BaseGetQuotaPreference._get_http_options() request, metadata = self._interceptor.pre_get_quota_preference( request, metadata @@ -1186,9 +1182,7 @@ def __call__( """ - http_options = ( - _BaseCloudQuotasRestTransport._BaseListQuotaPreferences._get_http_options() - ) + http_options = _BaseCloudQuotasRestTransport._BaseListQuotaPreferences._get_http_options() request, metadata = self._interceptor.pre_list_quota_preferences( request, metadata @@ -1342,9 +1336,7 @@ def __call__( """ - http_options = ( - _BaseCloudQuotasRestTransport._BaseUpdateQuotaPreference._get_http_options() - ) + http_options = _BaseCloudQuotasRestTransport._BaseUpdateQuotaPreference._get_http_options() request, metadata = self._interceptor.pre_update_quota_preference( request, metadata diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/types/cloudquotas.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/types/cloudquotas.py index bd437f93f363..a2ed26254e81 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/types/cloudquotas.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/types/cloudquotas.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.cloudquotas_v1.types import resources @@ -259,12 +259,12 @@ class CreateQuotaPreferenceRequest(proto.Message): number=3, message=resources.QuotaPreference, ) - ignore_safety_checks: MutableSequence[ - resources.QuotaSafetyCheck - ] = proto.RepeatedField( - proto.ENUM, - number=4, - enum=resources.QuotaSafetyCheck, + ignore_safety_checks: MutableSequence[resources.QuotaSafetyCheck] = ( + proto.RepeatedField( + proto.ENUM, + number=4, + enum=resources.QuotaSafetyCheck, + ) ) @@ -313,12 +313,12 @@ class UpdateQuotaPreferenceRequest(proto.Message): proto.BOOL, number=4, ) - ignore_safety_checks: MutableSequence[ - resources.QuotaSafetyCheck - ] = proto.RepeatedField( - proto.ENUM, - number=5, - enum=resources.QuotaSafetyCheck, + ignore_safety_checks: MutableSequence[resources.QuotaSafetyCheck] = ( + proto.RepeatedField( + proto.ENUM, + number=5, + enum=resources.QuotaSafetyCheck, + ) ) diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/types/resources.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/types/resources.py index 3cdf661b56da..4510f1ce2b12 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/types/resources.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1/types/resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -51,6 +51,7 @@ class QuotaSafetyCheck(proto.Enum): cause the consumer's effective limit to decrease by more than 10 percent. """ + QUOTA_SAFETY_CHECK_UNSPECIFIED = 0 QUOTA_DECREASE_BELOW_USAGE = 1 QUOTA_DECREASE_PERCENTAGE_TOO_HIGH = 2 @@ -130,6 +131,7 @@ class ContainerType(proto.Enum): ORGANIZATION (3): organization """ + CONTAINER_TYPE_UNSPECIFIED = 0 PROJECT = 1 FOLDER = 2 @@ -237,6 +239,7 @@ class IneligibilityReason(proto.Enum): OTHER (2): Other reasons. """ + INELIGIBILITY_REASON_UNSPECIFIED = 0 NO_VALID_BILLING_ACCOUNT = 1 NOT_SUPPORTED = 3 @@ -415,6 +418,7 @@ class Origin(proto.Enum): AUTO_ADJUSTER (2): Generated by automatic quota adjustment. """ + ORIGIN_UNSPECIFIED = 0 CLOUD_CONSOLE = 1 AUTO_ADJUSTER = 2 diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/__init__.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/__init__.py index 930c70366e47..3347dbd6256f 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/__init__.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/__init__.py @@ -28,6 +28,7 @@ # this code path once we drop support for Python 3.7 import importlib_metadata as metadata + from .services.cloud_quotas import CloudQuotasAsyncClient, CloudQuotasClient from .services.quota_adjuster_settings_manager import ( QuotaAdjusterSettingsManagerAsyncClient, diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/async_client.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/async_client.py index a3eab5151fad..9abb0c1fda7f 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/async_client.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudquotas_v1beta import gapic_version as package_version @@ -44,8 +44,8 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudquotas_v1beta.services.cloud_quotas import pagers from google.cloud.cloudquotas_v1beta.types import cloudquotas, resources @@ -126,7 +126,8 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CloudQuotasAsyncClient: The constructed client. """ - return CloudQuotasClient.from_service_account_info.__func__(CloudQuotasAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = CloudQuotasClient.from_service_account_info.__func__ # type: ignore + return sa_info_func(CloudQuotasAsyncClient, info, *args, **kwargs) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,8 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CloudQuotasAsyncClient: The constructed client. """ - return CloudQuotasClient.from_service_account_file.__func__(CloudQuotasAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = CloudQuotasClient.from_service_account_file.__func__ # type: ignore + return sa_file_func(CloudQuotasAsyncClient, filename, *args, **kwargs) from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/client.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/client.py index c5c0e6f00411..ed2ecf0b5dfd 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/client.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudquotas_v1beta import gapic_version as package_version @@ -61,8 +61,8 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore from google.cloud.cloudquotas_v1beta.services.cloud_quotas import pagers from google.cloud.cloudquotas_v1beta.types import cloudquotas, resources @@ -655,11 +655,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CloudQuotasClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CloudQuotasClient._read_environment_variables() + ) self._client_cert_source = CloudQuotasClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -694,8 +692,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CloudQuotasTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/pagers.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/pagers.py index bfee48fd1f92..40845bab8f16 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/pagers.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/pagers.py @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +299,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/base.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/base.py index 4a7a2178a5ab..9d48fe6199d9 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/base.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/base.py @@ -17,13 +17,13 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudquotas_v1beta import gapic_version as package_version from google.cloud.cloudquotas_v1beta.types import cloudquotas, resources diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/grpc.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/grpc.py index 8dd140dd7fc8..6d01b3ae685a 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/grpc.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/grpc.py @@ -16,17 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson from google.cloud.cloudquotas_v1beta.types import cloudquotas, resources diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/grpc_asyncio.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/grpc_asyncio.py index a51cc2f25a6a..c850a61ab4d4 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/grpc_asyncio.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/grpc_asyncio.py @@ -17,19 +17,19 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore from google.cloud.cloudquotas_v1beta.types import cloudquotas, resources diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/rest.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/rest.py index dd0368e9b463..f91fbff7aa95 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/rest.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/cloud_quotas/transports/rest.py @@ -16,15 +16,15 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version @@ -578,9 +578,7 @@ def __call__( """ - http_options = ( - _BaseCloudQuotasRestTransport._BaseCreateQuotaPreference._get_http_options() - ) + http_options = _BaseCloudQuotasRestTransport._BaseCreateQuotaPreference._get_http_options() request, metadata = self._interceptor.pre_create_quota_preference( request, metadata @@ -886,9 +884,7 @@ def __call__( """ - http_options = ( - _BaseCloudQuotasRestTransport._BaseGetQuotaPreference._get_http_options() - ) + http_options = _BaseCloudQuotasRestTransport._BaseGetQuotaPreference._get_http_options() request, metadata = self._interceptor.pre_get_quota_preference( request, metadata @@ -1186,9 +1182,7 @@ def __call__( """ - http_options = ( - _BaseCloudQuotasRestTransport._BaseListQuotaPreferences._get_http_options() - ) + http_options = _BaseCloudQuotasRestTransport._BaseListQuotaPreferences._get_http_options() request, metadata = self._interceptor.pre_list_quota_preferences( request, metadata @@ -1342,9 +1336,7 @@ def __call__( """ - http_options = ( - _BaseCloudQuotasRestTransport._BaseUpdateQuotaPreference._get_http_options() - ) + http_options = _BaseCloudQuotasRestTransport._BaseUpdateQuotaPreference._get_http_options() request, metadata = self._interceptor.pre_update_quota_preference( request, metadata diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/async_client.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/async_client.py index b50baee214cc..097349e0c565 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/async_client.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/async_client.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging import re +from collections import OrderedDict from typing import ( Callable, Dict, @@ -29,13 +29,13 @@ Union, ) +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudquotas_v1beta import gapic_version as package_version @@ -44,13 +44,13 @@ except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from google.cloud.cloudquotas_v1beta.types import ( quota_adjuster_settings as gac_quota_adjuster_settings, ) -from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from .client import QuotaAdjusterSettingsManagerClient from .transports.base import DEFAULT_CLIENT_INFO, QuotaAdjusterSettingsManagerTransport @@ -136,7 +136,12 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: QuotaAdjusterSettingsManagerAsyncClient: The constructed client. """ - return QuotaAdjusterSettingsManagerClient.from_service_account_info.__func__(QuotaAdjusterSettingsManagerAsyncClient, info, *args, **kwargs) # type: ignore + sa_info_func = ( + QuotaAdjusterSettingsManagerClient.from_service_account_info.__func__ + ) # type: ignore + return sa_info_func( + QuotaAdjusterSettingsManagerAsyncClient, info, *args, **kwargs + ) @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -152,7 +157,12 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: QuotaAdjusterSettingsManagerAsyncClient: The constructed client. """ - return QuotaAdjusterSettingsManagerClient.from_service_account_file.__func__(QuotaAdjusterSettingsManagerAsyncClient, filename, *args, **kwargs) # type: ignore + sa_file_func = ( + QuotaAdjusterSettingsManagerClient.from_service_account_file.__func__ + ) # type: ignore + return sa_file_func( + QuotaAdjusterSettingsManagerAsyncClient, filename, *args, **kwargs + ) from_service_account_json = from_service_account_file @@ -190,7 +200,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return QuotaAdjusterSettingsManagerClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return QuotaAdjusterSettingsManagerClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> QuotaAdjusterSettingsManagerTransport: diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/client.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/client.py index 85f752f02cca..05498e0ae24e 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/client.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/client.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict -from http import HTTPStatus import json import logging as std_logging import os import re +import warnings +from collections import OrderedDict +from http import HTTPStatus from typing import ( Callable, Dict, @@ -32,8 +33,8 @@ Union, cast, ) -import warnings +import google.protobuf from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -43,7 +44,6 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudquotas_v1beta import gapic_version as package_version @@ -61,13 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from google.cloud.cloudquotas_v1beta.types import ( quota_adjuster_settings as gac_quota_adjuster_settings, ) -from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from .transports.base import DEFAULT_CLIENT_INFO, QuotaAdjusterSettingsManagerTransport from .transports.grpc import QuotaAdjusterSettingsManagerGrpcTransport @@ -83,13 +83,11 @@ class QuotaAdjusterSettingsManagerClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[QuotaAdjusterSettingsManagerTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[QuotaAdjusterSettingsManagerTransport]] _transport_registry["grpc"] = QuotaAdjusterSettingsManagerGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = QuotaAdjusterSettingsManagerGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + QuotaAdjusterSettingsManagerGrpcAsyncIOTransport + ) _transport_registry["rest"] = QuotaAdjusterSettingsManagerRestTransport def get_transport_class( @@ -643,11 +641,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = QuotaAdjusterSettingsManagerClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + QuotaAdjusterSettingsManagerClient._read_environment_variables() + ) self._client_cert_source = ( QuotaAdjusterSettingsManagerClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -686,8 +682,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(QuotaAdjusterSettingsManagerTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/__init__.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/__init__.py index c086e3a11a61..609bfcd9b69f 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/__init__.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/__init__.py @@ -25,9 +25,7 @@ ) # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[QuotaAdjusterSettingsManagerTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[QuotaAdjusterSettingsManagerTransport]] _transport_registry["grpc"] = QuotaAdjusterSettingsManagerGrpcTransport _transport_registry["grpc_asyncio"] = QuotaAdjusterSettingsManagerGrpcAsyncIOTransport _transport_registry["rest"] = QuotaAdjusterSettingsManagerRestTransport diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/base.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/base.py index 78acbe2e6c37..b2f37d887dbb 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/base.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/base.py @@ -17,19 +17,19 @@ from typing import Awaitable, Callable, Dict, Optional, Sequence, Union import google.api_core +import google.auth # type: ignore +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import google.protobuf from google.cloud.cloudquotas_v1beta import gapic_version as package_version +from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from google.cloud.cloudquotas_v1beta.types import ( quota_adjuster_settings as gac_quota_adjuster_settings, ) -from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/grpc.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/grpc.py index 155c184c602b..912f2605fe0e 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/grpc.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/grpc.py @@ -16,22 +16,22 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.protobuf.json_format import MessageToJson import google.protobuf.message import grpc # type: ignore import proto # type: ignore +from google.api_core import gapic_v1, grpc_helpers +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.protobuf.json_format import MessageToJson +from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from google.cloud.cloudquotas_v1beta.types import ( quota_adjuster_settings as gac_quota_adjuster_settings, ) -from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from .base import DEFAULT_CLIENT_INFO, QuotaAdjusterSettingsManagerTransport @@ -352,12 +352,12 @@ def update_quota_adjuster_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_quota_adjuster_settings" not in self._stubs: - self._stubs[ - "update_quota_adjuster_settings" - ] = self._logged_channel.unary_unary( - "/google.api.cloudquotas.v1beta.QuotaAdjusterSettingsManager/UpdateQuotaAdjusterSettings", - request_serializer=gac_quota_adjuster_settings.UpdateQuotaAdjusterSettingsRequest.serialize, - response_deserializer=gac_quota_adjuster_settings.QuotaAdjusterSettings.deserialize, + self._stubs["update_quota_adjuster_settings"] = ( + self._logged_channel.unary_unary( + "/google.api.cloudquotas.v1beta.QuotaAdjusterSettingsManager/UpdateQuotaAdjusterSettings", + request_serializer=gac_quota_adjuster_settings.UpdateQuotaAdjusterSettingsRequest.serialize, + response_deserializer=gac_quota_adjuster_settings.QuotaAdjusterSettings.deserialize, + ) ) return self._stubs["update_quota_adjuster_settings"] @@ -384,12 +384,12 @@ def get_quota_adjuster_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_quota_adjuster_settings" not in self._stubs: - self._stubs[ - "get_quota_adjuster_settings" - ] = self._logged_channel.unary_unary( - "/google.api.cloudquotas.v1beta.QuotaAdjusterSettingsManager/GetQuotaAdjusterSettings", - request_serializer=quota_adjuster_settings.GetQuotaAdjusterSettingsRequest.serialize, - response_deserializer=quota_adjuster_settings.QuotaAdjusterSettings.deserialize, + self._stubs["get_quota_adjuster_settings"] = ( + self._logged_channel.unary_unary( + "/google.api.cloudquotas.v1beta.QuotaAdjusterSettingsManager/GetQuotaAdjusterSettings", + request_serializer=quota_adjuster_settings.GetQuotaAdjusterSettingsRequest.serialize, + response_deserializer=quota_adjuster_settings.QuotaAdjusterSettings.deserialize, + ) ) return self._stubs["get_quota_adjuster_settings"] diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/grpc_asyncio.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/grpc_asyncio.py index b9e8226b70a7..197a28e1d237 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/grpc_asyncio.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/grpc_asyncio.py @@ -17,24 +17,24 @@ import json import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import google.protobuf.message +import grpc # type: ignore +import proto # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.protobuf.json_format import MessageToJson -import google.protobuf.message -import grpc # type: ignore from grpc.experimental import aio # type: ignore -import proto # type: ignore +from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from google.cloud.cloudquotas_v1beta.types import ( quota_adjuster_settings as gac_quota_adjuster_settings, ) -from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from .base import DEFAULT_CLIENT_INFO, QuotaAdjusterSettingsManagerTransport from .grpc import QuotaAdjusterSettingsManagerGrpcTransport @@ -362,12 +362,12 @@ def update_quota_adjuster_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_quota_adjuster_settings" not in self._stubs: - self._stubs[ - "update_quota_adjuster_settings" - ] = self._logged_channel.unary_unary( - "/google.api.cloudquotas.v1beta.QuotaAdjusterSettingsManager/UpdateQuotaAdjusterSettings", - request_serializer=gac_quota_adjuster_settings.UpdateQuotaAdjusterSettingsRequest.serialize, - response_deserializer=gac_quota_adjuster_settings.QuotaAdjusterSettings.deserialize, + self._stubs["update_quota_adjuster_settings"] = ( + self._logged_channel.unary_unary( + "/google.api.cloudquotas.v1beta.QuotaAdjusterSettingsManager/UpdateQuotaAdjusterSettings", + request_serializer=gac_quota_adjuster_settings.UpdateQuotaAdjusterSettingsRequest.serialize, + response_deserializer=gac_quota_adjuster_settings.QuotaAdjusterSettings.deserialize, + ) ) return self._stubs["update_quota_adjuster_settings"] @@ -394,12 +394,12 @@ def get_quota_adjuster_settings( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_quota_adjuster_settings" not in self._stubs: - self._stubs[ - "get_quota_adjuster_settings" - ] = self._logged_channel.unary_unary( - "/google.api.cloudquotas.v1beta.QuotaAdjusterSettingsManager/GetQuotaAdjusterSettings", - request_serializer=quota_adjuster_settings.GetQuotaAdjusterSettingsRequest.serialize, - response_deserializer=quota_adjuster_settings.QuotaAdjusterSettings.deserialize, + self._stubs["get_quota_adjuster_settings"] = ( + self._logged_channel.unary_unary( + "/google.api.cloudquotas.v1beta.QuotaAdjusterSettingsManager/GetQuotaAdjusterSettings", + request_serializer=quota_adjuster_settings.GetQuotaAdjusterSettingsRequest.serialize, + response_deserializer=quota_adjuster_settings.QuotaAdjusterSettings.deserialize, + ) ) return self._stubs["get_quota_adjuster_settings"] diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/rest.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/rest.py index 9c4f07664151..466d19405e4f 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/rest.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/rest.py @@ -16,22 +16,22 @@ import dataclasses import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import warnings +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import google.protobuf from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -import google.protobuf from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from google.cloud.cloudquotas_v1beta.types import ( quota_adjuster_settings as gac_quota_adjuster_settings, ) -from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseQuotaAdjusterSettingsManagerRestTransport @@ -358,9 +358,7 @@ def __call__( """ - http_options = ( - _BaseQuotaAdjusterSettingsManagerRestTransport._BaseGetQuotaAdjusterSettings._get_http_options() - ) + http_options = _BaseQuotaAdjusterSettingsManagerRestTransport._BaseGetQuotaAdjusterSettings._get_http_options() request, metadata = self._interceptor.pre_get_quota_adjuster_settings( request, metadata @@ -515,9 +513,7 @@ def __call__( """ - http_options = ( - _BaseQuotaAdjusterSettingsManagerRestTransport._BaseUpdateQuotaAdjusterSettings._get_http_options() - ) + http_options = _BaseQuotaAdjusterSettingsManagerRestTransport._BaseUpdateQuotaAdjusterSettings._get_http_options() request, metadata = self._interceptor.pre_update_quota_adjuster_settings( request, metadata @@ -586,11 +582,10 @@ def __call__( resp = self._interceptor.post_update_quota_adjuster_settings(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_quota_adjuster_settings_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_quota_adjuster_settings_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -628,7 +623,9 @@ def get_quota_adjuster_settings( ]: # 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._GetQuotaAdjusterSettings(self._session, self._host, self._interceptor) # type: ignore + return self._GetQuotaAdjusterSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_quota_adjuster_settings( @@ -639,7 +636,9 @@ def update_quota_adjuster_settings( ]: # 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._UpdateQuotaAdjusterSettings(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateQuotaAdjusterSettings( + self._session, self._host, self._interceptor + ) # type: ignore @property def kind(self) -> str: diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/rest_base.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/rest_base.py index b07043d56aa5..300df117ac21 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/rest_base.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/services/quota_adjuster_settings_manager/transports/rest_base.py @@ -20,10 +20,10 @@ from google.api_core import gapic_v1, path_template from google.protobuf import json_format +from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from google.cloud.cloudquotas_v1beta.types import ( quota_adjuster_settings as gac_quota_adjuster_settings, ) -from google.cloud.cloudquotas_v1beta.types import quota_adjuster_settings from .base import DEFAULT_CLIENT_INFO, QuotaAdjusterSettingsManagerTransport diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/types/cloudquotas.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/types/cloudquotas.py index ae2e911dd3e9..f9a09b89b155 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/types/cloudquotas.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/types/cloudquotas.py @@ -17,7 +17,7 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.cloudquotas_v1beta.types import resources @@ -259,12 +259,12 @@ class CreateQuotaPreferenceRequest(proto.Message): number=3, message=resources.QuotaPreference, ) - ignore_safety_checks: MutableSequence[ - resources.QuotaSafetyCheck - ] = proto.RepeatedField( - proto.ENUM, - number=4, - enum=resources.QuotaSafetyCheck, + ignore_safety_checks: MutableSequence[resources.QuotaSafetyCheck] = ( + proto.RepeatedField( + proto.ENUM, + number=4, + enum=resources.QuotaSafetyCheck, + ) ) @@ -313,12 +313,12 @@ class UpdateQuotaPreferenceRequest(proto.Message): proto.BOOL, number=4, ) - ignore_safety_checks: MutableSequence[ - resources.QuotaSafetyCheck - ] = proto.RepeatedField( - proto.ENUM, - number=5, - enum=resources.QuotaSafetyCheck, + ignore_safety_checks: MutableSequence[resources.QuotaSafetyCheck] = ( + proto.RepeatedField( + proto.ENUM, + number=5, + enum=resources.QuotaSafetyCheck, + ) ) diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/types/quota_adjuster_settings.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/types/quota_adjuster_settings.py index 92c1caf5c718..bb9a2b78fa32 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/types/quota_adjuster_settings.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/types/quota_adjuster_settings.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -128,6 +128,7 @@ class Enablement(proto.Enum): DISABLED (3): The quota adjuster is disabled. """ + ENABLEMENT_UNSPECIFIED = 0 ENABLED = 2 DISABLED = 3 diff --git a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/types/resources.py b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/types/resources.py index 68f1511f0413..386ae46d6ef8 100644 --- a/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/types/resources.py +++ b/packages/google-cloud-quotas/google/cloud/cloudquotas_v1beta/types/resources.py @@ -17,8 +17,8 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore import proto # type: ignore __protobuf__ = proto.module( @@ -51,6 +51,7 @@ class QuotaSafetyCheck(proto.Enum): cause the consumer's effective limit to decrease by more than 10 percent. """ + QUOTA_SAFETY_CHECK_UNSPECIFIED = 0 QUOTA_DECREASE_BELOW_USAGE = 1 QUOTA_DECREASE_PERCENTAGE_TOO_HIGH = 2 @@ -130,6 +131,7 @@ class ContainerType(proto.Enum): ORGANIZATION (3): organization """ + CONTAINER_TYPE_UNSPECIFIED = 0 PROJECT = 1 FOLDER = 2 @@ -237,6 +239,7 @@ class IneligibilityReason(proto.Enum): OTHER (2): Other reasons. """ + INELIGIBILITY_REASON_UNSPECIFIED = 0 NO_VALID_BILLING_ACCOUNT = 1 NOT_SUPPORTED = 3 @@ -416,6 +419,7 @@ class Origin(proto.Enum): AUTO_ADJUSTER (2): Generated by automatic quota adjustment. """ + ORIGIN_UNSPECIFIED = 0 CLOUD_CONSOLE = 1 AUTO_ADJUSTER = 2 diff --git a/packages/google-cloud-quotas/noxfile.py b/packages/google-cloud-quotas/noxfile.py index 1ffa8b4a81c8..af6c3a3a6611 100644 --- a/packages/google-cloud-quotas/noxfile.py +++ b/packages/google-cloud-quotas/noxfile.py @@ -17,13 +17,12 @@ import pathlib import re import shutil -from typing import Dict, List import warnings +from typing import Dict, List import nox -BLACK_VERSION = "black[jupyter]==23.7.0" -ISORT_VERSION = "isort==5.11.0" +RUFF_VERSION = "ruff==0.14.14" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] @@ -149,42 +148,52 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", BLACK_VERSION) - session.run( - "black", - "--check", - *LINT_PATHS, - ) + session.install("flake8", RUFF_VERSION) + + # 2. Check formatting + session.run("ruff", "format", "--check", "--line-length=88", *LINT_PATHS) session.run("flake8", "google", "tests") @nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - session.run( - "black", - *LINT_PATHS, + """(Deprecated) Legacy session. Please use 'nox -s format'.""" + session.log( + "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future." ) + # Just run the ruff formatter (keeping legacy behavior of only formatting, not sorting imports) + session.install(RUFF_VERSION) + session.run("ruff", "format", "--line-length=88", *LINT_PATHS) + @nox.session(python=DEFAULT_PYTHON_VERSION) def format(session): """ - Run isort to sort imports. Then run black - to format code to uniform standard. + Run ruff to sort imports and format code. """ - session.install(BLACK_VERSION, ISORT_VERSION) - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + # 1. Install ruff (skipped automatically if you run with --no-venv) + session.install(RUFF_VERSION) + + # 2. Run Ruff to fix imports + # check --select I: Enables strict import sorting + # --fix: Applies the changes automatically session.run( - "isort", - "--fss", + "ruff", + "check", + "--select", + "I", + "--fix", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) + + # 3. Run Ruff to format code session.run( - "black", + "ruff", + "format", + "--line-length=88", # Standard Black line length *LINT_PATHS, ) diff --git a/packages/google-cloud-quotas/tests/unit/gapic/cloudquotas_v1/test_cloud_quotas.py b/packages/google-cloud-quotas/tests/unit/gapic/cloudquotas_v1/test_cloud_quotas.py index d7fe57e42e6c..5e095a8f2935 100644 --- a/packages/google-cloud-quotas/tests/unit/gapic/cloudquotas_v1/test_cloud_quotas.py +++ b/packages/google-cloud-quotas/tests/unit/gapic/cloudquotas_v1/test_cloud_quotas.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.cloudquotas_v1.services.cloud_quotas import ( CloudQuotasAsyncClient, @@ -925,10 +930,9 @@ def test_cloud_quotas_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +977,9 @@ def test_cloud_quotas_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1015,9 @@ def test_cloud_quotas_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1244,13 +1246,13 @@ def test_cloud_quotas_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1359,9 +1361,9 @@ def test_list_quota_infos_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_quota_infos - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_quota_infos] = ( + mock_rpc + ) request = {} client.list_quota_infos(request) @@ -2264,9 +2266,9 @@ def test_list_quota_preferences_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_quota_preferences - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_quota_preferences] = ( + mock_rpc + ) request = {} client.list_quota_preferences(request) @@ -2822,9 +2824,9 @@ def test_get_quota_preference_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_quota_preference - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_quota_preference] = ( + mock_rpc + ) request = {} client.get_quota_preference(request) @@ -3867,9 +3869,9 @@ def test_list_quota_infos_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_quota_infos - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_quota_infos] = ( + mock_rpc + ) request = {} client.list_quota_infos(request) @@ -4312,9 +4314,9 @@ def test_list_quota_preferences_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_quota_preferences - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_quota_preferences] = ( + mock_rpc + ) request = {} client.list_quota_preferences(request) @@ -4576,9 +4578,9 @@ def test_get_quota_preference_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_quota_preference - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_quota_preference] = ( + mock_rpc + ) request = {} client.get_quota_preference(request) @@ -5623,8 +5625,9 @@ def test_list_quota_infos_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5687,17 +5690,19 @@ def test_list_quota_infos_rest_interceptors(null_interceptor): ) client = CloudQuotasClient(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.CloudQuotasRestInterceptor, "post_list_quota_infos" - ) as post, mock.patch.object( - transports.CloudQuotasRestInterceptor, "post_list_quota_infos_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudQuotasRestInterceptor, "pre_list_quota_infos" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_list_quota_infos" + ) as post, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_list_quota_infos_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "pre_list_quota_infos" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5752,8 +5757,9 @@ def test_get_quota_info_rest_bad_request(request_type=cloudquotas.GetQuotaInfoRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5844,17 +5850,19 @@ def test_get_quota_info_rest_interceptors(null_interceptor): ) client = CloudQuotasClient(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.CloudQuotasRestInterceptor, "post_get_quota_info" - ) as post, mock.patch.object( - transports.CloudQuotasRestInterceptor, "post_get_quota_info_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudQuotasRestInterceptor, "pre_get_quota_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_get_quota_info" + ) as post, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_get_quota_info_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "pre_get_quota_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5907,8 +5915,9 @@ def test_list_quota_preferences_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5973,18 +5982,20 @@ def test_list_quota_preferences_rest_interceptors(null_interceptor): ) client = CloudQuotasClient(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.CloudQuotasRestInterceptor, "post_list_quota_preferences" - ) as post, mock.patch.object( - transports.CloudQuotasRestInterceptor, - "post_list_quota_preferences_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudQuotasRestInterceptor, "pre_list_quota_preferences" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_list_quota_preferences" + ) as post, + mock.patch.object( + transports.CloudQuotasRestInterceptor, + "post_list_quota_preferences_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "pre_list_quota_preferences" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6044,8 +6055,9 @@ def test_get_quota_preference_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6122,17 +6134,20 @@ def test_get_quota_preference_rest_interceptors(null_interceptor): ) client = CloudQuotasClient(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.CloudQuotasRestInterceptor, "post_get_quota_preference" - ) as post, mock.patch.object( - transports.CloudQuotasRestInterceptor, "post_get_quota_preference_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudQuotasRestInterceptor, "pre_get_quota_preference" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_get_quota_preference" + ) as post, + mock.patch.object( + transports.CloudQuotasRestInterceptor, + "post_get_quota_preference_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "pre_get_quota_preference" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6185,8 +6200,9 @@ def test_create_quota_preference_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6350,18 +6366,20 @@ def test_create_quota_preference_rest_interceptors(null_interceptor): ) client = CloudQuotasClient(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.CloudQuotasRestInterceptor, "post_create_quota_preference" - ) as post, mock.patch.object( - transports.CloudQuotasRestInterceptor, - "post_create_quota_preference_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudQuotasRestInterceptor, "pre_create_quota_preference" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_create_quota_preference" + ) as post, + mock.patch.object( + transports.CloudQuotasRestInterceptor, + "post_create_quota_preference_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "pre_create_quota_preference" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6418,8 +6436,9 @@ def test_update_quota_preference_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6587,18 +6606,20 @@ def test_update_quota_preference_rest_interceptors(null_interceptor): ) client = CloudQuotasClient(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.CloudQuotasRestInterceptor, "post_update_quota_preference" - ) as post, mock.patch.object( - transports.CloudQuotasRestInterceptor, - "post_update_quota_preference_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudQuotasRestInterceptor, "pre_update_quota_preference" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_update_quota_preference" + ) as post, + mock.patch.object( + transports.CloudQuotasRestInterceptor, + "post_update_quota_preference_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "pre_update_quota_preference" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6833,11 +6854,14 @@ def test_cloud_quotas_base_transport(): def test_cloud_quotas_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.cloudquotas_v1.services.cloud_quotas.transports.CloudQuotasTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.cloudquotas_v1.services.cloud_quotas.transports.CloudQuotasTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudQuotasTransport( @@ -6854,9 +6878,12 @@ def test_cloud_quotas_base_transport_with_credentials_file(): def test_cloud_quotas_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.cloudquotas_v1.services.cloud_quotas.transports.CloudQuotasTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.cloudquotas_v1.services.cloud_quotas.transports.CloudQuotasTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CloudQuotasTransport() @@ -6928,11 +6955,12 @@ def test_cloud_quotas_transport_auth_gdch_credentials(transport_class): def test_cloud_quotas_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-quotas/tests/unit/gapic/cloudquotas_v1beta/test_cloud_quotas.py b/packages/google-cloud-quotas/tests/unit/gapic/cloudquotas_v1beta/test_cloud_quotas.py index e4be077501ef..438e6ee0fa88 100644 --- a/packages/google-cloud-quotas/tests/unit/gapic/cloudquotas_v1beta/test_cloud_quotas.py +++ b/packages/google-cloud-quotas/tests/unit/gapic/cloudquotas_v1beta/test_cloud_quotas.py @@ -22,17 +22,17 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable import json import math +from collections.abc import AsyncIterable, Iterable +import grpc +import pytest from google.api_core import api_core_version 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 @@ -43,17 +43,22 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template -from google.api_core import client_options +import google.auth +import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore +import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore +import google.protobuf.wrappers_pb2 as wrappers_pb2 # type: ignore +from google.api_core import ( + client_options, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + path_template, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.protobuf import wrappers_pb2 # type: ignore from google.cloud.cloudquotas_v1beta.services.cloud_quotas import ( CloudQuotasAsyncClient, @@ -925,10 +930,9 @@ def test_cloud_quotas_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -973,10 +977,9 @@ def test_cloud_quotas_client_get_mtls_endpoint_and_cert_source(client_class): client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint, ) - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source(options) + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source(options) + ) assert api_endpoint == mock_api_endpoint assert cert_source is expected_cert_source @@ -1012,10 +1015,9 @@ def test_cloud_quotas_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1244,13 +1246,13 @@ def test_cloud_quotas_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1359,9 +1361,9 @@ def test_list_quota_infos_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_quota_infos - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_quota_infos] = ( + mock_rpc + ) request = {} client.list_quota_infos(request) @@ -2264,9 +2266,9 @@ def test_list_quota_preferences_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_quota_preferences - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_quota_preferences] = ( + mock_rpc + ) request = {} client.list_quota_preferences(request) @@ -2822,9 +2824,9 @@ def test_get_quota_preference_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_quota_preference - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_quota_preference] = ( + mock_rpc + ) request = {} client.get_quota_preference(request) @@ -3867,9 +3869,9 @@ def test_list_quota_infos_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_quota_infos - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_quota_infos] = ( + mock_rpc + ) request = {} client.list_quota_infos(request) @@ -4312,9 +4314,9 @@ def test_list_quota_preferences_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_quota_preferences - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_quota_preferences] = ( + mock_rpc + ) request = {} client.list_quota_preferences(request) @@ -4576,9 +4578,9 @@ def test_get_quota_preference_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_quota_preference - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_quota_preference] = ( + mock_rpc + ) request = {} client.get_quota_preference(request) @@ -5623,8 +5625,9 @@ def test_list_quota_infos_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5687,17 +5690,19 @@ def test_list_quota_infos_rest_interceptors(null_interceptor): ) client = CloudQuotasClient(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.CloudQuotasRestInterceptor, "post_list_quota_infos" - ) as post, mock.patch.object( - transports.CloudQuotasRestInterceptor, "post_list_quota_infos_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudQuotasRestInterceptor, "pre_list_quota_infos" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_list_quota_infos" + ) as post, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_list_quota_infos_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "pre_list_quota_infos" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5752,8 +5757,9 @@ def test_get_quota_info_rest_bad_request(request_type=cloudquotas.GetQuotaInfoRe 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5844,17 +5850,19 @@ def test_get_quota_info_rest_interceptors(null_interceptor): ) client = CloudQuotasClient(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.CloudQuotasRestInterceptor, "post_get_quota_info" - ) as post, mock.patch.object( - transports.CloudQuotasRestInterceptor, "post_get_quota_info_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudQuotasRestInterceptor, "pre_get_quota_info" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_get_quota_info" + ) as post, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_get_quota_info_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "pre_get_quota_info" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5907,8 +5915,9 @@ def test_list_quota_preferences_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5973,18 +5982,20 @@ def test_list_quota_preferences_rest_interceptors(null_interceptor): ) client = CloudQuotasClient(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.CloudQuotasRestInterceptor, "post_list_quota_preferences" - ) as post, mock.patch.object( - transports.CloudQuotasRestInterceptor, - "post_list_quota_preferences_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudQuotasRestInterceptor, "pre_list_quota_preferences" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_list_quota_preferences" + ) as post, + mock.patch.object( + transports.CloudQuotasRestInterceptor, + "post_list_quota_preferences_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "pre_list_quota_preferences" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6044,8 +6055,9 @@ def test_get_quota_preference_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6122,17 +6134,20 @@ def test_get_quota_preference_rest_interceptors(null_interceptor): ) client = CloudQuotasClient(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.CloudQuotasRestInterceptor, "post_get_quota_preference" - ) as post, mock.patch.object( - transports.CloudQuotasRestInterceptor, "post_get_quota_preference_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CloudQuotasRestInterceptor, "pre_get_quota_preference" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_get_quota_preference" + ) as post, + mock.patch.object( + transports.CloudQuotasRestInterceptor, + "post_get_quota_preference_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "pre_get_quota_preference" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6185,8 +6200,9 @@ def test_create_quota_preference_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6350,18 +6366,20 @@ def test_create_quota_preference_rest_interceptors(null_interceptor): ) client = CloudQuotasClient(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.CloudQuotasRestInterceptor, "post_create_quota_preference" - ) as post, mock.patch.object( - transports.CloudQuotasRestInterceptor, - "post_create_quota_preference_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudQuotasRestInterceptor, "pre_create_quota_preference" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_create_quota_preference" + ) as post, + mock.patch.object( + transports.CloudQuotasRestInterceptor, + "post_create_quota_preference_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "pre_create_quota_preference" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6418,8 +6436,9 @@ def test_update_quota_preference_rest_bad_request( 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 + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6587,18 +6606,20 @@ def test_update_quota_preference_rest_interceptors(null_interceptor): ) client = CloudQuotasClient(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.CloudQuotasRestInterceptor, "post_update_quota_preference" - ) as post, mock.patch.object( - transports.CloudQuotasRestInterceptor, - "post_update_quota_preference_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CloudQuotasRestInterceptor, "pre_update_quota_preference" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "post_update_quota_preference" + ) as post, + mock.patch.object( + transports.CloudQuotasRestInterceptor, + "post_update_quota_preference_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CloudQuotasRestInterceptor, "pre_update_quota_preference" + ) as pre, + ): {"code":"deadline_exceeded","msg":"operation timed out"}